refactor fieldGuide controller to router
This commit is contained in:
@ -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');
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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
|
||||
|
Reference in New Issue
Block a user