Merge pull request #70 from bitesinbyte/feature/63-feature-question-c…

…ontext chore: Fixed issues with ui
leben-in-deutschland · Feb 11, 2025 · 14e359c · 14e359c
2 parents 0b08479 + 6cff584
commit 14e359c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/app/web/components/prepare-quiz.tsx b/src/app/web/components/prepare-quiz.tsx
@@ -146,14 +146,15 @@ export default function PrepareQuiz({ originalQuestions, user, prepareQuestion }
                     && user.questionProgress[currentQuestionIndex].answerSelected !== ""
                     && user.questionProgress[currentQuestionIndex].answeredCorrectly) {
                     setShowSolution(true);
+                    setNextEnabled(true);
                 }
                 setOptionSelected(user.questionProgress[currentQuestionIndex].answerSelected);
                 if (user.questionProgress[currentQuestionIndex].answeredCorrectly) {
                     setSubmitDisabled(true);
+                    setNextEnabled(true);
                 }
                 setFlagPressed(user.questionProgress[currentQuestionIndex].flagged);
             }
-            setNextEnabled(true);
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [currentAction, currentQuestion]);
@@ -420,7 +421,7 @@ export default function PrepareQuiz({ originalQuestions, user, prepareQuestion }
                                     <Tooltip content="Flag for review">
                                         <Button onPress={handleFlag} disableRipple variant="light" className={`dark:invert ${flagPressed ? "text-red-600" : "text-white"}`} style={{ backgroundColor: 'transparent' }} startContent={<FlagIcon />} />
                                     </Tooltip>
-                                    <Button variant="solid" color="primary" onPress={handleSubmit} disabled={submitDisabled}>Submit</Button>
+                                    {!nextEnabled && <Button variant="solid" color="primary" onPress={handleSubmit} disabled={submitDisabled}>Submit</Button>}
                                     {nextEnabled && <Button disabled={!nextEnabled} variant="solid" color="primary" onPress={handleNext}>Next</Button>}
                                 </div>
                             </CardFooter>

diff --git a/src/app/web/package-lock.json b/src/app/web/package-lock.json
diff --git a/src/app/web/package.json b/src/app/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "leben-in-deutschland",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "private": true,
   "scripts": {
     "dev": "next dev",