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

3 files changed, 19 insertions, 41 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(
     {
diff --git a/apps/web/src/app/page.tsx b/apps/web/src/app/page.tsx
index 7f3abfee..1cc21adf 100644
--- a/apps/web/src/app/page.tsx
+++ b/apps/web/src/app/page.tsx
@@ -1,6 +1,6 @@
 import { db } from "@/server/db";
 import {
-    ChachedSpaceContent,
+  ChachedSpaceContent,
   contentToSpace,
   sessions,
   space,
@@ -57,37 +57,36 @@ export default async function Home() {
     .select()
     .from(space)
     .where(eq(space.user, userData.id))
-		.all();
+    .all();
 
-	console.log(collectedSpaces)
+  console.log(collectedSpaces);
 
   // Fetch only first 3 content of each spaces
   let contents: ChachedSpaceContent[] = [];
 
-	//console.log(await db.select().from(storedContent).)
-	
+  //console.log(await db.select().from(storedContent).)
+
   await Promise.all([
     collectedSpaces.forEach(async (space) => {
-			console.log("fetching ")
-			const data = (await fetchContentForSpace(space.id, {
-				offset: 0,
-				limit: 3,
-			})).map(data => ({
-				...data,
-				space: space.id
-			}))
-      contents = [
-        ...contents,
+      console.log("fetching ");
+      const data = (
+        await fetchContentForSpace(space.id, {
+          offset: 0,
+          limit: 3,
+        })
+      ).map((data) => ({
         ...data,
-      ];
+        space: space.id,
+      }));
+      contents = [...contents, ...data];
     }),
   ]);
 
-	console.log(contents)
+  console.log(contents);
 
   // freeMemories
   const freeMemories = await fetchFreeMemories(userData.id);
-	console.log('free',freeMemories)
+  console.log("free", freeMemories);
 
   return (
     <MemoryProvider
diff --git a/apps/web/src/app/privacy/page.tsx b/apps/web/src/app/privacy/page.tsx
index 8d126dff..5e40cbe9 100644
--- a/apps/web/src/app/privacy/page.tsx
+++ b/apps/web/src/app/privacy/page.tsx
@@ -2,6 +2,8 @@ import React from "react";
 import Markdown from "react-markdown";
 import { policy } from "./privacy";
 
+export const runtime = "edge";
+
 function Page() {
   return (
     <div>