diff options
author | Maximilian Hils <git@maximilianhils.com> | 2016-08-15 23:13:57 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-15 23:13:57 -0700 |
commit | f9f0ac848e8a691a78d4458f3d25f21b3e943658 (patch) | |
tree | f7b81554206afbc221b9eaaf1b6dead713f26a74 /web/src/js/app.jsx | |
parent | 2419ab153d3ce215e719b434f5f69405be9a6586 (diff) | |
parent | 81b726bab1cc403977ef4aea060f88ab8a0a66fd (diff) | |
download | mitmproxy-f9f0ac848e8a691a78d4458f3d25f21b3e943658.tar.gz mitmproxy-f9f0ac848e8a691a78d4458f3d25f21b3e943658.tar.bz2 mitmproxy-f9f0ac848e8a691a78d4458f3d25f21b3e943658.zip |
Merge pull request #1483 from gzzhanghao/history
[web] Use history object instead of react-router
Diffstat (limited to 'web/src/js/app.jsx')
-rw-r--r-- | web/src/js/app.jsx | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/web/src/js/app.jsx b/web/src/js/app.jsx index 726b2ae1..f04baea0 100644 --- a/web/src/js/app.jsx +++ b/web/src/js/app.jsx @@ -3,10 +3,8 @@ import { render } from 'react-dom' import { applyMiddleware, createStore } from 'redux' import { Provider } from 'react-redux' import thunk from 'redux-thunk' -import { Route, Router as ReactRouter, hashHistory, Redirect } from 'react-router' import ProxyApp from './components/ProxyApp' -import MainView from './components/MainView' import rootReducer from './ducks/index' import { add as addLog } from './ducks/eventLog' @@ -32,13 +30,7 @@ window.addEventListener('error', msg => { document.addEventListener('DOMContentLoaded', () => { render( <Provider store={store}> - <ReactRouter history={hashHistory}> - <Redirect from="/" to="/flows" /> - <Route path="/" component={ProxyApp}> - <Route path="flows" component={MainView}/> - <Route path="flows/:flowId/:detailTab" component={MainView}/> - </Route> - </ReactRouter> + <ProxyApp /> </Provider>, document.getElementById("mitmproxy") ) |