Refactor: Move API URL to constants.js

covid19india · Jul 6, 2020 · 9c7c859 · 9c7c859
1 parent a8f8360
commit 9c7c859
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 26 deletions.
diff --git a/src/components/Home.js b/src/components/Home.js
@@ -1,3 +1,4 @@
+import {API_ROOT_URL} from '../constants';
 import useIsVisible from '../hooks/useIsVisible';
 import useStickySWR from '../hooks/useStickySWR';
 import {fetcher} from '../utils/commonFunctions';
@@ -33,7 +34,7 @@ function Home(props) {
   const location = useLocation();
 
   const {data: timeseries} = useStickySWR(
-    'https://api.covid19india.org/v4/min/timeseries.min.json',
+    `${API_ROOT_URL}/timeseries.min.json`,
     fetcher,
     {
       revalidateOnMount: true,
@@ -42,9 +43,7 @@ function Home(props) {
   );
 
   const {data} = useStickySWR(
-    `https://api.covid19india.org/v4/min/data${
-      date ? `-${date}` : ''
-    }.min.json`,
+    `${API_ROOT_URL}/data${date ? `-${date}` : ''}.min.json`,
     fetcher,
     {
       revalidateOnMount: true,

diff --git a/src/components/State.js b/src/components/State.js
@@ -4,7 +4,7 @@ import MapSwitcher from './MapSwitcher';
 import StateHeader from './StateHeader';
 import StateMeta from './StateMeta';
 
-import {STATE_NAMES} from '../constants';
+import {API_ROOT_URL, STATE_NAMES} from '../constants';
 import useIsVisible from '../hooks/useIsVisible';
 import {fetcher, formatNumber, getStatistic} from '../utils/commonFunctions';
 
@@ -53,22 +53,18 @@ function State(props) {
   }, [regionHighlighted.stateCode, stateCode]);
 
   const {data: timeseries} = useSWR(
-    `https://api.covid19india.org/v4/min/timeseries-${stateCode}.min.json`,
+    `${API_ROOT_URL}/timeseries-${stateCode}.min.json`,
     fetcher,
     {
       revalidateOnMount: true,
       refreshInterval: 100000,
     }
   );
 
-  const {data} = useSWR(
-    'https://api.covid19india.org/v4/min/data.min.json',
-    fetcher,
-    {
-      revalidateOnMount: true,
-      refreshInterval: 100000,
-    }
-  );
+  const {data} = useSWR(`${API_ROOT_URL}/data.min.json`, fetcher, {
+    revalidateOnMount: true,
+    refreshInterval: 100000,
+  });
 
   const toggleShowAllDistricts = () => {
     setShowAllDistricts(!showAllDistricts);
@@ -138,16 +134,18 @@ function State(props) {
           </div>
 
           {data && (
-            <MapExplorer
-              {...{
-                stateCode,
-                data,
-                regionHighlighted,
-                setRegionHighlighted,
-                mapStatistic,
-                setMapStatistic,
-              }}
-            ></MapExplorer>
+            <Suspense fallback={<div style={{minHeight: '50rem'}} />}>
+              <MapExplorer
+                {...{
+                  stateCode,
+                  data,
+                  regionHighlighted,
+                  setRegionHighlighted,
+                  mapStatistic,
+                  setMapStatistic,
+                }}
+              ></MapExplorer>
+            </Suspense>
           )}
 
           <span ref={stateMetaElement} />

diff --git a/src/components/Timeline.js b/src/components/Timeline.js
@@ -115,8 +115,8 @@ const Timeline = ({setIsTimelineMode, setDate, dates}) => {
     '2020-04-14': 'End of Lockdown Phase 1',
     '2020-04-15': 'Beginning of Lockdown Phase 2',
     '2020-05-03': 'End of Lockdown Phase 2',
-    '2020-04-04': 'Beginning of Lockdown Phase 3',
-    '2020-04-17': 'End of Lockdown Phase 3',
+    '2020-05-04': 'Beginning of Lockdown Phase 3',
+    '2020-05-17': 'End of Lockdown Phase 3',
     '2020-05-18': 'Beginning of Lockdown Phase 4',
     '2020-05-31': 'End of Lockdown Phase 4',
     '2020-06-01': 'Beginning of Lockdown Phase 5',

diff --git a/src/constants.js b/src/constants.js
@@ -1,3 +1,5 @@
+export const API_ROOT_URL = 'https://api.covid19india.org/v4/min';
+
 export const LOCALE_SHORTHANDS = {
   english: 'en-US',
   hindi: 'hi',