@@ -1352,9 +1352,11 @@ export default function LaancStep1({
handlerStep={handlerStep}
/> */}
-
-
-
+
+
+
+
+
>
);
}
diff --git a/src/components/laanc/step/LaancStep2.js b/src/components/laanc/step/LaancStep2.js
index 0939b3c0..3ae9b491 100644
--- a/src/components/laanc/step/LaancStep2.js
+++ b/src/components/laanc/step/LaancStep2.js
@@ -2,7 +2,6 @@ import React, { useEffect, useState } from 'react';
import { useDispatch, useSelector } from 'react-redux';
import '@styles/react/libs/flatpickr/flatpickr.scss';
import { CheckCircle } from 'react-feather';
-import FlightArea from '../map/FlightArea';
import {
Row,
Col,
@@ -20,6 +19,8 @@ import {
import * as LaancAction from '../../../modules/laanc/actions/laancActions';
import * as TermsActions from '../../../modules/account/register/actions/accountAction';
+const FlightArea = lazy(() => import('../map/FlightArea'));
+
export default function LaancStep2({
data,
handlerStep,
diff --git a/src/components/map/mapbox/MapBoxMap.js b/src/components/map/mapbox/MapBoxMap.js
index 722fe09e..397328ba 100644
--- a/src/components/map/mapbox/MapBoxMap.js
+++ b/src/components/map/mapbox/MapBoxMap.js
@@ -17,7 +17,7 @@ import MapboxLanguage from '@mapbox/mapbox-gl-language';
import { DronToast } from './dron/DronToast';
import { DronMarker } from './dron/DronMarker';
import { DronPlan } from './dron/DronPlan';
-import { FeatureAirZone } from './feature/FeatureAirZone';
+import FeatureAirZone from './feature/FeatureAirZone';
import threebox from 'threebox-plugin';
diff --git a/src/components/map/mapbox/feature/FeatureAirZone.js b/src/components/map/mapbox/feature/FeatureAirZone.js
index 6e4503e3..19404482 100644
--- a/src/components/map/mapbox/feature/FeatureAirZone.js
+++ b/src/components/map/mapbox/feature/FeatureAirZone.js
@@ -26,7 +26,7 @@ const airPort = [
}
];
-export const FeatureAirZone = props => {
+export default function FeatureAirZone(props) {
let popup;
const mapControl = useSelector(state => state.controlMapReducer);
@@ -343,4 +343,4 @@ export const FeatureAirZone = props => {
};
return null;
-};
+}
diff --git a/src/components/modal/ErrorModal.js b/src/components/modal/ErrorModal.js
index 942d1043..98d404c7 100644
--- a/src/components/modal/ErrorModal.js
+++ b/src/components/modal/ErrorModal.js
@@ -1,6 +1,6 @@
import { Button, Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap';
-export const ErrorModal = props => {
+export default function ErrorModal(props) {
return (
{
);
-};
+}
diff --git a/src/components/modal/InfoModal.js b/src/components/modal/InfoModal.js
index 84b282ec..c59d8b57 100644
--- a/src/components/modal/InfoModal.js
+++ b/src/components/modal/InfoModal.js
@@ -1,6 +1,6 @@
import { Button, Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap';
-export const InfoModal = props => {
+export default function InfoModal(props) {
return (
{
);
-};
+}
diff --git a/src/containers/basis/dron/BasisIdntfContainer.js b/src/containers/basis/dron/BasisIdntfContainer.js
index 4dc278a8..2e7515b9 100644
--- a/src/containers/basis/dron/BasisIdntfContainer.js
+++ b/src/containers/basis/dron/BasisIdntfContainer.js
@@ -3,7 +3,7 @@ import { useDispatch, useSelector } from 'react-redux';
import { Card, CardBody, Col, Row } from 'reactstrap';
import { BasisIdntfForm } from '../../../components/basis/dron/BasisIdntform';
import * as Actions from '../../../modules/basis/dron/actions/basisDronAction';
-import { ErrorModal } from '../../../components/modal/ErrorModal';
+import ErrorModal from '../../../components/modal/ErrorModal';
export const BasisIdntfContainer = props => {
const dispatch = useDispatch();
diff --git a/src/containers/basis/flight/plan/WeatherContainer.js b/src/containers/basis/flight/plan/WeatherContainer.js
index 0ad58878..f7b3c6f4 100644
--- a/src/containers/basis/flight/plan/WeatherContainer.js
+++ b/src/containers/basis/flight/plan/WeatherContainer.js
@@ -11,7 +11,7 @@ import {
import dfsxyconv from '../../../../utility/dfsxyconv';
import { FlightweatherAction } from '../../../../modules/basis/flight/actions/basisFlightAction';
-export function WeatherContainer({ mapAreaCoordList }) {
+export default function WeatherContainer({ mapAreaCoordList }) {
const [dayData, setdayData] = useState({});
const { loading } = useSelector(state => state.loadingReducer);
@@ -236,4 +236,3 @@ export function WeatherContainer({ mapAreaCoordList }) {
>
);
}
-export default WeatherContainer;
diff --git a/src/containers/basis/group/BasisGroupApprovalContainer.js b/src/containers/basis/group/BasisGroupApprovalContainer.js
index 996c7704..ac5f7066 100644
--- a/src/containers/basis/group/BasisGroupApprovalContainer.js
+++ b/src/containers/basis/group/BasisGroupApprovalContainer.js
@@ -4,7 +4,7 @@ import { Button } from 'reactstrap';
import { BasisGroupApprovalSearch } from '../../../components/basis/group/BasisGroupApprovalSearch';
import { ConfirmModal } from '../../../components/modal/ConfirmModal';
import * as Actions from '../../../modules/basis/group/actions/basisGroupAction';
-import { InfoModal } from '../../../components/modal/InfoModal';
+import InfoModal from '../../../components/modal/InfoModal';
import { BasisContainer } from '../BasisContainer';
import { BasisDataGrid } from '../../../components/basis/BasisDataGrid';
diff --git a/src/containers/cstmrService/faq/FaqContainer.js b/src/containers/cstmrService/faq/FaqContainer.js
index 8ca37c5e..f2e94196 100644
--- a/src/containers/cstmrService/faq/FaqContainer.js
+++ b/src/containers/cstmrService/faq/FaqContainer.js
@@ -11,8 +11,8 @@ import {
import FaqSearchBox from '../../../components/cstmrService/faq/FaqSearchBox';
import FaqForm from '../../../components/cstmrService/faq/FaqForm';
import FaqTab from '../../../components/cstmrService/faq/FaqTab';
-import { ErrorModal } from '../../../components/modal/ErrorModal';
-import { InfoModal } from '../../../components/modal/InfoModal';
+import ErrorModal from '../../../components/modal/ErrorModal';
+import InfoModal from '../../../components/modal/InfoModal';
import { ConfirmModal } from '../../../components/modal/ConfirmModal';
const tabList = [
{
diff --git a/src/containers/cstmrService/inquiry/AdminInquiryContainer.js b/src/containers/cstmrService/inquiry/AdminInquiryContainer.js
index 68247c0e..bd9dccbb 100644
--- a/src/containers/cstmrService/inquiry/AdminInquiryContainer.js
+++ b/src/containers/cstmrService/inquiry/AdminInquiryContainer.js
@@ -12,7 +12,7 @@ import {
import QnaSearchBox from '../../../components/cstmrService/inquiry/QnaSearchBox';
import QnaGrid from '../../../components/cstmrService/inquiry/QnaGrid';
import QnaDetail from '../../../components/cstmrService/inquiry/QnaDetail';
-import { InfoModal } from '../../../components/modal/InfoModal';
+import InfoModal from '../../../components/modal/InfoModal';
import { ConfirmModal } from '../../../components/modal/ConfirmModal';
const initalSearch = {
diff --git a/src/containers/cstmrService/inquiry/UserInquiryContainer.js b/src/containers/cstmrService/inquiry/UserInquiryContainer.js
index f4feb3f5..8f10a6c5 100644
--- a/src/containers/cstmrService/inquiry/UserInquiryContainer.js
+++ b/src/containers/cstmrService/inquiry/UserInquiryContainer.js
@@ -5,8 +5,8 @@ import { useDispatch, useSelector } from 'react-redux';
import dayjs from 'dayjs';
import * as Actions from '../../../modules/cstmrService/inquiry/action';
import InquiryWrite from '../../../components/cstmrService/inquiry/InquiryWrite';
-import { InfoModal } from '../../../components/modal/InfoModal';
-import { ErrorModal } from '../../../components/modal/ErrorModal';
+import InfoModal from '../../../components/modal/InfoModal';
+import ErrorModal from '../../../components/modal/ErrorModal';
import { ConfirmModal } from '../../../components/modal/ConfirmModal';
export default function UserInquiryContainer({ memberName }) {
diff --git a/src/containers/laanc/LaancContainer.js b/src/containers/laanc/LaancContainer.js
index 3da66b45..7f876ced 100644
--- a/src/containers/laanc/LaancContainer.js
+++ b/src/containers/laanc/LaancContainer.js
@@ -1,4 +1,4 @@
-import { useEffect, useState, lazy } from 'react';
+import { useEffect, useState, lazy, Suspense } from 'react';
import { useLocation } from 'react-router-dom';
import { Button, Badge } from 'reactstrap';
import { useDispatch } from 'react-redux';
@@ -6,13 +6,11 @@ import { CustomMainLayout } from '../../components/layout/CustomMainLayout';
import * as LaancAction from '../../modules/laanc/actions/laancActions';
import * as AreaAction from '../../modules/basis/flight/actions/basisFlightAction';
import { drawTypeChangeAction } from '../../modules/control/map/actions/controlMapActions';
-
+import { Link } from 'react-router-dom';
const LaancPlanContainer = lazy(() => import('./LaancPlanContainer'));
-
const LaancSearch = lazy(() =>
import('../../components/laanc/list/LaancSearch')
);
-
const LaancGrid = lazy(() => import('../../components/laanc/list/LaancGrid'));
export default function LaancContainer() {
@@ -59,9 +57,9 @@ export default function LaancContainer() {
-
-
-
+
+
+
+
);
}
diff --git a/src/containers/laanc/LaancPlanContainer.js b/src/containers/laanc/LaancPlanContainer.js
index 766ce36f..16e5562b 100644
--- a/src/containers/laanc/LaancPlanContainer.js
+++ b/src/containers/laanc/LaancPlanContainer.js
@@ -1,15 +1,16 @@
-import { useEffect, useState } from 'react';
-import LaancStep1 from '../../components/laanc/step/LaancStep1'; // laanc step 1
-import LaancStep2 from '../../components/laanc/step/LaancStep2'; // laanc step 2
-import LaancStep3 from '../../components/laanc/step/LaacnStep3'; // laanc step 3
-import { ErrorModal } from '../../components/modal/ErrorModal';
-import { LaancModal } from '../../components/laanc/LaancModal';
+import { lazy, useEffect, useState, Suspense } from 'react';
+import LaancModal from '../../components/laanc/LaancModal';
import { initFlightBas } from '../../modules/laanc/models/laancModels';
import { Modal } from 'reactstrap';
import { AREA_DETAIL_INIT } from '../../modules/basis/flight/actions/basisFlightAction';
import { useDispatch, useSelector } from 'react-redux';
import { drawTypeChangeAction } from '../../modules/control/map/actions/controlMapActions';
+const LaancStep1 = lazy(() => import('../../components/laanc/step/LaancStep1'));
+const LaancStep2 = lazy(() => import('../../components/laanc/step/LaancStep2'));
+const LaancStep3 = lazy(() => import('../../components/laanc/step/LaacnStep3'));
+const ErrorModal = lazy(() => import('../../components/modal/ErrorModal'));
+
export default function LaancPlanContainer({
currentParm,
disabledAnimation,
@@ -76,45 +77,48 @@ export default function LaancPlanContainer({
fade={false}
backdrop={false}
>
- {step === 1 && (
- <>
-
+ {step === 1 && (
+ <>
+
+ >
+ )}
+ {step === 2 && (
+
+ )}
+ {step === 3 && (
+
- >
- )}
- {step === 2 && (
-
- )}
- {step === 3 && (
-
- )}
+ )}
+
-
-
-
+
+
+
+
>
);