Merge pull request #66 from Chicago-Deep-Dish/records-connection

Records connection
Chicago-Deep-Dish · Jul 1, 2022 · 5fe2682 · 5fe2682
2 parents 747cd35 + 73261a8
commit 5fe2682
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/components/RecordLibraryPage/InputFields.js b/src/components/RecordLibraryPage/InputFields.js
@@ -60,8 +60,8 @@ export default function InputFields({ search, setSearch, filters, setFilters })
         >
           <MenuItem value="all">All Time</MenuItem>
           <MenuItem value="daily">Past Day</MenuItem>
-          <MenuItem value="weekly">Past Week</MenuItem>
           <MenuItem value="monthly">Past Month</MenuItem>
+          <MenuItem value="yearly">Past Year</MenuItem>
         </Select>
       </FormControl>
     </Paper>

diff --git a/src/components/RecordLibraryPage/index.js b/src/components/RecordLibraryPage/index.js
@@ -15,7 +15,6 @@ export default function RecordLibrary() {
     difficulty: 'all',
     timeFrame: 'all',
   });
-
   useEffect(() => {
     let newData = userProblemArray.filter((prompt) => (
       (prompt.promptName.includes(search) ||
@@ -25,7 +24,10 @@ export default function RecordLibrary() {
         filters.difficulty === prompt.difficulty
       ) &&
       (
-        filters.timeFrame === 'all'
+        filters.timeFrame === 'all' ||
+        (filters.timeFrame === 'daily' && new Date(prompt.timeStamp).getFullYear() === new Date().getFullYear() && new Date(prompt.timeStamp).getMonth() === new Date().getMonth() && new Date(prompt.timeStamp).getDate() === new Date().getDate()) ||
+        (filters.timeFrame === 'monthly' && new Date(prompt.timeStamp).getFullYear() === new Date().getFullYear() && new Date(prompt.timeStamp).getMonth() === new Date().getMonth()) ||
+        (filters.timeFrame === 'yearly' && new Date(prompt.timeStamp).getFullYear() === new Date().getFullYear())
       )
     ));
     setShownData(newData);