Merge remote-tracking branch 'origin/master' into sergio

Arquisoft · May 2, 2024 · 41b494c · 41b494c
2 parents 7490301 + f2c382b
commit 41b494c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/gatewayservice/gateway-service.js b/gatewayservice/gateway-service.js
@@ -8,6 +8,7 @@ const fs = require("fs")
 const YAML = require('yaml')
 
 const app = express();
+app.disable("x-powered-by");
 const port = 8000;
 
 const authServiceUrl = process.env.AUTH_SERVICE_URL || 'http://localhost:8002';

diff --git a/webapp/src/components/Game.js b/webapp/src/components/Game.js
@@ -137,10 +137,10 @@ const Game = ({ username, totalQuestions, timeLimit, themes }) => {
 
             // Después de 3 segundos, restablecer la selección y pasar a la siguiente pregunta
             setTimeout(async() => {
+                setNumberClics(numberClics + 1);
                 await obtenerPreguntaAleatoria();
                 setSelectedOption(null);
                 await addGeneratedQuestionBody();
-                setNumberClics(numberClics + 1);
                 setSelectedAnswer('');
             }, delayBeforeNextQuestion);
         }
@@ -177,14 +177,14 @@ const Game = ({ username, totalQuestions, timeLimit, themes }) => {
             }
         };
 
-        if ((timer >= timeLimit || numberClics === totalQuestions - 1)&& !almacenado) {
+        if ((timer >= timeLimit || finished)&& !almacenado) {
             (async () => {
                 await addRecord();
                 await updateRanking();
             })();
             setAlmacenado(true);
         }
-    }, [timer, numberClics, totalQuestions, timeLimit, almacenado, apiEndpoint, correctQuestions, username, setError]);
+    }, [timer, finished, totalQuestions, timeLimit, almacenado, apiEndpoint, correctQuestions, username, setError, themes, setThemesSelected ]);
 
     if(isNaN(totalQuestions)){
         totalQuestions=10;
@@ -195,7 +195,7 @@ const Game = ({ username, totalQuestions, timeLimit, themes }) => {
 
     return (
         <Container maxWidth="lg">
-            {numberClics >= totalQuestions || timer >= timeLimit ? (
+            {(numberClics >= totalQuestions || timer >= timeLimit) && almacenado? (
                 <div style={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }}>
                     <Typography sx={{ mt: 4, mb: 2 }} variant="h6" component="div">
                         ¡Gracias por jugar!

diff --git a/webapp/src/components/GameSettings.js b/webapp/src/components/GameSettings.js
@@ -66,10 +66,10 @@ const GameSettings = ({ setSettings, currentUser }) => {
             return;
         }
         setIsWarningSecsVisible(false);
-        if (newValue === 60 ) {
-            if(totalMins === 10) {
-                return;
-            }
+        if(totalMins === 20) {
+            return;
+        }
+        if (newValue === 60 ) {            
             setTotalSecs(0);
             setTotalMins((totalMins) => totalMins + 1);
         }else {