Use specific layout for map aside
Links in aside change parent location
This commit is contained in:
Berkeley Martinez
@ -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;
|
||||
}
|
||||
|
||||
@ -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
8
server/views/layout-map-aside.jade
Normal 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
|
||||
@ -3,14 +3,9 @@ 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
|
||||
include partials/flash
|
||||
block content
|
||||
include partials/footer
|
||||
body.no-top-and-bottom-margins.full-screen-body-background
|
||||
include partials/scripts
|
||||
include partials/navbar
|
||||
include partials/flash
|
||||
block content
|
||||
include partials/footer
|
||||
|
||||
@ -1,95 +1,94 @@
|
||||
extends ../layout-wide
|
||||
block content
|
||||
if !showMinimal
|
||||
.row
|
||||
.col-xs-12.col-md-6.col-md-offset-3
|
||||
ul
|
||||
for superBlock in superBlocks
|
||||
h2= superBlock.name
|
||||
for challengeBlock in superBlock.blocks
|
||||
.row
|
||||
if (user)
|
||||
.col-xs-11.col-sm-8.col-md-9
|
||||
li.map-p.negative-10
|
||||
|
|
||||
a(href='#' + challengeBlock.dashedName)= challengeBlock.name
|
||||
if challengeBlock.markNew
|
||||
span.text-info.small    
|
||||
strong
|
||||
em NEW
|
||||
if challengeBlock.isComingSoon
|
||||
span.text-info.small    
|
||||
strong
|
||||
em Coming Soon
|
||||
else
|
||||
.hidden-xs.col-sm-3.col-md-2
|
||||
.col-xs-10.col-sm-8.col-md-9
|
||||
span.map-p.negative-10
|
||||
a(href='#' + challengeBlock.dashedName)= challengeBlock.name
|
||||
if challengeBlock.markNew
|
||||
span.text-info.small    
|
||||
strong
|
||||
em NEW
|
||||
if challengeBlock.isComingSoon
|
||||
span.text-info.small    
|
||||
strong
|
||||
em Coming Soon
|
||||
h2 Full Stack Development Certification
|
||||
.row
|
||||
.col-xs-12.col-sm-9.col-md-10
|
||||
li.map-p.negative-10
|
||||
|
|
||||
span.ion-locked.padded-ionic-icon
|
||||
| Greenfield Nonprofit Project 1
|
||||
.col-xs-12.col-sm-9.col-md-10
|
||||
li.map-p.negative-10
|
||||
|
|
||||
span.ion-locked.padded-ionic-icon
|
||||
| Greenfield Nonprofit Project 2
|
||||
.col-xs-12.col-sm-9.col-md-10
|
||||
li.map-p.negative-10
|
||||
|
|
||||
span.ion-locked.padded-ionic-icon
|
||||
| Legacy Nonprofit Project 1
|
||||
.col-xs-12.col-sm-9.col-md-10
|
||||
li.map-p.negative-10
|
||||
|
|
||||
span.ion-locked.padded-ionic-icon
|
||||
| Legacy Nonprofit Project 2
|
||||
.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
|
||||
.row
|
||||
.col-xs-12.col-md-6.col-md-offset-3
|
||||
ul
|
||||
for superBlock in superBlocks
|
||||
h2= superBlock.name
|
||||
for challengeBlock in superBlock.blocks
|
||||
.row
|
||||
if (user)
|
||||
.col-xs-11.col-sm-8.col-md-9
|
||||
li.map-p.negative-10
|
||||
|
|
||||
a(href='#' + challengeBlock.dashedName)= challengeBlock.name
|
||||
if challengeBlock.markNew
|
||||
span.text-info.small    
|
||||
strong
|
||||
em NEW
|
||||
if challengeBlock.isComingSoon
|
||||
span.text-info.small    
|
||||
strong
|
||||
em Coming Soon
|
||||
else
|
||||
.hidden-xs.col-sm-3.col-md-2
|
||||
.col-xs-10.col-sm-8.col-md-9
|
||||
span.map-p.negative-10
|
||||
a(href='#' + challengeBlock.dashedName)= challengeBlock.name
|
||||
if challengeBlock.markNew
|
||||
span.text-info.small    
|
||||
strong
|
||||
em NEW
|
||||
if challengeBlock.isComingSoon
|
||||
span.text-info.small    
|
||||
strong
|
||||
em Coming Soon
|
||||
h2 Full Stack Development Certification
|
||||
.row
|
||||
.col-xs-12.col-sm-9.col-md-10
|
||||
li.map-p.negative-10
|
||||
|
|
||||
span.ion-locked.padded-ionic-icon
|
||||
| Greenfield Nonprofit Project 1
|
||||
.col-xs-12.col-sm-9.col-md-10
|
||||
li.map-p.negative-10
|
||||
|
|
||||
span.ion-locked.padded-ionic-icon
|
||||
| Greenfield Nonprofit Project 2
|
||||
.col-xs-12.col-sm-9.col-md-10
|
||||
li.map-p.negative-10
|
||||
|
|
||||
span.ion-locked.padded-ionic-icon
|
||||
| Legacy Nonprofit Project 1
|
||||
.col-xs-12.col-sm-9.col-md-10
|
||||
li.map-p.negative-10
|
||||
|
|
||||
span.ion-locked.padded-ionic-icon
|
||||
| Legacy Nonprofit Project 2
|
||||
.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
|
||||
|
||||
h2 Coding Interview Preparation
|
||||
.row
|
||||
.col-xs-12.col-sm-9.col-md-10
|
||||
li.map-p.negative-10
|
||||
|
|
||||
span.ion-locked.padded-ionic-icon
|
||||
| Whiteboard Coding Interview Training
|
||||
.col-xs-12.col-sm-9.col-md-10
|
||||
li.map-p.negative-10
|
||||
|
|
||||
span.ion-locked.padded-ionic-icon
|
||||
| Critical Thinking Interview Training
|
||||
.col-xs-12.col-sm-9.col-md-10
|
||||
li.map-p.negative-10
|
||||
|
|
||||
span.ion-locked.padded-ionic-icon
|
||||
| Mock Interview 1
|
||||
.col-xs-12.col-sm-9.col-md-10
|
||||
li.map-p.negative-10
|
||||
|
|
||||
span.ion-locked.padded-ionic-icon
|
||||
| Mock Interview 2
|
||||
.col-xs-12.col-sm-9.col-md-10
|
||||
li.map-p.negative-10
|
||||
|
|
||||
span.ion-locked.padded-ionic-icon
|
||||
| Mock Interview 3
|
||||
hr
|
||||
h2 Coding Interview Preparation
|
||||
.row
|
||||
.col-xs-12.col-sm-9.col-md-10
|
||||
li.map-p.negative-10
|
||||
|
|
||||
span.ion-locked.padded-ionic-icon
|
||||
| Whiteboard Coding Interview Training
|
||||
.col-xs-12.col-sm-9.col-md-10
|
||||
li.map-p.negative-10
|
||||
|
|
||||
span.ion-locked.padded-ionic-icon
|
||||
| Critical Thinking Interview Training
|
||||
.col-xs-12.col-sm-9.col-md-10
|
||||
li.map-p.negative-10
|
||||
|
|
||||
span.ion-locked.padded-ionic-icon
|
||||
| Mock Interview 1
|
||||
.col-xs-12.col-sm-9.col-md-10
|
||||
li.map-p.negative-10
|
||||
|
|
||||
span.ion-locked.padded-ionic-icon
|
||||
| Mock Interview 2
|
||||
.col-xs-12.col-sm-9.col-md-10
|
||||
li.map-p.negative-10
|
||||
|
|
||||
span.ion-locked.padded-ionic-icon
|
||||
| Mock Interview 3
|
||||
hr
|
||||
.row
|
||||
.col-xs-12.col-md-6.col-md-offset-3
|
||||
for superBlock, index in superBlocks
|
||||
|
||||
47
server/views/map/showAside.jade
Normal file
47
server/views/map/showAside.jade
Normal 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}")
|
||||
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}")
|
||||
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    
|
||||
strong
|
||||
em New
|
||||
if challengeBlock.isComingSoon
|
||||
span.text-success.small    
|
||||
strong
|
||||
em Coming Soon
|
||||
else
|
||||
p.ion-ios-circle-outline.padded-ionic-icon.negative-15(name="#{challenge.dashedName}")
|
||||
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    
|
||||
strong
|
||||
em New
|
||||
if challengeBlock.isComingSoon
|
||||
span.text-success.small    
|
||||
strong
|
||||
em Coming Soon
|
||||
if (index < superBlocks.length)
|
||||
hr
|
||||
Reference in New Issue
Block a user