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

Merge branch 'issue/24' into 'development'

Issue #24:Minor fixes in footer and header

See merge request !27
parents db9bc579 3484d6c7
No related branches found
No related tags found
Loading
......@@ -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%",
......
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
......
......@@ -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.");
......
......@@ -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",
......
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