Can pull up right exercises for right dates! But no styling! SO CLOSE.

flbarfield · Oct 16, 2023 · 5c7da7c · 5c7da7c
1 parent 4b0b1e7
commit 5c7da7c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 18 deletions.
diff --git a/controllers/fitnessApp.js b/controllers/fitnessApp.js
@@ -26,9 +26,22 @@ module.exports = {
         }
     },
 
-    setDate: async (req, res) => {
+    getUserDateEntries: async (req, res) => {
         try {
-            // TO DO
+            const reqDate = moment(req.body.userDate)
+            const startOfUserDate = reqDate.startOf('day').toString()
+            const endOfUserDate = reqDate.endOf('day').toString()
+
+            const exerciseItems = await Exercises.find({$and: [ 
+                {userId: req.user.id}, 
+                {date: {'$gte': startOfUserDate,
+                    '$lt': endOfUserDate}
+
+            }]})
+
+            let currentDateInput = moment(reqDate).format('YYYY-MM-DD')
+
+            res.render('fitnessApp.ejs', {exercises: exerciseItems, userName: req.user.userName, currentDateInput}) 
         } catch (err) {
             console.log(err)
         }

diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
diff --git a/routes/fitnessApp.js b/routes/fitnessApp.js
@@ -5,6 +5,8 @@ const {ensureAuth} = require('../middleware/auth')
 
 router.get('/', ensureAuth, fitnessAppController.getFitApp)
 
+router.get('/getUserDateEntries', fitnessAppController.getUserDateEntries)
+
 router.post('/createExercise', fitnessAppController.createExercise)
 
 router.put('/modRep:id', fitnessAppController.modRep)

diff --git a/views/fitnessApp.ejs b/views/fitnessApp.ejs
@@ -25,8 +25,8 @@
 							<section id="content" class="main fitnessBody">
 								<span class="image main"><img class="fitnessAppImg" src="images/trainingPlaceholderLarge.jpg" alt="" /></span>
 								<section class="date">
-									<form action="/fitnessApp/setDate" method="post">
-										<input id='date' type="date" value="<%= currentDateInput %>"/>
+									<form action="/fitnessApp/getUserDateEntries?_method=GET" method="post">
+										<input id='date' name="userDate" type="date" value="<%= currentDateInput %>"/>
 										<button type="submit">Set Date</button>
 									</form>
 								</section>