diff --git a/.pnp.cjs b/.pnp.cjs index c336fd11..ae77bb23 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -7620,6 +7620,7 @@ const RAW_RUNTIME_STATE = ["typescript", "patch:typescript@npm%3A5.6.3#optional!builtin::version=5.6.3&hash=8c6c40"],\ ["typescript-eslint", "virtual:a315446cd0626d69c81bb371962241fad2e843699b8251d1a49a3231d7821af7bdb2285677102303361c3219ca15ceeabaa438b7b5ead02c2587180fe2eace6b#npm:8.12.2"],\ ["vite", "virtual:a315446cd0626d69c81bb371962241fad2e843699b8251d1a49a3231d7821af7bdb2285677102303361c3219ca15ceeabaa438b7b5ead02c2587180fe2eace6b#npm:5.4.10"],\ + ["vite-plugin-remove-console", "npm:2.2.0"],\ ["vite-plugin-svgr", "virtual:a315446cd0626d69c81bb371962241fad2e843699b8251d1a49a3231d7821af7bdb2285677102303361c3219ca15ceeabaa438b7b5ead02c2587180fe2eace6b#npm:4.3.0"],\ ["vite-tsconfig-paths", "virtual:a315446cd0626d69c81bb371962241fad2e843699b8251d1a49a3231d7821af7bdb2285677102303361c3219ca15ceeabaa438b7b5ead02c2587180fe2eace6b#npm:5.1.0"],\ ["zustand", "virtual:a315446cd0626d69c81bb371962241fad2e843699b8251d1a49a3231d7821af7bdb2285677102303361c3219ca15ceeabaa438b7b5ead02c2587180fe2eace6b#npm:5.0.1"]\ @@ -13761,6 +13762,15 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["vite-plugin-remove-console", [\ + ["npm:2.2.0", {\ + "packageLocation": "./.yarn/cache/vite-plugin-remove-console-npm-2.2.0-28ddb95349-b97e77f68e.zip/node_modules/vite-plugin-remove-console/",\ + "packageDependencies": [\ + ["vite-plugin-remove-console", "npm:2.2.0"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["vite-plugin-svgr", [\ ["npm:4.3.0", {\ "packageLocation": "./.yarn/cache/vite-plugin-svgr-npm-4.3.0-ded8bb690b-a73f10d319.zip/node_modules/vite-plugin-svgr/",\ diff --git a/.yarn/cache/@esbuild-win32-x64-npm-0.21.5-eddc2b5ad6-10c0.zip b/.yarn/cache/@esbuild-darwin-arm64-npm-0.21.5-62349c1520-10c0.zip similarity index 56% rename from .yarn/cache/@esbuild-win32-x64-npm-0.21.5-eddc2b5ad6-10c0.zip rename to .yarn/cache/@esbuild-darwin-arm64-npm-0.21.5-62349c1520-10c0.zip index f30aacde..a5230f92 100644 Binary files a/.yarn/cache/@esbuild-win32-x64-npm-0.21.5-eddc2b5ad6-10c0.zip and b/.yarn/cache/@esbuild-darwin-arm64-npm-0.21.5-62349c1520-10c0.zip differ diff --git a/.yarn/cache/@rollup-rollup-darwin-arm64-npm-4.24.3-90e2f8af54-10c0.zip b/.yarn/cache/@rollup-rollup-darwin-arm64-npm-4.24.3-90e2f8af54-10c0.zip new file mode 100644 index 00000000..cc01d339 Binary files /dev/null and b/.yarn/cache/@rollup-rollup-darwin-arm64-npm-4.24.3-90e2f8af54-10c0.zip differ diff --git a/.yarn/cache/@rollup-rollup-win32-x64-msvc-npm-4.24.3-7a36666962-10c0.zip b/.yarn/cache/@rollup-rollup-win32-x64-msvc-npm-4.24.3-7a36666962-10c0.zip deleted file mode 100644 index c6897359..00000000 Binary files a/.yarn/cache/@rollup-rollup-win32-x64-msvc-npm-4.24.3-7a36666962-10c0.zip and /dev/null differ diff --git a/.yarn/cache/vite-plugin-remove-console-npm-2.2.0-28ddb95349-b97e77f68e.zip b/.yarn/cache/vite-plugin-remove-console-npm-2.2.0-28ddb95349-b97e77f68e.zip new file mode 100644 index 00000000..88bb3788 Binary files /dev/null and b/.yarn/cache/vite-plugin-remove-console-npm-2.2.0-28ddb95349-b97e77f68e.zip differ diff --git a/packages/frontend/package.json b/packages/frontend/package.json index ef9422e9..2c5d0bbc 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -41,6 +41,7 @@ "typescript": "^5.6.3", "typescript-eslint": "^8.11.0", "vite": "^5.4.10", + "vite-plugin-remove-console": "^2.2.0", "vite-plugin-svgr": "^4.3.0", "vite-tsconfig-paths": "^5.1.0" } diff --git a/packages/frontend/src/components/gamePage/leftSection/MainDisplay.tsx b/packages/frontend/src/components/gamePage/leftSection/MainDisplay.tsx index a1818cad..891cb048 100644 --- a/packages/frontend/src/components/gamePage/leftSection/MainDisplay.tsx +++ b/packages/frontend/src/components/gamePage/leftSection/MainDisplay.tsx @@ -73,94 +73,101 @@ export default function MainDisplay() { }; return (
- + {gamePhase === GAME_PHASE.SPEAKING && ( +
+ +
+ )} -
- {gamePhase === GAME_PHASE.WAITING && ( -
- {isHost ? : } +
+
+
+
- )} - - {gamePhase === GAME_PHASE.COUNTDOWN && } + {gamePhase === GAME_PHASE.SPEAKING && ( +
+ 📢 {currentSpeaker} +
+ )} +
- {gamePhase === GAME_PHASE.SPEAKING && ( -
-
- +
+ {gamePhase === GAME_PHASE.WAITING && ( +
+ {isHost ? : }
-
- 📢 {currentSpeaker} + )} + {gamePhase === GAME_PHASE.COUNTDOWN && } + {gamePhase === GAME_PHASE.VOTING && ( + + )} + {gamePhase === GAME_PHASE.VOTING_RESULT && ( + + )} + {gamePhase === GAME_PHASE.GUESSING && ( +
+ {isPinoco ? ( + + ) : ( +

+ 피노코가 제시어를 추측 중입니다 🤔 +

+ )}
- {currentSpeaker === userId && ( + )} + {gamePhase === GAME_PHASE.ENDING && } +
+ +
+ {gamePhase === GAME_PHASE.SPEAKING && currentSpeaker === userId && ( +
- )} -
- )} - - {gamePhase === GAME_PHASE.VOTING && ( - - )} - - {gamePhase === GAME_PHASE.VOTING_RESULT && ( - - )} - {gamePhase === GAME_PHASE.GUESSING && ( -
- {isPinoco ? ( - - ) : ( -

- 피노코가 제시어를 추측 중입니다 🤔 -

- )} -
- )} - - {gamePhase === GAME_PHASE.ENDING && } -
- - {gamePhase === GAME_PHASE.SPEAKING && ( -
- endSpeaking(userId!)} /> -
- )} +
+ )} - {gamePhase === GAME_PHASE.VOTING && ( -
- + {(gamePhase === GAME_PHASE.SPEAKING || gamePhase === GAME_PHASE.VOTING) && ( +
+ endSpeaking(userId!) : handleVote + } + /> +
+ )}
- )} +
); } diff --git a/packages/frontend/src/components/gamePage/leftSection/WordDisplay.tsx b/packages/frontend/src/components/gamePage/leftSection/WordDisplay.tsx index c48570ad..6ae662be 100644 --- a/packages/frontend/src/components/gamePage/leftSection/WordDisplay.tsx +++ b/packages/frontend/src/components/gamePage/leftSection/WordDisplay.tsx @@ -34,7 +34,7 @@ export default function WordDisplay({ className={`${ gamePhase === GAME_PHASE.WORD_REVEAL ? 'fixed inset-0 flex items-center justify-center bg-black/50 z-50' - : 'absolute left-4 top-4 p-2 bg-black rounded-lg' + : 'absolute top-14 p-2 bg-black rounded-lg' }`} >