Merge pull request #24 from lenaten/master

add react-router support by redux-simple-router. close #2

Readme.md

@@ -13,8 +13,7 @@ A boilerplate of things that mostly shouldn't exist.
 - [x] [PostCSS](https://github.com/postcss/postcss)
 - [x] [CSS modules](https://github.com/outpunk/postcss-modules)
 - [x] [Rucksack](http://simplaio.github.io/rucksack/docs)
-- [x] Hot reloading
-- [ ] Redux router
+- [x] [Redux router](https://github.com/rackt/redux-simple-router)
 - [ ] Redux effects
 - [x] TodoMVC example
 

client/containers/App/index.js

@@ -9,11 +9,12 @@ import style from './style.css'
 
 class App extends Component {
   render() {
-    const { todos, actions } = this.props
+    const { todos, actions, children } = this.props
     return (
       <div className={style.normal}>
         <Header addTodo={actions.addTodo} />
         <MainSection todos={todos} actions={actions} />
+        {children}
       </div>
     )
   }

client/index.jsx

@@ -1,17 +1,25 @@
 
 import { Provider } from 'react-redux'
-import { createStore } from 'redux'
-import ReactDOM from "react-dom"
-import React from "react"
+import { Router, Route } from 'react-router'
+import { createHistory } from 'history'
+import { syncReduxAndRouter } from 'redux-simple-router'
+import ReactDOM from 'react-dom'
+import React from 'react'
 
 import App from './containers/App'
 import configure from './store'
 
 const store = configure()
+const history = createHistory()
+
+syncReduxAndRouter(history, store)
 
 ReactDOM.render(
   <Provider store={store}>
-    <App />
+    <Router history={history}>
+      <Route path="/" component={App}>
+      </Route>
+    </Router>
   </Provider>,
   document.getElementById('root')
 )

client/reducers/index.jsx

@@ -1,7 +1,9 @@
 
 import { combineReducers } from 'redux'
+import { routeReducer as routing } from 'redux-simple-router'
 import todos from './todos'
 
 export default combineReducers({
+  routing,
   todos
 })

package.json

@@ -6,7 +6,7 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "webpack-dev-server --hot --inline --progress --colors --port 3000",
+    "start": "webpack-dev-server --history-api-fallback --hot --inline --progress --colors --port 3000",
     "build": "NODE_ENV=production webpack --progress --colors"
   },
   "license": "MIT",
@@ -30,11 +30,14 @@
   "dependencies": {
     "babel-runtime": "^6.3.19",
     "classnames": "^2.1.2",
+    "history": "^1.17.0",
     "react": "^0.14.0",
     "react-dom": "^0.14.0",
     "react-hot-loader": "^1.3.0",
     "react-redux": "^3.1.0",
+    "react-router": "^1.0.3",
     "redux": "^3.0.2",
-    "redux-actions": "^0.9.0"
+    "redux-actions": "^0.9.0",
+    "redux-simple-router": "^1.0.2"
   }
 }