Skip to content

Commit 7fca644

Browse files
Fix barcharts width
1 parent a6e1398 commit 7fca644

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

src/components/CovidApp.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { withStyles } from "@material-ui/styles";
44
import colors from "../constants/colors";
55
import Charts from "./Charts";
66
import DisplayTable from "./DisplayTable";
7-
import TinyCharts from "./TinyCharts";
87
import styles from "../styles/CovidAppStyles";
98
import axios from "axios";
109
import stateCodes from "../constants/stateCodes";
@@ -142,13 +141,8 @@ class CovidApp extends Component {
142141
/>
143142
</div>
144143
</div>
145-
{/* <Barchart
146-
data={this.state.data}
147-
isLoading={this.state.isLoading}
148-
dataKey="confirmed"
149-
stroke={colors.red}
150-
/> */}
151144
<div className={classes.chartArea}>
145+
<Charts data={this.state.data} isLoading={this.state.isLoading} />
152146
<div className={classes.tinyChartArea}>
153147
<div className={classes.tinyChart}>
154148
<div
@@ -207,7 +201,6 @@ class CovidApp extends Component {
207201
</div>
208202
</div>
209203
</div>
210-
<Charts data={this.state.data} isLoading={this.state.isLoading} />
211204
</div>
212205
<div className={classes.tableContainer}>
213206
<h2 className={classes.tableHeading}>

src/styles/CovidAppStyles.js

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ export default {
55
display: "flex",
66
alignItems: "center",
77
},
8+
89
heading: {
910
fontWeight: "500",
1011
color: (props) =>
@@ -16,6 +17,7 @@ export default {
1617
marginRight: "1rem",
1718
},
1819
},
20+
1921
content: {
2022
backgroundColor: (props) => (props.isDarkMode ? colors.darkPurple : "#fff"),
2123
borderRadius: "2rem",
@@ -25,17 +27,22 @@ export default {
2527
flexDirection: "column",
2628
justifyContent: "center",
2729
},
30+
2831
contentArea: {
2932
display: "flex",
3033
},
34+
3135
mapArea: {
3236
flex: "1",
3337
},
38+
3439
chartArea: {
3540
minWidth: "50%",
3641
display: "flex",
3742
justifyContent: "center",
43+
flexDirection: "column",
3844
},
45+
3946
tableContainer: {
4047
padding: "2rem",
4148
margin: "5rem 0",
@@ -50,14 +57,15 @@ export default {
5057
tinyChartArea: {
5158
display: "flex",
5259
flexWrap: "wrap",
53-
padding: "2rem",
54-
justifyContent: "space-around",
60+
padding: "2rem 2rem",
61+
justifyContent: "space-evenly",
5562
alignItems: "center",
56-
marginTop: "3rem",
63+
marginTop: "5rem",
5764
},
5865

5966
tinyChart: {
60-
margin: "2rem",
67+
// width: "50%",
68+
margin: "2.5rem",
6169
"& h3": {
6270
textTransform: "capitalize",
6371
fontWeight: 500,
@@ -67,9 +75,9 @@ export default {
6775
},
6876

6977
tinych: {
70-
borderRadius: "2rem",
71-
marginBottom: "2rem",
72-
padding: "2rem",
78+
borderRadius: ".5rem",
79+
marginBottom: ".5rem",
80+
padding: "1rem",
7381
},
7482

7583
refreshIcon: {

0 commit comments

Comments
 (0)