Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
526 commits
Select commit Hold shift + click to select a range
3125fb9
Merge pull request #24 from CodeitFESI4-Team1/Feat/CR-40/Textbox
minkyung5x5 Oct 31, 2024
7ddab31
Merge branch 'develop' of https://github.com/CodeitFESI4-Team1/Team-1…
yulrang Oct 31, 2024
70a5286
Merge branch 'develop' into Feat/CR-35/LikeBtn
HaeJungg Oct 31, 2024
02871ab
Merge branch 'develop' into Feat/CR-12/ReviewCardList
User850413 Oct 31, 2024
c05545a
Merge branch 'develop' into Feat/CR-12/ReviewCardList
User850413 Oct 31, 2024
b9595dc
:bug: fix: npm run lint
User850413 Oct 31, 2024
af7b160
Merge pull request #14 from CodeitFESI4-Team1/Feat/CR-12/ReviewCardList
User850413 Oct 31, 2024
252d6e8
Merge branch 'develop' into Feat/CR-35/LikeBtn
HaeJungg Oct 31, 2024
c04a524
🚑 fix: ci 변경
HaeJungg Oct 31, 2024
905cf4f
Merge pull request #25 from CodeitFESI4-Team1/Feat/CR-35/LikeBtn
HaeJungg Oct 31, 2024
5febab3
Merge branch 'develop' of https://github.com/CodeitFESI4-Team1/Team-1…
yulrang Oct 31, 2024
9ac0fbd
Feat/cr 28/main category (#26)
yulrang Oct 31, 2024
166a6db
Merge branch 'develop' of https://github.com/CodeitFESI4-Team1/Team-1…
yulrang Oct 31, 2024
501ef7f
Merge branch 'develop' into Feat/CR-11/CrewCardList
User850413 Oct 31, 2024
77737dc
:bug: fix: lint �ㅻ�
User850413 Oct 31, 2024
913efe3
Merge pull request #27 from CodeitFESI4-Team1/Feat/CR-11/CrewCardList
User850413 Oct 31, 2024
e145a6d
Merge branch 'develop' into Feat/CR-50/FloatingBtn
HaeJungg Oct 31, 2024
fbf7961
🐛 fix: 안쓰는 내용 삭제
HaeJungg Oct 31, 2024
1134c61
Merge pull request #30 from CodeitFESI4-Team1/Feat/CR-50/FloatingBtn
HaeJungg Oct 31, 2024
a55faf3
Merge branch 'develop' into Feat/CR-17/ProgressBar
HaeJungg Oct 31, 2024
6937812
Merge branch 'develop' of https://github.com/CodeitFESI4-Team1/Team-1…
yulrang Oct 31, 2024
1b42f32
🚑 fix: ci 변경
HaeJungg Oct 31, 2024
6e2ca57
🐛 fix: props 변경부분 수정
HaeJungg Oct 31, 2024
ec776b7
Merge pull request #31 from CodeitFESI4-Team1/Feat/CR-17/ProgressBar
HaeJungg Oct 31, 2024
c5d60b0
Merge branch 'develop' of https://github.com/CodeitFESI4-Team1/Team-1…
yulrang Oct 31, 2024
3849cc0
Merge branch 'develop' into Feat/CR-54/button
HaeJungg Oct 31, 2024
205ef6f
🐛 fix: 겹치는 패키지 제거
HaeJungg Oct 31, 2024
d7c9ed8
👷 chore: zustand 설치
minkyung5x5 Oct 31, 2024
5f03a43
💄 design: 디자인 수정
HaeJungg Oct 31, 2024
830f207
Merge pull request #32 from CodeitFESI4-Team1/Feat/CR-54/button
HaeJungg Oct 31, 2024
98acd28
Merge branch 'develop' of https://github.com/CodeitFESI4-Team1/Team-1…
yulrang Oct 31, 2024
9ffad05
Feat/cr 53/gathering detail modal (#33)
yulrang Oct 31, 2024
d17ff9d
Merge branch 'develop' into Feat/CR-55/tab
HaeJungg Oct 31, 2024
03558e2
🐛 fix: changed package
HaeJungg Oct 31, 2024
95a5f55
🐛 fix: 폰트 이동
HaeJungg Oct 31, 2024
f7a31df
🐛 fix: pretendard body에 추가
HaeJungg Oct 31, 2024
6260089
Merge pull request #34 from CodeitFESI4-Team1/Feat/CR-55/tab
HaeJungg Oct 31, 2024
03ecb0c
Merge branch 'develop' of https://github.com/CodeitFESI4-Team1/Team-1…
yulrang Oct 31, 2024
aa953a7
Merge branch 'develop' into Feat/CR-56/AuthForm
minkyung5x5 Oct 31, 2024
7ca35ca
🐛 fix: authform stories에 onsubmit 추가
minkyung5x5 Oct 31, 2024
30cd493
Merge pull request #35 from CodeitFESI4-Team1/Feat/CR-56/AuthForm
minkyung5x5 Oct 31, 2024
01b6b1a
Merge branch 'develop' into Feat/CR-57/Toast
minkyung5x5 Oct 31, 2024
c7cbe35
👷 chore: uuid, zod 삭제
minkyung5x5 Oct 31, 2024
2a2773d
Merge pull request #36 from CodeitFESI4-Team1/Feat/CR-57/Toast
minkyung5x5 Oct 31, 2024
eedff37
Merge branch 'develop' into Feat/CR-60/LoginPage
minkyung5x5 Oct 31, 2024
a0e08fe
✨ Feat: hearts container 만드는 중
Oct 31, 2024
7a87e81
Merge branch 'develop' into Feat/CR-60/LoginPage
minkyung5x5 Oct 31, 2024
1875c29
Merge branch 'develop' into Feat/CR-62/AlertModal
HaeJungg Oct 31, 2024
038e807
♻️ Refac: review-card에서 ReviewHeart 분리
Oct 31, 2024
14d7b1c
✨ feat: 확인 취소, 확인 모달 추가
HaeJungg Oct 31, 2024
fe5d470
💄 design: 버튼 호버시 강조 디자인 추가
HaeJungg Oct 31, 2024
a59ffba
Merge branch 'develop' into Feat/CR-62/AlertModal
HaeJungg Oct 31, 2024
d8c6eee
🗑️ chore: 안쓰는 파일 삭제
HaeJungg Oct 31, 2024
09cf4a7
🐛 fix: api 유틸 간단하게 수정
HaeJungg Oct 31, 2024
833cc12
📝 docs: 프리티어, tsconfig order 추가
HaeJungg Oct 31, 2024
e01f0ff
✨ feat: 목 api 변경, 예시 코드 추가
HaeJungg Oct 31, 2024
8fe718c
✨ feat: 에러처리 추가
HaeJungg Oct 31, 2024
4ddf99d
✨ feat: suspense가 가능하도록 수정
HaeJungg Oct 31, 2024
0fd557b
🎨 style: eslint changed
HaeJungg Oct 31, 2024
f5cf2b2
✨ Feat: auth store 추가, 💄 style: prettier import order 추가
minkyung5x5 Oct 31, 2024
596064e
💄 style: import order 수정
minkyung5x5 Oct 31, 2024
3cf9478
Merge pull request #42 from CodeitFESI4-Team1/Feat/CR-64/ApiUtils
HaeJungg Oct 31, 2024
84379d0
Merge branch 'develop' into Feat/CR-62/AlertModal
HaeJungg Oct 31, 2024
ec58d0b
💄 design: 모달 수정
HaeJungg Oct 31, 2024
1c24133
Merge pull request #40 from CodeitFESI4-Team1/Feat/CR-62/AlertModal
HaeJungg Oct 31, 2024
32d1884
Merge branch 'develop' into Feat/CR-59/HeaderDesign
HaeJungg Oct 31, 2024
fcecfa9
Merge branch 'develop' into Feat/CR-60/LoginPage
minkyung5x5 Oct 31, 2024
57cb238
Merge pull request #38 from CodeitFESI4-Team1/Feat/CR-59/HeaderDesign
HaeJungg Nov 1, 2024
44a5226
🚧 wip: 이전으로 되돌림
HaeJungg Nov 1, 2024
0ed53d0
🐛 Fix: svgr 사용으로 src에 넣은 svg 파일을 파일 주소로 바꿈
Nov 1, 2024
b6afe95
💄 design: 좋아요 컴포넌트 디자인변경
HaeJungg Nov 1, 2024
0003f2f
✨ feat: 하트 컴포넌트 연결, id 추가
HaeJungg Nov 1, 2024
ac54ea3
🗑️ chore: 파일 위치변경
HaeJungg Nov 1, 2024
0cc140f
🎨 style: 글씨체 선언 변경
HaeJungg Nov 1, 2024
b26ed4a
🐛 fix: 디테일 페이지에서 클릭 안되게 변경, 약속 데이터 변경, 캔슬 기능삭제(완전히 삭제되는 방식)
HaeJungg Nov 1, 2024
641eb5d
🐛 fix: 데이터 변경
HaeJungg Nov 1, 2024
7bcd65b
🐛 test: 없는 테스트 삭제
HaeJungg Nov 1, 2024
641ba39
👷 Chore: svgr.d.ts 파일의 ?url 타입 설정 변경 후 Image에 쓰인 svg파일 주소 모두 수정
Nov 1, 2024
a43a270
🐛 Fix: svgr 제거
Nov 1, 2024
bac4344
🐛 Fix: svgr 제거 후 브랜치 최신화
Nov 1, 2024
e9f6a56
Merge branch 'develop' of https://github.com/CodeitFESI4-Team1/Team-1…
yulrang Nov 1, 2024
151af00
👷 Chore: storybook의 main.ts 파일에서 svgr 관련 설정 지움
Nov 1, 2024
038d0e5
Merge pull request #39 from CodeitFESI4-Team1/Feat/CR-14/ReviewHeart
ChoYenii Nov 1, 2024
b4180f1
:recycle: refactor: 由щ럭 �곗竈� 諛 由щ럭 �¢� 鍮쇨린
User850413 Nov 1, 2024
b4ad0cf
:sparkles: feat: mock api
User850413 Nov 1, 2024
1806a4a
Merge branch 'develop' of https://github.com/CodeitFESI4-Team1/Team-1…
yulrang Nov 1, 2024
6fb95b4
✨ Feat: login API 추가
minkyung5x5 Nov 1, 2024
05182cd
:bug: fix: �щ肘吏¦ �곗竈� �¢�� �곕Ⅸ prop ��
User850413 Nov 1, 2024
d108447
:test_tube: test: storybook ��
User850413 Nov 1, 2024
8f3c4ec
✨ Feat: getUser API 추가
minkyung5x5 Nov 1, 2024
c8b317c
✨ Feat: 헤더에 토큰 추가
minkyung5x5 Nov 1, 2024
b7a8b95
Merge branch 'develop' into Feat/CR-60/LoginPage
minkyung5x5 Nov 1, 2024
fad6a34
📦 chore: add 케밥 아이콘
HaeJungg Nov 1, 2024
38f2a17
💄 design: 프로필 이미지, 프로필 모은 컴포넌트 디자인 수정
HaeJungg Nov 1, 2024
d3887fc
💄 design: 크루카드 디자인 변경
HaeJungg Nov 1, 2024
8213b38
🐛 fix: 데이터 변경
HaeJungg Nov 1, 2024
705407b
🐛 fix: 스토리북 오류 수정
HaeJungg Nov 1, 2024
4d61548
✨ Feat: 헤더에 로그아웃 기능 추가
minkyung5x5 Nov 2, 2024
2c447a0
🐛 fix: storybook에서 isauth arg 삭제
minkyung5x5 Nov 2, 2024
2aafeb2
:sparkles: feat: format-date �⑥ 異�
User850413 Nov 3, 2024
92677e9
:lipstick: design: 諛¢ ��� ui �¬�
User850413 Nov 3, 2024
52afb1d
Merge branch 'develop' into Feat/CR-65/ReviewCardListModify
User850413 Nov 3, 2024
195b227
:package: package: merge �¦ �¦� �⑦\ㅼ� �ㅼ�
User850413 Nov 3, 2024
9a4fbc6
✨ Feat: Signup 페이지 추가, 내부의 useForm을 외부에서 선언 하도록 변경
minkyung5x5 Nov 4, 2024
c363315
Feat/cr 70/my page (#43)
yulrang Nov 4, 2024
bd30e0f
Merge branch 'develop' of https://github.com/CodeitFESI4-Team1/Team-1…
yulrang Nov 4, 2024
de9a97b
Merge branch 'develop' into Feat/CR-65/ReviewCardListModify
User850413 Nov 4, 2024
794f105
Merge branch 'develop' into Feat/CR-69/CardsDesign
HaeJungg Nov 4, 2024
17428a0
:lipstick: design: 留�댄竈吏¢� 由щ럭 由ъㅽ �쎌�
User850413 Nov 4, 2024
2bec5a9
📝 docs: 이전 내용 삭제
HaeJungg Nov 4, 2024
98e9476
✨ Feat: 회원가입 API 추가
minkyung5x5 Nov 4, 2024
06255ce
Merge pull request #44 from CodeitFESI4-Team1/Feat/CR-60/LoginPage
minkyung5x5 Nov 4, 2024
f0c96c4
Merge branch 'develop' into Feat/CR-73/Logout
minkyung5x5 Nov 4, 2024
36cf205
Merge pull request #46 from CodeitFESI4-Team1/Feat/CR-69/CardsDesign
HaeJungg Nov 4, 2024
35c483a
Merge branch 'develop' of https://github.com/CodeitFESI4-Team1/Team-1…
yulrang Nov 4, 2024
c9cb33a
✨ feat: 리뷰 점수 및 그래프 추가
HaeJungg Nov 4, 2024
877d112
Merge branch 'develop' into Feat/CR-74/DetailPage
HaeJungg Nov 4, 2024
4a278d6
💄 Style: 전체페이지 레이아웃 수정
minkyung5x5 Nov 4, 2024
5497e65
💄 Style: header에 container 추가
minkyung5x5 Nov 4, 2024
d993302
Merge pull request #47 from CodeitFESI4-Team1/Feat/CR-73/Logout
minkyung5x5 Nov 4, 2024
8dd9648
💄 Style: mantine font pretendard 설정, ♻️ Refactor: font 리팩토링
minkyung5x5 Nov 4, 2024
c234c18
💄 Style: font-pretendard 삭제
minkyung5x5 Nov 4, 2024
f0bab19
Merge branch 'develop' into Feat/CR-72/SignupPage
minkyung5x5 Nov 4, 2024
be7e764
♻️ Refactor: theme /style로 파일 위치 이동
minkyung5x5 Nov 4, 2024
760da18
✨ feat: env 설정 추가
HaeJungg Nov 4, 2024
32b980e
🐛 fix: 타입 수정
HaeJungg Nov 4, 2024
ae5b2e3
🐛 fix: 데이터 이름 수정
HaeJungg Nov 4, 2024
d68a3ca
✨ feat: 목 api 추가
HaeJungg Nov 4, 2024
b856831
🔥 chore: 사용하지않는 레이아웃 삭제
HaeJungg Nov 4, 2024
2a7b9c5
🐛 fix: 데이터에 맞게 수정, 분기처리
HaeJungg Nov 4, 2024
1c9f15e
:recycle: refactor: profile 而댄��몃� �¢泥
User850413 Nov 5, 2024
c8f946a
✨ feat: 캐러셀 직접구현
HaeJungg Nov 5, 2024
2c441a1
🐛 fix: eslint error
HaeJungg Nov 5, 2024
32d0ba6
✨ feat: 디테일 페이지 조립
HaeJungg Nov 5, 2024
6bbb3a6
🐛 fix: 버튼으로 변경 #53
HaeJungg Nov 5, 2024
9e3ffa7
♻️ Refactor: auth folder 추가
minkyung5x5 Nov 5, 2024
030758d
Merge branch 'develop' of https://github.com/CodeitFESI4-Team1/Team-1…
yulrang Nov 5, 2024
93fe558
Feat/cr 58/create crew page (#41)
yulrang Nov 5, 2024
1fc5201
Merge branch 'develop' of https://github.com/CodeitFESI4-Team1/Team-1…
yulrang Nov 5, 2024
f398b46
✨ feat: 박스 섀도우 config 추가
HaeJungg Nov 5, 2024
f53755e
✨ feat: 약속페이지에서 사용하는 카드 추가 #53
HaeJungg Nov 5, 2024
5d02be1
🧪 test: 스토리북 작성 #53
HaeJungg Nov 5, 2024
3ff6c33
♻️ Refactor: (crew) folder 추가
minkyung5x5 Nov 5, 2024
85ecc57
:lipstick: design: �щ(移대���蕤ぉ 蹂¢寃
User850413 Nov 5, 2024
134e055
Merge branch 'develop' into Feat/CR-72/SignupPage
minkyung5x5 Nov 5, 2024
df9a682
🐛 fix: 버튼 type 수정
HaeJungg Nov 5, 2024
9c75c5f
✨ feat: cn 훅 추가
HaeJungg Nov 5, 2024
9c42273
💄 design: ui 수정
HaeJungg Nov 5, 2024
e56071e
Merge pull request #50 from CodeitFESI4-Team1/Feat/CR-72/SignupPage
minkyung5x5 Nov 5, 2024
2c94348
💄 Style: auth layout ui 수정, ♻️ Refactor: layout 리팩토링
minkyung5x5 Nov 5, 2024
2878e03
✨ feat: 약속 디테일 모달 연결
HaeJungg Nov 5, 2024
c9976ef
💄 design: 프로필 컴포넌트로 교체
HaeJungg Nov 5, 2024
01257f3
✨ feat: 크루 리뷰부분 조립
HaeJungg Nov 5, 2024
3e0a742
Merge branch 'develop' into Feat/53/gathering-timeline
HaeJungg Nov 5, 2024
ff1e379
💄 Style: 디자인에 맞게 레이아웃 UI 수정
minkyung5x5 Nov 5, 2024
f9a2cc5
Merge branch 'develop' of https://github.com/CodeitFESI4-Team1/Team-1…
yulrang Nov 5, 2024
77c753c
✨ Feat: 로그인/회원가입 페이지 연결링크 추가
minkyung5x5 Nov 5, 2024
396277b
Merge branch 'develop' into Feat/CR-74/DetailPage
HaeJungg Nov 5, 2024
6c55ee4
🐛 fix: 레이아웃 md 반응형 안되는 문제 수정
HaeJungg Nov 5, 2024
2328329
🚚 chore: 파일 위치 변경
HaeJungg Nov 5, 2024
631a9a1
💄 design: 레이아웃에 따라 수정
HaeJungg Nov 5, 2024
c2b84ef
💄 design: 레이아웃에 따라 수정
HaeJungg Nov 5, 2024
e848cca
:sparkles: feat: 湲곕낯 援ъ“ �¦ #57
User850413 Nov 5, 2024
2b49953
💄 design: 헤더 반응형 디자인 수정
HaeJungg Nov 5, 2024
242b79f
💄 design: my 간격 추가
HaeJungg Nov 5, 2024
72ec8d1
💄 design: mx 간격 추가
HaeJungg Nov 5, 2024
49834ee
🐛 fix: response값에 따른 타입, 값변경
HaeJungg Nov 5, 2024
bfd1939
🐛 fix: response값에 따른 타입, 값변경
HaeJungg Nov 5, 2024
9b50d91
:memo: docs: mock�곗竈� 異� #57
User850413 Nov 5, 2024
d482519
🐛 fix: 타입에러 수정
HaeJungg Nov 5, 2024
140b2e3
:sparkles: feat: mock API 異� #57
User850413 Nov 5, 2024
4a0d17c
✨ feat: notification 추가
HaeJungg Nov 5, 2024
b18146b
:sparkles: feat: �곗竈� �쎌� #57
User850413 Nov 5, 2024
c24b998
Feat/cr 76/index page (#51)
yulrang Nov 5, 2024
c700910
✨ feat: 확인 삭제 모달 추가
HaeJungg Nov 5, 2024
50bf5d4
Merge branch 'develop' into Feat/CR-74/DetailPage
HaeJungg Nov 5, 2024
ee9d9db
💄 design: max 1200으로 수정, container 삭제
HaeJungg Nov 5, 2024
a343c0f
🎨 style: eslint changed
HaeJungg Nov 5, 2024
8f92cb7
Merge branch 'develop' into Feat/53/gathering-timeline
HaeJungg Nov 5, 2024
64f45ee
🐛 Fix: anchor 를 Link로 변경
minkyung5x5 Nov 5, 2024
be7e247
Merge branch 'develop' of https://github.com/CodeitFESI4-Team1/Team-1…
yulrang Nov 5, 2024
83c061f
📦 chore: 패키지 설치
HaeJungg Nov 5, 2024
2f1b399
✨ feat: react-toastify를 이용해 toast 구현
HaeJungg Nov 5, 2024
5f349a2
:lipstick: design: UI �� #57
User850413 Nov 5, 2024
289c342
Merge branch 'develop' into Feat/CR-65/ReviewCardListModify
User850413 Nov 5, 2024
7b3e801
Merge branch 'develop' into 54-auth-loginsignup-ui
minkyung5x5 Nov 5, 2024
672e94f
🐛 fix: (crew) 폴더 안으로 이동
minkyung5x5 Nov 5, 2024
cf070a3
Merge branch 'develop' into 54-auth-loginsignup-ui
minkyung5x5 Nov 5, 2024
db023a4
🔥 chore: git static 폴더 삭제
HaeJungg Nov 5, 2024
df9654c
🐛 fix: 파일위치 재설정
minkyung5x5 Nov 5, 2024
ccaaeef
Merge pull request #66 from CodeitFESI4-Team1/Hotfix/65/DeleteStorybo…
HaeJungg Nov 5, 2024
07a43fc
Merge branch 'develop' into 54-auth-loginsignup-ui
minkyung5x5 Nov 5, 2024
5078f24
Merge pull request #59 from CodeitFESI4-Team1/54-auth-loginsignup-ui
minkyung5x5 Nov 5, 2024
689732b
Merge branch 'develop' of https://github.com/CodeitFESI4-Team1/Team-1…
yulrang Nov 5, 2024
b5b7623
Merge branch 'develop' into Feat/53/gathering-timeline
HaeJungg Nov 5, 2024
49b1e26
Merge branch 'develop' into Feat/CR-65/ReviewCardListModify
User850413 Nov 5, 2024
f7788e2
:bug: fix: import �ㅻ� �닿껐
User850413 Nov 5, 2024
3f11193
:bug: fix: 鍮� �ㅻ� -> import臾 ��
User850413 Nov 5, 2024
ff14b1d
Merge pull request #49 from CodeitFESI4-Team1/Feat/CR-65/ReviewCardLi…
User850413 Nov 5, 2024
5e97bc0
Merge branch 'develop' into Feat/CR-74/DetailPage
HaeJungg Nov 5, 2024
9657c0a
🐛 fix: eslint changed
HaeJungg Nov 5, 2024
709bcbe
Merge branch 'develop' into Feat/53/gathering-timeline
HaeJungg Nov 5, 2024
467565a
Merge branch 'develop' of https://github.com/CodeitFESI4-Team1/Team-1…
yulrang Nov 5, 2024
bac9a2e
Merge pull request #55 from CodeitFESI4-Team1/Feat/53/gathering-timeline
HaeJungg Nov 5, 2024
36dba2e
Feat/cr 71/create gathering modal (#52)
yulrang Nov 5, 2024
350a418
Merge branch 'develop' into Feat/62/Toast
HaeJungg Nov 5, 2024
2c872ef
Merge branch 'develop' of https://github.com/CodeitFESI4-Team1/Team-1…
yulrang Nov 5, 2024
d9a4cee
Merge branch 'develop' into Feat/57/WritableReviewCardList
User850413 Nov 5, 2024
1e6ef46
Merge pull request #63 from CodeitFESI4-Team1/Feat/62/Toast
HaeJungg Nov 5, 2024
5330725
Merge branch 'develop' into Feat/CR-74/DetailPage
HaeJungg Nov 5, 2024
9310948
:bug: fix: profiles� �¦�ы�� prop ��
User850413 Nov 5, 2024
4123bdc
🔥 fix: 사용하지 않는 테스트 주석처리
HaeJungg Nov 6, 2024
9ecb083
✏️ fix: 페이지네이션으로 변경하면서 타입 변경
HaeJungg Nov 6, 2024
8576d6a
📝 docs: 목데이터 rate 변경
HaeJungg Nov 6, 2024
26df4ab
💄 design: 페이지네이션 디자인 변경
HaeJungg Nov 6, 2024
5f6785d
🎨 style: eslint changed
HaeJungg Nov 6, 2024
3af40d7
🐛 fix: 프로필에 이미지 전달안되는 문제 수정 안쓰는 import 제거
HaeJungg Nov 6, 2024
8daeebd
✨ feat: rate 변경
HaeJungg Nov 6, 2024
dcbc5b7
🐛 fix: 크루카드 경로수정
HaeJungg Nov 6, 2024
b6b436d
✨ feat: 크루 리뷰 데이터 목 api 페이지네이션
HaeJungg Nov 6, 2024
5ad31af
✨ feat: 리뷰리스트 페이지네이션
HaeJungg Nov 6, 2024
91f4f42
🧪 test: 스토리북 추가
HaeJungg Nov 6, 2024
dc083a9
🐛 fix: 파일 위치 변경, 네이밍 변경
HaeJungg Nov 6, 2024
f15e233
📝 docs: 데이터 일부 변경
HaeJungg Nov 6, 2024
5a45fd2
📝 docs: 주석 추가
HaeJungg Nov 6, 2024
9d8d75d
🐛 fix: import 변경
HaeJungg Nov 6, 2024
6a55030
✨ feat: 목 데이터 가공
HaeJungg Nov 6, 2024
53381de
💄 design: 스타일 변경
HaeJungg Nov 6, 2024
20f4d78
✨ feat: 크루 리뷰 조립
HaeJungg Nov 6, 2024
b1eceba
🐛 fix: 프로필모음 변경에 따른 타입, 코드 수정
HaeJungg Nov 6, 2024
ac65f03
🐛 fix: lint 에러, 빌드 에러 수정
HaeJungg Nov 6, 2024
c33e66a
🐛 fix: lint 에러, 빌드 에러 수정
HaeJungg Nov 6, 2024
0f1d615
🐛 fix: lint 에러, 빌드 에러 수정
HaeJungg Nov 6, 2024
8c625cc
Merge pull request #64 from CodeitFESI4-Team1/Feat/57/WritableReviewC…
User850413 Nov 6, 2024
bf48378
Merge branch 'develop' of https://github.com/CodeitFESI4-Team1/Team-1…
yulrang Nov 6, 2024
dc2b7f5
Merge pull request #61 from CodeitFESI4-Team1/Feat/CR-74/DetailPage
HaeJungg Nov 6, 2024
3bd1796
Merge branch 'develop' of https://github.com/CodeitFESI4-Team1/Team-1…
yulrang Nov 6, 2024
21fea30
🚑 fix: 이름 수정
HaeJungg Nov 6, 2024
7e36e5b
Merge pull request #70 from CodeitFESI4-Team1/Hotfix/69/ChangeFolder
HaeJungg Nov 6, 2024
17c8e68
Merge branch 'develop' of https://github.com/CodeitFESI4-Team1/Team-1…
yulrang Nov 6, 2024
54887f9
🚑 Fix: 변경요청
yulrang Nov 6, 2024
f8db1f4
Feat/56/my crew page (#58)
yulrang Nov 6, 2024
7a1ed4b
🐛 fix: 경로수정
HaeJungg Nov 6, 2024
5f4c538
✨ feat: 약속 만들기 모달 연결
HaeJungg Nov 6, 2024
27e6003
✨ feat: 확인 취소 모달 연결
HaeJungg Nov 6, 2024
6410f54
🐛 fix: 오타 수정
HaeJungg Nov 6, 2024
1f4d1e2
Merge pull request #72 from CodeitFESI4-Team1/Feat/71/AddModal
HaeJungg Nov 6, 2024
0d88261
Feat/60/my-gathering-page (#73)
minkyung5x5 Nov 6, 2024
def770e
Merge branch 'main' into develop
yulrang Nov 6, 2024
ea34667
🚨 Fix: 워크플로우 수정
yulrang Nov 6, 2024
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
13 changes: 10 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,23 @@ module.exports = {
],
plugins: ['react', 'react-hooks', '@typescript-eslint', 'jsx-a11y', 'import', 'prettier'],
rules: {
'import/no-extraneous-dependencies': [
'import/no-extraneous-dependencies': 'off',
'import/order': [
'error',
{
devDependencies: ['**/*.test.js', '**/*.stories.js', '**/storybook/**'],
groups: [
['builtin', 'external'], // React, Next.js 등 외부 라이브러리
'internal', // 프로젝트 내부 모듈
['sibling', 'parent'], // 형제 및 부모 모듈
'index', // index 파일
],
'newlines-between': 'ignore',
},
],
'prettier/prettier': [
'error',
{
endOfLine: 'lf',
endOfLine: 'auto',
},
],
'jsx-a11y/label-has-associated-control': [
Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<!-- Issue Ticket이 있을 경우, 해당 링크를 연결해주세요 -->

[Ticket](https://yeeunee73.atlassian.net/jira/software/projects/CR/boards/4/timeline)
[Ticket](https://yeeunee73.atlassian.net/browse/CR-1)

## :writing_hand: Description

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ jobs:
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-storybook

- name: depedency install
if: steps.cache.outputs.cache-hit != 'true'
run: npm ci

- name: publish to chromatic
Expand All @@ -43,6 +42,7 @@ jobs:
with:
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
token: ${{ secrets.GITHUB_TOKEN }}

- name: comment PR
uses: thollander/actions-comment-pull-request@v1
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up Git user
- name: 👤 Set up Git user
run: |
git config --global user.email "[email protected]"
git config --global user.name "yulrang"
- name: Sync fork
- name: 🔄 Sync fork
run: |
git remote add upstream https://github.com/CodeitFESI4-Team1/Team-1-Codeit.git
git fetch upstream
Expand Down
23 changes: 0 additions & 23 deletions .github/workflows/deploy_develop.yml

This file was deleted.

17 changes: 0 additions & 17 deletions .github/workflows/dispatch_develop.yml

This file was deleted.

5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,7 @@ yarn-error.log*
*.tsbuildinfo
next-env.d.ts

*storybook.log
*storybook.log

# storybook
/storybook-static
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
npm run lint
npm run lint --fix --no-cache

echo "🚚 finished linting.."
14 changes: 11 additions & 3 deletions .prettierrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,29 @@ module.exports = {

importOrder: [
'^react',
'^next',
'<THIRD_PARTY_MODULES>',
'^@/src/apis/(.*)$',
'^@/src/_apis/(.*)$',
'^@/src/_queries/(.*)$',
'^@/src/store/(.*)$',
'^@/src/data/(.*)$',
'^@/src/hooks/(.*)$',
'^@/src/utils/(.*)$',
'^@/src/app/(.*)$',
'^@/src/components/(.*)$',
'^@/src/fonts/(.*)$',
'^@/src/types/(.*)$',
'^@/src/styles/(.*)$',
'^@/src/mock/(.*)$',
'^@core/(.*)$',
'^@server/(.*)$',
'^@ui/(.*)$',
'^@/public/(.*)$',
'^[./]',
],
importOrderSeparation: true,
importOrderSeparation: false,
importOrderSortSpecifiers: true,

plugins: ['@trivago/prettier-plugin-sort-imports', 'prettier-plugin-tailwindcss'],

tailwindConfig: './tailwind.config.ts',
};
1 change: 1 addition & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@ const config: StorybookConfig = {
options: {},
},
};

export default config;
3 changes: 2 additions & 1 deletion .storybook/preview.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import React, { useEffect } from 'react';

import '@mantine/carousel/styles.css';
import { MantineProvider, useMantineColorScheme } from '@mantine/core';
import '@mantine/core/styles.css';
import { addons } from '@storybook/preview-api';
import { DARK_MODE_EVENT_NAME } from 'storybook-dark-mode';
import '@/src/styles/globals.css';

const channel = addons.getChannel();

Expand Down
15 changes: 14 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,18 @@
]
}
},
"cSpell.words": ["tailwindcss"]
"cSpell.words": ["crewcrew", "mantine", "tailwindcss", "tanstack"],
// Prettier를 기본 포맷터로 설정하고 저장 시 자동 포맷팅
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,

"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
},
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode" // Prettier 포맷터 사용
},
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode" // TypeScript에서도 Prettier 사용
}
}
Loading