diff options
| author | haishanh <[email protected]> | 2018-11-05 18:32:16 +0800 |
|---|---|---|
| committer | Haishan <[email protected]> | 2018-11-06 22:37:21 +0800 |
| commit | 91ecdaa5dd1a65ff0ae944896945c0fe4bc23574 (patch) | |
| tree | 9f7f476672fae91eca5df9e0ae021b45df950679 /src/components/Root.js | |
| parent | 1adaedcbc551f6beee4e9e0b9fbd94197ebdffe5 (diff) | |
update: convert more components to function ones
includes Input, Config, SideBard.
also removed react-redux Provider
Diffstat (limited to 'src/components/Root.js')
| -rw-r--r-- | src/components/Root.js | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/src/components/Root.js b/src/components/Root.js index 96ae243..e9d9141 100644 --- a/src/components/Root.js +++ b/src/components/Root.js @@ -1,6 +1,5 @@ import React from 'react'; -import { Provider } from 'react-redux'; -import { Provider as StoreProvider } from 'm/store'; +import { Provider } from 'm/store'; import { HashRouter as Router, Route } from 'react-router-dom'; // import { hot } from 'react-hot-loader'; // import createHistory from 'history/createHashHistory'; @@ -26,21 +25,19 @@ window.store = store; const Root = () => ( <Provider store={store}> - <StoreProvider store={store}> - <Router> - <div className={s0.app}> - <APIDiscovery /> - <Route path="/" component={SideBar} /> - <div className={s0.content}> - <Route exact path="/" render={() => <Home />} /> - <Route exact path="/overview" render={() => <Home />} /> - <Route exact path="/configs" render={() => <Config />} /> - <Route exact path="/logs" render={() => <Logs />} /> - <Route exact path="/proxies" render={() => <Proxies />} /> - </div> + <Router> + <div className={s0.app}> + <APIDiscovery /> + <Route path="/" render={() => <SideBar />} /> + <div className={s0.content}> + <Route exact path="/" render={() => <Home />} /> + <Route exact path="/overview" render={() => <Home />} /> + <Route exact path="/configs" render={() => <Config />} /> + <Route exact path="/logs" render={() => <Logs />} /> + <Route exact path="/proxies" render={() => <Proxies />} /> </div> - </Router> - </StoreProvider> + </div> + </Router> </Provider> ); // <Route exact path="/__0" component={StyleGuide} /> |
