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

Merge branch 'issue/46-URL' into 'development'

Issue #46:FIX ? in URL solved

See merge request !44
parents a0063345 cfe38df0
No related branches found
No related tags found
3 merge requests!58Version 1.1,!54Issue #53: Fix password info,!44Issue #46:FIX ? in URL solved
...@@ -10,7 +10,7 @@ import FormInput from "../components/fieldsSignUp/FormInput"; ...@@ -10,7 +10,7 @@ import FormInput from "../components/fieldsSignUp/FormInput";
import Paper from "@material-ui/core/Paper"; import Paper from "@material-ui/core/Paper";
import api from "../api"; import api from "../api";
const useStyles = makeStyles((theme) => ({ const useStyles = makeStyles(theme => ({
register: { register: {
maxWidth: "1000px", maxWidth: "1000px",
background: "#ffffff", background: "#ffffff",
...@@ -18,25 +18,25 @@ const useStyles = makeStyles((theme) => ({ ...@@ -18,25 +18,25 @@ const useStyles = makeStyles((theme) => ({
padding: "2% 1%", padding: "2% 1%",
margin: "0 auto", margin: "0 auto",
marginTop: "9%", marginTop: "9%",
width: "95%", width: "95%"
}, },
custom_strong: { custom_strong: {
fontSize: "25px", fontSize: "25px",
textAlign: "center", textAlign: "center",
display: "block", display: "block",
color: "#46525d", color: "#46525d"
}, },
strong_description: { strong_description: {
fontSize: "14px", fontSize: "14px",
color: "#c2c6ca", color: "#c2c6ca"
}, },
form: { form: {
marginTop: "3%", marginTop: "3%",
alignItems: "center", alignItems: "center",
textAlign: "center", textAlign: "center"
}, },
noAcc: { noAcc: {
marginTop: "10px", marginTop: "10px"
}, },
button: { button: {
type: "submit", type: "submit",
...@@ -47,12 +47,12 @@ const useStyles = makeStyles((theme) => ({ ...@@ -47,12 +47,12 @@ const useStyles = makeStyles((theme) => ({
padding: "10px 20px", padding: "10px 20px",
fontSize: "18px", fontSize: "18px",
"&:hover": { "&:hover": {
backgroundColor: "rgb(25, 109, 23)", backgroundColor: "rgb(25, 109, 23)"
}, },
["@media (max-width:550px)"]: { ["@media (max-width:550px)"]: {
width: "55%", width: "55%"
}, }
}, }
})); }));
export default function SignIn() { export default function SignIn() {
const classes = useStyles(); const classes = useStyles();
...@@ -63,13 +63,13 @@ export default function SignIn() { ...@@ -63,13 +63,13 @@ export default function SignIn() {
const [values, setValues] = React.useState({ const [values, setValues] = React.useState({
email: "", email: "",
password: "", password: "",
emailError: false, emailError: false
}); });
async function update(prop, event) { async function update(prop, event) {
await setValues({ ...values, [prop]: event.target.value }); await setValues({ ...values, [prop]: event.target.value });
} }
const handleChange = (prop) => (event) => { const handleChange = prop => event => {
if (!checkEmail()) { if (!checkEmail()) {
values.emailError = true; values.emailError = true;
} else { } else {
...@@ -103,7 +103,7 @@ export default function SignIn() { ...@@ -103,7 +103,7 @@ export default function SignIn() {
const response = await api const response = await api
.post(`/user/signIn`, { .post(`/user/signIn`, {
email: values.email, email: values.email,
hash: values.password, hash: values.password
}) })
.then(function(response) { .then(function(response) {
if (!response.data.error) { if (!response.data.error) {
...@@ -131,19 +131,19 @@ export default function SignIn() { ...@@ -131,19 +131,19 @@ export default function SignIn() {
const theme = createMuiTheme({ const theme = createMuiTheme({
overrides: { overrides: {
root: { root: {
color: "white", color: "white"
}, },
MuiInput: { MuiInput: {
underline: { underline: {
"&:before": { "&:before": {
borderBottom: "1px solid #35c7fc", borderBottom: "1px solid #35c7fc"
}, },
"&:after": { "&:after": {
borderBottom: "1px solid #3f51b5", borderBottom: "1px solid #3f51b5"
}, }
}, }
}, }
}, }
}); });
return isLoged ? ( return isLoged ? (
<Redirect to={`/list/${window.sessionStorage.getItem("userId")}`} /> <Redirect to={`/list/${window.sessionStorage.getItem("userId")}`} />
...@@ -175,7 +175,6 @@ export default function SignIn() { ...@@ -175,7 +175,6 @@ export default function SignIn() {
</Grid> </Grid>
<Grid> <Grid>
<IconButton <IconButton
type="submit"
size="medium" size="medium"
className={classes.button} className={classes.button}
id="whiteTextedButton" id="whiteTextedButton"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment