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

토이프로젝트2 4조 MAFIA 게임 #11

Open
wants to merge 185 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
185 commits
Select commit Hold shift + click to select a range
05f5504
📝Chore: initial commit
noSPkeepgoing Nov 8, 2023
8e48ca5
📝Chore: initial commit
noSPkeepgoing Nov 8, 2023
cdcd111
📄Docs: add pr template
noSPkeepgoing Nov 8, 2023
7d47efb
📄Docs: issue_template
noSPkeepgoing Nov 8, 2023
721c01d
✨ Feat: add pocketRequest.ts in api
NamgungJongMin Nov 8, 2023
b931558
Merge branch 'Y_FE_Toy2_Team4' into develop
noSPkeepgoing Nov 9, 2023
54634a1
:lipstick:Design: Set normalize.scss
NamgungJongMin Nov 9, 2023
61bf1a4
Merge pull request #1 from NamgungJongMin/develop
noSPkeepgoing Nov 9, 2023
6c51ce1
Merge remote-tracking branch 'dev/Y_FE_Toy2_Team4' into feature/vote
noSPkeepgoing Nov 9, 2023
9744a52
💄Design: add stylesheet for Header
noSPkeepgoing Nov 9, 2023
afe55bf
✨Feat: show ghost list for vote
noSPkeepgoing Nov 9, 2023
61664f8
💄Design: add stylesheet for vote page with dummy data
noSPkeepgoing Nov 9, 2023
adf8ee9
Merge branch 'feature/vote' into develop
noSPkeepgoing Nov 9, 2023
de0e235
📄Docs: change file name
noSPkeepgoing Nov 10, 2023
3978157
📄Docs: change file name
noSPkeepgoing Nov 10, 2023
3f47eb6
📄Docs: change file name
noSPkeepgoing Nov 10, 2023
c7574f9
🚑Fix: import error
noSPkeepgoing Nov 10, 2023
ca8eea9
Merge pull request #2 from noSPkeepgoing/develop
noSPkeepgoing Nov 10, 2023
2c91cd7
💄Design: add stylesheet for hanging page
noSPkeepgoing Nov 11, 2023
5af6497
:lipstick:Design: add header components & style
NamgungJongMin Nov 12, 2023
d650a90
:sparkles: Feat:Chat.tsx
jinjoo-jung Nov 12, 2023
04a41bd
📄Docs: change file structure
noSPkeepgoing Nov 13, 2023
6fad26f
Merge branch 'feature/hanging' into develop
noSPkeepgoing Nov 13, 2023
a767f98
✨Feat: add signin
Nov 13, 2023
1057ba0
✨Feat: add signup
Nov 14, 2023
19a6336
🎨 minor style change
Nov 14, 2023
fbe9f73
💄Design: add check icon on vote page
noSPkeepgoing Nov 14, 2023
8b72cbb
:hammer:Refactor: modify pocketRequest
NamgungJongMin Nov 14, 2023
6d80091
:sparkles:Feat: add lobby page
NamgungJongMin Nov 14, 2023
dd4625f
:ambulance:Fix: reconfigure setting file
NamgungJongMin Nov 14, 2023
422b6ec
:sparkles: Feat: add Chat.tsx
jinjoo-jung Nov 14, 2023
f28f53c
:sparkles:Feat: Add role page
NamgungJongMin Nov 14, 2023
18aa385
Merge branch 'feature/lobby' into develop
NamgungJongMin Nov 14, 2023
935eaef
"🎨 Style : style"
Nov 14, 2023
5d67aa9
Merge pull request #3 from KSJT/develop
noSPkeepgoing Nov 14, 2023
b4dafb9
Merge branch 'Y_FE_Toy2_Team4' into develop
noSPkeepgoing Nov 14, 2023
5b83c4c
Merge pull request #5 from NamgungJongMin/develop
noSPkeepgoing Nov 14, 2023
e6dd42c
merge branch 'develop' of https://github.com/noSPkeepgoing/Mafia-team…
Nov 14, 2023
8c6ca82
💄Design: add styles on hanging page
noSPkeepgoing Nov 14, 2023
2e5ceef
Merge remote-tracking branch 'dev/Y_FE_Toy2_Team4' into feature/hanging
noSPkeepgoing Nov 14, 2023
3cf95db
Merge branch 'Y_FE_Toy2_Team4' of https://github.com/noSPkeepgoing/Ma…
Nov 14, 2023
72306e4
Merge branch 'develop' of https://github.com/noSPkeepgoing/Mafia-team…
Nov 14, 2023
836740c
Merge branch 'Y_FE_Toy2_Team4' of https://github.com/noSPkeepgoing/Ma…
Nov 14, 2023
6e677d3
✨Feat: add global variable
Nov 14, 2023
f6044e9
💄Design: design fix
Nov 15, 2023
38c2cec
🎨 Style: fix style
Nov 15, 2023
ecdc051
Merge branch 'develop' of https://github.com/KSJT/Mafia into develop
Nov 15, 2023
4aa17cc
Merge branch 'feature/hanging' into develop
noSPkeepgoing Nov 15, 2023
1211ee8
Merge pull request #6 from KSJT/develop
noSPkeepgoing Nov 15, 2023
a49bcac
Merge remote-tracking branch 'dev/Y_FE_Toy2_Team4' into develop
noSPkeepgoing Nov 15, 2023
a9a379b
Merge pull request #7 from noSPkeepgoing/develop
noSPkeepgoing Nov 15, 2023
8a7a1c3
"🎨 Style: fix style"
Nov 15, 2023
8389125
Merge branch 'Y_FE_Toy2_Team4' of https://github.com/noSPkeepgoing/Ma…
Nov 15, 2023
e7576f8
🚑 Fix: fix merge accident
Nov 15, 2023
e197c21
Merge remote-tracking branch 'upstream/Y_FE_Toy2_Team4' into feature/…
jinjoo-jung Nov 15, 2023
e485e5e
:art:Style: modify styles
NamgungJongMin Nov 15, 2023
f36f51d
:mag:Test: tmp commit for testing api
NamgungJongMin Nov 15, 2023
20770e2
✨Feat: show user list with api
noSPkeepgoing Nov 15, 2023
fd3f22c
💄Design: change vote page UI
noSPkeepgoing Nov 15, 2023
e271596
Merge branch 'Y_FE_Toy2_Team4' of https://github.com/noSPkeepgoing/Ma…
NamgungJongMin Nov 15, 2023
0587bb9
✨Feat: add vote feature
noSPkeepgoing Nov 15, 2023
0632d68
Merge branch 'feature/vote' into develop
noSPkeepgoing Nov 15, 2023
d794632
💄Design: add stylesheet for night page
noSPkeepgoing Nov 15, 2023
254e0b2
✨Feat: add result
Nov 15, 2023
d82b935
:ambulance:Fix: modify router setting
NamgungJongMin Nov 15, 2023
3a65468
:hammer:Refactor: modify api logic
NamgungJongMin Nov 15, 2023
3f88435
:sparkles:Feat: add feature of request to api
NamgungJongMin Nov 15, 2023
7d9c3a3
:sparkles:Feat: add redux-toolkit userInfo slice
NamgungJongMin Nov 15, 2023
3d56dc0
:mag:Test: test code
NamgungJongMin Nov 15, 2023
e4531b7
Merge pull request #8 from KSJT/develop
noSPkeepgoing Nov 15, 2023
f358962
Merge pull request #9 from NamgungJongMin/develop
noSPkeepgoing Nov 15, 2023
e342ee6
Merge remote-tracking branch 'dev/Y_FE_Toy2_Team4' into feature/gameh…
noSPkeepgoing Nov 15, 2023
07c8d52
Merge remote-tracking branch 'upstream/Y_FE_Toy2_Team4' into feature/…
jinjoo-jung Nov 15, 2023
e99f0c1
:ambulance:Fix: fix way to insert query string
NamgungJongMin Nov 15, 2023
570ad37
Merge pull request #10 from NamgungJongMin/develop
noSPkeepgoing Nov 15, 2023
70e8b4d
Merge remote-tracking branch 'dev/Y_FE_Toy2_Team4' into feature/gameh…
noSPkeepgoing Nov 15, 2023
8df7f15
💄Design: fix design
Nov 15, 2023
07f5b99
Merge branch 'Y_FE_Toy2_Team4' of https://github.com/noSPkeepgoing/Ma…
Nov 15, 2023
5c33df9
:sparkles: Feat: Add Chat.tsx
jinjoo-jung Nov 15, 2023
7fe4633
Merge branch 'feature/chat' into develop
jinjoo-jung Nov 15, 2023
4ab3996
:sparkles: Feat: add Chat.tsx
jinjoo-jung Nov 15, 2023
e08ec5f
✨Feat: add timer
noSPkeepgoing Nov 16, 2023
6dd40e1
Merge branch 'feature/gameheader' into develop
noSPkeepgoing Nov 16, 2023
422db36
Merge branch 'develop' into feature/hanging
noSPkeepgoing Nov 16, 2023
32a3fc3
:ambulance:Fix: fix navigate url error
noSPkeepgoing Nov 16, 2023
b71d262
:hammer:Refactor: refactor random util function
NamgungJongMin Nov 16, 2023
f0742f9
:sparkles:Feat: apply new util function
NamgungJongMin Nov 16, 2023
0b8bb4c
Merge pull request #11 from KSJT/develop
noSPkeepgoing Nov 16, 2023
73a9559
Merge branch 'Y_FE_Toy2_Team4' of https://github.com/noSPkeepgoing/Ma…
NamgungJongMin Nov 16, 2023
43f8e60
Merge pull request #12 from jinjoo-jung/develop
noSPkeepgoing Nov 16, 2023
1278fc0
Merge branch 'Y_FE_Toy2_Team4' of https://github.com/noSPkeepgoing/Ma…
NamgungJongMin Nov 16, 2023
64428bd
Merge pull request #13 from NamgungJongMin/develop
noSPkeepgoing Nov 16, 2023
d2e6b04
Merge remote-tracking branch 'dev/Y_FE_Toy2_Team4' into feature/hanging
noSPkeepgoing Nov 16, 2023
aa067b1
💄Design: final
Nov 16, 2023
8d952bc
Design: design fix
Nov 16, 2023
ab314ee
update docs
Nov 16, 2023
255493a
Merge pull request #14 from KSJT/develop
noSPkeepgoing Nov 16, 2023
a3e0b36
Merge remote-tracking branch 'dev/Y_FE_Toy2_Team4' into feature/hanging
noSPkeepgoing Nov 16, 2023
8402026
design: final design fix
Nov 16, 2023
c233261
design: done
Nov 16, 2023
cb75a50
💄Design: add reset page
noSPkeepgoing Nov 16, 2023
ab7103c
design: done
Nov 16, 2023
f254030
:sparkles: Feat: page link
noSPkeepgoing Nov 16, 2023
53f42cb
Merge branch 'feature/hanging' into develop
noSPkeepgoing Nov 16, 2023
23fa9d2
Merge pull request #15 from KSJT/develop
noSPkeepgoing Nov 16, 2023
0689687
Merge pull request #16 from noSPkeepgoing/develop
noSPkeepgoing Nov 16, 2023
e644228
Fix: url fix
Nov 16, 2023
2da464b
Merge pull request #17 from KSJT/develop
noSPkeepgoing Nov 16, 2023
ff1eb3a
:ambulance:Fix: fix blink on hanging page
noSPkeepgoing Nov 16, 2023
c75a589
:sparkles: Feat: add reset page
noSPkeepgoing Nov 16, 2023
542653c
Merge pull request #18 from noSPkeepgoing/develop
noSPkeepgoing Nov 16, 2023
dc26359
:memo: Update: Chat.tsx
jinjoo-jung Nov 16, 2023
184b706
Merge remote-tracking branch 'upstream/Y_FE_Toy2_Team4' into develop
jinjoo-jung Nov 16, 2023
ea87308
Merge pull request #19 from noSPkeepgoing/develop
noSPkeepgoing Nov 16, 2023
036b070
:memo: Update: ChatHeader.tsx
jinjoo-jung Nov 16, 2023
1789701
Merge pull request #20 from noSPkeepgoing/develop
noSPkeepgoing Nov 16, 2023
de6cde9
:memo:Chore: set electron development environment
NamgungJongMin Nov 16, 2023
25c33aa
update
NamgungJongMin Nov 16, 2023
9c87141
delete .env
NamgungJongMin Nov 16, 2023
0717428
Merge pull request #22 from NamgungJongMin/develop
noSPkeepgoing Nov 16, 2023
6dc3816
Style: type done
Nov 17, 2023
018487c
Style: util func type
Nov 17, 2023
267dae8
Merge pull request #23 from KSJT/develop
noSPkeepgoing Nov 17, 2023
a72e755
:hammer:Refactor: add optional parameter in pocket
NamgungJongMin Nov 17, 2023
d5a1538
:ambulance:Fix: fix way to dispatch getUserInfo
NamgungJongMin Nov 17, 2023
a07cd44
:hammer:Refactor: move userImg & style
NamgungJongMin Nov 17, 2023
8ba1fc6
Merge pull request #24 from NamgungJongMin/develop
noSPkeepgoing Nov 17, 2023
683f525
:ambulance:Fix: fix initial player number
noSPkeepgoing Nov 17, 2023
4d2726d
:page_facing_up: Docs: add chat component folder
noSPkeepgoing Nov 17, 2023
dce6411
:ambulance: Fix: fix type error on ChatItem.tsx
noSPkeepgoing Nov 17, 2023
ceb08ca
:sparkles: Feat: add game start feature
noSPkeepgoing Nov 17, 2023
0fd7eb9
:art: Style: change style on chat page with scss
noSPkeepgoing Nov 17, 2023
1209d7b
💄Design: change chat header stylesheet
noSPkeepgoing Nov 17, 2023
88118e0
Merge branch 'feature/chat' into develop
noSPkeepgoing Nov 17, 2023
5128760
:ambulance: Fix: fix 404 error on vote page
noSPkeepgoing Nov 17, 2023
dd6fd48
:sparkles: Feat: show player name on result page
noSPkeepgoing Nov 17, 2023
3ad8166
Merge branch 'feature/credits' into develop
noSPkeepgoing Nov 17, 2023
f4b671f
Merge pull request #25 from noSPkeepgoing/develop
noSPkeepgoing Nov 17, 2023
ea3836e
style
Nov 18, 2023
f03892b
Merge branch 'Y_FE_Toy2_Team4' of https://github.com/noSPkeepgoing/Ma…
Nov 18, 2023
b68d8db
Style
Nov 18, 2023
eb4f2f3
error console
Nov 18, 2023
d4b397c
design
Nov 18, 2023
8067804
delete comment
Nov 18, 2023
5320524
add signup profile validation
Nov 18, 2023
e6b709a
Merge pull request #26 from KSJT/develop
NamgungJongMin Nov 18, 2023
ae4080c
:lipstick:Design: hide scroll bar
NamgungJongMin Nov 18, 2023
5b71fe6
Merge pull request #27 from NamgungJongMin/develop
NamgungJongMin Nov 18, 2023
7eec5ef
:sparkles: Feat: add leave chat room feature
noSPkeepgoing Nov 18, 2023
0b02f85
Merge pull request #28 from noSPkeepgoing/develop
noSPkeepgoing Nov 18, 2023
f3397fb
:memo: Update: chatItem.moduel.scss
jinjoo-jung Nov 18, 2023
7649b30
:ambulance: Fix: fix type error on result
noSPkeepgoing Nov 18, 2023
acd8105
Merge pull request #29 from noSPkeepgoing/develop
noSPkeepgoing Nov 18, 2023
dafdc8a
:ambulance:Fix: fix logic to check mafia
NamgungJongMin Nov 18, 2023
c9620ee
Merge branch 'Y_FE_Toy2_Team4' of https://github.com/noSPkeepgoing/Ma…
NamgungJongMin Nov 18, 2023
feade03
Merge pull request #30 from NamgungJongMin/develop
noSPkeepgoing Nov 18, 2023
b2142e4
:page_facing_up: Docs: update README
noSPkeepgoing Nov 18, 2023
5a3a6c0
Merge pull request #31 from noSPkeepgoing/develop
noSPkeepgoing Nov 18, 2023
d7d4a8a
Revert ":memo: Update: chatItem.moduel.scss"
jinjoo-jung Nov 18, 2023
2f3beda
Merge remote-tracking branch 'upstream/develop' into chat
jinjoo-jung Nov 18, 2023
4a95a33
:lipstick:Design: add animation moving moon
NamgungJongMin Nov 18, 2023
fbdf9ea
Merge branch 'develop' of https://github.com/noSPkeepgoing/Mafia-team…
NamgungJongMin Nov 18, 2023
c903747
Merge branch 'Y_FE_Toy2_Team4' of https://github.com/noSPkeepgoing/Ma…
NamgungJongMin Nov 18, 2023
10a89a3
Merge pull request #32 from NamgungJongMin/develop
NamgungJongMin Nov 18, 2023
dacfc56
:ambulance:Fix: fix typescript error
NamgungJongMin Nov 18, 2023
629841f
Merge branch 'develop' of https://github.com/noSPkeepgoing/Mafia-team…
NamgungJongMin Nov 18, 2023
2ef199d
Merge pull request #33 from NamgungJongMin/develop
NamgungJongMin Nov 18, 2023
e5e892b
:hammer:Refactor: delete react import
NamgungJongMin Nov 18, 2023
dc9359e
Merge branch 'develop' of https://github.com/noSPkeepgoing/Mafia-team…
NamgungJongMin Nov 18, 2023
a9848fe
Merge pull request #34 from NamgungJongMin/develop
NamgungJongMin Nov 18, 2023
08207f1
Design: chatItem.module.scss
jinjoo-jung Nov 18, 2023
4151c4e
Merge branch 'develop' of https://github.com/noSPkeepgoing/Mafia-team…
jinjoo-jung Nov 18, 2023
c295342
Merge pull request #1 from jinjoo-jung/chat
jinjoo-jung Nov 18, 2023
9872b9f
:ambulance:Fix: fix game start error
noSPkeepgoing Nov 18, 2023
6c54b10
:ambulance:Fix: fix typo
noSPkeepgoing Nov 18, 2023
157a85d
:ambulance:Fix: fix page link error
noSPkeepgoing Nov 18, 2023
75d8edb
Update ico
NamgungJongMin Nov 18, 2023
6cecc44
Merge pull request #35 from NamgungJongMin/develop
NamgungJongMin Nov 18, 2023
3a36d99
Update README.md
NamgungJongMin Nov 18, 2023
db3e518
Update README.md
NamgungJongMin Nov 18, 2023
7c07927
Update README.md
NamgungJongMin Nov 18, 2023
3d72c04
Update README.md
NamgungJongMin Nov 18, 2023
f5b2db9
Update README.md
jinjoo-jung Nov 18, 2023
b68b274
Update README.md
jinjoo-jung Nov 18, 2023
0fa870f
Merge pull request #36 from noSPkeepgoing/develop
noSPkeepgoing Nov 18, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
module.exports = {
root: true,
env: { browser: true, es2020: true },
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended',
'plugin:react-hooks/recommended',
],
ignorePatterns: ['dist', '.eslintrc.cjs'],
parser: '@typescript-eslint/parser',
plugins: ['react-refresh'],
rules: {
'react-refresh/only-export-components': [
'warn',
{ allowConstantExport: true },
],
},
}
9 changes: 9 additions & 0 deletions .github/issue_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
## 목적

## 세부 내용

## TODO
- [ ]

## ETC

13 changes: 13 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
## 작업 개요 (이슈 번호)

## 작업 내용 (변경 사항)

## 스크린샷

## 테스트 결과

## 리뷰 요청 사항

## Check list
- [ ] 테스트 통과
- [ ] 문서 업데이트
34 changes: 34 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

node_modules
dist
dist-ssr
dist-electron
release
*.local

# Editor directories and files
.vscode/.debug.env
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
.env

#lockfile
package-lock.json
pnpm-lock.yaml
yarn.lock
/test-results/
/playwright-report/
/playwright/.cache/
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
shamefully-hoist=true
12 changes: 12 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"printWidth": 80,
"singleQuote": true,
"trailingComma": "all",
"tabWidth": 2,
"bracketSameLine": true,
"orderedImports": true,
"bracketSpacing": true,
"jsxBracketSameLine": true,
"arrowParens": "always",
"endOfLine": "lf"
}
Loading