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

Merge pull request #419 from QuincyLarson/point-fix

Browse Source 
add campwide meeting and fix user show points
This commit is contained in:
Nathan
2015-05-05 12:48:32 -04:00
parent 077a97c941 200fa53012
commit 770e298b65
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
controllers/user.js
View File

@ -331,7 +331,6 @@ exports.returnUser = function(req, res, next) {
bio: user.profile.bio, bio: user.profile.bio,
picture: user.profile.picture, picture: user.profile.picture,
progressTimestamps: user.progressTimestamps, progressTimestamps: user.progressTimestamps,
points: user.progressTimestamps.length,
website1Link: user.portfolio.website1Link, website1Link: user.portfolio.website1Link,
website1Title: user.portfolio.website1Title, website1Title: user.portfolio.website1Title,
website1Image: user.portfolio.website1Image, website1Image: user.portfolio.website1Image,

2
views/account/show.jade
View File

@ -44,7 +44,7 @@ block content
.col-xs-12.col-sm-12.col-md-3.text-center .col-xs-12.col-sm-12.col-md-3.text-center
.background-svg.img-center .background-svg.img-center
.points-on-top .points-on-top
= "[ " + (user ? user.progressTimestamps.length : 0) + " ]" = "[ " + (user ? progressTimestamps.length : 0) + " ]"
.row .row

10
views/resources/twitch.jade
View File

@ -31,16 +31,16 @@ block content
.col-xs-12 .col-xs-12
h2 Here are some of our previous shows (you can full-screen them): h2 Here are some of our previous shows (you can full-screen them):
.row.negative-20 .row.negative-20
.col-xs-12.col-sm-12.col-md-6
.embed-responsive.embed-responsive-16by9.big-break
iframe.embed-responsive-item(src='//www.youtube.com/embed/dolG-yRMcPs')
p.wrappable.negative-45 link:  
a(href="http://www.youtube.com/watch/Fn9HMn79KH0") http://www.youtube.com/watch/dolG-yRMcPs
.col-xs-12.col-sm-12.col-md-6 .col-xs-12.col-sm-12.col-md-6
.embed-responsive.embed-responsive-16by9.big-break .embed-responsive.embed-responsive-16by9.big-break
iframe.embed-responsive-item(src='//www.youtube.com/embed/YMz_vrK_KlQ') iframe.embed-responsive-item(src='//www.youtube.com/embed/YMz_vrK_KlQ')
p.wrappable.negative-45 link:   p.wrappable.negative-45 link:  
a(href="http://www.youtube.com/watch/_BErpDdmBOw") http://www.youtube.com/watch/YMz_vrK_KlQ a(href="http://www.youtube.com/watch/_BErpDdmBOw") http://www.youtube.com/watch/YMz_vrK_KlQ
.col-xs-12.col-sm-12.col-md-6
.embed-responsive.embed-responsive-16by9.big-break
iframe.embed-responsive-item(src='//www.youtube.com/embed/vLcuOanKVMw')
p.wrappable.negative-45 link:  
a(href="http://www.youtube.com/watch/Fn9HMn79KH0") http://www.youtube.com/watch/vLcuOanKVMw
.col-xs-12.col-sm-12.col-md-6 .col-xs-12.col-sm-12.col-md-6
.embed-responsive.embed-responsive-16by9.big-break .embed-responsive.embed-responsive-16by9.big-break
iframe.embed-responsive-item(src='//www.youtube.com/embed/bbFVxaza8Ik') iframe.embed-responsive-item(src='//www.youtube.com/embed/bbFVxaza8Ik')