From c9b4a90f5715deb7136a8b8696ceec575054f6d9 Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Fri, 3 Apr 2015 20:50:27 -0700 Subject: [PATCH] more improvements to look of challengeMap --- controllers/challengeMap.js | 2 - public/css/main.less | 5 ++ views/challengeMap/show.jade | 90 +++++++++++++++++++++--------------- 3 files changed, 59 insertions(+), 38 deletions(-) diff --git a/controllers/challengeMap.js b/controllers/challengeMap.js index 8e0ae56cf5..f8cad437cf 100644 --- a/controllers/challengeMap.js +++ b/controllers/challengeMap.js @@ -53,8 +53,6 @@ module.exports = { basejumps = coursewareList.filter(function(challenge) { if (challenge.challengeType === 4) { return challenge } }); - console.log('completed', completedCoursewareList); - console.log('waypoints', waypoints); res.render('challengeMap/show', { title: "A map of all Free Code Camp's Challenges", diff --git a/public/css/main.less b/public/css/main.less index 5649f43ca4..ddd7d6d095 100644 --- a/public/css/main.less +++ b/public/css/main.less @@ -894,6 +894,11 @@ iframe.iphone { padding: 5px; } +.svg-challenge-map { + fill: #333; + height: 40px; +} + //uncomment this to see the dimensions of all elements outlined in red //* { // border-color: red; diff --git a/views/challengeMap/show.jade b/views/challengeMap/show.jade index 77fe2291ce..78a93f1791 100644 --- a/views/challengeMap/show.jade +++ b/views/challengeMap/show.jade @@ -5,39 +5,57 @@ block content .panel-heading.text-center h1 Challenge Map .panel-body - h3 Waypoints - ol.col-md-offset-2 - for waypoint in waypoints - if completedCoursewareList.indexOf(waypoint._id) > -1 - li.strikethrough - a(href="/challenges/#{waypoint.name}")= waypoint.name - else - li - a(href="/challenges/#{waypoint.name}")= waypoint.name - h3 Bonfires - ol.col-md-offset-2 - for bonfire in bonfires - if completedBonfireList.indexOf(bonfire._id) > -1 - li.strikethrough - a(href="/bonfires/#{bonfire.name}")= bonfire.name - else - li - a(href="/bonfires/#{bonfire.name}")= bonfire.name - h3 Ziplines - ol.col-md-offset-2 - for zipline in ziplines - if completedCoursewareList.indexOf(zipline._id) > -1 - li.strikethrough - a(href="/challenges/#{zipline.name}")= zipline.name - else - li - a(href="/challenges/#{zipline.name}")= zipline.name - h3 Basejumps - ol.col-md-offset-2 - for basejump in basejumps - if completedCoursewareList.indexOf(basejump._id) > -1 - li.strikethrough - a(href="/challenges/#{basejump.name}")= basejump.name - else - li - a(href="/challenges/#{basejump.name}")= basejump.name + .col-md-offset-2 + h2 + span.fa.fa-flag + |   Waypoints + + .col-xs-12 + h3.negative-15 + ol + for waypoint in waypoints + if completedCoursewareList.indexOf(waypoint._id) > -1 + li.strikethrough + a(href="/challenges/#{waypoint.name}")= waypoint.name + else + li + a(href="/challenges/#{waypoint.name}")= waypoint.name + h2 + span.ion-bonfire + |   Bonfires + .col-xs-12 + h3.negative-15 + ol + for bonfire in bonfires + if completedBonfireList.indexOf(bonfire._id) > -1 + li.strikethrough + a(href="/bonfires/#{bonfire.name}")= bonfire.name + else + li + a(href="/bonfires/#{bonfire.name}")= bonfire.name + h2 + span.fa.fa-angle-double-right + |   Ziplines + .col-xs-12 + h3.negative-15 + ol + for zipline in ziplines + if completedCoursewareList.indexOf(zipline._id) > -1 + li.strikethrough + a(href="/challenges/#{zipline.name}")= zipline.name + else + li + a(href="/challenges/#{zipline.name}")= zipline.name + h2 + span.fa.fa-level-down + |   Basejumps + .col-xs-12 + h3.negative-15 + ol + for basejump in basejumps + if completedCoursewareList.indexOf(basejump._id) > -1 + li.strikethrough + a(href="/challenges/#{basejump.name}")= basejump.name + else + li + a(href="/challenges/#{basejump.name}")= basejump.name