From 200fa53012f83ddf3071082c90ab347b44bfb4ac Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Tue, 5 May 2015 09:22:38 -0700 Subject: [PATCH] add campwide meeting and fix user show points --- controllers/user.js | 1 - views/account/show.jade | 2 +- views/resources/twitch.jade | 10 +++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/controllers/user.js b/controllers/user.js index 8c6c62fa7d..bd9c4c882e 100644 --- a/controllers/user.js +++ b/controllers/user.js @@ -331,7 +331,6 @@ exports.returnUser = function(req, res, next) { bio: user.profile.bio, picture: user.profile.picture, progressTimestamps: user.progressTimestamps, - points: user.progressTimestamps.length, website1Link: user.portfolio.website1Link, website1Title: user.portfolio.website1Title, website1Image: user.portfolio.website1Image, diff --git a/views/account/show.jade b/views/account/show.jade index b74f98d9b8..11ad24d769 100644 --- a/views/account/show.jade +++ b/views/account/show.jade @@ -43,7 +43,7 @@ block content .col-xs-12.col-sm-12.col-md-3.text-center .background-svg.img-center .points-on-top - = "[ " + (user ? user.progressTimestamps.length : 0) + " ]" + = "[ " + (user ? progressTimestamps.length : 0) + " ]" .row diff --git a/views/resources/twitch.jade b/views/resources/twitch.jade index 653aa9e4d8..e47b9e63b7 100644 --- a/views/resources/twitch.jade +++ b/views/resources/twitch.jade @@ -31,16 +31,16 @@ block content .col-xs-12 h2 Here are some of our previous shows (you can full-screen them): .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 .embed-responsive.embed-responsive-16by9.big-break iframe.embed-responsive-item(src='//www.youtube.com/embed/YMz_vrK_KlQ') p.wrappable.negative-45 link:   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 .embed-responsive.embed-responsive-16by9.big-break iframe.embed-responsive-item(src='//www.youtube.com/embed/bbFVxaza8Ik')