Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FE] 1.0.0 배포 #528

Merged
merged 17 commits into from
Sep 30, 2023
Merged

[FE] 1.0.0 배포 #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e7ab2bd
[FE] Feature/#489 사용자 입력 시 개행 적용 (#491)
semnil5202 Sep 25, 2023
a83dab6
[FE] Feature/#495 Google Analytics 적용 (#496)
GC-Park Sep 25, 2023
ae6eed6
fix: 개행 처리 적용 시 wrap 속성이 적용되지 않던 오류 수정 (#492)
semnil5202 Sep 25, 2023
3c7f3e1
[FE] Refactor/#495 GA 패키지 json (#497)
GC-Park Sep 25, 2023
b6b168d
[FE] Refactor/#495 ga 추적 key 상수로 변경 (#498)
GC-Park Sep 25, 2023
cc34861
refactor: GA 위치 변경 (#499)
GC-Park Sep 25, 2023
86f6549
feat: GA 추가 (#500)
GC-Park Sep 25, 2023
5ad4c21
refactor: 필요없는 코드 삭제 (#501)
GC-Park Sep 26, 2023
6476931
[FE] Refactor/#505 react ga4 적용 (#506)
GC-Park Sep 27, 2023
b1b01fd
[FE] Hotfix react ga4 에러 해결 (#507)
GC-Park Sep 27, 2023
60cf4d2
[FE] Feat/#502 (#503)
jiwonh423 Sep 27, 2023
551217f
hotfix: 환경변수 수정 (#512)
jiwonh423 Sep 27, 2023
0c5bf0d
[FE] Refactor/#513 지도 생성 및 핀 생성 페이지 지도 위치 조정 (#514)
semnil5202 Sep 27, 2023
83cc393
[FE] Fix/myinfo 마이페이지 닉네임 변경 시 이미지 사라지던 오류 수정 (#515)
semnil5202 Sep 27, 2023
20011f0
[FE] Fix/#522 토픽 조회 중복 요청 오류, 핀 조회 시 토픽 조회 요청 오류 및 지도 줌인 오류 수정 (#523)
semnil5202 Sep 28, 2023
92ffa0e
fix: 모아보기 상태에서 핀 조회가 안되는 오류 수정 (#525)
semnil5202 Sep 30, 2023
fafe2f4
[FE] Refactor/#526 반응형 네브바 가림 문제 해결 (#527)
semnil5202 Sep 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .github/workflows/fe-merge-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch:

pull_request:
branches: [develop-FE]
branches: [develop-FE-2]
types: [closed]
paths: frontend/**

Expand All @@ -23,8 +23,8 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: 18
cache: 'npm'
cache-dependency-path: 'frontend'
cache: "npm"
cache-dependency-path: "frontend"

- name: Install npm
run: npm install
Expand All @@ -33,6 +33,9 @@ jobs:
- name: Build project
run: npm run build
working-directory: frontend
env:
REACT_APP_GOOGLE_ANALYTICS: ${{ secrets.REACT_APP_GOOGLE_ANALYTICS }}
APP_URL: "https://mapbefine.kro.kr/api"

- name: upload to artifact
uses: actions/upload-artifact@v3
Expand Down Expand Up @@ -63,7 +66,7 @@ jobs:

uses: 8398a7/action-slack@v3
with:
mention: 'here'
mention: "here"
if_mention: always
status: ${{ job.status }}
fields: workflow,job,commit,message,ref,author,took
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/fe-merge-prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch:

pull_request:
branches: [ main ]
branches: [main]
types: [closed]
paths: frontend/**

Expand Down Expand Up @@ -33,6 +33,9 @@ jobs:
- name: Build project
run: npm run build
working-directory: frontend
env:
REACT_APP_GOOGLE_ANALYTICS: ${{ secrets.REACT_APP_GOOGLE_ANALYTICS }}
APP_URL: "https://mapbefine.com/api"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

아 이렇게 해서 운영 서버와 개발 서버를 나눴군요 굿 !!


- name: upload to artifact
uses: actions/upload-artifact@v3
Expand All @@ -41,7 +44,7 @@ jobs:
path: frontend/dist

deploy:
runs-on: [ self-hosted, prod]
runs-on: [self-hosted, prod]
needs: build-and-upload

if: github.event.pull_request.merged
Expand All @@ -63,7 +66,7 @@ jobs:

uses: 8398a7/action-slack@v3
with:
mention: 'here'
mention: "here"
if_mention: always
status: ${{ job.status }}
fields: workflow,job,commit,message,ref,author,took
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fe-pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Frontend CI For Test Validation
on:
# pull request open과 reopen 시 실행한다.
pull_request:
branches: [main, develop-FE]
branches: [main, develop-FE-2]
paths: frontend/**

defaults:
Expand Down
1 change: 1 addition & 0 deletions frontend/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
module.exports = {
preset: 'ts-jest',
testEnvironment: 'jsdom',
};
Loading
Loading