From 080fb4d37c3bd1dedf2d3160e53c3719643f991c Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Sat, 4 Jul 2015 08:16:42 -0700
Subject: [PATCH] add video player

---
 common/app/App.jsx                              |  5 ++++-
 common/app/components/Nav/Nav.jsx               |  1 +
 common/app/routes/Hikes/components/Hikes.jsx    |  6 +++++-
 common/app/routes/Hikes/components/Question.jsx |  0
 common/app/routes/Hikes/index.js                |  5 +++++
 common/app/routes/Hikes/questions.json          |  2 ++
 common/app/routes/Hikes/videos.json             | 16 ++++++++++++++++
 package.json                                    |  1 +
 8 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 common/app/routes/Hikes/components/Question.jsx
 create mode 100644 common/app/routes/Hikes/questions.json
 create mode 100644 common/app/routes/Hikes/videos.json

diff --git a/common/app/App.jsx b/common/app/App.jsx
index e0a2569c07..e97ac4d83f 100644
--- a/common/app/App.jsx
+++ b/common/app/App.jsx
@@ -1,4 +1,5 @@
 import React, { PropTypes } from 'react';
+import { Row } from 'react-bootstrap';
 
 import { Nav } from './components/Nav';
 import { Footer } from './components/Footer';
@@ -17,7 +18,9 @@ export default class extends React.Component {
     return (
       <div>
         <Nav />
-        { this.props.children }
+        <Row>
+          { this.props.children }
+        </Row>
         <Footer />
       </div>
     );
diff --git a/common/app/components/Nav/Nav.jsx b/common/app/components/Nav/Nav.jsx
index f35a8442ae..ddb7b2e3d3 100644
--- a/common/app/components/Nav/Nav.jsx
+++ b/common/app/components/Nav/Nav.jsx
@@ -8,6 +8,7 @@ const fCClogo = 'https://s3.amazonaws.com/freecodecamp/freecodecamp_logo.svg';
 const navElements = navLinks.map((navItem, index) => {
   return (
     <NavItem
+      key={ index }
       eventKey={ index + 1 }
       href={ navItem.link }>
       { navItem.content }
diff --git a/common/app/routes/Hikes/components/Hikes.jsx b/common/app/routes/Hikes/components/Hikes.jsx
index 2b248eb320..5bb219732f 100644
--- a/common/app/routes/Hikes/components/Hikes.jsx
+++ b/common/app/routes/Hikes/components/Hikes.jsx
@@ -1,4 +1,6 @@
 import React, { PropTypes } from 'react';
+import { Row } from 'react-bootstrap';
+import Video from 'react-video';
 
 export default React.createClass({
   displayName: 'Hikes',
@@ -12,7 +14,9 @@ export default React.createClass({
     } = this.props.params;
 
     return (
-      <h2>Hello { id }</h2>
+      <Video
+        from='vimeo'
+        videoId={ 132543959 } />
     );
   }
 });
diff --git a/common/app/routes/Hikes/components/Question.jsx b/common/app/routes/Hikes/components/Question.jsx
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/common/app/routes/Hikes/index.js b/common/app/routes/Hikes/index.js
index 02b140cf4a..fb24125653 100644
--- a/common/app/routes/Hikes/index.js
+++ b/common/app/routes/Hikes/index.js
@@ -1,5 +1,10 @@
 import Hikes from './components/Hikes.jsx';
 
+/*
+ * show video /hikes/someVideo
+ * show question /hikes/someVideo/question1
+ */
+
 export default {
   path: 'hikes(/:id)',
 
diff --git a/common/app/routes/Hikes/questions.json b/common/app/routes/Hikes/questions.json
new file mode 100644
index 0000000000..2c63c08510
--- /dev/null
+++ b/common/app/routes/Hikes/questions.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/common/app/routes/Hikes/videos.json b/common/app/routes/Hikes/videos.json
new file mode 100644
index 0000000000..790169acab
--- /dev/null
+++ b/common/app/routes/Hikes/videos.json
@@ -0,0 +1,16 @@
+[{
+  "title": "fcc computer basics 1: the 4 basic parts of a computer",
+  "id": "132542064"
+}, {
+  "title": "FCC Computer Basics 2: More Computer Hardware",
+  "id": "132542458"
+}, {
+  "title": "FCC Computer Basics 3: Intro to Binary Code",
+  "id": "132542757"
+}, {
+  "title": "FCC Computer Basics 4: Decoding a Binary Number",
+  "id": "132543332"
+}, {
+  "title": "FCC Computer Basics 5: How To Measure Data Size",
+  "id": "132543959"
+}]
diff --git a/package.json b/package.json
index eba0961b60..22a8a9b28c 100644
--- a/package.json
+++ b/package.json
@@ -91,6 +91,7 @@
     "react": "^0.13.3",
     "react-bootstrap": "^0.23.5",
     "react-router": "^1.0.0-beta3",
+    "react-video": "https://github.com/BerkeleyTrue/react-video",
     "request": "~2.53.0",
     "rx": "^2.5.3",
     "sanitize-html": "~1.6.1",