From 737a7008dd6fd02868a2f9fc6e4f393b713d208f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=83=81=ED=98=84?= Date: Tue, 24 Oct 2023 18:12:27 +0900 Subject: [PATCH] =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EA=B2=BD=EB=A1=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laanc/{ => list}/LaancDetail.js | 6 +-- src/components/laanc/{ => list}/LaancGrid.js | 10 ++--- .../laanc/{ => list}/LaancSearch.js | 2 +- src/components/laanc/{ => map}/FlightArea.js | 26 ++++++------- .../laanc/{ => map}/LaancAreaMap.js | 24 ++++++------ src/components/laanc/{ => report}/Report.js | 38 ++++++++----------- src/components/laanc/{ => step}/LaacnStep3.js | 4 +- src/components/laanc/{ => step}/LaancStep1.js | 10 ++--- src/components/laanc/{ => step}/LaancStep2.js | 6 +-- src/containers/laanc/LaancContainer.js | 4 +- src/containers/laanc/LaancPlanContainer.js | 6 +-- src/router/routes/RouteLaance.js | 2 +- src/views/laanc/LaancView.js | 3 +- src/views/laanc/ReportView.js | 7 ++++ 14 files changed, 74 insertions(+), 74 deletions(-) rename src/components/laanc/{ => list}/LaancDetail.js (97%) rename src/components/laanc/{ => list}/LaancGrid.js (94%) rename src/components/laanc/{ => list}/LaancSearch.js (97%) rename src/components/laanc/{ => map}/FlightArea.js (96%) rename src/components/laanc/{ => map}/LaancAreaMap.js (93%) rename src/components/laanc/{ => report}/Report.js (84%) rename src/components/laanc/{ => step}/LaacnStep3.js (99%) rename src/components/laanc/{ => step}/LaancStep1.js (99%) rename src/components/laanc/{ => step}/LaancStep2.js (98%) create mode 100644 src/views/laanc/ReportView.js diff --git a/src/components/laanc/LaancDetail.js b/src/components/laanc/list/LaancDetail.js similarity index 97% rename from src/components/laanc/LaancDetail.js rename to src/components/laanc/list/LaancDetail.js index 8ea43d08..80b3a43c 100644 --- a/src/components/laanc/LaancDetail.js +++ b/src/components/laanc/list/LaancDetail.js @@ -12,8 +12,8 @@ import { Label, Input } from 'reactstrap'; -import FlightArea from './FlightArea'; -import * as TermsActions from '../../modules/account/register/actions/accountAction'; +import FlightArea from '../map/FlightArea'; +import * as TermsActions from '../../../modules/account/register/actions/accountAction'; export default function LaancDetail({ data, handlerLaancClose }) { const dispatch = useDispatch(); @@ -52,7 +52,7 @@ export default function LaancDetail({ data, handlerLaancClose }) { return ( <> - LAANC 승인 요청 + LAANC 승인 완료
비행 구역
diff --git a/src/components/laanc/LaancGrid.js b/src/components/laanc/list/LaancGrid.js similarity index 94% rename from src/components/laanc/LaancGrid.js rename to src/components/laanc/list/LaancGrid.js index dfbd15aa..3b7a1680 100644 --- a/src/components/laanc/LaancGrid.js +++ b/src/components/laanc/list/LaancGrid.js @@ -3,16 +3,16 @@ import { useSelector, useDispatch } from 'react-redux'; import { Document, Page, pdfjs } from 'react-pdf'; import { GridDatabase } from '@src/components/crud/grid/GridDatatable'; import { Row, Col, Card, Button, Spinner, Modal } from 'reactstrap'; -import * as LaancAction from '../../modules/laanc/actions/laancActions'; -import LaancStep2 from './LaancStep2'; +import * as LaancAction from '../../../modules/laanc/actions/laancActions'; +import LaancStep2 from '../step/LaancStep2'; import moment from 'moment'; import { AREA_COORDINATE_LIST_SAVE, FLIGHT_PLAN_AREA_BUFFER_LIST, AREA_DETAIL_INIT -} from '../../modules/basis/flight/actions/basisFlightAction'; -import { drawTypeChangeAction } from '../../modules/control/map/actions/controlMapActions'; -import { HOST } from '../../configs/constants'; +} from '../../../modules/basis/flight/actions/basisFlightAction'; +import { drawTypeChangeAction } from '../../../modules/control/map/actions/controlMapActions'; +import { HOST } from '../../../configs/constants'; import LaancDetail from './LaancDetail'; pdfjs.GlobalWorkerOptions.workerSrc = `//cdnjs.cloudflare.com/ajax/libs/pdf.js/${pdfjs.version}/pdf.worker.js`; diff --git a/src/components/laanc/LaancSearch.js b/src/components/laanc/list/LaancSearch.js similarity index 97% rename from src/components/laanc/LaancSearch.js rename to src/components/laanc/list/LaancSearch.js index c160fe26..5865883f 100644 --- a/src/components/laanc/LaancSearch.js +++ b/src/components/laanc/list/LaancSearch.js @@ -4,7 +4,7 @@ import { Row, Col, Button, Card, CardBody } from 'reactstrap'; import { Search, Calendar } from 'react-feather'; import Flatpickr from 'react-flatpickr'; import moment from 'moment'; -import * as LaancAction from '../../modules/laanc/actions/laancActions'; +import * as LaancAction from '../../../modules/laanc/actions/laancActions'; function LaancSearch() { const dispatch = useDispatch(); diff --git a/src/components/laanc/FlightArea.js b/src/components/laanc/map/FlightArea.js similarity index 96% rename from src/components/laanc/FlightArea.js rename to src/components/laanc/map/FlightArea.js index bc335eca..f650cd27 100644 --- a/src/components/laanc/FlightArea.js +++ b/src/components/laanc/map/FlightArea.js @@ -10,18 +10,18 @@ import { DirectMode, SimpleSelectMode } from 'mapbox-gl-draw-circle'; -import { MAPBOX_TOKEN } from '../../configs/constants'; +import { MAPBOX_TOKEN } from '../../../configs/constants'; import { useEffect, useRef, useState } from 'react'; import { useDispatch, useSelector } from 'react-redux'; import { Button, Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap'; import { AREA_COORDINATE_LIST_SAVE, AREA_DETAIL_LIST_SAVE -} from '../../modules/basis/flight/actions/basisFlightAction'; +} from '../../../modules/basis/flight/actions/basisFlightAction'; import { drawTypeChangeAction, mapInitAction -} from '../../modules/control/map/actions/controlMapActions'; +} from '../../../modules/control/map/actions/controlMapActions'; import LaancAreaMap from './LaancAreaMap'; import { InitFeature, @@ -33,16 +33,16 @@ import { layerPolygon, layerPolyline, layerWayPoint -} from '../../utility/DrawUtil'; -import flatGimpo from '../map/geojson/flatGimpoAirportAirArea.json'; -import gimpo from '../map/geojson/gimpoAirportAirArea.json'; -import geoJson from '../map/geojson/airArea.json'; -import axios from '../../modules/utils/customAxiosUtil'; -import { ErrorModal } from '../modal/ErrorModal'; -import { FeatureAirZone } from '../map/mapbox/feature/FeatureAirZone'; -import { WeatherContainer } from '../../containers/basis/flight/plan/WeatherContainer'; -import { InfoModal } from '../modal/InfoModal'; -import { initFlightBas } from '../../modules/laanc/models/laancModels'; +} from '../../../utility/DrawUtil'; +import flatGimpo from '../../map/geojson/flatGimpoAirportAirArea.json'; +import gimpo from '../../map/geojson/gimpoAirportAirArea.json'; +import geoJson from '../../map/geojson/airArea.json'; +import axios from '../../../modules/utils/customAxiosUtil'; +import { ErrorModal } from '../../modal/ErrorModal'; +import { FeatureAirZone } from '../../map/mapbox/feature/FeatureAirZone'; +import { WeatherContainer } from '../../../containers/basis/flight/plan/WeatherContainer'; +import { InfoModal } from '../../modal/InfoModal'; +import { initFlightBas } from '../../../modules/laanc/models/laancModels'; const initialAddData = { isAddable: false, diff --git a/src/components/laanc/LaancAreaMap.js b/src/components/laanc/map/LaancAreaMap.js similarity index 93% rename from src/components/laanc/LaancAreaMap.js rename to src/components/laanc/map/LaancAreaMap.js index 0fc00850..0e55bf8b 100644 --- a/src/components/laanc/LaancAreaMap.js +++ b/src/components/laanc/map/LaancAreaMap.js @@ -2,20 +2,20 @@ import 'mapbox-gl/dist/mapbox-gl.css'; import mapboxgl from 'mapbox-gl'; import threebox from 'threebox-plugin'; import MapboxLanguage from '@mapbox/mapbox-gl-language'; -import { MAPBOX_TOKEN } from '../../configs/constants'; +import { MAPBOX_TOKEN } from '../../../configs/constants'; import { useEffect, useMemo, useState } from 'react'; import { useDispatch, useSelector } from 'react-redux'; import { Card, CardBody } from 'reactstrap'; -import { initFlightBas } from '../../modules/basis/flight/models/basisFlightModel'; +import { initFlightBas } from '../../../modules/basis/flight/models/basisFlightModel'; import { AREA_COORDINATE_LIST_SAVE, FLIGHT_PLAN_AREA_BUFFER_LIST, FLIGHT_PLAN_AREA_INAIRAREA -} from '../../modules/basis/flight/actions/basisFlightAction'; +} from '../../../modules/basis/flight/actions/basisFlightAction'; import { drawTypeChangeAction, mapInitAction -} from '../../modules/control/map/actions/controlMapActions'; +} from '../../../modules/control/map/actions/controlMapActions'; import { FormattingCoord, handlerFitBounds, @@ -25,14 +25,14 @@ import { layerPolygon, layerPolyline, layerWayPoint -} from '../../utility/DrawUtil'; -import flatGimpo from '../map/geojson/flatGimpoAirportAirArea.json'; -import gimpo from '../map/geojson/gimpoAirportAirArea.json'; -import geoJson from '../map/geojson/airArea.json'; -import { FeatureAirZone } from '../map/mapbox/feature/FeatureAirZone'; -import LaancMapSearch from '../map/mapbox/draw/LaancMapSearch'; -import { LaancDrawControl } from '../map/mapbox/draw/LaancDrawControl'; -import LaancModal from '../map/mapbox/draw/LaancModal'; +} from '../../../utility/DrawUtil'; +import flatGimpo from '../../map/geojson/flatGimpoAirportAirArea.json'; +import gimpo from '../../map/geojson/gimpoAirportAirArea.json'; +import geoJson from '../../map/geojson/airArea.json'; +import { FeatureAirZone } from '../../map/mapbox/feature/FeatureAirZone'; +import LaancMapSearch from '../../map/mapbox/draw/LaancMapSearch'; +import { LaancDrawControl } from '../../map/mapbox/draw/LaancDrawControl'; +import LaancModal from '../../map/mapbox/draw/LaancModal'; export default function LaancAreaMap({ centeredModal, diff --git a/src/components/laanc/Report.js b/src/components/laanc/report/Report.js similarity index 84% rename from src/components/laanc/Report.js rename to src/components/laanc/report/Report.js index 3d633b6d..05fa1231 100644 --- a/src/components/laanc/Report.js +++ b/src/components/laanc/report/Report.js @@ -1,10 +1,6 @@ -import '../../assets/css/custom.css'; -import '@styles/react/libs/flatpickr/flatpickr.scss'; -import '@styles/react/libs/tables/react-dataTable-component.scss'; -import { CustomMainLayout } from '../layout/CustomMainLayout'; +import { CustomMainLayout } from '../../layout/CustomMainLayout'; import { Info, ExternalLink } from 'react-feather'; -import { Row, Col, Button } from 'reactstrap'; -const Report = () => { +export default function Report() { return (
@@ -17,7 +13,7 @@ const Report = () => { - + 종류 사업용 @@ -26,11 +22,11 @@ const Report = () => { - + 동력비행장치 조종형비행장치 - 신고필요 + 신고필요 신고필요 @@ -38,22 +34,22 @@ const Report = () => { 신고필요 - 행글라이더 + 행글라이더 신고 불필요 - 패러글라이더 + 패러글라이더 신고 불필요 - 기구류 + 기구류 사람이 탑승하는 것은 신고필요 - 무인비행장치 - 무인동력비행장치 + 무인비행장치 + 무인동력비행장치 무인비행기 - + 신고필요
@@ -68,7 +64,7 @@ const Report = () => { 무인멀티콥터 - 무인비행선 + 무인비행선 신고필요 @@ -77,7 +73,7 @@ const Report = () => { - + 회전익비행장치 초경량헬리콥터 @@ -88,11 +84,11 @@ const Report = () => { 신고필요 - 동력패러글라이더 + 동력패러글라이더 신고필요 - 낙하산류 + 낙하산류 신고 불필요 @@ -167,6 +163,4 @@ const Report = () => {
); -}; - -export default Report; +} diff --git a/src/components/laanc/LaacnStep3.js b/src/components/laanc/step/LaacnStep3.js similarity index 99% rename from src/components/laanc/LaacnStep3.js rename to src/components/laanc/step/LaacnStep3.js index f47eb610..736ab1f6 100644 --- a/src/components/laanc/LaacnStep3.js +++ b/src/components/laanc/step/LaacnStep3.js @@ -14,9 +14,9 @@ import { Input, Badge } from 'reactstrap'; -import FlightArea from './FlightArea'; +import FlightArea from '../map/FlightArea'; import { CheckCircle } from 'react-feather'; -import { HOST } from '../../configs/constants'; +import { HOST } from '../../../configs/constants'; pdfjs.GlobalWorkerOptions.workerSrc = `//cdnjs.cloudflare.com/ajax/libs/pdf.js/${pdfjs.version}/pdf.worker.js`; export default function LaacnStep3({ diff --git a/src/components/laanc/LaancStep1.js b/src/components/laanc/step/LaancStep1.js similarity index 99% rename from src/components/laanc/LaancStep1.js rename to src/components/laanc/step/LaancStep1.js index 201b0042..8b1e5c6b 100644 --- a/src/components/laanc/LaancStep1.js +++ b/src/components/laanc/step/LaancStep1.js @@ -2,12 +2,12 @@ import React, { useEffect, useState, useRef } from 'react'; import { useLocation } from 'react-router-dom'; import { useDispatch, useSelector } from 'react-redux'; import Flatpickr from 'react-flatpickr'; -import * as LaancAction from '../../modules/laanc/actions/laancActions'; +import * as LaancAction from '../../../modules/laanc/actions/laancActions'; import '@styles/react/libs/flatpickr/flatpickr.scss'; import { AlertCircle, Info } from 'react-feather'; -import { ErrorModal } from '../modal/ErrorModal'; -import { InfoModal } from '../modal/InfoModal'; -import { LaancModal } from './LaancModal'; +import { ErrorModal } from '../../modal/ErrorModal'; +import { InfoModal } from '../../modal/InfoModal'; +import { LaancModal } from '../LaancModal'; import moment from 'moment'; import { Row, @@ -22,7 +22,7 @@ import { Label, Input } from 'reactstrap'; -import FlightArea from './FlightArea'; +import FlightArea from '../map/FlightArea'; export default function LaancStep1({ handleChange, diff --git a/src/components/laanc/LaancStep2.js b/src/components/laanc/step/LaancStep2.js similarity index 98% rename from src/components/laanc/LaancStep2.js rename to src/components/laanc/step/LaancStep2.js index 23e836be..22beac79 100644 --- a/src/components/laanc/LaancStep2.js +++ b/src/components/laanc/step/LaancStep2.js @@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react'; import { useDispatch, useSelector } from 'react-redux'; import '@styles/react/libs/flatpickr/flatpickr.scss'; import { AlertCircle, CheckCircle, AlertTriangle } from 'react-feather'; -import FlightArea from './FlightArea'; +import FlightArea from '../map/FlightArea'; import { Row, Col, @@ -16,8 +16,8 @@ import { Input, CustomInput } from 'reactstrap'; -import * as LaancAction from '../../modules/laanc/actions/laancActions'; -import * as TermsActions from '../../modules/account/register/actions/accountAction'; +import * as LaancAction from '../../../modules/laanc/actions/laancActions'; +import * as TermsActions from '../../../modules/account/register/actions/accountAction'; export default function LaancStep2({ data, diff --git a/src/containers/laanc/LaancContainer.js b/src/containers/laanc/LaancContainer.js index cd6909d5..7989b662 100644 --- a/src/containers/laanc/LaancContainer.js +++ b/src/containers/laanc/LaancContainer.js @@ -11,8 +11,8 @@ import { GROUP_LIST } from '../../modules/basis/group/actions/basisGroupAction'; import LaancPlanContainer from './LaancPlanContainer'; -import LaancSearch from '../../../src/components/laanc/LaancSearch'; -import LaancGrid from '../../../src/components/laanc/LaancGrid'; +import LaancSearch from '../../components/laanc/list/LaancSearch'; +import LaancGrid from '../../components/laanc/list/LaancGrid'; const initSearchData = { schFltStDt: moment() diff --git a/src/containers/laanc/LaancPlanContainer.js b/src/containers/laanc/LaancPlanContainer.js index ca0c9122..2cd92f4e 100644 --- a/src/containers/laanc/LaancPlanContainer.js +++ b/src/containers/laanc/LaancPlanContainer.js @@ -1,7 +1,7 @@ import { useEffect, useState } from 'react'; -import LaancStep1 from '../../components/laanc/LaancStep1'; // laanc step 1 -import LaancStep2 from '../../components/laanc/LaancStep2'; // laanc step 2 -import LaancStep3 from '../../components/laanc/LaacnStep3'; // laanc step 3 +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 moment from 'moment'; import { ErrorModal } from '../../components/modal/ErrorModal'; import { initFlightBas } from '../../modules/laanc/models/laancModels'; diff --git a/src/router/routes/RouteLaance.js b/src/router/routes/RouteLaance.js index 177f0232..dfc19e54 100644 --- a/src/router/routes/RouteLaance.js +++ b/src/router/routes/RouteLaance.js @@ -7,7 +7,7 @@ const RouteLaance = [ }, { path: '/laanc/report', - component: lazy(() => import('../../components/laanc/Report')) + component: lazy(() => import('../../views/laanc/ReportView')) } ]; diff --git a/src/views/laanc/LaancView.js b/src/views/laanc/LaancView.js index ae6a5534..a2c11444 100644 --- a/src/views/laanc/LaancView.js +++ b/src/views/laanc/LaancView.js @@ -1,8 +1,7 @@ import '@styles/react/libs/flatpickr/flatpickr.scss'; import '@styles/react/libs/tables/react-dataTable-component.scss'; -import React from 'react'; -import LaancContainer from '../../containers/laanc/LaancContainer'; import '../../assets/css/custom.css'; +import LaancContainer from '../../containers/laanc/LaancContainer'; export default function LaancView() { return ; } diff --git a/src/views/laanc/ReportView.js b/src/views/laanc/ReportView.js new file mode 100644 index 00000000..a9fdc7e1 --- /dev/null +++ b/src/views/laanc/ReportView.js @@ -0,0 +1,7 @@ +import '@styles/react/libs/flatpickr/flatpickr.scss'; +import '@styles/react/libs/tables/react-dataTable-component.scss'; +import '../../assets/css/custom.css'; +import Report from '../../components/laanc/report/Report'; +export default function ReportView() { + return ; +}