From 3b5812c67b730dce5ecc31be5a992f39fa86eaee Mon Sep 17 00:00:00 2001
From: Saatvik Arya <aryasaatvik@gmail.com>
Date: Thu, 25 Jul 2024 16:25:47 -0700
Subject: [PATCH] fix

---
 apps/web/app/(auth)/signin/page.tsx          |  9 +--------
 apps/web/app/(dash)/header/signOutButton.tsx |  4 +++-
 apps/web/app/(landing)/page.tsx              |  8 --------
 apps/web/middleware.ts                       | 15 +++++++++++----
 apps/web/routes.ts                           |  1 +
 5 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/apps/web/app/(auth)/signin/page.tsx b/apps/web/app/(auth)/signin/page.tsx
index e2524a5b..c7cceec5 100644
--- a/apps/web/app/(auth)/signin/page.tsx
+++ b/apps/web/app/(auth)/signin/page.tsx
@@ -1,21 +1,14 @@
 import Image from "next/image";
 import Link from "next/link";
 import Logo from "@/public/logo.svg";
-import { auth, signIn } from "@/server/auth";
+import { signIn } from "@/server/auth";
 import { Google } from "@repo/ui/components/icons";
 import gradientStyle from "./_components/TextGradient/gradient.module.css";
 import { cn } from "@repo/ui/lib/utils";
-import { redirect } from "next/navigation";
 
 export const runtime = "edge";
 
 async function Signin() {
-	const user = await auth();
-
-	if (user) {
-		redirect("/home");
-	}
-
 	return (
 		<div className="flex relative font-geistSans overflow-hidden items-center justify-between min-h-screen">
 			<div className="relative w-full lg:w-1/2 flex items-center min-h-screen bg-page-gradient  p-8 border-r-[1px] border-white/5">
diff --git a/apps/web/app/(dash)/header/signOutButton.tsx b/apps/web/app/(dash)/header/signOutButton.tsx
index 3ef5fa2a..7f6ba818 100644
--- a/apps/web/app/(dash)/header/signOutButton.tsx
+++ b/apps/web/app/(dash)/header/signOutButton.tsx
@@ -6,7 +6,9 @@ export default function SignOutButton() {
 		<form
 			action={async () => {
 				"use server"
-				await signOut()
+				await signOut({
+          redirectTo: "/",
+        });
 			}}
 		>
 			<Button variant="ghost" size="sm" type="submit" className="text-[#7D8994]">
diff --git a/apps/web/app/(landing)/page.tsx b/apps/web/app/(landing)/page.tsx
index f873c390..bba0a92f 100644
--- a/apps/web/app/(landing)/page.tsx
+++ b/apps/web/app/(landing)/page.tsx
@@ -5,21 +5,13 @@ import Cta from "./Cta";
 import { Toaster } from "@repo/ui/shadcn/toaster";
 import Features from "./Features";
 import Footer from "./footer";
-import { auth } from "@/server/auth";
 import Services from "./Features/index";
 import { Showcases } from "./Showcase";
 import BackgroundPlus from "./GridPatterns/PlusGrid";
-import { redirect } from "next/navigation";
 
 export const runtime = "edge";
 
 export default async function Home() {
-	const user = await auth();
-
-	if (user) {
-		redirect("/home");
-	}
-
 	return (
 		<>
 			<BackgroundPlus />
diff --git a/apps/web/middleware.ts b/apps/web/middleware.ts
index 370a5913..6b082f8e 100644
--- a/apps/web/middleware.ts
+++ b/apps/web/middleware.ts
@@ -18,18 +18,25 @@ export async function middleware(request: NextRequest) {
     Object.entries(corsHeaders).forEach(([key, value]) => {
       response.headers.set(key, value);
     });
-
     return response;
   }
   const info = await auth();
   if (routeTypes.authed.some((route) => request.nextUrl.pathname.startsWith(route))) {
     if (!info) {
-      NextResponse.redirect(new URL("/signin", request.nextUrl));
+      return NextResponse.redirect(new URL("/signin", request.nextUrl));
     }
-  } else {
+  } else if (routeTypes.unAuthedOnly.some((route) => request.nextUrl.pathname.endsWith(route))) {
     if (info) {
-      NextResponse.redirect(new URL("/home", request.nextUrl));
+      return NextResponse.redirect(new URL("/home", request.nextUrl));
     }
   }
   return NextResponse.next();
 }
+
+export const config = {
+  matcher: [
+    '/((?!_next/static|_next/image|image|favicon.ico).*)',
+    '/api/:path*',
+    '/.:path*',
+  ]
+};
diff --git a/apps/web/routes.ts b/apps/web/routes.ts
index 5f35e13a..e3ce910b 100644
--- a/apps/web/routes.ts
+++ b/apps/web/routes.ts
@@ -9,4 +9,5 @@ export const routeGroups = {
 export const routeTypes = {
   authed: [...routeGroups.canvas, ...routeGroups.dash, ...routeGroups.other],
   unauthed: [...routeGroups.auth, ...routeGroups.landing],
+  unAuthedOnly: [...routeGroups.landing, "/signin"],
 }
\ No newline at end of file