Skip to content

Commit ae40a6c

Browse files
Moved styles to files and refactor code
1 parent 158d2b3 commit ae40a6c

15 files changed

+327
-323
lines changed

src/components/Charts.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import {
88
Tooltip,
99
Legend,
1010
} from "recharts";
11-
import colors from "../colors";
12-
import "./Charts.css";
11+
import colors from "../constants/colors";
12+
import "../styles/Charts.css";
1313

1414
export default class Charts extends Component {
1515
render() {

src/components/CovidApp.js

Lines changed: 4 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -2,105 +2,13 @@ import React, { Component } from "react";
22
import Overview from "./Overview";
33
import Navbar from "./Navbar";
44
import { withStyles } from "@material-ui/styles";
5-
import colors from "../colors";
6-
import "./CodeApp.css";
5+
import colors from "../constants/colors";
6+
import "../styles/DarkModeButton.css";
77
import Charts from "./Charts";
88
import Map from "./Map/Map";
9-
import DisplayTable from "./Table/DisplayTable";
9+
import DisplayTable from "./DisplayTable";
1010
import TinyCharts from "./TinyCharts";
11-
12-
const styles = {
13-
root: {
14-
display: "flex",
15-
},
16-
navBar: {
17-
flex: "0 0 10%",
18-
backgroundColor: colors.darkPurple,
19-
color: (props) =>
20-
props.isDarkMode ? "rgba(255,255,255,.87)" : "rgba(255,255,255,.9)",
21-
textTransform: "capitalize",
22-
display: "flex",
23-
justifyContent: "center",
24-
},
25-
mainContent: {
26-
flex: 1,
27-
padding: "4rem",
28-
position: "relative",
29-
overflow: "hidden",
30-
},
31-
header: {
32-
display: "flex",
33-
alignItems: "center",
34-
},
35-
heading: {
36-
fontWeight: "500",
37-
color: (props) =>
38-
props.isDarkMode ? "rgb(245, 245, 245)" : colors.darkPurple,
39-
display: "inline-block",
40-
"& span": {
41-
fontWeight: "900",
42-
color: colors.purple,
43-
marginRight: "1rem",
44-
},
45-
},
46-
content: {
47-
backgroundColor: (props) => (props.isDarkMode ? colors.darkPurple : "#fff"),
48-
borderRadius: "2rem",
49-
marginTop: "3rem",
50-
display: "flex",
51-
padding: "4rem",
52-
flexDirection: "column",
53-
justifyContent: "center",
54-
},
55-
contentArea: {
56-
display: "flex",
57-
},
58-
mapArea: {
59-
flex: "1",
60-
},
61-
chartArea: {
62-
minWidth: "50%",
63-
display: "flex",
64-
justifyContent: "center",
65-
},
66-
tableContainer: {
67-
padding: "2rem",
68-
margin: "5rem 0",
69-
},
70-
71-
tableHeading: {
72-
textAlign: "center",
73-
margin: "4rem 0",
74-
fontSize: "3rem",
75-
// textTransform: "uppercase",
76-
},
77-
78-
tinyChartArea: {
79-
display: "flex",
80-
flexWrap: "wrap",
81-
padding: "2rem",
82-
// flexDirection: "column",
83-
justifyContent: "space-around",
84-
alignItems: "center",
85-
marginTop: "3rem",
86-
},
87-
tinyChart: {
88-
margin: "2rem",
89-
// padding: "2rem",
90-
"& h3": {
91-
textTransform: "capitalize",
92-
fontWeight: 500,
93-
94-
textAlign: "center",
95-
},
96-
},
97-
tinych: {
98-
// backgroundColor: "rgba(129, 124, 155, 0.05)",
99-
borderRadius: "2rem",
100-
marginBottom: "2rem",
101-
padding: "2rem",
102-
},
103-
};
11+
import styles from "../styles/CovidAppStyles";
10412

10513
const stateCodes = {
10614
"Andhra Pradesh": "AP",

src/components/DisplayPanels.js

Lines changed: 1 addition & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,6 @@
11
import React, { Component } from "react";
22
import { withStyles } from "@material-ui/styles";
3-
import colors from "../colors";
4-
5-
const styles = {
6-
panel: {
7-
width: "15%",
8-
display: "flex",
9-
flexDirection: "column",
10-
backgroundColor: (props) => (props.isDarkMode ? colors.darkPurple : "#fff"),
11-
marginBottom: "3.5rem",
12-
marginTop: "3.5rem",
13-
padding: "1.5rem 3rem",
14-
boxShadow: "0 1rem 2rem rgba(0, 0, 0, 0.05)",
15-
borderRadius: "2.5rem",
16-
},
17-
heading: {
18-
fontSize: "2rem",
19-
},
20-
number: {
21-
color: (props) => {
22-
let color;
23-
let title = props.title.toLowerCase();
24-
if (title === "recovered") {
25-
color = colors.green;
26-
} else if (title === "deceased") {
27-
color = colors.purple;
28-
} else if (title === "active") {
29-
color = colors.orange;
30-
} else if (title === "confirmed") {
31-
color = colors.red;
32-
}
33-
return color;
34-
},
35-
fontSize: "3.5rem",
36-
paddingTop: ".5rem",
37-
paddingBottom: ".5rem",
38-
},
39-
dataChange: {
40-
color: (props) => {
41-
let color;
42-
let title = props.title.toLowerCase();
43-
if (title === "recovered") {
44-
color = colors.green;
45-
} else if (title === "deceased") {
46-
color = colors.purple;
47-
} else if (title === "active") {
48-
color = colors.orange;
49-
} else if (title === "confirmed") {
50-
color = colors.red;
51-
}
52-
return color;
53-
},
54-
},
55-
};
3+
import styles from "../styles/DisplayPanelsStyles";
564

575
class DisplayPanels extends Component {
586
constructor(props) {

src/components/Table/DisplayTable.js renamed to src/components/DisplayTable.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from "react";
2-
import "./DisplayTable.css";
2+
import "../styles/DisplayTable.css";
33

44
const useSortableData = (items, config = null) => {
55
const [sortConfig, setSortConfig] = React.useState(config);

src/components/Navbar.js

Lines changed: 1 addition & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -7,80 +7,8 @@ import {
77
faFlask,
88
faQuestionCircle,
99
} from "@fortawesome/free-solid-svg-icons";
10-
import colors from "../colors";
1110
import classNames from "classnames";
12-
13-
const styles = {
14-
nav: {
15-
marginTop: "12rem",
16-
},
17-
navItems: {
18-
listStyle: "none",
19-
},
20-
navLinks: {
21-
marginBottom: "5rem",
22-
fontWeight: "500",
23-
},
24-
iconBox: {
25-
display: "flex",
26-
flexDirection: "column",
27-
justifyContent: "center",
28-
alignItems: "center",
29-
position: "relative",
30-
zIndex: "50",
31-
},
32-
icons: {
33-
fontSize: "2.5rem",
34-
padding: "1rem 0",
35-
},
36-
active: {
37-
color: (props) => (props.isDarkMode ? "rgb(245, 245, 245)" : colors.purple),
38-
position: "relative",
39-
zIndex: "10",
40-
animation: "$float 2s ease infinite",
41-
42-
"&::before": {
43-
content: '""',
44-
position: "absolute",
45-
width: "165%",
46-
height: "110%",
47-
display: "block",
48-
backgroundColor: (props) =>
49-
props.isDarkMode ? colors.lightPurple : "rgb(245, 245, 245)",
50-
transform: "translateX(-1rem) skewX(10deg)",
51-
borderRadius: "25px",
52-
zIndex: 10,
53-
},
54-
"&::after": {
55-
content: '""',
56-
position: "absolute",
57-
width: "145%",
58-
height: "110%",
59-
display: "block",
60-
top: 0,
61-
left: 0,
62-
backgroundColor: (props) =>
63-
props.isDarkMode ? "rgba(255,255,255,.6)nop" : colors.lightPurple,
64-
transform: "translate(-.9rem, .4rem) skew(10deg, -5deg)",
65-
borderRadius: "25px",
66-
},
67-
},
68-
69-
"@keyframes float": {
70-
"0%": {
71-
boxShadow: "0 5px 15px 0px rgba(0,0,0,0.6)",
72-
transform: "translateY(0px)",
73-
},
74-
"50%": {
75-
boxShadow: "0 25px 15px 0px rgba(0,0,0,0.2)",
76-
transform: "translateY(-5px)",
77-
},
78-
"100%": {
79-
boxShadow: "0 5px 15px 0px rgba(0,0,0,0.6)",
80-
transform: "translateY(0px)",
81-
},
82-
},
83-
};
11+
import styles from "../styles/NavbarStyles";
8412

8513
class Navbar extends Component {
8614
render() {

src/components/Overview.js

Lines changed: 1 addition & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -2,105 +2,9 @@ import React, { Component } from "react";
22
import DisplayPanels from "./DisplayPanels";
33
import axios from "axios";
44
import { withStyles } from "@material-ui/styles";
5-
import colors from "../colors";
65
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
76
import { faSyncAlt } from "@fortawesome/free-solid-svg-icons";
8-
9-
const styles = {
10-
root: {
11-
textAlign: "center",
12-
},
13-
panels: {
14-
display: "flex",
15-
justifyContent: "space-between",
16-
alignItems: "center",
17-
},
18-
btnBox: {
19-
position: "absolute",
20-
top: "-.5%",
21-
left: "27%",
22-
marginLeft: "2rem",
23-
// transform: "translate(-50%, 0)",
24-
},
25-
button: {
26-
top: "0",
27-
left: "0",
28-
border: "none",
29-
backgroundColor: colors.purple,
30-
padding: "1.5rem 3rem",
31-
color: "#fff",
32-
borderRadius: "10rem",
33-
fontFamily: "inherit",
34-
fontSize: "1.6rem",
35-
marginTop: "6rem",
36-
transition: "all .4s",
37-
boxShadow: "0 .5rem 1rem rgba(0,0,0,.2)",
38-
position: "relative",
39-
40-
"&:hover": {
41-
backgroundColor: colors.darkPurple,
42-
boxShadow: "0 .25rem .5rem rgba(0,0,0,.2)",
43-
outline: "none",
44-
border: "none",
45-
// transform: "translateY(-.3rem)",
46-
47-
"&::before": {
48-
transform: "scaleX(1.4) scaleY(1.6)",
49-
opacity: 0,
50-
},
51-
},
52-
53-
"&:focus": {
54-
border: "none",
55-
outline: "none",
56-
},
57-
58-
"&:hover svg": {
59-
animationName: "$rotation",
60-
animationDuration: "1s",
61-
animationTimingFunction: "linear",
62-
animationIterationCount: "infinite",
63-
},
64-
65-
"&::before": {
66-
content: '""',
67-
position: "absolute",
68-
display: "inline-block",
69-
backgroundColor: colors.purple,
70-
width: "100%",
71-
height: "100%",
72-
top: 0,
73-
left: 0,
74-
borderRadius: "10rem",
75-
transition: "all .4s",
76-
zIndex: -1,
77-
},
78-
},
79-
80-
refreshIcon: {
81-
fontSize: "10rem",
82-
animationName: "$rotation",
83-
animationDuration: "1s",
84-
animationTimingFunction: "linear",
85-
animationIterationCount: "infinite",
86-
},
87-
88-
loadingIcon: {
89-
height: "50vh",
90-
display: "flex",
91-
justifyContent: "center",
92-
alignItems: "center",
93-
},
94-
95-
"@keyframes rotation": {
96-
from: {
97-
transform: "rotate(0deg)",
98-
},
99-
to: {
100-
transform: "rotate(359deg)",
101-
},
102-
},
103-
};
7+
import styles from "../styles/OverviewStyles";
1048

1059
class Overview extends Component {
10610
constructor(props) {

src/components/TinyCharts.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import React, { Component } from "react";
22
import { LineChart, Line } from "recharts";
3-
// import "./Charts.css";
43

54
export default class TinyCharts extends Component {
65
render() {
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)