Browse Source

공통 modal import 위치 변경 및 오류 수정

master
김장현 7 months ago
parent
commit
ff80d6e7e5
  1. 12
      src/App.js
  2. 5
      src/containers/cstmrService/faq/FaqContainer.js
  3. 6
      src/router/hoc/ResolveRoutes.tsx
  4. 6
      src/router/hoc/authenticationCheck.tsx

12
src/App.js

@ -1,9 +1,19 @@
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 => <Router />;
const App = props => (
<>
<MessageModal />
<MessageErrorModal />
<MessageInfoModal />
<Router />
</>
);
export default App;

5
src/containers/cstmrService/faq/FaqContainer.js

@ -9,7 +9,8 @@ import FaqTab from '../../../components/cstmrService/faq/FaqTab';
import { ConfirmModal } from '../../../components/modal/ConfirmModal';
import {
CONTENT_INPUT_MESSAGE,
TITLE_INPUT_MESSAGE
TITLE_INPUT_MESSAGE,
VALID_TITLE
} from '@src/configs/msgConst';
import { openModal } from '@src/redux/features/comn/message/messageSlice';
const tabList = [
@ -177,7 +178,7 @@ export default function FaqContainer() {
setIsOpenFormModal(false);
setFormData(initFormData);
const title = formMode === 'create' ? '등록' : '수정';
handlerOpenModal(title, 'title' + '되었습니다.');
handlerOpenModal(title, `${title} 되었습니다.`);
};
// 수정하기 button click handler

6
src/router/hoc/ResolveRoutes.tsx

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

6
src/router/hoc/authenticationCheck.tsx

@ -3,6 +3,7 @@ import { RouteComponentProps } from 'react-router-dom';
import { useSelector, useDispatch } from '@src/redux/store';
import { checkToken } from '@src/redux/features/account/auth/authThunk';
import { ICheckAuthencationRs } from '@src/redux/features/account/auth/authState';
import { clientDispatchTopMenu } from '@src/redux/features/layout/layoutSlice';
interface IOption {
authRoute?: boolean;
@ -35,6 +36,8 @@ export default function (SpecificComponent: ReactNode, option: IOption) {
}
} else {
if (!authRoute) {
localStorage.setItem('topMenuCd', '/');
dispatch(clientDispatchTopMenu('/'));
props.history.replace('/main/dashboard');
}
}
@ -43,6 +46,9 @@ export default function (SpecificComponent: ReactNode, option: IOption) {
// props.history.replace('/account/login');
}
});
return () => {
setIsRender(false);
};
}, []);
return <>{isRender ? <Component {...props} user={user} /> : null}</>;

Loading…
Cancel
Save