started moving content to corretn divs

This commit is contained in:
2013-01-26 17:00:30 -05:00
parent 5584faedef
commit 4f234b5450
11 changed files with 261 additions and 94 deletions

View File

@@ -12,6 +12,7 @@ var maxUsersPerPage = 5;
module.exports = function(app) {
app.get('/users', loggedIn, isAdmin, function(req, res, next){
var page = req.query.page && parseInt(req.query.page, 10) || 0;

View File

@@ -8,6 +8,7 @@ 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 loadUser = require('./middleware/load_user');
var maxWorkoutsPerPage = 5;
var Exercise = require('../data/models/exercise');
var loadExercise = require('./middleware/load_exercise');
@@ -16,7 +17,7 @@ var Moment = require('moment');
module.exports = function(app) {
app.get('/workouts', loggedIn, function(req, res, next){
app.get('/workouts/recent', loggedIn, function(req, res, next){
var page = req.query.page && parseInt(req.query.page, 10) || 0;
async.parallel([
@@ -45,7 +46,7 @@ module.exports = function(app) {
var lastPage = (page + 1) * maxWorkoutsPerPage >= count;
res.render('workouts/index', {
res.render('workouts/recent', {
title: 'workouts',
workouts: workouts,
page: page,
@@ -60,6 +61,18 @@ module.exports = function(app) {
res.render('workouts/new', {title: "New workout"});
});
app.get('/workouts/:name/recent', loadUser, function(req, res, next){
req.user.recentworkouts(function(err, workouts) {
if (err) {
return next(err);
}
res.render('workouts/recent', {
//user: req.user,
//requested: req.params.name,
recentworkouts: workouts
});
});
});
app.get('/workouts/:_id', loggedIn, loadWorkout, function(req, res, next){
console.log("time" + Moment.utc(req.workout.workoutDate).format("ddd, hA"));