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.

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

[Chore] Main 기준으로 배포되도록 수정 #206

Merged
merged 822 commits into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
822 commits
Select commit Hold shift + click to select a range
ed517dc
refactor: Background 컴포넌트 폴더 경로 수정
sooyeoniya Aug 12, 2024
5dd9e24
fix: 렌더링 오류 발생 시 새로고침 발생하도록 수정
jhj2713 Aug 12, 2024
dc3a541
fix: 렌더링 오류 시 새로고침
jhj2713 Aug 12, 2024
e80ceda
fix: referrerId -> referralId
jhj2713 Aug 12, 2024
f9ae720
Merge pull request #135 from softeerbootcamp4th/feat/#134-admin-ui
sooyeoniya Aug 12, 2024
2305645
Merge pull request #136 from softeerbootcamp4th/feat/#130-error-handling
sooyeoniya Aug 12, 2024
8c42082
Merge branch 'dev' into feat/#137-admin-api
jhj2713 Aug 12, 2024
14a3f0a
fix: 빌드 수정
jhj2713 Aug 12, 2024
5b8c4f6
feat: file input 구현
jhj2713 Aug 12, 2024
e7f89af
feat: Countdown 표기법 변경 및 밸런스 게임 진행 카운트다운 Props로 전달
sooyeoniya Aug 12, 2024
a411b4d
feat: 이미지 업로드 로직
jhj2713 Aug 12, 2024
610a73e
design: RushCard 호버 시 CSS 수정
sooyeoniya Aug 12, 2024
396fd17
feat: RushCard API 연동
sooyeoniya Aug 12, 2024
533053a
feat: 목록 수정
jhj2713 Aug 12, 2024
453ae16
feat: RushCardComparison API 연동
sooyeoniya Aug 12, 2024
97f5948
feat: RushCard 선택 시 POST 후 사용자 참여 여부 반영 및 POST 타입 오류 수정
sooyeoniya Aug 12, 2024
64e2d5c
fix: userParticipated 반영 안되는 오류 수정(API GET response 타입 오류)
sooyeoniya Aug 12, 2024
2d0b37b
refactor: useFetch로fetch 요청 수정
jhj2713 Aug 13, 2024
d8b5009
chore: formdata content type 추가
jhj2713 Aug 13, 2024
61bd174
feat: Rush test API 추가
sooyeoniya Aug 13, 2024
c44c0dd
refactor: formdata 추가 로직 수정
jhj2713 Aug 13, 2024
00aceac
Merge pull request #139 from softeerbootcamp4th/feat/#137-admin-api
jhj2713 Aug 13, 2024
8fb47f6
feat: og tag 적용
jhj2713 Aug 13, 2024
c0a3eee
feat: favicon 적용
jhj2713 Aug 13, 2024
b5e22cb
chore: favicon 적용
jhj2713 Aug 13, 2024
561bf6f
feat: useToggleContents 토글 기능 추가 및 훅 이름 변경
sooyeoniya Aug 13, 2024
8090a12
feat: 사용자가 선택한 카드에 대한 결과 카드 API 연동
sooyeoniya Aug 13, 2024
8c79c6f
fix: fetchWithTimeout 수정
jhj2713 Aug 13, 2024
ce653a8
fix: 어드민 fetchWithTimeout 수정
jhj2713 Aug 13, 2024
fac92e0
design: Rush 진입 화면 배경 추가
sooyeoniya Aug 13, 2024
0542086
Merge pull request #141 from softeerbootcamp4th/feat/#140-main-error
jhj2713 Aug 13, 2024
ee1237a
Merge branch 'dev' into chore/#138-main-tag
jhj2713 Aug 13, 2024
a717859
Merge pull request #143 from softeerbootcamp4th/chore/#138-main-tag
jhj2713 Aug 13, 2024
6297c03
Merge branch 'dev' into chore/#142-admin-tag
jhj2713 Aug 13, 2024
fcac623
fix: 이미지 수정
jhj2713 Aug 13, 2024
15e58ea
Merge pull request #144 from softeerbootcamp4th/chore/#142-admin-tag
jhj2713 Aug 13, 2024
bfb034e
Merge pull request #147 from softeerbootcamp4th/feat/#145-api-exception
jhj2713 Aug 13, 2024
14ee6fc
feat: 선착순 밸런스 게임 이벤트 불러오기 API 연동
jhj2713 Aug 13, 2024
86e1e63
fix: API에 맞게 option 수정
jhj2713 Aug 13, 2024
32600fa
feat: 추첨 이벤트 조회 API 연동
jhj2713 Aug 13, 2024
6a9c647
design: RushGame 내부 스크롤 삭제 및 padding 조정
sooyeoniya Aug 13, 2024
31d1dac
fix: 추첨 이벤트 수정 API 요청 수정
jhj2713 Aug 13, 2024
b3592bd
fix: participants -> participantsList
jhj2713 Aug 13, 2024
4329f35
feat: RushGame 상태 관리 타입 및 context 내부 getter, setter 수정
sooyeoniya Aug 13, 2024
cf6d678
feat: 이미지 업로드 로직 구현
jhj2713 Aug 13, 2024
77d589a
fix: 타입 수정 및 불필요한 구문 삭제
jhj2713 Aug 13, 2024
09b0dda
feat: Rush 카운트 다운 상태 관리 Context로 분리
sooyeoniya Aug 13, 2024
f6808f2
fix: 게임이 이미 진행 중인 상태에서 0:0:0이 뜨고 게임 화면으로 넘어가는 오류
sooyeoniya Aug 13, 2024
1e7c40f
feat: POST 후 사용자 참여 상태 업데이트 및 사용자가 선택한 옵션 번호 저장
sooyeoniya Aug 13, 2024
edacc26
feat: API로 받은 두 개의 카드 옵션 데이터 context에 저장
sooyeoniya Aug 13, 2024
8d9e6d3
feat: 이미지 API 연동
jhj2713 Aug 14, 2024
5c8a356
fix: 이미지 업로드 조건 수정
jhj2713 Aug 14, 2024
416be8e
feat: 무한 스크롤 params 수정
jhj2713 Aug 14, 2024
fb6ffc7
feat: 사용자가 선택한 카드에 대한 설명 카드 context로 상태 관리 반영
sooyeoniya Aug 14, 2024
c868c4f
feat: 이벤트 진행 날짜 / 시간 예외처리 추가
jhj2713 Aug 14, 2024
91ff881
feat: 추첨 이벤트 수정 API 반영
jhj2713 Aug 14, 2024
f2e3e60
feat: 실시간 비율 관련 상태 호출 공통으로 분리 및 API 연동
sooyeoniya Aug 14, 2024
a751bcb
feat: 수정 API 연동
jhj2713 Aug 14, 2024
a9af8d7
feat: 사용자 선택에 따라 메인 텍스트 분기 처리
sooyeoniya Aug 14, 2024
7e2ad0c
feat: 기대평 삭제 로직 구현
jhj2713 Aug 14, 2024
02d359f
feat: 비율 소수점 2자리까지 반올림 구현
sooyeoniya Aug 14, 2024
59751a2
feat: FinalResult UI 구현 및 mainText, 비율 연동, 사용자 선택에 따른 메시지, 카텍고리 분기 처리
sooyeoniya Aug 14, 2024
47dc381
feat: FinalResult 인터렉션 추가
sooyeoniya Aug 14, 2024
d4684a3
fix: infinite 조회 수정
jhj2713 Aug 14, 2024
067550f
fix: token 로직 수정
jhj2713 Aug 14, 2024
11bc298
feat: 기대평 무한 스크롤
jhj2713 Aug 14, 2024
b42a8bf
fix: 공유 URL 수정
jhj2713 Aug 14, 2024
3eff6f8
Merge pull request #150 from softeerbootcamp4th/fix/#149-share-link
jhj2713 Aug 14, 2024
14e8134
fix: filp 시간 수정
jhj2713 Aug 14, 2024
92ae00d
fix: 이목구비 위치 수정
jhj2713 Aug 14, 2024
88a9a19
feat: 카테고리 타입 추가 및 getRushResult API 데이터 변경 반영
sooyeoniya Aug 14, 2024
6972546
fix: API 요청 칼럼 맞추기
jhj2713 Aug 14, 2024
82f0158
fix: start fetching 조건 추가
jhj2713 Aug 14, 2024
787597d
feat: 오류 시 cookie 제거 로직 구현
jhj2713 Aug 14, 2024
6e0ff43
feat: 프로그래스바 공통 컴포넌트 분리 및 승리 여부에 따른 텍스트 색상 변경 로직 구현
sooyeoniya Aug 14, 2024
1466aa5
fix: intersection observer 수정
jhj2713 Aug 14, 2024
461df26
feat: 프로그래스바 비율에 따른 CSS 반영
sooyeoniya Aug 14, 2024
3b40b7d
fix: memo 적용
jhj2713 Aug 14, 2024
85ff362
fix: 불필요한 props 삭제
jhj2713 Aug 14, 2024
859f1f0
refactor: useMemo 적용
jhj2713 Aug 14, 2024
ec4c890
Merge pull request #152 from softeerbootcamp4th/feat/#151-casper-ux-ui
sooyeoniya Aug 15, 2024
9b1a019
feat: showcase에서 이벤트 공유 로직 구현
jhj2713 Aug 15, 2024
bf02433
feat: 공유 링크 생성 예외처리
jhj2713 Aug 15, 2024
af62ad3
feat: 예외처리 추가
jhj2713 Aug 15, 2024
26afa9b
chore: 필요없는 주석 제거
jhj2713 Aug 15, 2024
3eceff6
Merge branch 'dev' into feat/#154-showcase-share
jhj2713 Aug 15, 2024
99dfc21
Merge pull request #155 from softeerbootcamp4th/feat/#154-showcase-share
sooyeoniya Aug 15, 2024
8f4d216
chore: API 연동 후 사용하지 않는 상수 데이터 삭제(CARD_OPTIONS)
sooyeoniya Aug 15, 2024
9484905
chore: 외부에서 사용하지 않는 context 함수 value에서 삭제
sooyeoniya Aug 15, 2024
cb915bb
chore: 프로그래스바 컴포넌트 내부 컨벤션 통일
sooyeoniya Aug 15, 2024
527def5
rename: RushGame 관련 폴더명 변경
sooyeoniya Aug 15, 2024
9f63c0a
refactor: RushGame 관련 상수 데이터 및 타입 수정
sooyeoniya Aug 15, 2024
8a53a53
chore: 게임 진행 카운트 다운 시간 변경
sooyeoniya Aug 15, 2024
f02c18a
fix: ModalComponent가 isOpen 상태에 따라 계속 리렌더링되는 현상 방지
jhj2713 Aug 15, 2024
1d074ca
fix: 충돌 해결 및 토큰 경로 수정
sooyeoniya Aug 15, 2024
c02924a
refactor: useAuth 훅 재구현
sooyeoniya Aug 15, 2024
06ec8b9
refactor: getMsTime 유틸 반영
sooyeoniya Aug 15, 2024
d88b744
refactor: fetchWithTimeout 반영
sooyeoniya Aug 15, 2024
265fd51
chore: header에 root 라우팅 적용
jhj2713 Aug 16, 2024
8d02920
feat: 추첨 API 연동
jhj2713 Aug 16, 2024
ebf96db
chore: 카운트 변경
sooyeoniya Aug 16, 2024
0bf706a
feat: useScrollToTarget hook 생성
jhj2713 Aug 16, 2024
2867700
feat: 추첨 이벤트 스크롤 적용
jhj2713 Aug 16, 2024
6c346e1
feat: 선착순 이벤트 scroll 클릭 적용
jhj2713 Aug 16, 2024
8e0afed
fix: participant fetch 조건 수정
jhj2713 Aug 16, 2024
0010c36
chore: 공유 링크 복사 텍스트 수정
jhj2713 Aug 16, 2024
15d8c6c
fix: 기대평 overflow 해결
jhj2713 Aug 16, 2024
3d3b90d
refactor: useFetch 훅 반영
sooyeoniya Aug 16, 2024
df54ecd
refactor: Notice/index.tsx 내부 useFetch 훅 반영 시 promise.all 빼고 리팩토링
sooyeoniya Aug 16, 2024
964223e
feat: 캐스퍼 봇 개수에 따른 UI 분기처리
jhj2713 Aug 16, 2024
6db3ea4
fix: EventDateData 타입 오류 수정
sooyeoniya Aug 16, 2024
75507cf
fix: 전화번호 popup input 예외처리 추가
jhj2713 Aug 16, 2024
35e66d5
refactor: 폴더구조 변경
jhj2713 Aug 17, 2024
bdd05e4
chore: transition 방식 수정
jhj2713 Aug 17, 2024
508e696
refactor: PR 리뷰 반영
sooyeoniya Aug 18, 2024
fdad436
refactor: useToggleContents 훅 관련 PR 리뷰 반영
sooyeoniya Aug 18, 2024
3da2799
Merge pull request #158 from softeerbootcamp4th/feat/#82-rush-card
sooyeoniya Aug 18, 2024
349ab4c
chore: transition 조건 수정
jhj2713 Aug 18, 2024
1fcef46
Merge branch 'dev' into chore/#163-casper-custom-folder
jhj2713 Aug 18, 2024
d038c92
Merge pull request #164 from softeerbootcamp4th/chore/#163-casper-cus…
jhj2713 Aug 18, 2024
8a266f9
fix: 프로그래스바 비율 텍스트 z-index 설정
sooyeoniya Aug 18, 2024
48f91db
fix: "다른 사람의 스마일 로봇 뱃지 보러가기" 전체 width 로 cursor 잡히는 오류 수정
sooyeoniya Aug 18, 2024
fa5f6af
feat: 새로고침 툴팁 메시지 부드럽게 사라지는 인터렉션 추가
sooyeoniya Aug 18, 2024
c88c631
feat: transition 개선
jhj2713 Aug 18, 2024
9fe3bf9
Merge branch 'dev' into feat/#160-ux
jhj2713 Aug 18, 2024
17d0435
chore: 충돌 해결
jhj2713 Aug 18, 2024
2f718ba
chore: 깜빡임 해결
jhj2713 Aug 18, 2024
77110d8
chore: 콘솔 삭제
jhj2713 Aug 18, 2024
9d74960
feat: 선착순 밸런스 게임 공유 링크 연동
sooyeoniya Aug 18, 2024
4ee3c52
feat: RushCard 색상 랜덤 기능 구현
sooyeoniya Aug 19, 2024
de33a99
refactor: getMsTime util 적용
jhj2713 Aug 19, 2024
bb37f19
chore: 필요없는 await 삭제
jhj2713 Aug 19, 2024
f0b236d
chore: index -> idx
jhj2713 Aug 19, 2024
31f8bf3
chore: validate 문구 수정
jhj2713 Aug 19, 2024
b38e8f8
feat: 선착순 이벤트 URL 환경변수로 분리
sooyeoniya Aug 19, 2024
69886df
chore: useCallback 추가
jhj2713 Aug 19, 2024
7b3cc4b
refactor: tailwind 속성 적용
jhj2713 Aug 19, 2024
d779294
refactor: 조건부 tailwind 속성 추가
jhj2713 Aug 19, 2024
0ad1c4c
feat: VITE_RUSH_URL 환경변수 설정
sooyeoniya Aug 19, 2024
64cf244
chore: useCallback 적용
jhj2713 Aug 19, 2024
6f2491f
Merge pull request #168 from softeerbootcamp4th/fix/#166-total-ui-bug
sooyeoniya Aug 19, 2024
59b01f0
Merge pull request #159 from softeerbootcamp4th/feat/#148-admin-api
sooyeoniya Aug 19, 2024
06fbe9f
Merge pull request #161 from softeerbootcamp4th/feat/#160-ux
sooyeoniya Aug 19, 2024
2094a27
feat: 카드 색상 랜덤 Fisher-Yates 알고리즘 적용
sooyeoniya Aug 19, 2024
e840df6
Merge pull request #169 from softeerbootcamp4th/feat/#167-random-color
jhj2713 Aug 19, 2024
83df9b2
chore: 토스트 메시지 컨벤션 통일
sooyeoniya Aug 19, 2024
0ffefd3
Merge pull request #171 from softeerbootcamp4th/feat/#165-rush-share-…
sooyeoniya Aug 19, 2024
6286382
chore: 카운트 다운 서버 시간으로 변경
sooyeoniya Aug 19, 2024
e5d12ae
Merge pull request #173 from softeerbootcamp4th/feat/#172-change-coun…
jhj2713 Aug 19, 2024
5a30d49
chore: 헤드라인 이미지 preload 추가
jhj2713 Aug 19, 2024
aa51b08
chore: font display 설정
jhj2713 Aug 19, 2024
808f338
fix: preload image type 수정
jhj2713 Aug 19, 2024
537f541
chore: meta 태그 추가 및 robots.txt 추가
jhj2713 Aug 19, 2024
e0594f1
chore: prize image size 설정
jhj2713 Aug 19, 2024
03a9473
chore: 이미지 width, height 설정
jhj2713 Aug 19, 2024
5afd2be
chore: test API 삭제
sooyeoniya Aug 19, 2024
bdf98fc
feat: 선착순 게임 새로고침 및 뒤로가기 방지
sooyeoniya Aug 19, 2024
47d5f69
feat: FinalResult 화면에서 unblockNavigation 호출
sooyeoniya Aug 19, 2024
5537da9
fix: transition 버벅임 수정
jhj2713 Aug 20, 2024
94e43e9
chore: 불필요한 구문 삭제 및 count 수 조절
jhj2713 Aug 20, 2024
974d8f2
feat: 사용자가 이미 옵션 선택한 후에는 새로고침/뒤로가기 방지 풀기
sooyeoniya Aug 20, 2024
420afc0
Merge pull request #175 from softeerbootcamp4th/refactor/#174-lightho…
sooyeoniya Aug 20, 2024
1c0df68
chore: 현재 시간을 서버 시간으로 변경
sooyeoniya Aug 20, 2024
1b4c076
Merge branch 'dev' into fix/#176-transition
jhj2713 Aug 20, 2024
8e6fb6c
refactor: 공통된 선언 변수화
jhj2713 Aug 20, 2024
2647f0a
fix: image 절대경로 수정
jhj2713 Aug 20, 2024
52031f0
Merge pull request #179 from softeerbootcamp4th/fix/#178-share-image
jhj2713 Aug 20, 2024
9ab86d2
feat: 0%일 때 프로그래스바 처리
sooyeoniya Aug 20, 2024
36365dc
feat: 유저 응모 여부에 따른 FinalResult 처리
sooyeoniya Aug 20, 2024
7c0ce0d
refactor: sticker 이미지png -> svg
jhj2713 Aug 20, 2024
107a778
fix: result API 데이터 반환 타입 변경
sooyeoniya Aug 20, 2024
d250c3e
Merge pull request #177 from softeerbootcamp4th/fix/#176-transition
sooyeoniya Aug 20, 2024
c59978e
chore: 필요 없는 TODO 삭제
sooyeoniya Aug 20, 2024
ee4bf54
fix: 색상 예외처리 추가
jhj2713 Aug 20, 2024
572a087
chore: 불필요한 optional 선언 수정
jhj2713 Aug 20, 2024
46073b7
refactor: 타입 선언 위치 수정
jhj2713 Aug 20, 2024
e07f2f3
Merge pull request #181 from softeerbootcamp4th/fix/#180-card-sticker…
sooyeoniya Aug 20, 2024
9a02fe2
fix: 유효하지 않는 타입 수정
jhj2713 Aug 20, 2024
07ce1ba
feat: resultAPI의 optionId 추가 후 사용자가 선택한 optionId 반영
sooyeoniya Aug 20, 2024
89ca371
chore: robots.txt 경로 수정
jhj2713 Aug 20, 2024
c38d1e3
chore: 메인페이지 lazy loading 설정
jhj2713 Aug 20, 2024
24c8344
chore: 소개 페이지 lazy loading 적용
jhj2713 Aug 20, 2024
cd41ede
feat: 게임 진입 시 현재 게임 진행 상태 및 사용자 참여 여부 저장 로직 구현 및 카운트 다운 로직 분리
sooyeoniya Aug 20, 2024
2a1da5a
feat: 오늘 날짜 필터링 추가
sooyeoniya Aug 21, 2024
276b538
refactor: Context 내부 getRushUserParticipationStatus API 호출 밖으로 분리
sooyeoniya Aug 21, 2024
ebf3050
chore: timeout 조건 수정
jhj2713 Aug 21, 2024
0edb721
fix: 추첨 이벤트 오류 시 delete 후 다시 추첨
jhj2713 Aug 21, 2024
09d25d6
refactor: suspense 처리 추가
jhj2713 Aug 21, 2024
b0546e0
chore: time 선택 조건 수정
jhj2713 Aug 21, 2024
8a8678b
chore: timeout 시간 수정
jhj2713 Aug 21, 2024
48eb267
chore: error 조건 수정
jhj2713 Aug 21, 2024
0c3c64a
fix: lottery winner 목록 fetch 예외처리 추가
jhj2713 Aug 21, 2024
ba937b4
chore: prize 이미지 수정
jhj2713 Aug 21, 2024
27f5f78
chore: submit 엔터 처리
jhj2713 Aug 21, 2024
4c8f181
feat: 게임 재접속 시 유저 상태에 따른 상태 처리
sooyeoniya Aug 21, 2024
cd478e7
rename: updateCardOptions 함수명 변경
sooyeoniya Aug 21, 2024
c88e43d
refactor: getSelectedCardInfo 유틸 함수로 분리
sooyeoniya Aug 21, 2024
47ab45b
refactor: getOptionRatio 유틸 함수로 분리
sooyeoniya Aug 21, 2024
dff3181
fix: useFetch 콜백 쌓이는 오류 수정
sooyeoniya Aug 21, 2024
ae744d2
refactor: enum 변환
jhj2713 Aug 21, 2024
9312f4b
refactor: rushBalanceData 패칭 및 상태 업데이트하는 로직 훅으로 분리
sooyeoniya Aug 21, 2024
cf55683
Merge pull request #186 from softeerbootcamp4th/feat/#183-lighthouse
sooyeoniya Aug 21, 2024
e47d5d6
Merge branch 'dev' into refactor/#187-enum
jhj2713 Aug 21, 2024
b5e604c
refactor: todayRushEventData 패칭 및 상태 업데이트하는 로직 훅으로 분리
sooyeoniya Aug 21, 2024
270c911
refactor: rushUserParticipationStatus 패칭 및 상태 업데이트하는 로직 훅으로 분리
sooyeoniya Aug 21, 2024
ab56abd
refactor: resultData 패칭 및 상태 업데이트하는 로직 훅으로 분리
sooyeoniya Aug 21, 2024
1120dee
refactor: userResultData 패칭 및 상태 업데이트하는 로직 훅으로 분리
sooyeoniya Aug 21, 2024
b24076e
refactor: rushData 받아서 게임 초기 상태 설정해주는 로직 훅으로 분리
sooyeoniya Aug 21, 2024
9b1b8db
refactor: 이전 커밋에 대한 useSetGamePhase 훅 추가 커밋
sooyeoniya Aug 21, 2024
7ddf770
refactor: context에 flux 패턴 적용
sooyeoniya Aug 21, 2024
3444b9f
chore: enum -> const enum
jhj2713 Aug 22, 2024
47b4249
refactor: hooks 폴더 리팩토링 및 RushGame enum 변환
sooyeoniya Aug 22, 2024
a9aad6f
refactor: 이벤트 공유 컴포넌트 분리 및 FinalResult UX 개선
sooyeoniya Aug 22, 2024
5c02ed3
refactor: Countdown UX 개선
sooyeoniya Aug 22, 2024
bd01cee
refactor: CountdownTimer 인터페이스 분리
sooyeoniya Aug 22, 2024
48aa9af
feat: 토글 버튼 클릭 시 실시간 비율 반영 추가
sooyeoniya Aug 22, 2024
3dba62d
Merge pull request #185 from softeerbootcamp4th/fix/#184-admin-lottery
sooyeoniya Aug 22, 2024
a6c3362
Merge pull request #188 from softeerbootcamp4th/refactor/#187-enum
sooyeoniya Aug 22, 2024
21a5846
Merge branch 'dev' into feat/#170-rush-exception
sooyeoniya Aug 22, 2024
45985ff
refactor: 날짜와 시간 분리하는 로직 유틸로 빼기
sooyeoniya Aug 22, 2024
e1dc865
refactor: parseIsoDateTime 적용
sooyeoniya Aug 22, 2024
0a8f509
refactor: timeout if 조건문 상수로 분리
sooyeoniya Aug 22, 2024
de7e2ac
feat: 뒤로가기 방지 popup 구현
jhj2713 Aug 22, 2024
6b6d345
refactor: 버튼 스타일 공통화
jhj2713 Aug 22, 2024
1e22619
chore: overflow 스타일 추가
jhj2713 Aug 22, 2024
895057f
refactor: Suspense 추가 및 관련 컴포넌트 리팩토링
sooyeoniya Aug 22, 2024
ecb1245
refactor: PopUp -> PhoneNumberPopUp
jhj2713 Aug 22, 2024
a4b6358
refactor: getOptionRatio, getSelectedCardInfo props 수정
sooyeoniya Aug 22, 2024
8eaa105
Merge pull request #190 from softeerbootcamp4th/feat/#170-rush-exception
sooyeoniya Aug 22, 2024
ef63bd1
Merge branch 'dev' into feat/#191-block-popup
jhj2713 Aug 22, 2024
536f4c2
chore: 선착순 이벤트 useBlock 삭제
jhj2713 Aug 22, 2024
f2439fb
fix: null일 경우 추가 처리
sooyeoniya Aug 22, 2024
4387eb7
chore: 빌드 오류 수정
jhj2713 Aug 22, 2024
7c05761
Merge pull request #194 from softeerbootcamp4th/fix/#192-final-page-n…
jhj2713 Aug 22, 2024
138a0ab
Merge pull request #193 from softeerbootcamp4th/feat/#191-block-popup
sooyeoniya Aug 22, 2024
33ea0d4
fix: 이벤트 날짜 비교 삭제
jhj2713 Aug 23, 2024
f267a42
Merge pull request #195 from softeerbootcamp4th/fix/rush-event-date
jhj2713 Aug 23, 2024
fea7476
fix: 새로고침 딜레이 추가
sooyeoniya Aug 23, 2024
ddccd18
Merge pull request #197 from softeerbootcamp4th/fix/#196-reload-throttle
sooyeoniya Aug 23, 2024
e9bf111
fix: 응답 완전히 반환 시 요청 보낼 수 있도록 isLoading 추가
sooyeoniya Aug 23, 2024
28d7d39
Merge pull request #199 from softeerbootcamp4th/fix/#198-reload-pending
jhj2713 Aug 23, 2024
f35074a
fix: dependency 수정
jhj2713 Aug 23, 2024
4c23011
fix: 카드 옵션 선택 시 409 요청 오류 throttle로 수정
sooyeoniya Aug 23, 2024
282961d
fix: POST 요청 오류 시 에러 화면 삭제
sooyeoniya Aug 23, 2024
34bf20f
Merge pull request #202 from softeerbootcamp4th/fix/#201-tab-casper
sooyeoniya Aug 23, 2024
cb70437
Merge pull request #203 from softeerbootcamp4th/fix/#200-select-card-…
sooyeoniya Aug 23, 2024
282f5ce
chore: console.error 삭제
jhj2713 Aug 23, 2024
7f64f23
chore: main 기반으로 배포되게 수정
jhj2713 Aug 23, 2024
fe3495e
Merge pull request #204 from softeerbootcamp4th/chore/#146-console-error
sooyeoniya Aug 23, 2024
168c408
Merge branch 'dev' into chore/#205-main-deploy
jhj2713 Aug 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 12 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
name: Bug report
about: 버그이슈
title: 버그명
labels: fix
assignees: ''

