Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
253 commits
Select commit Hold shift + click to select a range
209a31d
Design: Modal 여백 늘림
xxinzzi Dec 3, 2024
eea84c7
Fix: 충돌 해결
xxinzzi Dec 16, 2024
f7833e8
refactor: navbarProfile mypage 폴더로 이동
lalaurrel Dec 16, 2024
34286c1
Refact: Login 버튼 공통화, 변수 명명 규칙 점검 및 import문 순서 변경
mimizae Dec 17, 2024
55f9a30
Refact: 회원가입 페이지, 이용약관 동의 페이지 변수명 점검
mimizae Dec 17, 2024
c1b9bd0
fix: 경로수정
lalaurrel Dec 17, 2024
595b7c2
refactor: 라우팅 수정
lalaurrel Dec 17, 2024
ed7f54d
fix: pofileViwer 페이지 및 해당 페이지에서 사용하던 컴포넌트 삭제
lalaurrel Dec 17, 2024
b7a72ea
fix: 라우팅 경로 수정
lalaurrel Dec 17, 2024
6f46d75
fix: 경로 수정
lalaurrel Dec 17, 2024
d3ea5e7
fix: 경로수정
lalaurrel Dec 17, 2024
84aa219
fix: 경로수정
lalaurrel Dec 17, 2024
236852a
fix: 경로수정
lalaurrel Dec 17, 2024
7ee4371
fix: 경로수정
lalaurrel Dec 17, 2024
ffc2117
fix: 경로수정
lalaurrel Dec 17, 2024
d212068
fix: 경로수정
lalaurrel Dec 17, 2024
43739ae
fix: 마이페이지와 상대페이지 조건부 렌더링 설정 및 mypage -> profile로 변경
lalaurrel Dec 17, 2024
14ca6ab
refactor: 버튼 색상 수정
lalaurrel Dec 17, 2024
d1b092c
refactor: 버튼 수정
lalaurrel Dec 17, 2024
4699837
refactor: 버튼 간격 조정
lalaurrel Dec 17, 2024
49529c0
refactor: profile -> 내정보로 수정
lalaurrel Dec 17, 2024
ef5a53f
refactor: 간격수정
lalaurrel Dec 17, 2024
00b660e
fix: 경로수정
lalaurrel Dec 17, 2024
70a94ba
fix: 프로필뷰어 파일 삭제
lalaurrel Dec 17, 2024
3cf9d35
fix: 불필요한 코드 삭제
lalaurrel Dec 17, 2024
e1c9ede
Refact: TopBar z-index 조정
mimizae Dec 18, 2024
ee02090
Merge pull request #100 from oodd-team/feat/OD-157
gustn99 Dec 18, 2024
4b13dbd
Chore: 불필요한 의존성 정리
gustn99 Dec 18, 2024
9ebe485
Remove: 불필요한 상수 제거
gustn99 Dec 18, 2024
78f1cdb
Fix: eslint 패키지 업데이트 후 발견된 오류 수정
gustn99 Dec 18, 2024
2e9066c
Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react int…
gustn99 Dec 18, 2024
2776ae0
Merge pull request #101 from oodd-team/feat/OD-161
gustn99 Dec 18, 2024
c548f0e
Refact: svg파일 컴포넌트화
mimizae Dec 18, 2024
3b5e32e
Chore: yarn.lock 파일 삭제
mimizae Dec 18, 2024
ca14b21
Fix: yarn 재설치 ♥
mimizae Dec 18, 2024
e26aa73
Feat: 절대경로 설정 추가
gustn99 Dec 18, 2024
d46cc44
Fix: HomeTopBar.tsx를 HomtTopBar 폴더 내 index로 분리
gustn99 Dec 18, 2024
f7f1303
Refactor: Home 내부 import문 수정
gustn99 Dec 18, 2024
f321e15
Refactor: Home 코드 흐름 정리
gustn99 Dec 18, 2024
2a84b94
Refactor: 변수 명명 규칙에 따라 변수명 수정
gustn99 Dec 18, 2024
76da12b
Fix: 절대경로 사용을 위한 alias 설정
gustn99 Dec 18, 2024
776e04a
Merge pull request #102 from oodd-team/feat/OD-163
gustn99 Dec 18, 2024
f0f7543
Rename: Request 컴포넌트 이름을 Matching으로 수정
gustn99 Dec 18, 2024
7e4c43b
Refactor: Chats 내부 import문 수정
gustn99 Dec 18, 2024
f777257
Refactor: Home 내부 누락된 import문 수정
gustn99 Dec 18, 2024
d1c4218
Refact: svg 파일 컴포넌트 화
mimizae Dec 19, 2024
f8fcd44
Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react int…
mimizae Dec 19, 2024
ce0fbfc
Coment: 주석 추가
mimizae Dec 19, 2024
821fd10
Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react int…
mimizae Dec 19, 2024
589f2ac
Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react int…
mimizae Dec 19, 2024
28f52d4
Rename: 폴더 이동
mimizae Dec 19, 2024
cbef260
Refact: 코드 순서 정리, 경로 수정
mimizae Dec 19, 2024
7da536c
Feat: src/utils 폴더 생성해 id 꺼내오는 로직 함수화
mimizae Dec 19, 2024
9a05ac8
Chore: id 저장 키 my_id에서 current_user_id로 변경
mimizae Dec 19, 2024
126a0fc
Chore: 코드 순서 변경
mimizae Dec 19, 2024
7b1ed79
Fix: 충돌 해결
xxinzzi Dec 19, 2024
beada92
Refact: 경로 수정 및 변수명명 규칙 점검
mimizae Dec 19, 2024
c174370
Chore: 코드 순서 수정
mimizae Dec 19, 2024
32aedb8
Chore: request data 타입 변경
mimizae Dec 19, 2024
c37df82
Chore: 라우팅 경로 수정
mimizae Dec 19, 2024
ad82409
Feat: 컬러시스템 구축
xxinzzi Dec 19, 2024
a89ef00
Feat: 폰트 시스템 구축
xxinzzi Dec 19, 2024
947a6ee
Refactor: Chats 코드 흐름 정리 & 변수 명명 규칙에 따라 변수명 수정
gustn99 Dec 19, 2024
411439c
Refactor: recoil import문 정리
gustn99 Dec 19, 2024
77ba89d
Merge pull request #106 from oodd-team/feat/OD-153
gustn99 Dec 19, 2024
da6ee83
Feat: import문 정렬을 위한 eslint-plugin 설치
gustn99 Dec 19, 2024
3ea7318
Chore: 코멘트 기반해서 수정
mimizae Dec 20, 2024
66511cb
Refact: dto 파일명 변경, 이벤트 함수명 변경
mimizae Dec 20, 2024
96971f0
Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react int…
mimizae Dec 20, 2024
8176864
Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react int…
mimizae Dec 20, 2024
e894a7f
Rename: dto 파일명 변경
mimizae Dec 20, 2024
a8287ec
Refact: 피드백 바탕으로 아이콘 컴포넌트의 복잡한 로직을 삼항 연산자 로직으로 수정
mimizae Dec 20, 2024
2c3ad1d
Refact: Photo 컴포넌트를 조건부 렌더링 없이 구현
mimizae Dec 20, 2024
34c1fd7
Merge pull request #104 from oodd-team/feat/OD-146
gustn99 Dec 20, 2024
6c23aaf
Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react int…
mimizae Dec 20, 2024
62d25c4
Refact: getCurrentUserId 함수 적용
mimizae Dec 20, 2024
b1662d9
Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react int…
mimizae Dec 20, 2024
d74f653
Chore: 너비와 높이 조저
mimizae Dec 20, 2024
a572ad4
Chore: 변수명 카멜케이스로 변경
mimizae Dec 20, 2024
6b627ab
Chore: Photo 컴포넌트 이미지 뷰박스 100으로 고정
mimizae Dec 20, 2024
77aec7b
Merge pull request #105 from oodd-team/feat/OD-149
gustn99 Dec 20, 2024
f79f503
Merge pull request #103 from oodd-team/feat/OD-140
gustn99 Dec 20, 2024
a6fe05c
Refact: Home 무한 스크롤 Intersection Observer Api로 구현
mimizae Dec 20, 2024
ae9a18e
Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react int…
mimizae Dec 20, 2024
2ba7be7
Feat: eslint-plugin-import 관련 설정 추가
gustn99 Dec 21, 2024
97eeb0a
Refact: 디바운스 적용해 스크롤 이벤트 제어
mimizae Dec 22, 2024
8144e7d
Coment: 주석 추가
mimizae Dec 22, 2024
e448756
Chore: 컴포넌트화 필요한 아이콘에 주석 추가
mimizae Dec 22, 2024
1d249e9
Feat: eslint-plugin-import pathGroups 설정 추가
gustn99 Dec 22, 2024
c1205ae
Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react int…
gustn99 Dec 22, 2024
cfde082
Feat: utils 절대경로 추가
gustn99 Dec 22, 2024
4475e8c
Refactor: getCurrentUserId 적용
gustn99 Dec 22, 2024
04974b3
Refactor: 동일한 의존성을 가지는 useEffect 리팩토링
gustn99 Dec 22, 2024
e7d2faf
Refact: 아이콘 컴포넌트화
mimizae Dec 23, 2024
0b3815d
Refact: user 도메인의 api 파일에서의 경로 수정
mimizae Dec 23, 2024
348c85f
Refact: user-block, user-report 도메인에서의 경로 수정
mimizae Dec 23, 2024
30d93f2
Chore: 오타 수정
mimizae Dec 23, 2024
f73c0b6
Refactor: Signup @/utils/... -> @utils/...로 수정
gustn99 Dec 23, 2024
34cd968
Merge pull request #107 from oodd-team/feat/OD-142
gustn99 Dec 23, 2024
8853b5f
Feat: 폰트시스템 삭제 및 컬러시스템 수정
xxinzzi Dec 23, 2024
5f3dede
Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react int…
xxinzzi Dec 23, 2024
94d9c06
Feat: text 컬러 수정
xxinzzi Dec 23, 2024
8316196
Fix: 빌드 오류 해결
xxinzzi Dec 23, 2024
1dd6ca8
Refactor: Post & MyPost 병합 후 조건부 렌더링으로 변경
xxinzzi Dec 23, 2024
c09fdc8
Fix: 경로 오류 해결
xxinzzi Dec 23, 2024
146d5a4
Feat: 컬러시스템 적용
xxinzzi Dec 23, 2024
db244b7
Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react int…
mimizae Dec 25, 2024
ca1d189
Coment: 주석 추가
mimizae Dec 25, 2024
6a7f671
Coment: 주석 추가
mimizae Dec 25, 2024
36e38b5
Refact: isFetching과 isReachedEnd를 state가 아닌 useRef로 관리
mimizae Dec 26, 2024
db0b07d
Refact: isFilled에 isLikeClicked 값을 전달해 조건부렌더링 없이 구현
mimizae Dec 26, 2024
b0318cc
Merge pull request #110 from oodd-team/feat/OD-151
gustn99 Dec 26, 2024
3d2bcc7
Refact: jwt 이용한 회원정보 조회 응답 수정
mimizae Dec 26, 2024
b8e6425
Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react int…
mimizae Dec 26, 2024
2de288a
Chore: 이용약관 동의 페이지 라우팅 경로 수정
mimizae Dec 26, 2024
c8793ed
Refact: 공통 컴포넌트 리팩토링 (경로 수정, 변수명명 규칙 점검)
mimizae Dec 26, 2024
50ff956
Chore: import 순서 변경
mimizae Dec 26, 2024
0c14b38
Refactor: BottomSheet 리팩토링
gustn99 Dec 26, 2024
cce4f8e
Refactor: BottomSheetMenu 리팩토링
gustn99 Dec 26, 2024
507dbe2
Refactor: Comment 리팩토링
gustn99 Dec 26, 2024
c15cc99
Refactor: BottomSheet 관련 누락된 import 규칙 수정
gustn99 Dec 26, 2024
56c36d1
Refactor: CommentBottomSheet 리팩토링
gustn99 Dec 26, 2024
819435b
Refactor: 바텀시트 데스크톱 UI의 모달 닫기 버튼 렌더링 로직 통일
gustn99 Dec 26, 2024
efe7e66
Refactor: OODDFrame Loading Modal 컴포넌트 리팩토링
gustn99 Dec 26, 2024
95b30f0
Refactor: StyledText 리팩토링
gustn99 Dec 26, 2024
ec0ae71
Refactor: NavBar 리팩토링
gustn99 Dec 26, 2024
0ed1a84
Fix: Comment 폴더 이동에 따른 경로 수정
gustn99 Dec 26, 2024
a0b2e9d
Refact: 코멘트 바탕으로 경로 재수정, 변수명 수저
mimizae Dec 27, 2024
a36ee0c
Refact: 경로 재수정
mimizae Dec 27, 2024
3635db4
Chore: 이용약관동의 페이지 라우팅 경로 수정
mimizae Dec 27, 2024
d35e6f1
Chore: 충돌 방지를 위한 경로 수정
mimizae Dec 27, 2024
09c2a23
Refact: 경로 재재수정
mimizae Dec 27, 2024
2948ed9
Chore: 오타 수정
mimizae Dec 27, 2024
9512d13
Fix: 빌드 에러 해결
mimizae Dec 27, 2024
b5d9fd9
refactor: profile 페이지 절대경로로 수정
lalaurrel Dec 27, 2024
56c58d4
refactor: navbarProfile 절대경로 수정
lalaurrel Dec 27, 2024
75040f8
refactor: buttonSecondary 절대경로 수정
lalaurrel Dec 27, 2024
971d32e
refactor: AccountCancel 절대경로 수정
lalaurrel Dec 27, 2024
f60552b
refactor: accountEdit 절대경로 수정
lalaurrel Dec 27, 2024
1086fe9
refactor: accountSetting 절대경로로 수정
lalaurrel Dec 27, 2024
7dcb68b
refactor: ProfileEdit 절대경로 수정
lalaurrel Dec 27, 2024
9bccb42
Merge pull request #111 from oodd-team/feat/OD-165
gustn99 Dec 27, 2024
4f468ec
Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react int…
mimizae Dec 27, 2024
ffecf27
Feat: 모든 svg 컴포넌트에 width, height 프로퍼티 추가
gustn99 Dec 27, 2024
937d340
Merge pull request #112 from oodd-team/feat/OD-166
gustn99 Dec 27, 2024
abe7296
Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react int…
lalaurrel Dec 27, 2024
bac6d19
Refact: user, auth 도메인 api 응답 기반으로 dto 수정
mimizae Dec 28, 2024
7a627eb
Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react int…
mimizae Dec 28, 2024
f52d572
Fix: 빌드 오류 해결
mimizae Dec 28, 2024
956d313
Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react int…
mimizae Dec 28, 2024
ed411fa
Refact: api 응답 형식 변경
mimizae Dec 28, 2024
90705a8
Chore: dto 파일 import 시 type 명시
mimizae Dec 28, 2024
e6da535
Fix: 빌드 오류 해결, 변경된 user-block user-report request 형식에 따라 이 도메인을 사용하는 …
mimizae Dec 28, 2024
7674b8b
Merge pull request #114 from oodd-team/feat/OD-156
gustn99 Dec 28, 2024
b97cd9a
Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react int…
mimizae Dec 28, 2024
b50b609
Chore: type 키워드 추가
mimizae Dec 28, 2024
b89f8d0
Fix: matching 도메인 api 응답 수정
gustn99 Dec 28, 2024
8df0205
Design: BottomSheetMenu css 복구
xxinzzi Dec 28, 2024
de44743
Feat: 체크박스의 label 복구
xxinzzi Dec 28, 2024
546be36
Remove: Login/components 폴더 삭제
xxinzzi Dec 28, 2024
e4b3f2d
Feat: text colors 네이밍 변경 및 white 추가
xxinzzi Dec 28, 2024
3440909
Fix: 충돌 해결
xxinzzi Dec 28, 2024
9577da4
Refactor: import 경로 @/* 삭제
xxinzzi Dec 28, 2024
787c9ff
Merge pull request #113 from oodd-team/feat/OD-154
gustn99 Dec 28, 2024
45fef86
Feat: 기존 폰트 복구 및 color 네이밍 수정
xxinzzi Dec 28, 2024
12fe603
Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react int…
xxinzzi Dec 28, 2024
6737adb
Merge pull request #109 from oodd-team/feat/OD-158
gustn99 Dec 28, 2024
bd52423
Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react int…
gustn99 Dec 28, 2024
6208de2
Refactor: Comment 컴포넌트 누락된 type 키워드 추가
gustn99 Dec 28, 2024
32f6884
Fix: chatting 도메인 api 응답 수정
gustn99 Dec 28, 2024
aed0b2a
Fix: api 응답 수정에 따라 opponentInfo -> otherUser로 수정
gustn99 Dec 28, 2024
ff0c36b
Merge pull request #115 from oodd-team/feat/OD-152
gustn99 Dec 28, 2024
9eb3030
Rename: post 도메인 응답에 따른 dto 수정
xxinzzi Dec 28, 2024
cdae57e
Refactor: getCurrentUserId 함수 적용
xxinzzi Dec 28, 2024
780c4df
Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react int…
lalaurrel Dec 28, 2024
b90df30
Refactor: opponent -> otherUser로 수정
gustn99 Dec 28, 2024
7b2eeee
fix: 충돌 해결
lalaurrel Dec 28, 2024
f37c32e
Refactor: OOTD 컴포넌트 주석 정리
gustn99 Dec 28, 2024
33a9d01
Fix: 렌더링 시 중복 key 이슈 해결
gustn99 Dec 28, 2024
59bcbdd
refactor: profile 기존 색상 삭제
lalaurrel Dec 28, 2024
59f2bc1
refactor: 기존 폰트 제거
lalaurrel Dec 28, 2024
3eb1a3e
refactor: 기존 색상 제거 및 수정
lalaurrel Dec 28, 2024
05d6c18
refactor: 기존 폰트 제거 및 수정
lalaurrel Dec 28, 2024
5205460
Refactor: isTimeVisible에 불필요한 조건 삭제
gustn99 Dec 28, 2024
07db36d
Refactor: Chats 컬러시스템 적용
gustn99 Dec 28, 2024
deb093b
Refactor: Home 컬러시스템 적용
gustn99 Dec 28, 2024
5024c9f
Refactor: Chats 컬러시스템 background/border 활용해 수정
gustn99 Dec 28, 2024
cad73bd
Refactor: Home 컬러시스템 background/border 활용해 수정
gustn99 Dec 28, 2024
94f9496
Design: 피드 매칭 요청 아이콘 크기 조정
gustn99 Dec 28, 2024
08cd9aa
Fix: 유저 프로필로의 라우팅 경로 수정
gustn99 Dec 28, 2024
f3f33a1
Refactor: 바텀시트 컬러시스템 적용
gustn99 Dec 28, 2024
99cf43d
Refactor: 모달 및 내브바 컬러시스템 적용
gustn99 Dec 28, 2024
a3e4b63
Refactor: OODDFrame & Loading & StyledText 컬러시스템 적용
gustn99 Dec 28, 2024
5a9b6f0
Merge pull request #117 from oodd-team/feat/OD-167
gustn99 Dec 28, 2024
15c5e6c
fix: 코리 반영
lalaurrel Dec 28, 2024
6660cab
fix: 코리 반영
lalaurrel Dec 28, 2024
c5daecb
fix: 코리 반영
lalaurrel Dec 28, 2024
5662721
fix: 코리 반영
lalaurrel Dec 28, 2024
edc38d9
fix: 코리 반영
lalaurrel Dec 28, 2024
40e174e
fix: 코리 반영
lalaurrel Dec 28, 2024
dc72966
fix: 코리 반영
lalaurrel Dec 28, 2024
0f7fa88
fix: 코리 반영
lalaurrel Dec 28, 2024
b8520c1
fix: 코리 반영
lalaurrel Dec 28, 2024
23dbe08
fix: 코리 반영
lalaurrel Dec 28, 2024
fe2bd88
fix: 코리 반영
lalaurrel Dec 28, 2024
2c1f73d
fix: 코리 반영
lalaurrel Dec 28, 2024
3f12aeb
fix: 코리 반영
lalaurrel Dec 28, 2024
41a7941
fix: 코리 반영
lalaurrel Dec 28, 2024
0c97de1
fix: 코리 반영
lalaurrel Dec 28, 2024
102dbbc
fix: 코리 반영
lalaurrel Dec 28, 2024
b19f780
Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react int…
lalaurrel Dec 28, 2024
7268069
fix: 컬러 수정
lalaurrel Dec 28, 2024
2a21a0e
Refact: 공통 PostItem 컴포넌트에 컬러시스템 적용
mimizae Dec 29, 2024
7b8057f
Refact: TopBar 컬러시스템 적용
mimizae Dec 29, 2024
6dd863e
Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react int…
xxinzzi Dec 29, 2024
bb6f04d
Feat: Post 도메인 응답 dto 수정
xxinzzi Dec 29, 2024
31444c9
Refact: 이용약관 동의 페이지에 컬러시스템 적용
mimizae Dec 29, 2024
2083817
Merge pull request #116 from oodd-team/feat/OD-150
gustn99 Dec 29, 2024
412b83d
Merge pull request #119 from oodd-team/feat/OD-148
gustn99 Dec 29, 2024
b04aa20
Merge pull request #120 from oodd-team/feat/OD-171
gustn99 Dec 29, 2024
50adedc
Refactor: Post/PostBase 컴포넌트 리팩토링
xxinzzi Dec 29, 2024
ffe9afb
Refactor: Post 페이지 리팩토링
xxinzzi Dec 29, 2024
5a1db3e
Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react int…
xxinzzi Dec 29, 2024
f399712
Merge pull request #121 from oodd-team/feat/OD-168
gustn99 Dec 29, 2024
703a38f
Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react int…
gustn99 Dec 29, 2024
1df5232
Fix: 전체 페이지 경로(주소) 리팩토링
gustn99 Dec 29, 2024
1e506fe
Fix: 바텀시트 관련 컴포넌트 폴더 이동 및 그에 따른 경로 수정
gustn99 Dec 29, 2024
0cb7bb1
Fix: profile 페이지 폴더 이동
gustn99 Dec 29, 2024
3dffa75
Fix: account* 페이지 폴더 이동
gustn99 Dec 29, 2024
6a4ddaf
Fix: verivication 폴더명 수정 중
gustn99 Dec 29, 2024
c0c77af
Fix: verivication 폴더명 수정 완
gustn99 Dec 29, 2024
83e4d83
Fix: post* 페이지 폴더 이동 및 그에 따른 경로 수정
gustn99 Dec 29, 2024
8d5f5bf
Fix: signup* 페이지 폴더 이동 및 그에 따른 경로 수정
gustn99 Dec 29, 2024
fccf9dc
Fix: eslint에 따라 styled -> {styled}로 수정
gustn99 Dec 29, 2024
09ddcb7
Fix: 기타 컴포넌트 import문 수정
gustn99 Dec 29, 2024
8afc65c
Fix: 바텀시트 컴포넌트 import문 수정
gustn99 Dec 29, 2024
59e4e5d
Fix: 유저 프로필 컴포넌트 import문 수정
gustn99 Dec 29, 2024
d4cfc1f
Fix: 소켓 import문 수정
gustn99 Dec 29, 2024
92be65f
Fix: account 페이지 import문 수정
gustn99 Dec 29, 2024
82e64e7
Fix: chatRoom 페이지 import문 수정
gustn99 Dec 29, 2024
297e834
Fix: chats 페이지 import문 수정
gustn99 Dec 29, 2024
4d9ee4b
Fix: home 페이지 import문 수정
gustn99 Dec 29, 2024
5b6fbf9
Fix: login 페이지 import문 수정
gustn99 Dec 29, 2024
9507dce
Fix: signup & notfound 페이지 import문 수정
gustn99 Dec 29, 2024
c829ee2
Fix: postbase 페이지 import문 수정
gustn99 Dec 29, 2024
9578fda
Fix: 나머지 post 페이지 import문 수정
gustn99 Dec 29, 2024
fb14bee
Fix: profile 페이지 import문 수정
gustn99 Dec 29, 2024
9262a90
Fix: recoil 등 기타 파일 import문 수정
gustn99 Dec 29, 2024
955321d
Fix: error 객체를 직접 참조하지 않도록 수정
gustn99 Dec 29, 2024
f889997
Merge pull request #122 from oodd-team/feat/OD-138
gustn99 Dec 29, 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
108 changes: 100 additions & 8 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,17 +1,109 @@
module.exports = {
root: true,
extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended'],
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended',
'plugin:import/typescript',
'plugin:import/recommended',
'plugin:prettier/recommended',
],
parser: '@typescript-eslint/parser',
parserOptions: { project: ['./tsconfig.json'] },
plugins: ['@typescript-eslint'],
parserOptions: {
project: ['./tsconfig.app.json', './tsconfig.node.json'],
},
plugins: ['@typescript-eslint', 'eslint-plugin-import'],
settings: {
'import/resolver': {
typescript: {
project: ['./tsconfig.app.json', './tsconfig.node.json'],
},
},
'import/parsers': { '@typescript-eslint/parser': ['.ts', '.tsx'] },
},
env: {
node: true,
},
rules: {
'@typescript-eslint/strict-boolean-expressions': [
2,
'prettier/prettier': ['error', { endOfLine: 'auto' }],
'import/extensions': [
'error',
'ignorePackages',
{
allowString: false,
allowNumber: false,
ts: 'never',
tsx: 'never',
},
],
'import/order': [
'error',
{
groups: ['builtin', 'external', 'internal', 'index', 'type', 'parent', 'sibling', 'object'],
alphabetize: {
order: 'asc',
caseInsensitive: true,
},
'newlines-between': 'always',
pathGroups: [
{
pattern: 'react*',
group: 'builtin',
position: 'before',
},
{
pattern: '@components/**/dto',
group: 'type',
},
{
pattern: '@styles/**',
group: 'internal',
position: 'before',
},
{
pattern: '@assets/**',
group: 'internal',
position: 'after',
},
{
pattern: '@components/Icons/**',
group: 'internal',
position: 'after',
},
{
pattern: '@components/**',
group: 'internal',
position: 'after',
},
{
pattern: '../**/dto',
group: 'type',
position: 'after',
},
{
pattern: './**/dto',
group: 'type',
position: 'after',
},
{
pattern: '../**/index',
group: 'parent',
position: 'before',
},
{
pattern: './**/index',
group: 'parent',
position: 'before',
},
],
pathGroupsExcludedImportTypes: ['react*'],
},
],
},
ignorePatterns: ['src/**/*.test.ts', 'src/frontend/generated/*'],
overrides: [
{
files: ['*.ts', '*.tsx'],
rules: {
'import/order': 'error',
},
},
],
ignorePatterns: ['src/**/*.test.ts', 'src/frontend/generated/*', 'src/App.tsx'],
};
14 changes: 7 additions & 7 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"trailingComma": "all",
"tabWidth": 2,
"semi": true,
"singleQuote": true,
"printWidth": 120,
"arrowParens": "always",
"useTabs": true
"trailingComma": "all",
"tabWidth": 2,
"semi": true,
"singleQuote": true,
"printWidth": 120,
"arrowParens": "always",
"useTabs": true
}
29 changes: 11 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,45 +14,38 @@
"dependencies": {
"@types/styled-components": "^5.1.34",
"axios": "^1.7.2",
"body-parser": "^1.20.2",
"cors": "^2.8.5",
"dayjs": "^1.11.12",
"express": "^4.19.2",
"firebase": "^10.13.0",
"heic2any": "^0.0.4",
"js-cookie": "^3.0.5",
"lodash": "^4.17.21",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-error-overlay": "6.0.9",
"react-responsive": "^10.0.0",
"react-router-dom": "^6.24.1",
"react-scripts": "4.0.3",
"recoil": "^0.7.7",
"recoil-persist": "^5.1.0",
"request": "^2.88.2",
"socket.io-client": "^4.7.5",
"styled-components": "^6.1.11",
"styled-reset": "^4.5.2",
"swiper": "^11.1.8"
},
"devDependencies": {
"@types/express": "^4.17.21",
"@types/js-cookie": "^3.0.6",
"@types/lodash": "^4.17.13",
"@types/node": "^20.14.10",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@typescript-eslint/eslint-plugin": "^7.16.1",
"@typescript-eslint/parser": "^7.13.1",
"@typescript-eslint/eslint-plugin": "^8.18.1",
"@typescript-eslint/parser": "^8.18.1",
"@vitejs/plugin-react": "^4.3.1",
"eslint": "^9.7.0",
"eslint": "^8.0.0",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.7.0",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-hooks": "^5.1.0",
"eslint-plugin-react-refresh": "^0.4.7",
"json-server": "^1.0.0-beta.1",
"prettier": "^3.3.2",
"typescript": "^5.2.2",
"vite": "^5.3.1"
},
"proxy": "https://localhost:3001"
"typescript": "^5.7.2",
"vite": "^6.0.3"
}
}
71 changes: 36 additions & 35 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
import React from 'react';
import { BrowserRouter, Route, Routes, Navigate } from 'react-router-dom';
import Home from './pages/Home';
import Login from './pages/Login';
import SignUp from './pages/SignUp';
import LoginComplete from './pages/Login/components/LoginComplete';
import TermsAgreement from './pages/TermsAgreement';

