Browse Source

modal 위치 변경

master
김장현 7 months ago
parent
commit
84e5b50f7c
  1. 13
      src/App.js
  2. 7
      src/router/hoc/ResolveRoutes.tsx
  3. 6
      src/router/index.tsx

13
src/App.js

@ -1,19 +1,10 @@
import '@styles/react/libs/flatpickr/flatpickr.scss';
import '@styles/react/libs/tables/react-dataTable-component.scss';
import './assets/css/custom.css';
import { MessageModal } from '@src/components/message/MessageModal';
import { MessageErrorModal } from '@src/components/message/MessageErrorModal';
import { MessageInfoModal } from '@src/components/message/MessageInfoModal';
// ** Router Import
import Router from './router';
if (process.env.NODE_ENV === 'production') console.log = function () {};
const App = props => (
<>
{/* <MessageModal />
<MessageErrorModal />
<MessageInfoModal /> */}
<Router />
</>
);
const App = props => <Router />;
export default App;

7
src/router/hoc/ResolveRoutes.tsx

@ -10,10 +10,6 @@ import LayoutWrapper from '@layouts/components/layout-wrapper';
import { IRoute } from '../routes/type';
import { Routes } from '../routes';
import authenticationCheck from './authenticationCheck';
import { useSelector } from '@src/redux/store';
import { MessageInfoModal } from '@src/components/message/MessageInfoModal';
import { MessageErrorModal } from '@src/components/message/MessageErrorModal';
import { MessageModal } from '@src/components/message/MessageModal';
export default function ResolveRoutes() {
const [layout, setLayout] = useLayout();
@ -56,9 +52,6 @@ export default function ResolveRoutes() {
return (
<Route path={LayoutPaths} key={index}>
<MessageModal />
<MessageErrorModal />
<MessageInfoModal />
<LayoutTag
routerProps={routerProps}
layout={layout}

6
src/router/index.tsx

@ -7,6 +7,9 @@ import {
} from 'react-router-dom';
import BlankLayout from '@layouts/BlankLayout';
import ResolveRoutes from './hoc/ResolveRoutes';
import { MessageModal } from '@src/components/message/MessageModal';
import { MessageErrorModal } from '@src/components/message/MessageErrorModal';
import { MessageInfoModal } from '@src/components/message/MessageInfoModal';
const NotAuthorized = lazy(() => import('@src/views/NotAuthorized'));
const Error = lazy(() => import('@src/views/Error'));
@ -14,6 +17,9 @@ const Error = lazy(() => import('@src/views/Error'));
export default function Router() {
return (
<AppRouter basename={process.env.REACT_APP_BASENAME}>
<MessageModal />
<MessageErrorModal />
<MessageInfoModal />
<Switch>
<Route
exact

Loading…
Cancel
Save