diff options
| -rw-r--r-- | src/core/custom.router.js | 5 | ||||
| -rw-r--r-- | src/core/permission.router.js | 4 | ||||
| -rw-r--r-- | src/modules/admin/admin.container.js | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/src/core/custom.router.js b/src/core/custom.router.js index b3f08ec..c6b2859 100644 --- a/src/core/custom.router.js +++ b/src/core/custom.router.js @@ -7,7 +7,7 @@ export const CustomRouter = ({ xComponent: Component, ...xProps }) => { <Route {...xProps} render={props => { - console.log(props.permissions) + let returnProps = {...xProps, ...props}; let token = Storage.get("token"); let pathName = props.match.path; if (!token && pathName !== "/login") { @@ -19,8 +19,7 @@ export const CustomRouter = ({ xComponent: Component, ...xProps }) => { return <Redirect to="/dashboard" />; } - debugger - return <Component {...props} />; + return <Component {...returnProps} />; }} /> ); diff --git a/src/core/permission.router.js b/src/core/permission.router.js new file mode 100644 index 0000000..4047b75 --- /dev/null +++ b/src/core/permission.router.js @@ -0,0 +1,4 @@ +import React from "react"; +import { Route, Redirect } from "react-router-dom"; + +// export const Permi
\ No newline at end of file diff --git a/src/modules/admin/admin.container.js b/src/modules/admin/admin.container.js index e7e669a..bd6e1dc 100644 --- a/src/modules/admin/admin.container.js +++ b/src/modules/admin/admin.container.js @@ -1,6 +1,10 @@ import React, {Component} from 'react'; class AdminContainer extends Component{ + constructor(props){ + console.log(props); + super(props); + } render(){ return( |