Merge branch 'master' into 83-navigability-in-the-ui

README.md

@@ -34,7 +34,7 @@ docker compose --profile dev up --build
 ```
 
 ### Deployed in Cloud
-In order to view the application deploy in the cloud click [here](http://172.203.216.60:3000)
+In order to view the application deploy in the cloud click [here](http://wiqen1b.serveminecraft.net:3000)
 ### Members
 
 - Lucía Ruiz Núñez [email protected]

docker-compose.yml

@@ -113,7 +113,7 @@
     prometheus:
       image: prom/prometheus
       container_name: prometheus-${teamname:-defaultASW}
-      profiles: ["dev"]
+      profiles: ["dev", "prod"]
       networks:
         - mynetwork
       volumes:
@@ -127,7 +127,7 @@
     grafana:
       image: grafana/grafana
       container_name: grafana-${teamname:-defaultASW}
-      profiles: ["dev"]
+      profiles: ["dev", "prod"]
       networks:
         - mynetwork
       volumes:

gatewayservice/openapi.yaml

@@ -9,7 +9,7 @@ info:
 servers:
   - url: http://localhost:8000
     description: Development server
-  - url: http://172.203.216.60:8000
+  - url: http://wiqen1b.serveminecraft.net:8000
     description: Production server
 paths:
   /adduser:

package.json

@@ -8,13 +8,15 @@
     "express": "^4.19.2",
     "i18n": "^0.15.1",
     "i18next": "^23.10.1",
+    "jquery": "^3.7.1",
     "jsonwebtoken": "^9.0.2",
     "mongoose": "^8.3.0",
     "react-countdown": "^2.3.5",
     "react-i18next": "^14.1.0",
     "react-router-dom": "^6.22.1"
   },
   "devDependencies": {
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "jest": "^29.7.0"
   }
 }

webapp/package.json

@@ -23,7 +23,8 @@
     "react-icons": "^5.0.1",
     "react-router-dom": "^6.22.3",
     "react-scripts": "^5.0.1",
-    "web-vitals": "^3.5.1"
+    "web-vitals": "^3.5.1",
+    "zxcvbn": "^4.4.2"
   },
   "scripts": {
     "start": "react-scripts start",
@@ -52,6 +53,7 @@
     ]
   },
   "devDependencies": {
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "axios-mock-adapter": "^1.22.0",
     "expect-puppeteer": "^9.0.2",
     "jest": "^29.3.1",

webapp/src/App.js

@@ -2,6 +2,7 @@ import React,{ useEffect }  from 'react';
 import QuestionView from './components/questionView/QuestionView';
 import GameMenu from './components/GameMenu/GameMenu';
 import Navbar from './components/fragments/NavBar';
+import ErrorPage from './components/fragments/ErrorPage';
 import Home from './components/Home/Home';
 import Login from './components/loginAndRegistration/Login';
 import AddUser from './components/loginAndRegistration/AddUser';
@@ -20,7 +21,7 @@ function App() {
     document.title = 'WIQ';
   }, []);
   return (
-    <Router className='roter'>
+    <Router>
       <UserContextProvider>
         <div style={{ position: 'relative', minHeight: '100vh' }}>
           <Navbar style={{ width: '100%' }} /> 
@@ -36,6 +37,7 @@ function App() {
               <Route path="/historical" element={<HistoricalView />} />
               <Route path="/configurator" element={<GameConfigurator />}/>
               <Route path="/ranking" element={<RankingView />} />
+              <Route path="*" element={<ErrorPage />} />
             </Routes>
           </Container>
         </div>
@@ -44,4 +46,4 @@ function App() {
   );
 }
 
-export default App;
+export default App;

webapp/src/components/Instructions.js

@@ -4,12 +4,14 @@ import {useTranslation} from "react-i18next";
 
 
 
+
 function Instructions() {
 
   const[t] = useTranslation("global");
 
   return (
     <div className='instrucions_container'>
+
       <h1 className='instructions_title'>{t("instructions.title")}</h1>
      <section>   
       <article>
@@ -57,7 +59,9 @@ function Instructions() {
             </article>
 
       </section>
+
     </div>
+
   );
 }