From ef91cf3bb2a135b16e9a119aca96d1cbc3193b02 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Fri, 10 Jul 2015 12:10:03 -0700 Subject: [PATCH] add titles and grids --- common/app/routes/Hikes/components/Hikes.jsx | 5 +---- .../app/routes/Hikes/components/Lecture.jsx | 22 +++++++++++++++---- common/app/routes/Hikes/components/Map.jsx | 13 +++++++---- common/app/routes/Hikes/flux/Store.js | 0 common/app/routes/Hikes/videos.json | 2 +- 5 files changed, 29 insertions(+), 13 deletions(-) create mode 100644 common/app/routes/Hikes/flux/Store.js diff --git a/common/app/routes/Hikes/components/Hikes.jsx b/common/app/routes/Hikes/components/Hikes.jsx index 6beb6f6514d..0c538777fd0 100644 --- a/common/app/routes/Hikes/components/Hikes.jsx +++ b/common/app/routes/Hikes/components/Hikes.jsx @@ -1,6 +1,6 @@ import React, { PropTypes } from 'react'; import stampit from 'react-stampit'; -import { Panel, Row } from 'react-bootstrap'; +import { Row } from 'react-bootstrap'; // import debugFactory from 'debug'; import HikesMap from './Map.jsx'; @@ -23,9 +23,6 @@ export default stampit(React, { render() { return (
- -

Hikes!

-
{ this.props.children || this.renderMap() } diff --git a/common/app/routes/Hikes/components/Lecture.jsx b/common/app/routes/Hikes/components/Lecture.jsx index 8e1b64ddb49..0fcec7cddee 100644 --- a/common/app/routes/Hikes/components/Lecture.jsx +++ b/common/app/routes/Hikes/components/Lecture.jsx @@ -1,4 +1,5 @@ import React, { PropTypes } from 'react'; +import { Col, Row, Panel } from 'react-bootstrap'; import stampit from 'react-stampit'; import Vimeo from 'react-vimeo'; import debugFactory from 'debug'; @@ -12,7 +13,10 @@ export default stampit(React, { params: PropTypes.object }, - onError: debug, + handleError: debug, + handleFinish() { + debug('loading questions'); + }, render() { const { @@ -20,9 +24,19 @@ export default stampit(React, { } = this.props.params; return ( - + + + +

Title

+
+
+ + + + ); } }); diff --git a/common/app/routes/Hikes/components/Map.jsx b/common/app/routes/Hikes/components/Map.jsx index 366bf95d2c3..c859638552a 100644 --- a/common/app/routes/Hikes/components/Map.jsx +++ b/common/app/routes/Hikes/components/Map.jsx @@ -1,7 +1,7 @@ import React from 'react'; import stampit from 'react-stampit'; import { Link } from 'react-router'; -import { ListGroup, ListGroupItem } from 'react-bootstrap'; +import { ListGroup, ListGroupItem, Panel } from 'react-bootstrap'; import videos from '../videos.json'; export default stampit(React, { @@ -20,9 +20,14 @@ export default stampit(React, { }); return ( - - { vidElements } - +
+ +

Welcome To Hikes!

+
+ + { vidElements } + +
); } }); diff --git a/common/app/routes/Hikes/flux/Store.js b/common/app/routes/Hikes/flux/Store.js new file mode 100644 index 00000000000..e69de29bb2d diff --git a/common/app/routes/Hikes/videos.json b/common/app/routes/Hikes/videos.json index 790169acab1..628bf3dc6f3 100644 --- a/common/app/routes/Hikes/videos.json +++ b/common/app/routes/Hikes/videos.json @@ -1,5 +1,5 @@ [{ - "title": "fcc computer basics 1: the 4 basic parts of a computer", + "title": "FCC Computer Basics 1: the 4 basic parts of a computer", "id": "132542064" }, { "title": "FCC Computer Basics 2: More Computer Hardware",