Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
250 commits
Select commit Hold shift + click to select a range
53bb7c4
✨ feat: 공통컴포넌트 Button구현완료
moonhuicheol Dec 27, 2024
5eb8438
Merge pull request #1 from moonhuicheol/feature/공통컴포넌트/button
moonhuicheol Dec 27, 2024
104fddf
Merge branch 'vsCode-Game:develop' into develop
moonhuicheol Dec 27, 2024
3ee65c9
Develop (#30)
moonhuicheol Dec 27, 2024
dcd1123
✨ feat: 공통컴포넌트/input
moonhuicheol Dec 27, 2024
cff120e
✨ feat: 공통컴포넌트/input (#31)
moonhuicheol Dec 27, 2024
f130067
Merge branch 'vsCode-Game:develop' into develop
danggin Dec 27, 2024
e19ba2c
🔀 merge:
hoheesu Dec 27, 2024
cb4f810
Merge branch 'vsCode-Game:develop' into develop
danggin Dec 27, 2024
1016558
✨ feat: formbutton 구현완료
moonhuicheol Dec 28, 2024
a659f69
Merge pull request #2 from moonhuicheol/feature/button
moonhuicheol Dec 28, 2024
d073d92
✨ feat: formbutton 구현완료 (#34)
moonhuicheol Dec 28, 2024
650e2e4
✨ feat: 공통컴포넌트 input2
moonhuicheol Dec 28, 2024
7f2e6e6
Merge pull request #3 from moonhuicheol/feature/input
moonhuicheol Dec 28, 2024
fdfa966
✨ feat: 공통컴포넌트 input2 (#35)
moonhuicheol Dec 28, 2024
2375c73
Merge branch 'vsCode-Game:develop' into develop
danggin Dec 30, 2024
2a08868
✨ feat: loginPage구현
moonhuicheol Dec 30, 2024
382b2a1
Merge branch 'develop' into feature/login
moonhuicheol Dec 30, 2024
19d0451
Merge pull request #4 from moonhuicheol/feature/login
moonhuicheol Dec 30, 2024
be609a0
✨ feat: loginPage구현 (#36)
moonhuicheol Dec 30, 2024
a0ec31f
first commit
salwwkd Dec 30, 2024
ca2311b
충돌해결
salwwkd Dec 30, 2024
672bd9c
Merge pull request #1 from salwwkd/feature/뱃지
salwwkd Dec 30, 2024
b6df1ce
✨ feat: badge 구현
salwwkd Dec 30, 2024
53b36b5
✅ update: second commit
salwwkd Dec 30, 2024
e7c7ba8
Merge branch 'vsCode-Game:develop' into develop
danggin Dec 30, 2024
a8dee2b
✅ update: 타입수정
salwwkd Dec 30, 2024
2b33f8c
✅ update: badge타입수정
salwwkd Dec 30, 2024
31013b9
Merge pull request #2 from salwwkd/feature/badge
salwwkd Dec 30, 2024
82d1773
first commit (#37)
salwwkd Dec 30, 2024
202d28e
✅ update: login페이지 수정
moonhuicheol Dec 30, 2024
8c5d408
Merge pull request #5 from moonhuicheol/feature/login
moonhuicheol Dec 30, 2024
b39f5f3
🏗️ structure: Layout 컴포넌트 추가
danggin Dec 30, 2024
82af603
✅ update: login페이지 수정 (#38)
moonhuicheol Dec 30, 2024
a7f37cf
Merge branch 'vsCode-Game:develop' into develop
danggin Dec 30, 2024
ef557d2
Merge pull request #2 from danggin/feature/home
danggin Dec 30, 2024
11e02bb
🔀 merge (#39)
danggin Dec 30, 2024
3978032
💄 style: 레이아웃 깨지는 부분 수정
danggin Dec 30, 2024
d67530a
Merge pull request #3 from danggin/feature/signup
danggin Dec 30, 2024
af7b400
🔀 merge: (#40)
danggin Dec 30, 2024
f5d09c6
✨ feat: badge수정
salwwkd Dec 30, 2024
51f700b
Merge branch 'develop' into feature/badge
salwwkd Dec 30, 2024
8f85f27
🐛 fix: Merge branch 'develop' into feature/badge
salwwkd Dec 30, 2024
1e450cb
Merge pull request #4 from salwwkd/feature/badge
salwwkd Dec 30, 2024
0b59bc9
Develop (#42)
salwwkd Dec 30, 2024
a94f92e
✅ update: badge 컴포넌트 수정 및 파일 정리
moonhuicheol Dec 31, 2024
5feb9d0
✏️ typos: import 수정
moonhuicheol Dec 31, 2024
1a3dd06
Merge pull request #6 from moonhuicheol/feature/badge
moonhuicheol Dec 31, 2024
f918b09
✅ update: badge 컴포넌트 수정 및 파일 정리 (#43)
moonhuicheol Dec 31, 2024
17532f1
✅ update: 로그인 title 태그변경
moonhuicheol Dec 31, 2024
8898196
Merge pull request #7 from moonhuicheol/login
moonhuicheol Dec 31, 2024
655da03
update: 로그인 title 태그변경 (#44)
moonhuicheol Dec 31, 2024
5d66b20
✨ feat: chatInputBox 구현
moonhuicheol Dec 31, 2024
976891a
✅ update: 경로 수정 및 줄간격 수정
moonhuicheol Dec 31, 2024
89cb552
Merge pull request #8 from moonhuicheol/chatInput
moonhuicheol Dec 31, 2024
33834ac
✨ feat: chatInputBox 구현 (#45)
moonhuicheol Dec 31, 2024
0f55b55
✨ feat: Button 컴포넌트 width 속성 추가
danggin Dec 31, 2024
8ee9310
💄 style: container padding 값 수정
danggin Dec 31, 2024
0eb8ca5
✨ feat: input 컴포넌트 ...props 속성 추가
danggin Dec 31, 2024
1fc7e26
💄 style: container padding 수정에 따른 로그인 페이지 margin값 삭제
danggin Dec 31, 2024
66ede93
💄 style: 전체 영역 width, height 수정
danggin Dec 31, 2024
ff5edf0
🚧 cont: 회원가입 페이지 작업중
danggin Dec 31, 2024
00634b4
🔀 merge: Merge branch 'develop' into feature/signup
danggin Dec 31, 2024
9b219ec
🐛 fix: button 컴포넌트의 width 속성을 선택사항으로 수정
danggin Dec 31, 2024
a62865a
🐛 fix: 사용하지 않은 변수 삭제
danggin Dec 31, 2024
af359f5
Merge pull request #4 from danggin/feature/signup
danggin Dec 31, 2024
b4c98d9
공통 컴포넌트 수정 및 회원가입 페이지 작업중 (#46)
danggin Dec 31, 2024
0e154ae
💄 style: 방 제목 두줄 이상 넘을 경우 말줄임표 처리
salwwkd Dec 31, 2024
f59ebfc
♻️ refactor: 유저 프로필 사진 및 닉네임 컴포넌트로 분리
salwwkd Dec 31, 2024
20a503f
✨ feat: 게임 입장 시 유저 프로필 상자 컴포넌트 추가
salwwkd Dec 31, 2024
6c8bdde
✨ feat: 컴포넌트 분리에 따른 경로 수정
salwwkd Dec 31, 2024
7662bdb
Merge branch 'develop' into feature/card3
salwwkd Dec 31, 2024
8308c0f
🐛 fix: badge 컴포넌트 수정
salwwkd Dec 31, 2024
1b8e60d
Merge pull request #5 from salwwkd/feature/card3
salwwkd Dec 31, 2024
8e02241
Merge pull request #47 from salwwkd/develop
salwwkd Dec 31, 2024
0c6be9e
✨ feat: 채팅박스 구현
moonhuicheol Dec 31, 2024
4b87ea6
Merge pull request #9 from moonhuicheol/feature/chatting
moonhuicheol Dec 31, 2024
b00b480
Merge pull request #48 from moonhuicheol/develop
moonhuicheol Dec 31, 2024
8bf9d37
✨ feat: 파비콘 적용 및 사용하지 않는 이미지 파일 삭제
danggin Dec 31, 2024
c3492ee
✨ feat: Profile컴포넌트 구현
moonhuicheol Dec 31, 2024
ca7ab5f
♻️ refactor: 버튼 부분 컴포넌트로 교체
danggin Dec 31, 2024
fd11dfa
💄 style: box-sizing 에 important 추가
danggin Dec 31, 2024
fac63dc
Merge pull request #10 from moonhuicheol/feature/profile
moonhuicheol Dec 31, 2024
7c163cd
Merge pull request #49 from moonhuicheol/develop
moonhuicheol Dec 31, 2024
3939393
🔀 merge: Merge branch 'develop' into feature/signup
danggin Dec 31, 2024
f13638d
Merge pull request #5 from danggin/feature/signup
danggin Dec 31, 2024
0f7a614
Merge pull request #50 from danggin/develop
danggin Dec 31, 2024
3a89f11
✨ feat: deck 구현
moonhuicheol Jan 1, 2025
e23e848
Merge pull request #11 from moonhuicheol/feature/deck
moonhuicheol Jan 1, 2025
bbcf397
Merge pull request #51 from moonhuicheol/develop
moonhuicheol Jan 1, 2025
6ba9357
✨ feat: 각종 Deck 구현
moonhuicheol Jan 1, 2025
a91859a
Merge pull request #12 from moonhuicheol/feature/deck
moonhuicheol Jan 1, 2025
a55bd1c
Merge pull request #52 from moonhuicheol/develop
moonhuicheol Jan 1, 2025
b94b04f
✨ feat: checkbox,radiobutton 컴포넌트 구현
salwwkd Jan 2, 2025
2732622
Merge branch 'develop' into feature/checkbox
salwwkd Jan 2, 2025
9b10bd6
✅ update: 버셀 오류 수정
salwwkd Jan 2, 2025
aab567e
Merge pull request #6 from salwwkd/feature/checkbox
salwwkd Jan 2, 2025
c78d88d
Merge pull request #53 from salwwkd/develop
salwwkd Jan 2, 2025
3efe1ed
✨ feat: waitingpage 구현
salwwkd Jan 2, 2025
856096e
Merge pull request #7 from salwwkd/feature/waitingpage
salwwkd Jan 2, 2025
a171418
Merge pull request #54 from salwwkd/develop
salwwkd Jan 2, 2025
e44467c
✅ update: 컨벤션에 맞게 폴더명 수정
danggin Jan 2, 2025
59094a4
💄 style: footer position 속성 제거
danggin Jan 2, 2025
cab6cc1
💄 style: 회원가입 단계 스타일 추가
danggin Jan 2, 2025
bfec76e
✏️ typos: 폴더명 변경에 따른 경로 수정
danggin Jan 2, 2025
90f51ce
Merge pull request #6 from danggin/feature/signup
danggin Jan 2, 2025
b1e51ad
Merge branch 'develop' into develop
danggin Jan 2, 2025
a5a8518
Merge pull request #55 from danggin/develop
danggin Jan 2, 2025
1d7563b
🍱 asset: 마이페이지 아이콘 이미지 업데이트
danggin Jan 7, 2025
d0dc875
Merge pull request #7 from danggin/feature/assets
danggin Jan 7, 2025
cb9d1ec
Merge pull request #56 from danggin/develop
danggin Jan 7, 2025
f5297a8
✨ feat: 마이페이지/비밀번호 및 정보수정 페이지 구현
moonhuicheol Jan 8, 2025
a1fb12e
✅ update: 푸쉬에러수정
moonhuicheol Jan 8, 2025
a54f834
✅ update: push에러 수정 loginstyle
moonhuicheol Jan 8, 2025
0792fd4
✅ update: push 오류 해결
moonhuicheol Jan 8, 2025
b1807a8
✅ update: push오류
moonhuicheol Jan 8, 2025
b297a2e
🐛 fix: stlye파일 인식 오류
moonhuicheol Jan 8, 2025
5a38d54
Merge pull request #13 from moonhuicheol/feature/mypage
moonhuicheol Jan 8, 2025
fee56a8
Merge pull request #58 from moonhuicheol/develop
moonhuicheol Jan 8, 2025
441052a
✨ feat: 마이페이지 구현
salwwkd Jan 8, 2025
5c90d30
Merge pull request #8 from salwwkd/feature/mypage
salwwkd Jan 8, 2025
64782c6
Merge pull request #59 from salwwkd/develop
salwwkd Jan 8, 2025
9cd1276
✨ feat: 게임 방 입장 시 헤더 추가
danggin Jan 8, 2025
7c50b44
✨ feat: 게임 방 라우터 추가
danggin Jan 8, 2025
4651d57
Merge pull request #8 from danggin/feature/header
danggin Jan 8, 2025
4a1043e
Merge pull request #60 from danggin/develop
danggin Jan 8, 2025
2db3fb5
🐛 fix: 페이지수정
salwwkd Jan 9, 2025
e059e9f
Merge pull request #9 from salwwkd/feature/updatepage
salwwkd Jan 9, 2025
e9fd597
Merge pull request #61 from salwwkd/develop
salwwkd Jan 9, 2025
e35d8be
🚧 cont: 회원가입 작업중
danggin Jan 10, 2025
d94ecc1
🐛 fix: develop branch 최신화
moonhuicheol Jan 12, 2025
45e438f
💄 style: 세로 스크롤 생기지 않도록 스타일 수정
danggin Jan 12, 2025
6a86e78
✨ feat: Input, Button 컴포넌트에 ...props 속성 추가
danggin Jan 13, 2025
f93e760
✨ feat: gameRoom 페이지 구현 및 레이아웃 설정
moonhuicheol Jan 13, 2025
bd93ac5
🐛 fix: push 오류 해결
moonhuicheol Jan 13, 2025
f04b8c4
🐛 fix: push 오류해결 2
moonhuicheol Jan 13, 2025
a36cadb
Merge pull request #14 from moonhuicheol/waitingPage
moonhuicheol Jan 13, 2025
9573e97
Merge pull request #62 from moonhuicheol/develop
moonhuicheol Jan 13, 2025
0dd5811
✅ update: gameRoomListPage 그리드 및 버튼 적용
moonhuicheol Jan 13, 2025
41e86b1
Merge pull request #15 from moonhuicheol/gameRoomList
moonhuicheol Jan 13, 2025
347019d
Merge pull request #63 from moonhuicheol/develop
moonhuicheol Jan 13, 2025
ba58c74
🍱 asset: 사용자 프로필 이미지 업데이트
danggin Jan 13, 2025
61e5be0
🐛 fix: 게임 방 헤더 안뜨는 버그 수정
danggin Jan 13, 2025
90407cf
✨ feat: CheckBox 컴포넌트에 ...props 속성 추가
danggin Jan 13, 2025
d4c9efa
✨ feat: TextButton 컴포넌트 추가
danggin Jan 13, 2025
98b6a36
➖ remove: 사용하지 않는 파일 삭제
danggin Jan 13, 2025
d553638
✨ feat: useFunnel 훅을 이용한 회원가입 퍼블리싱 완료
danggin Jan 13, 2025
b577191
Merge branch 'develop' into feature/signup
danggin Jan 13, 2025
80ca20b
✏️ typos: 컴포넌트 경로 alias로 수정
danggin Jan 13, 2025
2348184
Merge pull request #9 from danggin/feature/signup
danggin Jan 13, 2025
73cca06
Merge pull request #64 from danggin/develop
danggin Jan 13, 2025
a672d98
✨ feat: 모달, 토스트 구현을 위한 React Portal 추가
danggin Jan 13, 2025
077aa7b
Merge pull request #10 from danggin/feature/signup
danggin Jan 13, 2025
856c155
Merge pull request #65 from danggin/develop
danggin Jan 13, 2025
106f0d2
✨ feat: waitingplayer, selectionnumber, scrolltotop 구현
salwwkd Jan 13, 2025
60872bb
Merge branch 'develop' into feature/selectnumber
salwwkd Jan 13, 2025
84c09d8
Merge pull request #10 from salwwkd/feature/selectnumber
salwwkd Jan 13, 2025
0b1d826
Merge pull request #66 from salwwkd/develop
salwwkd Jan 13, 2025
564855e
✨ feat: gameRoomListPage구현
moonhuicheol Jan 13, 2025
78765b0
Merge branch 'develop' into feature/gameRoomList
moonhuicheol Jan 13, 2025
fcb360f
🐛 fix: push 에러 수정
moonhuicheol Jan 13, 2025
271c37a
🐛 fix: push 에러 해결2
moonhuicheol Jan 13, 2025
76a6349
Merge pull request #16 from moonhuicheol/feature/gameRoomList
moonhuicheol Jan 13, 2025
9399a73
Merge pull request #67 from moonhuicheol/develop
moonhuicheol Jan 13, 2025
4970611
✨ feat: gameRoomList axios 및 reactQuery적용
moonhuicheol Jan 14, 2025
bfe9941
✨ feat: Controller로 회원가입 단계 별 데이터 연결
danggin Jan 14, 2025
9ee578f
🔀 merge: Merge branch 'develop' into feature/signup
danggin Jan 14, 2025
7458535
Merge pull request #17 from moonhuicheol/feature/gameRoomList
moonhuicheol Jan 14, 2025
64b038c
Merge pull request #68 from moonhuicheol/develop
moonhuicheol Jan 14, 2025
a6a7e3e
🔀 merge: Merge branch 'develop' into feature/signup
danggin Jan 14, 2025
d5d6930
✨ feat: gameRoomList 방만들기, 들어가기, 나가기 axios 및 reactQuery 설정
moonhuicheol Jan 14, 2025
b6bd661
Merge pull request #18 from moonhuicheol/feature/gameRoomList
moonhuicheol Jan 14, 2025
60fafb3
Merge pull request #69 from moonhuicheol/develop
moonhuicheol Jan 14, 2025
e2cfbc5
✨ feat: loginUser axios함수 구현
moonhuicheol Jan 14, 2025
03c1991
Merge pull request #11 from danggin/feature/signup
danggin Jan 14, 2025
f10ac28
Merge pull request #70 from danggin/develop
danggin Jan 14, 2025
ff1da63
✨ feat: 로그인 기능 구현
moonhuicheol Jan 14, 2025
cadd967
Merge branch 'develop' into feature/login
moonhuicheol Jan 14, 2025
b2739e9
🐛 fix: 타입에러 수정
moonhuicheol Jan 14, 2025
e3111e0
🐛 fix: 푸쉬에러 (타입수정)2
moonhuicheol Jan 14, 2025
408d13f
Merge pull request #19 from moonhuicheol/feature/login
moonhuicheol Jan 14, 2025
85b3f49
Merge pull request #71 from moonhuicheol/develop
moonhuicheol Jan 14, 2025
ec31669
🐛 fix: 버튼 컴포넌트 props 이름 수정
danggin Jan 14, 2025
5cd89af
🚧 cont: axios 회원가입 테스트
danggin Jan 14, 2025
99112cb
Merge branch 'develop' of https://github.com/danggin/codename-davinci…
danggin Jan 14, 2025
c22ff73
Merge pull request #72 from danggin/develop
danggin Jan 14, 2025
1c1b2c9
✅ update: 로그인후 페이지이동
moonhuicheol Jan 14, 2025
57959ae
✏️ typos: 컨벤션에 맞게 interface 이름 수정
danggin Jan 14, 2025
1c7cd90
✏️ typos: 컨벤션에 맞게 interface 이름 수정
danggin Jan 14, 2025
91fe1e8
✨ feat: 게임방 footer 추가
danggin Jan 14, 2025
edd7528
✨ feat: 회원가입 기능 추가
danggin Jan 14, 2025
00c26ab
✅ update: 객체 구조분해 할당 ...rest 변수명 formData로 변경
danggin Jan 14, 2025
dd83f42
Merge pull request #12 from danggin/feature/signup
danggin Jan 14, 2025
84674df
Merge pull request #73 from danggin/develop
danggin Jan 14, 2025
a021e15
✅ update: gameList api 연결
moonhuicheol Jan 14, 2025
433681b
Merge branch 'develop' into feature/gameRoomList
moonhuicheol Jan 14, 2025
f10ba3f
🐛 fix: push error 해결
moonhuicheol Jan 14, 2025
38747e7
Merge pull request #20 from moonhuicheol/feature/gameRoomList
moonhuicheol Jan 14, 2025
c8c46eb
Merge pull request #74 from moonhuicheol/develop
moonhuicheol Jan 14, 2025
44e0a34
✅ update: selectionnumber 컴포넌트 세분화 및 스타일드 임폴트 수정
salwwkd Jan 14, 2025
a9c1bff
✅ update: selectionnumber 컴포넌트 세부 구현 및 스타일드 임폴트 수정
salwwkd Jan 14, 2025
09f99d3
Merge pull request #11 from salwwkd/feature/selectnumber
salwwkd Jan 14, 2025
e445118
Merge pull request #75 from salwwkd/develop
salwwkd Jan 14, 2025
c6cded2
✨ feat: 홈 화면 라우터 추가
danggin Jan 14, 2025
795d13d
♻️ refactor: 토스트에 쓰일 Portal 컴포넌트 분리
danggin Jan 14, 2025
748119c
🚧 cont: 모달 작업중
danggin Jan 14, 2025
96bda4f
Merge pull request #76 from danggin/develop
danggin Jan 14, 2025
6a0071b
✨ feat: 모달에 필요한 각종 컴포넌트 구현
moonhuicheol Jan 14, 2025
af2a1ce
Merge branch 'develop' into feature/modalcontents
moonhuicheol Jan 14, 2025
69fcf00
🐛 fix: push에러 해결
moonhuicheol Jan 14, 2025
027b4ee
🐛 fix: 깃 푸쉬 에러 해결2
moonhuicheol Jan 14, 2025
2bb3755
Merge pull request #21 from moonhuicheol/feature/modalcontents
moonhuicheol Jan 14, 2025
67f8c92
Merge pull request #78 from moonhuicheol/develop
moonhuicheol Jan 14, 2025
bc8dd78
✨ feat: 토스트 추가
danggin Jan 15, 2025
25a4552
🐛 fix: 토스트 여러 개일 때 메시지만 반복되는 버그 수정
danggin Jan 15, 2025
25d21c8
💤 chore: console.log 코드 삭제
danggin Jan 15, 2025
8a390e3
✨ feat: 기본적인 기능의 모달 추가
danggin Jan 15, 2025
b0b9182
🐛 fix: modalStyle 타입 에러 수정
danggin Jan 15, 2025
4c5780b
🐛 fix: Modal 타입 에러 수정
danggin Jan 15, 2025
ae0aa63
Merge pull request #13 from danggin/feature/modal
danggin Jan 15, 2025
986cdf5
Merge pull request #79 from danggin/develop
danggin Jan 15, 2025
cf342b9
✨ feat:셀렉트넘버 구현
salwwkd Jan 15, 2025
ec38ed4
Merge branch 'develop' into feature/selectnumber
salwwkd Jan 15, 2025
3a4b9c7
Merge pull request #12 from salwwkd/feature/selectnumber
salwwkd Jan 15, 2025
d24e55e
Merge pull request #80 from salwwkd/develop
salwwkd Jan 15, 2025
2c4731b
➖ remove: 테스트 파일 삭제
danggin Jan 15, 2025
9c7dbb4
💤 chore: 테스트 코드 삭제
danggin Jan 15, 2025
440f494
🐛 fix: react-router-dom의 라우팅 컨텍스트 밖에 있던 모달, 토스트 컴포넌트 레이아웃에서 불러오도록 수정
danggin Jan 15, 2025
227525d
💄 style: 모달 패딩 추가 및 기본 너비 수정
danggin Jan 15, 2025
ed7d7e8
💄 style: 모달 스타일에 맞게 모달 컨텐츠 스타일 수정
danggin Jan 15, 2025
132f282
✨ feat: 방 만들기 모달 연결
danggin Jan 15, 2025
b10326b
🐛 fix: 빌드 에러 수정
danggin Jan 15, 2025
0a93bf1
🐛 fix: 빌드 에러 수정을 위한 폴더명 및 경로 변경
danggin Jan 15, 2025
1d5e364
✏️ typos: 카멜 케이스에 맞춰 폴더명 및 경로 수정
danggin Jan 15, 2025
0c6b495
Merge pull request #14 from danggin/feature/modal
danggin Jan 15, 2025
673c74d
Merge branch 'vsCode-Game:develop' into develop
danggin Jan 15, 2025
830cc7c
Merge pull request #81 from danggin/develop
danggin Jan 15, 2025
432d072
✨ feat: 게임 접속 네트워크 설정
moonhuicheol Jan 15, 2025
b4ffffa
🐛 fix: 푸쉬에러 해결
moonhuicheol Jan 15, 2025
eef22db
Merge branch 'develop' into gameLogic
moonhuicheol Jan 15, 2025
0502d83
🐛 fix: 푸쉬에러
moonhuicheol Jan 15, 2025
2795b58
Merge pull request #23 from moonhuicheol/gameLogic
moonhuicheol Jan 15, 2025
95083df
Merge pull request #83 from moonhuicheol/develop
moonhuicheol Jan 15, 2025
5d99de3
🐛 fix: 모달 방만들기 수정
moonhuicheol Jan 15, 2025
3779ebd
Merge pull request #24 from moonhuicheol/gameLogic
moonhuicheol Jan 15, 2025
6a7e237
Merge pull request #84 from moonhuicheol/develop
moonhuicheol Jan 15, 2025
11a0699
✨ feat: 방만들기, 방접속, 게임 시작 구현
moonhuicheol Jan 15, 2025
884190c
🐛 fix: 푸쉬수정
moonhuicheol Jan 15, 2025
a2f6d30
Merge pull request #25 from moonhuicheol/gameLogic
moonhuicheol Jan 15, 2025
54f37a9
Merge pull request #85 from moonhuicheol/develop
moonhuicheol Jan 15, 2025
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
8 changes: 5 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<link rel="icon" type="image/svg+xml" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite + React + TS</title>
<title>코드네임 다빈치 Codename Davinci</title>
</head>
<body>
<div id="root"></div>
<div id="toast-root"></div>
<div id="modal-root"></div>
<script type="module" src="/src/main.tsx"></script>
</body>
</html>
5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,24 @@
"preview": "vite preview"
},
"dependencies": {
"@hookform/resolvers": "^3.9.1",
"@tanstack/react-query": "4",
"axios": "^1.7.9",
"jwt-decode": "^4.0.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-hook-form": "^7.54.2",
"react-router-dom": "^7.0.2",
"styled-components": "^6.1.13",
"zod": "^3.24.1",
"zustand": "^5.0.2"
},
"devDependencies": {
"@eslint/js": "^9.15.0",
"@types/node": "^22.10.2",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@types/socket.io-client": "^3.0.0",
"@vitejs/plugin-react": "^4.3.4",
"eslint": "^9.15.0",
"eslint-plugin-react-hooks": "^5.0.0",
Expand Down
Binary file added public/favicon.ico
Binary file not shown.
1 change: 0 additions & 1 deletion public/vite.svg

This file was deleted.

11 changes: 4 additions & 7 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
import { Outlet } from "react-router-dom";
import Header from "@components/layout/header/Header";
import Footer from "@components/layout/footer/Footer";
import GlobalStyles from "./styles/GlobalStyle";
import "@styles/font.css";
import GlobalStyles from "./styles/GlobalStyle";
import { RouterProvider } from "react-router-dom";
import { router } from "./routes/router";

function App() {
return (
<>
<GlobalStyles />
<Header />
<Outlet />
<Footer />
<RouterProvider router={router} />
</>
);
}
Expand Down
62 changes: 62 additions & 0 deletions src/api/axios.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import axios from "axios";

export const instance = axios.create({
baseURL: import.meta.env.VITE_BASE_URL,
});

export const authInstance = axios.create({
baseURL: import.meta.env.VITE_BASE_URL,
withCredentials: true,
});

authInstance.interceptors.request.use(
(config) => {
const token = localStorage.getItem("accessToken");
if (token) {
config.headers.Authorization = token; // "Bearer ..." 형태로 저장돼 있다면 그대로 사용
}
return config;
},
(error) => {
return Promise.reject(error);
},
);

authInstance.interceptors.response.use(
(response) => {
// 성공 응답은 그대로 반환
return response;
},
async (error) => {
const originalRequest = error.config;

// 401 && 아직 재시도 안했을 경우
if (
error.response &&
error.response.status === 401 &&
!originalRequest._retry
) {
originalRequest._retry = true;
try {
// Refresh Token으로 새 Access Token 발급
const refreshResponse = await authInstance.post("/auth/refresh");
const { accessToken } = refreshResponse.data;

// 로컬스토리지에 다시 저장
localStorage.setItem("accessToken", accessToken);

// 원래 요청 헤더에 갱신된 토큰 반영
originalRequest.headers.Authorization = accessToken;

// 원래 요청 재시도
return authInstance(originalRequest);
} catch (refreshError) {
// 재발급 실패: 로그인 페이지로 이동 등 처리
// localStorage.clear() 또는 특정 에러 처리
return Promise.reject(refreshError);
}
}

return Promise.reject(error);
},
);
112 changes: 112 additions & 0 deletions src/api/gameRoomApi.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
import { AxiosError } from "axios";
import { authInstance, instance } from "./axios";

export interface IGameRoom {
id: number;
roomName: string;
maxPlayers: number;
currentCount: number;
createdAt: string;
}

export interface IRoomUser {
id: number;
roomId: number;
userId: number;
joinedAt: string;
}

export interface ICreateGameRoomResponse {
room: IGameRoom;
user: IRoomUser;
}

export const getGameRoomsList = async () => {
try {
const { data } = await instance.get("/gameRoom");
return data;
} catch (error) {
const axiosError = error as AxiosError<unknown>;

if (axiosError.response) {
return axiosError.response.data;
}
}
};

export const getGameRoomInfo = async (roomId: number) => {
try {
const response = await authInstance.get(`/gameRoom/${roomId}`);

return response.data;
} catch (error) {
const axiosError = error as AxiosError<unknown>;

if (axiosError.response) {
return axiosError.response.data;
}
}
};

export const createGameRoom = async ({
roomName,
}: {
roomName: string;
}): Promise<ICreateGameRoomResponse> => {
try {
const response = await authInstance.post<ICreateGameRoomResponse>(
"gameRoom/create",
{ roomName },
{
headers: { Authorization: localStorage.getItem("accessToken") },
},
);

return response.data;
} catch (error) {
const axiosError = error as AxiosError<{ message: string }>;

if (
axiosError.response &&
axiosError.response.data &&
axiosError.response.data.message
) {
throw new Error(axiosError.response.data.message);
} else {
throw new Error("게임 방 생성 중 예상치 못한 오류가 발생했습니다.");
}
}
};

export const joinGameRoom = async (gameRoomId: number) => {
try {
const response = await authInstance.post(`/gameRoom/join/${gameRoomId}`);

if (response.status === 200) {
return response.data;
}
if (response.status === 400) {
console.log(response);
throw response;
}
} catch (error: any) {
throw error.response.data;
}
};

export const outGameRoom = async (gameRoomId: number) => {
try {
console.log(gameRoomId, "gameRoomId확인");
const response = await authInstance.delete(`gameRoom/leave/${gameRoomId}`);
console.log(response, "outresponse확인");
if (response.status === 200) {
return response.data;
}
if (response.status === 400) {
console.log(response);
throw response;
}
} catch (error: any) {
throw error.response.data;
}
};
84 changes: 84 additions & 0 deletions src/api/userAuthApi.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
import { authInstance, instance } from "./axios";
import { AxiosError } from "axios";

export interface ILoginResponse {
accessToken: string;
}

export interface IErrorResponse {
status: number;
message: string;
}

export interface ISignUpVariables {
userEmail: string;
password: string;
userNickname: string;
}

export interface ISignUpResponse {
userEmail: string;
password: string;
userNickname: string;
}

export const loginUser = async (logInfo: {
userEmail: string;
password: string;
}): Promise<ILoginResponse> => {
try {
console.log(instance, "인스턴스확인");
const response = await instance.post<ILoginResponse>(
"/auth/login",
logInfo,
{
withCredentials: true,
headers: {
"Content-Type": "application/json",
},
},
);

console.log(response);
return response.data;
} catch (error) {
const axiosError = error as AxiosError<IErrorResponse>;
if (axiosError.response) {
console.log(axiosError.response.data.status);
throw new Error(axiosError.response.data.message); // 에러 메시지 던지기
} else {
throw new Error("로그인 중 예상치 못한 오류가 발생했습니다.");
}
}
};

export const refreshToken = async () => {
try {
const response = await authInstance.post("/auth/refresh");
console.log(response);
const { accessToken } = response.data;

localStorage.setItem("accessToken", accessToken);
return response.data.accessToken;
} catch (error) {
console.log(error);
}
};

export const signUpUser = async (
variables: ISignUpVariables,
): Promise<ISignUpResponse> => {
try {
const response = await instance.post("/user/signup", variables, {
withCredentials: false,
headers: {
"Content-Type": "application/json",
},
});
console.log(response);
return response.data;
} catch (err) {
console.log(err);
throw new Error("회원가입에 실패했습니다.");
}
};
3 changes: 3 additions & 0 deletions src/assets/images/Vector 3.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/assets/images/icon_heart_blue.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/assets/images/icon_heart_red.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/assets/images/icon_medal.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 52 additions & 0 deletions src/assets/images/image_profile_01.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading