diff --git a/app/(auth)/login.tsx b/app/(auth)/login.tsx index 0e485e5..39fc3c6 100644 --- a/app/(auth)/login.tsx +++ b/app/(auth)/login.tsx @@ -1,5 +1,6 @@ import Screen from "@/components/Screen"; -import { Text } from "react-native"; +import {SafeAreaView, Text} from "react-native"; +import React from "react"; const socialNetworkButtons: ISocialNetworkButtons[] = [ { icon: "instagram" }, @@ -13,9 +14,12 @@ interface ISocialNetworkButtons { export default function LoginPage() { return ( - - Tmp - + + + Tmp + + + // // // diff --git a/app/(tabs)/(add)/AddScreen.tsx b/app/(tabs)/(add)/AddScreen.tsx new file mode 100644 index 0000000..e420054 --- /dev/null +++ b/app/(tabs)/(add)/AddScreen.tsx @@ -0,0 +1,13 @@ +import {SafeAreaView, View, Text} from "react-native"; +import React from "react"; + +export default function AddScreen() { + return ( + + + Welcome to Add Screen + We will do it soon + + + ); +} \ No newline at end of file diff --git a/app/(tabs)/(add)/_layout.tsx b/app/(tabs)/(add)/_layout.tsx new file mode 100644 index 0000000..6b7abee --- /dev/null +++ b/app/(tabs)/(add)/_layout.tsx @@ -0,0 +1,13 @@ +import React from "react"; +import { Stack } from "expo-router"; + +export default function RootoLayout() { + return ( + + + + ); +} diff --git a/app/(tabs)/(add)/index.tsx b/app/(tabs)/(add)/index.tsx new file mode 100644 index 0000000..e2be743 --- /dev/null +++ b/app/(tabs)/(add)/index.tsx @@ -0,0 +1,97 @@ +// import { SafeAreaView, StyleSheet, View } from "react-native"; +// import React from "react"; +// import { +// Avatar, +// AvatarFallbackText, +// AvatarImage, +// } from "@/components/ui/avatar"; +// import { AntDesign } from "@expo/vector-icons"; +// import { Text } from "@/components/ui/text"; +// import ExerciceOverview from "@/components/ExerciceOverview"; + +// export default function HomeScreen() { +// const date = new Date(); +// const formattedDate = date.toLocaleDateString("fr-FR", { +// year: "numeric", +// month: "long", +// day: "numeric", +// }); + +// return ( +// +// +// +// +// {formattedDate} +// + +// +// +// Jane Doe +// +// +// Hello, Tata Monique +// +// + +// +// +// +// +// ); +// } + +// const styles = StyleSheet.create({ +// container: { +// flex: 1, +// backgroundColor: "#f9f9f9", // Fond de l'écran avec une couleur claire +// }, +// headerStyle: { +// height: 200, +// backgroundColor: "#333333", // Gris foncé pour l'arrière-plan du header +// borderBottomEndRadius: 25, +// borderBottomStartRadius: 25, +// padding: 20, +// alignItems: "flex-start", +// justifyContent: "flex-start", +// }, +// dateContainer: { +// flexDirection: "row", +// alignItems: "flex-start", +// marginBottom: 20, +// }, +// dateText: { +// fontSize: 18, +// fontWeight: "bold", +// marginLeft: 10, +// color: "#ffffff", +// }, +// avatarContainer: { +// marginBottom: 15, +// flexDirection: "row", +// alignItems: "center", +// }, + +// titleNameUser: { +// fontSize: 24, +// color: "#ffffff", +// fontWeight: "bold", +// marginLeft: 10, +// }, +// contentContainer: { +// marginTop: 20, +// padding: 15, +// alignItems: "flex-start", +// }, +// contentText: { +// fontSize: 16, +// color: "#333333", // Texte en gris foncé pour une bonne lisibilité +// textAlign: "center", +// }, + +// fitness: {}, +// }); diff --git a/app/(tabs)/(exercice)/ExerciceScreen.tsx b/app/(tabs)/(exercice)/ExerciceScreen.tsx new file mode 100644 index 0000000..b0ae97a --- /dev/null +++ b/app/(tabs)/(exercice)/ExerciceScreen.tsx @@ -0,0 +1,13 @@ +import {SafeAreaView, Text, View} from "react-native"; +import React from "react"; + +export default function ExerciceScreen() { + return ( + + + Welcome to Exercice Screen + We will do it soon + + + ); +} \ No newline at end of file diff --git a/app/(tabs)/(exercice)/_layout.tsx b/app/(tabs)/(exercice)/_layout.tsx new file mode 100644 index 0000000..b03bdcf --- /dev/null +++ b/app/(tabs)/(exercice)/_layout.tsx @@ -0,0 +1,15 @@ +import React from "react"; +import {Stack} from "expo-router"; + +export default function RootoLayout() { + return ( + + + + + ); + +} \ No newline at end of file diff --git a/app/(tabs)/(exercice)/index.tsx b/app/(tabs)/(exercice)/index.tsx new file mode 100644 index 0000000..e69de29 diff --git a/app/(tabs)/(help)/HelpsScreen.tsx b/app/(tabs)/(help)/HelpsScreen.tsx new file mode 100644 index 0000000..48e20f0 --- /dev/null +++ b/app/(tabs)/(help)/HelpsScreen.tsx @@ -0,0 +1,14 @@ +import {SafeAreaView, Text, View} from "react-native"; +import React from "react"; + +export default function HelpsScreen() { + return ( + + + Welcome to Help Screen + We will do it soon + + + + ); +} \ No newline at end of file diff --git a/app/(tabs)/(help)/_layout.tsx b/app/(tabs)/(help)/_layout.tsx new file mode 100644 index 0000000..6da6271 --- /dev/null +++ b/app/(tabs)/(help)/_layout.tsx @@ -0,0 +1,16 @@ +import React from "react"; +import {Stack} from "expo-router"; +import HelpsScreen from "@/app/(tabs)/(help)/HelpsScreen"; + +export default function RootoLayout() { + return ( + + + + + ); + +} \ No newline at end of file diff --git a/app/(tabs)/(help)/index.tsx b/app/(tabs)/(help)/index.tsx new file mode 100644 index 0000000..e69de29 diff --git a/app/(tabs)/(home)/HomeScreen.tsx b/app/(tabs)/(home)/HomeScreen.tsx new file mode 100644 index 0000000..f7f1f47 --- /dev/null +++ b/app/(tabs)/(home)/HomeScreen.tsx @@ -0,0 +1,90 @@ +import {SafeAreaView,StyleSheet, Text, View} from "react-native"; +import React from "react"; +import {AntDesign} from "@expo/vector-icons"; +import {Avatar, AvatarFallbackText, AvatarImage} from "@/ui/avatar"; + + + +export default function HomeScreen() { + const date = new Date(); + const formattedDate = date.toLocaleDateString('fr-FR', { + year: 'numeric', + month: 'long', + day: 'numeric', + }); + + return ( + + + + + {formattedDate} + + + + + Hello, Tata Monique + + + + + + ); +} + + + +const styles = StyleSheet.create({ + container: { + flex: 1, + backgroundColor: '#f9f9f9', // Fond de l'écran avec une couleur claire + }, + headerStyle: { + height: 200, + backgroundColor: '#333333', // Gris foncé pour l'arrière-plan du header + borderBottomEndRadius: 25, + borderBottomStartRadius: 25, + padding: 20, + alignItems: 'flex-start', + justifyContent: 'flex-start', + }, + dateContainer: { + flexDirection: 'row', + alignItems: 'flex-start', + marginBottom: 20, + }, + dateText: { + fontSize: 18, + fontWeight: 'bold', + marginLeft: 10, + color: '#ffffff', + }, + avatarContainer: { + marginBottom: 15, + flexDirection: 'row', + alignItems: 'center', + }, + + titleNameUser: { + fontSize: 24, + color: '#ffffff', + fontWeight: 'bold', + marginLeft: 10, + }, + contentContainer: { + marginTop: 20, + padding: 15, + alignItems: 'flex-start', + }, + contentText: { + fontSize: 16, + color: '#333333', // Texte en gris foncé pour une bonne lisibilité + textAlign: 'center', + }, + + fitness: { + + } + + +}); \ No newline at end of file diff --git a/app/(tabs)/(home)/_layout.tsx b/app/(tabs)/(home)/_layout.tsx index 1a29376..c7b1cd6 100644 --- a/app/(tabs)/(home)/_layout.tsx +++ b/app/(tabs)/(home)/_layout.tsx @@ -1,9 +1,13 @@ import { Stack } from "expo-router"; +import React from "react"; export default function RootoLayout() { return ( - - + + ); } diff --git a/app/(tabs)/(home)/index.tsx b/app/(tabs)/(home)/index.tsx index e2be743..3c74dc4 100644 --- a/app/(tabs)/(home)/index.tsx +++ b/app/(tabs)/(home)/index.tsx @@ -1,97 +1,12 @@ -// import { SafeAreaView, StyleSheet, View } from "react-native"; -// import React from "react"; -// import { -// Avatar, -// AvatarFallbackText, -// AvatarImage, -// } from "@/components/ui/avatar"; -// import { AntDesign } from "@expo/vector-icons"; -// import { Text } from "@/components/ui/text"; -// import ExerciceOverview from "@/components/ExerciceOverview"; - -// export default function HomeScreen() { -// const date = new Date(); -// const formattedDate = date.toLocaleDateString("fr-FR", { -// year: "numeric", -// month: "long", -// day: "numeric", -// }); - -// return ( -// -// -// -// -// {formattedDate} -// - -// -// -// Jane Doe -// -// -// Hello, Tata Monique -// -// - -// -// -// -// -// ); -// } - -// const styles = StyleSheet.create({ -// container: { -// flex: 1, -// backgroundColor: "#f9f9f9", // Fond de l'écran avec une couleur claire -// }, -// headerStyle: { -// height: 200, -// backgroundColor: "#333333", // Gris foncé pour l'arrière-plan du header -// borderBottomEndRadius: 25, -// borderBottomStartRadius: 25, -// padding: 20, -// alignItems: "flex-start", -// justifyContent: "flex-start", -// }, -// dateContainer: { -// flexDirection: "row", -// alignItems: "flex-start", -// marginBottom: 20, -// }, -// dateText: { -// fontSize: 18, -// fontWeight: "bold", -// marginLeft: 10, -// color: "#ffffff", -// }, -// avatarContainer: { -// marginBottom: 15, -// flexDirection: "row", -// alignItems: "center", -// }, - -// titleNameUser: { -// fontSize: 24, -// color: "#ffffff", -// fontWeight: "bold", -// marginLeft: 10, -// }, -// contentContainer: { -// marginTop: 20, -// padding: 15, -// alignItems: "flex-start", -// }, -// contentText: { -// fontSize: 16, -// color: "#333333", // Texte en gris foncé pour une bonne lisibilité -// textAlign: "center", -// }, - -// fitness: {}, -// }); +import {SafeAreaView, Text, View} from "react-native"; +import React from "react"; +import HomeScreen from "@/app/(tabs)/(home)/HomeScreen"; + +export default function App() { + + return ( + + + + ); +} \ No newline at end of file diff --git a/app/(tabs)/(profil)/ProfileScreen.tsx b/app/(tabs)/(profil)/ProfileScreen.tsx new file mode 100644 index 0000000..393f69f --- /dev/null +++ b/app/(tabs)/(profil)/ProfileScreen.tsx @@ -0,0 +1,13 @@ +import {SafeAreaView, Text, View} from "react-native"; +import React from "react"; + +export default function ProfileScreen() { + return ( + + + Welcome Screen + We will do it soon + + + ); +} \ No newline at end of file diff --git a/app/(tabs)/(profil)/_layout.tsx b/app/(tabs)/(profil)/_layout.tsx new file mode 100644 index 0000000..4f3fd23 --- /dev/null +++ b/app/(tabs)/(profil)/_layout.tsx @@ -0,0 +1,13 @@ +import { Stack } from "expo-router"; +import React from "react"; + +export default function RootoLayout() { + return ( + + + + ); +} diff --git a/app/(tabs)/(profile)/_layout.tsx b/app/(tabs)/(profile)/_layout.tsx deleted file mode 100644 index 66fcd68..0000000 --- a/app/(tabs)/(profile)/_layout.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import { Stack } from "expo-router"; - -export default function KRootLayout() { - return ( - - - - ); -} diff --git a/app/(tabs)/(profile)/profile.tsx b/app/(tabs)/(profile)/profile.tsx deleted file mode 100644 index 164c2d5..0000000 --- a/app/(tabs)/(profile)/profile.tsx +++ /dev/null @@ -1,13 +0,0 @@ -// import {SafeAreaView, View} from "react-native"; -// import {Text} from "react-native"; - -// export default function ProfileScreen() { -// return ( -// -// -// Edit src/screen/ProfileScreen.tsx to edit this screen. -// -// - -// ); -// } diff --git a/app/(tabs)/_layout.tsx b/app/(tabs)/_layout.tsx index 9277614..eca8daf 100644 --- a/app/(tabs)/_layout.tsx +++ b/app/(tabs)/_layout.tsx @@ -1,10 +1,14 @@ import { Redirect, Tabs } from "expo-router"; import { useSession } from "@/ctx"; import { Text } from "react-native"; +import React from "react"; +import {AntDesign, Ionicons, MaterialIcons} from "@expo/vector-icons"; export default function TabBarLayout() { const { session, isLoading } = useSession(); + + const sizeIcon = 24; // You can keep the splash screen open, or render a loading screen like we do here. if (isLoading) { return Loading...; @@ -12,30 +16,63 @@ export default function TabBarLayout() { // Only require authentication within the (app) group's layout as users // need to be able to access the (auth) group and sign in again. - if (!session) { + /*if (!session) { // On web, static rendering will stop here as the user is not authenticated // in the headless Node process that the pages are rendered in. return ; - } + }*/ return ( - , }} /> + + , + + }} + /> + + , + + }} + /> + + , + + }} + /> + + , + + }} + /> + + + ); } diff --git a/app/+not-found.tsx b/app/+not-found.tsx index 2112f90..d075182 100644 --- a/app/+not-found.tsx +++ b/app/+not-found.tsx @@ -9,7 +9,7 @@ export default function NotFoundScreen() { <> - This screen doesn't exist: {pathname} + This screen {pathname} doesn't exist: {pathname} Go to home screen! diff --git a/app/_layout.tsx b/app/_layout.tsx index 58b3638..1c3ec19 100644 --- a/app/_layout.tsx +++ b/app/_layout.tsx @@ -3,7 +3,8 @@ import { useFonts } from "expo-font"; import * as SplashScreen from "expo-splash-screen"; import { useEffect } from "react"; import { SessionProvider } from "@/ctx"; -import { Slot } from "expo-router"; +import {Slot, Stack} from "expo-router"; +import "@/global.css"; // Prevent the splash screen from auto-hiding before asset loading is complete. SplashScreen.preventAutoHideAsync(); @@ -26,7 +27,7 @@ export default function RootLayout() { return ( - + ); } diff --git a/babel.config.js b/babel.config.js index f3c649b..99456b2 100644 --- a/babel.config.js +++ b/babel.config.js @@ -7,3 +7,4 @@ module.exports = function (api) { ], }; }; + diff --git a/components/NavBar.tsx b/components/NavBar.tsx deleted file mode 100644 index 7ffb994..0000000 --- a/components/NavBar.tsx +++ /dev/null @@ -1,106 +0,0 @@ -// import HomeScreen from "@/app/(tabs)/(home)/home"; -// import { -// AntDesign, -// Entypo, -// MaterialCommunityIcons, -// MaterialIcons, -// } from "@expo/vector-icons"; -// import ProfileScreen from "@/app/(tabs)/(profile)/profile"; -// import React from "react"; -// import { createBottomTabNavigator } from "@react-navigation/bottom-tabs"; -// -// export default function NavBar() { -// const BottomTabNavigator = createBottomTabNavigator(); -// return ( -// -// ( -// -// ), -// }} -// /> -// -// ( -// -// ), -// }} -// /> -// -// ( -// -// ), -// tabBarItemStyle: { -// borderRadius: 50, -// backgroundColor: "orange", -// }, -// }} -// /> -// -// ( -// -// ), -// }} -// /> -// -// ( -// -// ), -// }} -// /> -// -// ); -// } diff --git a/generate-react-cli.json b/generate-react-cli.json new file mode 100644 index 0000000..703e18e --- /dev/null +++ b/generate-react-cli.json @@ -0,0 +1,14 @@ +{ + "usesTypeScript": true, + "usesStyledComponents": true, + "testLibrary": "Testing Library", + "component": { + "default": { + "path": "src/components", + "withStyle": true, + "withTest": true, + "withStory": true, + "withLazy": true + } + } +} \ No newline at end of file diff --git a/metro.config.js b/metro.config.js index b0963fe..774c784 100644 --- a/metro.config.js +++ b/metro.config.js @@ -3,4 +3,4 @@ const { withNativeWind } = require("nativewind/metro"); const config = getDefaultConfig(__dirname); -module.exports = withNativeWind(config, { input: "./global.css" }); +module.exports = withNativeWind(config, { input: "./global.css" }); \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 215246e..6dc9fe6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33,8 +33,8 @@ "react-dom": "18.3.1", "react-native": "0.76.6", "react-native-gesture-handler": "^2.20.2", - "react-native-reanimated": "^3.16.1", - "react-native-safe-area-context": "^4.12.0", + "react-native-reanimated": "~3.16.1", + "react-native-safe-area-context": "4.12.0", "react-native-screens": "^4.4.0", "react-native-svg": "^15.8.0", "react-native-vector-icons": "^10.2.0", diff --git a/package.json b/package.json index df5b504..058057d 100644 --- a/package.json +++ b/package.json @@ -40,8 +40,8 @@ "react-dom": "18.3.1", "react-native": "0.76.6", "react-native-gesture-handler": "^2.20.2", - "react-native-reanimated": "^3.16.1", - "react-native-safe-area-context": "^4.12.0", + "react-native-reanimated": "~3.16.1", + "react-native-safe-area-context": "4.12.0", "react-native-screens": "^4.4.0", "react-native-svg": "^15.8.0", "react-native-vector-icons": "^10.2.0", diff --git a/tailwind.config.js b/tailwind.config.js index 2127369..38f7798 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -7,4 +7,4 @@ module.exports = { extend: {}, }, plugins: [], -}; +} \ No newline at end of file