Merge branch 'main' into develop

BCSDLab · Apr 10, 2024 · 166f08e · 166f08e
2 parents c89e749 + 646c36c
commit 166f08e
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 7 deletions.
diff --git a/src/page/Auth/Login/index.tsx b/src/page/Auth/Login/index.tsx
@@ -24,7 +24,7 @@ export default function Login() {
   const { login, isError: isServerError } = useLogin();
   const [isFormError, setIsFormError] = useState(false);
   const navigate = useNavigate();
-  const { loginError, loginErrorCode } = useErrorMessageStore();
+  const { loginError, loginErrorStatus } = useErrorMessageStore();
   const [emailError, setEmailError] = useState('');
   const { value: isModalOpen, changeValue: toggle } = useBooleanState(false);
   const isError = isServerError || isFormError;
@@ -134,7 +134,7 @@ export default function Login() {
           </div>
         </form>
       </div>
-      {loginErrorCode === 100005 && isModalOpen && <ApprovalModal toggle={toggle} />}
+      {loginErrorStatus === 403 && isModalOpen && <ApprovalModal toggle={toggle} />}
     </div>
   );
 }
diff --git a/src/page/MyShopPage/components/EditShopInfoModal/index.tsx b/src/page/MyShopPage/components/EditShopInfoModal/index.tsx
@@ -420,7 +420,7 @@ EditShopInfoModalProps) {
             <label htmlFor="deliveryPrice" className={styles['main-info__label']}>
               <span className={styles['main-info__header']}>배달금액</span>
               <input
-                type="text"
+                type="number"
                 id="deliveryPrice"
                 value={deliveryPrice === 0 ? '' : deliveryPrice}
                 onChange={(e) => setDeliveryPrice(Number(e.target.value))}

diff --git a/src/page/ShopRegistration/view/Mobile/Sub/index.tsx b/src/page/ShopRegistration/view/Mobile/Sub/index.tsx
@@ -94,7 +94,7 @@ export default function Sub() {
       >
         배달금액
         <input
-          type="text"
+          type="number"
           id="deliveryPrice"
           onChange={(e) => setDeliveryPrice(Number(e.target.value))}
           value={deliveryPrice}

diff --git a/src/query/auth.ts b/src/query/auth.ts
@@ -33,7 +33,7 @@ export interface ErrorResponse {
 
 export const useLogin = () => {
   const { setUserType } = useUserTypeStore();
-  const { setLoginError, setLoginErrorCode } = useErrorMessageStore();
+  const { setLoginError } = useErrorMessageStore();
 
   const {
     mutate, error, isError, isSuccess,
@@ -67,7 +67,6 @@ export const useLogin = () => {
         }
         sessionStorage.removeItem('access_token');
         localStorage.removeItem('refresh_token');
-        setLoginErrorCode(err.code);
       }
     },
   });

diff --git a/src/store/errorMessageStore.ts b/src/store/errorMessageStore.ts
@@ -13,6 +13,8 @@ interface ErrorMessageStore {
   setLogoutError: (error: string) => void;
   logoutErrorCode: number;
   setLogoutErrorCode: (error: number) => void;
+  loginErrorStatus: number;
+  setLoginErrorStatus: (error: number) => void;
 }
 
 export const useErrorMessageStore = create<ErrorMessageStore>((set) => ({
@@ -28,4 +30,6 @@ export const useErrorMessageStore = create<ErrorMessageStore>((set) => ({
   setLogoutError: (error) => set({ loginError: error }),
   logoutErrorCode: 0,
   setLogoutErrorCode: (error) => set({ loginErrorCode: error }),
+  loginErrorStatus: 0,
+  setLoginErrorStatus: (error) => set({ loginErrorStatus: error }),
 }));
diff --git a/src/store/userType.ts b/src/store/userType.ts
@@ -1,6 +1,8 @@
+import { isKoinError } from '@bcsdlab/koin';
 import { getUserType } from 'api/auth';
 import { UserType } from 'model/auth';
 import { create } from 'zustand';
+import { useErrorMessageStore } from './errorMessageStore';
 
 interface UserTypeStore {
   userType: UserType;
@@ -19,8 +21,11 @@ const useUserTypeStore = create<UserTypeStore>((set) => ({
         }
         return state;
       });
-    } catch {
+    } catch (err) {
       set((state) => (state.userType !== null ? { userType: null } : state));
+      if (isKoinError(err)) {
+        useErrorMessageStore.getState().setLoginErrorStatus(err.status);
+      }
     }
   },
 }));