aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/components/Header/BrowserHeader.tsx24
-rw-r--r--src/components/Header/Header.tsx5
2 files changed, 20 insertions, 9 deletions
diff --git a/src/components/Header/BrowserHeader.tsx b/src/components/Header/BrowserHeader.tsx
index 2dda717..2acb69c 100644
--- a/src/components/Header/BrowserHeader.tsx
+++ b/src/components/Header/BrowserHeader.tsx
@@ -5,6 +5,7 @@ import SearchBar from './SearchBar';
interface PropTypes {
logo: JSX.Element;
+ menu: JSX.Element;
feed: JSX.Element;
notifications: JSX.Element;
profile: JSX.Element;
@@ -18,7 +19,8 @@ const useStyles = makeStyles({
justifyContent: 'space-around'
},
group: {
- display: 'flex'
+ display: 'flex',
+ alignItems: 'center'
}
});
@@ -27,6 +29,7 @@ const BrowserHeader: React.FC<PropTypes> = React.memo(props => {
const classes = useStyles();
const {
logo,
+ menu,
feed,
notifications,
profile
@@ -34,13 +37,18 @@ const BrowserHeader: React.FC<PropTypes> = React.memo(props => {
return (
<AppBar position="fixed">
- <Toolbar className={classes.root}>
- {logo}
- <SearchBar />
- <div className={classes.group}>
- {feed}
- {notifications}
- {profile}
+ <Toolbar>
+ {menu}
+ <div className={classes.root}>
+ <div className={classes.group}>
+ {logo}
+ </div>
+ <SearchBar />
+ <div className={classes.group}>
+ {feed}
+ {notifications}
+ {profile}
+ </div>
</div>
</Toolbar>
</AppBar>
diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx
index a1ca1b1..93ba47d 100644
--- a/src/components/Header/Header.tsx
+++ b/src/components/Header/Header.tsx
@@ -103,7 +103,10 @@ const Header: React.FC = React.memo(() => {
<Drawer isOpen={isDrawerOpen} setIsOpen={setIsDrawerOpen} />
</>
) : (
- <BrowserHeader logo={logo} profile={profile} notifications={notifications} feed={feed} />
+ <>
+ <BrowserHeader menu={menu} logo={logo} profile={profile} notifications={notifications} feed={feed} />
+ <Drawer isOpen={isDrawerOpen} setIsOpen={setIsDrawerOpen} />
+ </>
);
});