import MyPage from './pages/MyPage';
import ProfileEdit from './pages/ProfileEdit';
import AccountSetting from './pages/AccountSetting';
import AccountEdit from './pages/AccountEdit';
import AccountCancel from './pages/AccountCancel';
import Verification from './pages/verification';
import Home from '@pages/Home';
import Login from '@pages/Login';
import LoginComplete from '@pages/Login/LoginComplete';

import ProfileViewer from './pages/ProfileViewer';
import SignUp from '@pages/SignUp';
import TermsAgreement from '@pages/SignUp/TermsAgreement';

import Post from './pages/Post';
import MyPost from './pages/MyPost';
import PostUpload from './pages/PostUpload';
import PostImageSelect from './pages/PostImageSelect';
import PostInstaConnect from './pages/PostInstaConnect';
import PostInstaFeedSelect from './pages/PostInstaFeedSelect';
import Profile from '@pages/Profile';
import ProfileEdit from '@pages/Profile/ProfileEdit';

import Chats from './pages/Chats';
import ChatRoom from './pages/Chats/ChatRoom';
import AccountSetting from '@pages/Account/AccountSetting';
import AccountEdit from '@pages/Account/AccountEdit';
import AccountCancel from '@pages/Account/AccountCancel';
import Verification from '@pages/Account/Verification';

