home

app/(tabs)/_layout.tsx

@@ -7,10 +7,9 @@ import { HapticTab } from '@/components/haptic-tab';
 import { IconSymbol } from '@/components/ui/icon-symbol';
 import { Colors } from '@/constants/theme';
 import { useColorScheme } from '@/hooks/use-color-scheme';
-import TabTwoScreen from './index';
-import HomeScreen from './explore';
-import ListMateriel from './gestionnaire_ressource';
 import BonjourScreen from './bonjourFL';
+import ListMateriel from './gestionnaire_ressource';
+import Home from './home';
 import MapScreen from './mapScreen';
 
 const Tabs = createBottomTabNavigator();
@@ -25,9 +24,18 @@ export default function TabLayout() {
         tabBarActiveTintColor: Colors[colorScheme ?? 'light'].tint,
         headerShown: false,
         tabBarButton: HapticTab,
-      }}>
-
-        <Tabs.Screen
+    }}>
+      <Tabs.Screen
+        name="home"
+        component={Home}
+        options={{
+          title: 'Home',
+          tabBarIcon: ({ color }) => (
+            <IconSymbol size={28} name="house.fill" color={color} />
+          ),
+        }}
+      />  
+      <Tabs.Screen
         name="gestionnaire_ressource"
         component={ListMateriel}
         options={{

app/(tabs)/bonjourFL.tsx

@@ -82,7 +82,7 @@ export default function BonjourScreen() {
               <ThemedTextInput
                 lvl={0}
                 style={styles.input}
-                placeholder="Rechercher un groupe..."
+                placeholder="Rechercher un artisant..."
                 value={search}
                 onChangeText={setSearch}
               />
@@ -94,9 +94,7 @@ export default function BonjourScreen() {
         }
       />
 
-      <ThemedView style={styles.footer}>
-        <Button title="Retour" onPress={() => router.push("/(tabs)/mapScreen") } />
-      </ThemedView>
+
 
       <ThemedView style={{width:"100%", position: 'absolute', backgroundColor:'transparent',}}>
             <SelectChantier ></SelectChantier>

app/(tabs)/gestionnaire_ressource.tsx

@@ -1,50 +1,73 @@
-import { useRouter , useLocalSearchParams} from "expo-router";
+import { useRouter, useLocalSearchParams } from "expo-router";
 import { navigate } from "expo-router/build/global-state/routing";
-import React, {useState} from 'react';
-import { Button,FlatList,Image, Text, TextInput,View, StyleSheet } from 'react-native';
+import React, { useEffect, useState } from "react";
+import {
+  Button,
+  FlatList,
+  Image,
+  Text,
+  TextInput,
+  View,
+  StyleSheet,
+} from "react-native";
+import { getRessources, Ressource } from "../../services/ressourcesService";
 
 export default function GestionnaireRessource() {
   const { nom, prenom } = useLocalSearchParams(); // Recup data ecran precedent
-  const [search, setSearch] = useState('');
+  const [search, setSearch] = useState("");
+  const [ressource, setRessources] = useState<Ressource[]>([]);
+  const [loading, setLoading] = useState(true);
   const router = useRouter();
 
-  type Ressource ={
-    id: number;
-    name: string;
-    type: string;
-    Image: string;
-  }
-
-  const data: Ressource[] = [
-    { id: 1, name: 'Marteau', type: 'Outil', Image: '' },
-    { id: 2, name: 'Scie', type: 'Outil' , Image: ''},
-    { id: 3, name: 'Pelle', type: 'Outil' , Image: '' },
-    { id: 4, name: 'Grue', type: 'Machine',Image: 'https://media.discordapp.net/attachments/1425108443571945644/1427207643180826757/raw.png?ex=68ee0632&is=68ecb4b2&hm=1efc51065c6abfb1af75b8382f9924c2eb177c7d7672f7ed9837e96ef3076d16&=&format=webp&quality=lossless&width=421&height=632'},
-    { id: 5, name: 'Bulldozer', type: 'Machine', Image: ''},
-  ];
-
-
-    const renderRessource = ({ item, index }: { item?: Ressource; index: number })  => {
-      if (!item) {
-        // optionnel : afficher un placeholder pour debug
-        // return <View style={styles.card}><Text>Item manquant</Text></View>;
-        return null;
+  useEffect(() => {
+    async function loadData() {
+      try {
+        const data = await getRessources();
+        setRessources(data);
+      } catch (error) {
+        console.error("Erreur lors du chargement des ressources :", error);
+      } finally {
+        setLoading(false);
       }
-      return(
+    }
+
+    loadData();
+  }, []);
+
+  const filteredData = ressource.filter((r) =>
+    r.name.toLowerCase().includes(search.toLowerCase())
+  );
+
+  const renderRessource = ({
+    item,
+    index,
+  }: {
+    item?: Ressource;
+    index: number;
+  }) => {
+    if (!item) {
+      // optionnel : afficher un placeholder pour debug
+      // return <View style={styles.card}><Text>Item manquant</Text></View>;
+      return null;
+    }
+    return (
       <View style={styles.card}>
         <View style={styles.info}>
           <Image source={{ uri: item.Image }} style={styles.image} />
           <Text>{item.id}</Text>
           <Text>{item.name}</Text>
           <Text>{item.type}</Text>
+          <Text>{item.quantity}</Text>
+          <Text>{item.available_quantity}</Text>
         </View>
-      </View>);
-    };
+      </View>
+    );
+  };
 
-  return(
+  return (
     <View style={styles.container}>
       <FlatList
-        data={data}
+        data={filteredData}
         renderItem={renderRessource}
         keyExtractor={(_, index) => index.toString()}
         contentContainerStyle={{ paddingBottom: 40 }}
@@ -69,45 +92,48 @@ export default function GestionnaireRessource() {
       />
 
       <View style={styles.footer}>
-        <Button title="Retour" onPress={() =>router.push('/(tabs)/bonjourFL')} />
+        <Button
+          title="Retour"
+          onPress={() => router.push("/(tabs)/bonjourFL")}
+        />
       </View>
     </View>
-  )
+  );
 }
 
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    backgroundColor: '#fff',
+    backgroundColor: "#fff",
   },
   header: {
     marginTop: 60,
     marginBottom: 20,
-    alignItems: 'center',
+    alignItems: "center",
     paddingHorizontal: 20,
   },
   text: {
     fontSize: 22,
-    fontWeight: 'bold',
+    fontWeight: "bold",
     marginBottom: 10,
   },
   input: {
-    width: '100%',
+    width: "100%",
     borderWidth: 1,
-    borderColor: '#ccc',
+    borderColor: "#ccc",
     borderRadius: 10,
     padding: 10,
     fontSize: 16,
   },
   card: {
-    flexDirection: 'row',
+    flexDirection: "row",
     marginHorizontal: 20,
     marginBottom: 15,
     borderWidth: 1,
-    borderColor: '#ddd',
+    borderColor: "#ddd",
     borderRadius: 10,
     padding: 10,
-    backgroundColor: '#fafafa',
+    backgroundColor: "#fafafa",
   },
   image: {
     width: 80,
@@ -117,10 +143,10 @@ const styles = StyleSheet.create({
   },
   info: {
     flex: 1,
-    justifyContent: 'center',
+    justifyContent: "center",
   },
   group: {
-    fontWeight: 'bold',
+    fontWeight: "bold",
     fontSize: 16,
     marginBottom: 5,
   },
@@ -128,8 +154,8 @@ const styles = StyleSheet.create({
     padding: 20,
   },
   empty: {
-    textAlign: 'center',
+    textAlign: "center",
     marginTop: 30,
-    color: '#888',
+    color: "#888",
   },
-});
+});

app/(tabs)/home.tsx

@@ -0,0 +1,39 @@
+import SelectChantier from '@/components/selectChantier';
+import SetStatus from '@/components/setStatus';
+import { ThemedView, } from '@/components/themed-view';
+import Constants from 'expo-constants'; //pour connaître la taille de la barre menu de l'OS en haut
+import React from 'react';
+import { StyleSheet, View } from 'react-native';
+
+
+
+
+export default function Home() {
+
+
+  return(
+    <ThemedView lvl={3} style={styles.container}>
+      
+
+      <View style={styles.header}>
+        <View style={{position: 'absolute'}}>
+          <SelectChantier></SelectChantier>
+        </View>
+        <View style={{position: 'absolute'}}>
+          <SetStatus></SetStatus>
+        </View>
+      </View>
+
+    </ThemedView>
+  )
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    marginTop: Constants.statusBarHeight, //pour la barre menu du haut
+  },
+  header: {
+    width:"100%"
+  },
+});