---

## 🖥️ 어떤 버그인가요?

## ❗️ 참고 자료 (선택)
14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
name: Feature report
about: 기능이슈
title: 기능명
labels: feat
assignees: ''

---

## 🖥️ 어떤 기능인가요?

## ✏️ 작업 상세 내용

## ❗️ 참고 자료 (선택)
9 changes: 9 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
## 🖥️ Preview

close #{issue number}

## ✏️ 한 일

## ❗️ 발생한 이슈 (해결 방안)

## ❓ 논의가 필요한 사항
62 changes: 62 additions & 0 deletions .github/workflows/admin_pull_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
name: Build and Comment

on:
pull_request:
branches:
- main
- dev
paths:
- "admin/**"

jobs:
build-admin:
runs-on: ubuntu-latest
env:
working-directory: ./admin

steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Set up Node.js
uses: actions/setup-node@v2

- name: Install dependencies
run: yarn
working-directory: ${{ env.working-directory }}

- name: Build project
run: yarn build
working-directory: ${{ env.working-directory }}

comment-admin:
needs: build-admin
runs-on: ubuntu-latest
if: always()

steps:
# 성공 시 코멘트
- name: Add a comment on success
if: ${{ needs.build-admin.result == 'success' }}
uses: actions/github-script@v6
with:
script: |
github.rest.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: '빌드를 성공했습니다! :tada:'
})

