From 5f259160f300abcc1d0736072ab43725af8c0fe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?= Date: Mon, 5 Feb 2024 14:48:16 +0900 Subject: [PATCH] =?UTF-8?q?[Redux]=20/account/find=20=EB=84=A4=EC=9D=B4?= =?UTF-8?q?=EB=B0=8D=20=EA=B7=9C=EC=B9=99=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/find/AccountFindPassword.js | 4 +- .../account/find/AccountFindUserId.js | 6 +-- src/modules/account/find/actions/index.ts | 16 ++++---- src/modules/account/find/reducers/index.ts | 31 +++++++-------- src/modules/account/find/sagas/index.ts | 38 +++++++++---------- src/redux/reducers/rootReducer.ts | 4 +- 6 files changed, 47 insertions(+), 52 deletions(-) diff --git a/src/components/account/find/AccountFindPassword.js b/src/components/account/find/AccountFindPassword.js index d91074f7..ee01b451 100644 --- a/src/components/account/find/AccountFindPassword.js +++ b/src/components/account/find/AccountFindPassword.js @@ -17,7 +17,7 @@ import { import { User, Lock } from 'react-feather'; import '../../../assets/css/custom.css'; import { accountAPI } from '../../../modules/account/register'; -import { findAPI, updatePwAction } from '../../../modules/account/find'; +import { findAPI, updateUserPw } from '../../../modules/account/find'; export const AccountFindPassword = props => { const dispatch = useDispatch(); @@ -259,7 +259,7 @@ export const AccountFindPassword = props => { if (inputNewPw === inputNewPwCk && inputNewPw && inputNewPwCk) { dispatch( - updatePwAction.request({ + updateUserPw.request({ userId: inputId, hpno: inputHpno, newPw: inputNewPw diff --git a/src/components/account/find/AccountFindUserId.js b/src/components/account/find/AccountFindUserId.js index d51a1487..3e4a2dd7 100644 --- a/src/components/account/find/AccountFindUserId.js +++ b/src/components/account/find/AccountFindUserId.js @@ -18,7 +18,7 @@ import { User } from 'react-feather'; import '../../../assets/css/custom.css'; import { accountAPI } from '../../../modules/account/register'; -import { findAPI, findUserIdAction } from '../../../modules/account/find'; +import { findAPI, findUserId } from '../../../modules/account/find'; export const AccountFindUserId = props => { const dispatch = useDispatch(); @@ -258,9 +258,7 @@ export const AccountFindUserId = props => { //모든 인증 완료 후 확인버튼 const handlerFindId = () => { - dispatch( - findUserIdAction.request({ memberName: inputName, hpno: inputHpno }) - ); + dispatch(findUserId.request({ memberName: inputName, hpno: inputHpno })); setConfirmModal(!confirmModal); }; diff --git a/src/modules/account/find/actions/index.ts b/src/modules/account/find/actions/index.ts index f0377c49..8b5a6698 100644 --- a/src/modules/account/find/actions/index.ts +++ b/src/modules/account/find/actions/index.ts @@ -21,35 +21,35 @@ const UPDATE_USERPW_REQUEST = 'find/UPDATE_USERPW_REQUEST'; const UPDATE_USERPW_SUCCESS = 'find/UPDATE_USERPW_SUCCESS'; const UPDATE_USERPW_FAILURE = 'find/UPDATE_USERPW_FAILURE'; -export const sendForIdAction = createAsyncAction( +export const sendForId = createAsyncAction( SEND_FORID_REQUEST, SEND_FORID_SUCCESS, SEND_FORID_FAILURE )<{ memberName: string; hpno: string }, string, AxiosError>(); -export const findUserIdAction = createAsyncAction( +export const findUserId = createAsyncAction( FIND_USERID_REQUEST, FIND_USERID_SUCCESS, FIND_USERID_FAILURE )<{ memberName: string; hpno: string }, string, AxiosError>(); -export const sendForPwAction = createAsyncAction( +export const sendForPw = createAsyncAction( SEND_FORPW_REQUEST, SEND_FORPW_SUCCESS, SEND_FORPW_FAILURE )<{ userId: string; hpno: string }, string, AxiosError>(); -export const updatePwAction = createAsyncAction( +export const updateUserPw = createAsyncAction( UPDATE_USERPW_REQUEST, UPDATE_USERPW_SUCCESS, UPDATE_USERPW_FAILURE )<{ userId: string; hpno: string; newPw: string }, string, AxiosError>(); const actions = { - sendForIdAction, - findUserIdAction, - sendForPwAction, - updatePwAction + sendForId, + findUserId, + sendForPw, + updateUserPw }; export type FindAction = ActionType; diff --git a/src/modules/account/find/reducers/index.ts b/src/modules/account/find/reducers/index.ts index 0a85fb5d..2ea4aafb 100644 --- a/src/modules/account/find/reducers/index.ts +++ b/src/modules/account/find/reducers/index.ts @@ -4,50 +4,51 @@ import produce from 'immer'; import { createReducer } from 'typesafe-actions'; // action -import { - FindAction, - findUserIdAction, - sendForIdAction, - sendForPwAction, - updatePwAction -} from '../actions'; +import * as Actions from '../actions'; +// import { +// FindAction, +// findUserId, +// sendForId, +// sendForPw, +// updateUserPw +// } from '../actions'; // -export interface findState { +export interface FindState { idResult: string | undefined; userId: string | undefined; pwResult: string | undefined; udResult: string | undefined; } -const initFindState: findState = { +const initFind: FindState = { idResult: undefined, userId: undefined, pwResult: undefined, udResult: undefined }; -export const findAccountReducer = createReducer( - initFindState +export const findReducer = createReducer( + initFind ) - .handleAction(sendForIdAction.success, (state, action) => + .handleAction(Actions.sendForId.success, (state, action) => produce(state, draft => { const data = action.payload; draft.idResult = data; }) ) - .handleAction(findUserIdAction.success, (state, action) => + .handleAction(Actions.findUserId.success, (state, action) => produce(state, draft => { const data = action.payload; draft.userId = data; }) ) - .handleAction(sendForPwAction.success, (state, action) => + .handleAction(Actions.sendForPw.success, (state, action) => produce(state, draft => { const data = action.payload; draft.pwResult = data; }) ) - .handleAction(updatePwAction.success, (state, action) => + .handleAction(Actions.updateUserPw.success, (state, action) => produce(state, draft => { const data = action.payload; draft.udResult = data; diff --git a/src/modules/account/find/sagas/index.ts b/src/modules/account/find/sagas/index.ts index e9b7c991..c153f2d3 100644 --- a/src/modules/account/find/sagas/index.ts +++ b/src/modules/account/find/sagas/index.ts @@ -5,61 +5,57 @@ import { ActionType } from 'typesafe-actions'; import * as Actions from '../actions'; import { findAPI } from '../apis'; -function* sendForIdSaga( - action: ActionType -) { +function* sendForIdSaga(action: ActionType) { try { const { memberName, hpno } = action.payload; const res = yield call(findAPI.sendForId, { memberName, hpno }); - yield put(Actions.sendForIdAction.success(res)); + yield put(Actions.sendForId.success(res)); } catch (error: any) { - yield put(Actions.sendForIdAction.failure(error)); + yield put(Actions.sendForId.failure(error)); } } function* findUserIdSaga( - action: ActionType + action: ActionType ) { try { const { memberName, hpno } = action.payload; const res = yield call(findAPI.getUserId, { memberName, hpno }); - yield put(Actions.findUserIdAction.success(res)); + yield put(Actions.findUserId.success(res)); } catch (error: any) { - yield put(Actions.findUserIdAction.failure(error)); + yield put(Actions.findUserId.failure(error)); } } -function* sendForPwSaga( - action: ActionType -) { +function* sendForPwSaga(action: ActionType) { try { const { userId, hpno } = action.payload; const res = yield call(findAPI.sendForPw, { userId, hpno }); - yield put(Actions.sendForPwAction.success(res)); + yield put(Actions.sendForPw.success(res)); } catch (error: any) { - yield put(Actions.sendForPwAction.failure(error)); + yield put(Actions.sendForPw.failure(error)); } } -function* updatePwSaga( - action: ActionType +function* updateUserPwSaga( + action: ActionType ) { try { const { userId, hpno, newPw } = action.payload; const res = yield call(findAPI.updatePw, { userId, hpno, newPw }); - yield put(Actions.updatePwAction.success(res)); + yield put(Actions.updateUserPw.success(res)); } catch (error: any) { - yield put(Actions.updatePwAction.failure(error)); + yield put(Actions.updateUserPw.failure(error)); } } export function* findSaga() { - yield takeEvery(Actions.sendForIdAction.request, sendForIdSaga); - yield takeEvery(Actions.findUserIdAction.request, findUserIdSaga); - yield takeEvery(Actions.sendForPwAction.request, sendForPwSaga); - yield takeEvery(Actions.updatePwAction.request, updatePwSaga); + yield takeEvery(Actions.sendForId.request, sendForIdSaga); + yield takeEvery(Actions.findUserId.request, findUserIdSaga); + yield takeEvery(Actions.sendForPw.request, sendForPwSaga); + yield takeEvery(Actions.updateUserPw.request, updateUserPwSaga); } diff --git a/src/redux/reducers/rootReducer.ts b/src/redux/reducers/rootReducer.ts index bd38bb0b..0d099998 100644 --- a/src/redux/reducers/rootReducer.ts +++ b/src/redux/reducers/rootReducer.ts @@ -8,7 +8,7 @@ import layout from './layout'; import navbar from './navbar'; import { loadingReducer } from './loading'; -import { findSaga, findAccountReducer } from '../../modules/account/find'; +import { findSaga, findReducer } from '../../modules/account/find'; import { authSaga, authReducer, @@ -83,7 +83,7 @@ const rootReducer = combineReducers({ analysisHistoryState: analysisHistoryReducer, analysisSimulatorState: analysisSimulatorReducer, ControlGpWeatherState: controlGpReducer, - findState: findAccountReducer, + findState: findReducer, faqState: faqReducer, qnaState: qnaReducer, statisticsState: statisticsReducer