Perfil desparametrizado, ya funcionan los perfiles de amigos

Arquisoft · Apr 26, 2024 · dfd2533 · dfd2533
1 parent f18938b
commit dfd2533
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/webapp/src/App.js b/webapp/src/App.js
@@ -48,7 +48,7 @@ function App() {
           <Route path="/social/misgrupos" element={<UserGroups />} />
           <Route path="/social/grupo/:groupName" element={<GroupDetails />} />
 
-          <Route path="/perfil/:user" element={<Perfil />} />
+          <Route path="/perfil" element={<Perfil />} />
           <Route path="/history" element={<History />} />
           <Route path="/config" element={<Config />} />
         </Route>

diff --git a/webapp/src/App.test.js b/webapp/src/App.test.js
@@ -137,7 +137,7 @@ describe("Nav Component", () => {
     const perfilButton = screen.getByText("Mi perfil");
     fireEvent.click(perfilButton);
 
-    expect(window.location.pathname).toBe("/perfil/testuser");
+    expect(window.location.pathname).toBe("/perfil");
   });
 
   test("navigates to /sobre when Sobre nosotros button is clicked", () => {

diff --git a/webapp/src/components/Nav/Nav.js b/webapp/src/components/Nav/Nav.js
@@ -246,7 +246,7 @@ const Nav = () => {
           </MenuButton>
           <MenuList>
             <MenuGroup title={t("components.nav.profile")}>
-              <MenuItem onClick={() => handleNavigate(`/perfil/${username}`)}>
+              <MenuItem onClick={() => handleNavigate("/perfil")}>
                 {t("components.nav.myprofile")}
               </MenuItem>
               <MenuItem onClick={() => handleNavigate("/history")}>

diff --git a/webapp/src/components/Profile/Profile.js b/webapp/src/components/Profile/Profile.js
@@ -10,8 +10,10 @@ const Profile = (user) => {
 
   const { t } = useTranslation();
 
+  const username =  (user && user.username) || localStorage.getItem("username");
+
   useEffect(() => {
-    fetch(gatewayUrl + `/userInfo/${user.username}`)
+    fetch(gatewayUrl + `/userInfo/${username}`)
       .then((response) => response.json())
       .then((data) => {
         setUserData(data);
@@ -42,7 +44,7 @@ const Profile = (user) => {
               <>
                 {userData && (
                   <>
-                    <Avatar name={user.username} />
+                    <Avatar name={username} />
                     <Text justifyContent={"center"}>
                       <strong>{t('components.profile.name')}</strong> {userData.username}
                     </Text>

diff --git a/webapp/src/pages/Perfil/Perfil.js b/webapp/src/pages/Perfil/Perfil.js
@@ -9,7 +9,7 @@ const Perfil = () => {
   return (
     <>
       <Nav />
-      <Profile username={username.username}/>
+      <Profile username={username}/>
       <Footer />
     </>
   );