Merge pull request #15 from dprensha/BugFix

Adding missing changes
dprensha · Jun 14, 2022 · c57e1d2 · c57e1d2
2 parents 765b302 + 59fbca2
commit c57e1d2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/us-covid/src/App.js b/us-covid/src/App.js
@@ -9,12 +9,6 @@ import styles from './MUITheme'
 
 const store = configureStore();
 
-// const theme = createMuiTheme({
-//   palette: {
-//     type: 'dark',
-//   },
-// });
-
 function App() {
   return (
     <div className="App">

diff --git a/us-covid/src/MUITheme.js b/us-covid/src/MUITheme.js
@@ -1,6 +1,6 @@
-import { createMuiTheme } from '@material-ui/core';
+import { createTheme } from '@material-ui/core/styles';
 
-const styles = createMuiTheme({
+const styles = createTheme({
     palette: {
         type: "light",
         primary: { main: "#1F77B4" },

diff --git a/us-covid/src/store/CasesRedux.js b/us-covid/src/store/CasesRedux.js
@@ -100,7 +100,7 @@ export const actionCreators = {
             //     }
             // }),
             d3.csv('https://raw.githubusercontent.com/CSSEGISandData/COVID-19/master/csse_covid_19_data/csse_covid_19_time_series/time_series_covid19_deaths_global.csv', (data) => {
-                if (data["Province/State"] === "" && (data["Country/Region"] === "United Kingdom" || data["Country/Region"] === "Denmark" || data["Country/Region"] === "France" || data["Country/Region"] === "Netherlands")) {
+                if (data["Province/State"] === "" && (data["Country/Region"] === "United Kingdom" || data["Country/Region"] === "Denmark" || data["Country/Region"] === "France" || data["Country/Region"] === "Netherlands" || data["Country/Region"] === "New Zealand")) {
                     data["Province/State"] = `Mainland ${data["Country/Region"]}`
                 }
                 const dates = Object.keys(data).filter(function(key) { return !isNaN(Date.parse(key)) });
@@ -111,7 +111,7 @@ export const actionCreators = {
             }),
             d3.csv('https://raw.githubusercontent.com/CSSEGISandData/COVID-19/master/csse_covid_19_data/csse_covid_19_time_series/time_series_covid19_confirmed_global.csv', (data) => {
                 //deal with Denmark, France, Netherlands, United Kingdom
-                if (data["Province/State"] === "" && (data["Country/Region"] === "United Kingdom" || data["Country/Region"] === "Denmark" || data["Country/Region"] === "France" || data["Country/Region"] === "Netherlands")) {
+                if (data["Province/State"] === "" && (data["Country/Region"] === "United Kingdom" || data["Country/Region"] === "Denmark" || data["Country/Region"] === "France" || data["Country/Region"] === "Netherlands" || data["Country/Region"] === "New Zealand")) {
                     data["Province/State"] = `Mainland ${data["Country/Region"]}`
                 }