From 8785d3264b0c37f655382ce740bf91f7b19f41a6 Mon Sep 17 00:00:00 2001
From: Ricky Barfield <barfieldfredrick@gmail.com>
Date: Sun, 15 Oct 2023 21:14:23 -0700
Subject: [PATCH] some progress on setting dates correctly...

---
 controllers/fitnessApp.js       | 25 ++++++++++++++++++++++---
 models/exercises.js             |  1 +
 node_modules/.package-lock.json |  8 ++++++++
 package-lock.json               |  9 +++++++++
 package.json                    |  1 +
 public/assets/js/fitnessApp.js  | 19 -------------------
 views/fitnessApp.ejs            |  5 ++++-
 7 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/controllers/fitnessApp.js b/controllers/fitnessApp.js
index 2691ac6..752d229 100644
--- a/controllers/fitnessApp.js
+++ b/controllers/fitnessApp.js
@@ -1,12 +1,31 @@
 const Exercises = require('../models/exercises')
+const moment = require('moment')
 
 module.exports = {
     getFitApp: async (req, res) => {
         console.log(req.user)
-        const userName = req.user
+        
         try {
-           const exerciseItems = await Exercises.find({userId: req.user.id})
-           res.render('fitnessApp.ejs', {exercises: exerciseItems, userName: req.user.userName})  
+
+           const exerciseItems = await Exercises.find({$and: [ 
+                {userId: req.user.id}, 
+                {date: {'$gte': new Date(),
+                    '$lt': new Date()}
+
+            }]}) 
+
+           let currentDateInput = moment().format('YYYY-MM-DD')
+
+           res.render('fitnessApp.ejs', {exercises: exerciseItems, userName: req.user.userName, currentDateInput})  
+           
+        } catch (err) {
+            console.log(err)
+        }
+    },
+
+    setDate: async (req, res) => {
+        try {
+            // TO DO
         } catch (err) {
             console.log(err)
         }
diff --git a/models/exercises.js b/models/exercises.js
index 1df96d5..e0d828f 100644
--- a/models/exercises.js
+++ b/models/exercises.js
@@ -1,4 +1,5 @@
 const mongoose = require('mongoose')
+const moment = require('moment')
 
 const ExerciseSchema = new mongoose.Schema({
     name: {
diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
index 8c5581c..555d9a3 100644
--- a/node_modules/.package-lock.json
+++ b/node_modules/.package-lock.json
@@ -1299,6 +1299,14 @@
         "node": ">=10"
       }
     },
+    "node_modules/moment": {
+      "version": "2.29.4",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/mongodb": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.1.0.tgz",
diff --git a/package-lock.json b/package-lock.json
index ef0b3fb..0004074 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,6 +19,7 @@
         "express-flash": "^0.0.2",
         "express-session": "^1.17.3",
         "method-override": "^3.0.0",
+        "moment": "^2.29.4",
         "mongodb": "^6.1.0",
         "mongoose": "^7.5.3",
         "morgan": "^1.10.0",
@@ -1329,6 +1330,14 @@
         "node": ">=10"
       }
     },
+    "node_modules/moment": {
+      "version": "2.29.4",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/mongodb": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.1.0.tgz",
diff --git a/package.json b/package.json
index 6090cbb..e62fc20 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
     "express-flash": "^0.0.2",
     "express-session": "^1.17.3",
     "method-override": "^3.0.0",
+    "moment": "^2.29.4",
     "mongodb": "^6.1.0",
     "mongoose": "^7.5.3",
     "morgan": "^1.10.0",
diff --git a/public/assets/js/fitnessApp.js b/public/assets/js/fitnessApp.js
index d12cedb..cca2967 100644
--- a/public/assets/js/fitnessApp.js
+++ b/public/assets/js/fitnessApp.js
@@ -60,24 +60,6 @@ async function quoteApiRequest() {
 
 }
 
-// date setting...for now. This needs to be done via backend so I can populate based off it.
-function defaultDate () {
-    let myDate, day, month, year, date
-    
-    myDate = new Date
-    day = myDate.getDate()
-    if (day < 10){
-        day = '0' + day
-    }
-    month = myDate.getMonth() + 1
-    if (month < 10){
-        month = '0' + month
-    }
-    year = myDate.getFullYear()
-    date = `${year}-${month}-${day}`
-
-    document.getElementById('date').value = date
-}
 
 //show exerciseBank
 function showExerciseBank () {
@@ -151,7 +133,6 @@ const exercises = {
     }
 }
 
-defaultDate()
 populateExerciseBank()
 quoteApiRequest()
 
diff --git a/views/fitnessApp.ejs b/views/fitnessApp.ejs
index 590aae4..455da86 100644
--- a/views/fitnessApp.ejs
+++ b/views/fitnessApp.ejs
@@ -25,7 +25,10 @@
 							<section id="content" class="main fitnessBody">
 								<span class="image main"><img class="fitnessAppImg" src="images/trainingPlaceholderLarge.jpg" alt="" /></span>
 								<section class="date">
-									<input id='date' type="date" value=""/>
+									<form action="/fitnessApp/setDate" method="post">
+										<input id='date' type="date" value="<%= currentDateInput %>"/>
+										<button type="submit">Set Date</button>
+									</form>
 								</section>
 								<section class='exerciseList'>
 									<% exercises.forEach( el => { %>