diff --git a/config/routes.ts b/config/routes.ts index ed0bc96f..ffd388fa 100644 --- a/config/routes.ts +++ b/config/routes.ts @@ -1,64 +1,70 @@ export default [ { - path: '/user', - component: '../layouts/UserLayout', + path: '/', + component: '../layouts/BlankLayout', routes: [ { - name: 'login', - path: '/user/login', - component: './user/login', + path: '/user', + component: '../layouts/UserLayout', + routes: [ + { + name: 'login', + path: '/user/login', + component: './user/login', + }, + ], }, - ], - }, - { - path: '/', - component: '../layouts/SecurityLayout', - routes: [ { path: '/', - component: '../layouts/BasicLayout', - authority: ['admin', 'user'], + component: '../layouts/SecurityLayout', routes: [ { path: '/', - redirect: '/welcome', - }, - { - path: '/welcome', - name: 'welcome', - icon: 'smile', - component: './Welcome', - }, - { - path: '/admin', - name: 'admin', - icon: 'crown', - component: './Admin', - authority: ['admin'], + component: '../layouts/BasicLayout', + authority: ['admin', 'user'], routes: [ { - path: '/admin/sub-page', - name: 'sub-page', + path: '/', + redirect: '/welcome', + }, + { + path: '/welcome', + name: 'welcome', icon: 'smile', component: './Welcome', + }, + { + path: '/admin', + name: 'admin', + icon: 'crown', + component: './Admin', authority: ['admin'], + routes: [ + { + path: '/admin/sub-page', + name: 'sub-page', + icon: 'smile', + component: './Welcome', + authority: ['admin'], + }, + ], + }, + { + name: 'list.table-list', + icon: 'table', + path: '/list', + component: './ListTableList', + }, + { + component: './404', }, ], }, - { - name: 'list.table-list', - icon: 'table', - path: '/list', - component: './ListTableList', - }, { component: './404', }, ], }, - { - component: './404', - }, ], }, { diff --git a/src/layouts/BlankLayout.tsx b/src/layouts/BlankLayout.tsx index cdc55b09..28a0a8de 100644 --- a/src/layouts/BlankLayout.tsx +++ b/src/layouts/BlankLayout.tsx @@ -1,5 +1,10 @@ import React from 'react'; +import { Inspector } from 'react-dev-inspector'; -const Layout: React.FC = ({ children }) => <>{children}; +const InspectorWrapper = process.env.NODE_ENV === 'development' ? Inspector : React.Fragment; + +const Layout: React.FC = ({ children }) => { + return {children}; +}; export default Layout;