moduls폴더 각 index파일 생성 및 rootReducer 정리

src/containers/cstmrService/faq/FaqContainer.js

@@ -7,7 +7,7 @@ import {
   INSERT,
   UPDATE,
   DELETE
-} from '../../../modules/cstmrService/faq/action';
+} from '../../../modules/cstmrService/faq/actions';
 import FaqSearchBox from '../../../components/cstmrService/faq/FaqSearchBox';
 import FaqForm from '../../../components/cstmrService/faq/FaqForm';
 import FaqTab from '../../../components/cstmrService/faq/FaqTab';

src/containers/cstmrService/inquiry/AdminInquiryContainer.js

@@ -8,7 +8,7 @@ import {
   ADMIN_FILE_DOWN,
   ADMIN_DELETE,
   ADMIN_DETAIL_INITAL
-} from '../../../modules/cstmrService/inquiry/action';
+} from '../../../modules/cstmrService/inquiry/actions';
 import QnaSearchBox from '../../../components/cstmrService/inquiry/QnaSearchBox';
 import QnaGrid from '../../../components/cstmrService/inquiry/QnaGrid';
 import QnaDetail from '../../../components/cstmrService/inquiry/QnaDetail';

src/containers/cstmrService/inquiry/UserInquiryContainer.js

@@ -3,7 +3,7 @@ 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 * as Actions from '../../../modules/cstmrService/inquiry/actions';
 import InquiryWrite from '../../../components/cstmrService/inquiry/InquiryWrite';
 import InfoModal from '../../../components/modal/InfoModal';
 import ErrorModal from '../../../components/modal/ErrorModal';

src/modules/account/find/index.ts

@@ -0,0 +1,4 @@
+export * from './actions/findAction';
+export * from './models/findModel';
+export * from './reducers/findReducer';
+export * from './sagas/findSaga';

src/modules/account/login/index.ts

@@ -0,0 +1,4 @@
+export * from './actions/authAction';
+export * from './models/authModel';
+export * from './reducers/authReducer';
+export * from './sagas/authSaga';

src/modules/account/register/index.ts

@@ -0,0 +1,4 @@
+export * from './actions/accountAction';
+export * from './models/accountModel';
+export * from './reducers/accountReducer';
+export * from './sagas/accountSaga';

src/modules/analysis/history/index.ts

@@ -0,0 +1,4 @@
+export * from './actions/analysisHistoryAction';
+export * from './models/analysisHitoryModel';
+export * from './reducers/analysisHitoryReducer';
+export * from './sagas/analysisHistorySaga';

src/modules/analysis/simulation/index.ts

@@ -0,0 +1,4 @@
+export * from './actions/analysisSimulatorAction';
+export * from './models/analysisSimulatorModel';
+export * from './reducers/analysisSimulatorReducer';
+export * from './sagas/analysisSimulatorSaga';

src/modules/basis/dron/index.ts

@@ -0,0 +1,4 @@
+export * from './actions/basisDronAction';
+export * from './models/basisDronModel';
+export * from './reducers/basisDronReducer';
+export * from './sagas/basisDronSaga';

src/modules/basis/dron/models/basisDronModel.ts

