gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix some linting errors in app.js and highlight questionable code with todo comments

Browse Source
This commit is contained in:
terakilobyte
2015-04-29 19:30:51 -04:00
parent 2487f0421b
commit 1e21d5d7aa
1 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app.js
View File

@ -48,7 +48,7 @@ var express = require('express'),
/** /**
* Stories * Stories
*/ */
storyController = require('./controllers/story'); storyController = require('./controllers/story'),
/** /**
* API keys and Passport configuration. * API keys and Passport configuration.
@ -88,13 +88,15 @@ if (process.env.NODE_ENV === 'production') {
if (host.match(/^www\..*/i)) { if (host.match(/^www\..*/i)) {
next(); next();
} else { } else {
res.redirect(301, "http://www." + host + originalUrl); res.redirect(301, 'http://www.' + host + originalUrl);
} }
}); });
} }
app.use(compress()); app.use(compress());
var oneYear = 31557600000; var oneYear = 31557600000;
// todo
// another app.use(express.static...) call
app.use(express.static(__dirname + '/public', {maxAge: oneYear})); app.use(express.static(__dirname + '/public', {maxAge: oneYear}));
app.use(connectAssets({ app.use(connectAssets({
paths: [ paths: [
@ -135,8 +137,10 @@ app.use(helmet.xssFilter());
app.use(helmet.noSniff()); app.use(helmet.noSniff());
app.use(helmet.xframe()); app.use(helmet.xframe());
app.use(function(req, res, next) { app.use(function(req, res, next) {
res.header("Access-Control-Allow-Origin", "*"); res.header('Access-Control-Allow-Origin', '*');
res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept"); res.header('Access-Control-Allow-Headers',
'Origin, X-Requested-With, Content-Type, Accept'
);
next(); next();
}); });
@ -184,7 +188,7 @@ app.use(helmet.contentSecurityPolicy({
scriptSrc: [ scriptSrc: [
'*.optimizely.com', '*.optimizely.com',
'*.aspnetcdn.com', '*.aspnetcdn.com',
'*.d3js.org', '*.d3js.org'
].concat(trusted), ].concat(trusted),
'connect-src': [ 'connect-src': [
'ws://*.rafflecopter.com', 'ws://*.rafflecopter.com',
@ -204,7 +208,8 @@ app.use(helmet.contentSecurityPolicy({
'graph.facebook.com', 'graph.facebook.com',
'*.githubusercontent.com', '*.githubusercontent.com',
'*.googleusercontent.com', '*.googleusercontent.com',
'*' /* allow all input since we have user submitted images for public profile*/ /* allow all input since we have user submitted images for public profile*/
'*'
].concat(trusted), ].concat(trusted),
fontSrc: ['*.googleapis.com'].concat(trusted), fontSrc: ['*.googleapis.com'].concat(trusted),
mediaSrc: [ mediaSrc: [
@ -245,7 +250,8 @@ app.use(function (req, res, next) {
app.use( app.use(
express.static(path.join(__dirname, 'public'), {maxAge: 31557600000}) express.static(path.join(__dirname, 'public'), {maxAge: 31557600000})
); );
// todo
// why are there two express.static declarations?
app.use(express.static(__dirname + '/public', { maxAge: 86400000 })); app.use(express.static(__dirname + '/public', { maxAge: 86400000 }));
/** /**
@ -264,13 +270,15 @@ app.get('/twitch', resourcesController.twitch);
// Agile Project Manager Onboarding // Agile Project Manager Onboarding
app.get('/pmi-acp-agile-project-managers', resourcesController.agileProjectManagers); app.get('/pmi-acp-agile-project-managers',
resourcesController.agileProjectManagers);
app.get('/agile', function(req, res) { app.get('/agile', function(req, res) {
res.redirect(301, '/pmi-acp-agile-project-managers'); res.redirect(301, '/pmi-acp-agile-project-managers');
}); });
app.get('/pmi-acp-agile-project-managers-form', resourcesController.agileProjectManagersForm); app.get('/pmi-acp-agile-project-managers-form',
resourcesController.agileProjectManagersForm);
// Nonprofit Onboarding // Nonprofit Onboarding
@ -278,8 +286,6 @@ app.get('/nonprofits', resourcesController.nonprofits);
app.get('/nonprofits-form', resourcesController.nonprofitsForm); app.get('/nonprofits-form', resourcesController.nonprofitsForm);
app.get('/map', challengeMapController.challengeMap); app.get('/map', challengeMapController.challengeMap);
app.get('/live-pair-programming', function(req, res) { app.get('/live-pair-programming', function(req, res) {
@ -532,7 +538,9 @@ app.get('/api/trello', resourcesController.trelloCalls);
* Bonfire related routes * Bonfire related routes
*/ */
app.get('/field-guide/getFieldGuideList', fieldGuideController.showAllFieldGuides); app.get('/field-guide/getFieldGuideList',
fieldGuideController.showAllFieldGuides
);
app.get('/playground', bonfireController.index); app.get('/playground', bonfireController.index);
@ -562,7 +570,9 @@ app.post('/completed-bonfire/', bonfireController.completedBonfire);
*/ */
app.get('/field-guide/:fieldGuideName', fieldGuideController.returnIndividualFieldGuide); app.get('/field-guide/:fieldGuideName',
fieldGuideController.returnIndividualFieldGuide
);
app.get('/field-guide/', fieldGuideController.returnNextFieldGuide); app.get('/field-guide/', fieldGuideController.returnNextFieldGuide);
@ -586,9 +596,13 @@ app.post('/completed-zipline-or-basejump',
coursewareController.completedZiplineOrBasejump); coursewareController.completedZiplineOrBasejump);
// Unique Check API route // Unique Check API route
app.get('/api/checkUniqueUsername/:username', userController.checkUniqueUsername); app.get('/api/checkUniqueUsername/:username',
userController.checkUniqueUsername
);
app.get('/api/checkExistingUsername/:username', userController.checkExistingUsername); app.get('/api/checkExistingUsername/:username',
userController.checkExistingUsername
);
app.get('/api/checkUniqueEmail/:email', userController.checkUniqueEmail); app.get('/api/checkUniqueEmail/:email', userController.checkUniqueEmail);