Merge pull request #5 from or2ooo/develop

Fix test results navigation issue

Author: or2ooo

src/pages/Results.tsx

@@ -4,15 +4,25 @@ import { questions } from '../data/questions';
 import { topics } from '../data/topics';
 import { motion, AnimatePresence } from 'framer-motion';
 import { useEffect, useState } from 'react';
+import { useStore } from '../store/useStore';
 
 export function Results() {
   const location = useLocation();
   const navigate = useNavigate();
-  const result = location.state?.result;
+  const { userProfile } = useStore();
+  
+  // Try to get result from navigation state first, then fallback to latest test result
+  const navigationResult = location.state?.result;
+  const latestTestResult = userProfile.testResults.length > 0 ? userProfile.testResults[0] : null;
+  
+  // Use navigation result if available, otherwise use latest test
+  const result = navigationResult || latestTestResult;
+  
   const [showDetailedReview, setShowDetailedReview] = useState(false);
   const [expandedQuestions, setExpandedQuestions] = useState<Set<number>>(new Set());
 
   useEffect(() => {
+    // Only redirect if there's no result at all (no navigation state AND no test history)
     if (!result) {
       navigate('/practice');
     }

src/pages/Test.tsx

@@ -57,18 +57,10 @@ export function Test() {
   const handleSubmit = () => {
     const result = finishTest();
     if (result) {
-      // Calculate score
-      let correct = 0;
-      currentTest.questions.forEach((qId, index) => {
-        const question = allQuestions.find(q => q.id === qId);
-        if (question && currentTest.answers[index] === question.correctAnswer) {
-          correct++;
-        }
-      });
-      const score = Math.round((correct / currentTest.questions.length) * 100);
-      
-      // Navigate to results
-      navigate('/results', { state: { result: { ...result, score } } });
+      // Small delay to ensure state is saved before navigation
+      setTimeout(() => {
+        navigate('/results', { state: { result } });
+      }, 0);
     }
   };
 

src/store/useStore.ts

@@ -1,6 +1,7 @@
 import { create } from 'zustand';
 import { persist } from 'zustand/middleware';
 import type { UserProfile, TestResult, StudyProgress } from '../types';
+import { questions } from '../data/questions';
 
 interface AppState {
   // User Profile
@@ -161,12 +162,22 @@ export const useStore = create<AppState>()(
         const state = get();
         if (!state.currentTest || !state.currentTest.startTime) return null;
 
+        // Calculate score here
+        let correct = 0;
+        state.currentTest!.questions.forEach((qId, index) => {
+          const question = questions.find(q => q.id === qId);
+          if (question && state.currentTest!.answers[index] === question.correctAnswer) {
+            correct++;
+          }
+        });
+        const score = Math.round((correct / state.currentTest!.questions.length) * 100);
+        
         const result: TestResult = {
           id: Date.now().toString(),
           date: new Date(),
           questions: state.currentTest.questions,
           answers: state.currentTest.answers,
-          score: 0, // Will be calculated by the component
+          score,
           timeSpent: Date.now() - state.currentTest.startTime.getTime(),
           type: state.currentTest.type
         };