From c0f43aa9092b74d78ff289c89f3d8ce3eddc3be2 Mon Sep 17 00:00:00 2001
From: vianhazman <vianhazman@gmail.com>
Date: Fri, 13 Dec 2019 16:22:23 +0700
Subject: [PATCH] hehe
---
src/components/Header/index.js | 40 +---------------------------------
1 file changed, 1 insertion(+), 39 deletions(-)
diff --git a/src/components/Header/index.js b/src/components/Header/index.js
index fc19cf7..b3eef72 100644
--- a/src/components/Header/index.js
+++ b/src/components/Header/index.js
@@ -1,25 +1,3 @@
-<<<<<<< HEAD
-import React from "react";
-import { fade, makeStyles } from "@material-ui/core/styles";
-import AppBar from "@material-ui/core/AppBar";
-import Toolbar from "@material-ui/core/Toolbar";
-import IconButton from "@material-ui/core/IconButton";
-import Typography from "@material-ui/core/Typography";
-import InputBase from "@material-ui/core/InputBase";
-import Badge from "@material-ui/core/Badge";
-import MenuItem from "@material-ui/core/MenuItem";
-import Menu from "@material-ui/core/Menu";
-import SearchIcon from "@material-ui/icons/Search";
-import AccountCircle from "@material-ui/icons/AccountCircle";
-import MailIcon from "@material-ui/icons/Mail";
-import NotificationsIcon from "@material-ui/icons/Notifications";
-import MoreIcon from "@material-ui/icons/MoreVert";
-import Img from "./Img";
-import LogoCSUI from "./logo_csui.svg";
-import IconLogout from "./exit.svg";
-import IconAdmin from "./admin.svg";
-import {getRole} from "../../services";
-=======
import React from 'react';
import { makeStyles } from '@material-ui/core/styles';
import AppBar from '@material-ui/core/AppBar';
@@ -36,7 +14,7 @@ import Img from './Img';
import LogoCSUI from './logo_csui.svg';
import IconLogout from './exit.svg';
import IconAdmin from './admin.svg';
->>>>>>> 3be68fe9d10be31d170c0894c1af7c2794caea7b
+import {getRole} from '../../services'
const handleLogout = ()
const useStyles = makeStyles(theme => ({
@@ -110,12 +88,6 @@ const useStyles = makeStyles(theme => ({
}
},
sectionMobile: {
-<<<<<<< HEAD
- display: "flex",
- [theme.breakpoints.up("md")]: {
- display: "none"
- }
-=======
display: 'flex',
[theme.breakpoints.up('md')]: {
display: 'none',
@@ -126,7 +98,6 @@ const useStyles = makeStyles(theme => ({
display: 'flex',
alignItems: 'center',
color: 'inherit'
->>>>>>> 3be68fe9d10be31d170c0894c1af7c2794caea7b
}
}));
@@ -155,16 +126,12 @@ export default function PrimarySearchAppBar() {
setMobileMoreAnchorEl(event.currentTarget);
};
-<<<<<<< HEAD
- const menuId = "primary-search-account-menu";
-=======
const handleLogout = () => {
console.log("logout",localStorage);
localStorage.removeItem("auth");
};
const menuId = 'primary-search-account-menu';
->>>>>>> 3be68fe9d10be31d170c0894c1af7c2794caea7b
const renderMenu = (
<Menu
anchorEl={anchorEl}
@@ -235,12 +202,7 @@ export default function PrimarySearchAppBar() {
<a href="/management">
<img src={IconAdmin} height="25px" alt="Icon Admin" className={classes.iconTopNavbar} />
</a>
-<<<<<<< HEAD
-}
- <a href="/auth/logout">
-=======
<a href="/auth/logout" onClick={handleLogout}>
->>>>>>> 3be68fe9d10be31d170c0894c1af7c2794caea7b
<img src={IconLogout} height="25px" alt="Icon Logout" />
</a>
</div>
--
GitLab