Merge pull request #72 from Ashutoshbind15/main

Add map review for admins and some admin helpers

app/header.tsx

@@ -26,6 +26,7 @@ export default function Header() {
   const { signOut } = useAuthActions();
   const { isAuthenticated } = useConvexAuth();
   const flags = useQuery(api.flags.getFlags);
+  const isAdminQuery = useQuery(api.users.isAdmin);
 
   return (
     <header className="flex justify-between items-center py-4 px-6 shadow-sm border-b">
@@ -49,6 +50,11 @@ export default function Header() {
             <Button variant="ghost">Submit Map</Button>
           </Link>
         )}
+        {isAdminQuery && (
+          <Link href="/maps/review">
+            <Button variant="ghost">Review Maps</Button>
+          </Link>
+        )}
         {flags?.showTestPage && (
           <Link href="/test">
             <Button variant="ghost">Test</Button>

app/maps/review/page.tsx

@@ -0,0 +1,55 @@
+"use client";
+
+import { Map } from "@/components/Map";
+import { Button } from "@/components/ui/button";
+import {
+  Card,
+  CardContent,
+  CardFooter,
+  CardHeader,
+  CardTitle,
+} from "@/components/ui/card";
+import { api } from "@/convex/_generated/api";
+import { useMutation, useQuery } from "convex/react";
+
+const Page = () => {
+  const isAdmin = useQuery(api.users.isAdmin);
+  const maps = useQuery(api.maps.getMaps, { isReviewed: false });
+  const adminApprovalMutation = useMutation(api.maps.approveMap);
+
+  if (isAdmin == true) {
+    return (
+      <div className="py-6">
+        <h1 className="text-center font-semibold mb-4">Review Maps</h1>
+        <div className="flex items-center justify-around">
+          {maps?.map((map) => (
+            <Card key={map._id}>
+              <CardHeader>
+                <CardTitle> </CardTitle>
+              </CardHeader>
+
+              <CardContent>
+                <Map map={map.grid} />
+              </CardContent>
+
+              <CardFooter className="flex justify-center">
+                <Button
+                  variant="outline"
+                  onClick={async () => {
+                    await adminApprovalMutation({ mapId: map._id });
+                  }}
+                >
+                  Approve
+                </Button>
+              </CardFooter>
+            </Card>
+          ))}
+        </div>
+      </div>
+    );
+  }
+
+  return <div>Not an admin</div>;
+};
+
+export default Page;

app/play/page.tsx

@@ -16,7 +16,7 @@ import { useEffect, useState } from "react";
 import { Skeleton } from "@/components/ui/skeleton";
 
 export default function PlayPage() {
-  const maps = useQuery(api.maps.getMaps);
+  const maps = useQuery(api.maps.getMaps, {});
   const userMapResults = useQuery(api.playerresults.getUserMapStatus);
   const mapCountResults = useQuery(api.playerresults.getMapsWins);
 

convex/maps.ts

@@ -57,12 +57,10 @@ export const addMap = mutation({
       throw new Error("User not authenticated");
     }
 
-    const maps = await ctx.db.query("maps").collect();
-
     await ctx.db.insert("maps", {
-      level: maps.length + 1,
       grid: args.grid,
       submittedBy: userId,
+      isReviewed: false,
     });
   },
 });
@@ -82,6 +80,7 @@ export const seedMaps = internalMutation({
           ctx.db.insert("maps", {
             level: idx + 1,
             grid: map.grid,
+            isReviewed: true,
           });
         }
       }),
@@ -90,9 +89,71 @@ export const seedMaps = internalMutation({
 });
 
 export const getMaps = query({
-  args: {},
-  handler: async (ctx) => {
-    return await ctx.db.query("maps").withIndex("by_level").collect();
+  args: {
+    isReviewed: v.optional(v.boolean()),
+  },
+  handler: async (ctx, args) => {
+    if (args.isReviewed !== undefined) {
+      // todo: take this out into a helper function
+      // if a manual query is made, check if the user is an admin
+
+      const userId = await getAuthUserId(ctx);
+      if (userId === null) {
+        return null;
+      }
+
+      const admins = await ctx.db.query("admins").collect();
+      const isAdmin = admins.some((admin) => admin.userId === userId);
+
+      if (isAdmin) {
+        return await ctx.db
+          .query("maps")
+          .filter((q) => q.eq(q.field("isReviewed"), args.isReviewed))
+          .collect();
+      } else {
+        return null;
+      }
+    }
+
+    return await ctx.db
+      .query("maps")
+      .filter((q) => q.eq(q.field("isReviewed"), true))
+      .collect();
+  },
+});
+
+export const approveMap = mutation({
+  args: {
+    mapId: v.id("maps"),
+  },
+  handler: async (ctx, args) => {
+    // todo: take this out into a helper function
+
+    const userId = await getAuthUserId(ctx);
+    if (userId === null) {
+      throw new Error("Unauthorized");
+    }
+
+    const admins = await ctx.db.query("admins").collect();
+    const isAdmin = admins.some((admin) => admin.userId === userId);
+
+    if (!isAdmin) {
+      throw new Error("Unauthorized");
+    } else {
+      const maps = await ctx.db.query("maps").collect();
+
+      const lastLevel = maps.reduce((acc, map) => {
+        if (map.level) {
+          return Math.max(acc, map.level);
+        }
+        return acc;
+      }, 0);
+
+      await ctx.db.patch(args.mapId, {
+        isReviewed: true,
+        level: lastLevel + 1,
+      });
+    }
   },
 });
 

convex/results.ts

@@ -80,7 +80,12 @@ export const updateResult = internalMutation({
 
     const maps = await ctx.db.query("maps").collect();
 
-    const lastLevel = maps.reduce((max, map) => Math.max(max, map.level), 0);
+    const lastLevel = maps.reduce((acc, map) => {
+      if (map.level) {
+        return Math.max(acc, map.level);
+      }
+      return acc;
+    }, 0);
 
     await ctx.runMutation(internal.leaderboard.updateRankings, {
       modelId: game.modelId,

convex/schema.ts

@@ -12,9 +12,10 @@ export default defineSchema({
     status: v.union(v.literal("in_progress"), v.literal("completed")),
   }),
   maps: defineTable({
-    level: v.number(),
+    level: v.optional(v.number()),
     grid: v.array(v.array(v.string())),
     submittedBy: v.optional(v.id("users")),
+    isReviewed: v.boolean(),
   }).index("by_level", ["level"]),
   scores: defineTable({
     modelId: v.string(),
@@ -61,4 +62,7 @@ export default defineSchema({
     attempts: v.array(v.id("attempts")),
     hasWon: v.boolean(),
   }).index("by_mapId_userId", ["mapId", "userId"]),
+  admins: defineTable({
+    userId: v.id("users"),
+  }),
 });

convex/users.ts

@@ -26,3 +26,16 @@ export const getUserOrNull = query({
     return await ctx.db.get(userId);
   },
 });
+
+export const isAdmin = query({
+  handler: async (ctx) => {
+    const userId = await getAuthUserId(ctx);
+    if (userId === null) {
+      return false;
+    }
+
+    const admins = await ctx.db.query("admins").collect();
+
+    return admins.some((admin) => admin.userId === userId);
+  },
+});