From bfd33d8b408961e8f8d83bdb0aca143ce23d5338 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Wed, 3 Jun 2015 16:31:42 -0700 Subject: [PATCH] fix use app.use(router) to add sub router --- server/boot/challenge.js | 4 +++- server/boot/challengeMap.js | 4 +++- server/boot/fieldGuide.js | 4 +++- server/boot/home.js | 4 +++- server/boot/jobs.js | 3 ++- server/boot/nonprofits.js | 4 +++- server/boot/passport.js | 4 +++- server/boot/redirects.js | 4 +++- server/boot/story.js | 4 +++- server/boot/user.js | 4 +++- server/boot/utility.js | 4 +++- 11 files changed, 32 insertions(+), 11 deletions(-) diff --git a/server/boot/challenge.js b/server/boot/challenge.js index 26cb6d9f4e..df85d803d4 100644 --- a/server/boot/challenge.js +++ b/server/boot/challenge.js @@ -54,7 +54,7 @@ function getMDNlinks(links) { } module.exports = function(app) { - var router = app.Router(); + var router = app.loopback.Router(); var Challenge = app.models.Challenge; var User = app.models.User; @@ -75,6 +75,8 @@ module.exports = function(app) { router.post('/completed-zipline-or-basejump', completedZiplineOrBasejump); router.post('/completed-bonfire', completedBonfire); + app.use(router); + function returnNextChallenge(req, res, next) { if (!req.user) { return res.redirect('../challenges/learn-how-free-code-camp-works'); diff --git a/server/boot/challengeMap.js b/server/boot/challengeMap.js index 8a95857e2f..c6820c5020 100644 --- a/server/boot/challengeMap.js +++ b/server/boot/challengeMap.js @@ -6,7 +6,7 @@ var R = require('ramda'), module.exports = function(app) { var User = app.models.User; - var router = app.Router(); + var router = app.loopback.Router(); router.get('/map', middleware.userMigration, challengeMap); router.get('/learn-to-code', function(req, res) { @@ -16,6 +16,8 @@ module.exports = function(app) { res.redirect(301, '/map'); }); + app.use(router); + function challengeMap(req, res, next) { var completedList = []; diff --git a/server/boot/fieldGuide.js b/server/boot/fieldGuide.js index 038af52c08..7f29036941 100644 --- a/server/boot/fieldGuide.js +++ b/server/boot/fieldGuide.js @@ -4,7 +4,7 @@ var R = require('ramda'), resources = require('../resources/resources'); module.exports = function(app) { - var router = app.Router(); + var router = app.loopback.Router(); var FieldGuide = app.models.FieldGuide; router.get('/field-guide/all-articles', showAllFieldGuides); @@ -12,6 +12,8 @@ module.exports = function(app) { router.get('/field-guide/', returnNextFieldGuide); router.post('/completed-field-guide/', completedFieldGuide); + app.use(router); + function returnIndividualFieldGuide(req, res, next) { var dashedName = req.params.fieldGuideName; if (req.user) { diff --git a/server/boot/home.js b/server/boot/home.js index 036d454945..56bacf5c0f 100644 --- a/server/boot/home.js +++ b/server/boot/home.js @@ -2,9 +2,11 @@ var message = 'Learn to Code JavaScript and get a Coding Job by Helping Nonprofits'; module.exports = function(app) { - var router = app.Router(); + var router = app.loopback.Router(); router.get('/', index); + app.use(router); + function index(req, res, next) { if (req.user && !req.user.profile.picture) { req.user.profile.picture = diff --git a/server/boot/jobs.js b/server/boot/jobs.js index abcda8a2b2..65d3feae99 100644 --- a/server/boot/jobs.js +++ b/server/boot/jobs.js @@ -1,8 +1,9 @@ module.exports = function(app) { var Job = app.models.Job; - var router = app.Router(); + var router = app.loopback.Router(); router.get('/jobs', jobsDirectory); + app.use(router); function jobsDirectory(req, res, next) { Job.find({}, function(err, jobs) { diff --git a/server/boot/nonprofits.js b/server/boot/nonprofits.js index 507f366b49..1ba62bf5b5 100644 --- a/server/boot/nonprofits.js +++ b/server/boot/nonprofits.js @@ -1,11 +1,13 @@ module.exports = function(app) { - var router = app.Router(); + var router = app.loopback.Router(); var Nonprofit = app.models.Nonprofit; router.get('/nonprofits/directory', nonprofitsDirectory); router.get('/nonprofits/:nonprofitName', returnIndividualNonprofit); + app.use(router); + function nonprofitsDirectory(req, res, next) { Nonprofit.find( { where: { estimatedHours: { $gt: 0 } } }, diff --git a/server/boot/passport.js b/server/boot/passport.js index 53918dd346..53b914afc2 100644 --- a/server/boot/passport.js +++ b/server/boot/passport.js @@ -2,7 +2,7 @@ var passport = require('passport'), passportConf = require('../../config/passport'); module.exports = function(app) { - var router = app.Router(); + var router = app.loopback.Router(); var passportOptions = { successRedirect: '/', failureRedirect: '/login' @@ -64,4 +64,6 @@ module.exports = function(app) { res.redirect(req.session.returnTo || '/'); } ); + + app.use(router); }; diff --git a/server/boot/redirects.js b/server/boot/redirects.js index 2ad49ac83c..bac16345af 100644 --- a/server/boot/redirects.js +++ b/server/boot/redirects.js @@ -1,5 +1,5 @@ module.exports = function(app) { - var router = app.Router(); + var router = app.loopback.Router(); router.get('/nonprofit-project-instructions', function(req, res) { res.redirect( @@ -45,4 +45,6 @@ module.exports = function(app) { 301, '/field-guide/what-is-the-free-code-camp-privacy-policy?' ); }); + + app.use(router); }; diff --git a/server/boot/story.js b/server/boot/story.js index d2dd96d7ba..be2a473614 100755 --- a/server/boot/story.js +++ b/server/boot/story.js @@ -8,7 +8,7 @@ var nodemailer = require('nodemailer'), secrets = require('../../config/secrets'); module.exports = function(app) { - var router = app.Router(); + var router = app.loopback.Router(); var User = app.models.User; var Story = app.models.Story; @@ -27,6 +27,8 @@ module.exports = function(app) { router.get('/news/:storyName', returnIndividualStory); router.post('/stories/upvote/', upvote); + app.use(router); + function hotRank(timeValue, rank) { /* * Hotness ranking algorithm: http://amix.dk/blog/post/19588 diff --git a/server/boot/user.js b/server/boot/user.js index 5317fdddad..c78ff7dd45 100644 --- a/server/boot/user.js +++ b/server/boot/user.js @@ -11,7 +11,7 @@ var _ = require('lodash'), resources = require('./../resources/resources'); module.exports = function(app) { - var router = app.Router(); + var router = app.loopback.Router(); var User = app.models.User; router.get('/login', function(req, res) { @@ -43,6 +43,8 @@ module.exports = function(app) { // Ensure this is the last route! router.get('/:username', returnUser); + app.use(router); + /** * GET /signin * Siginin page. diff --git a/server/boot/utility.js b/server/boot/utility.js index 1c78fb409c..ea45d06461 100644 --- a/server/boot/utility.js +++ b/server/boot/utility.js @@ -11,7 +11,7 @@ var Rx = require('rx'), var slack = new Slack(secrets.slackHook); module.exports = function(app) { - var router = app.Router(); + var router = app.loopback.Router(); var User = app.models.User; var Challenge = app.models.Challenge; var Story = app.models.Store; @@ -39,6 +39,8 @@ module.exports = function(app) { router.get('/api/slack', slackInvite); + app.use(router); + function slackInvite(req, res, next) { if (req.user) { if (req.user.email) {