Merge pull request #77 from isd-sgcu/dev

update main
isd-sgcu · Jul 15, 2024 · b8015f6 · b8015f6
2 parents b8301d8 + 3de66a1
commit b8015f6
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/context/AuthContext.tsx b/src/context/AuthContext.tsx
@@ -49,13 +49,11 @@ const AuthProvider: React.FC<{ children: ReactNode }> = ({
   }, []);
 
   useEffect(() => {
-    if (path == '/') {
-      setisReady(true);
-      return;
-    }
+    setisReady(false);
 
     const userStr = localStorage.getItem('user');
     if (!userStr) {
+      setisReady(true);
       return router.push('/');
     }
 
@@ -68,6 +66,10 @@ const AuthProvider: React.FC<{ children: ReactNode }> = ({
     const isRegisterPage = path.includes('register');
 
     if (isStaff) {
+      if (path == '/') {
+        return router.push('firstdate/staff/home');
+      }
+
       if (!isRegistered && !isRegisterPage) {
         return router.push('/staff/register');
       }
@@ -76,6 +78,10 @@ const AuthProvider: React.FC<{ children: ReactNode }> = ({
         return router.push('/firstdate/staff/home');
       }
     } else {
+      if (path == '/') {
+        return router.push('/home');
+      }
+
       if (!isRegistered && !isRegisterPage) {
         return router.push('/register');
       }