diff --git a/src/entities/alarm/ui/login-type-bottom-sheet.tsx b/src/entities/alarm/ui/login-type-bottom-sheet.tsx
index 7e86643..c9d2da4 100644
--- a/src/entities/alarm/ui/login-type-bottom-sheet.tsx
+++ b/src/entities/alarm/ui/login-type-bottom-sheet.tsx
@@ -1,3 +1,4 @@
+import { APP_LOGIN_TYPE } from "@/entities/common/model/constant";
import { LoginType } from "@/entities/common/model/types";
import { IMAGE_ROOT } from "@/shared/constants/common";
@@ -47,17 +48,17 @@ export const LoginTypeBottomSheet = ({
- onChangeLoginType(LoginType['Id/Pw']) }
- >ID/PW 입력
+ className={ `${(loginType === LoginType.ID)? 'selected': ''}` }
+ onClick={ () => onChangeLoginType(LoginType.ID) }
+ >{ APP_LOGIN_TYPE[LoginType.ID] }
- onChangeLoginType(LoginType.Finger) }
- >지문 인증
+ className={ `${(loginType === LoginType.FINGER)? 'selected': ''}` }
+ onClick={ () => onChangeLoginType(LoginType.FINGER) }
+ >{ APP_LOGIN_TYPE[LoginType.FINGER] }
- onChangeLoginType(LoginType.Face) }
- >안면 인증
+ className={ `${(loginType === LoginType.FACE)? 'selected': ''}` }
+ onClick={ () => onChangeLoginType(LoginType.FACE) }
+ >{ APP_LOGIN_TYPE[LoginType.FACE] }
diff --git a/src/entities/alarm/ui/service-language-bottom-sheet.tsx b/src/entities/alarm/ui/service-language-bottom-sheet.tsx
index f3fc614..692ac9f 100644
--- a/src/entities/alarm/ui/service-language-bottom-sheet.tsx
+++ b/src/entities/alarm/ui/service-language-bottom-sheet.tsx
@@ -1,3 +1,4 @@
+import { APP_LANGUAGE } from "@/entities/common/model/constant";
import { AppLanguage } from "@/entities/common/model/types";
import { IMAGE_ROOT } from "@/shared/constants/common";
@@ -50,15 +51,15 @@ export const ServiceLanguageBottomSheet = ({
onChangeServiceLanguage(AppLanguage.DEVICE) }
- >기기 설정 언어
+ >{ APP_LANGUAGE[AppLanguage.DEVICE] }
onChangeServiceLanguage(AppLanguage.KO) }
- >한국어
+ >{ APP_LANGUAGE[AppLanguage.KO] }
onChangeServiceLanguage(AppLanguage.EN)
- }>ENGLISH
+ }>{ APP_LANGUAGE[AppLanguage.EN] }
diff --git a/src/entities/common/model/constant.ts b/src/entities/common/model/constant.ts
index 21742f7..f5fa7ec 100644
--- a/src/entities/common/model/constant.ts
+++ b/src/entities/common/model/constant.ts
@@ -1,6 +1,16 @@
import { PATHS } from "@/shared/constants/paths";
import { SortTypeKeys } from "./types";
+export const APP_LANGUAGE = {
+ DEVICE: '기기 설정 언어',
+ KO: '한국어',
+ EN: 'ENGLISH',
+};
+export const APP_LOGIN_TYPE = {
+ ID: 'ID/PW 입력',
+ FINGER: '지문 인증',
+ FACE: '안면 인증'
+};
export const DEFAULT_PAGE_PARAM = {
cursor: null,
size: 20,
diff --git a/src/entities/common/model/types.ts b/src/entities/common/model/types.ts
index 300e7ce..d7eed7e 100644
--- a/src/entities/common/model/types.ts
+++ b/src/entities/common/model/types.ts
@@ -1,12 +1,12 @@
export enum AppLanguage {
- 'DEVICE' = 'DEVICE',
- 'KO' = 'KO',
- 'EN' = 'EN'
+ DEVICE = 'DEVICE',
+ KO = 'KO',
+ EN = 'EN'
};
export enum LoginType {
- 'Id/Pw' = 'Id/Pw',
- 'Finger' = 'Finger',
- 'Face' = 'Face'
+ ID = 'ID',
+ FINGER = 'FINGER',
+ FACE = 'FACE'
};
export enum SuccessResult {
SUCCESS = 'SUCCESS',
diff --git a/src/pages/setting/setting-page.tsx b/src/pages/setting/setting-page.tsx
index 036269b..0acdf24 100644
--- a/src/pages/setting/setting-page.tsx
+++ b/src/pages/setting/setting-page.tsx
@@ -3,6 +3,7 @@ import { useAppAlarmFindMutation } from '@/entities/alarm/api/use-app-alarm-find
import { AppAlarmConsentParams, AppAlarmConsentResponse, AppAlarmFindParams, AppAlarmFindResponse, MERCHANT_ADMIN_APP } from '@/entities/alarm/model/types';
import { LoginTypeBottomSheet } from '@/entities/alarm/ui/login-type-bottom-sheet';
import { ServiceLanguageBottomSheet } from '@/entities/alarm/ui/service-language-bottom-sheet';
+import { APP_LANGUAGE, APP_LOGIN_TYPE } from '@/entities/common/model/constant';
import { AppLanguage, HeaderType, LoginType } from '@/entities/common/model/types';
import { useStore } from '@/shared/model/store';
import {
@@ -20,7 +21,7 @@ export const SettingPage = () => {
const [loginTypeBottomSheetOn, setLoginTypeBottomSheetOn] = useState(false);
const [serviceLanguageBottomSheetOn, setServiceLanguageBottomSheetOn] = useState(false);
- const [loginType, setLoginType] = useState(LoginType['Id/Pw']);
+ const [loginType, setLoginType] = useState(LoginType.ID);
const [appLanguage, setAppLanguage] = useState(AppLanguage.KO);
const {mutateAsync: appAlarmFind} = useAppAlarmFindMutation();
@@ -198,7 +199,7 @@ export const SettingPage = () => {
onClick={ () => setLoginTypeBottomSheetOn(true) }
>
로그인 방식 설정
- { loginType }
+ { APP_LOGIN_TYPE[loginType] }
{
onClick={ () => setServiceLanguageBottomSheetOn(true) }
>
서비스 언어 설정
-
{ appLanguage }
+
{ APP_LANGUAGE[appLanguage] }
@@ -215,7 +216,7 @@ export const SettingPage = () => {
로그아웃
-
+
{
textAlign: 'center',
padding: '12px'
}}
- >
- 개인정보처리방침
-
+ >개인정보처리방침