Skip to content

Commit 60d19ed

Browse files
PrinceSumberiaPrinceSumberia
authored
Merge pull request #20 from PrinceSumberia/imports-refactor
Imports refactor
2 parents 719e663 + c5dae1c commit 60d19ed

File tree

17 files changed

+117
-69
lines changed

17 files changed

+117
-69
lines changed

‎src/components/Cards.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import { withStyles } from "@material-ui/styles";
21
import React from "react";
2+
import { withStyles } from "@material-ui/styles";
3+
34
import styles from "../styles/CardsStyles";
45

56
function Cards({ title, src, classes }) {

‎src/components/Charts.js‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
1-
import { withStyles } from "@material-ui/styles";
21
import React, { Component } from "react";
2+
import { withStyles } from "@material-ui/styles";
33
import {
4-
Legend, Line, LineChart, ResponsiveContainer, Tooltip, XAxis, YAxis
4+
Legend,
5+
Line,
6+
LineChart,
7+
ResponsiveContainer,
8+
Tooltip,
9+
XAxis,
10+
YAxis,
511
} from "recharts";
12+
613
import colors from "../constants/colors";
7-
import styles from '../styles/ChartsStyles';
14+
15+
import styles from "../styles/ChartsStyles";
816

917
class Charts extends Component {
1018
render() {
@@ -28,7 +36,7 @@ class Charts extends Component {
2836
(newObject.totalrecovered + newObject.totaldeceased),
2937
};
3038
});
31-
} catch (err) { }
39+
} catch (err) {}
3240

3341
return (
3442
<div className={classes.charts}>
@@ -84,4 +92,4 @@ class Charts extends Component {
8492
}
8593
}
8694

87-
export default withStyles(styles)(Charts)
95+
export default withStyles(styles)(Charts);

‎src/components/CovidApp.js‎

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
1+
import React, { Component } from "react";
2+
import axios from "axios";
3+
import Lottie from "react-lottie";
4+
import { formatDistance } from "date-fns";
5+
import { withStyles } from "@material-ui/styles";
6+
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
17
import {
28
faBell,
39
faBellSlash,
4-
faSyncAlt
10+
faSyncAlt,
511
} from "@fortawesome/free-solid-svg-icons";
6-
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
7-
import { withStyles } from "@material-ui/styles";
8-
import axios from "axios";
9-
import { formatDistance } from "date-fns";
10-
import React, { Component } from "react";
11-
import Lottie from "react-lottie";
12-
import * as animationData from "../assets/loading.json";
13-
import colors from "../constants/colors";
14-
import stateCodes from "../constants/stateCodes";
15-
import styles from "../styles/CovidAppStyles";
16-
import "../styles/DarkModeButton.css";
12+
1713
import Barchart from "./Barchart";
1814
import Charts from "./Charts";
1915
import DisplayTable from "./DisplayTable";
2016
import Footer from "./Footer";
2117
import MapSection from "./MapSection";
2218
import Overview from "./Overview";
2319

20+
import colors from "../constants/colors";
21+
import stateCodes from "../constants/stateCodes";
22+
import * as animationData from "../assets/loading.json";
23+
24+
import styles from "../styles/CovidAppStyles";
25+
import "../styles/DarkModeButton.css";
26+
2427
const defaultOptions = {
2528
loop: true,
2629
autoplay: true,
@@ -40,9 +43,9 @@ const months = {
4043
"07": "Jul",
4144
"08": "Aug",
4245
"09": "Sep",
43-
"10": "Oct",
44-
"11": "Nov",
45-
"12": "Dec",
46+
10: "Oct",
47+
11: "Nov",
48+
12: "Dec",
4649
};
4750

4851
class CovidApp extends Component {
@@ -144,7 +147,7 @@ class CovidApp extends Component {
144147
const month = date.slice(3, 5);
145148
const time = date.slice(11);
146149
return `${day} ${months[month]}, ${time.slice(0, 5)} IST`;
147-
} catch (err) { }
150+
} catch (err) {}
148151
}
149152

150153
render() {
@@ -189,7 +192,7 @@ class CovidApp extends Component {
189192
</div>
190193
);
191194
});
192-
} catch (err) { }
195+
} catch (err) {}
193196

194197
return (
195198
<>
@@ -216,13 +219,13 @@ class CovidApp extends Component {
216219
onClick={this.handleNotification}
217220
/>
218221
) : (
219-
<div className={classes.notificationBell}>
220-
<FontAwesomeIcon
221-
icon={faBell}
222-
onClick={this.handleNotification}
223-
/>
224-
</div>
225-
)}
222+
<div className={classes.notificationBell}>
223+
<FontAwesomeIcon
224+
icon={faBell}
225+
onClick={this.handleNotification}
226+
/>
227+
</div>
228+
)}
226229
</div>
227230
{expanded && <div className={classes.update}>{displayUpdates}</div>}
228231
</div>

‎src/components/DisplayPanels.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import { withStyles } from "@material-ui/styles";
21
import React, { Component } from "react";
2+
import { withStyles } from "@material-ui/styles";
3+
34
import styles from "../styles/DisplayPanelsStyles";
45

