Skip to content

Commit ae1eb58

Browse files
PrinceSumberiaPrinceSumberia
committed
Minor chnages
1 parent ff87073 commit ae1eb58

File tree

1 file changed

+94
-94
lines changed

1 file changed

+94
-94
lines changed

‎src/components/CovidApp.js‎

Lines changed: 94 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ class CovidApp extends Component {
5757

5858
const [data] = countryData.cases_time_series.slice(-1);
5959

60+
console.log(countryData.statewise.slice(1, -1));
61+
6062
this.setState({ todayData: data, isLoading: false });
6163
})
6264
);
@@ -70,13 +72,25 @@ class CovidApp extends Component {
7072
// );
7173
}
7274

75+
// active: "22569";
76+
// confirmed: "31324";
77+
// deaths: "1008";
78+
// deltaconfirmed: "1866";
79+
// deltadeaths: "69";
80+
// deltarecovered: "610";
81+
// lastupdatedtime: "29/04/2020 02:50:45";
82+
// recovered: "7747";
83+
// state: "Total";
84+
// statecode: "TT";
85+
// statenotes: "";
86+
7387
formatData(data) {
7488
const newArr = data.slice(-1).map((data) => data.regional);
7589
const formatedData = newArr.flat().map((region, i) => {
7690
return {
77-
id: this.findId(region.loc),
91+
id: this.findId(region.state),
7892
state: region.loc.replace(" and ", " & "),
79-
value: region.totalConfirmed,
93+
value: region.confirmed,
8094
};
8195
});
8296
return formatedData;
@@ -155,100 +169,86 @@ class CovidApp extends Component {
155169
data={this.state.todayData}
156170
loadingStatus={this.loadingStatus}
157171
/>
172+
<div className={classes.content}>
173+
{/* <div className={classes.contentArea}>
174+
<div className={classes.mapArea}>
175+
<MapSection
176+
mapData={mapData}
177+
data={data}
178+
isDarkMode={isDarkMode}
179+
/>
180+
</div>
181+
</div> */}
182+
{/* <div className={classes.chartArea}>
183+
<Charts data={this.state.data} isLoading={this.state.isLoading} />
184+
<div className={classes.tinyChartArea}>
185+
<div className={classes.tinyChart}>
186+
<div
187+
className={classes.tinych}
188+
style={{ background: "rgba(249, 52, 94,.1)" }}
189+
>
190+
<h3 style={{ color: colors.red }}>confirmed</h3>
191+
<Barchart
192+
data={this.state.data}
193+
isLoading={this.state.isLoading}
194+
dataKey="confirmed"
195+
stroke={colors.red}
196+
/>
197+
</div>
198+
</div>
199+
<div className={classes.tinyChart}>
200+
<div
201+
className={classes.tinych}
202+
style={{ background: "rgba(250, 100, 0,.1)" }}
203+
>
204+
<h3 style={{ color: colors.orange }}>active</h3>
205+
<Barchart
206+
data={this.state.data}
207+
isLoading={this.state.isLoading}
208+
dataKey="active"
209+
stroke={colors.orange}
210+
/>
211+
</div>
212+
</div>
213+
<div className={classes.tinyChart}>
214+
<div
215+
className={classes.tinych}
216+
style={{ background: "rgba(28, 177, 66,.1)" }}
217+
>
218+
<h3 style={{ color: colors.green }}>Recovered</h3>
219+
<Barchart
220+
data={this.state.data}
221+
isLoading={this.state.isLoading}
222+
dataKey="discharged"
223+
stroke={colors.green}
224+
/>
225+
</div>
226+
</div>
227+
<div className={classes.tinyChart}>
228+
<div
229+
className={classes.tinych}
230+
style={{ background: "rgba(98, 54, 255,.1)" }}
231+
>
232+
<h3 style={{ color: colors.purple }}>Deceased</h3>
233+
<Barchart
234+
data={this.state.data}
235+
isLoading={this.state.isLoading}
236+
dataKey="deaths"
237+
stroke={colors.purple}
238+
/>
239+
</div>
240+
</div>
241+
</div>
242+
</div>
243+
<div className={classes.tableContainer}>
244+
<h2 className={classes.tableHeading}>
245+
State/UT Wise Data (Sortable){" "}
246+
</h2>
247+
<DisplayTable tableData={tableData} isDarkMode={isDarkMode} />
248+
</div> */}
249+
</div>
158250
</>
159251
);
160-
161-
// return (
162-
// <>
163-
164-
// <Overview
165-
// isDarkMode={isDarkMode}
166-
// data={this.state.data}
167-
// loadingStatus={this.loadingStatus}
168-
// />
169-
// {!this.state.isLoading && (
170-
// <div className={classes.content}>
171-
// <div className={classes.contentArea}>
172-
// <div className={classes.mapArea}>
173-
// {/* <Map mapData={mapData} /> */}
174-
// <MapSection
175-
// mapData={mapData}
176-
// data={data}
177-
// isDarkMode={isDarkMode}
178-
// />
179-
// </div>
180-
// </div>
181-
// <div className={classes.chartArea}>
182-
// <Charts data={this.state.data} isLoading={this.state.isLoading} />
183-
// <div className={classes.tinyChartArea}>
184-
// <div className={classes.tinyChart}>
185-
// <div
186-
// className={classes.tinych}
187-
// style={{ background: "rgba(249, 52, 94,.1)" }}
188-
// >
189-
// <h3 style={{ color: colors.red }}>confirmed</h3>
190-
// <Barchart
191-
// data={this.state.data}
192-
// isLoading={this.state.isLoading}
193-
// dataKey="confirmed"
194-
// stroke={colors.red}
195-
// />
196-
// </div>
197-
// </div>
198-
// <div className={classes.tinyChart}>
199-
// <div
200-
// className={classes.tinych}
201-
// style={{ background: "rgba(250, 100, 0,.1)" }}
202-
// >
203-
// <h3 style={{ color: colors.orange }}>active</h3>
204-
// <Barchart
205-
// data={this.state.data}
206-
// isLoading={this.state.isLoading}
207-
// dataKey="active"
208-
// stroke={colors.orange}
209-
// />
210-
// </div>
211-
// </div>
212-
// <div className={classes.tinyChart}>
213-
// <div
214-
// className={classes.tinych}
215-
// style={{ background: "rgba(28, 177, 66,.1)" }}
216-
// >
217-
// <h3 style={{ color: colors.green }}>Recovered</h3>
218-
// <Barchart
219-
// data={this.state.data}
220-
// isLoading={this.state.isLoading}
221-
// dataKey="discharged"
222-
// stroke={colors.green}
223-
// />
224-
// </div>
225-
// </div>
226-
// <div className={classes.tinyChart}>
227-
// <div
228-
// className={classes.tinych}
229-
// style={{ background: "rgba(98, 54, 255,.1)" }}
230-
// >
231-
// <h3 style={{ color: colors.purple }}>Deceased</h3>
232-
// <Barchart
233-
// data={this.state.data}
234-
// isLoading={this.state.isLoading}
235-
// dataKey="deaths"
236-
// stroke={colors.purple}
237-
// />
238-
// </div>
239-
// </div>
240-
// </div>
241-
// </div>
242-
// <div className={classes.tableContainer}>
243-
// <h2 className={classes.tableHeading}>
244-
// State/UT Wise Data (Sortable){" "}
245-
// </h2>
246-
// <DisplayTable tableData={tableData} isDarkMode={isDarkMode} />
247-
// </div>
248-
// </div>
249-
// )}
250-
// </>
251-
// );
252252
}
253253
}
254254

0 commit comments

Comments
 (0)