diff --git a/app/(tabs)/(exercice)/ExerciceScreen.tsx b/app/(tabs)/(exercice)/ExerciceScreen.tsx index b0ae97a..e72b0f5 100644 --- a/app/(tabs)/(exercice)/ExerciceScreen.tsx +++ b/app/(tabs)/(exercice)/ExerciceScreen.tsx @@ -1,13 +1,40 @@ -import {SafeAreaView, Text, View} from "react-native"; +import {FlatList, Text, View} from "react-native"; import React from "react"; +import HeaderProfileComponent from "@/components/HeaderProfileComponent"; +import Screen from "@/components/ui/Screen"; +import WorkoutCardComponent from "@/components/WorkoutCardComponent"; +import {useSession} from "@/ctx"; +import {Workout} from "@/model/Workout"; export default function ExerciceScreen() { + const [text, onChangeText] = React.useState(""); + const exercise = [new Workout("Développé couché", 25,"8 Series Workout", 412, "assets/images/Sigma-2.png","Intense" ), + new Workout("Curl halterné", 30, "8 Series Workout", 342, "assets/images/Sigma.jpg","Medium" ), + new Workout("Tirage Vertival", 29, "8 Series Workout", 793, "assets/images/Sigma.jpg","Easy" )]; + return ( - - - Welcome to Exercice Screen - We will do it soon - - + + + + + + + + Séance du jour + + + + } + data={exercise} + className="h-full" + renderItem={({ item }: { item: Workout }) => + + + + } + /> + ); } \ No newline at end of file diff --git a/app/(tabs)/(home)/HomeScreen.tsx b/app/(tabs)/(home)/HomeScreen.tsx index 1431897..a6d4f20 100644 --- a/app/(tabs)/(home)/HomeScreen.tsx +++ b/app/(tabs)/(home)/HomeScreen.tsx @@ -5,46 +5,55 @@ import Screen from "@/components/ui/Screen"; import CalendarComponent from "@/components/CalendarComponent"; import WelcomeComponent from "@/components/WelcomeComponent"; import ActivitiesComponent from "@/components/ActivitiesComponent"; +import {Workout} from "@/model/Workout"; export default function HomeScreen() { + const exercise = new Workout("Développé couché", 25,"8 Series Workout", 412, "assets/images/Sigma-2.png","Intense" ); return ( - + - - + + - - + - Fitness Metrics - See All + + Fitness Metrics + + + See All + - - - - - - Workout - See All + - - - - - + - Activities - See All + + Workout + + + See All + - + - + + + + Activities + + + See All + + + + diff --git a/app/_layout.tsx b/app/_layout.tsx index 887d66a..8baa43c 100644 --- a/app/_layout.tsx +++ b/app/_layout.tsx @@ -6,9 +6,6 @@ import { SessionProvider } from "@/ctx"; import {Slot, Stack} from "expo-router"; import "@/global.css"; -import "@/global.css"; - -// Prevent the splash screen from auto-hiding before asset loading is complete. SplashScreen.preventAutoHideAsync(); export default function RootLayout() { 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/Sigma-2.png b/assets/images/Sigma-2.png new file mode 100644 index 0000000..ac9796e Binary files /dev/null and b/assets/images/Sigma-2.png differ diff --git a/assets/images/black-back.png b/assets/images/black-back.png new file mode 100644 index 0000000..2822d53 Binary files /dev/null and b/assets/images/black-back.png differ diff --git a/components/ActivitiesComponent.tsx b/components/ActivitiesComponent.tsx index 5e3c4f7..61ce961 100644 --- a/components/ActivitiesComponent.tsx +++ b/components/ActivitiesComponent.tsx @@ -80,7 +80,7 @@ export default function ActivitiesComponent() { }; return ( - + {months.map((item, index) => { return ( diff --git a/components/HeaderProfileComponent.tsx b/components/HeaderProfileComponent.tsx new file mode 100644 index 0000000..f7e3802 --- /dev/null +++ b/components/HeaderProfileComponent.tsx @@ -0,0 +1,28 @@ +import {Image, Text, TouchableOpacity, View} from "react-native"; +import {Ionicons} from "@expo/vector-icons"; +import React from "react"; +import {useSession} from "@/ctx"; + +export default function HeaderProfileComponent() { + const {session} = useSession(); + + + return ( + + + + + + + + Prêt pour t'entrainer ? + {session} + + + + + + ); +} \ No newline at end of file diff --git a/components/WelcomeComponent.tsx b/components/WelcomeComponent.tsx index 85576ad..23f5d3a 100644 --- a/components/WelcomeComponent.tsx +++ b/components/WelcomeComponent.tsx @@ -1,6 +1,7 @@ -import {Image, Text, TouchableOpacity, View} from "react-native"; +import {Image, ImageBackground, Text, TouchableOpacity, View} from "react-native"; import {Ionicons} from "@expo/vector-icons"; import React from "react"; +import {useSession} from "@/ctx"; export default function WelcomeComponent() { const date = new Date(); @@ -9,25 +10,31 @@ export default function WelcomeComponent() { month: 'long', day: 'numeric', }); + const {session} = useSession(); + - return ( - - - - {formattedDate} + return ( + + - + + + - - - - Hello, Tata Yoyo! + + {formattedDate} + Hello {session} ! + + - + ); } \ No newline at end of file diff --git a/components/WorkoutCardComponent.tsx b/components/WorkoutCardComponent.tsx index a79586f..029d922 100644 --- a/components/WorkoutCardComponent.tsx +++ b/components/WorkoutCardComponent.tsx @@ -1,51 +1,68 @@ -import {ImageBackground, SafeAreaView,Text, TouchableOpacity, View} from "react-native"; +import {ImageBackground, Text, TouchableOpacity, View} from "react-native"; import React from "react"; import {AntDesign, MaterialCommunityIcons} from "@expo/vector-icons"; import {Workout} from "@/model/Workout"; -export default function WorkoutCardComponent() { +interface WorkoutCardComponentProps { + exercise: Workout, + background?: String, + height?: number, - const exercise = new Workout("Développé couché", 25,"8 Series Workout", 412, "assets/images/Sigma-2.jpg","Intense" ); +} +export default function WorkoutCardComponent({exercise, height, background}: WorkoutCardComponentProps) { + + const style = () => { + return `rounded-2xl overflow-hidden ${background ?? "bg-black"}` + } + + const styleImage = () => { + return `w-full h ` + } + + console.log(styleImage()) + + console.log(style()) + return ( - - - - - - - - {exercise.duration} min - - - - - - {exercise.calories} kcal - + + + + + + + + {exercise.duration} min + + + + + + {exercise.calories} kcal + - - {exercise.name} - {exercise.repetitions} - - - Intense - - + + {exercise.name} + {exercise.repetitions} + + + {exercise.level} + + + + + + + - - - - - - + ); } \ No newline at end of file diff --git a/model/Workout.ts b/model/Workout.ts index cb2a670..4665d23 100644 --- a/model/Workout.ts +++ b/model/Workout.ts @@ -40,4 +40,4 @@ export class Workout { this._image = image; this._level = level; } -} +} \ No newline at end of file