mirror of
https://github.com/bodyrep/DemoApp.git
synced 2026-02-06 12:32:50 +00:00
can read and display workouts
This commit is contained in:
@@ -1,10 +1,9 @@
|
||||
var workout = require('../../data/models/workout');
|
||||
|
||||
function loadworkout(req, res, next) {
|
||||
console.log('fetch id' + req.params.title );
|
||||
workout.findOne({title: req.params.title})
|
||||
.populate('elements')
|
||||
|
||||
console.log('fetch id' + req.params._id );
|
||||
workout.findOne({_id: req.params._id})
|
||||
//.populate('elements')
|
||||
.exec(function(err, workout) {
|
||||
if (err) {
|
||||
return next(err);
|
||||
@@ -13,6 +12,11 @@ function loadworkout(req, res, next) {
|
||||
return res.send('Not found', 404);
|
||||
}
|
||||
console.log('workout' + JSON.stringify(workout));
|
||||
workout.elements.forEach(function(element, index, array) {
|
||||
// console.log("elementID" + element._id);
|
||||
// console.log("elementID" + JSON.stringify(element.splits));
|
||||
});
|
||||
|
||||
req.workout = workout;
|
||||
next();
|
||||
});
|
||||
|
||||
@@ -3,7 +3,7 @@ function loggedIn(req, res, next) {
|
||||
console.log("not logged in - redirecting to login");
|
||||
res.redirect('/session/new');
|
||||
} else {
|
||||
console.log("user logged in");
|
||||
console.log("user logged in" + JSON.stringify(req.session.user));
|
||||
next();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,8 +8,8 @@ var Workout = require('../data/models/workout');
|
||||
var notLoggedIn = require('./middleware/not_logged_in');
|
||||
var loadWorkout = require('./middleware/load_workout');
|
||||
var loggedIn = require('./middleware/logged_in');
|
||||
var qs = require('querystring');
|
||||
var maxWorkoutsPerPage = 5;
|
||||
var Moment = require('moment');
|
||||
|
||||
module.exports = function(app) {
|
||||
|
||||
@@ -58,8 +58,11 @@ module.exports = function(app) {
|
||||
});
|
||||
|
||||
app.get('/workouts/:_id', loadWorkout, function(req, res, next){
|
||||
console.log("time" + Moment.utc(req.workout.workoutDate).format("ddd, hA"));
|
||||
res.render('workouts/workout', {title: req.workout.title,
|
||||
workout: req.workout});
|
||||
workout: req.workout,
|
||||
workouttime: Moment.utc(req.workout.workoutDate).format("ddd, hA")
|
||||
});
|
||||
});
|
||||
|
||||
app.post('/workouts', loggedIn, function(req, res, next) {
|
||||
@@ -85,7 +88,7 @@ module.exports = function(app) {
|
||||
});
|
||||
});
|
||||
|
||||
app.del('/workouts/:title', loggedIn, loadWorkout, function(req, res, next) {
|
||||
app.del('/workouts/:_id', loggedIn, loadWorkout, function(req, res, next) {
|
||||
req.workout.remove(function(err) {
|
||||
if (err) { return next(err); }
|
||||
res.redirect('/workouts');
|
||||
|
||||
Reference in New Issue
Block a user