diff --git a/app/_layout.tsx b/app/_layout.tsx index ccb215d..c37c24d 100644 --- a/app/_layout.tsx +++ b/app/_layout.tsx @@ -26,19 +26,11 @@ export default function RootLayout() { const [user, setUser] = useState(null); const [userRole, setUserRole] = useState(null); - - useEffect(() => { - if (Platform.OS === 'android' && UIManager.setLayoutAnimationEnabledExperimental) { - UIManager.setLayoutAnimationEnabledExperimental(true); - } - }, []); - - useEffect(() => { const unsubscribe = onAuthStateChanged(auth, async (currentUser) => { - setUser(currentUser); if (!currentUser) { router.replace("/login/login"); + setUser(null); return; } @@ -47,6 +39,7 @@ export default function RootLayout() { if (!userDoc.exists()) { router.replace("/login/login"); + setUser(null); return; } @@ -56,8 +49,10 @@ export default function RootLayout() { if (role === "chef") { router.replace("/(tabs)"); - } else if (role === "responsable") { - router.replace("/login/login"); + } else if (role === "resp") { + router.replace("/(tabs)"); + } else if (role === "ouvrier") { + router.replace("/(tabs)"); } else { router.replace("/login/login"); } diff --git a/services/ressourcesService.ts b/services/ressourcesService.ts index 21539e6..fdf4c7a 100644 --- a/services/ressourcesService.ts +++ b/services/ressourcesService.ts @@ -42,6 +42,7 @@ export async function getChantiers(): Promise { for (const docSnap of snap.docs) { const data = docSnap.data(); + //Faut convertir les Timestamp en Date ( merci à firebase :) ) const dateDep = data.dateDep instanceof Timestamp ? data.dateDep.toDate() : new Date(data.dateDep); let chef: User | null = null; if (data.chef) {