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

Almost finished Roles bugfix

Browse Source
This commit is contained in:
Alexis Leboeuf
2025-12-11 23:41:23 +01:00
parent b874fdfabf
commit ee3f5012f7
2 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@ export default function Home() {
const { chantier, setChantier } = useChantier();
const { role } = useUser();
console.log("ROLE USER", role)
return(
<ThemedView lvl={3} style={styles.back}>
@@ -24,11 +25,11 @@ export default function Home() {
<SelectChantier></SelectChantier>
</View>
<Anomaly style={styles.anomaly} data={{chantier}}/>
<View style={{width:"100%", position: 'absolute',marginLeft:"50%"}}>
<SetStatus></SetStatus>
</View>
{role === "chef"}
{role === "chef" && (
<View style={{width:"100%", position: 'absolute',marginLeft:"50%"}}>
<SetStatus></SetStatus>
</View>
)}
</View>
</ThemedView>
)

38
app/_layout.tsx
View File

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