# 실패 시 코멘트
- name: Add a comment on failure
if: ${{ needs.build-admin.result == 'failure' }}
uses: actions/github-script@v6
with:
script: |
github.rest.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: '빌드를 실패했습니다. :x: 자세한 내용은 로그를 참고해주세요.'
})
49 changes: 49 additions & 0 deletions .github/workflows/admin_push.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: HybridJGS-FE Main Production

on:
push:
branches:
- main
paths:
- "admin/**"

jobs:
build-and-deploy-admin:
runs-on: ubuntu-latest
env:
working-directory: ./admin
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Setup node
uses: actions/setup-node@v2

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ap-northeast-2

# dependency 설치
- name: Install dependencies
run: yarn
working-directory: ${{ env.working-directory }}

- name: Create .env file
run: echo "VITE_API_URL=${{ secrets.VITE_API_URL }}" > ./.env
working-directory: ${{ env.working-directory }}

# build
- name: Build project
run: yarn build
working-directory: ${{ env.working-directory }}

# S3 버킷에 배포
- name: Deploy static site to S3 bucket
run: aws s3 sync ./admin/dist s3://hybridjgs-admin

# CloudFront 삭제
- name: Invalidate CloudFront Cache
run: aws cloudfront create-invalidation --distribution-id ${{ secrets.DEV_AWS_DISTRIBUTION_ID_ADMIN }} --paths '/*'
62 changes: 62 additions & 0 deletions .github/workflows/client_pull_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
name: Build and Comment

