From 377e06017d354d5035347fa6bf69bd9483c4b3b3 Mon Sep 17 00:00:00 2001 From: Jason Ross Date: Sun, 22 Mar 2026 22:54:16 -0500 Subject: [PATCH] WIP --- src/app/(app)/{ => c}/page.tsx | 2 +- src/app/{login => }/page.tsx | 4 ++-- src/app/register/page.tsx | 2 +- src/lib/auth.ts | 14 +++++++------- src/middleware.ts | 8 ++++---- 5 files changed, 15 insertions(+), 15 deletions(-) rename src/app/(app)/{ => c}/page.tsx (98%) rename src/app/{login => }/page.tsx (97%) diff --git a/src/app/(app)/page.tsx b/src/app/(app)/c/page.tsx similarity index 98% rename from src/app/(app)/page.tsx rename to src/app/(app)/c/page.tsx index 152d966..706ff63 100644 --- a/src/app/(app)/page.tsx +++ b/src/app/(app)/c/page.tsx @@ -4,4 +4,4 @@ export default function ChatPage() { Select a conversation to start chatting ); -} \ No newline at end of file +} diff --git a/src/app/login/page.tsx b/src/app/page.tsx similarity index 97% rename from src/app/login/page.tsx rename to src/app/page.tsx index 367413f..17cdd9d 100644 --- a/src/app/login/page.tsx +++ b/src/app/page.tsx @@ -57,7 +57,7 @@ export default function LoginPage() {
- Don't have an account? + Don't have an account? Sign up @@ -65,4 +65,4 @@ export default function LoginPage() {
); -} \ No newline at end of file +} diff --git a/src/app/register/page.tsx b/src/app/register/page.tsx index fd23e09..22e85ef 100644 --- a/src/app/register/page.tsx +++ b/src/app/register/page.tsx @@ -69,7 +69,7 @@ export default function RegisterPage() {
Already have an account? - + Sign in
diff --git a/src/lib/auth.ts b/src/lib/auth.ts index 83564ea..65a20a8 100644 --- a/src/lib/auth.ts +++ b/src/lib/auth.ts @@ -33,7 +33,7 @@ export async function login(prevState: any, formData: FormData) { path: "/", maxAge: 60 * 60 * 24 * 7, // 1 week }); - redirect("/"); + redirect("/c"); } const errorData = await res.json().catch(() => ({})); @@ -67,12 +67,12 @@ export async function login(prevState: any, formData: FormData) { path: "/", maxAge: 60 * 60 * 24 * 7, // 1 week }); - redirect("/"); + redirect("/c"); } return { error: "Network error occurred." }; } - redirect("/"); + redirect("/c"); } export async function register(prevState: any, formData: FormData) { @@ -104,7 +104,7 @@ export async function register(prevState: any, formData: FormData) { path: "/", maxAge: 60 * 60 * 24 * 7, // 1 week }); - redirect("/"); + redirect("/c"); } const errorData = await res.json().catch(() => ({})); @@ -138,16 +138,16 @@ export async function register(prevState: any, formData: FormData) { path: "/", maxAge: 60 * 60 * 24 * 7, // 1 week }); - redirect("/"); + redirect("/c"); } return { error: "Network error occurred." }; } - redirect("/"); + redirect("/c"); } export async function logout() { const cookieStore = await cookies(); cookieStore.delete("auth_token"); - redirect("/login"); + redirect("/"); } \ No newline at end of file diff --git a/src/middleware.ts b/src/middleware.ts index 611de40..b6bf63e 100644 --- a/src/middleware.ts +++ b/src/middleware.ts @@ -5,16 +5,16 @@ export function middleware(request: NextRequest) { const authToken = request.cookies.get('auth_token') const { pathname } = request.nextUrl - const isAuthRoute = pathname === '/login' || pathname === '/register' + const isAuthRoute = pathname === '/' || pathname === '/register' - // Redirect unauthenticated users to /login + // Redirect unauthenticated users to / if (!authToken && !isAuthRoute) { - return NextResponse.redirect(new URL('/login', request.url)) + return NextResponse.redirect(new URL('/', request.url)) } // Redirect authenticated users away from auth routes if (authToken && isAuthRoute) { - return NextResponse.redirect(new URL('/', request.url)) + return NextResponse.redirect(new URL('/c', request.url)) } return NextResponse.next()