Skip to content

Commit ecb0b20

Browse files
committed
Improved Navbar style and fixed port selection on Windows 10
1 parent f5336fe commit ecb0b20

File tree

2 files changed

+22
-12
lines changed

2 files changed

+22
-12
lines changed

client/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"comment": "`proxy` works only on dev mode"
2424
},
2525
"scripts": {
26-
"start": "PORT=8000 react-scripts start",
26+
"start": "set PORT=8000 && react-scripts start",
2727
"build": "react-scripts build",
2828
"test": "react-scripts test",
2929
"eject": "react-scripts eject"

client/src/components/NavBar.jsx

+21-11
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,40 @@
11
import React, { Component } from 'react'
22
import styled from 'styled-components'
33

4+
import Appbar from '@material-ui/core/AppBar'
5+
import Toolbar from '@material-ui/core/Toolbar'
6+
47
import Logo from './Logo'
58
import Links from './Links'
69

7-
const Container = styled.div.attrs({
8-
className: 'container-fluid',
9-
})``
10-
1110
const Nav = styled.nav.attrs({
12-
className: 'navbar navbar-expand-lg navbar-dark bg-dark',
11+
className: 'navbar navbar-expand-lg navbar-dark',
1312
})`
1413
margin-bottom: 20 px;
1514
`
1615

1716
class NavBar extends Component {
1817
render() {
1918
return (
20-
<Container>
19+
<Appbar position = "static" style = {{
20+
backgroundColor: "gray"
21+
}}>
22+
<Toolbar >
23+
<Logo/>
24+
<Nav><Links/></Nav>
25+
26+
</Toolbar>
27+
</Appbar>
28+
)
29+
}
30+
}
31+
32+
export default NavBar
33+
/*
34+
<Container>
2135
<Nav>
2236
<Logo />
2337
<Links />
2438
</Nav>
2539
</Container>
26-
)
27-
}
28-
}
29-
30-
export default NavBar
40+
*/

0 commit comments

Comments
 (0)