Skip to content

Commit

Permalink
Translations and Settings
Browse files Browse the repository at this point in the history
  • Loading branch information
@AndreaIannoli
AndreaIannoli committed Nov 11, 2023
1 parent 4a13833 commit 549407a
Show file tree
Hide file tree
Showing 26 changed files with 837 additions and 2,879 deletions.
Binary file modified .DS_Store
View file
Binary file not shown.
Binary file modified app/.DS_Store
View file
Binary file not shown.
Binary file modified app/JAM/.DS_Store
View file
Binary file not shown.
1 change: 1 addition & 0 deletions app/JAM/.idea/vcs.xml
100755 → 100644
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 5 additions & 11 deletions app/JAM/.idea/workspace.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

168 changes: 85 additions & 83 deletions app/JAM/activities/Authentication.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {Ionicons} from "@expo/vector-icons";
import {signIn, signUp} from "../services/AuthService";
import {FIREBASE_AUTH, FIREBASE_DB} from "../config/FirebaseConfig";
import ImagePickerBox from "../components/ImagePickerBox";
import {useTranslation} from "react-i18next";

function Authentication({navigation}){
const windowHeight = useWindowDimensions().height;
Expand All @@ -39,6 +40,7 @@ function Authentication({navigation}){
error: ''
});
const auth = FIREBASE_AUTH;
const { t } = useTranslation();
const toggleShowPassword = () => {
setShowPassword(!showPassword);
};
Expand Down Expand Up @@ -119,101 +121,101 @@ function Authentication({navigation}){
<View style={styles.container}>
<View style={styles.authContainer}>
<Image source={horizontalLogo1} style={styles.logo} resizeMode="contain"/>
{selectedIndex === 0 ?
<View style={styles.form}>
<TextInput
editable
inputMode="email"
autoComplete="email"
placeholder="Email"
cursorColor={Colors.primary}
placeholderTextColor={Colors.grey}
style={[styles.textInput, {marginTop: 20}]}
onChangeText={(text) => setLoginCredentials({ ...loginCredentials, email: text })}
/>
<View style={styles.passContainer}>
{selectedIndex === 0 ?
<View style={styles.form}>
<TextInput
editable
inputMode="email"
autoComplete="email"
placeholder={t('emailPlaceHolder')}
cursorColor={Colors.primary}
placeholderTextColor={Colors.grey}
style={[styles.textInput, {marginTop: 20}]}
onChangeText={(text) => setLoginCredentials({ ...loginCredentials, email: text })}
/>
<View style={styles.passContainer}>
<TextInput
editable
secureTextEntry={!showPassword}
onChangeText={(text) => {setPassword(text); setLoginCredentials({ ...loginCredentials, password: text })}}
value={password}
inputMode="text"
autoComplete="password"
placeholder={t('passwordPlaceHolder')}
cursorColor={Colors.primary}
placeholderTextColor={Colors.grey}
style={[styles.textInput, {paddingHorizontal: 0}]}

/>
<Ionicons
name={showPassword ? 'eye-off' : 'eye'}
size={24}
color={Colors.primary}
style={styles.icon}
onPress={toggleShowPassword}
/>
</View>
<PrimaryButton title="Login" onPress={() => {signIn(auth, loginCredentials, setLoginCredentials, navigation)}}/>
{loginCredentials.error ? <Text style={styles.error}>{loginCredentials.error}</Text> : null}
<Pressable hitSlop={3} style={{marginTop: 10}}>
<Text style={styles.forgotPassText}>{t('passwordForgotLink')}</Text>
</Pressable>
</View>
:
<View style={styles.form}>
<ImagePickerBox image={image} setImage={setImage}/>
<TextInput
editable
inputMode="email"
autoComplete="email"
placeholder={t('emailPlaceHolder')}
cursorColor={Colors.primary}
placeholderTextColor={Colors.grey}
style={[styles.textInput, {marginTop: 20}]}
onChangeText={(text) => setRegistrationCredentials({ ...registrationCredentials, email: text })}
/>
<TextInput
editable
secureTextEntry={!showPassword}
onChangeText={(text) => {setPassword(text); setLoginCredentials({ ...loginCredentials, password: text })}}
value={password}
inputMode="text"
autoComplete="username"
placeholder={t('namePlaceHolder')}
cursorColor={Colors.primary}
placeholderTextColor={Colors.grey}
style={[styles.textInput, {marginTop: 20}]}
onChangeText={(text) => setRegistrationCredentials({ ...registrationCredentials, displayName: text })}
/>
<TextInput
editable
secureTextEntry={true}
inputMode="text"
autoComplete="password"
placeholder="Password"
placeholder={t('passwordPlaceHolder')}
cursorColor={Colors.primary}
placeholderTextColor={Colors.grey}
style={[styles.textInput, {paddingHorizontal: 0}]}

style={[styles.textInput, {marginTop: 20}]}
onChangeText={(text) => setRegistrationCredentials({ ...registrationCredentials, password: text })}
/>
<Ionicons
name={showPassword ? 'eye-off' : 'eye'}
size={24}
color={Colors.primary}
style={styles.icon}
onPress={toggleShowPassword}
<TextInput
editable
secureTextEntry={true}
inputMode="text"
autoComplete="password"
placeholder={t('confirmPasswordPlaceHolder')}
cursorColor={Colors.primary}
placeholderTextColor={Colors.grey}
style={[styles.textInput, {marginTop: 20}, {marginBottom: 60}]}
onChangeText={(text) => setRegistrationCredentials({ ...registrationCredentials, confirmPass: text })}
/>
<PrimaryButton title={t('registerBtn')} onPress={() => {
signUp(auth, registrationCredentials, setRegistrationCredentials, image, navigation);
}}/>
{registrationCredentials.error ? <Text style={styles.error}>{registrationCredentials.error}</Text> : null}
</View>
<PrimaryButton title="Login" onPress={() => {signIn(auth, loginCredentials, setLoginCredentials, navigation)}}/>
{loginCredentials.error ? <Text style={styles.error}>{loginCredentials.error}</Text> : null}
<Pressable hitSlop={3} style={{marginTop: 10}}>
<Text style={styles.forgotPassText}>Hai dimenticato la password?</Text>
</Pressable>
</View>
:
<View style={styles.form}>
<ImagePickerBox image={image} setImage={setImage}/>
<TextInput
editable
inputMode="email"
autoComplete="email"
placeholder="Email"
cursorColor={Colors.primary}
placeholderTextColor={Colors.grey}
style={[styles.textInput, {marginTop: 20}]}
onChangeText={(text) => setRegistrationCredentials({ ...registrationCredentials, email: text })}
/>
<TextInput
editable
inputMode="text"
autoComplete="username"
placeholder="Nome"
cursorColor={Colors.primary}
placeholderTextColor={Colors.grey}
style={[styles.textInput, {marginTop: 20}]}
onChangeText={(text) => setRegistrationCredentials({ ...registrationCredentials, displayName: text })}
/>
<TextInput
editable
secureTextEntry={true}
inputMode="text"
autoComplete="password"
placeholder="Password"
cursorColor={Colors.primary}
placeholderTextColor={Colors.grey}
style={[styles.textInput, {marginTop: 20}]}
onChangeText={(text) => setRegistrationCredentials({ ...registrationCredentials, password: text })}
/>
<TextInput
editable
secureTextEntry={true}
inputMode="text"
autoComplete="password"
placeholder="Conferma password"
cursorColor={Colors.primary}
placeholderTextColor={Colors.grey}
style={[styles.textInput, {marginTop: 20}, {marginBottom: 60}]}
onChangeText={(text) => setRegistrationCredentials({ ...registrationCredentials, confirmPass: text })}
/>
<PrimaryButton title="Registrati" onPress={() => {
signUp(auth, registrationCredentials, setRegistrationCredentials, image, navigation);
}}/>
{registrationCredentials.error ? <Text style={styles.error}>{registrationCredentials.error}</Text> : null}
</View>
}
}
</View>
<View style={styles.switchContainer}>
<SegmentedControl
values={['Login', 'Registrati']}
values={[t('segmentControlLogin'), t('segmentControlRegister')]}
selectedIndex={selectedIndex}
onChange={(event) => {
setSelectedIndex(event.nativeEvent.selectedSegmentIndex)
Expand Down
Loading

0 comments on commit 549407a

Please sign in to comment.