Merge branch 'master' into bonfire

This commit is contained in:
Michael Q Larson
2015-01-24 11:29:43 -08:00
8 changed files with 69 additions and 11 deletions

10
app.js
View File

@ -228,16 +228,22 @@ app.post('/email-signup', userController.postEmailSignup);
app.post('/email-signin', userController.postLogin);
app.get('/nonprofits', contactController.getNonprofitsForm);
app.post('/nonprofits', contactController.postNonprofitsForm);
app.get(
'/done-with-first-100-hours',
passportConf.isAuthenticated,
contactController.getDoneWithFirst100Hours
);
app.post(
'/done-with-first-100-hours',
passportConf.isAuthenticated,
contactController.postDoneWithFirst100Hours
);
// # Protected routes, user must be logged in.
app.get(
'/nonprofit-project-instructions',
passportConf.isAuthenticated,
resourcesController.nonprofitProjectInstructions
);
app.post(
'/update-progress',
passportConf.isAuthenticated,