Merge branch 'master' into bump-depend

PrinceSumberia · web-flow · commit 65aabfb3d165 · 2020-10-01T00:15:39.000+05:30
diff --git a/src/components/Cards.js b/src/components/Cards.js
@@ -1,5 +1,6 @@
-import { withStyles } from "@material-ui/styles";
 import React from "react";
+import { withStyles } from "@material-ui/styles";
+
 import styles from "../styles/CardsStyles";
 
 function Cards({ title, src, classes }) {
diff --git a/src/components/Charts.js b/src/components/Charts.js
@@ -1,10 +1,18 @@
-import { withStyles } from "@material-ui/styles";
 import React, { Component } from "react";
+import { withStyles } from "@material-ui/styles";
 import {
-  Legend, Line, LineChart, ResponsiveContainer, Tooltip, XAxis, YAxis
+  Legend,
+  Line,
+  LineChart,
+  ResponsiveContainer,
+  Tooltip,
+  XAxis,
+  YAxis,
 } from "recharts";
+
 import colors from "../constants/colors";
-import styles from '../styles/ChartsStyles';
+
+import styles from "../styles/ChartsStyles";
 
 class Charts extends Component {
   render() {
@@ -28,7 +36,7 @@ class Charts extends Component {
             (newObject.totalrecovered + newObject.totaldeceased),
         };
       });
-    } catch (err) { }
+    } catch (err) {}
 
     return (
       <div className={classes.charts}>
@@ -84,4 +92,4 @@ class Charts extends Component {
   }
 }
 
-export default withStyles(styles)(Charts)
+export default withStyles(styles)(Charts);
diff --git a/src/components/CovidApp.js b/src/components/CovidApp.js
@@ -1,26 +1,29 @@
+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
+  faSyncAlt,
 } from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { withStyles } from "@material-ui/styles";
-import axios from "axios";
-import { formatDistance } from "date-fns";
-import React, { Component } from "react";
-import Lottie from "react-lottie";
-import * as animationData from "../assets/loading.json";
-import colors from "../constants/colors";
-import stateCodes from "../constants/stateCodes";
-import styles from "../styles/CovidAppStyles";
-import "../styles/DarkModeButton.css";
+
 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 styles from "../styles/CovidAppStyles";
+import "../styles/DarkModeButton.css";
+
 const defaultOptions = {
   loop: true,
   autoplay: true,
@@ -40,9 +43,9 @@ const months = {
   "07": "Jul",
   "08": "Aug",
   "09": "Sep",
-  "10": "Oct",
-  "11": "Nov",
-  "12": "Dec",
+  10: "Oct",
+  11: "Nov",
+  12: "Dec",
 };
 
 class CovidApp extends Component {
@@ -144,7 +147,7 @@ class CovidApp extends Component {
       const month = date.slice(3, 5);
       const time = date.slice(11);
       return `${day} ${months[month]}, ${time.slice(0, 5)} IST`;
-    } catch (err) { }
+    } catch (err) {}
   }
 
   render() {
@@ -189,7 +192,7 @@ class CovidApp extends Component {
             </div>
           );
         });
-    } catch (err) { }
+    } catch (err) {}
 
     return (
       <>
@@ -216,13 +219,13 @@ class CovidApp extends Component {
                   onClick={this.handleNotification}
                 />
               ) : (
-                  <div className={classes.notificationBell}>
-                    <FontAwesomeIcon
-                      icon={faBell}
-                      onClick={this.handleNotification}
-                    />
-                  </div>
-                )}
+                <div className={classes.notificationBell}>
+                  <FontAwesomeIcon
+                    icon={faBell}
+                    onClick={this.handleNotification}
+                  />
+                </div>
+              )}
             </div>
             {expanded && <div className={classes.update}>{displayUpdates}</div>}
           </div>
diff --git a/src/components/DisplayPanels.js b/src/components/DisplayPanels.js
@@ -1,5 +1,6 @@
-import { withStyles } from "@material-ui/styles";
 import React, { Component } from "react";
