Merge branch 'webapp_interface' of https://github.com/Arquisoft/wiq_es6c

into webapp_interface
Arquisoft · Apr 29, 2024 · a45658d · a45658d
2 parents 97fddc2 + 0c925cb
commit a45658d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/webapp/src/components/nav/Nav.js b/webapp/src/components/nav/Nav.js
@@ -30,10 +30,10 @@ export const Nav = () => {
                 <Link to='/history' style={{color:'#0F0F0F', textDecoration: 'none', marginRight: '2vw', fontSize: '1.25rem'}}>
                     Historial
                 </Link>
-                <Link to='/appQuestion' style={{color:'#0F0F0F', textDecoration: 'none', fontSize: '1.25rem'}}>
+                <Link to='/appQuestion' style={{color:'#0F0F0F', textDecoration: 'none', marginRight: '2vw', fontSize: '1.25rem'}}>
                     Almacén de preguntas
                 </Link>
-                <Link to='/users' style={{color:'white', textDecoration: 'none'}}>
+                <Link to='/users' style={{color:'#0F0F0F', textDecoration: 'none', fontSize: '1.25rem'}}>
                     Usuarios
                 </Link>
             </Container>
@@ -44,7 +44,7 @@ export const Nav = () => {
                         <HelpIcon sx={{ color: "#0F0F0F" }}/>
                     </IconButton>
                 </Link>
-                <Link to='/login' style={{color:'white', textDecoration: 'none'}}>
+                <Link to='/' style={{color:'white', textDecoration: 'none'}}>
                     <IconButton size="large" color="inherit" >
                         <LogoutIcon sx={{ color: "#0F0F0F" }}/>
                     </IconButton>

diff --git a/webapp/src/userStats/components/Question.jsx b/webapp/src/userStats/components/Question.jsx
@@ -3,11 +3,13 @@ import React from 'react';
 function Question(props) {
   const { newQuestion } = props;
 
+  console.log(newQuestion)
+
   return (
     <div className='border'>
       <div className='inner'>
         <div className="header">
-        <h4>{newQuestion.title}</h4>
+          <h4>{newQuestion.title}</h4>
         </div>
         <div className='grid'>
           {newQuestion.answers.map((answer, index) => {
@@ -21,6 +23,9 @@ function Question(props) {
             }
           })}
         </div>
+        {newQuestion.ansIndex[0] === -1 ? (
+          <h5 className='noAnswer'>X Sin respuesta</h5>
+        ) : null}
       </div>
     </div>
   );

diff --git a/webapp/src/userStats/css/Game.css b/webapp/src/userStats/css/Game.css
@@ -195,6 +195,10 @@
     gap: 1%;
 }
 
+#history .noAnswer{
+    color: red;
+}
+
 @media (max-width: 720px) {
     #history .game{
         display: grid;