From a1dc9550c700034c4a3119732e90438803329ca0 Mon Sep 17 00:00:00 2001
From: Richard Heise <rfhf19@inf.ufpr.br>
Date: Fri, 11 Dec 2020 11:50:28 -0300
Subject: [PATCH] Issue #54: Fix changes to be like prod
---
src/pages/SignIn.js | 80 ++++++++++++------------
src/pages/SignUp.js | 146 ++++++++++++++++++++++----------------------
src/routes.js | 10 +--
3 files changed, 118 insertions(+), 118 deletions(-)
diff --git a/src/pages/SignIn.js b/src/pages/SignIn.js
index f7d5a76..8ec8c83 100644
--- a/src/pages/SignIn.js
+++ b/src/pages/SignIn.js
@@ -1,5 +1,5 @@
import React from "react";
-import { useHistory } from "react-router-dom";
+import { useHistory, Link } from "react-router-dom";
import { Redirect } from "react-router-dom";
import Grid from "@material-ui/core/Grid";
import { createMuiTheme, MuiThemeProvider } from "@material-ui/core";
@@ -105,7 +105,7 @@ export default function SignIn() {
email: values.email,
hash: values.password
})
- .then(function(response) {
+ .then(function (response) {
if (!response.data.error) {
window.sessionStorage.setItem("token", response.data.token);
window.sessionStorage.setItem("userId", response.data.id);
@@ -113,7 +113,7 @@ export default function SignIn() {
history.push(path);
}
})
- .catch(function(error) {
+ .catch(function (error) {
if (error.response) {
alert(
"Falha de autenticação. Certifique-se que email e senha estão corretos."
@@ -148,44 +148,44 @@ export default function SignIn() {
return isLoged ? (
<Redirect to={`/list/${window.sessionStorage.getItem("userId")}`} />
) : (
- <MuiThemeProvider theme={theme}>
- <Paper className={classes.register} justify="center">
- <strong className={classes.custom_strong}>
- Login de Usuário
+ <MuiThemeProvider theme={theme}>
+ <Paper className={classes.register} justify="center">
+ <strong className={classes.custom_strong}>
+ Login de Usuário
<p className={classes.strong_description}>
- Insira as informações abaixo
+ Insira as informações abaixo
</p>
- </strong>
- <form className={classes.form} autocomplete="off">
- <Grid>
- <FormInput
- label="E-mail"
- param="email"
- onUpdate={handleChange}
- error={!checkEmail()}
- />
- </Grid>
- <Grid>
- <FormInput label="Senha" param="password" onUpdate={handleChange} />
- </Grid>
- <Grid className={classes.noAcc}>
- <a href="https://genforms.c3sl.ufpr.br/#/signup">
- Não é cadastrado?
- </a>
- </Grid>
- <Grid>
- <IconButton
- size="medium"
- className={classes.button}
- id="whiteTextedButton"
- onClick={() => submit()}
- >
- <KeyboardArrowRightIcon />
- Conecte-se
+ </strong>
+ <form className={classes.form} autocomplete="off">
+ <Grid>
+ <FormInput
+ label="E-mail"
+ param="email"
+ onUpdate={handleChange}
+ error={!checkEmail()}
+ />
+ </Grid>
+ <Grid>
+ <FormInput label="Senha" param="password" onUpdate={handleChange} />
+ </Grid>
+ <Grid className={classes.noAcc}>
+ <Link to="/signup">
+ Não é cadastrado?
+ </Link>
+ </Grid>
+ <Grid>
+ <IconButton
+ size="medium"
+ className={classes.button}
+ id="whiteTextedButton"
+ onClick={() => submit()}
+ >
+ <KeyboardArrowRightIcon />
+ Conecte-se
</IconButton>
- </Grid>
- </form>
- </Paper>
- </MuiThemeProvider>
- );
+ </Grid>
+ </form>
+ </Paper>
+ </MuiThemeProvider>
+ );
}
diff --git a/src/pages/SignUp.js b/src/pages/SignUp.js
index ab39dee..8372c2e 100644
--- a/src/pages/SignUp.js
+++ b/src/pages/SignUp.js
@@ -1,6 +1,6 @@
import React, { useEffect } from "react";
import Grid from "@material-ui/core/Grid";
-import { Redirect } from "react-router-dom";
+import { Redirect, Link } from "react-router-dom";
import { createMuiTheme, MuiThemeProvider } from "@material-ui/core";
import IconButton from "@material-ui/core/IconButton";
import { useHistory } from "react-router-dom";
@@ -111,8 +111,8 @@ export default function SignUp() {
function checkPasswordString() {
return values.password
? /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&+_ ():;/?\|"'-])[A-Za-z\d@$!%*?&+_ ():;/\|"'-]{8,24}$/.test(
- values.password
- )
+ values.password
+ )
: true;
}
@@ -205,78 +205,78 @@ export default function SignUp() {
return isLoged ? (
<Redirect to="/signin" />
) : (
- <MuiThemeProvider theme={theme}>
- <Paper className={classes.register} justify="center">
- <strong className={classes.custom_strong}>
- Cadastro de Usuário
+ <MuiThemeProvider theme={theme}>
+ <Paper className={classes.register} justify="center">
+ <strong className={classes.custom_strong}>
+ Cadastro de Usuário
<p className={classes.strong_description}>
- Insira as informações abaixo
+ Insira as informações abaixo
</p>
- </strong>
- <form className={classes.form} autocomplete="off">
- <Grid>
- <FormInput
- label="Nome Completo"
- param="name"
- onUpdate={handleChange}
- error={!checkName()}
- />
- </Grid>
- <Grid>
- <FormInput
- label="E-mail"
- param="email"
- onUpdate={handleChange}
- error={!checkEmail()}
- />
- </Grid>
- <Grid>
- <FormInput
- label="Senha"
- param="password"
- onUpdate={handleChange}
- error={!checkPasswordString()}
- />
- {(!checkPasswordString() || !values.password) && (
- <Grid className={classes.errorGridOpts}>
- Sua senha deve conter entre 8 e 24 caracteres, uma letra
- maiúscula, uma minúscula, um número e um caractere dentre
- @$!%*?+_ ():;/?\|"'-
+ </strong>
+ <form className={classes.form} autocomplete="off">
+ <Grid>
+ <FormInput
+ label="Nome Completo"
+ param="name"
+ onUpdate={handleChange}
+ error={!checkName()}
+ />
+ </Grid>
+ <Grid>
+ <FormInput
+ label="E-mail"
+ param="email"
+ onUpdate={handleChange}
+ error={!checkEmail()}
+ />
+ </Grid>
+ <Grid>
+ <FormInput
+ label="Senha"
+ param="password"
+ onUpdate={handleChange}
+ error={!checkPasswordString()}
+ />
+ {(!checkPasswordString() || !values.password) && (
+ <Grid className={classes.errorGridOpts}>
+ Sua senha deve conter entre 8 e 24 caracteres, uma letra
+ maiúscula, uma minúscula, um número e um caractere dentre
+ @$!%*?+_ ():;/?\|"'-
</Grid>
- )}
- </Grid>
- <Grid>
- <FormInput
- label="Confirmar Senha"
- param="password_confirm"
- onUpdate={handleChange}
- error={
- values.password_confirm
- ? values.password === values.password_confirm
- ? false
- : true
- : false
- }
- />
- </Grid>
- <Grid className={classes.alreadyAcc}>
- <a href="https://genforms.c3sl.ufpr.br/#/signin">
- Já é cadastrado?
- </a>
- </Grid>
- <Grid>
- <IconButton
- size="medium"
- className={classes.button}
- id="whiteTextedButton"
- onClick={() => submit()}
- >
- <KeyboardArrowRightIcon />
- Cadastre-se
+ )}
+ </Grid>
+ <Grid>
+ <FormInput
+ label="Confirmar Senha"
+ param="password_confirm"
+ onUpdate={handleChange}
+ error={
+ values.password_confirm
+ ? values.password === values.password_confirm
+ ? false
+ : true
+ : false
+ }
+ />
+ </Grid>
+ <Grid className={classes.alreadyAcc}>
+ <Link to="/signin">
+ Já é cadastrado?
+ </Link>
+ </Grid>
+ <Grid>
+ <IconButton
+ size="medium"
+ className={classes.button}
+ id="whiteTextedButton"
+ onClick={() => submit()}
+ >
+ <KeyboardArrowRightIcon />
+ Cadastre-se
</IconButton>
- </Grid>
- </form>
- </Paper>
- </MuiThemeProvider>
- );
+ </Grid>
+ </form>
+ </Paper>
+ </MuiThemeProvider>
+ );
}
diff --git a/src/routes.js b/src/routes.js
index 5e8ac2b..bfc5bc0 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -10,7 +10,7 @@ import EditForm from "./pages/EditForm";
import GetForm from "./pages/GetForm";
import VisualizeForm from "./pages/VisualizeForm";
import Acknowledgement from "./pages/Acknowledgement";
-import { BrowserRouter, Route, Switch, Redirect } from "react-router-dom";
+import { HashRouter, Route, Switch, Redirect } from "react-router-dom";
const PrivateRoute = ({ component: Component, ...rest }) => {
let usr = true;
@@ -24,15 +24,15 @@ const PrivateRoute = ({ component: Component, ...rest }) => {
usr && window.sessionStorage.getItem("token") !== null ? (
<Component {...props} />
) : (
- <Redirect to={{ pathname: "/" }} />
- )
+ <Redirect to={{ pathname: "/" }} />
+ )
}
/>
);
};
const Routes = () => (
- <BrowserRouter>
+ <HashRouter>
<Header />
<Switch>
<Route exact path="/">
@@ -53,7 +53,7 @@ const Routes = () => (
<Route exact path="/post/:again" component={() => <Acknowledgement />} />
</Switch>
<Footer />
- </BrowserRouter>
+ </HashRouter>
);
export default Routes;
--
GitLab