fixing bugs with the ucat questions feature

Author: shabebe11

app/admin/page.tsx

@@ -21,8 +21,10 @@ type UploadType = "ucat" | "mmi";
 
 type UploadRow = Record<string, string>;
 
+// Normalize CSV headers for matching.
 const normalizeHeader = (value: string) => value.trim().toLowerCase();
 
+// Minimal CSV parser supporting quoted fields.
 const parseCsv = (content: string) => {
   const rows: string[][] = [];
   let current = "";
@@ -90,6 +92,7 @@ export default function AdminPage() {
     setUploadError(null);
   };
 
+  // Insert a single MMI question.
   const handleMmiSubmit = async () => {
     resetMessages();
     if (!mmiQuestion.trim() || !mmiAnswer.trim()) {
@@ -114,6 +117,7 @@ export default function AdminPage() {
     setIsSaving(false);
   };
 
+  // Insert a single UCAT question.
   const handleUcatSubmit = async () => {
     resetMessages();
     if (!ucatQuestion.trim()) {
@@ -142,11 +146,11 @@ export default function AdminPage() {
     const supabase = createClient();
     const { error } = await supabase.from("Ucat").insert({
       question: ucatQuestion.trim(),
-      answer1: ucatAnswers[0]?.trim() || null,
-      answer2: ucatAnswers[1]?.trim() || null,
-      answer3: ucatAnswers[2]?.trim() || null,
-      answer4: ucatAnswers[3]?.trim() || null,
-      answer5: ucatAnswers[4]?.trim() || null,
+      "answer 1": ucatAnswers[0]?.trim() || null,
+      "answer 2": ucatAnswers[1]?.trim() || null,
+      "answer 3": ucatAnswers[2]?.trim() || null,
+      "answer 4": ucatAnswers[3]?.trim() || null,
+      "answer 5": ucatAnswers[4]?.trim() || null,
       correct_answer: correctNumber,
       type: ucatType.trim(),
     });
@@ -163,6 +167,7 @@ export default function AdminPage() {
     setIsSaving(false);
   };
 
+  // Parse CSV and bulk insert rows.
   const handleCsvUpload = async (file: File, type: UploadType) => {
     resetMessages();
     setUploadPreview([]);
@@ -215,11 +220,11 @@ export default function AdminPage() {
       } else {
         const payload = mappedRows.map((row) => ({
           question: row.question?.trim(),
-          answer1: row.answer1?.trim() || null,
-          answer2: row.answer2?.trim() || null,
-          answer3: row.answer3?.trim() || null,
-          answer4: row.answer4?.trim() || null,
-          answer5: row.answer5?.trim() || null,
+          "answer 1": row.answer1?.trim() || null,
+          "answer 2": row.answer2?.trim() || null,
+          "answer 3": row.answer3?.trim() || null,
+          "answer 4": row.answer4?.trim() || null,
+          "answer 5": row.answer5?.trim() || null,
           correct_answer: Number(row.correct_answer) || null,
           type: row.type?.trim() || null,
         }));

app/auth/callback/route.ts

@@ -7,6 +7,7 @@ export async function GET(request: Request) {
   const code = requestUrl.searchParams.get('code')
 
   if (code) {
+    // Exchange the OAuth code for a Supabase session cookie.
     const supabase = await createClient()
     await supabase.auth.exchangeCodeForSession(code)
   }

app/mmi-prep/page.tsx

@@ -27,13 +27,15 @@ export default function Home() {
     const [dailyError, setDailyError] = useState<string | null>(null);
     const [practiceError, setPracticeError] = useState<string | null>(null);
 
+    // Normalize date to a local YYYY-MM-DD string for daily tracking.
     const getLocalDateString = (date = new Date()) => {
         const year = date.getFullYear();
         const month = String(date.getMonth() + 1).padStart(2, "0");
         const day = String(date.getDate()).padStart(2, "0");
         return `${year}-${month}-${day}`;
     };
 
+    // Convert today's date into day-of-year (1-366) for deterministic daily pick.
     const getDayOfYear = (date = new Date()) => {
         const start = new Date(date.getFullYear(), 0, 0);
         const diff =
@@ -43,6 +45,7 @@ export default function Home() {
         return Math.floor(diff / (1000 * 60 * 60 * 24));
     };
 
+    // Fetch the Nth question (0-based) to keep daily rotation stable.
     const fetchMmiQuestionByIndex = useCallback(async (index: number) => {
         const supabase = createClient();
         const { data, error } = await supabase
@@ -57,6 +60,7 @@ export default function Home() {
         return data ?? null;
     }, []);
 
+    // Random practice question (used for practice + daily fallback).
     const fetchRandomMmiQuestion = useCallback(async () => {
         const supabase = createClient();
         const { count, error: countError } = await supabase
@@ -70,6 +74,7 @@ export default function Home() {
         return fetchMmiQuestionByIndex(randomIndex);
     }, [fetchMmiQuestionByIndex]);
 
+    // Daily question: day-of-year, fallback to random if missing.
     const fetchDailyQuestion = useCallback(async () => {
         setIsDailyLoading(true);
         setDailyError(null);
@@ -98,6 +103,7 @@ export default function Home() {
         }
     }, [fetchMmiQuestionByIndex, fetchRandomMmiQuestion]);
 
+    // Practice question is always random to encourage variety.
     const fetchPracticeQuestion = useCallback(async () => {
         setIsPracticeLoading(true);
         setPracticeError(null);
@@ -111,6 +117,7 @@ export default function Home() {
         }
     }, [fetchRandomMmiQuestion]);
 
+    // Track daily usage and streaks in localStorage.
     const recordDailyReveal = () => {
         if (typeof window === "undefined") return;
 
@@ -167,6 +174,7 @@ export default function Home() {
         window.localStorage.setItem(STORAGE_KEYS.history, JSON.stringify(trimmedHistory));
     };
 
+    // Prep timer countdown.
     useEffect(() => {
         if (!isPrepRunning) return;
         const intervalId = window.setInterval(() => {
@@ -184,6 +192,7 @@ export default function Home() {
         return () => window.clearInterval(intervalId);
     }, [isPrepRunning, respDuration]);
 
+    // Response timer countdown.
     useEffect(() => {
         if (!isRespRunning) return;
         const intervalId = window.setInterval(() => {
@@ -192,10 +201,12 @@ export default function Home() {
         return () => window.clearInterval(intervalId);
     }, [isRespRunning]);
 
+    // Load daily question on first render.
     useEffect(() => {
         fetchDailyQuestion();
     }, [fetchDailyQuestion]);
 
+    // Load practice question when switching into practice mode.
     useEffect(() => {
         if (isPracticeMode && !practiceQuestion && !isPracticeLoading) {
             fetchPracticeQuestion();

app/submit-questions/page.tsx

@@ -22,6 +22,7 @@ export default function SubmitQuestionsPage() {
 
   const resetMessage = () => setMessage(null);
 
+  // Insert a user-submitted MMI question.
   const handleMmiSubmit = async () => {
     resetMessage();
     if (!mmiQuestion.trim() || !mmiAnswer.trim()) {
@@ -46,6 +47,7 @@ export default function SubmitQuestionsPage() {
     setIsSaving(false);
   };
 
+  // Insert a user-submitted UCAT question.
   const handleUcatSubmit = async () => {
     resetMessage();
     if (!ucatQuestion.trim()) {
@@ -74,11 +76,11 @@ export default function SubmitQuestionsPage() {
     const supabase = createClient();
     const { error } = await supabase.from("Ucat").insert({
       question: ucatQuestion.trim(),
-      answer1: ucatAnswers[0]?.trim() || null,
-      answer2: ucatAnswers[1]?.trim() || null,
-      answer3: ucatAnswers[2]?.trim() || null,
-      answer4: ucatAnswers[3]?.trim() || null,
-      answer5: ucatAnswers[4]?.trim() || null,
+      "answer 1": ucatAnswers[0]?.trim() || null,
+      "answer 2": ucatAnswers[1]?.trim() || null,
+      "answer 3": ucatAnswers[2]?.trim() || null,
+      "answer 4": ucatAnswers[3]?.trim() || null,
+      "answer 5": ucatAnswers[4]?.trim() || null,
       correct_answer: correctNumber,
       type: ucatType.trim(),
     });

app/ucat-prep/page.tsx

@@ -56,6 +56,7 @@ export default function Home() {
     selectedQuestions ?? (hasValidCustomQuestions ? customQuestionsValue : 0);
   const timerMinutes = selectedTimer ?? (hasValidCustom ? customMinutesValue : 0);
 
+  // Load a random window of UCAT questions, optionally filtered by type.
   const loadQuestions = async (limit: number, types: string[]) => {
     if (!limit) return [];
     const supabase = createClient();
@@ -66,7 +67,7 @@ export default function Home() {
     }
     const { count, error: countError } = await countQuery;
 
-    if (countError) throw countError;
+    if (countError) throw new Error(countError.message);
     if (!count) return [];
 
     const safeLimit = Math.min(limit, count);
@@ -75,7 +76,9 @@ export default function Home() {
 
     let dataQuery = supabase
       .from("Ucat")
-      .select("id, question, answer1, answer2, answer3, answer4, answer5, correct_answer")
+      .select(
+        'id, question, "answer 1", "answer 2", "answer 3", "answer 4", "answer 5", correct_answer, type'
+      )
       .order("id", { ascending: true })
       .range(offset, offset + safeLimit - 1);
 
@@ -85,15 +88,15 @@ export default function Home() {
 
     const { data, error } = await dataQuery;
 
-    if (error) throw error;
+    if (error) throw new Error(error.message);
 
     return (data ?? []).map((row, index) => {
       const options = [
-        row.answer1,
-        row.answer2,
-        row.answer3,
-        row.answer4,
-        row.answer5,
+        row["answer 1"],
+        row["answer 2"],
+        row["answer 3"],
+        row["answer 4"],
+        row["answer 5"],
       ]
         .map((value) => (typeof value === "string" ? value.trim() : ""))
         .filter(Boolean);
@@ -115,6 +118,7 @@ export default function Home() {
     });
   };
 
+  // Start a quiz session and fetch questions from Supabase.
   const handleStart = async () => {
     if (!canStart) return;
     const selectedTypes = [
@@ -144,9 +148,11 @@ export default function Home() {
         setTimeRemaining(null);
       }
     } catch (error) {
-      setQuestionLoadError(
-        error instanceof Error ? error.message : "Failed to load UCAT questions."
-      );
+      if (error && typeof error === "object" && "message" in error) {
+        setQuestionLoadError(String(error.message));
+      } else {
+        setQuestionLoadError("Failed to load UCAT questions.");
+      }
     } finally {
       setIsLoadingQuestions(false);
     }
@@ -156,11 +162,12 @@ export default function Home() {
     if (!questions.length) {
       return {
         correctCount: 0,
-        results: [] as { id: number; isCorrect: boolean | null }[],
+        results: [] as { id: number; number: number; isCorrect: boolean | null }[],
       };
     }
     const results = questions.map((question, index) => ({
       id: question.id,
+      number: index + 1,
       isCorrect:
         answerResults[index] ??
         (question.correctIndex === null
@@ -171,6 +178,7 @@ export default function Home() {
     return { correctCount, results };
   }, [questions, selectedAnswers, answerResults]);
 
+  // Timer countdown for timed mode.
   useEffect(() => {
     if (!hasStarted || practiceMode !== "timed" || timeRemaining === null) return;
     if (timeRemaining <= 0) return;
@@ -180,6 +188,7 @@ export default function Home() {
     return () => window.clearInterval(intervalId);
   }, [hasStarted, practiceMode, timeRemaining]);
 
+  // Simple mm:ss formatter for timers.
   const formatSeconds = (totalSeconds: number) => {
     const minutes = Math.floor(totalSeconds / 60);
     const seconds = totalSeconds % 60;
@@ -345,7 +354,7 @@ export default function Home() {
                       : "incorrect"
                   }`}
                 >
-                  Question {result.id}:{" "}
+                  Question {result.number}:{" "}
                   {result.isCorrect === null
                     ? "Unscored"
                     : result.isCorrect

lib/supabase/client.ts

@@ -1,6 +1,7 @@
 import { createBrowserClient } from '@supabase/ssr'
 
 function getSupabaseEnv() {
+  // Read public Supabase config from env and fail fast if missing.
   const url = process.env.NEXT_PUBLIC_SUPABASE_URL
   const anonKey =
     process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_OR_ANON_KEY ??
@@ -16,6 +17,7 @@ function getSupabaseEnv() {
 }
 
 export function createClient() {
+  // Browser client for client components.
   const { url, anonKey } = getSupabaseEnv()
   return createBrowserClient(url, anonKey)
 }

lib/supabase/server.ts

@@ -2,6 +2,7 @@ import { createServerClient } from '@supabase/ssr'
 import { cookies } from 'next/headers'
 
 function getSupabaseEnv() {
+  // Server uses the same public URL + anon key as the browser client.
   const url = process.env.NEXT_PUBLIC_SUPABASE_URL
   const anonKey =
     process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_OR_ANON_KEY ??
@@ -18,6 +19,7 @@ function getSupabaseEnv() {
 
 export async function createClient() {
   const { url, anonKey } = getSupabaseEnv()
+  // cookies() is async in Next 16+, so await before reading/writing.
   const cookieStore = await cookies()
 
   return createServerClient(url, anonKey, {
@@ -26,7 +28,7 @@ export async function createClient() {
         return cookieStore.getAll()
       },
       setAll(cookiesToSet) {
-        // In server components, set() can throw. Middleware should handle auth refresh.
+        // In server components, set() can throw; middleware handles refresh safely.
         try {
           cookiesToSet.forEach(({ name, value, options }) => {
             cookieStore.set(name, value, options)

middleware.ts

@@ -8,6 +8,7 @@ export async function middleware(request: NextRequest) {
     process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY
 
   if (!url || !anonKey) {
+    // If env vars aren't set, just continue without Supabase auth refresh.
     return NextResponse.next({ request })
   }
 
@@ -26,6 +27,7 @@ export async function middleware(request: NextRequest) {
     },
   })
 
+  // Touch auth to refresh session cookies when needed.
   await supabase.auth.getUser()
 
   return response