2 Commits

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
4 changed files with 54 additions and 28 deletions

View File

@@ -14,6 +14,7 @@ export default function Home() {
const { chantier, setChantier } = useChantier(); const { chantier, setChantier } = useChantier();
const { role } = useUser(); const { role } = useUser();
console.log("User", role);
return( return(
<ThemedView lvl={3} style={styles.back}> <ThemedView lvl={3} style={styles.back}>

View File

@@ -14,7 +14,9 @@ import { auth, db } from "../firebase_config";
import { Platform, UIManager } from 'react-native'; import { Platform, UIManager } from 'react-native';
import { ChantierProvider } from "./ContextChantier"; import { ChantierProvider } from "./ContextChantier";
import { UserProvider } from "./ContextUser"; import { useUser } from "./ContextUser";
import { RessourcesProvider } from "./ContextRessource";
import LoginScreen from "./login/login";
export const unstable_settings = { export const unstable_settings = {
@@ -24,52 +26,63 @@ export const unstable_settings = {
export default function RootLayout() { export default function RootLayout() {
const colorScheme = useColorScheme(); const colorScheme = useColorScheme();
const router = useRouter(); const router = useRouter();
const [user, setUser] = useState<User | null>(null); const [loading, setLoading] = useState(true);
const [userRole, setUserRole] = useState<string | null>(null); const { setUser, setRole, user } = useUser();
useEffect(() => { useEffect(() => {
const unsubscribe = onAuthStateChanged(auth, async (currentUser) => { const unsubscribe = onAuthStateChanged(auth, async (currentUser) => {
if (!currentUser) { if (!currentUser) {
console.log("No user logged in");
setUser(null); setUser(null);
setUserRole(null); setRole(null);
router.replace("/login/login"); setLoading(false);
return; return;
} }
setUser(currentUser);
const userDocRef = doc(db, "user", currentUser.uid); const userDocRef = doc(db, "user", currentUser.uid);
const userDoc = await getDoc(userDocRef); const userDoc = await getDoc(userDocRef);
console.log("User doc data:", userDoc.data());
if (!userDoc.exists()) { if (!userDoc.exists()) {
router.replace("/login/login");
setUser(null); setUser(null);
setUserRole(null); setLoading(false);
return; return;
} }
setRole(userDoc.data().role);
const { role } = userDoc.data();
setUser(currentUser); setUser(currentUser);
setUserRole(role); setLoading(false);
router.replace("/(tabs)/home");
}); });
return unsubscribe; return unsubscribe;
}, []); }, []);
if (loading) {
return null; // ou un SplashScreen
}
return ( return (
<UserProvider>
<ChantierProvider> <ChantierProvider>
<ThemeProvider value={colorScheme === "dark" ? DarkTheme : DefaultTheme}> <RessourcesProvider>
<Stack> <ThemeProvider value={colorScheme === "dark" ? DarkTheme : DefaultTheme}>
<Stack.Screen name="(tabs)" options={{ headerShown: false }} />
<Stack.Screen name="selectChantier" options={{ headerShown: false }}/> {user ? (
<Stack.Screen <Stack>
name="modal" <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
options={{ presentation: "modal", title: "Modal" }} <Stack.Screen name="selectChantier" options={{ headerShown: false }} />
/> <Stack.Screen
<Stack.Screen name="login" options={{ headerShown: false }} /> name="modal"
</Stack> options={{ presentation: "modal", title: "Modal" }}
<StatusBar style="auto" /> />
</ThemeProvider> </Stack>
) : (
<LoginScreen />
)}
<StatusBar style="auto" />
</ThemeProvider>
</RessourcesProvider>
</ChantierProvider> </ChantierProvider>
</UserProvider>
); );
} }

10
app/layout.tsx Normal file
View File

@@ -0,0 +1,10 @@
import { Slot } from "expo-router";
import { UserProvider } from "./ContextUser";
export default function Layout() {
return (
<UserProvider>
<Slot />
</UserProvider>
);
}

View File

@@ -8,12 +8,14 @@ import {
import React, { useState } from "react"; import React, { useState } from "react";
import { Button, StyleSheet, View } from "react-native"; import { Button, StyleSheet, View } from "react-native";
import { auth } from "../../firebase_config"; import { auth } from "../../firebase_config";
import { useUser } from "../ContextUser";
const DEFAULT_ROLE = "resp"; const DEFAULT_ROLE = "resp";
const LoginScreen: React.FC = () => { const LoginScreen: React.FC = () => {
const [email, setEmail] = useState<string>(""); const [email, setEmail] = useState<string>("");
const [password, setPassword] = useState<string>(""); const [password, setPassword] = useState<string>("");
const { setUser, setRole } = useUser();
const handleLogin = async () => { const handleLogin = async () => {
try { try {