fixed search and filters

routes/workouts.js

@@ -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")