From 5ba0dc1fec143252e3f43e7b6c7947698d1ab828 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Tue, 14 Jul 2015 23:44:21 -0700 Subject: [PATCH] hikes/:dashedName renders questions --- .../app/routes/Hikes/components/Lecture.jsx | 32 +++++++++++++------ server/boot/a-react.js | 4 +-- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/common/app/routes/Hikes/components/Lecture.jsx b/common/app/routes/Hikes/components/Lecture.jsx index cdc3b31ef69..a5a7cdec4e7 100644 --- a/common/app/routes/Hikes/components/Lecture.jsx +++ b/common/app/routes/Hikes/components/Lecture.jsx @@ -39,28 +39,37 @@ export default contain( debug('loading questions'); }, + renderQuestions(questions) { + return questions.map(([question]) => { + return ( + +

{ question }

+
+ ); + }); + }, + render() { const { title, challengeSeed = ['1'], - description = [] + description = [], + tests: questions } = this.props.currentHike; const [ id ] = challengeSeed; + const videoTitle =

{ title }

; return ( - -

{ title }

+ +
- - - @@ -70,6 +79,11 @@ export default contain( + + + { this.renderQuestions(questions) } + + ); } diff --git a/server/boot/a-react.js b/server/boot/a-react.js index 8b1393be5cd..9e77e4e4723 100644 --- a/server/boot/a-react.js +++ b/server/boot/a-react.js @@ -10,8 +10,8 @@ const debug = debugFactory('freecc:servereact'); // add routes here as they slowly get reactified // remove their individual controllers const routes = [ - '/Hikes', - '/Hikes/:id', + '/hikes', + '/hikes/*', '/jobs' ];