From 184ba1fa374bc5150dfa713027bf7366114d97a3 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Tue, 8 Sep 2015 22:18:25 -0700 Subject: [PATCH] add challengeId to localStorage remove unneeded current challenge route --- server/boot/challenge.js | 34 --------------------- server/views/partials/challenge-modals.jade | 3 ++ 2 files changed, 3 insertions(+), 34 deletions(-) diff --git a/server/boot/challenge.js b/server/boot/challenge.js index 4c3c261d47..cac6d0a867 100644 --- a/server/boot/challenge.js +++ b/server/boot/challenge.js @@ -131,12 +131,6 @@ module.exports = function(app) { router.get('/challenges/:challengeName', returnIndividualChallenge); - router.get( - '/challenges/', - redirectNonUser, - returnCurrentChallenge - ); - app.use(router); function returnNextChallenge(req, res, next) { @@ -218,34 +212,6 @@ module.exports = function(app) { ); } - function returnCurrentChallenge(req, res, next) { - Observable.just(req.user) - .flatMap(user => { - if (!req.user.currentChallenge) { - return challenge$ - .first() - .flatMap(challenge => { - user.currentChallenge = { - challengeId: challenge.id, - challengeName: challenge.name, - dashedName: challenge.dashedName - }; - return saveUser(user); - }); - } - return Observable.just(user); - }) - .map(user => user.currentChallenge.dashedName) - .subscribe( - function(challengeName) { - res.redirect('/challenges/' + challengeName); - }, - next, - function() { - } - ); - } - function returnIndividualChallenge(req, res, next) { const origChallengeName = req.params.challengeName; const unDashedName = unDasherize(origChallengeName); diff --git a/server/views/partials/challenge-modals.jade b/server/views/partials/challenge-modals.jade index 24805a953b..5776c8d7ce 100644 --- a/server/views/partials/challenge-modals.jade +++ b/server/views/partials/challenge-modals.jade @@ -48,3 +48,6 @@ a.btn.btn-lg.btn-info.btn-block#reset-button(href='#', data-dismiss='modal', aria-hidden='true') Clear my code 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); + }