Skip to content

Commit 35345aa

Browse files
Overview Data Changes
1 parent 84e5392 commit 35345aa

File tree

3 files changed

+24
-43
lines changed

3 files changed

+24
-43
lines changed

src/components/CovidApp.js

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -45,49 +45,31 @@ class CovidApp extends Component {
4545
const stateChanges = axios.get(
4646
"https://api.covid19india.org/states_daily.json"
4747
);
48-
const response = await axios.get(
49-
"https://api.rootnet.in/covid19-in/stats/history"
50-
);
48+
// const response = await axios.get(
49+
// "https://api.rootnet.in/covid19-in/stats/history"
50+
// );
5151

5252
axios.all([countryData, districtLevel, stateChanges]).then(
5353
axios.spread((...responses) => {
5454
const countryData = responses[0].data;
5555
const districtLevel = responses[1].data;
5656
const stateChanges = responses[2].data;
57-
// console.log(districtLevel);
5857

59-
const [todayData] = countryData.cases_time_series.slice(-1);
58+
const [todayData] = countryData.statewise.slice(0, 1);
6059

6160
const data = countryData.statewise.slice(1, -1);
6261

62+
const todayActive = data.active;
63+
const previousActive = countryData.cases_time_series;
64+
6365
this.setState(
6466
{ data: data, todayData: todayData, isLoading: false },
6567
this.handleFormat
6668
);
6769
})
6870
);
69-
70-
// this.setState(
71-
// (st) => ({
72-
// data: response.data.data,
73-
// isLoading: !st.isLoading,
74-
// }),
75-
// this.handleFormat
76-
// );
7771
}
7872

79-
// active: "22569";
80-
// confirmed: "31324";
81-
// deaths: "1008";
82-
// deltaconfirmed: "1866";
83-
// deltadeaths: "69";
84-
// deltarecovered: "610";
85-
// lastupdatedtime: "29/04/2020 02:50:45";
86-
// recovered: "7747";
87-
// state: "Total";
88-
// statecode: "TT";
89-
// statenotes: "";
90-
9173
formatData(data) {
9274
const formatedData = data.map((state, i) => {
9375
return {

src/components/Map/Map.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ const PROJECTION_CONFIG = {
2121
const COLOR_RANGE = [
2222
"#ffedea",
2323
"#ffcec5",
24+
"#ffbec5",
2425
"#ffad9f",
2526
"#ff8a75",
2627
"#ff5533",

src/components/Overview.js

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,53 +6,51 @@ import styles from "../styles/OverviewStyles";
66
function Overview(props) {
77
const { classes, isDarkMode } = props;
88
const {
9-
totalconfirmed,
10-
totaldeceased,
11-
totalrecovered,
12-
dailyrecovered,
13-
dailydeceased,
14-
dailyconfirmed,
9+
active,
10+
confirmed,
11+
deaths,
12+
recovered,
13+
deltaconfirmed,
14+
deltadeaths,
15+
deltarecovered,
1516
} = props.data;
1617

17-
const active =
18-
Number(totalconfirmed) - (Number(totaldeceased) + Number(totalrecovered));
19-
20-
const dailyactive =
21-
Number(dailyconfirmed) - (Number(dailydeceased) + Number(dailyrecovered));
18+
const deltaActive =
19+
Number(deltaconfirmed) - (Number(deltadeaths) + Number(deltarecovered));
2220

2321
return (
2422
<div className={classes.root}>
2523
<div className={classes.panels}>
2624
<div className={classes.panelContainer}>
2725
<DisplayPanels
2826
title="Confirmed"
29-
number={totalconfirmed}
27+
number={confirmed}
3028
isDarkMode={isDarkMode}
31-
dataChange={dailyconfirmed}
29+
dataChange={deltaconfirmed}
3230
/>
3331
</div>
3432
<div className={classes.panelContainer}>
3533
<DisplayPanels
3634
title="Active"
3735
number={active}
3836
isDarkMode={isDarkMode}
39-
dataChange={dailyactive}
37+
dataChange={deltaActive}
4038
/>
4139
</div>
4240
<div className={classes.panelContainer}>
4341
<DisplayPanels
4442
title="Recovered"
45-
number={totalrecovered}
43+
number={recovered}
4644
isDarkMode={isDarkMode}
47-
dataChange={dailyrecovered}
45+
dataChange={deltarecovered}
4846
/>
4947
</div>
5048
<div className={classes.panelContainer}>
5149
<DisplayPanels
5250
title="Deceased"
53-
number={totaldeceased}
51+
number={deaths}
5452
isDarkMode={isDarkMode}
55-
dataChange={dailydeceased}
53+
dataChange={deltadeaths}
5654
/>
5755
</div>
5856
</div>

0 commit comments

Comments
 (0)