[redux-toolkit] store 변경

src/@core/layouts/HorizontalLayout.js

@@ -30,7 +30,7 @@ import { useNavbarType } from '@hooks/useNavbarType';
 import { useFooterType } from '@hooks/useFooterType';
 import { useNavbarColor } from '@hooks/useNavbarColor';
 
-import { useSelector, useDispatch } from '@store/storeConfig/store';
+import { useSelector, useDispatch } from '@src/_redux/store';
 
 // ** Styles
 import '@styles/base/core/menu/menu-types/horizontal-menu.scss';

src/@core/layouts/VerticalLayout.js

@@ -3,7 +3,7 @@ import { useState, useEffect } from 'react';
 import { useLocation } from 'react-router-dom';
 
 // ** Store & Actions
-import { useSelector, useDispatch } from '@store/storeConfig/store';
+import { useSelector, useDispatch } from '@src/_redux/store';
 import {
   clientHandlerMenuCollapsed,
   clientHandlerContentWidth,

src/@core/layouts/components/layout-wrapper/index.js

@@ -5,7 +5,7 @@ import { Fragment, useEffect } from 'react';
 import classnames from 'classnames';
 
 // ** Store & Actions
-import { useSelector, useDispatch } from '@store/storeConfig/store';
+import { useSelector, useDispatch } from '@src/_redux/store';
 import {
   clientHandlerContentWidth,
   clientHandlerMenuCollapsed,

src/@core/layouts/components/menu/vertical-menu/index.js

@@ -15,7 +15,7 @@ import statistics from '@src/navigation/statistics';
 // ** Third Party Components
 import classnames from 'classnames';
 import PerfectScrollbar from 'react-perfect-scrollbar';
-import { useSelector } from '@store/storeConfig/store';
+import { useSelector } from '@src/_redux/store';
 
 // ** Vertical Menu Components
 import VerticalMenuHeader from './VerticalMenuHeader';

src/@core/layouts/components/navbar/NavbarUser.js

@@ -2,7 +2,7 @@
 import { Fragment } from 'react';
 // ** Third Party Components
 import { Menu, Moon, Sun } from 'react-feather';
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import { Nav, NavItem, NavLink } from '@component/ui';
 import UserDropdown from './UserDropdown';
 import { clientDispatchTopMenu } from '@src/_redux/features/layout/layoutSlice';

src/@core/layouts/components/navbar/UserDropdown.js

@@ -8,7 +8,7 @@ import { isUserLoggedIn } from '@utils';
 import { useEffect, useState } from 'react';
 import { Power, User } from 'react-feather';
 // ** Store & Actions
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import { Link, useHistory } from 'react-router-dom';
 // ** Third Party Components
 import {

src/_redux/features/control/gp/gpThunk.ts

@@ -27,7 +27,7 @@ export const getControlGp = createAsyncThunk(
 
     try {
       const state = getState() as RootState;
-      const { objectId, isClickObject } = state.map;
+      const { objectId, isClickObject } = state.mapState;
 
       //  그룹 별 기체 필터링
 

src/_redux/rootReducer.ts

@@ -27,9 +27,9 @@ const rootReducer = (state: any, action: any) => {
     layoutState: layoutReducer,
     messageState: messageReducer,
     // account
-    auth: authReducer,
-    find: findReducer,
-    register: registerReducer,
+    authState: authReducer,
+    findState: findReducer,
+    registerState: registerReducer,
     // analysis
     historyState: historyReducer,
     simulationState: simulationReducer,
@@ -44,7 +44,7 @@ const rootReducer = (state: any, action: any) => {
     controlGpFltPlanState: controlGpFltPlanReducer,
     controlGpCountState: controlGpCountReducer,
     // control map
-    map: mapReducer,
+    mapState: mapReducer,
     // customerService
     faqState: faqReducer,
     qnaState: qnaReducer,

src/_redux/store.ts

@@ -1,10 +1,10 @@
-import { configureStore } from '@reduxjs/toolkit';
-import rootReducer from './rootReducer';
 import {
   TypedUseSelectorHook,
   useDispatch as useDispatchs,
   useSelector as useSelectors
 } from 'react-redux';
+import rootReducer from './rootReducer';
+import { configureStore } from '@reduxjs/toolkit';
 
 export const store = configureStore({
   reducer: rootReducer,
@@ -14,6 +14,7 @@ export const store = configureStore({
     })
 });
 
+// hooks
 export type RootState = ReturnType<typeof rootReducer>;
 export const useSelector: TypedUseSelectorHook<RootState> = useSelectors;
 

src/components/account/find/AccountFindPassword.js

@@ -1,4 +1,4 @@
-import { useDispatch } from '@store/storeConfig/store';
+import { useDispatch } from '@src/_redux/store';
 import { useState, useEffect } from 'react';
 import {
   InputGroup,

src/components/account/find/AccountFindUserId.js

@@ -1,4 +1,4 @@
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import { useState, useEffect } from 'react';
 import {
   InputGroup,

src/components/account/login/AccountLogin.js

@@ -1,4 +1,4 @@
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import {
   Button,
   Form,

src/components/account/mypage/AccountMypagePwForm.js

@@ -1,5 +1,5 @@
 // ** React Imports
-import { useSelector, useDispatch } from '@store/storeConfig/store';
+import { useSelector, useDispatch } from '@src/_redux/store';
 import { useState, useEffect } from 'react';
 import {
   Card,

src/components/account/register/AccountRegisterForm.js

@@ -1,4 +1,4 @@
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import * as yup from 'yup';
 import { Fragment, useEffect, useState } from 'react';
 import classnames from 'classnames';

src/components/account/register/AccountRegisterTerm.js

@@ -1,4 +1,4 @@
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import { useEffect, useState } from 'react';
 import {
   Row,

src/components/analysis/history/AnalysisHistoryDetailSearch.js

@@ -4,11 +4,6 @@ import { Search } from 'react-feather';
 import '@styles/react/libs/flatpickr/flatpickr.scss';
 
 export const AnalysisHistoryDetailSearch = props => {
-  // const { log } = useSelector(state => state.analysisHistoryState);
-  // const dispatch = useDispatch();
-  // useEffect(() => {
-  //   dispatch(Actions.getHstryDetail.request(props.id));
-  // }, []);
   return (
     <div className='pal-card-box'>
       <Row>

src/components/analysis/history/AnalysisHistoryGrid.js

@@ -1,7 +1,7 @@
 import { GridDatabase } from '../../../components/crud/grid/GridDatatable';
 import { Card, Spinner } from '@component/ui';
 import { ExcelExportButton } from '../../crud/excel/ExcelExportButton';
-import { useSelector } from '@store/storeConfig/store';
+import { useSelector } from '@src/_redux/store';
 
 export const AnalysisHistoryGrid = props => {
   const { loading } = useSelector(state => state.layoutState);

src/components/analysis/simulation/AnalysisSimuationInfo.js

@@ -1,6 +1,6 @@
 import dayjs from 'dayjs';
 import { useEffect, useState, useRef, useCallback } from 'react';
-import { useSelector } from '@store/storeConfig/store';
+import { useSelector } from '@src/_redux/store';
 import { Spinner } from '@component/ui';
 
 export const AnalysisSimulationInfo = props => {

src/components/basis/flight/schedule/FlightScheduleGrid.js

@@ -2,7 +2,7 @@ import { useRef, useState } from 'react';
 import { GridDatabase } from '@src/components/crud/grid/GridDatatable';
 import { Row, Col, Card, Spinner } from '@component/ui';
 import FlightScheduleRealTime from './FlightScheduleRealTime';
-import { useSelector } from '@store/storeConfig/store';
+import { useSelector } from '@src/_redux/store';
 import dayjs from 'dayjs';
 
 /**

src/components/dashboard/DroneFlightSchedule.js

@@ -1,4 +1,4 @@
-import { useSelector } from '@store/storeConfig/store';
+import { useSelector } from '@src/_redux/store';
 import { Plus } from 'react-feather';
 import {
   Card,

src/components/laanc/LaancQr.js

@@ -2,7 +2,7 @@ import { useEffect, useState, useRef } from 'react';
 import { ModalHeader, ModalBody, ModalFooter, Button } from '@component/ui';
 import axios from '../../modules/utils/customAxiosUtil';
 import { checkLaancTsQr } from '@src/_redux/features/laanc/laancThunk';
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import { openModal } from '@src/_redux/features/comn/message/messageSlice';
 import { MODAL_BODY, MODAL_CRTFYHP, MODAL_HEADER } from '@src/configs/msgConst';
 

src/components/laanc/list/LaancDetail.js

@@ -1,5 +1,5 @@
 import React, { useEffect } from 'react';
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import {
   Row,
   Col,

src/components/laanc/list/LaancGrid.js

@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import { pdfjs } from 'react-pdf';
 import { GridDatabase } from '@src/components/crud/grid/GridDatatable';
 import { Row, Col, Card, Spinner, Modal, Button } from '@component/ui';

src/components/laanc/list/LaancSearch.js

@@ -4,7 +4,7 @@ import { Search, Calendar } from 'react-feather';
 import Flatpickr from 'react-flatpickr';
 import dayjs from 'dayjs';
 import { laancAprvList } from '@src/_redux/features/laanc/laancThunk';
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 
 function LaancSearch({ isSearch }) {
   const dispatch = useDispatch();

src/components/laanc/map/FlightArea.js

@@ -1,5 +1,5 @@
 import { useEffect, useRef, useState, lazy, Suspense } from 'react';
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import {
   Button,
   Modal,

src/components/laanc/map/LaancAreaMap.js

@@ -4,7 +4,7 @@ import mapboxgl from 'mapbox-gl';
 import threebox from 'threebox-plugin';
 import MapboxLanguage from '@mapbox/mapbox-gl-language';
 import { MAPBOX_TOKEN } from '../../../configs/constants';
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import { Card, CardBody } from '@component/ui';
 import { initFlightBasState } from '../../../modules/laanc/models';
 import { checkLaancValidArea } from '../../../_redux/features/laanc/laancThunk';

src/components/laanc/map/LaancDrawControl.js

@@ -1,5 +1,5 @@
 import { useEffect, useRef, useState, lazy, Suspense } from 'react';
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import {
   CalculateDistance,
   handlerCreateGroupMarker,

src/components/laanc/map/LaancMapSearch.js

@@ -7,7 +7,7 @@ import {
 import { Search } from 'react-feather';
 import { useState } from 'react';
 import { getFlightSearchArea } from '@src/_redux/features/laanc/laancThunk';
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 
 export default function LaancMapSearch({ mapObject }) {
   const dispatch = useDispatch();

src/components/laanc/step/LaancStep1.js

@@ -1,6 +1,6 @@
 import { useEffect, useState, useRef, lazy, Suspense } from 'react';
 import { useLocation } from 'react-router-dom';
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import Flatpickr from 'react-flatpickr';
 import '@styles/react/libs/flatpickr/flatpickr.scss';
 import {

src/components/laanc/step/LaancStep2.js

@@ -1,5 +1,5 @@
 import React, { useEffect, useState, lazy, Suspense } from 'react';
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import '@styles/react/libs/flatpickr/flatpickr.scss';
 import { CheckCircle } from 'react-feather';
 import {

src/components/laanc/step/LaancStep3.js

@@ -1,5 +1,5 @@
 import React, { useState, lazy, Suspense } from 'react';
-import { useSelector } from '@src/redux/storeConfig/store';
+import { useSelector } from '@src/_redux/store';
 import { Document, Page, pdfjs } from 'react-pdf';
 import {
   Row,

src/components/map/mapbox/MapBoxMap.js

@@ -6,7 +6,7 @@ import {
   lazy,
   Suspense
 } from 'react';
-import { useSelector, useDispatch } from '@store/storeConfig/store';
+import { useSelector, useDispatch } from '@src/_redux/store';
 import {
   Button,
   Modal,

src/components/map/mapbox/dron/DronMarker.js

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import { shallowEqual } from 'react-redux';
 import '../../../../assets/css/custom.css';
 import FlightIcon from '../../../../assets/images/airplan_org.svg';

src/components/map/mapbox/dron/DronToast.js

@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import useAudio from '../../../../utility/hooks/useAudio';
 import warning from '../../../../assets/sounds/warning.mp3';
 import { toast } from 'react-toastify';

src/components/map/mapbox/feature/FeatureAirZone.js

@@ -2,7 +2,7 @@ import '../../../../assets/css/custom.css';
 import { useEffect } from 'react';
 import geoJson from '../../geojson/airArea.json';
 import * as turf from '@turf/turf';
-import { useSelector } from '@store/storeConfig/store';
+import { useSelector } from '@src/_redux/store';
 
 // 격자 공역 Source
 const airPort = [

src/components/message/MessageErrorModal.js

@@ -1,4 +1,4 @@
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import {
   Button,
   Modal,

src/components/message/MessageInfoModal.js

@@ -1,4 +1,4 @@
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import {
   Button,
   Modal,

src/components/message/MessageModal.js

@@ -1,4 +1,4 @@
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import {
   Button,
   Modal,

src/components/websocket/WebsocketClient.js

@@ -1,6 +1,6 @@
 import React, { useEffect, useState, useRef } from 'react';
 import { VscLoading } from 'react-icons/vsc';
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import { useHistory } from 'react-router-dom';
 import { WS_HOST } from '../../configs/constants';
 import { getControlGp } from '@src/_redux/features/control/gp/gpThunk';

src/containers/account/mypage/AccountMypageContainer.js

@@ -1,6 +1,6 @@
 // ** React Imports
 import { useState, useEffect } from 'react';
-import { useSelector, useDispatch } from '@store/storeConfig/store';
+import { useSelector, useDispatch } from '@src/_redux/store';
 // ** Third Party Components
 import { User, Lock } from 'react-feather';
 import { Nav, NavItem, NavLink } from '@component/ui';

src/containers/analysis/history/AnalysisHistoryContainer.js

@@ -1,4 +1,4 @@
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import { shallowEqual } from 'react-redux';
 import dayjs from 'dayjs';
 import { useEffect, useState } from 'react';
@@ -28,9 +28,7 @@ export const AnalysisHistoryContainer = props => {
    * total: 비행이력 현황 총 갯수
    * page: 비행이력 현황 현재 페이지
    */
-  const { data, count, total, page } = useSelector(
-    state => state.analysisHistoryState
-  );
+  const { data, count, total, page } = useSelector(state => state.historyState);
 
   /**
    * 선택한 그룹정보 및 검색조건

src/containers/analysis/history/AnalysisHistoryDetailContainer.js

@@ -1,6 +1,6 @@
 import dayjs from 'dayjs';
 import { useEffect } from 'react';
-import { useDispatch, useSelector } from '@src/redux/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import { useParams } from 'react-router-dom';
 import { AnalysisHistoryDetailGrid } from '../../../components/analysis/history/AnalysisHistoryDetailGrid';
 import { AnalysisHistoryDetailStatic } from '../../../components/analysis/history/AnalysisHistoryDetailStatic';
@@ -11,7 +11,7 @@ import {
 } from '@src/_redux/features/analysis/history/historyThunk';
 export const AnalysisHistoryDetailContainer = () => {
   // 비행이력 목록
-  const { log } = useSelector(state => state.analysisHistoryState);
+  const { log } = useSelector(state => state.historyState);
   // 쿼리 파라미터 id
   const { id } = useParams();
   const dispatch = useDispatch();

src/containers/analysis/simulator/AnalysisSimulationContainer.js

@@ -1,6 +1,6 @@
 import dayjs from 'dayjs';
 import { useEffect, useState, useCallback, useRef } from 'react';
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import { AnalysisSimulationDetail } from '../../../components/analysis/simulation/AnalysisSimulationDetail';
 import { AnalysisSimulationMenu } from '../../../components/analysis/simulation/AnalysisSimulationMenu';
 import { AnalysisSimulationReport } from '../../../components/analysis/simulation/AnalysisSimulationReport';
@@ -22,7 +22,7 @@ let playCounts = 0;
 export const AnalysisSimulationContainer = props => {
   // 슬라이드 모든 데이터
   const { list, count, detail, searchParams, log, stcsList, stcsCount, page } =
-    useSelector(state => state.analysisSimulatorState);
+    useSelector(state => state.simulationState);
 
   // 비행 시물레이션 데이터
   const [oepnReportList, setOpenReportList] = useState(false);

src/containers/basis/BasisContainer.js

@@ -1,4 +1,4 @@
-import { useSelector } from '@store/storeConfig/store';
+import { useSelector } from '@src/_redux/store';
 import { shallowEqual } from 'react-redux';
 import { CustomMainLayout } from '../../components/layout/CustomMainLayout';
 import { BasisGroupGrid } from '../../components/basis/BasisGroupGrid';

src/containers/basis/dron/BasisDronContainer.js

@@ -1,4 +1,4 @@
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import { shallowEqual } from 'react-redux';
 import { useEffect, useState } from 'react';
 import { useHistory, Link } from 'react-router-dom';

src/containers/basis/dron/BasisDronDetailContainer.js

@@ -1,4 +1,4 @@
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import { useEffect, useState } from 'react';
 import { Col, Row } from '../../../components/ui/index';
 import { Button } from '@component/ui';

src/containers/basis/dron/BasisIdntfContainer.js

@@ -1,4 +1,4 @@
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import { useEffect, useState } from 'react';
 import { Card, CardBody, Col, Row } from '@component/ui';
 import { BasisIdntfForm } from '../../../components/basis/dron/BasisIdntform';

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

@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import dayjs from 'dayjs';
 import { Compass } from 'react-feather';
 import { Spinner } from '@component/ui';

src/containers/basis/group/BasisGroupApprovalContainer.js

@@ -1,4 +1,4 @@
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import { useEffect, useState } from 'react';
 import { Button } from '@component/ui';
 import { BasisGroupApprovalSearch } from '../../../components/basis/group/BasisGroupApprovalSearch';

src/containers/basis/group/BasisGroupContainer.js

@@ -1,4 +1,4 @@
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import { useEffect, useState } from 'react';
 import { Link, useHistory } from 'react-router-dom';
 import { Button } from '@component/ui';

src/containers/basis/group/BasisGroupDetailContainer.js

@@ -1,4 +1,4 @@
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import { useEffect, useState } from 'react';
 import { useParams } from 'react-router-dom';
 import { BasisGroupForm } from '../../../components/basis/group/BaisGroupForm';

src/containers/basis/group/BasisGroupDetailJoinContainer.js

@@ -1,4 +1,4 @@
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import { useEffect, useState } from 'react';
 import { Button } from '@component/ui';
 import { BasisGroupDetailJoinSearch } from '../../../components/basis/group/BasisGroupDetailJoinSearch';

src/containers/basis/group/BasisGroupUsersContainer.js

@@ -1,4 +1,4 @@
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import { useEffect, useState } from 'react';
 import { Button } from '@component/ui';
 import { BasisGroupUsersSearch } from '../../../components/basis/group/BasisGroupUsersSearch';

src/containers/cstmrService/faq/FaqContainer.js

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useLayoutEffect, useState } from 'react';
-import { useSelector, useDispatch } from '@store/storeConfig/store';
+import { useSelector, useDispatch } from '@src/_redux/store';
 import { TabContent, TabPane, Button } from '@component/ui';
 import AppCollapse from '@core@components/app-collapse';
 import * as Actions from '../../../_redux/features/customerService/faq/faqThunk';

src/containers/cstmrService/inquiry/AdminInquiryContainer.js

@@ -1,5 +1,5 @@
 import { useEffect, useState, useCallback } from 'react';
-import { useSelector, useDispatch } from '@store/storeConfig/store';
+import { useSelector, useDispatch } from '@src/_redux/store';
 import { Col, Row } from '@component/ui';
 import {
   getAdminQnaDetail,

src/containers/cstmrService/inquiry/UserInquiryContainer.js

@@ -1,7 +1,7 @@
 import { Fragment, useCallback, useEffect, useRef, useState } from 'react';
 import { Button, Badge } from '@component/ui';
 import AppCollapse from '@core@components/app-collapse';
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import dayjs from 'dayjs';
 import {
   deleteQnaUser,

src/containers/laanc/LaancPlanContainer.js

@@ -2,7 +2,7 @@ import { lazy, useEffect, useState, Suspense } from 'react';
 import { initFlightBasState } from '@src/_redux/features/laanc/laancState';
 import { Modal } from '@component/ui';
 import { clientInitAreaDetailInitial } from '../../modules/laanc/actions';
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import { clientDrawTypeChange } from '@src/_redux/features/control/map/mapSlice';
 
 const LaancStep1 = lazy(() => import('../../components/laanc/step/LaancStep1'));

src/containers/main/dash/MainDashContainer.js

@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import { useHistory } from 'react-router-dom';
 import dayjs from 'dayjs';
 import { Col, Row } from '@component/ui';

src/containers/statistics/AbnormalSituationContainer.js

@@ -1,6 +1,6 @@
 import { CustomMainLayout } from '../../components/layout/CustomMainLayout';
 import { useCallback, useEffect, useState } from 'react';
-import { useDispatch, useSelector } from '@src/redux/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import {
   getAbnormalSearch,
   getAbnormalStatistics

src/containers/statistics/FlightContainer.js

@@ -1,6 +1,6 @@
 import { CustomMainLayout } from '../../components/layout/CustomMainLayout';
 import { useCallback, useEffect, useState } from 'react';
-import { useDispatch, useSelector } from '@src/redux/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import StatisticsTotal from '../../components/statistics/StatisticsTotal';
 import StatisticsSearch from '../../components/statistics/StatisticsSearch';
 import {

src/containers/statistics/FlightResultContainer.js

@@ -1,6 +1,6 @@
 import { CustomMainLayout } from '../../components/layout/CustomMainLayout';
 import { useCallback, useEffect, useState } from 'react';
-import { useDispatch, useSelector } from '@src/redux/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import {
   getResultSearch,
   getResultStatistics

src/index.js

@@ -7,8 +7,7 @@ import { HelmetProvider } from 'react-helmet-async';
 
 // ** Redux Imports
 import { Provider } from 'react-redux';
-import { store } from './redux/storeConfig/store';
-import { store as store2 } from './_redux/store';
+import { store } from '@src/_redux/store';
 
 // ** Toast & ThemeColors Context
 import { ToastContainer } from 'react-toastify';

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

@@ -7,7 +7,7 @@ import {
   COOKIE_ACCESS_TOKEN,
   COOKIE_REFRESH_TOKEN
 } from './cookie';
-import { store } from '@store/storeConfig/store';
+import { store } from '@src/_redux/store';
 import * as Actions from '@modules/account/auth/actions';
 
 const JWT_FLEFIX = 'palnet ';

src/modules/utils/customAxiosUtil.ts

@@ -1,7 +1,7 @@
 import axios, { AxiosError, AxiosRequestConfig, AxiosResponse } from 'axios';
 import { HOST } from '../../configs/constants';
 import { getAccessToken } from '../account/auth/service/jwtTokenUtil';
-import { store } from './../../redux/storeConfig/store';
+import { store } from '@src/_redux/store';
 import {
   clientLoading,
   clientLoaded

src/redux/reducers/rootReducer.ts

@@ -2,54 +2,62 @@
 import { combineReducers } from 'redux';
 
 // Redux-toolkit Reducer
-import { droneReducer } from '@src/_redux/features/basis/drone/droneSlice';
-import { laancReducer } from '@src/_redux/features/laanc/laancSlice';
 import { layoutReducer } from '@src/_redux/features/layout/layoutSlice';
-import { historyReducer } from '@src/_redux/features/analysis/history/historySlice';
 import { messageReducer } from '@src/_redux/features/comn/message/messageSlice';
-import { dashboardReducer } from '@src/_redux/features/dashboard/dashboardSlice';
-import { faqReducer } from '@src/_redux/features/customerService/faq/faqSlice';
-import { groupReducer } from '@src/_redux/features/basis/group/groupSlice';
-import { simulationReducer } from '@src/_redux/features/analysis/simulation/simulationSlice';
-import { registerReducer } from '@src/_redux/features/account/register/registerSlice';
-import { findReducer } from '@src/_redux/features/account/find/findSlice';
-import { statisticsReducer } from '@src/_redux/features/statistics/statisticsSlice';
 import { authReducer } from '@src/_redux/features/account/auth/authSlice';
-import { qnaReducer } from '@src/_redux/features/customerService/qna/qnaSlice';
-import { mapReducer } from '@src/_redux/features/control/map/mapSlice';
+import { findReducer } from '@src/_redux/features/account/find/findSlice';
+import { registerReducer } from '@src/_redux/features/account/register/registerSlice';
+import { historyReducer } from '@src/_redux/features/analysis/history/historySlice';
+import { simulationReducer } from '@src/_redux/features/analysis/simulation/simulationSlice';
+import { droneReducer } from '@src/_redux/features/basis/drone/droneSlice';
+import { groupReducer } from '@src/_redux/features/basis/group/groupSlice';
 import {
-  controlGpDtlReducer,
-  controlGpHisReducer,
   controlGpReducer,
-  controlGpFltPlanReducer,
+  controlGpHisReducer,
   controlGpLogReducer,
+  controlGpDtlReducer,
+  controlGpFltPlanReducer,
   controlGpCountReducer
 } from '@src/_redux/features/control/gp/gpSlice';
+import { mapReducer } from '@src/_redux/features/control/map/mapSlice';
+import { faqReducer } from '@src/_redux/features/customerService/faq/faqSlice';
+import { qnaReducer } from '@src/_redux/features/customerService/qna/qnaSlice';
+import { dashboardReducer } from '@src/_redux/features/dashboard/dashboardSlice';
+import { laancReducer } from '@src/_redux/features/laanc/laancSlice';
+import { statisticsReducer } from '@src/_redux/features/statistics/statisticsSlice';
 
 const rootReducer = combineReducers({
+  // common
   layoutState: layoutReducer,
   messageState: messageReducer,
-
+  // account
+  authState: authReducer,
+  findState: findReducer,
+  registerState: registerReducer,
+  // analysis
+  historyState: historyReducer,
+  simulationState: simulationReducer,
+  // basis
+  droneState: droneReducer,
+  groupState: groupReducer,
+  // control gp
   controlGpState: controlGpReducer,
   controlGpHisState: controlGpHisReducer,
   controlGpLogState: controlGpLogReducer,
   controlGpDtlState: controlGpDtlReducer,
-  controlGpCountState: controlGpCountReducer,
   controlGpFltPlanState: controlGpFltPlanReducer,
-  ControlGpWeatherState: controlGpReducer,
-  laancState: laancReducer,
-  analysisHistoryState: historyReducer,
-  analysisSimulatorState: simulationReducer,
-  statisticsState: statisticsReducer,
-  dashboardState: dashboardReducer,
-  droneState: droneReducer,
+  controlGpCountState: controlGpCountReducer,
+  // control map
+  mapState: mapReducer,
+  // customerService
   faqState: faqReducer,
-  groupState: groupReducer,
-  registerState: registerReducer,
-  findState: findReducer,
-  authState: authReducer,
   qnaState: qnaReducer,
-  mapState: mapReducer
+  // dashboard
+  dashboardState: dashboardReducer,
+  // laanc
+  laancState: laancReducer,
+  // statistics
+  statisticsState: statisticsReducer
 });
 
 export default rootReducer;

src/router/hoc/ResolveRoutes.tsx

@@ -10,7 +10,7 @@ import LayoutWrapper from '@layouts/components/layout-wrapper';
 import { IRoute } from '../routes/type';
 import { Routes } from '../routes';
 import authenticationCheck from './authenticationCheck';
-import { useSelector } from '@store/storeConfig/store';
+import { useSelector } from '@src/_redux/store';
 import { MessageModal } from '@src/components/message/MessageModal';
 import { MessageErrorModal } from '@src/components/message/MessageErrorModal';
 import { MessageInfoModal } from '@src/components/message/MessageInfoModal';

src/router/hoc/authenticationCheck.tsx

@@ -1,6 +1,6 @@
 import { ReactNode, useEffect, useLayoutEffect } from 'react';
 import { RouteComponentProps } from 'react-router-dom';
-import { useSelector, useDispatch } from '@store/storeConfig/store';
+import { useSelector, useDispatch } from '@src/_redux/store';
 import { checkToken } from '@src/_redux/features/account/auth/authThunk';
 import { ICheckAuthencationRs } from '@src/_redux/features/account/auth/authState';
 

src/utility/hooks/useRTL.js

@@ -3,7 +3,7 @@ import { useEffect } from 'react';
 
 // ** Store & Actions
 import { clientHandlerRTL } from '@src/_redux/features/layout/layoutSlice';
-import { useSelector, useDispatch } from '@store/storeConfig/store';
+import { useSelector, useDispatch } from '@src/_redux/store';
 
 export const useRTL = () => {
   // ** Store Vars

src/views/control/alarm/ControlAlarmList.js

@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
 import { X } from 'react-feather';
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import { getWarnLog } from '@src/_redux/features/control/gp/gpThunk';
 import ControlAlarmDetail from './ControlAlarmDetail';
 import { Badge } from '@component/ui';

src/views/control/main/ControlMain.js

@@ -1,5 +1,5 @@
 import { useEffect, useState, lazy, Suspense } from 'react';
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import { useHistory } from 'react-router-dom';
 import {
   Sun,

src/views/control/report/ControlReportDetail.js

@@ -1,6 +1,6 @@
 import { useState, useEffect } from 'react';
 import { X } from 'react-feather';
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import dayjs from 'dayjs';
 import {
   Navigation2,

src/views/control/report/ControlReportList.js

@@ -1,6 +1,6 @@
 import { useState } from 'react';
 import { Search, X } from 'react-feather';
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import { Badge, Button, Input, InputGroup } from '@component/ui';
 import dayjs from 'dayjs';
 import { controlDt } from '@src/_redux/features/control/gp/gpThunk';

src/views/control/setting/ControlSetting.js

@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { useDispatch, useSelector } from '@store/storeConfig/store';
+import { useDispatch, useSelector } from '@src/_redux/store';
 import { useHistory } from 'react-router-dom';
 import mapboxgl from 'mapbox-gl';
 import { Button, ButtonGroup, CustomInput } from '@component/ui';