From c736a5c00ff6a4db3cb98b290cd03b68f020b69a Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Fri, 4 Dec 2015 22:37:15 -0800 Subject: [PATCH] Use regex to hide hikes Capitalize super block --- seed/index.js | 7 ++++++- server/boot/challenge.js | 11 +++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/seed/index.js b/seed/index.js index fa232842f1..6ca98c33bb 100644 --- a/seed/index.js +++ b/seed/index.js @@ -44,9 +44,14 @@ destroy() challenge.order = order; challenge.suborder = index + 1; challenge.block = block; - challenge.superBlock = superBlock; challenge.isBeta = challenge.isBeta || isBeta; challenge.time = challengeSpec.time; + challenge.superBlock = superBlock + .split('-') + .map(function(word) { + return _.capitalize(word); + }) + .join(' '); return challenge; }); diff --git a/server/boot/challenge.js b/server/boot/challenge.js index ca18817d39..063ea7a27b 100644 --- a/server/boot/challenge.js +++ b/server/boot/challenge.js @@ -146,8 +146,9 @@ module.exports = function(app) { challenges: blockArray, superBlock: blockArray[0].superBlock })) - .filter(({ name })=> { - return name !== 'Hikes'; + .filter(({ superBlock }) => { + console.log('sup', superBlock); + return challengesRegex.test(superBlock); }) .groupBy(block => block.superBlock) .flatMap(superBlocks$ => superBlocks$.toArray()) @@ -191,7 +192,7 @@ module.exports = function(app) { // find challenge return challenge$ .map(challenge => challenge.toJSON()) - .filter(({ superBlock }) => superBlock !== 'hikes') + .filter(({ superBlock }) => challengesRegex.test(superBlock)) .filter(({ id }) => id === challengeId) // now lets find the block it belongs to .flatMap(challenge => { @@ -529,7 +530,9 @@ module.exports = function(app) { time: blockArray[0] && blockArray[0].time || '???' }; }) - .filter(({ superBlock }) => superBlock !== 'hikes') + .filter(({ superBlock }) => { + return !(/hikes/i).test(superBlock); + }) // turn stream of blocks into a stream of an array .toArray() .doOnNext(blocks => {