diff --git a/frontend/src/components/Base/MainContainer/MainContainer.style.jsx b/frontend/src/components/Base/MainContainer/MainContainer.style.jsx index a288e71..ac76b22 100644 --- a/frontend/src/components/Base/MainContainer/MainContainer.style.jsx +++ b/frontend/src/components/Base/MainContainer/MainContainer.style.jsx @@ -1,4 +1,5 @@ import styled from "styled-components"; +import { color } from "../../../style/varibles"; const MainContainerStyled = styled.main` padding-left: 97px; @@ -21,6 +22,9 @@ const ContentContainerStyled = styled.div` height: 100vh; overflow: hidden; margin-top: 16px; + border-radius: 5px; + background-color: ${color.complement.azulOscuro}; + padding: 6px; `; export default MainContainerStyled; diff --git a/frontend/src/components/PageTitle/PageTitle.jsx b/frontend/src/components/PageTitle/PageTitle.jsx index 364db61..9ead028 100644 --- a/frontend/src/components/PageTitle/PageTitle.jsx +++ b/frontend/src/components/PageTitle/PageTitle.jsx @@ -9,14 +9,11 @@ import logo from "../../assets/images/Logo.png"; const PageTitle = () => { const path = useLocation(); - const [title,setTitle] = React.useState() + const [title, setTitle] = React.useState(); const [modal, setModal] = React.useState(false); const { user } = React.useContext(AuthContext); - - console.log(path.pathname); - - React.useEffect(()=>{ + React.useEffect(() => { switch (path.pathname) { case "/tickets": setTitle("Tickets"); @@ -51,7 +48,7 @@ const PageTitle = () => { default: setTitle("Dashboard"); } - },[path]) + }, [path]); const handleModal = () => { setModal(!modal); diff --git a/frontend/src/components/PageTitle/UserBtn/UserBtn.jsx b/frontend/src/components/PageTitle/UserBtn/UserBtn.jsx index 299a22e..6bc2e14 100644 --- a/frontend/src/components/PageTitle/UserBtn/UserBtn.jsx +++ b/frontend/src/components/PageTitle/UserBtn/UserBtn.jsx @@ -34,7 +34,7 @@ const UserBtn = ({ user, img, modal, modalSet }) => { } onClick={handleModal} /> - + Deseja Sair do sistema? diff --git a/frontend/src/layout/index.js b/frontend/src/layout/index.js index dcc26ee..2dd0ea9 100644 --- a/frontend/src/layout/index.js +++ b/frontend/src/layout/index.js @@ -7,8 +7,7 @@ import { i18n } from "../translate/i18n"; import MenuComponent from "../components/Menu/MenuComponent"; const LoggedInLayout = ({ children }) => { - const { handleLogout, loading, isAuth } = React.useContext(AuthContext); - + const { loading, user } = React.useContext(AuthContext); if (loading) { return ;