Merge pull request #306 from Arquisoft/develop

about page

docs/src/12_glossary.adoc

@@ -7,6 +7,7 @@ ifndef::imagesdir[:imagesdir: ../images]
 [cols="e,2e" options="header"]
 |===
 |Term |Definition
-|Question Generator
-|A module of the application responsible for querying Wikidata, creating the questions and storing them in our DB.
+|Distractor | Incorrect answer shown to the user alongside the correct one in each question
+|KiWiq | The name of our project
+|Question Generator |A module of the application responsible for querying Wikidata, creating the questions and storing them in our DB
 |===

docs/src/13_annex.adoc

@@ -46,7 +46,6 @@ ifndef::imagesdir[:imagesdir: ../images]
 ** FR-DMU 1.1. Registered users shall be able to access the number of games they have played.
 ** FR-DMU 1.2. Registered users shall be able to access the number of questions they have answered correctly.
 ** FR-DMU 1.3. Registered users shall be able to access the number of questions they have answered incorrectly.
-** FR-DMU 1.4. Registered users shall be able to access the time they have spent within the system.
 ** FR-DMU 1.5. Registered users shall be able to access the ranking of the game.
 
 ==== Play to WIQ.
@@ -66,7 +65,7 @@ ifndef::imagesdir[:imagesdir: ../images]
 [none or no-bullet]
 **** FR-PWIQ 3.1.1.1. When the answer is correct:
 [none or no-bullet]
-***** FR-PWIQ 3.1.1.1.1. The registered user shall earn 10 points.
+***** FR-PWIQ 3.1.1.1.1. The registered user shall be notified.
 ***** FR-PWIQ 3.1.1.1.2. When the registered user is in the ninth round, the system shall end the game.
 ***** FR-PWIQ 3.1.1.1.3. When the registered user is not in the ninth round, the system shall move to the next round.
 **** FR-PWIQ 3.1.1.2. When the answer is incorrect:
@@ -76,4 +75,12 @@ ifndef::imagesdir[:imagesdir: ../images]
 ** FR-PWIQ 3.2. When the specified time has ended:
 [none or no-bullet]
 *** FR-PWIQ 3.2.1. When the registered user is in the ninth round, the system shall end the game.
-*** FR-PWIQ 3.2.2. When the registered user is not in the ninth round, the system shall move to the next round.
+*** FR-PWIQ 3.2.2. When the registered user is not in the ninth round, the system shall move to the next round.
+[none or no-bullet]
+* FR-PWIQ 4. The system shall allow the user to create custom games.
+[none or no-bullet]
+** FR-PWIQ 4.1. The user may select.
+[none or no-bullet]
+*** FR-PWIQ 4.1.1 The number of rounds.
+*** FR-PWIQ 4.1.2 The time per round.
+*** FR-PWIQ 4.1.3 The categories of the questions.

webapp/public/index.html

@@ -7,7 +7,7 @@
     <meta name="theme-color" content="#000000" />
     <meta
       name="description"
-      content="Web site created using create-react-app"
+      content="Kiwiq - Ready to test your knowledge?"
     />
     <link rel="apple-touch-icon" href="%PUBLIC_URL%/kiwiq-icon.ico" />
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />

webapp/public/locales/en/translation.json

@@ -4,7 +4,7 @@
         "api_docs": "API Documentation",
         "statistics": {
             "title": "Statistics",
-            "personal": "My statistics",
+            "personal": "Total statistics",
             "general": "Leaderboard"
         },
         "play": "Play",
@@ -60,7 +60,7 @@
         "description2": "Each question is a door to a universe of possibilities, with four options before you. But be careful, only one of those options is the golden key that will unlock the treasure of the correct answer.",
         "description3": "With just 30 seconds for each question, you'll feel the adrenaline rushing through your veins as you fight against the clock to find the perfect answer. Take on the standard challenge with 9 questions waiting for you in each match, or venture into the custom terrain, where you can choose your own route. Do you feel brave? Or do you prefer strategy?",
         "description4": "At the end of the road, your score will be your badge of honor. Can you achieve maximum glory and become the KiWiQ champion? Only time will tell!",
