fix redirect logic

HackIllinois · Feb 1, 2025 · a3ada0f · a3ada0f
1 parent be4bced
commit a3ada0f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/app/closed/page.tsx b/app/closed/page.tsx
@@ -30,11 +30,6 @@ const Closed: React.FC = () => {
             return;
         }
 
-        if (eventStatus === "registration") {
-            router.push("/register");
-            return;
-        }
-
         if (!isAuthenticated()) {
             authenticate(pathname);
             return;
@@ -46,6 +41,11 @@ const Closed: React.FC = () => {
                 return;
             }
 
+            if (eventStatus === "registration") {
+                router.push("/register");
+                return;
+            }
+
             setIsLoading(false);
         });
     }, [eventStatus, pathname, router]);

diff --git a/app/register/layout.tsx b/app/register/layout.tsx
@@ -21,18 +21,23 @@ const Layout = ({ children }: { children: React.ReactNode }) => {
             return;
         }
 
-        if (eventStatus === "registration") {
-            setIsLoading(false);
-            return;
-        }
-
         if (!isAuthenticated()) {
             authenticate(pathname);
             return;
         }
 
         getRegistrationOrDefault().then(registration => {
-            router.push(registration.hasSubmitted ? "/profile" : "/closed");
+            if (registration.hasSubmitted) {
+                router.push("/profile");
+                return;
+            }
+
+            if (eventStatus !== "registration") {
+                router.push("/closed");
+                return;
+            }
+
+            setIsLoading(false);
         });
     }, [eventStatus, router, pathname]);