diff --git a/src/app/components/AcessibilityBar.js b/src/app/components/AcessibilityBar.js index f9d65c046290586e581ce94a5a196b6c5137fb40..28a87386606a0660e6aad42d144066b5bbf986cf 100644 --- a/src/app/components/AcessibilityBar.js +++ b/src/app/components/AcessibilityBar.js @@ -179,7 +179,7 @@ export default function AcessibilityBar() { </button> {!loggedIn && - <button onClick={() => router.push("/entrar")}> + <button className='font-light' onClick={() => router.push("/entrar")}> 4- Ir para login. </button> } @@ -224,7 +224,7 @@ export default function AcessibilityBar() { </button> {!loggedIn && - <button onClick={() => router.push("/entrar")}> + <button className='font-light' onClick={() => router.push("/entrar")}> 2- Ir para login. </button> } diff --git a/src/app/components/FiltersModal.js b/src/app/components/FiltersModal.js index c9d23a3fd0968b491743be5c3241cead619b6eb8..deb92008225133e335b816cb1a61d3563fc134c3 100644 --- a/src/app/components/FiltersModal.js +++ b/src/app/components/FiltersModal.js @@ -49,7 +49,7 @@ export default function FiltersModal({ <p className=' text-2xl font-bold text-darkGray-HC-white '> Filtros de Pesquisa </p> - <CloseIcon onClick={handleClose} sx={{ color: "#6c8080", fontSize: "35px" }} /> + <CloseIcon className="cursor-pointer" onClick={handleClose} sx={{ color: "#6c8080", fontSize: "35px" }} /> </div> </div> <div className='p-6'> @@ -80,4 +80,4 @@ export default function FiltersModal({ </div> </div> ); -} \ No newline at end of file +} diff --git a/src/app/components/Header.js b/src/app/components/Header.js index b90f9a66d38fee8b9f91b05e2d4c1eb60c829d6f..62d9ef58f553dae4f4f1725d1a1c8bb26479abe3 100644 --- a/src/app/components/Header.js +++ b/src/app/components/Header.js @@ -98,7 +98,7 @@ function DefaultContent({ <> <Notifications /> - <p className="max-md:hidden"><AccountMenu /></p> + <div className="max-md:hidden"><AccountMenu /></div> </> ) : ( <button diff --git a/src/app/components/MenuProfile.js b/src/app/components/MenuProfile.js index ecf44986c27ac926ea946a8691fa5bb933320fe8..d21368ba3556d7ed1e344af404967f9161c6170a 100644 --- a/src/app/components/MenuProfile.js +++ b/src/app/components/MenuProfile.js @@ -106,14 +106,6 @@ export default function AccountMenu() { window.location.reload(); }; - useEffect(() => { - let token = getStoredValue("access_token"); - if (token) { - let user = getStoredValue("user_data"); - setDataUser(JSON.parse(user)); - } - }, []); - return ( <> {loggedIn ? ( diff --git a/src/app/components/NavigationBar.js b/src/app/components/NavigationBar.js index d387ed9b983fad643bc777d5a50bf6731b37a59f..c97b63a8d4f829987c206ed5b82e17b51c3dd61d 100644 --- a/src/app/components/NavigationBar.js +++ b/src/app/components/NavigationBar.js @@ -41,6 +41,7 @@ const navItems = [ export default function NavigationBar({ mobileSearch }) { const [id, setId] = useState(null); const [needLoginOpen, setNeedLoginOpen] = useState(false); + const [loggedIn, setLoggedIn] = useState(false); const pathname = usePathname(); const searchParams = useSearchParams(); @@ -49,6 +50,7 @@ export default function NavigationBar({ mobileSearch }) { useEffect(() => { if (isLoggedIn()) { const userData = getStoredValue("user_data"); + setLoggedIn(true); if (userData) { const data = JSON.parse(userData); setId(data["id"]); @@ -115,9 +117,9 @@ export default function NavigationBar({ mobileSearch }) { <li key={index} className="flex w-20 flex-col items-center justify-center p-3"> <Link href={ - item.label === "Publicar" && !isLoggedIn() + item.label === "Publicar" && !loggedIn ? "#" - : item.label === "perfil" && isLoggedIn() + : item.label === "perfil" && loggedIn ? `/perfil/${id}` : getHref(item.href) } diff --git a/src/app/components/SideBar.js b/src/app/components/SideBar.js index 6228bae6835e9a989291a90b541527b62bfa4f75..0750b20c50bf6512e21f31467f6deb3e92478263 100644 --- a/src/app/components/SideBar.js +++ b/src/app/components/SideBar.js @@ -152,7 +152,7 @@ export default function SideBar({ setFilterState, filterState }) { <div className="max-md:hidden min-h-0 overflow-y-auto flex flex-col text-darkGray-HC-white-underline font-light"> <div className="flex flex-col justify-start items-center gap-2 w-full mb-5"> {acessoRapido - .filter(item => isLoggedIn() || (item.title !== "Sair" && item.href !== "/perfil")) + .filter(item => loggedIn || (item.title !== "Sair" && item.href !== "/perfil")) .map((item, index) => { return ( <Link @@ -179,4 +179,4 @@ export default function SideBar({ setFilterState, filterState }) { </div> </> ); -} \ No newline at end of file +} diff --git a/src/app/components/needLoginModal.js b/src/app/components/needLoginModal.js index fbc83a33bde745424bd95e7c950eef58198438ae..875cda90947b6595cc2413a053a9e9ef914720d5 100644 --- a/src/app/components/needLoginModal.js +++ b/src/app/components/needLoginModal.js @@ -7,7 +7,7 @@ export default function NeedLoginModal({ open, setOpen }) { return ( <> <Modal - open={open && isLoggedIn} + open={open} className="grid h-screen place-items-center m-5" onClose={() => setOpen(false)} slotProps={{