moment -> dayjs 교체

.env.development

@@ -3,8 +3,8 @@
 
 # REACT_APP_IMAGE_HOST = https://palnet-file.s3.ap-northeast-2.amazonaws.com/
 
-REACT_APP_HOST = http://211.253.11.189:8080/
+REACT_APP_HOST = http://121.190.193.50:6081/
-REACT_APP_WS_HOST = ws://211.253.11.189:8081/ws
+REACT_APP_WS_HOST = ws://121.190.193.50:6082/ws
 # REACT_APP_WS_HOST = ws://pav.palntour.com:8081/ws
 REACT_APP_IMAGE_HOST = https://palnet-file.s3.ap-northeast-2.amazonaws.com/
 

src/containers/basis/flight/plan/WeatherContainer.js

@@ -1,16 +1,15 @@
+import { useEffect, useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import dayjs from 'dayjs';
+import { Compass } from 'react-feather';
+import { Spinner } from 'reactstrap';
 import {
   TodayWeather,
   TomorrowWeahter,
-  AfterTomorrowWeahter,
+  AfterTomorrowWeahter
-  LastwWeahter
 } from '../../../../components/basis/flight/plan/TodayWeather';
-import React, { useEffect, useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
 import dfsxyconv from '../../../../utility/dfsxyconv';
-import moment from 'moment';
-import { Compass } from 'react-feather';
 import { FlightweatherAction } from '../../../../modules/basis/flight/actions/basisFlightAction';
-import { Spinner } from 'reactstrap';
 
 export function WeatherContainer({ mapAreaCoordList }) {
   const [dayData, setdayData] = useState({});
@@ -18,11 +17,10 @@ export function WeatherContainer({ mapAreaCoordList }) {
 
   const dispatch = useDispatch();
   const { weather } = useSelector(state => state.flightState);
-  let now = moment();
+  let date = dayjs().format('YYYYMMDD');
-  let date = moment().format('YYYYMMDD');
+  let plus_day1 = dayjs().add(1, 'day').format('YYYYMMDD');
-  let time = moment().format('HHmm');
+  let plus_day2 = dayjs().add(2, 'day').format('YYYYMMDD');
-  let plus_day1 = moment().add(1, 'day').format('YYYYMMDD');
+
-  let plus_day2 = moment().add(2, 'day').format('YYYYMMDD');
   useEffect(() => {
     if (weather?.response.body.items) {
       let wheatherobj = {};

src/containers/cstmrService/inquiry/UserInquiryContainer.js

@@ -1,9 +1,9 @@
+import { Fragment, useCallback, useEffect, useRef, useState } from 'react';
 import { Button, Badge } from 'reactstrap';
 import AppCollapse from '@components/app-collapse';
 import { useDispatch, useSelector } from 'react-redux';
+import dayjs from 'dayjs';
 import * as Actions from '../../../modules/cstmrService/inquiry/action';
-import { Fragment, useCallback, useEffect, useRef, useState } from 'react';
-import moment from 'moment';
 import InquiryWrite from '../../../components/cstmrService/inquiry/InquiryWrite';
 import { InfoModal } from '../../../components/modal/InfoModal';
 import { ErrorModal } from '../../../components/modal/ErrorModal';
@@ -101,7 +101,7 @@ export default function UserInquiryContainer({ memberName }) {
                 수정하기
               </Button.Ripple>
               <span className='date'>
-                {moment(i.createDt).format('YYYY-MM-DD')}
+                {dayjs(i.createDt).format('YYYY-MM-DD')}
               </span>
             </div>
           </div>

src/containers/main/dash/MainDashContainer.js

@@ -1,14 +1,13 @@
-import { useEffect, useState, useCallback } from 'react';
+import { useEffect, useState } from 'react';
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { Col, Row } from 'reactstrap';
 import DroneFlightSchedule from '../../../components/dashboard/DroneFlightSchedule';
 import { DashboardGroupList } from '../../../components/dashboard/DashboardGroupList';
 import { DashboardStcsArea } from '../../../components/dashboard/DashboardStcsArea';
 import { DashboardStcsDay } from '../../../components/dashboard/DashboardStcsDay';
 import * as DashActions from '../../../modules/main/dash/actions/mainDashAction';
-import * as GroupActions from '../../../modules/basis/group/actions/basisGroupAction';
 import { MessageErrorModal } from '../../../components/message/MessageErrorModal';
 import '@styles/react/libs/flatpickr/flatpickr.scss';
 import '@styles/react/libs/tables/react-dataTable-component.scss';
@@ -51,7 +50,7 @@ export const MainDashContainer = () => {
   const handlerStcsDaySearch = date => {
     dispatch(
       DashActions.STCS_DAY.request({
-        yyyymm: moment(date).format('YYYY-MM')
+        yyyymm: dayjs(date).format('YYYY-MM')
       })
     );
   };
@@ -60,7 +59,7 @@ export const MainDashContainer = () => {
   const handlerStcsAreaSearch = date => {
     dispatch(
       DashActions.STCS_AREA.request({
-        yyyymm: moment(date).format('YYYY-MM')
+        yyyymm: dayjs(date).format('YYYY-MM')
       })
     );
   };

src/modules/account/login/service/jwtTokenUtil.ts

@@ -1,7 +1,6 @@
 import decode from 'jwt-decode';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { HOST } from '../../../../configs/constants';
-import { store } from '../../../../redux/storeConfig/store';
 import { LoginData } from '../models/authModel';
 import {
   cookieStorage,
@@ -13,7 +12,7 @@ const JWT_FLEFIX = 'palnet ';
 export const checkTokenExpired = (token?: string) => {
   const decodedToken = decode<LoginData>(token as string);
 
-  if (parseInt(decodedToken.exp) < moment().unix()) {
+  if (parseInt(decodedToken.exp) < dayjs().unix()) {
     return true;
   }
 

src/modules/basis/flight/models/basisFlightModel.ts

@@ -1,4 +1,4 @@
-import moment from 'moment';
+import dayjs from 'dayjs';
 
 export interface FlightState {
   publicAreaList: PublicAreaData | undefined;
@@ -282,11 +282,15 @@ export const initFlight = {
     addr: '',
     addrDtlCn: '',
     zip: '',
-    schFltStDt: moment()
+    schFltStDt: dayjs()
-      .set({ h: 0, m: 0, s: 0 })
+      .set('h', 0)
+      .set('m', 0)
+      .set('s', 0)
       .format('YYYY-MM-DD HH:mm:ss'),
-    schFltEndDt: moment()
+    schFltEndDt: dayjs()
-      .set({ h: 0, m: 0, s: 0 })
+      .set('h', 0)
+      .set('m', 0)
+      .set('s', 0)
       .format('YYYY-MM-DD HH:mm:ss'),
     fltPurpose: '',
     aprvlYn: '',
@@ -407,8 +411,8 @@ export const initFlightBas = {
     addr: '',
     addrDtlCn: '',
     zip: '',
-    schFltStDt: moment().format('YYYY-MM-DD HH:mm:ss'),
+    schFltStDt: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-    schFltEndDt: moment().format('YYYY-MM-DD HH:mm:ss'),
+    schFltEndDt: dayjs().format('YYYY-MM-DD HH:mm:ss'),
     fltPurpose: '',
     aprvlYn: '',
     delYn: '',
@@ -499,8 +503,8 @@ export const initFlightBas = {
     addr: '',
     addrDtlCn: '',
     zip: '',
-    schFltStDt: moment().add(5, 'minute').format('YYYY-MM-DD HH:mm:ss'),
+    schFltStDt: dayjs().add(5, 'minute').format('YYYY-MM-DD HH:mm:ss'),
-    schFltEndDt: moment().add(2, 'hours').format('YYYY-MM-DD HH:mm:ss'),
+    schFltEndDt: dayjs().add(2, 'hours').format('YYYY-MM-DD HH:mm:ss'),
     fltPurpose: '',
     aprvlYn: '',
     delYn: '',

src/views/control/report/ControlReportDetail.js

@@ -1,16 +1,7 @@
-import moment from 'moment';
 import { useState, useEffect } from 'react';
 import { X } from 'react-feather';
 import { useDispatch, useSelector } from 'react-redux';
-import drone_img from '../../../assets/images/drone.jpg';
+import dayjs from 'dayjs';
-import uam_img from '../../../assets/images/uam_img.jpg';
-import drone_yellow from '../../../assets/images/drone_yellow.png';
-import {
-  GET_ARCTFT_TYPE_CD,
-  GET_WGHT_TYPE_CD
-} from '../../../utility/CondeUtil';
-import { controlGpLogAction } from '../../../modules/control/gp';
-import ControlAlarmDetail from '../alarm/ControlAlarmDetail';
 import {
   Navigation2,
   Compass,
@@ -20,6 +11,15 @@ import {
   CloudSnow
 } from 'react-feather';
 import { Table } from 'reactstrap';
+import drone_img from '../../../assets/images/drone.jpg';
+import uam_img from '../../../assets/images/uam_img.jpg';
+import drone_yellow from '../../../assets/images/drone_yellow.png';
+import {
+  GET_ARCTFT_TYPE_CD,
+  GET_WGHT_TYPE_CD
+} from '../../../utility/CondeUtil';
+import { controlGpLogAction } from '../../../modules/control/gp';
+import ControlAlarmDetail from '../alarm/ControlAlarmDetail';
 
 const ControlReportDetail = props => {
   const dispatch = useDispatch();
@@ -153,7 +153,7 @@ const ControlReportDetail = props => {
                 <div className='list-left-txt'>시작시간</div>
                 <div className='list-right-txt'>
                   {controlDetail?.cntrlStDt
-                    ? moment(controlDetail?.cntrlStDt, 'YYYYMMDDHHmmss').format(
+                    ? dayjs(controlDetail?.cntrlStDt, 'YYYYMMDDHHmmss').format(
                         'MM-DD HH:mm:ss'
                       )
                     : '-'}
@@ -193,7 +193,7 @@ const ControlReportDetail = props => {
                 <div className='list-left-txt'>위치정보 수신 시간</div>
                 <div className='list-right-txt'>
                   {controlGpDetail?.serverRcvDt
-                    ? moment(
+                    ? dayjs(
                         controlGpDetail?.serverRcvDt,
                         'YYYYMMDDHHmmss'
                       ).format('MM-DD HH:mm:ss')

src/views/control/report/ControlReportList.js

@@ -1,8 +1,9 @@
-import moment from 'moment';
 import { useState } from 'react';
 import { Search, X } from 'react-feather';
 import { useDispatch, useSelector } from 'react-redux';
 import { Badge, Button, Input, InputGroup } from 'reactstrap';
+import moment from 'moment';
+import dayjs from 'dayjs';
 import { controlGpDtlAction } from '../../../modules/control/gp';
 import { objectClickAction } from '../../../modules/control/map/actions/controlMapActions';
 
@@ -73,7 +74,7 @@ const ControlReportList = props => {
                     <div className='list-left-txt'>이륙 시간</div>
                     <div className='list-right-txt'>
                       {item.controlStartDt
-                        ? moment(item.controlStartDt, 'YYYYMMDDHHmmss').format(
+                        ? dayjs(item.controlStartDt, 'YYYYMMDDHHmmss').format(
                             'MM-DD HH:mm:ss'
                           )
                         : '-'}