diff --git a/src/app/components/Notifications.js b/src/app/components/Notifications.js index 29711cb5bf1706b4655eeef59dd74dfa2d914725..00cf4c1051b1c7826640ea6b12833aea3a928aee 100644 --- a/src/app/components/Notifications.js +++ b/src/app/components/Notifications.js @@ -1,5 +1,5 @@ import mecredApi from "@/axiosConfig"; -import { authHeaders, useLoginBarrier } from "@/app/handlers/loginHandler"; +import { authHeaders, useLoggedIn, useLoginBarrier } from "@/app/handlers/loginHandler"; import { getStoredValue } from "@/app/handlers/localStorageHandler"; import { useEffect, useState } from 'react' import ModalNotifications from "./ModalNotifications"; @@ -9,9 +9,9 @@ export default function Notifications({id}) { const [countNotifications, setCountNotifications] = useState(null); const loginBarrier = useLoginBarrier() - + const loggedIn = useLoggedIn() useEffect(() => { - if (!loginBarrier()) + if (!loggedIn) return const getNotifications = async () => { await mecredApi diff --git a/src/app/handlers/loginHandler.js b/src/app/handlers/loginHandler.js index cf95b8ca055fff905c441a16f41cf79e5f05c17c..72f45758f169f35703810fd5c4c2dc80752aafff 100644 --- a/src/app/handlers/loginHandler.js +++ b/src/app/handlers/loginHandler.js @@ -14,9 +14,9 @@ export function useLoginBarrier() { const pathname = usePathname(); const searchParams = useSearchParams(); const router = useRouter(); - + return useCallback(() => { - if (!localStorage.getItem('token')) return true; + if (localStorage.getItem('token')) return true; const params = new URLSearchParams(); params.set("redirect", pathname); diff --git a/src/app/perfil/[id]/components/UserCard.js b/src/app/perfil/[id]/components/UserCard.js index 6780f3ee9c7577d4039830331ae8806028849b6f..fd8b617e9836bfa16f98282996364e46366087cf 100644 --- a/src/app/perfil/[id]/components/UserCard.js +++ b/src/app/perfil/[id]/components/UserCard.js @@ -7,7 +7,7 @@ import { Avatar } from '@mui/material'; import { useEffect, useState } from 'react'; import { getStoredValue } from '@/app/handlers/localStorageHandler'; import mecredApi, { mecredURL } from '@/axiosConfig'; -import { authHeaders, isLoggedIn, userData } from '@/app/handlers/loginHandler'; +import { authHeaders, isLoggedIn, useLoggedIn, userData } from '@/app/handlers/loginHandler'; import Stats from './Stats'; import MedalAchievements from './MedalAchievements'; import AboutCard from "./AboutCard"; @@ -108,12 +108,13 @@ export default function UserCard({ profileData, idLogin, achievements, progresse const [medalActive, setMedalActive] = useState(0) const [profileInfo, setProfileInfo] = useState("") + const loggedIn = useLoggedIn() /** * faz fetch dos seguidores e seguindo, se não estiver logado não aparece essa informação */ useEffect(() => { - if (!isLoggedIn) + if (!loggedIn) return; setProfileInfo(userData()["user"]) console.log(profileData)