logout works

Author: ernest-phillips

app/auth/auth.router.js

@@ -49,12 +49,11 @@ authRouter.post('/refresh', jwtPassportMiddleware, (request, response) => {
     });
 });
 
-authRouter.get('/logout', localPassportMiddleware, (req, res) => {
+authRouter.post('/logout', (req, res) => {
     console.log("logging out")
     res.header('Cache-Control', 'no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0');
     res.json({
-        jwtToken,
-        user
+
     })
 });
 module.exports = {

app/exercise/exercise.model.js

@@ -8,10 +8,6 @@ const mongoose = require("mongoose");
 const Joi = require("joi");
 
 const exerciseSchema = new mongoose.Schema({
-    // user: {
-    //     type: mongoose.Schema.Types.ObjectId,
-    //     ref: "user"
-    // },
     exercise: {
         type: String,
         required: true
@@ -24,18 +20,13 @@ const exerciseSchema = new mongoose.Schema({
         type: String,
         enum: ["cardiovascular", "strength training"]
     }
+
 });
 
 exerciseSchema.methods.serialize = function() {
-    // let user;
-    // if (typeof this.user.serialize === "function") {
-    //     user = this.user.serialize();
-    // } else {
-    //     user = this.user;
-    // }
+
     return {
         id: this._id,
-        // user: user,
         exercise: this.exercise,
         bodypart: this.bodypart,
         ex_type: this.ex_type
@@ -56,5 +47,6 @@ const ExerciseJoiSchema = Joi.object().keys({
 });
 
 module.exports = {
-    Exercise
+    Exercise,
+    ExerciseJoiSchema
 };

app/workout/workout.model.js

@@ -15,24 +15,27 @@ const workoutSchema = new mongoose.Schema({
         type: mongoose.Schema.Types.ObjectId,
         ref: "user"
     },
-    exercise: {
-        type: String,
-        required: true
+    date: {
+        type: Date,
+        default: Date.now
     },
-    set: {
-        type: Number,
-
-    },
-    reps: {
-        type: Number,
-
-    },
-    weight: {
-        type: Number
-    }
-    // date: {
-    //     type: Date
-    // }
+    sets: [{
+        exercise: {
+            type: String,
+            required: true
+        },
+        set: {
+            type: Number,
+            required: true
+        },
+        reps: {
+            type: Number,
+            required: true
+        },
+        weight: {
+            type: Number
+        }
+    }]
 });
 
 workoutSchema.methods.serialize = function() {

public/auth.page.js

@@ -60,16 +60,11 @@ function onLoginSubmit(event) {
 }
 
 function onLogoutSubmit(event) {
-    console.log("Logging out")
     event.preventDefault();
     HTTP.logoutUser({
-
         onSuccess: response => {
-            const authenticatedUser = response.user;
-            console.log(authenticatedUser);
-            authenticatedUser.jwtToken = response.jwtToken;
-            CACHE.deleteAuthenticatedUserFromCache(authenticatedUser);
-            alert('Please come again');
+            CACHE.deleteAuthenticatedUserFromCache();
+
             window.open('/', '_self');
         }
     })

public/search.js

@@ -50,16 +50,13 @@ function exerciseLoop(res) {
 function clearInput() {
     $('input').val("")
 }
-
-
-
 // Save exercise set to workout
 // capture name of exercise
 function selectExercise() {
     $('.search-btn').on('click', function() {
-        let searchVal = $('.search-ex').val();
+        let searchVal = $('.search-ex')[1].value;
         console.log(searchVal)
-            // $('.exerciseName').append(`${searchVal}`);
+        $('.exerciseName').append(`${searchVal}`);
     });
 
 }
@@ -68,7 +65,22 @@ function showSetAdd() {
 
 }
 
+function saveSet() {
+    let reps;
+    let sets;
+    let weight;
+    $('button').on('click', '.save-set'function() {
+        reps = $('#POST-reps').value()
+        console.log(reps);
+        weight = $('#POST-weight').value();
+        console.log(weight);
+    });
+
+}
+
+function updateWorkout(reps, weight) {
 
+}
 
 
 function onPageLoad() {

public/utilities/http.module.js

@@ -55,10 +55,7 @@ function loginUser(options) {
         }
     });
 }
-// app.get('/logout', function(req, res) {
-//     req.logout();
-//     res.redirect('/');
-// });
+
 
 function logoutUser(options) {
     console.log("logout user called")
@@ -120,7 +117,7 @@ function getWorkoutById(options) {
 function createWorkout(options) {
     const {
         jwtToken,
-        newworkout,
+        newWorkout,
         onSuccess,
         onError
     } = options;