From 38ceceb555339b373633453a13af7d9d33eeb523 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tam=C3=A1s=20Szab=C3=B3?= <tamas@szaboo.com>
Date: Wed, 24 Jan 2018 19:39:54 +0100
Subject: [PATCH] remove history and redux router, added 404
---
package-lock.json | 5 -----
package.json | 2 --
src/components/Main.js | 2 ++
src/components/pages/NotFound.js | 9 +++++++++
src/configureStore.js | 6 ------
src/index.js | 6 +-----
src/reducers/index.js | 2 --
7 files changed, 12 insertions(+), 20 deletions(-)
create mode 100644 src/components/pages/NotFound.js
diff --git a/package-lock.json b/package-lock.json
index bca6a6e..83e05ec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8207,11 +8207,6 @@
"warning": "3.0.0"
}
},
- "react-router-redux": {
- "version": "4.0.8",
- "resolved": "https://registry.npmjs.org/react-router-redux/-/react-router-redux-4.0.8.tgz",
- "integrity": "sha1-InQDWWtRUeGCN32rg1tdRfD4BU4="
- },
"react-scripts": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-1.1.0.tgz",
diff --git a/package.json b/package.json
index 56dc5e1..a2ade58 100644
--- a/package.json
+++ b/package.json
@@ -3,13 +3,11 @@
"version": "0.1.0",
"private": true,
"dependencies": {
- "history": "^4.7.2",
"prop-types": "^15.6.0",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react-redux": "^5.0.6",
"react-router-dom": "^4.2.2",
- "react-router-redux": "^4.0.8",
"react-scripts": "1.1.0",
"redux": "^3.7.2",
"redux-logger": "^3.0.6",
diff --git a/src/components/Main.js b/src/components/Main.js
index 5b9a98b..c265aec 100644
--- a/src/components/Main.js
+++ b/src/components/Main.js
@@ -3,6 +3,7 @@ import { Switch, Route } from 'react-router-dom';
import Home from './pages/Home';
import Roster from './pages/Roster';
import Schedule from './pages/Schedule';
+import NotFound from './pages/NotFound';
const Main = () => (
<main>
@@ -10,6 +11,7 @@ const Main = () => (
<Route exact path='/' component={Home} />
<Route path='/roster' component={Roster} />
<Route path='/schedule' component={Schedule} />
+ <Route component={NotFound} />
</Switch>
</main>
);
diff --git a/src/components/pages/NotFound.js b/src/components/pages/NotFound.js
new file mode 100644
index 0000000..78aba0d
--- /dev/null
+++ b/src/components/pages/NotFound.js
@@ -0,0 +1,9 @@
+import React from 'react';
+
+const NotFound = () => (
+ <div>
+ <p>404: Page not found</p>
+ </div>
+);
+
+export default NotFound;
diff --git a/src/configureStore.js b/src/configureStore.js
index 7e9c2c3..cdb2694 100644
--- a/src/configureStore.js
+++ b/src/configureStore.js
@@ -1,13 +1,8 @@
import { createStore, applyMiddleware } from 'redux';
import thunkMiddleware from 'redux-thunk';
import { createLogger } from 'redux-logger';
-import { routerMiddleware } from 'react-router-redux';
-import createHistory from 'history/createBrowserHistory';
import rootReducer from './reducers';
-const history = createHistory();
-const routingMiddleware = routerMiddleware(history);
-
const loggerMiddleware = createLogger();
export default function configureStore(preloadedState) {
@@ -17,7 +12,6 @@ export default function configureStore(preloadedState) {
applyMiddleware(
thunkMiddleware,
loggerMiddleware,
- routingMiddleware,
),
);
}
diff --git a/src/index.js b/src/index.js
index 1543148..5c90af5 100644
--- a/src/index.js
+++ b/src/index.js
@@ -2,8 +2,6 @@ import React from 'react';
import { render } from 'react-dom';
import { Provider } from 'react-redux';
import { BrowserRouter as Router } from 'react-router-dom';
-import createHistory from 'history/createBrowserHistory';
-import { syncHistoryWithStore } from 'react-router-redux';
import configureStore from './configureStore';
import './index.css';
@@ -11,12 +9,10 @@ import App from './components/App';
import registerServiceWorker from './registerServiceWorker';
const store = configureStore();
-const browserHistory = createHistory();
-const history = syncHistoryWithStore(browserHistory, store);
render(
<Provider store={store}>
- <Router history={history}>
+ <Router>
<App />
</Router>
</Provider>,
diff --git a/src/reducers/index.js b/src/reducers/index.js
index 0275c9d..030bd73 100644
--- a/src/reducers/index.js
+++ b/src/reducers/index.js
@@ -1,9 +1,7 @@
import { combineReducers } from 'redux';
-import { routerReducer } from 'react-router-redux';
import TodoReducer from './TodoReducer';
const rootReducer = combineReducers({
- routing: routerReducer,
todos: TodoReducer,
});
--
GitLab