From 5c7da7ce6afe5dbdb2c5cbefe4598a4d61e45e83 Mon Sep 17 00:00:00 2001 From: Ricky Barfield Date: Mon, 16 Oct 2023 15:21:31 -0700 Subject: [PATCH] Can pull up right exercises for right dates! But no styling! SO CLOSE. --- controllers/fitnessApp.js | 17 +++++++++++++++-- node_modules/.package-lock.json | 14 -------------- routes/fitnessApp.js | 2 ++ views/fitnessApp.ejs | 4 ++-- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/controllers/fitnessApp.js b/controllers/fitnessApp.js index 9d91f82..9a14b3d 100644 --- 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 index 555d9a3..53cfedf 100644 --- a/node_modules/.package-lock.json +++ b/node_modules/.package-lock.json @@ -806,20 +806,6 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", diff --git a/routes/fitnessApp.js b/routes/fitnessApp.js index 54ea7d1..381505a 100644 --- 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 index 455da86..593e2d5 100644 --- a/views/fitnessApp.ejs +++ b/views/fitnessApp.ejs @@ -25,8 +25,8 @@
-
- + +