From 214840355e4c65d6f22390124e435f3ca19ff556 Mon Sep 17 00:00:00 2001
From: iyanfdezz <uo288231@uniovi.es>
Date: Thu, 11 Apr 2024 18:15:38 +0200
Subject: [PATCH 1/7] Internacionalizado GroupDetails

---
 webapp/src/locales/es.json              | 12 ++++++++++++
 webapp/src/pages/Social/GroupDetails.js | 19 +++++++++++--------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/webapp/src/locales/es.json b/webapp/src/locales/es.json
index fab14a9d..d1279bf7 100644
--- a/webapp/src/locales/es.json
+++ b/webapp/src/locales/es.json
@@ -199,6 +199,18 @@
       "profile": "Ver perfil",
       "delete": "Eliminar amigo",
       "noFriends": "No tienes amigos actualmente."
+    },
+    "groupdetails": {
+      "details":"Detalles del grupo",
+      "loading": "Cargando...",
+      "createdBy": "Creado por",
+      "when": "el",
+      "participants": "Participantes",
+      "avatar":"Avatar",
+      "name":"Nombre",
+      "viewProfile": "Ver perfil",
+      "loadingText": "Se está consultando su búsqueda, espere unos instantes.",
+      "noParticipants": "No hay participantes en este grupo."
     }
   }
 }
diff --git a/webapp/src/pages/Social/GroupDetails.js b/webapp/src/pages/Social/GroupDetails.js
index cba5e34b..d3c3b3be 100644
--- a/webapp/src/pages/Social/GroupDetails.js
+++ b/webapp/src/pages/Social/GroupDetails.js
@@ -4,8 +4,10 @@ import axios from 'axios';
 import { Container, Box, Text, Heading, Table, Thead, Tbody, Tr, Th, Td, Avatar, Link } from '@chakra-ui/react';
 import Nav from "../../components/Nav/Nav.js";
 import Footer from "../../components/Footer/Footer.js";
+import { useTranslation } from "react-i18next";
 
 const GroupDetails = () => {
+  const { t } = useTranslation();
   const [group, setGroup] = useState(null);
   const { groupName } = useParams();
   const apiEndpoint = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
@@ -32,20 +34,21 @@ const GroupDetails = () => {
     <>
       <Nav/>
       <Container maxW="md" mt="5">
-        <Heading as="h1" mb="5">Detalles del grupo: {groupName}</Heading>
+        <Heading as="h1" mb="5">{t('pages.groupdetails.details')} {groupName}</Heading>
         {group ? (
           <Box>
             <Text fontSize="lg" fontWeight="bold" mb="4">
-              Creado por {group.members.length > 0 ? group.members[0] : ''} el {new Date(group.createdAt).toLocaleDateString()}
+            {t('pages.groupdetails.createdBy')} {group.members.length > 0 ? group.members[0] : ''} 
+            {t('pages.groupdetails.when')} {new Date(group.createdAt).toLocaleDateString()}
             </Text>
   
-            <Text fontSize="lg" fontWeight="bold" mb="2">Participantes ({group.members.length}) :</Text>
+            <Text fontSize="lg" fontWeight="bold" mb="2">{t('pages.groupdetails.participants')} ({group.members.length}) :</Text>
             <Table variant="striped">
               <Thead>
                 <Tr>
-                  <Th>Avatar</Th>
-                  <Th>Nombre</Th>
-                  <Th>Ver perfil</Th>
+                  <Th>{t('pages.groupdetails.avatar')}</Th>
+                  <Th>{t('pages.groupdetails.name')}</Th>
+                  <Th>{t('pages.groupdetails.viewProfile')}</Th>
                 </Tr>
               </Thead>
               <Tbody>
@@ -56,7 +59,7 @@ const GroupDetails = () => {
                     </Td>
                     <Td>{member}</Td>
                     <Td>
-                      <Link color="blue.500" onClick={() => redirectToProfile(member)}>Ver perfil</Link>
+                      <Link color="blue.500" onClick={() => redirectToProfile(member)}>{t('pages.groupdetails.viewProfile')}</Link>
                     </Td>
                   </Tr>
                 ))}
@@ -64,7 +67,7 @@ const GroupDetails = () => {
             </Table>
           </Box>
         ) : (
-          <Text>Loading...</Text>
+          <Text>{t('pages.groupdetails.loading')}</Text>
         )}
       </Container>
       <Footer/>

From 726bbbf089f0a6f46d428d006ade19456ec4a893 Mon Sep 17 00:00:00 2001
From: iyanfdezz <uo288231@uniovi.es>
Date: Thu, 11 Apr 2024 18:24:18 +0200
Subject: [PATCH 2/7] Internacionalizada vista Grupos

---
 webapp/src/locales/es.json        | 13 +++++++++++++
 webapp/src/pages/Social/Groups.js | 18 ++++++++++--------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/webapp/src/locales/es.json b/webapp/src/locales/es.json
index d1279bf7..8df523ac 100644
--- a/webapp/src/locales/es.json
+++ b/webapp/src/locales/es.json
@@ -211,6 +211,19 @@
       "viewProfile": "Ver perfil",
       "loadingText": "Se está consultando su búsqueda, espere unos instantes.",
       "noParticipants": "No hay participantes en este grupo."
+    },
+    "groups": {
+      "title": "Crea un grupo",
+      "name": "Nombre",
+      "create": "Crear",
+      "errorPrefix": "Error: ",
+      "joinable": "Grupos a los que puedes unirte",
+      "groupName": "Nombre del grupo",
+      "creationDate": "Fecha de creación",
+      "creator": "Creador",
+      "join": "Unirse al grupo",
+      "noGroups": "No hay grupos disponibles para unirse."
     }
