updated lastPulled to lastPulledLocal

hackforla · Jan 7, 2021 · eb68f61 · eb68f61
1 parent ebc1e40
commit eb68f61
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/client/components/Footer.jsx b/client/components/Footer.jsx
@@ -46,7 +46,7 @@ const Footer = ({
 };
 
 const mapStateToProps = state => ({
-  lastUpdated: state.metadata.lastPulled,
+  lastUpdated: state.metadata.lastPulledLocal,
 });
 
 Footer.propTypes = {

diff --git a/client/components/Map/index.js b/client/components/Map/index.js
@@ -121,7 +121,7 @@ class MapContainer extends React.Component {
 const mapStateToProps = state => ({
   pins: state.data.pins,
   position: state.ui.map,
-  lastUpdated: state.metadata.lastPulled,
+  lastUpdated: state.metadata.lastPulledLocal,
   activeMode: state.ui.map.activeMode,
   requestTypes: state.mapFilters.requestTypes,
 });

diff --git a/client/redux/reducers/metadata.js b/client/redux/reducers/metadata.js
@@ -37,10 +37,12 @@ export const getRegionsSuccess = response => ({
 });
 
 const initialState = {
-  currentTime: null,
+  currentTimeUTC: null,
+  currentTimeLocal: null,
   gitSha: null,
   version: null,
-  lastPulled: null,
+  lastPulledUTC: null,
+  lastPulledLocal: null,
   requestTypes: null,
   councils: null,
   regions: null,

diff --git a/client/redux/sagas/metadata.js b/client/redux/sagas/metadata.js
@@ -20,9 +20,9 @@ function* getMetadata() {
   try {
     const [metadata, requestTypes, 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/`),
+      call(axios.get, `${baseUrl}/types`),
+      call(axios.get, `${baseUrl}/councils`),
+      call(axios.get, `${baseUrl}/regions`),
     ]);
     const { data: statusMetadata } = metadata;
     const { data: typesMetadata } = requestTypes;