diff --git a/frontend/src/pages/Lesson.tsx b/frontend/src/pages/Lesson.tsx index f055db5..e275625 100644 --- a/frontend/src/pages/Lesson.tsx +++ b/frontend/src/pages/Lesson.tsx @@ -2,12 +2,13 @@ import { useLocation, useNavigate } from 'react-router-dom'; import { useState } from 'react'; import WrittenQuestionExercise from "../components/WrittenQuestionExercise" import WrittenVocabularyExercise from "../components/WrittenVocabularyExercise" +import VerbalQuestionsExercise from "../components/VerbalQuestionsExercise" import Progress from '../components/Progress'; -export default function Course() { +export default function Lesson() { const location = useLocation(); const navigate = useNavigate(); - const { questions } = location.state; + const { questions, home } = location.state; const [currQuestion, setCurrQuestion] = useState(0); const handleNavigateBack = () => { @@ -18,11 +19,11 @@ export default function Course() { if (currQuestion < questions.length - 1) { setCurrQuestion(currQuestion + 1); } else { - navigate("/review"); + navigate(home); } } - const renderQuestion = (questionIndex: number) => { + const renderQuestion = (currIndex: number) => { const question = questions[currQuestion]; switch (question.type) { case 'written': @@ -49,17 +50,25 @@ export default function Course() { default: return null; } - // case 'verbal-listening': - // switch (exercise) { - // case 'questions': - // return ; + case 'verbal-listening': + switch (question.exercise) { + case 'questions': + return ; // case 'pronunciation': // return ; - // default: - // return null; - // } - // default: - // return null; + default: + return null; + } + default: + return null; } }; diff --git a/frontend/src/pages/Review.tsx b/frontend/src/pages/Review.tsx index f269e56..7d5577b 100644 --- a/frontend/src/pages/Review.tsx +++ b/frontend/src/pages/Review.tsx @@ -1,9 +1,10 @@ -import { useNavigate } from "react-router-dom" +import { useLocation, useNavigate } from "react-router-dom" import NavBar from "../components/NavBar" import { getLanguage, getUsername } from "../logic/sdk"; export default function Review() { const navigate = useNavigate(); + const location = useLocation(); const writtenReview = ["Questions", "Vocabulary"]; const verbalReview = ["Questions", "Pronunciation"]; @@ -81,7 +82,7 @@ export default function Review() { exercise: 'vocabulary', }, ]; - navigate('/lesson', { state: { questions: reviewQuestions } }); + navigate('/lesson', { state: { questions: reviewQuestions, home: location.pathname } }); } } }