lesson 07 finish

Author: r2fresh

lessons/01-setting-up/index.js

@@ -11,9 +11,10 @@ import Repo from './modules/Repo'
 render((
     <Router history={hashHistory}>
         <Route path="/" component={App}>
-            <Route path="/repos" component={Repos}/>
-            {/* add this new route*/}
-            <Route path="/repos/:userName/:repoName" component={Repo}/>
+            <Route path="/repos" component={Repos}>
+                {/* add this new route*/}
+                <Route path="/repos/:userName/:repoName" component={Repo}/>
+            </Route>
             <Route path="/about" component={About}/>
         </Route>
     </Router>

lessons/01-setting-up/modules/Repos.js

@@ -1,5 +1,6 @@
 import React, { Component } from 'react';
 import {Link} from 'react-router';
+import NavLink from './NavLink'
 
 class Repos extends Component {
     render(){
@@ -8,9 +9,11 @@ class Repos extends Component {
                 <h2>Repos</h2>
 
                 <ul>
-                    <li><Link to='repos/reactjs/react-router'>React Router</Link></li>
-                    <li><Link to='repos/facebook/react'>React</Link></li>
+                    <li><NavLink to='repos/reactjs/react-router'>React Router</NavLink></li>
+                    <li><NavLink to='repos/facebook/react'>React</NavLink></li>
                 </ul>
+
+                {this.props.children}
             </div>
         )
     }