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

improve the streak counter which previously wasn't defaulting to one day

Browse Source
This commit is contained in:
Michael Q Larson
2015-04-02 14:23:56 -07:00
parent 97e59d4568
commit 44c5da8f72
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
controllers/user.js
View File

@ -302,6 +302,9 @@ exports.returnUser = function(req, res, next) {
data[(progressTimestamps[i] / 1000).toString()] = 1; data[(progressTimestamps[i] / 1000).toString()] = 1;
} }
user.currentStreak = user.currentStreak || 1;
user.longestStreak = user.longestStreak || 1;
res.render('account/show', { res.render('account/show', {
title: 'Camper ' + user.profile.username + '\'s portfolio', title: 'Camper ' + user.profile.username + '\'s portfolio',
username: user.profile.username, username: user.profile.username,
@ -327,8 +330,8 @@ exports.returnUser = function(req, res, next) {
ch: user.challengesHash, ch: user.challengesHash,
calender: data, calender: data,
moment: moment, moment: moment,
longestStreak: user.longestStreak, longestStreak: user.longestStreak + (user.longestStreak === 1 ? " day" : " days"),
currentStreak: user.currentStreak currentStreak: user.currentStreak + (user.currentStreak === 1 ? " day" : " days")
}); });
} else { } else {

2
views/account/show.jade
View File

@ -123,4 +123,4 @@ block content
.hidden-xs.col-sm-12.text-center .hidden-xs.col-sm-12.text-center
.row .row
h3.col-sm-6.text-right Longest Streak: #{longestStreak} h3.col-sm-6.text-right Longest Streak: #{longestStreak}
h3.col-sm-6.text-left Current Streak #{currentStreak} h3.col-sm-6.text-left Current Streak: #{currentStreak}