Merging

Role management not working
I can't make it use the correct context If someone wants to try it, use this branch
2025-12-13 15:17:53 +01:00 · 2025-12-13 15:17:38 +01:00
33 changed files with 289 additions and 593 deletions
--- a/README.md
+++ b/README.md
@@ -13,7 +13,9 @@ Lien du git : gitlab2.istic.univ-rennes1.fr/trochas/mmm-projet

 Différentes commandes a effectuer pour lancer le projet:

-npx expo install react-native-maps@1.9.0
-npm install react-native-maps @react-navigation/native @react-navigation/bottom-tabs react-native-safe-area-context react-native-screens firebase
+npm install firebase
+npm install react-native-maps
+npx expo install react-native-maps
+npm install react-native-maps @react-navigation/native @react-navigation/bottom-tabs react-native-safe-area-context react-native-screens

 npx expo start
--- a/app/(tabs)/_layout.tsx
+++ b/app/(tabs)/_layout.tsx
@@ -3,19 +3,16 @@ import { } from 'expo-router';
 import React from 'react';


-import { HapticTab } from '@/components/expoExempleComponents/haptic-tab';
+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 GestionOuvrier from './gestion_ouvrier';
+import BonjourScreen from './bonjourFL';
 import ListMateriel from './gestionnaire_ressource';
 import Home from './home';
 import MapScreen from './mapScreen';
-import AddChantier from './addChantier';
+
 import AntDesign from '@expo/vector-icons/AntDesign';
-import { UserProvider } from '../ContextUser';
-import { ChantierProvider } from '../ContextChantier';
-import { RessourcesProvider } from '../ContextRessource';

 const Tabs = createBottomTabNavigator();

@@ -51,8 +48,8 @@ export default function TabLayout() {
        }}
      />
      <Tabs.Screen
