Skip to content

Commit 1da3b88

Browse files
Add react router dom and navlinks
1 parent affe386 commit 1da3b88

File tree

9 files changed

+347
-222
lines changed

9 files changed

+347
-222
lines changed

package-lock.json

Lines changed: 89 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"classnames": "^2.2.6",
1717
"react": "^16.13.1",
1818
"react-dom": "^16.13.1",
19+
"react-router-dom": "^5.1.2",
1920
"react-scripts": "3.4.1",
2021
"react-simple-maps": "^2.0.0",
2122
"react-tooltip": "^4.2.5",

src/App.css

Lines changed: 19 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,21 @@
1-
.App {
2-
text-align: center;
3-
}
1+
.root {
2+
display: flex;
3+
}
44

5-
.App-logo {
6-
height: 40vmin;
7-
pointer-events: none;
8-
}
5+
.navBar {
6+
flex: 0 0 10%;
7+
min-height: 100vh;
8+
background-color: #1A1053;
9+
color: rgba(255, 255, 255, .9);
10+
/* color: (props)=> props.isDarkMode ? "rgba(255,255,255,.87)": "rgba(255,255,255,.9)", */
11+
text-transform: capitalize;
12+
display: flex;
13+
justify-content: center;
14+
}
915

10-
@media (prefers-reduced-motion: no-preference) {
11-
.App-logo {
12-
animation: App-logo-spin infinite 20s linear;
13-
}
14-
}
15-
16-
.App-header {
17-
background-color: #282c34;
18-
min-height: 100vh;
19-
display: flex;
20-
flex-direction: column;
21-
align-items: center;
22-
justify-content: center;
23-
font-size: calc(10px + 2vmin);
24-
color: white;
25-
}
26-
27-
.App-link {
28-
color: #61dafb;
29-
}
30-
31-
@keyframes App-logo-spin {
32-
from {
33-
transform: rotate(0deg);
34-
}
35-
36-
to {
37-
transform: rotate(360deg);
38-
}
39-
}
16+
.mainContent {
17+
flex: 1;
18+
padding: 4rem;
19+
position: relative;
20+
overflow: hidden;
21+
}

src/App.js

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import React, { Component } from "react";
22
import CovidApp from "./components/CovidApp";
33
import Paper from "./components/Paper";
44
import "./App.css";
5+
import Navbar from "./components/Navbar";
6+
import { Switch, Route } from "react-router-dom";
57

68
class App extends Component {
79
constructor(props) {
@@ -17,12 +19,44 @@ class App extends Component {
1719
}
1820

1921
render() {
22+
const { isDarkMode } = this.state;
2023
return (
2124
<Paper isDarkMode={this.state.isDarkMode}>
22-
<CovidApp
23-
setDarkMode={this.setDarkMode}
24-
isDarkMode={this.state.isDarkMode}
25-
/>
25+
<div className="root">
26+
<div className="navBar">
27+
<Navbar isDarkMode={isDarkMode} />
28+
</div>
29+
<div className="mainContent">
30+
<Switch>
31+
<Route
32+
exact
33+
path="/"
34+
render={() => (
35+
<CovidApp
36+
setDarkMode={this.setDarkMode}
37+
isDarkMode={this.state.isDarkMode}
38+
/>
39+
)}
40+
/>
41+
<Route exact path="/symptoms" render={() => <h1>Help Page</h1>} />
42+
<Route
43+
exact
44+
path="/stay-safe"
45+
render={() => <h1>Stay Safe</h1>}
46+
/>
47+
<Route exact path="/help" render={() => <h1>Help Page</h1>} />
48+
<Route
49+
path="/"
50+
render={() => (
51+
<CovidApp
52+
setDarkMode={this.setDarkMode}
53+
isDarkMode={this.state.isDarkMode}
54+
/>
55+
)}
56+
/>
57+
</Switch>
58+
</div>
59+
</div>
2660
</Paper>
2761
);
2862
}

0 commit comments

Comments
 (0)