From 77b80b05d06dfbabb3e9b9d22d7621665090bcff Mon Sep 17 00:00:00 2001
From: Janaina <jsk22@inf.ufpr.br>
Date: Wed, 7 May 2025 10:57:08 -0300
Subject: [PATCH] login working
---
src/app/components/Notifications.js | 6 +++---
src/app/handlers/loginHandler.js | 4 ++--
src/app/perfil/[id]/components/UserCard.js | 5 +++--
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/app/components/Notifications.js b/src/app/components/Notifications.js
index 29711cb5..00cf4c10 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 cf95b8ca..72f45758 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 6780f3ee..fd8b617e 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)
--
GitLab