-        name="GestionOuvrier"
-        component={GestionOuvrier}
+        name="bonjourFL"
+        component={BonjourScreen}
        options={{
          title: 'Bonjour',
          tabBarIcon: ({ color }) => <IconSymbol size={28} name="person.fill" color={color} />,
@@ -68,12 +65,12 @@ export default function TabLayout() {
      >
      </Tabs.Screen>
      <Tabs.Screen
-        name="addChantier"
-        component={AddChantier}
+        name="ajouterChantier"
+        component={ListMateriel}
        options={{
          title: 'Ajouter',
          tabBarIcon: ({ color }) => (
-            <AntDesign name="plus" size={24} color={color} />
+            <AntDesign name="plus" size={24} color="black" />
          ),
        }}
      />              
--- a/app/(tabs)/addChantier.tsx
+++ b/app/(tabs)/addChantier.tsx
@@ -1,178 +0,0 @@
-import ChantierSummary from '@/components/chantierSummary';
-import SelectChantier from '@/components/selectChantier';
-import SetStatus from '@/components/setStatus';
-
-import { ThemedView } from '@/components/theme/themed-view';
-import React, { useEffect, useState } from 'react';
-import { StyleSheet, ScrollView, Button, TextInput, Text, View } from 'react-native';
-import { useChantier } from '../ContextChantier';
-import { useRessources } from '../ContextRessource';
-import { useUser } from '../ContextUser';
-import { getRessources, getUsers, addChantier } from '@/services/ressourcesService';
-import { Chantier, Ressources } from '@/class/class';
-import { ThemedText } from '@/components/theme/themed-text';
-import { ThemedButton } from '@/components/theme/themed-button';
-import { ThemedTextInput } from '@/components/theme/themed-textinput';
-import Constants from 'expo-constants'; //pour connaître la taille de la barre menu de l'OS en haut
-
-//Uniquement accessible par le RESPONSSABLE du chantier
-//Pour créer ou modifier un chantier
-export default function AddChantier() {
-  const { chantier, setChantier } = useChantier();
-  const { user, setUser } = useUser();
-  const { ressources, setRessources } = useRessources();
-  
-  const [editMode,setEditMode] = useState(false);
-
-  const [loading, setLoading] = useState(false);
-  const [objet, setObjet] = useState('');
-  const [date, setDate] = useState('');
-  const [chefChantier, setChefChantier] = useState('');
-  const [adresse, setAdresse] = useState('');
-  const [duree, setDuree] = useState('');
-  const [contact, setContact] = useState('');
-  const [userSelect, setUserSelect] = useState<string[]>([]);
-  const [ressourcesSelect, setRessourcesSelect] = useState<string[]>([]);
-
-  async function handleAddChantier() {
-    setLoading(true);
-  }
-
-  const renderInut = (name : string, preFill : string, value : string, setValue : ((text:string) => void)) => {
-    return (
-        <View style = {styles.inputLine}>
-          <ThemedText style = {styles.inputName}>{name}:</ThemedText>
-          <ThemedTextInput lvl = {1} style = {styles.input} placeholder={preFill} value = {value} onChangeText={setAdresse} />
-        </View>
-    );
-  };
-
-
-  return (
-    <ThemedView lvl={3} style={styles.back}>
-      <View style={styles.container}>
-        {editMode &&
-        <View style={{width:"100%", position: 'absolute'}}>
-          <SelectChantier></SelectChantier>
-        </View>
-        }
-        <ScrollView>
-          <View style = {styles.header}>
-            
-            <ThemedText style = {styles.text}>
-              {editMode? "Edition d'un chantier"
-              :"Ajouter un nouveau chantier"}
-            </ThemedText>
-            {renderInut("Objet","Renovation",objet,setObjet)}
-            {renderInut("Date de départ","TOTO : JOUR + Demi journé",date,setDate)}
-            {renderInut("Estimation de la durée (1/2 Journée)","14",duree,setDuree)}
-            {renderInut("Adresse","1 Rue de la Coutellerie, Paris",adresse,setAdresse)}
-            {renderInut("Contact client","07 01 02 03 04 05",contact,setContact)}
-            {renderInut("Vehicule","TODO pas un input bien sûre",adresse,setAdresse)}
-            {renderInut("Chef de chantier","TODO pas un input non plus",chefChantier,setChefChantier)}
-
-
-            <ThemedButton
-              lvl={1}
-              shadow={true}
-              style={{ padding: 10, borderRadius: 8, marginBottom: 10 }}
-              onPress={() => handleAddChantier()}
-              >
-                <ThemedText>+</ThemedText>
-            </ThemedButton>
-          </View>
-          
-        </ScrollView>
-      </View>
-    </ThemedView>
-  );
-}
-
-const styles = StyleSheet.create({
-  back:{
-    height:"100%",
-    width:"100%",
-  },
-  container: {
-    flex: 1,
-    marginTop: Constants.statusBarHeight, //pour la barre menu du haut
-  },
-  header: {
-    marginTop:60,
-    alignItems: "center",
-    paddingHorizontal: 20,
-  },
-  text: {
-    fontSize: 22,
-    fontWeight: "bold",
-    marginBottom: 10,
-  },
-  inputBack: {
-    width: "100%",
-    borderRadius: 10,
-    backgroundColor: "transparent",
-  },
-  inputLine:{
-    width: "100%",
-    //flexDirection: 'row',
-    paddingVertical: 5,
-    //alignItems: "center",
-  },
-  inputName: {
-    fontSize: 16,
-  },
-  input: {
-    width: "100%",
-    borderRadius: 10,
-    padding: 10,
-    fontSize: 16,
-  },
-  card: {
-    flexDirection: "row",
-    marginHorizontal: 20,
-    marginBottom: 15,
-    borderRadius: 10,
-    padding: 10,
-  },
-  image: {
-    width: 80,
-    height: 80,
-    borderRadius: 8,
-    marginRight: 10,
-  },
-  info: {
-    flex: 1,
-    justifyContent: "center",
-  },
-  footer: {
-    padding: 20,
-  },
-  empty: {
-    textAlign: "center",
-    marginTop: 30,
-    color: "#888",
-  },
-  filterMenuOverlay: {
-    position: "absolute",
-    top: 0,
-    left: 0,
-    right: 0,
-    bottom: 0,
-    backgroundColor: "rgba(0,0,0,0.4)",
-    justifyContent: "center",
-    alignItems: "center",
-    zIndex: 999,
-  },
-  filterMenu: {
-    width: "80%",
-    borderRadius: 12,
-    padding: 20,
-    backgroundColor: "#fff",
-  },
-  filterTitle: {
-    fontSize: 18,
-    fontWeight: "bold",
-    marginBottom: 20,
-    textAlign: "center",
-  },
-});
--- a/app/(tabs)/ajouter_chantier.tsx
+++ b/app/(tabs)/ajouter_chantier.tsx
@@ -0,0 +1,15 @@
+import ChantierSummary from '@/components/chantierSummary';
+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';
+import { useChantier } from '../ContextChantier';
+import { useRessources } from '../ContextRessource';
+
+export default function ajouterChantier() {
+    const { chantier, setChantier } = useChantier();
+    //const { artisant, setArtisant } = useArtisant();
+    const { ressources, setRessources } = useRessources();
+}
--- a/app/(tabs)/gestion_ouvrier.tsx
+++ b/app/(tabs)/gestion_ouvrier.tsx
@@ -1,14 +1,14 @@
-import { ThemedText } from "@/components/theme/themed-text";
-import { ThemedTextInput } from "@/components/theme/themed-textinput";
-import { ThemedView } from "@/components/theme/themed-view";
+import SelectChantier from "@/components/selectChantier";
+import { ThemedText } from "@/components/themed-text";
+import { ThemedTextInput } from "@/components/themed-textinput";
+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 { useLocalSearchParams, useRouter } from "expo-router";
 import React, { useMemo, useState } from "react";
-import { FlatList, Image, StyleSheet, Text, View } from "react-native";
+import { FlatList, Image, StyleSheet, Text } from "react-native";
 import rawConcerts from "../../data/concerts.json";

 import { useChantier } from "../ContextChantier";
-import SelectChantier from "@/components/selectChantier";

 type Concert = {
  group: string;
@@ -21,7 +21,7 @@ type Concert = {
  favorite: boolean;
 };

-export default function GestionOuvrier() {
+export default function BonjourScreen() {
  const router = useRouter();
  const { nom, prenom } = useLocalSearchParams(); // Recup data ecran precedent
  const [search, setSearch] = useState("");
@@ -57,20 +57,18 @@ export default function GestionOuvrier() {
  };

  return (
-    <ThemedView lvl={3} style={styles.back}>
-      <View style={styles.container}>
-        <View style={{width:"100%", position: 'absolute'}}>
-          <SelectChantier></SelectChantier>
-        </View>
-
-
+    <ThemedView lvl={3} style={styles.container}>
      <FlatList
        data={filteredData}
        renderItem={renderItem}
        keyExtractor={(_, index) => index.toString()}
        contentContainerStyle={{ paddingBottom: 40 }}
        ListHeaderComponent={
-            <View style={styles.header}>
+          <ThemedView opacity="00" style={styles.header}>
+            <ThemedText style={styles.text}>
+              Bonjour {prenom} {nom} {chantier && chantier.chef.name}
+            </ThemedText>
+
            <ThemedView style={styles.inputBack} shadow={true}>
              <ThemedTextInput
                lvl={0}
@@ -80,22 +78,27 @@ export default function GestionOuvrier() {
                onChangeText={setSearch}
              />
            </ThemedView>
-            </View>
+          </ThemedView>
        }
        ListEmptyComponent={
          <Text style={styles.empty}>Aucun résultat n'a été trouvé</Text>
        }
      />
-      </View>
+
+      <ThemedView
+        style={{
+          width: "100%",
+          position: "absolute",
+          backgroundColor: "transparent",
+        }}
+      >
+        <SelectChantier></SelectChantier>
+      </ThemedView>
    </ThemedView>
  );
 }

 const styles = StyleSheet.create({
-  back:{
-    height:"100%",
-    width:"100%",
-  },
  container: {
    flex: 1,
    marginTop: Constants.statusBarHeight, //pour la barre menu du haut
@@ -103,7 +106,7 @@ const styles = StyleSheet.create({
  },
  header: {
    marginTop: 60,
-    marginBottom: 10,
+    marginBottom: 20,
    alignItems: "center",
    paddingHorizontal: 20,
  },
--- a/app/(tabs)/explore.tsx
+++ b/app/(tabs)/explore.tsx
@@ -1,11 +1,11 @@
 import { Image } from 'expo-image';
 import { Platform, StyleSheet } from 'react-native';

-import { ExternalLink } from '@/components/expoExempleComponents/external-link';
-import ParallaxScrollView from '@/components/expoExempleComponents/parallax-scroll-view';
+import { ExternalLink } from '@/components/external-link';
+import ParallaxScrollView from '@/components/parallax-scroll-view';
 import SelectChantier from '@/components/selectChantier';
-import { ThemedText } from '@/components/theme/themed-text';
-import { ThemedView } from '@/components/theme/themed-view';
+import { ThemedText } from '@/components/themed-text';
+import { ThemedView } from '@/components/themed-view';
 import { Collapsible } from '@/components/ui/collapsible';
 import { IconSymbol } from '@/components/ui/icon-symbol';
 import { Fonts } from '@/constants/theme';
--- a/app/(tabs)/gestionnaire_ressource.tsx
+++ b/app/(tabs)/gestionnaire_ressource.tsx
@@ -1,15 +1,12 @@
-import { ThemedText } from "@/components/theme/themed-text";
-import { ThemedTextInput } from "@/components/theme/themed-textinput";
-import { ThemedView } from "@/components/theme/themed-view";
-import Constants from "expo-constants"; //pour connaître la taille de la barre menu de l'OS en haut
-
-import { ThemedButton } from "@/components/theme/themed-button";
+import { ThemedText } from "@/components/themed-text";
+import { ThemedTextInput } from "@/components/themed-textinput";
+import { ThemedView } from "@/components/themed-view";
+import { ThemedButton } from "@/components/themed-button";
 import { useLocalSearchParams, useRouter } from "expo-router";
 import React, { useEffect, useState } from "react";
-import { FlatList, Image, StyleSheet, Text, View } from "react-native";
+import { FlatList, Image, StyleSheet, Text } from "react-native";
 import { Ressources } from "../../class/class";
 import { getRessources } from "../../services/ressourcesService";
-import SelectChantier from "@/components/selectChantier";

 export default function GestionnaireRessource() {
  const { nom, prenom } = useLocalSearchParams();
@@ -53,22 +50,13 @@ export default function GestionnaireRessource() {
    );
  };

-  
-
  return (
-    <ThemedView lvl={3} style={styles.back}>
-      <View style={styles.container}>
-        
-        <View style={{width:"100%", position: 'absolute'}}>
-          <SelectChantier></SelectChantier>
-        </View>
-
-
+    <ThemedView lvl={3} style={styles.container}>
      {/* Overlay menu filtre */}
      {showFilterMenu && (
        <ThemedView lvl={2} style={styles.filterMenuOverlay}>
-            <ThemedView lvl={5} style={styles.filterMenu}>
-              <ThemedText style={styles.filterTitle}>Filtrer par type</ThemedText>
+          <ThemedView lvl={1} style={styles.filterMenu}>
+            <Text style={styles.filterTitle}>Filtrer par type</Text>
            {["tout", "Outil", "Machine"].map((t) => (
              <ThemedButton
                key={t}
@@ -103,7 +91,21 @@ export default function GestionnaireRessource() {
        keyExtractor={(_, index) => index.toString()}
        contentContainerStyle={{ paddingBottom: 40 }}
        ListHeaderComponent={
-            <View style={styles.header}>
+          <ThemedView opacity="00" style={styles.header}>
+            <ThemedText style={styles.text}>
+              Bonjour {prenom} {nom}
+            </ThemedText>
+
+            {/* Bouton filtre en haut à droite */}
+            <ThemedButton
+              lvl={1}
+              shadow={true}
+              style={{ padding: 10, borderRadius: 8, marginBottom: 10 }}
+              onPress={() => setShowFilterMenu(true)}
+            >
+              <ThemedText>{`Filtre: ${filterType}`}</ThemedText>
+            </ThemedButton>
+
            <ThemedView lvl={1} shadow={true} style={styles.inputBack}>
              <ThemedTextInput
                lvl={0}
@@ -113,38 +115,22 @@ export default function GestionnaireRessource() {
                onChangeText={setSearch}
              />
            </ThemedView>
-              
-              {/* Bouton filtre en haut à droite */}
-              <ThemedButton
-                lvl={1}
-                shadow={true}
-                style={{ padding: 10, borderRadius: 8, marginTop: 10 }}
-                onPress={() => setShowFilterMenu(true)}
-              >
-                <ThemedText>{`Filtre: ${filterType}`}</ThemedText>
-              </ThemedButton>
-            </View>
+          </ThemedView>
        }
        ListEmptyComponent={
          <ThemedText style={styles.empty}>Aucun résultat trouvé</ThemedText>
        }
      />
-      </View>
    </ThemedView>
  );
 }

 const styles = StyleSheet.create({
-  back:{
-    height:"100%",
-    width:"100%",
-  },
  container: {
    flex: 1,
-    marginTop: Constants.statusBarHeight,
+    marginTop: 60,
  },
  header: {
-    marginTop: 60,
    marginBottom: 20,
    alignItems: "center",
    paddingHorizontal: 20,
@@ -205,6 +191,7 @@ const styles = StyleSheet.create({
    width: "80%",
    borderRadius: 12,
    padding: 20,
+    backgroundColor: "#fff",
  },
  filterTitle: {
    fontSize: 18,
--- a/app/(tabs)/home.tsx
+++ b/app/(tabs)/home.tsx
@@ -1,13 +1,11 @@
 import ChantierSummary from '@/components/chantierSummary';
 import SelectChantier from '@/components/selectChantier';
 import SetStatus from '@/components/setStatus';
-import { ThemedView, } from '@/components/theme/themed-view';
+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,Text } from 'react-native';
+import { StyleSheet, View } from 'react-native';
 import { useChantier } from '../ContextChantier';
-import Anomaly from '@/components/anomaly';
-
 import { useUser } from '../ContextUser';


@@ -16,20 +14,21 @@ export default function Home() {
  const { chantier, setChantier } = useChantier();
  const { role } = useUser();

-  console.log("ROLE USER", role)
+  console.log("User", role);
  
  return(
    <ThemedView lvl={3} style={styles.back}>
      <View style={styles.container}>
+        <ChantierSummary style={styles.summary} data={{ chantier }} />
        <View style={{width:"100%", position: 'absolute'}}>
          <SelectChantier></SelectChantier>
        </View>
+        {role === "chef" && (
          <View style={{width:"100%", position: 'absolute',marginLeft:"50%"}}>
            <SetStatus></SetStatus>
          </View>
-        <ChantierSummary style={styles.summary} data={{ chantier }} />
-        <Anomaly style={styles.anomaly} data={{chantier}}/>
-        {role === "chef"}
+        )}
+        {role === "resp"}

      </View>
    </ThemedView>
@@ -44,16 +43,13 @@ const styles = StyleSheet.create({
  container: {
    flex: 1,
    marginTop: Constants.statusBarHeight, //pour la barre menu du haut
-    paddingTop : 60,
  },
  header: {
    flex: 1,
    width:"100%"
  },
  summary:{
-    padding:10,
-  },
-  anomaly:{
+    marginTop:60,
    padding:10,
  }
 });
--- a/app/(tabs)/index.tsx
+++ b/app/(tabs)/index.tsx
@@ -1,10 +1,10 @@
 import { Image } from 'expo-image';
 import { Platform, StyleSheet } from 'react-native';

-import { HelloWave } from '@/components/expoExempleComponents/hello-wave';
-import ParallaxScrollView from '@/components/expoExempleComponents/parallax-scroll-view';
-import { ThemedText } from '@/components/theme/themed-text';
-import { ThemedView } from '@/components/theme/themed-view';
+import { HelloWave } from '@/components/hello-wave';
+import ParallaxScrollView from '@/components/parallax-scroll-view';
+import { ThemedText } from '@/components/themed-text';
+import { ThemedView } from '@/components/themed-view';
 import { Link } from 'expo-router';

 export default function HomeScreen() {
--- a/app/(tabs)/mapScreen.tsx
+++ b/app/(tabs)/mapScreen.tsx
@@ -1,5 +1,5 @@
 // MapScreen.tsx
-import { ThemedMapView } from '@/components/theme/themed-mapview';
+import { ThemedMapView } from '@/components/themed-mapview';
 import React, { useEffect, useState } from 'react';
 import { StyleSheet, View, Dimensions, Image, Text } from 'react-native';
 import MapView, { Marker, Callout, CalloutSubview, PROVIDER_DEFAULT } from 'react-native-maps';
--- a/app/(tabs)/templateSreen.tsx
+++ b/app/(tabs)/templateSreen.tsx
@@ -1,31 +0,0 @@
-import { ThemedView } from "@/components/theme/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";
-
-import { useChantier } from "../ContextChantier";
-
-
-export default function TemplateScreen() {
-  const { chantier, setChantier } = useChantier();
-
-
-  return (
-    <ThemedView lvl={3} style={styles.back}>
-      <View style={styles.container}>
-        
-      </View>
-    </ThemedView>
-  );
-}
-
-const styles = StyleSheet.create({
-  back:{
-    height:"100%",
-    width:"100%",
-  },
-  container: {
-    flex: 1,
-    marginTop: Constants.statusBarHeight, //pour la barre menu du haut
-  },
-});
--- a/app/_layout.tsx
+++ b/app/_layout.tsx
@@ -14,9 +14,10 @@ import { auth, db } from "../firebase_config";

 import { Platform, UIManager } from 'react-native';
 import { ChantierProvider } from "./ContextChantier";
-import { UserProvider } from "./ContextUser";
-import { RessourcesProvider } from "./ContextRessource";
 import { useUser } from "./ContextUser";
+import { RessourcesProvider } from "./ContextRessource";
+import LoginScreen from "./login/login";
+

 export const unstable_settings = {
  anchor: "(tabs)",
@@ -25,41 +26,48 @@ export const unstable_settings = {
 export default function RootLayout() {
  const colorScheme = useColorScheme();
  const router = useRouter();
-  const { setUser, setRole } = useUser();
+  const [loading, setLoading] = useState(true);
+  const { setUser, setRole, user } = useUser();
+
  useEffect(() => {
    const unsubscribe = onAuthStateChanged(auth, async (currentUser) => {
      if (!currentUser) {
+        console.log("No user logged in");
        setUser(null);
        setRole(null);
-        router.replace("/login/login");
+        setLoading(false);
        return;
      }

+      setUser(currentUser);
+
      const userDocRef = doc(db, "user", currentUser.uid);
      const userDoc = await getDoc(userDocRef);
-
+      console.log("User doc data:", userDoc.data());
      if (!userDoc.exists()) {
-        router.replace("/login/login");
        setUser(null);
-        setRole(null);
+        setLoading(false);
        return;
      }
-
-      const { role } = userDoc.data();
-      console.log("ROLE APP",role)
+      setRole(userDoc.data().role);
      setUser(currentUser);
-      setRole(role);
-      router.replace("/(tabs)/home");
+      setLoading(false);
    });
+
    return unsubscribe;
  }, []);

+  if (loading) {
+    return null; // ou un SplashScreen
+  }
+
+
  return (
-    <UserProvider>
      <ChantierProvider>
        <RessourcesProvider>
-          <RootLayout></RootLayout>
          <ThemeProvider value={colorScheme === "dark" ? DarkTheme : DefaultTheme}>
+
+            {user ? (
              <Stack>
                <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
                <Stack.Screen name="selectChantier" options={{ headerShown: false }} />
@@ -67,12 +75,14 @@ export default function RootLayout() {
                  name="modal"
                  options={{ presentation: "modal", title: "Modal" }}
                />
-                <Stack.Screen name="login" options={{ headerShown: false }} />
              </Stack>
+            ) : (
+              <LoginScreen />
+            )}
+
            <StatusBar style="auto" />
          </ThemeProvider>
        </RessourcesProvider>
      </ChantierProvider>
-    </UserProvider>
  );
 }
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -0,0 +1,10 @@
+import { Slot } from "expo-router";
+import { UserProvider } from "./ContextUser";
+
+export default function Layout() {
+  return (
+    <UserProvider>
+      <Slot />
+    </UserProvider>
+  );
+}
--- a/app/login/login.tsx
+++ b/app/login/login.tsx
@@ -1,6 +1,6 @@
-import { ThemedText } from "@/components/theme/themed-text";
-import { ThemedTextInput } from "@/components/theme/themed-textinput";
-import { ThemedView } from "@/components/theme/themed-view";
+import { ThemedText } from "@/components/themed-text";
+import { ThemedTextInput } from "@/components/themed-textinput";
+import { ThemedView } from "@/components/themed-view";
 import { router } from "expo-router";
 import {
  signInWithEmailAndPassword
@@ -8,12 +8,14 @@ import {
 import React, { useState } from "react";
 import { Button, StyleSheet, View } from "react-native";
 import { auth } from "../../firebase_config";
+import { useUser } from "../ContextUser";

 const DEFAULT_ROLE = "resp";

 const LoginScreen: React.FC = () => {
  const [email, setEmail] = useState<string>("");
  const [password, setPassword] = useState<string>("");
+  const { setUser, setRole } = useUser();

  const handleLogin = async () => {
    try {
@@ -35,7 +37,7 @@ const LoginScreen: React.FC = () => {

  return (
    <ThemedView lvl={1} style={styles.container}>
-      <ThemedText style={styles.title}>Se connecter</ThemedText>
+      <ThemedText style={styles.title}>Se connecter / S'incrire</ThemedText>
      <ThemedTextInput
        lvl = {2}
        border = {5}
--- a/app/modal.tsx
+++ b/app/modal.tsx
@@ -1,8 +1,8 @@
 import { Link } from 'expo-router';
 import { StyleSheet } from 'react-native';

-import { ThemedText } from '@/components/theme/themed-text';
-import { ThemedView } from '@/components/theme/themed-view';
+import { ThemedText } from '@/components/themed-text';
+import { ThemedView } from '@/components/themed-view';

 export default function ModalScreen() {
  return (
--- a/components/anomaly.tsx
+++ b/components/anomaly.tsx
@@ -1,58 +0,0 @@
-import { Chantier } from '@/class/class';
-import { ThemedView, } from '@/components/theme/themed-view';
-import React from 'react';
-import { Image, StyleProp, StyleSheet, View, ViewStyle } from 'react-native';
-import { ThemedText } from './theme/themed-text';
-
-
-type Props = {
-    data: {
-        chantier:Chantier|null;
-    }
-    style?: StyleProp<ViewStyle>;
-};
-
-export default function Anomaly({data,style , ...otherProps }: Props) {
-
-  return(
-    <View  style={style}>
-        {data.chantier ? (
-            <ThemedView lvl={4} style={styles.anomaliesContainer}>
-                <ThemedText style={styles.anomaliesTitle}>Anomalies</ThemedText>
-                {data.chantier.anomalies.length > 0 ? (
-                  data.chantier.anomalies.map((anomaly, index) => (
-                  <ThemedView key={index} lvl={2} style={styles.anomalyItem}>
-                    <ThemedText>• {anomaly}</ThemedText>
-                  </ThemedView>
-                  ))
-                ) : (
-                  <ThemedText style={styles.noAnomaly}>Aucune anomalie</ThemedText>
-                ) }
-                </ThemedView>
-        ): null}
-    </View>
-  )
-}
-
-const styles = StyleSheet.create({
-  //Anomalies styles
-  anomaliesContainer: {
-    padding: 5,
-    borderRadius: 10,
-    height: 150,
-  },
-  anomaliesTitle: {
-    fontSize: 16,
-    fontWeight: "bold",
-    marginBottom: 8,
-  },
-  anomalyItem: {
-    padding: 8,
-    marginBottom: 5,
-    borderRadius: 8,
-  },
-  noAnomaly: {
-    fontStyle: "italic",
-    opacity: 0.7,
-  },
-});
--- a/components/chantierSummary.tsx
+++ b/components/chantierSummary.tsx
@@ -1,8 +1,9 @@
 import { Chantier } from '@/class/class';
-import { ThemedView, } from '@/components/theme/themed-view';
+import { ThemedView, } from '@/components/themed-view';
 import React from 'react';
 import { Image, StyleProp, StyleSheet, View, ViewStyle } from 'react-native';
-import { ThemedText } from './theme/themed-text';
+import { ThemedText } from './themed-text';
+

 type Props = {
    data: {
@@ -12,6 +13,8 @@ type Props = {
 };

 export default function ChantierSummary({data,style , ...otherProps }: Props) {
+
+
  return(
    <View  style={style}>
        {data.chantier ? (
--- a/components/expoExempleComponents/example.tsx
+++ b/components/expoExempleComponents/example.tsx
--- a/components/expoExempleComponents/external-link.tsx
+++ b/components/expoExempleComponents/external-link.tsx
--- a/components/expoExempleComponents/haptic-tab.tsx
+++ b/components/expoExempleComponents/haptic-tab.tsx
--- a/components/expoExempleComponents/hello-wave.tsx
+++ b/components/expoExempleComponents/hello-wave.tsx
--- a/components/expoExempleComponents/parallax-scroll-view.tsx
+++ b/components/expoExempleComponents/parallax-scroll-view.tsx
@@ -7,7 +7,7 @@ import Animated, {
  useScrollOffset,
 } from 'react-native-reanimated';

-import { ThemedView } from '@/components/theme/themed-view';
+import { ThemedView } from '@/components/themed-view';
 import { useColorScheme } from '@/hooks/use-color-scheme';
 import { useThemeColor } from '@/hooks/use-theme-color';

@@ -23,7 +23,7 @@ export default function ParallaxScrollView({
  headerImage,
  headerBackgroundColor,
 }: Props) {
-  const backgroundColor = useThemeColor({}, 'background3');
+  const backgroundColor = useThemeColor({}, 'background');
  const colorScheme = useColorScheme() ?? 'light';
  const scrollRef = useAnimatedRef<Animated.ScrollView>();
  const scrollOffset = useScrollOffset(scrollRef);
--- a/components/selectChantier.tsx
+++ b/components/selectChantier.tsx
@@ -1,10 +1,8 @@
 import { useChantier } from "@/app/ContextChantier";
 import { Chantier } from "@/class/class";
 import { getChantiers } from "@/services/ressourcesService";
-import { useRouter } from "expo-router";
 import { useEffect, useState } from "react";
 import {
-  ActivityIndicator,
  Dimensions,
  Image,
  Pressable,
@@ -15,10 +13,10 @@ import {
 import Animated, {
  LinearTransition
 } from "react-native-reanimated";
-import { ThemedButton } from "@/components/theme/themed-button";
-import { ThemedText } from "@/components/theme/themed-text";
-import { ThemedTextInput } from "@/components/theme/themed-textinput";
-import { ThemedView } from "@/components/theme/themed-view";
+import { ThemedButton } from "./themed-button";
+import { ThemedText } from "./themed-text";
+import { ThemedTextInput } from "./themed-textinput";
+import { ThemedView } from "./themed-view";

 const screenHeight = Dimensions.get("window").height;
 const { width, height } = Dimensions.get("window");
@@ -35,10 +33,7 @@ export default function SelectChantier() {
  const { chantier, setChantier } = useChantier();
  const [search, setSearch] = useState("");
  const [isOpen, setIsOpen] = useState(false);
-  const [isLoaded, setIsLoaded] = useState(false);
  const [chantiers, setChantiers] = useState<Chantier[]>([]);
-  const router = useRouter();
-

  const AnimatedThemedView = Animated.createAnimatedComponent(ThemedView);
  const AnimatedThemedText = Animated.createAnimatedComponent(ThemedText);
@@ -47,18 +42,15 @@ export default function SelectChantier() {
    Animated.createAnimatedComponent(ThemedTextInput);

  async function onPressOpen(){
-    setIsLoaded(false);
    setIsOpen(!isOpen);
    if(!isOpen){
      const updatedChantiers = await getChantiers();
-      setIsLoaded(true);
      setChantiers(updatedChantiers)
    }
  }

  function onPressAddChantier(){
-    router.push("/(tabs)/addChantier")
-    setIsOpen(false)
+
  }

  useEffect(() => {
@@ -83,6 +75,7 @@ export default function SelectChantier() {
              <Image source={{ uri:"https://cdn.discordapp.com/attachments/1425108443571945644/1427207643180826757/raw.png?ex=69392bb2&is=6937da32&hm=dcc09e76d3dca89d2418947b46efbd38673b9dc559027724b2e51d493b173bc9&" /*chantier.urlImg*/ }} style={styles.image} />
            </View>
            <View>
+            <ThemedText>{chantier.chef != null ? "true" : "false"}</ThemedText>
            <ThemedText>Adresse: {chantier.adresse}</ThemedText>
            <ThemedText>Chef de chantier: {chantier.chef.last_name}{" "}{chantier.chef.name}</ThemedText>
            <ThemedText>État: {chantier.etat}</ThemedText>
@@ -111,16 +104,14 @@ export default function SelectChantier() {
                +
              </ThemedText>
            </ThemedButton>
-            <View style={styles.list}>
-              {isLoaded?
+
+            <ThemedView lvl={2} style={styles.list}>
              <ScrollView contentContainerStyle={styles.chantiersList}>
                {chantiers.map((chantier, index) =>
                  renderChantier(chantier, index)
                )}
              </ScrollView>
-              : <ActivityIndicator style={{height:"100%"}} color="#808080" size="large" />}
-            </View>
-
+            </ThemedView>
        </View>
        )}
      </AnimatedThemedView>
@@ -223,8 +214,5 @@ const styles = StyleSheet.create({
  buttonAdd:{
    borderRadius: 10,
    marginBottom: 10,
-    height: 30,
-    alignItems: 'center',
-    justifyContent: 'center',
  }
 });
--- a/components/setStatus.tsx
+++ b/components/setStatus.tsx
@@ -3,9 +3,9 @@ import { changeChantierStatus } from "@/services/ressourcesService";
 import { useState } from 'react';
 import { Dimensions, LayoutAnimation, Modal, Pressable, StyleSheet, View } from 'react-native';
 import Animated, { LinearTransition } from 'react-native-reanimated';
-import { ThemedButton } from './theme/themed-button';
-import { ThemedText } from './theme/themed-text';
-import { ThemedView } from "./theme/themed-view";
+import { ThemedButton } from './themed-button';
+import { ThemedText } from './themed-text';
+import { ThemedView } from "./themed-view";

 const { width, height } = Dimensions.get("window");

@@ -70,7 +70,7 @@ export default function SetStatus() {
        <Modal transparent={true} >
          <View style={styles.overlay}>
            <ThemedView style={styles.overlayView}>
-              <ThemedText style={{fontSize: 25}}>Changer l'état du chantier en {tempStatus} ?</ThemedText>
+              <ThemedText style={{fontSize: 25}}>Changer l'était du chantier en {tempStatus} ?</ThemedText>
              <View style={styles.overlayView}>
                <ThemedButton lvl={2} border={5} style={styles.buttonValid} onPress={() => onConfirm()}>
                  <ThemedText style={{fontSize: 25}}>Confirmer</ThemedText>
@@ -162,7 +162,6 @@ const styles = StyleSheet.create({
    borderRadius: 15,
    padding: 10,
    height:40,
-    justifyContent: 'center',
  },
  centeredText:{
    textAlign: 'center',
@@ -189,7 +188,6 @@ const styles = StyleSheet.create({
    padding: 10,
    height:60,
    alignItems: "center",
-    justifyContent: 'center',
  },
  
 });
--- a/components/theme/themed-button.tsx
+++ b/components/theme/themed-button.tsx
--- a/components/theme/themed-mapview.tsx
+++ b/components/theme/themed-mapview.tsx
--- a/components/theme/themed-text.tsx
+++ b/components/theme/themed-text.tsx
--- a/components/theme/themed-textinput.tsx
+++ b/components/theme/themed-textinput.tsx
--- a/components/theme/themed-view.tsx
+++ b/components/theme/themed-view.tsx
--- a/components/ui/collapsible.tsx
+++ b/components/ui/collapsible.tsx
@@ -1,8 +1,8 @@
 import { PropsWithChildren, useState } from 'react';
 import { StyleSheet, TouchableOpacity } from 'react-native';

-import { ThemedText } from '@/components/theme/themed-text';
-import { ThemedView } from '@/components/theme/themed-view';
+import { ThemedText } from '@/components/themed-text';
+import { ThemedView } from '@/components/themed-view';
 import { IconSymbol } from '@/components/ui/icon-symbol';
 import { Colors } from '@/constants/theme';
 import { useColorScheme } from '@/hooks/use-color-scheme';
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,9 +9,9 @@
      "version": "1.0.0",
      "dependencies": {
        "@expo/vector-icons": "^15.0.2",
-        "@react-navigation/bottom-tabs": "^7.8.12",
+        "@react-navigation/bottom-tabs": "^7.8.2",
        "@react-navigation/elements": "^2.6.3",
-        "@react-navigation/native": "^7.1.25",
+        "@react-navigation/native": "^7.1.19",
        "expo": "~54.0.13",
        "expo-constants": "~18.0.9",
        "expo-font": "~14.0.9",
@@ -29,7 +29,7 @@
        "react-dom": "19.1.0",
        "react-native": "0.81.4",
        "react-native-gesture-handler": "~2.28.0",
-        "react-native-maps": "1.9.0",
+        "react-native-maps": "1.20.1",
        "react-native-reanimated": "~4.1.1",
        "react-native-safe-area-context": "~5.6.0",
        "react-native-screens": "~4.16.0",
@@ -38,7 +38,6 @@
      },
      "devDependencies": {
        "@types/react": "~19.1.0",
-        "baseline-browser-mapping": "^2.9.6",
        "eslint": "^9.25.0",
        "eslint-config-expo": "~10.0.0",
        "typescript": "~5.9.2"
@@ -2327,7 +2326,6 @@
      "version": "0.14.6",
      "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.14.6.tgz",
      "integrity": "sha512-4uyt8BOrBsSq6i4yiOV/gG6BnnrvTeyymlNcaN/dKvyU1GoolxAafvIvaNP1RCGPlNab3OuE4MKUQuv2lH+PLQ==",
-      "peer": true,
      "dependencies": {
        "@firebase/component": "0.7.0",
        "@firebase/logger": "0.5.0",
@@ -2393,7 +2391,6 @@
      "version": "0.5.6",
      "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.5.6.tgz",
      "integrity": "sha512-YYGARbutghQY4zZUWMYia0ib0Y/rb52y72/N0z3vglRHL7ii/AaK9SA7S/dzScVOlCdnbHXz+sc5Dq+r8fwFAg==",
-      "peer": true,
      "dependencies": {
        "@firebase/app": "0.14.6",
        "@firebase/component": "0.7.0",
@@ -3809,17 +3806,17 @@
      "license": "MIT"
    },
    "node_modules/@react-navigation/bottom-tabs": {
-      "version": "7.8.12",
-      "resolved": "https://registry.npmjs.org/@react-navigation/bottom-tabs/-/bottom-tabs-7.8.12.tgz",
-      "integrity": "sha512-efVt5ydHK+b4ZtjmN81iduaO5dPCmzhLBFwjCR8pV4x4VzUfJmtUJizLqTXpT3WatHdeon2gDPwhhoelsvu/JA==",
+      "version": "7.8.2",
+      "resolved": "https://registry.npmjs.org/@react-navigation/bottom-tabs/-/bottom-tabs-7.8.2.tgz",
+      "integrity": "sha512-QOcRZj6hA5QZg8PztlEaNOjbQRq75NKM26yTFXdL81OWM2qgry3tascIhBvLUak35NryG1iqQXzSpgn3I/86+g==",
      "license": "MIT",
      "dependencies": {
-        "@react-navigation/elements": "^2.9.2",
+        "@react-navigation/elements": "^2.8.1",
        "color": "^4.2.3",
        "sf-symbols-typescript": "^2.1.0"
      },
      "peerDependencies": {
-        "@react-navigation/native": "^7.1.25",
+        "@react-navigation/native": "^7.1.19",
        "react": ">= 18.2.0",
        "react-native": "*",
        "react-native-safe-area-context": ">= 4.0.0",
@@ -3827,12 +3824,12 @@
      }
    },
    "node_modules/@react-navigation/core": {
-      "version": "7.13.6",
-      "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-7.13.6.tgz",
-      "integrity": "sha512-7QG29HAWOR8wYuPkfTN8L2Po+kE1xn3nsi2sS35sGngq8HYZRHfXvxrhrAZYfFnFq2hUtOhcXnSS6vEWU/5rmA==",
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-7.13.0.tgz",
+      "integrity": "sha512-Fc/SO23HnlGnkou/z8JQUzwEMvhxuUhr4rdPTIZp/c8q1atq3k632Nfh8fEiGtk+MP1wtIvXdN2a5hBIWpLq3g==",
      "license": "MIT",
      "dependencies": {
-        "@react-navigation/routers": "^7.5.2",
+        "@react-navigation/routers": "^7.5.1",
        "escape-string-regexp": "^4.0.0",
        "fast-deep-equal": "^3.1.3",
        "nanoid": "^3.3.11",
@@ -3846,9 +3843,9 @@
      }
    },
    "node_modules/@react-navigation/elements": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-2.9.2.tgz",
-      "integrity": "sha512-J1GltOAGowNLznEphV/kr4zs0U7mUBO1wVA2CqpkN8ePBsoxrAmsd+T5sEYUCXN9KgTDFvc6IfcDqrGSQngd/g==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-2.8.1.tgz",
+      "integrity": "sha512-MLmuS5kPAeAFFOylw89WGjgEFBqGj/KBK6ZrFrAOqLnTqEzk52/SO1olb5GB00k6ZUCDZKJOp1BrLXslxE6TgQ==",
      "license": "MIT",
      "dependencies": {
        "color": "^4.2.3",
@@ -3857,7 +3854,7 @@
      },
      "peerDependencies": {
        "@react-native-masked-view/masked-view": ">= 0.2.0",
-        "@react-navigation/native": "^7.1.25",
+        "@react-navigation/native": "^7.1.19",
        "react": ">= 18.2.0",
        "react-native": "*",
        "react-native-safe-area-context": ">= 4.0.0"
@@ -3869,13 +3866,13 @@
      }
    },
    "node_modules/@react-navigation/native": {
-      "version": "7.1.25",
-      "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-7.1.25.tgz",
-      "integrity": "sha512-zQeWK9txDePWbYfqTs0C6jeRdJTm/7VhQtW/1IbJNDi9/rFIRzZule8bdQPAnf8QWUsNujRmi1J9OG/hhfbalg==",
+      "version": "7.1.19",
+      "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-7.1.19.tgz",
+      "integrity": "sha512-fM7q8di4Q8sp2WUhiUWOe7bEDRyRhbzsKQOd5N2k+lHeCx3UncsRYuw4Q/KN0EovM3wWKqMMmhy/YWuEO04kgw==",
      "license": "MIT",
      "peer": true,
      "dependencies": {
-        "@react-navigation/core": "^7.13.6",
+        "@react-navigation/core": "^7.13.0",
        "escape-string-regexp": "^4.0.0",
        "fast-deep-equal": "^3.1.3",
        "nanoid": "^3.3.11",
@@ -3904,9 +3901,9 @@
      }
    },
    "node_modules/@react-navigation/routers": {
-      "version": "7.5.2",
-      "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-7.5.2.tgz",
-      "integrity": "sha512-kymreY5aeTz843E+iPAukrsOtc7nabAH6novtAPREmmGu77dQpfxPB2ZWpKb5nRErIRowp1kYRoN2Ckl+S6JYw==",
+      "version": "7.5.1",
+      "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-7.5.1.tgz",
+      "integrity": "sha512-pxipMW/iEBSUrjxz2cDD7fNwkqR4xoi0E/PcfTQGCcdJwLoaxzab5kSadBLj1MTJyT0YRrOXL9umHpXtp+Dv4w==",
      "license": "MIT",
      "dependencies": {
        "nanoid": "^3.3.11"
@@ -5289,9 +5286,9 @@
      "license": "MIT"
    },
    "node_modules/baseline-browser-mapping": {
-      "version": "2.9.6",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.6.tgz",
-      "integrity": "sha512-v9BVVpOTLB59C9E7aSnmIF8h7qRsFpx+A2nugVMTszEOMcfjlZMsXRm4LF23I3Z9AJxc8ANpIvzbzONoX9VJlg==",
+      "version": "2.8.15",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.15.tgz",
+      "integrity": "sha512-qsJ8/X+UypqxHXN75M7dF88jNK37dLBRW7LeUzCPz+TNs37G8cfWy9nWzS+LS//g600zrt2le9KuXt0rWfDz5Q==",
      "license": "Apache-2.0",
      "bin": {
        "baseline-browser-mapping": "dist/cli.js"
@@ -7912,7 +7909,6 @@
      "version": "12.6.0",
      "resolved": "https://registry.npmjs.org/firebase/-/firebase-12.6.0.tgz",
      "integrity": "sha512-8ZD1Gcv916Qp8/nsFH2+QMIrfX/76ti6cJwxQUENLXXnKlOX/IJZaU2Y3bdYf5r1mbownrQKfnWtrt+MVgdwLA==",
-      "license": "Apache-2.0",
      "dependencies": {
        "@firebase/ai": "2.6.0",
        "@firebase/analytics": "0.10.19",
@@ -11401,9 +11397,9 @@
      }
    },
    "node_modules/react-is": {
-      "version": "19.2.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.2.1.tgz",
-      "integrity": "sha512-L7BnWgRbMwzMAubQcS7sXdPdNLmKlucPlopgAzx7FtYbksWZgEWiuYM5x9T6UqS2Ne0rsgQTq5kY2SGqpzUkYA==",
+      "version": "19.2.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.2.0.tgz",
+      "integrity": "sha512-x3Ax3kNSMIIkyVYhWPyO09bu0uttcAIoecO/um/rKGQ4EltYWVYtyiGkS/3xMynrbVQdS69Jhlv8FXUEZehlzA==",
      "license": "MIT"
    },
    "node_modules/react-native": {
@@ -11491,12 +11487,15 @@
      }
    },
    "node_modules/react-native-maps": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/react-native-maps/-/react-native-maps-1.9.0.tgz",
-      "integrity": "sha512-ZTMjwEP//M4e+3DA9vzL1tcEZpfHGw5FnejuEpauO8HK5542Der2Ux9mZEXZa5I5q3+B0wJKUzvUPRZxeImUHg==",
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/react-native-maps/-/react-native-maps-1.20.1.tgz",
+      "integrity": "sha512-NZI3B5Z6kxAb8gzb2Wxzu/+P2SlFIg1waHGIpQmazDSCRkNoHNY4g96g+xS0QPSaG/9xRBbDNnd2f2/OW6t6LQ==",
      "license": "MIT",
      "dependencies": {
-        "@types/geojson": "^7946.0.10"
+        "@types/geojson": "^7946.0.13"
+      },
+      "engines": {
+        "node": ">=18"
      },
      "peerDependencies": {
        "react": ">= 17.0.1",
--- a/package.json
+++ b/package.json
@@ -12,9 +12,9 @@
  },
  "dependencies": {
    "@expo/vector-icons": "^15.0.2",
-    "@react-navigation/bottom-tabs": "^7.8.12",
+    "@react-navigation/bottom-tabs": "^7.8.2",
    "@react-navigation/elements": "^2.6.3",
-    "@react-navigation/native": "^7.1.25",
+    "@react-navigation/native": "^7.1.19",
    "expo": "~54.0.13",
    "expo-constants": "~18.0.9",
    "expo-font": "~14.0.9",
@@ -32,7 +32,7 @@
    "react-dom": "19.1.0",
    "react-native": "0.81.4",
    "react-native-gesture-handler": "~2.28.0",
-    "react-native-maps": "1.9.0",
+    "react-native-maps": "1.20.1",
    "react-native-reanimated": "~4.1.1",
    "react-native-safe-area-context": "~5.6.0",
    "react-native-screens": "~4.16.0",
@@ -41,7 +41,6 @@
  },
  "devDependencies": {
    "@types/react": "~19.1.0",
-    "baseline-browser-mapping": "^2.9.6",
    "eslint": "^9.25.0",
    "eslint-config-expo": "~10.0.0",
    "typescript": "~5.9.2"
--- a/services/ressourcesService.ts
+++ b/services/ressourcesService.ts
@@ -2,7 +2,6 @@ import { addDoc, collection, doc, getDoc, getDocs, Timestamp, updateDoc } from "
 import { Chantier, Reservation, Ressources, User } from "../class/class";
 import { db } from "../firebase_config";

-///////////////////////////////////USER/////////////////////////////////////
 export async function getUsers(): Promise<User[]> {
  try {
    const colRef = collection(db, "user");
@@ -19,7 +18,7 @@ export async function getUsers(): Promise<User[]> {
    return [];
  }
 }
-///////////////////////////////////RESSOURCE////////////////////////////////
+
 export async function getRessources(): Promise<Ressources[]> {
  try {
    const colRef = collection(db, "ressources");
@@ -36,7 +35,7 @@ export async function getRessources(): Promise<Ressources[]> {
    return [];
  }
 }
-///////////////////////////////////CHANTIER/////////////////////////////////
+
 export async function getChantiers(): Promise<Chantier[]> {
  const snap = await getDocs(collection(db, "chantier"));
  const chantiers: Chantier[] = [];
@@ -73,7 +72,16 @@ export async function getChantiers(): Promise<Chantier[]> {
  return chantiers;
 }

-//CHANGE CHANTIER STATUS
+function convertReservation(res: any): Reservation {
+  return {
+    id: res.id,
+    dateChantier:
+      res.dateChantier instanceof Timestamp ? res.dateChantier.toDate() : new Date(res.dateChantier),
+    dateFin:
+      res.dateFin instanceof Timestamp ? res.dateFin.toDate() : new Date(res.dateFin),
+  };
+}
+
 export async function changeChantierStatus(chantierId: string, newStatus: string): Promise<void> {
  try {
    const chantierRef = doc(db, "chantier", chantierId);
@@ -84,7 +92,6 @@ export async function changeChantierStatus(chantierId: string, newStatus: string
  }
 }

-//ADD CHANTIER
 export async function addChantier(chantierData: Omit<Chantier, 'id'>): Promise<string | null> {
  try {
    const colRef = collection(db, "chantier");
@@ -96,56 +103,3 @@ export async function addChantier(chantierData: Omit<Chantier, 'id'>): Promise<s
    return null;
  }
 }
-
-//CHANGE CHANTIER ANOMALIE STATUS
-export async function changeAnomalieStatus(chantierId: string, anomalie_String: string, newStatus: string): Promise<void> {
-  try {
-    const chantierRef = doc(db, "chantier", chantierId);
-    const chantierSnap = await getDoc(chantierRef);
-    if (chantierSnap.exists()) {
-      const chantierData = chantierSnap.data();
-      const anomalies = chantierData.anomalies || [];
-      const updatedAnomalies = anomalies.map((anomalie: any) => {
-        if (anomalie.description === anomalie_String) {
-          return { ...anomalie, status: newStatus };
-        }
-        return anomalie;
-      });
-      await updateDoc(chantierRef, { anomalies: updatedAnomalies });
-      console.log(`Anomalie status updated to ${newStatus}`);
-    } else {
-      console.error("Chantier not found");
-    }
-  } catch (err) {
-    console.error("Error", err);
-  }
-}
-
-//CHANGE CHANTIER ANOMALIE STATUS
-export async function deleteAnomalie(chantierId: string, anomalie_String: string): Promise<void> {
-  try {
-    const chantierRef = doc(db, "chantier", chantierId);
-    const chantierSnap = await getDoc(chantierRef);
-    if (chantierSnap.exists()) {
-      const chantierData = chantierSnap.data();
-      const anomalies = chantierData.anomalies || [];
-      const updatedAnomalies = anomalies.filter((anomalie: any) => anomalie.description !== anomalie_String);
-      await updateDoc(chantierRef, { anomalies: updatedAnomalies });
-      console.log(`Anomalie deleted`);
-    } else {
-      console.error("Chantier not found");
-    }
-  } catch (err) {
-    console.error("Error", err);
-  }
-}
-
-function convertReservation(res: any): Reservation {
-  return {
-    id: res.id,
-    dateChantier:
-      res.dateChantier instanceof Timestamp ? res.dateChantier.toDate() : new Date(res.dateChantier),
-    dateFin:
-      res.dateFin instanceof Timestamp ? res.dateFin.toDate() : new Date(res.dateFin),
-  };
-}
Author	SHA1	Message	Date
Alexis Leboeuf	82fce55403	Merging	2025-12-13 15:17:53 +01:00
Alexis Leboeuf	92b1729728	Role management not working I can't make it use the correct context If someone wants to try it, use this branch	2025-12-13 15:17:38 +01:00