diff --git a/app/(quiz)/quiz.tsx b/app/(quiz)/quiz.tsx index 7dc6f41..ecda1fc 100644 --- a/app/(quiz)/quiz.tsx +++ b/app/(quiz)/quiz.tsx @@ -1,5 +1,6 @@ import BackButton from "@/components/BackButton"; import { toBgColor, toTextColor } from "@/components/Constants"; +import BeginnerQuestion from "@/components/quiz/BeginnerQuestion"; import HeightQuestion from "@/components/quiz/HeightQuestion"; import { QuestionChildProps } from "@/components/quiz/Question"; import WeightQuestion from "@/components/quiz/WeightQuestion"; @@ -20,6 +21,7 @@ export default function Quiz() { QuestionChildProps & RefAttributes >[] = [GoalQuestion, GenderQuestion, WeightQuestion, HeightQuestion, LvlQuestion, ActivityQuestion, SleepQuestion]; + const goBack = () => { if (currentQuestionIndex >= 1) { setCurrentQuestionIndex(currentQuestionIndex - 1); diff --git a/assets/images/Gestion de projet OptiFit.zip b/assets/images/Gestion de projet OptiFit.zip deleted file mode 100644 index bb7e867..0000000 Binary files a/assets/images/Gestion de projet OptiFit.zip and /dev/null differ diff --git a/assets/images/Gestion de projet OptiFit/Optifit_Gantt.mpp b/assets/images/Gestion de projet OptiFit/Optifit_Gantt.mpp deleted file mode 100644 index cafb608..0000000 Binary files a/assets/images/Gestion de projet OptiFit/Optifit_Gantt.mpp and /dev/null differ diff --git a/assets/images/Gestion de projet OptiFit/Optifit_Gantt.pdf b/assets/images/Gestion de projet OptiFit/Optifit_Gantt.pdf deleted file mode 100644 index c4a6818..0000000 Binary files a/assets/images/Gestion de projet OptiFit/Optifit_Gantt.pdf and /dev/null differ diff --git a/assets/images/Gestion de projet OptiFit/Optifit_Kanban.pdf b/assets/images/Gestion de projet OptiFit/Optifit_Kanban.pdf deleted file mode 100644 index 177d171..0000000 Binary files a/assets/images/Gestion de projet OptiFit/Optifit_Kanban.pdf and /dev/null differ diff --git a/assets/images/Gestion de projet OptiFit/Optifit_Planification_Individuelle.xlsx b/assets/images/Gestion de projet OptiFit/Optifit_Planification_Individuelle.xlsx deleted file mode 100644 index 9009a9a..0000000 Binary files a/assets/images/Gestion de projet OptiFit/Optifit_Planification_Individuelle.xlsx and /dev/null differ diff --git a/assets/images/Gestion de projet OptiFit/Optifit_WBS.pdf b/assets/images/Gestion de projet OptiFit/Optifit_WBS.pdf deleted file mode 100644 index 02dc5c4..0000000 Binary files a/assets/images/Gestion de projet OptiFit/Optifit_WBS.pdf and /dev/null differ diff --git a/assets/images/Gestion de projet OptiFit/Rapport de gestion de projet.pdf b/assets/images/Gestion de projet OptiFit/Rapport de gestion de projet.pdf deleted file mode 100644 index c27ce97..0000000 Binary files a/assets/images/Gestion de projet OptiFit/Rapport de gestion de projet.pdf and /dev/null differ diff --git a/assets/images/bench.png b/assets/images/bench.png new file mode 100644 index 0000000..370d6fb Binary files /dev/null and b/assets/images/bench.png differ diff --git a/components/quiz/BeginnerQuestion.tsx b/components/quiz/BeginnerQuestion.tsx new file mode 100644 index 0000000..a6fb270 --- /dev/null +++ b/components/quiz/BeginnerQuestion.tsx @@ -0,0 +1,29 @@ +import React from "react"; +import Question, { QuestionChildProps } from "./Question"; +import SegmentedControl from "../ui/SegmentedControl"; +import { Image } from "react-native"; + +//@ts-ignore +import BenchImage from "@/assets/images/bench.png"; + +export default React.forwardRef( + (props, ref): React.ReactElement => { + const ANSWERS = ["Non", "Oui"]; + const [answer, setAnswer] = React.useState("Oui"); + + return ( + + + + + ); + } +); diff --git a/components/quiz/HeightQuestion.tsx b/components/quiz/HeightQuestion.tsx index 6b48bc8..ef4afe6 100644 --- a/components/quiz/HeightQuestion.tsx +++ b/components/quiz/HeightQuestion.tsx @@ -3,7 +3,7 @@ import Question, { QuestionChildProps } from "./Question"; import Slider from "../ui/Slider"; import Text from "../ui/Text"; import { View } from "react-native"; -import SegmentedControl from "@react-native-segmented-control/segmented-control"; +import SegmentedControl from "../ui/SegmentedControl"; export default React.forwardRef( (props, ref): React.ReactElement => { diff --git a/components/quiz/WeightQuestion.tsx b/components/quiz/WeightQuestion.tsx index 386260e..8bfb597 100644 --- a/components/quiz/WeightQuestion.tsx +++ b/components/quiz/WeightQuestion.tsx @@ -3,7 +3,7 @@ import Question, { QuestionChildProps } from "./Question"; import Slider from "../ui/Slider"; import Text from "../ui/Text"; import { View } from "react-native"; -import SegmentedControl from "@react-native-segmented-control/segmented-control"; +import SegmentedControl from "../ui/SegmentedControl"; export default React.forwardRef( (props, ref): React.ReactElement => { @@ -19,7 +19,7 @@ export default React.forwardRef( selectedIndex={UNITS.indexOf(unit)} onValueChange={setUnit} /> - + {weight <= MIN_WEIGHT ? ( - de diff --git a/components/ui/Button.tsx b/components/ui/Button.tsx index a489ef1..5b9a0c9 100644 --- a/components/ui/Button.tsx +++ b/components/ui/Button.tsx @@ -67,6 +67,18 @@ export default React.forwardRef( return 30; case "3xl": return 36; + case "4xl": + return 36; + case "5xl": + return 42; + case "6xl": + return 48; + case "7xl": + return 54; + case "8xl": + return 60; + case "9xl": + return 66; } }; diff --git a/components/ui/SegmentedControl.tsx b/components/ui/SegmentedControl.tsx index a036301..4cca1f6 100644 --- a/components/ui/SegmentedControl.tsx +++ b/components/ui/SegmentedControl.tsx @@ -7,8 +7,13 @@ export default React.forwardRef( (props, ref): React.ReactElement => { return (