From 1d2e9c3d12beb56efe96e4d0dd1e0e4b89144826 Mon Sep 17 00:00:00 2001 From: hanif salafi Date: Mon, 25 Nov 2024 10:56:02 +0700 Subject: [PATCH 1/3] feat: update qudo login --- components/form/qudo-login.tsx | 30 +++--------------------- components/layout/navbar/NavbarHumas.tsx | 3 ++- components/layout/sidebar/sidebar.tsx | 3 ++- 3 files changed, 7 insertions(+), 29 deletions(-) diff --git a/components/form/qudo-login.tsx b/components/form/qudo-login.tsx index 8e5beaa..1bbb38a 100644 --- a/components/form/qudo-login.tsx +++ b/components/form/qudo-login.tsx @@ -59,13 +59,7 @@ export default function QudoLogin() { const dateTime: any = new Date(); const newTime: any = dateTime.getTime() + 10 * 60 * 1000; - Cookies.set("access_token", access_token, { - expires: 1, - }); - Cookies.set("refresh_token", refresh_token, { - expires: 1, - }); - Cookies.set("time_refresh", newTime, { + Cookies.set("is_authenticated", "true", { expires: 1, }); Cookies.set("is_first_login", "true", { @@ -86,27 +80,9 @@ export default function QudoLogin() { Cookies.set("username", profile?.data?.data?.username, { expires: 1, }); - Cookies.set("urie", profile?.data?.data?.roleId, { - expires: 1, - }); - Cookies.set("roleName", profile?.data?.data?.roleName, { - expires: 1, - }); - Cookies.set("masterPoldaId", profile?.data?.data?.masterPoldaId, { - expires: 1, - }); - Cookies.set("ulne", profile?.data?.data?.roleLevelNumber, { - expires: 1, - }); - Cookies.set("urce", profile?.data?.data?.roleCode, { - expires: 1, - }); - Cookies.set("email", profile?.data?.data?.email, { - expires: 1, - }); close(); - router.push("/admin/dashboard"); + router.push("/"); Cookies.set("status", "login", { expires: 1, }); @@ -208,7 +184,7 @@ export default function QudoLogin() { )} } - type={isVisible ? "text" : "password" && typePass} + type={isVisible ? "text" : typePass} classNames={{ input: ["w-full", "bg-slate-100", "!text-black", "rounded-sm"], mainWrapper: [ diff --git a/components/layout/navbar/NavbarHumas.tsx b/components/layout/navbar/NavbarHumas.tsx index 6952632..56ef4f0 100644 --- a/components/layout/navbar/NavbarHumas.tsx +++ b/components/layout/navbar/NavbarHumas.tsx @@ -56,9 +56,10 @@ export default function NavbarHumas() { const router = useRouter(); const token = Cookies.get("access_token"); + const isAuthenticated = Cookies.get("is_authenticated"); useEffect(() => { - if (!token) { + if (!isAuthenticated) { onLogout(); } }, [token]); diff --git a/components/layout/sidebar/sidebar.tsx b/components/layout/sidebar/sidebar.tsx index 5113728..0cb9a51 100644 --- a/components/layout/sidebar/sidebar.tsx +++ b/components/layout/sidebar/sidebar.tsx @@ -215,9 +215,10 @@ const Sidebar: React.FC = ({ updateSidebarData }) => { const [sidebarMenu, setSidebarMenu] = useState(); const { isOpen, toggleSidebar } = useSidebar(); const token = Cookies.get("access_token"); + const isAuthenticated = Cookies.get("is_authenticated"); useEffect(() => { - if (!token) { + if (!isAuthenticated) { onLogout(); } }, [token]); From 776747c75d73c955b888ec4f2f9fd317170cc4bf Mon Sep 17 00:00:00 2001 From: hanif salafi Date: Mon, 25 Nov 2024 11:16:52 +0700 Subject: [PATCH 2/3] feat: update login flow --- app/auth/page.tsx | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/app/auth/page.tsx b/app/auth/page.tsx index bab07f2..d42d7ce 100644 --- a/app/auth/page.tsx +++ b/app/auth/page.tsx @@ -1,8 +1,28 @@ +"use client" + import Login from "@/components/form/login"; import QudoLogin from "@/components/form/qudo-login"; -import React from "react"; +import Cookies from "js-cookie"; +import React, { useEffect, useState } from "react"; export default function AuthPage() { - // return ; - return ; + + const isAuthenticated = Cookies.get("is_authenticated") || "false"; + + console.log("isAuthenticated : ", isAuthenticated); + + const [hasMounted, setHasMounted] = useState(false); + + useEffect(() => { + setHasMounted(true); + }, []); + + // Render + if (!hasMounted) return null; + + return ( + isAuthenticated == "true" ? + : + + ); } From 99dbeaabb471a51833dedf6ba9d943e2adc4c5a4 Mon Sep 17 00:00:00 2001 From: hanif salafi Date: Mon, 25 Nov 2024 11:34:38 +0700 Subject: [PATCH 3/3] feat: minor update login --- components/form/qudo-login.tsx | 3 --- 1 file changed, 3 deletions(-) diff --git a/components/form/qudo-login.tsx b/components/form/qudo-login.tsx index 1bbb38a..f9a8f82 100644 --- a/components/form/qudo-login.tsx +++ b/components/form/qudo-login.tsx @@ -83,9 +83,6 @@ export default function QudoLogin() { close(); router.push("/"); - Cookies.set("status", "login", { - expires: 1, - }); } } // }