渐进行测试

ReganHe · ReganHe · commit 023f0b49b890 · 2016-06-02T23:12:08.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ bundle.js
 *.bundle.js
 node_modules
 .DS_Store
+.idea/
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
@@ -2,5 +2,6 @@
 <html>
 <meta charset=utf-8/>
 <title>My First React Router App</title>
+<link rel="stylesheet" href="index.css"/>
 <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
@@ -1,4 +1,15 @@
 import React from 'react'
 import { render } from 'react-dom'
+import {Router,Route,hashHistory} from 'react-router'
 import App from './modules/App'
-render(<App/>, document.getElementById('app'))
+import About from './modules/About'
+import Repos from './modules/Repos'
+
+render((
+    <Router history={hashHistory}>
+        <Route path="/" component={App}>
+            <Route path="/repos" component={Repos}/>
+            <Route path="/about" component={About}/>
+        </Route>
+    </Router>
+), document.getElementById('app'))
diff --git a/lessons/01-setting-up/modules/About.js b/lessons/01-setting-up/modules/About.js
@@ -0,0 +1,7 @@
+import React from 'react'
+
+export default React.createClass({
+  render() {
+    return <div>About</div>
+  }
+})
diff --git a/lessons/01-setting-up/modules/App.js b/lessons/01-setting-up/modules/App.js
@@ -1,7 +1,18 @@
 import React from 'react'
+import {Link} from 'react-router'
+import NavLink from './NavLink'
 
 export default React.createClass({
-  render() {
-    return <div>Hello, React Router!</div>
-  }
+    render() {
+        return (
+            <div>
+                <h1>React Router Tutorial</h1>
+                <ul role="nav">
+                    <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
diff --git a/lessons/01-setting-up/modules/Repos.js b/lessons/01-setting-up/modules/Repos.js
@@ -0,0 +1,7 @@
+import React from 'react'
+
+export default React.createClass({
+  render() {
+    return <div>Repos</div>
+  }
+})
diff --git a/lessons/06-params/modules/App.js b/lessons/06-params/modules/App.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import NavLink from './NavLink'
+import NavLink from './../../01-setting-up/modules/NavLink'
 
 export default React.createClass({
   render() {
