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

Streak display in account/show.jade, refactor courseware.json for error handling and linting

Browse Source
This commit is contained in:
Nathan Leniz
2015-03-28 23:42:07 +09:00
parent 85a06d5ac2
commit 9e1a4a1348
6 changed files with 337 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app.js
View File

@ -39,8 +39,6 @@ var express = require('express'),
resourcesController = require('./controllers/resources'),
userController = require('./controllers/user'),
contactController = require('./controllers/contact'),
ziplineController = require('./controllers/ziplines'),
basejumpController = require('./controllers/basejumps'),
nonprofitController = require('./controllers/nonprofits'),
bonfireController = require('./controllers/bonfire'),
coursewareController = require('./controllers/courseware'),
@ -48,7 +46,7 @@ var express = require('express'),
/**
* Stories
*/
storyController = require('./controllers/story');
storyController = require('./controllers/story'),
/**
* API keys and Passport configuration.
@ -398,8 +396,6 @@ app.post(
app.all('/account', passportConf.isAuthenticated);
app.get('/account/api', userController.getAccountAngular);
app.get('/user/streak', userController.getStreak);
/**
* API routes
*/

55
controllers/bonfire.js
View File

@ -42,7 +42,7 @@ exports.index = function(req, res) {
});
};
exports.returnNextBonfire = function(req, res) {
exports.returnNextBonfire = function(req, res, next) {
if (!req.user) {
return res.redirect('../bonfires/meet-bonfire');
}
@ -62,7 +62,7 @@ exports.returnNextBonfire = function(req, res) {
var displayedBonfires = Bonfire.find({'_id': uncompletedBonfires[0]});
displayedBonfires.exec(function(err, bonfire) {
if (err) {
next(err);
return next(err);
}
bonfire = bonfire.pop();
if (bonfire === undefined) {
@ -71,7 +71,7 @@ exports.returnNextBonfire = function(req, res) {
});
return res.redirect('../bonfires/meet-bonfire');
}
nameString = bonfire.name.toLowerCase().replace(/\s/g, '-');
var nameString = bonfire.name.toLowerCase().replace(/\s/g, '-');
return res.redirect('../bonfires/' + nameString);
});
};
@ -79,9 +79,9 @@ exports.returnNextBonfire = function(req, res) {
exports.returnIndividualBonfire = function(req, res, next) {
var dashedName = req.params.bonfireName;
bonfireName = dashedName.replace(/\-/g, ' ');
var bonfireName = dashedName.replace(/\-/g, ' ');
Bonfire.find({"name" : new RegExp(bonfireName, 'i')}, function(err, bonfire) {
Bonfire.find({'name': new RegExp(bonfireName, 'i')}, function(err, bonfire) {
if (err) {
next(err);
}
@ -118,14 +118,17 @@ exports.returnIndividualBonfire = function(req, res, next) {
compliment: resources.randomCompliment(),
bonfires: bonfire,
bonfireHash: bonfire._id
});
});
};
/**
* Bonfire generator
* Bonfire Generator
* @param req Request Object
* @param res Response Object
* @returns void
*/
exports.returnGenerator = function(req, res) {
res.render('bonfire/generator', {
title: null,
@ -144,7 +147,7 @@ exports.returnGenerator = function(req, res) {
*/
function randomString() {
var chars = "0123456789abcdef";
var chars = '0123456789abcdef';
var string_length = 23;
var randomstring = 'a';
for (var i = 0; i < string_length; i++) {
@ -152,7 +155,7 @@ function randomString() {
randomstring += chars.substring(rnum, rnum + 1);
}
return randomstring;
};
}
/**
*
@ -169,6 +172,7 @@ exports.testBonfire = function(req, res) {
bonfireTests.filter(getRidOfEmpties);
bonfireDescription.filter(getRidOfEmpties);
bonfireChallengeSeed = bonfireChallengeSeed.replace('\r', '');
res.render('bonfire/show', {
completedWith: null,
title: bonfireName,
@ -184,7 +188,7 @@ exports.testBonfire = function(req, res) {
phrase: resources.randomPhrase(),
compliment: resources.randomCompliment(),
bonfires: [],
bonfireHash: "test"
bonfireHash: 'test'
});
};
@ -192,7 +196,7 @@ function getRidOfEmpties(elem) {
if (elem.length > 0) {
return elem;
}
};
}
exports.publicGenerator = function(req, res) {
res.render('bonfire/public-generator');
@ -222,29 +226,28 @@ exports.generateChallenge = function(req, res) {
res.send(response);
};
exports.completedBonfire = function (req, res) {
var isCompletedWith = req.body.bonfireInfo.completedWith || undefined;
exports.completedBonfire = function (req, res, next) {
var isCompletedWith = req.body.bonfireInfo.completedWith || '';
var isCompletedDate = Math.round(+new Date());
var bonfireHash = req.body.bonfireInfo.bonfireHash;
var isSolution = req.body.bonfireInfo.solution;
if (isCompletedWith) {
var paired = User.find({"profile.username": isCompletedbWith.toLowerCase()}).limit(1);
var paired = User.find({'profile.username': isCompletedWith
.toLowerCase()}).limit(1);
paired.exec(function (err, pairedWith) {
if (err) {
return err;
return next(err);
} else {
var index = req.user.uncompletedBonfires.indexOf(bonfireHash);
if (index > -1) {
req.user.progressTimestamps.push(Date.now() || 0);
req.user.uncompletedBonfires.splice(index, 1)
req.user.uncompletedBonfires.splice(index, 1);
}
pairedWith = pairedWith.pop();
index = pairedWith.uncompletedBonfires.indexOf(bonfireHash);
if (index > -1) {
pairedWith.progressTimestamps.push(Date.now() || 0);
pairedWith.uncompletedBonfires.splice(index, 1);
@ -265,19 +268,21 @@ exports.completedBonfire = function (req, res) {
});
req.user.save(function (err, user) {
if (err) {
return next(err);
}
pairedWith.save(function (err, paired) {
if (err) {
throw err;
return next(err);
}
if (user && paired) {
res.send(true);
}
})
});
});
}
})
});
} else {
req.user.completedBonfires.push({
_id: bonfireHash,
completedWith: null,
@ -289,16 +294,16 @@ exports.completedBonfire = function (req, res) {
if (index > -1) {
req.user.progressTimestamps.push(Date.now() || 0);
req.user.uncompletedBonfires.splice(index, 1)
req.user.uncompletedBonfires.splice(index, 1);
}
req.user.save(function (err, user) {
if (err) {
throw err;
return next(err);
}
if (user) {
debug('Saving user');
res.send(true)
res.send(true);
}
});
}

42
controllers/courseware.js
View File

@ -22,7 +22,7 @@ exports.showAllCoursewares = function(req, res) {
res.send(data);
};
exports.returnNextCourseware = function(req, res) {
exports.returnNextCourseware = function(req, res, next) {
if (!req.user) {
return res.redirect('../challenges/learn-how-free-code-camp-works');
}
@ -30,7 +30,8 @@ exports.returnNextCourseware = function(req, res) {
return elem._id;
});
req.user.uncompletedCoursewares = resources.allCoursewareIds().filter(function (elem) {
req.user.uncompletedCoursewares = resources.allCoursewareIds()
.filter(function (elem) {
if (completed.indexOf(elem) === -1) {
return elem;
}
@ -43,13 +44,14 @@ exports.returnNextCourseware = function(req, res) {
var displayedCoursewares = Courseware.find({'_id': uncompletedCoursewares});
displayedCoursewares.exec(function(err, courseware) {
if (err) {
next(err);
return next(err);
}
courseware = courseware.pop();
if (courseware === undefined) {
req.flash('errors', {
msg: "It looks like you've completed all the courses we have available. Good job!"
msg: "It looks like you've completed all the courses we have " +
"available. Good job!"
});
return res.redirect('../challenges/learn-how-free-code-camp-works');
}
@ -61,16 +63,18 @@ exports.returnNextCourseware = function(req, res) {
exports.returnIndividualCourseware = function(req, res, next) {
var dashedName = req.params.coursewareName;
coursewareName = dashedName.replace(/\-/g, ' ');
var coursewareName = dashedName.replace(/\-/g, ' ');
Courseware.find({"name" : new RegExp(coursewareName, 'i')}, function(err, courseware) {
Courseware.find({'name': new RegExp(coursewareName, 'i')},
function(err, courseware) {
if (err) {
next(err);
}
// Handle not found
if (courseware.length < 1) {
req.flash('errors', {
msg: "404: We couldn't find a challenge with that name. Please double check the name."
msg: "404: We couldn't find a challenge with that name. " +
"Please double check the name."
});
return res.redirect('/challenges');
}
@ -134,7 +138,7 @@ exports.returnIndividualCourseware = function(req, res, next) {
},
3: function() {
res.render('coursewares/showVideo', {
res.render('coursewares/showZipline', {
title: courseware.name,
dashedName: dashedName,
name: courseware.name,
@ -150,7 +154,7 @@ exports.returnIndividualCourseware = function(req, res, next) {
},
4: function() {
res.render('coursewares/showVideo', {
res.render('coursewares/showBasejump', {
title: courseware.name,
dashedName: dashedName,
name: courseware.name,
@ -199,7 +203,7 @@ exports.testCourseware = function(req, res) {
phrase: resources.randomPhrase(),
compliment: resources.randomCompliment(),
coursewares: [],
coursewareHash: "test"
coursewareHash: 'test'
});
};
@ -207,7 +211,7 @@ function getRidOfEmpties(elem) {
if (elem.length > 0) {
return elem;
}
};
}
exports.publicGenerator = function(req, res) {
res.render('courseware/public-generator');
@ -243,34 +247,26 @@ exports.completedCourseware = function (req, res, next) {
var isCompletedDate = Math.round(+new Date());
var coursewareHash = req.body.coursewareInfo.coursewareHash;
debug('this is the coursewarehash we got', coursewareHash);
req.user.completedCoursewares.push({
_id: coursewareHash,
completedDate: isCompletedDate,
name: req.body.coursewareInfo.coursewareName
});
var index = req.user.completedCoursewares.indexOf(coursewareHash);
if (index === -1) {
req.user.progressTimestamps.push(Date.now() || 0);
req.user.uncompletedCoursewares.splice(index, 1);
}
exports.completedBasejump = function (req, res, next) {
var isCompletedWith = req.body.bonfireInfo.completedWith || undefined;
var isCompletedDate = Math.round(+new Date());
var coursewareHash = req.body.coursewareInfo.coursewareHash;
var solutionLink = req.body.coursewareInfo.solutionLink;
if(!solutionLink) {
// flash error and redirect
req.user.save(function (err, user) {
if (err) {
return next(err);
}
if (user) {
res.send(true);
}
};
});
};
exports.completedZiplineOrBasejump = function (req, res, next) {

78
controllers/user.js
View File

@ -196,50 +196,6 @@ exports.postEmailSignup = function(req, res, next) {
});
};
/**
* For Calendar display
*/
exports.getStreak = function(req, res, next) {
req.user.progressTimestamps = req.user.progressTimestamps.sort(function(a, b) {
return a - b;
});
var timeObject = Object.create(null);
R.forEach(function(time) {
timeObject[moment(time).format('YYYY-MM-DD')] = time;
}, req.user.progressTimestamps);
var tmpLongest = 1;
var timeKeys = R.keys(timeObject);
for (var i = 1; i <= timeKeys.length; i++) {
if (moment(timeKeys[i - 1]).add(1, 'd').toString()
=== moment(timeKeys[i]).toString()) {
tmpLongest++;
if (tmpLongest > req.user.currentStreak) {
req.user.currentStreak = tmpLongest;
}
if ( req.user.currentStreak > req.user.longestStreak) {
req.user.longestStreak = req.user.currentStreak;
}
}
}
req.user.save(function(err) {
if (err) {
return next(err);
}
});
s
var payload = {
longest: req.user.longestStreak,
timeObject: timeObject
};
return res.send(payload);
};
/**
* GET /account
* Profile page.
@ -314,6 +270,36 @@ exports.returnUser = function(req, res, next) {
if (user[0]) {
var user = user[0];
user.progressTimestamps = user.progressTimestamps.sort(function(a, b) {
return a - b;
});
var timeObject = Object.create(null);
R.forEach(function(time) {
timeObject[moment(time).format('YYYY-MM-DD')] = time;
}, user.progressTimestamps);
var tmpLongest = 1;
var timeKeys = R.keys(timeObject);
for (var i = 1; i <= timeKeys.length; i++) {
if (moment(timeKeys[i - 1]).add(1, 'd').toString()
=== moment(timeKeys[i]).toString()) {
tmpLongest++;
if (tmpLongest > user.currentStreak) {
user.currentStreak = tmpLongest;
}
if ( user.currentStreak > user.longestStreak) {
user.longestStreak = user.currentStreak;
}
}
}
user.save(function(err) {
if (err) {
return next(err);
}
});
var data = {};
var progressTimestamps = user.progressTimestamps;
for (var i = 0; i < progressTimestamps.length; i++) {
@ -344,7 +330,9 @@ exports.returnUser = function(req, res, next) {
website3Image: user.portfolio.website3Image,
ch: user.challengesHash,
calender: data,
moment: moment
moment: moment,
longestStreak: user.longestStreak,
currentStreak: user.currentStreak
});
} else {

1
package.json
View File

@ -48,6 +48,7 @@
"moment": "^2.8.4",
"mongodb": "^1.4.33",
"mongoose": "^4.0.0",
"mongoose-long": "0.0.2",
"morgan": "^1.5.0",
"newrelic": "^1.13.3",
"nodemailer": "^1.3.0",

13
views/account/show.jade
View File

@ -119,3 +119,16 @@ block content
legendColors: ["#cccccc", "#215f1e"],
legend: [1, 2, 3]
});
.row
.hidden-xs.col-sm-12.text-center
.row
h3.col-sm-6.text-center
.center-block.
#{longestStreak}
.center-block.
Longest Streak
h3.col-sm-6.text-center
.center-block.
#{currentStreak}
.center-block.
Current Streak