Merge branch 'calculator' into staging

Conflicts:
	app.js
	controllers/resources.js
	seed/field-guides.json
This commit is contained in:
Quincy Larson
2015-06-14 01:10:48 -07:00
6 changed files with 694 additions and 29 deletions

View File

@ -26,6 +26,7 @@ module.exports = function(app) {
router.post('/get-help', getHelp);
router.post('/get-pair', getPair);
router.get('/chat', chat);
router.get('/bootcamp-calculator', bootcampCalculator);
router.get('/twitch', twitch);
router.get('/pmi-acp-agile-project-managers', agileProjectManagers);
router.get('/pmi-acp-agile-project-managers-form', agileProjectManagersForm);
@ -325,6 +326,12 @@ module.exports = function(app) {
}
}
function bootcampCalculator(req, res) {
res.render('resources/calculator', {
title: 'Coding Bootcamp Cost Calculator'
});
}
function jobsForm(req, res) {
res.render('resources/jobs-form', {
title: 'Employer Partnership Form for Job Postings,' +