From 69d8f9e8e707fc16446ce67f18da7c633232e7f4 Mon Sep 17 00:00:00 2001 From: JANGHYUNn Date: Mon, 29 Jul 2024 13:16:55 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EC=A0=9C=EA=B3=BC=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=ED=8C=9D=EC=97=85=20url=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flight/ControlApprovalsContainer.js | 2 +- .../flight/OperationApprovalsContainer.js | 2 +- .../popup/ControlApprovalsPopupContainer.js} | 4 +- .../OperationApprovalsPopupContainer.js} | 4 +- src/router/routes/index.js | 49 +++++++++++-------- src/views/controlMenuView.js | 12 ----- .../flight/popup/ControlApprovalsPopupView.js | 12 +++++ .../popup/OperationApprovalsPopupView.js | 12 +++++ src/views/rightMenuView.js | 13 ----- 9 files changed, 58 insertions(+), 52 deletions(-) rename src/containers/{controlRightMenuContainer.js => flight/popup/ControlApprovalsPopupContainer.js} (98%) rename src/containers/{rightMenuContainer.js => flight/popup/OperationApprovalsPopupContainer.js} (98%) delete mode 100644 src/views/controlMenuView.js create mode 100644 src/views/flight/popup/ControlApprovalsPopupView.js create mode 100644 src/views/flight/popup/OperationApprovalsPopupView.js delete mode 100644 src/views/rightMenuView.js diff --git a/src/containers/flight/ControlApprovalsContainer.js b/src/containers/flight/ControlApprovalsContainer.js index 05593e47..39347884 100644 --- a/src/containers/flight/ControlApprovalsContainer.js +++ b/src/containers/flight/ControlApprovalsContainer.js @@ -227,7 +227,7 @@ export default function ControlApprovalsContainer({ mode }) { window.screenY + window.outerHeight / 2 - popupHeight / 2 ); const option = `width=${popupWidth},height=${popupHeight},left=${popupX},top=${popupY}`; - popupRef.current = window.open('/control/rightMenu', 'NewWindow', option); + popupRef.current = window.open('/control/popup', 'NewWindow', option); // setPopupOption(option); setPopup(popupRef.current); }; diff --git a/src/containers/flight/OperationApprovalsContainer.js b/src/containers/flight/OperationApprovalsContainer.js index 2a7778a5..c8f287c0 100644 --- a/src/containers/flight/OperationApprovalsContainer.js +++ b/src/containers/flight/OperationApprovalsContainer.js @@ -271,7 +271,7 @@ export default function OperationApprovalsContainer({ mode }) { window.screenY + window.outerHeight / 2 - popupHeight / 2 ); const option = `width=${popupWidth},height=${popupHeight},left=${popupX},top=${popupY}`; - popupRef.current = window.open('/rightMenu', 'NewWindow', option); + popupRef.current = window.open('/operation/popup', 'NewWindow', option); // setPopupOption(option); setPopup(popupRef.current); }; diff --git a/src/containers/controlRightMenuContainer.js b/src/containers/flight/popup/ControlApprovalsPopupContainer.js similarity index 98% rename from src/containers/controlRightMenuContainer.js rename to src/containers/flight/popup/ControlApprovalsPopupContainer.js index 6e03f15d..cc281d26 100644 --- a/src/containers/controlRightMenuContainer.js +++ b/src/containers/flight/popup/ControlApprovalsPopupContainer.js @@ -5,7 +5,7 @@ import { getLaancAprvList } from '@src/redux/features/laanc/laancThunk'; import ControlApprovalsTable from '@src/components/flight/ControlApprovalsTable'; import NewFlightApprovalsReport from '@src/components/flight/NewFlightApprovalsReport'; -function ControlRightMenuContainer() { +function ControlApprovalsPopupContainer() { const [filter, setFilter] = useState(''); const [startDate, setStartDate] = useState(dayjs().format('YYYY-MM-DD')); const [endDate, setEndDate] = useState(); @@ -175,4 +175,4 @@ function ControlRightMenuContainer() { ); } -export default ControlRightMenuContainer; +export default ControlApprovalsPopupContainer; diff --git a/src/containers/rightMenuContainer.js b/src/containers/flight/popup/OperationApprovalsPopupContainer.js similarity index 98% rename from src/containers/rightMenuContainer.js rename to src/containers/flight/popup/OperationApprovalsPopupContainer.js index 475070a7..f878a60d 100644 --- a/src/containers/rightMenuContainer.js +++ b/src/containers/flight/popup/OperationApprovalsPopupContainer.js @@ -5,7 +5,7 @@ import { getLaancAprvList } from '@src/redux/features/laanc/laancThunk'; import OperationApprovalsTable from '@src/components/flight/OperationApprovalsTable'; import NewFlightApprovalsReport from '@src/components/flight/NewFlightApprovalsReport'; -function RightMenuContainer() { +function OperationApprovalsPopupContainer() { const [filter, setFilter] = useState(''); const [startDate, setStartDate] = useState(dayjs().format('YYYY-MM-DD')); const [endDate, setEndDate] = useState(); @@ -210,4 +210,4 @@ function RightMenuContainer() { ); } -export default RightMenuContainer; +export default OperationApprovalsPopupContainer; diff --git a/src/router/routes/index.js b/src/router/routes/index.js index 9b412249..66cd5be1 100644 --- a/src/router/routes/index.js +++ b/src/router/routes/index.js @@ -7,7 +7,6 @@ import RouteWeather from './RouteWeather'; import RouteLaance from './RouteLaance'; import RouterCstmrService from './RouterCstmrService'; import RouteStatistics from './RouteStatistics'; -import RouteFlight from './RouteFlight'; // ** Document title const TemplateTitle = '%s - Dron Control System'; @@ -97,22 +96,26 @@ const Routes = [ authRoute: true } }, - { - path: '/rightMenu', - component: lazy(() => import('../../views/rightMenuView')), - layout: 'BlankLayout', - meta: { - authRoute: true - } - }, - { - path: '/control/rightMenu', - component: lazy(() => import('../../views/rightMenuView')), - layout: 'BlankLayout', - meta: { - authRoute: true - } - }, + // { + // path: '/operation/popup', + // component: lazy(() => + // import('../../views/flight/popup/OperationApprovalsPopupView') + // ), + // layout: 'BlankLayout', + // meta: { + // authRoute: true + // } + // }, + // { + // path: '/control/popup', + // component: lazy(() => + // import('../../views/flight/popup/ControlApprovalsPopupView') + // ), + // layout: 'BlankLayout', + // meta: { + // authRoute: true + // } + // }, { path: '/history/record/sample1', component: lazy(() => @@ -257,8 +260,10 @@ const GimpoControlRoutes = [ } }, { - path: '/control/rightMenu', - component: lazy(() => import('../../views/controlMenuView')), + path: '/control/popup', + component: lazy(() => + import('../../views/flight/popup/ControlApprovalsPopupView') + ), layout: 'BlankLayout', meta: { authRoute: true, @@ -266,8 +271,10 @@ const GimpoControlRoutes = [ } }, { - path: '/rightMenu', - component: lazy(() => import('../../views/rightMenuView')), + path: '/operation/popup', + component: lazy(() => + import('../../views/flight/popup/OperationApprovalsPopupView') + ), layout: 'BlankLayout', meta: { authRoute: true, diff --git a/src/views/controlMenuView.js b/src/views/controlMenuView.js deleted file mode 100644 index 235e4771..00000000 --- a/src/views/controlMenuView.js +++ /dev/null @@ -1,12 +0,0 @@ -import '@styles/react/libs/flatpickr/flatpickr.scss'; -import '@styles/react/libs/tables/react-dataTable-component.scss'; -import '../assets/css/custom.css'; -import ControlRightMenuContainer from '../containers/controlRightMenuContainer'; - -export default function rightMenuView() { - return ( -
- -
- ); -} diff --git a/src/views/flight/popup/ControlApprovalsPopupView.js b/src/views/flight/popup/ControlApprovalsPopupView.js new file mode 100644 index 00000000..6f0e0ce7 --- /dev/null +++ b/src/views/flight/popup/ControlApprovalsPopupView.js @@ -0,0 +1,12 @@ +import '@styles/react/libs/flatpickr/flatpickr.scss'; +import '@styles/react/libs/tables/react-dataTable-component.scss'; +import '@src/assets/css/custom.css'; +import ControlApprovalsPopupContainer from '@src/containers/flight/popup/ControlApprovalsPopupContainer'; + +export default function ControlApprovalsPopupView() { + return ( +
+ +
+ ); +} diff --git a/src/views/flight/popup/OperationApprovalsPopupView.js b/src/views/flight/popup/OperationApprovalsPopupView.js new file mode 100644 index 00000000..754c9be3 --- /dev/null +++ b/src/views/flight/popup/OperationApprovalsPopupView.js @@ -0,0 +1,12 @@ +import '@styles/react/libs/flatpickr/flatpickr.scss'; +import '@styles/react/libs/tables/react-dataTable-component.scss'; +import '@src/assets/css/custom.css'; +import OperationApprovalsPopupContainer from '@src/containers/flight/popup/OperationApprovalsPopupContainer'; + +export default function OperationApprovalsPopupView() { + return ( +
+ +
+ ); +} diff --git a/src/views/rightMenuView.js b/src/views/rightMenuView.js deleted file mode 100644 index e5f99c03..00000000 --- a/src/views/rightMenuView.js +++ /dev/null @@ -1,13 +0,0 @@ -import '@styles/react/libs/flatpickr/flatpickr.scss'; -import '@styles/react/libs/tables/react-dataTable-component.scss'; -import '../assets/css/custom.css'; -import RightMenuContainer from '../containers/rightMenuContainer'; -import FlightApprovalsContainer from '../containers/flight/flightApprovalsContainer'; - -export default function rightMenuView() { - return ( -
- -
- ); -}