Skip to content

Commit

Permalink
Merge branch 'feat/progress-page' of github.com:hicsail/intact-app in…
Browse files Browse the repository at this point in the history
…to feat/progress-page

merging from remote branch
  • Loading branch information
ZimLim committed Sep 12, 2024
2 parents b862de7 + 9ddee63 commit 70f6645
Show file tree
Hide file tree
Showing 148 changed files with 15 additions and 15 deletions.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
4 changes: 2 additions & 2 deletions src/components/VisualPairsMemorize.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ export const VisualPairsMemorize: FC<ChoiceReactionTimeMemorizeProps> = ({
<Grid
item
component="img"
src={`../src/assets/visual-pair/${imageGroupList[pairIdx]}${idxPairs[pairIdx][0]}.jpg`}
src={`/assets/visual-pair/${imageGroupList[pairIdx]}${idxPairs[pairIdx][0]}.jpg`}
/>
<Grid
item
component="img"
src={`../src/assets/visual-pair/${imageGroupList[pairIdx]}${idxPairs[pairIdx][1]}.jpg`}
src={`/assets/visual-pair/${imageGroupList[pairIdx]}${idxPairs[pairIdx][1]}.jpg`}
/>
</Grid>
)}
Expand Down
8 changes: 4 additions & 4 deletions src/components/VisualPairsRecall.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ export const VisualPairsRecall: FC<VisualPairsRecallProps> = ({ imageTheme, refe
<Box
component="img"
height={uiConfig.imageHeight - 2 * 3}
src={`../src/assets/visual-pair/${imageTheme}${reference}.jpg`}
src={`/assets/visual-pair/${imageTheme}${reference}.jpg`}
border="3px solid red"
/>
</Grid>
<Grid item>
<Box
component="img"
height={uiConfig.imageHeight}
src={`../src/assets/visual-pair/${imageTheme}${options[0]}.jpg`}
src={`/assets/visual-pair/${imageTheme}${options[0]}.jpg`}
onClick={() => submitHandler(options[0])}
/>
</Grid>
Expand All @@ -47,7 +47,7 @@ export const VisualPairsRecall: FC<VisualPairsRecallProps> = ({ imageTheme, refe
<Box
component="img"
height={uiConfig.imageHeight}
src={`../src/assets/visual-pair/${imageTheme}${option}.jpg`}
src={`/assets/visual-pair/${imageTheme}${option}.jpg`}
onClick={() => submitHandler(option)}
/>
</Grid>
Expand All @@ -59,7 +59,7 @@ export const VisualPairsRecall: FC<VisualPairsRecallProps> = ({ imageTheme, refe
<Box
component="img"
height={uiConfig.imageHeight}
src={`../src/assets/visual-pair/${imageTheme}${option}.jpg`}
src={`/assets/visual-pair/${imageTheme}${option}.jpg`}
onClick={() => submitHandler(option)}
/>
</Grid>
Expand Down
18 changes: 9 additions & 9 deletions src/config/testConfig.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import symbol1 from "../assets/digit-symbol/1.gif";
import symbol2 from "../assets/digit-symbol/2.gif";
import symbol3 from "../assets/digit-symbol/3.gif";
import symbol4 from "../assets/digit-symbol/4.gif";
import symbol5 from "../assets/digit-symbol/5.gif";
import symbol6 from "../assets/digit-symbol/6.gif";
import symbol7 from "../assets/digit-symbol/7.gif";
import symbol8 from "../assets/digit-symbol/8.gif";
import symbol9 from "../assets/digit-symbol/9.gif";
import symbol1 from "/assets/digit-symbol/1.gif";
import symbol2 from "/assets/digit-symbol/2.gif";
import symbol3 from "/assets/digit-symbol/3.gif";
import symbol4 from "/assets/digit-symbol/4.gif";
import symbol5 from "/assets/digit-symbol/5.gif";
import symbol6 from "/assets/digit-symbol/6.gif";
import symbol7 from "/assets/digit-symbol/7.gif";
import symbol8 from "/assets/digit-symbol/8.gif";
import symbol9 from "/assets/digit-symbol/9.gif";

export const generalConfig = {
digitSymbolConfig: 5, // Number of questions
Expand Down

0 comments on commit 70f6645

Please sign in to comment.