ysimard/application-amicale
1
0
Fork 0
forked from vergnet/application-amicale
Code Issues Pull requests Releases Wiki Activity

Improved login screen

Browse source
This commit is contained in:
Arnaud Vergnet 2020-04-05 21:29:33 +02:00
parent 04793d057e
commit 8026f8b223
3 changed files with 32 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
screens/Amicale/LoginScreen.js
View file

@ -2,7 +2,7 @@
import * as React from 'react';
import {Keyboard, KeyboardAvoidingView, ScrollView, StyleSheet, TouchableWithoutFeedback, View} from "react-native";
import {Avatar, Button, Card, HelperText, Text, TextInput, withTheme} from 'react-native-paper';
import {Avatar, Button, Card, HelperText, Paragraph, TextInput, withTheme} from 'react-native-paper';
import ConnectionManager, {ERROR_TYPE} from "../../managers/ConnectionManager";
import {openBrowser} from "../../utils/WebBrowser";
import i18n from 'i18n-js';
@ -236,6 +236,13 @@ class LoginScreen extends React.Component<Props, State> {
<Card.Content>
{this.getFormInput()}
<Card.Actions>
<Button
icon="help-circle"
mode="contained"
onPress={this.onResetPasswordClick}
style={{marginLeft: 'auto'}}>
{i18n.t("loginScreen.resetPassword")}
</Button>
<Button
icon="send"
mode="contained"
@ -254,18 +261,19 @@ class LoginScreen extends React.Component<Props, State> {
getSecondaryCard() {
return (
<Card style={styles.card}>
<Card.Title
title={i18n.t("loginScreen.whyAccountTitle")}
subtitle={i18n.t("loginScreen.whyAccountSub")}
left={(props) => <Avatar.Icon
{...props}
icon={"help"}
color={this.colors.primary}
style={{backgroundColor: 'transparent'}}/>}
/>
<Card.Content>
<Text>{i18n.t("loginScreen.forgotPassword")}</Text>
<View style={styles.btnContainer}>
<Button
icon="reload"
mode="contained"
onPress={this.onResetPasswordClick}
style={{marginLeft: 'auto'}}>
{i18n.t("loginScreen.resetPassword")}
</Button>
</View>
<Text>{i18n.t("loginScreen.noAccount")}</Text>
<Paragraph>{i18n.t("loginScreen.whyAccountParagraph")}</Paragraph>
<Paragraph>{i18n.t("loginScreen.whyAccountParagraph2")}</Paragraph>
<Paragraph>{i18n.t("loginScreen.noAccount")}</Paragraph>
</Card.Content>
</Card>
);

7
translations/en.json
View file

@ -231,8 +231,11 @@
"password": "Password",
"passwordError": "Please enter a password",
"login": "Login",
"forgotPassword": "Forgot your password? Click on the button below to get a new one.",
"resetPassword": "Reset Password",
"resetPassword": "Forgot Password",
"whyAccountTitle": "Why have an account?",
"whyAccountSub": "What can you do wth an account",
"whyAccountParagraph": "An Amicale account allows you to take part in several activities around campus. You can join a club, or even create your own!",
"whyAccountParagraph2": "Logging into your Amicale account on the app will allow you to see all available clubs on the campus, vote for the upcoming elections, and more to come!",
"noAccount": "No Account? Go to the Amicale's building during open hours to create one.",
"errors": {
"title": "Error!",

9
translations/fr.json
View file

@ -230,9 +230,12 @@
"emailError": "Merci d'entrer un email valide",
"password": "Mot de passe",
"passwordError": "Merci d'entrer un mot de passe",
"login": "Se Connecter",
"forgotPassword": "Mot de passe oublié ? Cliquez sur le bouton ci-dessous pour en créer un nouveau.",
"resetPassword": "Réinitialiser mot de passe",
"login": "Connexion",
"resetPassword": "Mdp oublié",
"whyAccountTitle": "Pourquoi avoir un compte?",
"whyAccountSub": "Ce que vous pouvez faire avec un compte",
"whyAccountParagraph": "Un compte Amicale vous donne la possibilité de participer à diverses activités sur le campus. Vous pouvez rejoindre des clubs ou même créer le votre !",
"whyAccountParagraph2": "Vous connecter à votre compte Amicale sur l'appli vous permettra de voir tous les clubs en activité, de voter pour les prochaines élections, et plus à venir !",
"noAccount": "Pas de compte ? Passez à l'Amicale pendant une perm pour en créer un.",
"errors": {
"title": "Erreur !",