+import { withStyles } from "@material-ui/styles";
+
 import styles from "../styles/DisplayPanelsStyles";
 
 class DisplayPanels extends Component {
diff --git a/src/components/DisplayTable.js b/src/components/DisplayTable.js
@@ -1,6 +1,10 @@
-import { faArrowCircleDown, faArrowCircleRight } from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import React, { useState } from "react";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import {
+  faArrowCircleDown,
+  faArrowCircleRight,
+} from "@fortawesome/free-solid-svg-icons";
+
 import "../styles/DisplayTable.css";
 
 const useSortableData = (items, config = null) => {
@@ -55,7 +59,7 @@ const DisplayTable = ({ tableData, isDarkMode, districtLevel }) => {
       }
       return newObject;
     });
-  } catch (err) { }
+  } catch (err) {}
 
   const getDistrictData = (statecode) => {
     try {
@@ -104,7 +108,7 @@ const DisplayTable = ({ tableData, isDarkMode, districtLevel }) => {
         </>
       );
       return markup;
-    } catch (err) { }
+    } catch (err) {}
   };
 
   const { items, requestSort, sortConfig } = useSortableData(result);
diff --git a/src/components/Footer.js b/src/components/Footer.js
@@ -1,6 +1,7 @@
+import React, { Component } from "react";
 import { withStyles } from "@material-ui/styles";
 import classNames from "classnames";
