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

Use specific layout for map aside

Browse Source 
Links in aside change parent location
This commit is contained in:
Berkeley Martinez
2016-01-14 16:03:55 -08:00
parent 7b53a108c3
commit 95dfd2304e
6 changed files with 155 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/main.js
View File

@ -264,7 +264,7 @@ $(document).ready(function() {
$('#nav-map-btn').on('click', () => {
if (!main.isMapAsideLoad) {
var mapAside = $('<iframe>');
mapAside.attr('src', '/map-minimal');
mapAside.attr('src', '/map-aside');
$('.map-aside').append(mapAside);
main.isMapAsideLoad = true;
}

10
server/boot/challenge.js
View File

@ -398,7 +398,7 @@ module.exports = function(app) {
);
router.get('/map', showMap.bind(null, false));
router.get('/map-minimal', showMap.bind(null, true));
router.get('/map-aside', showMap.bind(null, true));
router.get(
'/challenges/current-challenge',
redirectToCurrentChallenge
@ -618,15 +618,15 @@ module.exports = function(app) {
);
}
function showMap(showMinimal, { user }, res, next) {
function showMap(showAside, { user }, res, next) {
getSuperBlocks$(challenge$, getCompletedChallengeIds(user))
.subscribe(
superBlocks => {
res.render('map/show', {
const view = showAside ? 'map/showAside' : 'map/show';
res.render(view, {
superBlocks,
title: 'A Map to Learn to Code and Become a Software Engineer',
showMinimal
title: 'A Map to Learn to Code and Become a Software Engineer'
});
},
next

8
server/views/layout-map-aside.jade Normal file
View File

@ -0,0 +1,8 @@
doctype html
html(lang='en')
head
include partials/meta
include partials/stylesheets
body.map-aside-body
include partials/scripts
block content

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

@ -3,11 +3,6 @@ html(lang='en')
head
include partials/meta
include partials/stylesheets
if showMinimal
body.map-aside-body
include partials/scripts
block content
else
body.no-top-and-bottom-margins.full-screen-body-background
include partials/scripts
include partials/navbar

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

@ -1,6 +1,5 @@
extends ../layout-wide
block content
if !showMinimal
.row
.col-xs-12.col-md-6.col-md-offset-3
ul

47
server/views/map/showAside.jade Normal file
View File

@ -0,0 +1,47 @@
extends ../layout-map-aside
block content
.row
.col-xs-12.col-md-6.col-md-offset-3
for superBlock, index in superBlocks
for challengeBlock in superBlock.blocks
.row
a(href='#' name=challengeBlock.dashedName)
.spacer.negative-55
.row
h4.bold #{challengeBlock.name} (#{challengeBlock.time})
for challenge in challengeBlock.challenges
.col-xs-12.col-sm-9.col-md-10
if challenge.completed
p.text-primary.ion-checkmark-circled.padded-ionic-icon.negative-15(name="#{challenge.dashedName}") &nbsp;
a(href="/challenges/#{challenge.dashedName}" target='_parent')
= challenge.title
span.sr-only= " Complete"
else if (challenge.type === "bonfire")
p.ion-asterisk.padded-ionic-icon.negative-15(name="#{challenge.dashedName}") &nbsp;
a(name="#{challenge.dashedName}" target='_parent' href="/challenges/#{challenge.dashedName}" class=challenge.isComingSoon ? 'disabled' : '')
span= challenge.title
span.sr-only= " Incomplete"
if challenge.markNew
span.text-success.small &thinsp; &thinsp;
strong
em New
if challengeBlock.isComingSoon
span.text-success.small &thinsp; &thinsp;
strong
em Coming Soon
else
p.ion-ios-circle-outline.padded-ionic-icon.negative-15(name="#{challenge.dashedName}") &nbsp;
a(name="#{challenge.dashedName}" target='_parent' href="/challenges/#{challenge.dashedName}" class=challenge.isComingSoon ? 'disabled' : '')
span= challenge.title
span.sr-only= " Incomplete"
if challenge.markNew
span.text-success.small &thinsp; &thinsp;
strong
em New
if challengeBlock.isComingSoon
span.text-success.small &thinsp; &thinsp;
strong
em Coming Soon
if (index < superBlocks.length)
hr