Merge branch 'develop' into K-17-Put-the-WebGL-onto-a-React-Component

Author: kaseyliu

.gitignore

@@ -33,10 +33,3 @@ yarn-error.log*
 # typescript
 *.tsbuildinfo
 next-env.d.ts
-
-
-# package manager files
-package.json
-package-lock.json
-# clerk configuration (can include secrets)
-/.clerk/

package-lock.json

@@ -13,11 +13,15 @@
     "prepare": "husky"
   },
   "dependencies": {
-    "@clerk/nextjs": "^6.36.10",
+    "@chakra-ui/react": "^3.31.0",
+    "@clerk/nextjs": "^6.37.1",
+    "@emotion/react": "^11.14.0",
     "mongoose": "^8",
     "next": "^14.2.35",
+    "next-themes": "^0.4.6",
     "react": "^18",
-    "react-dom": "^18"
+    "react-dom": "^18",
+    "react-icons": "^5.5.0"
   },
   "devDependencies": {
     "@types/node": "^20",

package.json

@@ -0,0 +1,92 @@
+import connectDB from "@/database/db";
+import Session from "@/database/sessionSchema";
+import { NextRequest, NextResponse } from "next/server";
+import mongoose from "mongoose";
+// GET and PATCH routes for sessions
+
+/**
+ * GET /api/sessions/:sessionId
+ * Fetch a session by ID
+ */
+export async function GET(request: NextRequest, { params }: { params: { sessionId: string } }) {
+  try {
+    await connectDB();
+
+    const { sessionId } = params;
+
+    if (!mongoose.Types.ObjectId.isValid(sessionId)) {
+      return NextResponse.json({ error: "Invalid session ID" }, { status: 400 });
+    }
+
+    const session = await Session.findById(sessionId);
+
+    if (!session) {
+      return NextResponse.json({ error: "Session not found" }, { status: 404 });
+    }
+
+    return NextResponse.json({
+      _id: session._id,
+      anonUserId: session.anonUserId,
+      startedAt: session.startedAt,
+      endedAt: session.endedAt,
+      durationMs: session.durationMs,
+    });
+  } catch (error) {
+    console.error("GET /api/sessions/:sessionId error:", error);
+    return NextResponse.json({ error: "Failed to fetch session" }, { status: 500 });
+  }
+}
+
+/**
+ * PATCH /api/sessions/:sessionId
+ * Update a session (e.g., end it by setting endedAt and durationMs)
+ * Body: { endedAt?: Date, durationMs?: number } or empty to auto-end
+ */
+export async function PATCH(request: NextRequest, { params }: { params: { sessionId: string } }) {
+  try {
+    await connectDB();
+
+    const { sessionId } = params;
+
+    if (!mongoose.Types.ObjectId.isValid(sessionId)) {
+      return NextResponse.json({ error: "Invalid session ID" }, { status: 400 });
+    }
+
+    const session = await Session.findById(sessionId);
+
+    if (!session) {
+      return NextResponse.json({ error: "Session not found" }, { status: 404 });
+    }
+
+    const body = await request.json().catch(() => ({}));
+
+    // If body is empty or only endedAt/durationMs, allow update
+    const update: { endedAt?: Date; durationMs?: number } = {};
+
+    if (body.endedAt !== undefined) {
+      update.endedAt = typeof body.endedAt === "string" ? new Date(body.endedAt) : body.endedAt;
+    } else if (Object.keys(body).length === 0 || body.endSession) {
+      // Auto-end: set endedAt to now and calculate duration
+      const endedAt = new Date();
+      update.endedAt = endedAt;
+      update.durationMs = endedAt.getTime() - session.startedAt.getTime();
+    }
+
+    if (body.durationMs !== undefined) {
+      update.durationMs = Number(body.durationMs);
+    }
+
+    const updatedSession = await Session.findByIdAndUpdate(sessionId, { $set: update }, { new: true });
+
+    return NextResponse.json({
+      _id: updatedSession!._id,
+      anonUserId: updatedSession!.anonUserId,
+      startedAt: updatedSession!.startedAt,
+      endedAt: updatedSession!.endedAt,
+      durationMs: updatedSession!.durationMs,
+    });
+  } catch (error) {
+    console.error("PATCH /api/sessions/:sessionId error:", error);
+    return NextResponse.json({ error: "Failed to update session" }, { status: 500 });
+  }
+}

src/app/api/sessions/[sessionId]/route.ts

@@ -0,0 +1,41 @@
+import connectDB from "@/database/db";
+import Session from "@/database/sessionSchema";
+import { NextRequest, NextResponse } from "next/server";
+// POST route for creating a new session
+
+/**
+ * POST /api/sessions
+ * Create a new session
+ * Body: { anonUserId: string }
+ */
+export async function POST(request: NextRequest) {
+  try {
+    await connectDB();
+
+    const body = await request.json();
+    const { anonUserId } = body;
+
+    if (!anonUserId || typeof anonUserId !== "string") {
+      return NextResponse.json({ error: "anonUserId is required and must be a string" }, { status: 400 });
+    }
+
+    const startedAt = new Date();
+    const session = await Session.create({
+      anonUserId,
+      startedAt,
+      endedAt: null,
+      durationMs: 0,
+    });
+
+    return NextResponse.json({
+      _id: session._id,
+      anonUserId: session.anonUserId,
+      startedAt: session.startedAt,
+      endedAt: session.endedAt,
+      durationMs: session.durationMs,
+    });
+  } catch (error) {
+    console.error("POST /api/sessions error:", error);
+    return NextResponse.json({ error: "Failed to create session" }, { status: 500 });
+  }
+}

src/app/api/sessions/route.ts

@@ -0,0 +1,46 @@
+import connectDB from "@/database/db";
+import { NextResponse, NextRequest } from "next/server";
+import User from "@/database/userSchema";
+import mongoose from "mongoose";
+
+// Get a specific user, finding the user by their userID
+export async function GET(_req: NextRequest, { params }: { params: { id: string } }) {
+  try {
+    const { id } = params;
+    if (!mongoose.Types.ObjectId.isValid(id)) {
+      return NextResponse.json({ error: "Invalid user id" }, { status: 400 });
+    }
+    await connectDB();
+
+    const user = await User.findById(id).lean();
+    if (!user) {
+      return NextResponse.json({ error: "User not found" }, { status: 404 });
+    }
+    return NextResponse.json(user, { status: 200 });
+  } catch (err: any) {
+    console.error("Caught an error", err);
+    return NextResponse.json({ error: err.message }, { status: 500 });
+  }
+}
+
+// Update a specific user, finding the user by their userID
+export async function PUT(req: NextRequest, { params }: { params: { id: string } }) {
+  try {
+    const { id } = params;
+    const changes = await req.json();
+    if (!mongoose.Types.ObjectId.isValid(id)) {
+      return NextResponse.json({ error: "Invalid user id" }, { status: 400 });
+    }
+    await connectDB();
+
+    const updatedUser = await User.findByIdAndUpdate(id, { $set: changes }, { new: true, runValidators: true }).lean();
+    if (!updatedUser) {
+      return NextResponse.json({ error: "User not found" }, { status: 404 });
+    }
+
+    return NextResponse.json(updatedUser, { status: 200 });
+  } catch (err: any) {
+    console.error("Caught an error", err);
+    return NextResponse.json({ error: err.message }, { status: 400 });
+  }
+}

src/app/api/users/[id]/route.ts

@@ -0,0 +1,30 @@
+import connectDB from "@/database/db";
+import { NextResponse, NextRequest } from "next/server";
+import User from "@/database/userSchema";
+
+// CREATE a user with the parameters that are passed in, catching any server connection or bad requestst that may occur
+export async function POST(req: NextRequest) {
+  try {
+    await connectDB();
+
+    const body = await req.json();
+    const user = await User.create(body);
+    return NextResponse.json(user, { status: 201 });
+  } catch (err: any) {
+    console.error("Caught an error", err);
+    return NextResponse.json({ error: err.message }, { status: 400 });
+  }
+}
+
+// RETRIEVE all users from the database, catching any errors that may occur
+export async function GET() {
+  try {
+    await connectDB();
+
+    const retrieved_users = await User.find({}).lean();
+    return NextResponse.json(retrieved_users, { status: 200 });
+  } catch (err: any) {
+    console.error("Caught an error", err);
+    return NextResponse.json({ error: err.message }, { status: 400 });
+  }
+}

src/app/api/users/route.ts

@@ -0,0 +1 @@
+export default function Dashboard() {}

src/app/dashboard/page.tsx

@@ -0,0 +1 @@
+export default function Home() {}

src/app/home/page.tsx

@@ -1,6 +1,6 @@
 import type { Metadata } from "next";
 import "./globals.css";
-import { ClerkProvider } from "@clerk/nextjs";
+import Providers from "./providers";
 
 //! Update metadata to match your project
 export const metadata: Metadata = {
@@ -10,10 +10,10 @@ export const metadata: Metadata = {
 
 export default function RootLayout({ children }: { children: React.ReactNode }) {
   return (
-    <ClerkProvider>
-      <html lang="en">
-        <body>{children}</body>
-      </html>
-    </ClerkProvider>
+    <html lang="en">
+      <body>
+        <Providers>{children}</Providers>
+      </body>
+    </html>
   );
 }