bodyrep/DemoApp
1
0
Fork 0
mirror of https://github.com/bodyrep/DemoApp.git synced 2026-01-25 06:32:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed search and filters

Browse Source
This commit is contained in:
Stuiart Stent
2013-01-29 09:04:40 -05:00
parent 905b3258fb
commit 19e03c4fa0
21 changed files with 414 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
routes/index.js
View File

@@ -8,6 +8,7 @@ var isAdmin = require('./middleware/is_admin');
module.exports = function(app) {
app.get('/', loggedIn, isAdmin, function(req, res){
res.render('index', { title: 'Express' });
//res.render('index', { title: 'Express' });
res.redirect('/users/' + req.session.user.username);
});
};

99
routes/users.js
View File

@@ -1,7 +1,7 @@
/*
* User Routes
*/
var async = require('async');
var User = require('../data/models/user');
var notLoggedIn = require('./middleware/not_logged_in');
var loggedIn = require('./middleware/logged_in');
@@ -9,35 +9,38 @@ var loadUser = require('./middleware/load_user');
var isAdmin = require('./middleware/is_admin');
var restrictUserToSelf = require('./middleware/restrict_user_to_self');
var maxUsersPerPage = 5;
var maxWorkoutsPerPage = 5;
var Workout = require('../data/models/workout');
module.exports = function(app) {
app.get('/users', loggedIn, isAdmin, function(req, res, next){
var page = req.query.page && parseInt(req.query.page, 10) || 0;
res.redirect('/users/' + req.session.user.username);
// var page = req.query.page && parseInt(req.query.page, 10) || 0;
User.count(function(err, count) {
if (err) {
return next(err);
}
var lastPage = (page + 1) * maxUsersPerPage >= count;
// User.count(function(err, count) {
// if (err) {
// return next(err);
// }
// var lastPage = (page + 1) * maxUsersPerPage >= count;
User.find({})
.sort('name')
.skip(page * maxUsersPerPage)
.limit(maxUsersPerPage)
.exec(function(err, users) {
if (err) {
return next(err);
}
res.render('users/index', {
title: 'Users',
users: users,
page: page,
lastPage: lastPage
});
});
});
// User.find({})
// .sort('name')
// .skip(page * maxUsersPerPage)
// .limit(maxUsersPerPage)
// .exec(function(err, users) {
// if (err) {
// return next(err);
// }
// res.render('users/index', {
// title: 'Users',
// users: users,
// page: page,
// lastPage: lastPage
// });
// });
// });
});
app.get('/users/new', notLoggedIn, function(req, res) {
@@ -45,10 +48,43 @@ module.exports = function(app) {
});
app.get('/users/:name', loadUser, function(req, res, next){
req.user.recentworkouts(function(err, workouts) {
if (err) {
return next(err);
}
// req.user.recentworkouts(function(err, workouts) {
// if (err) {
// return next(err);
// }
var page = req.query.page && parseInt(req.query.page, 10) || 0;
async.parallel([
function(next) {
Workout.count(next);
},
function(next) {
Workout.find({})
//.sort('title', 1)
.populate('elements.exerciseID')
.skip(page * maxWorkoutsPerPage)
.limit(maxWorkoutsPerPage)
.exec(next);
console.log("exercise search finsihed");
}
],
// callback from async
function(err, results) {
if (err) {
return next(err);
}
var count = results[0];
var workouts = results[1];
var lastPage = (page + 1) * maxWorkoutsPerPage >= count;
res.render('users/profile', {
title: 'User profile',
user: req.user,
@@ -58,6 +94,15 @@ module.exports = function(app) {
});
});
app.get('/users/:name/sidebar', loadUser, function(req, res, next){
res.render('users/sidebar', {
user: req.user,
requested: req.params.name
});
});
app.post('/users', notLoggedIn, function(req, res, next) {
User.create(req.body, function(err) {
if (err) {

42
routes/workouts.js
View File

@@ -17,7 +17,11 @@ var Moment = require('moment');
module.exports = function(app) {
app.get('/workouts/recent', loggedIn, function(req, res, next){
app.get('/workouts', loggedIn, function(req, res) {
res.redirect('/users/' + req.session.user.username);
});
app.get('/workouts/:id/recent', loggedIn, function(req, res, next){
var page = req.query.page && parseInt(req.query.page, 10) || 0;
async.parallel([
@@ -28,6 +32,7 @@ module.exports = function(app) {
function(next) {
Workout.find({})
//.sort('title', 1)
.populate('elements.exerciseID')
.skip(page * maxWorkoutsPerPage)
.limit(maxWorkoutsPerPage)
.exec(next);
@@ -46,9 +51,10 @@ module.exports = function(app) {
var lastPage = (page + 1) * maxWorkoutsPerPage >= count;
console.log("workouts- " + JSON.stringify(workouts));
res.render('workouts/recent', {
title: 'workouts',
workouts: workouts,
recentworkouts: workouts,
page: page,
lastPage: lastPage
});
@@ -61,24 +67,26 @@ 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/filters', loggedIn, function(req, res) {
res.render('workouts/filters');
});
// 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"));
var output = MuscleArray(req.workout);
console.log('output - ' + JSON.stringify(output));
console.log('output - ' + JSON.stringify(output));
res.render('workouts/workout', {title: req.workout.title,
workout: req.workout,
workouttime: Moment.utc(req.workout.workoutDate).format("ddd, hA")