fix: default time range; bug; layout

nmcharlton · Dec 18, 2021 · 970accb · 970accb
1 parent 2855894
commit 970accb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.env.development b/.env.development
@@ -1,7 +1,7 @@
 REACT_APP_WEBMAP_DOMAIN=http://dev.treetracker.org
 REACT_APP_API_ROOT=https://dev-k8s.treetracker.org/api/admin
 REACT_APP_TREETRACKER_API_ROOT=https://dev-k8s.treetracker.org/treetracker
-REACT_APP_REPORTING_API_ROOT=https://dev-k8s.treetracker.org/reporting
 REACT_APP_ENABLE_CAPTURE_MATCHING=true
+REACT_APP_REPORTING_API_ROOT=https://dev-k8s.treetracker.org/reporting
 REACT_APP_REPORTING_ENABLED=true
 REACT_APP_ENABLE_EARNINGS=true
diff --git a/src/components/Home/Home.js b/src/components/Home/Home.js
@@ -53,7 +53,7 @@ function Home(props) {
   React.useEffect(() => {
     async function loadUpdateTime() {
       const res = await axios(
-        `${process.env.REACT_APP_REPORTING_API_ROOT}/capture/statistics`,
+        `${process.env.REACT_APP_REPORTING_API_ROOT}/capture/statistics?`,
       );
       const { data } = res;
       setUpdateTime(data.last_updated_at);
@@ -66,7 +66,7 @@ function Home(props) {
     { range: 356, text: 'Last Year' },
     { range: 356 * 50, text: 'All' },
   ];
-  const [timeRangeIndex, setTimeRangeIndex] = React.useState(0);
+  const [timeRangeIndex, setTimeRangeIndex] = React.useState(3);
   const [startDate, setStartDate] = React.useState(
     moment()
       .add(-1 * timeRange[timeRangeIndex], 'day')

diff --git a/src/components/Home/Home.styles.js b/src/components/Home/Home.styles.js
@@ -61,6 +61,7 @@ const styles = (theme) => ({
   },
   statCardGrid: {
     padding: 0,
+    flexWrap: 'wrap',
   },
 });
 

diff --git a/src/components/reportingCards/ReportingCard.hook.js b/src/components/reportingCards/ReportingCard.hook.js
@@ -18,6 +18,8 @@ export default function useLoadData(
       url: `${process.env.REACT_APP_REPORTING_API_ROOT}/capture/statistics/card`,
       params: {
         card_title: field1,
+        capture_created_start_date: startDate ? startDate : undefined,
+        capture_created_end_date: endDate ? endDate : undefined,
         // TODO optimize when data increases
         limit: 100,
       },
-Original file line number
+Diff line change
@@ Expand Up / @@ -61,6 +61,7 @@ const styles = (theme) => ({ @@
       },
       statCardGrid: {
         padding: 0,
+        flexWrap: 'wrap',
       },
     });
@@ Expand Down @@