Merge branch 'dev-restructure' of https://gitlab.com/hanifsalafi/web-humas-polri into dev-restructure

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 <Login />;
+
-  return <QudoLogin />;
+  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" ?
+    <Login /> : 
+    <QudoLogin />
+  );
 }

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, {
+        Cookies.set("is_authenticated", "true", {
-          expires: 1,
-        });
-        Cookies.set("refresh_token", refresh_token, {
-          expires: 1,
-        });
-        Cookies.set("time_refresh", newTime, {
           expires: 1,
         });
         Cookies.set("is_first_login", "true", {
@@ -86,30 +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 +181,7 @@ export default function QudoLogin() {
                 )}
               </button>
             }
-            type={isVisible ? "text" : "password" && typePass}
+            type={isVisible ? "text" : typePass}
             classNames={{
               input: ["w-full", "bg-slate-100", "!text-black", "rounded-sm"],
               mainWrapper: [

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]);

components/layout/sidebar/sidebar.tsx

@@ -215,9 +215,10 @@ const Sidebar: React.FC<SidebarProps> = ({ updateSidebarData }) => {
   const [sidebarMenu, setSidebarMenu] = useState<SidebarMenuTask[]>();
   const { isOpen, toggleSidebar } = useSidebar();
   const token = Cookies.get("access_token");
+  const isAuthenticated = Cookies.get("is_authenticated");
 
   useEffect(() => {
-    if (!token) {
+    if (!isAuthenticated) {
       onLogout();
     }
   }, [token]);