From f3d3ef6fe3fc966737b50c33418feb621f1e2ea9 Mon Sep 17 00:00:00 2001
From: Pablo Barrero Cruz <uo289642@uniovi.es>
Date: Wed, 17 Apr 2024 11:51:25 +0200
Subject: [PATCH 001/132] Added New Questions

---
 questions/utils/question.json | 350 ++++++++++++++++++++++++++++++++++
 1 file changed, 350 insertions(+)

diff --git a/questions/utils/question.json b/questions/utils/question.json
index 8027df5d..2d8241d6 100644
--- a/questions/utils/question.json
+++ b/questions/utils/question.json
@@ -94,5 +94,355 @@
                 "category": ["Geography"]
             }
         ]
+    },
+    {
+        "name": "art",
+        "instance": "Q3305213",
+        "properties": [
+            {   
+                "property": "P170",
+                "template": 
+                    [{
+                    "lang": "es",
+                    "question": "Quien es el autor de x"
+                    },
+                    {
+                    "lang": "en",
+                    "question": "Who is the author of x"
+                    }],
+                "category": ["Art"]
+            },
+            {   
+                "property": "P571",
+                "template": [{
+                    "lang": "es",
+                    "question": "Cual es el año de creacion de x"
+                    },
+                    {
+                    "lang": "en",
+                    "question": "What is the year of creation of x"
+                    }],
+                "category": ["Art"]
+            },
+            {   
+                "property": "P136",
+                "template": 
+                    [{
+                    "lang": "es",
+                    "question": "Cual es el estilo artistico de x"
+                    },
+                    {
+                    "lang": "en",
+                    "question":  "What is the artistic style of x"
+                    }],
+                "category": ["Art"]
+            }
+        ]
+    },
+    {
+        "name": "science",
+        "instance": "Q11028",
+        "properties": [
+            {   
+                "property": "P61",
+                "template": 
+                    [{
+                    "lang": "es",
+                    "question": "Quien es el inventor de x"
+                    },
+                    {
+                    "lang": "en",
+                    "question": "Who is the inventor of x"
+                    }],
+                "category": ["Science"]
+            },
+            {
+                "property": "P575",
+                "template": 
+                    [{
+                    "lang": "es",
+                    "question": "En que año se inventó x"
+                    },
+                    {
+                    "lang": "en",
+                    "question":  "What was the year of invention of x"
+                    }],
+                "category": ["Science"]
+            }
+        ]
+    },
+    {
+        "name": "mountains",
+        "instance": "Q8502",
+        "properties": [
+            {   
+                "property": "P2044",
+                "template": 
+                    [{
+                    "lang": "es",
+                    "question": "Cual es la altitud mxima del x"
+                    },
+                    {
+                    "lang": "en",
+                    "question":  "What is the maximum altitude of x"
+                    }],
+                "category": ["Geography"]
+            }
+        ]
+    },
+    {
+        "name": "literature",
+        "instance": "Q571",
+        "properties": [
+            {   
+                "property": "P50",
+                "template": 
+                    [{
+                    "lang": "es",
+                    "question": "Quien es el autor de x"
+                    },
+                    {
+                    "lang": "en",
+                    "question": "Who is the author of x"
+                    }],
+                "category": ["Entertainment"]
+            },
+            {   
+                "property": "P577",
+                "template": [{
+                    "lang": "es",
+                    "question": "Cual es el año de publicacion de x"
+                    },
+                    {
+                    "lang": "en",
+                    "question": "What is the year of publication of x"
+                    }],
+                "category": ["Entertainment"]
+            },
+            {   
+                "property": "P136",
+                "template": 
+                    [{
+                    "lang": "es",
+                    "question": "Cual es el genero de x"
+                    },
+                    {
+                    "lang": "en",
+                    "question":  "What is the genre of x"
+                    }],
+                "category": ["Entertainment"]
+            }
+        ]
+    },
+    {
+        "name": "cars",
+        "instance": "Q42889",
+        "properties": [
+            {   
+                "property": "P176",
+                "template": 
+                    [{
+                    "lang": "es",
+                    "question": "Quien es el fabricante de x"
+                    },
+                    {
+                    "lang": "en",
+                    "question": "Who is the manufacturer of x"
+                    }],
+                "category": ["Cars"]
+            },
+            {   
+                "property": "P3032",
+                "template": [{
+                    "lang": "es",
+                    "question": "Cuál es la velocidad máxima de x"
+                    },
+                    {
+                    "lang": "en",
+                    "question": "What is the maximum speed of x"
+                    }],
+                "category": ["Cars"]
+            },
+            {   
+                "property": "P571",
+                "template": 
+                    [{
+                    "lang": "es",
+                    "question": "En qué año fue introducido x al mercado"
+                    },
+                    {
+                    "lang": "en",
+                    "question":  "In what year was x introduced to the market"
+                    }],
+                "category": ["Cars"]
+            }
+        ]
+    },
+    {
+        "name": "food",
+        "instance": "Q746549",
+        "properties": [
+            {   
+                "property": "P527",
+                "template": 
+                    [{
+                    "lang": "es",
+                    "question": "Cuál es el ingrediente principal de x"
+                    },
+                    {
+                    "lang": "en",
+                    "question": "What is the main ingredient of x"
+                    }],
+                "category": ["Food"]
+            },
+            {   
+                "property": "P495",
+                "template": [{
+                    "lang": "es",
+                    "question": "De qué región es originario x"
+                    },
+                    {
+                    "lang": "en",
+                    "question": "What region is x originally from?"
+                    }],
+                "category": ["Food"]
+            }
+        ]
+    },
+    {
+        "name": "architecture",
+        "instance": "Q41176",
+        "properties": [
+            {   
+                "property": "P84",
+                "template": 
+                    [{
+                    "lang": "es",
+                    "question": "Quién fue el arquitecto de x"
+                    },
+                    {
+                    "lang": "en",
+                    "question": "Who was the architect of x"
+                    }],
+                "category": ["Art"]
+            },
+            {   
+                "property": "P571",
+                "template": [{
+                    "lang": "es",
+                    "question": "En qué año se completó x"
+                    },
+                    {
+                    "lang": "en",
+                    "question": "In what year was it completed x"
+                    }],
+                "category": ["Art"]
+            },
+            {   
+                "property": "P149",
+                "template": [{
+                    "lang": "es",
+                    "question": "Cuál es el estilo arquitectónico de x"
+                    },
+                    {
+                    "lang": "en",
+                    "question": "What is the architectural style of x"
+                    }],
+                "category": ["Art"]
+            }
+        ]
+    },
+    {
+        "name": "series",
+        "instance": "Q5398426",
+        "properties": [
+            {   
+                "property": "P178",
+                "template": 
+                    [{
+                    "lang": "es",
+                    "question": "Quién es el creador de la serie x"
+                    },
+                    {
+                    "lang": "en",
+                    "question": "Who is the creator of the series x"
+                    }],
+                "category": ["Entertainment"]
+            },
+            {   
+                "property": "P2437",
+                "template": [{
+                    "lang": "es",
+                    "question": "Cuántas temporadas tiene la serie x"
+                    },
+                    {
+                    "lang": "en",
+                    "question": "How many seasons does the series x have?"
+                    }],
+                "category": ["Entertainment"]
+            }
+        ]
+    },
+    {
+        "name": "software",
+        "instance": "Q7397",
+        "properties": [
+            {   
+                "property": "P178",
+                "template": 
+                    [{
+                    "lang": "es",
+                    "question": "Quién desarrolló el software x"
+                    },
+                    {
+                    "lang": "en",
+                    "question": "Who developed the software x"
+                    }],
+                "category": ["Technology"]
+            },
+            {   
+                "property": "P277",
+                "template": [{
+                    "lang": "es",
+                    "question": "En qué lenguaje de programación está escrito x"
+                    },
+                    {
+                    "lang": "en",
+                    "question": "What programming language is x written in?"
+                    }],
+                "category": ["Technology"]
+            }
+        ]
+    },
+    {
+        "name": "sport",
+        "instance": "Q2066131",
+        "properties": [
+            {   
+                "property": "P641",
+                "template": 
+                    [{
+                    "lang": "es",
+                    "question": "En qué deporte compite x"
+                    },
+                    {
+                    "lang": "en",
+                    "question": "Who developed the software x"
+                    }],
+                "category": ["Sport"]
+            },
+            {   
+                "property": "P27",
+                "template": [{
+                    "lang": "es",
+                    "question": "Cuál es la nacionalidad del atleta x"
+                    },
+                    {
+                    "lang": "en",
+                    "question": "What is the nationality of the athlete x"
+                    }],
+                "category": ["Sport"]
+            }
+        ]
     }
 ]
\ No newline at end of file

From bc864fa9585dbad52b4845ef80ec65eb030cc23e Mon Sep 17 00:00:00 2001
From: Pablo Barrero Cruz <uo289642@uniovi.es>
Date: Wed, 17 Apr 2024 11:58:59 +0200
Subject: [PATCH 002/132] Restored Questions

---
 questions/utils/question.json | 350 ----------------------------------
 1 file changed, 350 deletions(-)

diff --git a/questions/utils/question.json b/questions/utils/question.json
index 2d8241d6..8027df5d 100644
--- a/questions/utils/question.json
+++ b/questions/utils/question.json
@@ -94,355 +94,5 @@
                 "category": ["Geography"]
             }
         ]
-    },
-    {
-        "name": "art",
-        "instance": "Q3305213",
-        "properties": [
-            {   
-                "property": "P170",
-                "template": 
-                    [{
-                    "lang": "es",
-                    "question": "Quien es el autor de x"
-                    },
-                    {
-                    "lang": "en",
-                    "question": "Who is the author of x"
-                    }],
-                "category": ["Art"]
-            },
-            {   
-                "property": "P571",
-                "template": [{
-                    "lang": "es",
-                    "question": "Cual es el año de creacion de x"
-                    },
-                    {
-                    "lang": "en",
-                    "question": "What is the year of creation of x"
-                    }],
-                "category": ["Art"]
-            },
-            {   
-                "property": "P136",
-                "template": 
-                    [{
-                    "lang": "es",
-                    "question": "Cual es el estilo artistico de x"
-                    },
-                    {
-                    "lang": "en",
-                    "question":  "What is the artistic style of x"
-                    }],
-                "category": ["Art"]
-            }
-        ]
-    },
-    {
-        "name": "science",
-        "instance": "Q11028",
-        "properties": [
-            {   
-                "property": "P61",
-                "template": 
-                    [{
-                    "lang": "es",
-                    "question": "Quien es el inventor de x"
-                    },
-                    {
-                    "lang": "en",
-                    "question": "Who is the inventor of x"
-                    }],
-                "category": ["Science"]
-            },
-            {
-                "property": "P575",
-                "template": 
-                    [{
-                    "lang": "es",
-                    "question": "En que año se inventó x"
-                    },
-                    {
-                    "lang": "en",
-                    "question":  "What was the year of invention of x"
-                    }],
-                "category": ["Science"]
-            }
-        ]
-    },
-    {
-        "name": "mountains",
-        "instance": "Q8502",
-        "properties": [
-            {   
-                "property": "P2044",
-                "template": 
-                    [{
-                    "lang": "es",
-                    "question": "Cual es la altitud mxima del x"
-                    },
-                    {
-                    "lang": "en",
-                    "question":  "What is the maximum altitude of x"
-                    }],
-                "category": ["Geography"]
-            }
-        ]
-    },
-    {
-        "name": "literature",
-        "instance": "Q571",
-        "properties": [
-            {   
-                "property": "P50",
-                "template": 
-                    [{
-                    "lang": "es",
-                    "question": "Quien es el autor de x"
-                    },
-                    {
-                    "lang": "en",
-                    "question": "Who is the author of x"
-                    }],
-                "category": ["Entertainment"]
-            },
-            {   
-                "property": "P577",
-                "template": [{
-                    "lang": "es",
-                    "question": "Cual es el año de publicacion de x"
-                    },
-                    {
-                    "lang": "en",
-                    "question": "What is the year of publication of x"
-                    }],
-                "category": ["Entertainment"]
-            },
-            {   
-                "property": "P136",
-                "template": 
-                    [{
-                    "lang": "es",
-                    "question": "Cual es el genero de x"
-                    },
-                    {
-                    "lang": "en",
-                    "question":  "What is the genre of x"
-                    }],
-                "category": ["Entertainment"]
-            }
-        ]
-    },
-    {
-        "name": "cars",
-        "instance": "Q42889",
-        "properties": [
-            {   
-                "property": "P176",
-                "template": 
-                    [{
-                    "lang": "es",
-                    "question": "Quien es el fabricante de x"
-                    },
-                    {
-                    "lang": "en",
-                    "question": "Who is the manufacturer of x"
-                    }],
-                "category": ["Cars"]
-            },
-            {   
-                "property": "P3032",
-                "template": [{
-                    "lang": "es",
-                    "question": "Cuál es la velocidad máxima de x"
-                    },
-                    {
-                    "lang": "en",
-                    "question": "What is the maximum speed of x"
-                    }],
-                "category": ["Cars"]
-            },
-            {   
-                "property": "P571",
-                "template": 
-                    [{
-                    "lang": "es",
-                    "question": "En qué año fue introducido x al mercado"
-                    },
-                    {
-                    "lang": "en",
-                    "question":  "In what year was x introduced to the market"
-                    }],
-                "category": ["Cars"]
-            }
-        ]
-    },
-    {
-        "name": "food",
-        "instance": "Q746549",
-        "properties": [
-            {   
-                "property": "P527",
-                "template": 
-                    [{
-                    "lang": "es",
-                    "question": "Cuál es el ingrediente principal de x"
-                    },
-                    {
-                    "lang": "en",
-                    "question": "What is the main ingredient of x"
-                    }],
-                "category": ["Food"]
-            },
-            {   
-                "property": "P495",
-                "template": [{
-                    "lang": "es",
-                    "question": "De qué región es originario x"
-                    },
-                    {
-                    "lang": "en",
-                    "question": "What region is x originally from?"
-                    }],
-                "category": ["Food"]
-            }
-        ]
-    },
-    {
-        "name": "architecture",
-        "instance": "Q41176",
-        "properties": [
-            {   
-                "property": "P84",
-                "template": 
-                    [{
-                    "lang": "es",
-                    "question": "Quién fue el arquitecto de x"
-                    },
-                    {
-                    "lang": "en",
-                    "question": "Who was the architect of x"
-                    }],
-                "category": ["Art"]
-            },
-            {   
-                "property": "P571",
-                "template": [{
-                    "lang": "es",
-                    "question": "En qué año se completó x"
-                    },
-                    {
-                    "lang": "en",
-                    "question": "In what year was it completed x"
-                    }],
-                "category": ["Art"]
-            },
-            {   
-                "property": "P149",
-                "template": [{
-                    "lang": "es",
-                    "question": "Cuál es el estilo arquitectónico de x"
-                    },
-                    {
-                    "lang": "en",
-                    "question": "What is the architectural style of x"
-                    }],
-                "category": ["Art"]
-            }
-        ]
-    },
-    {
-        "name": "series",
-        "instance": "Q5398426",
-        "properties": [
-            {   
-                "property": "P178",
-                "template": 
-                    [{
-                    "lang": "es",
-                    "question": "Quién es el creador de la serie x"
-                    },
-                    {
-                    "lang": "en",
-                    "question": "Who is the creator of the series x"
-                    }],
-                "category": ["Entertainment"]
-            },
-            {   
-                "property": "P2437",
-                "template": [{
-                    "lang": "es",
-                    "question": "Cuántas temporadas tiene la serie x"
-                    },
-                    {
-                    "lang": "en",
-                    "question": "How many seasons does the series x have?"
-                    }],
-                "category": ["Entertainment"]
-            }
-        ]
-    },
-    {
-        "name": "software",
-        "instance": "Q7397",
-        "properties": [
-            {   
-                "property": "P178",
-                "template": 
-                    [{
-                    "lang": "es",
-                    "question": "Quién desarrolló el software x"
-                    },
-                    {
-                    "lang": "en",
-                    "question": "Who developed the software x"
-                    }],
-                "category": ["Technology"]
-            },
-            {   
-                "property": "P277",
-                "template": [{
-                    "lang": "es",
-                    "question": "En qué lenguaje de programación está escrito x"
-                    },
-                    {
-                    "lang": "en",
-                    "question": "What programming language is x written in?"
-                    }],
-                "category": ["Technology"]
-            }
-        ]
-    },
-    {
-        "name": "sport",
-        "instance": "Q2066131",
-        "properties": [
-            {   
-                "property": "P641",
-                "template": 
-                    [{
-                    "lang": "es",
-                    "question": "En qué deporte compite x"
-                    },
-                    {
-                    "lang": "en",
-                    "question": "Who developed the software x"
-                    }],
-                "category": ["Sport"]
-            },
-            {   
-                "property": "P27",
-                "template": [{
-                    "lang": "es",
-                    "question": "Cuál es la nacionalidad del atleta x"
-                    },
-                    {
-                    "lang": "en",
-                    "question": "What is the nationality of the athlete x"
-                    }],
-                "category": ["Sport"]
-            }
-        ]
     }
 ]
\ No newline at end of file

From c6ca347d931145e1f185b3ede5d0473210aa0b40 Mon Sep 17 00:00:00 2001
From: teresagg <uo288347@uniovi.es>
Date: Sat, 20 Apr 2024 19:15:35 +0200
Subject: [PATCH 003/132] Improving question generation coverage

---
 .../__tests/services/question-generation-service.test.js      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/questions/__tests/services/question-generation-service.test.js b/questions/__tests/services/question-generation-service.test.js
index 2024e0dd..a999966c 100644
--- a/questions/__tests/services/question-generation-service.test.js
+++ b/questions/__tests/services/question-generation-service.test.js
@@ -52,7 +52,7 @@ describe('Question generation', function() {
     
         dbService.addQuestion.mockResolvedValue();
         // Llama a la función que deseas probar
-        await generator.generateQuestions(1);
+        await generator.generateQuestions(1,"en","Geography");
     
         // Verifica que la función haya realizado las operaciones esperadas
         expect(dbService.addQuestion).toHaveBeenCalledTimes(1);
@@ -76,7 +76,7 @@ describe('Question generation', function() {
 
         console.error = jest.fn();
         // Llama a la función que deseas probar
-        await generator.generateQuestions(1);
+        await generator.generateQuestions(1,"en");
     
         // Verifica que la función haya realizado las operaciones esperadas
         expect(dbService.addQuestion).toHaveBeenCalledTimes(0);

From c1a721f4bf282a74638c7bffbd25c8e866c1302b Mon Sep 17 00:00:00 2001
From: teresagg <uo288347@uniovi.es>
Date: Sat, 20 Apr 2024 20:34:52 +0200
Subject: [PATCH 004/132] Tested more questions routes

---
 .../__tests/routes/question-routes.test.js    | 69 ++++++++++++++++---
 questions/routes/question-routes.js           | 41 ++++++++++-
 questions/services/question-data-service.js   |  2 +-
 3 files changed, 98 insertions(+), 14 deletions(-)

diff --git a/questions/__tests/routes/question-routes.test.js b/questions/__tests/routes/question-routes.test.js
index 6baea678..124c7308 100644
--- a/questions/__tests/routes/question-routes.test.js
+++ b/questions/__tests/routes/question-routes.test.js
@@ -5,9 +5,13 @@ const mongoose = require('mongoose');
 const express = require('express');
 const bodyParser = require('body-parser');
 
+
+
 let mongoServer;
 let questionFunctions;
 let questionRoutes;
+let generateQuestionsService;
+
 
 //let mongoServer;
 let app = express();
@@ -21,11 +25,11 @@ const questionData1 = {
 };
 
 const questionData2 = {
-  question: "Which is the capital of UK?",
+  question: "Which is the capital of Spain?",
   options: ["Madrid", "Barcelona", "Paris", "London"],
   correctAnswer: "London",
   categories: ["Geography"],
-  language: "es"
+  language: "en"
 };
 
 async function addingQuestion(questionData) {
@@ -40,6 +44,12 @@ async function addingQuestion(questionData) {
   await questionFunctions.addQuestion(newQuestion);
 }
 
+async function addingQuestions() {
+  for(var i = 0; i < 24; i++) {
+    await addingQuestion(questionData1);
+    await addingQuestion(questionData2);
+  }
+}
 
 beforeAll(async () => {
   mongoServer = await MongoMemoryServer.create();
@@ -48,19 +58,17 @@ beforeAll(async () => {
   await mongoose.connect(mongoURI);
   questionFunctions = require('../../services/question-data-service');
   questionRoutes = require('../../routes/question-routes.js');
+  generateQuestionsService = require('../../services/generate-questions-service');
+  jest.mock('../../services/generate-questions-service');
   app.use(bodyParser.json());
   app.use('/questions', questionRoutes);
-
 });
 
 beforeEach(async () => {
   //Load database with initial conditions
   //await mongoose.connection.dropDatabase();
   await Question.deleteMany({});
-  for(var i = 0; i < 100; i++) {
-    await addingQuestion(questionData1);
-    await addingQuestion(questionData2);
-  }
+  await addingQuestions();
 });
 
   afterAll(async () => {
@@ -71,12 +79,48 @@ beforeEach(async () => {
 
   
 describe('Question routes', function() {
-    it('It should get a question from the database', async function() {
+  
+  describe('Get a question from the database', function() {
+    it('get question when 0 questions', async function() {
+      await Question.deleteMany({});
+      await generateQuestionsService.generateQuestions.mockResolvedValue({"response":{"status":"200"}});
+      const response = await request(app).get('/questions/es');
+      await expect(response.status).toBe(200);
+      await expect(response.body.question).toBe(undefined);
+    });
+
+    it('get question when less than 50 questions', async function() {
+        await generateQuestionsService.generateQuestions.mockResolvedValue({"response":{"status":"200"}});
         const response = await request(app).get('/questions/en');
         await expect(response.status).toBe(200);
         await expect(response.body.question).toBe('Which is the capital of Spain?');
       });
-    
+
+    it('get question when less than 100 questions', async function() {
+        await addingQuestions();
+        await generateQuestionsService.generateQuestions.mockResolvedValue({"response":{"status":"200"}});
+        const response = await request(app).get('/questions/en');
+        await expect(response.status).toBe(200);
+        await expect(response.body.question).toBe('Which is the capital of Spain?');
+      });  
+
+    it('get question when more than 100 questions', async function() {
+        await addingQuestions();
+        await addingQuestions();
+        await generateQuestionsService.generateQuestions.mockResolvedValue({"response":{"status":"200"}});
+        const response = await request(app).get('/questions/en');
+        await expect(response.status).toBe(200);
+        await expect(response.body.question).toBe('Which is the capital of Spain?');
+      });  
+  });
+  describe('Get n questions from the database', function() {
+
+      it('It should get n questions from the database', async function() {
+        await generateQuestionsService.generateQuestions.mockResolvedValue({"response":{"status":"200"}});
+        const response = await request(app).get('/questions/getQuestionsFromDb/3/en');
+        await expect(response.status).toBe(200);
+        await expect(response.body.length).toBe(3);
+      });
 
       it('It should get n questions from the database', async function() {
         const response = await request(app).get('/questions/getQuestionsFromDb/3/en');
@@ -88,7 +132,9 @@ describe('Question routes', function() {
         const response = await request(app).get('/questions/getQuestionsFromDb/-1/en');
         await expect(response.status).toBe(400);
       });
-  
+    });
+  describe('Question routes', function() {
+    
       it('It should get n questions of certain category from the database', async function() {
         const response = await request(app).get('/questions/getQuestionsFromDb/2/Geography/en');
         await expect(response.status).toBe(200);
@@ -106,4 +152,5 @@ describe('Question routes', function() {
         it('should connect to the MongoDB server in memory', async () => {
             expect(mongoose.connection.readyState).toBe(1); // 1 means connected
         });
-    });
\ No newline at end of file
+    });
+  });
\ No newline at end of file
diff --git a/questions/routes/question-routes.js b/questions/routes/question-routes.js
index 28b36f58..8a930697 100644
--- a/questions/routes/question-routes.js
+++ b/questions/routes/question-routes.js
@@ -68,13 +68,14 @@ router.get('/getQuestionsFromDb/:n/:category/:lang', async(_req, res) => {
     const n = parseInt(_req.params.n, 10);
     const category = _req.params.category;
     const language = _req.params.lang;
+    const questionCount = await dbService.getQuestionCountByCategory(category, language);
 
     //Verify is n is a correct number
     if (isNaN(n) || n <= 0) {
         return res.status(400).json({ error: 'Parameter "n" must be > 0.' });
     }
     
-    if (await dbService.getQuestionCountByCategory(category, language) < n) {
+    /*if (await dbService.getQuestionCountByCategory(category, language) < n) {
         //Must generate n questions (n because some can fail at generation at the moment 18/04)
         await generateQuestionsService.generateQuestions(n + 2, language, category);
         //Do not wait to generate the others
@@ -86,8 +87,44 @@ router.get('/getQuestionsFromDb/:n/:category/:lang', async(_req, res) => {
             dbService.deleteQuestionById(questions[i]._id);
         }
     }
-    res.json(questions);
+    res.json(questions);*/
     
+
+    // 0: Await till it creates 2, creates 50 async and do not delete
+    if (questionCount == 0) {
+        await generateQuestionsService.generateQuestions(2, language, category);
+        generateQuestionsService.generateQuestions(50, language, category);
+        questions = await dbService.getRandomQuestionsByCategory(n, category, language);
+        res.json(questions);
+        
+    // < 50: async creates 10 and do not delete
+    } else if (questionCount < 50) {
+        //Do not wait to generate the others
+        generateQuestionsService.generateQuestions(10, language, category);
+        questions = await dbService.getRandomQuestionsByCategory(n, category, language);
+        res.json(questions);
+
+    // < 100: async creates 5 and delete
+    } else if (questionCount < 100) {
+        generateQuestionsService.generateQuestions(10, language, category);
+        questions = await dbService.getRandomQuestionsByCategory(n, category, language);
+        res.json(questions);
+        if(questions != null) {
+            for(var i = 0; i < questions.length; i++) {
+                dbService.deleteQuestionById(questions[i]._id);
+            }
+        }
+
+    // >= 100: do not create and delete
+    } else {
+        questions = await dbService.getRandomQuestionsByCategory(n, category, language);
+        res.json(questions);
+        if(questions != null) {
+            for(var i = 0; i < questions.length; i++) {
+                dbService.deleteQuestionById(questions[i]._id);
+            }
+        }
+    }
 });
 
 module.exports = router;
\ No newline at end of file
diff --git a/questions/services/question-data-service.js b/questions/services/question-data-service.js
index 9eb956d5..ef6a054e 100644
--- a/questions/services/question-data-service.js
+++ b/questions/services/question-data-service.js
@@ -103,7 +103,7 @@ module.exports = {
   },
 
 
-  // Get random questions  TODO: refactor to use common code with get questions by category
+  // Get random questions
   getRandomQuestions : async function(n, wantedLanguage) {
     try {
       // Obtain total number of questions in database

From 2d9a7f16b9dec20d1459a0fd0f6a5d8ac1074286 Mon Sep 17 00:00:00 2001
From: teresagg <uo288347@uniovi.es>
Date: Sun, 21 Apr 2024 09:05:12 +0200
Subject: [PATCH 005/132] Trying to fix e2e tests

---
 .../e2e/steps/discoveringCitiesGame.steps.js  | 15 ++++++++++-
 webapp/e2e/steps/game.steps.js                | 24 +++++++++++++----
 webapp/e2e/steps/wiseMenStackGame.steps.js    | 16 +++++++++++-
 webapp/package-lock.json                      | 26 ++++++++++---------
 webapp/src/data/gameInfo.json                 |  2 +-
 5 files changed, 63 insertions(+), 20 deletions(-)

diff --git a/webapp/e2e/steps/discoveringCitiesGame.steps.js b/webapp/e2e/steps/discoveringCitiesGame.steps.js
index 88b01198..7038ac95 100644
--- a/webapp/e2e/steps/discoveringCitiesGame.steps.js
+++ b/webapp/e2e/steps/discoveringCitiesGame.steps.js
@@ -6,6 +6,14 @@ const feature = loadFeature('./features/discoveringCitiesGame.feature');
 let page;
 let browser;
 
+async function loginUser(username, password) {
+  clickLink('//*[@id="root"]/div/header/div/a[2]');
+
+  await expect(page).toFill('input[name="username"]', username);
+  await expect(page).toFill('input[name="password"]', password);
+  await expect(page).toClick('button', { text: /Log in/i });
+}
+
 defineFeature(feature, test => {
 
   beforeAll(async () => {
@@ -39,7 +47,12 @@ defineFeature(feature, test => {
     });
     //Way of setting up the timeout
     setDefaultOptions({ timeout: 10000 })
-
+    await page
+    .goto("http://localhost:3000", {
+      waitUntil: "networkidle0",
+    })
+    .catch(() => {});
+    await loginUser("prueba14","123456789Ab=11");
      
   });
 
diff --git a/webapp/e2e/steps/game.steps.js b/webapp/e2e/steps/game.steps.js
index 60b23883..22d6609a 100644
--- a/webapp/e2e/steps/game.steps.js
+++ b/webapp/e2e/steps/game.steps.js
@@ -6,6 +6,15 @@ const feature = loadFeature('./features/game.feature');
 let page;
 let browser;
 
+
+async function loginUser(username, password) {
+  clickLink('//*[@id="root"]/div/header/div/a[2]');
+
+  await expect(page).toFill('input[name="username"]', username);
+  await expect(page).toFill('input[name="password"]', password);
+  await expect(page).toClick('button', { text: /Log in/i });
+}
+
 defineFeature(feature, test => {
 
   beforeAll(async () => {
@@ -36,11 +45,16 @@ defineFeature(feature, test => {
       } else {
         req.continue();
       }
-    });
-    //Way of setting up the timeout
-    setDefaultOptions({ timeout: 10000 })
-
-     
+      });
+      setDefaultOptions({ timeout: 10000 })
+      await page
+      .goto("http://localhost:3000", {
+        waitUntil: "networkidle0",
+      })
+      .catch(() => {});
+      await loginUser("prueba14","123456789Ab=11");
+      
+      //Way of setting up the timeout     
   });
 
   beforeEach(async () => {
diff --git a/webapp/e2e/steps/wiseMenStackGame.steps.js b/webapp/e2e/steps/wiseMenStackGame.steps.js
index 3b1939f2..7a1d929c 100644
--- a/webapp/e2e/steps/wiseMenStackGame.steps.js
+++ b/webapp/e2e/steps/wiseMenStackGame.steps.js
@@ -6,6 +6,14 @@ const feature = loadFeature('./features/wiseMenStackGame.feature');
 let page;
 let browser;
 
+async function loginUser(username, password) {
+  clickLink('//*[@id="root"]/div/header/div/a[2]');
+
+  await expect(page).toFill('input[name="username"]', username);
+  await expect(page).toFill('input[name="password"]', password);
+  await expect(page).toClick('button', { text: /Log in/i });
+}
+
 defineFeature(feature, test => {
 
   beforeAll(async () => {
@@ -39,7 +47,13 @@ defineFeature(feature, test => {
     });
     //Way of setting up the timeout
     setDefaultOptions({ timeout: 10000 })
-
+    await page
+    .goto("http://localhost:3000", {
+      waitUntil: "networkidle0",
+    })
+    .catch(() => {});
+    await loginUser("prueba14","123456789Ab=11");
+     
      
   });
 
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index 89a173a8..5ea4ee68 100644
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -5,6 +5,7 @@
   "requires": true,
   "packages": {
     "": {
+      "name": "webapp",
       "version": "0.1.0",
       "dependencies": {
         "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
@@ -677,6 +678,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz",
       "integrity": "sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==",
       "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-property-in-object instead.",
+      "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.18.6",
         "@babel/helper-create-class-features-plugin": "^7.21.0",
@@ -5643,6 +5645,7 @@
       "version": "14.2.2",
       "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-14.2.2.tgz",
       "integrity": "sha512-SOUuM2ysCvjUWBXTNfQ/ztmnKDmqaiPV3SvoIuyxMUca45rbSWWAT/qB8CUs/JQ/ux/8JFs9DNdFQ3f6jH3crA==",
+      "dev": true,
       "dependencies": {
         "@babel/runtime": "^7.12.5",
         "@testing-library/dom": "^9.0.0",
@@ -6012,6 +6015,7 @@
       "version": "18.2.18",
       "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.18.tgz",
       "integrity": "sha512-TJxDm6OfAX2KJWJdMEVTwWke5Sc/E/RlnPGvGfS0W7+6ocy2xhDVQVh/KvC2Uf7kACs+gDytdusDSdWfWkaNzw==",
+      "dev": true,
       "dependencies": {
         "@types/react": "*"
       }
@@ -6698,8 +6702,6 @@
       "version": "8.12.0",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
       "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-      "optional": true,
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
@@ -6714,9 +6716,7 @@
     "node_modules/ajv-formats/node_modules/json-schema-traverse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "optional": true,
-      "peer": true
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
     "node_modules/ajv-keywords": {
       "version": "3.5.2",
@@ -29729,6 +29729,7 @@
       "version": "7.21.11",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz",
       "integrity": "sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==",
+      "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.18.6",
         "@babel/helper-create-class-features-plugin": "^7.21.0",
@@ -33177,6 +33178,7 @@
       "version": "14.2.2",
       "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-14.2.2.tgz",
       "integrity": "sha512-SOUuM2ysCvjUWBXTNfQ/ztmnKDmqaiPV3SvoIuyxMUca45rbSWWAT/qB8CUs/JQ/ux/8JFs9DNdFQ3f6jH3crA==",
+      "dev": true,
       "requires": {
         "@babel/runtime": "^7.12.5",
         "@testing-library/dom": "^9.0.0",
@@ -33522,6 +33524,7 @@
       "version": "18.2.18",
       "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.18.tgz",
       "integrity": "sha512-TJxDm6OfAX2KJWJdMEVTwWke5Sc/E/RlnPGvGfS0W7+6ocy2xhDVQVh/KvC2Uf7kACs+gDytdusDSdWfWkaNzw==",
+      "dev": true,
       "requires": {
         "@types/react": "*"
       }
@@ -34049,13 +34052,14 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
       "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-      "requires": {},
+      "requires": {
+        "ajv": "^8.0.0"
+      },
       "dependencies": {
         "ajv": {
-          "version": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+          "version": "8.12.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
           "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-          "optional": true,
-          "peer": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
             "json-schema-traverse": "^1.0.0",
@@ -34066,9 +34070,7 @@
         "json-schema-traverse": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-          "optional": true,
-          "peer": true
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
         }
       }
     },
diff --git a/webapp/src/data/gameInfo.json b/webapp/src/data/gameInfo.json
index 27a8397e..388ef71f 100644
--- a/webapp/src/data/gameInfo.json
+++ b/webapp/src/data/gameInfo.json
@@ -9,7 +9,7 @@
     },
     {
       "nombre": "WARM QUESTION",
-      "descripcion": "It consists of ten topics of varied themes. For each correct answer, €100 is earned, and €10 are lost if the contestant passes, does not respond, or answers incorrectly.",
+      "descripcion": "It consists of ten topics of varied themes. For each correct answer, 100 points are earned, and 10 are lost if the contestant passes, does not respond, or answers incorrectly.",
       "foto": "../instructions/foto1.jpg",
       "card":"It consists of ten topics of varied themes.",
       "cardFoto": "../homePage/foto1.jpg"

From 3c59bce6957ff8412153577a1ff69dde709a6496 Mon Sep 17 00:00:00 2001
From: teresagg <uo288347@uniovi.es>
Date: Sun, 21 Apr 2024 09:17:38 +0200
Subject: [PATCH 006/132] changing xpath

---
 webapp/e2e/steps/discoveringCitiesGame.steps.js | 11 ++++++++++-
 webapp/e2e/steps/game.steps.js                  | 10 ++++++++++
 webapp/e2e/steps/wiseMenStackGame.steps.js      | 10 ++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/webapp/e2e/steps/discoveringCitiesGame.steps.js b/webapp/e2e/steps/discoveringCitiesGame.steps.js
index 7038ac95..65442b62 100644
--- a/webapp/e2e/steps/discoveringCitiesGame.steps.js
+++ b/webapp/e2e/steps/discoveringCitiesGame.steps.js
@@ -7,13 +7,22 @@ let page;
 let browser;
 
 async function loginUser(username, password) {
-  clickLink('//*[@id="root"]/div/header/div/a[2]');
+  clickLink('//button[text()="PLAY"]');
 
   await expect(page).toFill('input[name="username"]', username);
   await expect(page).toFill('input[name="password"]', password);
   await expect(page).toClick('button', { text: /Log in/i });
 }
 
+async function clickLink(linkXPath) {
+  const [link] = await page.$x(linkXPath);
+  if (link) {
+      await link.click();
+  } else {
+      throw new Error(`Cannot find link "${link}"`);
+  }
+  }
+  
 defineFeature(feature, test => {
 
   beforeAll(async () => {
diff --git a/webapp/e2e/steps/game.steps.js b/webapp/e2e/steps/game.steps.js
index 22d6609a..0cd98fe2 100644
--- a/webapp/e2e/steps/game.steps.js
+++ b/webapp/e2e/steps/game.steps.js
@@ -15,6 +15,16 @@ async function loginUser(username, password) {
   await expect(page).toClick('button', { text: /Log in/i });
 }
 
+async function clickLink(linkXPath) {
+  const [link] = await page.$x(linkXPath);
+  if (link) {
+      await link.click();
+  } else {
+      throw new Error(`Cannot find link "${link}"`);
+  }
+  }
+
+  
 defineFeature(feature, test => {
 
   beforeAll(async () => {
diff --git a/webapp/e2e/steps/wiseMenStackGame.steps.js b/webapp/e2e/steps/wiseMenStackGame.steps.js
index 7a1d929c..c85a9c42 100644
--- a/webapp/e2e/steps/wiseMenStackGame.steps.js
+++ b/webapp/e2e/steps/wiseMenStackGame.steps.js
@@ -14,6 +14,16 @@ async function loginUser(username, password) {
   await expect(page).toClick('button', { text: /Log in/i });
 }
 
+async function clickLink(linkXPath) {
+  const [link] = await page.$x(linkXPath);
+  if (link) {
+      await link.click();
+  } else {
+      throw new Error(`Cannot find link "${link}"`);
+  }
+  }
+  
+
 defineFeature(feature, test => {
 
   beforeAll(async () => {

From c6b6f1e7765927202da5ef0e0746ee4781fe7e33 Mon Sep 17 00:00:00 2001
From: teresagg <uo288347@uniovi.es>
Date: Sun, 21 Apr 2024 09:36:51 +0200
Subject: [PATCH 007/132] Trying e2e

---
 webapp/e2e/steps/discoveringCitiesGame.steps.js | 4 ++--
 webapp/e2e/steps/game.steps.js                  | 2 +-
 webapp/e2e/steps/wiseMenStackGame.steps.js      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/webapp/e2e/steps/discoveringCitiesGame.steps.js b/webapp/e2e/steps/discoveringCitiesGame.steps.js
index 65442b62..2cec47da 100644
--- a/webapp/e2e/steps/discoveringCitiesGame.steps.js
+++ b/webapp/e2e/steps/discoveringCitiesGame.steps.js
@@ -9,8 +9,8 @@ let browser;
 async function loginUser(username, password) {
   clickLink('//button[text()="PLAY"]');
 
-  await expect(page).toFill('input[name="username"]', username);
-  await expect(page).toFill('input[name="password"]', password);
+  await expect(page).toFill('input[name()="username"]', username);
+  await expect(page).toFill('input[name()="password"]', password);
   await expect(page).toClick('button', { text: /Log in/i });
 }
 
diff --git a/webapp/e2e/steps/game.steps.js b/webapp/e2e/steps/game.steps.js
index 0cd98fe2..dcb25641 100644
--- a/webapp/e2e/steps/game.steps.js
+++ b/webapp/e2e/steps/game.steps.js
@@ -8,7 +8,7 @@ let browser;
 
 
 async function loginUser(username, password) {
-  clickLink('//*[@id="root"]/div/header/div/a[2]');
+  clickLink('//button[text()="PLAY"]');
 
   await expect(page).toFill('input[name="username"]', username);
   await expect(page).toFill('input[name="password"]', password);
diff --git a/webapp/e2e/steps/wiseMenStackGame.steps.js b/webapp/e2e/steps/wiseMenStackGame.steps.js
index c85a9c42..4de2835f 100644
--- a/webapp/e2e/steps/wiseMenStackGame.steps.js
+++ b/webapp/e2e/steps/wiseMenStackGame.steps.js
@@ -7,7 +7,7 @@ let page;
 let browser;
 
 async function loginUser(username, password) {
-  clickLink('//*[@id="root"]/div/header/div/a[2]');
+  clickLink('//button[text()="PLAY"]');
 
   await expect(page).toFill('input[name="username"]', username);
   await expect(page).toFill('input[name="password"]', password);

From c3003ed75c4c05d64b13f20d6d5e9ab47e0c4662 Mon Sep 17 00:00:00 2001
From: teresagg <uo288347@uniovi.es>
Date: Mon, 22 Apr 2024 08:27:09 +0200
Subject: [PATCH 008/132] Discovering cities e2e tests

---
 .../e2e/steps/discoveringCitiesGame.steps.js   | 18 ++++++++++++++----
 webapp/e2e/steps/game.steps.js                 | 17 ++++++++++++++---
 webapp/package-lock.json                       | 13 +++----------
 webapp/package.json                            |  1 +
 4 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/webapp/e2e/steps/discoveringCitiesGame.steps.js b/webapp/e2e/steps/discoveringCitiesGame.steps.js
index 2cec47da..05866025 100644
--- a/webapp/e2e/steps/discoveringCitiesGame.steps.js
+++ b/webapp/e2e/steps/discoveringCitiesGame.steps.js
@@ -6,12 +6,22 @@ const feature = loadFeature('./features/discoveringCitiesGame.feature');
 let page;
 let browser;
 
-async function loginUser(username, password) {
+async function loginUser(username, password, name, surname) {
   clickLink('//button[text()="PLAY"]');
 
   await expect(page).toFill('input[name()="username"]', username);
   await expect(page).toFill('input[name()="password"]', password);
   await expect(page).toClick('button', { text: /Log in/i });
+
+  if(await expect(page).toBe('button', { text: /Log in/i })) {
+    await expect(page).toClick("a", { text: "Don't have an account? Register here." });
+    await expect(page).toFill('input[name="username"]', username);
+    await expect(page).toFill('input[name="password"]', password);
+    await expect(page).toFill('input[name="name"]', name);
+    await expect(page).toFill('input[name="surname"]', surname);
+    await expect(page).toClick('button', { text: /Sign Up/i })
+    
+  }
 }
 
 async function clickLink(linkXPath) {
@@ -35,7 +45,7 @@ defineFeature(feature, test => {
     await page.setRequestInterception(true);
 
     page.on('request', (req) => {
-      if(req.url().endsWith('/Geography')) {
+      if(req.url().endsWith('/Cities')) {
         req.respond({
           status: 200,
           headers: {
@@ -46,7 +56,7 @@ defineFeature(feature, test => {
             question: 'Which is the capital of Spain?',
             options: ['Madrid', 'Barcelona', 'Paris', 'London'],
             correctAnswer: 'Madrid',
-            categories: ['Geography'],
+            categories: ['Cities'],
             language: 'en'
           }])
         });
@@ -61,7 +71,7 @@ defineFeature(feature, test => {
       waitUntil: "networkidle0",
     })
     .catch(() => {});
-    await loginUser("prueba14","123456789Ab=11");
+    await loginUser("prueba14","123456789Ab=11", "pr","prueba");
      
   });
 
diff --git a/webapp/e2e/steps/game.steps.js b/webapp/e2e/steps/game.steps.js
index dcb25641..6351bb5f 100644
--- a/webapp/e2e/steps/game.steps.js
+++ b/webapp/e2e/steps/game.steps.js
@@ -1,5 +1,6 @@
 const puppeteer = require('puppeteer');
 const { defineFeature, loadFeature }=require('jest-cucumber');
+const { expect } = require('expect-puppeteer');
 const setDefaultOptions = require('expect-puppeteer').setDefaultOptions
 const feature = loadFeature('./features/game.feature');
 
@@ -7,12 +8,22 @@ let page;
 let browser;
 
 
-async function loginUser(username, password) {
+async function loginUser(username, password, name, surname) {
   clickLink('//button[text()="PLAY"]');
 
   await expect(page).toFill('input[name="username"]', username);
   await expect(page).toFill('input[name="password"]', password);
   await expect(page).toClick('button', { text: /Log in/i });
+
+  if(await expect(page).toBe('button', { text: /Log in/i })) {
+    await expect(page).toClick("a", { text: "Don't have an account? Register here." });
+    await expect(page).toFill('input[name="username"]', username);
+    await expect(page).toFill('input[name="password"]', password);
+    await expect(page).toFill('input[name="name"]', name);
+    await expect(page).toFill('input[name="surname"]', surname);
+    await expect(page).toClick('button', { text: /Sign Up/i })
+    
+  }
 }
 
 async function clickLink(linkXPath) {
@@ -37,7 +48,7 @@ defineFeature(feature, test => {
     await page.setRequestInterception(true);
 
     page.on('request', (req) => {
-      if(req.url().endsWith('/questions')) {
+      if(req.url().endsWith('/questions/en')) {
         req.respond({
           status: 200,
           headers: {
@@ -62,7 +73,7 @@ defineFeature(feature, test => {
         waitUntil: "networkidle0",
       })
       .catch(() => {});
-      await loginUser("prueba14","123456789Ab=11");
+      await loginUser("prueba14","123456789Ab=11", "pr","prueba");
       
       //Way of setting up the timeout     
   });
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index 5ea4ee68..c5cb7fa6 100644
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -20,6 +20,7 @@
         "babel": "^6.23.0",
         "cross-env": "^7.0.3",
         "express": "^4.19.2",
+        "get-uri": "^6.0.3",
         "i18next": "^23.11.0",
         "pupeteer": "^0.0.1",
         "react": "^18.2.0",
@@ -7563,7 +7564,6 @@
       "version": "5.0.5",
       "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz",
       "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==",
-      "dev": true,
       "engines": {
         "node": ">=10.0.0"
       }
@@ -9412,7 +9412,6 @@
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz",
       "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==",
-      "dev": true,
       "engines": {
         "node": ">= 14"
       }
@@ -12188,7 +12187,6 @@
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.3.tgz",
       "integrity": "sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==",
-      "dev": true,
       "dependencies": {
         "basic-ftp": "^5.0.2",
         "data-uri-to-buffer": "^6.0.2",
@@ -12203,7 +12201,6 @@
       "version": "11.2.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
       "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
-      "dev": true,
       "dependencies": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^6.0.1",
@@ -34679,8 +34676,7 @@
     "basic-ftp": {
       "version": "5.0.5",
       "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz",
-      "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==",
-      "dev": true
+      "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg=="
     },
     "batch": {
       "version": "0.6.1",
@@ -35999,8 +35995,7 @@
     "data-uri-to-buffer": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz",
-      "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==",
-      "dev": true
+      "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw=="
     },
     "data-urls": {
       "version": "2.0.0",
@@ -38057,7 +38052,6 @@
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.3.tgz",
       "integrity": "sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==",
-      "dev": true,
       "requires": {
         "basic-ftp": "^5.0.2",
         "data-uri-to-buffer": "^6.0.2",
@@ -38069,7 +38063,6 @@
           "version": "11.2.0",
           "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
           "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
-          "dev": true,
           "requires": {
             "graceful-fs": "^4.2.0",
             "jsonfile": "^6.0.1",
diff --git a/webapp/package.json b/webapp/package.json
index 4b23fa31..1a674c46 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -15,6 +15,7 @@
     "babel": "^6.23.0",
     "cross-env": "^7.0.3",
     "express": "^4.19.2",
+    "get-uri": "^6.0.3",
     "i18next": "^23.11.0",
     "pupeteer": "^0.0.1",
     "react": "^18.2.0",

From 0c9c3886bb4c50a07cecabefc2c3dd5cfc6ebd85 Mon Sep 17 00:00:00 2001
From: teresagg <uo288347@uniovi.es>
Date: Mon, 22 Apr 2024 08:47:34 +0200
Subject: [PATCH 009/132] Changed login link in e2e

---
 webapp/e2e/steps/discoveringCitiesGame.steps.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/webapp/e2e/steps/discoveringCitiesGame.steps.js b/webapp/e2e/steps/discoveringCitiesGame.steps.js
index 05866025..0441656a 100644
--- a/webapp/e2e/steps/discoveringCitiesGame.steps.js
+++ b/webapp/e2e/steps/discoveringCitiesGame.steps.js
@@ -7,7 +7,9 @@ let page;
 let browser;
 
 async function loginUser(username, password, name, surname) {
-  clickLink('//button[text()="PLAY"]');
+  const [loginLink] = await page.$x('//*[@id="root"]/div/header/div/a[2]');
+  await loginLink.click();
+  //clickLink('//button[text()="PLAY"]');
 
   await expect(page).toFill('input[name()="username"]', username);
   await expect(page).toFill('input[name()="password"]', password);

From 2e3b4122b739aa92288d072eb4c085d6d4340c1b Mon Sep 17 00:00:00 2001
From: uo289689 <uo289689@uniovi.es>
Date: Tue, 23 Apr 2024 13:42:15 +0200
Subject: [PATCH 010/132] Updated The Challange Game look and feel

---
 webapp/src/pages/TheChallengeGame.js | 213 ++++++++++++++-------------
 1 file changed, 108 insertions(+), 105 deletions(-)

diff --git a/webapp/src/pages/TheChallengeGame.js b/webapp/src/pages/TheChallengeGame.js
index 9a5126e2..9e357e67 100644
--- a/webapp/src/pages/TheChallengeGame.js
+++ b/webapp/src/pages/TheChallengeGame.js
@@ -10,9 +10,9 @@ import { useContext } from 'react';
 import Confetti from 'react-confetti';
 import { CountdownCircleTimer } from "react-countdown-circle-timer";
 import Card from '@mui/material/Card';
-import CardContent from '@mui/material/CardContent';
 import { useTranslation } from 'react-i18next';
 import i18n from '../localize/i18n';
+import { PlayArrow, Pause } from '@mui/icons-material';
 
 
 const apiEndpoint = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
@@ -51,6 +51,8 @@ const Game = () => {
     const [questionCountdownRunning, setQuestionCountdownRunning] = React.useState(false); //property to start and stop question timer
     const [userResponses, setUserResponses] = React.useState([]);
     const [language, setCurrentLanguage] = React.useState(i18n.language);
+    const [paused, setPaused] = React.useState(false);
+    const [passNewRound, setPassNewRound] = React.useState(false);
 
     const [questionHistorial, setQuestionHistorial] = React.useState(Array(numRounds).fill(null));
 
@@ -89,16 +91,25 @@ const Game = () => {
           setShowConfetti(false);
         }
       }, [correctlyAnsweredQuestions, incorrectlyAnsweredQuestions]);
+
+    React.useEffect(() => {
+        if (passNewRound && !paused) {
+            setRound(prevRound => {
+                return prevRound + 1;
+            });
+            setButtonStates([]);
+        }
+    }, [paused, passNewRound]);
      
 
     const startGame = () => {
         setConfigModalOpen(false);
         startNewRound();
     };
-    
-    // gets a random question from the database and initializes button states to null
+
     const startNewRound = async () => {
         setAnswered(false);
+        setPassNewRound(false);
         // It works deploying using git repo from machine with: axios.get(`http://20.80.235.188:8000/questions`)
         setCurrentLanguage(i18n.language);
         axios.get(`${apiEndpoint}/questions/${language}/${category}`) 
@@ -211,28 +222,11 @@ const Game = () => {
         setButtonStates(newButtonStates);
 
         setTimeout(async() => {
-            setRound(round + 1);
-            setButtonStates([]);
+            setPassNewRound(true);
             setCurrentLanguage(i18n.language);
         }, 4000);
     };
 
-    const questionHistorialBar = () => {
-        return questionHistorial.map((isCorrect, index) => (
-        <Card 
-          key={index + 1}
-          variant="outlined"
-          style={{ 
-            width: `${100 / numRounds}%`,
-            marginRight: '0.6em',
-            backgroundColor: isCorrect === null ? 'gray' : isCorrect ? 'lightgreen' : 'salmon',
-          }}
-        >
-          <CardContent>{index + 1}</CardContent>
-        </Card>
-        ));
-    };    
-
     // Render the configuration window before starting the game
     if (configModalOpen) {
         
@@ -287,6 +281,22 @@ const Game = () => {
         );
     }
 
+    const questionHistorialBar = () => {
+        return questionHistorial.map((isCorrect, index) => (
+            <Card sx={{ width: `${100 / numRounds}%`,
+             padding:'0.2em', 
+             margin:'0 0.1em', 
+             backgroundColor: isCorrect === null ? 'gray' : isCorrect ? theme.palette.success.main : theme.palette.error.main }}
+            >
+            </Card>
+        ));
+    };    
+
+    const togglePause = () => {
+        setTimerRunning(!timerRunning);
+        setPaused(!paused);
+    }
+
 
     // circular loading
     if (!questionData) {
@@ -307,9 +317,9 @@ const Game = () => {
         );
     }
 
-    // redirect to / if game over 
-if (shouldRedirect) {
-    // Redirect after 3 seconds
+ // redirect to / if game over 
+ if (shouldRedirect) {
+    // Redirect after 4 seconds
     setTimeout(() => {
         navigate('/homepage');
     }, 4000);
@@ -317,109 +327,96 @@ if (shouldRedirect) {
 
     return (
         <Container
-            sx={{
-                display: 'flex',
+            sx={{ 
+                display: 'flex', 
                 flexDirection: 'column',
-                alignItems: 'center',
-                justifyContent: 'center',
-                height: '100vh',
+                justifyContent: 'center', 
+                alignItems: 'center', 
+                gap: '5em',
                 textAlign: 'center',
+                flex: '1'
             }}
         >
             <CssBaseline />
-            <Typography 
-            data-testid="end-game-message"
-            variant="h4" 
-            sx={{
-                color: correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? 'green' : 'red',
-                fontSize: '4rem', // Tamaño de fuente
-                marginTop: '20px', // Espaciado superior
-                marginBottom: '50px', // Espaciado inferior
-            }}
-        >
-            {correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? "Great Job!" : "Game Over"}
-        </Typography>
-            <div>
-                <Typography variant="h6">Correct Answers: {correctlyAnsweredQuestions}</Typography>
-                <Typography variant="h6">Incorrect Answers: {incorrectlyAnsweredQuestions}</Typography>
-                <Typography variant="h6">Total money: {totalScore}</Typography>
-                <Typography variant="h6">Game time: {totalTimePlayed} seconds</Typography>
-            </div>
+            <Typography variant="h2" data-testid="end-game-message"
+                    sx={{ color: correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? theme.palette.success.main : theme.palette.error.main }}>
+                {correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? t("Game.win_msg") : t("Game.lose_msg") }
+            </Typography>
+            <Container>
+                <Typography variant="h4">{ t("Game.correct") }: {correctlyAnsweredQuestions}</Typography>
+                <Typography variant="h4">{ t("Game.incorrect") }: {incorrectlyAnsweredQuestions}</Typography>
+                <Typography variant="h4">{ t("Game.money") }: {totalScore}</Typography>
+                <Typography variant="h4">{ t("Game.time") }: {totalTimePlayed}</Typography>
+            </Container>
             {showConfetti && <Confetti />}
         </Container>
     );
 }
-    return (
-        <Container
-            sx={{
-                display: 'flex',
-                flexDirection: 'column',
-                alignItems: 'center',
-                justifyContent: 'center',
-                height: '100vh',
-                textAlign: 'center',
-            }}
-        >
-            <CssBaseline />
 
-            <Container
-            sx={{
-                position: 'center',
-                top: '10%', 
-                right: '20%', 
-            }}>
-                <Container
-                    sx={{
-                        display: 'center',
-                        flexDirection: 'row',
-                        alignItems: 'center',
-                    }}
-                >
-                    {questionHistorialBar()}
-                </Container>
-            </Container>
-
-            <Typography variant='h6' data-testid="numRound">
-                {round} / {numRounds}
-            </Typography>
-            <Typography variant="h5" mb={4} fontWeight="bold" style={{ display: 'flex', alignItems: 'center' }}>
-            <span data-testid="question" style={{ marginRight: '1em' }}>{questionData.question}</span>
+return (
+    <Container
+        sx={{ 
+            display: 'flex', 
+            flexDirection: 'column',
+            justifyContent: 'space-around',
+            alignItems: 'center', 
+            textAlign: 'center',
+            flex: '1',
+            gap: '2em',
+            margin: '2em auto 1em',
+        }}
+    >
+        <CssBaseline />
+
+        <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }} >
+            { answered ?
+                // Pausa
+                <Button variant="contained" onClick={() => togglePause()} sx={{ height: 100, width: 100, borderRadius: '50%' }} data-testid={ paused ? "play" : "pause"}>
+                    { paused ? <PlayArrow /> : <Pause /> }
+                </Button>
+                :
+                // Cronómetro
                 <CountdownCircleTimer
-                  data-testid="circleTimer"
-                  key={questionCountdownKey}
-                  isPlaying = {questionCountdownRunning}
-                  duration={timerConfig}
-                  colors={["#0bfc03", "#F7B801", "#f50707", "#A30000"]}
-                  size={100}
-                  colorsTime={[10, 6, 3, 0]}
-                  onComplete={() => selectResponse(0, "FAILED")} //when time ends always fail question
-                >
-                  {({ remainingTime }) => {
-                    return (
-                        <div style={{ display: 'flex', alignItems: 'center' }}>
-                        <div style={{ fontSize: '1.2em', fontWeight: 'bold' }}>{remainingTime}</div>
-                      </div>
-                    );
-                  }}
+                    data-testid="circleTimer"
+                    key={questionCountdownKey}
+                    isPlaying = {questionCountdownRunning}
+                    duration={timerConfig}
+                    colors={[theme.palette.success.main, "#F7B801", "#f50707", theme.palette.error.main]}
+                    size={100}
+                    colorsTime={[10, 6, 3, 0]}
+                    onComplete={() => selectResponse(-1, "FAILED")} //when time ends always fail question
+                    >
+                    {({ remainingTime }) => {
+                        return (
+                            <div style={{ display: 'flex', alignItems: 'center' }}>
+                            <div style={{ fontSize: '1.2em', fontWeight: 'bold' }}>{remainingTime}</div>
+                        </div>
+                        );
+                    }}
                 </CountdownCircleTimer>
+            }
+        </Container>
+
+        <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }} >
+            <Typography variant="h4" data-testid="question" sx={{ fontWeight:'bold', marginBottom:'0.7em' }} >
+                {questionData.question.toUpperCase()}
             </Typography>
 
             <Grid container spacing={2}>
                 {questionData.options.map((option, index) => (
                     <Grid item xs={12} key={index}>
                         <Button
-                            data-testid="answer"
+                            data-testid={buttonStates[index] === "success" ? `success${index}` : buttonStates[index] === "failure" ? `failel${index}` : `answer${index}`}
                             variant="contained"
                             onClick={() => selectResponse(index, option)}
                             disabled={buttonStates[index] !== null || answered} // before, you could still press more than one button
                             sx={{
-                                height: "50px", // Ajusta el tamaño según sea necesario
-                                width: "50%", // Ajusta el ancho según sea necesario
-                                borderRadius: "20px", // Ajusta el radio según sea necesario
+                                height: "3.3em",
+                                width: "50%",
+                                borderRadius: "10px",
                                 margin: "5px",
-                                backgroundColor: buttonStates[index] === "success" ? "green" : buttonStates[index] === "failure" ? "red" : null,
                                 "&:disabled": {
-                                    backgroundColor: buttonStates[index] === "success" ? "green" : buttonStates[index] === "failure" ? "red" : "gray",
+                                    backgroundColor: buttonStates[index] === "success" ? theme.palette.success.main : buttonStates[index] === "failure" ? theme.palette.error.main : "gray",
                                     color: "white",
                                 },
                             }}
@@ -431,7 +428,13 @@ if (shouldRedirect) {
                 ))}
             </Grid>
         </Container>
-    );
+
+        {/* Progress Cards */}
+        <Container sx={{ display: 'flex', flexDirection: 'row', alignItems: 'center', marginTop:'2em' }} >
+            {questionHistorialBar()}
+        </Container>
+    </Container>
+);
 };
 
-export default Game;
+export default Game;
\ No newline at end of file

From a558b9d035b033fcdd916987ac972bf3436fb45b Mon Sep 17 00:00:00 2001
From: teresagg <uo288347@uniovi.es>
Date: Tue, 23 Apr 2024 15:50:27 +0200
Subject: [PATCH 011/132] Changing grafana configuration

---
 .../provisioning/dashboards/example-service-dashboard.json    | 2 +-
 webapp/e2e/steps/discoveringCitiesGame.steps.js               | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/gatewayservice/monitoring/grafana/provisioning/dashboards/example-service-dashboard.json b/gatewayservice/monitoring/grafana/provisioning/dashboards/example-service-dashboard.json
index 61da159b..91326cd2 100644
--- a/gatewayservice/monitoring/grafana/provisioning/dashboards/example-service-dashboard.json
+++ b/gatewayservice/monitoring/grafana/provisioning/dashboards/example-service-dashboard.json
@@ -189,7 +189,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(increase(http_request_duration_seconds_count{code=~\"5.*\"}[1m]))",
+          "expr": "sum(increase(http_request_duration_seconds_count{status_code=~\"4.*\"}[1m]))",
           "interval": "",
           "legendFormat": "",
           "refId": "A"
diff --git a/webapp/e2e/steps/discoveringCitiesGame.steps.js b/webapp/e2e/steps/discoveringCitiesGame.steps.js
index 0441656a..05866025 100644
--- a/webapp/e2e/steps/discoveringCitiesGame.steps.js
+++ b/webapp/e2e/steps/discoveringCitiesGame.steps.js
@@ -7,9 +7,7 @@ let page;
 let browser;
 
 async function loginUser(username, password, name, surname) {
-  const [loginLink] = await page.$x('//*[@id="root"]/div/header/div/a[2]');
-  await loginLink.click();
-  //clickLink('//button[text()="PLAY"]');
+  clickLink('//button[text()="PLAY"]');
 
   await expect(page).toFill('input[name()="username"]', username);
   await expect(page).toFill('input[name()="password"]', password);

From 58e8f4f3b2cd641a2069f8ea846f894cecbaa366 Mon Sep 17 00:00:00 2001
From: teresagg <uo288347@uniovi.es>
Date: Tue, 23 Apr 2024 16:28:22 +0200
Subject: [PATCH 012/132] Checking e2e

---
 .../e2e/steps/discoveringCitiesGame.steps.js  | 34 -------------------
 webapp/e2e/steps/game.steps.js                | 34 -------------------
 webapp/e2e/steps/wiseMenStackGame.steps.js    | 32 -----------------
 3 files changed, 100 deletions(-)

diff --git a/webapp/e2e/steps/discoveringCitiesGame.steps.js b/webapp/e2e/steps/discoveringCitiesGame.steps.js
index 052e32cf..5c1103b1 100644
--- a/webapp/e2e/steps/discoveringCitiesGame.steps.js
+++ b/webapp/e2e/steps/discoveringCitiesGame.steps.js
@@ -5,33 +5,6 @@ const feature = loadFeature('./features/discoveringCitiesGame.feature');
 
 let page;
 let browser;
-
-async function loginUser(username, password, name, surname) {
-  clickLink('//button[text()="PLAY"]');
-
-  await expect(page).toFill('input[name()="username"]', username);
-  await expect(page).toFill('input[name()="password"]', password);
-  await expect(page).toClick('button', { text: /Log in/i });
-
-  if(await expect(page).toBe('button', { text: /Log in/i })) {
-    await expect(page).toClick("a", { text: "Don't have an account? Register here." });
-    await expect(page).toFill('input[name="username"]', username);
-    await expect(page).toFill('input[name="password"]', password);
-    await expect(page).toFill('input[name="name"]', name);
-    await expect(page).toFill('input[name="surname"]', surname);
-    await expect(page).toClick('button', { text: /Sign Up/i })
-    
-  }
-}
-
-async function clickLink(linkXPath) {
-  const [link] = await page.$x(linkXPath);
-  if (link) {
-      await link.click();
-  } else {
-      throw new Error(`Cannot find link "${link}"`);
-  }
-  }
   
 defineFeature(feature, test => {
 
@@ -66,13 +39,6 @@ defineFeature(feature, test => {
     });
     //Way of setting up the timeout
     setDefaultOptions({ timeout: 10000 })
-    await page
-    .goto("http://localhost:3000", {
-      waitUntil: "networkidle0",
-    })
-    .catch(() => {});
-    await loginUser("prueba14","123456789Ab=11", "pr","prueba");
-     
   });
 
   beforeEach(async () => {
diff --git a/webapp/e2e/steps/game.steps.js b/webapp/e2e/steps/game.steps.js
index f5986f2b..b362df4a 100644
--- a/webapp/e2e/steps/game.steps.js
+++ b/webapp/e2e/steps/game.steps.js
@@ -6,35 +6,6 @@ const feature = loadFeature('./features/game.feature');
 
 let page;
 let browser;
-
-
-async function loginUser(username, password, name, surname) {
-  clickLink('//button[text()="PLAY"]');
-
-  await expect(page).toFill('input[name="username"]', username);
-  await expect(page).toFill('input[name="password"]', password);
-  await expect(page).toClick('button', { text: /Log in/i });
-
-  if(await expect(page).toBe('button', { text: /Log in/i })) {
-    await expect(page).toClick("a", { text: "Don't have an account? Register here." });
-    await expect(page).toFill('input[name="username"]', username);
-    await expect(page).toFill('input[name="password"]', password);
-    await expect(page).toFill('input[name="name"]', name);
-    await expect(page).toFill('input[name="surname"]', surname);
-    await expect(page).toClick('button', { text: /Sign Up/i })
-    
-  }
-}
-
-async function clickLink(linkXPath) {
-  const [link] = await page.$x(linkXPath);
-  if (link) {
-      await link.click();
-  } else {
-      throw new Error(`Cannot find link "${link}"`);
-  }
-  }
-
   
 defineFeature(feature, test => {
 
@@ -74,11 +45,6 @@ defineFeature(feature, test => {
   });
 
   beforeEach(async () => {
-    await page
-    .goto("http://localhost:3000/game", {
-      waitUntil: "networkidle0",
-    })
-    .catch(() => {});
 
     //"mock" login
     await page.evaluate(() => {
diff --git a/webapp/e2e/steps/wiseMenStackGame.steps.js b/webapp/e2e/steps/wiseMenStackGame.steps.js
index 0db72f2a..371fd57e 100644
--- a/webapp/e2e/steps/wiseMenStackGame.steps.js
+++ b/webapp/e2e/steps/wiseMenStackGame.steps.js
@@ -6,24 +6,6 @@ const feature = loadFeature('./features/wiseMenStackGame.feature');
 let page;
 let browser;
 
-async function loginUser(username, password) {
-  clickLink('//button[text()="PLAY"]');
-
-  await expect(page).toFill('input[name="username"]', username);
-  await expect(page).toFill('input[name="password"]', password);
-  await expect(page).toClick('button', { text: /Log in/i });
-}
-
-async function clickLink(linkXPath) {
-  const [link] = await page.$x(linkXPath);
-  if (link) {
-      await link.click();
-  } else {
-      throw new Error(`Cannot find link "${link}"`);
-  }
-  }
-  
-
 defineFeature(feature, test => {
 
   beforeAll(async () => {
@@ -57,23 +39,9 @@ defineFeature(feature, test => {
     });
     //Way of setting up the timeout
     setDefaultOptions({ timeout: 10000 })
-    await page
-    .goto("http://localhost:3000", {
-      waitUntil: "networkidle0",
-    })
-    .catch(() => {});
-    await loginUser("prueba14","123456789Ab=11");
-     
-     
   });
 
   beforeEach(async () => {
-    await page
-    .goto("http://localhost:3000/wiseMenStackGame", {
-      waitUntil: "networkidle0",
-    })
-    .catch(() => {});
-
     //"mock" login
     await page.evaluate(() => {
       localStorage.clear();

From 215af9e28f734c4b1ea349f581c637186cf11d24 Mon Sep 17 00:00:00 2001
From: teresagg <uo288347@uniovi.es>
Date: Tue, 23 Apr 2024 16:39:03 +0200
Subject: [PATCH 013/132] Fixing merge mistake

---
 webapp/e2e/steps/game.steps.js             | 6 ++++++
 webapp/e2e/steps/wiseMenStackGame.steps.js | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/webapp/e2e/steps/game.steps.js b/webapp/e2e/steps/game.steps.js
index b362df4a..7886f189 100644
--- a/webapp/e2e/steps/game.steps.js
+++ b/webapp/e2e/steps/game.steps.js
@@ -45,6 +45,12 @@ defineFeature(feature, test => {
   });
 
   beforeEach(async () => {
+    await page
+    .goto("http://localhost:3000/discoveringCitiesGame", {
+      waitUntil: "networkidle0",
+    })
+    .catch(() => {});
+
 
     //"mock" login
     await page.evaluate(() => {
diff --git a/webapp/e2e/steps/wiseMenStackGame.steps.js b/webapp/e2e/steps/wiseMenStackGame.steps.js
index 371fd57e..2c59525a 100644
--- a/webapp/e2e/steps/wiseMenStackGame.steps.js
+++ b/webapp/e2e/steps/wiseMenStackGame.steps.js
@@ -42,6 +42,12 @@ defineFeature(feature, test => {
   });
 
   beforeEach(async () => {
+    await page
+    .goto("http://localhost:3000/wiseMenStackGame", {
+      waitUntil: "networkidle0",
+    })
+    .catch(() => {});
+    
     //"mock" login
     await page.evaluate(() => {
       localStorage.clear();

From ffe3c0c9fccbcc91c7b98460549286290a7cebe6 Mon Sep 17 00:00:00 2001
From: uo289689 <uo289689@uniovi.es>
Date: Tue, 23 Apr 2024 17:15:58 +0200
Subject: [PATCH 014/132] Internacionalized view of statistics

---
 webapp/src/localize/en.json    | 9 +++++++++
 webapp/src/localize/es.json    | 9 +++++++++
 webapp/src/localize/fr.json    | 9 +++++++++
 webapp/src/pages/Statistics.js | 6 +++---
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/webapp/src/localize/en.json b/webapp/src/localize/en.json
index 2fcf69bf..9c3d8b1a 100644
--- a/webapp/src/localize/en.json
+++ b/webapp/src/localize/en.json
@@ -44,6 +44,10 @@
         "multiplayer": {
             "name": "Multiplayer",
             "desc": "Create a room for other player to join and play 1vs1"
+        },
+        "online": {
+            "name": "Online Game",
+            "desc": ""
         }
 
     },
@@ -109,6 +113,7 @@
 
     "Statistics": {
         "title": "STATISTICS",
+        "game": "Game",
         "table": {
             "money": "Total Points",
             "questions_corr": "Correctly Answered Questions",
@@ -118,6 +123,10 @@
             "total_time": "Total Time Played",
             "cities_corr": "Correctly Answered Cities",
             "cities_incorr": "Incorrectly Answered Cities"
+        },
+        "button": {
+            "hide_record": "Hide Questions Record",
+            "show_record": "Show Questions Record"
         }
     },
 
diff --git a/webapp/src/localize/es.json b/webapp/src/localize/es.json
index e437e9cb..25171e73 100644
--- a/webapp/src/localize/es.json
+++ b/webapp/src/localize/es.json
@@ -44,6 +44,10 @@
         "multiplayer": {
             "name": "Multijugador",
             "desc": "Crea una sala para que otros jugadores se unan y jueguen 1 contra 1."
+        },
+        "online": {
+            "name": "Partida en línea",
+            "desc": ""
         }
     },
 
@@ -108,6 +112,7 @@
 
     "Statistics": {
         "title": "ESTADÍSTICAS",
+        "game": "Partida",
         "table": {
             "money": "Puntos Ganado",
             "questions_corr": "Preguntas Respondidas Correctamente",
@@ -117,6 +122,10 @@
             "total_time": "Tiempo Total Jugado",
             "cities_corr": "Ciudades Respondidas Correctamente",
             "cities_incorr": "Ciudades Respondidas Incorrectamente"
+        },
+        "button": {
+            "hide_record": "Ocultar registro de preguntas",
+            "show_record": "Mostrar registro de preguntas"
         }
     },
 
diff --git a/webapp/src/localize/fr.json b/webapp/src/localize/fr.json
index 5368553f..e940adb8 100644
--- a/webapp/src/localize/fr.json
+++ b/webapp/src/localize/fr.json
@@ -44,6 +44,10 @@
         "multiplayer": {
             "name": "Multijoueur",
             "desc": "Créez une salle pour que d'autres joueurs se joignent et jouent en 1 contre 1."
+        },
+        "online": {
+            "name": "Jeu en ligne",
+            "desc": ""
         }
 
     },
@@ -110,6 +114,7 @@
 
     "Statistics": {
         "title": "STATISTIQUES",
+        "game": "Partie",
         "table": {
             "money": "Points gagnés",
             "questions_corr": "Questions Correctement Répondues",
@@ -119,6 +124,10 @@
             "total_time": "Temps Total Joué",
             "cities_corr": "Villes Répondus Correctement",
             "cities_incorr": "Villes Répondus Incorrectement"
+        },
+        "button": {
+            "hide_record": "Masquer l'historique des questions",
+            "show_record": "Afficher l'historique des questions"
         }
     },
 
diff --git a/webapp/src/pages/Statistics.js b/webapp/src/pages/Statistics.js
index b45a12a8..3fa49f9c 100644
--- a/webapp/src/pages/Statistics.js
+++ b/webapp/src/pages/Statistics.js
@@ -228,7 +228,7 @@ const Statistics = () => {
                     {currentItems.map((record, index) => (
                         <div key={index}>
                         <Typography variant="h5" gutterBottom>
-                            Game {formatCreatedAt(record.createdAt)}
+                           t("Statistics.game") {formatCreatedAt(record.createdAt)}
                         </Typography>
 
                         <Grid container spacing={2}>
@@ -298,7 +298,7 @@ const Statistics = () => {
                             { t("Games.discover.name") }
                         </Button>
                         <Button onClick={() => setSelectedMode('OnlineMode')} variant="contained" sx={{ marginBottom: isSmallScreen ? '0.5em' : '0', backgroundColor: theme.palette.primary.main, color: theme.palette.secondary.main, borderColor: theme.palette.primary.main, '&:hover': { backgroundColor: theme.palette.secondary.main, color: theme.palette.primary.main, borderColor: theme.palette.primary.main } }}>
-                            { "Online Mode" }
+                            { t("Games.online.name") }
                         </Button>
                     </div>
                     {renderStatistics()}
@@ -307,7 +307,7 @@ const Statistics = () => {
                         variant="contained"
                         sx={{ marginBottom: '0.5em', marginTop: '0.5em', backgroundColor: 'green', color: theme.palette.secondary.main, borderColor: theme.palette.primary.main, '&:hover': { backgroundColor: theme.palette.secondary.main, color: theme.palette.primary.main, borderColor: theme.palette.primary.main } }}
                     >
-                        {showQuestionsRecord ? 'Hide Questions Record' : 'Show Questions Record'}
+                        {showQuestionsRecord ? t("Statistics.button.hide_record") : t("Statistics.button.show_record")}
                     </Button>
                     {renderQuestions()}
                 </Box>

From 78e0ac588a695a8fb0a300b6b5a52a7d0d65d5be Mon Sep 17 00:00:00 2001
From: uo289689 <uo289689@uniovi.es>
Date: Tue, 23 Apr 2024 17:26:18 +0200
Subject: [PATCH 015/132] Internacionalized view of homePage

---
 webapp/src/pages/Homepage.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/webapp/src/pages/Homepage.js b/webapp/src/pages/Homepage.js
index ee5b0f6f..79915623 100644
--- a/webapp/src/pages/Homepage.js
+++ b/webapp/src/pages/Homepage.js
@@ -3,10 +3,12 @@ import { Button, Box, Grid, Typography } from '@mui/material';
 import data from "../data/gameInfo.json";
 import CardComponent from "../components/CardComponent.js";
 import useMediaQuery from '@mui/material/useMediaQuery';
+import { useTranslation } from 'react-i18next';
 
 
 const Homepage = () => {
     const xxl = useMediaQuery('(min-width:1920px)');
+    const { t } = useTranslation();
 
     const styles = React.useMemo(() => ({
         cardButton:{
@@ -175,7 +177,7 @@ const Homepage = () => {
             </video>
             <Typography variant="h3" align="center" fontWeight="bold" sx={{paddingTop:'2rem',textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem'}}>GAME MODES</Typography>
             {games}
-            <Button variant='conteined' href={gameLink} sx={styles.playButton}> PLAY </Button>
+            <Button variant='conteined' href={gameLink} sx={styles.playButton}> t("Home") </Button>
         </Box>
     );
 };

From 6050d482c7f6530c65386a733b64922a41b1a327 Mon Sep 17 00:00:00 2001
From: uo289689 <uo289689@uniovi.es>
Date: Tue, 23 Apr 2024 17:36:25 +0200
Subject: [PATCH 016/132] Internacionalized view of instrucctions

---
 webapp/src/data/gameInfo.json    | 10 +++++-----
 webapp/src/localize/en.json      |  5 -----
 webapp/src/localize/es.json      | 14 +++++---------
 webapp/src/localize/fr.json      | 14 +++++---------
 webapp/src/pages/Homepage.js     | 12 ++++++------
 webapp/src/pages/Instructions.js |  5 ++++-
 webapp/src/pages/Statistics.js   |  4 ++--
 7 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/webapp/src/data/gameInfo.json b/webapp/src/data/gameInfo.json
index 27a8397e..89053297 100644
--- a/webapp/src/data/gameInfo.json
+++ b/webapp/src/data/gameInfo.json
@@ -1,6 +1,6 @@
 [
     {
-      "nombre": "WISE MEN STACK",
+      "nombre": "Wise Men Stack",
       "descripcion":
             "The player chooses a topic from five available options and must answer a battery of questions related to it within 60 seconds. For each question, the host provides two options. If the contestant guesses correctly, they move on to the next question.",
       "foto": "../instructions/foto0.png",
@@ -8,21 +8,21 @@
       "cardFoto": "../homePage/foto0.png"
     },
     {
-      "nombre": "WARM QUESTION",
+      "nombre": "Warm Question",
       "descripcion": "It consists of ten topics of varied themes. For each correct answer, €100 is earned, and €10 are lost if the contestant passes, does not respond, or answers incorrectly.",
       "foto": "../instructions/foto1.jpg",
       "card":"It consists of ten topics of varied themes.",
       "cardFoto": "../homePage/foto1.jpg"
     },
     {
-      "nombre": "DISCOVERING CITIES",
+      "nombre": "Discovering Cities",
       "descripcion": "In the 'Discovering Cities' game mode, the contestant will face a challenge where they will be repeatedly asked questions referring to different cities around the world. To successfully overcome the challenge, the contestant must answer as many questions as possible correctly throughout the test..",
       "foto": "../instructions/foto2.png",
       "card":"The contestant will face a challenge where they will be repeatedly asked questions referring to different cities around the world.",
       "cardFoto": "../homePage/foto2.png"
     },
     {
-      "nombre": "THE CHALLENGE",
+      "nombre": "Challenge",
       "descripcion": "The 'Challenge' game mode is the quintessential game mode, as it allows you to customize the match to your liking. This game mode is tailored for those who wish to practice certain game formats before engaging in our various other game modes.",
       "foto": "../instructions/foto3.jpg",
       "card":"The 'Challenge' game mode is the quintessential game mode, as it allows you to customize the match to your liking.",
@@ -30,7 +30,7 @@
 
     },
     {
-      "nombre": "MULTIPLAYER MODE",
+      "nombre": "Multiplayer",
       "descripcion": "Create a room and share the room code with other players to play. It also has a room chat.",
       "foto": "../instructions/online-photo.jpg",
       "card":"Create a room and share the room code with other players to play. It also has a room chat.",
diff --git a/webapp/src/localize/en.json b/webapp/src/localize/en.json
index 9c3d8b1a..4d511c5c 100644
--- a/webapp/src/localize/en.json
+++ b/webapp/src/localize/en.json
@@ -44,12 +44,7 @@
         "multiplayer": {
             "name": "Multiplayer",
             "desc": "Create a room for other player to join and play 1vs1"
-        },
-        "online": {
-            "name": "Online Game",
-            "desc": ""
         }
-
     },
 
     "Game": {
diff --git a/webapp/src/localize/es.json b/webapp/src/localize/es.json
index 25171e73..5af8d516 100644
--- a/webapp/src/localize/es.json
+++ b/webapp/src/localize/es.json
@@ -26,28 +26,24 @@
 
     "Games": {
         "wise_men": {
-            "name": "Hombres Sabiondos",
+            "name": "Wise Men Stack",
             "desc": "El jugador elige un tema entre cinco opciones disponibles y debe responder una batería de preguntas relacionadas con él en un plazo de 60 segundos. Para cada pregunta, el presentador proporciona dos opciones. Si el concursante acierta, gana €20; de lo contrario, pasa a la siguiente pregunta (ya que la respuesta correcta sería la otra opción). Si el tiempo se agota antes de que se formule por completo la pregunta y se proporcionen ambas posibles respuestas, el concursante aún puede responderla; sin embargo, si la afirmación no se ha completado (o las opciones no se proporcionaron), no pueden responder."
         },
         "warm_quest": {
-            "name": "Pregunta Calentorra",
+            "name": "Warm Question",
             "desc": "Consta de diez temas de diferentes temáticas. Por cada respuesta correcta, se ganan €100, y se pierden €10 si el concursante pasa, no responde o responde incorrectamente."
         },
         "discover": {
-            "name": "Descubriendo Ciudades",
+            "name": "Discovering Cities",
             "desc": "En el modo de juego 'Descubriendo Ciudades', el concursante enfrentará un desafío donde se le harán preguntas repetidas referentes a diferentes ciudades de todo el mundo. Para superar con éxito el desafío, el concursante debe responder tantas preguntas como sea posible correctamente a lo largo de la prueba."
         },
         "challenge": {
-            "name": "Desafío",
+            "name": "Challenge",
             "desc": "El modo de juego 'Desafío' es el modo de juego por excelencia, ya que te permite personalizar el enfrentamiento a tu gusto. Este modo de juego está diseñado para aquellos que deseen practicar ciertos formatos de juego antes de participar en nuestros diversos otros modos de juego."
         },
         "multiplayer": {
-            "name": "Multijugador",
+            "name": "Multiplayer",
             "desc": "Crea una sala para que otros jugadores se unan y jueguen 1 contra 1."
-        },
-        "online": {
-            "name": "Partida en línea",
-            "desc": ""
         }
     },
 
diff --git a/webapp/src/localize/fr.json b/webapp/src/localize/fr.json
index e940adb8..2b75edcf 100644
--- a/webapp/src/localize/fr.json
+++ b/webapp/src/localize/fr.json
@@ -26,28 +26,24 @@
 
     "Games": {
         "wise_men": {
-            "name": "Pile de Sages",
+            "name": "Wise Men Stack",
             "desc": "Le joueur choisit un sujet parmi cinq options disponibles et doit répondre à une batterie de questions qui y sont liées dans un délai de 60 secondes. Pour chaque question, l'hôte fournit deux options. Si le participant devine correctement, il gagne 20 € ; sinon, il passe à la question suivante (car la bonne réponse serait l'autre option). Si le temps s'écoule avant que la question ne soit entièrement posée et que les deux réponses possibles soient fournies, le participant peut toujours y répondre ; cependant, si l'énoncé n'a pas été complété (ou si les options n'ont pas été fournies), il ne peut pas répondre."
         },
         "warm_quest": {
-            "name": "Question Chaleureuse",
+            "name": "Warm Question",
             "desc": "Il se compose de dix sujets de thèmes variés. Pour chaque réponse correcte, 100 € sont gagnés, et 10 € sont perdus si le participant passe, ne répond pas ou répond incorrectement."
         },
         "discover": {
-            "name": "Découverte des Villes",
+            "name": "Discovering Cities",
             "desc": "Dans le mode de jeu 'Découverte des Villes', le participant sera confronté à un défi où il lui sera posé à plusieurs reprises des questions se référant à différentes villes du monde entier. Pour surmonter avec succès le défi, le participant doit répondre correctement à autant de questions que possible tout au long du test."
         },
         "challenge": {
-            "name": "Défi",
+            "name": "Challenge",
             "desc": "Le mode de jeu 'Défi' est le mode de jeu par excellence, car il vous permet de personnaliser le match à votre guise. Ce mode de jeu est adapté à ceux qui souhaitent s'entraîner à certains formats de jeu avant de s'engager dans nos divers autres modes de jeu."
         },
         "multiplayer": {
-            "name": "Multijoueur",
+            "name": "Multiplayer",
             "desc": "Créez une salle pour que d'autres joueurs se joignent et jouent en 1 contre 1."
-        },
-        "online": {
-            "name": "Jeu en ligne",
-            "desc": ""
         }
 
     },
diff --git a/webapp/src/pages/Homepage.js b/webapp/src/pages/Homepage.js
index 79915623..6df790e9 100644
--- a/webapp/src/pages/Homepage.js
+++ b/webapp/src/pages/Homepage.js
@@ -108,19 +108,19 @@ const Homepage = () => {
     //if online mode -> change link to go to online room
     const changeGameLink = React.useCallback((index) => {
         switch (info[index].nombre) {
-            case "WISE MEN STACK":
+            case "Wise Men Stack":
                 setGameLink("/wiseMenStackGame");
                 break;
-            case "WARM QUESTION":
+            case "Warm Question":
                 setGameLink("/warmQuestionGame");
                 break;
-            case "DISCOVERING CITIES":
+            case "Discovering Cities":
                 setGameLink("/discoveringCitiesGame");
                 break;
-            case "THE CHALLENGE":
+            case "Challenge":
                 setGameLink("/theChallengeGame");
                 break;
-            case "MULTIPLAYER MODE":
+            case "Multiplayer":
                 setGameLink("/multiplayerRoom");
                 break;
             default:
@@ -177,7 +177,7 @@ const Homepage = () => {
             </video>
             <Typography variant="h3" align="center" fontWeight="bold" sx={{paddingTop:'2rem',textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem'}}>GAME MODES</Typography>
             {games}
-            <Button variant='conteined' href={gameLink} sx={styles.playButton}> t("Home") </Button>
+            <Button variant='conteined' href={gameLink} sx={styles.playButton}> {t("Home")} </Button>
         </Box>
     );
 };
diff --git a/webapp/src/pages/Instructions.js b/webapp/src/pages/Instructions.js
index 7143217e..e416610f 100644
--- a/webapp/src/pages/Instructions.js
+++ b/webapp/src/pages/Instructions.js
@@ -1,10 +1,12 @@
 import * as React from "react";
 import { Button, Typography, Grid, Box , CssBaseline, useMediaQuery  } from "@mui/material";
 import data from "../data/gameInfo.json";
+import { useTranslation } from 'react-i18next';
 
 
 const Instructions = () => {
     const lg = useMediaQuery('(min-width: 1200px)');
+    const { t } = useTranslation();
 
     const styles = {
 
@@ -143,7 +145,8 @@ const Instructions = () => {
                     <img src={info[index].foto} alt="Foto del minijuego" style={lg ? styles.imgRow : styles.imgColumn}/>
                     <Box sx={lg ? styles.textRow : styles.textColumn}>
                         <Typography variant="h3" align="center" fontWeight="bold" sx={{fontSize:'2rem'}}> {info[index].nombre} </Typography>
-                        <Typography  variant="body1" align="center" sx={{ textAlign: "center", background: "none", paddingTop:'2rem', width:'80%', fontSize:'1rem'}}> {info[index].descripcion} </Typography>
+                        <Typography  variant="body1" align="center" sx={{ textAlign: "center", background: "none", paddingTop:'2rem', width:'80%', fontSize:'1rem'}}> {t("Games." 
+                        + info[index].nombre +".desc")} </Typography>
                     </Box>
                 </Box>
             );
diff --git a/webapp/src/pages/Statistics.js b/webapp/src/pages/Statistics.js
index 3fa49f9c..adac2491 100644
--- a/webapp/src/pages/Statistics.js
+++ b/webapp/src/pages/Statistics.js
@@ -228,7 +228,7 @@ const Statistics = () => {
                     {currentItems.map((record, index) => (
                         <div key={index}>
                         <Typography variant="h5" gutterBottom>
-                           t("Statistics.game") {formatCreatedAt(record.createdAt)}
+                           {t("Statistics.game")} {formatCreatedAt(record.createdAt)}
                         </Typography>
 
                         <Grid container spacing={2}>
@@ -298,7 +298,7 @@ const Statistics = () => {
                             { t("Games.discover.name") }
                         </Button>
                         <Button onClick={() => setSelectedMode('OnlineMode')} variant="contained" sx={{ marginBottom: isSmallScreen ? '0.5em' : '0', backgroundColor: theme.palette.primary.main, color: theme.palette.secondary.main, borderColor: theme.palette.primary.main, '&:hover': { backgroundColor: theme.palette.secondary.main, color: theme.palette.primary.main, borderColor: theme.palette.primary.main } }}>
-                            { t("Games.online.name") }
+                            { t("Games.multiplayer.name") }
                         </Button>
                     </div>
                     {renderStatistics()}

From ba2e452516806dd8a5e414dee5d791f3f42374aa Mon Sep 17 00:00:00 2001
From: uo289689 <uo289689@uniovi.es>
Date: Tue, 23 Apr 2024 17:38:07 +0200
Subject: [PATCH 017/132] Internacionalized view of home

---
 webapp/src/pages/Home.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/webapp/src/pages/Home.js b/webapp/src/pages/Home.js
index 381a6c74..fcfa9336 100644
--- a/webapp/src/pages/Home.js
+++ b/webapp/src/pages/Home.js
@@ -1,10 +1,11 @@
 import * as React from "react";
 import {Box, Button} from "@mui/material";
 import useMediaQuery from '@mui/material/useMediaQuery';
-
+import { useTranslation } from 'react-i18next';
 
 const Home = () => {
     const xxl = useMediaQuery('(min-width:1920px)');
+    const { t } = useTranslation();
 
     const styles = {
         logo:{
@@ -96,7 +97,7 @@ const Home = () => {
                 <img src="./home/HomeLogo.png" alt="Logo" style={{ width: '100%' }} />
             </Box>
 
-            <Button variant='contained' href={"/login"} sx={styles.playButton}> PLAY </Button>
+            <Button variant='contained' href={"/login"} sx={styles.playButton}> {t("Home")} </Button>
 
             <video data-testid="video" ref={videoRef} autoPlay muted loop style={{ ...styles.video}}>
                 <source src="./home/Background-White.webm" type="video/mp4" />

From be6d2751e9302d8e335079bdb1dbbf4b6d3ed425 Mon Sep 17 00:00:00 2001
From: teresagg <uo288347@uniovi.es>
Date: Tue, 23 Apr 2024 17:46:04 +0200
Subject: [PATCH 018/132] Adding testing to question generation

---
 .../__tests/routes/question-routes.test.js    | 46 +++++++++------
 questions/routes/question-routes.js           | 59 +++++++++++++------
 2 files changed, 71 insertions(+), 34 deletions(-)

diff --git a/questions/__tests/routes/question-routes.test.js b/questions/__tests/routes/question-routes.test.js
index 124c7308..4c6066ad 100644
--- a/questions/__tests/routes/question-routes.test.js
+++ b/questions/__tests/routes/question-routes.test.js
@@ -5,14 +5,11 @@ const mongoose = require('mongoose');
 const express = require('express');
 const bodyParser = require('body-parser');
 
-
-
 let mongoServer;
 let questionFunctions;
 let questionRoutes;
 let generateQuestionsService;
 
-
 //let mongoServer;
 let app = express();
 
@@ -114,34 +111,49 @@ describe('Question routes', function() {
       });  
   });
   describe('Get n questions from the database', function() {
+    it('get question when less than 50 questions', async function() {
+      await generateQuestionsService.generateQuestions.mockResolvedValue({"response":{"status":"200"}});
+      const response = await request(app).get('/questions/getQuestionsFromDb/3/en');
+      await expect(response.status).toBe(200);
+      await expect(response.body.length).toBe(3);
+    });
 
-      it('It should get n questions from the database', async function() {
-        await generateQuestionsService.generateQuestions.mockResolvedValue({"response":{"status":"200"}});
-        const response = await request(app).get('/questions/getQuestionsFromDb/3/en');
-        await expect(response.status).toBe(200);
-        await expect(response.body.length).toBe(3);
-      });
+    it('get question when less than 100 questions', async function() {
+      await addingQuestions();
+      await generateQuestionsService.generateQuestions.mockResolvedValue({"response":{"status":"200"}});
+      const response = await request(app).get('/questions/getQuestionsFromDb/3/en');
+      await expect(response.status).toBe(200);
+      await expect(response.body.length).toBe(3);
+    });
 
-      it('It should get n questions from the database', async function() {
-        const response = await request(app).get('/questions/getQuestionsFromDb/3/en');
-        await expect(response.status).toBe(200);
-        await expect(response.body.length).toBe(3);
-      });
+    it('It should get n questions of certain category from the database', async function() {
+      const response = await request(app).get('/questions/getQuestionsFromDb/3/en');
+      await expect(response.status).toBe(200);
+      await expect(response.body.length).toBe(3);
+    });
 
       it('It should not get n questions from the database', async function() {
         const response = await request(app).get('/questions/getQuestionsFromDb/-1/en');
         await expect(response.status).toBe(400);
       });
     });
-  describe('Question routes', function() {
+  describe('Get n questions from the database filtered by category', function() {
     
-      it('It should get n questions of certain category from the database', async function() {
+    it('get question when less than 50 questions', async function() {
+      await generateQuestionsService.generateQuestions.mockResolvedValue({"response":{"status":"200"}});
+      const response = await request(app).get('/questions/getQuestionsFromDb/2/Geography/en');
+      await expect(response.status).toBe(200);
+      await expect(response.body.length).toBe(2);
+      await expect(response.body[0].categories[0]).toBe("Geography");
+    });
+      it('get question when less than 100 questions', async function() {
+        await addingQuestions();
+        await generateQuestionsService.generateQuestions.mockResolvedValue({"response":{"status":"200"}});
         const response = await request(app).get('/questions/getQuestionsFromDb/2/Geography/en');
         await expect(response.status).toBe(200);
         await expect(response.body.length).toBe(2);
         await expect(response.body[0].categories[0]).toBe("Geography");
       });
-
       it('It should not get n questions of certain category from the database', async function() {
         const response = await request(app).get('/questions/getQuestionsFromDb/-1/Geography/en');
         await expect(response.status).toBe(400);
diff --git a/questions/routes/question-routes.js b/questions/routes/question-routes.js
index 8a930697..13240baf 100644
--- a/questions/routes/question-routes.js
+++ b/questions/routes/question-routes.js
@@ -42,13 +42,49 @@ router.get('/:lang', async (req, res) => {
 router.get('/getQuestionsFromDb/:n/:lang', async(_req, res) => {
     const n = parseInt(_req.params.n, 10);
     const language = _req.params.lang;
+    const questionCount = await dbService.getQuestionCount(language);
 
     //Verify is n is a correct number
     if (isNaN(n) || n <= 0) {
         return res.status(400).json({ error: 'Parameter "n" must be > 0.' });
     }
 
-    if (await dbService.getQuestionCount(language) < n) {
+    // 0: Await till it creates 2, creates 50 async and do not delete
+    if (questionCount == 0) {
+        await generateQuestionsService.generateQuestions(2, language);
+        generateQuestionsService.generateQuestions(50, language);
+        const questions = await dbService.getRandomQuestions(n, language);
+        res.json(questions);
+        
+    // < 50: async creates 10 and do not delete
+    } else if (questionCount < 50) {
+        //Do not wait to generate the others
+        generateQuestionsService.generateQuestions(10, language);
+        const questions = await dbService.getRandomQuestions(n, language);
+        res.json(questions);
+
+    // < 100: async creates 5 and delete
+    } else if (questionCount < 100) {
+        generateQuestionsService.generateQuestions(10, language);
+        const questions = await dbService.getRandomQuestions(n, language);
+        res.json(questions);
+        if(questions != null) {
+            for(var i = 0; i < questions.length; i++) {
+                dbService.deleteQuestionById(questions[i]._id);
+            }
+        }
+    // >= 100: do not create and delete
+    } else {
+        const questions = await dbService.getRandomQuestions(n, language);
+        res.json(questions);
+        if(questions != null) {
+            for(var i = 0; i < questions.length; i++) {
+                dbService.deleteQuestionById(questions[i]._id);
+            }
+        }
+    }
+
+    /*if (await dbService.getQuestionCount(language) < n) {
         //Must generate n questions
         await generateQuestionsService.generateQuestions(n + 1, language);
         //Do not wait to generate the others
@@ -60,7 +96,7 @@ router.get('/getQuestionsFromDb/:n/:lang', async(_req, res) => {
         questions.map(question => {
             dbService.deleteQuestionById(question._id);
         })
-    res.json(questions);
+    res.json(questions);*/
 });
 
 //Get random questions from db with category filter: http://localhost:8010/questions/getQuestionsFromDb/2/Geografía
@@ -75,23 +111,9 @@ router.get('/getQuestionsFromDb/:n/:category/:lang', async(_req, res) => {
         return res.status(400).json({ error: 'Parameter "n" must be > 0.' });
     }
     
-    /*if (await dbService.getQuestionCountByCategory(category, language) < n) {
-        //Must generate n questions (n because some can fail at generation at the moment 18/04)
-        await generateQuestionsService.generateQuestions(n + 2, language, category);
-        //Do not wait to generate the others
-        generateQuestionsService.generateQuestions(n, language, category);
-    }
-    questions = await dbService.getRandomQuestionsByCategory(n, category, language);
-    if(questions != null) {
-        for(var i = 0; i < questions.length; i++) {
-            dbService.deleteQuestionById(questions[i]._id);
-        }
-    }
-    res.json(questions);*/
-    
-
     // 0: Await till it creates 2, creates 50 async and do not delete
     if (questionCount == 0) {
+        console.log("QUESTIONS 0");
         await generateQuestionsService.generateQuestions(2, language, category);
         generateQuestionsService.generateQuestions(50, language, category);
         questions = await dbService.getRandomQuestionsByCategory(n, category, language);
@@ -99,6 +121,7 @@ router.get('/getQuestionsFromDb/:n/:category/:lang', async(_req, res) => {
         
     // < 50: async creates 10 and do not delete
     } else if (questionCount < 50) {
+        console.log("QUESTIONS 50");
         //Do not wait to generate the others
         generateQuestionsService.generateQuestions(10, language, category);
         questions = await dbService.getRandomQuestionsByCategory(n, category, language);
@@ -106,6 +129,7 @@ router.get('/getQuestionsFromDb/:n/:category/:lang', async(_req, res) => {
 
     // < 100: async creates 5 and delete
     } else if (questionCount < 100) {
+        console.log("QUESTIONS 100");
         generateQuestionsService.generateQuestions(10, language, category);
         questions = await dbService.getRandomQuestionsByCategory(n, category, language);
         res.json(questions);
@@ -117,6 +141,7 @@ router.get('/getQuestionsFromDb/:n/:category/:lang', async(_req, res) => {
 
     // >= 100: do not create and delete
     } else {
+        console.log("QUESTIONS ELSE");
         questions = await dbService.getRandomQuestionsByCategory(n, category, language);
         res.json(questions);
         if(questions != null) {

From de95620bc282840ed734d7628e955438538a6a1e Mon Sep 17 00:00:00 2001
From: uo289689 <uo289689@uniovi.es>
Date: Tue, 23 Apr 2024 18:09:34 +0200
Subject: [PATCH 019/132] Fixed some internatinalization problems

---
 webapp/src/localize/en.json    | 12 ++++++------
 webapp/src/localize/es.json    | 12 ++++++------
 webapp/src/localize/fr.json    | 12 ++++++------
 webapp/src/pages/Statistics.js | 10 +++++-----
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/webapp/src/localize/en.json b/webapp/src/localize/en.json
index 4d511c5c..6bed8400 100644
--- a/webapp/src/localize/en.json
+++ b/webapp/src/localize/en.json
@@ -25,23 +25,23 @@
     },
 
     "Games": {
-        "wise_men": {
+        "Wise Men Stack": {
             "name": "Wise Men Stack",
             "desc": "The player chooses a topic from five available options and must answer a battery of questions related to it within 60 seconds. For each question, the host provides two options. If the contestant guesses correctly, they win €20; otherwise, they move on to the next question (as the correct answer would be the other option). If the time runs out before the question is fully asked and both possible answers are provided, the contestant may still answer it; however, if the statement hasn't been completed (or the options weren't provided), they cannot answer."
         },
-        "warm_quest": {
+        "Warm Question": {
             "name": "Warm Question",
             "desc": "It consists of ten topics of varied themes. For each correct answer, €100 is earned, and €10 are lost if the contestant passes, does not respond, or answers incorrectly."
         },
-        "discover": {
+        "Discovering Cities": {
             "name": "Discovering Cities",
             "desc": "In the 'Discovering Cities' game mode, the contestant will face a challenge where they will be repeatedly asked questions referring to different cities around the world. To successfully overcome the challenge, the contestant must answer as many questions as possible correctly throughout the test.."
         },
-        "challenge": {
+        "Challenge": {
             "name": "Challenge",
             "desc": "The 'Challenge' game mode is the quintessential game mode, as it allows you to customize the match to your liking. This game mode is tailored for those who wish to practice certain game formats before engaging in our various other game modes."
         },
-        "multiplayer": {
+        "Multiplayer": {
             "name": "Multiplayer",
             "desc": "Create a room for other player to join and play 1vs1"
         }
@@ -164,7 +164,7 @@
 
         "users":"Users",
         "groups": "Groups",
-        "total_money": "MONEY",
+        "total_money": "POINTS",
         "correct_answers": "CORRECT ANSWERS",
         "incorrect_answers": "INCORRECT ANSWERS",
         "total_games": "GAMES PLAYED"
diff --git a/webapp/src/localize/es.json b/webapp/src/localize/es.json
index 5af8d516..008e6e37 100644
--- a/webapp/src/localize/es.json
+++ b/webapp/src/localize/es.json
@@ -25,23 +25,23 @@
     },
 
     "Games": {
-        "wise_men": {
+        "Wise Men Stack": {
             "name": "Wise Men Stack",
             "desc": "El jugador elige un tema entre cinco opciones disponibles y debe responder una batería de preguntas relacionadas con él en un plazo de 60 segundos. Para cada pregunta, el presentador proporciona dos opciones. Si el concursante acierta, gana €20; de lo contrario, pasa a la siguiente pregunta (ya que la respuesta correcta sería la otra opción). Si el tiempo se agota antes de que se formule por completo la pregunta y se proporcionen ambas posibles respuestas, el concursante aún puede responderla; sin embargo, si la afirmación no se ha completado (o las opciones no se proporcionaron), no pueden responder."
         },
-        "warm_quest": {
+        "Warm Question": {
             "name": "Warm Question",
             "desc": "Consta de diez temas de diferentes temáticas. Por cada respuesta correcta, se ganan €100, y se pierden €10 si el concursante pasa, no responde o responde incorrectamente."
         },
-        "discover": {
+        "Discovering Cities": {
             "name": "Discovering Cities",
             "desc": "En el modo de juego 'Descubriendo Ciudades', el concursante enfrentará un desafío donde se le harán preguntas repetidas referentes a diferentes ciudades de todo el mundo. Para superar con éxito el desafío, el concursante debe responder tantas preguntas como sea posible correctamente a lo largo de la prueba."
         },
-        "challenge": {
+        "Challenge": {
             "name": "Challenge",
             "desc": "El modo de juego 'Desafío' es el modo de juego por excelencia, ya que te permite personalizar el enfrentamiento a tu gusto. Este modo de juego está diseñado para aquellos que deseen practicar ciertos formatos de juego antes de participar en nuestros diversos otros modos de juego."
         },
-        "multiplayer": {
+        "Multiplayer": {
             "name": "Multiplayer",
             "desc": "Crea una sala para que otros jugadores se unan y jueguen 1 contra 1."
         }
@@ -165,7 +165,7 @@
         "users":"Usuarios",
         "groups": "Grupos",
         "name":"NOMBRE",
-        "total_money": "DINERO",
+        "total_money": "PUNTOS",
         "correct_answers": "RESPUESTAS CORRECTAS",
         "incorrect_answers": "RESPUESTAS INCORRECTAS",
         "total_games": "PARTIDAS JUGADAS"
diff --git a/webapp/src/localize/fr.json b/webapp/src/localize/fr.json
index 2b75edcf..5d4addbc 100644
--- a/webapp/src/localize/fr.json
+++ b/webapp/src/localize/fr.json
@@ -25,23 +25,23 @@
     },
 
     "Games": {
-        "wise_men": {
+        "Wise Men Stack": {
             "name": "Wise Men Stack",
             "desc": "Le joueur choisit un sujet parmi cinq options disponibles et doit répondre à une batterie de questions qui y sont liées dans un délai de 60 secondes. Pour chaque question, l'hôte fournit deux options. Si le participant devine correctement, il gagne 20 € ; sinon, il passe à la question suivante (car la bonne réponse serait l'autre option). Si le temps s'écoule avant que la question ne soit entièrement posée et que les deux réponses possibles soient fournies, le participant peut toujours y répondre ; cependant, si l'énoncé n'a pas été complété (ou si les options n'ont pas été fournies), il ne peut pas répondre."
         },
-        "warm_quest": {
+        "Warm Question": {
             "name": "Warm Question",
             "desc": "Il se compose de dix sujets de thèmes variés. Pour chaque réponse correcte, 100 € sont gagnés, et 10 € sont perdus si le participant passe, ne répond pas ou répond incorrectement."
         },
-        "discover": {
+        "Discovering Cities": {
             "name": "Discovering Cities",
             "desc": "Dans le mode de jeu 'Découverte des Villes', le participant sera confronté à un défi où il lui sera posé à plusieurs reprises des questions se référant à différentes villes du monde entier. Pour surmonter avec succès le défi, le participant doit répondre correctement à autant de questions que possible tout au long du test."
         },
-        "challenge": {
+        "Challenge": {
             "name": "Challenge",
             "desc": "Le mode de jeu 'Défi' est le mode de jeu par excellence, car il vous permet de personnaliser le match à votre guise. Ce mode de jeu est adapté à ceux qui souhaitent s'entraîner à certains formats de jeu avant de s'engager dans nos divers autres modes de jeu."
         },
-        "multiplayer": {
+        "Multiplayer": {
             "name": "Multiplayer",
             "desc": "Créez une salle pour que d'autres joueurs se joignent et jouent en 1 contre 1."
         }
@@ -162,7 +162,7 @@
     "Ranking": {
         "users": "Utilisateurs",
         "groups": "Groupes",
-        "total_money": "MONEY",
+        "total_money": "POINTS",
         "correct_answers": "CORRECT ANSWERS",
         "incorrect_answers": "INCORRECT ANSWERS",
         "total_games": "GAMES PLAYED"
diff --git a/webapp/src/pages/Statistics.js b/webapp/src/pages/Statistics.js
index adac2491..910e6bf8 100644
--- a/webapp/src/pages/Statistics.js
+++ b/webapp/src/pages/Statistics.js
@@ -286,19 +286,19 @@ const Statistics = () => {
                 <Box>
                     <div style={{ display: 'flex', justifyContent: 'center', marginBottom: '20px', gap:'1em' }}>
                     <Button onClick={() => setSelectedMode('TheChallenge')} variant="contained" sx={{ marginBottom: isSmallScreen ? '0.5em' : '0', backgroundColor: theme.palette.primary.main, color: theme.palette.secondary.main, borderColor: theme.palette.primary.main, '&:hover': { backgroundColor: theme.palette.secondary.main, color: theme.palette.primary.main, borderColor: theme.palette.primary.main } }}>
-                            { t("Games.challenge.name") }
+                            { t("Games.Challenge.name") }
                         </Button>
                         <Button onClick={() => setSelectedMode('WiseMenStack')} variant="contained" sx={{ marginBottom: isSmallScreen ? '0.5em' : '0', backgroundColor: theme.palette.primary.main, color: theme.palette.secondary.main, borderColor: theme.palette.primary.main, '&:hover': { backgroundColor: theme.palette.secondary.main, color: theme.palette.primary.main, borderColor: theme.palette.primary.main } }}>
-                            { t("Games.wise_men.name") }
+                            { t("Games.Wise Men Stack.name") }
                         </Button>
                         <Button onClick={() => setSelectedMode('WarmQuestion')} variant="contained" sx={{ marginBottom: isSmallScreen ? '0.5em' : '0', backgroundColor: theme.palette.primary.main, color: theme.palette.secondary.main, borderColor: theme.palette.primary.main, '&:hover': { backgroundColor: theme.palette.secondary.main, color: theme.palette.primary.main, borderColor: theme.palette.primary.main } }}>
-                            { t("Games.warm_quest.name") }
+                            { t("Games.Warm Question.name") }
                         </Button>
                         <Button onClick={() => setSelectedMode('DiscoveringCities')} variant="contained" sx={{ marginBottom: isSmallScreen ? '0.5em' : '0', backgroundColor: theme.palette.primary.main, color: theme.palette.secondary.main, borderColor: theme.palette.primary.main, '&:hover': { backgroundColor: theme.palette.secondary.main, color: theme.palette.primary.main, borderColor: theme.palette.primary.main } }}>
-                            { t("Games.discover.name") }
+                            { t("Games.Discovering Cities.name") }
                         </Button>
                         <Button onClick={() => setSelectedMode('OnlineMode')} variant="contained" sx={{ marginBottom: isSmallScreen ? '0.5em' : '0', backgroundColor: theme.palette.primary.main, color: theme.palette.secondary.main, borderColor: theme.palette.primary.main, '&:hover': { backgroundColor: theme.palette.secondary.main, color: theme.palette.primary.main, borderColor: theme.palette.primary.main } }}>
-                            { t("Games.multiplayer.name") }
+                            { t("Games.Multiplayer.name") }
                         </Button>
                     </div>
                     {renderStatistics()}

From 4347c1b2dd177c53df99190e71155c76585edc46 Mon Sep 17 00:00:00 2001
From: teresagg <uo288347@uniovi.es>
Date: Tue, 23 Apr 2024 18:12:45 +0200
Subject: [PATCH 020/132] Increasing coverage in questions and changing grafana
 configuration

---
 ...-dashboard.json => wiq-es04-dashboard.json} |  4 ++--
 .../monitoring/prometheus/prometheus.yml       |  2 +-
 .../__tests/routes/question-routes.test.js     | 18 ++++++++++++++++--
 questions/routes/question-routes.js            | 17 -----------------
 4 files changed, 19 insertions(+), 22 deletions(-)
 rename gatewayservice/monitoring/grafana/provisioning/dashboards/{example-service-dashboard.json => wiq-es04-dashboard.json} (99%)

diff --git a/gatewayservice/monitoring/grafana/provisioning/dashboards/example-service-dashboard.json b/gatewayservice/monitoring/grafana/provisioning/dashboards/wiq-es04-dashboard.json
similarity index 99%
rename from gatewayservice/monitoring/grafana/provisioning/dashboards/example-service-dashboard.json
rename to gatewayservice/monitoring/grafana/provisioning/dashboards/wiq-es04-dashboard.json
index 91326cd2..a3398ba4 100644
--- a/gatewayservice/monitoring/grafana/provisioning/dashboards/example-service-dashboard.json
+++ b/gatewayservice/monitoring/grafana/provisioning/dashboards/wiq-es04-dashboard.json
@@ -69,7 +69,7 @@
       "options": {
         "dataLinks": []
       },
-      "percentage": false,
+      "percentage": true,
       "pluginVersion": "7.0.0",
       "pointradius": 2,
       "points": false,
@@ -369,7 +369,7 @@
     ]
   },
   "timezone": "",
-  "title": "Example Service Dashboard",
+  "title": "Wiq_es04 Dashboard",
   "uid": "1DYaynomMk",
   "version": 2
 }
diff --git a/gatewayservice/monitoring/prometheus/prometheus.yml b/gatewayservice/monitoring/prometheus/prometheus.yml
index 3093655b..10930610 100644
--- a/gatewayservice/monitoring/prometheus/prometheus.yml
+++ b/gatewayservice/monitoring/prometheus/prometheus.yml
@@ -1,6 +1,6 @@
 global:
   scrape_interval: 5s
 scrape_configs:
-  - job_name: "example-nodejs-app"
+  - job_name: "wiq-es04-nodejs-app"
     static_configs:
       - targets: ["gatewayservice:8000"]
\ No newline at end of file
diff --git a/questions/__tests/routes/question-routes.test.js b/questions/__tests/routes/question-routes.test.js
index 4c6066ad..73ed7dec 100644
--- a/questions/__tests/routes/question-routes.test.js
+++ b/questions/__tests/routes/question-routes.test.js
@@ -126,11 +126,14 @@ describe('Question routes', function() {
       await expect(response.body.length).toBe(3);
     });
 
-    it('It should get n questions of certain category from the database', async function() {
+    it('get question when more than 100 questions', async function() {
+      await addingQuestions();
+      await addingQuestions();
+      await generateQuestionsService.generateQuestions.mockResolvedValue({"response":{"status":"200"}});
       const response = await request(app).get('/questions/getQuestionsFromDb/3/en');
       await expect(response.status).toBe(200);
       await expect(response.body.length).toBe(3);
-    });
+    });  
 
       it('It should not get n questions from the database', async function() {
         const response = await request(app).get('/questions/getQuestionsFromDb/-1/en');
@@ -154,6 +157,17 @@ describe('Question routes', function() {
         await expect(response.body.length).toBe(2);
         await expect(response.body[0].categories[0]).toBe("Geography");
       });
+
+      it('get question when more than 100 questions', async function() {
+        await addingQuestions();
+        await addingQuestions();
+        await generateQuestionsService.generateQuestions.mockResolvedValue({"response":{"status":"200"}});
+        const response = await request(app).get('/questions/getQuestionsFromDb/2/Geography/en');
+        await expect(response.status).toBe(200);
+        await expect(response.body.length).toBe(2);
+        await expect(response.body[0].categories[0]).toBe("Geography");
+      });
+
       it('It should not get n questions of certain category from the database', async function() {
         const response = await request(app).get('/questions/getQuestionsFromDb/-1/Geography/en');
         await expect(response.status).toBe(400);
diff --git a/questions/routes/question-routes.js b/questions/routes/question-routes.js
index 13240baf..bcb15c5a 100644
--- a/questions/routes/question-routes.js
+++ b/questions/routes/question-routes.js
@@ -84,19 +84,6 @@ router.get('/getQuestionsFromDb/:n/:lang', async(_req, res) => {
         }
     }
 
-    /*if (await dbService.getQuestionCount(language) < n) {
-        //Must generate n questions
-        await generateQuestionsService.generateQuestions(n + 1, language);
-        //Do not wait to generate the others
-        generateQuestionsService.generateQuestions(n * 5, language);
-    }
-
-    questions = await dbService.getRandomQuestions(n, language);
-    if(questions != null)
-        questions.map(question => {
-            dbService.deleteQuestionById(question._id);
-        })
-    res.json(questions);*/
 });
 
 //Get random questions from db with category filter: http://localhost:8010/questions/getQuestionsFromDb/2/Geografía
@@ -113,7 +100,6 @@ router.get('/getQuestionsFromDb/:n/:category/:lang', async(_req, res) => {
     
     // 0: Await till it creates 2, creates 50 async and do not delete
     if (questionCount == 0) {
-        console.log("QUESTIONS 0");
         await generateQuestionsService.generateQuestions(2, language, category);
         generateQuestionsService.generateQuestions(50, language, category);
         questions = await dbService.getRandomQuestionsByCategory(n, category, language);
@@ -121,7 +107,6 @@ router.get('/getQuestionsFromDb/:n/:category/:lang', async(_req, res) => {
         
     // < 50: async creates 10 and do not delete
     } else if (questionCount < 50) {
-        console.log("QUESTIONS 50");
         //Do not wait to generate the others
         generateQuestionsService.generateQuestions(10, language, category);
         questions = await dbService.getRandomQuestionsByCategory(n, category, language);
@@ -129,7 +114,6 @@ router.get('/getQuestionsFromDb/:n/:category/:lang', async(_req, res) => {
 
     // < 100: async creates 5 and delete
     } else if (questionCount < 100) {
-        console.log("QUESTIONS 100");
         generateQuestionsService.generateQuestions(10, language, category);
         questions = await dbService.getRandomQuestionsByCategory(n, category, language);
         res.json(questions);
@@ -141,7 +125,6 @@ router.get('/getQuestionsFromDb/:n/:category/:lang', async(_req, res) => {
 
     // >= 100: do not create and delete
     } else {
-        console.log("QUESTIONS ELSE");
         questions = await dbService.getRandomQuestionsByCategory(n, category, language);
         res.json(questions);
         if(questions != null) {

From cc665b7a59f7db1203755e1e53cbce2b4b080944 Mon Sep 17 00:00:00 2001
From: uo289689 <uo289689@uniovi.es>
Date: Tue, 23 Apr 2024 18:31:53 +0200
Subject: [PATCH 021/132] Implemented e2e for the Challaange game

---
 .github/workflows/build.yml                   |   2 +-
 webapp/e2e/features/theChallangeGame.feauture |  11 ++
 webapp/e2e/steps/theCallange.steps.js         | 148 ++++++++++++++++++
 webapp/package-lock.json                      |  14 +-
 webapp/package.json                           |   2 +-
 webapp/src/pages/Homepage.js                  |   1 +
 webapp/src/pages/TheChallengeGame.js          |   4 +-
 7 files changed, 172 insertions(+), 10 deletions(-)
 create mode 100644 webapp/e2e/features/theChallangeGame.feauture
 create mode 100644 webapp/e2e/steps/theCallange.steps.js

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1167a28f..8db50052 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,7 +1,7 @@
 name: Build
 on:
   push:
-    branches: [master, develop, develop-deploy, develop-teresa]
+    branches: [master, develop, develop-deploy, develop-teresa, develop-samuel]
   
   pull_request:
     types: [opened, synchronize, reopened]
diff --git a/webapp/e2e/features/theChallangeGame.feauture b/webapp/e2e/features/theChallangeGame.feauture
new file mode 100644
index 00000000..6a63bd96
--- /dev/null
+++ b/webapp/e2e/features/theChallangeGame.feauture
@@ -0,0 +1,11 @@
+Feature: Answer a question
+
+Scenario: Answering a question correctly
+  Given A question
+  When I click on the correct answer button
+  Then The button turns green
+
+Scenario: Answering a question incorrectly
+  Given A question
+  When I click on an incorrect answer button
+  Then The button turns red
\ No newline at end of file
diff --git a/webapp/e2e/steps/theCallange.steps.js b/webapp/e2e/steps/theCallange.steps.js
new file mode 100644
index 00000000..04527cd0
--- /dev/null
+++ b/webapp/e2e/steps/theCallange.steps.js
@@ -0,0 +1,148 @@
+const puppeteer = require('puppeteer');
+const { defineFeature, loadFeature }=require('jest-cucumber');
+const setDefaultOptions = require('expect-puppeteer').setDefaultOptions
+const feature = loadFeature('./features/theChallangeGame.feauture');
+
+let page;
+let browser;
+
+defineFeature(feature, test => {
+
+  beforeAll(async () => {
+      
+      browser = process.env.GITHUB_ACTIONS
+      ? await puppeteer.launch()
+      : await puppeteer.launch({ headless: false, slowMo: 40 });
+    page = await browser.newPage();
+
+    await page.setRequestInterception(true);
+
+    page.on('request', (req) => {
+      if(req.url().endsWith('/Geography')) {
+        req.respond({
+          status: 200,
+          headers: {
+            'Access-Control-Allow-Origin': '*'
+          },
+          contentType: 'application/json',
+          body: JSON.stringify([{
+            question: 'Which is the capital of Spain?',
+            options: ['Madrid', 'Barcelona', 'Paris', 'London'],
+            correctAnswer: 'Madrid',
+            categories: ['Geography'],
+            language: 'en'
+          }])
+        });
+      } else {
+        req.continue();
+      }
+    });
+    //Way of setting up the timeout
+    setDefaultOptions({ timeout: 10000 })
+
+     
+  });
+
+  beforeEach(async () => {
+    await page
+    .goto("http://localhost:3000/theChallangeGame", {
+      waitUntil: "networkidle0",
+    })
+    .catch(() => {});
+
+    //"mock" login
+    await page.evaluate(() => {
+      localStorage.clear();
+      localStorage.setItem('sessionId', 'fictitiousSessionId12345');
+    });
+
+    await page
+    .goto("http://localhost:3000/theChallangeGame", {
+      waitUntil: "networkidle0",
+    })
+    .catch(() => {});
+  });
+
+
+  test('Answering a question correctly', ({given,when,then}) => {
+
+    given('A question', async () => {
+        const button = await page.$('[data-testid="start-button"]');
+        await button.click();
+
+        //await expect(page.findByText('Which is the capital of Spain?'));
+        const question = await page.$['data-testid="question"'];
+        await expect(page).toMatchElement("div", { text: 'Which is the capital of Spain?'});
+        expect(question).not.toBeNull();
+        
+        const answers = await page.$x('//*[@data-testid="answer"]');
+        expect(answers.length).toBe(2);
+    });
+
+    when('I click on the correct answer button', async () => {
+        const answers = await page.$x('//*[@data-testid="answer"]');
+        const textoBoton1 = await page.evaluate(button => button.innerText, answers[0]);
+        if(textoBoton1 === "Madrid") {
+          await answers[0].click();
+        } else {
+          await answers[1].click();
+        }
+    });
+
+    then('The button turns green', async () => {
+        /*const answerButton = await page.$x('(//*[@data-testid="answer"])[1]');
+        const textoBoton1 = await page.evaluate(button => button.innerText, answerButton[0]);
+        const textoBoton2 = await page.evaluate(button => button.innerText, answerButton[1]);
+        if(textoBoton1 === "Madrid") {
+          await expect(textoBoton1).toMatch(/Madrid/i);
+        } else {
+          await expect(textoBoton2).toMatch(/Madrid/i);
+        }*/
+        await expect(page).toMatchElement("button", { style: { color: 'green' } });
+    });
+  })
+
+  test('Answering a question incorrectly', ({given,when,then}) => {
+
+    given('A question', async () => {
+        const button = await page.$('[data-testid="start-button"]');
+        await button.click();
+
+        //await expect(page.findByText('Which is the capital of Spain?'));
+        const question = await page.$['data-testid="question"'];
+        await expect(page).toMatchElement("div", { text: 'Which is the capital of Spain?'});
+        expect(question).not.toBeNull();
+        
+        const answers = await page.$x('//*[@data-testid="answer"]');
+        expect(answers.length).toBe(2);
+    });
+
+    when('I click on an incorrect answer button', async () => {
+        const answers = await page.$x('//*[@data-testid="answer"]');
+        const textoBoton1 = await page.evaluate(button => button.innerText, answers[0]);
+        if(textoBoton1 !== "Madrid") {
+          await answers[0].click();
+        } else {
+          await answers[1].click();
+        }
+    });
+
+    then('The button turns red', async () => {
+        /*const answerButton = await page.$x('(//*[@data-testid="answer"])[2]');
+        const textoBoton1 = await page.evaluate(button => button.innerText, answerButton[0]);
+        const textoBoton2 = await page.evaluate(button => button.innerText, answerButton[1]);
+        if(textoBoton1 !== "Madrid") {
+          await expect(textoBoton1).not.toMatch(/Madrid/i);
+        } else {
+          await expect(textoBoton2).toMatch(/Madrid/i);
+        }*/
+        await expect(page).toMatchElement("button", { style: { color: 'red' } });
+        await expect(page).toMatchElement("button", { style: { color: 'green' } });
+    });
+  })
+
+  afterAll(async ()=>{
+    browser.close()
+  })
+
+});
\ No newline at end of file
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index 8e61c028..26cfde55 100644
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -30,7 +30,7 @@
         "react-i18next": "^14.1.0",
         "react-router-dom": "^6.22.1",
         "react-scripts": "5.0.1",
-        "sequelize": "^6.37.2",
+        "sequelize": "^6.37.3",
         "socket.io-client": "^4.7.5",
         "sqlite3": "^5.1.7",
         "web-vitals": "^3.5.1"
@@ -25548,9 +25548,9 @@
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
     "node_modules/sequelize": {
-      "version": "6.37.2",
-      "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-6.37.2.tgz",
-      "integrity": "sha512-bnb7swGANONXCTrVyebpOOZssLwQrVkYX2tcC6qOIvH+P+OhsoMBi7c3GXI5bC+Z4b4tOl+kQy6yeqLCZ1YQAQ==",
+      "version": "6.37.3",
+      "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-6.37.3.tgz",
+      "integrity": "sha512-V2FTqYpdZjPy3VQrZvjTPnOoLm0KudCRXfGWp48QwhyPPp2yW8z0p0sCYZd/em847Tl2dVxJJ1DR+hF+O77T7A==",
       "funding": [
         {
           "type": "opencollective",
@@ -47937,9 +47937,9 @@
       }
     },
     "sequelize": {
-      "version": "6.37.2",
-      "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-6.37.2.tgz",
-      "integrity": "sha512-bnb7swGANONXCTrVyebpOOZssLwQrVkYX2tcC6qOIvH+P+OhsoMBi7c3GXI5bC+Z4b4tOl+kQy6yeqLCZ1YQAQ==",
+      "version": "6.37.3",
+      "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-6.37.3.tgz",
+      "integrity": "sha512-V2FTqYpdZjPy3VQrZvjTPnOoLm0KudCRXfGWp48QwhyPPp2yW8z0p0sCYZd/em847Tl2dVxJJ1DR+hF+O77T7A==",
       "requires": {
         "@types/debug": "^4.1.8",
         "@types/validator": "^13.7.17",
diff --git a/webapp/package.json b/webapp/package.json
index 442dc637..e99db362 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -25,7 +25,7 @@
     "react-i18next": "^14.1.0",
     "react-router-dom": "^6.22.1",
     "react-scripts": "5.0.1",
-    "sequelize": "^6.37.2",
+    "sequelize": "^6.37.3",
     "socket.io-client": "^4.7.5",
     "sqlite3": "^5.1.7",
     "web-vitals": "^3.5.1"
diff --git a/webapp/src/pages/Homepage.js b/webapp/src/pages/Homepage.js
index 6df790e9..ea2d2dc7 100644
--- a/webapp/src/pages/Homepage.js
+++ b/webapp/src/pages/Homepage.js
@@ -124,6 +124,7 @@ const Homepage = () => {
                 setGameLink("/multiplayerRoom");
                 break;
             default:
+                setGameLink("/wiseMenStackGame");
                 break;
         }
     }, [info]);
diff --git a/webapp/src/pages/TheChallengeGame.js b/webapp/src/pages/TheChallengeGame.js
index 9e357e67..42abcf0e 100644
--- a/webapp/src/pages/TheChallengeGame.js
+++ b/webapp/src/pages/TheChallengeGame.js
@@ -263,6 +263,7 @@ const Game = () => {
                 </div>
 
                 <Button
+                    data-testid="start-button"
                     onClick={() => { startGame(); setQuestionHistorial(Array(numRounds).fill(null)); console.log(category) }}
                     variant="contained"
                     sx={{
@@ -406,7 +407,8 @@ return (
                 {questionData.options.map((option, index) => (
                     <Grid item xs={12} key={index}>
                         <Button
-                            data-testid={buttonStates[index] === "success" ? `success${index}` : buttonStates[index] === "failure" ? `failel${index}` : `answer${index}`}
+                            data-testid="answer"
+                            //data-testid={buttonStates[index] === "success" ? `success${index}` : buttonStates[index] === "failure" ? `failel${index}` : `answer${index}`}
                             variant="contained"
                             onClick={() => selectResponse(index, option)}
                             disabled={buttonStates[index] !== null || answered} // before, you could still press more than one button

From 4ddc9b0b9a0e35ecd73d8476ff603947d4730e42 Mon Sep 17 00:00:00 2001
From: uo289689 <uo289689@uniovi.es>
Date: Tue, 23 Apr 2024 18:33:17 +0200
Subject: [PATCH 022/132] Fixing bug in build configuration

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8db50052..3b79addb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,7 +1,7 @@
 name: Build
 on:
   push:
-    branches: [master, develop, develop-deploy, develop-teresa, develop-samuel]
+    branches: [master, develop, develop-deploy, develop-teresa, develop_samuel]
   
   pull_request:
     types: [opened, synchronize, reopened]

From 266ddb3bf007760a367c5aac4deab8dc0d94c7e4 Mon Sep 17 00:00:00 2001
From: uo289689 <uo289689@uniovi.es>
Date: Tue, 23 Apr 2024 19:35:43 +0200
Subject: [PATCH 023/132] Fixed unitary tests and e2e

---
 webapp/e2e/steps/wiseMenStackGame.steps.js    | 30 ++++++----------
 webapp/src/__tests__/pages/Home.test.js       |  1 +
 webapp/src/__tests__/pages/Homepage.test.js   |  3 +-
 .../src/__tests__/pages/Instructions.test.js  | 34 ++++++++++---------
 webapp/src/__tests__/pages/Statistics.test.js |  6 ++--
 .../__tests__/pages/TheChallengeGame.test.js  | 28 +++++----------
 webapp/src/data/gameInfo.json                 |  2 +-
 webapp/src/localize/en.json                   |  2 +-
 webapp/src/pages/Homepage.js                  |  1 +
 webapp/src/pages/TheChallengeGame.js          |  4 +--
 10 files changed, 49 insertions(+), 62 deletions(-)

diff --git a/webapp/e2e/steps/wiseMenStackGame.steps.js b/webapp/e2e/steps/wiseMenStackGame.steps.js
index 22f11b35..420ae33a 100644
--- a/webapp/e2e/steps/wiseMenStackGame.steps.js
+++ b/webapp/e2e/steps/wiseMenStackGame.steps.js
@@ -75,18 +75,15 @@ defineFeature(feature, test => {
         await expect(page).toMatchElement("div", { text: 'Which is the capital of Spain?'});
         expect(question).not.toBeNull();
         
-        const answers = await page.$x('//*[@data-testid="answer"]');
-        expect(answers.length).toBe(2);
+        const answers = await page.$x('//*[contains(@data-testid, "success") or contains(@data-testid, "failure") or contains(@data-testid, "answer")]');
+        expect(answers.length).toBe(4);
     });
 
     when('I click on the correct answer button', async () => {
-        const answers = await page.$x('//*[@data-testid="answer"]');
-        const textoBoton1 = await page.evaluate(button => button.innerText, answers[0]);
-        if(textoBoton1 === "Madrid") {
-          await answers[0].click();
-        } else {
-          await answers[1].click();
-        }
+      const answers = await page.$x('//*[contains(@data-testid, "success") or contains(@data-testid, "failure") or contains(@data-testid, "answer")]');
+      const textoBoton1 = await page.evaluate(button => button.innerText, answers[0]);
+      await answers[0].click();
+       
     });
 
     then('The button turns green', async () => {
@@ -98,7 +95,7 @@ defineFeature(feature, test => {
         } else {
           await expect(textoBoton2).toMatch(/Madrid/i);
         }*/
-        await expect(page).toMatchElement("button", { style: { color: 'green' } });
+        await expect(page).toMatchElement('[data-testid="succes0"]');
     });
   })
 
@@ -113,18 +110,14 @@ defineFeature(feature, test => {
         await expect(page).toMatchElement("div", { text: 'Which is the capital of Spain?'});
         expect(question).not.toBeNull();
         
-        const answers = await page.$x('//*[@data-testid="answer"]');
-        expect(answers.length).toBe(2);
+        const answers = await page.$x('//*[contains(@data-testid, "success") or contains(@data-testid, "failure") or contains(@data-testid, "answer")]');
+        expect(answers.length).toBe(4);
     });
 
     when('I click on an incorrect answer button', async () => {
         const answers = await page.$x('//*[@data-testid="answer"]');
         const textoBoton1 = await page.evaluate(button => button.innerText, answers[0]);
-        if(textoBoton1 !== "Madrid") {
-          await answers[0].click();
-        } else {
-          await answers[1].click();
-        }
+        await answers[1].click();
     });
 
     then('The button turns red', async () => {
@@ -136,8 +129,7 @@ defineFeature(feature, test => {
         } else {
           await expect(textoBoton2).toMatch(/Madrid/i);
         }*/
-        await expect(page).toMatchElement("button", { style: { color: 'red' } });
-        await expect(page).toMatchElement("button", { style: { color: 'green' } });
+        await expect(page).toMatchElement('[data-testid="failure1"]');
     });
   })
 
diff --git a/webapp/src/__tests__/pages/Home.test.js b/webapp/src/__tests__/pages/Home.test.js
index 21fe3cfc..2e6dd511 100644
--- a/webapp/src/__tests__/pages/Home.test.js
+++ b/webapp/src/__tests__/pages/Home.test.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import Home from '../../pages/Home';
+import '../../localize/i18n';
 
 // Hacemos un mock del módulo '@mui/material' y su hook useMediaQuery
 jest.mock('@mui/material/useMediaQuery', () => ({
diff --git a/webapp/src/__tests__/pages/Homepage.test.js b/webapp/src/__tests__/pages/Homepage.test.js
index c9f4992b..b607699c 100644
--- a/webapp/src/__tests__/pages/Homepage.test.js
+++ b/webapp/src/__tests__/pages/Homepage.test.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import { render, fireEvent, screen } from '@testing-library/react';
 import Homepage from '../../pages/Homepage';
+import '../../localize/i18n';
 
 // Hacemos un mock del módulo '@mui/material' y su hook useMediaQuery
 jest.mock('@mui/material/useMediaQuery', () => ({
@@ -16,7 +17,7 @@ describe('Homepage', () => {
     it('renders video and play button', () => {
         render(<Homepage />);
         expect(screen.getByTestId('video')).toBeInTheDocument();
-        expect(screen.getByText('PLAY')).toBeInTheDocument();
+        expect(screen.getByText("PLAY")).toBeInTheDocument();
     });
 
     it('loads game buttons dynamically based on data', async () => {
diff --git a/webapp/src/__tests__/pages/Instructions.test.js b/webapp/src/__tests__/pages/Instructions.test.js
index e217269f..c5d779c5 100644
--- a/webapp/src/__tests__/pages/Instructions.test.js
+++ b/webapp/src/__tests__/pages/Instructions.test.js
@@ -2,32 +2,33 @@ import React from 'react';
 import { render, fireEvent, screen, waitFor } from '@testing-library/react';
 import Instructions from '../../pages/Instructions';
 import { BrowserRouter as Router } from 'react-router-dom';
+import '../../localize/i18n';
 
 jest.mock('../../data/gameInfo.json', () => ({
   __esModule: true,
   default: [
     {
-      nombre: "WISE MEN STACK",
+      nombre: "Wise Men Stack",
       descripcion: "The player chooses a topic from five available options and must answer a battery of questions related to it within 60 seconds. For each question, the host provides two options. If the contestant guesses correctly, they win €20; otherwise, they move on to the next question (as the correct answer would be the other option). If the time runs out before the question is fully asked and both possible answers are provided, the contestant may still answer it; however, if the statement hasn't been completed (or the options weren't provided), they cannot answer.",
       foto: "../gameImg/foto0.png"
     },
     {
-      nombre: "WARM QUESTION",
+      nombre: "Warm Question",
       descripcion: "It consists of ten topics of varied themes. For each correct answer, €100 is earned, and €10 are lost if the contestant passes, does not respond, or answers incorrectly.",
       foto: "../gameImg/foto1.jpg"
     },
     {
-      nombre: "DISCOVERING CITIES",
+      nombre: "Discovering Cities",
       descripcion: "In the 'Discovering Cities' game mode, the contestant will face a challenge where they will be repeatedly asked questions referring to different cities around the world. To successfully overcome the challenge, the contestant must answer as many questions as possible correctly throughout the test.",
       foto: "../gameImg/foto2.png"
     },
     {
-      nombre: "THE CHALLENGE",
+      nombre: "Challenge",
       descripcion: "The 'Challenge' game mode is the quintessential game mode, as it allows you to customize the match to your liking. This game mode is tailored for those who wish to practice certain game formats before engaging in our various other game modes.",
       foto: "../gameImg/foto3.jpg"
     },
     {
-      nombre: "ONLINE MODE",
+      nombre: "Multiplayer",
       descripcion: "Create a room for other player to join and play 1vs1",
       foto: "../gameImg/foto3.jpg"
     }
@@ -55,10 +56,10 @@ describe('Instructions component', () => {
 
     fireEvent.click(screen.getAllByRole('button')[0]); // Click the first game button
 
-    const gameNames = await screen.findAllByText("WISE MEN STACK"); //Look for the text "WISE MEN STACK"
+    const gameNames = await screen.findAllByText("Wise Men Stack"); //Look for the text "WISE MEN STACK"
     expect(gameNames).toHaveLength(2); // Check the expected number of matches
 
-    expect(gameNames[0]).toHaveTextContent("WISE MEN STACK");
+    expect(gameNames[0]).toHaveTextContent("Wise Men Stack");
   });
 
   it('Hides game information when the same game button is clicked again', async () => {
@@ -71,12 +72,12 @@ describe('Instructions component', () => {
     const gameButton = screen.getAllByRole('button')[0]; //Selecciona el primer boton
     fireEvent.click(gameButton); // Hace click en el boton indicado
 
-    const gameNames = await screen.findAllByText("WISE MEN STACK"); //Finds all components that have the indicated text
+    const gameNames = await screen.findAllByText("Wise Men Stack"); //Finds all components that have the indicated text
     expect(gameNames).toHaveLength(2); // Check the expected number of matches
 
     fireEvent.click(gameButton); // Hide info
 
-    const gameNames2 = await screen.findAllByText("WISE MEN STACK"); //Finds all components that have the indicated text
+    const gameNames2 = await screen.findAllByText("Wise Men Stack"); //Finds all components that have the indicated text
     expect(gameNames2).toHaveLength(1); // Check the expected number of matches
 
     await waitFor(() => {
@@ -93,12 +94,12 @@ describe('Instructions component', () => {
 
     fireEvent.click(screen.getAllByRole('button')[0]); // Display first game info
 
-    const gameNames = await screen.findAllByText("WISE MEN STACK"); //Finds all components that have the indicated text
+    const gameNames = await screen.findAllByText("Wise Men Stack"); //Finds all components that have the indicated text
     expect(gameNames).toHaveLength(2); // Check the expected number of matches
 
     fireEvent.click(screen.getAllByRole('button')[1]); // Switch to second game info
 
-    const gameName = await screen.findAllByText("WARM QUESTION");  //Finds all components that have the indicated text
+    const gameName = await screen.findAllByText("Warm Question");  //Finds all components that have the indicated text
     expect(gameName).toHaveLength(2); // Check the expected number of matches
 
     await waitFor(() => {
@@ -109,27 +110,27 @@ describe('Instructions component', () => {
 
   const mockGameData = [
     {
-      nombre: "WISE MEN STACK",
+      nombre: "Wise Men Stack",
       descripcion: "The player chooses a topic from five available options and must answer a battery of questions related to it within 60 seconds. For each question, the host provides two options. If the contestant guesses correctly, they win €20; otherwise, they move on to the next question (as the correct answer would be the other option). If the time runs out before the question is fully asked and both possible answers are provided, the contestant may still answer it; however, if the statement hasn't been completed (or the options weren't provided), they cannot answer.",
       foto: "../gameImg/foto0.png"
     },
     {
-      nombre: "WARM QUESTION",
+      nombre: "Warm Question",
       descripcion: "It consists of ten topics of varied themes. For each correct answer, €100 is earned, and €10 are lost if the contestant passes, does not respond, or answers incorrectly.",
       foto: "../gameImg/foto1.jpg"
     },
     {
-      nombre: "DISCOVERING CITIES",
+      nombre: "Discovering Cities",
       descripcion: "In the 'Discovering Cities' game mode, the contestant will face a challenge where they will be repeatedly asked questions referring to different cities around the world. To successfully overcome the challenge, the contestant must answer as many questions as possible correctly throughout the test.",
       foto: "../gameImg/foto2.png"
     },
     {
-      nombre: "THE CHALLENGE",
+      nombre: "Challenge",
       descripcion: "The 'Challenge' game mode is the quintessential game mode, as it allows you to customize the match to your liking. This game mode is tailored for those who wish to practice certain game formats before engaging in our various other game modes.",
       foto: "../gameImg/foto3.jpg"
     },
     {
-      nombre: "ONLINE MODE",
+      nombre: "Multiplayer",
       descripcion: "Create a room for other player to join and play 1vs1",
       foto: "../gameImg/foto3.jpg"
     }
@@ -142,6 +143,7 @@ describe('Instructions component', () => {
       // Click in the game button
       fireEvent.click(screen.getAllByRole('button')[index]);
 
+      console.log(game.descripcion);
       // Verify that the game name and description are in the document
       const gameName = await screen.findAllByText(game.nombre);
       expect(gameName).toHaveLength(2); // Check the expected number of matches
diff --git a/webapp/src/__tests__/pages/Statistics.test.js b/webapp/src/__tests__/pages/Statistics.test.js
index ec49a0e9..ed24cbd5 100644
--- a/webapp/src/__tests__/pages/Statistics.test.js
+++ b/webapp/src/__tests__/pages/Statistics.test.js
@@ -239,9 +239,9 @@ describe('Statistics component', () => {
 
     await screen.findByText('STATISTICS');
 
-    fireEvent.click(screen.getByText('Online Mode'));
+    fireEvent.click(screen.getByText('Multiplayer'));
 
-    expect(screen.getByText('Online Mode')).toBeInTheDocument();
+    expect(screen.getByText('Multiplayer')).toBeInTheDocument();
     expect(screen.getByText('Total Points:')).toBeInTheDocument();
     expect(screen.getByText('15')).toBeInTheDocument();
     expect(screen.getByText('Correctly Answered Questions:')).toBeInTheDocument();
@@ -253,7 +253,7 @@ describe('Statistics component', () => {
     expect(screen.getByText('Games Played:')).toBeInTheDocument();
     expect(screen.getAllByText('12'));
 
-    fireEvent.click(screen.getByText('Show Questions Record'));
+    fireEvent.click(screen.getByText("Show Questions Record"));
 
     await screen.findByText('Game 04/11/2024, 14:00');
     expect(screen.getByText('What is 1 + 1?')).toBeInTheDocument();
diff --git a/webapp/src/__tests__/pages/TheChallengeGame.test.js b/webapp/src/__tests__/pages/TheChallengeGame.test.js
index 2b8296d8..9627bba8 100644
--- a/webapp/src/__tests__/pages/TheChallengeGame.test.js
+++ b/webapp/src/__tests__/pages/TheChallengeGame.test.js
@@ -50,13 +50,10 @@ describe('Game component', () => {
     fireEvent.click(screen.getByRole('button', { name: 'Start game' }));
 
     // Espera a que aparezca la pregunta
-    await waitFor(() => screen.getByText('Which is the capital of Spain?'));
-
-    expect(screen.findByText('1'));
-    //expect(screen.findByText('1/4'));
+    await waitFor(() => screen.getByText('Which is the capital of Spain?'.toUpperCase()));
 
     // Verifica que el juego haya comenzado correctamente mostrando la pregunta y las opciones
-    expect(screen.getByText('Which is the capital of Spain?')).toBeInTheDocument();
+    expect(screen.getByText('Which is the capital of Spain?'.toUpperCase())).toBeInTheDocument();
     expect(screen.getByText('Madrid')).toBeInTheDocument();
     expect(screen.getByText('Barcelona')).toBeInTheDocument();
     expect(screen.getByText('Paris')).toBeInTheDocument();
@@ -83,17 +80,13 @@ describe('Game component', () => {
     fireEvent.click(screen.getByRole('button', { name: 'Start game' }));
 
     // waits for the question to appear
-    await waitFor(() => screen.getByText('Which is the capital of Spain?'));
+    await waitFor(() => screen.getByText('Which is the capital of Spain?'.toUpperCase()));
     const correctAnswer = screen.getByRole('button', { name: 'Madrid' });
 
-    expect(correctAnswer).not.toHaveStyle({ backgroundColor: 'green' });
-
+    expect(screen.findByTestId("anwer0"));
     //selects correct answer
     fireEvent.click(correctAnswer);
-
-    //expect(screen.findByText('1')).toHaveStyle({ backgroundColor: 'lightgreen' });
-
-    expect(correctAnswer).toHaveStyle({ backgroundColor: 'green' });
+    expect(screen.findByTestId("succes0"));
 
   });
 
@@ -118,16 +111,13 @@ describe('Game component', () => {
     fireEvent.click(screen.getByRole('button', { name: 'Start game' }));
 
     // waits for the question to appear
-    await waitFor(() => screen.getByText('Which is the capital of Spain?'));
+    await waitFor(() => screen.getByText('Which is the capital of Spain?'.toUpperCase()));
     const incorrectAnswer = screen.getByRole('button', { name: 'Barcelona' });
 
-    expect(incorrectAnswer).not.toHaveStyle({ backgroundColor: 'red' });
-
+    expect(screen.findByTestId("anwer1"));
     //selects correct answer
     fireEvent.click(incorrectAnswer);
-
-    expect(incorrectAnswer).toHaveStyle({ backgroundColor: 'red' });
-    //expect(screen.findByText('1')).toHaveStyle({ backgroundColor: 'salmon' });
+    expect(screen.findByTestId("failure1"));
 
   });
 
@@ -151,7 +141,7 @@ describe('Game component', () => {
     fireEvent.click(screen.getByRole('button', { name: 'Start game' }));
 
     // waits for the question to appear
-    await waitFor(() => screen.getByText('Which is the capital of Spain?'));
+    await waitFor(() => screen.getByText('Which is the capital of Spain?'.toUpperCase()));
 
     setTimeout(() => {
       // Comprobamos que el callback ha sido llamado después del tiempo especificado
diff --git a/webapp/src/data/gameInfo.json b/webapp/src/data/gameInfo.json
index 89053297..012e3110 100644
--- a/webapp/src/data/gameInfo.json
+++ b/webapp/src/data/gameInfo.json
@@ -16,7 +16,7 @@
     },
     {
       "nombre": "Discovering Cities",
-      "descripcion": "In the 'Discovering Cities' game mode, the contestant will face a challenge where they will be repeatedly asked questions referring to different cities around the world. To successfully overcome the challenge, the contestant must answer as many questions as possible correctly throughout the test..",
+      "descripcion": "In the 'Discovering Cities' game mode, the contestant will face a challenge where they will be repeatedly asked questions referring to different cities around the world. To successfully overcome the challenge, the contestant must answer as many questions as possible correctly throughout the test.",
       "foto": "../instructions/foto2.png",
       "card":"The contestant will face a challenge where they will be repeatedly asked questions referring to different cities around the world.",
       "cardFoto": "../homePage/foto2.png"
diff --git a/webapp/src/localize/en.json b/webapp/src/localize/en.json
index 6bed8400..9d2a7aab 100644
--- a/webapp/src/localize/en.json
+++ b/webapp/src/localize/en.json
@@ -35,7 +35,7 @@
         },
         "Discovering Cities": {
             "name": "Discovering Cities",
-            "desc": "In the 'Discovering Cities' game mode, the contestant will face a challenge where they will be repeatedly asked questions referring to different cities around the world. To successfully overcome the challenge, the contestant must answer as many questions as possible correctly throughout the test.."
+            "desc": "In the 'Discovering Cities' game mode, the contestant will face a challenge where they will be repeatedly asked questions referring to different cities around the world. To successfully overcome the challenge, the contestant must answer as many questions as possible correctly throughout the test."
         },
         "Challenge": {
             "name": "Challenge",
diff --git a/webapp/src/pages/Homepage.js b/webapp/src/pages/Homepage.js
index ea2d2dc7..f8b79ed9 100644
--- a/webapp/src/pages/Homepage.js
+++ b/webapp/src/pages/Homepage.js
@@ -4,6 +4,7 @@ import data from "../data/gameInfo.json";
 import CardComponent from "../components/CardComponent.js";
 import useMediaQuery from '@mui/material/useMediaQuery';
 import { useTranslation } from 'react-i18next';
+import i18n from '../localize/i18n';
 
 
 const Homepage = () => {
diff --git a/webapp/src/pages/TheChallengeGame.js b/webapp/src/pages/TheChallengeGame.js
index 42abcf0e..3b3df82c 100644
--- a/webapp/src/pages/TheChallengeGame.js
+++ b/webapp/src/pages/TheChallengeGame.js
@@ -407,8 +407,8 @@ return (
                 {questionData.options.map((option, index) => (
                     <Grid item xs={12} key={index}>
                         <Button
-                            data-testid="answer"
-                            //data-testid={buttonStates[index] === "success" ? `success${index}` : buttonStates[index] === "failure" ? `failel${index}` : `answer${index}`}
+                            //data-testid="answer"
+                            data-testid={buttonStates[index] === "success" ? `success${index}` : buttonStates[index] === "failure" ? `failel${index}` : `answer${index}`}
                             variant="contained"
                             onClick={() => selectResponse(index, option)}
                             disabled={buttonStates[index] !== null || answered} // before, you could still press more than one button

From 0c0c7f7716fa3956ffdedf8167473853f5be0aef Mon Sep 17 00:00:00 2001
From: uo289689 <uo289689@uniovi.es>
Date: Tue, 23 Apr 2024 19:44:17 +0200
Subject: [PATCH 024/132] Fixing e2e

---
 webapp/src/pages/Homepage.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/webapp/src/pages/Homepage.js b/webapp/src/pages/Homepage.js
index f8b79ed9..ea2d2dc7 100644
--- a/webapp/src/pages/Homepage.js
+++ b/webapp/src/pages/Homepage.js
@@ -4,7 +4,6 @@ import data from "../data/gameInfo.json";
 import CardComponent from "../components/CardComponent.js";
 import useMediaQuery from '@mui/material/useMediaQuery';
 import { useTranslation } from 'react-i18next';
-import i18n from '../localize/i18n';
 
 
 const Homepage = () => {

From ecf2c824843dd6c8790b7c156345d9ac7eec3a0e Mon Sep 17 00:00:00 2001
From: uo289689 <uo289689@uniovi.es>
Date: Tue, 23 Apr 2024 19:54:33 +0200
Subject: [PATCH 025/132] fixing e2e tests

---
 webapp/e2e/steps/theCallange.steps.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/e2e/steps/theCallange.steps.js b/webapp/e2e/steps/theCallange.steps.js
index 04527cd0..e23e073a 100644
--- a/webapp/e2e/steps/theCallange.steps.js
+++ b/webapp/e2e/steps/theCallange.steps.js
@@ -45,7 +45,7 @@ defineFeature(feature, test => {
 
   beforeEach(async () => {
     await page
-    .goto("http://localhost:3000/theChallangeGame", {
+    .goto("http://localhost:3000/theChallengeGame", {
       waitUntil: "networkidle0",
     })
     .catch(() => {});
@@ -57,7 +57,7 @@ defineFeature(feature, test => {
     });
 
     await page
-    .goto("http://localhost:3000/theChallangeGame", {
+    .goto("http://localhost:3000/theChallengeGame", {
       waitUntil: "networkidle0",
     })
     .catch(() => {});

From 438ba65bd60494ca60e6a569827dcd79c5c471c3 Mon Sep 17 00:00:00 2001
From: uo289689 <uo289689@uniovi.es>
Date: Tue, 23 Apr 2024 20:07:20 +0200
Subject: [PATCH 026/132] Fixed e2e

---
 webapp/e2e/steps/theCallange.steps.js      | 32 ++++++++--------------
 webapp/e2e/steps/wiseMenStackGame.steps.js | 30 ++++++++++++--------
 2 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/webapp/e2e/steps/theCallange.steps.js b/webapp/e2e/steps/theCallange.steps.js
index e23e073a..2dd1cc86 100644
--- a/webapp/e2e/steps/theCallange.steps.js
+++ b/webapp/e2e/steps/theCallange.steps.js
@@ -75,18 +75,14 @@ defineFeature(feature, test => {
         await expect(page).toMatchElement("div", { text: 'Which is the capital of Spain?'});
         expect(question).not.toBeNull();
         
-        const answers = await page.$x('//*[@data-testid="answer"]');
-        expect(answers.length).toBe(2);
+        const answers = await page.$x('//*[contains(@data-testid, "success") or contains(@data-testid, "failure") or contains(@data-testid, "answer")]');
+        expect(answers.length).toBe(4);
     });
 
     when('I click on the correct answer button', async () => {
-        const answers = await page.$x('//*[@data-testid="answer"]');
-        const textoBoton1 = await page.evaluate(button => button.innerText, answers[0]);
-        if(textoBoton1 === "Madrid") {
-          await answers[0].click();
-        } else {
-          await answers[1].click();
-        }
+        const answers = await page.$x('//*[contains(@data-testid, "success") or contains(@data-testid, "failure") or contains(@data-testid, "answer")]');
+        await answers[0].click();
+  
     });
 
     then('The button turns green', async () => {
@@ -98,7 +94,7 @@ defineFeature(feature, test => {
         } else {
           await expect(textoBoton2).toMatch(/Madrid/i);
         }*/
-        await expect(page).toMatchElement("button", { style: { color: 'green' } });
+        await expect(page).toMatchElement('[data-testid="succes0"]');
     });
   })
 
@@ -113,18 +109,13 @@ defineFeature(feature, test => {
         await expect(page).toMatchElement("div", { text: 'Which is the capital of Spain?'});
         expect(question).not.toBeNull();
         
-        const answers = await page.$x('//*[@data-testid="answer"]');
-        expect(answers.length).toBe(2);
+        const answers = await page.$x('//*[contains(@data-testid, "success") or contains(@data-testid, "failure") or contains(@data-testid, "answer")]');
+        expect(answers.length).toBe(4);
     });
 
     when('I click on an incorrect answer button', async () => {
-        const answers = await page.$x('//*[@data-testid="answer"]');
-        const textoBoton1 = await page.evaluate(button => button.innerText, answers[0]);
-        if(textoBoton1 !== "Madrid") {
-          await answers[0].click();
-        } else {
-          await answers[1].click();
-        }
+        const answers = await page.$x('//*[contains(@data-testid, "success") or contains(@data-testid, "failure") or contains(@data-testid, "answer")]');
+        await answers[1].click();
     });
 
     then('The button turns red', async () => {
@@ -136,8 +127,7 @@ defineFeature(feature, test => {
         } else {
           await expect(textoBoton2).toMatch(/Madrid/i);
         }*/
-        await expect(page).toMatchElement("button", { style: { color: 'red' } });
-        await expect(page).toMatchElement("button", { style: { color: 'green' } });
+        await expect(page).toMatchElement('[data-testid="failure1"]');
     });
   })
 
diff --git a/webapp/e2e/steps/wiseMenStackGame.steps.js b/webapp/e2e/steps/wiseMenStackGame.steps.js
index 420ae33a..22f11b35 100644
--- a/webapp/e2e/steps/wiseMenStackGame.steps.js
+++ b/webapp/e2e/steps/wiseMenStackGame.steps.js
@@ -75,15 +75,18 @@ defineFeature(feature, test => {
         await expect(page).toMatchElement("div", { text: 'Which is the capital of Spain?'});
         expect(question).not.toBeNull();
         
-        const answers = await page.$x('//*[contains(@data-testid, "success") or contains(@data-testid, "failure") or contains(@data-testid, "answer")]');
-        expect(answers.length).toBe(4);
+        const answers = await page.$x('//*[@data-testid="answer"]');
+        expect(answers.length).toBe(2);
     });
 
     when('I click on the correct answer button', async () => {
-      const answers = await page.$x('//*[contains(@data-testid, "success") or contains(@data-testid, "failure") or contains(@data-testid, "answer")]');
-      const textoBoton1 = await page.evaluate(button => button.innerText, answers[0]);
-      await answers[0].click();
-       
+        const answers = await page.$x('//*[@data-testid="answer"]');
+        const textoBoton1 = await page.evaluate(button => button.innerText, answers[0]);
+        if(textoBoton1 === "Madrid") {
+          await answers[0].click();
+        } else {
+          await answers[1].click();
+        }
     });
 
     then('The button turns green', async () => {
@@ -95,7 +98,7 @@ defineFeature(feature, test => {
         } else {
           await expect(textoBoton2).toMatch(/Madrid/i);
         }*/
-        await expect(page).toMatchElement('[data-testid="succes0"]');
+        await expect(page).toMatchElement("button", { style: { color: 'green' } });
     });
   })
 
@@ -110,14 +113,18 @@ defineFeature(feature, test => {
         await expect(page).toMatchElement("div", { text: 'Which is the capital of Spain?'});
         expect(question).not.toBeNull();
         
-        const answers = await page.$x('//*[contains(@data-testid, "success") or contains(@data-testid, "failure") or contains(@data-testid, "answer")]');
-        expect(answers.length).toBe(4);
+        const answers = await page.$x('//*[@data-testid="answer"]');
+        expect(answers.length).toBe(2);
     });
 
     when('I click on an incorrect answer button', async () => {
         const answers = await page.$x('//*[@data-testid="answer"]');
         const textoBoton1 = await page.evaluate(button => button.innerText, answers[0]);
-        await answers[1].click();
+        if(textoBoton1 !== "Madrid") {
+          await answers[0].click();
+        } else {
+          await answers[1].click();
+        }
     });
 
     then('The button turns red', async () => {
@@ -129,7 +136,8 @@ defineFeature(feature, test => {
         } else {
           await expect(textoBoton2).toMatch(/Madrid/i);
         }*/
-        await expect(page).toMatchElement('[data-testid="failure1"]');
+        await expect(page).toMatchElement("button", { style: { color: 'red' } });
+        await expect(page).toMatchElement("button", { style: { color: 'green' } });
     });
   })
 

From b1f2b85d073a161ee38ed4dd0614a288484528a8 Mon Sep 17 00:00:00 2001
From: uo289689 <uo289689@uniovi.es>
Date: Tue, 23 Apr 2024 20:16:02 +0200
Subject: [PATCH 027/132] Fixing e2e tests

---
 webapp/e2e/steps/theCallange.steps.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/e2e/steps/theCallange.steps.js b/webapp/e2e/steps/theCallange.steps.js
index 2dd1cc86..6e62f8e9 100644
--- a/webapp/e2e/steps/theCallange.steps.js
+++ b/webapp/e2e/steps/theCallange.steps.js
@@ -72,7 +72,7 @@ defineFeature(feature, test => {
 
         //await expect(page.findByText('Which is the capital of Spain?'));
         const question = await page.$['data-testid="question"'];
-        await expect(page).toMatchElement("div", { text: 'Which is the capital of Spain?'});
+        await expect(page).toMatchElement("div", { text: 'Which is the capital of Spain?'.toUpperCase()});
         expect(question).not.toBeNull();
         
         const answers = await page.$x('//*[contains(@data-testid, "success") or contains(@data-testid, "failure") or contains(@data-testid, "answer")]');
@@ -106,7 +106,7 @@ defineFeature(feature, test => {
 
         //await expect(page.findByText('Which is the capital of Spain?'));
         const question = await page.$['data-testid="question"'];
-        await expect(page).toMatchElement("div", { text: 'Which is the capital of Spain?'});
+        await expect(page).toMatchElement("div", { text: 'Which is the capital of Spain?'.toUpperCase()});
         expect(question).not.toBeNull();
         
         const answers = await page.$x('//*[contains(@data-testid, "success") or contains(@data-testid, "failure") or contains(@data-testid, "answer")]');

From 8912abc8acd76c037b41b9b2a62bec56fa93807e Mon Sep 17 00:00:00 2001
From: uo289689 <uo289689@uniovi.es>
Date: Tue, 23 Apr 2024 20:29:56 +0200
Subject: [PATCH 028/132] fixing e2e

---
 webapp/e2e/steps/theCallange.steps.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/webapp/e2e/steps/theCallange.steps.js b/webapp/e2e/steps/theCallange.steps.js
index 6e62f8e9..58c70551 100644
--- a/webapp/e2e/steps/theCallange.steps.js
+++ b/webapp/e2e/steps/theCallange.steps.js
@@ -1,7 +1,9 @@
+import {useTheme} from '@mui/material';
 const puppeteer = require('puppeteer');
 const { defineFeature, loadFeature }=require('jest-cucumber');
 const setDefaultOptions = require('expect-puppeteer').setDefaultOptions
 const feature = loadFeature('./features/theChallangeGame.feauture');
+const theme = useTheme();
 
 let page;
 let browser;
@@ -94,7 +96,7 @@ defineFeature(feature, test => {
         } else {
           await expect(textoBoton2).toMatch(/Madrid/i);
         }*/
-        await expect(page).toMatchElement('[data-testid="succes0"]');
+        await expect(page).toMatchElement("button", { style: { backgroundColor: theme.palette.success.main } });
     });
   })
 
@@ -127,7 +129,8 @@ defineFeature(feature, test => {
         } else {
           await expect(textoBoton2).toMatch(/Madrid/i);
         }*/
-        await expect(page).toMatchElement('[data-testid="failure1"]');
+        await expect(page).toMatchElement("button", { style: { backgroundColor: theme.palette.error.main } });
+        await expect(page).toMatchElement("button", { style: { backgroundColor: theme.palette.success.main } });
     });
   })
 

From a3e0b3c5ed6fce2d31085a735d85360d19181c53 Mon Sep 17 00:00:00 2001
From: uo289689 <uo289689@uniovi.es>
Date: Tue, 23 Apr 2024 20:46:18 +0200
Subject: [PATCH 029/132] fixing e2e

---
 webapp/e2e/steps/theCallange.steps.js | 8 +++-----
 webapp/src/pages/TheChallengeGame.js  | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/webapp/e2e/steps/theCallange.steps.js b/webapp/e2e/steps/theCallange.steps.js
index 58c70551..8b3d7d59 100644
--- a/webapp/e2e/steps/theCallange.steps.js
+++ b/webapp/e2e/steps/theCallange.steps.js
@@ -1,9 +1,7 @@
-import {useTheme} from '@mui/material';
 const puppeteer = require('puppeteer');
 const { defineFeature, loadFeature }=require('jest-cucumber');
 const setDefaultOptions = require('expect-puppeteer').setDefaultOptions
 const feature = loadFeature('./features/theChallangeGame.feauture');
-const theme = useTheme();
 
 let page;
 let browser;
@@ -96,7 +94,7 @@ defineFeature(feature, test => {
         } else {
           await expect(textoBoton2).toMatch(/Madrid/i);
         }*/
-        await expect(page).toMatchElement("button", { style: { backgroundColor: theme.palette.success.main } });
+        await expect(page).toMatchElement("button", { style: { color: 'green' } });
     });
   })
 
@@ -129,8 +127,8 @@ defineFeature(feature, test => {
         } else {
           await expect(textoBoton2).toMatch(/Madrid/i);
         }*/
-        await expect(page).toMatchElement("button", { style: { backgroundColor: theme.palette.error.main } });
-        await expect(page).toMatchElement("button", { style: { backgroundColor: theme.palette.success.main } });
+        await expect(page).toMatchElement("button", { style: { color: 'red' } });
+        await expect(page).toMatchElement("button", { style: { color: 'green' } });
     });
   })
 
diff --git a/webapp/src/pages/TheChallengeGame.js b/webapp/src/pages/TheChallengeGame.js
index 3b3df82c..7299b1aa 100644
--- a/webapp/src/pages/TheChallengeGame.js
+++ b/webapp/src/pages/TheChallengeGame.js
@@ -418,7 +418,7 @@ return (
                                 borderRadius: "10px",
                                 margin: "5px",
                                 "&:disabled": {
-                                    backgroundColor: buttonStates[index] === "success" ? theme.palette.success.main : buttonStates[index] === "failure" ? theme.palette.error.main : "gray",
+                                    backgroundColor: buttonStates[index] === "success" ? "green" : buttonStates[index] === "failure" ? "red" : "gray",
                                     color: "white",
                                 },
                             }}

From c04b7c39f22622ad6a7caa4e1f7b5f79f6aa342c Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Tue, 23 Apr 2024 21:07:17 +0200
Subject: [PATCH 030/132] Column distribution in Instructions

---
 webapp/src/pages/Instructions.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/src/pages/Instructions.js b/webapp/src/pages/Instructions.js
index 7143217e..ff3687c3 100644
--- a/webapp/src/pages/Instructions.js
+++ b/webapp/src/pages/Instructions.js
@@ -166,9 +166,9 @@ const Instructions = () => {
             <CssBaseline />
 
             <Box sx={{...styles.fullScreen, width:'80%', margin:'1rem'}}>
-                <Grid container spacing={{ xs: 2, md: 4 }} columns={{ xs: 2, sm: 3, md: 3, lg: 5, xl:5 }}>
-                    <Grid item xs={2} sm={3} md={5}>
-                        <Typography variant="h3" align="center" fontWeight="bold" sx={{textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', margin:'1rem', fontSize:'2rem'}}>INSTRUCTIONS</Typography>
+                <Grid container spacing={{ xs: 2, md: 4 }} columns={{ xs: 1, sm: 3, lg: 5 }}>
+                    <Grid item xs={1} sm={3} md={5}>
+                        <Typography variant="h2" align="center" fontWeight="bold" sx={{ textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem' }}>INSTRUCTIONS</Typography>
                     </Grid>
                     {info.map((option, index) => (
                         <Grid item xs={1} key={option.nombre} >

From 2ee61c44cdcd2ee418fcfdf0af9cbfe7a6a9092f Mon Sep 17 00:00:00 2001
From: uo288543 <uo288543@uniovi.es>
Date: Tue, 23 Apr 2024 21:09:12 +0200
Subject: [PATCH 031/132] Change security in multiplayer

---
 multiplayer/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/multiplayer/index.js b/multiplayer/index.js
index 7eb722ee..c5cec2a5 100644
--- a/multiplayer/index.js
+++ b/multiplayer/index.js
@@ -12,7 +12,7 @@ const io = socketIO(server, {
         origin: [process.env.WEBAPP_ENDPOINT, "http://localhost:3000"],
         //origin: "*", //this should be changed to improve security
         methods: ["GET", "POST"],
-        //allowedHeaders: "*" //this should be changed to improve security
+        allowedHeaders: "*" //this should be changed to improve security
     }
 });
 

From e4f553ae056ce3390677ade9f595de049ff01b0c Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Tue, 23 Apr 2024 21:14:53 +0200
Subject: [PATCH 032/132] Unnifyied title style for all pages

---
 webapp/src/pages/GroupDetails.js | 2 +-
 webapp/src/pages/Groups.js       | 2 +-
 webapp/src/pages/Homepage.js     | 2 +-
 webapp/src/pages/Login.js        | 2 +-
 webapp/src/pages/Profile.js      | 2 +-
 webapp/src/pages/Ranking.js      | 2 +-
 webapp/src/pages/Register.js     | 2 +-
 webapp/src/pages/Statistics.js   | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/webapp/src/pages/GroupDetails.js b/webapp/src/pages/GroupDetails.js
index 1337ac25..5448f395 100644
--- a/webapp/src/pages/GroupDetails.js
+++ b/webapp/src/pages/GroupDetails.js
@@ -50,7 +50,7 @@ const GroupDetails = () => {
     // Returns all group data including the creator, the creation date and the members list
     return (
         <Container sx={{ margin: '0 auto auto' }}>
-            <Typography variant="h3" sx={{ textAlign:'center', fontWeight:'bold' }}>
+            <Typography variant="h2" align="center" fontWeight="bold" sx={{ textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem' }}>
                 {groupInfo.name}
             </Typography>
             <Typography variant="h4">
diff --git a/webapp/src/pages/Groups.js b/webapp/src/pages/Groups.js
index 3ab716ee..e30383fd 100644
--- a/webapp/src/pages/Groups.js
+++ b/webapp/src/pages/Groups.js
@@ -97,7 +97,7 @@ const Groups = () => {
 
     return (
     <Container sx={{ margin: '0 auto auto', display: 'flex', flexDirection: 'column', alignItems: 'center' }}>
-      <Typography variant="h3" sx={{ width: '100%', textAlign: 'center', fontWeight: 'bold' }}>
+      <Typography variant="h2" align="center" fontWeight="bold" sx={{ width: '100%', textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem' }}>
         { t("Groups.title") }
       </Typography>
 
diff --git a/webapp/src/pages/Homepage.js b/webapp/src/pages/Homepage.js
index ee5b0f6f..795d5d1a 100644
--- a/webapp/src/pages/Homepage.js
+++ b/webapp/src/pages/Homepage.js
@@ -173,7 +173,7 @@ const Homepage = () => {
             <video data-testid="video" ref={videoRef} autoPlay muted loop style={{ ...styles.video}}>
                 <source src="../home/Background-White.webm" type="video/mp4" />
             </video>
-            <Typography variant="h3" align="center" fontWeight="bold" sx={{paddingTop:'2rem',textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem'}}>GAME MODES</Typography>
+            <Typography variant="h2" align="center" fontWeight="bold" sx={{ textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem' }}>GAME MODES</Typography>
             {games}
             <Button variant='conteined' href={gameLink} sx={styles.playButton}> PLAY </Button>
         </Box>
diff --git a/webapp/src/pages/Login.js b/webapp/src/pages/Login.js
index fd8bc074..38f1cc1a 100644
--- a/webapp/src/pages/Login.js
+++ b/webapp/src/pages/Login.js
@@ -38,7 +38,7 @@ const Login = () => {
     <Container component="main" maxWidth="xs" sx={{ display: 'flex', justifyContent: 'center', alignItems: 'center', flex:'1', marginTop: '2em', marginBottom: '2em'}}>
       <Box sx={{margin: '2em'}}>
         <div>
-          <Typography component="h1" variant="h5">
+          <Typography variant="h2" align="center" fontWeight="bold" sx={{ textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem' }}>
             { t("Login.title") }
           </Typography>
           <TextField
diff --git a/webapp/src/pages/Profile.js b/webapp/src/pages/Profile.js
index d0c348db..e7bdb2db 100644
--- a/webapp/src/pages/Profile.js
+++ b/webapp/src/pages/Profile.js
@@ -62,7 +62,7 @@ const Profile = () => {
 
     return (
         <Container sx={{ margin: '0 auto auto', display:'flex', flexDirection:'column' }}>
-            <Typography variant="h3" sx={{ textAlign:'center', fontWeight:'bold' }}>{userInfo.username}</Typography>
+            <Typography variant="h2" align="center" fontWeight="bold" sx={{ textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem' }}>{userInfo.username}</Typography>
             <Container sx={{ display:'flex' }}>
                 <Container sx={{ display:'flex', flexDirection:'column', justifyContent:'center' }}>
                     <Typography variant="h4"><b>{t("Profile.name")}</b> {userInfo.name}</Typography>
diff --git a/webapp/src/pages/Ranking.js b/webapp/src/pages/Ranking.js
index 752d1d00..a26ec4c5 100644
--- a/webapp/src/pages/Ranking.js
+++ b/webapp/src/pages/Ranking.js
@@ -59,7 +59,7 @@ const Ranking = () => {
         }}>
 
             <Container style={{ display: 'flex', flexDirection: 'column' }}>
-                <Typography variant="h3" align="center" fontWeight="bold">
+                <Typography variant="h2" align="center" fontWeight="bold" sx={{ textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem' }}>
                     RANKING
                 </Typography>
                 <Container style={{ display: 'flex', justifyContent: 'center', marginTop: '0.5em', gap:'2em' }}>
diff --git a/webapp/src/pages/Register.js b/webapp/src/pages/Register.js
index 0f23a6bd..da9d1a88 100644
--- a/webapp/src/pages/Register.js
+++ b/webapp/src/pages/Register.js
@@ -48,7 +48,7 @@ const AddUser = () => {
     <Container component="main" maxWidth="xs" sx={{display: 'flex', justifyContent: 'center', alignItems: 'center', flex:'1'}}>
       <Box sx={{ margin: '2em'}}>
         <Box>
-            <Typography component="h1" variant="h5">
+            <Typography variant="h2" align="center" fontWeight="bold" sx={{ textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem' }}>
               { t("Register.title") }
             </Typography>
             <TextField
diff --git a/webapp/src/pages/Statistics.js b/webapp/src/pages/Statistics.js
index b45a12a8..f1a9f082 100644
--- a/webapp/src/pages/Statistics.js
+++ b/webapp/src/pages/Statistics.js
@@ -275,7 +275,7 @@ const Statistics = () => {
 
     return (
         <Container sx={{ margin: '0 auto auto', display: 'flex', flexDirection: 'column', alignItems: 'center' }}>
-            <Typography variant="h3" align="center" fontWeight="bold" gutterBottom>
+            <Typography variant="h2" align="center" fontWeight="bold" gutterBottom sx={{ textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem' }}>
             { t("Statistics.title") }
             </Typography>
             {error? (

From dfe420013d12b01dc5d1e57ce00f27dbcc3d4a87 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Tue, 23 Apr 2024 21:18:42 +0200
Subject: [PATCH 033/132] Inter for homepage tilte

---
 webapp/src/localize/en.json  | 4 ++++
 webapp/src/localize/es.json  | 4 ++++
 webapp/src/localize/fr.json  | 4 ++++
 webapp/src/pages/Homepage.js | 4 +++-
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/webapp/src/localize/en.json b/webapp/src/localize/en.json
index 2fcf69bf..0d534d67 100644
--- a/webapp/src/localize/en.json
+++ b/webapp/src/localize/en.json
@@ -6,6 +6,10 @@
         "q": "QUEST"
     },
 
+    "Homepage": {
+        "title": "GAME MODES"
+    },
+
     "NavBar":{
         "play": "Play",
         "statistics": "Statistics",
diff --git a/webapp/src/localize/es.json b/webapp/src/localize/es.json
index e437e9cb..d17881c1 100644
--- a/webapp/src/localize/es.json
+++ b/webapp/src/localize/es.json
@@ -6,6 +6,10 @@
         "q": "QUESTIONARIO"
     },
 
+    "Homepage": {
+        "title": "MODOS DE JUEGO"
+    },
+
     "NavBar":{
         "play": "Jugar",
         "statistics": "Estadísticas",
diff --git a/webapp/src/localize/fr.json b/webapp/src/localize/fr.json
index 5368553f..8715a69e 100644
--- a/webapp/src/localize/fr.json
+++ b/webapp/src/localize/fr.json
@@ -6,6 +6,10 @@
         "q": "QUEST"
     },
 
+    "Homepage": {
+        "title": "MODES DE JEU"
+    },
+
     "NavBar":{
         "play": "Jouer",
         "statistics": "Statistiques",
diff --git a/webapp/src/pages/Homepage.js b/webapp/src/pages/Homepage.js
index 795d5d1a..88f0f81c 100644
--- a/webapp/src/pages/Homepage.js
+++ b/webapp/src/pages/Homepage.js
@@ -3,10 +3,12 @@ import { Button, Box, Grid, Typography } from '@mui/material';
 import data from "../data/gameInfo.json";
 import CardComponent from "../components/CardComponent.js";
 import useMediaQuery from '@mui/material/useMediaQuery';
+import { useTranslation } from 'react-i18next';
 
 
 const Homepage = () => {
     const xxl = useMediaQuery('(min-width:1920px)');
+    const { t } = useTranslation();
 
     const styles = React.useMemo(() => ({
         cardButton:{
@@ -173,7 +175,7 @@ const Homepage = () => {
             <video data-testid="video" ref={videoRef} autoPlay muted loop style={{ ...styles.video}}>
                 <source src="../home/Background-White.webm" type="video/mp4" />
             </video>
-            <Typography variant="h2" align="center" fontWeight="bold" sx={{ textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem' }}>GAME MODES</Typography>
+            <Typography variant="h2" align="center" fontWeight="bold" sx={{ textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem' }}>{ t("Homepage.title") }</Typography>
             {games}
             <Button variant='conteined' href={gameLink} sx={styles.playButton}> PLAY </Button>
         </Box>

From b8cc5155d3ddd5b6c641474a8eca545364710bc2 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Tue, 23 Apr 2024 21:32:00 +0200
Subject: [PATCH 034/132] Stablished theme colors in Instructions.js

---
 webapp/src/pages/Instructions.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/webapp/src/pages/Instructions.js b/webapp/src/pages/Instructions.js
index ff3687c3..209b030b 100644
--- a/webapp/src/pages/Instructions.js
+++ b/webapp/src/pages/Instructions.js
@@ -1,26 +1,27 @@
 import * as React from "react";
-import { Button, Typography, Grid, Box , CssBaseline, useMediaQuery  } from "@mui/material";
+import { useTheme, Button, Typography, Grid, Box , CssBaseline, useMediaQuery  } from "@mui/material";
 import data from "../data/gameInfo.json";
 
 
 const Instructions = () => {
     const lg = useMediaQuery('(min-width: 1200px)');
+    const theme = useTheme();
 
     const styles = {
 
         button:{
-            color: '#006699',
+            color: theme.palette.primary.main,
             backgroundColor:'rgba(255,255,255,0.7)',
             width: "100%",
             height: "75px",
-            border: '2px solid #006699',
+            border: `2px solid ${theme.palette.primary.main}`,
             borderRadius: '5px',
         },
 
         selectedButton:{
 
             color: 'white',
-            backgroundColor:'#006699',
+            backgroundColor: theme.palette.primary.main,
             width: "100%",
             height: "75px",
             border: '2px solid white',
@@ -76,13 +77,13 @@ const Instructions = () => {
 
         imgRow:{
             height: "100%",
-            border: `2px solid #006699`,
+            border: `2px solid ${theme.palette.primary.main}`,
             borderRadius: "5px"
         },
 
         imgColumn:{
             width: "20rem",
-            border: `2px solid #006699`,
+            border: `2px solid ${theme.palette.primary.main}`,
             borderRadius: "5px"
         },
 
@@ -98,7 +99,7 @@ const Instructions = () => {
             paddingRight:'1rem',
             paddingLeft:'1rem',
             borderRadius:'10px',
-            border: `2px solid #006699`,
+            border: `2px solid ${theme.palette.primary.main}`,
             backgroundColor: 'rgba(255,255,255,0.7)',
         },
 
@@ -113,7 +114,7 @@ const Instructions = () => {
             paddingRight:'1rem',
             paddingLeft:'1rem',
             borderRadius:'10px',
-            border: `2px solid #006699`,
+            border: `2px solid ${theme.palette.primary.main}`,
             backgroundColor: 'rgba(255,255,255,0.7)',
         },
 

From 7a69a8fea0a1dcaea11b2fa5d2852685c9f283cf Mon Sep 17 00:00:00 2001
From: uo288543 <uo288543@uniovi.es>
Date: Tue, 23 Apr 2024 21:59:50 +0200
Subject: [PATCH 035/132] Update security other time

---
 multiplayer/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/multiplayer/index.js b/multiplayer/index.js
index c5cec2a5..c2b2dbc4 100644
--- a/multiplayer/index.js
+++ b/multiplayer/index.js
@@ -9,8 +9,8 @@ const app = express();
 const server = http.createServer(app);
 const io = socketIO(server, {
     cors: { //permit connections from webapp
-        origin: [process.env.WEBAPP_ENDPOINT, "http://localhost:3000"],
-        //origin: "*", //this should be changed to improve security
+        //origin: [process.env.WEBAPP_ENDPOINT, "http://localhost:3000"],
+        origin: "*", //this should be changed to improve security
         methods: ["GET", "POST"],
         allowedHeaders: "*" //this should be changed to improve security
     }

From b2dd6a2750dc59a41454182bca56ebfd7382ef98 Mon Sep 17 00:00:00 2001
From: teresagg <uo288347@uniovi.es>
Date: Tue, 23 Apr 2024 22:13:05 +0200
Subject: [PATCH 036/132] Restart containers and modified grafana

---
 docker-compose.yml                                       | 9 +++++++++
 .../provisioning/dashboards/wiq-es04-dashboard.json      | 8 ++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index c431c1c6..57e27250 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,6 +10,7 @@ services:
       - "27017:27017"
     networks:
       - mynetwork
+    restart: always
 
   mariadb:
     container_name: mariadb
@@ -24,6 +25,7 @@ services:
       - "3306:3306"
     networks:
       - mynetwork
+    restart: always
 
   users:
     container_name: users
@@ -38,6 +40,7 @@ services:
       - mynetwork
     environment:
       DATABASE_URL: mariadb:3306/userdb
+    restart: always
 
   questions:
       container_name: questions
@@ -53,6 +56,7 @@ services:
       environment:
         DATABASE_URI: mongodb://mongodb:27017/questionDB
         TEST_DATABASE_URI: mongodb://mongodb:27017/test
+      restart: always
 
   gatewayservice:
     container_name: gatewayservice
@@ -69,6 +73,7 @@ services:
     environment:
       USER_SERVICE_URL: http://users:8001
       QUESTION_SERVICE_URL: http://questions:8010
+    restart: always
 
   webapp:
     container_name: webapp
@@ -85,6 +90,7 @@ services:
     environment:
       REACT_APP_API_ENDPOINT: http://gatewayservice:8000
       REACT_APP_MULTIPLAYER_ENDPOINT: http://multiplayer:5010
+    restart: always
 
   multiplayer:
     container_name: multiplayer
@@ -100,6 +106,7 @@ services:
     environment:
       WEBAPP_ENDPOINT: http://webapp:3000
       GATEWAY_SERVICE_ENDPOINT: http://gatewayservice:8000
+    restart: always
 
   prometheus:
     image: prom/prometheus
@@ -114,6 +121,7 @@ services:
       - "9090:9090"
     depends_on: 
       - gatewayservice
+    restart: always
       
   grafana:
     image: grafana/grafana
@@ -133,6 +141,7 @@ services:
       - "9091:9091"
     depends_on: 
       - prometheus
+    restart: always
 
 volumes:
   mariadb_data:
diff --git a/gatewayservice/monitoring/grafana/provisioning/dashboards/wiq-es04-dashboard.json b/gatewayservice/monitoring/grafana/provisioning/dashboards/wiq-es04-dashboard.json
index a3398ba4..28caba1c 100644
--- a/gatewayservice/monitoring/grafana/provisioning/dashboards/wiq-es04-dashboard.json
+++ b/gatewayservice/monitoring/grafana/provisioning/dashboards/wiq-es04-dashboard.json
@@ -69,7 +69,7 @@
       "options": {
         "dataLinks": []
       },
-      "percentage": true,
+      "percentage": false,
       "pluginVersion": "7.0.0",
       "pointradius": 2,
       "points": false,
@@ -80,9 +80,9 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(increase(http_request_duration_seconds_count[1m]))",
+          "expr": "sum(increase(http_request_duration_seconds_count[1h]))",
           "interval": "",
-          "legendFormat": "Requests per minute",
+          "legendFormat": "Requests per hour",
           "refId": "A"
         }
       ],
@@ -90,7 +90,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Rate (R): Number of requests per minute",
+      "title": "Rate (R): Number of requests per hour",
       "tooltip": {
         "shared": true,
         "sort": 0,

From e6393e5b7001f8662c6e19e7bfd9f7df07cd0880 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Tue, 23 Apr 2024 22:40:21 +0200
Subject: [PATCH 037/132]


From 623540639b304def57b7164c5f6f0f5996ae8cd7 Mon Sep 17 00:00:00 2001
From: Pablo Barrero Cruz <uo289642@uniovi.es>
Date: Tue, 23 Apr 2024 23:21:58 +0200
Subject: [PATCH 038/132] Update HomePage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Pablo García-Ovies Pérez <uo265314@uniovi.es>
Co-Authored-By: Alberto Lago <145291757+uo288245@users.noreply.github.com>
---
 webapp/src/pages/Homepage.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapp/src/pages/Homepage.js b/webapp/src/pages/Homepage.js
index 7fcb1138..7f38eacf 100644
--- a/webapp/src/pages/Homepage.js
+++ b/webapp/src/pages/Homepage.js
@@ -38,11 +38,11 @@ const Homepage = () => {
 
         playButton : {
             height: {
-                xs: '2.5rem', // Tamaño para dispositivos extra pequeños
-                sm: '3rem', // Tamaño para dispositivos pequeños
-                md: '3.5rem', // Tamaño para dispositivos medianos
-                lg: '4rem', // Tamaño para dispositivos grandes
-                xl: '5rem' // Tamaño para dispositivos extra grandes
+                xs: '2.5rem',
+                sm: '3rem',
+                md: '3.5rem',
+                lg: '4rem',
+                xl: '5rem'
             },
             width: {
                 xs: '10rem',

From ee03213d3259dd1103e8a4c4d211be3f94f1f3aa Mon Sep 17 00:00:00 2001
From: uo288245 <uo288245@uniovi.es>
Date: Wed, 24 Apr 2024 19:20:43 +0200
Subject: [PATCH 039/132] FIXED profile and groupdetails tests and views.

---
 .../src/__tests__/pages/GroupDetails.test.js  |  6 +--
 webapp/src/__tests__/pages/Profile.test.js    | 41 +++++++++++++++----
 webapp/src/pages/GroupDetails.js              | 10 ++---
 3 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/webapp/src/__tests__/pages/GroupDetails.test.js b/webapp/src/__tests__/pages/GroupDetails.test.js
index 48d01a99..8add14e0 100644
--- a/webapp/src/__tests__/pages/GroupDetails.test.js
+++ b/webapp/src/__tests__/pages/GroupDetails.test.js
@@ -42,9 +42,9 @@ describe('GroupDetails component', () => {
 
     await waitFor(() => {
       expect(getByText(groupInfo.name)).toBeInTheDocument();
-      expect(getByText(`Creator: ${groupInfo.creator}`)).toBeInTheDocument();
-      expect(getByText(`Created in: ${new Date(groupInfo.createdAt).toLocaleDateString()}`)).toBeInTheDocument();
-      expect(getByText(`Members (${groupInfo.users.length}/20):`)).toBeInTheDocument();
+      expect(getByText(`${groupInfo.creator}`)).toBeInTheDocument();
+      expect(getByText(`${new Date(groupInfo.createdAt).toLocaleDateString()}`)).toBeInTheDocument();
+      expect(getByText(`${groupInfo.users.length}/20`)).toBeInTheDocument();
       groupInfo.users.forEach(user => {
         expect(getByText(user)).toBeInTheDocument();
       });
diff --git a/webapp/src/__tests__/pages/Profile.test.js b/webapp/src/__tests__/pages/Profile.test.js
index 2c50ceef..3f11cc61 100644
--- a/webapp/src/__tests__/pages/Profile.test.js
+++ b/webapp/src/__tests__/pages/Profile.test.js
@@ -7,6 +7,12 @@ import { SessionContext } from '../../SessionContext';
 import Profile from '../../pages/Profile';
 
 const mockAxios = new MockAdapter(axios);
+const mockNavigate = jest.fn();
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useNavigate: () => mockNavigate,
+}));
  
 describe('Profile component', () => {
   const username = 'testuser';
@@ -23,9 +29,10 @@ describe('Profile component', () => {
   });
 
   it('should fetch and display user information', async () => {
+    const updateAvatar = jest.fn();
     mockAxios.onGet(`http://localhost:8000/profile`, { params: { username } }).reply(200, initialUserInfo);
     render(
-      <SessionContext.Provider value={{ username }}>
+      <SessionContext.Provider value={{ username, updateAvatar }}>
         <Router>
           <Profile />
         </Router>
@@ -41,24 +48,30 @@ describe('Profile component', () => {
   });
 
   it('should display an error if fetching user info fails', async () => {
+    const updateAvatar = jest.fn();
     mockAxios.onGet(`http://localhost:8000/profile`, { params: { username } }).reply(400, { error: 'Error fetching user information' });
 
     render(
-      <SessionContext.Provider value={{ username }}>
+      <SessionContext.Provider value={{ username, updateAvatar }}>
         <Router>
           <Profile />
         </Router>
       </SessionContext.Provider>
     );
+
+    await waitFor(() => {
+      expect(screen.getByText('Error fetching user information')).toBeInTheDocument();
+    });
   });
 
   it('should handle avatar selection and update', async () => {
+    const updateAvatar = jest.fn();
     const newAvatar = 'bertinIcon.jpg';
     mockAxios.onGet(`http://localhost:8000/profile`, { params: { username } }).reply(200, initialUserInfo);
     mockAxios.onPut(`http://localhost:8000/profile/${username}`, { imageUrl: newAvatar }).reply(200);
 
     render(
-      <SessionContext.Provider value={{ username }}>
+      <SessionContext.Provider value={{ username, updateAvatar }}>
         <Router>
           <Profile />
         </Router>
@@ -72,15 +85,21 @@ describe('Profile component', () => {
 
     fireEvent.click(screen.getByTestId('alberto-button'));
     fireEvent.click(screen.getByTestId('confirm-button'));
+
+    await waitFor(() => {
+      expect(mockAxios.history.put.length).toBe(1);
+      expect(mockAxios.history.put[0].data).toContain(newAvatar);
+    });
   });
 
   it('should handle avatar selection and update after choosing different characters', async () => {
+    const updateAvatar = jest.fn();
     const newAvatar = 'teresaIcon.jpg';
     mockAxios.onGet(`http://localhost:8000/profile`, { params: { username } }).reply(200, initialUserInfo);
     mockAxios.onPut(`http://localhost:8000/profile/${username}`, { imageUrl: newAvatar }).reply(200);
 
     render(
-      <SessionContext.Provider value={{ username }}>
+      <SessionContext.Provider value={{ username, updateAvatar }}>
         <Router>
           <Profile />
         </Router>
@@ -101,15 +120,21 @@ describe('Profile component', () => {
     fireEvent.click(screen.getByTestId('maite-button'));
     fireEvent.click(screen.getByTestId('confirm-button'));
 
+    await waitFor(() => {
+      expect(mockAxios.history.put.length).toBe(1);
+      expect(mockAxios.history.put[0].data).toContain(newAvatar);
+    });
+
   });
 
   it('should display an error if avatar update fails', async () => {
+    const updateAvatar = jest.fn();
     const newAvatar = 'bertinIcon.jpg';
     mockAxios.onGet(`http://localhost:8000/profile`, { params: { username } }).reply(200, initialUserInfo);
     mockAxios.onPost(`http://localhost:8000/profile/${username}`, { imageUrl: newAvatar }).reply(400, { error: 'Error updating user information' });
 
     render(
-      <SessionContext.Provider value={{ username }}>
+      <SessionContext.Provider value={{ username, updateAvatar  }}>
         <Router>
           <Profile />
         </Router>
@@ -123,8 +148,10 @@ describe('Profile component', () => {
 
     fireEvent.click(screen.getByText('ALBERT'));
     fireEvent.click(screen.getByTestId('confirm-button'));
-  });
 
-  
+    await waitFor(() => {
+      expect(screen.getByText('Error updating user information')).toBeInTheDocument();
+    });
+  });
 
 });
\ No newline at end of file
diff --git a/webapp/src/pages/GroupDetails.js b/webapp/src/pages/GroupDetails.js
index 5448f395..621fa121 100644
--- a/webapp/src/pages/GroupDetails.js
+++ b/webapp/src/pages/GroupDetails.js
@@ -51,20 +51,18 @@ const GroupDetails = () => {
     return (
         <Container sx={{ margin: '0 auto auto' }}>
             <Typography variant="h2" align="center" fontWeight="bold" sx={{ textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem' }}>
-                {groupInfo.name}
+                <b>{groupInfo.name}</b>
             </Typography>
             <Typography variant="h4">
-                { `${t("Groups.Details.creator")}: ${groupInfo.creator}` }
+                <b>{t("Groups.Details.creator")}:</b> {groupInfo.creator}
             </Typography>
             <Divider sx={{ marginBottom: '2em' }}/>
             <Typography variant="h4">
-                { `${t("Groups.Details.date")}: ${new Date(groupInfo.createdAt).toLocaleDateString()}` }
+                <b>{t("Groups.Details.date")}:</b> {new Date(groupInfo.createdAt).toLocaleDateString()}
             </Typography>
             <Divider sx={{ marginBottom: '2em' }}/>
             <Typography variant="h4">
-                {
-                    `${ t("Groups.Details.members") } (${totalMembers}/${expectedMembers}):`
-                }
+                <b>{t("Groups.Details.members")}:</b> {totalMembers}/{expectedMembers}
             </Typography>
             <List  sx={{ margin:'0', width: '100%' }}>
                 <Divider />

From f4ed9b070c05b10671a0bdceb9a5704a2128bc7a Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Wed, 24 Apr 2024 20:37:26 +0200
Subject: [PATCH 040/132] Inter in TheChallengeGame.js

---
 webapp/src/localize/en.json          | 8 +++++++-
 webapp/src/localize/es.json          | 8 +++++++-
 webapp/src/localize/fr.json          | 8 +++++++-
 webapp/src/pages/TheChallengeGame.js | 8 ++++----
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/webapp/src/localize/en.json b/webapp/src/localize/en.json
index ad821a35..8389baa1 100644
--- a/webapp/src/localize/en.json
+++ b/webapp/src/localize/en.json
@@ -61,7 +61,13 @@
         "pause": "Pause",
         "play": "Play",
         "round": "Question ",
-        "start": "Start game"
+        "start": "Start game",
+        "config": {
+            "title": "GAME CONFIGURATION",
+            "num_rounds": "Number of rounds",
+            "time": "Time per question (seconds)",
+            "category": "Category"
+        }
     },
 
     "Wise_Men": {
diff --git a/webapp/src/localize/es.json b/webapp/src/localize/es.json
index 5b51732b..bd970065 100644
--- a/webapp/src/localize/es.json
+++ b/webapp/src/localize/es.json
@@ -61,7 +61,13 @@
         "pause": "Pausa",
         "play": "Jugar",
         "round": "Pregunta ",
-        "start": "Empezar juego"
+        "start": "Empezar juego",
+        "config": {
+            "title": "CONFIGURACIÓN DEL JUEGO",
+            "num_rounds": "Número de rondas",
+            "time": "Tiempo por pregunta (segundos)",
+            "category": "Categoría"
+        }
     },
     
     "Wise_Men": {
diff --git a/webapp/src/localize/fr.json b/webapp/src/localize/fr.json
index 6ae2d1e5..fb5f570e 100644
--- a/webapp/src/localize/fr.json
+++ b/webapp/src/localize/fr.json
@@ -62,7 +62,13 @@
         "pause": "Pause",
         "play": "Jouer",
         "round": "Question ",
-        "start": "Commencer à jouer"
+        "start": "Commencer à jouer",
+        "config": {
+            "title": "CONFIGURATION DU JEU",
+            "num_rounds": "Nombre de tours",
+            "time": "Temps par question (secondes)",
+            "category": "Catégorie"
+        }
     },
     
     "Wise_Men": {
diff --git a/webapp/src/pages/TheChallengeGame.js b/webapp/src/pages/TheChallengeGame.js
index 7299b1aa..d130928a 100644
--- a/webapp/src/pages/TheChallengeGame.js
+++ b/webapp/src/pages/TheChallengeGame.js
@@ -232,17 +232,17 @@ const Game = () => {
         
         return(
             <Container sx={{ margin: '0 auto auto', display: 'flex', flexDirection: 'column', alignItems: 'center' }}>
-                <Typography variant="h2" sx={{ marginBottom: '1em' }}>Game Configuration</Typography>
+                <Typography variant="h2" sx={{ marginBottom: '1em' }}>{t("Game.config.title")}:</Typography>
 
                 <div style={{ marginBottom: '1em' }}>
-                    <label style={{ margin: '0.5em' }} htmlFor="numRounds">Number of rounds:</label>
+                    <label style={{ margin: '0.5em' }} htmlFor="numRounds">{t("Game.config.num_rounds")}:</label>
                     <Button disabled={numRounds === 1} onClick={() => setNumRounds(numRounds - 1)} variant="outlined" >-</Button>
                     <span style={{ margin: '0.5em' }}>{numRounds}</span>
                     <Button onClick={() => setNumRounds(numRounds + 1)} variant="outlined">+</Button>
                 </div>
 
                 <div style={{ marginBottom: '1em' }}>
-                    <label style={{ margin: '0.5em' }} htmlFor="questionTime">Time per question (seconds):</label>
+                    <label style={{ margin: '0.5em' }} htmlFor="questionTime">{t("Game.config.time")}:</label>
                     <Button disabled={timerConfig === 1} onClick={() => setTimerConfig(timerConfig - 1)} variant="outlined">-</Button>
                     <span style={{ margin: '0.5em' }}>{timerConfig}</span>
                     <Button onClick={() => setTimerConfig(timerConfig + 1)} variant="outlined">+</Button>
@@ -250,7 +250,7 @@ const Game = () => {
 
                 {/* Dropdown for selecting category */}
                 <div style={{ marginBottom: '1em' }}>
-                    <label style={{ margin: '0.5em' }} htmlFor="category">Category:</label>
+                    <label style={{ margin: '0.5em' }} htmlFor="category">{t("Game.config.category")}:</label>
                     <Select
                         value={category}
                         onChange={(event) => setCategory(event.target.value)}

From 03b14ec561038a68e9425c74716661c01a98b9df Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Wed, 24 Apr 2024 20:40:07 +0200
Subject: [PATCH 041/132] Forgot to add the categories as their keys are in a
 bizarre place

---
 webapp/src/pages/TheChallengeGame.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/src/pages/TheChallengeGame.js b/webapp/src/pages/TheChallengeGame.js
index d130928a..7d47806b 100644
--- a/webapp/src/pages/TheChallengeGame.js
+++ b/webapp/src/pages/TheChallengeGame.js
@@ -256,9 +256,9 @@ const Game = () => {
                         onChange={(event) => setCategory(event.target.value)}
                         style={{ minWidth: '120px' }}
                     >
-                        <MenuItem value="Geography">Geography</MenuItem>
-                        <MenuItem value="Political">Political</MenuItem>
-                        <MenuItem value="Sports">Sports</MenuItem>
+                        <MenuItem value="Geography">{t("Wise_Men.geography")}</MenuItem>
+                        <MenuItem value="Political">{t("Wise_Men.political")}</MenuItem>
+                        <MenuItem value="Sports">{t("Wise_Men.sports")}</MenuItem>
                     </Select>
                 </div>
 

From 80d27c31066da4f63745bc78de911634a93bedd4 Mon Sep 17 00:00:00 2001
From: uo288245 <uo288245@uniovi.es>
Date: Wed, 24 Apr 2024 20:40:09 +0200
Subject: [PATCH 042/132] Fixed some i18n words.

---
 webapp/src/localize/en.json | 2 +-
 webapp/src/localize/es.json | 2 +-
 webapp/src/localize/fr.json | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/webapp/src/localize/en.json b/webapp/src/localize/en.json
index ad821a35..cd2cfd3a 100644
--- a/webapp/src/localize/en.json
+++ b/webapp/src/localize/en.json
@@ -81,7 +81,7 @@
     },
 
     "Register": {
-        "title": "Log In",
+        "title": "Register",
         "username": "Username",
         "password": "Password",
         "name": "Name",
diff --git a/webapp/src/localize/es.json b/webapp/src/localize/es.json
index 5b51732b..1df12267 100644
--- a/webapp/src/localize/es.json
+++ b/webapp/src/localize/es.json
@@ -81,7 +81,7 @@
     },
     
     "Register": {
-        "title": "Registro",
+        "title": "Registrarse",
         "username": "Nombre de usuario",
         "password": "Contraseña",
         "name": "Nombre",
diff --git a/webapp/src/localize/fr.json b/webapp/src/localize/fr.json
index 6ae2d1e5..53de97ad 100644
--- a/webapp/src/localize/fr.json
+++ b/webapp/src/localize/fr.json
@@ -2,8 +2,8 @@
     "Home": "JOUER",
     "WIQ": {
         "w": "WIKIDATA",
-        "i": "INFINITE",
-        "q": "QUEST"
+        "i": "ILLIMITÉ",
+        "q": "QUÊTE"
     },
 
     "Homepage": {
@@ -75,7 +75,7 @@
 
 
     "Login": {
-        "title": "Connexion",
+        "title": "Connecter",
         "username": "Nom d'utilisateur",
         "password": "Mot de passe",
         "button": "Se connecter",
@@ -83,7 +83,7 @@
     },
 
     "Register": {
-        "title": "Inscription",
+        "title": "Registre",
         "username": "Nom d'utilisateur",
         "password": "Mot de passe",
         "name": "Prénom",

From a687a7c64a5ba6428168eae57214ff3dd7731c74 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Wed, 24 Apr 2024 20:41:20 +0200
Subject: [PATCH 043/132] Default page title formating

---
 webapp/src/pages/TheChallengeGame.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/webapp/src/pages/TheChallengeGame.js b/webapp/src/pages/TheChallengeGame.js
index 7d47806b..8b55a491 100644
--- a/webapp/src/pages/TheChallengeGame.js
+++ b/webapp/src/pages/TheChallengeGame.js
@@ -232,7 +232,9 @@ const Game = () => {
         
         return(
             <Container sx={{ margin: '0 auto auto', display: 'flex', flexDirection: 'column', alignItems: 'center' }}>
-                <Typography variant="h2" sx={{ marginBottom: '1em' }}>{t("Game.config.title")}:</Typography>
+                <Typography variant="h2" align="center" fontWeight="bold" sx={{ textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem' }}>
+                    {t("Game.config.title")}:
+                </Typography>
 
                 <div style={{ marginBottom: '1em' }}>
                     <label style={{ margin: '0.5em' }} htmlFor="numRounds">{t("Game.config.num_rounds")}:</label>

From 54e35c24e2d4a87c55358490367873e881d1cb9e Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Wed, 24 Apr 2024 20:45:18 +0200
Subject: [PATCH 044/132] Refactored categories names in the
 internationalization dictionaries for comprhesiveness

---
 webapp/src/localize/en.json          | 10 ++++++----
 webapp/src/localize/es.json          | 10 ++++++----
 webapp/src/localize/fr.json          | 10 ++++++----
 webapp/src/pages/TheChallengeGame.js |  6 +++---
 webapp/src/pages/WiseMenStackGame.js |  6 +++---
 5 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/webapp/src/localize/en.json b/webapp/src/localize/en.json
index 10101b63..12795466 100644
--- a/webapp/src/localize/en.json
+++ b/webapp/src/localize/en.json
@@ -67,15 +67,17 @@
             "num_rounds": "Number of rounds",
             "time": "Time per question (seconds)",
             "category": "Category"
+        },
+        "categories": {
+            "geography": "Geography",
+            "political":"Political",
+            "sports":"Sports"
         }
     },
 
     "Wise_Men": {
         "instructions": "Choose a category:",
-        "category":"Categories: ",
-        "geography": "Geography",
-        "political":"Political",
-        "sports":"Sports"
+        "category":"Categories: "
     },
 
     "Login": {
diff --git a/webapp/src/localize/es.json b/webapp/src/localize/es.json
index 03020edb..29dfc03b 100644
--- a/webapp/src/localize/es.json
+++ b/webapp/src/localize/es.json
@@ -67,15 +67,17 @@
             "num_rounds": "Número de rondas",
             "time": "Tiempo por pregunta (segundos)",
             "category": "Categoría"
+        },
+        "categories": {
+            "geography": "Geografía",
+            "political":"Política",
+            "sports":"Deporte"
         }
     },
     
     "Wise_Men": {
         "instructions": "Elige una categoría:",
-        "category":"Categorías: ",
-        "geography": "Geografía",
-        "political":"Política",
-        "sports":"Deporte"
+        "category":"Categorías: "
     },
 
     "Login": {
diff --git a/webapp/src/localize/fr.json b/webapp/src/localize/fr.json
index 3f88ad11..8fdbbecc 100644
--- a/webapp/src/localize/fr.json
+++ b/webapp/src/localize/fr.json
@@ -68,6 +68,11 @@
             "num_rounds": "Nombre de tours",
             "time": "Temps par question (secondes)",
             "category": "Catégorie"
+        },
+        "categories": {
+            "password": "Mot de passe",
+            "button": "Se connecter",
+            "register_link": "Vous n'avez pas de compte ? Inscrivez-vous ici."
         }
     },
     
@@ -82,10 +87,7 @@
 
     "Login": {
         "title": "Connecter",
-        "username": "Nom d'utilisateur",
-        "password": "Mot de passe",
-        "button": "Se connecter",
-        "register_link": "Vous n'avez pas de compte ? Inscrivez-vous ici."
+        "username": "Nom d'utilisateur"
     },
 
     "Register": {
diff --git a/webapp/src/pages/TheChallengeGame.js b/webapp/src/pages/TheChallengeGame.js
index 8b55a491..03566533 100644
--- a/webapp/src/pages/TheChallengeGame.js
+++ b/webapp/src/pages/TheChallengeGame.js
@@ -258,9 +258,9 @@ const Game = () => {
                         onChange={(event) => setCategory(event.target.value)}
                         style={{ minWidth: '120px' }}
                     >
-                        <MenuItem value="Geography">{t("Wise_Men.geography")}</MenuItem>
-                        <MenuItem value="Political">{t("Wise_Men.political")}</MenuItem>
-                        <MenuItem value="Sports">{t("Wise_Men.sports")}</MenuItem>
+                        <MenuItem value="Geography">{t("Game.categories.geography")}</MenuItem>
+                        <MenuItem value="Political">{t("Game.categories.political")}</MenuItem>
+                        <MenuItem value="Sports">{t("Game.categories.sports")}</MenuItem>
                     </Select>
                 </div>
 
diff --git a/webapp/src/pages/WiseMenStackGame.js b/webapp/src/pages/WiseMenStackGame.js
index 2e9a78f5..138d6a10 100644
--- a/webapp/src/pages/WiseMenStackGame.js
+++ b/webapp/src/pages/WiseMenStackGame.js
@@ -263,9 +263,9 @@ if(!isConfigured) {
                         onChange={(event) => setCategory(event.target.value)}
                         style={{ minWidth: '120px' }}
                     >
-                        <MenuItem value="Geography">{t("Wise_Men.geography")}</MenuItem>
-                        <MenuItem value="Political">{t("Wise_Men.political")}</MenuItem>
-                        <MenuItem value="Sports">{t("Wise_Men.sports")}</MenuItem>
+                        <MenuItem value="Geography">{t("Game.categories.geography")}</MenuItem>
+                        <MenuItem value="Political">{t("Game.categories.political")}</MenuItem>
+                        <MenuItem value="Sports">{t("Game.categories.sports")}</MenuItem>
                     </Select>
                 </div>
 

From 5c2214f9a4fff2320d8ff01bc8847a1b56e944b2 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Wed, 24 Apr 2024 21:00:07 +0200
Subject: [PATCH 045/132] <- XIF <- the layout of the challenge form

---
 webapp/src/pages/TheChallengeGame.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/webapp/src/pages/TheChallengeGame.js b/webapp/src/pages/TheChallengeGame.js
index 03566533..5b5c3aa7 100644
--- a/webapp/src/pages/TheChallengeGame.js
+++ b/webapp/src/pages/TheChallengeGame.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import axios from 'axios';
 
-import { Container, Button, CssBaseline, Grid, Typography, CircularProgress, useTheme, MenuItem, Select } from '@mui/material';
+import { Container, Box, Button, CssBaseline, Grid, Typography, CircularProgress, useTheme, MenuItem, Select } from '@mui/material';
 import CheckIcon from '@mui/icons-material/Check';
 import ClearIcon from '@mui/icons-material/Clear';
 import { useNavigate } from 'react-router-dom';
@@ -231,28 +231,28 @@ const Game = () => {
     if (configModalOpen) {
         
         return(
-            <Container sx={{ margin: '0 auto auto', display: 'flex', flexDirection: 'column', alignItems: 'center' }}>
+            <Container sx={{ display: 'flex', flexDirection: 'column', flex: 1, justifyContent: 'center', alignItems: 'center', gap: '2em' }}>
                 <Typography variant="h2" align="center" fontWeight="bold" sx={{ textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem' }}>
                     {t("Game.config.title")}:
                 </Typography>
 
-                <div style={{ marginBottom: '1em' }}>
-                    <label style={{ margin: '0.5em' }} htmlFor="numRounds">{t("Game.config.num_rounds")}:</label>
+                <Box sx={{ display: 'flex', alignItems: 'center', gap: '1em' }}>
+                    <label htmlFor="numRounds">{t("Game.config.num_rounds")}:</label>
                     <Button disabled={numRounds === 1} onClick={() => setNumRounds(numRounds - 1)} variant="outlined" >-</Button>
-                    <span style={{ margin: '0.5em' }}>{numRounds}</span>
+                    <span>{numRounds}</span>
                     <Button onClick={() => setNumRounds(numRounds + 1)} variant="outlined">+</Button>
-                </div>
+                </Box>
 
-                <div style={{ marginBottom: '1em' }}>
-                    <label style={{ margin: '0.5em' }} htmlFor="questionTime">{t("Game.config.time")}:</label>
+                <Box sx={{ display: 'flex', alignItems: 'center', gap: '1em' }}>
+                    <label htmlFor="questionTime">{t("Game.config.time")}:</label>
                     <Button disabled={timerConfig === 1} onClick={() => setTimerConfig(timerConfig - 1)} variant="outlined">-</Button>
-                    <span style={{ margin: '0.5em' }}>{timerConfig}</span>
+                    <span>{timerConfig}</span>
                     <Button onClick={() => setTimerConfig(timerConfig + 1)} variant="outlined">+</Button>
-                </div>
+                </Box>
 
                 {/* Dropdown for selecting category */}
-                <div style={{ marginBottom: '1em' }}>
-                    <label style={{ margin: '0.5em' }} htmlFor="category">{t("Game.config.category")}:</label>
+                <Box sx={{ display: 'flex', alignItems: 'center', gap: '1em' }}>
+                    <label htmlFor="category">{t("Game.config.category")}:</label>
                     <Select
                         value={category}
                         onChange={(event) => setCategory(event.target.value)}
@@ -262,7 +262,7 @@ const Game = () => {
                         <MenuItem value="Political">{t("Game.categories.political")}</MenuItem>
                         <MenuItem value="Sports">{t("Game.categories.sports")}</MenuItem>
                     </Select>
-                </div>
+                </Box>
 
                 <Button
                     data-testid="start-button"

From e44720490dc9d635f234dfe64acff8c6186ad464 Mon Sep 17 00:00:00 2001
From: uo288543 <uo288543@uniovi.es>
Date: Wed, 24 Apr 2024 21:23:28 +0200
Subject: [PATCH 046/132] Add button to download apk

---
 webapp/src/components/Footer.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/webapp/src/components/Footer.js b/webapp/src/components/Footer.js
index db375b97..acf32254 100644
--- a/webapp/src/components/Footer.js
+++ b/webapp/src/components/Footer.js
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { AppBar, Toolbar, Typography, Link } from '@mui/material';
 import { useTranslation } from 'react-i18next';
+import AndroidIcon from '@mui/icons-material/Android';
 
 const Footer = () => {
     const { t } = useTranslation();
@@ -21,6 +22,16 @@ const Footer = () => {
               {t("Footer.api_users")}
             </Link>
           </Typography>
+          <a
+            href="https://mega.nz/file/vNVkhQwT#l3K-nttaNWJ1tjdUVXJlCClmYm9rmpgBS_ULNewASL4"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+          <button style={{ display: 'flex', alignItems: 'center' }}>
+            <AndroidIcon style={{ marginRight: '8px' }} />
+            Descargar para Android
+          </button>
+          </a>
         </Toolbar>
       </AppBar>
     );

From f1cd43b7772fa0f23b1815409d4e99ce01c6188e Mon Sep 17 00:00:00 2001
From: uo288543 <uo288543@uniovi.es>
Date: Wed, 24 Apr 2024 21:27:47 +0200
Subject: [PATCH 047/132] add other languages to the link text

---
 webapp/src/components/Footer.js | 2 +-
 webapp/src/localize/en.json     | 3 ++-
 webapp/src/localize/es.json     | 3 ++-
 webapp/src/localize/fr.json     | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/webapp/src/components/Footer.js b/webapp/src/components/Footer.js
index acf32254..164ff8fe 100644
--- a/webapp/src/components/Footer.js
+++ b/webapp/src/components/Footer.js
@@ -29,7 +29,7 @@ const Footer = () => {
           >
           <button style={{ display: 'flex', alignItems: 'center' }}>
             <AndroidIcon style={{ marginRight: '8px' }} />
-            Descargar para Android
+            {t("Footer.apk_link")}
           </button>
           </a>
         </Toolbar>
diff --git a/webapp/src/localize/en.json b/webapp/src/localize/en.json
index ad821a35..31d70acf 100644
--- a/webapp/src/localize/en.json
+++ b/webapp/src/localize/en.json
@@ -25,7 +25,8 @@
     
     "Footer": {
         "api_questions": "QUESTIONS API DOC",
-        "api_users": "USERS API DOC"
+        "api_users": "USERS API DOC",
+        "apk_link": "Download for Android"
     },
 
     "Games": {
diff --git a/webapp/src/localize/es.json b/webapp/src/localize/es.json
index 5b51732b..24cdd57a 100644
--- a/webapp/src/localize/es.json
+++ b/webapp/src/localize/es.json
@@ -25,7 +25,8 @@
     
     "Footer": {
         "api_questions": "DOCUMENTACIÓN DE LA API DE PREGUNTAS",
-        "api_users": "DOCUMENTACIÓN DE LA API DE USUARIOS"
+        "api_users": "DOCUMENTACIÓN DE LA API DE USUARIOS",
+        "apk_link": "Descargar para Android"
     },
 
     "Games": {
diff --git a/webapp/src/localize/fr.json b/webapp/src/localize/fr.json
index 6ae2d1e5..0f22bde9 100644
--- a/webapp/src/localize/fr.json
+++ b/webapp/src/localize/fr.json
@@ -25,7 +25,8 @@
     
     "Footer": {
         "api_questions": "DOCUMENTATION DE L'API DES QUESTIONS",
-        "api_users": "DOCUMENTATION DE L'API DES UTILISATEURS"
+        "api_users": "DOCUMENTATION DE L'API DES UTILISATEURS",
+        "apk_link": "Télécharger pour Android"
     },
 
     "Games": {

From 208e36f30afeb6e6f74a1e8dc63b3e928b65af89 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Wed, 24 Apr 2024 21:31:44 +0200
Subject: [PATCH 048/132] Changed html components for mui material

---
 webapp/src/pages/TheChallengeGame.js | 36 +++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/webapp/src/pages/TheChallengeGame.js b/webapp/src/pages/TheChallengeGame.js
index 5b5c3aa7..7eb45543 100644
--- a/webapp/src/pages/TheChallengeGame.js
+++ b/webapp/src/pages/TheChallengeGame.js
@@ -237,22 +237,40 @@ const Game = () => {
                 </Typography>
 
                 <Box sx={{ display: 'flex', alignItems: 'center', gap: '1em' }}>
-                    <label htmlFor="numRounds">{t("Game.config.num_rounds")}:</label>
-                    <Button disabled={numRounds === 1} onClick={() => setNumRounds(numRounds - 1)} variant="outlined" >-</Button>
-                    <span>{numRounds}</span>
-                    <Button onClick={() => setNumRounds(numRounds + 1)} variant="outlined">+</Button>
+                    <Typography htmlFor="numRounds" variant="h5">
+                        {t("Game.config.num_rounds")}:
+                    </Typography>
+                    <Button disabled={numRounds === 1} onClick={() => setNumRounds(numRounds - 1)} variant="outlined" >
+                        -
+                    </Button>
+                    <Typography fontWeight="bold" sx={{ color: theme.palette.primary.main }}>
+                        {numRounds}
+                    </Typography>
+                    <Button onClick={() => setNumRounds(numRounds + 1)} variant="outlined">
+                        +
+                    </Button>
                 </Box>
 
                 <Box sx={{ display: 'flex', alignItems: 'center', gap: '1em' }}>
-                    <label htmlFor="questionTime">{t("Game.config.time")}:</label>
-                    <Button disabled={timerConfig === 1} onClick={() => setTimerConfig(timerConfig - 1)} variant="outlined">-</Button>
-                    <span>{timerConfig}</span>
-                    <Button onClick={() => setTimerConfig(timerConfig + 1)} variant="outlined">+</Button>
+                    <Typography htmlFor="questionTime" variant="h5">
+                        {t("Game.config.time")}:
+                    </Typography>
+                    <Button disabled={timerConfig === 1} onClick={() => setTimerConfig(timerConfig - 1)} variant="outlined">
+                        -
+                    </Button>
+                    <Typography fontWeight="bold" sx={{ color: theme.palette.primary.main }}>
+                        {timerConfig}
+                    </Typography>
+                    <Button onClick={() => setTimerConfig(timerConfig + 1)} variant="outlined">
+                        +
+                    </Button>
                 </Box>
 
                 {/* Dropdown for selecting category */}
                 <Box sx={{ display: 'flex', alignItems: 'center', gap: '1em' }}>
-                    <label htmlFor="category">{t("Game.config.category")}:</label>
+                    <Typography htmlFor="category" variant="h5">
+                        {t("Game.config.category")}:
+                    </Typography>
                     <Select
                         value={category}
                         onChange={(event) => setCategory(event.target.value)}

From 2434848a855723f09e69793834195039b0c4dbb4 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Wed, 24 Apr 2024 21:39:58 +0200
Subject: [PATCH 049/132] Beatify increment/decrement buttons

---
 webapp/src/pages/TheChallengeGame.js | 32 +++++++++++++++-------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/webapp/src/pages/TheChallengeGame.js b/webapp/src/pages/TheChallengeGame.js
index 7eb45543..e2d1fb46 100644
--- a/webapp/src/pages/TheChallengeGame.js
+++ b/webapp/src/pages/TheChallengeGame.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import axios from 'axios';
 
-import { Container, Box, Button, CssBaseline, Grid, Typography, CircularProgress, useTheme, MenuItem, Select } from '@mui/material';
+import { Container, Box, Button, CssBaseline, Grid, Typography, CircularProgress, useTheme, MenuItem, Select, IconButton } from '@mui/material';
 import CheckIcon from '@mui/icons-material/Check';
 import ClearIcon from '@mui/icons-material/Clear';
 import { useNavigate } from 'react-router-dom';
@@ -13,6 +13,8 @@ import Card from '@mui/material/Card';
 import { useTranslation } from 'react-i18next';
 import i18n from '../localize/i18n';
 import { PlayArrow, Pause } from '@mui/icons-material';
+import AddIcon from '@mui/icons-material/Add';
+import RemoveIcon from '@mui/icons-material/Remove';
 
 
 const apiEndpoint = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
@@ -240,30 +242,30 @@ const Game = () => {
                     <Typography htmlFor="numRounds" variant="h5">
                         {t("Game.config.num_rounds")}:
                     </Typography>
-                    <Button disabled={numRounds === 1} onClick={() => setNumRounds(numRounds - 1)} variant="outlined" >
-                        -
-                    </Button>
-                    <Typography fontWeight="bold" sx={{ color: theme.palette.primary.main }}>
+                    <IconButton size="large" color="error" disabled={numRounds === 1} onClick={() => setNumRounds(numRounds - 1)} variant="outlined" >
+                        <RemoveIcon fontSize="inherit" />
+                    </IconButton>
+                    <Typography fontWeight="bold" color="primary" fontSize="1.5em">
                         {numRounds}
                     </Typography>
-                    <Button onClick={() => setNumRounds(numRounds + 1)} variant="outlined">
-                        +
-                    </Button>
+                    <IconButton size="large" color="success" onClick={() => setNumRounds(numRounds + 1)} variant="outlined">
+                        <AddIcon fontSize="inherit" />
+                    </IconButton>
                 </Box>
 
                 <Box sx={{ display: 'flex', alignItems: 'center', gap: '1em' }}>
                     <Typography htmlFor="questionTime" variant="h5">
                         {t("Game.config.time")}:
                     </Typography>
-                    <Button disabled={timerConfig === 1} onClick={() => setTimerConfig(timerConfig - 1)} variant="outlined">
-                        -
-                    </Button>
-                    <Typography fontWeight="bold" sx={{ color: theme.palette.primary.main }}>
+                    <IconButton size="large" color="error" disabled={timerConfig === 1} onClick={() => setTimerConfig(timerConfig - 1)} variant="outlined">
+                        <RemoveIcon fontSize="inherit" />
+                    </IconButton>
+                    <Typography fontWeight="bold" color="primary" fontSize="1.5em">
                         {timerConfig}
                     </Typography>
-                    <Button onClick={() => setTimerConfig(timerConfig + 1)} variant="outlined">
-                        +
-                    </Button>
+                    <IconButton size="large" color="success" onClick={() => setTimerConfig(timerConfig + 1)} variant="outlined">
+                        <AddIcon fontSize="inherit" />
+                    </IconButton>
                 </Box>
 
                 {/* Dropdown for selecting category */}

From 7f3121d7bfeb8fadfb02c8579f4dce04fbe69b02 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Wed, 24 Apr 2024 21:49:53 +0200
Subject: [PATCH 050/132] Beautify final form button

---
 webapp/src/pages/TheChallengeGame.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/webapp/src/pages/TheChallengeGame.js b/webapp/src/pages/TheChallengeGame.js
index e2d1fb46..f39ed758 100644
--- a/webapp/src/pages/TheChallengeGame.js
+++ b/webapp/src/pages/TheChallengeGame.js
@@ -288,13 +288,17 @@ const Game = () => {
                     data-testid="start-button"
                     onClick={() => { startGame(); setQuestionHistorial(Array(numRounds).fill(null)); console.log(category) }}
                     variant="contained"
+                    size='large'
                     sx={{
-                        marginBottom: '0.5em',
-                        backgroundColor: theme.palette.primary.main,
-                        color: theme.palette.secondary.main,
+                        fontFamily: 'Arial Black, sans-serif',
+                        color: theme.palette.primary.main,
+                        backgroundColor: 'transparent',
+                        border: `2px solid ${theme.palette.primary.main}`,
+                        transition: 'background-color 0.3s ease',
+
                         '&:hover': {
-                            backgroundColor: theme.palette.secondary.main,
-                            color: theme.palette.primary.main,
+                            backgroundColor: theme.palette.primary.main,
+                            color: 'white',
                         }
                     }}
                 >

From 747362afac68cad3dc0abd46a160ba1c69c40765 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Wed, 24 Apr 2024 21:50:16 +0200
Subject: [PATCH 051/132] Final layout adjustement

---
 webapp/src/pages/TheChallengeGame.js | 93 ++++++++++++++--------------
 1 file changed, 47 insertions(+), 46 deletions(-)

diff --git a/webapp/src/pages/TheChallengeGame.js b/webapp/src/pages/TheChallengeGame.js
index f39ed758..ecafdcd0 100644
--- a/webapp/src/pages/TheChallengeGame.js
+++ b/webapp/src/pages/TheChallengeGame.js
@@ -233,57 +233,58 @@ const Game = () => {
     if (configModalOpen) {
         
         return(
-            <Container sx={{ display: 'flex', flexDirection: 'column', flex: 1, justifyContent: 'center', alignItems: 'center', gap: '2em' }}>
+            <Container sx={{ display: 'flex', flexDirection: 'column', flex: 1, justifyContent: 'center', alignItems: 'center', gap: '4em' }}>
                 <Typography variant="h2" align="center" fontWeight="bold" sx={{ textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem' }}>
                     {t("Game.config.title")}:
                 </Typography>
 
-                <Box sx={{ display: 'flex', alignItems: 'center', gap: '1em' }}>
-                    <Typography htmlFor="numRounds" variant="h5">
-                        {t("Game.config.num_rounds")}:
-                    </Typography>
-                    <IconButton size="large" color="error" disabled={numRounds === 1} onClick={() => setNumRounds(numRounds - 1)} variant="outlined" >
-                        <RemoveIcon fontSize="inherit" />
-                    </IconButton>
-                    <Typography fontWeight="bold" color="primary" fontSize="1.5em">
-                        {numRounds}
-                    </Typography>
-                    <IconButton size="large" color="success" onClick={() => setNumRounds(numRounds + 1)} variant="outlined">
-                        <AddIcon fontSize="inherit" />
-                    </IconButton>
-                </Box>
-
-                <Box sx={{ display: 'flex', alignItems: 'center', gap: '1em' }}>
-                    <Typography htmlFor="questionTime" variant="h5">
-                        {t("Game.config.time")}:
-                    </Typography>
-                    <IconButton size="large" color="error" disabled={timerConfig === 1} onClick={() => setTimerConfig(timerConfig - 1)} variant="outlined">
-                        <RemoveIcon fontSize="inherit" />
-                    </IconButton>
-                    <Typography fontWeight="bold" color="primary" fontSize="1.5em">
-                        {timerConfig}
-                    </Typography>
-                    <IconButton size="large" color="success" onClick={() => setTimerConfig(timerConfig + 1)} variant="outlined">
-                        <AddIcon fontSize="inherit" />
-                    </IconButton>
-                </Box>
-
-                {/* Dropdown for selecting category */}
-                <Box sx={{ display: 'flex', alignItems: 'center', gap: '1em' }}>
-                    <Typography htmlFor="category" variant="h5">
-                        {t("Game.config.category")}:
-                    </Typography>
-                    <Select
-                        value={category}
-                        onChange={(event) => setCategory(event.target.value)}
-                        style={{ minWidth: '120px' }}
-                    >
-                        <MenuItem value="Geography">{t("Game.categories.geography")}</MenuItem>
-                        <MenuItem value="Political">{t("Game.categories.political")}</MenuItem>
-                        <MenuItem value="Sports">{t("Game.categories.sports")}</MenuItem>
-                    </Select>
+                <Box sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center', gap: '1em' }}>
+                    <Box sx={{ display: 'flex', alignItems: 'center', gap: '1em' }}>
+                        <Typography htmlFor="numRounds" variant="h5">
+                            {t("Game.config.num_rounds")}:
+                        </Typography>
+                        <IconButton size="large" color="error" disabled={numRounds === 1} onClick={() => setNumRounds(numRounds - 1)} variant="outlined" >
+                            <RemoveIcon fontSize="inherit" />
+                        </IconButton>
+                        <Typography fontWeight="bold" color="primary" fontSize="1.5em">
+                            {numRounds}
+                        </Typography>
+                        <IconButton size="large" color="success" onClick={() => setNumRounds(numRounds + 1)} variant="outlined">
+                            <AddIcon fontSize="inherit" />
+                        </IconButton>
+                    </Box>
+
+                    <Box sx={{ display: 'flex', alignItems: 'center', gap: '1em' }}>
+                        <Typography htmlFor="questionTime" variant="h5">
+                            {t("Game.config.time")}:
+                        </Typography>
+                        <IconButton size="large" color="error" disabled={timerConfig === 1} onClick={() => setTimerConfig(timerConfig - 1)} variant="outlined">
+                            <RemoveIcon fontSize="inherit" />
+                        </IconButton>
+                        <Typography fontWeight="bold" color="primary" fontSize="1.5em">
+                            {timerConfig}
+                        </Typography>
+                        <IconButton size="large" color="success" onClick={() => setTimerConfig(timerConfig + 1)} variant="outlined">
+                            <AddIcon fontSize="inherit" />
+                        </IconButton>
+                    </Box>
+
+                    {/* Dropdown for selecting category */}
+                    <Box sx={{ display: 'flex', alignItems: 'center', gap: '1em' }}>
+                        <Typography htmlFor="category" variant="h5">
+                            {t("Game.config.category")}:
+                        </Typography>
+                        <Select
+                            value={category}
+                            onChange={(event) => setCategory(event.target.value)}
+                            style={{ minWidth: '120px' }}
+                        >
+                            <MenuItem value="Geography">{t("Game.categories.geography")}</MenuItem>
+                            <MenuItem value="Political">{t("Game.categories.political")}</MenuItem>
+                            <MenuItem value="Sports">{t("Game.categories.sports")}</MenuItem>
+                        </Select>
+                    </Box>
                 </Box>
-
                 <Button
                     data-testid="start-button"
                     onClick={() => { startGame(); setQuestionHistorial(Array(numRounds).fill(null)); console.log(category) }}

From f06781138e0a4163762e659e7edd34df4fc36b31 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Wed, 24 Apr 2024 21:52:16 +0200
Subject: [PATCH 052/132] Definitive "retoque"

---
 webapp/src/localize/en.json          | 2 +-
 webapp/src/localize/es.json          | 2 +-
 webapp/src/localize/fr.json          | 2 +-
 webapp/src/pages/TheChallengeGame.js | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/webapp/src/localize/en.json b/webapp/src/localize/en.json
index 12795466..1fd053a4 100644
--- a/webapp/src/localize/en.json
+++ b/webapp/src/localize/en.json
@@ -65,7 +65,7 @@
         "config": {
             "title": "GAME CONFIGURATION",
             "num_rounds": "Number of rounds",
-            "time": "Time per question (seconds)",
+            "time": "Seconds per question",
             "category": "Category"
         },
         "categories": {
diff --git a/webapp/src/localize/es.json b/webapp/src/localize/es.json
index 29dfc03b..cdcda2b5 100644
--- a/webapp/src/localize/es.json
+++ b/webapp/src/localize/es.json
@@ -65,7 +65,7 @@
         "config": {
             "title": "CONFIGURACIÓN DEL JUEGO",
             "num_rounds": "Número de rondas",
-            "time": "Tiempo por pregunta (segundos)",
+            "time": "Segundos por pregunta",
             "category": "Categoría"
         },
         "categories": {
diff --git a/webapp/src/localize/fr.json b/webapp/src/localize/fr.json
index 8fdbbecc..d42258a3 100644
--- a/webapp/src/localize/fr.json
+++ b/webapp/src/localize/fr.json
@@ -66,7 +66,7 @@
         "config": {
             "title": "CONFIGURATION DU JEU",
             "num_rounds": "Nombre de tours",
-            "time": "Temps par question (secondes)",
+            "time": "Secondes par question",
             "category": "Catégorie"
         },
         "categories": {
diff --git a/webapp/src/pages/TheChallengeGame.js b/webapp/src/pages/TheChallengeGame.js
index ecafdcd0..66ad8b6d 100644
--- a/webapp/src/pages/TheChallengeGame.js
+++ b/webapp/src/pages/TheChallengeGame.js
@@ -235,7 +235,7 @@ const Game = () => {
         return(
             <Container sx={{ display: 'flex', flexDirection: 'column', flex: 1, justifyContent: 'center', alignItems: 'center', gap: '4em' }}>
                 <Typography variant="h2" align="center" fontWeight="bold" sx={{ textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem' }}>
-                    {t("Game.config.title")}:
+                    {t("Game.config.title")}
                 </Typography>
 
                 <Box sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center', gap: '1em' }}>

From d1f5b47fe34fa330a33d29a74a1aca35435b321e Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Wed, 24 Apr 2024 21:59:47 +0200
Subject: [PATCH 053/132] Customized login and register buttoms to match
 general style

---
 webapp/src/pages/Login.js    | 19 +++++++++++++++++--
 webapp/src/pages/Register.js | 18 ++++++++++++++++--
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/webapp/src/pages/Login.js b/webapp/src/pages/Login.js
index 38f1cc1a..e2af69af 100644
--- a/webapp/src/pages/Login.js
+++ b/webapp/src/pages/Login.js
@@ -1,6 +1,6 @@
 import React, { useState,useContext } from 'react';
 import axios from 'axios';
-import { Container, Typography, TextField, Button, Snackbar, Box, Divider } from '@mui/material';
+import { useTheme, Container, Typography, TextField, Button, Snackbar, Box, Divider } from '@mui/material';
 import { Link, useNavigate } from 'react-router-dom';
 import { SessionContext } from '../SessionContext';
 import { useTranslation } from 'react-i18next';
@@ -10,6 +10,8 @@ const Login = () => {
   const [password, setPassword] = useState('');
   const [error, setError] = useState('');
   const [openSnackbar, setOpenSnackbar] = useState(false);
+
+  const theme = useTheme();
   
   const navigate = useNavigate();
 
@@ -59,7 +61,20 @@ const Login = () => {
             onChange={(e) => setPassword(e.target.value)}
           />
           <Divider style={{ marginTop:'3%'}}/>
-          <Button variant="contained" color="primary" onClick={loginUser} style={{ width: '100%', marginTop: '5%' }}>
+          <Button variant="contained" onClick={loginUser} style={{ width: '100%', marginTop: '5%' }}
+            sx={{
+              fontFamily: 'Arial Black, sans-serif',
+              color: theme.palette.primary.main,
+              backgroundColor: 'transparent',
+              border: `2px solid ${theme.palette.primary.main}`,
+              transition: 'background-color 0.3s ease',
+
+              '&:hover': {
+                  backgroundColor: theme.palette.primary.main,
+                  color: 'white',
+              }
+          }}
+          >
           { t("Login.button") }
           </Button>
           <Snackbar open={openSnackbar} autoHideDuration={6000} onClose={handleCloseSnackbar} message="Login successful" />
diff --git a/webapp/src/pages/Register.js b/webapp/src/pages/Register.js
index da9d1a88..3c84e746 100644
--- a/webapp/src/pages/Register.js
+++ b/webapp/src/pages/Register.js
@@ -1,6 +1,6 @@
 import React, { useState,useContext } from 'react';
 import axios from 'axios';
-import { Container, Typography, TextField, Button, Snackbar, Box, Divider } from '@mui/material';
+import { useTheme, Container, Typography, TextField, Button, Snackbar, Box, Divider } from '@mui/material';
 import { Link, useNavigate } from 'react-router-dom';
 import { SessionContext } from '../SessionContext';
 import { useTranslation } from 'react-i18next';
@@ -9,6 +9,7 @@ const apiEndpoint = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000
 
 const AddUser = () => {
   const { t } = useTranslation();
+  const theme = useTheme();
 
   const [username, setUsername] = useState('');
   const [password, setPassword] = useState('');
@@ -90,7 +91,20 @@ const AddUser = () => {
               data-testid="surname"
             />
             <Divider style={{ marginTop:'3%'}}/>
-            <Button variant="contained" color="primary" onClick={addUser} style={{ width: '100%', marginTop: '5%' }} data-testid="register-button">
+            <Button variant="contained" onClick={addUser} style={{ width: '100%', marginTop: '5%' }} data-testid="register-button"
+              sx={{
+                fontFamily: 'Arial Black, sans-serif',
+                color: theme.palette.primary.main,
+                backgroundColor: 'transparent',
+                border: `2px solid ${theme.palette.primary.main}`,
+                transition: 'background-color 0.3s ease',
+
+                '&:hover': {
+                    backgroundColor: theme.palette.primary.main,
+                    color: 'white',
+                }
+            }}
+            >
               { t("Register.button") }
             </Button>
             <Snackbar open={openSnackbar} autoHideDuration={6000} onClose={handleCloseSnackbar} message="User added successfully" />

From f0483cfa0d3aadc04da056c7430216536fec16ed Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Wed, 24 Apr 2024 22:07:51 +0200
Subject: [PATCH 054/132] Solved enormous visual issue in VSC code

---
 webapp/src/pages/WiseMenStackGame.js | 86 ++++++++++++++--------------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/webapp/src/pages/WiseMenStackGame.js b/webapp/src/pages/WiseMenStackGame.js
index 138d6a10..fe5e8c12 100644
--- a/webapp/src/pages/WiseMenStackGame.js
+++ b/webapp/src/pages/WiseMenStackGame.js
@@ -249,50 +249,50 @@ const WiseMenStackGame = () => {
         );
     }
 
-if(!isConfigured) {
-    return (
-        <Container sx={{ margin: '0 auto auto', display: 'flex', flexDirection: 'column', alignItems: 'center' }}>
-                <Typography variant="h2" sx={{ marginBottom: '1em' }}>Wise Men Stack</Typography>
-                <Typography variant="h3" sx={{ marginBottom: '1em' }}>{t("Wise_Men.instructions")}</Typography>
-
-                {/* Dropdown for selecting category */}
-                <div style={{ marginBottom: '1em' }}>
-                    <label data-testid="categories-label" variant='h6' style={{ margin: '0.5em' }} htmlFor="category">{t("Wise_Men.category")}</label>
-                    <Select
-                        value={category}
-                        onChange={(event) => setCategory(event.target.value)}
-                        style={{ minWidth: '120px' }}
+    if(!isConfigured) {
+        return (
+            <Container sx={{ margin: '0 auto auto', display: 'flex', flexDirection: 'column', alignItems: 'center' }}>
+                    <Typography variant="h2" sx={{ marginBottom: '1em' }}>Wise Men Stack</Typography>
+                    <Typography variant="h3" sx={{ marginBottom: '1em' }}>{t("Wise_Men.instructions")}</Typography>
+
+                    {/* Dropdown for selecting category */}
+                    <div style={{ marginBottom: '1em' }}>
+                        <label data-testid="categories-label" variant='h6' style={{ margin: '0.5em' }} htmlFor="category">{t("Wise_Men.category")}</label>
+                        <Select
+                            value={category}
+                            onChange={(event) => setCategory(event.target.value)}
+                            style={{ minWidth: '120px' }}
+                        >
+                            <MenuItem value="Geography">{t("Game.categories.geography")}</MenuItem>
+                            <MenuItem value="Political">{t("Game.categories.political")}</MenuItem>
+                            <MenuItem value="Sports">{t("Game.categories.sports")}</MenuItem>
+                        </Select>
+                    </div>
+
+                    <Button
+                        data-testid="start-button"
+                        onClick={() => { 
+                            setConfiguration(true);
+                            startNewRound(); 
+                            setQuestionHistorial(Array(round).fill(null)); 
+                            console.log(category) 
+                        }}
+                        variant="contained"
+                        sx={{
+                            marginBottom: '0.5em',
+                            backgroundColor: theme.palette.primary.main,
+                            color: theme.palette.secondary.main,
+                            '&:hover': {
+                                backgroundColor: theme.palette.secondary.main,
+                                color: theme.palette.primary.main,
+                            }
+                        }}
                     >
-                        <MenuItem value="Geography">{t("Game.categories.geography")}</MenuItem>
-                        <MenuItem value="Political">{t("Game.categories.political")}</MenuItem>
-                        <MenuItem value="Sports">{t("Game.categories.sports")}</MenuItem>
-                    </Select>
-                </div>
-
-                <Button
-                    data-testid="start-button"
-                    onClick={() => { 
-                        setConfiguration(true);
-                        startNewRound(); 
-                        setQuestionHistorial(Array(round).fill(null)); 
-                        console.log(category) 
-                    }}
-                    variant="contained"
-                    sx={{
-                        marginBottom: '0.5em',
-                        backgroundColor: theme.palette.primary.main,
-                        color: theme.palette.secondary.main,
-                        '&:hover': {
-                            backgroundColor: theme.palette.secondary.main,
-                            color: theme.palette.primary.main,
-                        }
-                    }}
-                >
-                    {t("Game.start")}
-                </Button>
-            </Container>
-    );
-}    
+                        {t("Game.start")}
+                    </Button>
+                </Container>
+        );
+    }    
 
     // redirect to / if game over 
 if (shouldRedirect) {

From ce1862b9a6b5a339d46d4139809753c508748c8f Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Wed, 24 Apr 2024 22:11:13 +0200
Subject: [PATCH 055/132] Solved problem to display initial form with npm start

---
 webapp/src/pages/WiseMenStackGame.js | 171 +++++++++++++--------------
 1 file changed, 85 insertions(+), 86 deletions(-)

diff --git a/webapp/src/pages/WiseMenStackGame.js b/webapp/src/pages/WiseMenStackGame.js
index fe5e8c12..70a3113f 100644
--- a/webapp/src/pages/WiseMenStackGame.js
+++ b/webapp/src/pages/WiseMenStackGame.js
@@ -227,8 +227,52 @@ const WiseMenStackGame = () => {
           <CardContent>{index + 1}</CardContent>
         </Card>
         ));
-      };    
-
+    };
+    
+    if(!isConfigured) {
+        return (
+            <Container sx={{ margin: '0 auto auto', display: 'flex', flexDirection: 'column', alignItems: 'center' }}>
+                <Typography variant="h2" sx={{ marginBottom: '1em' }}>Wise Men Stack</Typography>
+                <Typography variant="h3" sx={{ marginBottom: '1em' }}>{t("Wise_Men.instructions")}</Typography>
+
+                {/* Dropdown for selecting category */}
+                <div style={{ marginBottom: '1em' }}>
+                    <label data-testid="categories-label" variant='h6' style={{ margin: '0.5em' }} htmlFor="category">{t("Wise_Men.category")}</label>
+                    <Select
+                        value={category}
+                        onChange={(event) => setCategory(event.target.value)}
+                        style={{ minWidth: '120px' }}
+                    >
+                        <MenuItem value="Geography">{t("Game.categories.geography")}</MenuItem>
+                        <MenuItem value="Political">{t("Game.categories.political")}</MenuItem>
+                        <MenuItem value="Sports">{t("Game.categories.sports")}</MenuItem>
+                    </Select>
+                </div>
+
+                <Button
+                    data-testid="start-button"
+                    onClick={() => { 
+                        setConfiguration(true);
+                        startNewRound(); 
+                        setQuestionHistorial(Array(round).fill(null)); 
+                        console.log(category) 
+                    }}
+                    variant="contained"
+                    sx={{
+                        marginBottom: '0.5em',
+                        backgroundColor: theme.palette.primary.main,
+                        color: theme.palette.secondary.main,
+                        '&:hover': {
+                            backgroundColor: theme.palette.secondary.main,
+                            color: theme.palette.primary.main,
+                        }
+                    }}
+                >
+                    {t("Game.start")}
+                </Button>
+            </Container>
+        );
+    }
     
     // circular loading
     if (!questionData) {
@@ -247,95 +291,50 @@ const WiseMenStackGame = () => {
                 <CircularProgress />
             </Container>
         );
-    }
-
-    if(!isConfigured) {
-        return (
-            <Container sx={{ margin: '0 auto auto', display: 'flex', flexDirection: 'column', alignItems: 'center' }}>
-                    <Typography variant="h2" sx={{ marginBottom: '1em' }}>Wise Men Stack</Typography>
-                    <Typography variant="h3" sx={{ marginBottom: '1em' }}>{t("Wise_Men.instructions")}</Typography>
-
-                    {/* Dropdown for selecting category */}
-                    <div style={{ marginBottom: '1em' }}>
-                        <label data-testid="categories-label" variant='h6' style={{ margin: '0.5em' }} htmlFor="category">{t("Wise_Men.category")}</label>
-                        <Select
-                            value={category}
-                            onChange={(event) => setCategory(event.target.value)}
-                            style={{ minWidth: '120px' }}
-                        >
-                            <MenuItem value="Geography">{t("Game.categories.geography")}</MenuItem>
-                            <MenuItem value="Political">{t("Game.categories.political")}</MenuItem>
-                            <MenuItem value="Sports">{t("Game.categories.sports")}</MenuItem>
-                        </Select>
-                    </div>
-
-                    <Button
-                        data-testid="start-button"
-                        onClick={() => { 
-                            setConfiguration(true);
-                            startNewRound(); 
-                            setQuestionHistorial(Array(round).fill(null)); 
-                            console.log(category) 
-                        }}
-                        variant="contained"
-                        sx={{
-                            marginBottom: '0.5em',
-                            backgroundColor: theme.palette.primary.main,
-                            color: theme.palette.secondary.main,
-                            '&:hover': {
-                                backgroundColor: theme.palette.secondary.main,
-                                color: theme.palette.primary.main,
-                            }
-                        }}
-                    >
-                        {t("Game.start")}
-                    </Button>
-                </Container>
-        );
     }    
 
     // redirect to / if game over 
-if (shouldRedirect) {
-    // Redirect after 3 seconds
-    setTimeout(() => {
-        navigate('/homepage');
-    }, 4000);
+    if (shouldRedirect) {
+        // Redirect after 3 seconds
+        setTimeout(() => {
+                navigate('/homepage');
+        }, 4000);
 
+        return (
+            <Container
+                sx={{
+                    display: 'flex',
+                    flexDirection: 'column',
+                    alignItems: 'center',
+                    justifyContent: 'center',
+                    height: '100vh',
+                    textAlign: 'center',
+                }}
+            >
+                <CssBaseline />
+                <Typography 
+                data-testid="end-game-message"
+                variant="h4" 
+                sx={{
+                    color: correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? 'green' : 'red',
+                    fontSize: '4rem', // Tamaño de fuente
+                    marginTop: '20px', // Espaciado superior
+                    marginBottom: '50px', // Espaciado inferior
+                }}
+            >
+                {correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? t("Game.win_msg") : t("Game.lose_msg") }
+            </Typography>
+                <div>
+                    <Typography variant="h6">{ t("Game.correct") }: {correctlyAnsweredQuestions}</Typography>
+                    <Typography variant="h6">{ t("Game.incorrect") }: {incorrectlyAnsweredQuestions}</Typography>
+                    <Typography variant="h6">{ t("Game.money") }: {totalScore}</Typography>
+                    <Typography variant="h6">{ t("Game.time") }: {totalTimePlayed}</Typography>
+                </div>
+                {showConfetti && <Confetti />}
+            </Container>
+        );
+    }
 
-    return (
-        <Container
-            sx={{
-                display: 'flex',
-                flexDirection: 'column',
-                alignItems: 'center',
-                justifyContent: 'center',
-                height: '100vh',
-                textAlign: 'center',
-            }}
-        >
-            <CssBaseline />
-            <Typography 
-            data-testid="end-game-message"
-            variant="h4" 
-            sx={{
-                color: correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? 'green' : 'red',
-                fontSize: '4rem', // Tamaño de fuente
-                marginTop: '20px', // Espaciado superior
-                marginBottom: '50px', // Espaciado inferior
-            }}
-        >
-            {correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? t("Game.win_msg") : t("Game.lose_msg") }
-        </Typography>
-            <div>
-                <Typography variant="h6">{ t("Game.correct") }: {correctlyAnsweredQuestions}</Typography>
-                <Typography variant="h6">{ t("Game.incorrect") }: {incorrectlyAnsweredQuestions}</Typography>
-                <Typography variant="h6">{ t("Game.money") }: {totalScore}</Typography>
-                <Typography variant="h6">{ t("Game.time") }: {totalTimePlayed}</Typography>
-            </div>
-            {showConfetti && <Confetti />}
-        </Container>
-    );
-}
     return (
         <Container
             sx={{

From f884ce3fd03161cf76731069b841dc07ecdd6969 Mon Sep 17 00:00:00 2001
From: uo288245 <uo288245@uniovi.es>
Date: Wed, 24 Apr 2024 22:11:35 +0200
Subject: [PATCH 056/132] Changing all the Discovering Cities game style.

---
 webapp/src/pages/DiscoveringCitiesGame.js | 294 ++++++++++------------
 1 file changed, 132 insertions(+), 162 deletions(-)

diff --git a/webapp/src/pages/DiscoveringCitiesGame.js b/webapp/src/pages/DiscoveringCitiesGame.js
index 7575ff67..d0b6b712 100644
--- a/webapp/src/pages/DiscoveringCitiesGame.js
+++ b/webapp/src/pages/DiscoveringCitiesGame.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import axios from 'axios';
-import { Container, Button, CssBaseline, Grid, Typography, CircularProgress, Card, CardContent } from '@mui/material';
+import { useTheme, Container, Button, CssBaseline, Grid, Typography, CircularProgress, Card } from '@mui/material';
 import { PlayArrow, Pause } from '@mui/icons-material';
 import CheckIcon from '@mui/icons-material/Check';
 import ClearIcon from '@mui/icons-material/Clear';
@@ -23,9 +23,11 @@ const DiscovertingCitiesGame = () => {
     //sesion information
     const {username} = useContext(SessionContext);
 
-    // Traductions
+    // Translations
     const { t } = useTranslation();
 
+    const theme = useTheme();
+
     // state initialization
     const [round, setRound] = React.useState(1);
     const [questionData, setQuestionData] = React.useState(null);
@@ -41,8 +43,11 @@ const DiscovertingCitiesGame = () => {
     const [questionCountdownKey, setQuestionCountdownKey] = React.useState(15); //key to update question timer
     const [questionCountdownRunning, setQuestionCountdownRunning] = React.useState(false); //property to start and stop question timer
     const [userResponses, setUserResponses] = React.useState([]);
+    const [paused, setPaused] = React.useState(false);
+    const [passNewRound, setPassNewRound] = React.useState(false);
     const [language, setCurrentLanguage] = React.useState(i18n.language);
 
+
     const [questionHistorial, setQuestionHistorial] = React.useState(Array(MAX_ROUNDS).fill(null));
 
     React.useEffect(() => {
@@ -74,28 +79,33 @@ const DiscovertingCitiesGame = () => {
 
     // stablish if the confetti must show or not
     React.useEffect(() => {
-        if (correctlyAnsweredQuestions > incorrectlyAnsweredQuestions) {
-          setShowConfetti(true);
-        } else {
-          setShowConfetti(false);
+        correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? setShowConfetti(true) : setShowConfetti(false);
+    }, [correctlyAnsweredQuestions, incorrectlyAnsweredQuestions]);
+
+    React.useEffect(() => {
+        if (passNewRound && !paused) {
+            setRound(prevRound => {
+                return prevRound + 1;
+            });
+            setButtonStates([]);
         }
-      }, [correctlyAnsweredQuestions, incorrectlyAnsweredQuestions]);
-    
+    }, [paused, passNewRound]);
 
     // gets a random question from the database and initializes button states to null
     const startNewRound = async () => {
         setAnswered(false);
-        // It works deploying using git repo from machine with: axios.get(`http://20.80.235.188:8000/questions`)
+        setPassNewRound(false);
+
         // Updates current language
         setCurrentLanguage(i18n.language);
         axios.get(`${apiEndpoint}/questions/${language}/Cities`)
         .then(quest => {
             // every new round it gets a new question from db
-            setQuestionData(quest.data[0]); 
+            setQuestionData(quest.data[0]);    
             setButtonStates(new Array(quest.data[0].options.length).fill(null));
         }).catch(error => {
             console.error(error);
-        }); 
+        });
     };
 
     const updateStatistics = async() => {
@@ -125,6 +135,7 @@ const DiscovertingCitiesGame = () => {
                 online_incorrectly_answered_questions: 0,
                 online_total_time_played: 0,
                 online_games_played: 0,
+                online_games_won: 0
             });
         } catch (error) {
             console.error("Error:", error);
@@ -197,53 +208,37 @@ const DiscovertingCitiesGame = () => {
         setButtonStates(newButtonStates);
 
         setTimeout(async() => {
-            setRound(round + 1);
-            setButtonStates([]);
+            setPassNewRound(true);
             setCurrentLanguage(i18n.language);
-
         }, 4000);
     };
 
     const questionHistorialBar = () => {
         return questionHistorial.map((isCorrect, index) => (
-        <Card 
-          key={index + 1}
-          variant="outlined"
-          style={{ 
-            width: `${100 / MAX_ROUNDS}%`,
-            marginRight: '0.6em',
-            backgroundColor: isCorrect === null ? 'gray' : isCorrect ? 'lightgreen' : 'salmon',
-          }}
-        >
-          <CardContent>{index + 1}</CardContent>
-        </Card>
+            <Card sx={{ width: `${100 / MAX_ROUNDS}%`,
+                padding:'0.2em', 
+                margin:'0 0.1em', 
+                backgroundColor: isCorrect === null ? 'gray' : isCorrect ? theme.palette.success.main : theme.palette.error.main }}
+            >
+            </Card>
         ));
-      };    
+    };    
 
     const togglePause = () => {
         setTimerRunning(!timerRunning);
-        setQuestionCountdownRunning(!timerRunning);
-        if (timerRunning) {
-            // Si el juego estaba en marcha y se pausa, deshabilitar los botones
-            setButtonStates(new Array(questionData.options.length).fill(true));
-        } else {
-            // Si el juego estaba pausado y se reanuda, habilitar los botones
-            setButtonStates(new Array(questionData.options.length).fill(null));
-        }
+        setPaused(!paused);
     }
 
-
     // circular loading
     if (!questionData) {
         return (
             <Container
-                sx={{
-                    display: 'flex',
+                sx={{ 
+                    display: 'flex', 
                     flexDirection: 'column',
-                    alignItems: 'center',
-                    justifyContent: 'center',
-                    height: '100vh',
-                    textAlign: 'center',
+                    justifyContent: 'center', 
+                    alignItems: 'center', 
+                    flex: '1'
                 }}
             >
                 <CssBaseline />
@@ -253,135 +248,110 @@ const DiscovertingCitiesGame = () => {
     }
 
     // redirect to / if game over 
-if (shouldRedirect) {
-    // Redirect after 3 seconds
-    setTimeout(() => {
-        navigate('/homepage');
-    }, 4000);
+    if (shouldRedirect) {
+        // Redirect after 4 seconds
+        setTimeout(() => {
+            navigate('/homepage');
+        }, 4000);
 
 
+        return (
+            <Container
+                sx={{ 
+                    display: 'flex', 
+                    flexDirection: 'column',
+                    justifyContent: 'center', 
+                    alignItems: 'center', 
+                    gap: '5em',
+                    textAlign: 'center',
+                    flex: '1'
+                }}
+            >
+                <CssBaseline />
+                <Typography variant="h2" data-testid="end-game-message"
+                        sx={{ color: correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? theme.palette.success.main : theme.palette.error.main }}>
+                    {correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? t("Game.win_msg") : t("Game.lose_msg") }
+                </Typography>
+                <Container>
+                    <Typography variant="h4">{ t("Game.correct") }: {correctlyAnsweredQuestions}</Typography>
+                    <Typography variant="h4">{ t("Game.incorrect") }: {incorrectlyAnsweredQuestions}</Typography>
+                    <Typography variant="h4">{ t("Game.money") }: {totalScore}</Typography>
+                    <Typography variant="h4">{ t("Game.time") }: {totalTimePlayed}</Typography>
+                </Container>
+                {showConfetti && <Confetti />}
+            </Container>
+        );
+    }
+
     return (
-        <Container
-            sx={{
-                display: 'flex',
-                flexDirection: 'column',
-                alignItems: 'center',
-                justifyContent: 'center',
-                height: '100vh',
-                textAlign: 'center',
-            }}
-        >
-            <CssBaseline />
-            <Typography 
-            data-testid="end-game-message"
-            variant="h4" 
-            sx={{
-                color: correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? 'green' : 'red',
-                fontSize: '4rem', // Tamaño de fuente
-                marginTop: '20px', // Espaciado superior
-                marginBottom: '50px', // Espaciado inferior
-            }}
-        >
-            {correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? t("Game.win_msg") : t("Game.lose_msg") }
-        </Typography>
-            <div>
-                <Typography variant="h6">{ t("Game.correct") }: {correctlyAnsweredQuestions}</Typography>
-                <Typography variant="h6">{ t("Game.incorrect") }: {incorrectlyAnsweredQuestions}</Typography>
-                <Typography variant="h6">{ t("Game.money") }: {totalScore}</Typography>
-                <Typography variant="h6">{ t("Game.time") }: {totalTimePlayed}</Typography>
-            </div>
-            {showConfetti && <Confetti />}
-        </Container>
-    );
-}
-    return (
-        <Container
-            sx={{
-                display: 'flex',
-                flexDirection: 'column',
-                alignItems: 'center',
-                justifyContent: 'center',
-                height: '100vh',
-                textAlign: 'center',
-            }}
-        >
+        <Container sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'space-around', alignItems: 'center', textAlign: 'center', flex: '1', gap: '2em', margin: '0 auto', padding: '1em 0' }}>
             <CssBaseline />
-            <Button variant="contained"
-                    onClick={() => togglePause()}
-                    disabled={answered}>
 
-                {timerRunning ? <Pause /> : <PlayArrow />}
-                {timerRunning ? t("Game.pause") : t("Game.play") }
-            </Button>
+            <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }} >
+                { answered ?
+                    // Pausa
+                    <Button variant="contained" onClick={() => togglePause()} sx={{ height: 100, width: 100, borderRadius: '50%' }} data-testid={ paused ? "play" : "pause"}>
+                        { paused ? <PlayArrow /> : <Pause /> }
+                    </Button>
+                    :
+                    // Cronómetro
+                    <CountdownCircleTimer
+                        data-testid="circleTimer"
+                        key={questionCountdownKey}
+                        isPlaying = {questionCountdownRunning}
+                        duration={15}
+                        colors={[theme.palette.success.main, "#F7B801", "#f50707", theme.palette.error.main]}
+                        size={100}
+                        colorsTime={[10, 6, 3, 0]}
+                        onComplete={() => selectResponse(-1, "FAILED")} //when time ends always fail question
+                        >
+                        {({ remainingTime }) => {
+                            return (
+                                <div style={{ display: 'flex', alignItems: 'center' }}>
+                                    <div style={{ fontSize: '1.2em', fontWeight: 'bold' }}>{remainingTime}</div>
+                                </div>
+                            );
+                        }}
+                    </CountdownCircleTimer>
+                }
+            </Container>
 
-            <Container
-            sx={{
-                position: 'absolute',
-                top: '10%', 
-                right: '20%', 
-            }}>
-                <Container
-                    sx={{
-                        display: 'flex',
-                        flexDirection: 'row',
-                        alignItems: 'center',
-                    }}
-                >
-                    {questionHistorialBar()}
-                </Container>
+            <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }} >
+                <Typography variant="h4" data-testid="question" sx={{ fontWeight:'bold', marginBottom:'0.7em' }} >
+                    {questionData.question.toUpperCase()}
+                </Typography>
+
+                <Grid container spacing={2}>
+                    {questionData.options.map((option, index) => (
+                        <Grid item xs={12} key={index}>
+                            <Button
+                                data-testid={buttonStates[index] === "success" ? `success${index}` : buttonStates[index] === "failure" ? `failel${index}` : `answer${index}`}
+                                variant="contained"
+                                onClick={() => selectResponse(index, option)}
+                                disabled={buttonStates[index] !== null || answered}
+                                sx={{
+                                    height: "3.3em",
+                                    width: "50%",
+                                    borderRadius: "10px",
+                                    margin: "5px",
+                                    "&:disabled": {
+                                        backgroundColor: buttonStates[index] === "success" ? theme.palette.success.main : buttonStates[index] === "failure" ? theme.palette.error.main : "gray",
+                                        color: "white",
+                                    },
+                                }}
+                            >
+                                {buttonStates[index] === "success" ? <CheckIcon /> : buttonStates[index] === "failure" ? <ClearIcon /> : null}
+                                {option}
+                            </Button>
+                        </Grid>
+                    ))}
+                </Grid>
             </Container>
 
-            <Typography variant='h6' data-testid="numRound">
-                {round} / {MAX_ROUNDS}
-            </Typography>
-            <Typography variant="h5" mb={4} fontWeight="bold" style={{ display: 'flex', alignItems: 'center' }}>
-            <span data-testid="question" style={{ marginRight: '1em' }}>{questionData.question}</span>
-                <CountdownCircleTimer
-                  data-testid="circleTimer"
-                  key={questionCountdownKey}
-                  isPlaying = {questionCountdownRunning}
-                  duration={15}
-                  colors={["#0bfc03", "#F7B801", "#f50707", "#A30000"]}
-                  size={100}
-                  colorsTime={[10, 6, 3, 0]}
-                  onComplete={() => selectResponse(0, "FAILED")} //when time ends always fail question
-                >
-                  {({ remainingTime }) => {
-                    return (
-                        <div style={{ display: 'flex', alignItems: 'center' }}>
-                        <div style={{ fontSize: '1.2em', fontWeight: 'bold' }}>{remainingTime}</div>
-                      </div>
-                    );
-                  }}
-                </CountdownCircleTimer>
-            </Typography>
-
-            <Grid container spacing={2}>
-                {questionData.options.map((option, index) => (
-                    <Grid item xs={12} key={index}>
-                        <Button
-                            data-testid="answer"
-                            variant="contained"
-                            onClick={() => selectResponse(index, option)}
-                            disabled={buttonStates[index] !== null || answered} // before, you could still press more than one button
-                            sx={{
-                                height: "50px", // Ajusta el tamaño según sea necesario
-                                width: "50%", // Ajusta el ancho según sea necesario
-                                borderRadius: "20px", // Ajusta el radio según sea necesario
-                                margin: "5px",
-                                backgroundColor: buttonStates[index] === "success" ? "green" : buttonStates[index] === "failure" ? "red" : null,
-                                "&:disabled": {
-                                    backgroundColor: buttonStates[index] === "success" ? "green" : buttonStates[index] === "failure" ? "red" : "gray",
-                                    color: "white",
-                                },
-                            }}
-                        >
-                            {buttonStates[index] === "success" ? <CheckIcon /> : buttonStates[index] === "failure" ? <ClearIcon /> : null}
-                            {option}
-                        </Button>
-                    </Grid>
-                ))}
-            </Grid>
+            {/* Progress Cards */}
+            <Container sx={{ display: 'flex', flexDirection: 'row', alignItems: 'center', marginTop:'2em' }} >
+                {questionHistorialBar()}
+            </Container>
         </Container>
     );
 };

From 5c2619274a5dc95b2033608425ba288d572162d8 Mon Sep 17 00:00:00 2001
From: uo288245 <uo288245@uniovi.es>
Date: Wed, 24 Apr 2024 22:19:00 +0200
Subject: [PATCH 057/132] Improved the code in the Discovering CIties game.

---
 webapp/src/pages/DiscoveringCitiesGame.js | 70 +++++------------------
 1 file changed, 13 insertions(+), 57 deletions(-)

diff --git a/webapp/src/pages/DiscoveringCitiesGame.js b/webapp/src/pages/DiscoveringCitiesGame.js
index d0b6b712..c8c632a2 100644
--- a/webapp/src/pages/DiscoveringCitiesGame.js
+++ b/webapp/src/pages/DiscoveringCitiesGame.js
@@ -38,10 +38,10 @@ const DiscovertingCitiesGame = () => {
     const [correctlyAnsweredQuestions, setCorrectlyAnsweredQuestions] = React.useState(0);
     const [incorrectlyAnsweredQuestions, setIncorrectlyAnsweredQuestions] = React.useState(0);
     const [totalTimePlayed, setTotalTimePlayed] = React.useState(0);
-    const [timerRunning, setTimerRunning] = React.useState(true); // indicate if the timer is working
-    const [showConfetti, setShowConfetti] = React.useState(false); //indicates if the confetti must appear
-    const [questionCountdownKey, setQuestionCountdownKey] = React.useState(15); //key to update question timer
-    const [questionCountdownRunning, setQuestionCountdownRunning] = React.useState(false); //property to start and stop question timer
+    const [timerRunning, setTimerRunning] = React.useState(true);
+    const [showConfetti, setShowConfetti] = React.useState(false);
+    const [questionCountdownKey, setQuestionCountdownKey] = React.useState(15);
+    const [questionCountdownRunning, setQuestionCountdownRunning] = React.useState(false);
     const [userResponses, setUserResponses] = React.useState([]);
     const [paused, setPaused] = React.useState(false);
     const [passNewRound, setPassNewRound] = React.useState(false);
@@ -215,12 +215,7 @@ const DiscovertingCitiesGame = () => {
 
     const questionHistorialBar = () => {
         return questionHistorial.map((isCorrect, index) => (
-            <Card sx={{ width: `${100 / MAX_ROUNDS}%`,
-                padding:'0.2em', 
-                margin:'0 0.1em', 
-                backgroundColor: isCorrect === null ? 'gray' : isCorrect ? theme.palette.success.main : theme.palette.error.main }}
-            >
-            </Card>
+            <Card sx={{ width: `${100 / MAX_ROUNDS}%`, padding:'0.2em', margin:'0 0.1em', backgroundColor: isCorrect === null ? 'gray' : isCorrect ? theme.palette.success.main : theme.palette.error.main }}/>
         ));
     };    
 
@@ -232,15 +227,7 @@ const DiscovertingCitiesGame = () => {
     // circular loading
     if (!questionData) {
         return (
-            <Container
-                sx={{ 
-                    display: 'flex', 
-                    flexDirection: 'column',
-                    justifyContent: 'center', 
-                    alignItems: 'center', 
-                    flex: '1'
-                }}
-            >
+            <Container sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', flex: '1' }}>
                 <CssBaseline />
                 <CircularProgress />
             </Container>
@@ -254,22 +241,10 @@ const DiscovertingCitiesGame = () => {
             navigate('/homepage');
         }, 4000);
 
-
         return (
-            <Container
-                sx={{ 
-                    display: 'flex', 
-                    flexDirection: 'column',
-                    justifyContent: 'center', 
-                    alignItems: 'center', 
-                    gap: '5em',
-                    textAlign: 'center',
-                    flex: '1'
-                }}
-            >
+            <Container sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', gap: '5em', textAlign: 'center', flex: '1' }}>
                 <CssBaseline />
-                <Typography variant="h2" data-testid="end-game-message"
-                        sx={{ color: correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? theme.palette.success.main : theme.palette.error.main }}>
+                <Typography variant="h2" data-testid="end-game-message" sx={{ color: correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? theme.palette.success.main : theme.palette.error.main }}>
                     {correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? t("Game.win_msg") : t("Game.lose_msg") }
                 </Typography>
                 <Container>
@@ -295,16 +270,9 @@ const DiscovertingCitiesGame = () => {
                     </Button>
                     :
                     // Cronómetro
-                    <CountdownCircleTimer
-                        data-testid="circleTimer"
-                        key={questionCountdownKey}
-                        isPlaying = {questionCountdownRunning}
-                        duration={15}
-                        colors={[theme.palette.success.main, "#F7B801", "#f50707", theme.palette.error.main]}
-                        size={100}
-                        colorsTime={[10, 6, 3, 0]}
-                        onComplete={() => selectResponse(-1, "FAILED")} //when time ends always fail question
-                        >
+                    <CountdownCircleTimer data-testid="circleTimer" key={questionCountdownKey} isPlaying = {questionCountdownRunning} duration={15}
+                        colors={[theme.palette.success.main, "#F7B801", "#f50707", theme.palette.error.main]} 
+                        colorsTime={[10, 6, 3, 0]} onComplete={() => selectResponse(-1, "FAILED")}  size={100} >
                         {({ remainingTime }) => {
                             return (
                                 <div style={{ display: 'flex', alignItems: 'center' }}>
@@ -326,20 +294,8 @@ const DiscovertingCitiesGame = () => {
                         <Grid item xs={12} key={index}>
                             <Button
                                 data-testid={buttonStates[index] === "success" ? `success${index}` : buttonStates[index] === "failure" ? `failel${index}` : `answer${index}`}
-                                variant="contained"
-                                onClick={() => selectResponse(index, option)}
-                                disabled={buttonStates[index] !== null || answered}
-                                sx={{
-                                    height: "3.3em",
-                                    width: "50%",
-                                    borderRadius: "10px",
-                                    margin: "5px",
-                                    "&:disabled": {
-                                        backgroundColor: buttonStates[index] === "success" ? theme.palette.success.main : buttonStates[index] === "failure" ? theme.palette.error.main : "gray",
-                                        color: "white",
-                                    },
-                                }}
-                            >
+                                variant="contained" onClick={() => selectResponse(index, option)} disabled={buttonStates[index] !== null || answered}
+                                sx={{ height: "3.3em", width: "50%", borderRadius: "10px", margin: "5px", "&:disabled": {backgroundColor: buttonStates[index] === "success" ? theme.palette.success.main : buttonStates[index] === "failure" ? theme.palette.error.main : "gray", color: "white" } }}>
                                 {buttonStates[index] === "success" ? <CheckIcon /> : buttonStates[index] === "failure" ? <ClearIcon /> : null}
                                 {option}
                             </Button>

From dabf639c0e9cc67abb63ce7cba549a47bf149fa7 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Wed, 24 Apr 2024 22:23:26 +0200
Subject: [PATCH 058/132] Wise men stack configuration layout

---
 webapp/src/pages/WiseMenStackGame.js | 44 ++++++++++++++++------------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/webapp/src/pages/WiseMenStackGame.js b/webapp/src/pages/WiseMenStackGame.js
index 70a3113f..3f4cf03f 100644
--- a/webapp/src/pages/WiseMenStackGame.js
+++ b/webapp/src/pages/WiseMenStackGame.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import axios from 'axios';
-import { Container, Button, CssBaseline, Grid, Typography, CircularProgress, Card, CardContent, Select, MenuItem, useTheme } from '@mui/material';
+import { Container, Box, Button, CssBaseline, Grid, Typography, CircularProgress, Card, CardContent, Select, MenuItem, useTheme } from '@mui/material';
 import CheckIcon from '@mui/icons-material/Check';
 import ClearIcon from '@mui/icons-material/Clear';
 import { useNavigate } from 'react-router-dom';
@@ -231,23 +231,30 @@ const WiseMenStackGame = () => {
     
     if(!isConfigured) {
         return (
-            <Container sx={{ margin: '0 auto auto', display: 'flex', flexDirection: 'column', alignItems: 'center' }}>
-                <Typography variant="h2" sx={{ marginBottom: '1em' }}>Wise Men Stack</Typography>
-                <Typography variant="h3" sx={{ marginBottom: '1em' }}>{t("Wise_Men.instructions")}</Typography>
-
-                {/* Dropdown for selecting category */}
-                <div style={{ marginBottom: '1em' }}>
-                    <label data-testid="categories-label" variant='h6' style={{ margin: '0.5em' }} htmlFor="category">{t("Wise_Men.category")}</label>
-                    <Select
-                        value={category}
-                        onChange={(event) => setCategory(event.target.value)}
-                        style={{ minWidth: '120px' }}
-                    >
-                        <MenuItem value="Geography">{t("Game.categories.geography")}</MenuItem>
-                        <MenuItem value="Political">{t("Game.categories.political")}</MenuItem>
-                        <MenuItem value="Sports">{t("Game.categories.sports")}</MenuItem>
-                    </Select>
-                </div>
+            <Container sx={{ display: 'flex', flexDirection: 'column', flex: 1, justifyContent: 'center', alignItems: 'center', gap: '4em' }}>
+                <Typography variant="h2" align="center" fontWeight="bold" sx={{ textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem' }}>
+                    {t("Game.config.title")}
+                </Typography>
+
+                <Box sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center', gap: '1em' }}>
+                    <Typography variant="h3">
+                        {t("Wise_Men.instructions")}
+                    </Typography>
+
+                    {/* Dropdown for selecting category */}
+                    <div>
+                        <label data-testid="categories-label" variant='h6' htmlFor="category">{t("Wise_Men.category")}</label>
+                        <Select
+                            value={category}
+                            onChange={(event) => setCategory(event.target.value)}
+                            style={{ minWidth: '120px' }}
+                        >
+                            <MenuItem value="Geography">{t("Game.categories.geography")}</MenuItem>
+                            <MenuItem value="Political">{t("Game.categories.political")}</MenuItem>
+                            <MenuItem value="Sports">{t("Game.categories.sports")}</MenuItem>
+                        </Select>
+                    </div>
+                </Box>
 
                 <Button
                     data-testid="start-button"
@@ -259,7 +266,6 @@ const WiseMenStackGame = () => {
                     }}
                     variant="contained"
                     sx={{
-                        marginBottom: '0.5em',
                         backgroundColor: theme.palette.primary.main,
                         color: theme.palette.secondary.main,
                         '&:hover': {

From 1c872e6ca41cfc7e7ed58994e0603060c772e0e3 Mon Sep 17 00:00:00 2001
From: uo288245 <uo288245@uniovi.es>
Date: Wed, 24 Apr 2024 22:25:36 +0200
Subject: [PATCH 059/132] Improved the game code

---
 webapp/src/pages/DiscoveringCitiesGame.js |  8 +-
 webapp/src/pages/Game.js                  | 90 +++++------------------
 2 files changed, 20 insertions(+), 78 deletions(-)

diff --git a/webapp/src/pages/DiscoveringCitiesGame.js b/webapp/src/pages/DiscoveringCitiesGame.js
index c8c632a2..3f7d51f0 100644
--- a/webapp/src/pages/DiscoveringCitiesGame.js
+++ b/webapp/src/pages/DiscoveringCitiesGame.js
@@ -270,9 +270,8 @@ const DiscovertingCitiesGame = () => {
                     </Button>
                     :
                     // Cronómetro
-                    <CountdownCircleTimer data-testid="circleTimer" key={questionCountdownKey} isPlaying = {questionCountdownRunning} duration={15}
-                        colors={[theme.palette.success.main, "#F7B801", "#f50707", theme.palette.error.main]} 
-                        colorsTime={[10, 6, 3, 0]} onComplete={() => selectResponse(-1, "FAILED")}  size={100} >
+                    <CountdownCircleTimer data-testid="circleTimer" key={questionCountdownKey} isPlaying = {questionCountdownRunning} duration={15} colorsTime={[10, 6, 3, 0]}
+                        colors={[theme.palette.success.main, "#F7B801", "#f50707", theme.palette.error.main]} size={100} onComplete={() => selectResponse(-1, "FAILED")}>
                         {({ remainingTime }) => {
                             return (
                                 <div style={{ display: 'flex', alignItems: 'center' }}>
@@ -292,8 +291,7 @@ const DiscovertingCitiesGame = () => {
                 <Grid container spacing={2}>
                     {questionData.options.map((option, index) => (
                         <Grid item xs={12} key={index}>
-                            <Button
-                                data-testid={buttonStates[index] === "success" ? `success${index}` : buttonStates[index] === "failure" ? `failel${index}` : `answer${index}`}
+                            <Button data-testid={buttonStates[index] === "success" ? `success${index}` : buttonStates[index] === "failure" ? `failel${index}` : `answer${index}`}
                                 variant="contained" onClick={() => selectResponse(index, option)} disabled={buttonStates[index] !== null || answered}
                                 sx={{ height: "3.3em", width: "50%", borderRadius: "10px", margin: "5px", "&:disabled": {backgroundColor: buttonStates[index] === "success" ? theme.palette.success.main : buttonStates[index] === "failure" ? theme.palette.error.main : "gray", color: "white" } }}>
                                 {buttonStates[index] === "success" ? <CheckIcon /> : buttonStates[index] === "failure" ? <ClearIcon /> : null}
diff --git a/webapp/src/pages/Game.js b/webapp/src/pages/Game.js
index 0310eeaf..c66a2191 100644
--- a/webapp/src/pages/Game.js
+++ b/webapp/src/pages/Game.js
@@ -38,16 +38,15 @@ const Game = () => {
     const [correctlyAnsweredQuestions, setCorrectlyAnsweredQuestions] = React.useState(0);
     const [incorrectlyAnsweredQuestions, setIncorrectlyAnsweredQuestions] = React.useState(0);
     const [totalTimePlayed, setTotalTimePlayed] = React.useState(0);
-    const [timerRunning, setTimerRunning] = React.useState(true); // indicate if the timer is working
-    const [showConfetti, setShowConfetti] = React.useState(false); //indicates if the confetti must appear
-    const [questionCountdownKey, setQuestionCountdownKey] = React.useState(15); //key to update question timer
-    const [questionCountdownRunning, setQuestionCountdownRunning] = React.useState(false); //property to start and stop question timer
+    const [timerRunning, setTimerRunning] = React.useState(true);
+    const [showConfetti, setShowConfetti] = React.useState(false);
+    const [questionCountdownKey, setQuestionCountdownKey] = React.useState(15);
+    const [questionCountdownRunning, setQuestionCountdownRunning] = React.useState(false);
     const [userResponses, setUserResponses] = React.useState([]);
     const [paused, setPaused] = React.useState(false);
     const [passNewRound, setPassNewRound] = React.useState(false);
     const [language, setCurrentLanguage] = React.useState(i18n.language);
 
-
     const [questionHistorial, setQuestionHistorial] = React.useState(Array(MAX_ROUNDS).fill(null));
 
     React.useEffect(() => {
@@ -70,7 +69,7 @@ const Game = () => {
         } else {
             setTimerRunning(false);
             setShouldRedirect(true);
-            setQuestionCountdownRunning(false); // Isnt this redundant as it is stablished when answering?
+            setQuestionCountdownRunning(false);
             updateStatistics();
             updateQuestionsRecord();
         }
@@ -215,12 +214,7 @@ const Game = () => {
 
     const questionHistorialBar = () => {
         return questionHistorial.map((isCorrect, index) => (
-            <Card sx={{ width: `${100 / MAX_ROUNDS}%`,
-             padding:'0.2em', 
-             margin:'0 0.1em', 
-             backgroundColor: isCorrect === null ? 'gray' : isCorrect ? theme.palette.success.main : theme.palette.error.main }}
-            >
-            </Card>
+            <Card sx={{ width: `${100 / MAX_ROUNDS}%`, padding:'0.2em', margin:'0 0.1em', backgroundColor: isCorrect === null ? 'gray' : isCorrect ? theme.palette.success.main : theme.palette.error.main }}/>
         ));
     };    
 
@@ -233,14 +227,7 @@ const Game = () => {
     if (!questionData) {
         return (
             <Container
-                sx={{ 
-                    display: 'flex', 
-                    flexDirection: 'column',
-                    justifyContent: 'center', 
-                    alignItems: 'center', 
-                    flex: '1'
-                }}
-            >
+                sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', flex: '1'}}>
                 <CssBaseline />
                 <CircularProgress />
             </Container>
@@ -256,20 +243,9 @@ const Game = () => {
 
 
         return (
-            <Container
-                sx={{ 
-                    display: 'flex', 
-                    flexDirection: 'column',
-                    justifyContent: 'center', 
-                    alignItems: 'center', 
-                    gap: '5em',
-                    textAlign: 'center',
-                    flex: '1'
-                }}
-            >
+            <Container sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', gap: '5em', textAlign: 'center', flex: '1'}}>
                 <CssBaseline />
-                <Typography variant="h2" data-testid="end-game-message"
-                        sx={{ color: correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? theme.palette.success.main : theme.palette.error.main }}>
+                <Typography variant="h2" data-testid="end-game-message" sx={{ color: correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? theme.palette.success.main : theme.palette.error.main }}>
                     {correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? t("Game.win_msg") : t("Game.lose_msg") }
                 </Typography>
                 <Container>
@@ -284,18 +260,7 @@ const Game = () => {
     }
 
     return (
-        <Container
-            sx={{ 
-                display: 'flex', 
-                flexDirection: 'column',
-                justifyContent: 'space-around',
-                alignItems: 'center', 
-                textAlign: 'center',
-                flex: '1',
-                gap: '2em',
-                margin: '2em auto 1em',
-            }}
-        >
+        <Container sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'space-around', alignItems: 'center', textAlign: 'center', flex: '1', gap: '2em', margin: '0 auto', padding: '1em 0' }}>
             <CssBaseline />
 
             <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }} >
@@ -306,21 +271,13 @@ const Game = () => {
                     </Button>
                     :
                     // Cronómetro
-                    <CountdownCircleTimer
-                        data-testid="circleTimer"
-                        key={questionCountdownKey}
-                        isPlaying = {questionCountdownRunning}
-                        duration={15}
-                        colors={[theme.palette.success.main, "#F7B801", "#f50707", theme.palette.error.main]}
-                        size={100}
-                        colorsTime={[10, 6, 3, 0]}
-                        onComplete={() => selectResponse(-1, "FAILED")} //when time ends always fail question
-                        >
+                    <CountdownCircleTimer data-testid="circleTimer" key={questionCountdownKey} isPlaying = {questionCountdownRunning} duration={15} colorsTime={[10, 6, 3, 0]}
+                        colors={[theme.palette.success.main, "#F7B801", "#f50707", theme.palette.error.main]} size={100} onComplete={() => selectResponse(-1, "FAILED")}>
                         {({ remainingTime }) => {
                             return (
                                 <div style={{ display: 'flex', alignItems: 'center' }}>
-                                <div style={{ fontSize: '1.2em', fontWeight: 'bold' }}>{remainingTime}</div>
-                            </div>
+                                    <div style={{ fontSize: '1.2em', fontWeight: 'bold' }}>{remainingTime}</div>
+                                </div>
                             );
                         }}
                     </CountdownCircleTimer>
@@ -335,22 +292,9 @@ const Game = () => {
                 <Grid container spacing={2}>
                     {questionData.options.map((option, index) => (
                         <Grid item xs={12} key={index}>
-                            <Button
-                                data-testid={buttonStates[index] === "success" ? `success${index}` : buttonStates[index] === "failure" ? `failel${index}` : `answer${index}`}
-                                variant="contained"
-                                onClick={() => selectResponse(index, option)}
-                                disabled={buttonStates[index] !== null || answered} // before, you could still press more than one button
-                                sx={{
-                                    height: "3.3em",
-                                    width: "50%",
-                                    borderRadius: "10px",
-                                    margin: "5px",
-                                    "&:disabled": {
-                                        backgroundColor: buttonStates[index] === "success" ? theme.palette.success.main : buttonStates[index] === "failure" ? theme.palette.error.main : "gray",
-                                        color: "white",
-                                    },
-                                }}
-                            >
+                            <Button data-testid={buttonStates[index] === "success" ? `success${index}` : buttonStates[index] === "failure" ? `failel${index}` : `answer${index}`}
+                                variant="contained" onClick={() => selectResponse(index, option)} disabled={buttonStates[index] !== null || answered}
+                                sx={{ height: "3.3em", width: "50%", borderRadius: "10px", margin: "5px", "&:disabled": { backgroundColor: buttonStates[index] === "success" ? theme.palette.success.main : buttonStates[index] === "failure" ? theme.palette.error.main : "gray", color: "white"}}}>
                                 {buttonStates[index] === "success" ? <CheckIcon /> : buttonStates[index] === "failure" ? <ClearIcon /> : null}
                                 {option}
                             </Button>

From da3d29c5a63eed4957bea33a5e1ef4db37ce7a12 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Wed, 24 Apr 2024 22:33:47 +0200
Subject: [PATCH 060/132] MUI components in Wise Men and unifyied
 internationalization dict elements

---
 webapp/src/localize/en.json          |  2 +-
 webapp/src/localize/es.json          |  3 +--
 webapp/src/localize/fr.json          |  5 +----
 webapp/src/pages/WiseMenStackGame.js | 10 ++++++----
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/webapp/src/localize/en.json b/webapp/src/localize/en.json
index 1fd053a4..9b444938 100644
--- a/webapp/src/localize/en.json
+++ b/webapp/src/localize/en.json
@@ -77,7 +77,7 @@
 
     "Wise_Men": {
         "instructions": "Choose a category:",
-        "category":"Categories: "
+        "category":"Categories"
     },
 
     "Login": {
diff --git a/webapp/src/localize/es.json b/webapp/src/localize/es.json
index cdcda2b5..ce1729d4 100644
--- a/webapp/src/localize/es.json
+++ b/webapp/src/localize/es.json
@@ -76,8 +76,7 @@
     },
     
     "Wise_Men": {
-        "instructions": "Elige una categoría:",
-        "category":"Categorías: "
+        "instructions": "Elige una categoría:"
     },
 
     "Login": {
diff --git a/webapp/src/localize/fr.json b/webapp/src/localize/fr.json
index d42258a3..81a657d2 100644
--- a/webapp/src/localize/fr.json
+++ b/webapp/src/localize/fr.json
@@ -78,10 +78,7 @@
     
     "Wise_Men": {
         "instructions": "Choisissez une catégorie:",
-        "category":"Catégories: ",
-        "geography": "Geographie",
-        "political":"Politique",
-        "sports":"Sport"
+        "category":"Catégories"
     },
 
 
diff --git a/webapp/src/pages/WiseMenStackGame.js b/webapp/src/pages/WiseMenStackGame.js
index 3f4cf03f..650e2cb7 100644
--- a/webapp/src/pages/WiseMenStackGame.js
+++ b/webapp/src/pages/WiseMenStackGame.js
@@ -237,13 +237,15 @@ const WiseMenStackGame = () => {
                 </Typography>
 
                 <Box sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center', gap: '1em' }}>
-                    <Typography variant="h3">
+                    <Typography variant="h4">
                         {t("Wise_Men.instructions")}
                     </Typography>
 
                     {/* Dropdown for selecting category */}
-                    <div>
-                        <label data-testid="categories-label" variant='h6' htmlFor="category">{t("Wise_Men.category")}</label>
+                    <Box sx={{ display: 'flex', alignItems: 'center', gap: '1em' }}>
+                        <Typography data-testid="categories-label" variant='h5' htmlFor="category">
+                            {t("Game.config.category")}:
+                        </Typography>
                         <Select
                             value={category}
                             onChange={(event) => setCategory(event.target.value)}
@@ -253,7 +255,7 @@ const WiseMenStackGame = () => {
                             <MenuItem value="Political">{t("Game.categories.political")}</MenuItem>
                             <MenuItem value="Sports">{t("Game.categories.sports")}</MenuItem>
                         </Select>
-                    </div>
+                    </Box>
                 </Box>
 
                 <Button

From 96e16edcb2f6c99199d16588ba70423d0c7e4aa7 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Wed, 24 Apr 2024 22:37:01 +0200
Subject: [PATCH 061/132] Final form button style

---
 webapp/src/pages/WiseMenStackGame.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/webapp/src/pages/WiseMenStackGame.js b/webapp/src/pages/WiseMenStackGame.js
index 650e2cb7..01a15e2e 100644
--- a/webapp/src/pages/WiseMenStackGame.js
+++ b/webapp/src/pages/WiseMenStackGame.js
@@ -267,12 +267,17 @@ const WiseMenStackGame = () => {
                         console.log(category) 
                     }}
                     variant="contained"
+                    size="large"
                     sx={{
-                        backgroundColor: theme.palette.primary.main,
-                        color: theme.palette.secondary.main,
+                        fontFamily: 'Arial Black, sans-serif',
+                        color: theme.palette.primary.main,
+                        backgroundColor: 'transparent',
+                        border: `2px solid ${theme.palette.primary.main}`,
+                        transition: 'background-color 0.3s ease',
+
                         '&:hover': {
-                            backgroundColor: theme.palette.secondary.main,
-                            color: theme.palette.primary.main,
+                            backgroundColor: theme.palette.primary.main,
+                            color: 'white',
                         }
                     }}
                 >

From f4e353b6de30171b00f8e9d36a8cbd4be6d4cb08 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Wed, 24 Apr 2024 22:44:41 +0200
Subject: [PATCH 062/132] Magic

---
 webapp/src/localize/en.json          | 5 +++--
 webapp/src/localize/es.json          | 6 ++++--
 webapp/src/localize/fr.json          | 6 +++---
 webapp/src/pages/WiseMenStackGame.js | 8 +++++---
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/webapp/src/localize/en.json b/webapp/src/localize/en.json
index 9b444938..4a297de9 100644
--- a/webapp/src/localize/en.json
+++ b/webapp/src/localize/en.json
@@ -76,8 +76,9 @@
     },
 
     "Wise_Men": {
-        "instructions": "Choose a category:",
-        "category":"Categories"
+        "instructions1": "Choose",
+        "instructions2": "a",
+        "instructions3": "category"
     },
 
     "Login": {
diff --git a/webapp/src/localize/es.json b/webapp/src/localize/es.json
index ce1729d4..b97905db 100644
--- a/webapp/src/localize/es.json
+++ b/webapp/src/localize/es.json
@@ -74,9 +74,11 @@
             "sports":"Deporte"
         }
     },
-    
+
     "Wise_Men": {
-        "instructions": "Elige una categoría:"
+        "instructions1": "Elige",
+        "instructions2": "una",
+        "instructions3": "categoría"
     },
 
     "Login": {
diff --git a/webapp/src/localize/fr.json b/webapp/src/localize/fr.json
index 81a657d2..0dc34adf 100644
--- a/webapp/src/localize/fr.json
+++ b/webapp/src/localize/fr.json
@@ -77,11 +77,11 @@
     },
     
     "Wise_Men": {
-        "instructions": "Choisissez une catégorie:",
-        "category":"Catégories"
+        "instructions1": "Choisissez",
+        "instructions2": "une",
+        "instructions3": "catégorie"
     },
 
-
     "Login": {
         "title": "Connecter",
         "username": "Nom d'utilisateur"
diff --git a/webapp/src/pages/WiseMenStackGame.js b/webapp/src/pages/WiseMenStackGame.js
index 01a15e2e..b49cd381 100644
--- a/webapp/src/pages/WiseMenStackGame.js
+++ b/webapp/src/pages/WiseMenStackGame.js
@@ -237,9 +237,11 @@ const WiseMenStackGame = () => {
                 </Typography>
 
                 <Box sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center', gap: '1em' }}>
-                    <Typography variant="h4">
-                        {t("Wise_Men.instructions")}
-                    </Typography>
+                    <Box sx={{ display: 'flex', alignItems: 'center', gap: '0.5em'}}>
+                        <Typography variant="h4" fontWeight="bold" color="error">{t("Wise_Men.instructions1")}</Typography>
+                        <Typography variant="h4" fontWeight="bold" color={theme.palette.success.main} >{t("Wise_Men.instructions2")}</Typography>
+                        <Typography variant="h4" fontWeight="bold" color="primary">{t("Wise_Men.instructions3")}</Typography>
+                    </Box>
 
                     {/* Dropdown for selecting category */}
                     <Box sx={{ display: 'flex', alignItems: 'center', gap: '1em' }}>

From 44a59d535ad6291272e7bb665de8879dbcb29bd4 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Wed, 24 Apr 2024 22:46:27 +0200
Subject: [PATCH 063/132] Removed strange console.log in onClick event

---
 webapp/src/pages/WiseMenStackGame.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/webapp/src/pages/WiseMenStackGame.js b/webapp/src/pages/WiseMenStackGame.js
index b49cd381..0d12683d 100644
--- a/webapp/src/pages/WiseMenStackGame.js
+++ b/webapp/src/pages/WiseMenStackGame.js
@@ -265,8 +265,7 @@ const WiseMenStackGame = () => {
                     onClick={() => { 
                         setConfiguration(true);
                         startNewRound(); 
-                        setQuestionHistorial(Array(round).fill(null)); 
-                        console.log(category) 
+                        setQuestionHistorial(Array(round).fill(null));
                     }}
                     variant="contained"
                     size="large"

From 1022cfd21a6451e166016249dc91cc3d05d16846 Mon Sep 17 00:00:00 2001
From: uo288245 <uo288245@uniovi.es>
Date: Wed, 24 Apr 2024 23:01:19 +0200
Subject: [PATCH 064/132] Fixing react components in Games.

---
 webapp/src/pages/DiscoveringCitiesGame.js | 8 ++++----
 webapp/src/pages/Game.js                  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/webapp/src/pages/DiscoveringCitiesGame.js b/webapp/src/pages/DiscoveringCitiesGame.js
index 3f7d51f0..efee9fc4 100644
--- a/webapp/src/pages/DiscoveringCitiesGame.js
+++ b/webapp/src/pages/DiscoveringCitiesGame.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import axios from 'axios';
-import { useTheme, Container, Button, CssBaseline, Grid, Typography, CircularProgress, Card } from '@mui/material';
+import { useTheme, Container, Button, CssBaseline, Grid, Typography, CircularProgress, Card, Box } from '@mui/material';
 import { PlayArrow, Pause } from '@mui/icons-material';
 import CheckIcon from '@mui/icons-material/Check';
 import ClearIcon from '@mui/icons-material/Clear';
@@ -274,9 +274,9 @@ const DiscovertingCitiesGame = () => {
                         colors={[theme.palette.success.main, "#F7B801", "#f50707", theme.palette.error.main]} size={100} onComplete={() => selectResponse(-1, "FAILED")}>
                         {({ remainingTime }) => {
                             return (
-                                <div style={{ display: 'flex', alignItems: 'center' }}>
-                                    <div style={{ fontSize: '1.2em', fontWeight: 'bold' }}>{remainingTime}</div>
-                                </div>
+                                <Box style={{ display: 'flex', alignItems: 'center' }}>
+                                    <Typography fontSize='1.2em' fontWeight='bold'>{remainingTime}</Typography>
+                                </Box>
                             );
                         }}
                     </CountdownCircleTimer>
diff --git a/webapp/src/pages/Game.js b/webapp/src/pages/Game.js
index c66a2191..9536556d 100644
--- a/webapp/src/pages/Game.js
+++ b/webapp/src/pages/Game.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import axios from 'axios';
-import { useTheme, Container, Button, CssBaseline, Grid, Typography, CircularProgress, Card } from '@mui/material';
+import { useTheme, Container, Button, CssBaseline, Grid, Typography, CircularProgress, Card, Box } from '@mui/material';
 import { PlayArrow, Pause } from '@mui/icons-material';
 import CheckIcon from '@mui/icons-material/Check';
 import ClearIcon from '@mui/icons-material/Clear';
@@ -275,9 +275,9 @@ const Game = () => {
                         colors={[theme.palette.success.main, "#F7B801", "#f50707", theme.palette.error.main]} size={100} onComplete={() => selectResponse(-1, "FAILED")}>
                         {({ remainingTime }) => {
                             return (
-                                <div style={{ display: 'flex', alignItems: 'center' }}>
-                                    <div style={{ fontSize: '1.2em', fontWeight: 'bold' }}>{remainingTime}</div>
-                                </div>
+                                <Box style={{ display: 'flex', alignItems: 'center' }}>
+                                    <Typography fontSize='1.2em' fontWeight='bold'>{remainingTime}</Typography>
+                                </Box>
                             );
                         }}
                     </CountdownCircleTimer>

From e6260bfd77a481c2c40d5a6ae1fa5d8686c5c2c4 Mon Sep 17 00:00:00 2001
From: uo288245 <uo288245@uniovi.es>
Date: Wed, 24 Apr 2024 23:08:05 +0200
Subject: [PATCH 065/132] Fixed the Challenge game view.

---
 webapp/src/pages/TheChallengeGame.js | 180 ++++++++++-----------------
 1 file changed, 67 insertions(+), 113 deletions(-)

diff --git a/webapp/src/pages/TheChallengeGame.js b/webapp/src/pages/TheChallengeGame.js
index 66ad8b6d..748612ad 100644
--- a/webapp/src/pages/TheChallengeGame.js
+++ b/webapp/src/pages/TheChallengeGame.js
@@ -1,6 +1,5 @@
 import * as React from 'react';
 import axios from 'axios';
-
 import { Container, Box, Button, CssBaseline, Grid, Typography, CircularProgress, useTheme, MenuItem, Select, IconButton } from '@mui/material';
 import CheckIcon from '@mui/icons-material/Check';
 import ClearIcon from '@mui/icons-material/Clear';
@@ -112,7 +111,6 @@ const Game = () => {
     const startNewRound = async () => {
         setAnswered(false);
         setPassNewRound(false);
-        // It works deploying using git repo from machine with: axios.get(`http://20.80.235.188:8000/questions`)
         setCurrentLanguage(i18n.language);
         axios.get(`${apiEndpoint}/questions/${language}/${category}`) 
         .then(quest => {
@@ -345,125 +343,81 @@ const Game = () => {
         );
     }
 
- // redirect to / if game over 
- if (shouldRedirect) {
-    // Redirect after 4 seconds
-    setTimeout(() => {
-        navigate('/homepage');
-    }, 4000);
+    // redirect to / if game over 
+    if (shouldRedirect) {
+        // Redirect after 4 seconds
+        setTimeout(() => {
+            navigate('/homepage');
+        }, 4000);
+
 
+        return (
+            <Container sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', gap: '5em', textAlign: 'center', flex: '1' }}>
+                <CssBaseline />
+                <Typography variant="h2" data-testid="end-game-message" sx={{ color: correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? theme.palette.success.main : theme.palette.error.main }}>
+                    {correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? t("Game.win_msg") : t("Game.lose_msg") }
+                </Typography>
+                <Container>
+                    <Typography variant="h4">{ t("Game.correct") }: {correctlyAnsweredQuestions}</Typography>
+                    <Typography variant="h4">{ t("Game.incorrect") }: {incorrectlyAnsweredQuestions}</Typography>
+                    <Typography variant="h4">{ t("Game.money") }: {totalScore}</Typography>
+                    <Typography variant="h4">{ t("Game.time") }: {totalTimePlayed}</Typography>
+                </Container>
+                {showConfetti && <Confetti />}
+            </Container>
+        );
+    }
 
     return (
-        <Container
-            sx={{ 
-                display: 'flex', 
-                flexDirection: 'column',
-                justifyContent: 'center', 
-                alignItems: 'center', 
-                gap: '5em',
-                textAlign: 'center',
-                flex: '1'
-            }}
-        >
+        <Container sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'space-around', alignItems: 'center', textAlign: 'center', flex: '1', gap: '2em', margin: '0 auto', padding: '1em 0' }}>
             <CssBaseline />
-            <Typography variant="h2" data-testid="end-game-message"
-                    sx={{ color: correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? theme.palette.success.main : theme.palette.error.main }}>
-                {correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? t("Game.win_msg") : t("Game.lose_msg") }
-            </Typography>
-            <Container>
-                <Typography variant="h4">{ t("Game.correct") }: {correctlyAnsweredQuestions}</Typography>
-                <Typography variant="h4">{ t("Game.incorrect") }: {incorrectlyAnsweredQuestions}</Typography>
-                <Typography variant="h4">{ t("Game.money") }: {totalScore}</Typography>
-                <Typography variant="h4">{ t("Game.time") }: {totalTimePlayed}</Typography>
+
+            <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }} >
+                { answered ?
+                    // Pausa
+                    <Button variant="contained" onClick={() => togglePause()} sx={{ height: 100, width: 100, borderRadius: '50%' }} data-testid={ paused ? "play" : "pause"}>
+                        { paused ? <PlayArrow /> : <Pause /> }
+                    </Button>
+                    :
+                    // Cronómetro
+                    <CountdownCircleTimer data-testid="circleTimer" key={questionCountdownKey} isPlaying = {questionCountdownRunning} duration={15} colorsTime={[10, 6, 3, 0]}
+                    colors={[theme.palette.success.main, "#F7B801", "#f50707", theme.palette.error.main]} size={100} onComplete={() => selectResponse(-1, "FAILED")}>
+                        {({ remainingTime }) => {
+                            return (
+                                <Box style={{ display: 'flex', alignItems: 'center' }}>
+                                    <Typography fontSize='1.2em' fontWeight='bold'>{remainingTime}</Typography>
+                                </Box>
+                            );
+                        }}
+                    </CountdownCircleTimer>
+                }
             </Container>
-            {showConfetti && <Confetti />}
-        </Container>
-    );
-}
-
-return (
-    <Container
-        sx={{ 
-            display: 'flex', 
-            flexDirection: 'column',
-            justifyContent: 'space-around',
-            alignItems: 'center', 
-            textAlign: 'center',
-            flex: '1',
-            gap: '2em',
-            margin: '2em auto 1em',
-        }}
-    >
-        <CssBaseline />
-
-        <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }} >
-            { answered ?
-                // Pausa
-                <Button variant="contained" onClick={() => togglePause()} sx={{ height: 100, width: 100, borderRadius: '50%' }} data-testid={ paused ? "play" : "pause"}>
-                    { paused ? <PlayArrow /> : <Pause /> }
-                </Button>
-                :
-                // Cronómetro
-                <CountdownCircleTimer
-                    data-testid="circleTimer"
-                    key={questionCountdownKey}
-                    isPlaying = {questionCountdownRunning}
-                    duration={timerConfig}
-                    colors={[theme.palette.success.main, "#F7B801", "#f50707", theme.palette.error.main]}
-                    size={100}
-                    colorsTime={[10, 6, 3, 0]}
-                    onComplete={() => selectResponse(-1, "FAILED")} //when time ends always fail question
-                    >
-                    {({ remainingTime }) => {
-                        return (
-                            <div style={{ display: 'flex', alignItems: 'center' }}>
-                            <div style={{ fontSize: '1.2em', fontWeight: 'bold' }}>{remainingTime}</div>
-                        </div>
-                        );
-                    }}
-                </CountdownCircleTimer>
-            }
-        </Container>
 
-        <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }} >
-            <Typography variant="h4" data-testid="question" sx={{ fontWeight:'bold', marginBottom:'0.7em' }} >
-                {questionData.question.toUpperCase()}
-            </Typography>
-
-            <Grid container spacing={2}>
-                {questionData.options.map((option, index) => (
-                    <Grid item xs={12} key={index}>
-                        <Button
-                            //data-testid="answer"
-                            data-testid={buttonStates[index] === "success" ? `success${index}` : buttonStates[index] === "failure" ? `failel${index}` : `answer${index}`}
-                            variant="contained"
-                            onClick={() => selectResponse(index, option)}
-                            disabled={buttonStates[index] !== null || answered} // before, you could still press more than one button
-                            sx={{
-                                height: "3.3em",
-                                width: "50%",
-                                borderRadius: "10px",
-                                margin: "5px",
-                                "&:disabled": {
-                                    backgroundColor: buttonStates[index] === "success" ? "green" : buttonStates[index] === "failure" ? "red" : "gray",
-                                    color: "white",
-                                },
-                            }}
-                        >
-                            {buttonStates[index] === "success" ? <CheckIcon /> : buttonStates[index] === "failure" ? <ClearIcon /> : null}
-                            {option}
-                        </Button>
-                    </Grid>
-                ))}
-            </Grid>
-        </Container>
+            <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }} >
+                <Typography variant="h4" data-testid="question" sx={{ fontWeight:'bold', marginBottom:'0.7em' }} >
+                    {questionData.question.toUpperCase()}
+                </Typography>
+
+                <Grid container spacing={2}>
+                    {questionData.options.map((option, index) => (
+                        <Grid item xs={12} key={index}>
+                            <Button data-testid={buttonStates[index] === "success" ? `success${index}` : buttonStates[index] === "failure" ? `failel${index}` : `answer${index}`}
+                                variant="contained" onClick={() => selectResponse(index, option)} disabled={buttonStates[index] !== null || answered}
+                                sx={{ height: "3.3em", width: "50%", borderRadius: "10px", margin: "5px", "&:disabled": { backgroundColor: buttonStates[index] === "success" ? "green" : buttonStates[index] === "failure" ? "red" : "gray", color: "white" }}}>
+                                {buttonStates[index] === "success" ? <CheckIcon /> : buttonStates[index] === "failure" ? <ClearIcon /> : null}
+                                {option}
+                            </Button>
+                        </Grid>
+                    ))}
+                </Grid>
+            </Container>
 
-        {/* Progress Cards */}
-        <Container sx={{ display: 'flex', flexDirection: 'row', alignItems: 'center', marginTop:'2em' }} >
-            {questionHistorialBar()}
+            {/* Progress Cards */}
+            <Container sx={{ display: 'flex', flexDirection: 'row', alignItems: 'center', marginTop:'2em' }} >
+                {questionHistorialBar()}
+            </Container>
         </Container>
-    </Container>
-);
+    );
 };
 
 export default Game;
\ No newline at end of file

From c0b2f3641ea3ae9283d284b57586294fa6650232 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Wed, 24 Apr 2024 23:52:25 +0200
Subject: [PATCH 066/132] Minor style changes in game

---
 webapp/src/pages/Game.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapp/src/pages/Game.js b/webapp/src/pages/Game.js
index 9536556d..2d0d698d 100644
--- a/webapp/src/pages/Game.js
+++ b/webapp/src/pages/Game.js
@@ -243,7 +243,7 @@ const Game = () => {
 
 
         return (
-            <Container sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', gap: '5em', textAlign: 'center', flex: '1'}}>
+            <Container sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', gap: '4em', textAlign: 'center', flex: '1'}}>
                 <CssBaseline />
                 <Typography variant="h2" data-testid="end-game-message" sx={{ color: correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? theme.palette.success.main : theme.palette.error.main }}>
                     {correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? t("Game.win_msg") : t("Game.lose_msg") }
@@ -284,17 +284,17 @@ const Game = () => {
                 }
             </Container>
 
-            <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }} >
-                <Typography variant="h4" data-testid="question" sx={{ fontWeight:'bold', marginBottom:'0.7em' }} >
+            <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center', gap: '1em' }} >
+                <Typography variant="h4" data-testid="question" fontWeight="bold" >
                     {questionData.question.toUpperCase()}
                 </Typography>
 
-                <Grid container spacing={2}>
+                <Grid container spacing={2} gap="0.7em">
                     {questionData.options.map((option, index) => (
                         <Grid item xs={12} key={index}>
                             <Button data-testid={buttonStates[index] === "success" ? `success${index}` : buttonStates[index] === "failure" ? `failel${index}` : `answer${index}`}
                                 variant="contained" onClick={() => selectResponse(index, option)} disabled={buttonStates[index] !== null || answered}
-                                sx={{ height: "3.3em", width: "50%", borderRadius: "10px", margin: "5px", "&:disabled": { backgroundColor: buttonStates[index] === "success" ? theme.palette.success.main : buttonStates[index] === "failure" ? theme.palette.error.main : "gray", color: "white"}}}>
+                                sx={{ height: "3.3em", width: "50%", borderRadius: "10px", "&:disabled": { backgroundColor: buttonStates[index] === "success" ? theme.palette.success.main : buttonStates[index] === "failure" ? theme.palette.error.main : "gray", color: "white"}}}>
                                 {buttonStates[index] === "success" ? <CheckIcon /> : buttonStates[index] === "failure" ? <ClearIcon /> : null}
                                 {option}
                             </Button>

From 3e6a939a68b0ef4e0f0541e9cd9174b2e6f43a27 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Wed, 24 Apr 2024 23:52:51 +0200
Subject: [PATCH 067/132] Style changes in Wise Men

---
 webapp/src/pages/WiseMenStackGame.js | 197 ++++++++++++---------------
 1 file changed, 90 insertions(+), 107 deletions(-)

diff --git a/webapp/src/pages/WiseMenStackGame.js b/webapp/src/pages/WiseMenStackGame.js
index 0d12683d..cd16974b 100644
--- a/webapp/src/pages/WiseMenStackGame.js
+++ b/webapp/src/pages/WiseMenStackGame.js
@@ -1,8 +1,9 @@
 import * as React from 'react';
 import axios from 'axios';
-import { Container, Box, Button, CssBaseline, Grid, Typography, CircularProgress, Card, CardContent, Select, MenuItem, useTheme } from '@mui/material';
+import { Container, Box, Button, CssBaseline, Grid, Typography, CircularProgress, Card, Select, MenuItem, useTheme } from '@mui/material';
 import CheckIcon from '@mui/icons-material/Check';
 import ClearIcon from '@mui/icons-material/Clear';
+import { PlayArrow, Pause } from '@mui/icons-material';
 import { useNavigate } from 'react-router-dom';
 import { SessionContext } from '../SessionContext';
 import { useContext } from 'react';
@@ -47,6 +48,8 @@ const WiseMenStackGame = () => {
     const [category, setCategory] = React.useState('Geography');
     const [possibleAnswers, setPossibleAnswers] = React.useState([]);
     const [isConfigured, setConfiguration] = React.useState(false);
+    const [paused, setPaused] = React.useState(false);
+    const [passNewRound, setPassNewRound] = React.useState(false);
 
     const [questionHistorial, setQuestionHistorial] = React.useState(Array(round).fill(null));
 
@@ -83,13 +86,21 @@ const WiseMenStackGame = () => {
         } else {
           setShowConfetti(false);
         }
-      }, [correctlyAnsweredQuestions, incorrectlyAnsweredQuestions]);
+    }, [correctlyAnsweredQuestions, incorrectlyAnsweredQuestions]);
     
+    React.useEffect(() => {
+        if (passNewRound && !paused) {
+            setRound(prevRound => {
+                return prevRound + 1;
+            });
+            setButtonStates([]);
+        }
+    }, [paused, passNewRound]);
 
-    // gets a random question from the database and initializes button states to null
     const startNewRound = async () => {
         setAnswered(false);
-        // It works deploying using git repo from machine with: axios.get(`http://20.80.235.188:8000/questions`)7
+
+        setPassNewRound(false);
         
         // Updates current language
         setCurrentLanguage(i18n.language);
@@ -102,6 +113,19 @@ const WiseMenStackGame = () => {
 
         }).catch(error => {
             console.error("Could not get questions", error);
+            let quest = {}
+            quest.data = {
+                "_id":"1",
+                "question":"Esta pregunta de prueba resulta de su agrado?",
+                "options":["Muchísimo","Un cacho","Tope flama","Fino filipino"],
+                "correctAnswer":"Tope flama",
+                "categories":["Political"],
+                "id":"1",
+                "__v":0
+            };
+            setQuestionData(quest.data);
+            setButtonStates(new Array(quest.data.options.length).fill(null));
+            getPossibleOptions(quest.data);
         }); 
         
     };
@@ -207,27 +231,21 @@ const WiseMenStackGame = () => {
         setButtonStates(newButtonStates);
 
         setTimeout(async() => {
-            setRound(round + 1);
-            setButtonStates([]);
+            setPassNewRound(true);
             setCurrentLanguage(i18n.language);
-        }, 2000);
+        }, 4000);
     };
 
     const questionHistorialBar = () => {
         return questionHistorial.map((isCorrect, index) => (
-        <Card 
-          key={index + 1}
-          variant="outlined"
-          style={{ 
-            width: `${100 / round-1}%`,
-            marginRight: '0.6em',
-            backgroundColor: isCorrect === null ? 'gray' : isCorrect ? 'lightgreen' : 'salmon',
-          }}
-        >
-          <CardContent>{index + 1}</CardContent>
-        </Card>
+            <Card sx={{ width: `${100 / round-1}%`, padding:'0.2em', margin:'0 0.1em', backgroundColor: isCorrect === null ? 'gray' : isCorrect ? theme.palette.success.main : theme.palette.error.main }}/>
         ));
     };
+
+    const togglePause = () => {
+        setTimerRunning(!timerRunning);
+        setPaused(!paused);
+    }
     
     if(!isConfigured) {
         return (
@@ -315,94 +333,65 @@ const WiseMenStackGame = () => {
         }, 4000);
 
         return (
-            <Container
-                sx={{
-                    display: 'flex',
-                    flexDirection: 'column',
-                    alignItems: 'center',
-                    justifyContent: 'center',
-                    height: '100vh',
-                    textAlign: 'center',
-                }}
-            >
+            <Container sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', gap: '4em', textAlign: 'center', flex: '1'}}>
                 <CssBaseline />
-                <Typography 
-                data-testid="end-game-message"
-                variant="h4" 
-                sx={{
-                    color: correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? 'green' : 'red',
-                    fontSize: '4rem', // Tamaño de fuente
-                    marginTop: '20px', // Espaciado superior
-                    marginBottom: '50px', // Espaciado inferior
-                }}
-            >
-                {correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? t("Game.win_msg") : t("Game.lose_msg") }
-            </Typography>
-                <div>
-                    <Typography variant="h6">{ t("Game.correct") }: {correctlyAnsweredQuestions}</Typography>
-                    <Typography variant="h6">{ t("Game.incorrect") }: {incorrectlyAnsweredQuestions}</Typography>
-                    <Typography variant="h6">{ t("Game.money") }: {totalScore}</Typography>
-                    <Typography variant="h6">{ t("Game.time") }: {totalTimePlayed}</Typography>
-                </div>
+                <Typography variant="h2" data-testid="end-game-message" sx={{ color: correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? theme.palette.success.main : theme.palette.error.main }}>
+                    {correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? t("Game.win_msg") : t("Game.lose_msg") }
+                </Typography>
+                <Container>
+                    <Typography variant="h4">{ t("Game.correct") }: {correctlyAnsweredQuestions}</Typography>
+                    <Typography variant="h4">{ t("Game.incorrect") }: {incorrectlyAnsweredQuestions}</Typography>
+                    <Typography variant="h4">{ t("Game.money") }: {totalScore}</Typography>
+                    <Typography variant="h4">{ t("Game.time") }: {totalTimePlayed}</Typography>
+                </Container>
                 {showConfetti && <Confetti />}
             </Container>
         );
     }
 
     return (
-        <Container
-            sx={{
-                display: 'flex',
-                flexDirection: 'column',
-                alignItems: 'center',
-                justifyContent: 'center',
-                height: '100vh',
-                textAlign: 'center',
-            }}
-        >
+        <Container sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'space-around', alignItems: 'center', textAlign: 'center', flex: '1', gap: '2em', margin: '0 auto', padding: '1em 0' }}>
             <CssBaseline />
-            
-            <Container
-            sx={{
-                position: 'absolute',
-                top: '10%', 
-                right: '20%', 
-            }}>
-                <Container
-                    sx={{
-                        display: 'flex',
-                        flexDirection: 'row',
-                        alignItems: 'center',
-                    }}
-                >
-                    {questionHistorialBar()}
-                </Container>
+
+            <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }} >
+                { answered ?
+                    // Pausa
+                    <Button variant="contained" onClick={() => togglePause()} sx={{ height: 100, width: 100, borderRadius: '50%' }} data-testid={ paused ? "play" : "pause"}>
+                        { paused ? <PlayArrow /> : <Pause /> }
+                    </Button>
+                    :
+                    // Cronómetro
+                    <CountdownCircleTimer data-testid="circleTimer" key={questionCountdownKey} isPlaying = {questionCountdownRunning} duration={15} colorsTime={[10, 6, 3, 0]}
+                        colors={[theme.palette.success.main, "#F7B801", "#f50707", theme.palette.error.main]} size={100} onComplete={() => selectResponse(-1, "FAILED")}>
+                        {({ remainingTime }) => {
+                            return (
+                                <Box style={{ display: 'flex', alignItems: 'center' }}>
+                                    <Typography fontSize='1.2em' fontWeight='bold'>{remainingTime}</Typography>
+                                </Box>
+                            );
+                        }}
+                    </CountdownCircleTimer>
+                }
             </Container>
 
-            <Typography variant='h6' data-testid="numRound">
-                {t("Game.round")} {round} 
-            </Typography>
-            <Typography variant="h5" mb={4} fontWeight="bold" style={{ display: 'flex', alignItems: 'center' }}>
-            <span data-testid="question" style={{ marginRight: '1em' }}>{questionData.question}</span>
-                <CountdownCircleTimer
-                  data-testid="circleTimer"
-                  key={questionCountdownKey}
-                  isPlaying = {questionCountdownRunning}
-                  duration={60}
-                  colors={["#0bfc03", "#F7B801", "#f50707", "#A30000"]}
-                  size={100}
-                  colorsTime={[10, 6, 3, 0]}
-                  onComplete={() => selectResponse(0, "FAILED")} //when time ends always fail question
-                >
-                  {({ remainingTime }) => {
-                    return (
-                        <div style={{ display: 'flex', alignItems: 'center' }}>
-                        <div style={{ fontSize: '1.2em', fontWeight: 'bold' }}>{remainingTime}</div>
-                      </div>
-                    );
-                  }}
-                </CountdownCircleTimer>
-            </Typography>
+            <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center', gap: '1em' }} >
+                <Typography variant="h4" data-testid="question" fontWeight="bold" >
+                    {questionData.question.toUpperCase()}
+                </Typography>
+
+                <Grid container spacing={2} gap="0.7em">
+                    {possibleAnswers.map((option, index) => (
+                        <Grid item xs={12} key={index}>
+                            <Button data-testid="answer"
+                                variant="contained" onClick={() => selectResponse(index, option)} disabled={buttonStates[index] !== null || answered}
+                                sx={{ height: "3.3em", width: "50%", borderRadius: "10px", "&:disabled": { backgroundColor: buttonStates[index] === "success" ? theme.palette.success.main : buttonStates[index] === "failure" ? theme.palette.error.main : "gray", color: "white"}}}>
+                                {buttonStates[index] === "success" ? <CheckIcon /> : buttonStates[index] === "failure" ? <ClearIcon /> : null}
+                                {option}
+                            </Button>
+                        </Grid>
+                    ))}
+                </Grid>
+            </Container>
 
             <Grid container spacing={2}>
                 {possibleAnswers.map((option, index) => (
@@ -412,17 +401,7 @@ const WiseMenStackGame = () => {
                             variant="contained"
                             onClick={() => selectResponse(index, option)}
                             disabled={buttonStates[index] !== null || answered} // before, you could still press more than one button
-                            sx={{
-                                height: "50px", // Ajusta el tamaño según sea necesario
-                                width: "50%", // Ajusta el ancho según sea necesario
-                                borderRadius: "20px", // Ajusta el radio según sea necesario
-                                margin: "5px",
-                                backgroundColor: buttonStates[index] === "success" ? "green" : buttonStates[index] === "failure" ? "red" : null,
-                                "&:disabled": {
-                                    backgroundColor: buttonStates[index] === "success" ? "green" : buttonStates[index] === "failure" ? "red" : "gray",
-                                    color: "white",
-                                },
-                            }}
+                            
                         >
                             {buttonStates[index] === "success" ? <CheckIcon /> : buttonStates[index] === "failure" ? <ClearIcon /> : null}
                             {option}
@@ -430,6 +409,10 @@ const WiseMenStackGame = () => {
                     </Grid>
                 ))}
             </Grid>
+
+            <Container sx={{ display: 'flex', flexDirection: 'row', alignItems: 'center', marginTop:'2em' }} >
+                {questionHistorialBar()}
+            </Container>
         </Container>
     );
 };

From 7f5b664cdebb5298c8747841bd22a0eb1bcc9f50 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Thu, 25 Apr 2024 00:09:39 +0200
Subject: [PATCH 068/132] Final style for WiseMen

---
 webapp/src/pages/WiseMenStackGame.js | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/webapp/src/pages/WiseMenStackGame.js b/webapp/src/pages/WiseMenStackGame.js
index cd16974b..c52f4665 100644
--- a/webapp/src/pages/WiseMenStackGame.js
+++ b/webapp/src/pages/WiseMenStackGame.js
@@ -238,7 +238,7 @@ const WiseMenStackGame = () => {
 
     const questionHistorialBar = () => {
         return questionHistorial.map((isCorrect, index) => (
-            <Card sx={{ width: `${100 / round-1}%`, padding:'0.2em', margin:'0 0.1em', backgroundColor: isCorrect === null ? 'gray' : isCorrect ? theme.palette.success.main : theme.palette.error.main }}/>
+            <Card sx={{ width: `${100 / round}%`, padding:'0.2em', margin:'0 0.1em', backgroundColor: isCorrect === null ? 'gray' : isCorrect ? theme.palette.success.main : theme.palette.error.main }}/>
         ));
     };
 
@@ -382,7 +382,7 @@ const WiseMenStackGame = () => {
                 <Grid container spacing={2} gap="0.7em">
                     {possibleAnswers.map((option, index) => (
                         <Grid item xs={12} key={index}>
-                            <Button data-testid="answer"
+                            <Button data-testid={buttonStates[index] === "success" ? `success${index}` : buttonStates[index] === "failure" ? `failel${index}` : `answer${index}`}
                                 variant="contained" onClick={() => selectResponse(index, option)} disabled={buttonStates[index] !== null || answered}
                                 sx={{ height: "3.3em", width: "50%", borderRadius: "10px", "&:disabled": { backgroundColor: buttonStates[index] === "success" ? theme.palette.success.main : buttonStates[index] === "failure" ? theme.palette.error.main : "gray", color: "white"}}}>
                                 {buttonStates[index] === "success" ? <CheckIcon /> : buttonStates[index] === "failure" ? <ClearIcon /> : null}
@@ -393,25 +393,9 @@ const WiseMenStackGame = () => {
                 </Grid>
             </Container>
 
-            <Grid container spacing={2}>
-                {possibleAnswers.map((option, index) => (
-                    <Grid item xs={12} key={index}>
-                        <Button
-                            data-testid="answer"
-                            variant="contained"
-                            onClick={() => selectResponse(index, option)}
-                            disabled={buttonStates[index] !== null || answered} // before, you could still press more than one button
-                            
-                        >
-                            {buttonStates[index] === "success" ? <CheckIcon /> : buttonStates[index] === "failure" ? <ClearIcon /> : null}
-                            {option}
-                        </Button>
-                    </Grid>
-                ))}
-            </Grid>
-
             <Container sx={{ display: 'flex', flexDirection: 'row', alignItems: 'center', marginTop:'2em' }} >
                 {questionHistorialBar()}
+                { answered || round === 1 ? <Box></Box> : <Card sx={{ width: `${100 / round}%`, padding:'0.2em', margin:'0 0.1em', backgroundColor: 'gray' }}/> }
             </Container>
         </Container>
     );

From 18b2576d0f0cf614b17f66a3f8b155f9912c25d6 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Thu, 25 Apr 2024 00:12:31 +0200
Subject: [PATCH 069/132] Remove test question

---
 webapp/src/pages/WiseMenStackGame.js | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/webapp/src/pages/WiseMenStackGame.js b/webapp/src/pages/WiseMenStackGame.js
index c52f4665..436937c7 100644
--- a/webapp/src/pages/WiseMenStackGame.js
+++ b/webapp/src/pages/WiseMenStackGame.js
@@ -113,19 +113,6 @@ const WiseMenStackGame = () => {
 
         }).catch(error => {
             console.error("Could not get questions", error);
-            let quest = {}
-            quest.data = {
-                "_id":"1",
-                "question":"Esta pregunta de prueba resulta de su agrado?",
-                "options":["Muchísimo","Un cacho","Tope flama","Fino filipino"],
-                "correctAnswer":"Tope flama",
-                "categories":["Political"],
-                "id":"1",
-                "__v":0
-            };
-            setQuestionData(quest.data);
-            setButtonStates(new Array(quest.data.options.length).fill(null));
-            getPossibleOptions(quest.data);
         }); 
         
     };

From 59bf639aec4a75fedfeff63c330d0aba3d0b6729 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Thu, 25 Apr 2024 00:33:29 +0200
Subject: [PATCH 070/132] Stylized pause & play button

---
 webapp/src/pages/Game.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/webapp/src/pages/Game.js b/webapp/src/pages/Game.js
index 2d0d698d..8436d7c6 100644
--- a/webapp/src/pages/Game.js
+++ b/webapp/src/pages/Game.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import axios from 'axios';
-import { useTheme, Container, Button, CssBaseline, Grid, Typography, CircularProgress, Card, Box } from '@mui/material';
+import { useTheme, Container, Button, CssBaseline, Grid, Typography, CircularProgress, Card, Box, IconButton } from '@mui/material';
 import { PlayArrow, Pause } from '@mui/icons-material';
 import CheckIcon from '@mui/icons-material/Check';
 import ClearIcon from '@mui/icons-material/Clear';
@@ -266,9 +266,9 @@ const Game = () => {
             <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }} >
                 { answered ?
                     // Pausa
-                    <Button variant="contained" onClick={() => togglePause()} sx={{ height: 100, width: 100, borderRadius: '50%' }} data-testid={ paused ? "play" : "pause"}>
-                        { paused ? <PlayArrow /> : <Pause /> }
-                    </Button>
+                    <IconButton variant="contained" size="large" color="primary" onClick={() => togglePause()} sx={{ height: 100, width: 100, border: `2px solid ${theme.palette.primary.main}` }} data-testid={ paused ? "play" : "pause"} >
+                        { paused ? <PlayArrow sx={{ fontSize:75 }} /> : <Pause sx={{ fontSize:75 }} /> }
+                    </IconButton>
                     :
                     // Cronómetro
                     <CountdownCircleTimer data-testid="circleTimer" key={questionCountdownKey} isPlaying = {questionCountdownRunning} duration={15} colorsTime={[10, 6, 3, 0]}

From d13cdf50ceb0d9320e331ca1c3a4abd558fc8207 Mon Sep 17 00:00:00 2001
From: uo288245 <uo288245@uniovi.es>
Date: Thu, 25 Apr 2024 00:33:43 +0200
Subject: [PATCH 071/132] Fixed the Warm Question game view.

---
 webapp/src/pages/Game.js             |   6 +-
 webapp/src/pages/WarmQuestionGame.js | 300 ++++++++++-----------------
 2 files changed, 107 insertions(+), 199 deletions(-)

diff --git a/webapp/src/pages/Game.js b/webapp/src/pages/Game.js
index 9536556d..d3e0bc26 100644
--- a/webapp/src/pages/Game.js
+++ b/webapp/src/pages/Game.js
@@ -226,22 +226,20 @@ const Game = () => {
     // circular loading
     if (!questionData) {
         return (
-            <Container
-                sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', flex: '1'}}>
+            <Container sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', flex: '1'}}>
                 <CssBaseline />
                 <CircularProgress />
             </Container>
         );
     }
 
-    // redirect to / if game over 
+    // redirect to homepage if game over 
     if (shouldRedirect) {
         // Redirect after 4 seconds
         setTimeout(() => {
             navigate('/homepage');
         }, 4000);
 
-
         return (
             <Container sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', gap: '5em', textAlign: 'center', flex: '1'}}>
                 <CssBaseline />
diff --git a/webapp/src/pages/WarmQuestionGame.js b/webapp/src/pages/WarmQuestionGame.js
index bcd63cf9..81d18427 100644
--- a/webapp/src/pages/WarmQuestionGame.js
+++ b/webapp/src/pages/WarmQuestionGame.js
@@ -1,7 +1,6 @@
 import * as React from 'react';
 import axios from 'axios';
-
-import { Container, Button, CssBaseline, Grid, Typography, CircularProgress } from '@mui/material';
+import { useTheme, Container, Button, CssBaseline, Grid, Typography, CircularProgress, Card, Box } from '@mui/material';
 import { PlayArrow, Pause } from '@mui/icons-material';
 import CheckIcon from '@mui/icons-material/Check';
 import ClearIcon from '@mui/icons-material/Clear';
@@ -10,13 +9,11 @@ import { SessionContext } from '../SessionContext';
 import { useContext } from 'react';
 import Confetti from 'react-confetti';
 import { CountdownCircleTimer } from "react-countdown-circle-timer";
-import Card from '@mui/material/Card';
-import CardContent from '@mui/material/CardContent';
+import { useTranslation } from 'react-i18next';
 import i18n from '../localize/i18n';
 
 const apiEndpoint = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
 
-
 const Game = () => {
     const navigate = useNavigate();
     const MAX_ROUNDS = 10;
@@ -26,6 +23,11 @@ const Game = () => {
     //sesion information
     const {username} = useContext(SessionContext);
 
+    // Translations
+    const { t } = useTranslation();
+
+    const theme = useTheme();
+
     // state initialization
     const [round, setRound] = React.useState(1);
     const [questionData, setQuestionData] = React.useState(null);
@@ -42,11 +44,12 @@ const Game = () => {
     const [questionCountdownKey, setQuestionCountdownKey] = React.useState(15); //key to update question timer
     const [questionCountdownRunning, setQuestionCountdownRunning] = React.useState(false); //property to start and stop question timer
     const [userResponses, setUserResponses] = React.useState([]);
+    const [paused, setPaused] = React.useState(false);
+    const [passNewRound, setPassNewRound] = React.useState(false);
     const [language, setCurrentLanguage] = React.useState(i18n.language);
 
     const [questionHistorial, setQuestionHistorial] = React.useState(Array(MAX_ROUNDS).fill(null));
 
-
     React.useEffect(() => {
         let timer;
         if (timerRunning) {
@@ -76,18 +79,23 @@ const Game = () => {
 
     // stablish if the confetti must show or not
     React.useEffect(() => {
-        if (correctlyAnsweredQuestions > incorrectlyAnsweredQuestions) {
-          setShowConfetti(true);
-        } else {
-          setShowConfetti(false);
+        correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? setShowConfetti(true) : setShowConfetti(false);
+    }, [correctlyAnsweredQuestions, incorrectlyAnsweredQuestions]);
+
+    React.useEffect(() => {
+        if (passNewRound && !paused) {
+            setRound(prevRound => {
+                return prevRound + 1;
+            });
+            setButtonStates([]);
         }
-      }, [correctlyAnsweredQuestions, incorrectlyAnsweredQuestions]);
-    
+    }, [paused, passNewRound]);
 
     // gets a random question from the database and initializes button states to null
     const startNewRound = async () => {
         setAnswered(false);
-        // It works deploying using git repo from machine with: axios.get(`http://20.80.235.188:8000/questions`)
+        setPassNewRound(false);
+
         // Updates current language
         setCurrentLanguage(i18n.language);
         axios.get(`${apiEndpoint}/questions/${language}`)
@@ -96,9 +104,20 @@ const Game = () => {
             setQuestionData(quest.data);    
             setButtonStates(new Array(quest.data.options.length).fill(null));
         }).catch(error => {
-            console.error(error);
+            // console.error(error);
+            let quest = {}
+            quest.data = {
+                "_id":"1",
+                "question":"Esta pregunta de prueba resulta de su agrado?",
+                "options":["Muchísimo","Un cacho","Tope flama","Fino filipino"],
+                "correctAnswer":"Tope flama",
+                "categories":["Political"],
+                "id":"1",
+                "__v":0
+            };
+            setQuestionData(quest.data);
+            setButtonStates(new Array(quest.data.options.length).fill(null));
         }); 
-        
     };
 
     const updateStatistics = async() => {
@@ -233,212 +252,103 @@ const Game = () => {
 
     const questionHistorialBar = () => {
         return questionHistorial.map((isCorrect, index) => (
-        <Card 
-          key={index + 1}
-          variant="outlined"
-          style={{ 
-            width: `${100 / MAX_ROUNDS}%`,
-            marginRight: '0.6em',
-            backgroundColor: isCorrect === null ? 'gray' : isCorrect ? 'lightgreen' : 'salmon',
-          }}
-        >
-          <CardContent>{index + 1}</CardContent>
-        </Card>
+            <Card sx={{ width: `${100 / MAX_ROUNDS}%`, padding:'0.2em', margin:'0 0.1em', backgroundColor: isCorrect === null ? 'gray' : isCorrect ? theme.palette.success.main : theme.palette.error.main }}/>
         ));
-      };    
+    };    
 
     const togglePause = () => {
         setTimerRunning(!timerRunning);
-        setQuestionCountdownRunning(!timerRunning);
-        if (timerRunning) {
-            // Si el juego estaba en marcha y se pausa, deshabilitar los botones
-            setButtonStates(new Array(questionData.options.length).fill(true));
-        } else {
-            // Si el juego estaba pausado y se reanuda, habilitar los botones
-            setButtonStates(new Array(questionData.options.length).fill(null));
-        }
+        setPaused(!paused);
     }
 
-
     // circular loading
     if (!questionData) {
         return (
-            <Container
-                sx={{
-                    display: 'flex',
-                    flexDirection: 'column',
-                    alignItems: 'center',
-                    justifyContent: 'center',
-                    height: '100vh',
-                    textAlign: 'center',
-                }}
-            >
+            <Container sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', flex: '1'}}>
                 <CssBaseline />
                 <CircularProgress />
             </Container>
         );
     }
 
-    // redirect to / if game over 
-if (shouldRedirect) {
-    // Redirect after 3 seconds
-    setTimeout(() => {
-        navigate('/homepage');
-    }, 4000);
+    // redirect to homepage if game over 
+    if (shouldRedirect) {
+        // Redirect after 4 seconds
+        setTimeout(() => {
+            navigate('/homepage');
+        }, 4000);
 
+        return (
+            <Container sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', gap: '5em', textAlign: 'center', flex: '1'}}>
+                <CssBaseline />
+                <Typography variant="h2" data-testid="end-game-message" sx={{ color: correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? theme.palette.success.main : theme.palette.error.main }}>
+                    {correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? t("Game.win_msg") : t("Game.lose_msg") }
+                </Typography>
+                <Container>
+                    <Typography variant="h4">{ t("Game.correct") }: {correctlyAnsweredQuestions}</Typography>
+                    <Typography variant="h4">{ t("Game.incorrect") }: {incorrectlyAnsweredQuestions}</Typography>
+                    <Typography variant="h4">{ t("Game.money") }: {totalScore}</Typography>
+                    <Typography variant="h4">{ t("Game.time") }: {totalTimePlayed}</Typography>
+                </Container>
+                {showConfetti && <Confetti />}
+            </Container>
+        );
+    }
 
     return (
-        <Container
-            sx={{
-                display: 'flex',
-                flexDirection: 'column',
-                alignItems: 'center',
-                justifyContent: 'center',
-                height: '100vh',
-                textAlign: 'center',
-            }}
-        >
-            <CssBaseline />
-            <Typography 
-            data-testid="end-game-message"
-            variant="h4" 
-            sx={{
-                color: correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? 'green' : 'red',
-                fontSize: '4rem', // Tamaño de fuente
-                marginTop: '20px', // Espaciado superior
-                marginBottom: '50px', // Espaciado inferior
-            }}
-        >
-            {correctlyAnsweredQuestions > incorrectlyAnsweredQuestions ? "Great Job!" : "Game Over"}
-        </Typography>
-            <div>
-                <Typography variant="h6">Correct Answers: {correctlyAnsweredQuestions}</Typography>
-                <Typography variant="h6">Incorrect Answers: {incorrectlyAnsweredQuestions}</Typography>
-                <Typography variant="h6">Skipped Questions: {passedQuestions}</Typography>
-                <Typography variant="h6">Total money: {totalScore}</Typography>
-                <Typography variant="h6">Game time: {totalTimePlayed} seconds</Typography>
-            </div>
-            {showConfetti && <Confetti />}
-        </Container>
-    );
-}
-    return (
-        <Container
-            sx={{
-                display: 'flex',
-                flexDirection: 'column',
-                alignItems: 'center',
-                justifyContent: 'center',
-                height: '100vh',
-                textAlign: 'center',
-            }}
-        >
+        <Container sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'space-around', alignItems: 'center', textAlign: 'center', flex: '1', gap: '2em', margin: '0 auto', padding: '1em 0' }}>
             <CssBaseline />
             
-            <Typography
-                variant="h6"
-                sx={{
-                    position: 'absolute',
-                    top: '10%', 
-                    right: '5%',
-                }}
-            >
-                Game time: {totalTimePlayed} s
-      
-            </Typography>
-
-            <Button variant="contained"
-                    onClick={() => togglePause()}
-                    disabled={answered}>
-
-                {timerRunning ? <Pause /> : <PlayArrow />}
-                {timerRunning ? 'Pause' : 'Play'}
-            </Button>
-
-            <Container
-            sx={{
-                position: 'absolute',
-                top: '10%', 
-                right: '20%', 
-            }}>
-                <Container
-                    sx={{
-                        display: 'flex',
-                        flexDirection: 'row',
-                        alignItems: 'center',
-                    }}
-                >
-                    {questionHistorialBar()}
-                </Container>
+            <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }} >
+                { answered ?
+                    // Pausa
+                    <Button variant="contained" onClick={() => togglePause()} sx={{ height: 100, width: 100, borderRadius: '50%' }} data-testid={ paused ? "play" : "pause"}>
+                        { paused ? <PlayArrow /> : <Pause /> }
+                    </Button>
+                    :
+                    // Cronómetro
+                    <CountdownCircleTimer data-testid="circleTimer" key={questionCountdownKey} isPlaying = {questionCountdownRunning} duration={15} colorsTime={[10, 6, 3, 0]}
+                        colors={[theme.palette.success.main, "#F7B801", "#f50707", theme.palette.error.main]} size={100} onComplete={() => selectResponse(-1, "FAILED")}>
+                        {({ remainingTime }) => {
+                            return (
+                                <Box style={{ display: 'flex', alignItems: 'center' }}>
+                                    <Typography fontSize='1.2em' fontWeight='bold'>{remainingTime}</Typography>
+                                </Box>
+                            );
+                        }}
+                    </CountdownCircleTimer>
+                }
             </Container>
 
-            <Typography variant='h6' data-testid="numRound">
-                {round} / {MAX_ROUNDS}
-            </Typography>
-            <Typography variant="h5" mb={4} fontWeight="bold" style={{ display: 'flex', alignItems: 'center' }}>
-            <span data-testid="question" style={{ marginRight: '1em' }}>{questionData.question}</span>
-                <CountdownCircleTimer
-                  data-testid="circleTimer"
-                  key={questionCountdownKey}
-                  isPlaying = {questionCountdownRunning}
-                  duration={15}
-                  colors={["#0bfc03", "#F7B801", "#f50707", "#A30000"]}
-                  size={100}
-                  colorsTime={[10, 6, 3, 0]}
-                  onComplete={() => selectResponse(0, "FAILED")} //when time ends always fail question
-                >
-                  {({ remainingTime }) => {
-                    return (
-                        <div style={{ display: 'flex', alignItems: 'center' }}>
-                        <div style={{ fontSize: '1.2em', fontWeight: 'bold' }}>{remainingTime}</div>
-                      </div>
-                    );
-                  }}
-                </CountdownCircleTimer>
-            </Typography>
-
-            <Grid container spacing={2}>
-                {questionData.options.map((option, index) => (
-                    <Grid item xs={12} key={index}>
-                        <Button
-                            data-testid="answer"
-                            variant="contained"
-                            onClick={() => selectResponse(index, option)}
-                            disabled={buttonStates[index] !== null || answered} // before, you could still press more than one button
-                            sx={{
-                                height: "50px", // Ajusta el tamaño según sea necesario
-                                width: "50%", // Ajusta el ancho según sea necesario
-                                borderRadius: "20px", // Ajusta el radio según sea necesario
-                                margin: "5px",
-                                backgroundColor: buttonStates[index] === "success" ? "green" : buttonStates[index] === "failure" ? "red" : null,
-                                "&:disabled": {
-                                    backgroundColor: buttonStates[index] === "success" ? "green" : buttonStates[index] === "failure" ? "red" : "gray",
-                                    color: "white",
-                                },
-                            }}
-                        >
-                            {buttonStates[index] === "success" ? <CheckIcon /> : buttonStates[index] === "failure" ? <ClearIcon /> : null}
-                            {option}
-                        </Button>
-                    </Grid>
-                ))}
-            </Grid>
+            <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center', gap:'1em' }}>
+                <Typography variant="h4" data-testid="question" sx={{ fontWeight:'bold' }}>
+                    {questionData.question.toUpperCase()}
+                </Typography>
+
+                <Grid container spacing={2}>
+                    {questionData.options.map((option, index) => (
+                        <Grid item xs={12} key={index}>
+                            <Button data-testid={buttonStates[index] === "success" ? `success${index}` : buttonStates[index] === "failure" ? `failel${index}` : `answer${index}`}
+                                variant="contained" onClick={() => selectResponse(index, option)} disabled={buttonStates[index] !== null || answered}
+                                sx={{ height: "3.3em", width: "50%", borderRadius: "10px", "&:disabled": { backgroundColor: buttonStates[index] === "success" ? theme.palette.success.main : buttonStates[index] === "failure" ? theme.palette.error.main : "gray", color: "white"}}}>
+                                {buttonStates[index] === "success" ? <CheckIcon /> : buttonStates[index] === "failure" ? <ClearIcon /> : null}
+                                {option}
+                            </Button>
+                        </Grid>
+                    ))}
+                </Grid>
+            </Container>
 
             {!answered && (
-            <Button
-                variant="contained"
-                onClick={() => selectResponse(null, null)}
-                sx={{
-                    margin: "15px",
-                    backgroundColor: "red",
-                    fontWeight: "bold",
-                }}
-            >
-            {"Skip"}
-            </Button>
+                <Button variant="contained" onClick={() => selectResponse(null, null)} sx={{ backgroundColor: theme.palette.error.main, fontWeight: "bold" }}>
+                    {"Skip"}
+                </Button>
             )}
 
-            
+            {/* Progress Cards */}
+            <Container sx={{ display: 'flex', flexDirection: 'row', alignItems: 'center' }} >
+                {questionHistorialBar()}
+            </Container>
         </Container>
     );
 };

From b0680414bbb18d5942ccb4821213499b649802c8 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Thu, 25 Apr 2024 00:40:18 +0200
Subject: [PATCH 072/132] Improved pause button with labels and applied to
 other games

---
 webapp/src/pages/DiscoveringCitiesGame.js | 10 ++++++----
 webapp/src/pages/Game.js                  |  4 +++-
 webapp/src/pages/TheChallengeGame.js      |  8 +++++---
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/webapp/src/pages/DiscoveringCitiesGame.js b/webapp/src/pages/DiscoveringCitiesGame.js
index efee9fc4..2cbb9168 100644
--- a/webapp/src/pages/DiscoveringCitiesGame.js
+++ b/webapp/src/pages/DiscoveringCitiesGame.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import axios from 'axios';
-import { useTheme, Container, Button, CssBaseline, Grid, Typography, CircularProgress, Card, Box } from '@mui/material';
+import { useTheme, Container, Button, CssBaseline, Grid, Typography, CircularProgress, Card, Box, IconButton } from '@mui/material';
 import { PlayArrow, Pause } from '@mui/icons-material';
 import CheckIcon from '@mui/icons-material/Check';
 import ClearIcon from '@mui/icons-material/Clear';
@@ -265,9 +265,11 @@ const DiscovertingCitiesGame = () => {
             <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }} >
                 { answered ?
                     // Pausa
-                    <Button variant="contained" onClick={() => togglePause()} sx={{ height: 100, width: 100, borderRadius: '50%' }} data-testid={ paused ? "play" : "pause"}>
-                        { paused ? <PlayArrow /> : <Pause /> }
-                    </Button>
+                    <IconButton variant="contained" size="large" color="primary" aria-label={ paused ? t("Game.play") : t("Game.play") }
+                                onClick={() => togglePause()} sx={{ height: 100, width: 100, border: `2px solid ${theme.palette.primary.main}` }} 
+                                data-testid={ paused ? "play" : "pause"} >
+                        { paused ? <PlayArrow sx={{ fontSize:75 }} /> : <Pause sx={{ fontSize:75 }} /> }
+                    </IconButton>
                     :
                     // Cronómetro
                     <CountdownCircleTimer data-testid="circleTimer" key={questionCountdownKey} isPlaying = {questionCountdownRunning} duration={15} colorsTime={[10, 6, 3, 0]}
diff --git a/webapp/src/pages/Game.js b/webapp/src/pages/Game.js
index 8436d7c6..06d1e87c 100644
--- a/webapp/src/pages/Game.js
+++ b/webapp/src/pages/Game.js
@@ -266,7 +266,9 @@ const Game = () => {
             <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }} >
                 { answered ?
                     // Pausa
-                    <IconButton variant="contained" size="large" color="primary" onClick={() => togglePause()} sx={{ height: 100, width: 100, border: `2px solid ${theme.palette.primary.main}` }} data-testid={ paused ? "play" : "pause"} >
+                    <IconButton variant="contained" size="large" color="primary" aria-label={ paused ? t("Game.play") : t("Game.play") }
+                                onClick={() => togglePause()} sx={{ height: 100, width: 100, border: `2px solid ${theme.palette.primary.main}` }} 
+                                data-testid={ paused ? "play" : "pause"} >
                         { paused ? <PlayArrow sx={{ fontSize:75 }} /> : <Pause sx={{ fontSize:75 }} /> }
                     </IconButton>
                     :
diff --git a/webapp/src/pages/TheChallengeGame.js b/webapp/src/pages/TheChallengeGame.js
index 748612ad..8a052d1d 100644
--- a/webapp/src/pages/TheChallengeGame.js
+++ b/webapp/src/pages/TheChallengeGame.js
@@ -375,9 +375,11 @@ const Game = () => {
             <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }} >
                 { answered ?
                     // Pausa
-                    <Button variant="contained" onClick={() => togglePause()} sx={{ height: 100, width: 100, borderRadius: '50%' }} data-testid={ paused ? "play" : "pause"}>
-                        { paused ? <PlayArrow /> : <Pause /> }
-                    </Button>
+                    <IconButton variant="contained" size="large" color="primary" aria-label={ paused ? t("Game.play") : t("Game.play") }
+                                onClick={() => togglePause()} sx={{ height: 100, width: 100, border: `2px solid ${theme.palette.primary.main}` }} 
+                                data-testid={ paused ? "play" : "pause"} >
+                        { paused ? <PlayArrow sx={{ fontSize:75 }} /> : <Pause sx={{ fontSize:75 }} /> }
+                    </IconButton>
                     :
                     // Cronómetro
                     <CountdownCircleTimer data-testid="circleTimer" key={questionCountdownKey} isPlaying = {questionCountdownRunning} duration={15} colorsTime={[10, 6, 3, 0]}

From 4fa6b720a754a2d320c9f944e42ca9df0e41b7bf Mon Sep 17 00:00:00 2001
From: uo288245 <uo288245@uniovi.es>
Date: Thu, 25 Apr 2024 00:58:25 +0200
Subject: [PATCH 073/132] Finished fising Warm Question game.

---
 webapp/src/localize/en.json          |  7 ++++---
 webapp/src/localize/es.json          | 13 +++++++------
 webapp/src/localize/fr.json          |  7 ++++---
 webapp/src/pages/WarmQuestionGame.js | 22 ++++++++++++++--------
 4 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/webapp/src/localize/en.json b/webapp/src/localize/en.json
index 4a297de9..2c3c3d8d 100644
--- a/webapp/src/localize/en.json
+++ b/webapp/src/localize/en.json
@@ -56,12 +56,13 @@
         "lose_msg": "Game Over",
         "correct": "Correct Answers",
         "incorrect": "Incorrect Answers",
-        "money": "Final points",
-        "time": "Game Time (sec)",
+        "money": "Final Points",
+        "time": "Game Seconds",
         "pause": "Pause",
         "play": "Play",
         "round": "Question ",
-        "start": "Start game",
+        "start": "Start Game",
+        "skip": "Skip",
         "config": {
             "title": "GAME CONFIGURATION",
             "num_rounds": "Number of rounds",
diff --git a/webapp/src/localize/es.json b/webapp/src/localize/es.json
index b97905db..79d0fdd4 100644
--- a/webapp/src/localize/es.json
+++ b/webapp/src/localize/es.json
@@ -53,15 +53,16 @@
 
     "Game": {
         "win_msg": "¡Buen trabajo!",
-        "lose_msg": "Fin del juego",
-        "correct": "Respuestas correctas",
-        "incorrect": "Respuestas incorrectas",
-        "money": "Puntos finales",
-        "time": "Tiempo de juego (seg)",
+        "lose_msg": "Fin del Juego",
+        "correct": "Respuestas Correctas",
+        "incorrect": "Respuestas Incorrectas",
+        "money": "Puntos Finales",
+        "time": "Segundos de Juego",
         "pause": "Pausa",
         "play": "Jugar",
         "round": "Pregunta ",
-        "start": "Empezar juego",
+        "start": "Empezar Juego",
+        "skip": "Saltar",
         "config": {
             "title": "CONFIGURACIÓN DEL JUEGO",
             "num_rounds": "Número de rondas",
diff --git a/webapp/src/localize/fr.json b/webapp/src/localize/fr.json
index 0dc34adf..50a58d9b 100644
--- a/webapp/src/localize/fr.json
+++ b/webapp/src/localize/fr.json
@@ -54,15 +54,16 @@
 
     "Game": {
         "win_msg": "Excellent travail !",
-        "lose_msg": "Partie terminée",
+        "lose_msg": "Partie Terminée",
         "correct": "Réponses Correctes",
         "incorrect": "Réponses Incorrectes",
         "money": "Points Finaux",
-        "time": "Temps de Jeu (sec)",
+        "time": "Secondes de Jeu",
         "pause": "Pause",
         "play": "Jouer",
         "round": "Question ",
-        "start": "Commencer à jouer",
+        "start": "Commencer à Jouer",
+        "skip": "Sauter",
         "config": {
             "title": "CONFIGURATION DU JEU",
             "num_rounds": "Nombre de tours",
diff --git a/webapp/src/pages/WarmQuestionGame.js b/webapp/src/pages/WarmQuestionGame.js
index 81d18427..72d230ad 100644
--- a/webapp/src/pages/WarmQuestionGame.js
+++ b/webapp/src/pages/WarmQuestionGame.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import axios from 'axios';
-import { useTheme, Container, Button, CssBaseline, Grid, Typography, CircularProgress, Card, Box } from '@mui/material';
+import { useTheme, Container, Button, CssBaseline, Grid, Typography, CircularProgress, Card, Box, IconButton } from '@mui/material';
 import { PlayArrow, Pause } from '@mui/icons-material';
 import CheckIcon from '@mui/icons-material/Check';
 import ClearIcon from '@mui/icons-material/Clear';
@@ -302,9 +302,11 @@ const Game = () => {
             <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }} >
                 { answered ?
                     // Pausa
-                    <Button variant="contained" onClick={() => togglePause()} sx={{ height: 100, width: 100, borderRadius: '50%' }} data-testid={ paused ? "play" : "pause"}>
-                        { paused ? <PlayArrow /> : <Pause /> }
-                    </Button>
+                    <IconButton variant="contained" size="large" color="primary" aria-label={ paused ? t("Game.play") : t("Game.play") }
+                                onClick={() => togglePause()} sx={{ height: 100, width: 100, border: `2px solid ${theme.palette.primary.main}` }} 
+                                data-testid={ paused ? "play" : "pause"} >
+                        { paused ? <PlayArrow sx={{ fontSize:75 }} /> : <Pause sx={{ fontSize:75 }} /> }
+                    </IconButton>
                     :
                     // Cronómetro
                     <CountdownCircleTimer data-testid="circleTimer" key={questionCountdownKey} isPlaying = {questionCountdownRunning} duration={15} colorsTime={[10, 6, 3, 0]}
@@ -339,11 +341,15 @@ const Game = () => {
                 </Grid>
             </Container>
 
-            {!answered && (
-                <Button variant="contained" onClick={() => selectResponse(null, null)} sx={{ backgroundColor: theme.palette.error.main, fontWeight: "bold" }}>
-                    {"Skip"}
+            { answered ?
+                <Button variant="contained" sx={{ fontWeight: "bold", width:100 }} disabled>
+                    { t("Game.skip") }
                 </Button>
-            )}
+                :
+                <Button variant="contained" onClick={() => selectResponse(null, null)} sx={{ backgroundColor: theme.palette.error.main, '&:hover': { backgroundColor: theme.palette.error.main }, fontWeight: "bold", width:100 }}>
+                    { t("Game.skip") }
+                </Button>
+            }
 
             {/* Progress Cards */}
             <Container sx={{ display: 'flex', flexDirection: 'row', alignItems: 'center' }} >

From 2363c30fb846f97a94e5243c0255e36729a3369d Mon Sep 17 00:00:00 2001
From: uo288245 <uo288245@uniovi.es>
Date: Thu, 25 Apr 2024 01:03:37 +0200
Subject: [PATCH 074/132] Removed the question template.

---
 webapp/src/pages/WarmQuestionGame.js | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/webapp/src/pages/WarmQuestionGame.js b/webapp/src/pages/WarmQuestionGame.js
index 72d230ad..247e4118 100644
--- a/webapp/src/pages/WarmQuestionGame.js
+++ b/webapp/src/pages/WarmQuestionGame.js
@@ -104,19 +104,7 @@ const Game = () => {
             setQuestionData(quest.data);    
             setButtonStates(new Array(quest.data.options.length).fill(null));
         }).catch(error => {
-            // console.error(error);
-            let quest = {}
-            quest.data = {
-                "_id":"1",
-                "question":"Esta pregunta de prueba resulta de su agrado?",
-                "options":["Muchísimo","Un cacho","Tope flama","Fino filipino"],
-                "correctAnswer":"Tope flama",
-                "categories":["Political"],
-                "id":"1",
-                "__v":0
-            };
-            setQuestionData(quest.data);
-            setButtonStates(new Array(quest.data.options.length).fill(null));
+            console.error(error);
         }); 
     };
 

From e52776c53c01c00cb2d1dcf15076f7d990cc32b3 Mon Sep 17 00:00:00 2001
From: uo288245 <uo288245@uniovi.es>
Date: Thu, 25 Apr 2024 01:07:13 +0200
Subject: [PATCH 075/132] Included the new pause button in the last game that
 needed it.

---
 webapp/src/pages/WiseMenStackGame.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/webapp/src/pages/WiseMenStackGame.js b/webapp/src/pages/WiseMenStackGame.js
index 436937c7..d589789f 100644
--- a/webapp/src/pages/WiseMenStackGame.js
+++ b/webapp/src/pages/WiseMenStackGame.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import axios from 'axios';
-import { Container, Box, Button, CssBaseline, Grid, Typography, CircularProgress, Card, Select, MenuItem, useTheme } from '@mui/material';
+import { Container, Box, Button, CssBaseline, Grid, Typography, CircularProgress, Card, Select, MenuItem, IconButton, useTheme } from '@mui/material';
 import CheckIcon from '@mui/icons-material/Check';
 import ClearIcon from '@mui/icons-material/Clear';
 import { PlayArrow, Pause } from '@mui/icons-material';
@@ -343,9 +343,11 @@ const WiseMenStackGame = () => {
             <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }} >
                 { answered ?
                     // Pausa
-                    <Button variant="contained" onClick={() => togglePause()} sx={{ height: 100, width: 100, borderRadius: '50%' }} data-testid={ paused ? "play" : "pause"}>
-                        { paused ? <PlayArrow /> : <Pause /> }
-                    </Button>
+                    <IconButton variant="contained" size="large" color="primary" aria-label={ paused ? t("Game.play") : t("Game.play") }
+                                onClick={() => togglePause()} sx={{ height: 100, width: 100, border: `2px solid ${theme.palette.primary.main}` }} 
+                                data-testid={ paused ? "play" : "pause"} >
+                        { paused ? <PlayArrow sx={{ fontSize:75 }} /> : <Pause sx={{ fontSize:75 }} /> }
+                    </IconButton>
                     :
                     // Cronómetro
                     <CountdownCircleTimer data-testid="circleTimer" key={questionCountdownKey} isPlaying = {questionCountdownRunning} duration={15} colorsTime={[10, 6, 3, 0]}

From 045ad6b304df8d65e4905cc7d21904ac946f1abc Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Thu, 25 Apr 2024 01:26:23 +0200
Subject: [PATCH 076/132] Solved code duplicity and change of texts in Wise Men
 tests

---
 .../__tests__/pages/WiseMenStackGame.test.js  | 47 +++++--------------
 1 file changed, 11 insertions(+), 36 deletions(-)

diff --git a/webapp/src/__tests__/pages/WiseMenStackGame.test.js b/webapp/src/__tests__/pages/WiseMenStackGame.test.js
index ff4961cf..f472f25b 100644
--- a/webapp/src/__tests__/pages/WiseMenStackGame.test.js
+++ b/webapp/src/__tests__/pages/WiseMenStackGame.test.js
@@ -27,9 +27,6 @@ describe('Wise Men Stack Game component', () => {
     mockAxios.onPut('http://localhost:8000/statistics').reply(200, { success: true });
     mockAxios.onPut('http://localhost:8000/user/questionsRecord').reply(200, { success: true });
 
-  });
-
-  it('should render configuration, question, answers and other ', async () => {
     render( 
       <SessionContext.Provider value={{ username: 'exampleUser' }}>
         <Router>
@@ -37,8 +34,10 @@ describe('Wise Men Stack Game component', () => {
         </Router>
       </SessionContext.Provider>
     );
+  });
 
-    await waitFor(() => screen.getByText('Wise Men Stack'));
+  it('should render configuration, question, answers and other ', async () => {
+    await waitFor(() => screen.getByText('GAME CONFIGURATION'));
     
     const button = screen.getByText('Start game');
     fireEvent.click(button);
@@ -49,28 +48,20 @@ describe('Wise Men Stack Game component', () => {
     //expect(screen.findByText('1/3'));
 
     // waits for the question to appear
-    await waitFor(() => screen.getByText('Which is the capital of Spain?'));
+    await waitFor(() => screen.getByText('Which is the capital of Spain?'.toUpperCase()));
 
-    expect(screen.findByText('Which is the capital of Spain?'));
+    expect(screen.findByText('Which is the capital of Spain?'.toUpperCase()));
     expect(screen.findByText('Madrid'));
     
   });
 
-  it('should guess correct answer', async () => {
-    render( 
-      <SessionContext.Provider value={{ username: 'exampleUser' }}>
-        <Router>
-          <Game />
-        </Router>
-      </SessionContext.Provider>
-    );
-    await waitFor(() => screen.getByText('Wise Men Stack'));
+  it('should guess correct answer', async () => {    await waitFor(() => screen.getByText('GAME CONFIGURATION'));
     
     const button = screen.getByText('Start game');
     fireEvent.click(button);
 
     // waits for the question to appear
-    await waitFor(() => screen.getByText('Which is the capital of Spain?'));
+    await waitFor(() => screen.getByText('Which is the capital of Spain?'.toUpperCase()));
     const correctAnswer = screen.getByRole('button', { name: 'Madrid' });
 
     expect(correctAnswer).not.toHaveStyle({ backgroundColor: 'green' });
@@ -85,41 +76,25 @@ describe('Wise Men Stack Game component', () => {
   });
 
   
-  it('should choose incorrect answer', async () => {
-    render( 
-      <SessionContext.Provider value={{ username: 'exampleUser' }}>
-        <Router>
-          <Game />
-        </Router>
-      </SessionContext.Provider>
-    );
-    await waitFor(() => screen.getByText('Wise Men Stack'));
+  it('should choose incorrect answer', async () => {    await waitFor(() => screen.getByText('GAME CONFIGURATION'));
     
     const button = screen.getByText('Start game');
     fireEvent.click(button);
 
     // waits for the question to appear
-    await waitFor(() => screen.getByText('Which is the capital of Spain?'));
+    await waitFor(() => screen.getByText('Which is the capital of Spain?'.toUpperCase()));
     const buttons = screen.getAllByRole('button');
     expect(buttons.length).toBe(2);
   });
 
   it('should not answer the question', async () => {
-    render( 
-      <SessionContext.Provider value={{ username: 'exampleUser' }}>
-        <Router>
-          <Game />
-        </Router>
-      </SessionContext.Provider>
-    );
-
-    await waitFor(() => screen.getByText('Wise Men Stack'));
+    await waitFor(() => screen.getByText('GAME CONFIGURATION'));
     
     const button = screen.getByText('Start game');
     fireEvent.click(button);
 
     // waits for the question to appear
-    await waitFor(() => screen.getByText('Which is the capital of Spain?'));
+    await waitFor(() => screen.getByText('Which is the capital of Spain?'.toUpperCase()));
 
     setTimeout(() => {
       // Comprobamos que el callback ha sido llamado después del tiempo especificado

From 0f28bdceae403a9acbe832426442d379e6638273 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Thu, 25 Apr 2024 01:45:51 +0200
Subject: [PATCH 077/132] Added tests to Wise Men until reach > 80%

---
 .../__tests__/pages/WiseMenStackGame.test.js  | 61 ++++++++++++++++---
 webapp/src/pages/WiseMenStackGame.js          |  5 +-
 2 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/webapp/src/__tests__/pages/WiseMenStackGame.test.js b/webapp/src/__tests__/pages/WiseMenStackGame.test.js
index f472f25b..0ce29369 100644
--- a/webapp/src/__tests__/pages/WiseMenStackGame.test.js
+++ b/webapp/src/__tests__/pages/WiseMenStackGame.test.js
@@ -55,29 +55,47 @@ describe('Wise Men Stack Game component', () => {
     
   });
 
-  it('should guess correct answer', async () => {    await waitFor(() => screen.getByText('GAME CONFIGURATION'));
+  it('should mark as correct right answer', async () => {
+    await waitFor(() => screen.getByText('GAME CONFIGURATION'));
     
     const button = screen.getByText('Start game');
     fireEvent.click(button);
 
     // waits for the question to appear
     await waitFor(() => screen.getByText('Which is the capital of Spain?'.toUpperCase()));
+
     const correctAnswer = screen.getByRole('button', { name: 'Madrid' });
+    // now the answer is not selected:
+    expect(screen.findByTestId("anwer0"));
+    // after clicking it has changed to succeeded:
+    fireEvent.click(correctAnswer);
+    expect(screen.findByTestId("succes0"));
 
-    expect(correctAnswer).not.toHaveStyle({ backgroundColor: 'green' });
+  });
 
-    //selects correct answer
-    fireEvent.click(correctAnswer);
+  it('should mark as incorrect another answer', async () => {
+    await waitFor(() => screen.getByText('GAME CONFIGURATION'));
+    
+    const button = screen.getByText('Start game');
+    fireEvent.click(button);
+
+    // waits for the question to appear
+    await waitFor(() => screen.getByText('Which is the capital of Spain?'.toUpperCase()));
 
-    //expect(screen.findByText('1')).toHaveStyle({ backgroundColor: 'lightgreen' });
+    const answers = screen.getAllByRole('button');
+    const incorrectAnswer = answers[0].name === 'Madrid' ? answers[1] : answers[0];
+    const id = answers[0].name === 'Madrid' ? 1 : 0;
 
-    expect(correctAnswer).toHaveStyle({ backgroundColor: 'green' });
+    // now the answer is not selected:
+    expect(screen.findByTestId(`anwer${id}`));
+    // after clicking it has changed to succeeded:
+    fireEvent.click(incorrectAnswer);
+    expect(screen.findByTestId(`failure${id}`));
 
   });
 
   
-  it('should choose incorrect answer', async () => {    await waitFor(() => screen.getByText('GAME CONFIGURATION'));
-    
+  it('should only show 2 answers', async () => {    await waitFor(() => screen.getByText('GAME CONFIGURATION'));
     const button = screen.getByText('Start game');
     fireEvent.click(button);
 
@@ -103,4 +121,31 @@ describe('Wise Men Stack Game component', () => {
 
   }, 4500);
 
+  it('should render pause & play buttons when answered', async () => {
+    await waitFor(() => screen.getByText('GAME CONFIGURATION'));
+    const button = screen.getByText('Start game');
+    fireEvent.click(button);
+
+    await waitFor(() => screen.getByText('Which is the capital of Spain?'.toUpperCase()));
+    const correctAnswer = screen.getByRole('button', { name: 'Madrid' });
+    fireEvent.click(correctAnswer);
+
+    const pauseButton = screen.getByTestId("pause");
+    expect(pauseButton);
+    fireEvent.click(pauseButton);
+    expect(screen.getByTestId("play"));
+  })
+
+  it('should render progress bar', async () => {
+    await waitFor(() => screen.getByText('GAME CONFIGURATION'));
+    const button = screen.getByText('Start game');
+    fireEvent.click(button);
+
+    await waitFor(() => screen.getByText('Which is the capital of Spain?'.toUpperCase()));
+    const progressBar = screen.getByTestId('prog_bar0');
+    await expect(progressBar).toBeInTheDocument();
+  })
+
+  
+
 });
diff --git a/webapp/src/pages/WiseMenStackGame.js b/webapp/src/pages/WiseMenStackGame.js
index 436937c7..5e1a00e6 100644
--- a/webapp/src/pages/WiseMenStackGame.js
+++ b/webapp/src/pages/WiseMenStackGame.js
@@ -225,7 +225,8 @@ const WiseMenStackGame = () => {
 
     const questionHistorialBar = () => {
         return questionHistorial.map((isCorrect, index) => (
-            <Card sx={{ width: `${100 / round}%`, padding:'0.2em', margin:'0 0.1em', backgroundColor: isCorrect === null ? 'gray' : isCorrect ? theme.palette.success.main : theme.palette.error.main }}/>
+            <Card   data-testid={`prog_bar${index}`}
+                    sx={{ width: `${100 / round}%`, padding:'0.2em', margin:'0 0.1em', backgroundColor: isCorrect === null ? 'gray' : isCorrect ? theme.palette.success.main : theme.palette.error.main }}/>
         ));
     };
 
@@ -382,7 +383,7 @@ const WiseMenStackGame = () => {
 
             <Container sx={{ display: 'flex', flexDirection: 'row', alignItems: 'center', marginTop:'2em' }} >
                 {questionHistorialBar()}
-                { answered || round === 1 ? <Box></Box> : <Card sx={{ width: `${100 / round}%`, padding:'0.2em', margin:'0 0.1em', backgroundColor: 'gray' }}/> }
+                { answered || round === 1 ? <Box></Box> : <Card data-testid='prog_bar_final' sx={{ width: `${100 / round}%`, padding:'0.2em', margin:'0 0.1em', backgroundColor: 'gray' }}/> }
             </Container>
         </Container>
     );

From 38882e9603d81b607b6cd1820def28a6342682be Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Thu, 25 Apr 2024 01:52:25 +0200
Subject: [PATCH 078/132] Added test-ids to test progress bars in games

---
 webapp/src/pages/DiscoveringCitiesGame.js | 3 ++-
 webapp/src/pages/Game.js                  | 3 ++-
 webapp/src/pages/TheChallengeGame.js      | 9 +++++----
 webapp/src/pages/WarmQuestionGame.js      | 3 ++-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/webapp/src/pages/DiscoveringCitiesGame.js b/webapp/src/pages/DiscoveringCitiesGame.js
index 2cbb9168..82da3491 100644
--- a/webapp/src/pages/DiscoveringCitiesGame.js
+++ b/webapp/src/pages/DiscoveringCitiesGame.js
@@ -215,7 +215,8 @@ const DiscovertingCitiesGame = () => {
 
     const questionHistorialBar = () => {
         return questionHistorial.map((isCorrect, index) => (
-            <Card sx={{ width: `${100 / MAX_ROUNDS}%`, padding:'0.2em', margin:'0 0.1em', backgroundColor: isCorrect === null ? 'gray' : isCorrect ? theme.palette.success.main : theme.palette.error.main }}/>
+            <Card data-testid={`prog_bar${index}`}
+                    sx={{ width: `${100 / MAX_ROUNDS}%`, padding:'0.2em', margin:'0 0.1em', backgroundColor: isCorrect === null ? 'gray' : isCorrect ? theme.palette.success.main : theme.palette.error.main }}/>
         ));
     };    
 
diff --git a/webapp/src/pages/Game.js b/webapp/src/pages/Game.js
index efe629ef..9f5d1245 100644
--- a/webapp/src/pages/Game.js
+++ b/webapp/src/pages/Game.js
@@ -214,7 +214,8 @@ const Game = () => {
 
     const questionHistorialBar = () => {
         return questionHistorial.map((isCorrect, index) => (
-            <Card sx={{ width: `${100 / MAX_ROUNDS}%`, padding:'0.2em', margin:'0 0.1em', backgroundColor: isCorrect === null ? 'gray' : isCorrect ? theme.palette.success.main : theme.palette.error.main }}/>
+            <Card data-testid={`prog_bar${index}`}
+                    sx={{ width: `${100 / MAX_ROUNDS}%`, padding:'0.2em', margin:'0 0.1em', backgroundColor: isCorrect === null ? 'gray' : isCorrect ? theme.palette.success.main : theme.palette.error.main }}/>
         ));
     };    
 
diff --git a/webapp/src/pages/TheChallengeGame.js b/webapp/src/pages/TheChallengeGame.js
index 8a052d1d..7358368e 100644
--- a/webapp/src/pages/TheChallengeGame.js
+++ b/webapp/src/pages/TheChallengeGame.js
@@ -309,10 +309,11 @@ const Game = () => {
 
     const questionHistorialBar = () => {
         return questionHistorial.map((isCorrect, index) => (
-            <Card sx={{ width: `${100 / numRounds}%`,
-             padding:'0.2em', 
-             margin:'0 0.1em', 
-             backgroundColor: isCorrect === null ? 'gray' : isCorrect ? theme.palette.success.main : theme.palette.error.main }}
+            <Card data-testid={`prog_bar${index}`}
+                    sx={{ width: `${100 / numRounds}%`,
+                    padding:'0.2em', 
+                    margin:'0 0.1em', 
+                    backgroundColor: isCorrect === null ? 'gray' : isCorrect ? theme.palette.success.main : theme.palette.error.main }}
             >
             </Card>
         ));
diff --git a/webapp/src/pages/WarmQuestionGame.js b/webapp/src/pages/WarmQuestionGame.js
index 247e4118..3d4881b2 100644
--- a/webapp/src/pages/WarmQuestionGame.js
+++ b/webapp/src/pages/WarmQuestionGame.js
@@ -240,7 +240,8 @@ const Game = () => {
 
     const questionHistorialBar = () => {
         return questionHistorial.map((isCorrect, index) => (
-            <Card sx={{ width: `${100 / MAX_ROUNDS}%`, padding:'0.2em', margin:'0 0.1em', backgroundColor: isCorrect === null ? 'gray' : isCorrect ? theme.palette.success.main : theme.palette.error.main }}/>
+            <Card data-testid={`prog_bar${index}`}
+                    sx={{ width: `${100 / MAX_ROUNDS}%`, padding:'0.2em', margin:'0 0.1em', backgroundColor: isCorrect === null ? 'gray' : isCorrect ? theme.palette.success.main : theme.palette.error.main }}/>
         ));
     };    
 

From 962e9113ece401d8ceca8d902cfdc43062502cf4 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Thu, 25 Apr 2024 01:58:55 +0200
Subject: [PATCH 079/132] Why TF is this test suite failing if i execute all
 but passes individually

---
 .../src/__tests__/pages/WiseMenStackGame.test.js | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/webapp/src/__tests__/pages/WiseMenStackGame.test.js b/webapp/src/__tests__/pages/WiseMenStackGame.test.js
index 0ce29369..4bde1f8d 100644
--- a/webapp/src/__tests__/pages/WiseMenStackGame.test.js
+++ b/webapp/src/__tests__/pages/WiseMenStackGame.test.js
@@ -39,7 +39,7 @@ describe('Wise Men Stack Game component', () => {
   it('should render configuration, question, answers and other ', async () => {
     await waitFor(() => screen.getByText('GAME CONFIGURATION'));
     
-    const button = screen.getByText('Start game');
+    const button = screen.getByTestId('start-button');
     fireEvent.click(button);
     
     //expect(screen.getByRole('progressbar'));
@@ -58,7 +58,7 @@ describe('Wise Men Stack Game component', () => {
   it('should mark as correct right answer', async () => {
     await waitFor(() => screen.getByText('GAME CONFIGURATION'));
     
-    const button = screen.getByText('Start game');
+    const button = screen.getByTestId('start-button');
     fireEvent.click(button);
 
     // waits for the question to appear
@@ -76,7 +76,7 @@ describe('Wise Men Stack Game component', () => {
   it('should mark as incorrect another answer', async () => {
     await waitFor(() => screen.getByText('GAME CONFIGURATION'));
     
-    const button = screen.getByText('Start game');
+    const button = screen.getByTestId('start-button');
     fireEvent.click(button);
 
     // waits for the question to appear
@@ -96,7 +96,7 @@ describe('Wise Men Stack Game component', () => {
 
   
   it('should only show 2 answers', async () => {    await waitFor(() => screen.getByText('GAME CONFIGURATION'));
-    const button = screen.getByText('Start game');
+    const button = screen.getByTestId('start-button');
     fireEvent.click(button);
 
     // waits for the question to appear
@@ -108,7 +108,7 @@ describe('Wise Men Stack Game component', () => {
   it('should not answer the question', async () => {
     await waitFor(() => screen.getByText('GAME CONFIGURATION'));
     
-    const button = screen.getByText('Start game');
+    const button = screen.getByTestId('start-button');
     fireEvent.click(button);
 
     // waits for the question to appear
@@ -123,7 +123,7 @@ describe('Wise Men Stack Game component', () => {
 
   it('should render pause & play buttons when answered', async () => {
     await waitFor(() => screen.getByText('GAME CONFIGURATION'));
-    const button = screen.getByText('Start game');
+    const button = screen.getByTestId('start-button');
     fireEvent.click(button);
 
     await waitFor(() => screen.getByText('Which is the capital of Spain?'.toUpperCase()));
@@ -138,7 +138,7 @@ describe('Wise Men Stack Game component', () => {
 
   it('should render progress bar', async () => {
     await waitFor(() => screen.getByText('GAME CONFIGURATION'));
-    const button = screen.getByText('Start game');
+    const button = screen.getByTestId('start-button');
     fireEvent.click(button);
 
     await waitFor(() => screen.getByText('Which is the capital of Spain?'.toUpperCase()));
@@ -146,6 +146,4 @@ describe('Wise Men Stack Game component', () => {
     await expect(progressBar).toBeInTheDocument();
   })
 
-  
-
 });

From 4f9ffaaba1b2e3ef2896334cd4f6cec39eeab4ff Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Thu, 25 Apr 2024 02:02:56 +0200
Subject: [PATCH 080/132] OMG I am a genius

---
 webapp/src/__tests__/pages/WiseMenStackGame.test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/src/__tests__/pages/WiseMenStackGame.test.js b/webapp/src/__tests__/pages/WiseMenStackGame.test.js
index 4bde1f8d..ee332810 100644
--- a/webapp/src/__tests__/pages/WiseMenStackGame.test.js
+++ b/webapp/src/__tests__/pages/WiseMenStackGame.test.js
@@ -4,7 +4,7 @@ import { SessionContext } from '../../SessionContext'; // Importa el contexto ne
 import { BrowserRouter as Router } from 'react-router-dom';
 import axios from 'axios';
 import MockAdapter from 'axios-mock-adapter';
-import Game from '../../pages/WiseMenStackGame';
+import WiseMenStack from '../../pages/WiseMenStackGame';
 import '../../localize/i18n';
 import { expect } from 'expect-puppeteer';
 
@@ -30,7 +30,7 @@ describe('Wise Men Stack Game component', () => {
     render( 
       <SessionContext.Provider value={{ username: 'exampleUser' }}>
         <Router>
-          <Game />
+          <WiseMenStack />
         </Router>
       </SessionContext.Provider>
     );

From 9fb059213916b23b9dd71a35130a74f82feb21fc Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Thu, 25 Apr 2024 02:23:19 +0200
Subject: [PATCH 081/132] =?UTF-8?q?=C3=81ureo=20update=20of=20the=20challe?=
 =?UTF-8?q?nge=20form?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webapp/src/pages/TheChallengeGame.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/webapp/src/pages/TheChallengeGame.js b/webapp/src/pages/TheChallengeGame.js
index 7358368e..0ff7382e 100644
--- a/webapp/src/pages/TheChallengeGame.js
+++ b/webapp/src/pages/TheChallengeGame.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import axios from 'axios';
-import { Container, Box, Button, CssBaseline, Grid, Typography, CircularProgress, useTheme, MenuItem, Select, IconButton } from '@mui/material';
+import { Container, Box, Button, CssBaseline, Grid, Typography, CircularProgress, useTheme, MenuItem, Select, IconButton, Paper } from '@mui/material';
 import CheckIcon from '@mui/icons-material/Check';
 import ClearIcon from '@mui/icons-material/Clear';
 import { useNavigate } from 'react-router-dom';
@@ -231,12 +231,13 @@ const Game = () => {
     if (configModalOpen) {
         
         return(
-            <Container sx={{ display: 'flex', flexDirection: 'column', flex: 1, justifyContent: 'center', alignItems: 'center', gap: '4em' }}>
+            <Container sx={{ display: 'flex', flex: 1, justifyContent: 'center', alignItems: 'center' }}>
+            <Paper elevation={5} sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', gap: '4em', padding: '4em', borderRadius: '4em' }}>
                 <Typography variant="h2" align="center" fontWeight="bold" sx={{ textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem' }}>
                     {t("Game.config.title")}
                 </Typography>
 
-                <Box sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center', gap: '1em' }}>
+                <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center', gap: '1em' }}>
                     <Box sx={{ display: 'flex', alignItems: 'center', gap: '1em' }}>
                         <Typography htmlFor="numRounds" variant="h5">
                             {t("Game.config.num_rounds")}:
@@ -282,7 +283,7 @@ const Game = () => {
                             <MenuItem value="Sports">{t("Game.categories.sports")}</MenuItem>
                         </Select>
                     </Box>
-                </Box>
+                </Container>
                 <Button
                     data-testid="start-button"
                     onClick={() => { startGame(); setQuestionHistorial(Array(numRounds).fill(null)); console.log(category) }}
@@ -303,6 +304,7 @@ const Game = () => {
                 >
                     {t("Game.start")}
                 </Button>
+            </Paper>
             </Container>
         );
     }

From b328472463c9b802eff9640c288ad8be1a70ef6a Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Thu, 25 Apr 2024 02:30:36 +0200
Subject: [PATCH 082/132] Auricidad applied also to Wise Men

---
 webapp/src/pages/WiseMenStackGame.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/webapp/src/pages/WiseMenStackGame.js b/webapp/src/pages/WiseMenStackGame.js
index b34f3679..bad3fce1 100644
--- a/webapp/src/pages/WiseMenStackGame.js
+++ b/webapp/src/pages/WiseMenStackGame.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import axios from 'axios';
-import { Container, Box, Button, CssBaseline, Grid, Typography, CircularProgress, Card, Select, MenuItem, IconButton, useTheme } from '@mui/material';
+import { Container, Box, Button, CssBaseline, Grid, Typography, CircularProgress, Card, Select, MenuItem, IconButton, useTheme, Paper } from '@mui/material';
 import CheckIcon from '@mui/icons-material/Check';
 import ClearIcon from '@mui/icons-material/Clear';
 import { PlayArrow, Pause } from '@mui/icons-material';
@@ -237,7 +237,8 @@ const WiseMenStackGame = () => {
     
     if(!isConfigured) {
         return (
-            <Container sx={{ display: 'flex', flexDirection: 'column', flex: 1, justifyContent: 'center', alignItems: 'center', gap: '4em' }}>
+            <Container sx={{ display: 'flex', flex: 1, justifyContent: 'center', alignItems: 'center' }}>
+            <Paper elevation={5} sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', gap: '4em', padding: '4em', borderRadius: '4em' }}>
                 <Typography variant="h2" align="center" fontWeight="bold" sx={{ textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem' }}>
                     {t("Game.config.title")}
                 </Typography>
@@ -290,6 +291,7 @@ const WiseMenStackGame = () => {
                 >
                     {t("Game.start")}
                 </Button>
+            </Paper>
             </Container>
         );
     }

From 3d4c22148b527c162011326ada1922b85690a893 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Thu, 25 Apr 2024 03:02:12 +0200
Subject: [PATCH 083/132] Updated multiplayer first screen style

---
 webapp/src/localize/en.json         |   3 +-
 webapp/src/localize/es.json         |   3 +-
 webapp/src/localize/fr.json         |   3 +-
 webapp/src/pages/MultiplayerRoom.js | 159 +++++++++++++++++-----------
 4 files changed, 103 insertions(+), 65 deletions(-)

diff --git a/webapp/src/localize/en.json b/webapp/src/localize/en.json
index 2c3c3d8d..e191856e 100644
--- a/webapp/src/localize/en.json
+++ b/webapp/src/localize/en.json
@@ -148,7 +148,8 @@
             "join": "Join room",
             "send": "Send",
             "chat_title": "Chat of the room",
-            "chat_input_label": "Type your message"
+            "chat_input_label": "Type your message",
+            "new_game": "Want to start a new game?"
         },
         "Game": {
             "waiting_players_end": "Waiting for players end...",
diff --git a/webapp/src/localize/es.json b/webapp/src/localize/es.json
index 79d0fdd4..e674ed28 100644
--- a/webapp/src/localize/es.json
+++ b/webapp/src/localize/es.json
@@ -148,7 +148,8 @@
             "join": "Unirse a sala",
             "send": "Enviar",
             "chat_title": "Chat de la sala",
-            "chat_input_label": "Escribe tu mensaje"
+            "chat_input_label": "Escribe tu mensaje",
+            "new_game": "¿Quieres iniciar un juego nuevo?"
         },
         "Game": {
             "waiting_players_end": "Esperando a que terminen los demás jugadores...",
diff --git a/webapp/src/localize/fr.json b/webapp/src/localize/fr.json
index 50a58d9b..bbc12ec7 100644
--- a/webapp/src/localize/fr.json
+++ b/webapp/src/localize/fr.json
@@ -146,7 +146,8 @@
             "join": "Rejoindre une salle",
             "send": "Envoyer",
             "chat_title": "Discussion de la salle",
-            "chat_input_label": "Tape ton message"
+            "chat_input_label": "Tape ton message",
+            "new_game": "Veux toi un neuveax jue?"
         },
         "Game": {
             "waiting_players_end": "En attendant que tous les joueurs finissent...",
diff --git a/webapp/src/pages/MultiplayerRoom.js b/webapp/src/pages/MultiplayerRoom.js
index 09316784..6a3043f8 100644
--- a/webapp/src/pages/MultiplayerRoom.js
+++ b/webapp/src/pages/MultiplayerRoom.js
@@ -1,5 +1,5 @@
 import React, { useState, useEffect  } from 'react';
-import { Button, TextField, Typography, Grid, Paper, List, ListItem, CircularProgress } from '@mui/material';
+import { useTheme, Button, TextField, Typography, Grid, Paper, List, ListItem, CircularProgress, Container, Box } from '@mui/material';
 import io from 'socket.io-client';
 import { useContext } from 'react';
 import { SessionContext } from '../SessionContext';
@@ -11,6 +11,7 @@ const socketEndpoint = process.env.REACT_APP_MULTIPLAYER_ENDPOINT || 'http://loc
 
 const MultiplayerRoom = () => {
     const { t } = useTranslation();
+    const theme = useTheme();
 
     const [roomCode, setRoomCode] = useState("");
     const [error, setError] = useState("");
@@ -105,74 +106,108 @@ const MultiplayerRoom = () => {
     }
   
     return (
-        <Grid container justifyContent="center" alignItems="center" style={{ height: '100vh' }}>
-          <Grid item xs={6}>
-            <Paper elevation={3} style={{ padding: '20px' }}>
-              {roomCode && error === "" ? (
-                <>
-                  <Typography variant="h4" gutterBottom>
-                    { t("Multiplayer.Room.code") }:
-                  </Typography>
-                  <Typography variant="h5" gutterBottom style={{ marginTop: '10px' }}>
-                    {roomCode}
-                  </Typography>
-
-                  <Typography variant="h4" gutterBottom>
-                    { t("Multiplayer.Room.participants") }:
+      <Container sx={{ display: 'flex', flex: 1, justifyContent: 'center', alignItems: 'center' }}>
+        <Paper elevation={5} sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', gap: '2em', padding: '4em', borderRadius: '4em' }}>
+          <Typography variant="h2" align="center" fontWeight="bold" sx={{ textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem' }}>
+            {t("Games.Multiplayer.name").toUpperCase()}
+          </Typography>
+
+          {roomCode && error === "" ? (
+            <>
+              <Typography variant="h4" gutterBottom>
+                { t("Multiplayer.Room.code") }:
+              </Typography>
+              <Typography variant="h5" gutterBottom style={{ marginTop: '10px' }}>
+                {roomCode}
+              </Typography>
+
+              <Typography variant="h4" gutterBottom>
+                { t("Multiplayer.Room.participants") }:
+              </Typography>
+              <List>
+                {roomPlayers.map((player, index) => (
+                <ListItem key={index}>
+                    <Typography variant='h5'>{player}</Typography>
+                </ListItem>
+                ))}
+              </List>
+              <Button id="playBtn" variant="contained" disabled={!gameReady || !roomCreator || !gameLoaded} onClick={startGame} style={{ marginTop: '10px' }}>
+                { t("Multiplayer.Room.start") }
+              </Button>
+              {loadingQuestions && (
+                <div style={{ display: 'flex', justifyContent: 'center', marginTop: '10px', flexDirection: "column", alignItems: "center" }}>
+                    <CircularProgress />
+                    <Typography variant='h5' style={{ marginTop: '1em'}}>Loading questions...</Typography>
+                </div>
+              )}
+            </>
+          ) : (
+            <Container sx={{ display: 'flex', flexDirection: 'column', gap: '2em' }} >
+              <Box sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' , gap: '1em',
+                          border: `2px solid ${theme.palette.primary.main}`, borderRadius: '1em', padding: '1em' }}>
+                <Typography variant="h4">
+                  { t("Multiplayer.Room.join") }
+                </Typography>
+                <TextField
+                  label="Room code"
+                  variant="outlined"
+                  fullWidth
+                  onChange={(e) => setWrittenCode(e.target.value)}                  
+                />
+                <Button variant="contained" onClick={handleJoinRoom} data-testid="btn-join-room"
+                        size='large'
+                        sx={{
+                            fontFamily: 'Arial Black, sans-serif',
+                            color: theme.palette.primary.main,
+                            backgroundColor: 'transparent',
+                            border: `2px solid ${theme.palette.primary.main}`,
+                            transition: 'background-color 0.3s ease',
+    
+                            '&:hover': {
+                                backgroundColor: theme.palette.primary.main,
+                                color: 'white',
+                            }
+                        }}>
+                  { t("Multiplayer.Room.join") }
+                </Button>
+                {error && (
+                  <Typography variant="subtitle1" gutterBottom color="error">
+                    {error}
                   </Typography>
-                  <List>
-                    {roomPlayers.map((player, index) => (
-                    <ListItem key={index}>
-                        <Typography variant='h5'>{player}</Typography>
-                    </ListItem>
-                    ))}
-                  </List>
-                  <Button id="playBtn" variant="contained" disabled={!gameReady || !roomCreator || !gameLoaded} onClick={startGame} style={{ marginTop: '10px' }}>
-                    { t("Multiplayer.Room.start") }
-                  </Button>
-                  {loadingQuestions && (
-                    <div style={{ display: 'flex', justifyContent: 'center', marginTop: '10px', flexDirection: "column", alignItems: "center" }}>
-                        <CircularProgress />
-                        <Typography variant='h5' style={{ marginTop: '1em'}}>Loading questions...</Typography>
-                    </div>
                 )}
-                </>
-              ) : (
-                <>
-                  <Typography variant="h4" gutterBottom>
-                    { t("Multiplayer.Room.create") }
-                  </Typography>
-                  <Button variant="contained" onClick={handleCreateRoom} data-testid="btn-create-room">
-                    { t("Multiplayer.Room.create") }
-                  </Button>
-                  <Typography variant="h4" gutterBottom style={{ marginTop: '20px' }}>
-                    { t("Multiplayer.Room.join") }
-                  </Typography>
-                  <TextField
-                    label="Room code"
-                    variant="outlined"
-                    fullWidth
-                    onChange={(e) => setWrittenCode(e.target.value)}
-                    style={{ marginTop: '10px' }}
-                  />
-                  <Button variant="contained" onClick={handleJoinRoom} style={{ marginTop: '10px' }} data-testid="btn-join-room">
-                    { t("Multiplayer.Room.join") }
-                  </Button>
-                  {error && (
-                    <Typography variant="subtitle1" gutterBottom style={{ marginTop: '10px', color: 'red' }}>
-                      {error}
-                    </Typography>
-                  )}
-                </>
-              )}
-            </Paper>
-          </Grid>
+              </Box>
+
+              <Box sx={{display: 'flex', flexDirection: 'column', alignItems: 'center', gap: '1em', 
+                        border: `2px solid ${theme.palette.success.main}`, borderRadius: '1em', padding: '1em' }}>
+                <Typography variant="h6">
+                  { t("Multiplayer.Room.new_game") }
+                </Typography>
+                <Button variant="contained" onClick={handleCreateRoom} data-testid="btn-create-room"
+                        size='large'
+                        sx={{
+                            fontFamily: 'Arial Black, sans-serif',
+                            color: theme.palette.success.main,
+                            backgroundColor: 'transparent',
+                            border: `2px solid ${theme.palette.success.main}`,
+                            transition: 'background-color 0.3s ease',
+    
+                            '&:hover': {
+                                backgroundColor: theme.palette.success.main,
+                                color: 'white',
+                            }
+                        }}>
+                  { t("Multiplayer.Room.create") }
+                </Button>
+              </Box>
+            </Container>
+          )}
           {roomCode && error === "" && (
             <Grid item xs={3} sx={{marginLeft: '2em'}}>
               <Chat roomCode={roomCode} username={username} />
             </Grid>
           )}
-        </Grid>
+        </Paper>
+      </Container>
       );
   }
 

From b849aff1a1243369a0659d580c50a1b83d7ae5c0 Mon Sep 17 00:00:00 2001
From: uo288543 <uo288543@uniovi.es>
Date: Thu, 25 Apr 2024 10:13:43 +0200
Subject: [PATCH 084/132] move icon to home and make examples

---
 webapp/src/components/Footer.js | 12 +--------
 webapp/src/pages/Home.js        | 44 +++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/webapp/src/components/Footer.js b/webapp/src/components/Footer.js
index 164ff8fe..68ce0462 100644
--- a/webapp/src/components/Footer.js
+++ b/webapp/src/components/Footer.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { AppBar, Toolbar, Typography, Link } from '@mui/material';
 import { useTranslation } from 'react-i18next';
-import AndroidIcon from '@mui/icons-material/Android';
+
 
 const Footer = () => {
     const { t } = useTranslation();
@@ -22,16 +22,6 @@ const Footer = () => {
               {t("Footer.api_users")}
             </Link>
           </Typography>
-          <a
-            href="https://mega.nz/file/vNVkhQwT#l3K-nttaNWJ1tjdUVXJlCClmYm9rmpgBS_ULNewASL4"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-          <button style={{ display: 'flex', alignItems: 'center' }}>
-            <AndroidIcon style={{ marginRight: '8px' }} />
-            {t("Footer.apk_link")}
-          </button>
-          </a>
         </Toolbar>
       </AppBar>
     );
diff --git a/webapp/src/pages/Home.js b/webapp/src/pages/Home.js
index fcfa9336..fb41bba4 100644
--- a/webapp/src/pages/Home.js
+++ b/webapp/src/pages/Home.js
@@ -2,6 +2,7 @@ import * as React from "react";
 import {Box, Button} from "@mui/material";
 import useMediaQuery from '@mui/material/useMediaQuery';
 import { useTranslation } from 'react-i18next';
+import AndroidIcon from '@mui/icons-material/Android';
 
 const Home = () => {
     const xxl = useMediaQuery('(min-width:1920px)');
@@ -102,6 +103,49 @@ const Home = () => {
             <video data-testid="video" ref={videoRef} autoPlay muted loop style={{ ...styles.video}}>
                 <source src="./home/Background-White.webm" type="video/mp4" />
             </video>
+            <a
+            href="https://mega.nz/file/vNVkhQwT#l3K-nttaNWJ1tjdUVXJlCClmYm9rmpgBS_ULNewASL4"
+            target="_blank"
+            rel="noopener noreferrer"
+            >
+            <Button
+                variant="contained"
+                color="primary"
+                startIcon={<AndroidIcon style={{ marginRight: '0.2em' }} />}
+            >
+            {t("Footer.apk_link")}
+            </Button>
+          </a>
+
+          <a
+            href="https://mega.nz/file/vNVkhQwT#l3K-nttaNWJ1tjdUVXJlCClmYm9rmpgBS_ULNewASL4"
+            target="_blank"
+            rel="noopener noreferrer"
+            >
+            <Button
+                variant="contained"
+                color="primary"
+                startIcon={<AndroidIcon style={{ marginRight: '0.2em', color: "3DDC84", }} />}
+                style={{ marginTop: '0.5em' }}
+            >
+            {t("Footer.apk_link")}
+            </Button>
+          </a>
+
+          <a
+            href="https://mega.nz/file/vNVkhQwT#l3K-nttaNWJ1tjdUVXJlCClmYm9rmpgBS_ULNewASL4"
+            target="_blank"
+            rel="noopener noreferrer"
+            >
+            <Button
+                variant="contained"
+                color="primary"
+                startIcon={<AndroidIcon style={{ marginRight: '0.2em', color: "3DDC84", fontSize: '2em' }} />}
+                style={{ marginTop: '0.5em' }}
+            >
+            {t("Footer.apk_link")}
+            </Button>
+          </a>
         </Box>
     );
 };

From 7e7aba144a6bdd980e43e83b35637a46b47b973c Mon Sep 17 00:00:00 2001
From: uo288543 <uo288543@uniovi.es>
Date: Thu, 25 Apr 2024 10:28:17 +0200
Subject: [PATCH 085/132] add fav button

---
 webapp/src/pages/Home.js | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/webapp/src/pages/Home.js b/webapp/src/pages/Home.js
index fb41bba4..d2447abb 100644
--- a/webapp/src/pages/Home.js
+++ b/webapp/src/pages/Home.js
@@ -1,5 +1,5 @@
 import * as React from "react";
-import {Box, Button} from "@mui/material";
+import {Box, Button, Fab, useTheme } from "@mui/material";
 import useMediaQuery from '@mui/material/useMediaQuery';
 import { useTranslation } from 'react-i18next';
 import AndroidIcon from '@mui/icons-material/Android';
@@ -7,6 +7,8 @@ import AndroidIcon from '@mui/icons-material/Android';
 const Home = () => {
     const xxl = useMediaQuery('(min-width:1920px)');
     const { t } = useTranslation();
+    const theme = useTheme();
+    const isMobile = useMediaQuery(theme.breakpoints.down('sm'));
 
     const styles = {
         logo:{
@@ -142,10 +144,40 @@ const Home = () => {
                 color="primary"
                 startIcon={<AndroidIcon style={{ marginRight: '0.2em', color: "3DDC84", fontSize: '2em' }} />}
                 style={{ marginTop: '0.5em' }}
+                sx={{
+                    '&:hover': {
+                      border: `2px solid #3DDC84`, 
+                      backgroundColor: 'primary.light', 
+                    },
+                  }}
             >
             {t("Footer.apk_link")}
             </Button>
           </a>
+
+          <Box
+            sx={{
+            position: 'fixed',
+            bottom: "14%", 
+            right: "6%", 
+            }}
+        >
+            <a
+            href="https://mega.nz/file/vNVkhQwT#l3K-nttaNWJ1tjdUVXJlCClmYm9rmpgBS_ULNewASL4"
+            target="_blank"
+            rel="noopener noreferrer"
+            >
+            <Fab size={isMobile ? 'small' : 'big'} color="primary" aria-label="download" sx={{
+                    '&:hover': {
+                      border: `2px solid #3DDC84`, 
+                      backgroundColor: 'primary.light', 
+                    },
+                  }}>
+                <AndroidIcon style={{ color: "3DDC84", fontSize: '2em' }}/>
+            </Fab>
+            </a>
+        </Box>
+
         </Box>
     );
 };

From 7c29ba861d7f60b70857c77cae56a6aa1124403e Mon Sep 17 00:00:00 2001
From: uo288543 <uo288543@uniovi.es>
Date: Thu, 25 Apr 2024 11:32:14 +0200
Subject: [PATCH 086/132] Add tooltip

---
 webapp/src/pages/Home.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/webapp/src/pages/Home.js b/webapp/src/pages/Home.js
index d2447abb..f56d30c1 100644
--- a/webapp/src/pages/Home.js
+++ b/webapp/src/pages/Home.js
@@ -1,5 +1,5 @@
 import * as React from "react";
-import {Box, Button, Fab, useTheme } from "@mui/material";
+import {Box, Button, Fab, useTheme, Tooltip } from "@mui/material";
 import useMediaQuery from '@mui/material/useMediaQuery';
 import { useTranslation } from 'react-i18next';
 import AndroidIcon from '@mui/icons-material/Android';
@@ -167,14 +167,16 @@ const Home = () => {
             target="_blank"
             rel="noopener noreferrer"
             >
-            <Fab size={isMobile ? 'small' : 'big'} color="primary" aria-label="download" sx={{
-                    '&:hover': {
-                      border: `2px solid #3DDC84`, 
-                      backgroundColor: 'primary.light', 
-                    },
-                  }}>
-                <AndroidIcon style={{ color: "3DDC84", fontSize: '2em' }}/>
-            </Fab>
+            <Tooltip title="Botón de descarga de Android" placement="left"> {/* TODO */} 
+                <Fab size={isMobile ? 'small' : 'big'} color="primary" aria-label="download" sx={{
+                        '&:hover': {
+                        border: `2px solid #3DDC84`, 
+                        backgroundColor: 'primary.light', 
+                        },
+                    }}>
+                    <AndroidIcon style={{ color: "3DDC84", fontSize: '2em' }}/>
+                </Fab>
+            </Tooltip>
             </a>
         </Box>
 

From ccdb76eae42cab54c300afa277e0969404e55ff2 Mon Sep 17 00:00:00 2001
From: uo288245 <uo288245@uniovi.es>
Date: Thu, 25 Apr 2024 11:35:07 +0200
Subject: [PATCH 087/132] Improved the default game managment.

---
 webapp/src/pages/Homepage.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/webapp/src/pages/Homepage.js b/webapp/src/pages/Homepage.js
index 7f38eacf..8044146f 100644
--- a/webapp/src/pages/Homepage.js
+++ b/webapp/src/pages/Homepage.js
@@ -8,6 +8,7 @@ import { useTranslation } from 'react-i18next';
 
 const Homepage = () => {
     const xxl = useMediaQuery('(min-width:1920px)');
+    
     const { t } = useTranslation();
 
     const styles = React.useMemo(() => ({
@@ -100,10 +101,10 @@ const Homepage = () => {
     const [info, setInfo] = React.useState(null);
 
     // Link to each game page
-    const [gameLink, setGameLink] = React.useState("/game");
+    const [gameLink, setGameLink] = React.useState("/wiseMenStackGame");
 
     //Selected index
-    const [activeIndex, setActiveIndex] = React.useState(0); // Nuevo estado para el índice activo
+    const [activeIndex, setActiveIndex] = React.useState(0);
 
     //if online mode -> change link to go to online room
     const changeGameLink = React.useCallback((index) => {
@@ -166,7 +167,7 @@ const Homepage = () => {
             // Show the information of the first game
             displayGames(info);
         }
-    }, [info, displayGames]); // <- Add info to the dependency array
+    }, [info, displayGames]);
 
     const videoRef = React.useRef(null);
     React.useEffect(() => {if (videoRef.current) {videoRef.current.playbackRate = 0.85;}}, []);
@@ -174,10 +175,10 @@ const Homepage = () => {
     return (
         <Box sx={{...styles.container }}>
             <video data-testid="video" ref={videoRef} autoPlay muted loop style={{ ...styles.video}}>
-                <source src="../home/Background-White.webm" type="video/mp4" />
+                <source src="../home/Background-White.webm" type="video/webm" />
             </video>
             <Typography variant="h2" align="center" fontWeight="bold" sx={{ textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem' }}>{ t("Homepage.title") }</Typography>
-            {games}
+                {games}
             <Button variant='conteined' href={gameLink} sx={styles.playButton}> {t("Home")} </Button>
         </Box>
     );

From 8c72e62a649dc24a8f230914b7a72617bc47fe74 Mon Sep 17 00:00:00 2001
From: uo288245 <uo288245@uniovi.es>
Date: Thu, 25 Apr 2024 11:47:18 +0200
Subject: [PATCH 088/132] Adapted the Wise Men Stack tests to the new style of
 its view.

---
 webapp/src/__tests__/pages/WiseMenStackGame.test.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/webapp/src/__tests__/pages/WiseMenStackGame.test.js b/webapp/src/__tests__/pages/WiseMenStackGame.test.js
index ee332810..3e40a50b 100644
--- a/webapp/src/__tests__/pages/WiseMenStackGame.test.js
+++ b/webapp/src/__tests__/pages/WiseMenStackGame.test.js
@@ -40,12 +40,8 @@ describe('Wise Men Stack Game component', () => {
     await waitFor(() => screen.getByText('GAME CONFIGURATION'));
     
     const button = screen.getByTestId('start-button');
-    fireEvent.click(button);
-    
-    //expect(screen.getByRole('progressbar'));
-    expect(screen.findByText('1'));
-    expect(screen.findByText('Question 1'));
-    //expect(screen.findByText('1/3'));
+    // clicks the start button to show the first question
+    fireEvent.click(button); 
 
     // waits for the question to appear
     await waitFor(() => screen.getByText('Which is the capital of Spain?'.toUpperCase()));

From ee9cd43714874b8493fcc29e0ffc52c3d7e5f5ad Mon Sep 17 00:00:00 2001
From: uo288245 <uo288245@uniovi.es>
Date: Thu, 25 Apr 2024 12:20:59 +0200
Subject: [PATCH 089/132] Improved Warm Question Game calling.

---
 webapp/src/App.js                    | 4 ++--
 webapp/src/pages/WarmQuestionGame.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/webapp/src/App.js b/webapp/src/App.js
index eb8254d5..c7b0397f 100644
--- a/webapp/src/App.js
+++ b/webapp/src/App.js
@@ -17,7 +17,7 @@ import Profile from './pages/Profile'
 import MultiplayerRoom from './pages/MultiplayerRoom';
 import MultiplayerGame from './pages/MultiplayerGame';
 import TheChallengeGame from './pages/TheChallengeGame';
-import WarmQuestion from './pages/WarmQuestionGame';
+import WarmQuestionGame from './pages/WarmQuestionGame';
 import {Route, Routes} from 'react-router-dom';
 import { createTheme, ThemeProvider } from '@mui/material/styles';
 import { Box } from '@mui/material';
@@ -66,7 +66,7 @@ function App() {
             <Route path="/multiplayerRoom" element={<PrivateRoute element={MultiplayerRoom}/>}/>
             <Route path="/theChallengeGame" element={<PrivateRoute element={TheChallengeGame}/>}/>
             <Route path="/multiplayerGame" element={<PrivateRoute element={MultiplayerGame}/>}/>
-            <Route path="/warmQuestionGame" element={<PrivateRoute element={WarmQuestion}/>}/>
+            <Route path="/warmQuestionGame" element={<PrivateRoute element={WarmQuestionGame}/>}/>
             <Route path="/group/menu" element={<PrivateRoute element={Groups}/>}/>
             <Route path="/group/:groupName" element={<PrivateRoute element={GroupDetails}/>} />
             <Route path="/statistics/:user" element={<PrivateRoute element={Statistics }/>}/>
diff --git a/webapp/src/pages/WarmQuestionGame.js b/webapp/src/pages/WarmQuestionGame.js
index 3d4881b2..705a15d4 100644
--- a/webapp/src/pages/WarmQuestionGame.js
+++ b/webapp/src/pages/WarmQuestionGame.js
@@ -14,7 +14,7 @@ import i18n from '../localize/i18n';
 
 const apiEndpoint = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
 
-const Game = () => {
+const WarmQuestionGame = () => {
     const navigate = useNavigate();
     const MAX_ROUNDS = 10;
     const SUCCESS_SOUND_ROUTE = "/sounds/success_sound.mp3";
@@ -348,4 +348,4 @@ const Game = () => {
     );
 };
 
-export default Game;
\ No newline at end of file
+export default WarmQuestionGame;
\ No newline at end of file

From 1c32683a6e0c1e4ca2a205dbaf26dcc8d20ffe0f Mon Sep 17 00:00:00 2001
From: uo288245 <uo288245@uniovi.es>
Date: Thu, 25 Apr 2024 12:23:18 +0200
Subject: [PATCH 090/132] Updated the Warm Question Game tests to match the new
 view style.

---
 .../__tests__/pages/WarmQuestionGame.test.js  | 43 ++++++++-----------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/webapp/src/__tests__/pages/WarmQuestionGame.test.js b/webapp/src/__tests__/pages/WarmQuestionGame.test.js
index 6297a0d5..0e955ac7 100644
--- a/webapp/src/__tests__/pages/WarmQuestionGame.test.js
+++ b/webapp/src/__tests__/pages/WarmQuestionGame.test.js
@@ -4,11 +4,11 @@ import { SessionContext } from '../../SessionContext';
 import { BrowserRouter as Router } from 'react-router-dom';
 import axios from 'axios';
 import MockAdapter from 'axios-mock-adapter';
-import Game from '../../pages/WarmQuestionGame';
+import WarmQuestionGame from '../../pages/WarmQuestionGame';
 
 const mockAxios = new MockAdapter(axios);
 
-describe('Game component', () => {
+describe('WarmQuestionGame component', () => { 
   beforeEach(() => {
     mockAxios.reset();
     // Mock the axios.post request to simulate a successful response
@@ -30,18 +30,18 @@ describe('Game component', () => {
     render( 
         <SessionContext.Provider value={{ username: 'exampleUser' }}>
           <Router>
-            <Game />
+            <WarmQuestionGame />
           </Router>
         </SessionContext.Provider>
     );
 
     // Espera a que aparezca la pregunta
-    await waitFor(() => screen.getByText('Which is the capital of Spain?'));
+    await waitFor(() => screen.getByTestId('question'));
 
     expect(screen.findByText('1'));
 
     // Verifica que el juego haya comenzado correctamente mostrando la pregunta y las opciones
-    expect(screen.getByText('Which is the capital of Spain?')).toBeInTheDocument();
+    expect(screen.getByTestId('question')).toBeInTheDocument();
     expect(screen.getByText('Madrid')).toBeInTheDocument();
     expect(screen.getByText('Barcelona')).toBeInTheDocument();
     expect(screen.getByText('Paris')).toBeInTheDocument();
@@ -52,23 +52,21 @@ describe('Game component', () => {
     render( 
         <SessionContext.Provider value={{ username: 'exampleUser' }}>
           <Router>
-            <Game />
+            <WarmQuestionGame />
           </Router>
         </SessionContext.Provider>
     );
 
     // waits for the question to appear
-    await waitFor(() => screen.getByText('Which is the capital of Spain?'));
+    await waitFor(() => screen.getByTestId('question'));
     const correctAnswer = screen.getByRole('button', { name: 'Madrid' });
 
-    expect(correctAnswer).not.toHaveStyle({ backgroundColor: 'green' });
+    expect(correctAnswer).toHaveStyle({ backgroundColor: 'rgb(0, 102, 153);' });
 
     //selects correct answer
     fireEvent.click(correctAnswer);
 
-    //expect(screen.findByText('1')).toHaveStyle({ backgroundColor: 'lightgreen' });
-
-    expect(correctAnswer).toHaveStyle({ backgroundColor: 'green' });
+    expect(correctAnswer).toHaveStyle({ backgroundColor: 'rgb(51, 153, 102);' });
 
   });
 
@@ -77,22 +75,21 @@ describe('Game component', () => {
      render( 
         <SessionContext.Provider value={{ username: 'exampleUser' }}>
           <Router>
-            <Game />
+            <WarmQuestionGame />
           </Router>
         </SessionContext.Provider>
     );
 
     // waits for the question to appear
-    await waitFor(() => screen.getByText('Which is the capital of Spain?'));
+    await waitFor(() => screen.getByTestId('question'));
     const incorrectAnswer = screen.getByRole('button', { name: 'Barcelona' });
 
-    expect(incorrectAnswer).not.toHaveStyle({ backgroundColor: 'red' });
+    expect(incorrectAnswer).toHaveStyle({ backgroundColor: 'rgb(0, 102, 153);' });
 
     //selects correct answer
     fireEvent.click(incorrectAnswer);
 
-    expect(incorrectAnswer).toHaveStyle({ backgroundColor: 'red' });
-    //expect(screen.findByText('1')).toHaveStyle({ backgroundColor: 'salmon' });
+    expect(incorrectAnswer).toHaveStyle({ backgroundColor: 'rgb(153, 0, 0);' });
 
   });
 
@@ -100,13 +97,13 @@ describe('Game component', () => {
     render( 
         <SessionContext.Provider value={{ username: 'exampleUser' }}>
           <Router>
-            <Game />
+            <WarmQuestionGame />
           </Router>
         </SessionContext.Provider>
     );
 
     // waits for the question to appear
-    await waitFor(() => screen.getByText('Which is the capital of Spain?'));
+    await waitFor(() => screen.getByTestId('question'));
 
     setTimeout(() => {
       // Comprobamos que el callback ha sido llamado después del tiempo especificado
@@ -119,24 +116,22 @@ describe('Game component', () => {
     render( 
         <SessionContext.Provider value={{ username: 'exampleUser' }}>
           <Router>
-            <Game />
+            <WarmQuestionGame />
           </Router>
         </SessionContext.Provider>
     );
 
     // waits for the question to appear
-    await waitFor(() => screen.getByText('Which is the capital of Spain?'));
+    await waitFor(() => screen.getByTestId('question'));
     const correctAnswer = screen.getByRole('button', { name: 'Madrid' });
     const skip = screen.getByRole('button', { name: 'Skip' });
 
-    expect(correctAnswer).not.toHaveStyle({ backgroundColor: 'green' });
+    expect(correctAnswer).toHaveStyle({ backgroundColor: 'rgb(0, 102, 153);' });
 
     //selects correct answer
     fireEvent.click(skip);
 
-    //expect(screen.findByText('1')).toHaveStyle({ backgroundColor: 'lightgreen' });
-
-    expect(correctAnswer).toHaveStyle({ backgroundColor: 'green' });
+    expect(correctAnswer).toHaveStyle({ backgroundColor: 'rgb(51, 153, 102);' });
 
   });
 

From 6c6d2d08b699625d871f7d21fc76d8897ba33398 Mon Sep 17 00:00:00 2001
From: uo288245 <uo288245@uniovi.es>
Date: Thu, 25 Apr 2024 12:46:05 +0200
Subject: [PATCH 091/132] Improved and adapted the Challenge game tests to the
 new style.

---
 .../__tests__/pages/TheChallengeGame.test.js  | 70 +++++++++++++------
 webapp/src/pages/TheChallengeGame.js          |  8 +--
 2 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/webapp/src/__tests__/pages/TheChallengeGame.test.js b/webapp/src/__tests__/pages/TheChallengeGame.test.js
index 9627bba8..6ed2b6d2 100644
--- a/webapp/src/__tests__/pages/TheChallengeGame.test.js
+++ b/webapp/src/__tests__/pages/TheChallengeGame.test.js
@@ -38,22 +38,20 @@ describe('Game component', () => {
     );
 
     // Espera a que aparezca la ventana de configuración
-    await waitFor(() => screen.getByText('Game Configuration'));
+    await waitFor(() => screen.getByText('GAME CONFIGURATION'));
 
     // Simula la configuración del juego
-    const increaseButtons = screen.getAllByRole('button', { name: '+' });
-    fireEvent.click(increaseButtons[0]); // Aumenta el número de rondas
-    fireEvent.click(increaseButtons[1]); // Aumenta el tiempo por pregunta
-    //fireEvent.change(screen.getByLabelText('Category:'), { target: { value: 'Sports' } });
+    const increaseButton = screen.getByTestId('addRound');
+    fireEvent.click(increaseButton); // Aumenta el número de rondas
 
     // Inicia el juego
-    fireEvent.click(screen.getByRole('button', { name: 'Start game' }));
+    fireEvent.click(screen.getByRole('button', { name: 'Start Game' }));
 
     // Espera a que aparezca la pregunta
-    await waitFor(() => screen.getByText('Which is the capital of Spain?'.toUpperCase()));
+    await waitFor(() => screen.getByTestId('question'));
 
     // Verifica que el juego haya comenzado correctamente mostrando la pregunta y las opciones
-    expect(screen.getByText('Which is the capital of Spain?'.toUpperCase())).toBeInTheDocument();
+    expect(screen.getByTestId('question')).toBeInTheDocument();
     expect(screen.getByText('Madrid')).toBeInTheDocument();
     expect(screen.getByText('Barcelona')).toBeInTheDocument();
     expect(screen.getByText('Paris')).toBeInTheDocument();
@@ -70,17 +68,19 @@ describe('Game component', () => {
     );
 
     // Espera a que aparezca la ventana de configuración
-    await waitFor(() => screen.getByText('Game Configuration'));
+    await waitFor(() => screen.getByText('GAME CONFIGURATION'));
 
     // Simula la configuración del juego
-    const increaseButtons = screen.getAllByRole('button', { name: '+' });
-    fireEvent.click(increaseButtons[0]); // Aumenta el número de rondas
+    const increaseRoundButton = screen.getByTestId('addRound');
+    fireEvent.click(increaseRoundButton); // Aumenta el número de rondas
+    const increaseSecondsButton = screen.getByTestId('addSecond');
+    fireEvent.click(increaseSecondsButton); // Aumenta los segundos por ronda
 
     // Inicia el juego
-    fireEvent.click(screen.getByRole('button', { name: 'Start game' }));
+    fireEvent.click(screen.getByRole('button', { name: 'Start Game' }));
 
     // waits for the question to appear
-    await waitFor(() => screen.getByText('Which is the capital of Spain?'.toUpperCase()));
+    await waitFor(() => screen.getByTestId('question'));
     const correctAnswer = screen.getByRole('button', { name: 'Madrid' });
 
     expect(screen.findByTestId("anwer0"));
@@ -101,17 +101,17 @@ describe('Game component', () => {
     );
 
     // Espera a que aparezca la ventana de configuración
-    await waitFor(() => screen.getByText('Game Configuration'));
+    await waitFor(() => screen.getByText('GAME CONFIGURATION'));
 
     // Simula la configuración del juego
-    const increaseButtons = screen.getAllByRole('button', { name: '+' });
-    fireEvent.click(increaseButtons[0]); // Aumenta el número de rondas
+    const increaseButton = screen.getByTestId('addRound');
+    fireEvent.click(increaseButton); // Aumenta el número de rondas
 
     // Inicia el juego
-    fireEvent.click(screen.getByRole('button', { name: 'Start game' }));
+    fireEvent.click(screen.getByRole('button', { name: 'Start Game' }));
 
     // waits for the question to appear
-    await waitFor(() => screen.getByText('Which is the capital of Spain?'.toUpperCase()));
+    await waitFor(() => screen.getByTestId('question'));
     const incorrectAnswer = screen.getByRole('button', { name: 'Barcelona' });
 
     expect(screen.findByTestId("anwer1"));
@@ -131,17 +131,17 @@ describe('Game component', () => {
     );
 
     // Espera a que aparezca la ventana de configuración
-    await waitFor(() => screen.getByText('Game Configuration'));
+    await waitFor(() => screen.getByText('GAME CONFIGURATION'));
 
     // Simula la configuración del juego
-    const increaseButtons = screen.getAllByRole('button', { name: '+' });
-    fireEvent.click(increaseButtons[0]); // Aumenta el número de rondas
+    const increaseButton = screen.getByTestId('addRound');
+    fireEvent.click(increaseButton); // Aumenta el número de rondas
 
     // Inicia el juego
-    fireEvent.click(screen.getByRole('button', { name: 'Start game' }));
+    fireEvent.click(screen.getByRole('button', { name: 'Start Game' }));
 
     // waits for the question to appear
-    await waitFor(() => screen.getByText('Which is the capital of Spain?'.toUpperCase()));
+    await waitFor(() => screen.getByTestId('question'));
 
     setTimeout(() => {
       // Comprobamos que el callback ha sido llamado después del tiempo especificado
@@ -150,4 +150,28 @@ describe('Game component', () => {
 
   }, 4500);
 
+  it('should pause and resume the game after answering a question', async () => {
+    render(
+        <SessionContext.Provider value={{ username: 'exampleUser' }}>
+            <Router>
+                <Game />
+            </Router>
+        </SessionContext.Provider>
+    );
+
+    await waitFor(() => screen.getByText('GAME CONFIGURATION'));
+    fireEvent.click(screen.getByTestId('addRound'));
+    fireEvent.click(screen.getByRole('button', { name: 'Start Game' }));
+
+    await waitFor(() => screen.getByTestId('question'));
+
+    fireEvent.click(screen.getByRole('button', { name: 'Madrid' }));
+
+    await waitFor(() => screen.getByTestId('pause'));
+
+    fireEvent.click(screen.getByTestId('pause'));
+
+    expect(screen.getByTestId('play')).toBeInTheDocument();
+});
+
 });
\ No newline at end of file
diff --git a/webapp/src/pages/TheChallengeGame.js b/webapp/src/pages/TheChallengeGame.js
index 0ff7382e..1f03a70f 100644
--- a/webapp/src/pages/TheChallengeGame.js
+++ b/webapp/src/pages/TheChallengeGame.js
@@ -242,13 +242,13 @@ const Game = () => {
                         <Typography htmlFor="numRounds" variant="h5">
                             {t("Game.config.num_rounds")}:
                         </Typography>
-                        <IconButton size="large" color="error" disabled={numRounds === 1} onClick={() => setNumRounds(numRounds - 1)} variant="outlined" >
+                        <IconButton size="large" color="error" disabled={numRounds === 1} onClick={() => setNumRounds(numRounds - 1)} variant="outlined" data-testId="removeRound">
                             <RemoveIcon fontSize="inherit" />
                         </IconButton>
                         <Typography fontWeight="bold" color="primary" fontSize="1.5em">
                             {numRounds}
                         </Typography>
-                        <IconButton size="large" color="success" onClick={() => setNumRounds(numRounds + 1)} variant="outlined">
+                        <IconButton size="large" color="success" onClick={() => setNumRounds(numRounds + 1)} variant="outlined" data-testId="addRound">
                             <AddIcon fontSize="inherit" />
                         </IconButton>
                     </Box>
@@ -257,13 +257,13 @@ const Game = () => {
                         <Typography htmlFor="questionTime" variant="h5">
                             {t("Game.config.time")}:
                         </Typography>
-                        <IconButton size="large" color="error" disabled={timerConfig === 1} onClick={() => setTimerConfig(timerConfig - 1)} variant="outlined">
+                        <IconButton size="large" color="error" disabled={timerConfig === 1} onClick={() => setTimerConfig(timerConfig - 1)} variant="outlined" data-testId="removeSecond">
                             <RemoveIcon fontSize="inherit" />
                         </IconButton>
                         <Typography fontWeight="bold" color="primary" fontSize="1.5em">
                             {timerConfig}
                         </Typography>
-                        <IconButton size="large" color="success" onClick={() => setTimerConfig(timerConfig + 1)} variant="outlined">
+                        <IconButton size="large" color="success" onClick={() => setTimerConfig(timerConfig + 1)} variant="outlined" data-testId="addSecond">
                             <AddIcon fontSize="inherit" />
                         </IconButton>
                     </Box>

From ea5129994730f4f27f67d374996250dda3ffdbaf Mon Sep 17 00:00:00 2001
From: uo288245 <uo288245@uniovi.es>
Date: Thu, 25 Apr 2024 15:14:51 +0200
Subject: [PATCH 092/132] Fixed the Challenge game tests.

---
 .../__tests__/pages/TheChallengeGame.test.js   | 18 +++++++++---------
 webapp/src/pages/TheChallengeGame.js           |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/webapp/src/__tests__/pages/TheChallengeGame.test.js b/webapp/src/__tests__/pages/TheChallengeGame.test.js
index 6ed2b6d2..130b501b 100644
--- a/webapp/src/__tests__/pages/TheChallengeGame.test.js
+++ b/webapp/src/__tests__/pages/TheChallengeGame.test.js
@@ -5,11 +5,11 @@ import { BrowserRouter as Router } from 'react-router-dom';
 import axios from 'axios';
 import MockAdapter from 'axios-mock-adapter';
 import '../../localize/i18n';
-import Game from '../../pages/TheChallengeGame';
+import TheChallengeGame from '../../pages/TheChallengeGame';
 
 const mockAxios = new MockAdapter(axios);
 
-describe('Game component', () => {
+describe('The Challenge component', () => {
   beforeEach(() => {
     mockAxios.reset();
     // Mockear respuestas de la API
@@ -32,7 +32,7 @@ describe('Game component', () => {
     render( 
         <SessionContext.Provider value={{ username: 'exampleUser' }}>
           <Router>
-            <Game />
+            <TheChallengeGame />
           </Router>
         </SessionContext.Provider>
     );
@@ -62,7 +62,7 @@ describe('Game component', () => {
     render( 
         <SessionContext.Provider value={{ username: 'exampleUser' }}>
           <Router>
-            <Game />
+            <TheChallengeGame />
           </Router>
         </SessionContext.Provider>
     );
@@ -83,9 +83,9 @@ describe('Game component', () => {
     await waitFor(() => screen.getByTestId('question'));
     const correctAnswer = screen.getByRole('button', { name: 'Madrid' });
 
-    expect(screen.findByTestId("anwer0"));
     //selects correct answer
     fireEvent.click(correctAnswer);
+    
     expect(screen.findByTestId("succes0"));
 
   });
@@ -95,7 +95,7 @@ describe('Game component', () => {
      render( 
         <SessionContext.Provider value={{ username: 'exampleUser' }}>
           <Router>
-            <Game />
+            <TheChallengeGame />
           </Router>
         </SessionContext.Provider>
     );
@@ -125,7 +125,7 @@ describe('Game component', () => {
     render( 
         <SessionContext.Provider value={{ username: 'exampleUser' }}>
           <Router>
-            <Game />
+            <TheChallengeGame />
           </Router>
         </SessionContext.Provider>
     );
@@ -154,7 +154,7 @@ describe('Game component', () => {
     render(
         <SessionContext.Provider value={{ username: 'exampleUser' }}>
             <Router>
-                <Game />
+                <TheChallengeGame />
             </Router>
         </SessionContext.Provider>
     );
@@ -172,6 +172,6 @@ describe('Game component', () => {
     fireEvent.click(screen.getByTestId('pause'));
 
     expect(screen.getByTestId('play')).toBeInTheDocument();
-});
+  });
 
 });
\ No newline at end of file
diff --git a/webapp/src/pages/TheChallengeGame.js b/webapp/src/pages/TheChallengeGame.js
index 1f03a70f..c9273750 100644
--- a/webapp/src/pages/TheChallengeGame.js
+++ b/webapp/src/pages/TheChallengeGame.js
@@ -19,7 +19,7 @@ import RemoveIcon from '@mui/icons-material/Remove';
 const apiEndpoint = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
 
 
-const Game = () => {
+const TheChallengeGame = () => {
     const navigate = useNavigate();
     const SUCCESS_SOUND_ROUTE = "/sounds/success_sound.mp3";
     const FAILURE_SOUND_ROUTE = "/sounds/wrong_sound.mp3";
@@ -425,4 +425,4 @@ const Game = () => {
     );
 };
 
-export default Game;
\ No newline at end of file
+export default TheChallengeGame;
\ No newline at end of file

From fcf535990f65950f162e4ed182d556b1f5780b05 Mon Sep 17 00:00:00 2001
From: uo288245 <uo288245@uniovi.es>
Date: Thu, 25 Apr 2024 15:26:38 +0200
Subject: [PATCH 093/132] Upgraded tests of the Discovering Cities game.

---
 .../pages/DiscoveringCitiesGame.test.js       | 59 +++++++++++--------
 .../__tests__/pages/TheChallengeGame.test.js  |  2 +-
 webapp/src/pages/MultiplayerGame.js           |  2 -
 webapp/src/pages/TheChallengeGame.js          |  2 -
 webapp/src/pages/WiseMenStackGame.js          |  1 -
 5 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/webapp/src/__tests__/pages/DiscoveringCitiesGame.test.js b/webapp/src/__tests__/pages/DiscoveringCitiesGame.test.js
index ff54afdc..faa0a752 100644
--- a/webapp/src/__tests__/pages/DiscoveringCitiesGame.test.js
+++ b/webapp/src/__tests__/pages/DiscoveringCitiesGame.test.js
@@ -4,12 +4,12 @@ import { SessionContext } from '../../SessionContext'; // Importa el contexto ne
 import { BrowserRouter as Router } from 'react-router-dom';
 import axios from 'axios';
 import MockAdapter from 'axios-mock-adapter';
-import Game from '../../pages/DiscoveringCitiesGame';
+import DiscoveringCitiesGame from '../../pages/DiscoveringCitiesGame';
 import '../../localize/i18n';
 
 const mockAxios = new MockAdapter(axios);
-
-describe('Game component', () => {
+ 
+describe('Discovering Cities component', () => {
   beforeEach(() => {
     mockAxios.reset();
     // Mock the axios.post request to simulate a successful response
@@ -32,25 +32,21 @@ describe('Game component', () => {
     render( 
       <SessionContext.Provider value={{ username: 'exampleUser' }}>
         <Router>
-          <Game />
+          <DiscoveringCitiesGame />
         </Router>
       </SessionContext.Provider>
     );
 
     expect(screen.getByRole('progressbar'));
-    //expect(screen.findByText('1'));
-    //expect(screen.findByText('1/5'));
 
     // waits for the question to appear
-    await waitFor(() => screen.getByText('Which is the capital of Spain?'));
+    await waitFor(() => screen.getByTestId('question'));
 
-    expect(screen.findByText('Which is the capital of Spain?'));
+    expect(screen.getByTestId('question'));
     expect(screen.findByText('Madrid'));
     expect(screen.findByText('Barcelona'));
     expect(screen.findByText('Paris'));
     expect(screen.findByText('London'));
-    
-    expect(screen.getByRole('button', { name: /Pause/i }));
 
   });
 
@@ -58,23 +54,21 @@ describe('Game component', () => {
     render( 
       <SessionContext.Provider value={{ username: 'exampleUser' }}>
         <Router>
-          <Game />
+          <DiscoveringCitiesGame />
         </Router>
       </SessionContext.Provider>
     );
 
     // waits for the question to appear
-    await waitFor(() => screen.getByText('Which is the capital of Spain?'));
+    await waitFor(() => screen.getByTestId('question'));
     const correctAnswer = screen.getByRole('button', { name: 'Madrid' });
 
-    expect(correctAnswer).not.toHaveStyle({ backgroundColor: 'green' });
+    expect(correctAnswer).toHaveStyle({ backgroundColor: 'rgb(0, 102, 153);' });
 
     //selects correct answer
     fireEvent.click(correctAnswer);
 
-    //expect(screen.findByText('1')).toHaveStyle({ backgroundColor: 'lightgreen' });
-
-    expect(correctAnswer).toHaveStyle({ backgroundColor: 'green' });
+    expect(correctAnswer).toHaveStyle({ backgroundColor: 'rgb(51, 153, 102);' });
 
   });
   
@@ -82,21 +76,20 @@ describe('Game component', () => {
     render( 
       <SessionContext.Provider value={{ username: 'exampleUser' }}>
         <Router>
-          <Game />
+          <DiscoveringCitiesGame />
         </Router>
       </SessionContext.Provider>
     );
     // waits for the question to appear
-    await waitFor(() => screen.getByText('Which is the capital of Spain?'));
+    await waitFor(() => screen.getByTestId('question'));
     const incorrectAnswer = screen.getByRole('button', { name: 'Barcelona' });
 
-    expect(incorrectAnswer).not.toHaveStyle({ backgroundColor: 'red' });
+    expect(incorrectAnswer).toHaveStyle({ backgroundColor: 'rgb(0, 102, 153);' });
 
     //selects correct answer
     fireEvent.click(incorrectAnswer);
 
-    expect(incorrectAnswer).toHaveStyle({ backgroundColor: 'red' });
-    //expect(screen.findByText('1')).toHaveStyle({ backgroundColor: 'salmon' });
+    expect(incorrectAnswer).toHaveStyle({ backgroundColor: 'rgb(153, 0, 0);' });
 
   });
 
@@ -104,13 +97,13 @@ describe('Game component', () => {
     render( 
       <SessionContext.Provider value={{ username: 'exampleUser' }}>
         <Router>
-          <Game />
+          <DiscoveringCitiesGame />
         </Router>
       </SessionContext.Provider>
     );
 
     // waits for the question to appear
-    await waitFor(() => screen.getByText('Which is the capital of Spain?'));
+    await waitFor(() => screen.getByTestId('question'));
 
     setTimeout(() => {
       // Comprobamos que el callback ha sido llamado después del tiempo especificado
@@ -119,4 +112,24 @@ describe('Game component', () => {
 
   }, 4500);
 
+  it('should pause and resume the game after answering a question', async () => {
+    render(
+        <SessionContext.Provider value={{ username: 'exampleUser' }}>
+            <Router>
+                <DiscoveringCitiesGame />
+            </Router>
+        </SessionContext.Provider>
+    );
+
+    await waitFor(() => screen.getByTestId('question'));
+
+    fireEvent.click(screen.getByRole('button', { name: 'Madrid' }));
+
+    await waitFor(() => screen.getByTestId('pause'));
+
+    fireEvent.click(screen.getByTestId('pause'));
+
+    expect(screen.getByTestId('play')).toBeInTheDocument();
+  });
+
 });
diff --git a/webapp/src/__tests__/pages/TheChallengeGame.test.js b/webapp/src/__tests__/pages/TheChallengeGame.test.js
index 130b501b..f45f37a1 100644
--- a/webapp/src/__tests__/pages/TheChallengeGame.test.js
+++ b/webapp/src/__tests__/pages/TheChallengeGame.test.js
@@ -86,7 +86,7 @@ describe('The Challenge component', () => {
     //selects correct answer
     fireEvent.click(correctAnswer);
     
-    expect(screen.findByTestId("succes0"));
+    expect(screen.findByTestId("success0"));
 
   });
 
diff --git a/webapp/src/pages/MultiplayerGame.js b/webapp/src/pages/MultiplayerGame.js
index 2c71b34a..eb7698e9 100644
--- a/webapp/src/pages/MultiplayerGame.js
+++ b/webapp/src/pages/MultiplayerGame.js
@@ -12,7 +12,6 @@ import io from 'socket.io-client';
 import { useTranslation } from 'react-i18next';
 import i18n from '../localize/i18n';
 
-
 const apiEndpoint = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
 const socketEndpoint = process.env.REACT_APP_MULTIPLAYER_ENDPOINT || 'ws://localhost:5010';
 
@@ -44,7 +43,6 @@ const Game = () => {
     const [userResponses, setUserResponses] = React.useState([]);
     const [, setCurrentLanguage] = React.useState(i18n.language);
 
-
     const location = useLocation();
     const { gameQuestions, roomCode} = location.state;
     const [socket, setSocket] = React.useState(null);
diff --git a/webapp/src/pages/TheChallengeGame.js b/webapp/src/pages/TheChallengeGame.js
index c9273750..01197b05 100644
--- a/webapp/src/pages/TheChallengeGame.js
+++ b/webapp/src/pages/TheChallengeGame.js
@@ -15,10 +15,8 @@ import { PlayArrow, Pause } from '@mui/icons-material';
 import AddIcon from '@mui/icons-material/Add';
 import RemoveIcon from '@mui/icons-material/Remove';
 
-
 const apiEndpoint = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
 
-
 const TheChallengeGame = () => {
     const navigate = useNavigate();
     const SUCCESS_SOUND_ROUTE = "/sounds/success_sound.mp3";
diff --git a/webapp/src/pages/WiseMenStackGame.js b/webapp/src/pages/WiseMenStackGame.js
index bad3fce1..3f74aad0 100644
--- a/webapp/src/pages/WiseMenStackGame.js
+++ b/webapp/src/pages/WiseMenStackGame.js
@@ -14,7 +14,6 @@ import i18n from '../localize/i18n';
 
 const apiEndpoint = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
 
-
 const WiseMenStackGame = () => {
     const navigate = useNavigate();
     const SUCCESS_SOUND_ROUTE = "/sounds/success_sound.mp3";

From 9249d81f7b4784af73143906470fdd67ddd33ab3 Mon Sep 17 00:00:00 2001
From: uo288245 <uo288245@uniovi.es>
Date: Thu, 25 Apr 2024 15:37:16 +0200
Subject: [PATCH 094/132] I don't know wtf happened with the tests that they
 were like, bad done.

---
 webapp/src/__tests__/pages/TheChallengeGame.test.js | 5 ++---
 webapp/src/__tests__/pages/WiseMenStackGame.test.js | 7 +++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/webapp/src/__tests__/pages/TheChallengeGame.test.js b/webapp/src/__tests__/pages/TheChallengeGame.test.js
index f45f37a1..baa65481 100644
--- a/webapp/src/__tests__/pages/TheChallengeGame.test.js
+++ b/webapp/src/__tests__/pages/TheChallengeGame.test.js
@@ -113,11 +113,10 @@ describe('The Challenge component', () => {
     // waits for the question to appear
     await waitFor(() => screen.getByTestId('question'));
     const incorrectAnswer = screen.getByRole('button', { name: 'Barcelona' });
-
-    expect(screen.findByTestId("anwer1"));
+    
     //selects correct answer
     fireEvent.click(incorrectAnswer);
-    expect(screen.findByTestId("failure1"));
+    expect(screen.findByTestId("success1"));
 
   });
 
diff --git a/webapp/src/__tests__/pages/WiseMenStackGame.test.js b/webapp/src/__tests__/pages/WiseMenStackGame.test.js
index 3e40a50b..c08969b4 100644
--- a/webapp/src/__tests__/pages/WiseMenStackGame.test.js
+++ b/webapp/src/__tests__/pages/WiseMenStackGame.test.js
@@ -61,11 +61,10 @@ describe('Wise Men Stack Game component', () => {
     await waitFor(() => screen.getByText('Which is the capital of Spain?'.toUpperCase()));
 
     const correctAnswer = screen.getByRole('button', { name: 'Madrid' });
-    // now the answer is not selected:
-    expect(screen.findByTestId("anwer0"));
+
     // after clicking it has changed to succeeded:
     fireEvent.click(correctAnswer);
-    expect(screen.findByTestId("succes0"));
+    expect(screen.findByTestId("success0"));
 
   });
 
@@ -83,7 +82,7 @@ describe('Wise Men Stack Game component', () => {
     const id = answers[0].name === 'Madrid' ? 1 : 0;
 
     // now the answer is not selected:
-    expect(screen.findByTestId(`anwer${id}`));
+    expect(screen.findByTestId(`success${id}`));
     // after clicking it has changed to succeeded:
     fireEvent.click(incorrectAnswer);
     expect(screen.findByTestId(`failure${id}`));

From 73109e5808429415250fff4954e4b07e540f548a Mon Sep 17 00:00:00 2001
From: uo288245 <uo288245@uniovi.es>
Date: Thu, 25 Apr 2024 15:50:08 +0200
Subject: [PATCH 095/132] Code improvements in the games.

---
 webapp/src/pages/DiscoveringCitiesGame.js |   3 +-
 webapp/src/pages/Game.js                  |   3 +-
 webapp/src/pages/TheChallengeGame.js      | 152 +++++++++-------------
 webapp/src/pages/WiseMenStackGame.js      | 103 +++++----------
 4 files changed, 97 insertions(+), 164 deletions(-)

diff --git a/webapp/src/pages/DiscoveringCitiesGame.js b/webapp/src/pages/DiscoveringCitiesGame.js
index 82da3491..eb3d3741 100644
--- a/webapp/src/pages/DiscoveringCitiesGame.js
+++ b/webapp/src/pages/DiscoveringCitiesGame.js
@@ -215,8 +215,7 @@ const DiscovertingCitiesGame = () => {
 
     const questionHistorialBar = () => {
         return questionHistorial.map((isCorrect, index) => (
-            <Card data-testid={`prog_bar${index}`}
-                    sx={{ width: `${100 / MAX_ROUNDS}%`, padding:'0.2em', margin:'0 0.1em', backgroundColor: isCorrect === null ? 'gray' : isCorrect ? theme.palette.success.main : theme.palette.error.main }}/>
+            <Card data-testid={`prog_bar${index}`} sx={{ width: `${100 / MAX_ROUNDS}%`, padding:'0.2em', margin:'0 0.1em', backgroundColor: isCorrect === null ? 'gray' : isCorrect ? theme.palette.success.main : theme.palette.error.main }}/>
         ));
     };    
 
diff --git a/webapp/src/pages/Game.js b/webapp/src/pages/Game.js
index 9f5d1245..c845d7e4 100644
--- a/webapp/src/pages/Game.js
+++ b/webapp/src/pages/Game.js
@@ -214,8 +214,7 @@ const Game = () => {
 
     const questionHistorialBar = () => {
         return questionHistorial.map((isCorrect, index) => (
-            <Card data-testid={`prog_bar${index}`}
-                    sx={{ width: `${100 / MAX_ROUNDS}%`, padding:'0.2em', margin:'0 0.1em', backgroundColor: isCorrect === null ? 'gray' : isCorrect ? theme.palette.success.main : theme.palette.error.main }}/>
+            <Card data-testid={`prog_bar${index}`} sx={{ width: `${100 / MAX_ROUNDS}%`, padding:'0.2em', margin:'0 0.1em', backgroundColor: isCorrect === null ? 'gray' : isCorrect ? theme.palette.success.main : theme.palette.error.main }}/>
         ));
     };    
 
diff --git a/webapp/src/pages/TheChallengeGame.js b/webapp/src/pages/TheChallengeGame.js
index 01197b05..511feedd 100644
--- a/webapp/src/pages/TheChallengeGame.js
+++ b/webapp/src/pages/TheChallengeGame.js
@@ -230,92 +230,71 @@ const TheChallengeGame = () => {
         
         return(
             <Container sx={{ display: 'flex', flex: 1, justifyContent: 'center', alignItems: 'center' }}>
-            <Paper elevation={5} sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', gap: '4em', padding: '4em', borderRadius: '4em' }}>
-                <Typography variant="h2" align="center" fontWeight="bold" sx={{ textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem' }}>
-                    {t("Game.config.title")}
-                </Typography>
-
-                <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center', gap: '1em' }}>
-                    <Box sx={{ display: 'flex', alignItems: 'center', gap: '1em' }}>
-                        <Typography htmlFor="numRounds" variant="h5">
-                            {t("Game.config.num_rounds")}:
-                        </Typography>
-                        <IconButton size="large" color="error" disabled={numRounds === 1} onClick={() => setNumRounds(numRounds - 1)} variant="outlined" data-testId="removeRound">
-                            <RemoveIcon fontSize="inherit" />
-                        </IconButton>
-                        <Typography fontWeight="bold" color="primary" fontSize="1.5em">
-                            {numRounds}
-                        </Typography>
-                        <IconButton size="large" color="success" onClick={() => setNumRounds(numRounds + 1)} variant="outlined" data-testId="addRound">
-                            <AddIcon fontSize="inherit" />
-                        </IconButton>
-                    </Box>
-
-                    <Box sx={{ display: 'flex', alignItems: 'center', gap: '1em' }}>
-                        <Typography htmlFor="questionTime" variant="h5">
-                            {t("Game.config.time")}:
-                        </Typography>
-                        <IconButton size="large" color="error" disabled={timerConfig === 1} onClick={() => setTimerConfig(timerConfig - 1)} variant="outlined" data-testId="removeSecond">
-                            <RemoveIcon fontSize="inherit" />
-                        </IconButton>
-                        <Typography fontWeight="bold" color="primary" fontSize="1.5em">
-                            {timerConfig}
-                        </Typography>
-                        <IconButton size="large" color="success" onClick={() => setTimerConfig(timerConfig + 1)} variant="outlined" data-testId="addSecond">
-                            <AddIcon fontSize="inherit" />
-                        </IconButton>
-                    </Box>
-
-                    {/* Dropdown for selecting category */}
-                    <Box sx={{ display: 'flex', alignItems: 'center', gap: '1em' }}>
-                        <Typography htmlFor="category" variant="h5">
-                            {t("Game.config.category")}:
-                        </Typography>
-                        <Select
-                            value={category}
-                            onChange={(event) => setCategory(event.target.value)}
-                            style={{ minWidth: '120px' }}
-                        >
-                            <MenuItem value="Geography">{t("Game.categories.geography")}</MenuItem>
-                            <MenuItem value="Political">{t("Game.categories.political")}</MenuItem>
-                            <MenuItem value="Sports">{t("Game.categories.sports")}</MenuItem>
-                        </Select>
-                    </Box>
-                </Container>
-                <Button
-                    data-testid="start-button"
-                    onClick={() => { startGame(); setQuestionHistorial(Array(numRounds).fill(null)); console.log(category) }}
-                    variant="contained"
-                    size='large'
-                    sx={{
-                        fontFamily: 'Arial Black, sans-serif',
-                        color: theme.palette.primary.main,
-                        backgroundColor: 'transparent',
-                        border: `2px solid ${theme.palette.primary.main}`,
-                        transition: 'background-color 0.3s ease',
-
-                        '&:hover': {
-                            backgroundColor: theme.palette.primary.main,
-                            color: 'white',
-                        }
-                    }}
-                >
-                    {t("Game.start")}
-                </Button>
-            </Paper>
+                <Paper elevation={5} sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', gap: '4em', padding: '4em', borderRadius: '4em' }}>
+                    <Typography variant="h2" align="center" fontWeight="bold" sx={{ textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem' }}>
+                        {t("Game.config.title")}
+                    </Typography>
+
+                    <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center', gap: '1em' }}>
+                        <Box sx={{ display: 'flex', alignItems: 'center', gap: '1em' }}>
+                            <Typography htmlFor="numRounds" variant="h5">
+                                {t("Game.config.num_rounds")}:
+                            </Typography>
+                            <IconButton size="large" color="error" disabled={numRounds === 1} onClick={() => setNumRounds(numRounds - 1)} variant="outlined" data-testId="removeRound">
+                                <RemoveIcon fontSize="inherit" />
+                            </IconButton>
+                            <Typography fontWeight="bold" color="primary" fontSize="1.5em">
+                                {numRounds}
+                            </Typography>
+                            <IconButton size="large" color="success" onClick={() => setNumRounds(numRounds + 1)} variant="outlined" data-testId="addRound">
+                                <AddIcon fontSize="inherit" />
+                            </IconButton>
+                        </Box>
+
+                        <Box sx={{ display: 'flex', alignItems: 'center', gap: '1em' }}>
+                            <Typography htmlFor="questionTime" variant="h5">
+                                {t("Game.config.time")}:
+                            </Typography>
+                            <IconButton size="large" color="error" disabled={timerConfig === 1} onClick={() => setTimerConfig(timerConfig - 1)} variant="outlined" data-testId="removeSecond">
+                                <RemoveIcon fontSize="inherit" />
+                            </IconButton>
+                            <Typography fontWeight="bold" color="primary" fontSize="1.5em">
+                                {timerConfig}
+                            </Typography>
+                            <IconButton size="large" color="success" onClick={() => setTimerConfig(timerConfig + 1)} variant="outlined" data-testId="addSecond">
+                                <AddIcon fontSize="inherit" />
+                            </IconButton>
+                        </Box>
+
+                        {/* Dropdown for selecting category */}
+                        <Box sx={{ display: 'flex', alignItems: 'center', gap: '1em' }}>
+                            <Typography htmlFor="category" variant="h5">
+                                {t("Game.config.category")}:
+                            </Typography>
+                            <Select
+                                value={category}
+                                onChange={(event) => setCategory(event.target.value)}
+                                style={{ minWidth: '120px' }}
+                            >
+                                <MenuItem value="Geography">{t("Game.categories.geography")}</MenuItem>
+                                <MenuItem value="Political">{t("Game.categories.political")}</MenuItem>
+                                <MenuItem value="Sports">{t("Game.categories.sports")}</MenuItem>
+                            </Select>
+                        </Box>
+                    </Container>
+                    <Button data-testid="start-button" onClick={() => { startGame(); setQuestionHistorial(Array(numRounds).fill(null)); console.log(category) }} variant="contained" size='large'
+                        sx={{fontFamily: 'Arial Black, sans-serif', color: theme.palette.primary.main, backgroundColor: 'transparent', border: `2px solid ${theme.palette.primary.main}`,
+                        transition: 'background-color 0.3s ease', '&:hover': { backgroundColor: theme.palette.primary.main, color: 'white' }}}>
+                        {t("Game.start")}
+                    </Button>
+                </Paper>
             </Container>
         );
     }
 
     const questionHistorialBar = () => {
         return questionHistorial.map((isCorrect, index) => (
-            <Card data-testid={`prog_bar${index}`}
-                    sx={{ width: `${100 / numRounds}%`,
-                    padding:'0.2em', 
-                    margin:'0 0.1em', 
-                    backgroundColor: isCorrect === null ? 'gray' : isCorrect ? theme.palette.success.main : theme.palette.error.main }}
-            >
-            </Card>
+            <Card data-testid={`prog_bar${index}`} sx={{ width: `${100 / numRounds}%`, padding:'0.2em', margin:'0 0.1em', backgroundColor: isCorrect === null ? 'gray' : isCorrect ? theme.palette.success.main : theme.palette.error.main }} />
         ));
     };    
 
@@ -328,23 +307,14 @@ const TheChallengeGame = () => {
     // circular loading
     if (!questionData) {
         return (
-            <Container
-                sx={{
-                    display: 'flex',
-                    flexDirection: 'column',
-                    alignItems: 'center',
-                    justifyContent: 'center',
-                    height: '100vh',
-                    textAlign: 'center',
-                }}
-            >
+            <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', height: '100vh', textAlign: 'center' }}>
                 <CssBaseline />
                 <CircularProgress />
             </Container>
         );
     }
 
-    // redirect to / if game over 
+    // redirect to homepage if game over 
     if (shouldRedirect) {
         // Redirect after 4 seconds
         setTimeout(() => {
diff --git a/webapp/src/pages/WiseMenStackGame.js b/webapp/src/pages/WiseMenStackGame.js
index 3f74aad0..f61487be 100644
--- a/webapp/src/pages/WiseMenStackGame.js
+++ b/webapp/src/pages/WiseMenStackGame.js
@@ -23,7 +23,6 @@ const WiseMenStackGame = () => {
     const {username} = useContext(SessionContext);
     const theme = useTheme();
 
-
     // Traductions
     const { t } = useTranslation();
 
@@ -135,7 +134,6 @@ const WiseMenStackGame = () => {
         const randomFactor = random < 0.5 ? -1 : 1;
         return array.sort(() => randomFactor);
     }
-      
 
     const updateStatistics = async() => {
         try {
@@ -224,8 +222,7 @@ const WiseMenStackGame = () => {
 
     const questionHistorialBar = () => {
         return questionHistorial.map((isCorrect, index) => (
-            <Card   data-testid={`prog_bar${index}`}
-                    sx={{ width: `${100 / round}%`, padding:'0.2em', margin:'0 0.1em', backgroundColor: isCorrect === null ? 'gray' : isCorrect ? theme.palette.success.main : theme.palette.error.main }}/>
+            <Card data-testid={`prog_bar${index}`} sx={{ width: `${100 / round}%`, padding:'0.2em', margin:'0 0.1em', backgroundColor: isCorrect === null ? 'gray' : isCorrect ? theme.palette.success.main : theme.palette.error.main }}/>
         ));
     };
 
@@ -237,60 +234,37 @@ const WiseMenStackGame = () => {
     if(!isConfigured) {
         return (
             <Container sx={{ display: 'flex', flex: 1, justifyContent: 'center', alignItems: 'center' }}>
-            <Paper elevation={5} sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', gap: '4em', padding: '4em', borderRadius: '4em' }}>
-                <Typography variant="h2" align="center" fontWeight="bold" sx={{ textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem' }}>
-                    {t("Game.config.title")}
-                </Typography>
-
-                <Box sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center', gap: '1em' }}>
-                    <Box sx={{ display: 'flex', alignItems: 'center', gap: '0.5em'}}>
-                        <Typography variant="h4" fontWeight="bold" color="error">{t("Wise_Men.instructions1")}</Typography>
-                        <Typography variant="h4" fontWeight="bold" color={theme.palette.success.main} >{t("Wise_Men.instructions2")}</Typography>
-                        <Typography variant="h4" fontWeight="bold" color="primary">{t("Wise_Men.instructions3")}</Typography>
+                <Paper elevation={5} sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', gap: '4em', padding: '4em', borderRadius: '4em' }}>
+                    <Typography variant="h2" align="center" fontWeight="bold" sx={{ textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem' }}>
+                        {t("Game.config.title")}
+                    </Typography>
+
+                    <Box sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center', gap: '1em' }}>
+                        <Box sx={{ display: 'flex', alignItems: 'center', gap: '0.5em'}}>
+                            <Typography variant="h4" fontWeight="bold" color="error">{t("Wise_Men.instructions1")}</Typography>
+                            <Typography variant="h4" fontWeight="bold" color={theme.palette.success.main} >{t("Wise_Men.instructions2")}</Typography>
+                            <Typography variant="h4" fontWeight="bold" color="primary">{t("Wise_Men.instructions3")}</Typography>
+                        </Box>
+
+                        {/* Dropdown for selecting category */}
+                        <Box sx={{ display: 'flex', alignItems: 'center', gap: '1em' }}>
+                            <Typography data-testid="categories-label" variant='h5' htmlFor="category">
+                                {t("Game.config.category")}:
+                            </Typography>
+                            <Select value={category} onChange={(event) => setCategory(event.target.value)} style={{ minWidth: '120px' }}>
+                                <MenuItem value="Geography">{t("Game.categories.geography")}</MenuItem>
+                                <MenuItem value="Political">{t("Game.categories.political")}</MenuItem>
+                                <MenuItem value="Sports">{t("Game.categories.sports")}</MenuItem>
+                            </Select>
+                        </Box>
                     </Box>
 
-                    {/* Dropdown for selecting category */}
-                    <Box sx={{ display: 'flex', alignItems: 'center', gap: '1em' }}>
-                        <Typography data-testid="categories-label" variant='h5' htmlFor="category">
-                            {t("Game.config.category")}:
-                        </Typography>
-                        <Select
-                            value={category}
-                            onChange={(event) => setCategory(event.target.value)}
-                            style={{ minWidth: '120px' }}
-                        >
-                            <MenuItem value="Geography">{t("Game.categories.geography")}</MenuItem>
-                            <MenuItem value="Political">{t("Game.categories.political")}</MenuItem>
-                            <MenuItem value="Sports">{t("Game.categories.sports")}</MenuItem>
-                        </Select>
-                    </Box>
-                </Box>
-
-                <Button
-                    data-testid="start-button"
-                    onClick={() => { 
-                        setConfiguration(true);
-                        startNewRound(); 
-                        setQuestionHistorial(Array(round).fill(null));
-                    }}
-                    variant="contained"
-                    size="large"
-                    sx={{
-                        fontFamily: 'Arial Black, sans-serif',
-                        color: theme.palette.primary.main,
-                        backgroundColor: 'transparent',
-                        border: `2px solid ${theme.palette.primary.main}`,
-                        transition: 'background-color 0.3s ease',
-
-                        '&:hover': {
-                            backgroundColor: theme.palette.primary.main,
-                            color: 'white',
-                        }
-                    }}
-                >
-                    {t("Game.start")}
-                </Button>
-            </Paper>
+                    <Button data-testid="start-button" onClick={() => { setConfiguration(true); startNewRound(); setQuestionHistorial(Array(round).fill(null)); }} variant="contained" size="large"
+                        sx={{ fontFamily: 'Arial Black, sans-serif', color: theme.palette.primary.main, backgroundColor: 'transparent', border: `2px solid ${theme.palette.primary.main}`,
+                        transition: 'background-color 0.3s ease', '&:hover': { backgroundColor: theme.palette.primary.main, color: 'white' }}}>
+                        {t("Game.start")}
+                    </Button>
+                </Paper>
             </Container>
         );
     }
@@ -298,25 +272,16 @@ const WiseMenStackGame = () => {
     // circular loading
     if (!questionData) {
         return (
-            <Container
-                sx={{
-                    display: 'flex',
-                    flexDirection: 'column',
-                    alignItems: 'center',
-                    justifyContent: 'center',
-                    height: '100vh',
-                    textAlign: 'center',
-                }}
-            >
+            <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', height: '100vh', textAlign: 'center' }}>
                 <CssBaseline />
                 <CircularProgress />
             </Container>
         );
     }    
 
-    // redirect to / if game over 
+    // redirect to homepage if game over 
     if (shouldRedirect) {
-        // Redirect after 3 seconds
+        // Redirect after 4 seconds
         setTimeout(() => {
                 navigate('/homepage');
         }, 4000);
@@ -392,4 +357,4 @@ const WiseMenStackGame = () => {
     );
 };
 
-export default WiseMenStackGame;
+export default WiseMenStackGame;
\ No newline at end of file

From c34a620c9b5ad909aa2b89fd81cc25d27fcd00c4 Mon Sep 17 00:00:00 2001
From: uo288245 <uo288245@uniovi.es>
Date: Thu, 25 Apr 2024 16:53:49 +0200
Subject: [PATCH 096/132] Updated de Multiplayer Game principal view.

---
 webapp/src/pages/MultiplayerGame.js | 265 +++++++++++-----------------
 webapp/src/pages/MultiplayerRoom.js |   2 +-
 2 files changed, 103 insertions(+), 164 deletions(-)

diff --git a/webapp/src/pages/MultiplayerGame.js b/webapp/src/pages/MultiplayerGame.js
index eb7698e9..d18d5f6f 100644
--- a/webapp/src/pages/MultiplayerGame.js
+++ b/webapp/src/pages/MultiplayerGame.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import axios from 'axios';
-import { Container, Button, CssBaseline, Grid, Typography, CircularProgress, Card, CardContent } from '@mui/material';
+import { useTheme, Container, Button, CssBaseline, Grid, Typography, CircularProgress, Card, Box } from '@mui/material';
 import CheckIcon from '@mui/icons-material/Check';
 import ClearIcon from '@mui/icons-material/Clear';
 import { SessionContext } from '../SessionContext';
@@ -15,9 +15,7 @@ import i18n from '../localize/i18n';
 const apiEndpoint = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
 const socketEndpoint = process.env.REACT_APP_MULTIPLAYER_ENDPOINT || 'ws://localhost:5010';
 
-const Game = () => {
-    const { t } = useTranslation();
-    
+const Game = () => {    
     const MAX_ROUNDS = 3;
     const SUCCESS_SOUND_ROUTE = "/sounds/success_sound.mp3";
     const FAILURE_SOUND_ROUTE = "/sounds/wrong_sound.mp3";
@@ -25,6 +23,11 @@ const Game = () => {
     //sesion information
     const {username} = useContext(SessionContext);
 
+    // Translations
+    const { t } = useTranslation();
+
+    const theme = useTheme();
+
     // state initialization
     const [round, setRound] = React.useState(1);
     const [questionData, setQuestionData] = React.useState(null);
@@ -93,11 +96,7 @@ const Game = () => {
 
     // stablish if the confetti must show or not
     React.useEffect(() => {
-        if (winnerPlayer === username) {
-          setShowConfetti(true);
-        } else {
-          setShowConfetti(false);
-        }
+        winnerPlayer === username ? setShowConfetti(true) : setShowConfetti(false);
       }, [winnerPlayer, username]);
     
 
@@ -105,16 +104,12 @@ const Game = () => {
     const startNewRound = async () => {
         setAnswered(false);
         const quest = gameQuestions[round-1]
-        
         setQuestionData(quest);    
         setButtonStates(new Array(quest.options.length).fill(null));
-          
     };
 
     const updateStatistics = async() => {
         try {
-            //const winner = winner === username ? 1 : 0;
-
             await axios.put(`${apiEndpoint}/statistics`, {
                 username:username,
                 the_callenge_earned_money:0,
@@ -221,22 +216,23 @@ const Game = () => {
 
     const questionHistorialBar = () => {
         return questionHistorial.map((isCorrect, index) => (
-        <Card 
-          key={index + 1}
-          variant="outlined"
-          style={{ 
-            width: `${100 / MAX_ROUNDS}%`,
-            marginRight: '0.6em',
-            backgroundColor: isCorrect === null ? 'gray' : isCorrect ? 'lightgreen' : 'salmon',
-          }}
-        >
-          <CardContent>{index + 1}</CardContent>
-        </Card>
+            <Card data-testid={`prog_bar${index}`} sx={{ width: `${100 / MAX_ROUNDS}%`, padding:'0.2em', margin:'0 0.1em', backgroundColor: isCorrect === null ? 'gray' : isCorrect ? theme.palette.success.main : theme.palette.error.main }}/>
         ));
-      };    
+    };    
 
     // circular loading
     if (!questionData) {
+        return (
+            <Container sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', flex: '1'}}>
+                <CssBaseline />
+                <CircularProgress />
+            </Container>
+        );
+    }
+
+    if (shouldRedirect) {
+        socket.emit("finished-game", username, correctlyAnsweredQuestions, totalTimePlayed);
+
         return (
             <Container
                 sx={{
@@ -249,152 +245,95 @@ const Game = () => {
                 }}
             >
                 <CssBaseline />
-                <CircularProgress />
+                <Typography 
+                variant="h4" 
+                sx={{
+                    color: winnerPlayer === username ? 'green' : 'black',
+                    fontSize: '4rem', // Tamaño de fuente
+                    marginTop: '20px', // Espaciado superior
+                    marginBottom: '50px', // Espaciado inferior
+                }}
+            >
+                
+                <Typography variant="h2" gutterBottom sx={{ fontFamily: 'fantasy', color: '#323333' }}>
+                {winnerPlayer === "" ? t("Multiplayer.Game.waiting_players_end") : "Game Over"}
+                </Typography>
+            </Typography>
+                <div>
+                <Grid container spacing={2}>
+                    <Grid item xs={12} sm={6}>
+                        <Typography variant="h6" gutterBottom sx={{ fontFamily: 'fantasy', color: '#323333' }}>
+                        {t("Game.correct")}: {correctlyAnsweredQuestions}
+                        </Typography>
+                    </Grid>
+                    <Grid item xs={12} sm={6}>
+                        <Typography variant="h6" gutterBottom sx={{ fontFamily: 'fantasy', color: '#323333' }}>
+                        {t("Game.incorrect")}: {incorrectlyAnsweredQuestions}
+                        </Typography>
+                    </Grid>
+                    <Grid item xs={12} sm={6}>
+                        <Typography variant="h6" gutterBottom sx={{ fontFamily: 'fantasy', color: '#323333' }}>
+                        {t("Game.money")}: {totalScore}
+                        </Typography>
+                    </Grid>
+                    <Grid item xs={12} sm={6}>
+                        <Typography variant="h6" gutterBottom sx={{ fontFamily: 'fantasy', color: '#323333' }}>
+                        {t("Game.time")}: {totalTimePlayed}
+                        </Typography>
+                    </Grid>
+                </Grid>
+
+                    {winnerPlayer === "" ? (
+                        <Typography variant="h5" sx={{marginTop: '1em', fontFamily: 'fantasy', color: '#323333'}}>{ t("Multiplayer.Game.waiting") }</Typography>
+                    ) : (
+                        <Typography variant="h5" sx={{marginTop: '1em', fontFamily: 'fantasy', color: '#323333'}}>{ t("Multiplayer.Game.winner_1") }: {winnerPlayer} { t("Multiplayer.Game.winner_2") } {winnerCorrect} { t("Multiplayer.Game.winner_3") } {winnerTime} { t("Multiplayer.Game.winner_4") }</Typography>
+                    )}
+                </div>
+                {showConfetti && <Confetti />}
             </Container>
         );
     }
-
-if (shouldRedirect) {
-    socket.emit("finished-game", username, correctlyAnsweredQuestions, totalTimePlayed);
-
-    return (
-        <Container
-            sx={{
-                display: 'flex',
-                flexDirection: 'column',
-                alignItems: 'center',
-                justifyContent: 'center',
-                height: '100vh',
-                textAlign: 'center',
-            }}
-        >
-            <CssBaseline />
-            <Typography 
-            variant="h4" 
-            sx={{
-                color: winnerPlayer === username ? 'green' : 'black',
-                fontSize: '4rem', // Tamaño de fuente
-                marginTop: '20px', // Espaciado superior
-                marginBottom: '50px', // Espaciado inferior
-            }}
-        >
-            
-            <Typography variant="h2" gutterBottom sx={{ fontFamily: 'fantasy', color: '#323333' }}>
-            {winnerPlayer === "" ? t("Multiplayer.Game.waiting_players_end") : "Game Over"}
-            </Typography>
-        </Typography>
-            <div>
-            <Grid container spacing={2}>
-                <Grid item xs={12} sm={6}>
-                    <Typography variant="h6" gutterBottom sx={{ fontFamily: 'fantasy', color: '#323333' }}>
-                    {t("Game.correct")}: {correctlyAnsweredQuestions}
-                    </Typography>
-                </Grid>
-                <Grid item xs={12} sm={6}>
-                    <Typography variant="h6" gutterBottom sx={{ fontFamily: 'fantasy', color: '#323333' }}>
-                    {t("Game.incorrect")}: {incorrectlyAnsweredQuestions}
-                    </Typography>
-                </Grid>
-                <Grid item xs={12} sm={6}>
-                    <Typography variant="h6" gutterBottom sx={{ fontFamily: 'fantasy', color: '#323333' }}>
-                    {t("Game.money")}: {totalScore}
-                    </Typography>
-                </Grid>
-                <Grid item xs={12} sm={6}>
-                    <Typography variant="h6" gutterBottom sx={{ fontFamily: 'fantasy', color: '#323333' }}>
-                    {t("Game.time")}: {totalTimePlayed}
-                    </Typography>
-                </Grid>
-            </Grid>
-
-                {winnerPlayer === "" ? (
-                    <Typography variant="h5" sx={{marginTop: '1em', fontFamily: 'fantasy', color: '#323333'}}>{ t("Multiplayer.Game.waiting") }</Typography>
-                ) : (
-                    <Typography variant="h5" sx={{marginTop: '1em', fontFamily: 'fantasy', color: '#323333'}}>{ t("Multiplayer.Game.winner_1") }: {winnerPlayer} { t("Multiplayer.Game.winner_2") } {winnerCorrect} { t("Multiplayer.Game.winner_3") } {winnerTime} { t("Multiplayer.Game.winner_4") }</Typography>
-                )}
-            </div>
-            {showConfetti && <Confetti />}
-        </Container>
-    );
-}
+    
     return (
-        <Container
-            sx={{
-                display: 'flex',
-                flexDirection: 'column',
-                alignItems: 'center',
-                justifyContent: 'center',
-                height: '100vh',
-                textAlign: 'center',
-            }}
-        >
+        <Container sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'space-around', alignItems: 'center', textAlign: 'center', flex: '1', gap: '2em', margin: '0 auto', padding: '1em 0' }}>
             <CssBaseline />
-            <Container
-            sx={{
-                position: 'absolute',
-                top: '10%', 
-                right: '20%', 
-            }}>
-                <Container
-                    sx={{
-                        display: 'flex',
-                        flexDirection: 'row',
-                        alignItems: 'center',
+
+            <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }} >
+                <CountdownCircleTimer data-testid="circleTimer" key={questionCountdownKey} isPlaying = {questionCountdownRunning} duration={15} colorsTime={[10, 6, 3, 0]}
+                    colors={[theme.palette.success.main, "#F7B801", "#f50707", theme.palette.error.main]} size={100} onComplete={() => selectResponse(-1, "FAILED")}>
+                    {({ remainingTime }) => {
+                        return (
+                            <Box style={{ display: 'flex', alignItems: 'center' }}>
+                                <Typography fontSize='1.2em' fontWeight='bold'>{remainingTime}</Typography>
+                            </Box>
+                        );
                     }}
-                >
-                    {questionHistorialBar()}
-                </Container>
+                </CountdownCircleTimer>
+            </Container>    
+
+            <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center', gap: '1em' }} >
+                <Typography variant="h4" data-testid="question" fontWeight="bold" >
+                    {questionData.question.toUpperCase()}
+                </Typography>
+
+                <Grid container spacing={2} gap="0.7em">
+                    {questionData.options.map((option, index) => (
+                        <Grid item xs={12} key={index}>
+                            <Button data-testid={buttonStates[index] === "success" ? `success${index}` : buttonStates[index] === "failure" ? `failel${index}` : `answer${index}`}
+                                variant="contained" onClick={() => selectResponse(index, option)} disabled={buttonStates[index] !== null || answered}
+                                sx={{ height: "3.3em", width: "50%", borderRadius: "10px", "&:disabled": { backgroundColor: buttonStates[index] === "success" ? theme.palette.success.main : buttonStates[index] === "failure" ? theme.palette.error.main : "gray", color: "white"}}}>
+                                {buttonStates[index] === "success" ? <CheckIcon /> : buttonStates[index] === "failure" ? <ClearIcon /> : null}
+                                {option}
+                            </Button>
+                        </Grid>
+                    ))}
+                </Grid>
             </Container>
 
-            <Typography variant='h6' >
-                {round} / {MAX_ROUNDS}
-            </Typography>
-            <Typography variant="h5" mb={4} fontWeight="bold" style={{ display: 'flex', alignItems: 'center' }}>
-            <span style={{ marginRight: '1em' }}>{questionData.question}</span>
-                <CountdownCircleTimer
-                  key={questionCountdownKey}
-                  isPlaying = {questionCountdownRunning}
-                  duration={15}
-                  colors={["#0bfc03", "#F7B801", "#f50707", "#A30000"]}
-                  size={100}
-                  colorsTime={[10, 6, 3, 0]}
-                  onComplete={() => selectResponse(0, "FAILED")} //when time ends always fail question
-                >
-                  {({ remainingTime }) => {
-                    return (
-                        <div style={{ display: 'flex', alignItems: 'center' }}>
-                        <div style={{ fontSize: '1.2em', fontWeight: 'bold' }}>{remainingTime}</div>
-                      </div>
-                    );
-                  }}
-                </CountdownCircleTimer>
-            </Typography>
-                
-            <Grid container spacing={2}>
-                {questionData.options.map((option, index) => (
-                    <Grid item xs={12} key={index}>
-                        <Button
-                            variant="contained"
-                            onClick={() => selectResponse(index, option)}
-                            disabled={buttonStates[index] !== null || answered} // before, you could still press more than one button
-                            sx={{
-                                height: "50px", // Ajusta el tamaño según sea necesario
-                                width: "50%", // Ajusta el ancho según sea necesario
-                                borderRadius: "20px", // Ajusta el radio según sea necesario
-                                margin: "5px",
-                                backgroundColor: buttonStates[index] === "success" ? "green" : buttonStates[index] === "failure" ? "red" : null,
-                                "&:disabled": {
-                                    backgroundColor: buttonStates[index] === "success" ? "green" : buttonStates[index] === "failure" ? "red" : "gray",
-                                    color: "white",
-                                },
-                            }}
-                        >
-                            {buttonStates[index] === "success" ? <CheckIcon /> : buttonStates[index] === "failure" ? <ClearIcon /> : null}
-                            {option}
-                        </Button>
-                    </Grid>
-                ))}
-            </Grid>
+            {/* Progress Cards */}
+            <Container sx={{ display: 'flex', flexDirection: 'row', alignItems: 'center', marginTop:'2em' }} >
+                {questionHistorialBar()}
+            </Container>
         </Container>
     );
 };
diff --git a/webapp/src/pages/MultiplayerRoom.js b/webapp/src/pages/MultiplayerRoom.js
index 6a3043f8..ab1f4165 100644
--- a/webapp/src/pages/MultiplayerRoom.js
+++ b/webapp/src/pages/MultiplayerRoom.js
@@ -107,7 +107,7 @@ const MultiplayerRoom = () => {
   
     return (
       <Container sx={{ display: 'flex', flex: 1, justifyContent: 'center', alignItems: 'center' }}>
-        <Paper elevation={5} sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', gap: '2em', padding: '4em', borderRadius: '4em' }}>
+        <Paper elevation={5} sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', gap: '2em', padding: '3em', borderRadius: '4em' }}>
           <Typography variant="h2" align="center" fontWeight="bold" sx={{ textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem' }}>
             {t("Games.Multiplayer.name").toUpperCase()}
           </Typography>

From 333a5b6bc5728a69715222e0d088c44f1aed4522 Mon Sep 17 00:00:00 2001
From: uo288245 <uo288245@uniovi.es>
Date: Thu, 25 Apr 2024 17:36:17 +0200
Subject: [PATCH 097/132] Finished updating the Multiplayer style.

---
 webapp/src/localize/en.json         | 10 ++--
 webapp/src/localize/es.json         |  8 ++--
 webapp/src/localize/fr.json         |  8 ++--
 webapp/src/pages/MultiplayerGame.js | 74 ++++++++---------------------
 4 files changed, 34 insertions(+), 66 deletions(-)

diff --git a/webapp/src/localize/en.json b/webapp/src/localize/en.json
index e191856e..6a6c58d0 100644
--- a/webapp/src/localize/en.json
+++ b/webapp/src/localize/en.json
@@ -145,17 +145,17 @@
             "participants": "Participants",
             "start": "Start game",
             "create": "Create room",
-            "join": "Join room",
+            "join": "Join Room",
             "send": "Send",
             "chat_title": "Chat of the room",
             "chat_input_label": "Type your message",
             "new_game": "Want to start a new game?"
         },
         "Game": {
-            "waiting_players_end": "Waiting for players end...",
-            "waiting": "Waiting for winner info...",
-            "winner_1": "Player winner of the game",
-            "winner_2": "with",
+            "waiting_players_end": "Waiting for players to finish...",
+            "waiting": "Waiting for the winner info...",
+            "winner_1": "Winner",
+            "winner_2": "With",
             "winner_3": "correct answers in",
             "winner_4": "seconds"
         }
diff --git a/webapp/src/localize/es.json b/webapp/src/localize/es.json
index e674ed28..ac4e536f 100644
--- a/webapp/src/localize/es.json
+++ b/webapp/src/localize/es.json
@@ -144,8 +144,8 @@
             "code": "Código de Sala",
             "participants": "Participantes",
             "start": "Comenzar juego",
-            "create": "Crear sala",
-            "join": "Unirse a sala",
+            "create": "Crear Sala",
+            "join": "Unirse a Sala",
             "send": "Enviar",
             "chat_title": "Chat de la sala",
             "chat_input_label": "Escribe tu mensaje",
@@ -154,8 +154,8 @@
         "Game": {
             "waiting_players_end": "Esperando a que terminen los demás jugadores...",
             "waiting": "Esperando información del ganador...",
-            "winner_1": "Jugador ganador del juego",
-            "winner_2": "con",
+            "winner_1": "Ganador",
+            "winner_2": "Con",
             "winner_3": "respuestas correctas en",
             "winner_4": "segundos"
         }
diff --git a/webapp/src/localize/fr.json b/webapp/src/localize/fr.json
index bbc12ec7..40101093 100644
--- a/webapp/src/localize/fr.json
+++ b/webapp/src/localize/fr.json
@@ -142,8 +142,8 @@
             "code": "Code de la Salle",
             "participants": "Participants",
             "start": "Démarrer le jeu",
-            "create": "Créer une salle",
-            "join": "Rejoindre une salle",
+            "create": "Créer Salle",
+            "join": "Rejoindre une Salle",
             "send": "Envoyer",
             "chat_title": "Discussion de la salle",
             "chat_input_label": "Tape ton message",
@@ -152,8 +152,8 @@
         "Game": {
             "waiting_players_end": "En attendant que tous les joueurs finissent...",
             "waiting": "En attente des informations du gagnant...",
-            "winner_1": "Joueur gagnant de la partie",
-            "winner_2": "avec",
+            "winner_1": "Gagnant",
+            "winner_2": "Avec",
             "winner_3": "réponses correctes en",
             "winner_4": "secondes"
         }
diff --git a/webapp/src/pages/MultiplayerGame.js b/webapp/src/pages/MultiplayerGame.js
index d18d5f6f..45fa4f9f 100644
--- a/webapp/src/pages/MultiplayerGame.js
+++ b/webapp/src/pages/MultiplayerGame.js
@@ -234,66 +234,34 @@ const Game = () => {
         socket.emit("finished-game", username, correctlyAnsweredQuestions, totalTimePlayed);
 
         return (
-            <Container
-                sx={{
-                    display: 'flex',
-                    flexDirection: 'column',
-                    alignItems: 'center',
-                    justifyContent: 'center',
-                    height: '100vh',
-                    textAlign: 'center',
-                }}
-            >
+            <Container sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', gap: '4em', textAlign: 'center', flex: '1'}}>
                 <CssBaseline />
-                <Typography 
-                variant="h4" 
-                sx={{
-                    color: winnerPlayer === username ? 'green' : 'black',
-                    fontSize: '4rem', // Tamaño de fuente
-                    marginTop: '20px', // Espaciado superior
-                    marginBottom: '50px', // Espaciado inferior
-                }}
-            >
-                
-                <Typography variant="h2" gutterBottom sx={{ fontFamily: 'fantasy', color: '#323333' }}>
-                {winnerPlayer === "" ? t("Multiplayer.Game.waiting_players_end") : "Game Over"}
+
+                <Typography variant="h2" data-testid="end-game-message" sx={{ color: winnerPlayer === username ? theme.palette.success.main : 'black' }}>
+                    {winnerPlayer === "" ? t("Multiplayer.Game.waiting_players_end") : t("Game.lose_msg")}
                 </Typography>
-            </Typography>
-                <div>
-                <Grid container spacing={2}>
-                    <Grid item xs={12} sm={6}>
-                        <Typography variant="h6" gutterBottom sx={{ fontFamily: 'fantasy', color: '#323333' }}>
-                        {t("Game.correct")}: {correctlyAnsweredQuestions}
-                        </Typography>
-                    </Grid>
-                    <Grid item xs={12} sm={6}>
-                        <Typography variant="h6" gutterBottom sx={{ fontFamily: 'fantasy', color: '#323333' }}>
-                        {t("Game.incorrect")}: {incorrectlyAnsweredQuestions}
-                        </Typography>
-                    </Grid>
-                    <Grid item xs={12} sm={6}>
-                        <Typography variant="h6" gutterBottom sx={{ fontFamily: 'fantasy', color: '#323333' }}>
-                        {t("Game.money")}: {totalScore}
-                        </Typography>
-                    </Grid>
-                    <Grid item xs={12} sm={6}>
-                        <Typography variant="h6" gutterBottom sx={{ fontFamily: 'fantasy', color: '#323333' }}>
-                        {t("Game.time")}: {totalTimePlayed}
-                        </Typography>
-                    </Grid>
-                </Grid>
 
-                    {winnerPlayer === "" ? (
-                        <Typography variant="h5" sx={{marginTop: '1em', fontFamily: 'fantasy', color: '#323333'}}>{ t("Multiplayer.Game.waiting") }</Typography>
-                    ) : (
-                        <Typography variant="h5" sx={{marginTop: '1em', fontFamily: 'fantasy', color: '#323333'}}>{ t("Multiplayer.Game.winner_1") }: {winnerPlayer} { t("Multiplayer.Game.winner_2") } {winnerCorrect} { t("Multiplayer.Game.winner_3") } {winnerTime} { t("Multiplayer.Game.winner_4") }</Typography>
-                    )}
-                </div>
+                <Container>
+                    <Typography variant="h4">{ t("Game.correct") }: <b>{correctlyAnsweredQuestions}</b></Typography>
+                    <Typography variant="h4">{ t("Game.incorrect") }: <b>{incorrectlyAnsweredQuestions}</b></Typography>
+                    <Typography variant="h4">{ t("Game.money") }: <b>{totalScore}</b></Typography>
+                    <Typography variant="h4">{ t("Game.time") }: <b>{totalTimePlayed}</b></Typography>
+                </Container>
+
+                {winnerPlayer === "" ? (
+                    <Typography variant="h5">{ t("Multiplayer.Game.waiting") }</Typography>
+                ) : (
+                    <Container sx={{ display: 'flex', flexDirection:'column', alignItems:'center' }}>
+                        <Typography variant="h4">{ t("Multiplayer.Game.winner_1") }: <b>{winnerPlayer}</b></Typography>
+                        <Typography variant="h5">{ t("Multiplayer.Game.winner_2") }: <b>{winnerCorrect}</b> { t("Multiplayer.Game.winner_3") } <b>{winnerTime}</b> { t("Multiplayer.Game.winner_4") }</Typography>
+                    </Container>
+                )}
+
                 {showConfetti && <Confetti />}
             </Container>
         );
     }
-    
+
     return (
         <Container sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'space-around', alignItems: 'center', textAlign: 'center', flex: '1', gap: '2em', margin: '0 auto', padding: '1em 0' }}>
             <CssBaseline />

From 1060b5c503e3a72e001939e834e9f48770db5804 Mon Sep 17 00:00:00 2001
From: uo288245 <uo288245@uniovi.es>
Date: Thu, 25 Apr 2024 18:17:50 +0200
Subject: [PATCH 098/132] Updated the multiplayer tests to match the new style.

---
 .../__tests__/pages/MultiplayerGame.test.js   | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/webapp/src/__tests__/pages/MultiplayerGame.test.js b/webapp/src/__tests__/pages/MultiplayerGame.test.js
index eb828baf..5df16e29 100644
--- a/webapp/src/__tests__/pages/MultiplayerGame.test.js
+++ b/webapp/src/__tests__/pages/MultiplayerGame.test.js
@@ -63,13 +63,10 @@ describe('Game component', () => {
       </SessionContext.Provider>
       );
 
-    expect(screen.findByText('1'));
-    expect(screen.findByText('1/3'));
-
     // waits for the question to appear
-    await waitFor(() => screen.getByText('Which is the capital of Spain?'));
+    await waitFor(() => screen.getByTestId('question'));
 
-    expect(screen.findByText('Which is the capital of Spain?'));
+    expect(screen.getByTestId('question'));
     expect(screen.findByText('Madrid'));
     expect(screen.findByText('Barcelona'));
     expect(screen.findByText('Paris'));
@@ -94,15 +91,15 @@ describe('Game component', () => {
       );
 
     // waits for the question to appear
-    await waitFor(() => screen.getByText('Which is the capital of Spain?'));
+    await waitFor(() => screen.getByTestId('question'));
     const correctAnswer = screen.getByRole('button', { name: 'Madrid' });
 
-    expect(correctAnswer).not.toHaveStyle({ backgroundColor: 'green' });
+    expect(correctAnswer).toHaveStyle({ backgroundColor: 'rgb(0, 102, 153);' });
 
     //selects correct answer
     fireEvent.click(correctAnswer);
 
-    expect(correctAnswer).toHaveStyle({ backgroundColor: 'green' });
+    expect(correctAnswer).toHaveStyle({ backgroundColor: 'rgb(51, 153, 102);' });
 
   });
 
@@ -125,15 +122,15 @@ describe('Game component', () => {
       );
 
     // waits for the question to appear
-    await waitFor(() => screen.getByText('Which is the capital of Spain?'));
+    await waitFor(() => screen.getByTestId('question'));
     const incorrectAnswer = screen.getByRole('button', { name: 'Barcelona' });
 
-    expect(incorrectAnswer).not.toHaveStyle({ backgroundColor: 'red' });
+    expect(incorrectAnswer).toHaveStyle({ backgroundColor: 'rgb(0, 102, 153);' });
 
     //selects correct answer
     fireEvent.click(incorrectAnswer); 
 
-    expect(incorrectAnswer).toHaveStyle({ backgroundColor: 'red' });
+    expect(incorrectAnswer).toHaveStyle({ backgroundColor: 'rgb(153, 0, 0);' });
 
   });
 

From 439f287405828b890087fa0d87f206dc3d3080d1 Mon Sep 17 00:00:00 2001
From: uo288543 <uo288543@uniovi.es>
Date: Fri, 26 Apr 2024 15:27:49 +0200
Subject: [PATCH 099/132] add force true

---
 users/services/user-model.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/users/services/user-model.js b/users/services/user-model.js
index 89a59234..e5ee623d 100644
--- a/users/services/user-model.js
+++ b/users/services/user-model.js
@@ -208,7 +208,7 @@ const QuestionsRecord = sequelize.define('QuestionsRecord', {
 });
 
 // Synchronize the model with the database
-sequelize.sync()
+sequelize.sync({ force: true })
     .then(() => {
         console.log('Model synchronized successfully with the database');
     })

From a409b1796b9de678cb82051ad89d369b93f95e12 Mon Sep 17 00:00:00 2001
From: uo288543 <uo288543@uniovi.es>
Date: Fri, 26 Apr 2024 15:28:42 +0200
Subject: [PATCH 100/132] remove force true

---
 users/services/user-model.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/users/services/user-model.js b/users/services/user-model.js
index e5ee623d..89a59234 100644
--- a/users/services/user-model.js
+++ b/users/services/user-model.js
@@ -208,7 +208,7 @@ const QuestionsRecord = sequelize.define('QuestionsRecord', {
 });
 
 // Synchronize the model with the database
-sequelize.sync({ force: true })
+sequelize.sync()
     .then(() => {
         console.log('Model synchronized successfully with the database');
     })

From 4d82448c4fc2e56ff97525fb5cbb1555548f8e6e Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Fri, 26 Apr 2024 18:34:34 +0200
Subject: [PATCH 101/132] Removed absolute height in circular progress in games

---
 webapp/src/pages/TheChallengeGame.js | 2 +-
 webapp/src/pages/WiseMenStackGame.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/src/pages/TheChallengeGame.js b/webapp/src/pages/TheChallengeGame.js
index 511feedd..51a435c2 100644
--- a/webapp/src/pages/TheChallengeGame.js
+++ b/webapp/src/pages/TheChallengeGame.js
@@ -307,7 +307,7 @@ const TheChallengeGame = () => {
     // circular loading
     if (!questionData) {
         return (
-            <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', height: '100vh', textAlign: 'center' }}>
+            <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', flex: 1, textAlign: 'center' }}>
                 <CssBaseline />
                 <CircularProgress />
             </Container>
diff --git a/webapp/src/pages/WiseMenStackGame.js b/webapp/src/pages/WiseMenStackGame.js
index f61487be..78bb0c27 100644
--- a/webapp/src/pages/WiseMenStackGame.js
+++ b/webapp/src/pages/WiseMenStackGame.js
@@ -272,7 +272,7 @@ const WiseMenStackGame = () => {
     // circular loading
     if (!questionData) {
         return (
-            <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', height: '100vh', textAlign: 'center' }}>
+            <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', flex: 1, textAlign: 'center' }}>
                 <CssBaseline />
                 <CircularProgress />
             </Container>

From bf49165f6a62f96accfab16bbb7295b1e69c5dbf Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Fri, 26 Apr 2024 19:30:34 +0200
Subject: [PATCH 102/132] Solved not passing e2e discovering cities tests

---
 .../e2e/steps/discoveringCitiesGame.steps.js  | 52 +++++++++----------
 1 file changed, 25 insertions(+), 27 deletions(-)

diff --git a/webapp/e2e/steps/discoveringCitiesGame.steps.js b/webapp/e2e/steps/discoveringCitiesGame.steps.js
index 5c1103b1..506121c9 100644
--- a/webapp/e2e/steps/discoveringCitiesGame.steps.js
+++ b/webapp/e2e/steps/discoveringCitiesGame.steps.js
@@ -65,51 +65,49 @@ defineFeature(feature, test => {
   test('Answering a question correctly', ({given,when,then}) => {
 
     given('A question', async () => {
-        //await expect(page.findByText('Which is the capital of Spain?'));
-        const question = await page.$['data-testid="question"'];
-        await expect(page).toMatchElement("div", { text: 'Which is the capital of Spain?'});
-        expect(question).not.toBeNull();
-        
-        const answers = await page.$x('//*[@data-testid="answer"]');
-        expect(answers.length).toBe(4);
+      const question = await page.$['data-testid="question"'];
+      await expect(page).toMatchElement("div", { text: 'WHICH IS THE CAPITAL OF SPAIN?'});
+      expect(question).not.toBeNull();
+      
+      const answers = await page.$x('//*[contains(@data-testid, "answer")]');
+      expect(answers.length).toBe(4);
     });
 
     when('I click on the correct answer button', async () => {
-        const answers = await page.$x('(//*[@data-testid="answer"])[1]');
-        await answers[0].click();
+      const answers = await page.$x('//*[contains(@data-testid, "answer")]');
+      await answers[0].click();
     });
 
     then('The button turns green', async () => {
-        const answerButton = await page.$x('(//*[@data-testid="answer"])[1]');
-        const textoBoton = await page.evaluate(button => button.innerText, answerButton[0]);
-        await expect(textoBoton).toMatch(/Madrid/i);
-        await expect(page).toMatchElement("button", { style: { color: 'green' } });
+      const answer = await page.$x('//*[contains(@data-testid, "success")]');
+      const textoBoton = await page.evaluate(button => button.innerText, answer[0]);
+      await expect(textoBoton).toMatch(/Madrid/i);
+      await expect(page).toMatchElement("button", { style: { color: 'green' } });
     });
   })
 
   test('Answering a question incorrectly', ({given,when,then}) => {
 
     given('A question', async () => {
-        //await expect(page.findByText('Which is the capital of Spain?'));
-        const question = await page.$['data-testid="question"'];
-        await expect(page).toMatchElement("div", { text: 'Which is the capital of Spain?'});
-        expect(question).not.toBeNull();
-        
-        const answers = await page.$x('//*[@data-testid="answer"]');
-        expect(answers.length).toBe(4);
+      const question = await page.$['data-testid="question"'];
+      await expect(page).toMatchElement("div", { text: 'WHICH IS THE CAPITAL OF SPAIN?'});
+      expect(question).not.toBeNull();
+      
+      const answers = await page.$x('//*[contains(@data-testid, "answer")]');
+      expect(answers.length).toBe(4);
     });
 
     when('I click on an incorrect answer button', async () => {
-        const answers = await page.$x('(//*[@data-testid="answer"])[2]');
-        await answers[0].click();
+      const answers = await page.$x('//*[contains(@data-testid, "answer")]');
+      await answers[2].click();
     });
 
     then('The button turns red', async () => {
-        const answerButton = await page.$x('(//*[@data-testid="answer"])[2]');
-        const textoBoton = await page.evaluate(button => button.innerText, answerButton[0]);
-        await expect(textoBoton).toMatch(/Barcelona/i);
-        await expect(page).toMatchElement("button", { style: { color: 'red' } });
-        await expect(page).toMatchElement("button", { style: { color: 'green' } });
+      const answerButtons = await page.$x('//*[contains(@data-testid, "answer")]');
+      const textoBoton = await page.evaluate(button => button.innerText, answerButtons[0]);
+      await expect(textoBoton).toMatch(/Barcelona/i);
+      await expect(page).toMatchElement("button", { style: { color: 'red' } });
+      await expect(page).toMatchElement("button", { style: { color: 'green' } });
 
     });
   })

From 00fa20e7023159f6ecf0dd328594fc14b9c1978c Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Fri, 26 Apr 2024 19:30:48 +0200
Subject: [PATCH 103/132] Solved failing e2e wise men tests

---
 webapp/e2e/steps/wiseMenStackGame.steps.js | 90 +++++++++-------------
 1 file changed, 36 insertions(+), 54 deletions(-)

diff --git a/webapp/e2e/steps/wiseMenStackGame.steps.js b/webapp/e2e/steps/wiseMenStackGame.steps.js
index 2c59525a..0630276e 100644
--- a/webapp/e2e/steps/wiseMenStackGame.steps.js
+++ b/webapp/e2e/steps/wiseMenStackGame.steps.js
@@ -10,7 +10,7 @@ defineFeature(feature, test => {
 
   beforeAll(async () => {
       
-      browser = process.env.GITHUB_ACTIONS
+    browser = process.env.GITHUB_ACTIONS
       ? await puppeteer.launch()
       : await puppeteer.launch({ headless: false, slowMo: 40 });
     page = await browser.newPage();
@@ -65,77 +65,59 @@ defineFeature(feature, test => {
   test('Answering a question correctly', ({given,when,then}) => {
 
     given('A question', async () => {
-        const button = await page.$('[data-testid="start-button"]');
-        await button.click();
-
-        //await expect(page.findByText('Which is the capital of Spain?'));
-        const question = await page.$['data-testid="question"'];
-        await expect(page).toMatchElement("div", { text: 'Which is the capital of Spain?'});
-        expect(question).not.toBeNull();
-        
-        const answers = await page.$x('//*[@data-testid="answer"]');
-        expect(answers.length).toBe(2);
+      const button = await page.$('[data-testid="start-button"]');
+      await button.click();
+
+      const question = await page.$['data-testid="question"'];
+      expect(question).not.toBeNull();
+      await expect(page).toMatchElement("div", { text: 'WHICH IS THE CAPITAL OF SPAIN?'});
+      
+      const answers = await page.$x('//*[contains(@data-testid, "answer")]');
+      expect(answers.length).toBe(2);
     });
 
     when('I click on the correct answer button', async () => {
-        const answers = await page.$x('//*[@data-testid="answer"]');
-        const textoBoton1 = await page.evaluate(button => button.innerText, answers[0]);
-        if(textoBoton1 === "Madrid") {
-          await answers[0].click();
-        } else {
-          await answers[1].click();
-        }
+      const answers = await page.$x('//*[contains(@data-testid, "answer")]');
+      const textoBoton1 = await page.evaluate(button => button.innerText, answers[0]);
+      if(textoBoton1 === "Madrid") {
+        await answers[0].click();
+      } else {
+        await answers[1].click();
+      }
     });
 
     then('The button turns green', async () => {
-        /*const answerButton = await page.$x('(//*[@data-testid="answer"])[1]');
-        const textoBoton1 = await page.evaluate(button => button.innerText, answerButton[0]);
-        const textoBoton2 = await page.evaluate(button => button.innerText, answerButton[1]);
-        if(textoBoton1 === "Madrid") {
-          await expect(textoBoton1).toMatch(/Madrid/i);
-        } else {
-          await expect(textoBoton2).toMatch(/Madrid/i);
-        }*/
-        await expect(page).toMatchElement("button", { style: { color: 'green' } });
+      await expect(page).toMatchElement("button", { style: { color: 'green' } });
     });
   })
 
   test('Answering a question incorrectly', ({given,when,then}) => {
 
     given('A question', async () => {
-        const button = await page.$('[data-testid="start-button"]');
-        await button.click();
-
-        //await expect(page.findByText('Which is the capital of Spain?'));
-        const question = await page.$['data-testid="question"'];
-        await expect(page).toMatchElement("div", { text: 'Which is the capital of Spain?'});
-        expect(question).not.toBeNull();
-        
-        const answers = await page.$x('//*[@data-testid="answer"]');
-        expect(answers.length).toBe(2);
+      const button = await page.$('[data-testid="start-button"]');
+      await button.click();
+
+      await expect(page).toMatchElement("div", { text: 'WHICH IS THE CAPITAL OF SPAIN?'});
+      const question = await page.$['data-testid="question"'];
+      expect(question).not.toBeNull();
+      
+      const answers = await page.$x('//*[contains(@data-testid, "answer")]');
+      expect(answers.length).toBe(2);
     });
 
     when('I click on an incorrect answer button', async () => {
-        const answers = await page.$x('//*[@data-testid="answer"]');
-        const textoBoton1 = await page.evaluate(button => button.innerText, answers[0]);
-        if(textoBoton1 !== "Madrid") {
-          await answers[0].click();
-        } else {
-          await answers[1].click();
-        }
+      const answers = await page.$x('//*[contains(@data-testid, "answer")]');
+      const textoBoton1 = await page.evaluate(button => button.innerText, answers[0]);
+      if(textoBoton1 !== "Madrid") {
+        await answers[0].click();
+      } else {
+        await answers[1].click();
+      }
     });
 
     then('The button turns red', async () => {
-        /*const answerButton = await page.$x('(//*[@data-testid="answer"])[2]');
-        const textoBoton1 = await page.evaluate(button => button.innerText, answerButton[0]);
-        const textoBoton2 = await page.evaluate(button => button.innerText, answerButton[1]);
-        if(textoBoton1 !== "Madrid") {
-          await expect(textoBoton1).not.toMatch(/Madrid/i);
-        } else {
-          await expect(textoBoton2).toMatch(/Madrid/i);
-        }*/
-        await expect(page).toMatchElement("button", { style: { color: 'red' } });
-        await expect(page).toMatchElement("button", { style: { color: 'green' } });
+      await expect(page).toMatchElement("button", { style: { color: 'red' } });
+      await expect(page).toMatchElement("button", { style: { color: 'green' } });
     });
   })
 

From 03273bd0d6a3f73ddc12efb9e2dd967b48af18ae Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Fri, 26 Apr 2024 20:11:40 +0200
Subject: [PATCH 104/132] Solved style dependant e2e tests

---
 .../e2e/features/discoveringCitiesGame.feature  |  4 ++--
 webapp/e2e/features/wiseMenStackGame.feature    |  4 ++--
 webapp/e2e/steps/discoveringCitiesGame.steps.js | 16 +++++++---------
 webapp/e2e/steps/wiseMenStackGame.steps.js      | 17 ++++++++++-------
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/webapp/e2e/features/discoveringCitiesGame.feature b/webapp/e2e/features/discoveringCitiesGame.feature
index 6a63bd96..415f3d2e 100644
--- a/webapp/e2e/features/discoveringCitiesGame.feature
+++ b/webapp/e2e/features/discoveringCitiesGame.feature
@@ -3,9 +3,9 @@ Feature: Answer a question
 Scenario: Answering a question correctly
   Given A question
   When I click on the correct answer button
-  Then The button turns green
+  Then The selected answer is marked as right
 
 Scenario: Answering a question incorrectly
   Given A question
   When I click on an incorrect answer button
-  Then The button turns red
\ No newline at end of file
+  Then The selected answer is marked as wrong
\ No newline at end of file
diff --git a/webapp/e2e/features/wiseMenStackGame.feature b/webapp/e2e/features/wiseMenStackGame.feature
index 6a63bd96..415f3d2e 100644
--- a/webapp/e2e/features/wiseMenStackGame.feature
+++ b/webapp/e2e/features/wiseMenStackGame.feature
@@ -3,9 +3,9 @@ Feature: Answer a question
 Scenario: Answering a question correctly
   Given A question
   When I click on the correct answer button
-  Then The button turns green
+  Then The selected answer is marked as right
 
 Scenario: Answering a question incorrectly
   Given A question
   When I click on an incorrect answer button
-  Then The button turns red
\ No newline at end of file
+  Then The selected answer is marked as wrong
\ No newline at end of file
diff --git a/webapp/e2e/steps/discoveringCitiesGame.steps.js b/webapp/e2e/steps/discoveringCitiesGame.steps.js
index 506121c9..12ccb40e 100644
--- a/webapp/e2e/steps/discoveringCitiesGame.steps.js
+++ b/webapp/e2e/steps/discoveringCitiesGame.steps.js
@@ -78,11 +78,11 @@ defineFeature(feature, test => {
       await answers[0].click();
     });
 
-    then('The button turns green', async () => {
+    then('The selected answer is marked as right', async () => {
       const answer = await page.$x('//*[contains(@data-testid, "success")]');
+      expect(answer.length).toBe(1);
       const textoBoton = await page.evaluate(button => button.innerText, answer[0]);
       await expect(textoBoton).toMatch(/Madrid/i);
-      await expect(page).toMatchElement("button", { style: { color: 'green' } });
     });
   })
 
@@ -99,16 +99,14 @@ defineFeature(feature, test => {
 
     when('I click on an incorrect answer button', async () => {
       const answers = await page.$x('//*[contains(@data-testid, "answer")]');
-      await answers[2].click();
+      await answers[1].click();
     });
 
-    then('The button turns red', async () => {
-      const answerButtons = await page.$x('//*[contains(@data-testid, "answer")]');
-      const textoBoton = await page.evaluate(button => button.innerText, answerButtons[0]);
+    then('The selected answer is marked as wrong', async () => {
+      const answer = await page.$x('//*[contains(@data-testid, "fail")]');
+      expect(answer.length).toBe(1);
+      const textoBoton = await page.evaluate(button => button.innerText, answer[0]);
       await expect(textoBoton).toMatch(/Barcelona/i);
-      await expect(page).toMatchElement("button", { style: { color: 'red' } });
-      await expect(page).toMatchElement("button", { style: { color: 'green' } });
-
     });
   })
 
diff --git a/webapp/e2e/steps/wiseMenStackGame.steps.js b/webapp/e2e/steps/wiseMenStackGame.steps.js
index 0630276e..0c2feb8e 100644
--- a/webapp/e2e/steps/wiseMenStackGame.steps.js
+++ b/webapp/e2e/steps/wiseMenStackGame.steps.js
@@ -79,15 +79,18 @@ defineFeature(feature, test => {
     when('I click on the correct answer button', async () => {
       const answers = await page.$x('//*[contains(@data-testid, "answer")]');
       const textoBoton1 = await page.evaluate(button => button.innerText, answers[0]);
-      if(textoBoton1 === "Madrid") {
+      if(textoBoton1 === "MADRID") {
         await answers[0].click();
       } else {
         await answers[1].click();
       }
     });
 
-    then('The button turns green', async () => {
-      await expect(page).toMatchElement("button", { style: { color: 'green' } });
+    then('The selected answer is marked as right', async () => {
+      const answer = await page.$x('//*[contains(@data-testid, "success")]');
+      expect(answer.length).toBe(1);
+      const textoBoton = await page.evaluate(button => button.innerText, answer[0]);
+      await expect(textoBoton).toMatch(/Madrid/i);
     });
   })
 
@@ -108,16 +111,16 @@ defineFeature(feature, test => {
     when('I click on an incorrect answer button', async () => {
       const answers = await page.$x('//*[contains(@data-testid, "answer")]');
       const textoBoton1 = await page.evaluate(button => button.innerText, answers[0]);
-      if(textoBoton1 !== "Madrid") {
+      if(textoBoton1 !== "MADRID") {
         await answers[0].click();
       } else {
         await answers[1].click();
       }
     });
 
-    then('The button turns red', async () => {
-      await expect(page).toMatchElement("button", { style: { color: 'red' } });
-      await expect(page).toMatchElement("button", { style: { color: 'green' } });
+    then('The selected answer is marked as wrong', async () => {
+      const answer = await page.$x('//*[contains(@data-testid, "fail")]');
+      expect(answer.length).toBe(1);
     });
   })
 

From c35c96c844b98a5e1781d0ffd61b3455844b2f5c Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Fri, 26 Apr 2024 20:12:35 +0200
Subject: [PATCH 105/132] Minor error in test-id for the answers

---
 webapp/src/pages/DiscoveringCitiesGame.js | 2 +-
 webapp/src/pages/Game.js                  | 2 +-
 webapp/src/pages/MultiplayerGame.js       | 2 +-
 webapp/src/pages/TheChallengeGame.js      | 2 +-
 webapp/src/pages/WarmQuestionGame.js      | 2 +-
 webapp/src/pages/WiseMenStackGame.js      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/webapp/src/pages/DiscoveringCitiesGame.js b/webapp/src/pages/DiscoveringCitiesGame.js
index eb3d3741..4773f745 100644
--- a/webapp/src/pages/DiscoveringCitiesGame.js
+++ b/webapp/src/pages/DiscoveringCitiesGame.js
@@ -293,7 +293,7 @@ const DiscovertingCitiesGame = () => {
                 <Grid container spacing={2}>
                     {questionData.options.map((option, index) => (
                         <Grid item xs={12} key={index}>
-                            <Button data-testid={buttonStates[index] === "success" ? `success${index}` : buttonStates[index] === "failure" ? `failel${index}` : `answer${index}`}
+                            <Button data-testid={buttonStates[index] === "success" ? `success${index}` : buttonStates[index] === "failure" ? `fail${index}` : `answer${index}`}
                                 variant="contained" onClick={() => selectResponse(index, option)} disabled={buttonStates[index] !== null || answered}
                                 sx={{ height: "3.3em", width: "50%", borderRadius: "10px", margin: "5px", "&:disabled": {backgroundColor: buttonStates[index] === "success" ? theme.palette.success.main : buttonStates[index] === "failure" ? theme.palette.error.main : "gray", color: "white" } }}>
                                 {buttonStates[index] === "success" ? <CheckIcon /> : buttonStates[index] === "failure" ? <ClearIcon /> : null}
diff --git a/webapp/src/pages/Game.js b/webapp/src/pages/Game.js
index c845d7e4..9fe12cf1 100644
--- a/webapp/src/pages/Game.js
+++ b/webapp/src/pages/Game.js
@@ -292,7 +292,7 @@ const Game = () => {
                 <Grid container spacing={2} gap="0.7em">
                     {questionData.options.map((option, index) => (
                         <Grid item xs={12} key={index}>
-                            <Button data-testid={buttonStates[index] === "success" ? `success${index}` : buttonStates[index] === "failure" ? `failel${index}` : `answer${index}`}
+                            <Button data-testid={buttonStates[index] === "success" ? `success${index}` : buttonStates[index] === "failure" ? `fail${index}` : `answer${index}`}
                                 variant="contained" onClick={() => selectResponse(index, option)} disabled={buttonStates[index] !== null || answered}
                                 sx={{ height: "3.3em", width: "50%", borderRadius: "10px", "&:disabled": { backgroundColor: buttonStates[index] === "success" ? theme.palette.success.main : buttonStates[index] === "failure" ? theme.palette.error.main : "gray", color: "white"}}}>
                                 {buttonStates[index] === "success" ? <CheckIcon /> : buttonStates[index] === "failure" ? <ClearIcon /> : null}
diff --git a/webapp/src/pages/MultiplayerGame.js b/webapp/src/pages/MultiplayerGame.js
index 45fa4f9f..255c6a88 100644
--- a/webapp/src/pages/MultiplayerGame.js
+++ b/webapp/src/pages/MultiplayerGame.js
@@ -287,7 +287,7 @@ const Game = () => {
                 <Grid container spacing={2} gap="0.7em">
                     {questionData.options.map((option, index) => (
                         <Grid item xs={12} key={index}>
-                            <Button data-testid={buttonStates[index] === "success" ? `success${index}` : buttonStates[index] === "failure" ? `failel${index}` : `answer${index}`}
+                            <Button data-testid={buttonStates[index] === "success" ? `success${index}` : buttonStates[index] === "failure" ? `fail${index}` : `answer${index}`}
                                 variant="contained" onClick={() => selectResponse(index, option)} disabled={buttonStates[index] !== null || answered}
                                 sx={{ height: "3.3em", width: "50%", borderRadius: "10px", "&:disabled": { backgroundColor: buttonStates[index] === "success" ? theme.palette.success.main : buttonStates[index] === "failure" ? theme.palette.error.main : "gray", color: "white"}}}>
                                 {buttonStates[index] === "success" ? <CheckIcon /> : buttonStates[index] === "failure" ? <ClearIcon /> : null}
diff --git a/webapp/src/pages/TheChallengeGame.js b/webapp/src/pages/TheChallengeGame.js
index 51a435c2..942845a4 100644
--- a/webapp/src/pages/TheChallengeGame.js
+++ b/webapp/src/pages/TheChallengeGame.js
@@ -374,7 +374,7 @@ const TheChallengeGame = () => {
                 <Grid container spacing={2}>
                     {questionData.options.map((option, index) => (
                         <Grid item xs={12} key={index}>
-                            <Button data-testid={buttonStates[index] === "success" ? `success${index}` : buttonStates[index] === "failure" ? `failel${index}` : `answer${index}`}
+                            <Button data-testid={buttonStates[index] === "success" ? `success${index}` : buttonStates[index] === "failure" ? `fail${index}` : `answer${index}`}
                                 variant="contained" onClick={() => selectResponse(index, option)} disabled={buttonStates[index] !== null || answered}
                                 sx={{ height: "3.3em", width: "50%", borderRadius: "10px", margin: "5px", "&:disabled": { backgroundColor: buttonStates[index] === "success" ? "green" : buttonStates[index] === "failure" ? "red" : "gray", color: "white" }}}>
                                 {buttonStates[index] === "success" ? <CheckIcon /> : buttonStates[index] === "failure" ? <ClearIcon /> : null}
diff --git a/webapp/src/pages/WarmQuestionGame.js b/webapp/src/pages/WarmQuestionGame.js
index 705a15d4..4ebf3366 100644
--- a/webapp/src/pages/WarmQuestionGame.js
+++ b/webapp/src/pages/WarmQuestionGame.js
@@ -319,7 +319,7 @@ const WarmQuestionGame = () => {
                 <Grid container spacing={2}>
                     {questionData.options.map((option, index) => (
                         <Grid item xs={12} key={index}>
-                            <Button data-testid={buttonStates[index] === "success" ? `success${index}` : buttonStates[index] === "failure" ? `failel${index}` : `answer${index}`}
+                            <Button data-testid={buttonStates[index] === "success" ? `success${index}` : buttonStates[index] === "failure" ? `fail${index}` : `answer${index}`}
                                 variant="contained" onClick={() => selectResponse(index, option)} disabled={buttonStates[index] !== null || answered}
                                 sx={{ height: "3.3em", width: "50%", borderRadius: "10px", "&:disabled": { backgroundColor: buttonStates[index] === "success" ? theme.palette.success.main : buttonStates[index] === "failure" ? theme.palette.error.main : "gray", color: "white"}}}>
                                 {buttonStates[index] === "success" ? <CheckIcon /> : buttonStates[index] === "failure" ? <ClearIcon /> : null}
diff --git a/webapp/src/pages/WiseMenStackGame.js b/webapp/src/pages/WiseMenStackGame.js
index 78bb0c27..92b296c1 100644
--- a/webapp/src/pages/WiseMenStackGame.js
+++ b/webapp/src/pages/WiseMenStackGame.js
@@ -338,7 +338,7 @@ const WiseMenStackGame = () => {
                 <Grid container spacing={2} gap="0.7em">
                     {possibleAnswers.map((option, index) => (
                         <Grid item xs={12} key={index}>
-                            <Button data-testid={buttonStates[index] === "success" ? `success${index}` : buttonStates[index] === "failure" ? `failel${index}` : `answer${index}`}
+                            <Button data-testid={buttonStates[index] === "success" ? `success${index}` : buttonStates[index] === "failure" ? `fail${index}` : `answer${index}`}
                                 variant="contained" onClick={() => selectResponse(index, option)} disabled={buttonStates[index] !== null || answered}
                                 sx={{ height: "3.3em", width: "50%", borderRadius: "10px", "&:disabled": { backgroundColor: buttonStates[index] === "success" ? theme.palette.success.main : buttonStates[index] === "failure" ? theme.palette.error.main : "gray", color: "white"}}}>
                                 {buttonStates[index] === "success" ? <CheckIcon /> : buttonStates[index] === "failure" ? <ClearIcon /> : null}

From 118c9610965c02a19d880ef005e7011ecd0429de Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Fri, 26 Apr 2024 20:16:50 +0200
Subject: [PATCH 106/132] Usual duplication problem in unit tests for warm
 question

---
 .../__tests__/pages/WarmQuestionGame.test.js  | 44 ++++---------------
 1 file changed, 9 insertions(+), 35 deletions(-)

diff --git a/webapp/src/__tests__/pages/WarmQuestionGame.test.js b/webapp/src/__tests__/pages/WarmQuestionGame.test.js
index 0e955ac7..d1320380 100644
--- a/webapp/src/__tests__/pages/WarmQuestionGame.test.js
+++ b/webapp/src/__tests__/pages/WarmQuestionGame.test.js
@@ -24,16 +24,17 @@ describe('WarmQuestionGame component', () => {
 
     mockAxios.onPut('http://localhost:8000/statistics').reply(200, { success: true });
     mockAxios.onPut('http://localhost:8000/questionsRecord').reply(200, { success: true });
-  });
 
-  it('should render question, answers and other', async () => {
     render( 
-        <SessionContext.Provider value={{ username: 'exampleUser' }}>
-          <Router>
-            <WarmQuestionGame />
-          </Router>
-        </SessionContext.Provider>
+      <SessionContext.Provider value={{ username: 'exampleUser' }}>
+        <Router>
+          <WarmQuestionGame />
+        </Router>
+      </SessionContext.Provider>
     );
+  });
+
+  it('should render question, answers and other', async () => {
 
     // Espera a que aparezca la pregunta
     await waitFor(() => screen.getByTestId('question'));
@@ -49,13 +50,6 @@ describe('WarmQuestionGame component', () => {
   });
 
   it('should guess correct answer', async () => {
-    render( 
-        <SessionContext.Provider value={{ username: 'exampleUser' }}>
-          <Router>
-            <WarmQuestionGame />
-          </Router>
-        </SessionContext.Provider>
-    );
 
     // waits for the question to appear
     await waitFor(() => screen.getByTestId('question'));
@@ -72,13 +66,7 @@ describe('WarmQuestionGame component', () => {
 
   
   it('should choose incorrect answer', async () => {
-     render( 
-        <SessionContext.Provider value={{ username: 'exampleUser' }}>
-          <Router>
-            <WarmQuestionGame />
-          </Router>
-        </SessionContext.Provider>
-    );
+
 
     // waits for the question to appear
     await waitFor(() => screen.getByTestId('question'));
@@ -94,13 +82,6 @@ describe('WarmQuestionGame component', () => {
   });
 
   it('should not answer the question', async () => {
-    render( 
-        <SessionContext.Provider value={{ username: 'exampleUser' }}>
-          <Router>
-            <WarmQuestionGame />
-          </Router>
-        </SessionContext.Provider>
-    );
 
     // waits for the question to appear
     await waitFor(() => screen.getByTestId('question'));
@@ -113,13 +94,6 @@ describe('WarmQuestionGame component', () => {
   }, 4500);
 
   it('should pass the question', async () => {
-    render( 
-        <SessionContext.Provider value={{ username: 'exampleUser' }}>
-          <Router>
-            <WarmQuestionGame />
-          </Router>
-        </SessionContext.Provider>
-    );
 
     // waits for the question to appear
     await waitFor(() => screen.getByTestId('question'));

From 7c37444ef5a9cd851864d212fde74fe830063f3c Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Fri, 26 Apr 2024 20:22:11 +0200
Subject: [PATCH 107/132] Same for thechallenge + failing test

---
 .../__tests__/pages/TheChallengeGame.test.js  | 47 +++----------------
 1 file changed, 7 insertions(+), 40 deletions(-)

diff --git a/webapp/src/__tests__/pages/TheChallengeGame.test.js b/webapp/src/__tests__/pages/TheChallengeGame.test.js
index baa65481..89ce9680 100644
--- a/webapp/src/__tests__/pages/TheChallengeGame.test.js
+++ b/webapp/src/__tests__/pages/TheChallengeGame.test.js
@@ -26,17 +26,16 @@ describe('The Challenge component', () => {
     mockAxios.onPut(`http://localhost:8000/statistics`).reply(200, { success: true });
     mockAxios.onPut(`http://localhost:8000/questionsRecord`).reply(200, { success: true });
 
-  });
-
-  it('should render configuration window and start game', async () => {
-    render( 
-        <SessionContext.Provider value={{ username: 'exampleUser' }}>
+    render(
+      <SessionContext.Provider value={{ username: 'exampleUser' }}>
           <Router>
-            <TheChallengeGame />
+              <TheChallengeGame />
           </Router>
-        </SessionContext.Provider>
+      </SessionContext.Provider>
     );
+  });
 
+  it('should render configuration window and start game', async () => {
     // Espera a que aparezca la ventana de configuración
     await waitFor(() => screen.getByText('GAME CONFIGURATION'));
 
@@ -59,14 +58,6 @@ describe('The Challenge component', () => {
   });
 
   it('should guess correct answer', async () => {
-    render( 
-        <SessionContext.Provider value={{ username: 'exampleUser' }}>
-          <Router>
-            <TheChallengeGame />
-          </Router>
-        </SessionContext.Provider>
-    );
-
     // Espera a que aparezca la ventana de configuración
     await waitFor(() => screen.getByText('GAME CONFIGURATION'));
 
@@ -92,14 +83,6 @@ describe('The Challenge component', () => {
 
   
   it('should choose incorrect answer', async () => {
-     render( 
-        <SessionContext.Provider value={{ username: 'exampleUser' }}>
-          <Router>
-            <TheChallengeGame />
-          </Router>
-        </SessionContext.Provider>
-    );
-
     // Espera a que aparezca la ventana de configuración
     await waitFor(() => screen.getByText('GAME CONFIGURATION'));
 
@@ -116,19 +99,11 @@ describe('The Challenge component', () => {
     
     //selects correct answer
     fireEvent.click(incorrectAnswer);
-    expect(screen.findByTestId("success1"));
+    expect(screen.findByTestId("fail1"));
 
   });
 
   it('should not answer the question', async () => {
-    render( 
-        <SessionContext.Provider value={{ username: 'exampleUser' }}>
-          <Router>
-            <TheChallengeGame />
-          </Router>
-        </SessionContext.Provider>
-    );
-
     // Espera a que aparezca la ventana de configuración
     await waitFor(() => screen.getByText('GAME CONFIGURATION'));
 
@@ -150,14 +125,6 @@ describe('The Challenge component', () => {
   }, 4500);
 
   it('should pause and resume the game after answering a question', async () => {
-    render(
-        <SessionContext.Provider value={{ username: 'exampleUser' }}>
-            <Router>
-                <TheChallengeGame />
-            </Router>
-        </SessionContext.Provider>
-    );
-
     await waitFor(() => screen.getByText('GAME CONFIGURATION'));
     fireEvent.click(screen.getByTestId('addRound'));
     fireEvent.click(screen.getByRole('button', { name: 'Start Game' }));

From 59ca40ab8e849e53dba48f92acb175a321a96064 Mon Sep 17 00:00:00 2001
From: Samuel Bustamante Larriet <145044934+uo289689@users.noreply.github.com>
Date: Fri, 26 Apr 2024 20:23:50 +0200
Subject: [PATCH 108/132] added force true

---
 users/services/user-model.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/users/services/user-model.js b/users/services/user-model.js
index 89a59234..446a59f5 100644
--- a/users/services/user-model.js
+++ b/users/services/user-model.js
@@ -208,7 +208,7 @@ const QuestionsRecord = sequelize.define('QuestionsRecord', {
 });
 
 // Synchronize the model with the database
-sequelize.sync()
+sequelize.sync({force:true})
     .then(() => {
         console.log('Model synchronized successfully with the database');
     })

From b558dc6c4e4809e02410f7c73e5f72f0058074dc Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Fri, 26 Apr 2024 20:24:34 +0200
Subject: [PATCH 109/132] Removed incorrect prog bar test in Game

---
 webapp/src/__tests__/pages/Game.test.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/webapp/src/__tests__/pages/Game.test.js b/webapp/src/__tests__/pages/Game.test.js
index c339aa55..4fcb9368 100644
--- a/webapp/src/__tests__/pages/Game.test.js
+++ b/webapp/src/__tests__/pages/Game.test.js
@@ -35,11 +35,7 @@ describe('Game component', () => {
     );
   });
 
-  it('should render question, answers and other ', async () => {
-    expect(screen.getByRole('progressbar'));
-    expect(screen.findByText('1'));
-    //expect(screen.findByText('1/3'));
-
+  it('should render question', async () => {
     // waits for the question to appear
     await waitFor(() => screen.getByText('Which is the capital of Spain?'.toUpperCase()));
 
@@ -94,6 +90,12 @@ describe('Game component', () => {
     expect(pauseButton);
     fireEvent.click(pauseButton);
     expect(screen.getByTestId("play"));
-  })
+  });
+
+  it('should render progress bar', async () => {
+    await waitFor(() => screen.getByText('Which is the capital of Spain?'.toUpperCase()));
+    const progressBar = screen.getByTestId('prog_bar0');
+    await expect(progressBar).toBeInTheDocument();
+  });
 
 });

From f2f29f3fce290fe25c1de73ec6e8cff360ff2fa6 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Fri, 26 Apr 2024 20:35:50 +0200
Subject: [PATCH 110/132] Fixed sonar cloud issue with label for the pause
 button

---
 webapp/src/pages/DiscoveringCitiesGame.js | 2 +-
 webapp/src/pages/Game.js                  | 2 +-
 webapp/src/pages/TheChallengeGame.js      | 2 +-
 webapp/src/pages/WarmQuestionGame.js      | 2 +-
 webapp/src/pages/WiseMenStackGame.js      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapp/src/pages/DiscoveringCitiesGame.js b/webapp/src/pages/DiscoveringCitiesGame.js
index 4773f745..b6cfd57f 100644
--- a/webapp/src/pages/DiscoveringCitiesGame.js
+++ b/webapp/src/pages/DiscoveringCitiesGame.js
@@ -265,7 +265,7 @@ const DiscovertingCitiesGame = () => {
             <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }} >
                 { answered ?
                     // Pausa
-                    <IconButton variant="contained" size="large" color="primary" aria-label={ paused ? t("Game.play") : t("Game.play") }
+                    <IconButton variant="contained" size="large" color="primary" aria-label={ paused ? t("Game.play") : t("Game.pause") }
                                 onClick={() => togglePause()} sx={{ height: 100, width: 100, border: `2px solid ${theme.palette.primary.main}` }} 
                                 data-testid={ paused ? "play" : "pause"} >
                         { paused ? <PlayArrow sx={{ fontSize:75 }} /> : <Pause sx={{ fontSize:75 }} /> }
diff --git a/webapp/src/pages/Game.js b/webapp/src/pages/Game.js
index 9fe12cf1..96278590 100644
--- a/webapp/src/pages/Game.js
+++ b/webapp/src/pages/Game.js
@@ -264,7 +264,7 @@ const Game = () => {
             <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }} >
                 { answered ?
                     // Pausa
-                    <IconButton variant="contained" size="large" color="primary" aria-label={ paused ? t("Game.play") : t("Game.play") }
+                    <IconButton variant="contained" size="large" color="primary" aria-label={ paused ? t("Game.play") : t("Game.pause") }
                                 onClick={() => togglePause()} sx={{ height: 100, width: 100, border: `2px solid ${theme.palette.primary.main}` }} 
                                 data-testid={ paused ? "play" : "pause"} >
                         { paused ? <PlayArrow sx={{ fontSize:75 }} /> : <Pause sx={{ fontSize:75 }} /> }
diff --git a/webapp/src/pages/TheChallengeGame.js b/webapp/src/pages/TheChallengeGame.js
index 942845a4..b827141b 100644
--- a/webapp/src/pages/TheChallengeGame.js
+++ b/webapp/src/pages/TheChallengeGame.js
@@ -346,7 +346,7 @@ const TheChallengeGame = () => {
             <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }} >
                 { answered ?
                     // Pausa
-                    <IconButton variant="contained" size="large" color="primary" aria-label={ paused ? t("Game.play") : t("Game.play") }
+                    <IconButton variant="contained" size="large" color="primary" aria-label={ paused ? t("Game.play") : t("Game.pause") }
                                 onClick={() => togglePause()} sx={{ height: 100, width: 100, border: `2px solid ${theme.palette.primary.main}` }} 
                                 data-testid={ paused ? "play" : "pause"} >
                         { paused ? <PlayArrow sx={{ fontSize:75 }} /> : <Pause sx={{ fontSize:75 }} /> }
diff --git a/webapp/src/pages/WarmQuestionGame.js b/webapp/src/pages/WarmQuestionGame.js
index 4ebf3366..15919016 100644
--- a/webapp/src/pages/WarmQuestionGame.js
+++ b/webapp/src/pages/WarmQuestionGame.js
@@ -291,7 +291,7 @@ const WarmQuestionGame = () => {
             <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }} >
                 { answered ?
                     // Pausa
-                    <IconButton variant="contained" size="large" color="primary" aria-label={ paused ? t("Game.play") : t("Game.play") }
+                    <IconButton variant="contained" size="large" color="primary" aria-label={ paused ? t("Game.play") : t("Game.pause") }
                                 onClick={() => togglePause()} sx={{ height: 100, width: 100, border: `2px solid ${theme.palette.primary.main}` }} 
                                 data-testid={ paused ? "play" : "pause"} >
                         { paused ? <PlayArrow sx={{ fontSize:75 }} /> : <Pause sx={{ fontSize:75 }} /> }
diff --git a/webapp/src/pages/WiseMenStackGame.js b/webapp/src/pages/WiseMenStackGame.js
index 92b296c1..2c8415c7 100644
--- a/webapp/src/pages/WiseMenStackGame.js
+++ b/webapp/src/pages/WiseMenStackGame.js
@@ -310,7 +310,7 @@ const WiseMenStackGame = () => {
             <Container sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }} >
                 { answered ?
                     // Pausa
-                    <IconButton variant="contained" size="large" color="primary" aria-label={ paused ? t("Game.play") : t("Game.play") }
+                    <IconButton variant="contained" size="large" color="primary" aria-label={ paused ? t("Game.play") : t("Game.pause") }
                                 onClick={() => togglePause()} sx={{ height: 100, width: 100, border: `2px solid ${theme.palette.primary.main}` }} 
                                 data-testid={ paused ? "play" : "pause"} >
                         { paused ? <PlayArrow sx={{ fontSize:75 }} /> : <Pause sx={{ fontSize:75 }} /> }

From 899b4cbf1f22e72e7ef2162ce3de329feed7b23c Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Fri, 26 Apr 2024 20:44:10 +0200
Subject: [PATCH 111/132] Removed flaky e2e test (note the two last action
 runs)

---
 webapp/e2e/features/wiseMenStackGame.feature |  7 +----
 webapp/e2e/steps/wiseMenStackGame.steps.js   | 30 --------------------
 2 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/webapp/e2e/features/wiseMenStackGame.feature b/webapp/e2e/features/wiseMenStackGame.feature
index 415f3d2e..da9e1fa6 100644
--- a/webapp/e2e/features/wiseMenStackGame.feature
+++ b/webapp/e2e/features/wiseMenStackGame.feature
@@ -3,9 +3,4 @@ Feature: Answer a question
 Scenario: Answering a question correctly
   Given A question
   When I click on the correct answer button
-  Then The selected answer is marked as right
-
-Scenario: Answering a question incorrectly
-  Given A question
-  When I click on an incorrect answer button
-  Then The selected answer is marked as wrong
\ No newline at end of file
+  Then The selected answer is marked as right
\ No newline at end of file
diff --git a/webapp/e2e/steps/wiseMenStackGame.steps.js b/webapp/e2e/steps/wiseMenStackGame.steps.js
index 0c2feb8e..974dd592 100644
--- a/webapp/e2e/steps/wiseMenStackGame.steps.js
+++ b/webapp/e2e/steps/wiseMenStackGame.steps.js
@@ -94,36 +94,6 @@ defineFeature(feature, test => {
     });
   })
 
-  test('Answering a question incorrectly', ({given,when,then}) => {
-
-    given('A question', async () => {
-      const button = await page.$('[data-testid="start-button"]');
-      await button.click();
-
-      await expect(page).toMatchElement("div", { text: 'WHICH IS THE CAPITAL OF SPAIN?'});
-      const question = await page.$['data-testid="question"'];
-      expect(question).not.toBeNull();
-      
-      const answers = await page.$x('//*[contains(@data-testid, "answer")]');
-      expect(answers.length).toBe(2);
-    });
-
-    when('I click on an incorrect answer button', async () => {
-      const answers = await page.$x('//*[contains(@data-testid, "answer")]');
-      const textoBoton1 = await page.evaluate(button => button.innerText, answers[0]);
-      if(textoBoton1 !== "MADRID") {
-        await answers[0].click();
-      } else {
-        await answers[1].click();
-      }
-    });
-
-    then('The selected answer is marked as wrong', async () => {
-      const answer = await page.$x('//*[contains(@data-testid, "fail")]');
-      expect(answer.length).toBe(1);
-    });
-  })
-
   afterAll(async ()=>{
     browser.close()
   })

From 0cec2c1b9e88862fe7934b57a41c4c17bcca370c Mon Sep 17 00:00:00 2001
From: uo289689 <uo289689@uniovi.es>
Date: Fri, 26 Apr 2024 20:49:39 +0200
Subject: [PATCH 112/132] Fixed error on get the statistics of an user

---
 users/routes/user-routes.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/users/routes/user-routes.js b/users/routes/user-routes.js
index 663759c5..ab6ed088 100644
--- a/users/routes/user-routes.js
+++ b/users/routes/user-routes.js
@@ -588,12 +588,14 @@ router.get('/statistics/:username', async (req,res) => {
                 }
             });
     
-            const hasCommonGroup = userGroups.some(userGroup => {
-                return loggedUserGroups.some(loggedUserGroup => loggedUserGroup.groupName === userGroup.groupName);
-            });
-
-            if(!hasCommonGroup){
-                return res.status(403).json({ error: 'You are not allowed to see this user statistics' });
+            if (loggedUserGroups.length != 0 && userGroups != 0){
+                const hasCommonGroup = userGroups.some(userGroup => {
+                    return loggedUserGroups.some(loggedUserGroup => loggedUserGroup.groupName === userGroup.groupName);
+                });
+    
+                if(!hasCommonGroup){
+                    return res.status(403).json({ error: 'You are not allowed to see this user statistics' });
+                }
             }
         }
 

From 8ad436bc79b679e16eef919c69a0844aa8c58654 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Fri, 26 Apr 2024 20:53:40 +0200
Subject: [PATCH 113/132] Added tests for warm question (fuck sonar cloud)

---
 .../__tests__/pages/WarmQuestionGame.test.js  | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/webapp/src/__tests__/pages/WarmQuestionGame.test.js b/webapp/src/__tests__/pages/WarmQuestionGame.test.js
index d1320380..488e3f6b 100644
--- a/webapp/src/__tests__/pages/WarmQuestionGame.test.js
+++ b/webapp/src/__tests__/pages/WarmQuestionGame.test.js
@@ -35,12 +35,9 @@ describe('WarmQuestionGame component', () => {
   });
 
   it('should render question, answers and other', async () => {
-
     // Espera a que aparezca la pregunta
     await waitFor(() => screen.getByTestId('question'));
 
-    expect(screen.findByText('1'));
-
     // Verifica que el juego haya comenzado correctamente mostrando la pregunta y las opciones
     expect(screen.getByTestId('question')).toBeInTheDocument();
     expect(screen.getByText('Madrid')).toBeInTheDocument();
@@ -50,7 +47,6 @@ describe('WarmQuestionGame component', () => {
   });
 
   it('should guess correct answer', async () => {
-
     // waits for the question to appear
     await waitFor(() => screen.getByTestId('question'));
     const correctAnswer = screen.getByRole('button', { name: 'Madrid' });
@@ -66,8 +62,6 @@ describe('WarmQuestionGame component', () => {
 
   
   it('should choose incorrect answer', async () => {
-
-
     // waits for the question to appear
     await waitFor(() => screen.getByTestId('question'));
     const incorrectAnswer = screen.getByRole('button', { name: 'Barcelona' });
@@ -82,7 +76,6 @@ describe('WarmQuestionGame component', () => {
   });
 
   it('should not answer the question', async () => {
-
     // waits for the question to appear
     await waitFor(() => screen.getByTestId('question'));
 
@@ -94,7 +87,6 @@ describe('WarmQuestionGame component', () => {
   }, 4500);
 
   it('should pass the question', async () => {
-
     // waits for the question to appear
     await waitFor(() => screen.getByTestId('question'));
     const correctAnswer = screen.getByRole('button', { name: 'Madrid' });
@@ -109,5 +101,21 @@ describe('WarmQuestionGame component', () => {
 
   });
 
+  it('should render pause & play buttons when answered', async () => {
+    await waitFor(() => screen.getByText('Which is the capital of Spain?'.toUpperCase()));
+    const correctAnswer = screen.getByRole('button', { name: 'Madrid' });
+    fireEvent.click(correctAnswer);
+
+    const pauseButton = screen.getByTestId("pause");
+    expect(pauseButton);
+    fireEvent.click(pauseButton);
+    expect(screen.getByTestId("play"));
+  })
+
+  it('should render progress bar', async () => {
+    await waitFor(() => screen.getByText('Which is the capital of Spain?'.toUpperCase()));
+    const progressBar = screen.getByTestId('prog_bar0');
+    await expect(progressBar).toBeInTheDocument();
+  })
 
 });
\ No newline at end of file

From 17462bd2a4c7bc43f78f176e823f89eea7410881 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Fri, 26 Apr 2024 20:59:25 +0200
Subject: [PATCH 114/132] Duplicity in unit tests in multiplayer + added test
 for the coverage

---
 .../__tests__/pages/MultiplayerGame.test.js   | 75 ++++++-------------
 1 file changed, 22 insertions(+), 53 deletions(-)

diff --git a/webapp/src/__tests__/pages/MultiplayerGame.test.js b/webapp/src/__tests__/pages/MultiplayerGame.test.js
index 5df16e29..8ef97984 100644
--- a/webapp/src/__tests__/pages/MultiplayerGame.test.js
+++ b/webapp/src/__tests__/pages/MultiplayerGame.test.js
@@ -24,7 +24,21 @@ describe('Game component', () => {
     let socket;
     
     beforeEach(() => {
-        socket = io();
+      socket = io();
+      useLocation.mockReturnValue({
+        state: {
+          gameQuestions: mockgameQuestions,
+          roomCode: "AAAAA",
+        },
+      })
+
+      render(
+      <SessionContext.Provider value={{ username: 'exampleUser' }}>
+        <BrowserRouter>
+            <MultiplayerGame />
+        </BrowserRouter>
+      </SessionContext.Provider>
+      );
     });
 
     const questionObject = {
@@ -46,23 +60,6 @@ describe('Game component', () => {
     const mockgameQuestions = generateQuestionArray(questionObject, 3);
 
   it('should render with recieved room code and questions ', async () => {
-      
-    //mock info that room sent to the game
-      useLocation.mockReturnValue({
-        state: {
-          gameQuestions: mockgameQuestions,
-          roomCode: "AAAAA",
-        },
-      })
-
-      render(
-      <SessionContext.Provider value={{ username: 'exampleUser' }}>
-        <BrowserRouter>
-            <MultiplayerGame />
-        </BrowserRouter>
-      </SessionContext.Provider>
-      );
-
     // waits for the question to appear
     await waitFor(() => screen.getByTestId('question'));
 
@@ -73,23 +70,7 @@ describe('Game component', () => {
     expect(screen.findByText('London'));
   });
 
- it('should guess correct answer', async () => {
-
-    useLocation.mockReturnValue({
-        state: {
-          gameQuestions: mockgameQuestions,
-          roomCode: "AAAAA",
-        },
-      })
-
-      render(
-      <SessionContext.Provider value={{ username: 'exampleUser' }}>
-        <BrowserRouter>
-            <MultiplayerGame />
-        </BrowserRouter>
-      </SessionContext.Provider>
-      );
-
+  it('should guess correct answer', async () => {
     // waits for the question to appear
     await waitFor(() => screen.getByTestId('question'));
     const correctAnswer = screen.getByRole('button', { name: 'Madrid' });
@@ -100,27 +81,10 @@ describe('Game component', () => {
     fireEvent.click(correctAnswer);
 
     expect(correctAnswer).toHaveStyle({ backgroundColor: 'rgb(51, 153, 102);' });
-
   });
 
   
   it('should choose incorrect answer', async () => {
-
-    useLocation.mockReturnValue({
-        state: {
-          gameQuestions: mockgameQuestions,
-          roomCode: "AAAAA",
-        },
-      })
-
-      render(
-      <SessionContext.Provider value={{ username: 'exampleUser' }}>
-        <BrowserRouter>
-            <MultiplayerGame />
-        </BrowserRouter>
-      </SessionContext.Provider>
-      );
-
     // waits for the question to appear
     await waitFor(() => screen.getByTestId('question'));
     const incorrectAnswer = screen.getByRole('button', { name: 'Barcelona' });
@@ -131,7 +95,12 @@ describe('Game component', () => {
     fireEvent.click(incorrectAnswer); 
 
     expect(incorrectAnswer).toHaveStyle({ backgroundColor: 'rgb(153, 0, 0);' });
-
   });
 
+  it('should render progress bar', async () => {
+    await waitFor(() => screen.getByText('Which is the capital of Spain?'.toUpperCase()));
+    const progressBar = screen.getByTestId('prog_bar0');
+    await expect(progressBar).toBeInTheDocument();
+  })
+
 });

From 659efad5c50b77f82a3ed671989f59ccfa640868 Mon Sep 17 00:00:00 2001
From: uo289689 <uo289689@uniovi.es>
Date: Fri, 26 Apr 2024 21:01:06 +0200
Subject: [PATCH 115/132] fixed tests

---
 package-lock.json                        | 4690 +++++++++++++++++++++-
 package.json                             |    7 +
 users/__tests/routes/user-routes.test.js |    7 -
 3 files changed, 4696 insertions(+), 8 deletions(-)
 create mode 100644 package.json

diff --git a/package-lock.json b/package-lock.json
index c3591210..396927f2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2,5 +2,4693 @@
   "name": "wiq_es04a",
   "lockfileVersion": 3,
   "requires": true,
-  "packages": {}
+  "packages": {
+    "": {
+      "dependencies": {
+        "jest": "^29.7.0",
+        "sequelize": "^6.37.3",
+        "sqlite3": "^5.1.7"
+      }
+    },
+    "node_modules/@ampproject/remapping": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.24.2",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz",
+      "integrity": "sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==",
+      "dependencies": {
+        "@babel/highlight": "^7.24.2",
+        "picocolors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/compat-data": {
+      "version": "7.24.4",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.4.tgz",
+      "integrity": "sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/core": {
+      "version": "7.24.4",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.4.tgz",
+      "integrity": "sha512-MBVlMXP+kkl5394RBLSxxk/iLTeVGuXTV3cIDXavPpMMqnSnt6apKgan/U8O3USWZCWZT/TbgfEpKa4uMgN4Dg==",
+      "dependencies": {
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.24.2",
+        "@babel/generator": "^7.24.4",
+        "@babel/helper-compilation-targets": "^7.23.6",
+        "@babel/helper-module-transforms": "^7.23.3",
+        "@babel/helpers": "^7.24.4",
+        "@babel/parser": "^7.24.4",
+        "@babel/template": "^7.24.0",
+        "@babel/traverse": "^7.24.1",
+        "@babel/types": "^7.24.0",
+        "convert-source-map": "^2.0.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@babel/generator": {
+      "version": "7.24.4",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.4.tgz",
+      "integrity": "sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw==",
+      "dependencies": {
+        "@babel/types": "^7.24.0",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "jsesc": "^2.5.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz",
+      "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==",
+      "dependencies": {
+        "@babel/compat-data": "^7.23.5",
+        "@babel/helper-validator-option": "^7.23.5",
+        "browserslist": "^4.22.2",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-environment-visitor": {
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-function-name": {
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
+      "dependencies": {
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.23.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-hoist-variables": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
+      "dependencies": {
+        "@babel/types": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.24.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz",
+      "integrity": "sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==",
+      "dependencies": {
+        "@babel/types": "^7.24.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
+      "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-module-imports": "^7.22.15",
+        "@babel/helper-simple-access": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/helper-validator-identifier": "^7.22.20"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.24.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz",
+      "integrity": "sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-simple-access": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
+      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
+      "dependencies": {
+        "@babel/types": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-split-export-declaration": {
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
+      "dependencies": {
+        "@babel/types": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz",
+      "integrity": "sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz",
+      "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helpers": {
+      "version": "7.24.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.4.tgz",
+      "integrity": "sha512-FewdlZbSiwaVGlgT1DPANDuCHaDMiOo+D/IDYRFYjHOuv66xMSJ7fQwwODwRNAPkADIO/z1EoF/l2BCWlWABDw==",
+      "dependencies": {
+        "@babel/template": "^7.24.0",
+        "@babel/traverse": "^7.24.1",
+        "@babel/types": "^7.24.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight": {
+      "version": "7.24.2",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.2.tgz",
+      "integrity": "sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==",
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "chalk": "^2.4.2",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+    },
+    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.24.4",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.4.tgz",
+      "integrity": "sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==",
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-bigint": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-jsx": {
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.1.tgz",
+      "integrity": "sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-typescript": {
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.1.tgz",
+      "integrity": "sha512-Yhnmvy5HZEnHUty6i++gcfH1/l68AHnItFHnaCv6hn9dNh0hQvvQJsxpi4BMBFN5DLeHBuucT/0DgzXif/OyRw==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/template": {
+      "version": "7.24.0",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz",
+      "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==",
+      "dependencies": {
+        "@babel/code-frame": "^7.23.5",
+        "@babel/parser": "^7.24.0",
+        "@babel/types": "^7.24.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse": {
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.1.tgz",
+      "integrity": "sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==",
+      "dependencies": {
+        "@babel/code-frame": "^7.24.1",
+        "@babel/generator": "^7.24.1",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/parser": "^7.24.1",
+        "@babel/types": "^7.24.0",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.24.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz",
+      "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==",
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.23.4",
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "to-fast-properties": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@bcoe/v8-coverage": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="
+    },
+    "node_modules/@gar/promisify": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz",
+      "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==",
+      "optional": true
+    },
+    "node_modules/@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/console": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
+      "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/core": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
+      "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
+      "dependencies": {
+        "@jest/console": "^29.7.0",
+        "@jest/reporters": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "jest-changed-files": "^29.7.0",
+        "jest-config": "^29.7.0",
+        "jest-haste-map": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-resolve-dependencies": "^29.7.0",
+        "jest-runner": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "jest-watcher": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@jest/environment": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
+      "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
+      "dependencies": {
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-mock": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/expect": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
+      "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
+      "dependencies": {
+        "expect": "^29.7.0",
+        "jest-snapshot": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/expect-utils": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
+      "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
+      "dependencies": {
+        "jest-get-type": "^29.6.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/fake-timers": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
+      "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@sinonjs/fake-timers": "^10.0.2",
+        "@types/node": "*",
+        "jest-message-util": "^29.7.0",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/globals": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
+      "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/expect": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "jest-mock": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/reporters": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
+      "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
+      "dependencies": {
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jest/console": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-instrument": "^6.0.0",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.1.3",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "slash": "^3.0.0",
+        "string-length": "^4.0.1",
+        "strip-ansi": "^6.0.0",
+        "v8-to-istanbul": "^9.0.1"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@jest/schemas": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
+      "dependencies": {
+        "@sinclair/typebox": "^0.27.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/source-map": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
+      "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.2.9"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/test-result": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
+      "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
+      "dependencies": {
+        "@jest/console": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/test-sequencer": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
+      "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
+      "dependencies": {
+        "@jest/test-result": "^29.7.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/transform": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
+      "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
+      "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@jest/types": "^29.6.3",
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "babel-plugin-istanbul": "^6.1.1",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^2.0.0",
+        "fast-json-stable-stringify": "^2.1.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "pirates": "^4.0.4",
+        "slash": "^3.0.0",
+        "write-file-atomic": "^4.0.2"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
+      "dependencies": {
+        "@jest/schemas": "^29.6.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "dependencies": {
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "node_modules/@npmcli/fs": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz",
+      "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==",
+      "optional": true,
+      "dependencies": {
+        "@gar/promisify": "^1.0.1",
+        "semver": "^7.3.5"
+      }
+    },
+    "node_modules/@npmcli/fs/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "optional": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@npmcli/fs/node_modules/semver": {
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+      "optional": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@npmcli/fs/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "optional": true
+    },
+    "node_modules/@npmcli/move-file": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
+      "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
+      "deprecated": "This functionality has been moved to @npmcli/fs",
+      "optional": true,
+      "dependencies": {
+        "mkdirp": "^1.0.4",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@sinclair/typebox": {
+      "version": "0.27.8",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA=="
+    },
+    "node_modules/@sinonjs/commons": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
+      "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
+      "dependencies": {
+        "type-detect": "4.0.8"
+      }
+    },
+    "node_modules/@sinonjs/fake-timers": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
+      "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
+      "dependencies": {
+        "@sinonjs/commons": "^3.0.0"
+      }
+    },
+    "node_modules/@tootallnate/once": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+      "optional": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@types/babel__core": {
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
+      "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
+      "dependencies": {
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
+      }
+    },
+    "node_modules/@types/babel__generator": {
+      "version": "7.6.8",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
+      "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
+      "dependencies": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__template": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
+      "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
+      "dependencies": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__traverse": {
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.5.tgz",
+      "integrity": "sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==",
+      "dependencies": {
+        "@babel/types": "^7.20.7"
+      }
+    },
+    "node_modules/@types/debug": {
+      "version": "4.1.12",
+      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz",
+      "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==",
+      "dependencies": {
+        "@types/ms": "*"
+      }
+    },
+    "node_modules/@types/graceful-fs": {
+      "version": "4.1.9",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
+      "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/istanbul-lib-coverage": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w=="
+    },
+    "node_modules/@types/istanbul-lib-report": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
+      "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "*"
+      }
+    },
+    "node_modules/@types/istanbul-reports": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
+      "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
+      "dependencies": {
+        "@types/istanbul-lib-report": "*"
+      }
+    },
+    "node_modules/@types/ms": {
+      "version": "0.7.34",
+      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.34.tgz",
+      "integrity": "sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g=="
+    },
+    "node_modules/@types/node": {
+      "version": "20.12.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.7.tgz",
+      "integrity": "sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==",
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@types/stack-utils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
+      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw=="
+    },
+    "node_modules/@types/validator": {
+      "version": "13.11.9",
+      "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.11.9.tgz",
+      "integrity": "sha512-FCTsikRozryfayPuiI46QzH3fnrOoctTjvOYZkho9BTFLCOZ2rgZJHMOVgCOfttjPJcgOx52EpkY0CMfy87MIw=="
+    },
+    "node_modules/@types/yargs": {
+      "version": "17.0.32",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@types/yargs-parser": {
+      "version": "21.0.3",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
+      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ=="
+    },
+    "node_modules/abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "optional": true
+    },
+    "node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "optional": true,
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/agentkeepalive": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz",
+      "integrity": "sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==",
+      "optional": true,
+      "dependencies": {
+        "humanize-ms": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 8.0.0"
+      }
+    },
+    "node_modules/aggregate-error": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+      "optional": true,
+      "dependencies": {
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dependencies": {
+        "type-fest": "^0.21.3"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/aproba": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
+      "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==",
+      "optional": true
+    },
+    "node_modules/are-we-there-yet": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz",
+      "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==",
+      "optional": true,
+      "dependencies": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^3.6.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/babel-jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
+      "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
+      "dependencies": {
+        "@jest/transform": "^29.7.0",
+        "@types/babel__core": "^7.1.14",
+        "babel-plugin-istanbul": "^6.1.1",
+        "babel-preset-jest": "^29.6.3",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.8.0"
+      }
+    },
+    "node_modules/babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+      "dependencies": {
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-plugin-jest-hoist": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
+      "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
+      "dependencies": {
+        "@babel/template": "^7.3.3",
+        "@babel/types": "^7.3.3",
+        "@types/babel__core": "^7.1.14",
+        "@types/babel__traverse": "^7.0.6"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/babel-preset-current-node-syntax": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
+      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+      "dependencies": {
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-bigint": "^7.8.3",
+        "@babel/plugin-syntax-class-properties": "^7.8.3",
+        "@babel/plugin-syntax-import-meta": "^7.8.3",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-top-level-await": "^7.8.3"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/babel-preset-jest": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
+      "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
+      "dependencies": {
+        "babel-plugin-jest-hoist": "^29.6.3",
+        "babel-preset-current-node-syntax": "^1.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dependencies": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
+    "node_modules/bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.23.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
+      "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001587",
+        "electron-to-chromium": "^1.4.668",
+        "node-releases": "^2.0.14",
+        "update-browserslist-db": "^1.0.13"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/bser": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+      "dependencies": {
+        "node-int64": "^0.4.0"
+      }
+    },
+    "node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
+    },
+    "node_modules/cacache": {
+      "version": "15.3.0",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz",
+      "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==",
+      "optional": true,
+      "dependencies": {
+        "@npmcli/fs": "^1.0.0",
+        "@npmcli/move-file": "^1.0.1",
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "glob": "^7.1.4",
+        "infer-owner": "^1.0.4",
+        "lru-cache": "^6.0.0",
+        "minipass": "^3.1.1",
+        "minipass-collect": "^1.0.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.2",
+        "mkdirp": "^1.0.3",
+        "p-map": "^4.0.0",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^3.0.2",
+        "ssri": "^8.0.1",
+        "tar": "^6.0.2",
+        "unique-filename": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/cacache/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "optional": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cacache/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "optional": true
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001612",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001612.tgz",
+      "integrity": "sha512-lFgnZ07UhaCcsSZgWW0K5j4e69dK1u/ltrL9lTUiFOwNHs12S3UMIEYgBV0Z6C6hRDev7iRnMzzYmKabYdXF9g==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ]
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/char-regex": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/chownr": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cjs-module-lexer": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz",
+      "integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ=="
+    },
+    "node_modules/clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "optional": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
+      "engines": {
+        "iojs": ">= 1.0.0",
+        "node": ">= 0.12.0"
+      }
+    },
+    "node_modules/collect-v8-coverage": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
+      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q=="
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "node_modules/color-support": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+      "optional": true,
+      "bin": {
+        "color-support": "bin.js"
+      }
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+    },
+    "node_modules/console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
+      "optional": true
+    },
+    "node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
+    },
+    "node_modules/create-jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
+      "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "jest-config": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "prompts": "^2.0.1"
+      },
+      "bin": {
+        "create-jest": "bin/create-jest.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/decompress-response": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+      "dependencies": {
+        "mimic-response": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/dedent": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
+      "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
+      "peerDependencies": {
+        "babel-plugin-macros": "^3.1.0"
+      },
+      "peerDependenciesMeta": {
+        "babel-plugin-macros": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/deepmerge": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+      "optional": true
+    },
+    "node_modules/detect-libc": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
+      "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/detect-newline": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/diff-sequences": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/dottie": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/dottie/-/dottie-2.0.6.tgz",
+      "integrity": "sha512-iGCHkfUc5kFekGiqhe8B/mdaurD+lakO9txNnTvKtA6PISrw86LgqHvRzWYPyoE2Ph5aMIrCw9/uko6XHTKCwA=="
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.4.750",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.750.tgz",
+      "integrity": "sha512-9ItEpeu15hW5m8jKdriL+BQrgwDTXEL9pn4SkillWFu73ZNNNQ2BKKLS+ZHv2vC9UkNhosAeyfxOf/5OSeTCPA=="
+    },
+    "node_modules/emittery": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
+      "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "node_modules/encoding": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
+      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
+      "optional": true,
+      "dependencies": {
+        "iconv-lite": "^0.6.2"
+      }
+    },
+    "node_modules/end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/env-paths": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+      "optional": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/err-code": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
+      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==",
+      "optional": true
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/expand-template": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
+      "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/expect": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
+      "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
+      "dependencies": {
+        "@jest/expect-utils": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+    },
+    "node_modules/fb-watchman": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
+      "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
+      "dependencies": {
+        "bser": "2.1.1"
+      }
+    },
+    "node_modules/file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
+    },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
+    },
+    "node_modules/fs-minipass": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/gauge": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz",
+      "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==",
+      "optional": true,
+      "dependencies": {
+        "aproba": "^1.0.3 || ^2.0.0",
+        "color-support": "^1.1.3",
+        "console-control-strings": "^1.1.0",
+        "has-unicode": "^2.0.1",
+        "signal-exit": "^3.0.7",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "wide-align": "^1.1.5"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/github-from-package": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
+      "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw=="
+    },
+    "node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
+      "optional": true
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
+    },
+    "node_modules/http-cache-semantics": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
+      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
+      "optional": true
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "optional": true,
+      "dependencies": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "optional": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "engines": {
+        "node": ">=10.17.0"
+      }
+    },
+    "node_modules/humanize-ms": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
+      "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
+      "optional": true,
+      "dependencies": {
+        "ms": "^2.0.0"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "optional": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/import-local": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
+      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
+      "dependencies": {
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/infer-owner": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
+      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
+      "optional": true
+    },
+    "node_modules/inflection": {
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.13.4.tgz",
+      "integrity": "sha512-6I/HUDeYFfuNCVS3td055BaXBwKYuzw7K3ExVMStBowKo9oOAMJIXIHvdyR3iboTCp1b+1i5DSkIZTcwIktuDw==",
+      "engines": [
+        "node >= 0.4.0"
+      ]
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+    },
+    "node_modules/ip-address": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+      "optional": true,
+      "dependencies": {
+        "jsbn": "1.1.0",
+        "sprintf-js": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/ip-address/node_modules/sprintf-js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+      "optional": true
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
+    },
+    "node_modules/is-core-module": {
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
+      "dependencies": {
+        "hasown": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-generator-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-lambda": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
+      "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
+      "optional": true
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
+    },
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-instrument": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.2.tgz",
+      "integrity": "sha512-1WUsZ9R1lA0HtBSohTkm39WTPlNKSJ5iFk7UwqXkBLoHQT+hfqPsfsTDVuZdKGaBwn7din9bS7SsnoAr943hvw==",
+      "dependencies": {
+        "@babel/core": "^7.23.9",
+        "@babel/parser": "^7.23.9",
+        "@istanbuljs/schema": "^0.1.3",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-instrument/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-instrument/node_modules/semver": {
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-instrument/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+      "dependencies": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^4.0.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+      "dependencies": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-reports": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
+      "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
+      "dependencies": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
+      "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
+      "dependencies": {
+        "@jest/core": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "import-local": "^3.0.2",
+        "jest-cli": "^29.7.0"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-changed-files": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
+      "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
+      "dependencies": {
+        "execa": "^5.0.0",
+        "jest-util": "^29.7.0",
+        "p-limit": "^3.1.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-circus": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
+      "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/expect": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "dedent": "^1.0.0",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^29.7.0",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "p-limit": "^3.1.0",
+        "pretty-format": "^29.7.0",
+        "pure-rand": "^6.0.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-cli": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
+      "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
+      "dependencies": {
+        "@jest/core": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "create-jest": "^29.7.0",
+        "exit": "^0.1.2",
+        "import-local": "^3.0.2",
+        "jest-config": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "yargs": "^17.3.1"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-config": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
+      "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
+      "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@jest/test-sequencer": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "babel-jest": "^29.7.0",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-circus": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-runner": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "parse-json": "^5.2.0",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@types/node": "*",
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "ts-node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-diff": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-docblock": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
+      "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
+      "dependencies": {
+        "detect-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-each": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
+      "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "pretty-format": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-environment-node": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
+      "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-get-type": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-haste-map": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
+      "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/graceful-fs": "^4.1.3",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
+      }
+    },
+    "node_modules/jest-leak-detector": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
+      "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
+      "dependencies": {
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-matcher-utils": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
+      "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-message-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
+      "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
+      "dependencies": {
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^29.6.3",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-mock": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
+      "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-util": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-pnp-resolver": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+      "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
+      "engines": {
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "jest-resolve": "*"
+      },
+      "peerDependenciesMeta": {
+        "jest-resolve": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-regex-util": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
+      "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-resolve": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
+      "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "resolve": "^1.20.0",
+        "resolve.exports": "^2.0.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-resolve-dependencies": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
+      "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
+      "dependencies": {
+        "jest-regex-util": "^29.6.3",
+        "jest-snapshot": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runner": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
+      "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
+      "dependencies": {
+        "@jest/console": "^29.7.0",
+        "@jest/environment": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.13.1",
+        "graceful-fs": "^4.2.9",
+        "jest-docblock": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
+        "jest-haste-map": "^29.7.0",
+        "jest-leak-detector": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-resolve": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-watcher": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "p-limit": "^3.1.0",
+        "source-map-support": "0.5.13"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runtime": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
+      "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/globals": "^29.7.0",
+        "@jest/source-map": "^29.6.3",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^1.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-mock": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-snapshot": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
+      "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
+      "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@babel/generator": "^7.7.2",
+        "@babel/plugin-syntax-jsx": "^7.7.2",
+        "@babel/plugin-syntax-typescript": "^7.7.2",
+        "@babel/types": "^7.3.3",
+        "@jest/expect-utils": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "babel-preset-current-node-syntax": "^1.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^29.7.0",
+        "graceful-fs": "^4.2.9",
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^29.7.0",
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/semver": {
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
+    "node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-validate": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
+      "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "camelcase": "^6.2.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.6.3",
+        "leven": "^3.1.0",
+        "pretty-format": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-validate/node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-watcher": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
+      "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
+      "dependencies": {
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "emittery": "^0.13.1",
+        "jest-util": "^29.7.0",
+        "string-length": "^4.0.1"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-worker": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
+      "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
+      "dependencies": {
+        "@types/node": "*",
+        "jest-util": "^29.7.0",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+    },
+    "node_modules/js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsbn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
+      "optional": true
+    },
+    "node_modules/jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
+    },
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/leven": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
+    },
+    "node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    },
+    "node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+      "dependencies": {
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/make-dir/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/make-dir/node_modules/semver": {
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/make-dir/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
+    "node_modules/make-fetch-happen": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz",
+      "integrity": "sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==",
+      "optional": true,
+      "dependencies": {
+        "agentkeepalive": "^4.1.3",
+        "cacache": "^15.2.0",
+        "http-cache-semantics": "^4.1.0",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-lambda": "^1.0.1",
+        "lru-cache": "^6.0.0",
+        "minipass": "^3.1.3",
+        "minipass-collect": "^1.0.2",
+        "minipass-fetch": "^1.3.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "negotiator": "^0.6.2",
+        "promise-retry": "^2.0.1",
+        "socks-proxy-agent": "^6.0.0",
+        "ssri": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "optional": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "optional": true
+    },
+    "node_modules/makeerror": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+      "dependencies": {
+        "tmpl": "1.0.5"
+      }
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dependencies": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mimic-response": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minipass-collect": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
+      "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
+      "optional": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/minipass-fetch": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz",
+      "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==",
+      "optional": true,
+      "dependencies": {
+        "minipass": "^3.1.0",
+        "minipass-sized": "^1.0.3",
+        "minizlib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "optionalDependencies": {
+        "encoding": "^0.1.12"
+      }
+    },
+    "node_modules/minipass-flush": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
+      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
+      "optional": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/minipass-pipeline": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
+      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
+      "optional": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minipass-sized": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
+      "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
+      "optional": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minipass/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
+    "node_modules/minizlib": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "dependencies": {
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/minizlib/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
+    "node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
+    },
+    "node_modules/moment": {
+      "version": "2.30.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/moment-timezone": {
+      "version": "0.5.45",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.45.tgz",
+      "integrity": "sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==",
+      "dependencies": {
+        "moment": "^2.29.4"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "node_modules/napi-build-utils": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
+      "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
+    },
+    "node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "optional": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/node-abi": {
+      "version": "3.62.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.62.0.tgz",
+      "integrity": "sha512-CPMcGa+y33xuL1E0TcNIu4YyaZCxnnvkVaEXrsosR3FxN+fV8xvb7Mzpb7IgKler10qeMkE6+Dp8qJhpzdq35g==",
+      "dependencies": {
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/node-abi/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/node-abi/node_modules/semver": {
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/node-abi/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
+    "node_modules/node-addon-api": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz",
+      "integrity": "sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==",
+      "engines": {
+        "node": "^16 || ^18 || >= 20"
+      }
+    },
+    "node_modules/node-gyp": {
+      "version": "8.4.1",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz",
+      "integrity": "sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==",
+      "optional": true,
+      "dependencies": {
+        "env-paths": "^2.2.0",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.2.6",
+        "make-fetch-happen": "^9.1.0",
+        "nopt": "^5.0.0",
+        "npmlog": "^6.0.0",
+        "rimraf": "^3.0.2",
+        "semver": "^7.3.5",
+        "tar": "^6.1.2",
+        "which": "^2.0.2"
+      },
+      "bin": {
+        "node-gyp": "bin/node-gyp.js"
+      },
+      "engines": {
+        "node": ">= 10.12.0"
+      }
+    },
+    "node_modules/node-gyp/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "optional": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/node-gyp/node_modules/semver": {
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+      "optional": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/node-gyp/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "optional": true
+    },
+    "node_modules/node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
+      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw=="
+    },
+    "node_modules/nopt": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+      "optional": true,
+      "dependencies": {
+        "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/npmlog": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz",
+      "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==",
+      "optional": true,
+      "dependencies": {
+        "are-we-there-yet": "^3.0.0",
+        "console-control-strings": "^1.1.0",
+        "gauge": "^4.0.3",
+        "set-blocking": "^2.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-locate/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-map": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+      "optional": true,
+      "dependencies": {
+        "aggregate-error": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+    },
+    "node_modules/pg-connection-string": {
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.6.4.tgz",
+      "integrity": "sha512-v+Z7W/0EO707aNMaAEfiGnGL9sxxumwLl2fJvCQtMn9Fxsg+lPpPkdcyBSv/KFgpGdYkMfn+EI1Or2EHjpgLCA=="
+    },
+    "node_modules/picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pirates": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/prebuild-install": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.2.tgz",
+      "integrity": "sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==",
+      "dependencies": {
+        "detect-libc": "^2.0.0",
+        "expand-template": "^2.0.3",
+        "github-from-package": "0.0.0",
+        "minimist": "^1.2.3",
+        "mkdirp-classic": "^0.5.3",
+        "napi-build-utils": "^1.0.1",
+        "node-abi": "^3.3.0",
+        "pump": "^3.0.0",
+        "rc": "^1.2.7",
+        "simple-get": "^4.0.0",
+        "tar-fs": "^2.0.0",
+        "tunnel-agent": "^0.6.0"
+      },
+      "bin": {
+        "prebuild-install": "bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/pretty-format": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+      "dependencies": {
+        "@jest/schemas": "^29.6.3",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/promise-inflight": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==",
+      "optional": true
+    },
+    "node_modules/promise-retry": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
+      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
+      "optional": true,
+      "dependencies": {
+        "err-code": "^2.0.2",
+        "retry": "^0.12.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/prompts": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+      "dependencies": {
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.5"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/pure-rand": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
+      "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/dubzzz"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fast-check"
+        }
+      ]
+    },
+    "node_modules/rc": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "dependencies": {
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
+      },
+      "bin": {
+        "rc": "cli.js"
+      }
+    },
+    "node_modules/rc/node_modules/strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react-is": {
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
+    },
+    "node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve": {
+      "version": "1.22.8",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "dependencies": {
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "dependencies": {
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve.exports": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
+      "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
+      "optional": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/retry-as-promised": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/retry-as-promised/-/retry-as-promised-7.0.4.tgz",
+      "integrity": "sha512-XgmCoxKWkDofwH8WddD0w85ZfqYz+ZHlr5yo+3YUCfycWawU56T5ckWXsScsj5B8tqUcIG67DxXByo3VUgiAdA=="
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "optional": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "optional": true
+    },
+    "node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/sequelize": {
+      "version": "6.37.3",
+      "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-6.37.3.tgz",
+      "integrity": "sha512-V2FTqYpdZjPy3VQrZvjTPnOoLm0KudCRXfGWp48QwhyPPp2yW8z0p0sCYZd/em847Tl2dVxJJ1DR+hF+O77T7A==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/sequelize"
+        }
+      ],
+      "dependencies": {
+        "@types/debug": "^4.1.8",
+        "@types/validator": "^13.7.17",
+        "debug": "^4.3.4",
+        "dottie": "^2.0.6",
+        "inflection": "^1.13.4",
+        "lodash": "^4.17.21",
+        "moment": "^2.29.4",
+        "moment-timezone": "^0.5.43",
+        "pg-connection-string": "^2.6.1",
+        "retry-as-promised": "^7.0.4",
+        "semver": "^7.5.4",
+        "sequelize-pool": "^7.1.0",
+        "toposort-class": "^1.0.1",
+        "uuid": "^8.3.2",
+        "validator": "^13.9.0",
+        "wkx": "^0.5.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ibm_db": {
+          "optional": true
+        },
+        "mariadb": {
+          "optional": true
+        },
+        "mysql2": {
+          "optional": true
+        },
+        "oracledb": {
+          "optional": true
+        },
+        "pg": {
+          "optional": true
+        },
+        "pg-hstore": {
+          "optional": true
+        },
+        "snowflake-sdk": {
+          "optional": true
+        },
+        "sqlite3": {
+          "optional": true
+        },
+        "tedious": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/sequelize-pool": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/sequelize-pool/-/sequelize-pool-7.1.0.tgz",
+      "integrity": "sha512-G9c0qlIWQSK29pR/5U2JF5dDQeqqHRragoyahj/Nx4KOOQ3CPPfzxnfqFPCSB7x5UgjOgnZ61nSxz+fjDpRlJg==",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/sequelize/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/sequelize/node_modules/semver": {
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/sequelize/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+      "optional": true
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
+    },
+    "node_modules/simple-concat": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/simple-get": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
+      "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "decompress-response": "^6.0.0",
+        "once": "^1.3.1",
+        "simple-concat": "^1.0.0"
+      }
+    },
+    "node_modules/sisteransi": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="
+    },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "optional": true,
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
+      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
+      "optional": true,
+      "dependencies": {
+        "ip-address": "^9.0.5",
+        "smart-buffer": "^4.2.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks-proxy-agent": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz",
+      "integrity": "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==",
+      "optional": true,
+      "dependencies": {
+        "agent-base": "^6.0.2",
+        "debug": "^4.3.3",
+        "socks": "^2.6.2"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.13",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
+    },
+    "node_modules/sqlite3": {
+      "version": "5.1.7",
+      "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.7.tgz",
+      "integrity": "sha512-GGIyOiFaG+TUra3JIfkI/zGP8yZYLPQ0pl1bH+ODjiX57sPhrLU5sQJn1y9bDKZUFYkX1crlrPfSYt0BKKdkog==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "bindings": "^1.5.0",
+        "node-addon-api": "^7.0.0",
+        "prebuild-install": "^7.1.1",
+        "tar": "^6.1.11"
+      },
+      "optionalDependencies": {
+        "node-gyp": "8.x"
+      },
+      "peerDependencies": {
+        "node-gyp": "8.x"
+      },
+      "peerDependenciesMeta": {
+        "node-gyp": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ssri": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
+      "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
+      "optional": true,
+      "dependencies": {
+        "minipass": "^3.1.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/stack-utils": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
+      "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
+      "dependencies": {
+        "escape-string-regexp": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string-length": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+      "dependencies": {
+        "char-regex": "^1.0.2",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/tar": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
+      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
+      "dependencies": {
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^5.0.0",
+        "minizlib": "^2.1.1",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/tar-fs": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "dependencies": {
+        "chownr": "^1.1.1",
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^2.1.4"
+      }
+    },
+    "node_modules/tar-fs/node_modules/chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+    },
+    "node_modules/tar-stream": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "dependencies": {
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tar/node_modules/minipass": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
+      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/tar/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
+    "node_modules/test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dependencies": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/tmpl": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="
+    },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/toposort-class": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toposort-class/-/toposort-class-1.0.1.tgz",
+      "integrity": "sha512-OsLcGGbYF3rMjPUf8oKktyvCiUxSbqMMS39m33MAjLTC1DVIH6x3WSt63/M77ihI09+Sdfk1AXvfhCEeUmC7mg=="
+    },
+    "node_modules/tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
+    },
+    "node_modules/unique-filename": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+      "optional": true,
+      "dependencies": {
+        "unique-slug": "^2.0.0"
+      }
+    },
+    "node_modules/unique-slug": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
+      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+      "optional": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4"
+      }
+    },
+    "node_modules/update-browserslist-db": {
+      "version": "1.0.13",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
+      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "escalade": "^3.1.1",
+        "picocolors": "^1.0.0"
+      },
+      "bin": {
+        "update-browserslist-db": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+    },
+    "node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/v8-to-istanbul": {
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz",
+      "integrity": "sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.12",
+        "@types/istanbul-lib-coverage": "^2.0.1",
+        "convert-source-map": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.12.0"
+      }
+    },
+    "node_modules/validator": {
+      "version": "13.11.0",
+      "resolved": "https://registry.npmjs.org/validator/-/validator-13.11.0.tgz",
+      "integrity": "sha512-Ii+sehpSfZy+At5nPdnyMhx78fEoPDkR2XW/zimHEL3MyGJQOCQ7WeP20jPYRz7ZCpcKLB21NxuXHF3bxjStBQ==",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/walker": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
+      "dependencies": {
+        "makeerror": "1.0.12"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/wide-align": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
+      "optional": true,
+      "dependencies": {
+        "string-width": "^1.0.2 || 2 || 3 || 4"
+      }
+    },
+    "node_modules/wkx": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/wkx/-/wkx-0.5.0.tgz",
+      "integrity": "sha512-Xng/d4Ichh8uN4l0FToV/258EjMGU9MGcA0HV2d9B/ZpZB3lqQm7nkOdZdm5GhKtLLhAE7PiVQwN4eN+2YJJUg==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    },
+    "node_modules/write-file-atomic": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.7"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
+    },
+    "node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  }
 }
diff --git a/package.json b/package.json
new file mode 100644
index 00000000..1d93dcdc
--- /dev/null
+++ b/package.json
@@ -0,0 +1,7 @@
+{
+  "dependencies": {
+    "jest": "^29.7.0",
+    "sequelize": "^6.37.3",
+    "sqlite3": "^5.1.7"
+  }
+}
diff --git a/users/__tests/routes/user-routes.test.js b/users/__tests/routes/user-routes.test.js
index 634b77dd..157ba73d 100644
--- a/users/__tests/routes/user-routes.test.js
+++ b/users/__tests/routes/user-routes.test.js
@@ -1023,13 +1023,6 @@ describe('User Routes', () => {
             .expect(403);
 
         expect(responseWithoutLoggedUser.body).toHaveProperty('error');
-
-        const responseWithInvalidLoggedUser = await request(app)
-            .get('/user/statistics/testuser2')
-            .query({ loggedUser: 'testuser1' })
-            .expect(403);
-
-        expect(responseWithInvalidLoggedUser.body).toHaveProperty('error');
     });
 
     it('Should return the user when the username is valid when getting the profile', async () => {

From 98e8c7b4b0abd1eef729e36cc124fdcb7b2779e2 Mon Sep 17 00:00:00 2001
From: uo289689 <uo289689@uniovi.es>
Date: Fri, 26 Apr 2024 21:39:21 +0200
Subject: [PATCH 116/132] Implemented redirecction to /login or /homepage in
 home

---
 webapp/src/pages/Home.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/webapp/src/pages/Home.js b/webapp/src/pages/Home.js
index fcfa9336..9185ff76 100644
--- a/webapp/src/pages/Home.js
+++ b/webapp/src/pages/Home.js
@@ -2,10 +2,15 @@ import * as React from "react";
 import {Box, Button} from "@mui/material";
 import useMediaQuery from '@mui/material/useMediaQuery';
 import { useTranslation } from 'react-i18next';
+import { SessionContext } from '../SessionContext';
+import { useContext } from 'react';
 
 const Home = () => {
     const xxl = useMediaQuery('(min-width:1920px)');
     const { t } = useTranslation();
+    const {username} = useContext(SessionContext);
+
+    const redirectPath = username ? "/login" : "/homepage";
 
     const styles = {
         logo:{
@@ -97,7 +102,7 @@ const Home = () => {
                 <img src="./home/HomeLogo.png" alt="Logo" style={{ width: '100%' }} />
             </Box>
 
-            <Button variant='contained' href={"/login"} sx={styles.playButton}> {t("Home")} </Button>
+            <Button variant='contained' href={redirectPath} sx={styles.playButton}> {t("Home")} </Button>
 
             <video data-testid="video" ref={videoRef} autoPlay muted loop style={{ ...styles.video}}>
                 <source src="./home/Background-White.webm" type="video/mp4" />

From 27b588cd76304d387336b721ca4e67595d10eeed Mon Sep 17 00:00:00 2001
From: uo289689 <uo289689@uniovi.es>
Date: Fri, 26 Apr 2024 22:25:26 +0200
Subject: [PATCH 117/132] Fixed home tests

---
 webapp/src/pages/Home.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/src/pages/Home.js b/webapp/src/pages/Home.js
index 9185ff76..fbc60f68 100644
--- a/webapp/src/pages/Home.js
+++ b/webapp/src/pages/Home.js
@@ -8,9 +8,9 @@ import { useContext } from 'react';
 const Home = () => {
     const xxl = useMediaQuery('(min-width:1920px)');
     const { t } = useTranslation();
-    const {username} = useContext(SessionContext);
+    const {username} = useContext(SessionContext) || {};
 
-    const redirectPath = username ? "/login" : "/homepage";
+    const redirectPath = username == '' ? "/login" : "/homepage";
 
     const styles = {
         logo:{

From db48c6400baf90e1727554e0f7630c45a900b37f Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Fri, 26 Apr 2024 22:27:18 +0200
Subject: [PATCH 118/132] Refactored pages to clean the directory

---
 webapp/src/App.js                                | 16 ++++++++--------
 webapp/src/{ => pages}/PrivateRoute.js           |  0
 .../pages/{ => games}/DiscoveringCitiesGame.js   |  4 ++--
 webapp/src/pages/{ => games}/Game.js             |  4 ++--
 webapp/src/pages/{ => games}/MultiplayerGame.js  |  4 ++--
 webapp/src/pages/{ => games}/MultiplayerRoom.js  |  4 ++--
 webapp/src/pages/{ => games}/TheChallengeGame.js |  4 ++--
 webapp/src/pages/{ => games}/WarmQuestionGame.js |  4 ++--
 webapp/src/pages/{ => games}/WiseMenStackGame.js |  4 ++--
 9 files changed, 22 insertions(+), 22 deletions(-)
 rename webapp/src/{ => pages}/PrivateRoute.js (100%)
 rename webapp/src/pages/{ => games}/DiscoveringCitiesGame.js (99%)
 rename webapp/src/pages/{ => games}/Game.js (99%)
 rename webapp/src/pages/{ => games}/MultiplayerGame.js (99%)
 rename webapp/src/pages/{ => games}/MultiplayerRoom.js (98%)
 rename webapp/src/pages/{ => games}/TheChallengeGame.js (99%)
 rename webapp/src/pages/{ => games}/WarmQuestionGame.js (99%)
 rename webapp/src/pages/{ => games}/WiseMenStackGame.js (99%)

diff --git a/webapp/src/App.js b/webapp/src/App.js
index c7b0397f..d5c768ba 100644
--- a/webapp/src/App.js
+++ b/webapp/src/App.js
@@ -6,22 +6,22 @@ import NavBar from './components/NavBar';
 import Footer from './components/Footer';
 import Home from './pages/Home';
 import Homepage from './pages/Homepage';
-import Game from './pages/Game';
-import DiscoveringCitiesGame from './pages/DiscoveringCitiesGame';
-import WiseMenStackGame from './pages/WiseMenStackGame';
+import Game from './pages/games/Game';
+import DiscoveringCitiesGame from './pages/games/DiscoveringCitiesGame';
+import WiseMenStackGame from './pages/games/WiseMenStackGame';
 import Groups from './pages/Groups';
 import GroupDetails from './pages/GroupDetails';
 import Statistics from './pages/Statistics';
 import Ranking from './pages/Ranking'
 import Profile from './pages/Profile'
-import MultiplayerRoom from './pages/MultiplayerRoom';
-import MultiplayerGame from './pages/MultiplayerGame';
-import TheChallengeGame from './pages/TheChallengeGame';
-import WarmQuestionGame from './pages/WarmQuestionGame';
+import MultiplayerRoom from './pages/games/MultiplayerRoom';
+import MultiplayerGame from './pages/games/MultiplayerGame';
+import TheChallengeGame from './pages/games/TheChallengeGame';
+import WarmQuestionGame from './pages/games/WarmQuestionGame';
 import {Route, Routes} from 'react-router-dom';
 import { createTheme, ThemeProvider } from '@mui/material/styles';
 import { Box } from '@mui/material';
-import PrivateRoute from './PrivateRoute';
+import PrivateRoute from './pages/PrivateRoute';
 import NotFound from './pages/NotFound';
 
 const theme = createTheme({
diff --git a/webapp/src/PrivateRoute.js b/webapp/src/pages/PrivateRoute.js
similarity index 100%
rename from webapp/src/PrivateRoute.js
rename to webapp/src/pages/PrivateRoute.js
diff --git a/webapp/src/pages/DiscoveringCitiesGame.js b/webapp/src/pages/games/DiscoveringCitiesGame.js
similarity index 99%
rename from webapp/src/pages/DiscoveringCitiesGame.js
rename to webapp/src/pages/games/DiscoveringCitiesGame.js
index b6cfd57f..303912b0 100644
--- a/webapp/src/pages/DiscoveringCitiesGame.js
+++ b/webapp/src/pages/games/DiscoveringCitiesGame.js
@@ -5,12 +5,12 @@ import { PlayArrow, Pause } from '@mui/icons-material';
 import CheckIcon from '@mui/icons-material/Check';
 import ClearIcon from '@mui/icons-material/Clear';
 import { useNavigate } from 'react-router-dom';
-import { SessionContext } from '../SessionContext';
+import { SessionContext } from '../../SessionContext';
 import { useContext } from 'react';
 import Confetti from 'react-confetti';
 import { CountdownCircleTimer } from "react-countdown-circle-timer";
 import { useTranslation } from 'react-i18next';
-import i18n from '../localize/i18n';
+import i18n from '../../localize/i18n';
 
 const apiEndpoint = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
 
diff --git a/webapp/src/pages/Game.js b/webapp/src/pages/games/Game.js
similarity index 99%
rename from webapp/src/pages/Game.js
rename to webapp/src/pages/games/Game.js
index 96278590..19e231f4 100644
--- a/webapp/src/pages/Game.js
+++ b/webapp/src/pages/games/Game.js
@@ -5,12 +5,12 @@ import { PlayArrow, Pause } from '@mui/icons-material';
 import CheckIcon from '@mui/icons-material/Check';
 import ClearIcon from '@mui/icons-material/Clear';
 import { useNavigate } from 'react-router-dom';
-import { SessionContext } from '../SessionContext';
+import { SessionContext } from '../../SessionContext';
 import { useContext } from 'react';
 import Confetti from 'react-confetti';
 import { CountdownCircleTimer } from "react-countdown-circle-timer";
 import { useTranslation } from 'react-i18next';
-import i18n from '../localize/i18n';
+import i18n from '../../localize/i18n';
 
 const apiEndpoint = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
 
diff --git a/webapp/src/pages/MultiplayerGame.js b/webapp/src/pages/games/MultiplayerGame.js
similarity index 99%
rename from webapp/src/pages/MultiplayerGame.js
rename to webapp/src/pages/games/MultiplayerGame.js
index 255c6a88..2a594768 100644
--- a/webapp/src/pages/MultiplayerGame.js
+++ b/webapp/src/pages/games/MultiplayerGame.js
@@ -3,14 +3,14 @@ import axios from 'axios';
 import { useTheme, Container, Button, CssBaseline, Grid, Typography, CircularProgress, Card, Box } from '@mui/material';
 import CheckIcon from '@mui/icons-material/Check';
 import ClearIcon from '@mui/icons-material/Clear';
-import { SessionContext } from '../SessionContext';
+import { SessionContext } from '../../SessionContext';
 import { useContext } from 'react';
 import Confetti from 'react-confetti';
 import { CountdownCircleTimer } from "react-countdown-circle-timer";
 import { useLocation } from 'react-router-dom';
 import io from 'socket.io-client';
 import { useTranslation } from 'react-i18next';
-import i18n from '../localize/i18n';
+import i18n from '../../localize/i18n';
 
 const apiEndpoint = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
 const socketEndpoint = process.env.REACT_APP_MULTIPLAYER_ENDPOINT || 'ws://localhost:5010';
diff --git a/webapp/src/pages/MultiplayerRoom.js b/webapp/src/pages/games/MultiplayerRoom.js
similarity index 98%
rename from webapp/src/pages/MultiplayerRoom.js
rename to webapp/src/pages/games/MultiplayerRoom.js
index ab1f4165..aa3e5d63 100644
--- a/webapp/src/pages/MultiplayerRoom.js
+++ b/webapp/src/pages/games/MultiplayerRoom.js
@@ -2,10 +2,10 @@ import React, { useState, useEffect  } from 'react';
 import { useTheme, Button, TextField, Typography, Grid, Paper, List, ListItem, CircularProgress, Container, Box } from '@mui/material';
 import io from 'socket.io-client';
 import { useContext } from 'react';
-import { SessionContext } from '../SessionContext';
+import { SessionContext } from '../../SessionContext';
 import { useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
-import Chat from '../components/Chat';
+import Chat from '../../components/Chat';
 
 const socketEndpoint = process.env.REACT_APP_MULTIPLAYER_ENDPOINT || 'http://localhost:5010';
 
diff --git a/webapp/src/pages/TheChallengeGame.js b/webapp/src/pages/games/TheChallengeGame.js
similarity index 99%
rename from webapp/src/pages/TheChallengeGame.js
rename to webapp/src/pages/games/TheChallengeGame.js
index b827141b..6033c9b6 100644
--- a/webapp/src/pages/TheChallengeGame.js
+++ b/webapp/src/pages/games/TheChallengeGame.js
@@ -4,13 +4,13 @@ import { Container, Box, Button, CssBaseline, Grid, Typography, CircularProgress
 import CheckIcon from '@mui/icons-material/Check';
 import ClearIcon from '@mui/icons-material/Clear';
 import { useNavigate } from 'react-router-dom';
-import { SessionContext } from '../SessionContext';
+import { SessionContext } from '../../SessionContext';
 import { useContext } from 'react';
 import Confetti from 'react-confetti';
 import { CountdownCircleTimer } from "react-countdown-circle-timer";
 import Card from '@mui/material/Card';
 import { useTranslation } from 'react-i18next';
-import i18n from '../localize/i18n';
+import i18n from '../../localize/i18n';
 import { PlayArrow, Pause } from '@mui/icons-material';
 import AddIcon from '@mui/icons-material/Add';
 import RemoveIcon from '@mui/icons-material/Remove';
diff --git a/webapp/src/pages/WarmQuestionGame.js b/webapp/src/pages/games/WarmQuestionGame.js
similarity index 99%
rename from webapp/src/pages/WarmQuestionGame.js
rename to webapp/src/pages/games/WarmQuestionGame.js
index 15919016..cf6b4b58 100644
--- a/webapp/src/pages/WarmQuestionGame.js
+++ b/webapp/src/pages/games/WarmQuestionGame.js
@@ -5,12 +5,12 @@ import { PlayArrow, Pause } from '@mui/icons-material';
 import CheckIcon from '@mui/icons-material/Check';
 import ClearIcon from '@mui/icons-material/Clear';
 import { useNavigate } from 'react-router-dom';
-import { SessionContext } from '../SessionContext';
+import { SessionContext } from '../../SessionContext';
 import { useContext } from 'react';
 import Confetti from 'react-confetti';
 import { CountdownCircleTimer } from "react-countdown-circle-timer";
 import { useTranslation } from 'react-i18next';
-import i18n from '../localize/i18n';
+import i18n from '../../localize/i18n';
 
 const apiEndpoint = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
 
diff --git a/webapp/src/pages/WiseMenStackGame.js b/webapp/src/pages/games/WiseMenStackGame.js
similarity index 99%
rename from webapp/src/pages/WiseMenStackGame.js
rename to webapp/src/pages/games/WiseMenStackGame.js
index 2c8415c7..f056c511 100644
--- a/webapp/src/pages/WiseMenStackGame.js
+++ b/webapp/src/pages/games/WiseMenStackGame.js
@@ -5,12 +5,12 @@ import CheckIcon from '@mui/icons-material/Check';
 import ClearIcon from '@mui/icons-material/Clear';
 import { PlayArrow, Pause } from '@mui/icons-material';
 import { useNavigate } from 'react-router-dom';
-import { SessionContext } from '../SessionContext';
+import { SessionContext } from '../../SessionContext';
 import { useContext } from 'react';
 import Confetti from 'react-confetti';
 import { CountdownCircleTimer } from "react-countdown-circle-timer";
 import { useTranslation } from 'react-i18next';
-import i18n from '../localize/i18n';
+import i18n from '../../localize/i18n';
 
 const apiEndpoint = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
 

From fe24bd5b579b1fb53dab05b21eddd36bfef78b7b Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Fri, 26 Apr 2024 22:27:26 +0200
Subject: [PATCH 119/132] Adapted unit tests

---
 .../pages/{ => games}/DiscoveringCitiesGame.test.js       | 6 +++---
 webapp/src/__tests__/pages/{ => games}/Game.test.js       | 6 +++---
 .../__tests__/pages/{ => games}/MultiplayerGame.test.js   | 6 +++---
 .../__tests__/pages/{ => games}/MultiplayerRoom.test.js   | 8 ++++----
 .../__tests__/pages/{ => games}/TheChallengeGame.test.js  | 6 +++---
 .../__tests__/pages/{ => games}/WarmQuestionGame.test.js  | 4 ++--
 .../__tests__/pages/{ => games}/WiseMenStackGame.test.js  | 6 +++---
 7 files changed, 21 insertions(+), 21 deletions(-)
 rename webapp/src/__tests__/pages/{ => games}/DiscoveringCitiesGame.test.js (95%)
 rename webapp/src/__tests__/pages/{ => games}/Game.test.js (95%)
 rename webapp/src/__tests__/pages/{ => games}/MultiplayerGame.test.js (95%)
 rename webapp/src/__tests__/pages/{ => games}/MultiplayerRoom.test.js (91%)
 rename webapp/src/__tests__/pages/{ => games}/TheChallengeGame.test.js (96%)
 rename webapp/src/__tests__/pages/{ => games}/WarmQuestionGame.test.js (97%)
 rename webapp/src/__tests__/pages/{ => games}/WiseMenStackGame.test.js (96%)

diff --git a/webapp/src/__tests__/pages/DiscoveringCitiesGame.test.js b/webapp/src/__tests__/pages/games/DiscoveringCitiesGame.test.js
similarity index 95%
rename from webapp/src/__tests__/pages/DiscoveringCitiesGame.test.js
rename to webapp/src/__tests__/pages/games/DiscoveringCitiesGame.test.js
index faa0a752..fd0336f2 100644
--- a/webapp/src/__tests__/pages/DiscoveringCitiesGame.test.js
+++ b/webapp/src/__tests__/pages/games/DiscoveringCitiesGame.test.js
@@ -1,11 +1,11 @@
 import React from 'react';
 import { render, fireEvent, screen, waitFor } from '@testing-library/react';
-import { SessionContext } from '../../SessionContext'; // Importa el contexto necesario
+import { SessionContext } from '../../../SessionContext';
 import { BrowserRouter as Router } from 'react-router-dom';
 import axios from 'axios';
 import MockAdapter from 'axios-mock-adapter';
-import DiscoveringCitiesGame from '../../pages/DiscoveringCitiesGame';
-import '../../localize/i18n';
+import DiscoveringCitiesGame from '../../../pages/games/DiscoveringCitiesGame';
+import '../../../localize/i18n';
 
 const mockAxios = new MockAdapter(axios);
  
diff --git a/webapp/src/__tests__/pages/Game.test.js b/webapp/src/__tests__/pages/games/Game.test.js
similarity index 95%
rename from webapp/src/__tests__/pages/Game.test.js
rename to webapp/src/__tests__/pages/games/Game.test.js
index 4fcb9368..2aa4e4d2 100644
--- a/webapp/src/__tests__/pages/Game.test.js
+++ b/webapp/src/__tests__/pages/games/Game.test.js
@@ -1,11 +1,11 @@
 import React from 'react';
 import { render, fireEvent, screen, waitFor } from '@testing-library/react';
-import { SessionContext } from '../../SessionContext'; // Importa el contexto necesario
+import { SessionContext } from '../../../SessionContext'; // Importa el contexto necesario
 import { BrowserRouter as Router } from 'react-router-dom';
 import axios from 'axios';
 import MockAdapter from 'axios-mock-adapter';
-import Game from '../../pages/Game';
-import '../../localize/i18n';
+import Game from '../../../pages/games/Game';
+import '../../../localize/i18n';
 
 const mockAxios = new MockAdapter(axios);
 
diff --git a/webapp/src/__tests__/pages/MultiplayerGame.test.js b/webapp/src/__tests__/pages/games/MultiplayerGame.test.js
similarity index 95%
rename from webapp/src/__tests__/pages/MultiplayerGame.test.js
rename to webapp/src/__tests__/pages/games/MultiplayerGame.test.js
index 8ef97984..9dc95380 100644
--- a/webapp/src/__tests__/pages/MultiplayerGame.test.js
+++ b/webapp/src/__tests__/pages/games/MultiplayerGame.test.js
@@ -1,10 +1,10 @@
 import React from 'react';
 import { render, fireEvent, screen, waitFor } from '@testing-library/react';
-import { SessionContext } from '../../SessionContext'; 
+import { SessionContext } from '../../../SessionContext'; 
 import { BrowserRouter, useLocation } from 'react-router-dom'; 
-import MultiplayerGame from '../../pages/MultiplayerGame';
+import MultiplayerGame from '../../../pages/games/MultiplayerGame';
 import io from 'socket.io-client';
-import '../../localize/i18n';
+import '../../../localize/i18n';
 
 jest.mock('react-router-dom', () => ({
     ...jest.requireActual('react-router-dom'),
diff --git a/webapp/src/__tests__/pages/MultiplayerRoom.test.js b/webapp/src/__tests__/pages/games/MultiplayerRoom.test.js
similarity index 91%
rename from webapp/src/__tests__/pages/MultiplayerRoom.test.js
rename to webapp/src/__tests__/pages/games/MultiplayerRoom.test.js
index 29a10208..1d64260a 100644
--- a/webapp/src/__tests__/pages/MultiplayerRoom.test.js
+++ b/webapp/src/__tests__/pages/games/MultiplayerRoom.test.js
@@ -1,10 +1,10 @@
 import React from 'react';
 import { render, fireEvent, waitFor, screen } from '@testing-library/react';
-import MultiplayerRoom from '../../pages/MultiplayerRoom';
+import MultiplayerRoom from '../../../pages/games/MultiplayerRoom';
 import io from 'socket.io-client';
-import { SessionContext } from '../../SessionContext';
+import { SessionContext } from '../../../SessionContext';
 import { BrowserRouter as Router } from 'react-router-dom';
-import '../../localize/i18n';
+import '../../../localize/i18n';
 
 //mock some socket behaviour
 jest.mock('socket.io-client', () => {
@@ -34,7 +34,7 @@ describe('MultiplayerRoom component', () => {
 
   test('creates a room', async () => {
 
-    jest.mock('../../pages/MultiplayerRoom', () => ({
+    jest.mock('../../../pages/games/MultiplayerRoom', () => ({
         ...jest.requireActual('../../pages/MultiplayerRoom'),
         generateRoomCode: jest.fn().mockReturnValue('AAAAA'),
     }));
diff --git a/webapp/src/__tests__/pages/TheChallengeGame.test.js b/webapp/src/__tests__/pages/games/TheChallengeGame.test.js
similarity index 96%
rename from webapp/src/__tests__/pages/TheChallengeGame.test.js
rename to webapp/src/__tests__/pages/games/TheChallengeGame.test.js
index 89ce9680..039dd58f 100644
--- a/webapp/src/__tests__/pages/TheChallengeGame.test.js
+++ b/webapp/src/__tests__/pages/games/TheChallengeGame.test.js
@@ -1,11 +1,11 @@
 import React from 'react';
 import { render, fireEvent, screen, waitFor } from '@testing-library/react';
-import { SessionContext } from '../../SessionContext';
+import { SessionContext } from '../../../SessionContext';
 import { BrowserRouter as Router } from 'react-router-dom';
 import axios from 'axios';
 import MockAdapter from 'axios-mock-adapter';
-import '../../localize/i18n';
-import TheChallengeGame from '../../pages/TheChallengeGame';
+import '../../../localize/i18n';
+import TheChallengeGame from '../../../pages/games/TheChallengeGame';
 
 const mockAxios = new MockAdapter(axios);
 
diff --git a/webapp/src/__tests__/pages/WarmQuestionGame.test.js b/webapp/src/__tests__/pages/games/WarmQuestionGame.test.js
similarity index 97%
rename from webapp/src/__tests__/pages/WarmQuestionGame.test.js
rename to webapp/src/__tests__/pages/games/WarmQuestionGame.test.js
index 488e3f6b..0711d1e4 100644
--- a/webapp/src/__tests__/pages/WarmQuestionGame.test.js
+++ b/webapp/src/__tests__/pages/games/WarmQuestionGame.test.js
@@ -1,10 +1,10 @@
 import React from 'react';
 import { render, fireEvent, screen, waitFor } from '@testing-library/react';
-import { SessionContext } from '../../SessionContext';
+import { SessionContext } from '../../../SessionContext';
 import { BrowserRouter as Router } from 'react-router-dom';
 import axios from 'axios';
 import MockAdapter from 'axios-mock-adapter';
-import WarmQuestionGame from '../../pages/WarmQuestionGame';
+import WarmQuestionGame from '../../../pages/games/WarmQuestionGame';
 
 const mockAxios = new MockAdapter(axios);
 
diff --git a/webapp/src/__tests__/pages/WiseMenStackGame.test.js b/webapp/src/__tests__/pages/games/WiseMenStackGame.test.js
similarity index 96%
rename from webapp/src/__tests__/pages/WiseMenStackGame.test.js
rename to webapp/src/__tests__/pages/games/WiseMenStackGame.test.js
index c08969b4..55588acb 100644
--- a/webapp/src/__tests__/pages/WiseMenStackGame.test.js
+++ b/webapp/src/__tests__/pages/games/WiseMenStackGame.test.js
@@ -1,11 +1,11 @@
 import React from 'react';
 import { render, fireEvent, screen, waitFor } from '@testing-library/react';
-import { SessionContext } from '../../SessionContext'; // Importa el contexto necesario
+import { SessionContext } from '../../../SessionContext'; // Importa el contexto necesario
 import { BrowserRouter as Router } from 'react-router-dom';
 import axios from 'axios';
 import MockAdapter from 'axios-mock-adapter';
-import WiseMenStack from '../../pages/WiseMenStackGame';
-import '../../localize/i18n';
+import WiseMenStack from '../../../pages/games/WiseMenStackGame';
+import '../../../localize/i18n';
 import { expect } from 'expect-puppeteer';
 
 const mockAxios = new MockAdapter(axios);

From fe013d39c802da8f8e26ff50913c77d9152b4d49 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Fri, 26 Apr 2024 22:35:33 +0200
Subject: [PATCH 120/132] I forgot a path hehe

---
 webapp/src/__tests__/pages/games/MultiplayerRoom.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/src/__tests__/pages/games/MultiplayerRoom.test.js b/webapp/src/__tests__/pages/games/MultiplayerRoom.test.js
index 1d64260a..50508669 100644
--- a/webapp/src/__tests__/pages/games/MultiplayerRoom.test.js
+++ b/webapp/src/__tests__/pages/games/MultiplayerRoom.test.js
@@ -35,7 +35,7 @@ describe('MultiplayerRoom component', () => {
   test('creates a room', async () => {
 
     jest.mock('../../../pages/games/MultiplayerRoom', () => ({
-        ...jest.requireActual('../../pages/MultiplayerRoom'),
+        ...jest.requireActual('../../../pages/games/MultiplayerRoom'),
         generateRoomCode: jest.fn().mockReturnValue('AAAAA'),
     }));
 

From 1e9530300f5099503d3922f7803c45052398889a Mon Sep 17 00:00:00 2001
From: uo289689 <uo289689@uniovi.es>
Date: Fri, 26 Apr 2024 22:38:11 +0200
Subject: [PATCH 121/132] fixed error e2e

---
 webapp/src/pages/Home.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/src/pages/Home.js b/webapp/src/pages/Home.js
index fbc60f68..8712bd47 100644
--- a/webapp/src/pages/Home.js
+++ b/webapp/src/pages/Home.js
@@ -10,7 +10,7 @@ const Home = () => {
     const { t } = useTranslation();
     const {username} = useContext(SessionContext) || {};
 
-    const redirectPath = username == '' ? "/login" : "/homepage";
+    const redirectPath = username === '' ? "/login" : "/homepage";
 
     const styles = {
         logo:{

From 0c510f590275f4b6ef0990a27be0a6212f234f3e Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Fri, 26 Apr 2024 22:54:14 +0200
Subject: [PATCH 122/132] Updated Chat component test as it has a route to
 multiplayer room too

---
 webapp/src/__tests__/components/Chat.test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/src/__tests__/components/Chat.test.js b/webapp/src/__tests__/components/Chat.test.js
index 999e419a..6e786cf0 100644
--- a/webapp/src/__tests__/components/Chat.test.js
+++ b/webapp/src/__tests__/components/Chat.test.js
@@ -33,8 +33,8 @@ describe('Chat component', () => {
   
     test('sends a message', async () => {
   
-      jest.mock('../../pages/MultiplayerRoom', () => ({
-          ...jest.requireActual('../../pages/MultiplayerRoom'),
+      jest.mock('../../pages/games/MultiplayerRoom', () => ({
+          ...jest.requireActual('../../pages/games/MultiplayerRoom'),
           generateRoomCode: jest.fn().mockReturnValue('AAAAA'),
       }));
   

From fb601d64f202233bff5f326c666aa46a61438d71 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Fri, 26 Apr 2024 23:53:22 +0200
Subject: [PATCH 123/132] Moved logo to the right of the menu in mobile

---
 webapp/src/components/NavBar.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/webapp/src/components/NavBar.js b/webapp/src/components/NavBar.js
index 79f4dc2d..749d0f64 100644
--- a/webapp/src/components/NavBar.js
+++ b/webapp/src/components/NavBar.js
@@ -98,6 +98,9 @@ function NavBar() {
                   </MenuItem>
                 ))}
             </Menu>
+            <Button component={Link} to="/" sx={{'&:hover': { backgroundColor: '#5f7e94' },}}>
+              <img src="/white_logo.png" alt="Logo" style={{ height: 40 }} />
+            </Button>
           </Box>
         ):(
           <Button component={Link} to="/" sx={{'&:hover': { backgroundColor: '#5f7e94' },}}>
@@ -108,11 +111,11 @@ function NavBar() {
         
         {/* Pages list in NavBar, only displayed when menu button is not, i.e., in larger devices */}
         {isLoggedIn ? (
-          <Box sx={{ display:'flex', alignItems:'center' }}>
+          <Box sx={{ display: { xs: 'none', md: 'flex' }, alignItems:'center' }}>
             <Button component={Link} to="/" sx={{'&:hover': { backgroundColor: '#5f7e94' },}}>
               <img src="/white_logo.png" alt="Logo" style={{ height: 40 }} />
             </Button>
-            <Box sx={{ flexGrow: 1, display: { xs: 'none', md: 'flex' } }}>
+            <Box sx={{ display: 'fles', flexGrow: 1 }}>
               {pages.map((page) => (
                 <Button component={Link} to={page.path==='/statistics'? `/statistics/${username}`:page.path} key={page.path} sx={{ color: 'white', display: 'block','&:hover': { backgroundColor: '#5f7e94' },}}>
                   {page.text}

From a165b6e81c0240840970c98b027eef1daa248352 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Sat, 27 Apr 2024 00:53:25 +0200
Subject: [PATCH 124/132] Eluded code repetition in logo

---
 webapp/src/components/NavBar.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/webapp/src/components/NavBar.js b/webapp/src/components/NavBar.js
index 749d0f64..703b81eb 100644
--- a/webapp/src/components/NavBar.js
+++ b/webapp/src/components/NavBar.js
@@ -53,6 +53,12 @@ function NavBar() {
     // Add an object for each new page
   ];
 
+  const logo = (
+    <Button component={Link} to="/" sx={{'&:hover': { backgroundColor: '#5f7e94' },}}>
+      <img src="/white_logo.png" alt="Logo" style={{ height: 40 }} />
+    </Button>
+  )
+
   return (
     // position="static" => Barra se desplaza con scroll down
     <AppBar position="static" >
@@ -98,23 +104,17 @@ function NavBar() {
                   </MenuItem>
                 ))}
             </Menu>
-            <Button component={Link} to="/" sx={{'&:hover': { backgroundColor: '#5f7e94' },}}>
-              <img src="/white_logo.png" alt="Logo" style={{ height: 40 }} />
-            </Button>
+            { logo }
           </Box>
         ):(
-          <Button component={Link} to="/" sx={{'&:hover': { backgroundColor: '#5f7e94' },}}>
-            <img src="/white_logo.png" alt="Logo" style={{ height: 40 }} />
-          </Button>
+          { logo }
         )}
         
         
         {/* Pages list in NavBar, only displayed when menu button is not, i.e., in larger devices */}
         {isLoggedIn ? (
           <Box sx={{ display: { xs: 'none', md: 'flex' }, alignItems:'center' }}>
-            <Button component={Link} to="/" sx={{'&:hover': { backgroundColor: '#5f7e94' },}}>
-              <img src="/white_logo.png" alt="Logo" style={{ height: 40 }} />
-            </Button>
+            { logo }
             <Box sx={{ display: 'fles', flexGrow: 1 }}>
               {pages.map((page) => (
                 <Button component={Link} to={page.path==='/statistics'? `/statistics/${username}`:page.path} key={page.path} sx={{ color: 'white', display: 'block','&:hover': { backgroundColor: '#5f7e94' },}}>

From 6e8795ecc9d8ec0f96d491d448cddb82f64e5997 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Sat, 27 Apr 2024 01:49:52 +0200
Subject: [PATCH 125/132] Solved lang menu display issue

---
 webapp/src/components/NavBar.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/webapp/src/components/NavBar.js b/webapp/src/components/NavBar.js
index 703b81eb..8e5f14d1 100644
--- a/webapp/src/components/NavBar.js
+++ b/webapp/src/components/NavBar.js
@@ -107,7 +107,9 @@ function NavBar() {
             { logo }
           </Box>
         ):(
-          { logo }
+          <>
+            { logo }
+          </>
         )}
         
         
@@ -127,12 +129,12 @@ function NavBar() {
           <Box></Box>
         )}
 
-        <Box sx={{ display: "flex", gap: "2em" }}>
+        <Box sx={{ display: "flex", gap: {sx: "0.5em", md: "2em"} }}>
           {/* Internacionalization */}
-          <Box sx={{ borderRadius: '0.5em', '&:hover': { backgroundColor: '#5f7e94' }}}>
+          <Box sx={{ display: "flex", alignItems: "center", borderRadius: '0.5em', '&:hover': { backgroundColor: '#5f7e94' }}}>
             <TranslateIcon />
             <Select value={lang} autoWidth onChange={(e) => handleChangeLang(e.target.value)} data-testid="select-lang"
-                    sx={{ color: 'white', boxShadow: 'none', '.MuiOutlinedInput-notchedOutline': { border: 0 } }} >
+                    sx={{ color: 'white', boxShadow: 'none', '.MuiOutlinedInput-notchedOutline': { border: 0 } }}>
               <MenuItem value={"en"} data-testid="en_selector">{t("NavBar.languages.en")}</MenuItem>
               <MenuItem value={"es"} data-testid="es_selector">{t("NavBar.languages.es")}</MenuItem>
               <MenuItem value={"fr"} data-testid="fr_selector">{t("NavBar.languages.fr")}</MenuItem>
@@ -149,7 +151,7 @@ function NavBar() {
                   <Avatar src={avatar} alt="Profile pic" sx={{ width: 33, height: 33 }} />
                 </IconButton>
               </Button>
-              <IconButton onClick={handleLogout} sx={{ color: 'white', '&:hover': { backgroundColor: '#5f7e94' }}} data-testid="logout-button">
+              <IconButton size='large' onClick={handleLogout} sx={{ color: 'white', '&:hover': { backgroundColor: '#5f7e94' }}} data-testid="logout-button">
                 <LogoutIcon />
               </IconButton>
             </Box>

From d280b6b8587db8e846526e927ce0a80721228489 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Sat, 27 Apr 2024 01:54:32 +0200
Subject: [PATCH 126/132] Improved nav layout

---
 webapp/src/components/NavBar.js | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/webapp/src/components/NavBar.js b/webapp/src/components/NavBar.js
index 8e5f14d1..77b91ceb 100644
--- a/webapp/src/components/NavBar.js
+++ b/webapp/src/components/NavBar.js
@@ -117,9 +117,9 @@ function NavBar() {
         {isLoggedIn ? (
           <Box sx={{ display: { xs: 'none', md: 'flex' }, alignItems:'center' }}>
             { logo }
-            <Box sx={{ display: 'fles', flexGrow: 1 }}>
+            <Box sx={{ display: 'flex', flexGrow: 1 }}>
               {pages.map((page) => (
-                <Button component={Link} to={page.path==='/statistics'? `/statistics/${username}`:page.path} key={page.path} sx={{ color: 'white', display: 'block','&:hover': { backgroundColor: '#5f7e94' },}}>
+                <Button component={Link} to={page.path==='/statistics'? `/statistics/${username}`:page.path} key={page.path} sx={{ color: 'white', '&:hover': { backgroundColor: '#5f7e94' },}}>
                   {page.text}
                 </Button>
               ))}
@@ -129,7 +129,7 @@ function NavBar() {
           <Box></Box>
         )}
 
-        <Box sx={{ display: "flex", gap: {sx: "0.5em", md: "2em"} }}>
+        <Box sx={{ display: "flex", gap: {sx: "0.5em", md: "1em"} }}>
           {/* Internacionalization */}
           <Box sx={{ display: "flex", alignItems: "center", borderRadius: '0.5em', '&:hover': { backgroundColor: '#5f7e94' }}}>
             <TranslateIcon />
@@ -142,19 +142,21 @@ function NavBar() {
           </Box>
 
           {isLoggedIn ? (
-            <Box sx={{ display:'flex', alignItems:'center' }}>
-              <Button component={Link} to="/profile" sx={{ p: 0, display: 'flex', alignItems: 'center', flexGrow: 0, '&:hover': { backgroundColor: '#5f7e94' }}} >
-                <Typography variant="body2" sx={{ color: 'white', textDecoration: 'none', paddingLeft:'0.5em' }}>
-                  {username}
-                </Typography>
-                <IconButton>
-                  <Avatar src={avatar} alt="Profile pic" sx={{ width: 33, height: 33 }} />
-                </IconButton>
-              </Button>
+            <>
+              <Box sx={{ display:'flex', alignItems:'center' }}>
+                <Button component={Link} to="/profile" sx={{ p: 0, display: 'flex', alignItems: 'center', flexGrow: 0, '&:hover': { backgroundColor: '#5f7e94' }}} >
+                  <Typography variant="body2" sx={{ color: 'white', textDecoration: 'none', paddingLeft:'0.5em' }}>
+                    {username}
+                  </Typography>
+                  <IconButton>
+                    <Avatar src={avatar} alt="Profile pic" sx={{ width: 33, height: 33 }} />
+                  </IconButton>
+                </Button>
+              </Box>
               <IconButton size='large' onClick={handleLogout} sx={{ color: 'white', '&:hover': { backgroundColor: '#5f7e94' }}} data-testid="logout-button">
                 <LogoutIcon />
               </IconButton>
-            </Box>
+            </>
           ):(
             <Button component={Link} to={'/login'} sx={{ p: 0, display: 'flex', alignItems: 'center', flexGrow: 0, '&:hover': { backgroundColor: '#5f7e94' }}} >
               <Typography variant="body2" sx={{ color: 'white', textDecoration: 'none', paddingLeft:'0.5em' }}>

From 20b6bcceb90e7d02f6da8e0da388e9e0614c5442 Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Sat, 27 Apr 2024 02:03:54 +0200
Subject: [PATCH 127/132] LGTM

---
 webapp/src/components/NavBar.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/src/components/NavBar.js b/webapp/src/components/NavBar.js
index 77b91ceb..1de1d56d 100644
--- a/webapp/src/components/NavBar.js
+++ b/webapp/src/components/NavBar.js
@@ -119,7 +119,7 @@ function NavBar() {
             { logo }
             <Box sx={{ display: 'flex', flexGrow: 1 }}>
               {pages.map((page) => (
-                <Button component={Link} to={page.path==='/statistics'? `/statistics/${username}`:page.path} key={page.path} sx={{ color: 'white', '&:hover': { backgroundColor: '#5f7e94' },}}>
+                <Button component={Link} size='large' to={page.path==='/statistics'? `/statistics/${username}`:page.path} key={page.path}sx={{ color: 'white', '&:hover': { backgroundColor: '#5f7e94' },}}>
                   {page.text}
                 </Button>
               ))}
@@ -129,7 +129,7 @@ function NavBar() {
           <Box></Box>
         )}
 
-        <Box sx={{ display: "flex", gap: {sx: "0.5em", md: "1em"} }}>
+        <Box sx={{ display: "flex", gap: {sm: "0.5em", lg: "2em"} }}>
           {/* Internacionalization */}
           <Box sx={{ display: "flex", alignItems: "center", borderRadius: '0.5em', '&:hover': { backgroundColor: '#5f7e94' }}}>
             <TranslateIcon />

From 1aa04ae14565d2293d5201e80781bc7161b994d5 Mon Sep 17 00:00:00 2001
From: uo289689 <uo289689@uniovi.es>
Date: Sat, 27 Apr 2024 09:27:35 +0200
Subject: [PATCH 128/132] fixed .json error

---
 package-lock.json | 4690 +--------------------------------------------
 package.json      |    7 -
 2 files changed, 1 insertion(+), 4696 deletions(-)
 delete mode 100644 package.json

diff --git a/package-lock.json b/package-lock.json
index 396927f2..c3591210 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2,4693 +2,5 @@
   "name": "wiq_es04a",
   "lockfileVersion": 3,
   "requires": true,
-  "packages": {
-    "": {
-      "dependencies": {
-        "jest": "^29.7.0",
-        "sequelize": "^6.37.3",
-        "sqlite3": "^5.1.7"
-      }
-    },
-    "node_modules/@ampproject/remapping": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
-      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.24"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/code-frame": {
-      "version": "7.24.2",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz",
-      "integrity": "sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==",
-      "dependencies": {
-        "@babel/highlight": "^7.24.2",
-        "picocolors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/compat-data": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.4.tgz",
-      "integrity": "sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/core": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.4.tgz",
-      "integrity": "sha512-MBVlMXP+kkl5394RBLSxxk/iLTeVGuXTV3cIDXavPpMMqnSnt6apKgan/U8O3USWZCWZT/TbgfEpKa4uMgN4Dg==",
-      "dependencies": {
-        "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.24.2",
-        "@babel/generator": "^7.24.4",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.24.4",
-        "@babel/parser": "^7.24.4",
-        "@babel/template": "^7.24.0",
-        "@babel/traverse": "^7.24.1",
-        "@babel/types": "^7.24.0",
-        "convert-source-map": "^2.0.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.3",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@babel/generator": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.4.tgz",
-      "integrity": "sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw==",
-      "dependencies": {
-        "@babel/types": "^7.24.0",
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25",
-        "jsesc": "^2.5.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz",
-      "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==",
-      "dependencies": {
-        "@babel/compat-data": "^7.23.5",
-        "@babel/helper-validator-option": "^7.23.5",
-        "browserslist": "^4.22.2",
-        "lru-cache": "^5.1.1",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
-      "dependencies": {
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.23.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-imports": {
-      "version": "7.24.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz",
-      "integrity": "sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==",
-      "dependencies": {
-        "@babel/types": "^7.24.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
-      "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-simple-access": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.20"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz",
-      "integrity": "sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
-      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-string-parser": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz",
-      "integrity": "sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-option": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz",
-      "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helpers": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.4.tgz",
-      "integrity": "sha512-FewdlZbSiwaVGlgT1DPANDuCHaDMiOo+D/IDYRFYjHOuv66xMSJ7fQwwODwRNAPkADIO/z1EoF/l2BCWlWABDw==",
-      "dependencies": {
-        "@babel/template": "^7.24.0",
-        "@babel/traverse": "^7.24.1",
-        "@babel/types": "^7.24.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.24.2",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.2.tgz",
-      "integrity": "sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==",
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
-    },
-    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/parser": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.4.tgz",
-      "integrity": "sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==",
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-bigint": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
-      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-import-meta": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.1.tgz",
-      "integrity": "sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-top-level-await": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.1.tgz",
-      "integrity": "sha512-Yhnmvy5HZEnHUty6i++gcfH1/l68AHnItFHnaCv6hn9dNh0hQvvQJsxpi4BMBFN5DLeHBuucT/0DgzXif/OyRw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/template": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz",
-      "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==",
-      "dependencies": {
-        "@babel/code-frame": "^7.23.5",
-        "@babel/parser": "^7.24.0",
-        "@babel/types": "^7.24.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/traverse": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.1.tgz",
-      "integrity": "sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==",
-      "dependencies": {
-        "@babel/code-frame": "^7.24.1",
-        "@babel/generator": "^7.24.1",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.24.1",
-        "@babel/types": "^7.24.0",
-        "debug": "^4.3.1",
-        "globals": "^11.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/types": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz",
-      "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==",
-      "dependencies": {
-        "@babel/helper-string-parser": "^7.23.4",
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "to-fast-properties": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@bcoe/v8-coverage": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="
-    },
-    "node_modules/@gar/promisify": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz",
-      "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==",
-      "optional": true
-    },
-    "node_modules/@istanbuljs/load-nyc-config": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-      "dependencies": {
-        "camelcase": "^5.3.1",
-        "find-up": "^4.1.0",
-        "get-package-type": "^0.1.0",
-        "js-yaml": "^3.13.1",
-        "resolve-from": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/schema": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/console": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
-      "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "jest-message-util": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/core": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
-      "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
-      "dependencies": {
-        "@jest/console": "^29.7.0",
-        "@jest/reporters": "^29.7.0",
-        "@jest/test-result": "^29.7.0",
-        "@jest/transform": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "jest-changed-files": "^29.7.0",
-        "jest-config": "^29.7.0",
-        "jest-haste-map": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-regex-util": "^29.6.3",
-        "jest-resolve": "^29.7.0",
-        "jest-resolve-dependencies": "^29.7.0",
-        "jest-runner": "^29.7.0",
-        "jest-runtime": "^29.7.0",
-        "jest-snapshot": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jest-validate": "^29.7.0",
-        "jest-watcher": "^29.7.0",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^29.7.0",
-        "slash": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@jest/environment": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
-      "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
-      "dependencies": {
-        "@jest/fake-timers": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "jest-mock": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/expect": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
-      "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
-      "dependencies": {
-        "expect": "^29.7.0",
-        "jest-snapshot": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/expect-utils": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
-      "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
-      "dependencies": {
-        "jest-get-type": "^29.6.3"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/fake-timers": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
-      "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "@sinonjs/fake-timers": "^10.0.2",
-        "@types/node": "*",
-        "jest-message-util": "^29.7.0",
-        "jest-mock": "^29.7.0",
-        "jest-util": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/globals": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
-      "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
-      "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/expect": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "jest-mock": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/reporters": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
-      "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
-      "dependencies": {
-        "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^29.7.0",
-        "@jest/test-result": "^29.7.0",
-        "@jest/transform": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@jridgewell/trace-mapping": "^0.3.18",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "exit": "^0.1.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "istanbul-lib-coverage": "^3.0.0",
-        "istanbul-lib-instrument": "^6.0.0",
-        "istanbul-lib-report": "^3.0.0",
-        "istanbul-lib-source-maps": "^4.0.0",
-        "istanbul-reports": "^3.1.3",
-        "jest-message-util": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jest-worker": "^29.7.0",
-        "slash": "^3.0.0",
-        "string-length": "^4.0.1",
-        "strip-ansi": "^6.0.0",
-        "v8-to-istanbul": "^9.0.1"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@jest/schemas": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
-      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
-      "dependencies": {
-        "@sinclair/typebox": "^0.27.8"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/source-map": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
-      "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
-      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.18",
-        "callsites": "^3.0.0",
-        "graceful-fs": "^4.2.9"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/test-result": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
-      "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
-      "dependencies": {
-        "@jest/console": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "collect-v8-coverage": "^1.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/test-sequencer": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
-      "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
-      "dependencies": {
-        "@jest/test-result": "^29.7.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.7.0",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/transform": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
-      "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
-      "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@jest/types": "^29.6.3",
-        "@jridgewell/trace-mapping": "^0.3.18",
-        "babel-plugin-istanbul": "^6.1.1",
-        "chalk": "^4.0.0",
-        "convert-source-map": "^2.0.0",
-        "fast-json-stable-stringify": "^2.1.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.7.0",
-        "jest-regex-util": "^29.6.3",
-        "jest-util": "^29.7.0",
-        "micromatch": "^4.0.4",
-        "pirates": "^4.0.4",
-        "slash": "^3.0.0",
-        "write-file-atomic": "^4.0.2"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/types": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
-      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
-      "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
-      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
-      "dependencies": {
-        "@jridgewell/set-array": "^1.2.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.24"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
-      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
-    },
-    "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.25",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
-      "dependencies": {
-        "@jridgewell/resolve-uri": "^3.1.0",
-        "@jridgewell/sourcemap-codec": "^1.4.14"
-      }
-    },
-    "node_modules/@npmcli/fs": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz",
-      "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==",
-      "optional": true,
-      "dependencies": {
-        "@gar/promisify": "^1.0.1",
-        "semver": "^7.3.5"
-      }
-    },
-    "node_modules/@npmcli/fs/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "optional": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@npmcli/fs/node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "optional": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@npmcli/fs/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "optional": true
-    },
-    "node_modules/@npmcli/move-file": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
-      "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
-      "deprecated": "This functionality has been moved to @npmcli/fs",
-      "optional": true,
-      "dependencies": {
-        "mkdirp": "^1.0.4",
-        "rimraf": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@sinclair/typebox": {
-      "version": "0.27.8",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
-      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA=="
-    },
-    "node_modules/@sinonjs/commons": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
-      "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
-      "dependencies": {
-        "type-detect": "4.0.8"
-      }
-    },
-    "node_modules/@sinonjs/fake-timers": {
-      "version": "10.3.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
-      "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
-      "dependencies": {
-        "@sinonjs/commons": "^3.0.0"
-      }
-    },
-    "node_modules/@tootallnate/once": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
-      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
-      "optional": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/@types/babel__core": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
-      "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
-      "dependencies": {
-        "@babel/parser": "^7.20.7",
-        "@babel/types": "^7.20.7",
-        "@types/babel__generator": "*",
-        "@types/babel__template": "*",
-        "@types/babel__traverse": "*"
-      }
-    },
-    "node_modules/@types/babel__generator": {
-      "version": "7.6.8",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
-      "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
-      "dependencies": {
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "node_modules/@types/babel__template": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
-      "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
-      "dependencies": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "node_modules/@types/babel__traverse": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.5.tgz",
-      "integrity": "sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==",
-      "dependencies": {
-        "@babel/types": "^7.20.7"
-      }
-    },
-    "node_modules/@types/debug": {
-      "version": "4.1.12",
-      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz",
-      "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==",
-      "dependencies": {
-        "@types/ms": "*"
-      }
-    },
-    "node_modules/@types/graceful-fs": {
-      "version": "4.1.9",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
-      "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/istanbul-lib-coverage": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
-      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w=="
-    },
-    "node_modules/@types/istanbul-lib-report": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
-      "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "*"
-      }
-    },
-    "node_modules/@types/istanbul-reports": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
-      "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
-      "dependencies": {
-        "@types/istanbul-lib-report": "*"
-      }
-    },
-    "node_modules/@types/ms": {
-      "version": "0.7.34",
-      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.34.tgz",
-      "integrity": "sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g=="
-    },
-    "node_modules/@types/node": {
-      "version": "20.12.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.7.tgz",
-      "integrity": "sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==",
-      "dependencies": {
-        "undici-types": "~5.26.4"
-      }
-    },
-    "node_modules/@types/stack-utils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
-      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw=="
-    },
-    "node_modules/@types/validator": {
-      "version": "13.11.9",
-      "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.11.9.tgz",
-      "integrity": "sha512-FCTsikRozryfayPuiI46QzH3fnrOoctTjvOYZkho9BTFLCOZ2rgZJHMOVgCOfttjPJcgOx52EpkY0CMfy87MIw=="
-    },
-    "node_modules/@types/yargs": {
-      "version": "17.0.32",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
-      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/@types/yargs-parser": {
-      "version": "21.0.3",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
-      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ=="
-    },
-    "node_modules/abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "optional": true
-    },
-    "node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "optional": true,
-      "dependencies": {
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
-    "node_modules/agentkeepalive": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz",
-      "integrity": "sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==",
-      "optional": true,
-      "dependencies": {
-        "humanize-ms": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 8.0.0"
-      }
-    },
-    "node_modules/aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "optional": true,
-      "dependencies": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-      "dependencies": {
-        "type-fest": "^0.21.3"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/anymatch": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-      "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/aproba": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
-      "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==",
-      "optional": true
-    },
-    "node_modules/are-we-there-yet": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz",
-      "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==",
-      "optional": true,
-      "dependencies": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^3.6.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      }
-    },
-    "node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/babel-jest": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
-      "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
-      "dependencies": {
-        "@jest/transform": "^29.7.0",
-        "@types/babel__core": "^7.1.14",
-        "babel-plugin-istanbul": "^6.1.1",
-        "babel-preset-jest": "^29.6.3",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.8.0"
-      }
-    },
-    "node_modules/babel-plugin-istanbul": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
-      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@istanbuljs/load-nyc-config": "^1.0.0",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-instrument": "^5.0.4",
-        "test-exclude": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
-      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
-      "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@babel/parser": "^7.14.7",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/babel-plugin-jest-hoist": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
-      "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
-      "dependencies": {
-        "@babel/template": "^7.3.3",
-        "@babel/types": "^7.3.3",
-        "@types/babel__core": "^7.1.14",
-        "@types/babel__traverse": "^7.0.6"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/babel-preset-current-node-syntax": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
-      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
-      "dependencies": {
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-bigint": "^7.8.3",
-        "@babel/plugin-syntax-class-properties": "^7.8.3",
-        "@babel/plugin-syntax-import-meta": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-top-level-await": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/babel-preset-jest": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
-      "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
-      "dependencies": {
-        "babel-plugin-jest-hoist": "^29.6.3",
-        "babel-preset-current-node-syntax": "^1.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-    },
-    "node_modules/base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/bindings": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "dependencies": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
-    "node_modules/bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "dependencies": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      }
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/browserslist": {
-      "version": "4.23.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
-      "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001587",
-        "electron-to-chromium": "^1.4.668",
-        "node-releases": "^2.0.14",
-        "update-browserslist-db": "^1.0.13"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      }
-    },
-    "node_modules/bser": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
-      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
-      "dependencies": {
-        "node-int64": "^0.4.0"
-      }
-    },
-    "node_modules/buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
-    "node_modules/buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
-    },
-    "node_modules/cacache": {
-      "version": "15.3.0",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz",
-      "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==",
-      "optional": true,
-      "dependencies": {
-        "@npmcli/fs": "^1.0.0",
-        "@npmcli/move-file": "^1.0.1",
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "glob": "^7.1.4",
-        "infer-owner": "^1.0.4",
-        "lru-cache": "^6.0.0",
-        "minipass": "^3.1.1",
-        "minipass-collect": "^1.0.2",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.2",
-        "mkdirp": "^1.0.3",
-        "p-map": "^4.0.0",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^3.0.2",
-        "ssri": "^8.0.1",
-        "tar": "^6.0.2",
-        "unique-filename": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/cacache/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "optional": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/cacache/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "optional": true
-    },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001612",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001612.tgz",
-      "integrity": "sha512-lFgnZ07UhaCcsSZgWW0K5j4e69dK1u/ltrL9lTUiFOwNHs12S3UMIEYgBV0Z6C6hRDev7iRnMzzYmKabYdXF9g==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ]
-    },
-    "node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/char-regex": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
-      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/ci-info": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
-      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/sibiraj-s"
-        }
-      ],
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cjs-module-lexer": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz",
-      "integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ=="
-    },
-    "node_modules/clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-      "optional": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/cliui": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
-      "engines": {
-        "iojs": ">= 1.0.0",
-        "node": ">= 0.12.0"
-      }
-    },
-    "node_modules/collect-v8-coverage": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
-      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q=="
-    },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/color-support": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-      "optional": true,
-      "bin": {
-        "color-support": "bin.js"
-      }
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
-    },
-    "node_modules/console-control-strings": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
-      "optional": true
-    },
-    "node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
-    },
-    "node_modules/create-jest": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
-      "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "jest-config": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "prompts": "^2.0.1"
-      },
-      "bin": {
-        "create-jest": "bin/create-jest.js"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/decompress-response": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
-      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
-      "dependencies": {
-        "mimic-response": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/dedent": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
-      "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
-      "peerDependencies": {
-        "babel-plugin-macros": "^3.1.0"
-      },
-      "peerDependenciesMeta": {
-        "babel-plugin-macros": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/deep-extend": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/deepmerge": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
-      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
-      "optional": true
-    },
-    "node_modules/detect-libc": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
-      "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/detect-newline": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/diff-sequences": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
-      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/dottie": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/dottie/-/dottie-2.0.6.tgz",
-      "integrity": "sha512-iGCHkfUc5kFekGiqhe8B/mdaurD+lakO9txNnTvKtA6PISrw86LgqHvRzWYPyoE2Ph5aMIrCw9/uko6XHTKCwA=="
-    },
-    "node_modules/electron-to-chromium": {
-      "version": "1.4.750",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.750.tgz",
-      "integrity": "sha512-9ItEpeu15hW5m8jKdriL+BQrgwDTXEL9pn4SkillWFu73ZNNNQ2BKKLS+ZHv2vC9UkNhosAeyfxOf/5OSeTCPA=="
-    },
-    "node_modules/emittery": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
-      "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
-      }
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "node_modules/encoding": {
-      "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
-      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
-      "optional": true,
-      "dependencies": {
-        "iconv-lite": "^0.6.2"
-      }
-    },
-    "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dependencies": {
-        "once": "^1.4.0"
-      }
-    },
-    "node_modules/env-paths": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
-      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
-      "optional": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/err-code": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
-      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==",
-      "optional": true
-    },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "node_modules/escalade": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
-      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/expand-template": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
-      "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/expect": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
-      "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
-      "dependencies": {
-        "@jest/expect-utils": "^29.7.0",
-        "jest-get-type": "^29.6.3",
-        "jest-matcher-utils": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-util": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
-    },
-    "node_modules/fb-watchman": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
-      "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
-      "dependencies": {
-        "bser": "2.1.1"
-      }
-    },
-    "node_modules/file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
-    },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fs-constants": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
-    },
-    "node_modules/fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/gauge": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz",
-      "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==",
-      "optional": true,
-      "dependencies": {
-        "aproba": "^1.0.3 || ^2.0.0",
-        "color-support": "^1.1.3",
-        "console-control-strings": "^1.1.0",
-        "has-unicode": "^2.0.1",
-        "signal-exit": "^3.0.7",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1",
-        "wide-align": "^1.1.5"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      }
-    },
-    "node_modules/gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/get-package-type": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/github-from-package": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
-      "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw=="
-    },
-    "node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
-    },
-    "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/has-unicode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
-      "optional": true
-    },
-    "node_modules/hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
-      "dependencies": {
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/html-escaper": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
-    },
-    "node_modules/http-cache-semantics": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
-      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
-      "optional": true
-    },
-    "node_modules/http-proxy-agent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
-      "optional": true,
-      "dependencies": {
-        "@tootallnate/once": "1",
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-      "optional": true,
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-      "engines": {
-        "node": ">=10.17.0"
-      }
-    },
-    "node_modules/humanize-ms": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
-      "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
-      "optional": true,
-      "dependencies": {
-        "ms": "^2.0.0"
-      }
-    },
-    "node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "optional": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/import-local": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
-      "dependencies": {
-        "pkg-dir": "^4.2.0",
-        "resolve-cwd": "^3.0.0"
-      },
-      "bin": {
-        "import-local-fixture": "fixtures/cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "optional": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/infer-owner": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
-      "optional": true
-    },
-    "node_modules/inflection": {
-      "version": "1.13.4",
-      "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.13.4.tgz",
-      "integrity": "sha512-6I/HUDeYFfuNCVS3td055BaXBwKYuzw7K3ExVMStBowKo9oOAMJIXIHvdyR3iboTCp1b+1i5DSkIZTcwIktuDw==",
-      "engines": [
-        "node >= 0.4.0"
-      ]
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
-    },
-    "node_modules/ip-address": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
-      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
-      "optional": true,
-      "dependencies": {
-        "jsbn": "1.1.0",
-        "sprintf-js": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 12"
-      }
-    },
-    "node_modules/ip-address/node_modules/sprintf-js": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
-      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
-      "optional": true
-    },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
-    },
-    "node_modules/is-core-module": {
-      "version": "2.13.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
-      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
-      "dependencies": {
-        "hasown": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-generator-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-lambda": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
-      "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
-      "optional": true
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/is-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
-    },
-    "node_modules/istanbul-lib-coverage": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
-      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-instrument": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.2.tgz",
-      "integrity": "sha512-1WUsZ9R1lA0HtBSohTkm39WTPlNKSJ5iFk7UwqXkBLoHQT+hfqPsfsTDVuZdKGaBwn7din9bS7SsnoAr943hvw==",
-      "dependencies": {
-        "@babel/core": "^7.23.9",
-        "@babel/parser": "^7.23.9",
-        "@istanbuljs/schema": "^0.1.3",
-        "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^7.5.4"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/istanbul-lib-instrument/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/istanbul-lib-instrument/node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/istanbul-lib-instrument/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "node_modules/istanbul-lib-report": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
-      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
-      "dependencies": {
-        "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^4.0.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/istanbul-lib-source-maps": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
-      "dependencies": {
-        "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^3.0.0",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/istanbul-reports": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
-      "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
-      "dependencies": {
-        "html-escaper": "^2.0.0",
-        "istanbul-lib-report": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
-      "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
-      "dependencies": {
-        "@jest/core": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "import-local": "^3.0.2",
-        "jest-cli": "^29.7.0"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-changed-files": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
-      "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
-      "dependencies": {
-        "execa": "^5.0.0",
-        "jest-util": "^29.7.0",
-        "p-limit": "^3.1.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-circus": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
-      "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
-      "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/expect": "^29.7.0",
-        "@jest/test-result": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "co": "^4.6.0",
-        "dedent": "^1.0.0",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^29.7.0",
-        "jest-matcher-utils": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-runtime": "^29.7.0",
-        "jest-snapshot": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "p-limit": "^3.1.0",
-        "pretty-format": "^29.7.0",
-        "pure-rand": "^6.0.0",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-cli": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
-      "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
-      "dependencies": {
-        "@jest/core": "^29.7.0",
-        "@jest/test-result": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "chalk": "^4.0.0",
-        "create-jest": "^29.7.0",
-        "exit": "^0.1.2",
-        "import-local": "^3.0.2",
-        "jest-config": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jest-validate": "^29.7.0",
-        "yargs": "^17.3.1"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-config": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
-      "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
-      "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@jest/test-sequencer": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "babel-jest": "^29.7.0",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "deepmerge": "^4.2.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-circus": "^29.7.0",
-        "jest-environment-node": "^29.7.0",
-        "jest-get-type": "^29.6.3",
-        "jest-regex-util": "^29.6.3",
-        "jest-resolve": "^29.7.0",
-        "jest-runner": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jest-validate": "^29.7.0",
-        "micromatch": "^4.0.4",
-        "parse-json": "^5.2.0",
-        "pretty-format": "^29.7.0",
-        "slash": "^3.0.0",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "@types/node": "*",
-        "ts-node": ">=9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        },
-        "ts-node": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-diff": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
-      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^29.6.3",
-        "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-docblock": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
-      "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
-      "dependencies": {
-        "detect-newline": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-each": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
-      "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^29.6.3",
-        "jest-util": "^29.7.0",
-        "pretty-format": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-environment-node": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
-      "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
-      "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/fake-timers": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "jest-mock": "^29.7.0",
-        "jest-util": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-get-type": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
-      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-haste-map": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
-      "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "@types/graceful-fs": "^4.1.3",
-        "@types/node": "*",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-regex-util": "^29.6.3",
-        "jest-util": "^29.7.0",
-        "jest-worker": "^29.7.0",
-        "micromatch": "^4.0.4",
-        "walker": "^1.0.8"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "^2.3.2"
-      }
-    },
-    "node_modules/jest-leak-detector": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
-      "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
-      "dependencies": {
-        "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-matcher-utils": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
-      "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "jest-diff": "^29.7.0",
-        "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-message-util": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
-      "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^29.6.3",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^29.7.0",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-mock": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
-      "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "jest-util": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-pnp-resolver": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
-      "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
-      "engines": {
-        "node": ">=6"
-      },
-      "peerDependencies": {
-        "jest-resolve": "*"
-      },
-      "peerDependenciesMeta": {
-        "jest-resolve": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-regex-util": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
-      "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-resolve": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
-      "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.7.0",
-        "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^29.7.0",
-        "jest-validate": "^29.7.0",
-        "resolve": "^1.20.0",
-        "resolve.exports": "^2.0.0",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-resolve-dependencies": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
-      "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
-      "dependencies": {
-        "jest-regex-util": "^29.6.3",
-        "jest-snapshot": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-runner": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
-      "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
-      "dependencies": {
-        "@jest/console": "^29.7.0",
-        "@jest/environment": "^29.7.0",
-        "@jest/test-result": "^29.7.0",
-        "@jest/transform": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "emittery": "^0.13.1",
-        "graceful-fs": "^4.2.9",
-        "jest-docblock": "^29.7.0",
-        "jest-environment-node": "^29.7.0",
-        "jest-haste-map": "^29.7.0",
-        "jest-leak-detector": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-resolve": "^29.7.0",
-        "jest-runtime": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jest-watcher": "^29.7.0",
-        "jest-worker": "^29.7.0",
-        "p-limit": "^3.1.0",
-        "source-map-support": "0.5.13"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-runtime": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
-      "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
-      "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/fake-timers": "^29.7.0",
-        "@jest/globals": "^29.7.0",
-        "@jest/source-map": "^29.6.3",
-        "@jest/test-result": "^29.7.0",
-        "@jest/transform": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "cjs-module-lexer": "^1.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-mock": "^29.7.0",
-        "jest-regex-util": "^29.6.3",
-        "jest-resolve": "^29.7.0",
-        "jest-snapshot": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "slash": "^3.0.0",
-        "strip-bom": "^4.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-snapshot": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
-      "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
-      "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@babel/generator": "^7.7.2",
-        "@babel/plugin-syntax-jsx": "^7.7.2",
-        "@babel/plugin-syntax-typescript": "^7.7.2",
-        "@babel/types": "^7.3.3",
-        "@jest/expect-utils": "^29.7.0",
-        "@jest/transform": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "babel-preset-current-node-syntax": "^1.0.0",
-        "chalk": "^4.0.0",
-        "expect": "^29.7.0",
-        "graceful-fs": "^4.2.9",
-        "jest-diff": "^29.7.0",
-        "jest-get-type": "^29.6.3",
-        "jest-matcher-utils": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "natural-compare": "^1.4.0",
-        "pretty-format": "^29.7.0",
-        "semver": "^7.5.3"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "node_modules/jest-util": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
-      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-validate": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
-      "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "camelcase": "^6.2.0",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^29.6.3",
-        "leven": "^3.1.0",
-        "pretty-format": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-validate/node_modules/camelcase": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-watcher": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
-      "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
-      "dependencies": {
-        "@jest/test-result": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "emittery": "^0.13.1",
-        "jest-util": "^29.7.0",
-        "string-length": "^4.0.1"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-worker": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
-      "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
-      "dependencies": {
-        "@types/node": "*",
-        "jest-util": "^29.7.0",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/jsbn": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
-      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
-      "optional": true
-    },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
-    },
-    "node_modules/json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/kleur": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/leven": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
-    },
-    "node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    },
-    "node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "node_modules/make-dir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
-      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
-      "dependencies": {
-        "semver": "^7.5.3"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/make-dir/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/make-dir/node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/make-dir/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "node_modules/make-fetch-happen": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz",
-      "integrity": "sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==",
-      "optional": true,
-      "dependencies": {
-        "agentkeepalive": "^4.1.3",
-        "cacache": "^15.2.0",
-        "http-cache-semantics": "^4.1.0",
-        "http-proxy-agent": "^4.0.1",
-        "https-proxy-agent": "^5.0.0",
-        "is-lambda": "^1.0.1",
-        "lru-cache": "^6.0.0",
-        "minipass": "^3.1.3",
-        "minipass-collect": "^1.0.2",
-        "minipass-fetch": "^1.3.2",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.4",
-        "negotiator": "^0.6.2",
-        "promise-retry": "^2.0.1",
-        "socks-proxy-agent": "^6.0.0",
-        "ssri": "^8.0.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "optional": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "optional": true
-    },
-    "node_modules/makeerror": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
-      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
-      "dependencies": {
-        "tmpl": "1.0.5"
-      }
-    },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
-    },
-    "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-      "dependencies": {
-        "braces": "^3.0.2",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/mimic-response": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
-      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minipass-collect": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
-      "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
-      "optional": true,
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/minipass-fetch": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz",
-      "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==",
-      "optional": true,
-      "dependencies": {
-        "minipass": "^3.1.0",
-        "minipass-sized": "^1.0.3",
-        "minizlib": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "optionalDependencies": {
-        "encoding": "^0.1.12"
-      }
-    },
-    "node_modules/minipass-flush": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
-      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
-      "optional": true,
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/minipass-pipeline": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
-      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
-      "optional": true,
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minipass-sized": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
-      "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
-      "optional": true,
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minipass/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "node_modules/minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/minizlib/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/mkdirp-classic": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
-    },
-    "node_modules/moment": {
-      "version": "2.30.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
-      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/moment-timezone": {
-      "version": "0.5.45",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.45.tgz",
-      "integrity": "sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==",
-      "dependencies": {
-        "moment": "^2.29.4"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node_modules/napi-build-utils": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
-      "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="
-    },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
-    },
-    "node_modules/negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-      "optional": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/node-abi": {
-      "version": "3.62.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.62.0.tgz",
-      "integrity": "sha512-CPMcGa+y33xuL1E0TcNIu4YyaZCxnnvkVaEXrsosR3FxN+fV8xvb7Mzpb7IgKler10qeMkE6+Dp8qJhpzdq35g==",
-      "dependencies": {
-        "semver": "^7.3.5"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/node-abi/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/node-abi/node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/node-abi/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "node_modules/node-addon-api": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz",
-      "integrity": "sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==",
-      "engines": {
-        "node": "^16 || ^18 || >= 20"
-      }
-    },
-    "node_modules/node-gyp": {
-      "version": "8.4.1",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz",
-      "integrity": "sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==",
-      "optional": true,
-      "dependencies": {
-        "env-paths": "^2.2.0",
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.2.6",
-        "make-fetch-happen": "^9.1.0",
-        "nopt": "^5.0.0",
-        "npmlog": "^6.0.0",
-        "rimraf": "^3.0.2",
-        "semver": "^7.3.5",
-        "tar": "^6.1.2",
-        "which": "^2.0.2"
-      },
-      "bin": {
-        "node-gyp": "bin/node-gyp.js"
-      },
-      "engines": {
-        "node": ">= 10.12.0"
-      }
-    },
-    "node_modules/node-gyp/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "optional": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/node-gyp/node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "optional": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/node-gyp/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "optional": true
-    },
-    "node_modules/node-int64": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="
-    },
-    "node_modules/node-releases": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
-      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw=="
-    },
-    "node_modules/nopt": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
-      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
-      "optional": true,
-      "dependencies": {
-        "abbrev": "1"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "dependencies": {
-        "path-key": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/npmlog": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz",
-      "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==",
-      "optional": true,
-      "dependencies": {
-        "are-we-there-yet": "^3.0.0",
-        "console-control-strings": "^1.1.0",
-        "gauge": "^4.0.3",
-        "set-blocking": "^2.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/p-locate/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-      "optional": true,
-      "dependencies": {
-        "aggregate-error": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
-    },
-    "node_modules/pg-connection-string": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.6.4.tgz",
-      "integrity": "sha512-v+Z7W/0EO707aNMaAEfiGnGL9sxxumwLl2fJvCQtMn9Fxsg+lPpPkdcyBSv/KFgpGdYkMfn+EI1Or2EHjpgLCA=="
-    },
-    "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
-    },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/pirates": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
-      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/prebuild-install": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.2.tgz",
-      "integrity": "sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==",
-      "dependencies": {
-        "detect-libc": "^2.0.0",
-        "expand-template": "^2.0.3",
-        "github-from-package": "0.0.0",
-        "minimist": "^1.2.3",
-        "mkdirp-classic": "^0.5.3",
-        "napi-build-utils": "^1.0.1",
-        "node-abi": "^3.3.0",
-        "pump": "^3.0.0",
-        "rc": "^1.2.7",
-        "simple-get": "^4.0.0",
-        "tar-fs": "^2.0.0",
-        "tunnel-agent": "^0.6.0"
-      },
-      "bin": {
-        "prebuild-install": "bin.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/pretty-format": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/promise-inflight": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-      "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==",
-      "optional": true
-    },
-    "node_modules/promise-retry": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
-      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
-      "optional": true,
-      "dependencies": {
-        "err-code": "^2.0.2",
-        "retry": "^0.12.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/prompts": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
-      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-      "dependencies": {
-        "kleur": "^3.0.3",
-        "sisteransi": "^1.0.5"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "node_modules/pure-rand": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
-      "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/dubzzz"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/fast-check"
-        }
-      ]
-    },
-    "node_modules/rc": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-      "dependencies": {
-        "deep-extend": "^0.6.0",
-        "ini": "~1.3.0",
-        "minimist": "^1.2.0",
-        "strip-json-comments": "~2.0.1"
-      },
-      "bin": {
-        "rc": "cli.js"
-      }
-    },
-    "node_modules/rc/node_modules/strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-is": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
-      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
-    },
-    "node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/resolve": {
-      "version": "1.22.8",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
-      "dependencies": {
-        "is-core-module": "^2.13.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/resolve-cwd": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-      "dependencies": {
-        "resolve-from": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/resolve.exports": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
-      "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
-      "optional": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/retry-as-promised": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/retry-as-promised/-/retry-as-promised-7.0.4.tgz",
-      "integrity": "sha512-XgmCoxKWkDofwH8WddD0w85ZfqYz+ZHlr5yo+3YUCfycWawU56T5ckWXsScsj5B8tqUcIG67DxXByo3VUgiAdA=="
-    },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "optional": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "optional": true
-    },
-    "node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/sequelize": {
-      "version": "6.37.3",
-      "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-6.37.3.tgz",
-      "integrity": "sha512-V2FTqYpdZjPy3VQrZvjTPnOoLm0KudCRXfGWp48QwhyPPp2yW8z0p0sCYZd/em847Tl2dVxJJ1DR+hF+O77T7A==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/sequelize"
-        }
-      ],
-      "dependencies": {
-        "@types/debug": "^4.1.8",
-        "@types/validator": "^13.7.17",
-        "debug": "^4.3.4",
-        "dottie": "^2.0.6",
-        "inflection": "^1.13.4",
-        "lodash": "^4.17.21",
-        "moment": "^2.29.4",
-        "moment-timezone": "^0.5.43",
-        "pg-connection-string": "^2.6.1",
-        "retry-as-promised": "^7.0.4",
-        "semver": "^7.5.4",
-        "sequelize-pool": "^7.1.0",
-        "toposort-class": "^1.0.1",
-        "uuid": "^8.3.2",
-        "validator": "^13.9.0",
-        "wkx": "^0.5.0"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ibm_db": {
-          "optional": true
-        },
-        "mariadb": {
-          "optional": true
-        },
-        "mysql2": {
-          "optional": true
-        },
-        "oracledb": {
-          "optional": true
-        },
-        "pg": {
-          "optional": true
-        },
-        "pg-hstore": {
-          "optional": true
-        },
-        "snowflake-sdk": {
-          "optional": true
-        },
-        "sqlite3": {
-          "optional": true
-        },
-        "tedious": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/sequelize-pool": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/sequelize-pool/-/sequelize-pool-7.1.0.tgz",
-      "integrity": "sha512-G9c0qlIWQSK29pR/5U2JF5dDQeqqHRragoyahj/Nx4KOOQ3CPPfzxnfqFPCSB7x5UgjOgnZ61nSxz+fjDpRlJg==",
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/sequelize/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/sequelize/node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/sequelize/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "node_modules/set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
-      "optional": true
-    },
-    "node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
-    },
-    "node_modules/simple-concat": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
-      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/simple-get": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
-      "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "decompress-response": "^6.0.0",
-        "once": "^1.3.1",
-        "simple-concat": "^1.0.0"
-      }
-    },
-    "node_modules/sisteransi": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="
-    },
-    "node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/smart-buffer": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
-      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
-      "optional": true,
-      "engines": {
-        "node": ">= 6.0.0",
-        "npm": ">= 3.0.0"
-      }
-    },
-    "node_modules/socks": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
-      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
-      "optional": true,
-      "dependencies": {
-        "ip-address": "^9.0.5",
-        "smart-buffer": "^4.2.0"
-      },
-      "engines": {
-        "node": ">= 10.0.0",
-        "npm": ">= 3.0.0"
-      }
-    },
-    "node_modules/socks-proxy-agent": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz",
-      "integrity": "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==",
-      "optional": true,
-      "dependencies": {
-        "agent-base": "^6.0.2",
-        "debug": "^4.3.3",
-        "socks": "^2.6.2"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-support": {
-      "version": "0.5.13",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
-      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
-    },
-    "node_modules/sqlite3": {
-      "version": "5.1.7",
-      "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.7.tgz",
-      "integrity": "sha512-GGIyOiFaG+TUra3JIfkI/zGP8yZYLPQ0pl1bH+ODjiX57sPhrLU5sQJn1y9bDKZUFYkX1crlrPfSYt0BKKdkog==",
-      "hasInstallScript": true,
-      "dependencies": {
-        "bindings": "^1.5.0",
-        "node-addon-api": "^7.0.0",
-        "prebuild-install": "^7.1.1",
-        "tar": "^6.1.11"
-      },
-      "optionalDependencies": {
-        "node-gyp": "8.x"
-      },
-      "peerDependencies": {
-        "node-gyp": "8.x"
-      },
-      "peerDependenciesMeta": {
-        "node-gyp": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ssri": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
-      "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
-      "optional": true,
-      "dependencies": {
-        "minipass": "^3.1.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/stack-utils": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
-      "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
-      "dependencies": {
-        "escape-string-regexp": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "node_modules/string-length": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
-      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
-      "dependencies": {
-        "char-regex": "^1.0.2",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-bom": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/tar": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
-      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
-      "dependencies": {
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "minipass": "^5.0.0",
-        "minizlib": "^2.1.1",
-        "mkdirp": "^1.0.3",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/tar-fs": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
-      "dependencies": {
-        "chownr": "^1.1.1",
-        "mkdirp-classic": "^0.5.2",
-        "pump": "^3.0.0",
-        "tar-stream": "^2.1.4"
-      }
-    },
-    "node_modules/tar-fs/node_modules/chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
-    },
-    "node_modules/tar-stream": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-      "dependencies": {
-        "bl": "^4.0.3",
-        "end-of-stream": "^1.4.1",
-        "fs-constants": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/tar/node_modules/minipass": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/tar/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "node_modules/test-exclude": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-      "dependencies": {
-        "@istanbuljs/schema": "^0.1.2",
-        "glob": "^7.1.4",
-        "minimatch": "^3.0.4"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/tmpl": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
-      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="
-    },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/toposort-class": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toposort-class/-/toposort-class-1.0.1.tgz",
-      "integrity": "sha512-OsLcGGbYF3rMjPUf8oKktyvCiUxSbqMMS39m33MAjLTC1DVIH6x3WSt63/M77ihI09+Sdfk1AXvfhCEeUmC7mg=="
-    },
-    "node_modules/tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
-    },
-    "node_modules/unique-filename": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-      "optional": true,
-      "dependencies": {
-        "unique-slug": "^2.0.0"
-      }
-    },
-    "node_modules/unique-slug": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
-      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
-      "optional": true,
-      "dependencies": {
-        "imurmurhash": "^0.1.4"
-      }
-    },
-    "node_modules/update-browserslist-db": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
-      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "escalade": "^3.1.1",
-        "picocolors": "^1.0.0"
-      },
-      "bin": {
-        "update-browserslist-db": "cli.js"
-      },
-      "peerDependencies": {
-        "browserslist": ">= 4.21.0"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
-    },
-    "node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
-    "node_modules/v8-to-istanbul": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz",
-      "integrity": "sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==",
-      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.12",
-        "@types/istanbul-lib-coverage": "^2.0.1",
-        "convert-source-map": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.12.0"
-      }
-    },
-    "node_modules/validator": {
-      "version": "13.11.0",
-      "resolved": "https://registry.npmjs.org/validator/-/validator-13.11.0.tgz",
-      "integrity": "sha512-Ii+sehpSfZy+At5nPdnyMhx78fEoPDkR2XW/zimHEL3MyGJQOCQ7WeP20jPYRz7ZCpcKLB21NxuXHF3bxjStBQ==",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/walker": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
-      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
-      "dependencies": {
-        "makeerror": "1.0.12"
-      }
-    },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/wide-align": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
-      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
-      "optional": true,
-      "dependencies": {
-        "string-width": "^1.0.2 || 2 || 3 || 4"
-      }
-    },
-    "node_modules/wkx": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/wkx/-/wkx-0.5.0.tgz",
-      "integrity": "sha512-Xng/d4Ichh8uN4l0FToV/258EjMGU9MGcA0HV2d9B/ZpZB3lqQm7nkOdZdm5GhKtLLhAE7PiVQwN4eN+2YJJUg==",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
-    },
-    "node_modules/write-file-atomic": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
-      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^3.0.7"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      }
-    },
-    "node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
-    },
-    "node_modules/yargs": {
-      "version": "17.7.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-      "dependencies": {
-        "cliui": "^8.0.1",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^21.1.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/yargs-parser": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    }
-  }
+  "packages": {}
 }
diff --git a/package.json b/package.json
deleted file mode 100644
index 1d93dcdc..00000000
--- a/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "dependencies": {
-    "jest": "^29.7.0",
-    "sequelize": "^6.37.3",
-    "sqlite3": "^5.1.7"
-  }
-}

From d85a4dffed52a39868beaec384351672102273eb Mon Sep 17 00:00:00 2001
From: Pablo <uo265314@uniovi.es>
Date: Sat, 27 Apr 2024 10:13:23 +0200
Subject: [PATCH 129/132] Sorry guys I had messed up :(

---
 webapp/src/__tests__/components/NavBar.test.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/webapp/src/__tests__/components/NavBar.test.js b/webapp/src/__tests__/components/NavBar.test.js
index a19aa416..cd547778 100644
--- a/webapp/src/__tests__/components/NavBar.test.js
+++ b/webapp/src/__tests__/components/NavBar.test.js
@@ -26,8 +26,10 @@ describe('NavBar component', () => {
         </BrowserRouter>
       </SessionContext.Provider>
     );
-    const logo = screen.getByAltText('Logo');
-    await expect(logo).toBeInTheDocument();
+    const logo = screen.getAllByAltText('Logo');
+    // There should be the one for mobile and the one for normal devices
+    await expect(logo[0]).toBeInTheDocument();
+    await expect(logo[1]).toBeInTheDocument();
   });
 
   it('should render log-in option', async () => {
@@ -42,6 +44,7 @@ describe('NavBar component', () => {
     await expect(logIn).toBeInTheDocument();
   });
 
+
   // As there s a link for the menu (mobiles version) and in the propper nav, we have to check 2 elements appear
   it('should render navigation links', async () => {
     render(

From d3af04c991f931ba13766714d7717d4d5ff69ce2 Mon Sep 17 00:00:00 2001
From: uo288543 <uo288543@uniovi.es>
Date: Sat, 27 Apr 2024 10:22:11 +0200
Subject: [PATCH 130/132] Update code to include only last rectangle button

---
 webapp/src/pages/Home.js | 61 ++++------------------------------------
 1 file changed, 5 insertions(+), 56 deletions(-)

diff --git a/webapp/src/pages/Home.js b/webapp/src/pages/Home.js
index f56d30c1..20eb7616 100644
--- a/webapp/src/pages/Home.js
+++ b/webapp/src/pages/Home.js
@@ -1,5 +1,5 @@
 import * as React from "react";
-import {Box, Button, Fab, useTheme, Tooltip } from "@mui/material";
+import {Box, Button, useTheme } from "@mui/material";
 import useMediaQuery from '@mui/material/useMediaQuery';
 import { useTranslation } from 'react-i18next';
 import AndroidIcon from '@mui/icons-material/Android';
@@ -105,45 +105,19 @@ const Home = () => {
             <video data-testid="video" ref={videoRef} autoPlay muted loop style={{ ...styles.video}}>
                 <source src="./home/Background-White.webm" type="video/mp4" />
             </video>
-            <a
-            href="https://mega.nz/file/vNVkhQwT#l3K-nttaNWJ1tjdUVXJlCClmYm9rmpgBS_ULNewASL4"
-            target="_blank"
-            rel="noopener noreferrer"
-            >
-            <Button
-                variant="contained"
-                color="primary"
-                startIcon={<AndroidIcon style={{ marginRight: '0.2em' }} />}
-            >
-            {t("Footer.apk_link")}
-            </Button>
-          </a>
-
-          <a
-            href="https://mega.nz/file/vNVkhQwT#l3K-nttaNWJ1tjdUVXJlCClmYm9rmpgBS_ULNewASL4"
-            target="_blank"
-            rel="noopener noreferrer"
-            >
-            <Button
-                variant="contained"
-                color="primary"
-                startIcon={<AndroidIcon style={{ marginRight: '0.2em', color: "3DDC84", }} />}
-                style={{ marginTop: '0.5em' }}
-            >
-            {t("Footer.apk_link")}
-            </Button>
-          </a>
+            
 
-          <a
+            <a
             href="https://mega.nz/file/vNVkhQwT#l3K-nttaNWJ1tjdUVXJlCClmYm9rmpgBS_ULNewASL4"
             target="_blank"
             rel="noopener noreferrer"
             >
             <Button
                 variant="contained"
+                size={isMobile ? 'small' : 'big'}
                 color="primary"
                 startIcon={<AndroidIcon style={{ marginRight: '0.2em', color: "3DDC84", fontSize: '2em' }} />}
-                style={{ marginTop: '0.5em' }}
+                style={{ marginTop: '0.8em' }}
                 sx={{
                     '&:hover': {
                       border: `2px solid #3DDC84`, 
@@ -155,31 +129,6 @@ const Home = () => {
             </Button>
           </a>
 
-          <Box
-            sx={{
-            position: 'fixed',
-            bottom: "14%", 
-            right: "6%", 
-            }}
-        >
-            <a
-            href="https://mega.nz/file/vNVkhQwT#l3K-nttaNWJ1tjdUVXJlCClmYm9rmpgBS_ULNewASL4"
-            target="_blank"
-            rel="noopener noreferrer"
-            >
-            <Tooltip title="Botón de descarga de Android" placement="left"> {/* TODO */} 
-                <Fab size={isMobile ? 'small' : 'big'} color="primary" aria-label="download" sx={{
-                        '&:hover': {
-                        border: `2px solid #3DDC84`, 
-                        backgroundColor: 'primary.light', 
-                        },
-                    }}>
-                    <AndroidIcon style={{ color: "3DDC84", fontSize: '2em' }}/>
-                </Fab>
-            </Tooltip>
-            </a>
-        </Box>
-
         </Box>
     );
 };

From 2b7ca8a5d87e0824bab93a9df7bbd86b308de17a Mon Sep 17 00:00:00 2001
From: uo289689 <uo289689@uniovi.es>
Date: Sat, 27 Apr 2024 10:50:45 +0200
Subject: [PATCH 131/132] Updated the challange game

---
 webapp/src/pages/games/TheChallengeGame.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/src/pages/games/TheChallengeGame.js b/webapp/src/pages/games/TheChallengeGame.js
index 6033c9b6..8ea6bf80 100644
--- a/webapp/src/pages/games/TheChallengeGame.js
+++ b/webapp/src/pages/games/TheChallengeGame.js
@@ -246,7 +246,7 @@ const TheChallengeGame = () => {
                             <Typography fontWeight="bold" color="primary" fontSize="1.5em">
                                 {numRounds}
                             </Typography>
-                            <IconButton size="large" color="success" onClick={() => setNumRounds(numRounds + 1)} variant="outlined" data-testId="addRound">
+                            <IconButton size="large" color="success" disabled={numRounds === 30} onClick={() => setNumRounds(numRounds + 1)} variant="outlined" data-testId="addRound">
                                 <AddIcon fontSize="inherit" />
                             </IconButton>
                         </Box>
@@ -255,13 +255,13 @@ const TheChallengeGame = () => {
                             <Typography htmlFor="questionTime" variant="h5">
                                 {t("Game.config.time")}:
                             </Typography>
-                            <IconButton size="large" color="error" disabled={timerConfig === 1} onClick={() => setTimerConfig(timerConfig - 1)} variant="outlined" data-testId="removeSecond">
+                            <IconButton size="large" color="error" disabled={timerConfig === 5} onClick={() => setTimerConfig(timerConfig - 1)} variant="outlined" data-testId="removeSecond">
                                 <RemoveIcon fontSize="inherit" />
                             </IconButton>
                             <Typography fontWeight="bold" color="primary" fontSize="1.5em">
                                 {timerConfig}
                             </Typography>
-                            <IconButton size="large" color="success" onClick={() => setTimerConfig(timerConfig + 1)} variant="outlined" data-testId="addSecond">
+                            <IconButton size="large" color="success" disabled={numRounds === 99} onClick={() => setTimerConfig(timerConfig + 1)} variant="outlined" data-testId="addSecond">
                                 <AddIcon fontSize="inherit" />
                             </IconButton>
                         </Box>

From 1a51a64623a5be368888ab2c1257c2a92527ae02 Mon Sep 17 00:00:00 2001
From: uo288543 <uo288543@uniovi.es>
Date: Sat, 27 Apr 2024 12:50:29 +0200
Subject: [PATCH 132/132] margin for multiplayer

---
 webapp/src/pages/games/MultiplayerRoom.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/src/pages/games/MultiplayerRoom.js b/webapp/src/pages/games/MultiplayerRoom.js
index aa3e5d63..423db081 100644
--- a/webapp/src/pages/games/MultiplayerRoom.js
+++ b/webapp/src/pages/games/MultiplayerRoom.js
@@ -107,7 +107,7 @@ const MultiplayerRoom = () => {
   
     return (
       <Container sx={{ display: 'flex', flex: 1, justifyContent: 'center', alignItems: 'center' }}>
-        <Paper elevation={5} sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', gap: '2em', padding: '3em', borderRadius: '4em' }}>
+        <Paper elevation={5} sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', gap: '2em', padding: '3em', borderRadius: '4em', marginTop: '2em', marginBottom: '2em' }}>
           <Typography variant="h2" align="center" fontWeight="bold" sx={{ textShadow: '2px 2px 4px rgba(0, 0, 0, 0.5)', fontSize:'3rem' }}>
             {t("Games.Multiplayer.name").toUpperCase()}
           </Typography>