Skip to content
Snippets Groups Projects
Commit bd074895 authored by Gabriel Silva Hermida's avatar Gabriel Silva Hermida
Browse files

Issue #33: Header updates properly

parent 6ec1a8a6
No related branches found
No related tags found
1 merge request!41Issue #33: Header updates properly
import React from "react"; import React, { useEffect } from "react";
import Grid from "@material-ui/core/Grid"; import Grid from "@material-ui/core/Grid";
import { useHistory } from "react-router-dom"; import { useHistory } from "react-router-dom";
import logo from "./header_imgs/imgsimmc-01.png"; import logo from "./header_imgs/imgsimmc-01.png";
...@@ -59,7 +59,7 @@ const useStyles = makeStyles((theme) => ({ ...@@ -59,7 +59,7 @@ const useStyles = makeStyles((theme) => ({
export default function Header() { export default function Header() {
const classes = useStyles(); const classes = useStyles();
const [isLoged, setIsLoged] = React.useState(checkLoged()); const [isLoged, setIsLoged] = React.useState(false);
const history = useHistory(); const history = useHistory();
function checkLoged() { function checkLoged() {
...@@ -69,6 +69,10 @@ export default function Header() { ...@@ -69,6 +69,10 @@ export default function Header() {
return false; return false;
} }
useEffect(() => {
console.log("O TOKEN MUDOU");
setIsLoged(!isLoged);
}, [window.sessionStorage.getItem("token")]);
return ( return (
<Grid> <Grid>
......
...@@ -12,28 +12,28 @@ import UserImg from "./../header_imgs/user.png"; ...@@ -12,28 +12,28 @@ import UserImg from "./../header_imgs/user.png";
import { Avatar } from "@material-ui/core"; import { Avatar } from "@material-ui/core";
const useStyles = makeStyles(theme => ({ const useStyles = makeStyles((theme) => ({
menuPopUp: { menuPopUp: {
alignContent: "start", alignContent: "start",
["@media (max-width:346px)"]: { ["@media (max-width:346px)"]: {
width: "23%" width: "23%",
} },
}, },
menuPopUpText: { menuPopUpText: {
["@media (max-width:525px)"]: { ["@media (max-width:525px)"]: {
fontSize: "13px" fontSize: "13px",
} },
}, },
popUpPaper: { popUpPaper: {
marginRight: "14%", marginRight: "14%",
["@media (max-width:525px)"]: { ["@media (max-width:525px)"]: {
marginRight: "0" marginRight: "0",
} },
}, },
menuList: { menuList: {
alignItems: "flex-start", alignItems: "flex-start",
color: "grey" color: "grey",
} },
})); }));
/** /**
...@@ -54,9 +54,9 @@ function MenuListComposition(props) { ...@@ -54,9 +54,9 @@ function MenuListComposition(props) {
const anchorRef = React.useRef(null); const anchorRef = React.useRef(null);
const handleToggle = () => { const handleToggle = () => {
setOpen(prevOpen => !prevOpen); setOpen((prevOpen) => !prevOpen);
}; };
const handleProfile = event => { const handleProfile = (event) => {
if (window.sessionStorage.getItem("userId")) { if (window.sessionStorage.getItem("userId")) {
let path = `/list/${window.sessionStorage.getItem("userId")}`; let path = `/list/${window.sessionStorage.getItem("userId")}`;
history.push(path); history.push(path);
...@@ -65,14 +65,14 @@ function MenuListComposition(props) { ...@@ -65,14 +65,14 @@ function MenuListComposition(props) {
alert("Você não está logado."); alert("Você não está logado.");
}; };
const handleLogOut = event => { const handleLogOut = (event) => {
window.sessionStorage.removeItem("token"); window.sessionStorage.removeItem("token");
window.sessionStorage.removeItem("userId"); window.sessionStorage.removeItem("userId");
props.checkLoged(); props.checkLoged();
let path = `/signin`; let path = `/signin`;
history.push(path); history.push(path);
}; };
const handleClose = event => { const handleClose = (event) => {
if (anchorRef.current && anchorRef.current.contains(event.target)) { if (anchorRef.current && anchorRef.current.contains(event.target)) {
return; return;
} }
...@@ -120,7 +120,7 @@ function MenuListComposition(props) { ...@@ -120,7 +120,7 @@ function MenuListComposition(props) {
{...TransitionProps} {...TransitionProps}
style={{ style={{
transformOrigin: transformOrigin:
placement === "bottom" ? "center top" : "center bottom" placement === "bottom" ? "center top" : "center bottom",
}} }}
> >
<Paper className={classes.popUpPaper}> <Paper className={classes.popUpPaper}>
......
...@@ -10,16 +10,16 @@ import { useHistory } from "react-router-dom"; ...@@ -10,16 +10,16 @@ import { useHistory } from "react-router-dom";
import CardForm from "../components/fieldsListForms/CardForm.jsx"; import CardForm from "../components/fieldsListForms/CardForm.jsx";
import Tab from "../components/fieldsListForms/Tab.jsx"; import Tab from "../components/fieldsListForms/Tab.jsx";
import { Typography } from "@material-ui/core"; import { Typography } from "@material-ui/core";
const useStyles = makeStyles(theme => ({ const useStyles = makeStyles((theme) => ({
body: { body: {
marginBottom: "15%" marginBottom: "15%",
}, },
Forms: { Forms: {
textAlign: "center", textAlign: "center",
marginBottom: "3%", marginBottom: "3%",
fontSize: "20px" fontSize: "20px",
} },
})); }));
export default function ListForms() { export default function ListForms() {
const classes = useStyles(); const classes = useStyles();
...@@ -53,12 +53,12 @@ export default function ListForms() { ...@@ -53,12 +53,12 @@ export default function ListForms() {
setAuxForms(tmp); setAuxForms(tmp);
} else if (type === 4) { } else if (type === 4) {
let tmp = [...forms] let tmp = [...forms]
.filter(value => { .filter((value) => {
return value.date; return value.date;
}) })
.sort((a, b) => a.date > b.date) .sort((a, b) => a.date > b.date)
.concat( .concat(
[...forms].filter(value => { [...forms].filter((value) => {
return value.date === ""; return value.date === "";
}) })
); );
...@@ -73,7 +73,7 @@ export default function ListForms() { ...@@ -73,7 +73,7 @@ export default function ListForms() {
function searching(string) { function searching(string) {
console.log(string); console.log(string);
setAuxForms( setAuxForms(
[...forms].filter(value => { [...forms].filter((value) => {
return value.title.toLowerCase().includes(string.toLowerCase()); return value.title.toLowerCase().includes(string.toLowerCase());
}) })
); );
...@@ -91,7 +91,7 @@ export default function ListForms() { ...@@ -91,7 +91,7 @@ export default function ListForms() {
setAuxForms(res.data.sort((a, b) => a.id > b.id)); setAuxForms(res.data.sort((a, b) => a.id > b.id));
setisLoaded(true); setisLoaded(true);
}) })
.catch(error => { .catch((error) => {
if (error.response.status === 401) { if (error.response.status === 401) {
window.sessionStorage.removeItem("token"); window.sessionStorage.removeItem("token");
window.sessionStorage.removeItem("userId"); window.sessionStorage.removeItem("userId");
...@@ -114,7 +114,7 @@ export default function ListForms() { ...@@ -114,7 +114,7 @@ export default function ListForms() {
<Grid className={classes.Forms}>Seus Formulários:</Grid> <Grid className={classes.Forms}>Seus Formulários:</Grid>
<Grid container justify="center" spacing={3} className={classes.body}> <Grid container justify="center" spacing={3} className={classes.body}>
{auxForms.length ? ( {auxForms.length ? (
auxForms.map(form => ( auxForms.map((form) => (
<Grid item xl={4} lg={4} md={4} sm={6} xs={12} zeroMinWidth> <Grid item xl={4} lg={4} md={4} sm={6} xs={12} zeroMinWidth>
<CardForm <CardForm
id={form.id} id={form.id}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment