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

Ad minimal map for iframe loading

Browse Source
This commit is contained in:
Berkeley Martinez
2016-01-13 14:59:51 -08:00
parent f960b3aa84
commit a2fd213a86
3 changed files with 98 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/boot/challenge.js
View File

@ -228,6 +228,7 @@ function getSuperBlocks$(challenge$, completedChallenges) {
return { return {
isBeta, isBeta,
isComingSoon, isComingSoon,
isRequired,
name: blockArray[0].block, name: blockArray[0].block,
superBlock: blockArray[0].superBlock, superBlock: blockArray[0].superBlock,
dashedName: dasherize(blockArray[0].block), dashedName: dasherize(blockArray[0].block),
@ -317,7 +318,8 @@ module.exports = function(app) {
completedZiplineOrBasejump completedZiplineOrBasejump
); );
router.get('/map', showMap); router.get('/map', showMap.bind(null, false));
router.get('/map-minimal', showMap.bind(null, true));
router.get( router.get(
'/challenges/next-challenge', '/challenges/next-challenge',
returnNextChallenge returnNextChallenge
@ -574,14 +576,15 @@ module.exports = function(app) {
); );
} }
function showMap({ user }, res, next) { function showMap(showMinimal, { user }, res, next) {
getSuperBlocks$(challenge$, getCompletedChallengeIds(user)) getSuperBlocks$(challenge$, getCompletedChallengeIds(user))
.subscribe( .subscribe(
superBlocks => { superBlocks => {
res.render('map/show', { res.render('map/show', {
superBlocks, superBlocks,
title: 'A Map to Learn to Code and Become a Software Engineer' title: 'A Map to Learn to Code and Become a Software Engineer',
showMinimal
}); });
}, },
next next

5
server/views/layout-wide.jade
View File

@ -5,7 +5,8 @@ html(lang='en')
include partials/stylesheets include partials/stylesheets
body.no-top-and-bottom-margins.full-screen-body-background body.no-top-and-bottom-margins.full-screen-body-background
include partials/scripts include partials/scripts
include partials/navbar if !showMinimal
include partials/flash include partials/navbar
include partials/flash
block content block content
include partials/footer include partials/footer

177
server/views/map/show.jade
View File

@ -1,94 +1,95 @@
extends ../layout-wide extends ../layout-wide
block content block content
.row if !showMinimal
.col-xs-12.col-md-6.col-md-offset-3 .row
ul .col-xs-12.col-md-6.col-md-offset-3
for superBlock in superBlocks ul
h2= superBlock.name for superBlock in superBlocks
for challengeBlock in superBlock.blocks h2= superBlock.name
.row for challengeBlock in superBlock.blocks
if (user) .row
.col-xs-11.col-sm-8.col-md-9 if (user)
li.map-p.negative-10 .col-xs-11.col-sm-8.col-md-9
|    li.map-p.negative-10
a(href='#' + challengeBlock.dashedName)= challengeBlock.name |   
if challengeBlock.markNew a(href='#' + challengeBlock.dashedName)= challengeBlock.name
span.text-info.small     if challengeBlock.markNew
strong span.text-info.small    
em NEW strong
if challengeBlock.isComingSoon em NEW
span.text-info.small     if challengeBlock.isComingSoon
strong span.text-info.small    
em Coming Soon strong
else em Coming Soon
.hidden-xs.col-sm-3.col-md-2 else
.col-xs-10.col-sm-8.col-md-9 .hidden-xs.col-sm-3.col-md-2
span.map-p.negative-10 .col-xs-10.col-sm-8.col-md-9
a(href='#' + challengeBlock.dashedName)= challengeBlock.name span.map-p.negative-10
if challengeBlock.markNew a(href='#' + challengeBlock.dashedName)= challengeBlock.name
span.text-info.small     if challengeBlock.markNew
strong span.text-info.small    
em NEW strong
if challengeBlock.isComingSoon em NEW
span.text-info.small     if challengeBlock.isComingSoon
strong span.text-info.small    
em Coming Soon strong
h2 Full Stack Development Certification em Coming Soon
.row h2 Full Stack Development Certification
.col-xs-12.col-sm-9.col-md-10 .row
li.map-p.negative-10 .col-xs-12.col-sm-9.col-md-10
|    li.map-p.negative-10
span.ion-locked.padded-ionic-icon |   
| Greenfield Nonprofit Project 1 span.ion-locked.padded-ionic-icon
.col-xs-12.col-sm-9.col-md-10 | Greenfield Nonprofit Project 1
li.map-p.negative-10 .col-xs-12.col-sm-9.col-md-10
|    li.map-p.negative-10
span.ion-locked.padded-ionic-icon |   
| Greenfield Nonprofit Project 2 span.ion-locked.padded-ionic-icon
.col-xs-12.col-sm-9.col-md-10 | Greenfield Nonprofit Project 2
li.map-p.negative-10 .col-xs-12.col-sm-9.col-md-10
|    li.map-p.negative-10
span.ion-locked.padded-ionic-icon |   
| Legacy Nonprofit Project 1 span.ion-locked.padded-ionic-icon
.col-xs-12.col-sm-9.col-md-10 | Legacy Nonprofit Project 1
li.map-p.negative-10 .col-xs-12.col-sm-9.col-md-10
|    li.map-p.negative-10
span.ion-locked.padded-ionic-icon |   
| Legacy Nonprofit Project 2 span.ion-locked.padded-ionic-icon
.col-xs-12.col-sm-9.col-md-10 | Legacy Nonprofit Project 2
li.map-p.negative-10 .col-xs-12.col-sm-9.col-md-10
|    li.map-p.negative-10
span.ion-locked.padded-ionic-icon |   
| Claim your Full Stack Development Certification span.ion-locked.padded-ionic-icon
| Claim your Full Stack Development Certification
h2 Coding Interview Preparation h2 Coding Interview Preparation
.row .row
.col-xs-12.col-sm-9.col-md-10 .col-xs-12.col-sm-9.col-md-10
li.map-p.negative-10 li.map-p.negative-10
|    |   
span.ion-locked.padded-ionic-icon span.ion-locked.padded-ionic-icon
| Whiteboard Coding Interview Training | Whiteboard Coding Interview Training
.col-xs-12.col-sm-9.col-md-10 .col-xs-12.col-sm-9.col-md-10
li.map-p.negative-10 li.map-p.negative-10
|    |   
span.ion-locked.padded-ionic-icon span.ion-locked.padded-ionic-icon
| Critical Thinking Interview Training | Critical Thinking Interview Training
.col-xs-12.col-sm-9.col-md-10 .col-xs-12.col-sm-9.col-md-10
li.map-p.negative-10 li.map-p.negative-10
|    |   
span.ion-locked.padded-ionic-icon span.ion-locked.padded-ionic-icon
| Mock Interview 1 | Mock Interview 1
.col-xs-12.col-sm-9.col-md-10 .col-xs-12.col-sm-9.col-md-10
li.map-p.negative-10 li.map-p.negative-10
|    |   
span.ion-locked.padded-ionic-icon span.ion-locked.padded-ionic-icon
| Mock Interview 2 | Mock Interview 2
.col-xs-12.col-sm-9.col-md-10 .col-xs-12.col-sm-9.col-md-10
li.map-p.negative-10 li.map-p.negative-10
|    |   
span.ion-locked.padded-ionic-icon span.ion-locked.padded-ionic-icon
| Mock Interview 3 | Mock Interview 3
hr hr
.row .row
.col-xs-12.col-md-6.col-md-offset-3 .col-xs-12.col-md-6.col-md-offset-3
for superBlock, index in superBlocks for superBlock, index in superBlocks