From cfba4edb29c85760580695db3e4d1532bc8f2405 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Tue, 8 Sep 2015 23:47:00 -0700 Subject: [PATCH] add further code to be QAd after sleeping --- server/boot/challenge.js | 7 +------ server/views/coursewares/showBonfire.jade | 5 +++-- server/views/coursewares/showHTML.jade | 5 +++-- server/views/coursewares/showJS.jade | 3 ++- server/views/coursewares/showVideo.jade | 10 ++++++---- server/views/coursewares/showZiplineOrBasejump.jade | 11 +++++++---- server/views/partials/challenge-modals.jade | 2 +- server/views/partials/navbar.jade | 13 ++++++++----- 8 files changed, 31 insertions(+), 25 deletions(-) diff --git a/server/boot/challenge.js b/server/boot/challenge.js index 58c4371d97..15736e3a51 100644 --- a/server/boot/challenge.js +++ b/server/boot/challenge.js @@ -14,7 +14,6 @@ import { import { userMigration, - ifNoUserRedirectTo, ifNoUserSend } from '../utils/middleware'; @@ -100,9 +99,6 @@ module.exports = function(app) { const userCount$ = observeMethod(User, 'count'); const send200toNonUser = ifNoUserSend(true); - const redirectNonUser = ifNoUserRedirectTo( - '/map' - ); router.post( '/completed-challenge/', @@ -125,7 +121,6 @@ module.exports = function(app) { router.get('/map', challengeMap); router.get( '/challenges/next-challenge', - redirectNonUser, returnNextChallenge ); @@ -197,7 +192,7 @@ module.exports = function(app) { function() { debug('next challengeName', nextChallengeName); if (!nextChallengeName || nextChallengeName === firstChallenge) { - req.flash('errors', { + req.flash('info', { msg: dedent` Once you have completed all of our challenges, you should join our 2) a.animated.fadeIn.btn.btn-lg.btn-block.btn-twitter(target="_blank", href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{dashedName}&hashtags=LearnToCode, JavaScript") i.fa.fa-twitter   = phrase else - a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress + a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge #reset-modal.modal(tabindex='-1') .modal-dialog.animated.fadeInUp.fast-animation .modal-content diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade index 64a10cc314..91496dfd20 100644 --- a/server/views/coursewares/showHTML.jade +++ b/server/views/coursewares/showHTML.jade @@ -62,6 +62,7 @@ block content var challenge_Id = !{JSON.stringify(challengeId)}; var challenge_Name = !{JSON.stringify(name)}; var prodOrDev = !{JSON.stringify(environment)}; + var dashedName = !{JSON.stringify(dashedName)}; var challengeType = !{JSON.stringify(challengeType)}; var started = Math.floor(Date.now()); .col-xs-12.col-sm-12.col-md-5.col-lg-6 @@ -91,7 +92,7 @@ block content span.completion-icon.ion-checkmark-circled.text-primary .spacer if(user) - #submit-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit and go to next challenge + #submit-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit and go to my next challenge else - a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress + a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge include ../partials/challenge-modals diff --git a/server/views/coursewares/showJS.jade b/server/views/coursewares/showJS.jade index f0832f8387..27f2652cf9 100644 --- a/server/views/coursewares/showJS.jade +++ b/server/views/coursewares/showJS.jade @@ -61,6 +61,7 @@ block content var challengeSeed = !{JSON.stringify(challengeSeed)}; var challenge_Id = !{JSON.stringify(challengeId)}; var challenge_Name = !{JSON.stringify(name)}; + var dashedName = !{JSON.stringify(dashedName)}; var started = Math.floor(Date.now()); var challengeType = !{JSON.stringify(challengeType)}; var _ = R; @@ -93,7 +94,7 @@ block content i.fa.fa-twitter   = phrase else - a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress + a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge include ../partials/challenge-modals script. var MDNlinks = !{JSON.stringify(MDNlinks)}; diff --git a/server/views/coursewares/showVideo.jade b/server/views/coursewares/showVideo.jade index ae3e049c90..8b4393f453 100644 --- a/server/views/coursewares/showVideo.jade +++ b/server/views/coursewares/showVideo.jade @@ -17,7 +17,7 @@ block content iframe.embed-responsive-item(src='//player.vimeo.com/video/#{video}') br if (user) - a.btn.btn-primary.btn-big.btn-block#completed-courseware-editorless I've completed this challenge (ctrl + enter) + a.btn.btn-primary.btn-big.btn-block#completed-courseware-editorless I've completed this challenge (ctrl + enter) script. var userLoggedIn = true; .button-spacer @@ -30,6 +30,8 @@ block content |   Report a bug .button-spacer else + a.animated.fadeIn.btn.btn-big.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge (ctrl + enter) + .button-spacer a.btn.btn-big.signup-btn.btn-block(href='/login') Sign in so you can save your progress script. var userLoggedIn = false; @@ -64,7 +66,7 @@ block content .animated.zoomInDown.delay-half span.completion-icon.ion-checkmark-circled.text-primary if (user) - a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block#next-courseware-button(name='_csrf', value=_csrf) On to my next challenge (ctrl + enter) + a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block#next-courseware-button(name='_csrf', value=_csrf) Go to my next challenge script. $('#complete-courseware-editorless-dialog').bind('keypress', modalControlEnterHandler); @@ -74,12 +76,12 @@ block content i.fa.fa-twitter   = phrase else - a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress - h1 #{name} + a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge script. $('body').bind('keypress', controlEnterHandler); script. var challenge_Id = !{JSON.stringify(challengeId)}; var challenge_Name = !{JSON.stringify(name)}; var challengeType = !{JSON.stringify(challengeType)}; + var dashedName = !{JSON.stringify(dashedName)}; include ../partials/challenge-modals diff --git a/server/views/coursewares/showZiplineOrBasejump.jade b/server/views/coursewares/showZiplineOrBasejump.jade index df46b026e0..e1e1e37a8f 100644 --- a/server/views/coursewares/showZiplineOrBasejump.jade +++ b/server/views/coursewares/showZiplineOrBasejump.jade @@ -17,7 +17,7 @@ block content iframe.embed-responsive-item(src='//player.vimeo.com/video/#{video}') br if (user) - a.btn.btn-primary.btn-big.btn-block#completed-zipline-or-basejump I've completed this challenge (ctrl + enter) + a.btn.btn-primary.btn-big.btn-block#completed-zipline-or-basejump I've completed this challenge (ctrl + enter) .button-spacer .btn-group.input-group.btn-group-justified .btn.btn-success.btn-big#trigger-help-modal @@ -33,7 +33,8 @@ block content script. var userLoggedIn = true; else - a.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress + a.animated.fadeIn.btn.btn-big.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge (ctrl + enter) + a.btn.btn-big.signup-btn.btn-block(href='/login') Sign in so you can save your progress script. var userLoggedIn = false; br @@ -41,6 +42,7 @@ block content var challenge_Id = !{JSON.stringify(challengeId)}; var challenge_Name = !{JSON.stringify(name)}; var started = Math.floor(Date.now()); + var dashedName = !{JSON.stringify(dashedName)}; var challengeType = !{JSON.stringify(challengeType)}; var controlEnterHandler = function (e) { $('body').unbind('keypress'); @@ -87,11 +89,12 @@ block content | Username not found if (user) - a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block#next-courseware-button(name='_csrf', value=_csrf, ng-disabled='completedWithForm.$invalid') Go to my next challenge (ctrl + enter) + a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block#next-courseware-button(name='_csrf', value=_csrf, ng-disabled='completedWithForm.$invalid') Go to my next challenge + .button-spacer script. $('#complete-zipline-or-basejump-dialog').on('keypress', modalControlEnterHandler); else - a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress + a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge script. $('body').on('keypress', controlEnterHandler); include ../partials/challenge-modals diff --git a/server/views/partials/challenge-modals.jade b/server/views/partials/challenge-modals.jade index 5776c8d7ce..b5e223cb5e 100644 --- a/server/views/partials/challenge-modals.jade +++ b/server/views/partials/challenge-modals.jade @@ -49,5 +49,5 @@ a.btn.btn-lg.btn-primary.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Cancel script. if (typeof localStorage !== 'undefined') { - localStorage.setItem('currentChallenge', challenge_Id); + localStorage.setItem('currentDashedName', dashedName); } diff --git a/server/views/partials/navbar.jade b/server/views/partials/navbar.jade index bc6a85ce20..546334932d 100644 --- a/server/views/partials/navbar.jade +++ b/server/views/partials/navbar.jade @@ -37,13 +37,16 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height script. $(document).ready(function() { $('.learn-btn').click(function(e) { - var challengeId = null; + var challengeDashedName = null; e.preventDefault(); - if (typeof localStorage !== 'undefined') { - challengeId = localStorage.getItem('currentChallenge'); + if (typeof dashedName === "string") { + return location.reload(); } - window.location = challengeId ? - '/challenges/next-challenge?id=' + challengeId : + if (typeof localStorage !== 'undefined') { + challengeDashedName = localStorage.getItem('currentDashedName'); + } + window.location = challengeDashedName ? + '/challenges/' + challengeDashedName : '/map'; }); });