fix a strange bug caused by an apparent clash in variables introduced this morning by my menu refactor

This commit is contained in:
Michael Q Larson
2014-12-30 22:03:03 -08:00
parent 1dda38eaaa
commit a00070e5c5
4 changed files with 11 additions and 17 deletions

View File

@ -141,8 +141,8 @@ exports.getAccount = function(req, res) {
} }
res.render('account/profile', { res.render('account/profile', {
title: 'Manage your Free Code Camp Account', title: 'Manage your Free Code Camp Account',
c: c, challenges: c,
cc: req.user.challengesHash, ch: req.user.challengesHash,
moment: moment moment: moment
}); });
}); });

View File

@ -71,7 +71,7 @@ block content
i.fa.fa-twitter i.fa.fa-twitter
| Link Twitter with your account | Link Twitter with your account
br br
- if (cc[0] > 0) - if (ch[0] > 0)
.panel .panel
.container .container
h1 Completed Challenges h1 Completed Challenges
@ -81,11 +81,11 @@ block content
tr tr
th Challenge th Challenge
th Date Finished th Date Finished
for challenge in c for challenge in challenges
if cc[challenge.challengeNumber] > 0 if ch[challenge.challengeNumber] > 0
tr tr
td= c[challenge.challengeNumber].name td= challenges[challenge.challengeNumber].name
td= moment(cc[challenge.challengeNumber], 'X').format("MMM DD, YYYY") td= moment(ch[challenge.challengeNumber], 'X').format("MMM DD, YYYY")
br br
.panel .panel
.container .container

View File

@ -12,13 +12,13 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height
ul.nav.navbar-nav.navbar-right ul.nav.navbar-nav.navbar-right
li li
a(href='/') Challenges a(href='/') Challenges
- if (!cc || (cc && cc[1]) < 1) - if (!cc || (cc && cc[1] < 1))
li li
a(href='/challenges/1') Chat a(href='/challenges/1') Chat
- else - else
li li
a(href='http://chat.freecodecamp.com' target='_blank') Chat a(href='http://chat.freecodecamp.com' target='_blank') Chat
- if (!cc || (cc && cc[2]) < 1) - if (!cc || (cc && cc[2] < 1))
li li
a(href='/challenges/2') Forum a(href='/challenges/2') Forum
- else - else

View File

@ -62,13 +62,7 @@ block content
= c39 = c39
.row .row
.col-xs-6.text-right .col-xs-6.text-right
h2 49 Points: h2 All 54 Points:
.col-xs-6.text-left .col-xs-6.text-left
h2 h2
= c49 = all
.row
.col-xs-6.text-right
h2 All 60 Points:
.col-xs-6.text-left
h2
= c59