Skip to content

Update CovidApp.js #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Update CovidApp.js #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Update CovidApp.js
  • Loading branch information
@ank1traj
ank1traj authored Feb 20, 2021
commit 9c768fb4bef9f79dbc60484bb0ab2ebbec16cf28
99 changes: 48 additions & 51 deletions src/components/CovidApp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,51 @@
import React, { Component } from 'react';
import axios from 'axios';
import Lottie from 'react-lottie';
import { formatDistance } from 'date-fns';
import { withStyles } from '@material-ui/styles';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import React, { Component } from "react";
import axios from "axios";
import Lottie from "react-lottie";
import { formatDistance } from "date-fns";
import { withStyles } from "@material-ui/styles";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import {
faBell,
faBellSlash,
faSyncAlt,
} from '@fortawesome/free-solid-svg-icons';
} from "@fortawesome/free-solid-svg-icons";

import Barchart from './Barchart';
import Charts from './Charts';
import DisplayTable from './DisplayTable';
import Footer from './Footer';
import MapSection from './MapSection';
import Overview from './Overview';
import Barchart from "./Barchart";
import Charts from "./Charts";
import DisplayTable from "./DisplayTable";
import Footer from "./Footer";
import MapSection from "./MapSection";
import Overview from "./Overview";

import colors from '../constants/colors';
import stateCodes from '../constants/stateCodes';
import * as animationData from '../assets/loading.json';
import colors from "../constants/colors";
import stateCodes from "../constants/stateCodes";
import * as animationData from "../assets/loading.json";

import styles from '../styles/CovidAppStyles';
import '../styles/DarkModeButton.css';
import styles from "../styles/CovidAppStyles";
import "../styles/DarkModeButton.css";

const defaultOptions = {
loop: true,
autoplay: true,
animationData: animationData.default,
rendererSettings: {
preserveAspectRatio: 'xMidYMid slice',
preserveAspectRatio: "xMidYMid slice",
},
};

const months = {
1: 'Jan',
2: 'Feb',
3: 'Mar',
4: 'Apr',
5: 'May',
6: 'Jun',
7: 'Jul',
8: 'Aug',
9: 'Sep',
10: 'Oct',
11: 'Nov',
12: 'Dec',
"1": "Jan",
"2": "Feb",
"3": "Mar",
"4": "Apr",
"5": "May",
"6": "Jun",
"7": "Jul",
"8": "Aug",
"9": "Sep",
"10": "Oct",
"11": "Nov",
"12": "Dec",
};

class CovidApp extends Component {
Expand Down Expand Up @@ -73,15 +73,15 @@ class CovidApp extends Component {

async fetchData() {
this.setState({ isLoading: !this.state.isLoading });
const countryData = axios.get('https://api.covid19india.org/data.json');
const countryData = axios.get("https://api.covid19india.org/data.json");
const districtLevel = axios.get(
'https://api.covid19india.org/v2/state_district_wise.json'
"https://api.covid19india.org/v2/state_district_wise.json"
);
const stateChanges = axios.get(
'https://api.covid19india.org/states_daily.json'
"https://api.covid19india.org/states_daily.json"
);
const updates = axios.get(
'https://api.covid19india.org/updatelog/log.json'
"https://api.covid19india.org/updatelog/log.json"
);

axios.all([countryData, districtLevel, stateChanges, updates]).then(
Expand Down Expand Up @@ -114,7 +114,7 @@ class CovidApp extends Component {
const formatedData = data.map((state, i) => {
return {
id: this.findId(state.state),
state: state.state.replace(' and ', ' & '),
state: state.state.replace(" and ", " & "),
value: state.confirmed,
};
});
Expand All @@ -141,15 +141,12 @@ class CovidApp extends Component {
this.setState({ expanded: !this.state.expanded });
}

formatDate(timestamp) {
formatDate(date) {
try {
const [date, time] = timestamp.split(' ');
const formattedDate = date.split('/');
console.log(time);
return `${formattedDate[0]} ${months[formattedDate[1]]}, ${time.slice(
0,
5
)} IST`;
const day = date.slice(0, 2);
const month = date.slice(3, 4);
const time = date.slice(10);
return `${day}th ${months[month]}, ${time.slice(0, 5)} IST`;
} catch (err) {}
}

Expand Down Expand Up @@ -177,7 +174,7 @@ class CovidApp extends Component {
.slice(-5)
.reverse()
.map(({ update, timestamp }, i) => {
update = update.replace('\n', '<br/>');
update = update.replace("\n", "<br/>");
return (
<div className={classes.updateBox} key={i}>
<h5 className={classes.updateHeading}>
Expand Down Expand Up @@ -211,7 +208,7 @@ class CovidApp extends Component {
/>
</div>
<div className={classes.lastUpdatedTime}>
Last Updated:{' '}
Last Updated:{" "}
{this.formatDate(this.state.todayData.lastupdatedtime)}
</div>
<div className={classes.updates}>
Expand Down Expand Up @@ -271,7 +268,7 @@ class CovidApp extends Component {
<div className={classes.tinyChart}>
<div
className={classes.tinych}
style={{ background: 'rgba(249, 52, 94,.1)' }}
style={{ background: "rgba(249, 52, 94,.1)" }}
>
<h3 style={{ color: colors.red }}>confirmed</h3>
<Barchart
Expand All @@ -285,7 +282,7 @@ class CovidApp extends Component {
<div className={classes.tinyChart}>
<div
className={classes.tinych}
style={{ background: 'rgba(250, 100, 0,.1)' }}
style={{ background: "rgba(250, 100, 0,.1)" }}
>
<h3 style={{ color: colors.orange }}>active</h3>
<Barchart
Expand All @@ -299,7 +296,7 @@ class CovidApp extends Component {
<div className={classes.tinyChart}>
<div
className={classes.tinych}
style={{ background: 'rgba(28, 177, 66,.1)' }}
style={{ background: "rgba(28, 177, 66,.1)" }}
>
<h3 style={{ color: colors.green }}>Recovered</h3>
<Barchart
Expand All @@ -313,7 +310,7 @@ class CovidApp extends Component {
<div className={classes.tinyChart}>
<div
className={classes.tinych}
style={{ background: 'rgba(98, 54, 255,.1)' }}
style={{ background: "rgba(98, 54, 255,.1)" }}
>
<h3 style={{ color: colors.purple }}>Deceased</h3>
<Barchart
Expand All @@ -328,7 +325,7 @@ class CovidApp extends Component {
</div>
<div className={classes.tableContainer}>
<h2 className={classes.tableHeading}>
State/UT Wise Data (Sortable){' '}
State/UT Wise Data (Sortable){" "}
</h2>
<DisplayTable
tableData={data}
Expand Down