Skip to content

Commit

Permalink
Merge branch 'release/0.0.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
toshiyukihina committed May 17, 2016
2 parents a337f7b + b864976 commit e402f2e
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 13 deletions.
5 changes: 5 additions & 0 deletions HISTORY.md
@@ -1,3 +1,8 @@
0.0.8 / 2016/05/17
==================

* [Lesson 8 - Index Routes](https://github.com/reactjs/react-router-tutorial/tree/master/lessons/08-index-routes) done

0.0.7 / 2016/05/17
==================

Expand Down
11 changes: 11 additions & 0 deletions app/components/home.jsx
@@ -0,0 +1,11 @@
import React from 'react';

class Home extends React.Component {

render() {
return (<div>Home</div>);
}

}

export default Home;
24 changes: 12 additions & 12 deletions app/index.jsx
@@ -1,24 +1,24 @@
import React from 'react';
import ReactDOM from 'react-dom';
import { Router, Route, hashHistory } from 'react-router';
import { Router, Route, hashHistory, IndexRoute } from 'react-router';

import App from './components/app';
import About from './components/about';
import Repos from './components/repos';
import Repo from './components/repo'
import Repo from './components/repo';
import Home from './components/home';

require('../node_modules/bootstrap/dist/css/bootstrap.css');
require('./index.css');

ReactDOM.render((
<Router history={hashHistory}>
<Route path="/" component={App}>
<Route path="/repos" component={Repos}>
<Route path="/repos/:userName/:repoName" component={Repo} />
</Route>
<Route path="/about" component={About} />
<Router history={hashHistory}>
<Route path="/" component={App}>
<IndexRoute component={Home} />
<Route path="/repos" component={Repos}>
<Route path="/repos/:userName/:repoName" component={Repo} />
</Route>
</Router>
),
document.body.appendChild(document.createElement('div'))
);
<Route path="/about" component={About} />
</Route>
</Router>
), document.body.appendChild(document.createElement('div')));
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "react-router-tutorial",
"version": "0.0.7",
"version": "0.0.8",
"description": "",
"main": "index.js",
"scripts": {
Expand Down

0 comments on commit e402f2e

Please sign in to comment.