diff --git a/logify-frontend/src/contexts/AuthContext.jsx b/logify-frontend/src/contexts/AuthContext.jsx index 571f525c..b9fe0647 100644 --- a/logify-frontend/src/contexts/AuthContext.jsx +++ b/logify-frontend/src/contexts/AuthContext.jsx @@ -2,8 +2,6 @@ import { createContext, useEffect, useState } from "react"; import { useNavigate } from "react-router-dom"; import { api, SESSION_CLEARED_EVENT } from "../config/api.js"; -import Loading from "../components/ui/Loading"; - const SESSION_STORAGE_KEY = "logify-auth-session"; const ROLE_TO_PATH = { student: "/student", @@ -238,7 +236,6 @@ const AuthProvider = ({ children }) => { adminSignUp, }} > - {isLoadingUser && } {children} ); diff --git a/logify-frontend/src/pages/AdminSignupPage.jsx b/logify-frontend/src/pages/AdminSignupPage.jsx index 4eda31f6..6de8074d 100644 --- a/logify-frontend/src/pages/AdminSignupPage.jsx +++ b/logify-frontend/src/pages/AdminSignupPage.jsx @@ -3,6 +3,7 @@ import { Link, useNavigate } from "react-router-dom"; import { api } from "../config/api.js"; import { AuthContext } from "../contexts/AuthContext"; +import Loading from "../components/ui/Loading"; import AuthActionButton from "../components/ui/AuthActionButton"; import AuthLayout from "./auth/AuthLayout"; import GuestOnlyRoute from "./auth/GuestOnlyRoute"; @@ -174,6 +175,7 @@ const AdminSignupPage = () => { return ( + {isSubmitting && } { return ( + {isSubmitting && } { return ( + {isSubmitting && } { return ( + {isSubmitting && } { const navigate = useNavigate(); return ( - -
- {/* Background blobs for Glassmorphism */} -
-
-
+
+ {/* Background blobs for Glassmorphism */} +
+
+
-
-
- - LOGIFY - - - Skip Tutorial - -
+
+
+ + LOGIFY + + + Skip Tutorial + +
-
-

- Onboarding -

-

- Welcome To Logify -

-

- Logify is an internship lifecycle workspace for universities and - host organizations. It centralizes placement approvals, weekly - tracking, evaluations, and reporting. -

+
+

+ Onboarding +

+

+ Welcome To Logify +

+

+ Logify is an internship lifecycle workspace for universities and + host organizations. It centralizes placement approvals, weekly + tracking, evaluations, and reporting. +

-
- {roleCards.map((role) => ( -
- {/* Subtle sheen reflection effect on hover */} -
+
+ {roleCards.map((role) => ( +
+ {/* Subtle sheen reflection effect on hover */} +
-
-
- {role.icon} - {role.title} -
-

- {role.desc} -

+
+
+ {role.icon} + {role.title}
-
- ))} -
+

+ {role.desc} +

+
+ + ))} +
-
-

- How Tracking Works -

-

- Student submits placement and weekly logs. Supervisors review - and request changes or approve. Academic evaluation and final - reports close the loop. -

-
+
+

+ How Tracking Works +

+

+ Student submits placement and weekly logs. Supervisors review and + request changes or approve. Academic evaluation and final reports + close the loop. +

+
-
- - {/* - Back To Landing - */} -
- -
+
+ + {/* + Back To Landing + */} +
+
- +
); }; diff --git a/logify-frontend/src/pages/auth/GuestOnlyRoute.jsx b/logify-frontend/src/pages/auth/GuestOnlyRoute.jsx index a9580a40..5a6dbab9 100644 --- a/logify-frontend/src/pages/auth/GuestOnlyRoute.jsx +++ b/logify-frontend/src/pages/auth/GuestOnlyRoute.jsx @@ -15,33 +15,7 @@ const GuestOnlyRoute = ({ children }) => { const { isAuthenticated, isLoadingUser, user } = useContext(AuthContext); if (isLoadingUser || (isAuthenticated && !user)) { - return ( -
-
- - - - - Loading... -
-
- ); + return null; } if (!isAuthenticated || !user) {