on:
pull_request:
branches:
- main
- dev
paths:
- "client/**"

jobs:
build-client:
runs-on: ubuntu-latest
env:
working-directory: ./client

steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Set up Node.js
uses: actions/setup-node@v2

- name: Install dependencies
run: yarn
working-directory: ${{ env.working-directory }}

- name: Build project
run: yarn build
working-directory: ${{ env.working-directory }}

comment-client:
needs: build-client
runs-on: ubuntu-latest
if: always()

steps:
# 성공 시 코멘트
- name: Add a comment on success
if: ${{ needs.build-client.result == 'success' }}
uses: actions/github-script@v6
with:
script: |
github.rest.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: '빌드를 성공했습니다! :tada:'
})

# 실패 시 코멘트
- name: Add a comment on failure
if: ${{ needs.build-client.result == 'failure' }}
uses: actions/github-script@v6
with:
script: |
github.rest.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: '빌드를 실패했습니다. :x: 자세한 내용은 로그를 참고해주세요.'
})
52 changes: 52 additions & 0 deletions .github/workflows/client_push.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: HybridJGS-FE Main Production

on:
push:
branches:
- main
paths:
- "client/**"

jobs:
build-and-deploy-client:
runs-on: ubuntu-latest
env:
working-directory: ./client

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Setup node
uses: actions/setup-node@v2

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ap-northeast-2

# dependency 설치
- name: Install dependencies
run: yarn
working-directory: ${{ env.working-directory }}

- name: Create .env file
run: |
echo "VITE_API_URL=${{ secrets.VITE_API_URL }}" >> ./.env
echo "VITE_RUSH_URL=${{ secrets.VITE_RUSH_URL }}" >> ./.env
working-directory: ${{ env.working-directory }}

# build
- name: Build project
run: yarn build
working-directory: ${{ env.working-directory }}

# S3 버킷에 배포
- name: Deploy static site to S3 bucket
run: aws s3 sync ./client/dist s3://hybridjgs-frontend

# CloudFront 삭제
- name: Invalidate CloudFront Cache
run: aws cloudfront create-invalidation --distribution-id ${{ secrets.DEV_AWS_DISTRIBUTION_ID }} --paths '/*'
Loading
Loading