import NotFound from './pages/NotFound';
import Post from '@pages/Post';
import PostUpload from '@pages/Post/PostUpload';
import PostImageSelect from '@pages/Post/PostImageSelect';
import PostInstaConnect from '@pages/Post/PostInstaConnect';
import PostInstaFeedSelect from '@pages/Post/PostInstaFeedSelect';

import Chats from '@pages/Chats';
import ChatRoom from '@pages/Chats/ChatRoom';

import NotFound from '@pages/NotFound';

const ProtectedRoute = ({ children }: { children: JSX.Element }) => {
const isAuthenticated = Boolean(localStorage.getItem('new_jwt_token'));
Expand All @@ -36,21 +36,21 @@ const ProtectedRoute = ({ children }: { children: JSX.Element }) => {
const protectedRoutes = [
{ path: '/', element: <Home /> },

// 사용자 프로필 및 계정 관리
{ path: '/mypage', element: <MyPage /> },
// profile
{ path: '/profile/:userId', element: <Profile /> },
{ path: '/profile/edit', element: <ProfileEdit /> },
{ path: '/account-setting', element: <AccountSetting /> },
{ path: '/account-edit', element: <AccountEdit /> },
{ path: '/account-cancel', element: <AccountCancel /> },
{ path: '/verification', element: <Verification /> },
{ path: '/users/:userId', element: <ProfileViewer /> },

// account
{ path: '/account/setting', element: <AccountSetting /> },
{ path: '/account/edit', element: <AccountEdit /> },
{ path: '/account/cancel', element: <AccountCancel /> },
{ path: '/account/verification', element: <Verification /> },

{ path: '/post/:postId', element: <Post /> },
{ path: '/my-post/:postId', element: <MyPost /> },
{ path: '/upload', element: <PostUpload /> },
{ path: '/image-select', element: <PostImageSelect /> },
{ path: '/insta-connect', element: <PostInstaConnect /> },
{ path: '/insta-feed-select', element: <PostInstaFeedSelect /> },
{ path: '/post/upload/photo/select', element: <PostImageSelect /> },
{ path: '/post/upload/instagram/connect', element: <PostInstaConnect /> },
{ path: '/post/upload/instagram/select', element: <PostInstaFeedSelect /> },
{ path: '/post/upload/content', element: <PostUpload /> },

// 메시지/채팅
{ path: '/chats', element: <Chats /> },
Expand All @@ -60,9 +60,10 @@ const protectedRoutes = [
// 인증이 필요 없는 페이지 배열
const publicRoutes = [
{ path: '/login', element: <Login /> },
{ path: '/signup', element: <SignUp /> },
{ path: '/login/complete', element: <LoginComplete /> },
{ path: '/terms-agreement', element: <TermsAgreement /> },

{ path: '/signup', element: <SignUp /> },
{ path: '/signup/terms-agreement', element: <TermsAgreement /> },
];

const App: React.FC = () => {
Expand Down
5 changes: 3 additions & 2 deletions src/apis/auth/dto.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import { BaseSuccessResponse } from '../core/dto';
import type { BaseSuccessResponse } from '@apis/core/dto';

// jwt를 이용한 사용자 정보 조회 응답
export type getUserInfoByJwtResponse = BaseSuccessResponse<getUserInfoByJwtData>;
// jwt를 이용한 사용자 정보 조회 응답 데이터
export interface getUserInfoByJwtData {
userId: number;
id: number;
name: string;
phoneNumber: string;
email: string;
nickname: string;
profilePictureUrl: string;
bio: string;
birthDate: string;
}
4 changes: 2 additions & 2 deletions src/apis/auth/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getUserInfoByJwtResponse } from './dto';
import { newRequest } from '../core';
import { newRequest } from '@apis/core';
import type { getUserInfoByJwtResponse } from './dto';

// jwt로 사용자 정보 조회 api /auth/me
export const getUserInfoByJwtApi = () => newRequest.get<getUserInfoByJwtResponse>('/auth/me');
Empty file removed src/apis/chat-room/dto.ts
Empty file.
4 changes: 2 additions & 2 deletions src/apis/chatting/dto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
// base response 형태를 따르지 않으므로 data 접미사를 사용했습니다.
// response
export interface ChatRoomData {
chatRoomId: number;
id: number;
otherUser: OtherUserDto;
latestMessage: LatestMessageDto;
}

export interface OtherUserDto {
id: number;
nickname: string;
profileUrl: string;
profilePictureUrl: string;
}

export interface LatestMessageDto {
Expand Down
39 changes: 1 addition & 38 deletions src/apis/core/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import axios, {
AxiosResponse,
InternalAxiosRequestConfig,
} from 'axios';
import { JWT_KEY, NEW_JWT_KEY } from '../../config/constant';
import { NEW_JWT_KEY } from '../../config/constant';

// 기존 서버 응답 타입
export type BaseResponse<T = any> = {
Expand Down Expand Up @@ -71,40 +71,3 @@ newRequest.interceptors.response.use(
return Promise.reject(error);
},
);

// 기존 서버 axios 인스턴스
export const request: CustomInstance = axios.create({
baseURL: import.meta.env.VITE_API_URL,
timeout: 20000,
headers: {
accept: 'application/json',
Authorization: `Bearer ${localStorage.getItem(JWT_KEY)}`,
},
});

request.interceptors.request.use(
(config) => {
const jwt = window.localStorage.getItem(JWT_KEY);
config.headers.Authorization = `Bearer ${jwt}`;
return config;
},
(error) => {
return Promise.reject(error);
},
);

request.interceptors.response.use(
(response) => {
console.log('network log', response);
if (response.status === 200 || response.status === 201) {
return response.data;
} else {
return Promise.reject(response.data.message);
}
},
(error) => {
return Promise.reject(error.code === 'ERR_NETWORK' ? '허용되지 않은 네트워크 접근입니다.' : error);
},
);

export default request;
Loading
Loading