auth with handler

This commit is contained in:
tuanvu
2025-12-14 01:58:02 +01:00
parent 1f698076df
commit 0de6462c31
3 changed files with 65 additions and 50 deletions

View File

@@ -1,33 +1,27 @@
import { createBottomTabNavigator } from '@react-navigation/bottom-tabs'; import { Tabs } from 'expo-router';
import { } from 'expo-router';
import React from 'react'; import React from 'react';
import { HapticTab } from '@/components/expoExempleComponents/haptic-tab'; import { HapticTab } from '@/components/expoExempleComponents/haptic-tab';
import { IconSymbol } from '@/components/ui/icon-symbol'; import { IconSymbol } from '@/components/ui/icon-symbol';
import { Colors } from '@/constants/theme'; import { Colors } from '@/constants/theme';
import { useColorScheme } from '@/hooks/use-color-scheme'; import { useColorScheme } from '@/hooks/use-color-scheme';
import GestionOuvrier from './gestion_ouvrier';
import ListMateriel from './gestionnaire_ressource';
import Home from './home';
import MapScreen from './mapScreen';
import AntDesign from '@expo/vector-icons/AntDesign'; import AntDesign from '@expo/vector-icons/AntDesign';
import AddScreen from './addScreen'; import { useUser } from '../ContextUser';
import { useAuthHandler } from '../AuthHandler';
const Tabs = createBottomTabNavigator();
export default function TabLayout() { export default function TabLayout() {
const colorScheme = useColorScheme(); const colorScheme = useColorScheme();
const { role } = useUser();
// Handle auth in tabs layout
useAuthHandler();
return ( return (
<Tabs.Navigator <Tabs screenOptions={{tabBarActiveTintColor: Colors[colorScheme ?? 'light'].tint, headerShown: false, tabBarButton: HapticTab}}>
initialRouteName='explore' <Tabs.Screen name="index" options={{ href: null}}/>
screenOptions={{ <Tabs.Screen name="explore" options={{ href: null }}/>
tabBarActiveTintColor: Colors[colorScheme ?? 'light'].tint, <Tabs.Screen name="templateSreen" options={{ href: null}}/>
headerShown: false,
tabBarButton: HapticTab,
}}>
<Tabs.Screen <Tabs.Screen
name="home" name="home"
component={Home}
options={{ options={{
title: 'Home', title: 'Home',
tabBarIcon: ({ color }) => ( tabBarIcon: ({ color }) => (
@@ -37,7 +31,6 @@ export default function TabLayout() {
/> />
<Tabs.Screen <Tabs.Screen
name="gestionnaire_ressource" name="gestionnaire_ressource"
component={ListMateriel}
options={{ options={{
title: 'Ressources', title: 'Ressources',
tabBarIcon: ({ color }) => ( tabBarIcon: ({ color }) => (
@@ -46,34 +39,29 @@ export default function TabLayout() {
}} }}
/> />
<Tabs.Screen <Tabs.Screen
name="GestionOuvrier" name="gestion_ouvrier"
component={GestionOuvrier}
options={{ options={{
title: 'Ouvriers', title: 'Ouvriers',
tabBarIcon: ({ color }) => <IconSymbol size={28} name="person.fill" color={color} />, tabBarIcon: ({ color }) => <IconSymbol size={28} name="person.fill" color={color} />,
}} }}
/> />
<Tabs.Screen <Tabs.Screen
name="explore" name="mapScreen"
component={MapScreen}
options={{ options={{
title: 'MapScreen', title: 'Map',
tabBarIcon: ({ color }) => <IconSymbol size={28} name="paperplane.fill" color={color} />, tabBarIcon: ({ color }) => <IconSymbol size={28} name="paperplane.fill" color={color} />,
}} }}
> />
</Tabs.Screen>
<Tabs.Screen <Tabs.Screen
name="Ajouter" name="addScreen"
component={AddScreen}
options={{ options={{
title: 'Ajouter', title: 'Ajouter',
href: role === 'chef' ? '/(tabs)/addScreen' : null,
tabBarIcon: ({ color }) => ( tabBarIcon: ({ color }) => (
<AntDesign name="plus" size={24} color={color} /> <AntDesign name="plus" size={24} color={color} />
), ),
}} }}
/> />
</Tabs>
</Tabs.Navigator>
); );
} }

45
app/AuthHandler.tsx Normal file
View File

@@ -0,0 +1,45 @@
import { useRouter, useSegments } from "expo-router";
import { onAuthStateChanged } from "firebase/auth";
import { doc, getDoc } from "firebase/firestore";
import { useEffect } from "react";
import { auth, db } from "../firebase_config";
import { useUser } from "./ContextUser";
export function useAuthHandler() {
const router = useRouter();
const segments = useSegments();
const { setUser, setRole } = useUser();
useEffect(() => {
const unsubscribe = onAuthStateChanged(auth, async (currentUser) => {
if (!currentUser) {
setUser(null);
setRole(null);
router.replace("/login/login");
return;
}
const userDocRef = doc(db, "user", currentUser.uid);
const userDoc = await getDoc(userDocRef);
if (!userDoc.exists()) {
setUser(null);
setRole(null);
router.replace("/login/login");
return;
}
const { role } = userDoc.data();
setUser(currentUser);
setRole(role);
// Only redirect if we're on login page
const inAuthGroup = segments[0] === 'login';
if (inAuthGroup) {
router.replace("/(tabs)/home");
}
});
return unsubscribe;
}, []);
}

View File

@@ -1,16 +1,11 @@
import { ThemedText } from "@/components/theme/themed-text"; import { ThemedText } from "@/components/theme/themed-text";
import { ThemedTextInput } from "@/components/theme/themed-textinput"; import { ThemedTextInput } from "@/components/theme/themed-textinput";
import { ThemedView } from "@/components/theme/themed-view"; import { ThemedView } from "@/components/theme/themed-view";
import { router } from "expo-router"; import { signInWithEmailAndPassword } from "firebase/auth";
import {
signInWithEmailAndPassword
} from "firebase/auth";
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";
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>("");
@@ -18,21 +13,11 @@ const LoginScreen: React.FC = () => {
const handleLogin = async () => { const handleLogin = async () => {
try { try {
await signInWithEmailAndPassword(auth, email, password); await signInWithEmailAndPassword(auth, email, password);
router.replace("/(tabs)");
} catch (error: any) { } catch (error: any) {
alert(error.message); alert(error.message);
} }
}; };
/*const handleRegister = async () => {
try {
await createUserWithEmailAndPassword(auth, email, password);
router.replace("/(tabs)");
} catch (error: any) {
alert(error.message);
}
}; */
return ( return (
<ThemedView lvl={1} style={styles.container}> <ThemedView lvl={1} style={styles.container}>
<ThemedText style={styles.title}>Se connecter</ThemedText> <ThemedText style={styles.title}>Se connecter</ThemedText>
@@ -45,7 +30,6 @@ const LoginScreen: React.FC = () => {
value={email} value={email}
onChangeText={setEmail} onChangeText={setEmail}
autoCapitalize="none" autoCapitalize="none"
/> />
<ThemedTextInput <ThemedTextInput
lvl = {2} lvl = {2}
@@ -59,7 +43,6 @@ const LoginScreen: React.FC = () => {
/> />
<Button title="Se connecter" onPress={handleLogin} /> <Button title="Se connecter" onPress={handleLogin} />
<View style={{ height: 10 }} /> <View style={{ height: 10 }} />
{/* <Button title="S'inscrire" onPress={handleRegister} /> */}
</ThemedView> </ThemedView>
); );
}; };
@@ -76,7 +59,6 @@ const styles = StyleSheet.create({
}, },
input: { input: {
borderWidth: 1, borderWidth: 1,
//borderColor: "#ccc",
borderRadius: 8, borderRadius: 8,
padding: 10, padding: 10,
marginBottom: 10, marginBottom: 10,