Skip to content

Commit c425a8e

Browse files
committed
bottom tab and marketplace linked to UI
2 parents ada01e3 + 0507bbd commit c425a8e

File tree

1 file changed

+33
-18
lines changed

1 file changed

+33
-18
lines changed

app/src/components/top/NavBar.tsx

Lines changed: 33 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
import React, { useState } from 'react';
22
import { Link } from 'react-router-dom';
33
import Avatar from '@mui/material/Avatar';
4+
import Button from '@mui/material/Button';
5+
import MoreVertIcon from '@mui/icons-material/MoreVert';
6+
import NavBarButtons from './NavBarButtons';
47
import NavbarDropDown from './NavBarButtons';
8+
import NewExportButton from './NewExportButton';
59
import { RootState } from '../../redux/store';
610
import logo from '../../public/icons/win/logo.png';
7-
import NewExportButton from './NewExportButton';
811
import { useSelector } from 'react-redux';
9-
import Button from '@mui/material/Button';
10-
import MoreVertIcon from '@mui/icons-material/MoreVert';
11-
import NavBarButtons from './NavBarButtons';
1212

1313
const NavBar = () => {
1414
const [dropMenu, setDropMenu] = useState(false);
15-
const isDarkMode = useSelector((state: RootState) => state.darkMode.isDarkMode);
15+
const isDarkMode = useSelector(
16+
(state: RootState) => state.darkMode.isDarkMode
17+
);
1618

1719
const buttonContainerStyle = {
1820
display: 'flex',
1921
alignItems: 'center',
20-
justifyContent: 'flex-start',
22+
justifyContent: 'flex-start'
2123
};
2224

2325
const buttonStyle = {
@@ -28,31 +30,40 @@ const NavBar = () => {
2830
padding: '8px 12px',
2931
cursor: 'pointer',
3032
marginRight: '10px',
31-
marginLeft: '5px',
32-
borderRadius: '4px',
33+
marginLeft: '5px',
34+
borderRadius: '4px'
3335
};
3436

3537
const moreVertButtonStyle = {
3638
backgroundColor: '#333',
3739
border: '1px solid #333',
3840
padding: '0',
3941
cursor: 'pointer',
40-
display: 'flex',
41-
alignItems: 'center',
42-
justifyContent: 'flex-start',
42+
display: 'flex',
43+
alignItems: 'center',
44+
justifyContent: 'flex-start',
4345
borderRadius: '4px',
44-
width: '30px',
46+
width: '30px',
4547
minWidth: '20px',
46-
marginLeft: '0px',
47-
marginRight: '10px',
48+
marginLeft: '0px',
49+
marginRight: '10px'
4850
};
4951

5052
return (
51-
<nav className="main-navbar" style={isDarkMode ? { backgroundColor: '#013365' } : { backgroundColor: 'white' }}>
52-
<Link to="/" style={{textDecoration: 'none'}}>
53+
<nav
54+
className="main-navbar"
55+
style={
56+
isDarkMode
57+
? { backgroundColor: '#013365' }
58+
: { backgroundColor: '#151515' }
59+
}
60+
>
61+
<Link to="/" style={{ textDecoration: 'none' }}>
5362
<div className="main-logo">
5463
<Avatar src={logo}></Avatar>
55-
<h1 style={isDarkMode ? { color: 'white' } : { color: '#013365' }}>ReacType</h1>
64+
<h1 style={isDarkMode ? { color: 'white' } : { color: 'white' }}>
65+
ReacType
66+
</h1>
5667
</div>
5768
</Link>
5869
<div style={buttonContainerStyle}>
@@ -66,7 +77,11 @@ const NavBar = () => {
6677
>
6778
<MoreVertIcon style={{ color: 'white' }} />
6879
</Button>
69-
<NavBarButtons dropMenu={dropMenu} setDropMenu={setDropMenu} style={{ color: 'white' }} />
80+
<NavBarButtons
81+
dropMenu={dropMenu}
82+
setDropMenu={setDropMenu}
83+
style={{ color: 'white' }}
84+
/>
7085
</div>
7186
</nav>
7287
);

0 commit comments

Comments
 (0)