From 28f0320f181d963ed23094ef6dbcc2bf27e12218 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Mon, 1 Jun 2015 16:32:54 -0700
Subject: [PATCH] refactor fieldGuide controller to router

---
 server/boot/challengeMap.js |  5 +----
 server/boot/fieldGuide.js   | 26 ++++++++++++++++++--------
 server/boot/jobs.js         | 10 ++++++++--
 server/server.js            | 11 -----------
 4 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/server/boot/challengeMap.js b/server/boot/challengeMap.js
index 6a4a79dba2..b5b9790964 100644
--- a/server/boot/challengeMap.js
+++ b/server/boot/challengeMap.js
@@ -6,10 +6,7 @@ var R = require('ramda'),
   express = require('express'),
   router = express.Router();
 
-router.get('/map',
-  middleware.userMigration,
-  challengeMap
-);
+router.get('/map', middleware.userMigration, challengeMap);
 
 router.get('/learn-to-code', function(req, res) {
   res.redirect(301, '/map');
diff --git a/server/boot/fieldGuide.js b/server/boot/fieldGuide.js
index f433bf3ed2..f70ca3ef32 100644
--- a/server/boot/fieldGuide.js
+++ b/server/boot/fieldGuide.js
@@ -1,9 +1,17 @@
 var R = require('ramda'),
+    express = require('express'),
     // debug = require('debug')('freecc:fieldguides'),
     FieldGuide = require('./../../models/FieldGuide'),
     resources = require('./../resources/resources');
 
-exports.returnIndividualFieldGuide = function(req, res, next) {
+var router = express.Router();
+
+router.get('/field-guide/all-articles', showAllFieldGuides);
+router.get('/field-guide/:fieldGuideName', returnIndividualFieldGuide);
+router.get('/field-guide/', returnNextFieldGuide);
+router.post('/completed-field-guide/', completedFieldGuide);
+
+function returnIndividualFieldGuide(req, res, next) {
   var dashedName = req.params.fieldGuideName;
   if (req.user) {
     var completed = req.user.completedFieldGuides;
@@ -48,9 +56,9 @@ exports.returnIndividualFieldGuide = function(req, res, next) {
       });
     }
   );
-};
+}
 
-exports.showAllFieldGuides = function(req, res) {
+function showAllFieldGuides(req, res) {
   var allFieldGuideNamesAndIds = resources.allFieldGuideNamesAndIds();
 
   var completedFieldGuides = [];
@@ -61,9 +69,9 @@ exports.showAllFieldGuides = function(req, res) {
     allFieldGuideNamesAndIds: allFieldGuideNamesAndIds,
     completedFieldGuides: completedFieldGuides
   });
-};
+}
 
-exports.returnNextFieldGuide = function(req, res, next) {
+function returnNextFieldGuide(req, res, next) {
   if (!req.user) {
     return res.redirect('/field-guide/how-do-i-use-this-guide');
   }
@@ -91,9 +99,9 @@ exports.returnNextFieldGuide = function(req, res, next) {
     var nameString = fieldGuide.name.toLowerCase().replace(/\s/g, '-');
     return res.redirect('../field-guide/' + nameString);
   });
-};
+}
 
-exports.completedFieldGuide = function (req, res, next) {
+function completedFieldGuide(req, res, next) {
   var fieldGuideId = req.body.fieldGuideInfo.fieldGuideId;
 
   req.user.completedFieldGuides.push(fieldGuideId);
@@ -110,4 +118,6 @@ exports.completedFieldGuide = function (req, res, next) {
     }
     res.send(true);
   });
-};
+}
+
+module.exports = router;
diff --git a/server/boot/jobs.js b/server/boot/jobs.js
index d92843a465..52d0a5cab7 100644
--- a/server/boot/jobs.js
+++ b/server/boot/jobs.js
@@ -1,6 +1,10 @@
+var express = require('express');
 var Job = require('./../../models/Job');
+var router = express.Router();
 
-exports.jobsDirectory = function(req, res, next) {
+router.get('/jobs', jobsDirectory);
+
+function jobsDirectory(req, res, next) {
   Job.find({}, function(err, jobs) {
     if (err) { return next(err); }
 
@@ -9,4 +13,6 @@ exports.jobsDirectory = function(req, res, next) {
       jobs: jobs
     });
   });
-};
+}
+
+module.exports = router;
diff --git a/server/server.js b/server/server.js
index e826fa5bc5..668bb50db9 100755
--- a/server/server.js
+++ b/server/server.js
@@ -227,18 +227,7 @@ app.use(utilityRouter);
 app.use(storyRouter);
 
 /*
-app.get(
-  '/jobs',
-  jobsController.jobsDirectory
-);
-
 app.all('/account', passportConf.isAuthenticated);
-app.get('/field-guide/all-articles', fieldGuideController.showAllFieldGuides);
-app.get('/field-guide/:fieldGuideName',
-  fieldGuideController.returnIndividualFieldGuide
-);
-app.get('/field-guide/', fieldGuideController.returnNextFieldGuide);
-app.post('/completed-field-guide/', fieldGuideController.completedFieldGuide);
 app.get('/challenges/next-challenge',
   userController.userMigration,
   challengeController.returnNextChallenge