From de21ec52d965f5e59cadcae54601ee64acc069eb Mon Sep 17 00:00:00 2001 From: Cody Seibert Date: Tue, 22 Oct 2024 12:29:43 -0400 Subject: [PATCH] fix issue with no maps showing when logged out and local storage filter set --- app/play/page.tsx | 3 +++ convex/maps.ts | 6 ++---- convex/schema.ts | 3 ++- package.json | 1 + 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/play/page.tsx b/app/play/page.tsx index bb8f0c5..1d9b0d6 100644 --- a/app/play/page.tsx +++ b/app/play/page.tsx @@ -4,6 +4,7 @@ import { useEffect, useState } from "react"; import { Authenticated, Unauthenticated, + useConvexAuth, useMutation, useQuery, } from "convex/react"; @@ -29,6 +30,7 @@ export default function PlayPage() { const userMapResults = useQuery(api.playerresults.getUserMapStatus); const mapCountResults = useQuery(api.playerresults.getMapsWins); const adminDeleteMapMutation = useMutation(api.maps.deleteMap); + const { isAuthenticated } = useConvexAuth(); const [resMap, setResMap] = useState(new Map()); const [countMap, setCountMap] = useState(new Map()); @@ -68,6 +70,7 @@ export default function PlayPage() { }, [userMapResults, mapCountResults]); const filteredMaps = maps?.filter((map) => { + if (!isAuthenticated) return true; if (filter === "all") return true; if (filter === "beaten") return resMap.get(map._id); if (filter === "unbeaten") return !resMap.get(map._id); diff --git a/convex/maps.ts b/convex/maps.ts index ddafb1f..7863f97 100644 --- a/convex/maps.ts +++ b/convex/maps.ts @@ -191,7 +191,6 @@ export const seedMaps = internalMutation({ }, }); - export const getUnreviewedMaps = adminQueryBuilder({ handler: async (ctx) => { return await ctx.db @@ -202,10 +201,9 @@ export const getUnreviewedMaps = adminQueryBuilder({ }); export const getMaps = query({ - args: { - }, + args: {}, handler: async (ctx, args) => { - return await ctx.db + return await ctx.db .query("maps") .withIndex("by_isReviewed_level", (q) => q.eq("isReviewed", true)) .collect(); diff --git a/convex/schema.ts b/convex/schema.ts index 0c26702..e1005eb 100644 --- a/convex/schema.ts +++ b/convex/schema.ts @@ -16,7 +16,8 @@ export default defineSchema({ grid: v.array(v.array(v.string())), submittedBy: v.optional(v.id("users")), isReviewed: v.boolean(), - }).index("by_level", ["level"]) + }) + .index("by_level", ["level"]) .index("by_isReviewed_level", ["isReviewed", "level"]), scores: defineTable({ modelId: v.string(), diff --git a/package.json b/package.json index c335391..433d8ef 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "openai": "^4.67.3", "react": "^18", "react-dom": "^18", + "sharp": "^0.33.5", "tailwind-merge": "^2.4.0", "tailwindcss-animate": "^1.0.7", "zod": "^3.23.8"