From 405b57ef7fc4402eec4be2e70b34113e046b71f1 Mon Sep 17 00:00:00 2001
From: Jibril <Jibrilpascua@gmail.com>
Date: Tue, 25 Nov 2025 16:39:13 -0600
Subject: [PATCH 1/2] Added logic to show blank screen before bringing user to
 Dashboard

---
 apps/web/src/app/sign-in/[[...sign-in]]/page.tsx | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/apps/web/src/app/sign-in/[[...sign-in]]/page.tsx b/apps/web/src/app/sign-in/[[...sign-in]]/page.tsx
index ada2756..d5c790d 100644
--- a/apps/web/src/app/sign-in/[[...sign-in]]/page.tsx
+++ b/apps/web/src/app/sign-in/[[...sign-in]]/page.tsx
@@ -1,15 +1,24 @@
-// "use client"
-import { SignIn } from "@clerk/nextjs";
+"use client";
+import { SignIn, useAuth } from "@clerk/nextjs";
 import { Button } from "@/components/ui/button";
 import c from "config";
 import Link from "next/link";
 import PortalMigrationExplainer from "@/components/dash/shared/PortalMigrationExplainer";
+
 export default function Page() {
+	const {isLoaded } = useAuth();
+
+	if (!isLoaded) {
+		return (
+			<main className="flex h-screen w-screen items-center justify-center">
+			</main>
+		);
+	}
 	return (
 		<main className="flex h-screen w-screen flex-col items-center justify-center gap-y-5">
 			<div className="flex max-w-[400px] flex-col items-center justify-center gap-y-5">
 				<h1 className="text-4xl font-black">{c.clubName}</h1>
-				<SignIn />
+				<SignIn forceRedirectUrl="/dash" />
 				<Link href="/onboarding/migrate" className="w-full">
 					<Button className="w-full">
 						Migrate From Legacy Portal

From e71c7712d75a67ee153dcd15d57d83ea2fd360b1 Mon Sep 17 00:00:00 2001
From: Jibril <Jibrilpascua@gmail.com>
Date: Fri, 5 Dec 2025 15:48:00 -0600
Subject: [PATCH 2/2] Fixes logic for Screen so ForceRedirectURL isn't needed.

---
 .../src/app/sign-in/[[...sign-in]]/page.tsx   |  2 +-
 .../src/app/sign-up/[[...sign-up]]/page.tsx   | 12 +++++++-
 apps/web/src/lib/queries/users.ts             |  6 ++++
 apps/web/src/middleware.ts                    | 30 +++++++++++++++++--
 4 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/apps/web/src/app/sign-in/[[...sign-in]]/page.tsx b/apps/web/src/app/sign-in/[[...sign-in]]/page.tsx
index d5c790d..ed146e4 100644
--- a/apps/web/src/app/sign-in/[[...sign-in]]/page.tsx
+++ b/apps/web/src/app/sign-in/[[...sign-in]]/page.tsx
@@ -18,7 +18,7 @@ export default function Page() {
 		<main className="flex h-screen w-screen flex-col items-center justify-center gap-y-5">
 			<div className="flex max-w-[400px] flex-col items-center justify-center gap-y-5">
 				<h1 className="text-4xl font-black">{c.clubName}</h1>
-				<SignIn forceRedirectUrl="/dash" />
+				<SignIn />
 				<Link href="/onboarding/migrate" className="w-full">
 					<Button className="w-full">
 						Migrate From Legacy Portal
diff --git a/apps/web/src/app/sign-up/[[...sign-up]]/page.tsx b/apps/web/src/app/sign-up/[[...sign-up]]/page.tsx
index 650dedf..692c3a4 100644
--- a/apps/web/src/app/sign-up/[[...sign-up]]/page.tsx
+++ b/apps/web/src/app/sign-up/[[...sign-up]]/page.tsx
@@ -1,10 +1,20 @@
-import { SignUp } from "@clerk/nextjs";
+"use client";
+import { SignUp, useAuth } from "@clerk/nextjs";
 import { Button } from "@/components/ui/button";
 import c from "config";
 import Link from "next/link";
 import PortalMigrationExplainer from "@/components/dash/shared/PortalMigrationExplainer";
 export default function Page() {
+	const {isLoaded } = useAuth();
+
+	if (!isLoaded) {
+		return (
+			<main className="flex h-screen w-screen items-center justify-center">
+			</main>
+		);
+	}
 	return (
+		
 		<main className="flex h-screen w-screen flex-col items-center justify-center gap-y-5">
 			<div className="flex max-w-[400px] flex-col items-center justify-center gap-y-5">
 				<h1 className="text-4xl font-black">ClubKit</h1>
diff --git a/apps/web/src/lib/queries/users.ts b/apps/web/src/lib/queries/users.ts
index 6311dd8..7bd010e 100644
--- a/apps/web/src/lib/queries/users.ts
+++ b/apps/web/src/lib/queries/users.ts
@@ -16,6 +16,12 @@ export const getAdminUser = async (clerkId: string) => {
 	});
 };
 
+export const getUserByClerkId = async (clerkId: string) => {
+	return db.query.users.findFirst({
+		where: eq(users.clerkID, clerkId),
+	});
+};
+
 export const getUser = async (userID: string) => {
 	return db.query.users.findFirst({
 		where: eq(users.userID, Number(userID)),
diff --git a/apps/web/src/middleware.ts b/apps/web/src/middleware.ts
index 1dd3679..c3f2815 100644
--- a/apps/web/src/middleware.ts
+++ b/apps/web/src/middleware.ts
@@ -1,5 +1,5 @@
 import { clerkMiddleware, createRouteMatcher } from "@clerk/nextjs/server";
-import { getAdminUser } from "./lib/queries/users";
+import { getAdminUser, getUserByClerkId } from "./lib/queries/users";
 import { NextResponse } from "next/server";
 
 const isProtectedRoute = createRouteMatcher([
@@ -8,16 +8,40 @@ const isProtectedRoute = createRouteMatcher([
 	"/settings(.*)",
 ]);
 const isAdminAPIRoute = createRouteMatcher(["/api/admin(.*)"]);
+const isAuthRoute = createRouteMatcher(["/sign-in(.*)", "/sign-up(.*)"]);
+const isOnboardingRoute = createRouteMatcher(["/onboarding(.*)"]);
 
 export default clerkMiddleware(async (auth, req) => {
 	const { userId, redirectToSignIn } = await auth();
+	
+	// Protect routes - redirect to sign-in if not authenticated
 	if (isProtectedRoute(req) && !userId) {
-		redirectToSignIn({
+		return redirectToSignIn({
 			returnBackUrl: req.nextUrl.toString(),
 		});
 	}
 
-	// protect admin api routes
+	// Handle authenticated user routing
+	if (userId) {
+		const user = await getUserByClerkId(userId);
+		
+		// Redirect authenticated users away from auth pages
+		if (isAuthRoute(req)) {
+			return NextResponse.redirect(new URL(user ? "/dash" : "/onboarding", req.url));
+		}
+		
+		// Redirect registered users away from onboarding
+		if (isOnboardingRoute(req) && user) {
+			return NextResponse.redirect(new URL("/dash", req.url));
+		}
+		
+		// Redirect unregistered users to onboarding from protected routes
+		if (isProtectedRoute(req) && !user) {
+			return NextResponse.redirect(new URL("/onboarding", req.url));
+		}
+	}
+
+	// Protect admin API routes
 	if (isAdminAPIRoute(req)) {
 		if (!userId || !(await getAdminUser(userId))) {
 			return NextResponse.json({ error: "Unauthorized", status: 401 });