diff --git a/src/@core/layouts/HorizontalLayout.js b/src/@core/layouts/HorizontalLayout.js index bffbfdd8..d711c122 100644 --- a/src/@core/layouts/HorizontalLayout.js +++ b/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'; diff --git a/src/@core/layouts/VerticalLayout.js b/src/@core/layouts/VerticalLayout.js index 5fb80bbb..dcc55e1b 100644 --- a/src/@core/layouts/VerticalLayout.js +++ b/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, diff --git a/src/@core/layouts/components/layout-wrapper/index.js b/src/@core/layouts/components/layout-wrapper/index.js index 485353ca..605c5be1 100644 --- a/src/@core/layouts/components/layout-wrapper/index.js +++ b/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, diff --git a/src/@core/layouts/components/menu/vertical-menu/index.js b/src/@core/layouts/components/menu/vertical-menu/index.js index f4993809..f7b6359e 100644 --- a/src/@core/layouts/components/menu/vertical-menu/index.js +++ b/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'; diff --git a/src/@core/layouts/components/navbar/NavbarUser.js b/src/@core/layouts/components/navbar/NavbarUser.js index 8edf8a8a..aebbe562 100644 --- a/src/@core/layouts/components/navbar/NavbarUser.js +++ b/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'; diff --git a/src/@core/layouts/components/navbar/UserDropdown.js b/src/@core/layouts/components/navbar/UserDropdown.js index be541994..cfada08c 100644 --- a/src/@core/layouts/components/navbar/UserDropdown.js +++ b/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 { diff --git a/src/_redux/features/control/gp/gpThunk.ts b/src/_redux/features/control/gp/gpThunk.ts index 19fecc81..edb46be3 100644 --- a/src/_redux/features/control/gp/gpThunk.ts +++ b/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; // 그룹 별 기체 필터링 diff --git a/src/_redux/rootReducer.ts b/src/_redux/rootReducer.ts index a2b1a595..fea3d058 100644 --- a/src/_redux/rootReducer.ts +++ b/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, diff --git a/src/_redux/store.ts b/src/_redux/store.ts index de09f057..0e749cf1 100644 --- a/src/_redux/store.ts +++ b/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; export const useSelector: TypedUseSelectorHook = useSelectors; diff --git a/src/components/account/find/AccountFindPassword.js b/src/components/account/find/AccountFindPassword.js index 0e8ec92e..be1b00d1 100644 --- a/src/components/account/find/AccountFindPassword.js +++ b/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, diff --git a/src/components/account/find/AccountFindUserId.js b/src/components/account/find/AccountFindUserId.js index 88e7ddd5..6e699696 100644 --- a/src/components/account/find/AccountFindUserId.js +++ b/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, diff --git a/src/components/account/login/AccountLogin.js b/src/components/account/login/AccountLogin.js index d34625df..a770620b 100644 --- a/src/components/account/login/AccountLogin.js +++ b/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, diff --git a/src/components/account/mypage/AccountMypagePwForm.js b/src/components/account/mypage/AccountMypagePwForm.js index 65654a02..909667a2 100644 --- a/src/components/account/mypage/AccountMypagePwForm.js +++ b/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, diff --git a/src/components/account/register/AccountRegisterForm.js b/src/components/account/register/AccountRegisterForm.js index da00bbcc..408d0c87 100644 --- a/src/components/account/register/AccountRegisterForm.js +++ b/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'; diff --git a/src/components/account/register/AccountRegisterTerm.js b/src/components/account/register/AccountRegisterTerm.js index 4c494b9b..40a61b51 100644 --- a/src/components/account/register/AccountRegisterTerm.js +++ b/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, diff --git a/src/components/analysis/history/AnalysisHistoryDetailSearch.js b/src/components/analysis/history/AnalysisHistoryDetailSearch.js index 8c3f3b8e..6b8e5bc3 100644 --- a/src/components/analysis/history/AnalysisHistoryDetailSearch.js +++ b/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 (
diff --git a/src/components/analysis/history/AnalysisHistoryGrid.js b/src/components/analysis/history/AnalysisHistoryGrid.js index 8185f405..6aa83349 100644 --- a/src/components/analysis/history/AnalysisHistoryGrid.js +++ b/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); diff --git a/src/components/analysis/simulation/AnalysisSimuationInfo.js b/src/components/analysis/simulation/AnalysisSimuationInfo.js index 86c45f44..88557e2b 100644 --- a/src/components/analysis/simulation/AnalysisSimuationInfo.js +++ b/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 => { diff --git a/src/components/basis/flight/schedule/FlightScheduleGrid.js b/src/components/basis/flight/schedule/FlightScheduleGrid.js index 6eacac48..5e6a0744 100644 --- a/src/components/basis/flight/schedule/FlightScheduleGrid.js +++ b/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'; /** diff --git a/src/components/dashboard/DroneFlightSchedule.js b/src/components/dashboard/DroneFlightSchedule.js index e9f76456..8a934f9f 100644 --- a/src/components/dashboard/DroneFlightSchedule.js +++ b/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, diff --git a/src/components/laanc/LaancQr.js b/src/components/laanc/LaancQr.js index 7b2bcd4a..2396723e 100644 --- a/src/components/laanc/LaancQr.js +++ b/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'; diff --git a/src/components/laanc/list/LaancDetail.js b/src/components/laanc/list/LaancDetail.js index e9ade81a..494c6765 100644 --- a/src/components/laanc/list/LaancDetail.js +++ b/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, diff --git a/src/components/laanc/list/LaancGrid.js b/src/components/laanc/list/LaancGrid.js index 1968ce1a..254bfa09 100644 --- a/src/components/laanc/list/LaancGrid.js +++ b/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'; diff --git a/src/components/laanc/list/LaancSearch.js b/src/components/laanc/list/LaancSearch.js index 63ba1cbd..ea3bb748 100644 --- a/src/components/laanc/list/LaancSearch.js +++ b/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(); diff --git a/src/components/laanc/map/FlightArea.js b/src/components/laanc/map/FlightArea.js index 5d6d2dd2..7b428af2 100644 --- a/src/components/laanc/map/FlightArea.js +++ b/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, diff --git a/src/components/laanc/map/LaancAreaMap.js b/src/components/laanc/map/LaancAreaMap.js index 30712317..3f7140ee 100644 --- a/src/components/laanc/map/LaancAreaMap.js +++ b/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'; diff --git a/src/components/laanc/map/LaancDrawControl.js b/src/components/laanc/map/LaancDrawControl.js index 7e52832e..19c47a60 100644 --- a/src/components/laanc/map/LaancDrawControl.js +++ b/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, diff --git a/src/components/laanc/map/LaancMapSearch.js b/src/components/laanc/map/LaancMapSearch.js index bcaee619..9ce68b4c 100644 --- a/src/components/laanc/map/LaancMapSearch.js +++ b/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(); diff --git a/src/components/laanc/step/LaancStep1.js b/src/components/laanc/step/LaancStep1.js index 212a040d..9532b288 100644 --- a/src/components/laanc/step/LaancStep1.js +++ b/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 { diff --git a/src/components/laanc/step/LaancStep2.js b/src/components/laanc/step/LaancStep2.js index 88302d8b..0de35d86 100644 --- a/src/components/laanc/step/LaancStep2.js +++ b/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 { diff --git a/src/components/laanc/step/LaancStep3.js b/src/components/laanc/step/LaancStep3.js index cd8cd48d..bcbab917 100644 --- a/src/components/laanc/step/LaancStep3.js +++ b/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, diff --git a/src/components/map/mapbox/MapBoxMap.js b/src/components/map/mapbox/MapBoxMap.js index 6a8f56cf..549175e3 100644 --- a/src/components/map/mapbox/MapBoxMap.js +++ b/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, diff --git a/src/components/map/mapbox/dron/DronMarker.js b/src/components/map/mapbox/dron/DronMarker.js index ddbf8c86..fdad1aaa 100644 --- a/src/components/map/mapbox/dron/DronMarker.js +++ b/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'; diff --git a/src/components/map/mapbox/dron/DronToast.js b/src/components/map/mapbox/dron/DronToast.js index ea4a5579..a51ae366 100644 --- a/src/components/map/mapbox/dron/DronToast.js +++ b/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'; diff --git a/src/components/map/mapbox/feature/FeatureAirZone.js b/src/components/map/mapbox/feature/FeatureAirZone.js index 545b55d2..09ea253c 100644 --- a/src/components/map/mapbox/feature/FeatureAirZone.js +++ b/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 = [ diff --git a/src/components/message/MessageErrorModal.js b/src/components/message/MessageErrorModal.js index 22b3c9e2..ae47bcab 100644 --- a/src/components/message/MessageErrorModal.js +++ b/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, diff --git a/src/components/message/MessageInfoModal.js b/src/components/message/MessageInfoModal.js index 2ff3eafe..f1287d60 100644 --- a/src/components/message/MessageInfoModal.js +++ b/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, diff --git a/src/components/message/MessageModal.js b/src/components/message/MessageModal.js index f2d9468c..bf3b431e 100644 --- a/src/components/message/MessageModal.js +++ b/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, diff --git a/src/components/websocket/WebsocketClient.js b/src/components/websocket/WebsocketClient.js index afd442c4..4cc71ef3 100644 --- a/src/components/websocket/WebsocketClient.js +++ b/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'; diff --git a/src/containers/account/mypage/AccountMypageContainer.js b/src/containers/account/mypage/AccountMypageContainer.js index f205b2e7..16b6b7c9 100644 --- a/src/containers/account/mypage/AccountMypageContainer.js +++ b/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'; diff --git a/src/containers/analysis/history/AnalysisHistoryContainer.js b/src/containers/analysis/history/AnalysisHistoryContainer.js index 04231482..f25c2577 100644 --- a/src/containers/analysis/history/AnalysisHistoryContainer.js +++ b/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); /** * 선택한 그룹정보 및 검색조건 diff --git a/src/containers/analysis/history/AnalysisHistoryDetailContainer.js b/src/containers/analysis/history/AnalysisHistoryDetailContainer.js index 6e347ca5..e62db595 100644 --- a/src/containers/analysis/history/AnalysisHistoryDetailContainer.js +++ b/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(); diff --git a/src/containers/analysis/simulator/AnalysisSimulationContainer.js b/src/containers/analysis/simulator/AnalysisSimulationContainer.js index 8211e852..373b769f 100644 --- a/src/containers/analysis/simulator/AnalysisSimulationContainer.js +++ b/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); diff --git a/src/containers/basis/BasisContainer.js b/src/containers/basis/BasisContainer.js index c86591ff..35cda8c0 100644 --- a/src/containers/basis/BasisContainer.js +++ b/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'; diff --git a/src/containers/basis/dron/BasisDronContainer.js b/src/containers/basis/dron/BasisDronContainer.js index 3239ba1b..f7f3214b 100644 --- a/src/containers/basis/dron/BasisDronContainer.js +++ b/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'; diff --git a/src/containers/basis/dron/BasisDronDetailContainer.js b/src/containers/basis/dron/BasisDronDetailContainer.js index 8108fdcf..8547cc4f 100644 --- a/src/containers/basis/dron/BasisDronDetailContainer.js +++ b/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'; diff --git a/src/containers/basis/dron/BasisIdntfContainer.js b/src/containers/basis/dron/BasisIdntfContainer.js index 6a84fa1f..c4ec64d6 100644 --- a/src/containers/basis/dron/BasisIdntfContainer.js +++ b/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'; diff --git a/src/containers/basis/flight/plan/WeatherContainer.js b/src/containers/basis/flight/plan/WeatherContainer.js index cb67da4f..a3f35f54 100644 --- a/src/containers/basis/flight/plan/WeatherContainer.js +++ b/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'; diff --git a/src/containers/basis/group/BasisGroupApprovalContainer.js b/src/containers/basis/group/BasisGroupApprovalContainer.js index 3cc1fcd9..9f69416c 100644 --- a/src/containers/basis/group/BasisGroupApprovalContainer.js +++ b/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'; diff --git a/src/containers/basis/group/BasisGroupContainer.js b/src/containers/basis/group/BasisGroupContainer.js index 4d0fd589..01dde658 100644 --- a/src/containers/basis/group/BasisGroupContainer.js +++ b/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'; diff --git a/src/containers/basis/group/BasisGroupDetailContainer.js b/src/containers/basis/group/BasisGroupDetailContainer.js index 906bf76a..548df75b 100644 --- a/src/containers/basis/group/BasisGroupDetailContainer.js +++ b/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'; diff --git a/src/containers/basis/group/BasisGroupDetailJoinContainer.js b/src/containers/basis/group/BasisGroupDetailJoinContainer.js index c3bbd14c..713b2741 100644 --- a/src/containers/basis/group/BasisGroupDetailJoinContainer.js +++ b/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'; diff --git a/src/containers/basis/group/BasisGroupUsersContainer.js b/src/containers/basis/group/BasisGroupUsersContainer.js index cb4c7c63..f659a224 100644 --- a/src/containers/basis/group/BasisGroupUsersContainer.js +++ b/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'; diff --git a/src/containers/cstmrService/faq/FaqContainer.js b/src/containers/cstmrService/faq/FaqContainer.js index c093c3da..2747676e 100644 --- a/src/containers/cstmrService/faq/FaqContainer.js +++ b/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'; diff --git a/src/containers/cstmrService/inquiry/AdminInquiryContainer.js b/src/containers/cstmrService/inquiry/AdminInquiryContainer.js index 5acc8629..4f2f3aa8 100644 --- a/src/containers/cstmrService/inquiry/AdminInquiryContainer.js +++ b/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, diff --git a/src/containers/cstmrService/inquiry/UserInquiryContainer.js b/src/containers/cstmrService/inquiry/UserInquiryContainer.js index 32b1ec80..d493cd0e 100644 --- a/src/containers/cstmrService/inquiry/UserInquiryContainer.js +++ b/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, diff --git a/src/containers/laanc/LaancPlanContainer.js b/src/containers/laanc/LaancPlanContainer.js index 825a22c8..ce403a77 100644 --- a/src/containers/laanc/LaancPlanContainer.js +++ b/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')); diff --git a/src/containers/main/dash/MainDashContainer.js b/src/containers/main/dash/MainDashContainer.js index e3cb8ec0..ab45bd22 100644 --- a/src/containers/main/dash/MainDashContainer.js +++ b/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'; diff --git a/src/containers/statistics/AbnormalSituationContainer.js b/src/containers/statistics/AbnormalSituationContainer.js index 64041b0e..a4a7a21d 100644 --- a/src/containers/statistics/AbnormalSituationContainer.js +++ b/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 diff --git a/src/containers/statistics/FlightContainer.js b/src/containers/statistics/FlightContainer.js index 76218c44..26e64350 100644 --- a/src/containers/statistics/FlightContainer.js +++ b/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 { diff --git a/src/containers/statistics/FlightResultContainer.js b/src/containers/statistics/FlightResultContainer.js index 345bcea9..7c9fe323 100644 --- a/src/containers/statistics/FlightResultContainer.js +++ b/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 diff --git a/src/index.js b/src/index.js index 77e5b56d..1fba7518 100644 --- a/src/index.js +++ b/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'; diff --git a/src/modules/account/auth/service/jwtTokenUtil.ts b/src/modules/account/auth/service/jwtTokenUtil.ts index af8c31f8..5c65d818 100644 --- a/src/modules/account/auth/service/jwtTokenUtil.ts +++ b/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 '; diff --git a/src/modules/utils/customAxiosUtil.ts b/src/modules/utils/customAxiosUtil.ts index f56ac510..7b7d6103 100644 --- a/src/modules/utils/customAxiosUtil.ts +++ b/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 diff --git a/src/redux/reducers/rootReducer.ts b/src/redux/reducers/rootReducer.ts index c05b491a..fa1a5f91 100644 --- a/src/redux/reducers/rootReducer.ts +++ b/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; diff --git a/src/router/hoc/ResolveRoutes.tsx b/src/router/hoc/ResolveRoutes.tsx index 59dce792..118a1bea 100644 --- a/src/router/hoc/ResolveRoutes.tsx +++ b/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'; diff --git a/src/router/hoc/authenticationCheck.tsx b/src/router/hoc/authenticationCheck.tsx index 0e96e6de..f7d94501 100644 --- a/src/router/hoc/authenticationCheck.tsx +++ b/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'; diff --git a/src/utility/hooks/useRTL.js b/src/utility/hooks/useRTL.js index 7711c322..cbd444d7 100644 --- a/src/utility/hooks/useRTL.js +++ b/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 diff --git a/src/views/control/alarm/ControlAlarmList.js b/src/views/control/alarm/ControlAlarmList.js index 318fd1f4..46f65b3a 100644 --- a/src/views/control/alarm/ControlAlarmList.js +++ b/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'; diff --git a/src/views/control/main/ControlMain.js b/src/views/control/main/ControlMain.js index b8240e65..744eac4a 100644 --- a/src/views/control/main/ControlMain.js +++ b/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, diff --git a/src/views/control/report/ControlReportDetail.js b/src/views/control/report/ControlReportDetail.js index e80db174..7902ebb8 100644 --- a/src/views/control/report/ControlReportDetail.js +++ b/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, diff --git a/src/views/control/report/ControlReportList.js b/src/views/control/report/ControlReportList.js index 6946d615..08558a0c 100644 --- a/src/views/control/report/ControlReportList.js +++ b/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'; diff --git a/src/views/control/setting/ControlSetting.js b/src/views/control/setting/ControlSetting.js index 907e4083..b635f7fe 100644 --- a/src/views/control/setting/ControlSetting.js +++ b/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';