Add sub navigation

knosis · knosis · commit da749a2e26b8 · 2016-05-21T22:20:12.000-07:00
diff --git a/lessons/01-setting-up/index.css b/lessons/01-setting-up/index.css
@@ -0,0 +1,3 @@
+.active {
+  color: green;
+}
diff --git a/lessons/01-setting-up/index.html b/lessons/01-setting-up/index.html
@@ -1,6 +1,9 @@
 <!doctype html public "storage">
 <html>
+<head>
 <meta charset=utf-8/>
+<link rel="stylesheet" href="index.css">
 <title>My First React Router App</title>
+</head>
 <div id=app></div>
 <script src="bundle.js"></script>
diff --git a/lessons/01-setting-up/index.js b/lessons/01-setting-up/index.js
@@ -3,15 +3,19 @@ import { render } from 'react-dom'
 import { Router, Route, hashHistory } from 'react-router'
 import About from './modules/About'
 import Repos from './modules/Repos'
+import Repo from './modules/Repo'
 import App from './modules/App'
 
 
 render(
   (
   <Router history={hashHistory}>
-    <Route path="/" component={App}/>
-    <Route path="about" component={About}/>
-    <Route path="repos" component={Repos}/>
+    <Route path="/" component={App}>
+      <Route path="/repos" component={Repos}>
+        <Route path="/repos/:userName/:repoName" component={Repo}/>
+      </Route>
+      <Route path="/about" component={About}/>
+    </Route>
   </Router>
   ), document.getElementById('app')
 )
diff --git a/lessons/01-setting-up/modules/App.js b/lessons/01-setting-up/modules/App.js
@@ -1,15 +1,17 @@
 import React from 'react'
 import { Link } from 'react-router'
+import NavLink from './NavLink'
 
 export default React.createClass({
   render() {
     return (
       <div>
         <h1>React Router Tutorial</h1>
         <ul role="nav">
-          <li><Link to="/about">About</Link></li>
-          <li><Link to="/repos">Repos</Link></li>
+          <li><NavLink to="/about">About</NavLink></li>
+          <li><NavLink to="/repos">Repos</NavLink></li>
         </ul>
+        {this.props.children}
       </div>
     )
   }
diff --git a/lessons/01-setting-up/modules/NavLink.js b/lessons/01-setting-up/modules/NavLink.js
@@ -0,0 +1,8 @@
+import React from 'react'
+import { Link } from 'react-router'
+
+export default React.createClass({
+  render() {
+    return <Link {...this.props} activeClassName="active" />
+  }
+})
diff --git a/lessons/01-setting-up/modules/Repo.js b/lessons/01-setting-up/modules/Repo.js
@@ -0,0 +1,11 @@
+import React from 'react'
+
+export default React.createClass({
+  render() {
+    return (
+      <div>
+        <h2>{this.props.params.repoName}</h2>
+      </div>
+    )
+  }
+})
diff --git a/lessons/01-setting-up/modules/Repos.js b/lessons/01-setting-up/modules/Repos.js
@@ -1,11 +1,18 @@
 import React from 'react'
+import { Link } from 'react-router'
+import NavLink from './NavLink'
 
 export default React.createClass({
-
   render() {
-    return
+    return (
       <div>
-        Repos
+        <h2>Repos</h2>
+        <ul>
+          <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>
+    )
   }
 })
