Skip to content

Commit

Permalink
fixed router issue with remix-run/react-router#2704
Browse files Browse the repository at this point in the history
  • Loading branch information
madeinfree committed Jul 28, 2016
1 parent f43225d commit 88c82f5
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions src/index.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,18 @@ import './lib/bootstrap/dist/bootstrap.min.css'

const store = configureStore()

const routes = (
<Route path='/' component={ Common }>
<IndexRoute component={ Welcome } />
<Route path='home' component={ Home } />
</Route>
)

const App = () => (
<Provider store={ store }>
<Router history={ browserHistory }>
<Route path='/' component={ Common }>
<IndexRoute component={ Welcome } />
<Route path='home' component={ Home } />
</Route>
</Router>
<Router
history={ browserHistory }
routes={ routes } />
</Provider>
)

Expand Down

0 comments on commit 88c82f5

Please sign in to comment.