Clean up privacy policy routing. Adopt same pattern from courseware/bonfire mongo lookup to fieldguides.

app.js

@@ -253,12 +253,8 @@ app.use(express.static(__dirname + '/public', { maxAge: 86400000 }));
 
 app.get('/', homeController.index);
 
-app.get('/privacy', function(req, res) {
-    res.redirect(301, "/field-guide/free-code-camp's-privacy-policy");
-});
-
 app.get('/nonprofit-project-instructions', function(req, res) {
-    res.redirect(301, "/field-guide/free-code-camp's-privacy-policy");
+    res.redirect(301, '/field-guide/nonprofit-project-instructions');
 });
 
 app.get('/chat', resourcesController.chat);
@@ -384,17 +380,17 @@ app.post(
   passportConf.isAuthenticated,
   contactController.postDoneWithFirst100Hours
 );
-//app.get(
-//  '/nonprofit-project-instructions',
-//  passportConf.isAuthenticated,
-//  resourcesController.nonprofitProjectInstructions
-//);
+
 app.post(
   '/update-progress',
   passportConf.isAuthenticated,
   userController.updateProgress
 );
 
+app.get('/privacy', function(req, res) {
+  res.redirect(301, '/field-guide/the-free-code-camp-privacy-policy');
+});
+
 app.get('/api/slack', function(req, res) {
   if (req.user) {
     if (req.user.email) {
@@ -590,7 +586,7 @@ app.post('/completed-bonfire/', bonfireController.completedBonfire);
 
 app.get('/field-guide/:fieldGuideName', fieldGuideController.returnIndividualFieldGuide);
 
-app.get('/field-guide', fieldGuideController.returnNextFieldGuide);
+app.get('/field-guide/', fieldGuideController.returnNextFieldGuide);
 
 app.post('/completed-field-guide/', fieldGuideController.completedFieldGuide);
 

controllers/fieldGuide.js

@@ -9,12 +9,12 @@ exports.returnIndividualFieldGuide = function(req, res, next) {
 
     var fieldGuideName = dashedName.replace(/\-/g, ' ');
 
-    FieldGuide.find({'name': new RegExp(fieldGuideName, 'i')}, function(err, fieldGuide) {
+    FieldGuide.find({'name': new RegExp(fieldGuideName, 'i')}, function(err, fieldGuideFromMongo) {
         if (err) {
             next(err);
         }
 
-        if (fieldGuide.length < 1) {
+        if (fieldGuideFromMongo.length < 1) {
             req.flash('errors', {
                 msg: "404: We couldn't find a field guide entry with that name. Please double check the name."
             });
@@ -22,9 +22,9 @@ exports.returnIndividualFieldGuide = function(req, res, next) {
             return res.redirect('/field-guide');
         }
 
-        fieldGuide = fieldGuide.pop();
+        fieldGuide = fieldGuideFromMongo.pop();
         var dashedNameFull = fieldGuide.name.toLowerCase().replace(/\s/g, '-').replace(/\?/g, '');
-        if (dashedNameFull != dashedName) {
+        if (dashedNameFull !== dashedName) {
             return res.redirect('../field-guide/' + dashedNameFull);
         }
         res.render('field-guide/show', {
@@ -69,7 +69,7 @@ exports.returnNextFieldGuide = function(req, res, next) {
       return next(err);
     }
     fieldGuide = fieldGuide.pop();
-    if (fieldGuide === undefined) {
+    if (typeof fieldGuide === 'undefined') {
       req.flash('success', {
         msg: "You've read all our current Field Guide entries. You can contribute to our Field Guide <a href='https://github.com/FreeCodeCamp/freecodecamp/blob/master/seed_data/field-guides.json'>here</a>."
       });

controllers/resources.js

@@ -44,12 +44,6 @@ Array.zip = function(left, right, combinerFunction) {
 };
 
 module.exports = {
-  privacy: function privacy(req, res) {
-    res.render('resources/privacy', {
-      title: 'Privacy'
-    });
-  },
-
   sitemap: function sitemap(req, res, next) {
     var appUrl = 'http://www.freecodecamp.com';
     var now = moment(new Date()).format('YYYY-MM-DD');