From 3329e6f02eb642f8fc063e3f27541ff77ebd2673 Mon Sep 17 00:00:00 2001
From: CANCI0 <martinlol831@gmail.com>
Date: Fri, 26 Apr 2024 23:25:05 +0200
Subject: [PATCH] Detalles de integrante de grupo arreglado

---
 webapp/src/components/CustomModal/CustomModal.js | 7 +++++--
 webapp/src/locales/en.json                       | 7 ++++++-
 webapp/src/locales/es.json                       | 7 ++++++-
 webapp/src/pages/Calculadora/Calculadora.js      | 4 ++--
 webapp/src/pages/Clasico/Clasico.js              | 2 +-
 webapp/src/pages/Social/GroupDetails.js          | 6 +++---
 6 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/webapp/src/components/CustomModal/CustomModal.js b/webapp/src/components/CustomModal/CustomModal.js
index 31f1706e..024782ae 100644
--- a/webapp/src/components/CustomModal/CustomModal.js
+++ b/webapp/src/components/CustomModal/CustomModal.js
@@ -1,11 +1,14 @@
 import React from 'react';
 import { Button, Modal, ModalOverlay, ModalContent, ModalHeader, ModalCloseButton, ModalBody, ModalFooter, useDisclosure } from '@chakra-ui/react';
 import { useNavigate } from 'react-router-dom';
+import { useTranslation } from "react-i18next";
 
 const CustomModal = ({ title, text, route }) => {
   const { isOpen, onOpen, onClose } = useDisclosure();
   const navigate = useNavigate();
 
+  const { t } = useTranslation();
+
   return (
     <>
       <Button onClick={onOpen}>{title}</Button>
@@ -21,9 +24,9 @@ const CustomModal = ({ title, text, route }) => {
 
           <ModalFooter>
             <Button variant='ghost' mr={3} onClick={onClose}>
-              Cerrar
+            {t("components.custommodal.close")}
             </Button>
-            <Button colorScheme='blue' onClick={() => navigate(route)}>Jugar</Button>
+            <Button colorScheme='blue' onClick={() => navigate(route)}>{t("components.custommodal.play")}</Button>
           </ModalFooter>
         </ModalContent>
       </Modal>
diff --git a/webapp/src/locales/en.json b/webapp/src/locales/en.json
index 11b00d8c..0879d619 100644
--- a/webapp/src/locales/en.json
+++ b/webapp/src/locales/en.json
@@ -1,5 +1,9 @@
 {
   "components": {
+    "custommodal": {
+      "play": "Jugar",
+      "close": "Cerrar"
+    },
     "footer": {
       "copyright": "Copyright 2024 ® Software Architecture Group 1A"
     },
@@ -87,7 +91,8 @@
       "playAgain": "Play Again",
       "back": "Back to Menu",
       "question": "Question",
-      "time": "Time Remaining:"
+      "time": "Time Remaining:",
+      "send": "Send"
     },
     "config": {
       "title": "Settings",
diff --git a/webapp/src/locales/es.json b/webapp/src/locales/es.json
index 33e57b6b..d8a072d4 100644
--- a/webapp/src/locales/es.json
+++ b/webapp/src/locales/es.json
@@ -1,5 +1,9 @@
 {
   "components": {
+    "custommodal": {
+      "play": "Jugar",
+      "close": "Cerrar"
+    },
     "footer": {
       "copyright": "Copyright 2024 ® Grupo 1A de Arquitectura del Software"
     },
@@ -87,7 +91,8 @@
       "playAgain": "Jugar de nuevo",
       "back": "Volver al menú",
       "question": "Pregunta",
-      "time": "Tiempo restante:"
+      "time": "Tiempo restante:",
+      "send": "Enviar"
     },
     "config": {
       "title": "Configuración",
diff --git a/webapp/src/pages/Calculadora/Calculadora.js b/webapp/src/pages/Calculadora/Calculadora.js
index 5cbbc809..a196ebb4 100644
--- a/webapp/src/pages/Calculadora/Calculadora.js
+++ b/webapp/src/pages/Calculadora/Calculadora.js
@@ -173,7 +173,7 @@ const CalculadoraHumana = () => {
           {juegoTerminado ? (
             <Box textAlign="center">
               <Heading as="h2">{t('pages.humancalculator.finished')}</Heading>
-              <p p={2}>Tu puntuación: {puntuacion}</p>
+              <p p={2}>{t("pages.humancalculator.score")} {puntuacion}</p>
               <Flex flexDirection={"column"}>
                 <Button onClick={handleRepetirJuego} colorScheme="teal" m={2} data-testid="play-again-button">
                   {t('pages.humancalculator.playAgain')}
@@ -198,7 +198,7 @@ const CalculadoraHumana = () => {
               />
               <Button mt={3} onClick={() => handleAnswer(Number(valSubmit))} data-testid="submit-button">
                 {" "}
-                Enviar{" "}
+                {t('pages.humancalculator.send')}{" "}
               </Button>
               <Box textAlign="center" mt={4}>
                 <p>{t('pages.humancalculator.time')} {Math.floor(tiempoRestante)}</p>
diff --git a/webapp/src/pages/Clasico/Clasico.js b/webapp/src/pages/Clasico/Clasico.js
index 194c2344..f1aac13b 100644
--- a/webapp/src/pages/Clasico/Clasico.js
+++ b/webapp/src/pages/Clasico/Clasico.js
@@ -318,7 +318,7 @@ const JuegoPreguntas = () => {
                 <p>
                   {t("pages.classic.time")} {Math.floor(tiempoRestante)}
                 </p>
-                <p>Puntuación: {puntuacion}</p>
+                <p>{t("pages.classic.score")} {puntuacion}</p>
                 <Box w="100%" bg="gray.100" borderRadius="lg" mt={4}>
                   <Box
                     bg="teal.500"
diff --git a/webapp/src/pages/Social/GroupDetails.js b/webapp/src/pages/Social/GroupDetails.js
index 91acc6ee..42ac867a 100644
--- a/webapp/src/pages/Social/GroupDetails.js
+++ b/webapp/src/pages/Social/GroupDetails.js
@@ -18,7 +18,7 @@ import {
 import Nav from "../../components/Nav/Nav.js";
 import Footer from "../../components/Footer/Footer.js";
 import { useTranslation } from "react-i18next";
-import Perfil from "../../components/Profile/Profile.js";
+import Profile from "../../components/Profile/Profile.js";
 
 
 const GroupDetails = () => {
@@ -55,7 +55,7 @@ const GroupDetails = () => {
   };
 
   const redirectToProfile = (member) => {
-    navigate(`/perfil/${member.username}`);
+    setUser(member);
   };
 
 
@@ -63,7 +63,7 @@ const GroupDetails = () => {
     return (
       <>
         <Nav />
-        <Perfil username={user} />
+        <Profile username={user} />
         <Button p={"1rem"} mb={"1rem"} onClick={() => setUser("")}>Volver</Button>
         <Footer />
       </>