Merge branch 'main' of https://github.com/dhravya/supermemory

1 files changed, 0 insertions, 23 deletions

diff --git a/apps/web/src/app/api/spaces/route.ts b/apps/web/src/app/api/spaces/route.ts
index 3fe95870..d2685e9f 100644
--- a/apps/web/src/app/api/spaces/route.ts
+++ b/apps/web/src/app/api/spaces/route.ts
@@ -3,13 +3,7 @@ import { sessions, space, users } from "@/server/db/schema";
 import { eq } from "drizzle-orm";
 import { NextRequest, NextResponse } from "next/server";
 
-<<<<<<< HEAD
-export const runtime = "edge"
-
-export async function GET(req: NextRequest) {
-=======
 export const runtime = "edge";
->>>>>>> 7648bdaa8cbe42a90f05865f8c555c9a3911af9b
 
 export async function GET(req: NextRequest) {
   const token =
@@ -40,7 +34,6 @@ export async function GET(req: NextRequest) {
     .from(sessions)
     .where(eq(sessions.sessionToken, token!));
 
-
   if (!sessionData || sessionData.length === 0) {
     return new Response(
       JSON.stringify({ message: "Invalid Key, session not found." }),
@@ -63,27 +56,11 @@ export async function GET(req: NextRequest) {
 
   const user = userData[0];
 
-<<<<<<< HEAD
-	const spaces = await db
-		.select()
-		.from(space)
-		.where(eq(space.user, user.id))
-		.all();
-
-
-	console.log('data', spaces)
-
-	return NextResponse.json({
-		message: "OK",
-		data: spaces
-	}, { status: 200 })
-=======
   const spaces = await db
     .select()
     .from(space)
     .where(eq(space.user, user.id))
     .all();
->>>>>>> 7648bdaa8cbe42a90f05865f8c555c9a3911af9b
 
   return NextResponse.json(
     {