Skip to content

Commit 0bd946d

Browse files
committed
07-lesson;
1 parent ad9ed1a commit 0bd946d

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

lessons/07-more-nesting/index.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ import Repo from './modules/Repo'
99
render((
1010
<Router history={hashHistory}>
1111
<Route path="/" component={App}>
12-
<Route path="/repos" component={Repos}/>
13-
<Route path="/repos/:userName/:repoName" component={Repo}/>
12+
<Route path="/repos" component={Repos}>
13+
<Route path="/repos/:userName/:repoName" component={Repo}/>
14+
</Route>
1415
<Route path="/about" component={About}/>
1516
</Route>
1617
</Router>
Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
import React from 'react'
2-
import { Link } from 'react-router'
2+
import NavLink from './NavLink'
33

44
export default React.createClass({
5-
render() {
6-
return (
7-
<div>
8-
<h2>Repos</h2>
9-
<ul>
10-
<li><Link to="/repos/reactjs/react-router">React Router</Link></li>
11-
<li><Link to="/repos/facebook/react">React</Link></li>
12-
</ul>
13-
</div>
14-
)
15-
}
5+
render() {
6+
return (
7+
<div>
8+
<h2>Repos</h2>
9+
<ul>
10+
<li><NavLink to="/repos/reactjs/react-router">React Router</NavLink></li>
11+
<li><NavLink to="/repos/facebook/react">React</NavLink></li>
12+
</ul>
13+
14+
{this.props.children}
15+
</div>
16+
)
17+
}
1618
})

0 commit comments

Comments
 (0)