Merge pull request #100 from boostcampwm2023/feat/scoreboard/ui

Feat/scoreboard/UI : ScoreBoard UI
boostcampwm2023 · Nov 28, 2023 · e027ab1 · e027ab1
2 parents 986db77 + c2ceee5
commit e027ab1
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 23 deletions.
diff --git a/client/src/components/ScoreBoardModal/Players.tsx b/client/src/components/ScoreBoardModal/Players.tsx
@@ -1,11 +1,11 @@
 import { PlayerScoreType } from '../../types/ScoreType';
-import { Result } from './Result';
+import Result from './Result';
 
 interface PlayersProps {
   playerScore: PlayerScoreType;
 }
 
-export function Players({ playerScore }: PlayersProps) {
+export default function Players({ playerScore }: PlayersProps) {
   return (
     <li className="flex flex-row gap-3 bg-aod_bg px-5 py-2.5 text-aod_text odd:bg-aod_text_alt odd:text-aod_gutter">
       <div>{playerScore.name}</div>

diff --git a/client/src/components/ScoreBoardModal/Result.tsx b/client/src/components/ScoreBoardModal/Result.tsx
@@ -6,7 +6,7 @@ interface ResultProps {
   result: ResultType;
 }
 
-export function Result({ result }: ResultProps) {
+export default function Result({ result }: ResultProps) {
   return (
     <div className="flex flex-1 flex-row justify-around">
       {result === ResultType.CORRECT ? (

diff --git a/client/src/components/ScoreBoardModal/ScoreBoard.tsx b/client/src/components/ScoreBoardModal/ScoreBoard.tsx
@@ -1,16 +1,16 @@
 import { ScoreType } from '../../types/ScoreType';
-import { Players } from './Players';
+import Players from './Players';
 
 interface ScoreBoardProps {
-    scores: ScoreType;
+  scores: ScoreType;
 }
 
-export function ScoreBoard({ scores }: ScoreBoardProps) {
-    return (
-        <ul className="my-5 flex w-full flex-col overflow-auto text-sm font-medium text-aod_text">
-            {scores.players.map((playerScore, index) => (
-                <Players key={index} playerScore={playerScore} />
-            ))}
-        </ul>
-    );
+export default function ScoreBoard({ scores }: ScoreBoardProps) {
+  return (
+    <ul className="my-5 flex w-full flex-col overflow-auto text-sm font-medium text-aod_text">
+      {scores.players.map((playerScore, index) => (
+        <Players key={index} playerScore={playerScore} />
+      ))}
+    </ul>
+  );
 }
diff --git a/client/src/components/ScoreBoardModal/ScoreBoardModal.tsx b/client/src/components/ScoreBoardModal/ScoreBoardModal.tsx
@@ -1,9 +1,8 @@
 import { ResultType, ScoreType } from '../../types/ScoreType';
 import mockScoresData from '../../../public/mocks/Scores.json';
-import { ScoreBoard } from './ScoreBoard';
+import ScoreBoard from './ScoreBoard';
 import { FaChartSimple } from 'react-icons/fa6';
 
-
 const mockScores: ScoreType = {
   players: mockScoresData.players.map((player) => ({
     ...player,
@@ -28,5 +27,3 @@ export default function ScoreBoardModal() {
     </div>
   );
 }
-
-
diff --git a/client/src/routes.tsx b/client/src/routes.tsx
@@ -6,7 +6,6 @@ import Home from './pages/Home.tsx';
 import NotFound from './pages/NotFound.tsx';
 import Lobby from './pages/Lobby.tsx';
 import Room from './pages/Room.tsx';
-import ScoreBoardModal from './components/ScoreBoardModal/ScoreBoardModal.tsx';
 
 export const router = createBrowserRouter([
   {
@@ -35,11 +34,6 @@ export const router = createBrowserRouter([
           </ProtectedRoute>
         ),
       },
-      // ScoreBoardModal
-      {
-          path: '/scoreboard',
-          element: <ScoreBoardModal />,
-      },
     ],
   },
 ]);