+      
   }
 }
diff --git a/webapp/src/pages/Social/Groups.js b/webapp/src/pages/Social/Groups.js
index fec56044..c6ed78a5 100644
--- a/webapp/src/pages/Social/Groups.js
+++ b/webapp/src/pages/Social/Groups.js
@@ -3,8 +3,10 @@ import axios from 'axios';
 import { Box, Container, Text, Button, Input, InputGroup, InputRightElement, Alert, Table, Thead, Tbody, Tr, Th, Td } from '@chakra-ui/react';
 import Nav from "../../components/Nav/Nav.js";
 import Footer from "../../components/Footer/Footer.js";
+import { useTranslation } from "react-i18next";
 
 const Groups = () => {
+  const { t } = useTranslation();
   const [groups, setGroups] = useState([]);
   const [name, setName] = useState('');
   const [error, setError] = useState('');
@@ -69,7 +71,7 @@ const Groups = () => {
       <Nav />
       <Container maxW="md" mt="5">
         <Box mb="5">
-          <Text fontSize="2xl" fontWeight="bold" mb="4">Crea un grupo</Text>
+          <Text fontSize="2xl" fontWeight="bold" mb="4">{t('pages.groups.title')}</Text>
           <Box display="flex" alignItems="center">
             <InputGroup flex="1" mr="4">
               <Input
@@ -79,7 +81,7 @@ const Groups = () => {
                 onChange={(e) => setName(e.target.value)}
               />
             </InputGroup>
-            <Button colorScheme="blue" onClick={addGroup}>Crear</Button>
+            <Button colorScheme="blue" onClick={addGroup}>{t('pages.groups.create')}</Button>
           </Box>
           {error && (
             <Alert status="error" variant="subtle" mt="2">
@@ -89,14 +91,14 @@ const Groups = () => {
         </Box>
   
         <Box mt="4">
-          <Text fontSize="3xl" fontWeight="bold" mb="4">Grupos a los que puedes unirte</Text>
+          <Text fontSize="3xl" fontWeight="bold" mb="4">{t('pages.groups.joinable')}</Text>
           <Table variant="simple">
             <Thead>
               <Tr>
-                <Th>Nombre del grupo</Th>
-                <Th>Fecha de creación</Th>
-                <Th>Creador</Th>
-                <Th>Unirse al grupo</Th>
+                <Th>{t('pages.groups.groupName')}</Th>
+                <Th>{t('pages.groups.creationDate')}</Th>
+                <Th>{t('pages.groups.creator')}</Th>
+                <Th>{t('pages.groups.join')}</Th>
               </Tr>
             </Thead>
             <Tbody>
@@ -106,7 +108,7 @@ const Groups = () => {
                   <Td>{new Date(group.createdAt).toLocaleDateString()}</Td>
                   <Td>{group.members.length > 0 ? group.members[0] : ''}</Td>
                   <Td>
-                    <Button colorScheme="blue" onClick={() => handleJoinGroup(group._id)}>Unirme</Button>
+                    <Button colorScheme="blue" onClick={() => handleJoinGroup(group._id)}>{t('pages.groups.join')}</Button>
                   </Td>
                 </Tr>
               ))}

From 87fa2661b09fc9a2524298b3552a955bf99eddfa Mon Sep 17 00:00:00 2001
From: iyanfdezz <uo288231@uniovi.es>
Date: Thu, 11 Apr 2024 18:25:36 +0200
Subject: [PATCH 3/7] Generalizando las cabeceras de las tablas de grupos

---
 webapp/src/locales/es.json        | 8 +++++---
 webapp/src/pages/Social/Groups.js | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/webapp/src/locales/es.json b/webapp/src/locales/es.json
index 8df523ac..50fe8d59 100644
--- a/webapp/src/locales/es.json
+++ b/webapp/src/locales/es.json
@@ -218,11 +218,13 @@
       "create": "Crear",
       "errorPrefix": "Error: ",
       "joinable": "Grupos a los que puedes unirte",
-      "groupName": "Nombre del grupo",
-      "creationDate": "Fecha de creación",
-      "creator": "Creador",
       "join": "Unirse al grupo",
       "noGroups": "No hay grupos disponibles para unirse."
+    },
+    "groupsTable": {
+      "groupName": "Nombre del grupo",
+      "creationDate": "Fecha de creación",
+      "creator": "Creador"
     }
       
   }
diff --git a/webapp/src/pages/Social/Groups.js b/webapp/src/pages/Social/Groups.js
index c6ed78a5..78e16db3 100644
--- a/webapp/src/pages/Social/Groups.js
+++ b/webapp/src/pages/Social/Groups.js
@@ -95,9 +95,9 @@ const Groups = () => {
           <Table variant="simple">
             <Thead>
               <Tr>
-                <Th>{t('pages.groups.groupName')}</Th>
-                <Th>{t('pages.groups.creationDate')}</Th>
-                <Th>{t('pages.groups.creator')}</Th>
+                <Th>{t('pages.groupsTable.groupName')}</Th>
+                <Th>{t('pages.groupsTable.creationDate')}</Th>
+                <Th>{t('pages.groupsTable.creator')}</Th>
                 <Th>{t('pages.groups.join')}</Th>
               </Tr>
             </Thead>

From d88df2f35843112a09fff791353205993c8d93bb Mon Sep 17 00:00:00 2001
From: iyanfdezz <uo288231@uniovi.es>
Date: Thu, 11 Apr 2024 18:31:55 +0200
Subject: [PATCH 4/7] Internacionalizada vista UserGroup

---
 webapp/src/locales/es.json            |  6 ++++++
 webapp/src/pages/Social/UserGroups.js | 14 ++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/webapp/src/locales/es.json b/webapp/src/locales/es.json
index 50fe8d59..c166bea7 100644
--- a/webapp/src/locales/es.json
+++ b/webapp/src/locales/es.json
@@ -225,6 +225,12 @@
       "groupName": "Nombre del grupo",
       "creationDate": "Fecha de creación",
       "creator": "Creador"
+    },
+    "usergroups": {
+      "title":"Tus grupos",
+      "seegroup": "Ver grupo",
+      "creationDate": "Fecha de creación",
+      "creator": "Creador"
     }
       
   }
diff --git a/webapp/src/pages/Social/UserGroups.js b/webapp/src/pages/Social/UserGroups.js
index e20457b4..edc8a2a9 100644
--- a/webapp/src/pages/Social/UserGroups.js
+++ b/webapp/src/pages/Social/UserGroups.js
@@ -4,8 +4,10 @@ import { Box, Container, Text, Button, Table, Thead, Tbody, Tr, Th, Td } from '@
 import Nav from "../../components/Nav/Nav.js";
 import Footer from "../../components/Footer/Footer.js";
 import { useNavigate } from "react-router-dom";
+import { useTranslation } from "react-i18next";
 
 const UserGroups = () => {
+  const { t } = useTranslation();
   const [groups, setGroups] = useState([]);
   const [name, setName] = useState('');
   const [error, setError] = useState('');
@@ -40,14 +42,14 @@ const UserGroups = () => {
       <Nav />
       <Container maxW="xs" mt="5" textAlign="center">
         <Box mt="5">
-          <Text fontSize="3xl" fontWeight="bold" mb="4">Tus grupos</Text>
+          <Text fontSize="3xl" fontWeight="bold" mb="4">{t('pages.usergroups.title')}</Text>
           <Table variant="simple" mx="auto">
             <Thead>
               <Tr>
-                <Th>Nombre del grupo</Th>
-                <Th>Creador</Th>
-                <Th>Fecha de creación</Th>
-                <Th>Ver grupo</Th>
+                <Th>{t('pages.groupsTable.groupName')}</Th>
+                <Th>{t('pages.groupsTable.creationDate')}</Th>
+                <Th>{t('pages.groupsTable.creator')}</Th>
+                <Th>{t('pages.usergroups.seegroup')}</Th>
               </Tr>
             </Thead>
             <Tbody>
@@ -57,7 +59,7 @@ const UserGroups = () => {
                   <Td>{group.members.length > 0 ? group.members[0] : ''}</Td>
                   <Td>{new Date(group.createdAt).toLocaleDateString()}</Td>
                   <Td>
-                    <Button colorScheme="blue" onClick={() => seeGroupDetails(group.name)}>Ver grupo</Button>
+                    <Button colorScheme="blue" onClick={() => seeGroupDetails(group.name)}>{t('pages.usergroups.seegroup')}</Button>
                   </Td>
                 </Tr>
               ))}

From a926b1b1c763fdfcbe15524b895191fada566ff4 Mon Sep 17 00:00:00 2001
From: iyanfdezz <uo288231@uniovi.es>
Date: Thu, 11 Apr 2024 18:34:32 +0200
Subject: [PATCH 5/7] =?UTF-8?q?Traducci=C3=B3n=20a=20ingl=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webapp/src/locales/en.json | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/webapp/src/locales/en.json b/webapp/src/locales/en.json
index fa0bcdeb..f3cb9ebf 100644
--- a/webapp/src/locales/en.json
+++ b/webapp/src/locales/en.json
@@ -199,6 +199,38 @@
       "profile": "View Profile",
       "delete": "Delete Friend",
       "noFriends": "You currently have no friends."
+    },
+    "groupdetails": {
+      "details": "Group details",
+      "loading": "Loading...",
+      "createdBy": "Created by",
+      "when": "on the",
+      "participants": "Participants",
+      "avatar": "Avatar",
+      "name": "Name",
+      "viewProfile": "View profile",
+      "loadingText": "Your search is being processed, please wait a moment.",
+      "noParticipants": "There are no participants in this group."
+    },
+    "groups": {
+      "title": "Create a group",
+      "name": "Name",
+      "create": "Create",
+      "errorPrefix": "Error: ",
+      "joinable": "Groups you can join",
+      "join": "Join group",
+      "noGroups": "There are no groups available to join."
+    },
+    "groupsTable": {
+      "groupName": "Group name",
+      "creationDate": "Creation date",
+      "creator": "Creator"
+    },
+    "usergroups": {
+      "title": "Your groups",
+      "seegroup": "See group",
+      "creationDate": "Creation date",
+      "creator": "Creator"
     }
   }
 }

