From d972a2c94759287a3d67417af9e46be2104a7fdf Mon Sep 17 00:00:00 2001
From: Saatvik Arya <aryasaatvik@gmail.com>
Date: Thu, 25 Jul 2024 14:00:26 -0700
Subject: [PATCH 1/9] middleware based auth

---
 apps/web/app/(auth)/onboarding/page.tsx       |  6 ++--
 apps/web/app/(auth)/signin/page.tsx           | 11 ++-----
 apps/web/app/(landing)/Headers/Navbar.tsx     |  2 +-
 apps/web/app/(landing)/page.tsx               |  2 +-
 apps/web/app/actions/doers.ts                 |  4 +--
 .../{ => app}/(canvas)/canvas/[id]/page.tsx   |  0
 .../app/{ => app}/(canvas)/canvas/page.tsx    |  0
 .../(canvas)/canvas/search&create.tsx         |  0
 .../{ => app}/(canvas)/canvas/thinkPad.tsx    |  0
 .../{ => app}/(canvas)/canvas/thinkPads.tsx   |  0
 .../app/{ => app}/(canvas)/canvasStyles.css   |  0
 apps/web/app/{ => app}/(canvas)/layout.tsx    |  9 +-----
 .../{ => app}/(dash)/(memories)/content.tsx   |  0
 .../(dash)/(memories)/memories/page.tsx       |  2 +-
 .../(memories)/space/[spaceid]/page.tsx       |  5 +--
 .../app/{ => app}/(dash)/chat/CodeBlock.tsx   |  0
 .../(dash)/chat/[chatid]/loading.tsx          |  0
 .../{ => app}/(dash)/chat/[chatid]/page.tsx   |  0
 .../{ => app}/(dash)/chat/chatQueryInput.tsx  |  0
 .../app/{ => app}/(dash)/chat/chatWindow.tsx  |  2 +-
 .../(dash)/chat/markdownRenderHelpers.tsx     |  0
 apps/web/app/{ => app}/(dash)/chat/route.ts   |  2 +-
 .../(dash)/dialogContentContainer.tsx         |  0
 .../{ => app}/(dash)/dialogTriggerWrapper.tsx |  0
 .../(dash)/header/autoBreadCrumbs.tsx         |  2 +-
 .../app/{ => app}/(dash)/header/header.tsx    |  2 +-
 .../{ => app}/(dash)/header/newChatButton.tsx |  2 +-
 .../{ => app}/(dash)/header/signOutButton.tsx |  0
 .../{ => app}/(dash)/home/filterSpaces.tsx    |  0
 .../web/app/{ => app}/(dash)/home/history.tsx |  0
 apps/web/app/{ => app}/(dash)/home/page.tsx   |  0
 .../app/{ => app}/(dash)/home/queryinput.tsx  |  0
 apps/web/app/{ => app}/(dash)/layout.tsx      | 11 ++-----
 apps/web/app/{ => app}/(dash)/menu.tsx        |  2 +-
 .../{ => app}/(dash)/note/[noteid]/page.tsx   |  0
 apps/web/middleware.ts                        | 32 ++++++++++++-------
 36 files changed, 42 insertions(+), 54 deletions(-)
 rename apps/web/app/{ => app}/(canvas)/canvas/[id]/page.tsx (100%)
 rename apps/web/app/{ => app}/(canvas)/canvas/page.tsx (100%)
 rename apps/web/app/{ => app}/(canvas)/canvas/search&create.tsx (100%)
 rename apps/web/app/{ => app}/(canvas)/canvas/thinkPad.tsx (100%)
 rename apps/web/app/{ => app}/(canvas)/canvas/thinkPads.tsx (100%)
 rename apps/web/app/{ => app}/(canvas)/canvasStyles.css (100%)
 rename apps/web/app/{ => app}/(canvas)/layout.tsx (73%)
 rename apps/web/app/{ => app}/(dash)/(memories)/content.tsx (100%)
 rename apps/web/app/{ => app}/(dash)/(memories)/memories/page.tsx (85%)
 rename apps/web/app/{ => app}/(dash)/(memories)/space/[spaceid]/page.tsx (87%)
 rename apps/web/app/{ => app}/(dash)/chat/CodeBlock.tsx (100%)
 rename apps/web/app/{ => app}/(dash)/chat/[chatid]/loading.tsx (100%)
 rename apps/web/app/{ => app}/(dash)/chat/[chatid]/page.tsx (100%)
 rename apps/web/app/{ => app}/(dash)/chat/chatQueryInput.tsx (100%)
 rename apps/web/app/{ => app}/(dash)/chat/chatWindow.tsx (99%)
 rename apps/web/app/{ => app}/(dash)/chat/markdownRenderHelpers.tsx (100%)
 rename apps/web/app/{ => app}/(dash)/chat/route.ts (71%)
 rename apps/web/app/{ => app}/(dash)/dialogContentContainer.tsx (100%)
 rename apps/web/app/{ => app}/(dash)/dialogTriggerWrapper.tsx (100%)
 rename apps/web/app/{ => app}/(dash)/header/autoBreadCrumbs.tsx (95%)
 rename apps/web/app/{ => app}/(dash)/header/header.tsx (97%)
 rename apps/web/app/{ => app}/(dash)/header/newChatButton.tsx (96%)
 rename apps/web/app/{ => app}/(dash)/header/signOutButton.tsx (100%)
 rename apps/web/app/{ => app}/(dash)/home/filterSpaces.tsx (100%)
 rename apps/web/app/{ => app}/(dash)/home/history.tsx (100%)
 rename apps/web/app/{ => app}/(dash)/home/page.tsx (100%)
 rename apps/web/app/{ => app}/(dash)/home/queryinput.tsx (100%)
 rename apps/web/app/{ => app}/(dash)/layout.tsx (81%)
 rename apps/web/app/{ => app}/(dash)/menu.tsx (99%)
 rename apps/web/app/{ => app}/(dash)/note/[noteid]/page.tsx (100%)

diff --git a/apps/web/app/(auth)/onboarding/page.tsx b/apps/web/app/(auth)/onboarding/page.tsx
index 9728d107..880afd12 100644
--- a/apps/web/app/(auth)/onboarding/page.tsx
+++ b/apps/web/app/(auth)/onboarding/page.tsx
@@ -27,7 +27,7 @@ export default function Home() {
 		}
 		if (currStep > 3) {
 			updateDb().then(() => {
-				push("/home?q=what%20is%20supermemory");
+				push("/app/home?q=what%20is%20supermemory");
 			});
 		}
 	}, [currStep]);
@@ -297,7 +297,7 @@ function StepThree({ currStep }: { currStep: number }) {
 										toast.error(`Memory creation failed: ${cont.error}`);
 									}
 
-									push(`/home?q=what%20is%20supermemory`);
+									push(`/app/home?q=what%20is%20supermemory`);
 								}}
 							>
 								<textarea
