diff --git a/src/components/footer/footer.js b/src/components/footer/footer.js index f538dcad5f03a43d5d5374b24feb33e102d51dca..f4f56ca1b0d501eead5d81c91b45f34c917b5ad3 100644 --- a/src/components/footer/footer.js +++ b/src/components/footer/footer.js @@ -7,8 +7,8 @@ import Logo from "./c3sl.png"; const useStyles = makeStyles(theme => ({ footer: { background: "#66a6c2", - position: "fixed", left: 0, + position: "fixed", bottom: 0, right: 0, width: "100%", diff --git a/src/components/header/header.jsx b/src/components/header/header.jsx index 8a52a8c84e822ae87d57ffcdeb7c4fbe641f62e0..64486a923643060c0804be0bb81cb641a41f5ebd 100644 --- a/src/components/header/header.jsx +++ b/src/components/header/header.jsx @@ -1,5 +1,6 @@ import React from "react"; import Grid from "@material-ui/core/Grid"; +import { useHistory } from "react-router-dom"; import logo from "./header_imgs/imgsimmc-01.png"; import { makeStyles } from "@material-ui/core"; import MenuListComposition from "./header_components/MenuList"; @@ -59,6 +60,7 @@ const useStyles = makeStyles(theme => ({ export default function Header() { const classes = useStyles(); const [isLoged, setIsLoged] = React.useState(checkLoged()); + const history = useHistory(); function checkLoged() { if (window.sessionStorage.getItem("token")) { @@ -107,27 +109,11 @@ export default function Header() { </Grid> </Grid> <Grid container item xs={6} sm={6} md={4} justify="center"> - {isLoged ? ( - <a - href="http://localhost:3000/#/signup" - title="Ir para a página de SignUp" - className={classes.link} - > - <h2 className={classes.form_creator}> - Gerenciador de Formulários - </h2> - </a> - ) : ( - <a - href="http://localhost:3000/#/signin" - title="Ir para a página de SignIn" - className={classes.link} - > - <h2 className={classes.form_creator}> - Gerenciador de Formulários - </h2> - </a> - )} + <a className={classes.link}> + <h2 className={classes.form_creator}> + Gerenciador de Formulários + </h2> + </a> </Grid> <Grid container diff --git a/src/components/header/header_components/MenuList.jsx b/src/components/header/header_components/MenuList.jsx index 21bd7014f6e172f29f16b71a9878ab867ee1f81d..7f7d54c27ec849f9a9402facf67bfd31b4e9ff34 100644 --- a/src/components/header/header_components/MenuList.jsx +++ b/src/components/header/header_components/MenuList.jsx @@ -60,6 +60,7 @@ function MenuListComposition(props) { if (window.sessionStorage.getItem("userId")) { let path = `/list/${window.sessionStorage.getItem("userId")}`; history.push(path); + return; } alert("Você não está logado."); diff --git a/src/pages/SignUp.js b/src/pages/SignUp.js index 97472a802c5cad74ce30ab64f5f2b94e4c631da2..1a894a0880234669f88c75ac08f52ca7835f9777 100644 --- a/src/pages/SignUp.js +++ b/src/pages/SignUp.js @@ -15,8 +15,8 @@ const useStyles = makeStyles(theme => ({ background: "#ffffff", borderRadius: "2px", padding: "2% 1%", + marginTop: "3%", margin: "0 auto", - marginTop: "9%", width: "95%" }, custom_strong: { @@ -30,7 +30,6 @@ const useStyles = makeStyles(theme => ({ color: "#c2c6ca" }, form: { - marginTop: "3%", alignItems: "center", textAlign: "center" }, @@ -38,6 +37,7 @@ const useStyles = makeStyles(theme => ({ type: "submit", width: "30%", marginTop: "4%", + marginBottom: "10%", background: "#6ec46c", borderRadius: "2px", padding: "10px 20px",