From 3e3f3ba9e93b21de5fb0538e652330fd48529e75 Mon Sep 17 00:00:00 2001
From: Adam Kendis <atkendis@gmail.com>
Date: Thu, 17 Dec 2020 12:47:25 -0800
Subject: [PATCH 1/9] Update Routes, add Router

---
 client/App.jsx    | 13 +++++--------
 client/Routes.jsx | 29 +++++++++++++++++------------
 client/index.js   |  8 +++++++-
 3 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/client/App.jsx b/client/App.jsx
index 21a96c6d0..47aaad02e 100644
--- a/client/App.jsx
+++ b/client/App.jsx
@@ -1,13 +1,11 @@
 import React, { useEffect } from 'react';
 import PropTypes from 'proptypes';
+import { BrowserRouter } from 'react-router-dom';
 import { connect } from 'react-redux';
-import { ThemeProvider } from '@material-ui/core/styles';
-import { CssBaseline } from '@material-ui/core';
 import { getMetadataRequest } from '@reducers/metadata';
+import Routes from './Routes';
 import Header from '@components/Header';
 import Footer from '@components/Footer';
-import MapContainer from '@components/Map';
-import theme from './theme/theme';
 
 const App = ({
   getMetadata,
@@ -17,12 +15,11 @@ const App = ({
   });
 
   return (
-    <ThemeProvider theme={theme}>
-      <CssBaseline />
+    <BrowserRouter>
       <Header />
-      <MapContainer />
+      <Routes />
       <Footer />
-    </ThemeProvider>
+    </BrowserRouter>
   );
 };
 
diff --git a/client/Routes.jsx b/client/Routes.jsx
index 421d053f8..9ebef68aa 100644
--- a/client/Routes.jsx
+++ b/client/Routes.jsx
@@ -4,24 +4,29 @@ import React from 'react';
 import {
   Switch,
   Route,
+  Redirect,
 } from 'react-router-dom';
 
-import PrivacyPolicy from '@components/privacyPolicy/PrivacyPolicy';
-import Contact from './components/contact/Contact';
-import About from './components/about/About';
-import Body from './components/main/body/Body';
-import Faq from './components/faq/Faq';
+// import PrivacyPolicy from '@components/privacyPolicy/PrivacyPolicy';
+// import Contact from './components/contact/Contact';
+// import About from './components/about/About';
+// import Body from './components/main/body/Body';
+// import Faq from './components/faq/Faq';
+import MapContainer from '@components/Map/'
 
 export default function Routes() {
   return (
     <Switch>
-      <Route path="/contact" component={Contact} />
-      <Route path="/about" component={About} />
-      <Route path="/privacy" component={PrivacyPolicy} />
-      <Route path="/comparison" component={Body} />
-      <Route path="/faq" component={Faq} />
-      <Route path="/data" component={Body} />
-      <Route path="/" component={About} />
+      {/* <Route path="/contact" component={Contact} /> */}
+      {/* <Route path="/about" component={About} /> */}
+      {/* <Route path="/privacy" component={PrivacyPolicy} /> */}
+      {/* <Route path="/comparison" component={Body} /> */}
+      {/* <Route path="/faq" component={Faq} /> */}
+      {/* <Route path="/data" component={Body} /> */}
+      <Route path="/map" component={MapContainer} />
+      <Route path="/">
+        <Redirect to="map" />
+      </Route>
     </Switch>
   );
 }
diff --git a/client/index.js b/client/index.js
index 069ee496c..5479f8ed9 100644
--- a/client/index.js
+++ b/client/index.js
@@ -6,11 +6,17 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { Provider } from 'react-redux';
 import store from './redux/store';
+import { ThemeProvider } from '@material-ui/core/styles';
+import { CssBaseline } from '@material-ui/core';
 import App from './App';
+import theme from './theme/theme';
 
 ReactDOM.render(
   <Provider store={store}>
-    <App />
+    <ThemeProvider theme={theme}>
+      <CssBaseline />
+      <App />
+    </ThemeProvider>
   </Provider>,
   document.getElementById('root'),
 );

From fcf2bb708a7be9b8adaca1df5cf213f10b77772a Mon Sep 17 00:00:00 2001
From: Adam Kendis <atkendis@gmail.com>
Date: Thu, 17 Dec 2020 12:48:30 -0800
Subject: [PATCH 2/9] remove map clusters code, update sagas to fetch more
 metadata from api

---
 client/redux/reducers/data.js     | 35 ------------------------
 client/redux/reducers/metadata.js | 44 +++++++++++++++++++++++++++++-
 client/redux/sagas/data.js        | 45 -------------------------------
 client/redux/sagas/metadata.js    | 25 ++++++++++++++---
 4 files changed, 65 insertions(+), 84 deletions(-)

diff --git a/client/redux/reducers/data.js b/client/redux/reducers/data.js
index d9f3fff92..5f30e1cf6 100644
--- a/client/redux/reducers/data.js
+++ b/client/redux/reducers/data.js
@@ -5,8 +5,6 @@ export const types = {
   GET_PIN_INFO_REQUEST: 'GET_PIN_INFO_REQUEST',
   GET_PIN_INFO_SUCCESS: 'GET_PIN_INFO_SUCCESS',
   GET_PIN_INFO_FAILURE: 'GET_PIN_INFO_FAILURE',
-  GET_PIN_CLUSTERS_SUCCESS: 'GET_PIN_CLUSTERS_SUCCESS',
-  GET_PIN_CLUSTERS_FAILURE: 'GET_PIN_CLUSTERS_FAILURE',
   GET_HEATMAP_SUCCESS: 'GET_HEATMAP_SUCCESS',
   GET_HEATMAP_FAILURE: 'GET_HEATMAP_FAILURE',
   GET_VIS_DATA_SUCCESS: 'GET_VIS_DATA_SUCCESS',
@@ -45,16 +43,6 @@ export const getPinInfoFailure = error => ({
   payload: error,
 });
 
-export const getPinClustersSuccess = response => ({
-  type: types.GET_PIN_CLUSTERS_SUCCESS,
-  payload: response,
-});
-
-export const getPinClustersFailure = error => ({
-  type: types.GET_PIN_CLUSTERS_FAILURE,
-  payload: error,
-});
-
 export const getHeatmapSuccess = response => ({
   type: types.GET_HEATMAP_SUCCESS,
   payload: response,
@@ -95,7 +83,6 @@ const initialState = {
   isVisLoading: false,
   error: null,
   pins: [],
-  pinClusters: [],
   heatmap: [],
   pinsInfo: {},
   counts: {},
@@ -159,28 +146,6 @@ export default (state = initialState, action) => {
         },
       };
     }
-    case types.GET_PIN_CLUSTERS_SUCCESS:
-      return {
-        ...state,
-        error: null,
-        pinClusters: action.payload,
-        isMapLoading: false,
-      };
-    case types.GET_PIN_CLUSTERS_FAILURE: {
-      const {
-        response: { status },
-        message,
-      } = action.payload;
-      return {
-        ...state,
-        error: {
-          code: status,
-          message,
-          error: action.payload,
-        },
-        isMapLoading: false,
-      };
-    }
     case types.GET_HEATMAP_SUCCESS:
       return {
         ...state,
diff --git a/client/redux/reducers/metadata.js b/client/redux/reducers/metadata.js
index 292df2a69..1302de4db 100644
--- a/client/redux/reducers/metadata.js
+++ b/client/redux/reducers/metadata.js
@@ -2,6 +2,9 @@ export const types = {
   GET_METADATA_REQUEST: 'GET_METADATA_REQUEST',
   GET_METADATA_SUCCESS: 'GET_METADATA_SUCCESS',
   GET_METADATA_FAILURE: 'GET_METADATA_FAILURE',
+  GET_REQUEST_TYPES_SUCCESS: 'GET_REQUEST_TYPES_SUCCESS',
+  GET_COUNCILS_SUCCESS: 'GET_COUNCILS_SUCCESS',
+  GET_REGIONS_SUCCESS: 'GET_REGIONS_SUCCESS',
 };
 
 export const getMetadataRequest = () => ({
@@ -18,14 +21,53 @@ export const getMetadataFailure = error => ({
   payload: error,
 });
 
-const initialState = {};
+export const getRequestTypesSuccess = response => ({
+  type: types.GET_REQUEST_TYPES_SUCCESS,
+  payload: response,
+})
+
+export const getCouncilsSuccess = response => ({
+  type: types.GET_COUNCILS_SUCCESS,
+  payload: response,
+})
+
+export const getRegionsSuccess = response => ({
+  type: types.GET_REGIONS_SUCCESS,
+  payload: response,
+})
+
+const initialState = {
+  currentTime: null,
+  gitSha: null,
+  version: null,
+  lastPulled: null,
+  requestTypes: null,
+  councils: null,
+  regions: null,
+};
 
 export default (state = initialState, action) => {
   switch (action.type) {
     case types.GET_METADATA_SUCCESS:
       return {
+        ...state,
         ...action.payload,
       };
+    case types.GET_REQUEST_TYPES_SUCCESS:
+      return {
+        ...state,
+        requestTypes: action.payload,
+      }
+    case types.GET_COUNCILS_SUCCESS:
+      return {
+        ...state,
+        councils: action.payload,
+      }
+    case types.GET_REGIONS_SUCCESS:
+      return {
+        ...state,
+        regions: action.payload,
+      }
     case types.GET_METADATA_FAILURE: {
       const {
         response: { status },
diff --git a/client/redux/sagas/data.js b/client/redux/sagas/data.js
index bdce07faa..b0dac50ca 100644
--- a/client/redux/sagas/data.js
+++ b/client/redux/sagas/data.js
@@ -15,8 +15,6 @@ import {
   getDataRequest,
   getPinsSuccess,
   getPinsFailure,
-  // getPinClustersSuccess,
-  // getPinClustersFailure,
   getHeatmapSuccess,
   getHeatmapFailure,
   getPinInfoSuccess,
@@ -52,28 +50,6 @@ function* fetchPins(filters) {
   return data;
 }
 
-// function* fetchPinClusters(filters, { zoom, bounds }) {
-//   const clustersUrl = `${BASE_URL}/map/clusters`;
-
-//   const {
-//     _northEast: { lat: north, lng: east },
-//     _southWest: { lat: south, lng: west },
-//   } = bounds;
-
-//   const { data } = yield call(axios.post, clustersUrl, {
-//     ...filters,
-//     zoom,
-//     bounds: {
-//       north,
-//       east,
-//       south,
-//       west,
-//     },
-//   });
-
-//   return data;
-// }
-
 function* fetchHeatmap(filters) {
   const heatmapUrl = `${BASE_URL}/map/heat`;
 
@@ -199,26 +175,6 @@ function* getVisData() {
   }
 }
 
-// function* updatePinClusters() {
-//   const filters = yield getFilters();
-
-//   if (
-//     !filters.startDate
-//     || !filters.endDate
-//     || !filters.ncList.length
-//     || !filters.requestTypes.length
-//   ) return;
-
-//   const mapPosition = yield getMapPosition();
-//   try {
-//     const data = yield call(fetchPinClusters, filters, mapPosition);
-//     yield put(getPinClustersSuccess(data));
-//   } catch (e) {
-//     yield put(getPinClustersFailure(e));
-//     yield put(setErrorModal(true));
-//   }
-// }
-
 function* getPinData(action) {
   try {
     const srnumber = action.payload;
@@ -248,5 +204,4 @@ export default function* rootSaga() {
   yield takeLatest(types.GET_DATA_REQUEST, getVisData);
   yield takeEvery(types.GET_PIN_INFO_REQUEST, getPinData);
   yield takeLatest(types.SEND_GIT_REQUEST, sendContactData);
-  // yield takeLatest(uiTypes.UPDATE_MAP_POSITION, updatePinClusters);
 }
diff --git a/client/redux/sagas/metadata.js b/client/redux/sagas/metadata.js
index 38758f9d9..6fae9cf9e 100644
--- a/client/redux/sagas/metadata.js
+++ b/client/redux/sagas/metadata.js
@@ -3,19 +3,38 @@ import {
   takeLatest,
   call,
   put,
+  all,
 } from 'redux-saga/effects';
 
 import {
   types,
   getMetadataSuccess,
+  getRequestTypesSuccess,
+  getCouncilsSuccess,
+  getRegionsSuccess,
   getMetadataFailure,
 } from '../reducers/metadata';
 
 function* getMetadata() {
-  const url = `${process.env.API_URL}/status/api`;
+  const baseUrl = process.env.API_URL;
   try {
-    const { data } = yield call(axios.get, url);
-    yield put(getMetadataSuccess(data));
+    const [metadata, types, councils, regions] = yield all([
+      call(axios.get, baseUrl + '/status/api'),
+      call(axios.get, baseUrl +  '/types/'),
+      call(axios.get, baseUrl + '/councils/'),
+      call(axios.get, baseUrl + '/regions/'),
+    ]);
+    const { data: statusMetadata } = metadata;
+    const { data: typesMetadata } = types;
+    const { data: councilsMetadata } = councils;
+    const { data: regionsMetadata } = regions;
+
+    yield all([
+      put(getMetadataSuccess(statusMetadata)),
+      put(getRequestTypesSuccess(typesMetadata)),
+      put(getCouncilsSuccess(councilsMetadata)),
+      put(getRegionsSuccess(regionsMetadata)),
+    ]);
   } catch (e) {
     yield put(getMetadataFailure(e));
   }

From 69453bcd129e07c8f2ee9197368be98a7d563679 Mon Sep 17 00:00:00 2001
From: Adam Kendis <atkendis@gmail.com>
Date: Thu, 17 Dec 2020 16:34:26 -0800
Subject: [PATCH 3/9] update theme

---
 client/components/Footer.jsx                  |  8 +++----
 client/components/Header.jsx                  |  6 ++++--
 client/components/Map/{index.jsx => index.js} |  6 +-----
 client/theme/theme.js                         | 21 +++++++++++--------
 4 files changed, 21 insertions(+), 20 deletions(-)
 rename client/components/Map/{index.jsx => index.js} (96%)

diff --git a/client/components/Footer.jsx b/client/components/Footer.jsx
index 8b422740a..11418da53 100644
--- a/client/components/Footer.jsx
+++ b/client/components/Footer.jsx
@@ -8,19 +8,19 @@ import {
 import { makeStyles } from '@material-ui/core/styles';
 import moment from 'moment';
 
-// TODO: pull style constants into mui theme
 const useStyles = makeStyles(theme => ({
   footer: {
     position: 'absolute',
     bottom: 0,
-    height: '40px',
+    height: theme.footer.height,
     width: '100%',
     backgroundColor: theme.palette.primary.dark,
   },
   lastUpdated: {
-    color: theme.palette.typography.dark,
-    lineHeight: '40px',
+    color: theme.palette.text.dark,
+    lineHeight: theme.footer.height,
     fontSize: '14px',
+    fontFamily: 'Roboto',
   },
 }));
 
diff --git a/client/components/Header.jsx b/client/components/Header.jsx
index ed51ecfdf..0e749987b 100644
--- a/client/components/Header.jsx
+++ b/client/components/Header.jsx
@@ -10,15 +10,17 @@ import {
 
 const useStyles = makeStyles(theme => ({
   appBar: {
-    height: theme.palette.header.height,
+    height: theme.header.height,
     backgroundColor: theme.palette.primary.main,
   },
   button: {
     textTransform: 'none',
+    fontFamily: 'Roboto',
+    marginLeft: theme.spacing(2),
   },
   title: {
     flexGrow: 1,
-    fontFamily: theme.palette.typography.fontFamily,
+    fontFamily: theme.typography.fontFamily,
     fontSize: '30px',
     fontWeight: 'bold',
     letterSpacing: '4px',
diff --git a/client/components/Map/index.jsx b/client/components/Map/index.js
similarity index 96%
rename from client/components/Map/index.jsx
rename to client/components/Map/index.js
index e979de2b8..114469c59 100644
--- a/client/components/Map/index.jsx
+++ b/client/components/Map/index.js
@@ -12,11 +12,7 @@ import Map from './Map';
 
 const styles = theme => ({
   root: {
-    position: 'absolute',
-    top: theme.palette.header.height,
-    bottom: theme.palette.footer.height,
-    left: 0,
-    right: 0,
+    height: '100%',
   },
 })
 
diff --git a/client/theme/theme.js b/client/theme/theme.js
index 6fe3e31b6..6d3467956 100644
--- a/client/theme/theme.js
+++ b/client/theme/theme.js
@@ -4,7 +4,7 @@ const theme = createMuiTheme({
   palette: {
     type: 'dark',
     primary: {
-      main: '#2A404E',
+      main: '#29404F',
       dark: '#192730',
     },
     secondary: {
@@ -13,17 +13,20 @@ const theme = createMuiTheme({
     background: {
       default: '#1A1A1A',
     },
-    typography: {
-      fontFamily: ['Oswald', 'sans-serif'],
+    text: {
       dark: '#C4C4C4',
+      cyan: '#87C8BC',
     },
-    header: {
-      height: '62px',
-    },
-    footer: {
-      height: '40px',
-    },
   },
+  header: {
+    height: '62px',
+  },
+  footer: {
+    height: '40px',
+  },
+  typography: {
+    fontFamily: ['Oswald', 'sans-serif'],
+  }
 });
 
 export default theme;

From b4f55df368ade4170350ef78a928af22e26d5544 Mon Sep 17 00:00:00 2001
From: Adam Kendis <atkendis@gmail.com>
Date: Thu, 17 Dec 2020 16:35:25 -0800
Subject: [PATCH 4/9] starter desktop filters menu

---
 client/components/FilterMenu/index.js   | 98 +++++++++++++++++++++++++
 client/components/GearButton/index.jsx  |  8 +-
 client/components/main/Desktop/index.js | 31 ++++++++
 client/components/main/Mobile/.gitkeep  |  0
 4 files changed, 134 insertions(+), 3 deletions(-)
 create mode 100644 client/components/FilterMenu/index.js
 create mode 100644 client/components/main/Desktop/index.js
 create mode 100644 client/components/main/Mobile/.gitkeep

diff --git a/client/components/FilterMenu/index.js b/client/components/FilterMenu/index.js
new file mode 100644
index 000000000..919a68b3a
--- /dev/null
+++ b/client/components/FilterMenu/index.js
@@ -0,0 +1,98 @@
+import React, { useState, useEffect, useCallback } from 'react';
+import { makeStyles } from '@material-ui/core/styles';
+import Card from '@material-ui/core/Card'
+import CardHeader from '@material-ui/core/CardHeader';
+import CardContent from '@material-ui/core/CardContent';
+import IconButton from '@material-ui/core/IconButton'
+import ArrowDropDownIcon from '@material-ui/icons/ArrowDropDown'
+import ArrowDropUpIcon from '@material-ui/icons/ArrowDropUp'
+import Collapse from '@material-ui/core/Collapse';
+import Typography from '@material-ui/core/Typography'
+import GearButton from '../GearButton'
+
+const useStyles = makeStyles(theme => ({
+  card: {
+    width: 300,
+    backgroundColor: theme.palette.primary.main,
+    position: 'absolute',
+    left: 35,
+    top: 75,
+    borderRadius: 15,
+  },
+  header: {
+    color: theme.palette.text.cyan,
+    padding: 5,
+    paddingRight: 0,
+  },
+  headerAction: {
+    margin: 'auto',
+  },
+  headerTitle: {
+    marginLeft: 10,
+    fontSize: 20,
+    fontWeight: 600,
+    letterSpacing: '2px',
+  },
+  button: {
+    padding: 5,
+    paddingRight: 0,
+    color: theme.palette.text.dark,
+    '&:hover': {
+      backgroundColor: theme.palette.primary.main,
+    },
+    '& svg': {
+      fontSize: 30,
+    },
+  },
+}));
+
+const FilterMenu = () => {
+  const [expanded, setExpanded] = useState(false);
+  const classes = useStyles()
+
+  return (
+    <Card className={classes.card}>
+      <CardHeader
+        classes={{
+          root: classes.header,
+          action: classes.headerAction,
+        }}
+        title={(
+          <>
+            <GearButton
+              aria-label="toggle map menu"
+              // TODO: toggle left slider menu
+              onClick={() => console.log('toggle left slider')}
+            />
+            <Typography
+              className={classes.headerTitle}
+              component="span"
+            >
+              FILTERS
+            </Typography>
+          </>
+        )}
+        action={
+          <IconButton
+            className={classes.button}
+            aria-label="toggle filter menu"
+            onClick={() => setExpanded(expanded => !expanded)}
+            disableFocusRipple
+            disableRipple
+          >
+            {expanded ? <ArrowDropUpIcon/> : <ArrowDropDownIcon/> }
+          </IconButton>
+        }
+      >
+      // TODO: add basic/advanced toggle switch
+      </CardHeader>
+      <Collapse in={expanded}>
+        <CardContent>
+          TODO: Selectors
+        </CardContent>
+      </Collapse>
+    </Card>
+  )
+};
+
+export default FilterMenu;
diff --git a/client/components/GearButton/index.jsx b/client/components/GearButton/index.jsx
index 4d1df34ba..a09866043 100644
--- a/client/components/GearButton/index.jsx
+++ b/client/components/GearButton/index.jsx
@@ -4,9 +4,9 @@ import { IconButton } from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
 import SettingsSharpIcon from '@material-ui/icons/SettingsSharp';
 
-const useStyles = makeStyles({
+const useStyles = makeStyles(theme => ({
   gearIcon: {
-    color: 'white',
+    color: theme.palette.text.dark,
     background: '#29404F',
     borderRadius: '12px',
     height: '33px',
@@ -16,7 +16,7 @@ const useStyles = makeStyles({
   button: {
     padding: '0',
   },
-});
+}));
 
 const GearButton = ({ onClick }) => {
   const { gearIcon, button } = useStyles();
@@ -44,6 +44,8 @@ const GearButton = ({ onClick }) => {
       role="button"
       aria-pressed={pressed}
       aria-label="Toggle Sidebar"
+      disableFocusRipple
+      disableRipple
     >
       <SettingsSharpIcon className={gearIcon} />
     </IconButton>
diff --git a/client/components/main/Desktop/index.js b/client/components/main/Desktop/index.js
new file mode 100644
index 000000000..5cbe0cc24
--- /dev/null
+++ b/client/components/main/Desktop/index.js
@@ -0,0 +1,31 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { makeStyles } from '@material-ui/core/styles'
+import MapContainer from '@components/Map'
+import FilterMenu from '@components/FilterMenu'
+
+const useStyles = makeStyles(theme => ({
+  root: {
+    position: 'absolute',
+    top: theme.header.height,
+    bottom: theme.footer.height,
+    left: 0,
+    right: 0,
+  },
+}));
+
+const Desktop = () => {
+  const classes = useStyles()
+
+  return (
+    <div className={classes.root}>
+      <MapContainer />
+      <FilterMenu />
+    </div>
+  )
+};
+
+export default Desktop;
+
+Desktop.propTypes = {};
+Desktop.defaultProps = {};
\ No newline at end of file
diff --git a/client/components/main/Mobile/.gitkeep b/client/components/main/Mobile/.gitkeep
new file mode 100644
index 000000000..e69de29bb

From e6401a9a6da6c89d38f2cad29ef1529cb402eb0c Mon Sep 17 00:00:00 2001
From: Adam Kendis <atkendis@gmail.com>
Date: Thu, 17 Dec 2020 16:35:42 -0800
Subject: [PATCH 5/9] Added Desktop component to map route

---
 client/Routes.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/Routes.jsx b/client/Routes.jsx
index 9ebef68aa..53fe8ccc8 100644
--- a/client/Routes.jsx
+++ b/client/Routes.jsx
@@ -12,7 +12,7 @@ import {
 // import About from './components/about/About';
 // import Body from './components/main/body/Body';
 // import Faq from './components/faq/Faq';
-import MapContainer from '@components/Map/'
+import Desktop from '@components/main/Desktop'
 
 export default function Routes() {
   return (
@@ -23,7 +23,7 @@ export default function Routes() {
       {/* <Route path="/comparison" component={Body} /> */}
       {/* <Route path="/faq" component={Faq} /> */}
       {/* <Route path="/data" component={Body} /> */}
-      <Route path="/map" component={MapContainer} />
+      <Route path="/map" component={Desktop} />
       <Route path="/">
         <Redirect to="map" />
       </Route>

From 383c624e43f1c73b583fb0dfc4c3f889b29b2162 Mon Sep 17 00:00:00 2001
From: Adam Kendis <atkendis@gmail.com>
Date: Thu, 17 Dec 2020 16:47:18 -0800
Subject: [PATCH 6/9] linting

---
 client/App.jsx                          |  2 +-
 client/components/FilterMenu/index.js   | 34 ++++++++++++-------------
 client/components/main/Desktop/index.js | 14 ++++------
 client/index.js                         |  2 +-
 client/redux/reducers/metadata.js       | 12 ++++-----
 client/redux/sagas/metadata.js          | 12 ++++-----
 client/theme/theme.js                   |  2 +-
 7 files changed, 37 insertions(+), 41 deletions(-)

diff --git a/client/App.jsx b/client/App.jsx
index 47aaad02e..6de727fa0 100644
--- a/client/App.jsx
+++ b/client/App.jsx
@@ -3,9 +3,9 @@ import PropTypes from 'proptypes';
 import { BrowserRouter } from 'react-router-dom';
 import { connect } from 'react-redux';
 import { getMetadataRequest } from '@reducers/metadata';
-import Routes from './Routes';
 import Header from '@components/Header';
 import Footer from '@components/Footer';
+import Routes from './Routes';
 
 const App = ({
   getMetadata,
diff --git a/client/components/FilterMenu/index.js b/client/components/FilterMenu/index.js
index 919a68b3a..f69140ded 100644
--- a/client/components/FilterMenu/index.js
+++ b/client/components/FilterMenu/index.js
@@ -1,14 +1,14 @@
-import React, { useState, useEffect, useCallback } from 'react';
+import React, { useState } from 'react';
 import { makeStyles } from '@material-ui/core/styles';
-import Card from '@material-ui/core/Card'
+import Card from '@material-ui/core/Card';
 import CardHeader from '@material-ui/core/CardHeader';
 import CardContent from '@material-ui/core/CardContent';
-import IconButton from '@material-ui/core/IconButton'
-import ArrowDropDownIcon from '@material-ui/icons/ArrowDropDown'
-import ArrowDropUpIcon from '@material-ui/icons/ArrowDropUp'
+import IconButton from '@material-ui/core/IconButton';
+import ArrowDropDownIcon from '@material-ui/icons/ArrowDropDown';
+import ArrowDropUpIcon from '@material-ui/icons/ArrowDropUp';
 import Collapse from '@material-ui/core/Collapse';
-import Typography from '@material-ui/core/Typography'
-import GearButton from '../GearButton'
+import Typography from '@material-ui/core/Typography';
+import GearButton from '../GearButton';
 
 const useStyles = makeStyles(theme => ({
   card: {
@@ -17,7 +17,7 @@ const useStyles = makeStyles(theme => ({
     position: 'absolute',
     left: 35,
     top: 75,
-    borderRadius: 15,
+    borderRadius: 10,
   },
   header: {
     color: theme.palette.text.cyan,
@@ -48,8 +48,9 @@ const useStyles = makeStyles(theme => ({
 
 const FilterMenu = () => {
   const [expanded, setExpanded] = useState(false);
-  const classes = useStyles()
+  const classes = useStyles();
 
+  // TODO: add basic/advanced toggle switch
   return (
     <Card className={classes.card}>
       <CardHeader
@@ -62,6 +63,7 @@ const FilterMenu = () => {
             <GearButton
               aria-label="toggle map menu"
               // TODO: toggle left slider menu
+              // eslint-disable-next-line
               onClick={() => console.log('toggle left slider')}
             />
             <Typography
@@ -72,27 +74,25 @@ const FilterMenu = () => {
             </Typography>
           </>
         )}
-        action={
+        action={(
           <IconButton
             className={classes.button}
             aria-label="toggle filter menu"
-            onClick={() => setExpanded(expanded => !expanded)}
+            onClick={() => setExpanded(prevExpanded => !prevExpanded)}
             disableFocusRipple
             disableRipple
           >
-            {expanded ? <ArrowDropUpIcon/> : <ArrowDropDownIcon/> }
+            {expanded ? <ArrowDropUpIcon /> : <ArrowDropDownIcon /> }
           </IconButton>
-        }
-      >
-      // TODO: add basic/advanced toggle switch
-      </CardHeader>
+        )}
+      />
       <Collapse in={expanded}>
         <CardContent>
           TODO: Selectors
         </CardContent>
       </Collapse>
     </Card>
-  )
+  );
 };
 
 export default FilterMenu;
diff --git a/client/components/main/Desktop/index.js b/client/components/main/Desktop/index.js
index 5cbe0cc24..023a1292f 100644
--- a/client/components/main/Desktop/index.js
+++ b/client/components/main/Desktop/index.js
@@ -1,8 +1,7 @@
 import React from 'react';
-import PropTypes from 'prop-types';
-import { makeStyles } from '@material-ui/core/styles'
-import MapContainer from '@components/Map'
-import FilterMenu from '@components/FilterMenu'
+import { makeStyles } from '@material-ui/core/styles';
+import MapContainer from '@components/Map';
+import FilterMenu from '@components/FilterMenu';
 
 const useStyles = makeStyles(theme => ({
   root: {
@@ -15,17 +14,14 @@ const useStyles = makeStyles(theme => ({
 }));
 
 const Desktop = () => {
-  const classes = useStyles()
+  const classes = useStyles();
 
   return (
     <div className={classes.root}>
       <MapContainer />
       <FilterMenu />
     </div>
-  )
+  );
 };
 
 export default Desktop;
-
-Desktop.propTypes = {};
-Desktop.defaultProps = {};
\ No newline at end of file
diff --git a/client/index.js b/client/index.js
index 5479f8ed9..d09a0bcaa 100644
--- a/client/index.js
+++ b/client/index.js
@@ -5,9 +5,9 @@ import 'regenerator-runtime/runtime';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Provider } from 'react-redux';
-import store from './redux/store';
 import { ThemeProvider } from '@material-ui/core/styles';
 import { CssBaseline } from '@material-ui/core';
+import store from './redux/store';
 import App from './App';
 import theme from './theme/theme';
 
diff --git a/client/redux/reducers/metadata.js b/client/redux/reducers/metadata.js
index 1302de4db..9ebf10dab 100644
--- a/client/redux/reducers/metadata.js
+++ b/client/redux/reducers/metadata.js
@@ -24,17 +24,17 @@ export const getMetadataFailure = error => ({
 export const getRequestTypesSuccess = response => ({
   type: types.GET_REQUEST_TYPES_SUCCESS,
   payload: response,
-})
+});
 
 export const getCouncilsSuccess = response => ({
   type: types.GET_COUNCILS_SUCCESS,
   payload: response,
-})
+});
 
 export const getRegionsSuccess = response => ({
   type: types.GET_REGIONS_SUCCESS,
   payload: response,
-})
+});
 
 const initialState = {
   currentTime: null,
@@ -57,17 +57,17 @@ export default (state = initialState, action) => {
       return {
         ...state,
         requestTypes: action.payload,
-      }
+      };
     case types.GET_COUNCILS_SUCCESS:
       return {
         ...state,
         councils: action.payload,
-      }
+      };
     case types.GET_REGIONS_SUCCESS:
       return {
         ...state,
         regions: action.payload,
-      }
+      };
     case types.GET_METADATA_FAILURE: {
       const {
         response: { status },
diff --git a/client/redux/sagas/metadata.js b/client/redux/sagas/metadata.js
index 6fae9cf9e..6de299f35 100644
--- a/client/redux/sagas/metadata.js
+++ b/client/redux/sagas/metadata.js
@@ -18,14 +18,14 @@ import {
 function* getMetadata() {
   const baseUrl = process.env.API_URL;
   try {
-    const [metadata, types, councils, regions] = yield all([
-      call(axios.get, baseUrl + '/status/api'),
-      call(axios.get, baseUrl +  '/types/'),
-      call(axios.get, baseUrl + '/councils/'),
-      call(axios.get, baseUrl + '/regions/'),
+    const [metadata, requestTypes, councils, regions] = yield all([
+      call(axios.get, '/status/api'),
+      call(axios.get, `${baseUrl}/types/`),
+      call(axios.get, `${baseUrl}/councils/`),
+      call(axios.get, `${baseUrl}/regions/`),
     ]);
     const { data: statusMetadata } = metadata;
-    const { data: typesMetadata } = types;
+    const { data: typesMetadata } = requestTypes;
     const { data: councilsMetadata } = councils;
     const { data: regionsMetadata } = regions;
 
diff --git a/client/theme/theme.js b/client/theme/theme.js
index 6d3467956..a792ba53a 100644
--- a/client/theme/theme.js
+++ b/client/theme/theme.js
@@ -26,7 +26,7 @@ const theme = createMuiTheme({
   },
   typography: {
     fontFamily: ['Oswald', 'sans-serif'],
-  }
+  },
 });
 
 export default theme;

From 10d1285d0cadf008aedcc8b6e5d7697fae5fa204 Mon Sep 17 00:00:00 2001
From: Adam Kendis <atkendis@gmail.com>
Date: Thu, 17 Dec 2020 16:49:48 -0800
Subject: [PATCH 7/9] fix url in getMetadata saga

---
 client/redux/sagas/metadata.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/redux/sagas/metadata.js b/client/redux/sagas/metadata.js
index 6de299f35..1ac00c49e 100644
--- a/client/redux/sagas/metadata.js
+++ b/client/redux/sagas/metadata.js
@@ -19,7 +19,7 @@ function* getMetadata() {
   const baseUrl = process.env.API_URL;
   try {
     const [metadata, requestTypes, councils, regions] = yield all([
-      call(axios.get, '/status/api'),
+      call(axios.get, `${baseUrl}/status/api`),
       call(axios.get, `${baseUrl}/types/`),
       call(axios.get, `${baseUrl}/councils/`),
       call(axios.get, `${baseUrl}/regions/`),

From d4a38901822e3212bedd05cdd58e5da3d1f936d4 Mon Sep 17 00:00:00 2001
From: Adam Kendis <atkendis@gmail.com>
Date: Thu, 17 Dec 2020 16:56:12 -0800
Subject: [PATCH 8/9] clean up comments

---
 client/Routes.jsx | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/client/Routes.jsx b/client/Routes.jsx
index 53fe8ccc8..183d8d273 100644
--- a/client/Routes.jsx
+++ b/client/Routes.jsx
@@ -1,28 +1,14 @@
-/* eslint-disable */
-// temporarily disabling eslint here until v2 refactor
 import React from 'react';
 import {
   Switch,
   Route,
   Redirect,
 } from 'react-router-dom';
-
-// import PrivacyPolicy from '@components/privacyPolicy/PrivacyPolicy';
-// import Contact from './components/contact/Contact';
-// import About from './components/about/About';
-// import Body from './components/main/body/Body';
-// import Faq from './components/faq/Faq';
-import Desktop from '@components/main/Desktop'
+import Desktop from '@components/main/Desktop';
 
 export default function Routes() {
   return (
     <Switch>
-      {/* <Route path="/contact" component={Contact} /> */}
-      {/* <Route path="/about" component={About} /> */}
-      {/* <Route path="/privacy" component={PrivacyPolicy} /> */}
-      {/* <Route path="/comparison" component={Body} /> */}
-      {/* <Route path="/faq" component={Faq} /> */}
-      {/* <Route path="/data" component={Body} /> */}
       <Route path="/map" component={Desktop} />
       <Route path="/">
         <Redirect to="map" />

From 17027c603d5510471b148e9b3cd319f3e78f7b25 Mon Sep 17 00:00:00 2001
From: Adam Kendis <atkendis@gmail.com>
Date: Thu, 7 Jan 2021 12:14:58 -0800
Subject: [PATCH 9/9] linting

---
 client/components/GearButton/index.jsx |  2 +-
 client/components/LeftDrawer/index.jsx | 24 +++++++++++-------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/client/components/GearButton/index.jsx b/client/components/GearButton/index.jsx
index 6aa1c5c8f..875f1b4f4 100644
--- a/client/components/GearButton/index.jsx
+++ b/client/components/GearButton/index.jsx
@@ -39,7 +39,7 @@ const GearButton = ({
     setPressed(!pressed);
     onClick();
   };
-  
+
   return (
     <IconButton
       className={button}
diff --git a/client/components/LeftDrawer/index.jsx b/client/components/LeftDrawer/index.jsx
index e69b292f2..62f8e62d9 100644
--- a/client/components/LeftDrawer/index.jsx
+++ b/client/components/LeftDrawer/index.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import PropTypes from 'proptypes';
 import { makeStyles, useTheme } from '@material-ui/core/styles';
 import Drawer from '@material-ui/core/Drawer';
@@ -90,20 +90,18 @@ const PersistentDrawerLeft = ({ menuIsOpen, toggleMenu }) => {
     // TODO ADD FUNCTIONALITY
   };
 
-  const escFunction = e => {
-    e.preventDefault();
-    if (e.key === 'Escape'
-    ) {
-      toggleMenu();
-    }
-  };
+  useEffect(() => {
+    const escFunction = e => {
+      e.preventDefault();
+      if (e.key === 'Escape') {
+        toggleMenu();
+      }
+    };
 
-  React.useEffect(() => {
     document.addEventListener('keypress', escFunction, false);
-    return () => {
-      document.removeEventListener('keypress', escFunction, false);
-    };
-  }, [escFunction]);
+
+    return () => document.removeEventListener('keypress', escFunction, false);
+  }, [toggleMenu]);
 
   return (
     <div className={classes.root}>