fix use app.use(router) to add sub router

This commit is contained in:
Berkeley Martinez
2015-06-03 16:31:42 -07:00
parent 8165105b29
commit bfd33d8b40
11 changed files with 32 additions and 11 deletions

View File

@ -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');

View File

@ -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 = [];

View File

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

View File

@ -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 =

View File

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

View File

@ -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 } } },

View File

@ -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);
};

View File

@ -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);
};

View File

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

View File

@ -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.

View File

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