Merge branch 'Persistance' of https://codefirst.iut.uca.fr/git/BOB_PARTEAM/BOB_PARTY into Persistance

bob_party/App.tsx

@@ -6,7 +6,6 @@ import ManagerUser from './src/services/userServices/ManagerUser'
 import FakeSaverUser from './src/services/userServices/fakeSaverUser'
 import React, { useCallback } from 'react';
 import { useUserStore } from './userContext';
-import MainTabNavigator from './src/navigation/AppNavigator';
 
 
 
@@ -47,7 +46,9 @@ export const MANAGER_USER = new ManagerUser(new LoaderUserApi, new FakeSaverUser
     }, []);
 
     return (
-      <MainTabNavigator/>
+      <Provider store={store}>
+        <MainTabNavigator/>
+      </Provider>
     );
   }
   

bob_party/src/screens/Settings.tsx

@@ -12,6 +12,7 @@ import RNPickerSelect from "react-native-picker-select";
 import { PickerGreySmall } from '../components/PickerGreySmall';
 import { MANAGER_USER } from '../../App';
 import { useUserStore } from '../../userContext';
+import DialogInput from 'react-native-dialog-input';
 
 function Settings(props: { navigation: any; }) {
     const { navigation } = props
@@ -55,7 +56,8 @@ function Settings(props: { navigation: any; }) {
             <View>
               <View>
                 <Text style={styles.text}>Pseudo: {MANAGER_USER.getCurrentUser().getUsername()}</Text>
-                <ButtonGreySmall onPress={() => setDialogPseudoVisible(true)} title='Changer le pseudo'/>
+                <ButtonGreySmall onPress={() => {console.log(dialogPseudoVisible);
+                ;setDialogPseudoVisible(true)}} title='Changer le pseudo'/>
               </View>
               <View>
                 <Text style={styles.text}>Mot de passe: {MANAGER_USER.getCurrentUser().getPassword()}</Text>
@@ -92,31 +94,6 @@ function Settings(props: { navigation: any; }) {
           
       </DialogInput>
 
-      <Dialog.Container visible={dialogNationalityVisible}>
-        <Dialog.Title>Changer de nationalité</Dialog.Title>
-        <View style={styles.RNPView}>
-          <RNPickerSelect
-            placeholder={{label:"Cliquez pour changer", value: null}}
-            onValueChange={(value:string) => setSelectedNationality(value)}
-            items={tabNat}
-          />
-        </View>  
-        <Dialog.Button label="Cancel" onPress={() => setDialogNationalityVisible(false)} />
-        <Dialog.Button label="Valider" onPress={() => { setDialogNationalityVisible(false)}} />
-      </Dialog.Container>
-
-      <Dialog.Container visible={dialogSexVisible}>
-        <Dialog.Title>Changer de sexe</Dialog.Title>
-        <View style={styles.RNPView}>
-          <RNPickerSelect
-            placeholder={{label:"Cliquez pour changer", value: null}}
-            onValueChange={(value:string) => setSelectedSex(value)}
-            items={tabSex}
-          />
-        </View>  
-        <Dialog.Button label="Cancel" onPress={() => setDialogSexVisible(false)} />
-        <Dialog.Button label="Valider" onPress={() => { setDialogSexVisible(false)}} />
-      </Dialog.Container>
 
     </View>
   );

bob_party/src/screens/SignIn.tsx

@@ -20,8 +20,8 @@ function SignIn(props: { navigation: any; }) {
     const setUser = useUserStore((state) => state.setUser);
 
     const errorList = useSelector((state: RootState) => state.credentialErrors.loginErrorList);
+
     
-    {/*
     const [pseudo, setPseudo] = useState('');
     const [password, setPassword] = useState('');
     const dispatch=useDispatch();
@@ -30,7 +30,7 @@ function SignIn(props: { navigation: any; }) {
             Alert.alert("Pseudo ou Mot de passe incorrect");
             dispatch(updateIncorrectCredentials(true));
     }
-*/}
+
 
 
     const handleUserConnect = useCallback(async (pseudo: string, password: string) => {
@@ -48,20 +48,17 @@ function SignIn(props: { navigation: any; }) {
 
       }, []);
     
-    function dispatch(arg0: { payload: boolean; type: string; }): void {
-        throw new Error('Function not implemented.');
-    }
 
     return (
     <View style={stylesScreen.container}>
         <View style={stylesScreen.bodyCenter}>
-            {/*
+            
             <TextInput style={styles.textInput} placeholder='Login' onChangeText={(val) => setPseudo(val)} autoCapitalize='none' />
             <TextInput style={styles.textInput} placeholder='Password' onChangeText={(val) => setPassword(val)} autoCapitalize='none' secureTextEntry={true}/>
             <Pressable style={styles.button} onPress={() => handleUserConnect(pseudo, password)}>
                 <Text style={styles.text}>Se connecter</Text>
             </Pressable>
-    */}
+    
             <Pressable onPress={() => navigation.navigate('SignUp')}>
                 <Text style={styles.textLink}>Pas de compte? Inscrivez vous !</Text>
             </Pressable>