diff options
author | Indrajith K L | 2019-12-12 19:31:50 +0530 |
---|---|---|
committer | Indrajith K L | 2019-12-12 19:31:50 +0530 |
commit | 8883eacd2a5e2f3f5637a6b71123dfcb2a64c3d5 (patch) | |
tree | fe0fb8f601f2272f9bf2a7d2b365c7812acb6e63 /src/core/routes.js | |
parent | f41d980fd83ab7da5804efd8aa7e914e820797d6 (diff) | |
download | react-redux-saga-starter-8883eacd2a5e2f3f5637a6b71123dfcb2a64c3d5.tar.gz react-redux-saga-starter-8883eacd2a5e2f3f5637a6b71123dfcb2a64c3d5.tar.bz2 react-redux-saga-starter-8883eacd2a5e2f3f5637a6b71123dfcb2a64c3d5.zip |
:fire: :zap: Major Update
* Adds Actions, Redicers and Middlewares
* Adds Http Service
* Adds Cancel option for Http Service
* Adds HOC's for API Loader, Sidebar and Headers
* Adds Random key generator for Routes
Diffstat (limited to 'src/core/routes.js')
-rw-r--r-- | src/core/routes.js | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/src/core/routes.js b/src/core/routes.js index 764e793..9c2d222 100644 --- a/src/core/routes.js +++ b/src/core/routes.js @@ -1,33 +1,36 @@ import React, { Suspense } from "react"; -import { Provider } from "react-redux"; +import { Provider, connect } from "react-redux"; import { ConnectedRouter } from "connected-react-router"; -import { Switch, Redirect, Route } from "react-router-dom"; +import { Switch, Redirect, Route, withRouter } from "react-router-dom"; import { CustomRouter } from "./custom.router"; import LoginContainer from "../modules/login/login.container"; import DashBoardContainer from "../modules/dashboard/dashboard.container"; import { AppRoutes } from "./app.routes"; +import MasterComponent from "../master/master.component"; const Routes = ({ store, history }) => { return ( <Provider store={store}> - <ConnectedRouter history={history}> - <Suspense - fallback={<div style={{ display: "none" }}> Loading ...</div>} - > - <Switch> - <CustomRouter path="/login" xComponent={LoginContainer} /> - <CustomRouter path="/dashboard" xComponent={DashBoardContainer} /> - {AppRoutes.map(_routes => - <CustomRouter - key={_routes.path} - path={_routes.path} - xComponent={_routes.component} - permissions={_routes.permission} - />)} - <Redirect from="*" to="/login" push /> - </Switch> - </Suspense> - </ConnectedRouter> + <MasterComponent> + <ConnectedRouter history={history}> + <Suspense + fallback={<div style={{ display: "none" }}> Loading ...</div>} + > + <Switch> + <CustomRouter path="/login" xComponent={LoginContainer} /> + <CustomRouter path="/dashboard" xComponent={DashBoardContainer} /> + {AppRoutes.map(_routes => + <CustomRouter + key={_routes.path} + path={_routes.path} + xComponent={_routes.component} + permissions={_routes.permission} + />)} + <Redirect from="*" to="/login" push /> + </Switch> + </Suspense> + </ConnectedRouter> + </MasterComponent> </Provider> ); }; |