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

Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp

Browse Source
This commit is contained in:
Quincy Larson
2015-05-05 18:40:34 -07:00
parent c9e7b30867 ba78710c82
commit c61e3c8ed2
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
controllers/user.js
View File

@ -285,29 +285,43 @@ exports.returnUser = function(req, res, next) {
var tmpLongest = 1; var tmpLongest = 1;
var timeKeys = R.keys(timeObject); var timeKeys = R.keys(timeObject);
user.longestStreak = 0;
for (var i = 1; i <= timeKeys.length; i++) { for (var i = 1; i <= timeKeys.length; i++) {
if (moment(timeKeys[i - 1]).add(1, 'd').toString() if (moment(timeKeys[i - 1]).add(1, 'd').toString()
=== moment(timeKeys[i]).toString()) { === moment(timeKeys[i]).toString()) {
tmpLongest++; tmpLongest++;
user.longestStreak = tmpLongest; if (tmpLongest > user.longestStreak) {
user.longestStreak = tmpLongest;
}
} else { } else {
tmpLongest = 1; tmpLongest = 1;
} }
} }
timeKeys = timeKeys.reverse(); timeKeys = timeKeys.reverse();
var today = moment(Date.now()), currStreak = 1; tmpLongest = 1;
if (moment(timeKeys[0]).add(1, 'd').toString === today.toString()) {
for (var i = 2; i <= timeKeys.length; i++) { user.currentStreak = 1;
if (moment(timeKeys[i - 1]).add(1, 'd').toString() var today = moment(Date.now()).format('YYYY-MM-DD');
=== moment(timeKeys[i]).toString()) {
currStreak++; if (moment(today).toString() === moment(timeKeys[0]).toString() ||
moment(today).subtract(1, 'd').toString() ===
moment(timeKeys[0]).toString()) {
for (var i = 1; i <= timeKeys.length; i++) {
if (moment(timeKeys[i - 1]).subtract(1, 'd').toString()
=== moment(timeKeys[i]).toString()) {
debug(timeKeys[i - 1], timeKeys[i]);
tmpLongest++;
if (tmpLongest > user.currentStreak) {
user.currentStreak = tmpLongest;
}
} else { } else {
break; break;
} }
} }
} else {
user.currentStreak = 1;
} }
user.currentStreak = currStreak;
user.save(function(err) { user.save(function(err) {
if (err) { if (err) {

3
views/account/show.jade
View File

@ -161,7 +161,8 @@ block content
th.col-xs-6 Solution th.col-xs-6 Solution
for bonfire in bonfires for bonfire in bonfires
tr tr
td.col-xs-4= bonfire.name td.col-xs-4
a(href='/bonfires/' + bonfire.name)= bonfire.name
td.col-xs-2= moment(bonfire.completedDate, 'x').format("MMM DD, YYYY") td.col-xs-2= moment(bonfire.completedDate, 'x').format("MMM DD, YYYY")
td.col-xs-6 td.col-xs-6
pre.wrappable= bonfire.solution pre.wrappable= bonfire.solution