From b2477cdf4175c63ac44cfb5b0cd3fcfa6edc0b1a Mon Sep 17 00:00:00 2001
From: RubenFern <rubenferval@hotmail.com>
Date: Thu, 18 Apr 2024 17:08:14 +0200
Subject: [PATCH 1/2] icons with authenticated path access do not appear on
 login and register screens

---
 webapp/src/components/nav/Nav.js | 89 +++++++++++++++++++-------------
 1 file changed, 53 insertions(+), 36 deletions(-)

diff --git a/webapp/src/components/nav/Nav.js b/webapp/src/components/nav/Nav.js
index 4a76c162..239db05f 100644
--- a/webapp/src/components/nav/Nav.js
+++ b/webapp/src/components/nav/Nav.js
@@ -149,6 +149,8 @@ export const Nav = () => {
     navigate("/settings");
   };
 
+  const hasToken = localStorage.getItem('token') !== null;
+
   return (
     <Box sx={{ flexGrow: 1 }}>
       <AppBar position="static">
@@ -217,44 +219,59 @@ export const Nav = () => {
           </Menu>
 
           {/** Settings Icon */}
-          <IconButton onClick={openSettings} size="large" color="inherit" data-testid="go-settings">
-            <SettingsIcon style={{ color: color }} />
-          </IconButton>
+          { 
+            hasToken && (
+              <IconButton onClick={openSettings} size="large" color="inherit" data-testid="go-settings">
+                <SettingsIcon style={{ color: color }} />
+              </IconButton>
+            )
+          }
 
           {/* Botón de cuenta */}
-          <IconButton
-            size="large"
-            aria-label="account of current user"
-            aria-controls="account-appbar"
-            aria-haspopup="true"
-            onClick={handleMenuAccountOpen}
-            color="inherit"
-            data-testid="open-account-menu"
-          >
-            <AccountCircle style={{ color: color }} />
-          </IconButton>
-
-          <Menu
-            id="account-appbar"
-            open={openMenuAccount}
-            onClose={handleMenuAccountClose}
-            anchorEl={userAnchor}
-          >
-
-            <MenuItem onClick={profile} data-testid="go-profile">Perfil</MenuItem>
-            <MenuItem onClick={history} data-testid="go-history">Historial</MenuItem>
-            <MenuItem onClick={friends} data-testid="go-friends">Amigos</MenuItem>
-
-          </Menu>
-
-          <IconButton
-            size="large"
-            color="inherit"
-            onClick={logout}
-            data-testid="logout"
-          >
-            <LogoutIcon style={{ color: color }} />
-          </IconButton>
+          { 
+            hasToken && (
+              <>
+              <IconButton
+                size="large"
+                aria-label="account of current user"
+                aria-controls="account-appbar"
+                aria-haspopup="true"
+                onClick={handleMenuAccountOpen}
+                color="inherit"
+                data-testid="open-account-menu"
+              >
+                <AccountCircle style={{ color: color }} />
+              </IconButton>
+
+              <Menu
+                id="account-appbar"
+                open={openMenuAccount}
+                onClose={handleMenuAccountClose}
+                anchorEl={userAnchor}
+              >
+
+                <MenuItem onClick={profile} data-testid="go-profile">Perfil</MenuItem>
+                <MenuItem onClick={history} data-testid="go-history">Historial</MenuItem>
+                <MenuItem onClick={friends} data-testid="go-friends">Amigos</MenuItem>
+
+              </Menu>
+              </>
+            )
+          }
+
+          { /* Logout */ }
+          {
+            hasToken && (
+              <IconButton
+                size="large"
+                color="inherit"
+                onClick={logout}
+                data-testid="logout"
+              >
+                <LogoutIcon style={{ color: color }} />
+              </IconButton>
+            )
+          }
         </Toolbar>
       </AppBar>
     </Box>

From 2223948b5113f9faa901441741bfd2be63d9eb66 Mon Sep 17 00:00:00 2001
From: RubenFern <rubenferval@hotmail.com>
Date: Thu, 18 Apr 2024 17:24:45 +0200
Subject: [PATCH 2/2] fixed transaltions

---
 webapp/src/components/nav/Nav.js | 13 ++++++++-----
 webapp/src/i18n.js               | 10 ++++++++++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/webapp/src/components/nav/Nav.js b/webapp/src/components/nav/Nav.js
index 239db05f..18cb4397 100644
--- a/webapp/src/components/nav/Nav.js
+++ b/webapp/src/components/nav/Nav.js
@@ -19,6 +19,9 @@ import AccountCircle from "@mui/icons-material/AccountCircle";
 import NightlightIcon from "@mui/icons-material/Nightlight";
 import TranslateIcon from "@mui/icons-material/Translate";
 import SettingsIcon from "@mui/icons-material/Settings";
+import AccountCircleIcon from '@mui/icons-material/AccountCircle';
+import HistoryIcon from '@mui/icons-material/History';
+import GroupsIcon from '@mui/icons-material/Groups';
 import i18n from "../../i18n";
 
 
@@ -207,14 +210,14 @@ export const Nav = () => {
               onClick={spanish}
             >
               <span className="fi fi-es mr-1"></span>
-              Español
+              { t('Nav.spanish') }
             </MenuItem>
             <MenuItem
               selected={i18n.language === "en" ? true : false}
               onClick={english}
             >
               <span className="fi fi-gb mr-1"></span>
-              Inglés
+              { t('Nav.english') }
             </MenuItem>
           </Menu>
 
@@ -250,9 +253,9 @@ export const Nav = () => {
                 anchorEl={userAnchor}
               >
 
-                <MenuItem onClick={profile} data-testid="go-profile">Perfil</MenuItem>
-                <MenuItem onClick={history} data-testid="go-history">Historial</MenuItem>
-                <MenuItem onClick={friends} data-testid="go-friends">Amigos</MenuItem>
+                <MenuItem onClick={profile} data-testid="go-profile"><AccountCircleIcon className="mr-1" />{ t('Nav.profile') }</MenuItem>
+                <MenuItem onClick={history} data-testid="go-history"><HistoryIcon className="mr-1"/>{ t('Nav.history') }</MenuItem>
+                <MenuItem onClick={friends} data-testid="go-friends"><GroupsIcon className="mr-1"/>{ t('Nav.friends') }</MenuItem>
 
               </Menu>
               </>
diff --git a/webapp/src/i18n.js b/webapp/src/i18n.js
index e5d8f125..692cebeb 100644
--- a/webapp/src/i18n.js
+++ b/webapp/src/i18n.js
@@ -31,6 +31,11 @@ i18n
                     alertText: 'Your game will end.',
                     alertConfirm: 'Yes, go out',
                     alertCancel: 'No, continue playing',
+                    profile: 'Profile',
+                    history: 'History',
+                    friends: 'Friends',
+                    spanish: 'Spanish',
+                    english: 'English'
                 },
                 Home: {
                     home: 'Home',
@@ -107,6 +112,11 @@ i18n
                     alertText: 'Terminará tu partida.',
                     alertConfirm: 'Sí, salir',
                     alertCancel: 'No, continuar jugando',
+                    profile: 'Perfil',
+                    history: 'Historial',
+                    friends: 'Amigos',
+                    spanish: 'Español',
+                    english: 'Inglés'
                 },
                 Home: {
                     home: 'Inicio',