@@ -388,7 +388,7 @@ function Navbar() {
 	const router = useRouter();
 	const handleSkip = async () => {
 		await completeOnboarding();
-		router.push("/home?q=what%20is%20supermemory");
+		router.push("/app/home?q=what%20is%20supermemory");
 	}
 
 	return (
diff --git a/apps/web/app/(auth)/signin/page.tsx b/apps/web/app/(auth)/signin/page.tsx
index 3b563b90..762ee021 100644
--- a/apps/web/app/(auth)/signin/page.tsx
+++ b/apps/web/app/(auth)/signin/page.tsx
@@ -6,19 +6,14 @@ 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";
-import { toast } from "sonner";
 
 export const runtime = "edge";
 
-async function Signin({
-	searchParams,
-}: {
-	searchParams: Record<string, string>;
-}) {
+async function Signin() {
 	const user = await auth();
 
 	if (user) {
-		redirect("/home");
+		redirect("/app/home");
 	}
 
 	return (
@@ -64,7 +59,7 @@ async function Signin({
 								action={async () => {
 									"use server";
 									await signIn("google", {
-										redirectTo: "/home",
+										redirectTo: "/app/home",
 									});
 								}}
 							>
diff --git a/apps/web/app/(landing)/Headers/Navbar.tsx b/apps/web/app/(landing)/Headers/Navbar.tsx
index d783244a..1d59157f 100644
--- a/apps/web/app/(landing)/Headers/Navbar.tsx
+++ b/apps/web/app/(landing)/Headers/Navbar.tsx
@@ -34,7 +34,7 @@ const SlideTabs = () => {
 			</Link>
 
 			<Tab key={0} setPosition={setPosition}>
-				<Link className="w-full h-full" href={"/home"}>
+				<Link className="w-full h-full" href={"/app/home"}>
 					Home
 				</Link>
 			</Tab>
diff --git a/apps/web/app/(landing)/page.tsx b/apps/web/app/(landing)/page.tsx
index b2b86818..08770789 100644
--- a/apps/web/app/(landing)/page.tsx
+++ b/apps/web/app/(landing)/page.tsx
@@ -17,7 +17,7 @@ export default async function Home() {
 	const user = await auth();
 
 	if (user) {
-		await redirect("/home");
+		redirect("/app/home");
 	}
 
 	return (
diff --git a/apps/web/app/actions/doers.ts b/apps/web/app/actions/doers.ts
index fbccd195..0c514fc6 100644
--- a/apps/web/app/actions/doers.ts
+++ b/apps/web/app/actions/doers.ts
@@ -70,7 +70,7 @@ export const createSpace = async (
 			.insert(space)
 			.values({ name: input, user: data.user.id, createdAt: new Date() });
 
-		revalidatePath("/home");
+		revalidatePath("/app/home");
 		return { success: true, data: resp.meta.last_row_id };
 	} catch (e: unknown) {
 		const error = e as Error;
@@ -343,7 +343,7 @@ export const createMemory = async (input: {
 			})
 			.returning({ id: storedContent.id });
 		revalidatePath("/memories");
-		revalidatePath("/home");
+		revalidatePath("/app/home");
 
 		contentId = insertResponse[0]?.id;
 	} catch (e) {
diff --git a/apps/web/app/(canvas)/canvas/[id]/page.tsx b/apps/web/app/app/(canvas)/canvas/[id]/page.tsx
similarity index 100%
rename from apps/web/app/(canvas)/canvas/[id]/page.tsx
rename to apps/web/app/app/(canvas)/canvas/[id]/page.tsx
diff --git a/apps/web/app/(canvas)/canvas/page.tsx b/apps/web/app/app/(canvas)/canvas/page.tsx
similarity index 100%
rename from apps/web/app/(canvas)/canvas/page.tsx
rename to apps/web/app/app/(canvas)/canvas/page.tsx
diff --git a/apps/web/app/(canvas)/canvas/search&create.tsx b/apps/web/app/app/(canvas)/canvas/search&create.tsx
similarity index 100%
rename from apps/web/app/(canvas)/canvas/search&create.tsx
rename to apps/web/app/app/(canvas)/canvas/search&create.tsx
diff --git a/apps/web/app/(canvas)/canvas/thinkPad.tsx b/apps/web/app/app/(canvas)/canvas/thinkPad.tsx
similarity index 100%
rename from apps/web/app/(canvas)/canvas/thinkPad.tsx
rename to apps/web/app/app/(canvas)/canvas/thinkPad.tsx
diff --git a/apps/web/app/(canvas)/canvas/thinkPads.tsx b/apps/web/app/app/(canvas)/canvas/thinkPads.tsx
similarity index 100%
rename from apps/web/app/(canvas)/canvas/thinkPads.tsx
rename to apps/web/app/app/(canvas)/canvas/thinkPads.tsx
diff --git a/apps/web/app/(canvas)/canvasStyles.css b/apps/web/app/app/(canvas)/canvasStyles.css
similarity index 100%
rename from apps/web/app/(canvas)/canvasStyles.css
rename to apps/web/app/app/(canvas)/canvasStyles.css
diff --git a/apps/web/app/(canvas)/layout.tsx b/apps/web/app/app/(canvas)/layout.tsx
similarity index 73%
rename from apps/web/app/(canvas)/layout.tsx
rename to apps/web/app/app/(canvas)/layout.tsx
index e9d38968..363bf6ed 100644
--- a/apps/web/app/(canvas)/layout.tsx
+++ b/apps/web/app/app/(canvas)/layout.tsx
@@ -1,7 +1,5 @@
-import { auth } from "@/server/auth";
 import "./canvasStyles.css";
-import { redirect } from "next/navigation";
-import BackgroundPlus from "../(landing)/GridPatterns/PlusGrid";
+import BackgroundPlus from "@/app/(landing)/GridPatterns/PlusGrid";
 import { Toaster } from "@repo/ui/shadcn/sonner";
 
 export default async function RootLayout({
@@ -9,11 +7,6 @@ export default async function RootLayout({
 }: {
 	children: React.ReactNode;
 }) {
-	const info = await auth();
-
-	if (!info) {
-		return redirect("/signin");
-	}
 	return (
 		<>
 			<div className="relative flex justify-center z-40 pointer-events-none">
diff --git a/apps/web/app/(dash)/(memories)/content.tsx b/apps/web/app/app/(dash)/(memories)/content.tsx
similarity index 100%
rename from apps/web/app/(dash)/(memories)/content.tsx
rename to apps/web/app/app/(dash)/(memories)/content.tsx
diff --git a/apps/web/app/(dash)/(memories)/memories/page.tsx b/apps/web/app/app/(dash)/(memories)/memories/page.tsx
similarity index 85%
rename from apps/web/app/(dash)/(memories)/memories/page.tsx
rename to apps/web/app/app/(dash)/(memories)/memories/page.tsx
index d0f555f2..a2f6c8a1 100644
--- a/apps/web/app/(dash)/(memories)/memories/page.tsx
+++ b/apps/web/app/app/(dash)/(memories)/memories/page.tsx
@@ -4,7 +4,7 @@ import MemoriesPage from "../content";
 
 async function Page() {
 	const { success, data } = await getAllUserMemoriesAndSpaces();
-	if (!success ?? !data) return redirect("/home");
+	if (!success ?? !data) return redirect("/app/home");
 	return <MemoriesPage memoriesAndSpaces={data} />;
 }
 
diff --git a/apps/web/app/(dash)/(memories)/space/[spaceid]/page.tsx b/apps/web/app/app/(dash)/(memories)/space/[spaceid]/page.tsx
similarity index 87%
rename from apps/web/app/(dash)/(memories)/space/[spaceid]/page.tsx
rename to apps/web/app/app/(dash)/(memories)/space/[spaceid]/page.tsx
index ed1ea1cc..353466a9 100644
--- a/apps/web/app/(dash)/(memories)/space/[spaceid]/page.tsx
+++ b/apps/web/app/app/(dash)/(memories)/space/[spaceid]/page.tsx
@@ -4,13 +4,10 @@ import MemoriesPage from "../../content";
 import { db } from "@/server/db";
 import { and, eq } from "drizzle-orm";
 import { spacesAccess } from "@/server/db/schema";
-import { auth } from "@/server/auth";
 
 async function Page({ params: { spaceid } }: { params: { spaceid: number } }) {
-	const user = await auth();
-
 	const { success, data } = await getMemoriesInsideSpace(spaceid);
-	if (!success ?? !data) return redirect("/home");
+	if (!success ?? !data) return redirect("/app/home");
 
 	const hasAccess = await db.query.spacesAccess.findMany({
 		where: and(eq(spacesAccess.spaceId, spaceid)),
diff --git a/apps/web/app/(dash)/chat/CodeBlock.tsx b/apps/web/app/app/(dash)/chat/CodeBlock.tsx
similarity index 100%
rename from apps/web/app/(dash)/chat/CodeBlock.tsx
rename to apps/web/app/app/(dash)/chat/CodeBlock.tsx
diff --git a/apps/web/app/(dash)/chat/[chatid]/loading.tsx b/apps/web/app/app/(dash)/chat/[chatid]/loading.tsx
similarity index 100%
rename from apps/web/app/(dash)/chat/[chatid]/loading.tsx
rename to apps/web/app/app/(dash)/chat/[chatid]/loading.tsx
diff --git a/apps/web/app/(dash)/chat/[chatid]/page.tsx b/apps/web/app/app/(dash)/chat/[chatid]/page.tsx
similarity index 100%
rename from apps/web/app/(dash)/chat/[chatid]/page.tsx
rename to apps/web/app/app/(dash)/chat/[chatid]/page.tsx
diff --git a/apps/web/app/(dash)/chat/chatQueryInput.tsx b/apps/web/app/app/(dash)/chat/chatQueryInput.tsx
similarity index 100%
rename from apps/web/app/(dash)/chat/chatQueryInput.tsx
rename to apps/web/app/app/(dash)/chat/chatQueryInput.tsx
diff --git a/apps/web/app/(dash)/chat/chatWindow.tsx b/apps/web/app/app/(dash)/chat/chatWindow.tsx
similarity index 99%
rename from apps/web/app/(dash)/chat/chatWindow.tsx
rename to apps/web/app/app/(dash)/chat/chatWindow.tsx
index ed65bf7a..30718b8d 100644
--- a/apps/web/app/(dash)/chat/chatWindow.tsx
+++ b/apps/web/app/app/(dash)/chat/chatWindow.tsx
@@ -201,7 +201,7 @@ function ChatWindow({
 				);
 			}
 		} else {
-			router.push("/home");
+			router.push("/app/home");
 		}
 	}, []);
 
diff --git a/apps/web/app/(dash)/chat/markdownRenderHelpers.tsx b/apps/web/app/app/(dash)/chat/markdownRenderHelpers.tsx
similarity index 100%
rename from apps/web/app/(dash)/chat/markdownRenderHelpers.tsx
rename to apps/web/app/app/(dash)/chat/markdownRenderHelpers.tsx
diff --git a/apps/web/app/(dash)/chat/route.ts b/apps/web/app/app/(dash)/chat/route.ts
similarity index 71%
rename from apps/web/app/(dash)/chat/route.ts
rename to apps/web/app/app/(dash)/chat/route.ts
index 94f250ff..038c5f7c 100644
--- a/apps/web/app/(dash)/chat/route.ts
+++ b/apps/web/app/app/(dash)/chat/route.ts
@@ -1,5 +1,5 @@
 import { redirect } from "next/navigation";
 
 export async function GET() {
-	return redirect("/home");
+	return redirect("/app/home");
 }
diff --git a/apps/web/app/(dash)/dialogContentContainer.tsx b/apps/web/app/app/(dash)/dialogContentContainer.tsx
similarity index 100%
rename from apps/web/app/(dash)/dialogContentContainer.tsx
rename to apps/web/app/app/(dash)/dialogContentContainer.tsx
diff --git a/apps/web/app/(dash)/dialogTriggerWrapper.tsx b/apps/web/app/app/(dash)/dialogTriggerWrapper.tsx
similarity index 100%
rename from apps/web/app/(dash)/dialogTriggerWrapper.tsx
rename to apps/web/app/app/(dash)/dialogTriggerWrapper.tsx
diff --git a/apps/web/app/(dash)/header/autoBreadCrumbs.tsx b/apps/web/app/app/(dash)/header/autoBreadCrumbs.tsx
similarity index 95%
rename from apps/web/app/(dash)/header/autoBreadCrumbs.tsx
rename to apps/web/app/app/(dash)/header/autoBreadCrumbs.tsx
index 671464ff..8a262b78 100644
--- a/apps/web/app/(dash)/header/autoBreadCrumbs.tsx
+++ b/apps/web/app/app/(dash)/header/autoBreadCrumbs.tsx
@@ -16,7 +16,7 @@ function AutoBreadCrumbs() {
 	return (
 		<Breadcrumb className="hidden md:block">
 			<BreadcrumbList>
-				{!pathname.startsWith("/home") && (
+				{!pathname.startsWith("/app/home") && (
 					<>
 						<BreadcrumbItem>
 							<BreadcrumbLink href="/">Home</BreadcrumbLink>
diff --git a/apps/web/app/(dash)/header/header.tsx b/apps/web/app/app/(dash)/header/header.tsx
similarity index 97%
rename from apps/web/app/(dash)/header/header.tsx
rename to apps/web/app/app/(dash)/header/header.tsx
index eaade258..2b109600 100644
--- a/apps/web/app/(dash)/header/header.tsx
+++ b/apps/web/app/app/(dash)/header/header.tsx
@@ -26,7 +26,7 @@ async function Header() {
 		<div className="p-4 relative z-30 h-16 flex items-center">
 			<div className="w-full flex items-center justify-between">
 				<div className="flex items-center gap-4">
-					<Link className="" href="/home">
+					<Link className="" href="/app/home">
 						<Image
 							src={Logo}
 							alt="SuperMemory logo"
diff --git a/apps/web/app/(dash)/header/newChatButton.tsx b/apps/web/app/app/(dash)/header/newChatButton.tsx
similarity index 96%
rename from apps/web/app/(dash)/header/newChatButton.tsx
rename to apps/web/app/app/(dash)/header/newChatButton.tsx
index a634ab41..1699ca4c 100644
--- a/apps/web/app/(dash)/header/newChatButton.tsx
+++ b/apps/web/app/app/(dash)/header/newChatButton.tsx
@@ -12,7 +12,7 @@ function NewChatButton() {
 	if (path.startsWith("/chat")) {
 		return (
 			<Link
-				href="/home"
+				href="/app/home"
 				className="flex duration-200 items-center text-[#7D8994] hover:bg-[#1F2429] text-[13px] gap-2 px-3 py-2 rounded-xl"
 			>
 				<Image src={ChatIcon} alt="Chat icon" className="w-5" />
diff --git a/apps/web/app/(dash)/header/signOutButton.tsx b/apps/web/app/app/(dash)/header/signOutButton.tsx
similarity index 100%
rename from apps/web/app/(dash)/header/signOutButton.tsx
rename to apps/web/app/app/(dash)/header/signOutButton.tsx
diff --git a/apps/web/app/(dash)/home/filterSpaces.tsx b/apps/web/app/app/(dash)/home/filterSpaces.tsx
similarity index 100%
rename from apps/web/app/(dash)/home/filterSpaces.tsx
rename to apps/web/app/app/(dash)/home/filterSpaces.tsx
diff --git a/apps/web/app/(dash)/home/history.tsx b/apps/web/app/app/(dash)/home/history.tsx
similarity index 100%
rename from apps/web/app/(dash)/home/history.tsx
rename to apps/web/app/app/(dash)/home/history.tsx
diff --git a/apps/web/app/(dash)/home/page.tsx b/apps/web/app/app/(dash)/home/page.tsx
similarity index 100%
rename from apps/web/app/(dash)/home/page.tsx
rename to apps/web/app/app/(dash)/home/page.tsx
diff --git a/apps/web/app/(dash)/home/queryinput.tsx b/apps/web/app/app/(dash)/home/queryinput.tsx
similarity index 100%
rename from apps/web/app/(dash)/home/queryinput.tsx
rename to apps/web/app/app/(dash)/home/queryinput.tsx
diff --git a/apps/web/app/(dash)/layout.tsx b/apps/web/app/app/(dash)/layout.tsx
similarity index 81%
rename from apps/web/app/(dash)/layout.tsx
rename to apps/web/app/app/(dash)/layout.tsx
index c6174945..7a08c3cb 100644
--- a/apps/web/app/(dash)/layout.tsx
+++ b/apps/web/app/app/(dash)/layout.tsx
@@ -1,18 +1,11 @@
 import Header from "./header/header";
 import Menu from "./menu";
 import { redirect } from "next/navigation";
-import { auth } from "../../server/auth";
 import { Toaster } from "@repo/ui/shadcn/sonner";
-import BackgroundPlus from "../(landing)/GridPatterns/PlusGrid";
-import { getUser } from "../actions/fetchers";
+import BackgroundPlus from "@/app/(landing)/GridPatterns/PlusGrid";
+import { getUser } from "@/app/actions/fetchers";
 
 async function Layout({ children }: { children: React.ReactNode }) {
-	const info = await auth();
-
-	if (!info) {
-		return redirect("/signin");
-	}
-
 	const user = await getUser();
 	const hasOnboarded = user.data?.hasOnboarded;
 
diff --git a/apps/web/app/(dash)/menu.tsx b/apps/web/app/app/(dash)/menu.tsx
similarity index 99%
rename from apps/web/app/(dash)/menu.tsx
rename to apps/web/app/app/(dash)/menu.tsx
index c56a3247..d7c2d70c 100644
--- a/apps/web/app/(dash)/menu.tsx
+++ b/apps/web/app/app/(dash)/menu.tsx
@@ -53,7 +53,7 @@ function Menu() {
 		{
 			icon: HomeIconWeb,
 			text: "Home",
-			url: "/home",
+			url: "/app/home",
 			disabled: false,
 		},
 		{
diff --git a/apps/web/app/(dash)/note/[noteid]/page.tsx b/apps/web/app/app/(dash)/note/[noteid]/page.tsx
similarity index 100%
rename from apps/web/app/(dash)/note/[noteid]/page.tsx
rename to apps/web/app/app/(dash)/note/[noteid]/page.tsx
diff --git a/apps/web/middleware.ts b/apps/web/middleware.ts
index 9e1e335f..ee579ad9 100644
--- a/apps/web/middleware.ts
+++ b/apps/web/middleware.ts
@@ -1,4 +1,6 @@
-import { NextRequest, NextResponse } from "next/server";
+import { type NextRequest, NextResponse } from "next/server";
+import { auth } from "./server/auth";
+import { redirect } from "next/navigation";
 
 const corsHeaders = {
 	"Access-Control-Allow-Origin": "*",
@@ -6,19 +8,27 @@ const corsHeaders = {
 	"Access-Control-Allow-Headers": "Content-Type, Authorization",
 };
 
-export function middleware(request: NextRequest) {
-	if (request.method === "OPTIONS") {
-		return new NextResponse(null, { headers: corsHeaders });
-	}
+export async function middleware(request: NextRequest) {
+  if (request.nextUrl.pathname.startsWith("/api")) {
+    if (request.method === "OPTIONS") {
+      return new NextResponse(null, { headers: corsHeaders });
+    }
 
-	const response = NextResponse.next();
-	Object.entries(corsHeaders).forEach(([key, value]) => {
-		response.headers.set(key, value);
-	});
+    const response = NextResponse.next();
+    Object.entries(corsHeaders).forEach(([key, value]) => {
+      response.headers.set(key, value);
+    });
 
-	return response;
+    return response;
+  } else if (request.nextUrl.pathname.startsWith("/app")) {
+    const info = await auth();
+
+    if (!info) {
+      return redirect("/signin");
+    }
+  }
 }
 
 export const config = {
-	matcher: "/api/:path*",
+	matcher: ["/api/:path*", "/app/:path*"],
 };

From aa0cd25e5115f5fef757fbefc6d1c614b68454d9 Mon Sep 17 00:00:00 2001
From: Saatvik Arya <aryasaatvik@gmail.com>
Date: Thu, 25 Jul 2024 14:05:41 -0700
Subject: [PATCH 2/9] robots and sitemap

---
 apps/web/app/robots.ts  | 12 ++++++++++++
 apps/web/app/sitemap.ts | 12 ++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 apps/web/app/robots.ts
 create mode 100644 apps/web/app/sitemap.ts

diff --git a/apps/web/app/robots.ts b/apps/web/app/robots.ts
new file mode 100644
index 00000000..3ce26140
--- /dev/null
+++ b/apps/web/app/robots.ts
@@ -0,0 +1,12 @@
+import { type MetadataRoute } from 'next'
+
+export default function robots(): MetadataRoute.Robots {
+  return {
+    rules: {
+      userAgent: '*',
+      allow: '/',
+      disallow: '/app/*',
+    },
+    sitemap: 'https://supermemory.ai/sitemap.xml',
+  }
+}
\ No newline at end of file
diff --git a/apps/web/app/sitemap.ts b/apps/web/app/sitemap.ts
new file mode 100644
index 00000000..f3c67863
--- /dev/null
+++ b/apps/web/app/sitemap.ts
@@ -0,0 +1,12 @@
+import { type MetadataRoute } from 'next'
+
+export default function sitemap(): MetadataRoute.Sitemap {
+  return [
+    {
+      url: 'https://supermemory.ai/',
+      lastModified: new Date(),
+      changeFrequency: 'yearly',
+      priority: 1,
+    }
+  ]
+}
\ No newline at end of file

From 7e479555fb10ce1947b243238a5f881720fa10ca Mon Sep 17 00:00:00 2001
From: Saatvik Arya <aryasaatvik@gmail.com>
Date: Thu, 25 Jul 2024 14:14:49 -0700
Subject: [PATCH 3/9] update ref

---
 apps/web/app/app/(dash)/(memories)/content.tsx | 10 ++++------
 apps/web/app/app/(dash)/header/header.tsx      |  4 ++--
 apps/web/app/app/(dash)/menu.tsx               |  9 +++------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/apps/web/app/app/(dash)/(memories)/content.tsx b/apps/web/app/app/(dash)/(memories)/content.tsx
index fea4477a..214e6f34 100644
--- a/apps/web/app/app/(dash)/(memories)/content.tsx
+++ b/apps/web/app/app/(dash)/(memories)/content.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { Content, StoredSpace } from "@/server/db/schema";
-import { MemoriesIcon, NextIcon, SearchIcon, UrlIcon } from "@repo/ui/icons";
+import type { Content, StoredSpace } from "@/server/db/schema";
+import { MemoriesIcon, NextIcon, UrlIcon } from "@repo/ui/icons";
 import {
 	ArrowLeftIcon,
 	MenuIcon,
@@ -12,17 +12,15 @@ import {
 } from "lucide-react";
 import Image from "next/image";
 import Link from "next/link";
-import React, { useEffect, useMemo, useState } from "react";
+import React, { useMemo, useState } from "react";
 import Masonry from "react-layout-masonry";
 import { getRawTweet } from "@repo/shared-types/utils";
-import { MyTweet } from "../../../components/twitter/render-tweet";
+import { MyTweet } from "@/components/twitter/render-tweet";
 import {
 	DropdownMenu,
 	DropdownMenuContent,
 	DropdownMenuItem,
-	DropdownMenuLabel,
 	DropdownMenuPortal,
-	DropdownMenuSeparator,
 	DropdownMenuSub,
 	DropdownMenuSubContent,
 	DropdownMenuSubTrigger,
diff --git a/apps/web/app/app/(dash)/header/header.tsx b/apps/web/app/app/(dash)/header/header.tsx
index 2b109600..bd34de53 100644
--- a/apps/web/app/app/(dash)/header/header.tsx
+++ b/apps/web/app/app/(dash)/header/header.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 import Image from "next/image";
 import Link from "next/link";
-import Logo from "../../../public/logo.svg";
+import Logo from "@/public/logo.svg";
 
-import { getChatHistory } from "../../actions/fetchers";
+import { getChatHistory } from "@/app/actions/fetchers";
 import NewChatButton from "./newChatButton";
 import AutoBreadCrumbs from "./autoBreadCrumbs";
 import SignOutButton from "./signOutButton";
diff --git a/apps/web/app/app/(dash)/menu.tsx b/apps/web/app/app/(dash)/menu.tsx
index d7c2d70c..c68c18e6 100644
--- a/apps/web/app/app/(dash)/menu.tsx
+++ b/apps/web/app/app/(dash)/menu.tsx
@@ -5,8 +5,6 @@ import Image from "next/image";
 import Link from "next/link";
 import {
 	MemoriesIcon,
-	ExploreIcon,
-	CanvasIcon,
 	AddIcon,
 	HomeIcon as HomeIconWeb,
 } from "@repo/ui/icons";
@@ -24,12 +22,11 @@ import {
 import { Label } from "@repo/ui/shadcn/label";
 import { Textarea } from "@repo/ui/shadcn/textarea";
 import { toast } from "sonner";
-import { getSpaces } from "../actions/fetchers";
+import { getSpaces } from "@/app/actions/fetchers";
 import { HomeIcon } from "@heroicons/react/24/solid";
-import { createMemory, createSpace } from "../actions/doers";
+import { createMemory, createSpace } from "@/app/actions/doers";
 import ComboboxWithCreate from "@repo/ui/shadcn/combobox";
-import { StoredSpace } from "@/server/db/schema";
-import useMeasure from "react-use-measure";
+import type { StoredSpace } from "@/server/db/schema";
 
 function Menu() {
 	const [spaces, setSpaces] = useState<StoredSpace[]>([]);

From c5b4256b9055d9186cbca1fa4a1753c992dec85d Mon Sep 17 00:00:00 2001
From: Saatvik Arya <aryasaatvik@gmail.com>
Date: Thu, 25 Jul 2024 14:23:11 -0700
Subject: [PATCH 4/9] fix

---
 apps/web/app/app/(dash)/chat/[chatid]/loading.tsx  | 1 -
 apps/web/app/app/(dash)/dialogContentContainer.tsx | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/web/app/app/(dash)/chat/[chatid]/loading.tsx b/apps/web/app/app/(dash)/chat/[chatid]/loading.tsx
index 422adb8e..dbb9290c 100644
--- a/apps/web/app/app/(dash)/chat/[chatid]/loading.tsx
+++ b/apps/web/app/app/(dash)/chat/[chatid]/loading.tsx
@@ -1,5 +1,4 @@
 import React from "react";
-import { chatSearchParamsCache } from "../../../../lib/searchParams";
 import ChatWindow from "../chatWindow";
 
 async function Page({
diff --git a/apps/web/app/app/(dash)/dialogContentContainer.tsx b/apps/web/app/app/(dash)/dialogContentContainer.tsx
index 4e8d81ef..cb8c4ce1 100644
--- a/apps/web/app/app/(dash)/dialogContentContainer.tsx
+++ b/apps/web/app/app/(dash)/dialogContentContainer.tsx
@@ -1,9 +1,9 @@
-import { StoredSpace } from "@/server/db/schema";
+import type { StoredSpace } from "@/server/db/schema";
 import { useEffect, useMemo, useState } from "react";
-import { createMemory, createSpace } from "../actions/doers";
+import { createMemory, createSpace } from "@/app/actions/doers";
 import ComboboxWithCreate from "@repo/ui/shadcn/combobox";
 import { toast } from "sonner";
-import { getSpaces } from "../actions/fetchers";
+import { getSpaces } from "@/app/actions/fetchers";
 import { MinusIcon, PlusCircleIcon } from "lucide-react";
 import {
 	DialogContent,

From 8d335524e24fe61d0b40d74868beb6cd27ef9ccc Mon Sep 17 00:00:00 2001
From: Saatvik Arya <aryasaatvik@gmail.com>
Date: Thu, 25 Jul 2024 14:49:22 -0700
Subject: [PATCH 5/9] undo nesting

---
 apps/web/app/{app => }/(canvas)/canvas/[id]/page.tsx              | 0
 apps/web/app/{app => }/(canvas)/canvas/page.tsx                   | 0
 apps/web/app/{app => }/(canvas)/canvas/search&create.tsx          | 0
 apps/web/app/{app => }/(canvas)/canvas/thinkPad.tsx               | 0
 apps/web/app/{app => }/(canvas)/canvas/thinkPads.tsx              | 0
 apps/web/app/{app => }/(canvas)/canvasStyles.css                  | 0
 apps/web/app/{app => }/(canvas)/layout.tsx                        | 0
 apps/web/app/{app => }/(dash)/(memories)/content.tsx              | 0
 apps/web/app/{app => }/(dash)/(memories)/memories/page.tsx        | 0
 apps/web/app/{app => }/(dash)/(memories)/space/[spaceid]/page.tsx | 0
 apps/web/app/{app => }/(dash)/chat/CodeBlock.tsx                  | 0
 apps/web/app/{app => }/(dash)/chat/[chatid]/loading.tsx           | 0
 apps/web/app/{app => }/(dash)/chat/[chatid]/page.tsx              | 0
 apps/web/app/{app => }/(dash)/chat/chatQueryInput.tsx             | 0
 apps/web/app/{app => }/(dash)/chat/chatWindow.tsx                 | 0
 apps/web/app/{app => }/(dash)/chat/markdownRenderHelpers.tsx      | 0
 apps/web/app/{app => }/(dash)/chat/route.ts                       | 0
 apps/web/app/{app => }/(dash)/dialogContentContainer.tsx          | 0
 apps/web/app/{app => }/(dash)/dialogTriggerWrapper.tsx            | 0
 apps/web/app/{app => }/(dash)/header/autoBreadCrumbs.tsx          | 0
 apps/web/app/{app => }/(dash)/header/header.tsx                   | 0
 apps/web/app/{app => }/(dash)/header/newChatButton.tsx            | 0
 apps/web/app/{app => }/(dash)/header/signOutButton.tsx            | 0
 apps/web/app/{app => }/(dash)/home/filterSpaces.tsx               | 0
 apps/web/app/{app => }/(dash)/home/history.tsx                    | 0
 apps/web/app/{app => }/(dash)/home/page.tsx                       | 0
 apps/web/app/{app => }/(dash)/home/queryinput.tsx                 | 0
 apps/web/app/{app => }/(dash)/layout.tsx                          | 0
 apps/web/app/{app => }/(dash)/menu.tsx                            | 0
 apps/web/app/{app => }/(dash)/note/[noteid]/page.tsx              | 0
 30 files changed, 0 insertions(+), 0 deletions(-)
 rename apps/web/app/{app => }/(canvas)/canvas/[id]/page.tsx (100%)
 rename apps/web/app/{app => }/(canvas)/canvas/page.tsx (100%)
 rename apps/web/app/{app => }/(canvas)/canvas/search&create.tsx (100%)
 rename apps/web/app/{app => }/(canvas)/canvas/thinkPad.tsx (100%)
 rename apps/web/app/{app => }/(canvas)/canvas/thinkPads.tsx (100%)
 rename apps/web/app/{app => }/(canvas)/canvasStyles.css (100%)
 rename apps/web/app/{app => }/(canvas)/layout.tsx (100%)
 rename apps/web/app/{app => }/(dash)/(memories)/content.tsx (100%)
 rename apps/web/app/{app => }/(dash)/(memories)/memories/page.tsx (100%)
 rename apps/web/app/{app => }/(dash)/(memories)/space/[spaceid]/page.tsx (100%)
 rename apps/web/app/{app => }/(dash)/chat/CodeBlock.tsx (100%)
 rename apps/web/app/{app => }/(dash)/chat/[chatid]/loading.tsx (100%)
 rename apps/web/app/{app => }/(dash)/chat/[chatid]/page.tsx (100%)
 rename apps/web/app/{app => }/(dash)/chat/chatQueryInput.tsx (100%)
 rename apps/web/app/{app => }/(dash)/chat/chatWindow.tsx (100%)
 rename apps/web/app/{app => }/(dash)/chat/markdownRenderHelpers.tsx (100%)
 rename apps/web/app/{app => }/(dash)/chat/route.ts (100%)
 rename apps/web/app/{app => }/(dash)/dialogContentContainer.tsx (100%)
 rename apps/web/app/{app => }/(dash)/dialogTriggerWrapper.tsx (100%)
 rename apps/web/app/{app => }/(dash)/header/autoBreadCrumbs.tsx (100%)
 rename apps/web/app/{app => }/(dash)/header/header.tsx (100%)
 rename apps/web/app/{app => }/(dash)/header/newChatButton.tsx (100%)
 rename apps/web/app/{app => }/(dash)/header/signOutButton.tsx (100%)
 rename apps/web/app/{app => }/(dash)/home/filterSpaces.tsx (100%)
 rename apps/web/app/{app => }/(dash)/home/history.tsx (100%)
 rename apps/web/app/{app => }/(dash)/home/page.tsx (100%)
 rename apps/web/app/{app => }/(dash)/home/queryinput.tsx (100%)
 rename apps/web/app/{app => }/(dash)/layout.tsx (100%)
 rename apps/web/app/{app => }/(dash)/menu.tsx (100%)
 rename apps/web/app/{app => }/(dash)/note/[noteid]/page.tsx (100%)

diff --git a/apps/web/app/app/(canvas)/canvas/[id]/page.tsx b/apps/web/app/(canvas)/canvas/[id]/page.tsx
similarity index 100%
rename from apps/web/app/app/(canvas)/canvas/[id]/page.tsx
rename to apps/web/app/(canvas)/canvas/[id]/page.tsx
diff --git a/apps/web/app/app/(canvas)/canvas/page.tsx b/apps/web/app/(canvas)/canvas/page.tsx
similarity index 100%
rename from apps/web/app/app/(canvas)/canvas/page.tsx
rename to apps/web/app/(canvas)/canvas/page.tsx
diff --git a/apps/web/app/app/(canvas)/canvas/search&create.tsx b/apps/web/app/(canvas)/canvas/search&create.tsx
similarity index 100%
rename from apps/web/app/app/(canvas)/canvas/search&create.tsx
rename to apps/web/app/(canvas)/canvas/search&create.tsx
diff --git a/apps/web/app/app/(canvas)/canvas/thinkPad.tsx b/apps/web/app/(canvas)/canvas/thinkPad.tsx
similarity index 100%
rename from apps/web/app/app/(canvas)/canvas/thinkPad.tsx
rename to apps/web/app/(canvas)/canvas/thinkPad.tsx
diff --git a/apps/web/app/app/(canvas)/canvas/thinkPads.tsx b/apps/web/app/(canvas)/canvas/thinkPads.tsx
similarity index 100%
rename from apps/web/app/app/(canvas)/canvas/thinkPads.tsx
rename to apps/web/app/(canvas)/canvas/thinkPads.tsx
diff --git a/apps/web/app/app/(canvas)/canvasStyles.css b/apps/web/app/(canvas)/canvasStyles.css
similarity index 100%
rename from apps/web/app/app/(canvas)/canvasStyles.css
rename to apps/web/app/(canvas)/canvasStyles.css
diff --git a/apps/web/app/app/(canvas)/layout.tsx b/apps/web/app/(canvas)/layout.tsx
similarity index 100%
rename from apps/web/app/app/(canvas)/layout.tsx
rename to apps/web/app/(canvas)/layout.tsx
diff --git a/apps/web/app/app/(dash)/(memories)/content.tsx b/apps/web/app/(dash)/(memories)/content.tsx
similarity index 100%
rename from apps/web/app/app/(dash)/(memories)/content.tsx
rename to apps/web/app/(dash)/(memories)/content.tsx
diff --git a/apps/web/app/app/(dash)/(memories)/memories/page.tsx b/apps/web/app/(dash)/(memories)/memories/page.tsx
similarity index 100%
rename from apps/web/app/app/(dash)/(memories)/memories/page.tsx
rename to apps/web/app/(dash)/(memories)/memories/page.tsx
diff --git a/apps/web/app/app/(dash)/(memories)/space/[spaceid]/page.tsx b/apps/web/app/(dash)/(memories)/space/[spaceid]/page.tsx
similarity index 100%
rename from apps/web/app/app/(dash)/(memories)/space/[spaceid]/page.tsx
rename to apps/web/app/(dash)/(memories)/space/[spaceid]/page.tsx
diff --git a/apps/web/app/app/(dash)/chat/CodeBlock.tsx b/apps/web/app/(dash)/chat/CodeBlock.tsx
similarity index 100%
rename from apps/web/app/app/(dash)/chat/CodeBlock.tsx
rename to apps/web/app/(dash)/chat/CodeBlock.tsx
diff --git a/apps/web/app/app/(dash)/chat/[chatid]/loading.tsx b/apps/web/app/(dash)/chat/[chatid]/loading.tsx
similarity index 100%
rename from apps/web/app/app/(dash)/chat/[chatid]/loading.tsx
rename to apps/web/app/(dash)/chat/[chatid]/loading.tsx
diff --git a/apps/web/app/app/(dash)/chat/[chatid]/page.tsx b/apps/web/app/(dash)/chat/[chatid]/page.tsx
similarity index 100%
rename from apps/web/app/app/(dash)/chat/[chatid]/page.tsx
rename to apps/web/app/(dash)/chat/[chatid]/page.tsx
diff --git a/apps/web/app/app/(dash)/chat/chatQueryInput.tsx b/apps/web/app/(dash)/chat/chatQueryInput.tsx
similarity index 100%
rename from apps/web/app/app/(dash)/chat/chatQueryInput.tsx
rename to apps/web/app/(dash)/chat/chatQueryInput.tsx
diff --git a/apps/web/app/app/(dash)/chat/chatWindow.tsx b/apps/web/app/(dash)/chat/chatWindow.tsx
similarity index 100%
rename from apps/web/app/app/(dash)/chat/chatWindow.tsx
rename to apps/web/app/(dash)/chat/chatWindow.tsx
diff --git a/apps/web/app/app/(dash)/chat/markdownRenderHelpers.tsx b/apps/web/app/(dash)/chat/markdownRenderHelpers.tsx
similarity index 100%
rename from apps/web/app/app/(dash)/chat/markdownRenderHelpers.tsx
rename to apps/web/app/(dash)/chat/markdownRenderHelpers.tsx
diff --git a/apps/web/app/app/(dash)/chat/route.ts b/apps/web/app/(dash)/chat/route.ts
similarity index 100%
rename from apps/web/app/app/(dash)/chat/route.ts
rename to apps/web/app/(dash)/chat/route.ts
diff --git a/apps/web/app/app/(dash)/dialogContentContainer.tsx b/apps/web/app/(dash)/dialogContentContainer.tsx
similarity index 100%
rename from apps/web/app/app/(dash)/dialogContentContainer.tsx
rename to apps/web/app/(dash)/dialogContentContainer.tsx
diff --git a/apps/web/app/app/(dash)/dialogTriggerWrapper.tsx b/apps/web/app/(dash)/dialogTriggerWrapper.tsx
similarity index 100%
rename from apps/web/app/app/(dash)/dialogTriggerWrapper.tsx
rename to apps/web/app/(dash)/dialogTriggerWrapper.tsx
diff --git a/apps/web/app/app/(dash)/header/autoBreadCrumbs.tsx b/apps/web/app/(dash)/header/autoBreadCrumbs.tsx
similarity index 100%
rename from apps/web/app/app/(dash)/header/autoBreadCrumbs.tsx
rename to apps/web/app/(dash)/header/autoBreadCrumbs.tsx
diff --git a/apps/web/app/app/(dash)/header/header.tsx b/apps/web/app/(dash)/header/header.tsx
similarity index 100%
rename from apps/web/app/app/(dash)/header/header.tsx
rename to apps/web/app/(dash)/header/header.tsx
diff --git a/apps/web/app/app/(dash)/header/newChatButton.tsx b/apps/web/app/(dash)/header/newChatButton.tsx
similarity index 100%
rename from apps/web/app/app/(dash)/header/newChatButton.tsx
rename to apps/web/app/(dash)/header/newChatButton.tsx
diff --git a/apps/web/app/app/(dash)/header/signOutButton.tsx b/apps/web/app/(dash)/header/signOutButton.tsx
similarity index 100%
rename from apps/web/app/app/(dash)/header/signOutButton.tsx
rename to apps/web/app/(dash)/header/signOutButton.tsx
diff --git a/apps/web/app/app/(dash)/home/filterSpaces.tsx b/apps/web/app/(dash)/home/filterSpaces.tsx
similarity index 100%
rename from apps/web/app/app/(dash)/home/filterSpaces.tsx
rename to apps/web/app/(dash)/home/filterSpaces.tsx
diff --git a/apps/web/app/app/(dash)/home/history.tsx b/apps/web/app/(dash)/home/history.tsx
similarity index 100%
rename from apps/web/app/app/(dash)/home/history.tsx
rename to apps/web/app/(dash)/home/history.tsx
diff --git a/apps/web/app/app/(dash)/home/page.tsx b/apps/web/app/(dash)/home/page.tsx
similarity index 100%
rename from apps/web/app/app/(dash)/home/page.tsx
rename to apps/web/app/(dash)/home/page.tsx
diff --git a/apps/web/app/app/(dash)/home/queryinput.tsx b/apps/web/app/(dash)/home/queryinput.tsx
similarity index 100%
rename from apps/web/app/app/(dash)/home/queryinput.tsx
rename to apps/web/app/(dash)/home/queryinput.tsx
diff --git a/apps/web/app/app/(dash)/layout.tsx b/apps/web/app/(dash)/layout.tsx
similarity index 100%
rename from apps/web/app/app/(dash)/layout.tsx
rename to apps/web/app/(dash)/layout.tsx
diff --git a/apps/web/app/app/(dash)/menu.tsx b/apps/web/app/(dash)/menu.tsx
similarity index 100%
rename from apps/web/app/app/(dash)/menu.tsx
rename to apps/web/app/(dash)/menu.tsx
diff --git a/apps/web/app/app/(dash)/note/[noteid]/page.tsx b/apps/web/app/(dash)/note/[noteid]/page.tsx
similarity index 100%
rename from apps/web/app/app/(dash)/note/[noteid]/page.tsx
rename to apps/web/app/(dash)/note/[noteid]/page.tsx

From a62802f788e4e936d259cc37123ab42dd7506e07 Mon Sep 17 00:00:00 2001
From: Saatvik Arya <aryasaatvik@gmail.com>
Date: Thu, 25 Jul 2024 15:12:52 -0700
Subject: [PATCH 6/9] routes.ts

---
 apps/web/app/robots.ts |  5 +++--
 apps/web/middleware.ts | 17 ++++++++++-------
 apps/web/routes.ts     | 12 ++++++++++++
 3 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 apps/web/routes.ts

diff --git a/apps/web/app/robots.ts b/apps/web/app/robots.ts
index 3ce26140..92a94b74 100644
--- a/apps/web/app/robots.ts
+++ b/apps/web/app/robots.ts
@@ -1,11 +1,12 @@
 import { type MetadataRoute } from 'next'
+import { routeGroups, routeTypes } from '@/routes'
 
 export default function robots(): MetadataRoute.Robots {
   return {
     rules: {
       userAgent: '*',
-      allow: '/',
-      disallow: '/app/*',
+      allow: [...routeGroups.landing],
+      disallow: [...routeTypes.authed],
     },
     sitemap: 'https://supermemory.ai/sitemap.xml',
   }
diff --git a/apps/web/middleware.ts b/apps/web/middleware.ts
index ee579ad9..832686dc 100644
--- a/apps/web/middleware.ts
+++ b/apps/web/middleware.ts
@@ -1,6 +1,7 @@
 import { type NextRequest, NextResponse } from "next/server";
 import { auth } from "./server/auth";
 import { redirect } from "next/navigation";
+import { routeTypes } from "@/routes";
 
 const corsHeaders = {
 	"Access-Control-Allow-Origin": "*",
@@ -20,15 +21,17 @@ export async function middleware(request: NextRequest) {
     });
 
     return response;
-  } else if (request.nextUrl.pathname.startsWith("/app")) {
-    const info = await auth();
-
+  }
+  const info = await auth();
+  if (routeTypes.authed.some((route) => request.nextUrl.pathname.startsWith(route))) {
     if (!info) {
       return redirect("/signin");
     }
+    return NextResponse.next();
+  } else {
+    if (info) {
+      return redirect("/dash/home");
+    }
+    return NextResponse.next();
   }
 }
-
-export const config = {
-	matcher: ["/api/:path*", "/app/:path*"],
-};
diff --git a/apps/web/routes.ts b/apps/web/routes.ts
new file mode 100644
index 00000000..5f35e13a
--- /dev/null
+++ b/apps/web/routes.ts
@@ -0,0 +1,12 @@
+export const routeGroups = {
+  auth: ["/privacy", "/signin", "/tos"],
+  canvas: ["/canvas"],
+  dash: ["/memories", "/space", "/chat", "/home", "/note"],
+  landing: ["/"],
+  other: ["/ref", "/onboarding"],
+};
+
+export const routeTypes = {
+  authed: [...routeGroups.canvas, ...routeGroups.dash, ...routeGroups.other],
+  unauthed: [...routeGroups.auth, ...routeGroups.landing],
+}
\ No newline at end of file

From c937e79c02b999e5f2479900b14ac6f864313ee5 Mon Sep 17 00:00:00 2001
From: Saatvik Arya <aryasaatvik@gmail.com>
Date: Thu, 25 Jul 2024 15:12:58 -0700
Subject: [PATCH 7/9] unnest

---
 apps/web/app/(auth)/onboarding/page.tsx                 | 6 +++---
 apps/web/app/(auth)/signin/page.tsx                     | 4 ++--
 apps/web/app/(dash)/(memories)/memories/page.tsx        | 2 +-
 apps/web/app/(dash)/(memories)/space/[spaceid]/page.tsx | 2 +-
 apps/web/app/(dash)/chat/chatWindow.tsx                 | 2 +-
 apps/web/app/(dash)/chat/route.ts                       | 2 +-
 apps/web/app/(dash)/header/autoBreadCrumbs.tsx          | 2 +-
 apps/web/app/(dash)/header/header.tsx                   | 2 +-
 apps/web/app/(dash)/header/newChatButton.tsx            | 2 +-
 apps/web/app/(dash)/menu.tsx                            | 2 +-
 apps/web/app/(landing)/Headers/Navbar.tsx               | 2 +-
 apps/web/app/(landing)/page.tsx                         | 2 +-
 apps/web/app/actions/doers.ts                           | 4 ++--
 13 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/apps/web/app/(auth)/onboarding/page.tsx b/apps/web/app/(auth)/onboarding/page.tsx
index 880afd12..9728d107 100644
--- a/apps/web/app/(auth)/onboarding/page.tsx
+++ b/apps/web/app/(auth)/onboarding/page.tsx
@@ -27,7 +27,7 @@ export default function Home() {
 		}
 		if (currStep > 3) {
 			updateDb().then(() => {
-				push("/app/home?q=what%20is%20supermemory");
+				push("/home?q=what%20is%20supermemory");
 			});
 		}
 	}, [currStep]);
@@ -297,7 +297,7 @@ function StepThree({ currStep }: { currStep: number }) {
 										toast.error(`Memory creation failed: ${cont.error}`);
 									}
 
-									push(`/app/home?q=what%20is%20supermemory`);
+									push(`/home?q=what%20is%20supermemory`);
 								}}
 							>
 								<textarea
@@ -388,7 +388,7 @@ function Navbar() {
 	const router = useRouter();
 	const handleSkip = async () => {
 		await completeOnboarding();
-		router.push("/app/home?q=what%20is%20supermemory");
+		router.push("/home?q=what%20is%20supermemory");
 	}
 
 	return (
diff --git a/apps/web/app/(auth)/signin/page.tsx b/apps/web/app/(auth)/signin/page.tsx
index 762ee021..e2524a5b 100644
--- a/apps/web/app/(auth)/signin/page.tsx
+++ b/apps/web/app/(auth)/signin/page.tsx
@@ -13,7 +13,7 @@ async function Signin() {
 	const user = await auth();
 
 	if (user) {
-		redirect("/app/home");
+		redirect("/home");
 	}
 
 	return (
@@ -59,7 +59,7 @@ async function Signin() {
 								action={async () => {
 									"use server";
 									await signIn("google", {
-										redirectTo: "/app/home",
+										redirectTo: "/home",
 									});
 								}}
 							>
diff --git a/apps/web/app/(dash)/(memories)/memories/page.tsx b/apps/web/app/(dash)/(memories)/memories/page.tsx
index a2f6c8a1..d0f555f2 100644
--- a/apps/web/app/(dash)/(memories)/memories/page.tsx
+++ b/apps/web/app/(dash)/(memories)/memories/page.tsx
@@ -4,7 +4,7 @@ import MemoriesPage from "../content";
 
 async function Page() {
 	const { success, data } = await getAllUserMemoriesAndSpaces();
-	if (!success ?? !data) return redirect("/app/home");
+	if (!success ?? !data) return redirect("/home");
 	return <MemoriesPage memoriesAndSpaces={data} />;
 }
 
diff --git a/apps/web/app/(dash)/(memories)/space/[spaceid]/page.tsx b/apps/web/app/(dash)/(memories)/space/[spaceid]/page.tsx
index 353466a9..c7508ef4 100644
--- a/apps/web/app/(dash)/(memories)/space/[spaceid]/page.tsx
+++ b/apps/web/app/(dash)/(memories)/space/[spaceid]/page.tsx
@@ -7,7 +7,7 @@ import { spacesAccess } from "@/server/db/schema";
 
 async function Page({ params: { spaceid } }: { params: { spaceid: number } }) {
 	const { success, data } = await getMemoriesInsideSpace(spaceid);
-	if (!success ?? !data) return redirect("/app/home");
+	if (!success ?? !data) return redirect("/home");
 
 	const hasAccess = await db.query.spacesAccess.findMany({
 		where: and(eq(spacesAccess.spaceId, spaceid)),
diff --git a/apps/web/app/(dash)/chat/chatWindow.tsx b/apps/web/app/(dash)/chat/chatWindow.tsx
index 30718b8d..ed65bf7a 100644
--- a/apps/web/app/(dash)/chat/chatWindow.tsx
+++ b/apps/web/app/(dash)/chat/chatWindow.tsx
@@ -201,7 +201,7 @@ function ChatWindow({
 				);
 			}
 		} else {
-			router.push("/app/home");
+			router.push("/home");
 		}
 	}, []);
 
diff --git a/apps/web/app/(dash)/chat/route.ts b/apps/web/app/(dash)/chat/route.ts
index 038c5f7c..94f250ff 100644
--- a/apps/web/app/(dash)/chat/route.ts
+++ b/apps/web/app/(dash)/chat/route.ts
@@ -1,5 +1,5 @@
 import { redirect } from "next/navigation";
 
 export async function GET() {
-	return redirect("/app/home");
+	return redirect("/home");
 }
diff --git a/apps/web/app/(dash)/header/autoBreadCrumbs.tsx b/apps/web/app/(dash)/header/autoBreadCrumbs.tsx
index 8a262b78..671464ff 100644
--- a/apps/web/app/(dash)/header/autoBreadCrumbs.tsx
+++ b/apps/web/app/(dash)/header/autoBreadCrumbs.tsx
@@ -16,7 +16,7 @@ function AutoBreadCrumbs() {
 	return (
 		<Breadcrumb className="hidden md:block">
 			<BreadcrumbList>
-				{!pathname.startsWith("/app/home") && (
+				{!pathname.startsWith("/home") && (
 					<>
 						<BreadcrumbItem>
 							<BreadcrumbLink href="/">Home</BreadcrumbLink>
diff --git a/apps/web/app/(dash)/header/header.tsx b/apps/web/app/(dash)/header/header.tsx
index bd34de53..079b350c 100644
--- a/apps/web/app/(dash)/header/header.tsx
+++ b/apps/web/app/(dash)/header/header.tsx
@@ -26,7 +26,7 @@ async function Header() {
 		<div className="p-4 relative z-30 h-16 flex items-center">
 			<div className="w-full flex items-center justify-between">
 				<div className="flex items-center gap-4">
-					<Link className="" href="/app/home">
+					<Link className="" href="/home">
 						<Image
 							src={Logo}
 							alt="SuperMemory logo"
diff --git a/apps/web/app/(dash)/header/newChatButton.tsx b/apps/web/app/(dash)/header/newChatButton.tsx
index 1699ca4c..a634ab41 100644
--- a/apps/web/app/(dash)/header/newChatButton.tsx
+++ b/apps/web/app/(dash)/header/newChatButton.tsx
@@ -12,7 +12,7 @@ function NewChatButton() {
 	if (path.startsWith("/chat")) {
 		return (
 			<Link
-				href="/app/home"
+				href="/home"
 				className="flex duration-200 items-center text-[#7D8994] hover:bg-[#1F2429] text-[13px] gap-2 px-3 py-2 rounded-xl"
 			>
 				<Image src={ChatIcon} alt="Chat icon" className="w-5" />
diff --git a/apps/web/app/(dash)/menu.tsx b/apps/web/app/(dash)/menu.tsx
index c68c18e6..dfd1646a 100644
--- a/apps/web/app/(dash)/menu.tsx
+++ b/apps/web/app/(dash)/menu.tsx
@@ -50,7 +50,7 @@ function Menu() {
 		{
 			icon: HomeIconWeb,
 			text: "Home",
-			url: "/app/home",
+			url: "/home",
 			disabled: false,
 		},
 		{
diff --git a/apps/web/app/(landing)/Headers/Navbar.tsx b/apps/web/app/(landing)/Headers/Navbar.tsx
index 1d59157f..d783244a 100644
--- a/apps/web/app/(landing)/Headers/Navbar.tsx
+++ b/apps/web/app/(landing)/Headers/Navbar.tsx
@@ -34,7 +34,7 @@ const SlideTabs = () => {
 			</Link>
 
 			<Tab key={0} setPosition={setPosition}>
-				<Link className="w-full h-full" href={"/app/home"}>
+				<Link className="w-full h-full" href={"/home"}>
 					Home
 				</Link>
 			</Tab>
diff --git a/apps/web/app/(landing)/page.tsx b/apps/web/app/(landing)/page.tsx
index 08770789..f873c390 100644
--- a/apps/web/app/(landing)/page.tsx
+++ b/apps/web/app/(landing)/page.tsx
@@ -17,7 +17,7 @@ export default async function Home() {
 	const user = await auth();
 
 	if (user) {
-		redirect("/app/home");
+		redirect("/home");
 	}
 
 	return (
diff --git a/apps/web/app/actions/doers.ts b/apps/web/app/actions/doers.ts
index 0c514fc6..fbccd195 100644
--- a/apps/web/app/actions/doers.ts
+++ b/apps/web/app/actions/doers.ts
@@ -70,7 +70,7 @@ export const createSpace = async (
 			.insert(space)
 			.values({ name: input, user: data.user.id, createdAt: new Date() });
 
-		revalidatePath("/app/home");
+		revalidatePath("/home");
 		return { success: true, data: resp.meta.last_row_id };
 	} catch (e: unknown) {
 		const error = e as Error;
@@ -343,7 +343,7 @@ export const createMemory = async (input: {
 			})
 			.returning({ id: storedContent.id });
 		revalidatePath("/memories");
-		revalidatePath("/app/home");
+		revalidatePath("/home");
 
 		contentId = insertResponse[0]?.id;
 	} catch (e) {

From 83f4b24b771fef69f1d34af35a9b7e4ecc01078a Mon Sep 17 00:00:00 2001
From: Saatvik Arya <aryasaatvik@gmail.com>
Date: Thu, 25 Jul 2024 15:18:40 -0700
Subject: [PATCH 8/9] middleware

---
 apps/web/middleware.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/apps/web/middleware.ts b/apps/web/middleware.ts
index 832686dc..370a5913 100644
--- a/apps/web/middleware.ts
+++ b/apps/web/middleware.ts
@@ -1,6 +1,5 @@
 import { type NextRequest, NextResponse } from "next/server";
 import { auth } from "./server/auth";
-import { redirect } from "next/navigation";
 import { routeTypes } from "@/routes";
 
 const corsHeaders = {
@@ -25,13 +24,12 @@ export async function middleware(request: NextRequest) {
   const info = await auth();
   if (routeTypes.authed.some((route) => request.nextUrl.pathname.startsWith(route))) {
     if (!info) {
-      return redirect("/signin");
+      NextResponse.redirect(new URL("/signin", request.nextUrl));
     }
-    return NextResponse.next();
   } else {
     if (info) {
-      return redirect("/dash/home");
+      NextResponse.redirect(new URL("/home", request.nextUrl));
     }
-    return NextResponse.next();
   }
+  return NextResponse.next();
 }

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 9/9] 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