-import React, { Component } from "react";
+
 import styles from "../styles/FooterStyles.js";
 
 class Footer extends Component {
diff --git a/src/components/Form.js b/src/components/Form.js
@@ -1,5 +1,6 @@
-import { withStyles } from "@material-ui/styles";
 import React, { Component } from "react";
+import { withStyles } from "@material-ui/styles";
+
 import styles from "../styles/FormStyles";
 
 class Form extends Component {
diff --git a/src/components/Help.js b/src/components/Help.js
@@ -1,13 +1,15 @@
-import { faExternalLinkAlt } from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { withStyles } from "@material-ui/styles";
-import axios from "axios";
 import React, { Component } from "react";
+import axios from "axios";
 import FadeIn from "react-fade-in";
-import styles from "../styles/HelpStyles";
+import { withStyles } from "@material-ui/styles";
+import { faExternalLinkAlt } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+
 import Form from "./Form";
 import Placeholder from "./Placeholder";
 
+import styles from "../styles/HelpStyles";
+
 class Help extends Component {
   constructor(props) {
     super(props);
@@ -46,7 +48,7 @@ class Help extends Component {
           hashmap[x["state"]][x["city"]][x["category"]].push(x);
       });
       this.setState({ data: hashmap });
-    } catch (err) { }
+    } catch (err) {}
   }
 
   handleQuery(query) {
diff --git a/src/components/LinearGradient.js b/src/components/LinearGradient.js
@@ -1,7 +1,8 @@
-import { withStyles } from "@material-ui/styles";
-import classNames from 'classnames';
-import PropTypes from "prop-types";
 import React from "react";
+import classNames from "classnames";
+import PropTypes from "prop-types";
+import { withStyles } from "@material-ui/styles";
+
 import styles from "../styles/LinearGradientStyles";
 
 const LinearGradient = (props) => {
@@ -13,7 +14,13 @@ const LinearGradient = (props) => {
         <span className={classes.fill}></span>
         <span>{data.max}</span>
       </div>
-      <div className={classNames(classes.mt8, classes.boxStyle, classes.gradientStyle)}></div>
+      <div
+        className={classNames(
+          classes.mt8,
+          classes.boxStyle,
+          classes.gradientStyle
+        )}
+      ></div>
     </div>
   );
 };
diff --git a/src/components/Map.js b/src/components/Map.js
@@ -1,12 +1,13 @@
+import React, { Component } from "react";
+import ReactTooltip from "react-tooltip";
 import { withStyles } from "@material-ui/styles";
 import { scaleQuantile } from "d3-scale";
-import React, { Component } from "react";
 import { ComposableMap, Geographies, Geography } from "react-simple-maps";
-import ReactTooltip from "react-tooltip";
+
+import LinearGradient from "./LinearGradient.js";
 import INDIA_TOPO_JSON from "../constants/india.topo.json";
 import styles from "../styles/MapStyles";
 import "../styles/MapStyles.js";
-import LinearGradient from "./LinearGradient.js";
 
 /**
  * Courtesy: https://rawgit.com/Anujarya300/bubble_maps/master/data/geography-data/india.topo.json
@@ -78,6 +79,8 @@ class Map extends Component {
 
   render() {
     const data = this.props.mapData;
+    const { classes } = this.props;
+    
     const gradientData = {
       fromColor: COLOR_RANGE[0],
       toColor: COLOR_RANGE[COLOR_RANGE.length - 1],
diff --git a/src/components/MapSection.js b/src/components/MapSection.js
@@ -1,8 +1,10 @@
-import { withStyles } from "@material-ui/styles";
 import React, { Component } from "react";
-import styles from "../styles/MapSection";
-import DisplayPanels from "./DisplayPanels";
+import { withStyles } from "@material-ui/styles";
+
 import Map from "./Map";
+import DisplayPanels from "./DisplayPanels";
+
+import styles from "../styles/MapSection";
 
 class MapSection extends Component {
   constructor(props) {
@@ -32,7 +34,7 @@ class MapSection extends Component {
           (Number(updatedData.deltarecovered) +
             Number(updatedData.deltadeaths)),
       });
-    } catch (error) { }
+    } catch (error) {}
   }
 
   render() {
diff --git a/src/components/Navbar.js b/src/components/Navbar.js
@@ -1,10 +1,18 @@
-import { faBars, faBox, faFlask, faHeadSideCough, faHome } from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { withStyles } from "@material-ui/styles";
-import classNames from "classnames";
 import React, { Component } from "react";
 import { NavLink } from "react-router-dom";
+import classNames from "classnames";
+import { withStyles } from "@material-ui/styles";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import {
+  faBars,
+  faBox,
+  faFlask,
+  faHeadSideCough,
+  faHome,
+} from "@fortawesome/free-solid-svg-icons";
+
 import logo from "../assets/SVG/06.svg";
+
 import styles from "../styles/NavbarStyles";
 
 class Navbar extends Component {
diff --git a/src/components/Overview.js b/src/components/Overview.js
@@ -1,8 +1,10 @@
-import { withStyles } from "@material-ui/styles";
 import React from "react";
-import styles from "../styles/OverviewStyles";
+import { withStyles } from "@material-ui/styles";
+
 import DisplayPanels from "./DisplayPanels";
 
+import styles from "../styles/OverviewStyles";
+
 function Overview(props) {
   const { classes, isDarkMode } = props;
   const {
diff --git a/src/components/Paper.js b/src/components/Paper.js
@@ -1,5 +1,5 @@
-import { withStyles } from "@material-ui/styles";
 import React, { Component } from "react";
+import { withStyles } from "@material-ui/styles";
 
 const styles = {
   darkMode: {
diff --git a/src/components/ResponsiveTable.js b/src/components/ResponsiveTable.js
@@ -1,12 +1,12 @@
-import Paper from "@material-ui/core/Paper";
+import React from "react";
 import { makeStyles } from "@material-ui/core/styles";
+import Paper from "@material-ui/core/Paper";
 import Table from "@material-ui/core/Table";
 import TableBody from "@material-ui/core/TableBody";
 import TableCell from "@material-ui/core/TableCell";
 import TableContainer from "@material-ui/core/TableContainer";
 import TableHead from "@material-ui/core/TableHead";
 import TableRow from "@material-ui/core/TableRow";
-import React from "react";
 
 const useStyles = makeStyles({
   table: {
diff --git a/src/components/StaySafe.js b/src/components/StaySafe.js
@@ -1,13 +1,16 @@
-import { withStyles } from "@material-ui/styles";
 import React, { Component } from "react";
+import { withStyles } from "@material-ui/styles";
+
+import Cards from "./Cards";
+
 import First from "../assets/SVG/01.svg";
 import Second from "../assets/SVG/02.svg";
 import Third from "../assets/SVG/03.svg";
 import Fourth from "../assets/SVG/04.svg";
 import Fifth from "../assets/SVG/05.svg";
 import Sixth from "../assets/SVG/06.svg";
+
 import styles from "../styles/StaySafeStyles";
-import Cards from "./Cards";
 
 class StaySafe extends Component {
   render() {
