From bc62d18eb4736b325b99f678526b41fe1c6d7eb8 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Thu, 9 Jul 2015 00:29:29 -0700 Subject: [PATCH] add map of hikes --- .eslintrc | 8 +++-- common/app/routes/Hikes/components/Hikes.jsx | 35 +++++++++++++------ .../app/routes/Hikes/components/Lecture.jsx | 28 +++++++++++++++ common/app/routes/Hikes/components/Map.jsx | 28 +++++++++++++++ .../app/routes/Hikes/components/Question.jsx | 19 ++++++++++ common/app/routes/Hikes/index.js | 18 ++++++---- 6 files changed, 115 insertions(+), 21 deletions(-) create mode 100644 common/app/routes/Hikes/components/Lecture.jsx create mode 100644 common/app/routes/Hikes/components/Map.jsx diff --git a/.eslintrc b/.eslintrc index 5c50e37af5..f06a712e01 100644 --- a/.eslintrc +++ b/.eslintrc @@ -185,10 +185,12 @@ "sort-vars": 0, "space-after-keywords": [ 2, - "always", - { "checkFunctionKeyword": false } + "always" + ], + "space-before-function-paren": [ + 2, + "never" ], - "space-after-function-names": "never", "space-before-blocks": [ 2, "always" diff --git a/common/app/routes/Hikes/components/Hikes.jsx b/common/app/routes/Hikes/components/Hikes.jsx index 9891adbc88..6beb6f6514 100644 --- a/common/app/routes/Hikes/components/Hikes.jsx +++ b/common/app/routes/Hikes/components/Hikes.jsx @@ -1,22 +1,35 @@ import React, { PropTypes } from 'react'; -import { Row } from 'react-bootstrap'; -import Video from 'react-video'; +import stampit from 'react-stampit'; +import { Panel, Row } from 'react-bootstrap'; +// import debugFactory from 'debug'; -export default React.createClass({ +import HikesMap from './Map.jsx'; + +// const debug = debugFactory('freecc:hikes'); + +export default stampit(React, { displayName: 'Hikes', + propTypes: { - id: PropTypes.string + children: PropTypes.element + }, + + renderMap() { + return ( + + ); }, render() { - const { - id - } = this.props.params; - return ( -