Merge branch 'release/0.0.2'

HISTORY.md

@@ -1,3 +1,8 @@
+0.0.2 / 2016/05/16
+==================
+
+  * [Lesson 2-react-router-tutorial](https://github.com/reactjs/react-router-tutorial/tree/master/lessons/02-rendering-a-route) done
+
 0.0.1 / 2016/05/16
 ==================
 

app/components/about.jsx

@@ -0,0 +1,14 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+
+export default class About extends React.Component {
+
+  constructor(props) {
+    super(props);
+  }
+
+  render() {
+    return (<div>About</div>);
+  }
+
+}

app/components/repos.jsx

@@ -0,0 +1,14 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+
+export default class Repos extends React.Component {
+
+  constructor(props) {
+    super(props);
+  }
+
+  render() {
+    return (<div>Repos</div>);
+  }
+
+}

app/index.jsx

@@ -1,10 +1,19 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-require('../node_modules/bootstrap/dist/css/bootstrap.css')
+import { Router, Route, hashHistory } from 'react-router';
 
-import App from './components/app'
+require('../node_modules/bootstrap/dist/css/bootstrap.css');
 
-ReactDOM.render(
-  <App />,
+import App from './components/app';
+import About from './components/about';
+import Repos from './components/repos';
+
+ReactDOM.render((
+    <Router history={hashHistory}>
+      <Route path="/" component={App} />
+      <Route path="/repos" component={Repos} />
+      <Route path="/about" component={About} />
+    </Router>
+  ),
   document.body.appendChild(document.createElement('div'))
 );

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-router-tutorial",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -31,6 +31,7 @@
     "lodash": "^4.12.0",
     "react": "^15.0.2",
     "react-bootstrap": "^0.29.4",
-    "react-dom": "^15.0.2"
+    "react-dom": "^15.0.2",
+    "react-router": "^2.4.0"
   }
 }