Skip to content
Snippets Groups Projects
Commit d1007f0b authored by Stephanie Briere Americo's avatar Stephanie Briere Americo
Browse files

Merge branch 'issue/53' into 'development'

Issue #53: Fix password info

See merge request !55
parents 9b5b333f db5ba57c
No related branches found
No related tags found
2 merge requests!58Version 1.1,!55Issue #53: Fix password info
...@@ -110,9 +110,9 @@ export default function SignUp() { ...@@ -110,9 +110,9 @@ export default function SignUp() {
function checkPasswordString() { function checkPasswordString() {
return values.password return values.password
? /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&+_ ():;/?\|"'-])[A-Za-z\d@$!%*?&+_ ():;/?\|"'-]{8,24}$/.test( ? /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&+_ ():;/?\|"'-])[A-Za-z\d@$!%*?&+_ ():;/\|"'-]{8,24}$/.test(
values.password values.password
) )
: true; : true;
} }
...@@ -182,6 +182,7 @@ export default function SignUp() { ...@@ -182,6 +182,7 @@ export default function SignUp() {
handleSubmit(); handleSubmit();
} }
} }
const theme = createMuiTheme({ const theme = createMuiTheme({
overrides: { overrides: {
root: { root: {
...@@ -199,80 +200,83 @@ export default function SignUp() { ...@@ -199,80 +200,83 @@ export default function SignUp() {
}, },
}, },
}); });
let msg =
"Sua senha deve conter entre 8 e 24 caracteres, uma letra maiúscula, uma minúscula, um número e um caractere dentre @$!%*?&+_ ():;/|\"'-";
return isLoged ? ( return isLoged ? (
<Redirect to="/signin" /> <Redirect to="/signin" />
) : ( ) : (
<MuiThemeProvider theme={theme}> <MuiThemeProvider theme={theme}>
<Paper className={classes.register} justify="center"> <Paper className={classes.register} justify="center">
<strong className={classes.custom_strong}> <strong className={classes.custom_strong}>
Cadastro de Usuário Cadastro de Usuário
<p className={classes.strong_description}> <p className={classes.strong_description}>
Insira as informações abaixo Insira as informações abaixo
</p> </p>
</strong> </strong>
<form className={classes.form} autocomplete="off"> <form className={classes.form} autocomplete="off">
<Grid> <Grid>
<FormInput <FormInput
label="Nome Completo" label="Nome Completo"
param="name" param="name"
onUpdate={handleChange} onUpdate={handleChange}
error={!checkName()} error={!checkName()}
/> />
</Grid> </Grid>
<Grid> <Grid>
<FormInput <FormInput
label="E-mail" label="E-mail"
param="email" param="email"
onUpdate={handleChange} onUpdate={handleChange}
error={!checkEmail()} error={!checkEmail()}
/> />
</Grid> </Grid>
<Grid> <Grid>
<FormInput <FormInput
label="Senha" label="Senha"
param="password" param="password"
onUpdate={handleChange} onUpdate={handleChange}
error={!checkPasswordString()} error={!checkPasswordString()}
/> />
{(!checkPasswordString() || !values.password) && ( {(!checkPasswordString() || !values.password) && (
<Grid className={classes.errorGridOpts}> <Grid className={classes.errorGridOpts}>
Sua senha deve conter entre 8 e 24 caracteres, uma letra Sua senha deve conter entre 8 e 24 caracteres, uma letra
maiúscula, uma minúscula e um número maiúscula, uma minúscula, um número e um caractere dentre
@$!%*?+_ ():;/?\|"'-
</Grid> </Grid>
)} )}
</Grid> </Grid>
<Grid> <Grid>
<FormInput <FormInput
label="Confirmar Senha" label="Confirmar Senha"
param="password_confirm" param="password_confirm"
onUpdate={handleChange} onUpdate={handleChange}
error={ error={
values.password_confirm values.password_confirm
? values.password === values.password_confirm ? values.password === values.password_confirm
? false ? false
: true : true
: false : false
} }
/> />
</Grid> </Grid>
<Grid className={classes.alreadyAcc}> <Grid className={classes.alreadyAcc}>
<a href="https://genforms.c3sl.ufpr.br/#/signin"> <a href="https://genforms.c3sl.ufpr.br/#/signin">
é cadastrado? é cadastrado?
</a> </a>
</Grid> </Grid>
<Grid> <Grid>
<IconButton <IconButton
size="medium" size="medium"
className={classes.button} className={classes.button}
id="whiteTextedButton" id="whiteTextedButton"
onClick={() => submit()} onClick={() => submit()}
> >
<KeyboardArrowRightIcon /> <KeyboardArrowRightIcon />
Cadastre-se Cadastre-se
</IconButton> </IconButton>
</Grid> </Grid>
</form> </form>
</Paper> </Paper>
</MuiThemeProvider> </MuiThemeProvider>
); );
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment