diff --git a/chapter-11/react_router_basic/package.json b/chapter-11/react_router_basic/package.json index b6dd5c5..25dee87 100644 --- a/chapter-11/react_router_basic/package.json +++ b/chapter-11/react_router_basic/package.json @@ -6,11 +6,13 @@ "react-scripts": "0.8.4" }, "dependencies": { + "history": "^4.6.2", "react": "^15.4.1", "react-dom": "^15.4.1", "react-redux": "^5.0.1", - "react-router": "^3.0.0", - "react-router-redux": "^4.0.7", + "react-router": "^4.1.1", + "react-router-dom": "^4.1.1", + "react-router-redux": "^5.0.0-alpha.6", "redux": "^3.6.0" }, "scripts": { diff --git a/chapter-11/react_router_basic/src/Routes.js b/chapter-11/react_router_basic/src/Routes.js index 68b2eae..71a67a5 100644 --- a/chapter-11/react_router_basic/src/Routes.js +++ b/chapter-11/react_router_basic/src/Routes.js @@ -1,35 +1,34 @@ import React from 'react'; -import {Router, Route, IndexRoute, browserHistory} from 'react-router'; +import {Route, Switch} from 'react-router-dom'; import {Provider} from 'react-redux'; -import {syncHistoryWithStore} from 'react-router-redux'; +//import {syncHistoryWithStore} from 'react-router-redux'; +import {ConnectedRouter} from 'react-router-redux'; +import createBrowserHistory from 'history/createBrowserHistory'; -import App from './pages/App.js'; +import {view as TopMenu} from './components/TopMenu'; + +//import App from './pages/App.js'; import Home from './pages/Home.js'; import About from './pages/About.js'; import NotFound from './pages/NotFound.js'; import store from './Store.js'; -const createElement = (Component, props) => { - return ( - - - - ); -}; - -const history = syncHistoryWithStore(browserHistory, store); -//const history = browserHistory; +const history = createBrowserHistory(); const Routes = () => ( - - - - - - - - + + +
+ + + + + + +
+
+
); export default Routes; diff --git a/chapter-11/react_router_basic/src/components/TopMenu/index.js b/chapter-11/react_router_basic/src/components/TopMenu/index.js index ab3ee81..505c48c 100644 --- a/chapter-11/react_router_basic/src/components/TopMenu/index.js +++ b/chapter-11/react_router_basic/src/components/TopMenu/index.js @@ -1,6 +1,6 @@ import React from 'react'; -import {Link} from 'react-router'; +import {Link} from 'react-router-dom'; const liStyle = { display: 'inline-block', @@ -11,7 +11,7 @@ const view = () => { return (