56
class DisplayPanels extends Component {

‎src/components/DisplayTable.js‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
import { faArrowCircleDown, faArrowCircleRight } from "@fortawesome/free-solid-svg-icons";
2-
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
31
import React, { useState } from "react";
2+
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
3+
import {
4+
faArrowCircleDown,
5+
faArrowCircleRight,
6+
} from "@fortawesome/free-solid-svg-icons";
7+
48
import "../styles/DisplayTable.css";
59

610
const useSortableData = (items, config = null) => {
@@ -55,7 +59,7 @@ const DisplayTable = ({ tableData, isDarkMode, districtLevel }) => {
5559
}
5660
return newObject;
5761
});
58-
} catch (err) { }
62+
} catch (err) {}
5963

6064
const getDistrictData = (statecode) => {
6165
try {
@@ -104,7 +108,7 @@ const DisplayTable = ({ tableData, isDarkMode, districtLevel }) => {
104108
</>
105109
);
106110
return markup;
107-
} catch (err) { }
111+
} catch (err) {}
108112
};
109113

110114
const { items, requestSort, sortConfig } = useSortableData(result);

‎src/components/Footer.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
import React, { Component } from "react";
12
import { withStyles } from "@material-ui/styles";
23
import classNames from "classnames";
3-
import React, { Component } from "react";
4+
45
import styles from "../styles/FooterStyles.js";
56

67
class Footer extends Component {

‎src/components/Form.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import { withStyles } from "@material-ui/styles";
21
import React, { Component } from "react";
2+
import { withStyles } from "@material-ui/styles";
3+
34
import styles from "../styles/FormStyles";
45

56
class Form extends Component {

‎src/components/Help.js‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
import { faExternalLinkAlt } from "@fortawesome/free-solid-svg-icons";
2-
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
3-
import { withStyles } from "@material-ui/styles";
4-
import axios from "axios";
51
import React, { Component } from "react";
2+
import axios from "axios";
63
import FadeIn from "react-fade-in";
7-
import styles from "../styles/HelpStyles";
4+
import { withStyles } from "@material-ui/styles";
5+
import { faExternalLinkAlt } from "@fortawesome/free-solid-svg-icons";
6+
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
7+
88
import Form from "./Form";
99
import Placeholder from "./Placeholder";
1010

11+
import styles from "../styles/HelpStyles";
12+
1113
class Help extends Component {
1214
constructor(props) {
1315
super(props);
@@ -46,7 +48,7 @@ class Help extends Component {
4648
hashmap[x["state"]][x["city"]][x["category"]].push(x);
4749
});
4850
this.setState({ data: hashmap });
49-
} catch (err) { }
51+
} catch (err) {}
5052
}
5153

5254
handleQuery(query) {

‎src/components/LinearGradient.js‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import { withStyles } from "@material-ui/styles";
2-
import classNames from 'classnames';
3-
import PropTypes from "prop-types";
41
import React from "react";
2+
import classNames from "classnames";
3+
import PropTypes from "prop-types";
4+
import { withStyles } from "@material-ui/styles";
5+
56
import styles from "../styles/LinearGradientStyles";
67

78
const LinearGradient = (props) => {
@@ -13,7 +14,13 @@ const LinearGradient = (props) => {
1314
<span className={classes.fill}></span>
1415
<span>{data.max}</span>
1516
</div>
16-
<div className={classNames(classes.mt8, classes.boxStyle, classes.gradientStyle)}></div>
17+
<div
18+
className={classNames(
19+
classes.mt8,
20+
classes.boxStyle,
21+
classes.gradientStyle
22+
)}
23+
></div>
1724
</div>
1825
);
1926
};

‎src/components/Map.js‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1+
import React, { Component } from "react";
2+
import ReactTooltip from "react-tooltip";
13
import { withStyles } from "@material-ui/styles";
24
import { scaleQuantile } from "d3-scale";
3-
import React, { Component } from "react";
45
import { ComposableMap, Geographies, Geography } from "react-simple-maps";
5-
import ReactTooltip from "react-tooltip";
6+
7+
import LinearGradient from "./LinearGradient.js";
8+
69
import INDIA_TOPO_JSON from "../constants/india.topo.json";
7-
import styles from '../styles/MapStyles';
10+
11+
import styles from "../styles/MapStyles";
812
import "../styles/MapStyles.js";
9-
import LinearGradient from "./LinearGradient.js";
1013

1114
/**
1215
* Courtesy: https://rawgit.com/Anujarya300/bubble_maps/master/data/geography-data/india.topo.json
@@ -78,7 +81,7 @@ class Map extends Component {
7881

7982
render() {
8083
const data = this.props.mapData;
81-
const { classes } = this.props
84+
const { classes } = this.props;
8285
const gradientData = {
8386
fromColor: COLOR_RANGE[0],
8487
toColor: COLOR_RANGE[COLOR_RANGE.length - 1],

0 commit comments

Comments
 (0)