-        "description5": "Let the game begin!"
+        "description5": "Enjoy your meal!"
 
     },
     "statistics": {
@@ -93,8 +93,7 @@
     },
     "about": {
         "title": "About",
-        "description1": "We are the WIQ_EN2B group and we are delighted that you like 🥝KIWIQ🥝. Enjoy!!!",
-        "table1": "Developers",
-        "table2": "Contact"
+        "description1": "We are the WIQ_EN2B group and we are delighted that you like 🥝KIWIQ🥝. Enjoy your meal!!!",
+        "tableheader": "Developers"
     }
 }

webapp/public/locales/es/translation.json

@@ -4,7 +4,7 @@
         "api_docs": "Documentación de la API",
         "statistics": {
             "title": "Estadísticas",
-            "personal": "Mis estadísticas",
+            "personal": "Estadísticas totales",
             "general": "Clasificación"
         },
         "play": "Jugar",
@@ -92,8 +92,7 @@
     },
     "about": {
         "title": "Sobre nosotros",
-        "description1": "Somos el grupo WIQ_EN2B y estamos encantados de que te guste 🥝KIWIQ🥝. Disfruta!!!",
-        "table1": "Desarrolladores",
-        "table2": "Contacto"
+        "description1": "Somos el grupo WIQ_EN2B y estamos encantados de que te guste 🥝KIWIQ🥝. Que aproveche!!!",
+        "tableheader": "Desarrolladores"
     }
 }

webapp/src/components/GoBack.jsx

