From f3d028da85b63e927b13bc7330004a803dcae697 Mon Sep 17 00:00:00 2001 From: "focp212@naver.com" Date: Tue, 30 Sep 2025 11:37:35 +0900 Subject: [PATCH] =?UTF-8?q?MId=20=EC=85=8B=ED=8C=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../filter/account-holder-auth-filter.tsx | 8 +- .../filter/account-holder-search-filter.tsx | 12 +- .../ui/filter/alimtalk-filter.tsx | 11 +- .../ui/filter/ars-filter.tsx | 11 +- .../ui/filter/fund-account-result-filter.tsx | 9 +- .../fund-account-trnasaction-filter.tsx | 9 +- .../ui/filter/payout-filter.tsx | 9 +- .../filter/key-in-payment-filter.tsx | 10 +- .../filter/link-payment-history-filter.tsx | 10 +- .../link-payment-pending-send-filter.tsx | 10 +- .../ui/sms-payment/sms-payment-filter.tsx | 20 +- src/entities/home/model/types.ts | 2 +- .../settlement/ui/filter/list-filter.tsx | 9 +- src/entities/transaction/ui/filter.tsx | 179 ------------------ .../ui/filter/all-transaction-filter.tsx | 11 +- .../transaction/ui/filter/billing-filter.tsx | 9 +- .../ui/filter/cash-receipt-filter.tsx | 10 +- .../transaction/ui/filter/escrow-filter.tsx | 8 +- src/entities/user/lib/use-user-info.ts | 18 +- src/entities/user/model/store.ts | 42 +++- .../vat-return/ui/filter/list-filter.tsx | 9 +- src/entities/vat-return/ui/reference-wrap.tsx | 9 +- src/pages/home/home-page.tsx | 40 +++- src/shared/constants/local-storage.ts | 4 +- 24 files changed, 164 insertions(+), 305 deletions(-) delete mode 100644 src/entities/transaction/ui/filter.tsx diff --git a/src/entities/additional-service/ui/account-holder-auth/filter/account-holder-auth-filter.tsx b/src/entities/additional-service/ui/account-holder-auth/filter/account-holder-auth-filter.tsx index b7829c5..07aa230 100644 --- a/src/entities/additional-service/ui/account-holder-auth/filter/account-holder-auth-filter.tsx +++ b/src/entities/additional-service/ui/account-holder-auth/filter/account-holder-auth-filter.tsx @@ -8,6 +8,7 @@ import { FilterButtonGroups } from '@/shared/ui/filter/button-groups'; import { AccountHolderAuthFilterProps, AuthAndTransferStatus } from '@/entities/additional-service/model/types'; import { authStatusBtnGroup } from '@/entities/additional-service/model/account-holder-auth/constant'; import { FilterMotionDuration, FilterMotionStyle, FilterMotionVariants } from '@/entities/common/model/constant'; +import { useStore } from '@/shared/model/store'; export const AccountHolderAuthFilter = ({ filterOn, @@ -27,10 +28,7 @@ export const AccountHolderAuthFilter = ({ const [filterEndDate, setFilterEndDate] = useState(moment(endDate).format('YYYY.MM.DD')); const [filterAuthStatus, setFilterAuthStatus] = useState(authStatus); - let MidOptions = [ - { name: 'nictest00m', value: 'nictest00m' }, - { name: 'nictest002m', value: 'nictest002m' } - ]; + const midOptions = useStore.getState().UserStore.selectOptionsMids; const onClickToClose = () => { setFilterOn(false); @@ -76,7 +74,7 @@ export const AccountHolderAuthFilter = ({ title='가맹점' selectValue={mid} selectSetter={setMid} - selectOptions={MidOptions} + selectOptions={midOptions} > (bank) const [filterProcessResult, setFilterProcessResult] = useState(processResult); + const midOptions = useStore.getState().UserStore.selectOptionsMids; + const onClickToClose = () => { setFilterOn(false); }; @@ -59,12 +62,7 @@ export const AccountHolderSearchFilter = ({ setProcessResult(filterProcessResult); onClickToClose(); }; - - let MidOptions = [ - { name: 'nictest00m', value: 'nictest00m' }, - { name: 'nictest002m', value: 'nictest002m' } - ]; - + let bankOptions = [ { name: '우리은행', value: '우리은행' }, { name: '토스뱅킹', value: '토스뱅킹' } @@ -113,7 +111,7 @@ export const AccountHolderSearchFilter = ({ title='가맹점' selectValue={mid} selectSetter={setMid} - selectOptions={MidOptions} + selectOptions={midOptions} > (minAmount); const [filterMaxAmount, setFilterMaxAmount] = useState(maxAmount); + const midOptions = useStore.getState().UserStore.selectOptionsMids; + const onClickToClose = () => { setFilterOn(false); }; @@ -81,11 +84,7 @@ export const AlimtalkFilter = ({ setMaxAmount(filterMaxAmount); onClickToClose(); }; - - let MidOptions = [ - {name: 'nictest00m', value: 'nictest00m'} - ]; - + useEffect(() => { setFilterPaymentStatus(paymentStatus); }, [paymentStatus]); @@ -121,7 +120,7 @@ export const AlimtalkFilter = ({ title='가맹점' selectValue={ filterMid } selectSetter={ setFilterMid } - selectOptions={ MidOptions } + selectOptions={ midOptions } > (minAmount); const [filterMaxAmount, setFilterMaxAmount] = useState(maxAmount); + const midOptions = useStore.getState().UserStore.selectOptionsMids; + const onClickToClose = () => { setFilterOn(false); }; @@ -81,11 +84,7 @@ export const ArsFilter = ({ setMaxAmount(filterMaxAmount); onClickToClose(); }; - - let MidOptions = [ - {name: 'nictest00m', value: 'nictest00m'} - ]; - + useEffect(() => { setFilterPaymentStatus(paymentStatus); }, [paymentStatus]); @@ -121,7 +120,7 @@ export const ArsFilter = ({ title='가맹점' selectValue={ filterMid } selectSetter={ setFilterMid } - selectOptions={ MidOptions } + selectOptions={ midOptions } > (''); + + const midOptions = useStore.getState().UserStore.selectOptionsMids; const onClickToClose = () => { setFilterOn(false); @@ -90,10 +93,6 @@ export const FundAccountResultFilter = ({ onClickToClose(); }; - let MidOptions = [ - {name: 'nictest00m', value: 'nictest00m'} - ]; - useEffect(() => { setFilterStatus(status); }, [status]); @@ -129,7 +128,7 @@ export const FundAccountResultFilter = ({ title='가맹점' selectValue={ filterMid } selectSetter={ setFilterMid } - selectOptions={ MidOptions } + selectOptions={ midOptions } > (''); + const midOptions = useStore.getState().UserStore.selectOptionsMids; + const onClickToClose = () => { setFilterOn(false); }; @@ -85,10 +88,6 @@ export const FundAccountTransactionFilter = ({ onClickToClose(); }; - let MidOptions = [ - {name: 'nictest00m', value: 'nictest00m'} - ]; - useEffect(() => { setFilterStatus(status); }, [status]); @@ -124,7 +123,7 @@ export const FundAccountTransactionFilter = ({ title='가맹점' selectValue={ filterMid } selectSetter={ setFilterMid } - selectOptions={ MidOptions } + selectOptions={ midOptions } > (minAmount); const [filterMaxAmount, setFilterMaxAmount] = useState(maxAmount); + const midOptions = useStore.getState().UserStore.selectOptionsMids; + const onClickToClose = () => { setFilterOn(false); }; @@ -81,10 +84,6 @@ export const PayoutFilter = ({ onClickToClose(); }; - let MidOptions = [ - {name: 'nictest00m', value: 'nictest00m'} - ]; - useEffect(() => { setFilterDisbursementStatus(disbursementStatus); }, [disbursementStatus]); @@ -120,7 +119,7 @@ export const PayoutFilter = ({ title='가맹점' selectValue={ filterMid } selectSetter={ setFilterMid } - selectOptions={ MidOptions } + selectOptions={ midOptions } > (minAmount); const [filterMaxAmount, setFilterMaxAmount] = useState(maxAmount); + const midOptions = useStore.getState().UserStore.selectOptionsMids; + const onClickToClose = () => { setFilterOn(false); }; @@ -55,10 +58,7 @@ export const KeyInPaymentFilter = ({ setMaxAmount(filterMaxAmount); onClickToClose(); }; - let MidOptions = [ - { name: 'nictest00m', value: 'nictest00m' } - ]; - + let transactionStatusOption = [ { name: '전체', value: KeyInPaymentTransactionStatus.ALL }, { name: '승인', value: KeyInPaymentTransactionStatus.APPROVAL }, @@ -98,7 +98,7 @@ export const KeyInPaymentFilter = ({ title='가맹점' selectValue={filterMid} selectSetter={setMid} - selectOptions={MidOptions} + selectOptions={midOptions} > (FilterDateOptions.Input); const [calendarOpen, setCalendarOpen] = useState(false); + + const midOptions = useStore.getState().UserStore.selectOptionsMids; const onClickToClose = () => { setFilterOn(false); @@ -72,11 +75,6 @@ export const LinkPaymentHistoryFilter = ({ onClickToClose(); }; - let MidOptions = [ - { name: 'nictest00m', value: 'nictest00m' }, - { name: 'nictest002m', value: 'nictest002m' } - ]; - let searchTypeOption = [ { name: '휴대폰번호', value: LinkPaymentSearchType.PHONE }, { name: '이메일', value: LinkPaymentSearchType.EMAIL }, @@ -136,7 +134,7 @@ export const LinkPaymentHistoryFilter = ({ title='가맹점' selectValue={filterMid} selectSetter={setFilterMid} - selectOptions={MidOptions} + selectOptions={midOptions} > (false); + const midOptions = useStore.getState().UserStore.selectOptionsMids; + const onClickToClose = () => { setFilterOn(false); }; @@ -67,11 +70,6 @@ export const LinkPaymentWaitSendFilter = ({ onClickToClose(); }; - let MidOptions = [ - { name: 'nictest00m', value: 'nictest00m' }, - { name: 'nictest002m', value: 'nictest002m' } - ]; - let searchTypeOption = [ { name: '휴대폰번호', value: LinkPaymentSearchType.PHONE }, { name: '이메일', value: LinkPaymentSearchType.EMAIL }, @@ -122,7 +120,7 @@ export const LinkPaymentWaitSendFilter = ({ title='가맹점' selectValue={mid} selectSetter={setFilterMid} - selectOptions={MidOptions} + selectOptions={midOptions} > (moment(fromDate).format('YYYY.MM.DD')); const [filterToDate, setFilterToDate] = useState(moment(toDate).format('YYYY.MM.DD')); const [filterSmsCl, setFilterSmsCl] = useState(smsCl); - - const variants = { - hidden: { x: '100%' }, - visible: { x: '0%' }, - }; + + const midOptions = useStore.getState().UserStore.selectOptionsMids; const onClickToSetFilter = () => { setMid(filterMid); @@ -73,12 +72,9 @@ export const SmsPaymentFilter = ({ className="full-menu-modal" initial="hidden" animate={(filterOn) ? 'visible' : 'hidden'} - variants={variants} - transition={{ duration: 0.3 }} - style={{ - width: '100%', - height: '100%', - }} + variants={ FilterMotionVariants } + transition={ FilterMotionDuration } + style={ FilterMotionStyle } >
@@ -102,7 +98,7 @@ export const SmsPaymentFilter = ({ title='가맹점' selectValue={mid} selectSetter={setMid} - selectOptions={MidOptions} + selectOptions={midOptions} > ; diff --git a/src/entities/settlement/ui/filter/list-filter.tsx b/src/entities/settlement/ui/filter/list-filter.tsx index ed85765..b04cc3e 100644 --- a/src/entities/settlement/ui/filter/list-filter.tsx +++ b/src/entities/settlement/ui/filter/list-filter.tsx @@ -1,6 +1,7 @@ import { useEffect, useState } from 'react'; import { motion } from 'framer-motion'; import { IMAGE_ROOT } from '@/shared/constants/common'; +import { useStore } from '@/shared/model/store'; import { SettlementPaymentMethod, SettlementPeriodType @@ -51,6 +52,8 @@ export const ListFilter = ({ const [filterEndDate, setFilterEndDate] = useState(endDate); const [filterPaymentMethod, setFilterPaymentMethod] = useState(paymentMethod); + const midOptions = useStore.getState().UserStore.selectOptionsMids; + const onClickToClose = () => { setFilterOn(false); }; @@ -64,10 +67,6 @@ export const ListFilter = ({ onClickToClose(); }; - let MidOptions = [ - {name: 'nictest00m', value: 'nictest00m'} - ]; - useEffect(() => { setFilterPeriodType(periodType); }, [periodType]); @@ -103,7 +102,7 @@ export const ListFilter = ({ title='가맹점' selectValue={ filterMid } selectSetter={ setFilterMid } - selectOptions={ MidOptions } + selectOptions={ midOptions } > { - - const onClickToClose = () => { - setFilterOn(false); - }; - return ( - <> - -
-
-
필터
-
- -
-
- -
-
-
가맹점
-
- -
-
- -
-
주문번호/ID
-
- - -
-
- -
-
조회기간
-
-
- 당일 - 일주일 - 1개월 - 직접입력 -
-
-
- - -
- ~ -
- - -
-
-
-
- -
-
요청상태
-
-
- 전체 - 진행중 - 성공 - 요청취소 -
-
-
- -
-
저리결과
-
-
- 전체 - 성공 - 실패 - -
-
-
- -
-
결제수단
-
- -
-
- -
-
거래금액
-
-
- -
- ~ -
- -
-
-
-
-
- -
-
- - - ); -}; \ No newline at end of file diff --git a/src/entities/transaction/ui/filter/all-transaction-filter.tsx b/src/entities/transaction/ui/filter/all-transaction-filter.tsx index a8c5636..53b5eb6 100644 --- a/src/entities/transaction/ui/filter/all-transaction-filter.tsx +++ b/src/entities/transaction/ui/filter/all-transaction-filter.tsx @@ -25,6 +25,7 @@ import { FilterMotionStyle, FilterMotionVariants } from '@/entities/common/model/constant'; +import { useStore } from '@/shared/model/store'; export const AllTransactionFilter = ({ filterOn, @@ -74,6 +75,9 @@ export const AllTransactionFilter = ({ const [filterSearchValue, setFilterSearchValue] = useState(searchValue); const [searchClOptionsGroup, setSearchClOptionsGroup] = useState>>([]); + + const midOptions = useStore.getState().UserStore.selectOptionsMids; + const onClickToClose = () => { setFilterOn(false); }; @@ -105,10 +109,7 @@ export const AllTransactionFilter = ({ setSearchValue(filterSearchValue); onClickToClose(); }; - let MidOptions = [ - {name: 'nictest00m', value: 'nictest00m'} - ]; - + let setSearchClOptions = (value: AllTransactionServiceCode) => { let options = []; setFilterServiceCode(value); @@ -185,7 +186,7 @@ export const AllTransactionFilter = ({ title='가맹점' selectValue={ filterMid } selectSetter={ setMid } - selectOptions={ MidOptions } + selectOptions={ midOptions } > (minAmount); const [filterMaxAmount, setFilterMaxAmount] = useState(maxAmount); + const midOptions = useStore.getState().UserStore.selectOptionsMids; + const onClickToClose = () => { setFilterOn(false); }; @@ -83,11 +86,7 @@ export const BillingFilter = ({ setMaxAmount(filterMaxAmount); onClickToClose(); }; - let MidOptions = [ - {name: 'nictest00m', value: 'nictest00m'} - ]; - useEffect(() => { setFilterRequestStatus(requestStatus); }, [requestStatus]); @@ -124,7 +123,7 @@ export const BillingFilter = ({ title='가맹점' selectValue={ filterMid } selectSetter={ setFilterMid } - selectOptions={ MidOptions } + selectOptions={ midOptions } > { setFilterOn(false); }; @@ -71,10 +74,7 @@ export const CashReceiptFilter = ({ setProcessResult(filterProcessResult); onClickToClose(); }; - let MidOptions = [ - {name: 'nictest00m', value: 'nictest00m'} - ]; - + useEffect(() => { setFilterIssueStatus(issueStatus); }, [issueStatus]); @@ -111,7 +111,7 @@ export const CashReceiptFilter = ({ title='가맹점' selectValue={ filterMid } selectSetter={ setMid } - selectOptions={ MidOptions } + selectOptions={ midOptions } > (minAmount); const [filterMaxAmount, setFilterMaxAmount] = useState(maxAmount); + const midOptions = useStore.getState().UserStore.selectOptionsMids; + const onClickToClose = () => { setFilterOn(false); }; @@ -77,9 +80,6 @@ export const EscrowFilter = ({ setMaxAmount(filterMaxAmount); onClickToClose(); }; - let MidOptions = [ - {name: 'nictest00m', value: 'nictest00m'} - ]; useEffect(() => { setFilterDeliveryStatus(deliveryStatus); @@ -117,7 +117,7 @@ export const EscrowFilter = ({ title='가맹점' selectValue={ filterMid } selectSetter={ setMid } - selectOptions={ MidOptions } + selectOptions={ midOptions } > { accessTokenExpiresIn, refreshTokenExpiresIn, menuGrants, - // usrid, - // clientAddressIP, - // requires2FA + clientAddressIP, + requires2FA } = result; setLocalStorage(StorageKeys.TokenType, tokenType); setLocalStorage(StorageKeys.AccessToken, accessToken); @@ -33,11 +32,14 @@ export const useUserInfo = () => { setLocalStorage(StorageKeys.AccessTokenExpiresIn, accessTokenExpiresIn); setLocalStorage(StorageKeys.RefreshTokenExpiresIn, refreshTokenExpiresIn); setLocalStorage(StorageKeys.MenuGrants, menuGrants); - // setLocalStorage(StorageKeys.Usrid, usrid); - // setLocalStorage(StorageKeys.ClientAddressIP, clientAddressIP); - // setLocalStorage(StorageKeys.Requires2FA, requires2FA); - console.log(result) - useStore.getState().UserStore.setUserInfo(result); + setLocalStorage(StorageKeys.Usrid, params.id); + setLocalStorage(StorageKeys.ClientAddressIP, clientAddressIP); + setLocalStorage(StorageKeys.Requires2FA, requires2FA); + + useStore.getState().UserStore.setUserInfo({ + ...result, + usrid: params.id + }); } } catch(e: any){ diff --git a/src/entities/user/model/store.ts b/src/entities/user/model/store.ts index 80266fd..ef4a4ca 100644 --- a/src/entities/user/model/store.ts +++ b/src/entities/user/model/store.ts @@ -9,11 +9,17 @@ export interface UserInfoState { resetUserInfo: () => void; userFavorite: Array; setUserFavorite: (update: SetStateAction>) => void; + userMids: Array; + setUserMids: (update: SetStateAction>) => void; + selectOptionsMids: Array>; + setSelectOptionsMids: (update: SetStateAction>>) => void; }; const initialUserInfoState = { userInfo: {} as UserInfo, - userFavorite: [] as Array + userFavorite: [] as Array, + userMids: [] as Array, + selectOptionsMids: [] as Array> } as UserInfoState; export const createUserInfoStore = lens((set, get) => ({ @@ -39,8 +45,8 @@ export const createUserInfoStore = lens((set, get) => ({ window.localStorage.removeItem(StorageKeys.RefreshTokenExpiresIn); window.localStorage.removeItem(StorageKeys.MenuGrants); window.localStorage.removeItem(StorageKeys.Usrid); - // window.localStorage.removeItem(StorageKeys.ClientAddressIP); - // window.localStorage.removeItem(StorageKeys.Requires2FA); + window.localStorage.removeItem(StorageKeys.ClientAddressIP); + window.localStorage.removeItem(StorageKeys.Requires2FA); set(initialUserInfoState); }, setUserFavorite: (update) => { @@ -49,10 +55,36 @@ export const createUserInfoStore = lens((set, get) => ({ ? update(state.userFavorite): update; return { ...state, - userFavorite: { + userFavorite: [ ...state.userFavorite, ...newUserFavorite - }, + ], + }; + }); + }, + setUserMids: (update) => { + set((state: UserInfoState) => { + const newUserMids = (typeof update === 'function') + ? update(state.userMids): update; + return { + ...state, + userMids: [ + ...state.userMids, + ...newUserMids + ], + }; + }); + }, + setSelectOptionsMids: (update) => { + set((state: UserInfoState) => { + const newSelectOptionsMids = (typeof update === 'function') + ? update(state.selectOptionsMids): update; + return { + ...state, + selectOptionsMids: [ + ...state.selectOptionsMids, + ...newSelectOptionsMids + ], }; }); }, diff --git a/src/entities/vat-return/ui/filter/list-filter.tsx b/src/entities/vat-return/ui/filter/list-filter.tsx index 9d76432..9a7432b 100644 --- a/src/entities/vat-return/ui/filter/list-filter.tsx +++ b/src/entities/vat-return/ui/filter/list-filter.tsx @@ -7,6 +7,7 @@ import { useState } from 'react'; import { FilterButtonGroups } from '@/shared/ui/filter/button-groups'; import { VatReturnReceiptTypeBtnGroup, VatReturnTargetTypeBtnGroup } from '../../model/contant'; import { FilterCalendarMonth } from '@/shared/ui/filter/calendar-month'; +import { useStore } from '@/shared/model/store'; export interface ListFilterProps { filterOn: boolean; @@ -44,6 +45,8 @@ export const ListFilter = ({ const [filterReceiptType, setFIlterReceiptType] = useState(receiptType); const [filterTargetType, setFilterTargetType] = useState(targetType); + const midOptions = useStore.getState().UserStore.selectOptionsMids; + const onClickToClose = () => { setFilterOn(false); }; @@ -56,10 +59,6 @@ export const ListFilter = ({ setTargetType(filterTargetType); onClickToClose(); }; - - let MidOptions = [ - {name: 'nictest00m', value: 'nictest00m'} - ]; return ( <> @@ -92,7 +91,7 @@ export const ListFilter = ({ title='가맹점' selectValue={ filterMid } selectSetter={ setFilterMid } - selectOptions={ MidOptions } + selectOptions={ midOptions } > { @@ -20,10 +21,8 @@ export const ReferenceWrap = () => { const [payTax, setPayTax] = useState(VatReturnPayTax.Tax); const [email, setEmail] = useState(''); - let MidOptions = [ - {name: 'nictest00m', value: 'nictest00m'} - ]; - + const midOptions = useStore.getState().UserStore.selectOptionsMids; + let EmailOptions = [ {name: 'focp212@naver.com', value: 'focp212@naver.com'} ]; @@ -44,7 +43,7 @@ export const ReferenceWrap = () => { title='가맹점' selectValue={ mid } selectSetter={ setMid } - selectOptions={ MidOptions } + selectOptions={ midOptions } > { const { callLogin } = useUserInfo(); @@ -42,16 +44,35 @@ export const HomePage = () => { const [authRegisterOn, setAuthRegisterOn] = useState(false); const [loginSuccess, setLoginSuccess] = useState(false); + const { mutateAsync: homeGroups } = useHomeGroupsMutation(); - - + const callHomeGroups = () => { + let userInfo = useStore.getState().UserStore.userInfo; + let params: HomeGroupsParams = { + userid: userInfo.usrid + }; + homeGroups(params).then((rs: HomeGroupsResponse) => { + useStore.getState().UserStore.setUserMids(rs.mids); + let options: Array> = rs.mids.map((value, index) => { + return { + name: value, + value: value + }; + }); + useStore.getState().UserStore.setSelectOptionsMids(options); + }); + }; /* const userParmas = { id: 'thenaun12', password: 'answjddl1!' }; */ - + const userParmas = { + id: 'nictest00', + password: 'nictest00' + }; + const handleRequestToken = useCallback(async () =>{ console.log('handleRequestToken'); alert('handleRequestToken'); @@ -74,15 +95,19 @@ export const HomePage = () => { setLocalStorage(StorageKeys.AccessTokenExpiresIn, token.accessTokenExpiresIn); setLocalStorage(StorageKeys.RefreshTokenExpiresIn, token.refreshTokenExpiresIn); setLocalStorage(StorageKeys.MenuGrants, token.menuGrants); + setLocalStorage(StorageKeys.ClientAddressIP, token.clientAddressIP); + setLocalStorage(StorageKeys.Requires2FA, token.requires2FA); useStore.getState().UserStore.setUserInfo({ - usrid: token.usrid, + usrid: userParmas.id, tokenType: token.tokenType, accessToken: token.accessToken, refreshToken: token.refreshToken, accessTokenExpiresIn: token.accessTokenExpiresIn, refreshTokenExpiresIn: token.refreshTokenExpiresIn, menuGrants: token.menuGrants, + clientAddressIP: token.clientAddressIP, + requires2FA: token.requires2FA, }); setLoginSuccess(true); @@ -97,10 +122,7 @@ export const HomePage = () => { }, []); - const userParmas = { - id: 'nictest00', - password: 'nictest00' - }; + const handleLogin = useCallback(async () =>{ //let appStart = getLocalStorage(StorageKeys.AppStart); @@ -125,10 +147,12 @@ export const HomePage = () => { // usrid: usrid }); setLoginSuccess(true); + callHomeGroups(); } else{ callLogin(userParmas).then(() => { setLoginSuccess(true); + callHomeGroups(); }); } diff --git a/src/shared/constants/local-storage.ts b/src/shared/constants/local-storage.ts index 78b62ab..dc44820 100644 --- a/src/shared/constants/local-storage.ts +++ b/src/shared/constants/local-storage.ts @@ -7,8 +7,8 @@ export enum StorageKeys { RefreshTokenExpiresIn = 'REFRESH_TOKEN_EXPIRES_IN', MenuGrants = 'MENU_GRANTS', Usrid = 'USRID', - // ClientAddressIP = 'ClIENT_ADDRESS_IP', - // Requires2FA = 'REQUIRES_2FA', + ClientAddressIP = 'ClIENT_ADDRESS_IP', + Requires2FA = 'REQUIRES_2FA', BottomBannerClose = 'BOTTOM_BANNER_CLOSE', RootStore = 'ROOT_STORE',