@@ -1,4 +1,15 @@
-import { ErrorModel } from '../../../models/ComnModel';
+export const initDron = {
+  list: undefined,
+  count: 0,
+  detail: undefined,
+  searchParams: '',
+  selectData: undefined,
+  listIdntf: undefined,
+  idntfCount: 0,
+  isRefreshIdntf: false,
+  page: 1,
+  total: 0
+};
 
 export interface DronState {
   list: DronData[] | undefined;
@@ -58,16 +69,3 @@ export interface IdntfData {
   createDt: Date;
   cstmrSno: number;
 }
-
-export const initDron = {
-  list: undefined,
-  count: 0,
-  detail: undefined,
-  searchParams: '',
-  selectData: undefined,
-  listIdntf: undefined,
-  idntfCount: 0,
-  isRefreshIdntf: false,
-  page: 1,
-  total: 0
-};

src/modules/basis/group/index.ts

@@ -0,0 +1,4 @@
+export * from './actions/basisGroupAction';
+export * from './models/basisGroupModel';
+export * from './reducers/basisGroupReducer';
+export * from './sagas/basisGroupSaga';

src/modules/comn/message/index.ts

@@ -0,0 +1,3 @@
+export * from './actions/comnMessageAction';
+export * from './models/comnMessageModel';
+export * from './reducers/comnMessageReducer';

src/modules/control/map/index.ts

@@ -0,0 +1,2 @@
+export * from './actions/controlMapActions';
+export * from './reducers/controlMapReducer';

src/modules/control/map/reducers/controlMapReducer.ts

@@ -20,7 +20,7 @@ const initialState = {
   flightAreaMarker: null
 };
 
-const controlReducerReducer = (state = initialState, action) => {
+export const controlMapReducer = (state = initialState, action) => {
   switch (action.type) {
     case 'MAP_INIT':
       return { ...state, map: action.value };
@@ -114,5 +114,3 @@ const controlReducerReducer = (state = initialState, action) => {
       return { ...state, flightAreaMarker: action.value };
   }
 };
-
-export default controlReducerReducer;

src/modules/cstmrService/faq/actions/index.ts

@@ -7,7 +7,7 @@ import {
   IFaqInsert,
   IFaqUpdate,
   IFaqDelete
-} from '../model';
+} from '../models';
 
 // 목록 조회
 const LIST_REQUEST = 'cstmrService/faq/LIST_REQUEST';

src/modules/cstmrService/faq/index.ts

@@ -0,0 +1,4 @@
+export * from './actions';
+export * from './models';
+export * from './reducers';
+export * from './sagas';

src/modules/cstmrService/faq/reducers/index.ts

@@ -1,7 +1,7 @@
 import { createReducer } from 'typesafe-actions';
 import produce from 'immer';
-import * as Actions from '../action';
-import { IFaqState } from '../model';
+import * as Actions from '../actions';
+import { IFaqState } from '../models';
 
 export const faqReducer = createReducer<IFaqState, Actions.FaqAction>({
   faqList: []

src/modules/cstmrService/faq/sagas/index.ts

@@ -7,7 +7,7 @@ import {
   SAVE_MESSAGE
 } from '../../../../configs/constants';
 import * as MessageActions from '../../../comn/message/actions/comnMessageAction';
-import * as Actions from '../action';
+import * as Actions from '../actions';
 import * as Apis from '../apis';
 
 function* listSaga(action: ActionType<typeof Actions.LIST.request>) {

src/modules/cstmrService/inquiry/actions/index.ts

@@ -12,7 +12,7 @@ import {
   IQnaUserInquiry,
   IQnaUserDetail,
   IQnaUserUpdate
-} from '../model';
+} from '../models';
 
 // 관리자 목록 조회
 const ADMIN_LIST_REQUEST = 'cstmrService/qna/ADMIN_LIST_REQUEST';

src/modules/cstmrService/inquiry/apis/index.ts

@@ -1,6 +1,6 @@
 import axios from '../../../utils/customAxiosUtil';
 import qs from 'qs';
-import { IQnaUserInquiry, IQnaUserSearch, IQnaUserUpdate } from '../model';
+import { IQnaUserInquiry, IQnaUserSearch, IQnaUserUpdate } from '../models';
 
 export const qnaAPI = {
   adminList: async (data: {

src/modules/cstmrService/inquiry/index.ts

@@ -0,0 +1,4 @@
+export * from './actions';
+export * from './models';
+export * from './reducers';
+export * from './sagas';

src/modules/cstmrService/inquiry/reducers/index.ts

@@ -1,7 +1,7 @@
 import { createReducer } from 'typesafe-actions';
 import produce from 'immer';
-import * as Actions from '../action';
-import { IQnaState, initalState } from '../model';
+import * as Actions from '../actions';
+import { IQnaState, initalState } from '../models';
 
 export const qnaReducer = createReducer<IQnaState, Actions.QnaAction>(
   initalState

src/modules/cstmrService/inquiry/sagas/index.ts

@@ -6,7 +6,7 @@ import {
   SAVE_MESSAGE
 } from '../../../../configs/constants';
 import * as MessageActions from '../../../comn/message/actions/comnMessageAction';
-import * as Actions from '../action';
+import * as Actions from '../actions';
 import * as Apis from '../apis';
 
 function* adminListSaga(action: ActionType<typeof Actions.ADMIN_LIST.request>) {

src/modules/index.ts

@@ -1,39 +0,0 @@
-// base
-import { combineReducers } from 'redux';
-import { all, fork } from 'redux-saga/effects';
-import { controlGpReducer, controlGpSaga, ControlGpState } from './control/gp';
-
-
-import auth from "../redux/reducers/auth/";
-
-
-
-export interface StoreState {
-  controlGpState : ControlGpState;
-}
-
-export function* saga() {
-  yield all([
-    fork(controlGpSaga),
-
-  ]);
-}
-
-const reducer = combineReducers({
-  auth : auth,
-  controlGpState: controlGpReducer,
-
-})
-
-// const reducer = (history: History) =>
-//   combineReducers<StoreState>({
-//     router: connectRouter(history),
-//     controlGpState: controlGpReducer,
-//     comnAuthState : comnAuthReducer,
-//     // customizerState : customizerReducer,
-//   });
-
-
-
-export default reducer;
-

src/modules/laanc/index.ts

@@ -0,0 +1,4 @@
+export * from './actions/laancActions';
+export * from './models/laancModels';
+export * from './reducers/laancReducers';
+export * from './sagas/laancSagas';

src/modules/main/dash/index.ts

@@ -0,0 +1,4 @@
+export * from './actions/mainDashAction';
+export * from './models/mainDashModel';
+export * from './reducers/mainDashReducer';
+export * from './sagas/mainDashSaga';

src/modules/menu/index.ts

@@ -0,0 +1,3 @@
+export * from './actions/menuAction';
+export * from './models/menuModel';
+export * from './reducers/menuReducer';

src/modules/statistics/index.ts

@@ -0,0 +1,4 @@
+export * from './actions';
+export * from './models';
+export * from './reducers';
+export * from './sagas';

src/redux/reducers/rootReducer.ts

@@ -1,59 +1,48 @@
 // ** Redux Imports
 import { combineReducers } from 'redux';
 import { all, fork } from 'redux-saga/effects';
-import { authReducer } from '../../modules/account/login/reducers/authReducer';
-import { authSaga } from '../../modules/account/login/sagas/authSaga';
-import { accountReducer } from '../../modules/account/register/reducers/accountReducer';
-import { accountSaga } from '../../modules/account/register/sagas/accountSaga';
-import { analysisHistoryReducer } from '../../modules/analysis/history/reducers/analysisHitoryReducer';
-import { analysisHistorySaga } from '../../modules/analysis/history/sagas/analysisHistorySaga';
-import { analysisSimulatorReducer } from '../../modules/analysis/simulation/reducers/analysisSimulatorReducer';
-import { analysisSimulatorSaga } from '../../modules/analysis/simulation/sagas/analysisSimulatorSaga';
-import { dronReducer } from '../../modules/basis/dron/reducers/basisDronReducer';
-import { dronSaga } from '../../modules/basis/dron/sagas/basisDronSaga';
-import { groupReducer } from '../../modules/basis/group/reducers/basisGroupReducer';
-import { basGroupSaga } from '../../modules/basis/group/sagas/basisGroupSaga';
-import { messageReducer } from '../../modules/comn/message/reducers/comnMessageReducer';
+
+// ** Reducers, Sagas Imports
+import auth from './auth';
+import layout from './layout';
+import navbar from './navbar';
+import { loadingReducer } from './loading';
+
+import { findSaga, findAccountReducer } from '../../modules/account/find';
 import {
+  authSaga,
+  authReducer,
   mypageReducer,
   userPwReducer
-} from '../../modules/account/login/reducers/authReducer';
-import { findSaga } from '../../modules/account/find/sagas/findSaga';
-import { findAccountReducer } from '../../modules/account/find/reducers/findReducer';
-
+} from '../../modules/account/login';
+import { accountSaga, accountReducer } from '../../modules/account/register';
+import {
+  analysisHistorySaga,
+  analysisHistoryReducer
+} from '../../modules/analysis/history';
+import {
+  analysisSimulatorSaga,
+  analysisSimulatorReducer
+} from '../../modules/analysis/simulation';
+import { dronSaga, dronReducer } from '../../modules/basis/dron';
+import { basGroupSaga, groupReducer } from '../../modules/basis/group';
+import { messageReducer } from '../../modules/comn/message';
 import {
   controlGpDtlReducer,
   controlGpHisReducer,
   controlGpReducer,
-  // controlGroupAuthReducer,
   controlGpFltPlanReducer,
   controlGpSaga,
-  ControlGpState,
   controlGpLogReducer,
   controlGpCountReducer
 } from '../../modules/control/gp';
-import controlMapReducer from '../../modules/control/map/reducers/controlMapReducer';
-import { mainDahReducer } from '../../modules/main/dash/reducers/mainDashReducer';
-import { mainDashSaga } from '../../modules/main/dash/sagas/mainDashSaga';
-import { menuReducer } from '../../modules/menu/reducers/menuReducer';
-// ** Reducers Imports
-import auth from './auth';
-import layout from './layout';
-import navbar from './navbar';
-import { loadingReducer } from './loading';
-
-import { laancSaga } from '../../modules/laanc/sagas/laancSagas';
-import laancReducer from '../../modules/laanc/reducers/laancReducers';
-import { faqSaga } from '../../modules/cstmrService/faq/sagas';
-import { faqReducer } from '../../modules/cstmrService/faq/reducers';
-import { qnaSaga } from '../../modules/cstmrService/inquiry/sagas';
-import { qnaReducer } from '../../modules/cstmrService/inquiry/reducers';
-import { statisticsSaga } from '../../modules/statistics/sagas';
-import { statisticsReducer } from '../../modules/statistics/reducers';
-
-export interface StoreState {
-  controlGpState: ControlGpState;
-}
+import { controlMapReducer } from '../../modules/control/map';
+import { faqSaga, faqReducer } from '../../modules/cstmrService/faq';
+import { qnaSaga, qnaReducer } from '../../modules/cstmrService/inquiry';
+import { laancSaga, laancReducer } from '../../modules/laanc';
+import { mainDashSaga, mainDahReducer } from '../../modules/main/dash';
+import { menuReducer } from '../../modules/menu';
+import { statisticsSaga, statisticsReducer } from '../../modules/statistics';
 
 export function* saga() {
   yield all([fork(mainDashSaga)]);
@@ -91,7 +80,6 @@ const rootReducer = combineReducers({
   controlGpLogState: controlGpLogReducer,
   controlGpDtlState: controlGpDtlReducer,
   controlGpCountState: controlGpCountReducer,
-  // controlGroupAuthState: controlGroupAuthReducer,
   controlGpFltPlanState: controlGpFltPlanReducer,
   menuState: menuReducer,
   analysisHistoryState: analysisHistoryReducer,

src/redux/storeConfig/store.ts

@@ -8,11 +8,7 @@ import createSagaMiddleware from 'redux-saga';
 // ** init middleware
 
 export const sagaMiddleware = createSagaMiddleware();
-const middlewares = [sagaMiddleware, createDebounce() , thunk]
-
-
-
-// const middleware = [thunk, createDebounce()];
+const middlewares = [sagaMiddleware, createDebounce(), thunk];
 
 // ** Dev Tools
 declare global {
@@ -23,7 +19,6 @@ declare global {
 
 const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
 
-
 // ** Create store
 const store = createStore(
   rootReducer,