|
|
|
@ -15,6 +15,7 @@ import {
|
|
|
|
|
} from 'react-router-dom'; |
|
|
|
|
import * as Actions from '../modules/account/login/actions/authAction'; |
|
|
|
|
import { Routes } from './routes'; |
|
|
|
|
import { useCallback } from 'react'; |
|
|
|
|
|
|
|
|
|
const Router = () => { |
|
|
|
|
const [layout, setLayout] = useLayout(); |
|
|
|
@ -83,11 +84,12 @@ const Router = () => {
|
|
|
|
|
// default:
|
|
|
|
|
// return <route.component {...props} />;
|
|
|
|
|
// }
|
|
|
|
|
console.log(props); |
|
|
|
|
return <route.component {...props} />; |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
const ResolveRoutes = () => { |
|
|
|
|
const ResolveRoutes = useCallback(() => { |
|
|
|
|
return Object.keys(Layouts).map((layout, index) => { |
|
|
|
|
const LayoutTag = Layouts[layout]; |
|
|
|
|
|
|
|
|
@ -152,7 +154,7 @@ const Router = () => {
|
|
|
|
|
</Route> |
|
|
|
|
); |
|
|
|
|
}); |
|
|
|
|
}; |
|
|
|
|
}, [Layouts]); |
|
|
|
|
|
|
|
|
|
return ( |
|
|
|
|
<AppRouter basename={process.env.REACT_APP_BASENAME}> |
|
|
|
|