File tree Expand file tree Collapse file tree 3 files changed +15
-18
lines changed
Expand file tree Collapse file tree 3 files changed +15
-18
lines changed Original file line number Diff line number Diff line change 11import React , { Component , PropTypes } from 'react'
22import { Provider } from 'react-redux'
3- import Routes from '../routes'
3+ import routes from '../routes'
44import DevTools from './DevTools'
5+ import { Router , browserHistory } from 'react-router'
56
67export default class Root extends Component {
78 render ( ) {
89 const { store } = this . props
910 return (
1011 < Provider store = { store } >
1112 < div >
12- < Routes />
13+ < Router history = { browserHistory } routes = { routes } />
1314 < DevTools />
1415 </ div >
1516 </ Provider >
Original file line number Diff line number Diff line change 11import React , { Component , PropTypes } from 'react'
22import { Provider } from 'react-redux'
3-
4- import Routes from '../routes '
3+ import routes from '../routes'
4+ import { Router , browserHistory } from 'react-router '
55
66export default class Root extends Component {
77 render ( ) {
88 const { store } = this . props
99 return (
1010 < Provider store = { store } >
11- < Routes />
11+ < Router history = { browserHistory } routes = { routes } />
1212 </ Provider >
1313 )
1414 }
Original file line number Diff line number Diff line change 11import React from 'react'
2- import { Route , browserHistory , Router } from 'react-router'
2+ import { Route } from 'react-router'
33import App from './containers/App'
44import UserPage from './containers/UserPage'
55import RepoPage from './containers/RepoPage'
66
7- export default function Routes ( ) {
8- return (
9- < Router history = { browserHistory } >
10- < Route path = "/" component = { App } >
11- < Route path = "/:login/:name"
12- component = { RepoPage } />
13- < Route path = "/:login"
14- component = { UserPage } />
15- </ Route >
16- </ Router >
17- )
18- }
7+ export default (
8+ < Route path = "/" component = { App } >
9+ < Route path = "/:login/:name"
10+ component = { RepoPage } />
11+ < Route path = "/:login"
12+ component = { UserPage } />
13+ </ Route >
14+ )
You can’t perform that action at this time.
0 commit comments