Fix the challenge retrieval

joshSzep · Jul 14, 2024 · 6d30bd6 · 6d30bd6
1 parent cedd955
commit 6d30bd6
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 9 deletions.
diff --git a/Procfile b/Procfile
diff --git a/frontend/templates/frontend/tutor.html b/frontend/templates/frontend/tutor.html
@@ -96,6 +96,10 @@
         }
 
         function App() {
+            const [challengeGroups, setChallengeGroups] = React.useState([]);
+            const [currentGroup, setCurrentGroup] = React.useState(null);
+            const [challengeIds, setChallengeIds] = React.useState([]);
+            const [currentChallengeIndex, setCurrentChallengeIndex] = React.useState(0);
             const [currentChallenge, setCurrentChallenge] = React.useState(null);
             const [input, setInput] = React.useState('');
             const [startTime, setStartTime] = React.useState(null);
@@ -114,18 +118,37 @@
             const inputRef = React.useRef(null);
 
             React.useEffect(() => {
-                fetchChallenge();
+                fetchChallengeGroups();
             }, []);
 
+            React.useEffect(() => {
+                if (currentGroup) {
+                    setChallengeIds(currentGroup.challenges);
+                    setCurrentChallengeIndex(0);
+                }
+            }, [currentGroup]);
+
+            React.useEffect(() => {
+                if (challengeIds.length > 0 && currentChallengeIndex < challengeIds.length) {
+                    fetchChallenge(challengeIds[currentChallengeIndex]);
+                }
+            }, [challengeIds, currentChallengeIndex]);
+
+            React.useEffect(() => {
+                if (challengeIds.length > 0 && currentChallengeIndex < challengeIds.length) {
+                    fetchChallenge(challengeIds[currentChallengeIndex]);
+                }
+            }, [challengeIds, currentChallengeIndex]);
+
             React.useEffect(() => {
                 if (isChallengeLoaded && inputRef.current) {
                     inputRef.current.focus();
                 }
             }, [isChallengeLoaded]);
 
-            const fetchChallenge = async () => {
+            const fetchChallenge = async (challengeId) => {
                 try {
-                    const response = await fetch('../api/v1/challenges/challenge:0669309f-4572-714f-8000-3acabe8e0abf');
+                    const response = await fetch(`../api/v1/challenges/${challengeId}`);
                     if (!response.ok) {
                         throw new Error('Failed to fetch challenge');
                     }
@@ -138,6 +161,23 @@
                 }
             };
 
+            const fetchChallengeGroups = async () => {
+                try {
+                    const response = await fetch('../api/v1/challenge_groups/');
+                    if (!response.ok) {
+                        throw new Error('Failed to fetch challenge groups');
+                    }
+                    const data = await response.json();
+                    setChallengeGroups(data);
+                    if (data.length > 0) {
+                        setCurrentGroup(data[0]);
+                    }
+                } catch (error) {
+                    console.error('Error fetching challenge groups:', error);
+                    setDebug('Error fetching challenge groups. Please try again.');
+                }
+            };
+
             const handleInputChange = (e) => {
                 const newInput = e.target.value;
                 if (!startTime) {
@@ -185,7 +225,9 @@
                     setShowAccuracy(true);
 
                     setTimeout(() => {
-                        fetchChallenge();
+                        const nextIndex = (currentChallengeIndex + 1) % challengeIds.length;
+                        setCurrentChallengeIndex(nextIndex);
+                        setIsChallengeLoaded(false);
                         setInput('');
                         setStartTime(null);
                         setShowEnglish(false);

diff --git a/render.yaml b/render.yaml
@@ -3,7 +3,4 @@ services:
     name: hangul_typing_tutor
     env: python
     buildCommand: ./render_build.sh
-    startCommand: gunicorn hangul_tutor.wsgi:application
-    envVars:
-      - key: PORT
-        value: 1000
+    startCommand: ./render_run.sh