Merge pull request #69 from Arquisoft/UO287747-Develop

Actualización interfaz y preguntas
Arquisoft · Mar 3, 2024 · 593f92c · 593f92c
2 parents c590478 + 15562bc
commit 593f92c
Show file tree

Hide file tree

Showing 17 changed files with 558 additions and 157 deletions.
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
diff --git a/webapp/package.json b/webapp/package.json
@@ -6,6 +6,7 @@
     "@emotion/react": "^11.11.3",
     "@emotion/styled": "^11.11.0",
     "@mui/material": "^5.15.3",
+    "@mui/icons-material": "^5.15.3",
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^14.1.2",
     "@testing-library/user-event": "^14.5.2",

diff --git a/webapp/src/App.js b/webapp/src/App.js
@@ -1,7 +1,9 @@
 import { useState } from 'react'
 
+import Nav from './components/Nav'
 import { Start } from './components/Start'
 import { Game } from './components/Game'
+import { PostGame } from './components/PostGame'
 import { Participation } from './components/Participation'
 import User from './components/User'
 
@@ -15,9 +17,11 @@ function App() {
   return (
     <>
       {menuState === 0 && <User goTo={(x) => goTo(x)}/>}
+      {menuState > 0 && <Nav goTo={(x) => goTo(x)}/>}
       {menuState === 1 && <Start goTo={(x) => goTo(x)}/>}
       {menuState === 2 && <Game goTo={(x) => goTo(x)}/>}
-      {menuState === 3 && <Participation goTo={(x) => goTo(x)}/>}
+      {menuState === 3 && <PostGame />}
+      {menuState === 4 && <Participation goTo={(x) => goTo(x)}/>}
     </>
   )
 }