From 6cff1ee6ca60a4cfec1cfe4a80786d2f93de992e Mon Sep 17 00:00:00 2001
From: iyanfdezz <uo288231@uniovi.es>
Date: Thu, 11 Apr 2024 18:49:59 +0200
Subject: [PATCH 6/7] =?UTF-8?q?Internacionalizaci=C3=B3n=20Grupos=20en=20N?=
 =?UTF-8?q?av?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webapp/src/components/Nav/Nav.js  | 4 ++--
 webapp/src/locales/en.json        | 2 ++
 webapp/src/locales/es.json        | 2 ++
 webapp/src/pages/Social/Groups.js | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/webapp/src/components/Nav/Nav.js b/webapp/src/components/Nav/Nav.js
index ebf626c9..e9d15098 100644
--- a/webapp/src/components/Nav/Nav.js
+++ b/webapp/src/components/Nav/Nav.js
@@ -184,7 +184,7 @@ const Nav = () => {
                   onClick={() => handleNavigate("/social/grupos")}
                   color={textColor}
                 >
-                  Grupos
+                  {t("components.nav.groups")}
                 </Text>
                 <Text
                   data-testid="mygroups"
@@ -192,7 +192,7 @@ const Nav = () => {
                   onClick={() => handleNavigate("/social/misgrupos")}
                   color={textColor}
                 >
-                  Mis grupos
+                  {t("components.nav.usergroups")}
                 </Text>
               </PopoverBody>
             </PopoverContent>
diff --git a/webapp/src/locales/en.json b/webapp/src/locales/en.json
index f3cb9ebf..5b23eddc 100644
--- a/webapp/src/locales/en.json
+++ b/webapp/src/locales/en.json
@@ -22,6 +22,8 @@
       "humancalculator": "Human Calculator",
       "users": "Users",
       "social": "Social",
+      "groups": "Groups",
+      "usergroups": "My groups",
       "friends": "Friends",
       "stats": "Statistics",
       "ranking": "Ranking",
diff --git a/webapp/src/locales/es.json b/webapp/src/locales/es.json
index c166bea7..9b050c38 100644
--- a/webapp/src/locales/es.json
+++ b/webapp/src/locales/es.json
@@ -22,6 +22,8 @@
       "humancalculator": "Calculadora humana",
       "users": "Usuarios",
       "social": "Social",
+      "groups": "Grupos",
+      "usergroups": "Mis grupos",
       "friends": "Amigos",
       "stats": "Estadísticas",
       "ranking": "Ranking",
diff --git a/webapp/src/pages/Social/Groups.js b/webapp/src/pages/Social/Groups.js
index 78e16db3..5b9ad6b7 100644
--- a/webapp/src/pages/Social/Groups.js
+++ b/webapp/src/pages/Social/Groups.js
@@ -76,7 +76,7 @@ const Groups = () => {
             <InputGroup flex="1" mr="4">
               <Input
                 name="name"
-                placeholder="Nombre"
+                placeholder={t('pages.groups.name')}
                 value={name}
                 onChange={(e) => setName(e.target.value)}
               />

From d21861622e8ed6e5869c50eb6d0d963785e6deb1 Mon Sep 17 00:00:00 2001
From: iyanfdezz <uo288231@uniovi.es>
Date: Thu, 11 Apr 2024 18:51:25 +0200
Subject: [PATCH 7/7] =?UTF-8?q?A=C3=B1adiendo=20enlaces=20a=20grupos=20en?=
 =?UTF-8?q?=20el=20desplegable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/webapp/src/components/Nav/Nav.js b/webapp/src/components/Nav/Nav.js
index e9d15098..f02b01c7 100644
--- a/webapp/src/components/Nav/Nav.js
+++ b/webapp/src/components/Nav/Nav.js
@@ -315,6 +315,12 @@ const Nav = () => {
                       <Link href="/social/amigos">
                         {t("components.nav.friends")}
                       </Link>
+                      <Link href="/social/grupos">
+                        {t("components.nav.groups")}
+                      </Link>
+                      <Link href="/social/misgrupos">
+                        {t("components.nav.usergroups")}
+                      </Link>
                       <Link href="/stats">{t("components.nav.stats")}</Link>
                       <Link href="/ranking">{t("components.nav.ranking")}</Link>
                     </Flex>