diff --git a/src/components/header/header.jsx b/src/components/header/header.jsx index d532abc24f8f54a5fd54a4c0b43ef3953b4b4cb1..696c62b7b1a2cc2d4255e0967bcd9cf9ddc83675 100644 --- a/src/components/header/header.jsx +++ b/src/components/header/header.jsx @@ -1,4 +1,4 @@ -import React from "react"; +import React, { useEffect } from "react"; import Grid from "@material-ui/core/Grid"; import { useHistory } from "react-router-dom"; import logo from "./header_imgs/imgsimmc-01.png"; @@ -59,7 +59,7 @@ const useStyles = makeStyles((theme) => ({ export default function Header() { const classes = useStyles(); - const [isLoged, setIsLoged] = React.useState(checkLoged()); + const [isLoged, setIsLoged] = React.useState(false); const history = useHistory(); function checkLoged() { @@ -69,6 +69,10 @@ export default function Header() { return false; } + useEffect(() => { + console.log("O TOKEN MUDOU"); + setIsLoged(!isLoged); + }, [window.sessionStorage.getItem("token")]); return ( <Grid> diff --git a/src/components/header/header_components/MenuList.jsx b/src/components/header/header_components/MenuList.jsx index 7f7d54c27ec849f9a9402facf67bfd31b4e9ff34..e6d9fa6db090268a0beec4949c70e0baf7c722df 100644 --- a/src/components/header/header_components/MenuList.jsx +++ b/src/components/header/header_components/MenuList.jsx @@ -12,28 +12,28 @@ import UserImg from "./../header_imgs/user.png"; import { Avatar } from "@material-ui/core"; -const useStyles = makeStyles(theme => ({ +const useStyles = makeStyles((theme) => ({ menuPopUp: { alignContent: "start", ["@media (max-width:346px)"]: { - width: "23%" - } + width: "23%", + }, }, menuPopUpText: { ["@media (max-width:525px)"]: { - fontSize: "13px" - } + fontSize: "13px", + }, }, popUpPaper: { marginRight: "14%", ["@media (max-width:525px)"]: { - marginRight: "0" - } + marginRight: "0", + }, }, menuList: { alignItems: "flex-start", - color: "grey" - } + color: "grey", + }, })); /** @@ -54,9 +54,9 @@ function MenuListComposition(props) { const anchorRef = React.useRef(null); const handleToggle = () => { - setOpen(prevOpen => !prevOpen); + setOpen((prevOpen) => !prevOpen); }; - const handleProfile = event => { + const handleProfile = (event) => { if (window.sessionStorage.getItem("userId")) { let path = `/list/${window.sessionStorage.getItem("userId")}`; history.push(path); @@ -65,14 +65,14 @@ function MenuListComposition(props) { alert("Você não está logado."); }; - const handleLogOut = event => { + const handleLogOut = (event) => { window.sessionStorage.removeItem("token"); window.sessionStorage.removeItem("userId"); props.checkLoged(); let path = `/signin`; history.push(path); }; - const handleClose = event => { + const handleClose = (event) => { if (anchorRef.current && anchorRef.current.contains(event.target)) { return; } @@ -120,7 +120,7 @@ function MenuListComposition(props) { {...TransitionProps} style={{ transformOrigin: - placement === "bottom" ? "center top" : "center bottom" + placement === "bottom" ? "center top" : "center bottom", }} > <Paper className={classes.popUpPaper}> diff --git a/src/pages/ListForms.js b/src/pages/ListForms.js index 0f71c7ab6ee3bf1520d6c3150bd97b1c32d65baa..a845790765d31ace57bd542f52ba42da3f9aa077 100644 --- a/src/pages/ListForms.js +++ b/src/pages/ListForms.js @@ -10,16 +10,16 @@ import { useHistory } from "react-router-dom"; import CardForm from "../components/fieldsListForms/CardForm.jsx"; import Tab from "../components/fieldsListForms/Tab.jsx"; import { Typography } from "@material-ui/core"; -const useStyles = makeStyles(theme => ({ +const useStyles = makeStyles((theme) => ({ body: { - marginBottom: "15%" + marginBottom: "15%", }, Forms: { textAlign: "center", marginBottom: "3%", - fontSize: "20px" - } + fontSize: "20px", + }, })); export default function ListForms() { const classes = useStyles(); @@ -53,12 +53,12 @@ export default function ListForms() { setAuxForms(tmp); } else if (type === 4) { let tmp = [...forms] - .filter(value => { + .filter((value) => { return value.date; }) .sort((a, b) => a.date > b.date) .concat( - [...forms].filter(value => { + [...forms].filter((value) => { return value.date === ""; }) ); @@ -73,7 +73,7 @@ export default function ListForms() { function searching(string) { console.log(string); setAuxForms( - [...forms].filter(value => { + [...forms].filter((value) => { return value.title.toLowerCase().includes(string.toLowerCase()); }) ); @@ -86,12 +86,12 @@ export default function ListForms() { async function fetchData(id) { const res = await api .get(`/user/list/${id}`) - .then(function(res) { + .then(function (res) { setForms(res.data.sort((a, b) => a.id > b.id)); setAuxForms(res.data.sort((a, b) => a.id > b.id)); setisLoaded(true); }) - .catch(error => { + .catch((error) => { if (error.response.status === 401) { window.sessionStorage.removeItem("token"); window.sessionStorage.removeItem("userId"); @@ -114,7 +114,7 @@ export default function ListForms() { <Grid className={classes.Forms}>Seus Formulários:</Grid> <Grid container justify="center" spacing={3} className={classes.body}> {auxForms.length ? ( - auxForms.map(form => ( + auxForms.map((form) => ( <Grid item xl={4} lg={4} md={4} sm={6} xs={12} zeroMinWidth> <CardForm id={form.id}