@@ -7,7 +7,7 @@ export default function GoBack() {
     const {t} = useTranslation();
     const navigate = useNavigate();
     return <Flex justify={"center"}>
-        <Button size={"lg"} fontSize={"2xl"} flex={1} data-testid={"GoBack"} type="submit" colorScheme="pigment_green" margin={"0.5rem"} className={"custom-button effect1"} onClick={() => navigate("/dashboard")}>
+        <Button size={"lg"} fontSize={"2xl"} flex={1} data-testid={"GoBack"} type="submit" colorScheme="pigment_green" margin={"0.5rem"} className={"custom-button effect1"} onClick={() => navigate("/")}>
             {t("common.goBack")}
         </Button>
     </Flex>

webapp/src/pages/About.jsx

@@ -1,12 +1,12 @@
 import React, { useState } from "react";
 import { useTranslation } from 'react-i18next';
-import { Center, Heading, Stack, Box, Text, Table, Thead, Tr, Td, Th, Tbody, Container } from '@chakra-ui/react';
+import { Center, Heading, Stack, Box, Text, Table, Tr, Td, Tbody, Container, Link, Avatar } from '@chakra-ui/react';
 import { InfoIcon } from '@chakra-ui/icons';
 
 import LateralMenu from '../components/menu/LateralMenu';
 import MenuButton from '../components/menu/MenuButton';
 import GoBack from "components/GoBack";
-
+import "../styles/animations.css";
 export default function About() {
   const { t, i18n } = useTranslation();
   const [isMenuOpen, setIsMenuOpen] = useState(false);
@@ -27,41 +27,36 @@ export default function About() {
             </Box> 
             <Stack spacing={4} p="1rem" backgroundColor="whiteAlpha.900" boxShadow="md" rounded="1rem" data-testid={"About page"}>
               <Text>{t("about.description1")}</Text>
+              <Text fontWeight='extrabold' color={"forest_green.400"} textAlign={"center"} fontSize={"md"}>{t("about.tableheader")}</Text>
               <Table variant="simple">
-                <Thead>
-                  <Tr>
-                    <Th><Text fontWeight='extrabold' color={"forest_green.400"} textAlign={"center"} fontSize={"md"}>{t("about.table1")}</Text></Th>
-                    <Th><Text fontWeight='extrabold' color={"forest_green.400"} textAlign={"center"} fontSize={"md"}>{t("about.table2")}</Text></Th>
-                  </Tr>
-                </Thead>
                 <Tbody>
-                  <Tr>
-                    <Td>Gonzalo Alonso Fernández</Td>
-                    <Td>UO282104</Td>
+                  <Tr _hover={{animation:"zoomIn 0.05s ease-in forwards"}}>
+                    <Td><Avatar name='Gonzalo Alonso Fernández' src='./img/avatar/avatar-gonzaa.jpg' /></Td>
+                    <Td><Link href='https://www.linkedin.com/in/gonzalo-alonso-fern%C3%A1ndez-277436219//' isExternal > Gonzalo Alonso Fernández</Link></Td>
                   </Tr>
-                  <Tr>
-                    <Td>Sergio Rodríguez García</Td>
-                    <Td>UO282598</Td>
+                  <Tr _hover={{animation:"zoomIn 0.05s ease-in forwards"}}>
+                    <Td><Avatar name='Sergio Rodríguez García' src='./img/avatar/avatar-sergior.jpg' /></Td>
+                    <Td><Link href='https://www.linkedin.com/in/sergio-rodr%C3%ADguez-garc%C3%ADa/' isExternal >Sergio Rodríguez García</Link></Td>
                   </Tr>
-                  <Tr>
-                    <Td>Jorge Joaquín Gancedo Fernández</Td>
-                    <Td>UO282161</Td>
+                  <Tr _hover={{animation:"zoomIn 0.05s ease-in forwards"}}>
+                    <Td><Avatar name='Jorge Joaquín Gancedo Fernández' src='./img/avatar/avatar-jorge.jpg' /></Td>
+                    <Td><Link href='mailto:[email protected]' isExternal >Jorge Joaquín Gancedo Fernández</Link></Td>
                   </Tr>
-                  <Tr>
-                    <Td>Darío Gutiérrez Mori</Td>
-                    <Td>UO282435</Td>
+                  <Tr _hover={{animation:"zoomIn 0.05s ease-in forwards"}}>
+                    <Td><Avatar name='Dario G. Mori' src='./img/avatar/avatar-dario.jpg'/></Td>
+                    <Td><Link href='https://www.linkedin.com/in/dariogmori/' isExternal >Darío G. Mori </Link></Td>
                   </Tr>
-                  <Tr>
-                    <Td>Sergio Quintana Fernández</Td>
-                    <Td>UO288090</Td>
+                  <Tr _hover={{animation:"zoomIn 0.05s ease-in forwards"}}>
+                    <Td><Avatar name='Sergio Quintana Fernández' src='./img/avatar/avatar-sergioq.jpg' /></Td>
+                    <Td><Link href='https://www.linkedin.com/in/sergio-quintana-fern%C3%A1ndez-b9845a27a/' isExternal >Sergio Quintana Fernández</Link></Td>
                   </Tr>
-                  <Tr>
-                    <Td>Diego Villanueva Berros</Td>
-                    <Td>UO283615</Td>
+                  <Tr _hover={{animation:"zoomIn 0.05s ease-in forwards"}}>
+                    <Td><Avatar name='Diego Villanueva Berros' src='./img/avatar/avatar-diego.jpg' /></Td>
+                    <Td><Link href='https://www.linkedin.com/in/diegovillanuevaberros/' isExternal >Diego Villanueva Berros</Link></Td>
                   </Tr>
-                  <Tr>
-                    <Td>Gonzalo Suárez Losada</Td>
-                    <Td>UO283928</Td>
+                  <Tr _hover={{animation:"zoomIn 0.05s ease-in forwards"}}>
+                    <Td><Avatar name='Gonzalo Suárez Losada' src='./img/avatar/avatar-gonzas.jpg' /></Td>
+                    <Td><Link href='https://www.linkedin.com/in/gonzalo-suarez-losada/' isExternal>Gonzalo Suárez Losada</Link></Td>
                   </Tr>
                 </Tbody>
               </Table>

webapp/src/styles/animations.css

@@ -0,0 +1,8 @@
+@keyframes zoomIn {
+    0% {
+        transform: scale(1);
+    }
+    100% {
+        transform: scale(1.05);
+    }
+}

webapp/src/tests/About.test.js

@@ -27,6 +27,5 @@ describe('About Component', () => {
         const { getByText } = render(<ChakraProvider theme={theme}><MemoryRouter><About /></MemoryRouter></ChakraProvider>);
 
         expect(getByText('Gonzalo Alonso Fernández')).toBeInTheDocument();
-        expect(getByText('UO282104')).toBeInTheDocument();
     });
 });