From 44c5da8f729b742631abe4eeac77cfbaa219d63d Mon Sep 17 00:00:00 2001
From: Michael Q Larson <michaelqlarson@gmail.com>
Date: Thu, 2 Apr 2015 14:23:56 -0700
Subject: [PATCH] improve the streak counter which previously wasn't defaulting
 to one day

---
 controllers/user.js     | 7 +++++--
 views/account/show.jade | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/controllers/user.js b/controllers/user.js
index 5f925b370c..8b44838c03 100644
--- a/controllers/user.js
+++ b/controllers/user.js
@@ -302,6 +302,9 @@ exports.returnUser = function(req, res, next) {
         data[(progressTimestamps[i] / 1000).toString()] = 1;
       }
 
+      user.currentStreak = user.currentStreak || 1;
+      user.longestStreak = user.longestStreak || 1;
+
       res.render('account/show', {
         title: 'Camper ' + user.profile.username + '\'s portfolio',
         username: user.profile.username,
@@ -327,8 +330,8 @@ exports.returnUser = function(req, res, next) {
         ch: user.challengesHash,
         calender: data,
         moment: moment,
-        longestStreak: user.longestStreak,
-        currentStreak: user.currentStreak
+        longestStreak: user.longestStreak + (user.longestStreak === 1 ? " day" : " days"),
+        currentStreak: user.currentStreak + (user.currentStreak === 1 ? " day" : " days")
       });
 
     } else {
diff --git a/views/account/show.jade b/views/account/show.jade
index 34e0a6e864..1ab23dd6ad 100644
--- a/views/account/show.jade
+++ b/views/account/show.jade
@@ -123,4 +123,4 @@ block content
                             .hidden-xs.col-sm-12.text-center
                                 .row
                                     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}