added rudimentary admin pages, started testing validation code

routes/admin.js

@@ -3,11 +3,14 @@
  */
 
 var async = require('async');
-var Exercise = require('../data/models/workout');
+var Exercise = require('../data/models/exercise');
+var User = require('../data/models/user');
 var notLoggedIn = require('./middleware/not_logged_in');
-//var loadWorkout = require('./middleware/load_workout');
 var loggedIn = require('./middleware/logged_in');
-//var qs = require('querystring');
+var loadUser = require('./middleware/load_user');
+var loadExercise = require('./middleware/load_exercise');
+var isAdmin = require('./middleware/is_admin');
+var maxUsersPerPage = 15;
 var maxExercisesPerPage = 15;
 
 module.exports = function(app) {
@@ -16,11 +19,44 @@ app.get('/admin', loggedIn, isAdmin, function(req, res){
     res.render('admin/index', { title: 'Admin' });
   });
 
-app.get('/admin/users', loggedIn, isAdmin, function(req, res){
-    res.render('index', { title: 'Express' });
+app.get('/admin/users', loggedIn, isAdmin, function(req, res, next){
+    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.find({})
+      .sort('name')
+      .skip(page * maxUsersPerPage)
+      .limit(maxUsersPerPage)
+      .exec(function(err, users) {
+        if (err) {
+           return next(err);
+        }
+        res.render('admin/users', {
+          title: 'Users',
+          users: users,
+          page: page,
+          lastPage: lastPage
+        });
+      });
+    });
   });
 
-app.get('/admin/exercises', loggedIn, function(req, res, next){
+  app.del('/admin/users/:_id', loadUser,
+    function(req, res, next) {
+      req.user.remove(function(err) {
+        if (err) { return next(err); }
+        res.redirect('/admin/users/');
+      });
+  });
+
+////////////////////////////////////////////////
+
+app.get('/admin/exercises', loggedIn, isAdmin, function(req, res, next){
     var page = req.query.page  && parseInt(req.query.page, 10) || 0;
     async.parallel([
 
@@ -45,11 +81,11 @@ app.get('/admin/exercises', loggedIn, function(req, res, next){
         }
 
         var count = results[0];
-        var workouts = results[1];
+        var exercises = results[1];
 
         var lastPage = (page + 1) * maxExercisesPerPage >= count;
 
-        res.render('/admin/exercises/index', {
+        res.render('admin/exercises', {
           title: 'exercises',
           exercises: exercises,
           page: page,
@@ -60,53 +96,48 @@ app.get('/admin/exercises', loggedIn, function(req, res, next){
     );
   });
 
-app.get('/admin/exercises/new', loggedIn, function(req, res) {
-    res.render('admin/exercises/new', {title: "New Exercise"});
+  app.get('/admin/exercises/new', loggedIn, isAdmin, function(req, res) {
+    res.render('admin/newexercise', {title: "New Exercise"});
   });
 
 
-app.post('/admin/exercises/new', loggedIn, function(req, res, next) {
-    console.log("/nreq.body" + JSON.stringify(req.body));
-    var exerise = req.body;
-       Exercise.create(workout, function(err) {
-      if (err) {
-        if (err.code === 11000) {
-          res.send('Conflict', 409);
-        } else {
-          if (err.name === 'ValidationError') {
-            return res.send(Object.keys(err.errors).map(function(errField) {
-              return err.errors[errField].message;
-            }).join('. '), 406);
+  app.post('/admin/exercises', function(req, res, next) {
+      console.log("/nreq.body" + JSON.stringify(req.body));
+      var exercise = req.body;
+         Exercise.create(exercise, function(err) {
+        if (err) {
+          if (err.code === 11000) {
+            res.send('Conflict', 409);
           } else {
-            next(err);
+            if (err.name === 'ValidationError') {
+              return res.send(Object.keys(err.errors).map(function(errField) {
+                return err.errors[errField].message;
+              }).join('. '), 406);
+            } else {
+              next(err);
+            }
           }
+          return;
         }
-        return;
-      }
-      res.redirect('/admin/exercises');
+        res.redirect('/admin/exercises');
+      });
     });
+
+  app.get('/admin/exercises/:_id', loadExercise, function(req, res, next){
+    res.render('admin/exercise', {title: req.exercise.name,
+      exercise: req.exercise
+      });
   });
 
-  app.del('/admin/exercises/:_id', loggedIn, loadWorkout, function(req, res, next) {
-    req.workout.remove(function(err) {
+  app.del('/admin/exercises/:_id', loggedIn, isAdmin, loadExercise, function(req, res, next) {
+    req.exercise.remove(function(err) {
       if (err) { return next(err); }
       res.redirect('/admin/exercises');
     });
-
+  });
 
 
 //////////////////////////////////////////
 
 
-  
-
-  app.get('/workouts/:_id', loadWorkout, function(req, res, next){
-    res.render('workouts/workout', {title: req.workout.title,
-      workout: req.workout});
-  });
-
-  
-
-  });
-
 };

routes/middleware/load_exercise.js

@@ -0,0 +1,17 @@
+var exercise = require('../../data/models/exercise');
+
+function loadexercise(req, res, next) {
+  exercise.findOne({_id: req.params._id})
+    .exec(function(err, exercise) {
+      if (err) {
+        return next(err);
+      }
+      if (! exercise) {
+        return res.send('Not found', 404);
+      }
+      req.exercise = exercise;
+      next();
+    });
+}
+
+module.exports = loadexercise;

routes/middleware/load_workout.js

@@ -11,12 +11,6 @@ function loadworkout(req, res, next) {
       if (! workout) {
         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();
     });