vuminh224/mmm-projet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: vuminh224:main
Branches Tags
vuminh224:main vuminh224:reservation-test vuminh224:userrole vuminh224:temp
...
pull from: vuminh224:temp
Branches Tags
vuminh224:main vuminh224:reservation-test vuminh224:userrole vuminh224:temp

2 Commits
main ... temp

Author SHA1 Message Date
Alexis Leboeuf
ad91270c9e Merge 2025-12-11 23:42:08 +01:00
Alexis Leboeuf
ee3f5012f7 Almost finished Roles bugfix 2025-12-11 23:41:23 +01:00
2 changed files with 20 additions and 19 deletions
Expand all files Collapse all files

1
app/(tabs)/home.tsx
View File

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

38
app/_layout.tsx
View File

@@ -16,7 +16,7 @@ import { Platform, UIManager } from 'react-native';
import { ChantierProvider } from "./ContextChantier"; import { ChantierProvider } from "./ContextChantier";
import { UserProvider } from "./ContextUser"; import { UserProvider } from "./ContextUser";
import { RessourcesProvider } from "./ContextRessource"; import { RessourcesProvider } from "./ContextRessource";
import { useUser } from "./ContextUser";
export const unstable_settings = { export const unstable_settings = {
anchor: "(tabs)", anchor: "(tabs)",
@@ -25,14 +25,12 @@ 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 { setUser, setRole } = useUser();
const [userRole, setUserRole] = useState<string | null>(null);
useEffect(() => { useEffect(() => {
const unsubscribe = onAuthStateChanged(auth, async (currentUser) => { const unsubscribe = onAuthStateChanged(auth, async (currentUser) => {
if (!currentUser) { if (!currentUser) {
setUser(null); setUser(null);
setUserRole(null); setRole(null);
router.replace("/login/login"); router.replace("/login/login");
return; return;
} }
@@ -43,13 +41,14 @@ export default function RootLayout() {
if (!userDoc.exists()) { if (!userDoc.exists()) {
router.replace("/login/login"); router.replace("/login/login");
setUser(null); setUser(null);
setUserRole(null); setRole(null);
return; return;
} }
const { role } = userDoc.data(); const { role } = userDoc.data();
console.log("ROLE APP",role)
setUser(currentUser); setUser(currentUser);
setUserRole(role); setRole(role);
router.replace("/(tabs)/home"); router.replace("/(tabs)/home");
}); });
return unsubscribe; return unsubscribe;
@@ -59,18 +58,19 @@ export default function RootLayout() {
<UserProvider> <UserProvider>
<ChantierProvider> <ChantierProvider>
<RessourcesProvider> <RessourcesProvider>
<ThemeProvider value={colorScheme === "dark" ? DarkTheme : DefaultTheme}> <RootLayout></RootLayout>
<Stack> <ThemeProvider value={colorScheme === "dark" ? DarkTheme : DefaultTheme}>
<Stack.Screen name="(tabs)" options={{ headerShown: false }} /> <Stack>
<Stack.Screen name="selectChantier" options={{ headerShown: false }}/> <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
<Stack.Screen <Stack.Screen name="selectChantier" options={{ headerShown: false }}/>
name="modal" <Stack.Screen
options={{ presentation: "modal", title: "Modal" }} name="modal"
/> options={{ presentation: "modal", title: "Modal" }}
<Stack.Screen name="login" options={{ headerShown: false }} /> />
</Stack> <Stack.Screen name="login" options={{ headerShown: false }} />
<StatusBar style="auto" /> </Stack>
</ThemeProvider> <StatusBar style="auto" />
</ThemeProvider>
</RessourcesProvider> </RessourcesProvider>
</ChantierProvider> </ChantierProvider>
</UserProvider> </UserProvider>