pav
/
pav-fe-kac
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

파일 경로 수정

pull/2/head
박상현 11 months ago
parent
8d0737cc8e
commit
737a7008dd
14 changed files with 74 additions and 74 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/components/laanc/list/LaancDetail.js
  2. 10
      src/components/laanc/list/LaancGrid.js
  3. 2
      src/components/laanc/list/LaancSearch.js
  4. 26
      src/components/laanc/map/FlightArea.js
  5. 24
      src/components/laanc/map/LaancAreaMap.js
  6. 38
      src/components/laanc/report/Report.js
  7. 4
      src/components/laanc/step/LaacnStep3.js
  8. 10
      src/components/laanc/step/LaancStep1.js
  9. 6
      src/components/laanc/step/LaancStep2.js
  10. 4
      src/containers/laanc/LaancContainer.js
  11. 6
      src/containers/laanc/LaancPlanContainer.js
  12. 2
      src/router/routes/RouteLaance.js
  13. 3
      src/views/laanc/LaancView.js
  14. 7
      src/views/laanc/ReportView.js

6
src/components/laanc/LaancDetail.js → src/components/laanc/list/LaancDetail.js
Unescape View File

@ -12,8 +12,8 @@ import {
Label, Label,
Input Input
} from 'reactstrap'; } from 'reactstrap';
import FlightArea from './FlightArea'; import FlightArea from '../map/FlightArea';
import * as TermsActions from '../../modules/account/register/actions/accountAction'; import * as TermsActions from '../../../modules/account/register/actions/accountAction';
export default function LaancDetail({ data, handlerLaancClose }) { export default function LaancDetail({ data, handlerLaancClose }) {
const dispatch = useDispatch(); const dispatch = useDispatch();
@ -52,7 +52,7 @@ export default function LaancDetail({ data, handlerLaancClose }) {
return ( return (
<> <>
<ModalHeader>LAANC 승인 요청</ModalHeader> <ModalHeader>LAANC 승인 완료</ModalHeader>
<ModalBody> <ModalBody>
<div className='mb-1'> <div className='mb-1'>
<div className='ti'>비행 구역</div> <div className='ti'>비행 구역</div>

10
src/components/laanc/LaancGrid.js → src/components/laanc/list/LaancGrid.js
Unescape View File

@ -3,16 +3,16 @@ import { useSelector, useDispatch } from 'react-redux';
import { Document, Page, pdfjs } from 'react-pdf'; import { Document, Page, pdfjs } from 'react-pdf';
import { GridDatabase } from '@src/components/crud/grid/GridDatatable'; import { GridDatabase } from '@src/components/crud/grid/GridDatatable';
import { Row, Col, Card, Button, Spinner, Modal } from 'reactstrap'; import { Row, Col, Card, Button, Spinner, Modal } from 'reactstrap';
import * as LaancAction from '../../modules/laanc/actions/laancActions'; import * as LaancAction from '../../../modules/laanc/actions/laancActions';
import LaancStep2 from './LaancStep2'; import LaancStep2 from '../step/LaancStep2';
import moment from 'moment'; import moment from 'moment';
import { import {
AREA_COORDINATE_LIST_SAVE, AREA_COORDINATE_LIST_SAVE,
FLIGHT_PLAN_AREA_BUFFER_LIST, FLIGHT_PLAN_AREA_BUFFER_LIST,
AREA_DETAIL_INIT AREA_DETAIL_INIT
} from '../../modules/basis/flight/actions/basisFlightAction'; } from '../../../modules/basis/flight/actions/basisFlightAction';
import { drawTypeChangeAction } from '../../modules/control/map/actions/controlMapActions'; import { drawTypeChangeAction } from '../../../modules/control/map/actions/controlMapActions';
import { HOST } from '../../configs/constants'; import { HOST } from '../../../configs/constants';
import LaancDetail from './LaancDetail'; import LaancDetail from './LaancDetail';
pdfjs.GlobalWorkerOptions.workerSrc = `//cdnjs.cloudflare.com/ajax/libs/pdf.js/${pdfjs.version}/pdf.worker.js`; pdfjs.GlobalWorkerOptions.workerSrc = `//cdnjs.cloudflare.com/ajax/libs/pdf.js/${pdfjs.version}/pdf.worker.js`;

2
src/components/laanc/LaancSearch.js → src/components/laanc/list/LaancSearch.js
Unescape View File

@ -4,7 +4,7 @@ import { Row, Col, Button, Card, CardBody } from 'reactstrap';
import { Search, Calendar } from 'react-feather'; import { Search, Calendar } from 'react-feather';
import Flatpickr from 'react-flatpickr'; import Flatpickr from 'react-flatpickr';
import moment from 'moment'; import moment from 'moment';
import * as LaancAction from '../../modules/laanc/actions/laancActions'; import * as LaancAction from '../../../modules/laanc/actions/laancActions';
function LaancSearch() { function LaancSearch() {
const dispatch = useDispatch(); const dispatch = useDispatch();

26
src/components/laanc/FlightArea.js → src/components/laanc/map/FlightArea.js
Unescape View File

@ -10,18 +10,18 @@ import {
DirectMode, DirectMode,
SimpleSelectMode SimpleSelectMode
} from 'mapbox-gl-draw-circle'; } from 'mapbox-gl-draw-circle';
import { MAPBOX_TOKEN } from '../../configs/constants'; import { MAPBOX_TOKEN } from '../../../configs/constants';
import { useEffect, useRef, useState } from 'react'; import { useEffect, useRef, useState } from 'react';
import { useDispatch, useSelector } from 'react-redux'; import { useDispatch, useSelector } from 'react-redux';
import { Button, Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap'; import { Button, Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap';
import { import {
AREA_COORDINATE_LIST_SAVE, AREA_COORDINATE_LIST_SAVE,
AREA_DETAIL_LIST_SAVE AREA_DETAIL_LIST_SAVE
} from '../../modules/basis/flight/actions/basisFlightAction'; } from '../../../modules/basis/flight/actions/basisFlightAction';
import { import {
drawTypeChangeAction, drawTypeChangeAction,
mapInitAction mapInitAction
} from '../../modules/control/map/actions/controlMapActions'; } from '../../../modules/control/map/actions/controlMapActions';
import LaancAreaMap from './LaancAreaMap'; import LaancAreaMap from './LaancAreaMap';
import { import {
InitFeature, InitFeature,
@ -33,16 +33,16 @@ import {
layerPolygon, layerPolygon,
layerPolyline, layerPolyline,
layerWayPoint layerWayPoint
} from '../../utility/DrawUtil'; } from '../../../utility/DrawUtil';
import flatGimpo from '../map/geojson/flatGimpoAirportAirArea.json'; import flatGimpo from '../../map/geojson/flatGimpoAirportAirArea.json';
import gimpo from '../map/geojson/gimpoAirportAirArea.json'; import gimpo from '../../map/geojson/gimpoAirportAirArea.json';
import geoJson from '../map/geojson/airArea.json'; import geoJson from '../../map/geojson/airArea.json';
import axios from '../../modules/utils/customAxiosUtil'; import axios from '../../../modules/utils/customAxiosUtil';
import { ErrorModal } from '../modal/ErrorModal'; import { ErrorModal } from '../../modal/ErrorModal';
import { FeatureAirZone } from '../map/mapbox/feature/FeatureAirZone'; import { FeatureAirZone } from '../../map/mapbox/feature/FeatureAirZone';
import { WeatherContainer } from '../../containers/basis/flight/plan/WeatherContainer'; import { WeatherContainer } from '../../../containers/basis/flight/plan/WeatherContainer';
import { InfoModal } from '../modal/InfoModal'; import { InfoModal } from '../../modal/InfoModal';
import { initFlightBas } from '../../modules/laanc/models/laancModels'; import { initFlightBas } from '../../../modules/laanc/models/laancModels';
const initialAddData = { const initialAddData = {
isAddable: false, isAddable: false,

24
src/components/laanc/LaancAreaMap.js → src/components/laanc/map/LaancAreaMap.js
Unescape View File

@ -2,20 +2,20 @@ import 'mapbox-gl/dist/mapbox-gl.css';
import mapboxgl from 'mapbox-gl'; import mapboxgl from 'mapbox-gl';
import threebox from 'threebox-plugin'; import threebox from 'threebox-plugin';
import MapboxLanguage from '@mapbox/mapbox-gl-language'; 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 { useEffect, useMemo, useState } from 'react';
import { useDispatch, useSelector } from 'react-redux'; import { useDispatch, useSelector } from 'react-redux';
import { Card, CardBody } from 'reactstrap'; import { Card, CardBody } from 'reactstrap';
import { initFlightBas } from '../../modules/basis/flight/models/basisFlightModel'; import { initFlightBas } from '../../../modules/basis/flight/models/basisFlightModel';
import { import {
AREA_COORDINATE_LIST_SAVE, AREA_COORDINATE_LIST_SAVE,
FLIGHT_PLAN_AREA_BUFFER_LIST, FLIGHT_PLAN_AREA_BUFFER_LIST,
FLIGHT_PLAN_AREA_INAIRAREA FLIGHT_PLAN_AREA_INAIRAREA
} from '../../modules/basis/flight/actions/basisFlightAction'; } from '../../../modules/basis/flight/actions/basisFlightAction';
import { import {
drawTypeChangeAction, drawTypeChangeAction,
mapInitAction mapInitAction
} from '../../modules/control/map/actions/controlMapActions'; } from '../../../modules/control/map/actions/controlMapActions';
import { import {
FormattingCoord, FormattingCoord,
handlerFitBounds, handlerFitBounds,
@ -25,14 +25,14 @@ import {
layerPolygon, layerPolygon,
layerPolyline, layerPolyline,
layerWayPoint layerWayPoint
} from '../../utility/DrawUtil'; } from '../../../utility/DrawUtil';
import flatGimpo from '../map/geojson/flatGimpoAirportAirArea.json'; import flatGimpo from '../../map/geojson/flatGimpoAirportAirArea.json';
import gimpo from '../map/geojson/gimpoAirportAirArea.json'; import gimpo from '../../map/geojson/gimpoAirportAirArea.json';
import geoJson from '../map/geojson/airArea.json'; import geoJson from '../../map/geojson/airArea.json';
import { FeatureAirZone } from '../map/mapbox/feature/FeatureAirZone'; import { FeatureAirZone } from '../../map/mapbox/feature/FeatureAirZone';
import LaancMapSearch from '../map/mapbox/draw/LaancMapSearch'; import LaancMapSearch from '../../map/mapbox/draw/LaancMapSearch';
import { LaancDrawControl } from '../map/mapbox/draw/LaancDrawControl'; import { LaancDrawControl } from '../../map/mapbox/draw/LaancDrawControl';
import LaancModal from '../map/mapbox/draw/LaancModal'; import LaancModal from '../../map/mapbox/draw/LaancModal';
export default function LaancAreaMap({ export default function LaancAreaMap({
centeredModal, centeredModal,

38
src/components/laanc/Report.js → src/components/laanc/report/Report.js
Unescape View File

@ -1,10 +1,6 @@
import '../../assets/css/custom.css'; import { CustomMainLayout } from '../../layout/CustomMainLayout';
import '@styles/react/libs/flatpickr/flatpickr.scss';
import '@styles/react/libs/tables/react-dataTable-component.scss';
import { CustomMainLayout } from '../layout/CustomMainLayout';
import { Info, ExternalLink } from 'react-feather'; import { Info, ExternalLink } from 'react-feather';
import { Row, Col, Button } from 'reactstrap'; export default function Report() {
const Report = () => {
return ( return (
<CustomMainLayout> <CustomMainLayout>
<div className='report-wrap'> <div className='report-wrap'>
@ -17,7 +13,7 @@ const Report = () => {
</caption> </caption>
<thead> <thead>
<tr> <tr>
<th colspan='3' scope='col'> <th colSpan='3' scope='col'>
종류 종류
</th> </th>
<th scope='col'>사업용</th> <th scope='col'>사업용</th>
@ -26,11 +22,11 @@ const Report = () => {
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td rowspan='2' colspan='2'> <td rowSpan='2' colSpan='2'>
동력비행장치 동력비행장치
</td> </td>
<td>조종형비행장치</td> <td>조종형비행장치</td>
<td rowspan='13'>신고필요</td> <td rowSpan='13'>신고필요</td>
<td>신고필요</td> <td>신고필요</td>
</tr> </tr>
<tr> <tr>
@ -38,22 +34,22 @@ const Report = () => {
<td>신고필요</td> <td>신고필요</td>
</tr> </tr>
<tr> <tr>
<td colspan='3'>행글라이더</td> <td colSpan='3'>행글라이더</td>
<td>신고 불필요</td> <td>신고 불필요</td>
</tr> </tr>
<tr> <tr>
<td colspan='3'>패러글라이더</td> <td colSpan='3'>패러글라이더</td>
<td>신고 불필요</td> <td>신고 불필요</td>
</tr> </tr>
<tr> <tr>
<td colspan='3'>기구류</td> <td colSpan='3'>기구류</td>
<td>사람이 탑승하는 것은 신고필요</td> <td>사람이 탑승하는 것은 신고필요</td>
</tr> </tr>
<tr> <tr>
<td rowspan='4'>무인비행장치</td> <td rowSpan='4'>무인비행장치</td>
<td rowspan='3'>무인동력비행장치</td> <td rowSpan='3'>무인동력비행장치</td>
<td>무인비행기</td> <td>무인비행기</td>
<td rowspan='3'> <td rowSpan='3'>
<span className='text-point'> <span className='text-point'>
신고필요 신고필요
<br /> <br />
@ -68,7 +64,7 @@ const Report = () => {
<td>무인멀티콥터</td> <td>무인멀티콥터</td>
</tr> </tr>
<tr> <tr>
<td colspan='2'>무인비행선</td> <td colSpan='2'>무인비행선</td>
<td> <td>
<span className='text-point'> <span className='text-point'>
신고필요 신고필요
@ -77,7 +73,7 @@ const Report = () => {
</td> </td>
</tr> </tr>
<tr> <tr>
<td rowspan='2' colspan='2'> <td rowSpan='2' colSpan='2'>
회전익비행장치 회전익비행장치
</td> </td>
<td>초경량헬리콥터</td> <td>초경량헬리콥터</td>
@ -88,11 +84,11 @@ const Report = () => {
<td>신고필요</td> <td>신고필요</td>
</tr> </tr>
<tr> <tr>
<td colspan='3'>동력패러글라이더</td> <td colSpan='3'>동력패러글라이더</td>
<td>신고필요</td> <td>신고필요</td>
</tr> </tr>
<tr> <tr>
<td colspan='3'>낙하산류</td> <td colSpan='3'>낙하산류</td>
<td>신고 불필요</td> <td>신고 불필요</td>
</tr> </tr>
</tbody> </tbody>
@ -167,6 +163,4 @@ const Report = () => {
</div> </div>
</CustomMainLayout> </CustomMainLayout>
); );
}; }
export default Report;

4
src/components/laanc/LaacnStep3.js → src/components/laanc/step/LaacnStep3.js
Unescape View File

@ -14,9 +14,9 @@ import {
Input, Input,
Badge Badge
} from 'reactstrap'; } from 'reactstrap';
import FlightArea from './FlightArea'; import FlightArea from '../map/FlightArea';
import { CheckCircle } from 'react-feather'; 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`; pdfjs.GlobalWorkerOptions.workerSrc = `//cdnjs.cloudflare.com/ajax/libs/pdf.js/${pdfjs.version}/pdf.worker.js`;
export default function LaacnStep3({ export default function LaacnStep3({

10
src/components/laanc/LaancStep1.js → src/components/laanc/step/LaancStep1.js
Unescape View File

@ -2,12 +2,12 @@ import React, { useEffect, useState, useRef } from 'react';
import { useLocation } from 'react-router-dom'; import { useLocation } from 'react-router-dom';
import { useDispatch, useSelector } from 'react-redux'; import { useDispatch, useSelector } from 'react-redux';
import Flatpickr from 'react-flatpickr'; 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 '@styles/react/libs/flatpickr/flatpickr.scss';
import { AlertCircle, Info } from 'react-feather'; import { AlertCircle, Info } from 'react-feather';
import { ErrorModal } from '../modal/ErrorModal'; import { ErrorModal } from '../../modal/ErrorModal';
import { InfoModal } from '../modal/InfoModal'; import { InfoModal } from '../../modal/InfoModal';
import { LaancModal } from './LaancModal'; import { LaancModal } from '../LaancModal';
import moment from 'moment'; import moment from 'moment';
import { import {
Row, Row,
@ -22,7 +22,7 @@ import {
Label, Label,
Input Input
} from 'reactstrap'; } from 'reactstrap';
import FlightArea from './FlightArea'; import FlightArea from '../map/FlightArea';
export default function LaancStep1({ export default function LaancStep1({
handleChange, handleChange,

6
src/components/laanc/LaancStep2.js → src/components/laanc/step/LaancStep2.js
Unescape View File

@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
import { useDispatch, useSelector } from 'react-redux'; import { useDispatch, useSelector } from 'react-redux';
import '@styles/react/libs/flatpickr/flatpickr.scss'; import '@styles/react/libs/flatpickr/flatpickr.scss';
import { AlertCircle, CheckCircle, AlertTriangle } from 'react-feather'; import { AlertCircle, CheckCircle, AlertTriangle } from 'react-feather';
import FlightArea from './FlightArea'; import FlightArea from '../map/FlightArea';
import { import {
Row, Row,
Col, Col,
@ -16,8 +16,8 @@ import {
Input, Input,
CustomInput CustomInput
} from 'reactstrap'; } from 'reactstrap';
import * as LaancAction from '../../modules/laanc/actions/laancActions'; import * as LaancAction from '../../../modules/laanc/actions/laancActions';
import * as TermsActions from '../../modules/account/register/actions/accountAction'; import * as TermsActions from '../../../modules/account/register/actions/accountAction';
export default function LaancStep2({ export default function LaancStep2({
data, data,

4
src/containers/laanc/LaancContainer.js
Unescape View File

@ -11,8 +11,8 @@ import {
GROUP_LIST GROUP_LIST
} from '../../modules/basis/group/actions/basisGroupAction'; } from '../../modules/basis/group/actions/basisGroupAction';
import LaancPlanContainer from './LaancPlanContainer'; import LaancPlanContainer from './LaancPlanContainer';
import LaancSearch from '../../../src/components/laanc/LaancSearch'; import LaancSearch from '../../components/laanc/list/LaancSearch';
import LaancGrid from '../../../src/components/laanc/LaancGrid'; import LaancGrid from '../../components/laanc/list/LaancGrid';
const initSearchData = { const initSearchData = {
schFltStDt: moment() schFltStDt: moment()

6
src/containers/laanc/LaancPlanContainer.js
Unescape View File

@ -1,7 +1,7 @@
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import LaancStep1 from '../../components/laanc/LaancStep1'; // laanc step 1 import LaancStep1 from '../../components/laanc/step/LaancStep1'; // laanc step 1
import LaancStep2 from '../../components/laanc/LaancStep2'; // laanc step 2 import LaancStep2 from '../../components/laanc/step/LaancStep2'; // laanc step 2
import LaancStep3 from '../../components/laanc/LaacnStep3'; // laanc step 3 import LaancStep3 from '../../components/laanc/step/LaacnStep3'; // laanc step 3
import moment from 'moment'; import moment from 'moment';
import { ErrorModal } from '../../components/modal/ErrorModal'; import { ErrorModal } from '../../components/modal/ErrorModal';
import { initFlightBas } from '../../modules/laanc/models/laancModels'; import { initFlightBas } from '../../modules/laanc/models/laancModels';

2
src/router/routes/RouteLaance.js
Unescape View File

@ -7,7 +7,7 @@ const RouteLaance = [
}, },
{ {
path: '/laanc/report', path: '/laanc/report',
component: lazy(() => import('../../components/laanc/Report')) component: lazy(() => import('../../views/laanc/ReportView'))
} }
]; ];

3
src/views/laanc/LaancView.js
Unescape View File

@ -1,8 +1,7 @@
import '@styles/react/libs/flatpickr/flatpickr.scss'; import '@styles/react/libs/flatpickr/flatpickr.scss';
import '@styles/react/libs/tables/react-dataTable-component.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 '../../assets/css/custom.css';
import LaancContainer from '../../containers/laanc/LaancContainer';
export default function LaancView() { export default function LaancView() {
return <LaancContainer />; return <LaancContainer />;
} }

7
src/views/laanc/ReportView.js
Unescape View File

@ -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 <Report />;
}
Write Preview
Loading…
Cancel
Save