feature: improve ui

PHPcomRapadura · Apr 9, 2024 · 13d740f · 13d740f
1 parent 73154e5
commit 13d740f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 17 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -57,14 +57,14 @@ export default function App () {
             path="/auth/otp"
             element={<WaitOneTimePassword />}
           />
+        </Route>
+        <Route
+          element={<ProtectPage />}
+        >
           <Route
-            element={<ProtectPage />}
-          >
-            <Route
-              path="/dashboard"
-              element={<DashboardPage />}
-            />
-          </Route>
+            path="/dashboard"
+            element={<DashboardPage />}
+          />
         </Route>
       </Routes>
     </AppProvider>

diff --git a/src/view/components/game/GamePlaySession.tsx b/src/view/components/game/GamePlaySession.tsx
@@ -7,7 +7,7 @@ import Game from '../../../app/Domain/Game/Game.ts'
 
 import { GamePlaySessionInstruction } from './game-play-session/GamePlaySessionInstruction.tsx'
 import { GamePlaySessionQuestion, GameQuestionAnswerQuestion } from './game-play-session/GamePlaySessionQuestion.tsx'
-import { Case, Switch } from '../general/Switch.tsx'
+import { Case, Match } from '../general/Match.tsx'
 import { Loading } from '../general/Loading.tsx'
 import { AlertWarning } from '../general/Alert.tsx'
 
@@ -79,7 +79,7 @@ export function GamePlaySession ({ game, onStart, onFinish }: GamePlaySessionPro
   }, [status, game, questions])
 
   return (
-    <Switch condition={status}>
+    <Match condition={status}>
       <Case value={GamePlaySessionStatus.WAITING}>
         <Loading />
       </Case>
@@ -120,6 +120,6 @@ export function GamePlaySession ({ game, onStart, onFinish }: GamePlaySessionPro
       <Case value={GamePlaySessionStatus.FINISHED}>
         <AlertWarning />
       </Case>
-    </Switch>
+    </Match>
   )
 }
diff --git a/src/view/components/game/game-play-session/GamePlaySessionQuestion.tsx b/src/view/components/game/game-play-session/GamePlaySessionQuestion.tsx
@@ -4,7 +4,7 @@ import Answer from '../../../../app/Domain/Game/Answer.ts'
 import { shuffle } from '../../../../app/Domain/Util.ts'
 import AnswerStatus from '../../../../app/Domain/Game/AnswerStatus.ts'
 
-import { Case, Switch } from '../../general/Switch.tsx'
+import { Case, Match } from '../../general/Match.tsx'
 
 import {
   GamePlaySessionQuestionCorrect,
@@ -77,10 +77,8 @@ export function GamePlaySessionQuestion (props: GameQuestionProps) {
 
   return (
     <>
-      <Switch condition={status}>
-        <Case
-          value={AnswerStatus.UNANSWERED}
-        >
+      <Match condition={status}>
+        <Case value={AnswerStatus.UNANSWERED}>
           <GamePlaySessionQuestionUnanswered
             text={text}
             options={options}
@@ -100,7 +98,7 @@ export function GamePlaySessionQuestion (props: GameQuestionProps) {
         <Case value={AnswerStatus.CORRECT}>
           <GamePlaySessionQuestionCorrect finishQuestion={finishQuestion} />
         </Case>
-      </Switch>
+      </Match>
     </>
   )
 }
diff --git a/src/view/components/general/Switch.tsx → src/view/components/general/Match.tsx b/src/view/components/general/Switch.tsx → src/view/components/general/Match.tsx
@@ -15,7 +15,7 @@ export type SwitchProps = {
   children: ReactNode[]
 }
 
-export function Switch (props: SwitchProps) {
+export function Match (props: SwitchProps) {
   const { condition, children } = props
   return children.find((child: any) => child.props.value === condition)
 }