diff --git a/src/components/Exercises/TrueFalse.tsx b/src/components/Exercises/TrueFalse.tsx index 19330684..4c7ffae9 100644 --- a/src/components/Exercises/TrueFalse.tsx +++ b/src/components/Exercises/TrueFalse.tsx @@ -17,7 +17,7 @@ export default function TrueFalse({id, type, prompt, questions, userSolutions, o const calculateScore = () => { const total = questions.length || 0; const correct = answers.filter( - (x) => questions.find((y) => x.id.toString() === y.id.toString())?.solution === x.solution.toLowerCase() || false, + (x) => questions.find((y) => x.id.toString() === y.id.toString())?.solution?.toLowerCase() === x.solution.toLowerCase() || false, ).length; const missing = total - answers.filter((x) => questions.find((y) => x.id.toString() === y.id.toString())).length; @@ -62,41 +62,37 @@ export default function TrueFalse({id, type, prompt, questions, userSolutions, o You can click a selected option again to deselect it.
- {questions.map((question, index) => ( -
- - {index + 1}. {question.prompt} - -
- - - + {questions.map((question, index) => { + const id = question.id.toString(); + + return ( +
+ + {index + 1}. {question.prompt} + +
+ + + +
-
- ))} + ); + })}
diff --git a/src/components/Low/Button.tsx b/src/components/Low/Button.tsx index 29d529e2..9bd207f0 100644 --- a/src/components/Low/Button.tsx +++ b/src/components/Low/Button.tsx @@ -4,7 +4,7 @@ import {BsArrowRepeat} from "react-icons/bs"; interface Props { children: ReactNode; - color?: "rose" | "purple" | "red" | "green"; + color?: "rose" | "purple" | "red" | "green" | "gray"; variant?: "outline" | "solid"; className?: string; disabled?: boolean; @@ -39,6 +39,11 @@ export default function Button({ outline: "bg-transparent text-mti-red-light border border-mti-red-light hover:bg-mti-red-light disabled:text-mti-red disabled:bg-mti-red-ultralight disabled:border-none selection:bg-mti-red-dark hover:text-white selection:text-white", }, + gray: { + solid: "bg-mti-gray-davy text-white border border-mti-gray-davy hover:bg-mti-gray-davy disabled:text-mti-gray-davy disabled:bg-mti-gray-davy selection:bg-mti-gray-davy", + outline: + "bg-transparent text-mti-gray-davy border border-mti-gray-davy hover:bg-mti-gray-davy disabled:text-mti-gray-davy disabled:bg-mti-gray-davy disabled:border-none selection:bg-mti-gray-davy hover:text-white selection:text-white", + }, rose: { solid: "bg-mti-rose-light text-white border border-mti-rose-light hover:bg-mti-rose disabled:text-mti-rose disabled:bg-mti-rose-ultralight selection:bg-mti-rose-dark", outline: diff --git a/src/components/Solutions/FillBlanks.tsx b/src/components/Solutions/FillBlanks.tsx index 51d32962..413bfc9d 100644 --- a/src/components/Solutions/FillBlanks.tsx +++ b/src/components/Solutions/FillBlanks.tsx @@ -28,9 +28,9 @@ export default function FillBlanksSolutions({id, type, prompt, solutions, text, return ( ); } @@ -99,7 +99,7 @@ export default function FillBlanksSolutions({id, type, prompt, solutions, text, Correct
-
+
Unanswered
diff --git a/src/components/Solutions/MatchSentences.tsx b/src/components/Solutions/MatchSentences.tsx index c2537202..27b7dfcc 100644 --- a/src/components/Solutions/MatchSentences.tsx +++ b/src/components/Solutions/MatchSentences.tsx @@ -50,7 +50,7 @@ export default function MatchSentencesSolutions({ className={clsx( "w-8 h-8 rounded-full z-10 text-white", "transition duration-300 ease-in-out", - !userSolutions.find((x) => x.question.toString() === id.toString()) && "!bg-mti-red", + !userSolutions.find((x) => x.question.toString() === id.toString()) && "!bg-mti-gray-davy", userSolutions.find((x) => x.question.toString() === id.toString())?.option === solution && "bg-mti-purple", userSolutions.find((x) => x.question.toString() === id.toString())?.option !== solution && "bg-mti-rose", )}> @@ -96,7 +96,7 @@ export default function MatchSentencesSolutions({
Correct
-
Unanswered +
Unanswered
Wrong diff --git a/src/components/Solutions/MultipleChoice.tsx b/src/components/Solutions/MultipleChoice.tsx index 7a81ad16..0dfe1785 100644 --- a/src/components/Solutions/MultipleChoice.tsx +++ b/src/components/Solutions/MultipleChoice.tsx @@ -14,7 +14,7 @@ function Question({ }: MultipleChoiceQuestion & {userSolution: string | undefined; onSelectOption?: (option: string) => void; showSolution?: boolean}) { const optionColor = (option: string) => { if (option === solution && !userSolution) { - return "!border-mti-red-light !text-mti-red-light"; + return "!border-mti-gray-davy !text-mti-gray-davy"; } if (option === solution) { @@ -114,7 +114,7 @@ export default function MultipleChoice({ Correct
-
+
Unanswered
diff --git a/src/components/Solutions/TrueFalse.tsx b/src/components/Solutions/TrueFalse.tsx index a80df152..44699bfb 100644 --- a/src/components/Solutions/TrueFalse.tsx +++ b/src/components/Solutions/TrueFalse.tsx @@ -33,7 +33,7 @@ export default function TrueFalseSolution({prompt, type, id, questions, userSolu return "rose"; } - return "red"; + return "gray"; }; return ( @@ -67,6 +67,7 @@ export default function TrueFalseSolution({prompt, type, id, questions, userSolu {userSolutions && questions.map((question, index) => { const userSolution = userSolutions.find((x) => x.id === question.id.toString()); + const solution = question.solution.toString().toLowerCase() as Solution; return (
@@ -75,23 +76,23 @@ export default function TrueFalseSolution({prompt, type, id, questions, userSolu
@@ -105,7 +106,7 @@ export default function TrueFalseSolution({prompt, type, id, questions, userSolu Correct
-
+
Unanswered
diff --git a/src/components/Solutions/WriteBlanks.tsx b/src/components/Solutions/WriteBlanks.tsx index a7ef4f9b..6740a4c5 100644 --- a/src/components/Solutions/WriteBlanks.tsx +++ b/src/components/Solutions/WriteBlanks.tsx @@ -38,7 +38,7 @@ function Blank({ const getSolutionStyling = () => { if (!userSolution) { - return "bg-mti-red-ultralight text-mti-red-light"; + return "bg-mti-gray-davy text-mti-gray-davy"; } return "bg-mti-purple-ultralight text-mti-purple-light"; @@ -131,7 +131,7 @@ export default function WriteBlanksSolutions({ Correct
-
+
Unanswered