Merge branch 'newDevelop' of https://github.com/Arquisoft/wiq_es05a i…

…nto newDevelop
Arquisoft · Apr 30, 2024 · 51b3047 · 51b3047
2 parents 93c7e4e + 764290c
commit 51b3047
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 25 deletions.
diff --git a/.env b/.env
@@ -0,0 +1 @@
+teamname="wiq_es05a"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,8 +4,9 @@ on:
     branches:
       - master
       - develop
+      - newDevelop
       - LaraFMz
-      - Pablo-Arreglos
+      - Pablo-AjustesFinales
       - jota
   pull_request:
     types: [opened, synchronize, reopened]

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   mongodb:
-    container_name: mongodb-${teamname:-wiq5a}
+    container_name: mongodb-${teamname:-wiq_es05a}
     image: mongo
     profiles: ["dev", "prod"]
     volumes:
@@ -12,8 +12,8 @@ services:
       - mynetwork
 
   questionservice:
-    container_name: questionservice-${teamname:-wiq5a}
-    image: ghcr.io/arquisoft/wiq_5a/questionservice:latest
+    container_name: questionservice-${teamname:-wiq_es05a}
+    image: ghcr.io/arquisoft/wiq_es05a/questionservice:latest
     profiles: ["dev", "prod"]
     build: ./questionservice
     ports:
@@ -25,8 +25,8 @@ services:
       - mynetwork
 
   authservice:
-    container_name: authservice-${teamname:-wiq5a}
-    image: ghcr.io/arquisoft/wiq_5a/authservice:latest
+    container_name: authservice-${teamname:-wiq_es05a}
+    image: ghcr.io/arquisoft/wiq_es05a/authservice:latest
     profiles: ["dev", "prod"]
     build: ./userservice/authservice
     depends_on:
@@ -39,8 +39,8 @@ services:
       MONGODB_URI: mongodb://mongodb:27017/userdb
 
   userservice:
-    container_name: userservice-${teamname:-wiq5a}
-    image: ghcr.io/arquisoft/wiq_5a/userservice:latest
+    container_name: userservice-${teamname:-wiq_es05a}
+    image: ghcr.io/arquisoft/wiq_es05a/userservice:latest
     profiles: ["dev", "prod"]
     build: ./userservice/userservice
     depends_on:
@@ -53,8 +53,8 @@ services:
       MONGODB_URI: mongodb://mongodb:27017/userdb
 
   gatewayservice:
-    container_name: gatewayservice-${teamname:-wiq5a}
-    image: ghcr.io/arquisoft/wiq_5a/gatewayservice:latest
+    container_name: gatewayservice-${teamname:-wiq_es05a}
+    image: ghcr.io/arquisoft/wiq_es05a/gatewayservice:latest
     profiles: ["dev", "prod"]
     build: ./gatewayservice
     depends_on:
@@ -72,8 +72,8 @@ services:
       QUESTION_SERVICE_URL: http://questionservice:8003
 
   webapp:
-    container_name: webapp-${teamname:-wiq5a}
-    image: ghcr.io/arquisoft/wiq_5a/webapp:latest
+    container_name: webapp-${teamname:-wiq_es05a}
+    image: ghcr.io/arquisoft/wiq_es05a/webapp:latest
     profiles: ["dev", "prod"]
     build: ./webapp
     depends_on:
@@ -82,8 +82,8 @@ services:
       - "3000:3000" 
 
   prometheus:
-    image: ghcr.io/arquisoft/wiq_5a/prometheus:latest
-    container_name: prometheus-${teamname:-wiq5a}
+    image: ghcr.io/arquisoft/wiq_es05a/prometheus:latest
+    container_name: prometheus-${teamname:-wiq_es05a}
     build: ./monitoring/prometheus
     profiles: ["dev", "prod"]
     networks:
@@ -97,8 +97,8 @@ services:
 
 
   grafana:
-    image: ghcr.io/arquisoft/wiq_5a/grafana:latest
-    container_name: grafana-${teamname:-wiq5a}
+    image: ghcr.io/arquisoft/wiq_es05a/grafana:latest
+    container_name: grafana-${teamname:-wiq_es05a}
     build: ./monitoring/grafana
     profiles: ["dev", "prod"]
     networks:

diff --git a/monitoring/grafana/provisioning/dashboards/example-service-dashboard.json b/monitoring/grafana/provisioning/dashboards/example-service-dashboard.json
@@ -372,4 +372,4 @@
   "title": "Example Service Dashboard",
   "uid": "1DYaynomMk",
   "version": 2
-}
+}
diff --git a/webapp/src/components/Pages/Estadisticas.js b/webapp/src/components/Pages/Estadisticas.js
@@ -12,7 +12,6 @@ const Estadisticas = ({isLogged, username}) => {
     const [correctAnswers, setCorrectAnswers] = useState(0);
     const [incorrectAnswers, setIncorrectAnswers] = useState(0);
     const [completedGames, setCompletedGames] = useState(0);
-    const [averageTime, setAverageTime] = useState(0);
     const [firstRender, setFirstRender] = useState(false);
 
   useEffect(() => {
@@ -30,7 +29,6 @@ const Estadisticas = ({isLogged, username}) => {
         setCorrectAnswers(datos.user.correctAnswers);
         setIncorrectAnswers(datos.user.incorrectAnswers);
         setCompletedGames(datos.user.completedGames);
-        setAverageTime(datos.user.averageTime);
       } catch (error) {
         setError('Error al cargar la información');
       }
@@ -54,10 +52,6 @@ const Estadisticas = ({isLogged, username}) => {
                     <td>Nº Juegos completados: </td>
                     <td> {completedGames} </td>
                 </tr>
-                <tr>
-                    <td>Tiempo medio por juego: </td>
-                    <td> {averageTime} </td>
-                </tr>
             </tbody>
     </table>
 

diff --git a/webapp/src/components/tests/Estadisticas.test.js b/webapp/src/components/tests/Estadisticas.test.js
@@ -36,8 +36,6 @@ describe('Estadisticas Component', () => {
       expect(getByText('Nº Juegos completados:')).toBeInTheDocument();
       expect(getByText('20')).toBeInTheDocument(); // Verifica que el número de juegos completados sea 20
 
-      expect(getByText('Tiempo medio por juego:')).toBeInTheDocument();
-      expect(getByText('30')).toBeInTheDocument(); // Verifica que el tiempo medio por juego sea 30
     });
   });