diff --git a/jams-react-client/src/assets/jss/material-dashboard-react/components/headerStyle.js b/jams-react-client/src/assets/jss/material-dashboard-react/components/headerStyle.js index 99a9b366a0002f2528a4c918430281373d573d6d..703ac3ff561edf8719329fb4cebb07fc4431977a 100644 --- a/jams-react-client/src/assets/jss/material-dashboard-react/components/headerStyle.js +++ b/jams-react-client/src/assets/jss/material-dashboard-react/components/headerStyle.js @@ -18,7 +18,7 @@ const headerStyle = () => ({ borderBottom: "0", marginBottom: "0", position: "absolute", - width: "100%", + width: "50%", paddingTop: "10px", zIndex: "1029", color: grayColor[7], diff --git a/jams-react-client/src/assets/jss/material-dashboard-react/layouts/adminStyle.js b/jams-react-client/src/assets/jss/material-dashboard-react/layouts/adminStyle.js index 4f904929e7ea71e5978542d58b0a7c91d2e48617..8864411d2524a5ab67b32f6bddb9d8624d205bc8 100644 --- a/jams-react-client/src/assets/jss/material-dashboard-react/layouts/adminStyle.js +++ b/jams-react-client/src/assets/jss/material-dashboard-react/layouts/adminStyle.js @@ -23,7 +23,7 @@ const appStyle = theme => ({ overflowScrolling: "touch" }, content: { - marginTop: "70px", + marginTop: "0px", padding: "30px 15px", minHeight: "calc(100vh - 123px)" }, diff --git a/jams-react-client/src/components/Navbars/AdminNavbarLinks.js b/jams-react-client/src/components/Navbars/AdminNavbarLinks.js index c6f90f4a2f6e26d62ad356b0281f730f79d899dd..7a15805688673b412730586e117c1acb68910fea 100644 --- a/jams-react-client/src/components/Navbars/AdminNavbarLinks.js +++ b/jams-react-client/src/components/Navbars/AdminNavbarLinks.js @@ -46,10 +46,6 @@ export default function AdminNavbarLinks(props) { setOpenProfile(event.currentTarget); } }; - const handleCloseProfile = () => { - setOpenProfile(null); - auth.logout(() => { history.push("/") }) - }; const handleOtherAction = () => { // Do nothing @@ -214,12 +210,6 @@ export default function AdminNavbarLinks(props) { Settings </MenuItem> <Divider light /> - <MenuItem - onClick={handleCloseProfile} - className={classes.dropdownItem} - > - Logout - </MenuItem> </MenuList> </ClickAwayListener> </Paper> diff --git a/jams-react-client/src/components/Navbars/Navbar.js b/jams-react-client/src/components/Navbars/Navbar.js index 1a0f3e92542d9495f91da65b6c919f99aa102039..5636b79341aaddf1be73f6c2b39a388148e3e7b6 100755 --- a/jams-react-client/src/components/Navbars/Navbar.js +++ b/jams-react-client/src/components/Navbars/Navbar.js @@ -40,12 +40,12 @@ export default function Header(props) { <div className={classes.flex}> {/* Here we create navbar brand, based on route name */} <Button color="transparent" href="#" className={classes.title}> - {makeBrand()} - </Button> + {/* {makeBrand()} */} + </Button> </div> - <Hidden smDown implementation="css"> + {/* <Hidden smDown implementation="css"> {props.rtlActive ? <RTLNavbarLinks /> : <AdminNavbarLinks />} - </Hidden> + </Hidden> */} <Hidden mdUp implementation="css"> <IconButton color="inherit" diff --git a/jams-react-client/src/components/Sidebar/Sidebar.js b/jams-react-client/src/components/Sidebar/Sidebar.js index 7c2490fb627d90260004ac0b552d35c00133f5a5..284f292edc5c1322142b8c4042d8cb54ec2b5b67 100755 --- a/jams-react-client/src/components/Sidebar/Sidebar.js +++ b/jams-react-client/src/components/Sidebar/Sidebar.js @@ -1,5 +1,6 @@ /*eslint-disable*/ import React from "react"; +import { useHistory } from 'react-router-dom' import classNames from "classnames"; import PropTypes from "prop-types"; import { NavLink } from "react-router-dom"; @@ -11,16 +12,26 @@ import List from "@material-ui/core/List"; import ListItem from "@material-ui/core/ListItem"; import ListItemText from "@material-ui/core/ListItemText"; import Icon from "@material-ui/core/Icon"; +import Button from '@material-ui/core/Button'; // core components import AdminNavbarLinks from "components/Navbars/AdminNavbarLinks.js"; import RTLNavbarLinks from "components/Navbars/RTLNavbarLinks.js"; +import ExitToAppIcon from '@material-ui/icons/ExitToApp'; import styles from "assets/jss/material-dashboard-react/components/sidebarStyle.js"; +import auth from "auth"; + const useStyles = makeStyles(styles); export default function Sidebar(props) { const classes = useStyles(); + const history = useHistory(); + + const handleCloseProfile = () => { + auth.logout(() => { history.push("/") }) + }; + // verifies if routeName is the one active (in browser input) function activeRoute(routeName) { return window.location.href.indexOf(routeName) > -1 ? true : false; @@ -78,6 +89,22 @@ export default function Sidebar(props) { </NavLink> ); })} + <ListItem button className={classes.itemLink} onClick={handleCloseProfile}> + <Icon + className={classNames(classes.itemIcon, { + [classes.itemIconRTL]: false + })} + > + <ExitToAppIcon /> + </Icon> + <ListItemText + primary="Logout" + className={classNames(classes.itemText, { + [classes.itemTextRTL]: false + })} + disableTypography={true} + /> + </ListItem> </List> ); var brand = (