update

ReganHe · ReganHe · commit c33cdb88a43d · 2016-06-06T09:49:33.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ bundle.js
 node_modules
 .DS_Store
 .idea/
+*.log
diff --git a/lessons/01-setting-up/index.html b/lessons/01-setting-up/index.html
@@ -2,6 +2,6 @@
 <html>
 <meta charset=utf-8/>
 <title>My First React Router App</title>
-<link rel="stylesheet" href="index.css"/>
+<link rel="stylesheet" href="/index.css"/>
 <div id=app></div>
-<script src="bundle.js"></script>
+<script src="/bundle.js"></script>
diff --git a/lessons/01-setting-up/index.js b/lessons/01-setting-up/index.js
@@ -1,14 +1,19 @@
 import React from 'react'
 import { render } from 'react-dom'
-import {Router,Route,hashHistory} from 'react-router'
+import {Router,Route,browserHistory,IndexRoute} from 'react-router'
 import App from './modules/App'
 import About from './modules/About'
 import Repos from './modules/Repos'
+import Repo from './modules/Repo'
+import Home from './modules/Home'
 
 render((
-    <Router history={hashHistory}>
+    <Router history={browserHistory}>
         <Route path="/" component={App}>
-            <Route path="/repos" component={Repos}/>
+            <IndexRoute component={Home}/>
+            <Route path="/repos" component={Repos}>
+                <Route path="/repos/:userName/:repoName" component={Repo}/>
+            </Route>
             <Route path="/about" component={About}/>
         </Route>
     </Router>
diff --git a/lessons/01-setting-up/modules/App.js b/lessons/01-setting-up/modules/App.js
@@ -1,5 +1,4 @@
 import React from 'react'
-import {Link} from 'react-router'
 import NavLink from './NavLink'
 
 export default React.createClass({
@@ -8,6 +7,7 @@ export default React.createClass({
             <div>
                 <h1>React Router Tutorial</h1>
                 <ul role="nav">
+                    <li><NavLink to="/" onlyActiveOnIndex={true}>Home</NavLink></li>
                     <li><NavLink to="/about">About</NavLink></li>
                     <li><NavLink to="/repos">Repos</NavLink></li>
                 </ul>
diff --git a/lessons/01-setting-up/modules/Home.js b/lessons/01-setting-up/modules/Home.js
@@ -0,0 +1,10 @@
+/**
+ * Created by heoo442 on 2016/6/4.
+ */
+import React from 'react'
+
+export default React.createClass({
+    render(){
+        return <div>Home</div>
+    }
+})
diff --git a/lessons/01-setting-up/modules/Repo.js b/lessons/01-setting-up/modules/Repo.js
@@ -0,0 +1,9 @@
+import React from 'react'
+
+export default React.createClass({
+    render() {
+        return <div>
+            <h2>{this.props.params.userName +'   '+ 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,7 +1,15 @@
 import React from 'react'
+import NavLink from './NavLink'
 
 export default React.createClass({
-  render() {
-    return <div>Repos</div>
-  }
+    render() {
+        return <div>
+            <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>
+    }
 })
diff --git a/lessons/01-setting-up/package.json b/lessons/01-setting-up/package.json
@@ -4,11 +4,14 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "start": "webpack-dev-server --inline --content-base ."
+    "start": "if-env NODE_ENV=production && npm run start:prod || npm run start:dev",
+    "start:dev": "webpack-dev-server --inline --content-base . --history-api-fallback",
+    "start:prod": "webpack && node server.js"
   },
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "if-env": "^1.0.0",
     "react": "^0.14.7",
     "react-dom": "^0.14.7",
     "react-router": "^2.0.0"
diff --git a/lessons/01-setting-up/server.js b/lessons/01-setting-up/server.js
@@ -0,0 +1,20 @@
+/**
+ * Created by heoo442 on 2016/6/5.
+ */
+var express = require('express')
+var path = require('path')
+var compression = require('compression')
+
+var app = express()
+
+app.use(express.static(_dirname))
+app.get('*', function (req, res) {
+    res.sendFile(path.join(_dirname, 'index.html'))
+})
+
+var PORT = process.env.PORT || 8080
+app.listen(PORT, function () {
+    console.log('Production Express server running at localhost:' + PORT)
+})
+
+
