aboutsummaryrefslogtreecommitdiff
path: root/src/core/routes.js
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/routes.js')
-rw-r--r--src/core/routes.js43
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>
);
};