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

Resolve merge conflicts using Webstorm's merge integration tool. v2

Browse Source
This commit is contained in:
terakilobyte
2015-04-17 00:39:48 -04:00
parent b49d2fd343
commit b9372b9af6
4 changed files with 6 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app.js
View File

@ -370,11 +370,11 @@ app.post(
passportConf.isAuthenticated, passportConf.isAuthenticated,
contactController.postDoneWithFirst100Hours contactController.postDoneWithFirst100Hours
); );
app.get( //app.get(
'/nonprofit-project-instructions', // '/nonprofit-project-instructions',
passportConf.isAuthenticated, // passportConf.isAuthenticated,
resourcesController.nonprofitProjectInstructions // resourcesController.nonprofitProjectInstructions
); //);
app.post( app.post(
'/update-progress', '/update-progress',
passportConf.isAuthenticated, passportConf.isAuthenticated,
@ -521,18 +521,6 @@ app.post(
storyController.upvote storyController.upvote
); );
/**
* Challenge related routes
*/
app.get(
'/challenges/',
challengesController.returnNextChallenge
);
app.get(
'/challenges/:challengeNumber',
challengesController.returnChallenge
);
app.all('/account', passportConf.isAuthenticated); app.all('/account', passportConf.isAuthenticated);
app.get('/account/api', userController.getAccountAngular); app.get('/account/api', userController.getAccountAngular);

7
controllers/resources.js
View File

@ -149,13 +149,6 @@ module.exports = {
var date1 = new Date("10/15/2014"); var date1 = new Date("10/15/2014");
var date2 = new Date(); var date2 = new Date();
livePairProgramming: function(req, res) {
res.render('resources/live-pair-programming', {
title: 'Live Pair Programming'
});
},
var timeDiff = Math.abs(date2.getTime() - date1.getTime()); var timeDiff = Math.abs(date2.getTime() - date1.getTime());
var daysRunning = Math.ceil(timeDiff / (1000 * 3600 * 24)); var daysRunning = Math.ceil(timeDiff / (1000 * 3600 * 24));
var announcements = resources.announcements; var announcements = resources.announcements;

10
controllers/story.js
View File

@ -359,16 +359,6 @@ exports.storySubmission = function(req, res, next) {
}); });
}; };
story.save(function(err) {
if (err) {
return next(err);
}
res.send(JSON.stringify({
storyLink: story.storyLink.replace(/\s/g, '-').toLowerCase()
}));
});
};
exports.commentSubmit = function(req, res, next) { exports.commentSubmit = function(req, res, next) {
var data = req.body.data; var data = req.body.data;
if (req.user._id.toString() !== data.author.userId.toString()) { if (req.user._id.toString() !== data.author.userId.toString()) {

2
gulpfile.js
View File

@ -68,4 +68,4 @@ gulp.task('lint', function() {
.pipe(eslint.format()); .pipe(eslint.format());
}); });
gulp.task('default', ['lint', 'serve', 'sync']); gulp.task('default', ['serve', 'sync']);