diff --git a/bob_party/App.tsx b/bob_party/App.tsx index 586ce08..f1247cb 100644 --- a/bob_party/App.tsx +++ b/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 ( - + + + ); } diff --git a/bob_party/src/screens/Settings.tsx b/bob_party/src/screens/Settings.tsx index 1e61034..173de52 100644 --- a/bob_party/src/screens/Settings.tsx +++ b/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; }) { Pseudo: {MANAGER_USER.getCurrentUser().getUsername()} - setDialogPseudoVisible(true)} title='Changer le pseudo'/> + {console.log(dialogPseudoVisible); + ;setDialogPseudoVisible(true)}} title='Changer le pseudo'/> Mot de passe: {MANAGER_USER.getCurrentUser().getPassword()} @@ -92,31 +94,6 @@ function Settings(props: { navigation: any; }) { - - Changer de nationalité - - setSelectedNationality(value)} - items={tabNat} - /> - - setDialogNationalityVisible(false)} /> - { setDialogNationalityVisible(false)}} /> - - - - Changer de sexe - - setSelectedSex(value)} - items={tabSex} - /> - - setDialogSexVisible(false)} /> - { setDialogSexVisible(false)}} /> - ); diff --git a/bob_party/src/screens/SignIn.tsx b/bob_party/src/screens/SignIn.tsx index 769dee9..2d7b052 100644 --- a/bob_party/src/screens/SignIn.tsx +++ b/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 ( - {/* + setPseudo(val)} autoCapitalize='none' /> setPassword(val)} autoCapitalize='none' secureTextEntry={true}/> handleUserConnect(pseudo, password)}> Se connecter - */} + navigation.navigate('SignUp')}> Pas de compte? Inscrivez vous !