From 7a625e8a417ec4e73733ff731dd7cd8190442542 Mon Sep 17 00:00:00 2001 From: dooohun Date: Thu, 21 Dec 2023 20:02:34 +0900 Subject: [PATCH 01/27] =?UTF-8?q?fix:=20react-query=20=EB=B2=84=EC=A0=84?= =?UTF-8?q?=20=EC=97=85=20=EC=97=90=EB=9F=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/index.tsx | 4 ++-- src/page/Auth/FindPassword/SendAuthNumber/index.tsx | 2 +- src/query/auth.ts | 4 ++-- src/query/shopCategory.ts | 2 +- src/query/shops.ts | 2 +- src/query/storeCategory.ts | 0 6 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 src/query/storeCategory.ts diff --git a/src/index.tsx b/src/index.tsx index f1ad747b..c59f20c5 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -19,10 +19,10 @@ const queryClient = new QueryClient({ refetchOnReconnect: false, retry: 1, staleTime: 1000 * 60 * 5, - onError: (err) => err instanceof ZodError, + throwOnError: (err) => err instanceof ZodError, }, mutations: { - onError: (err) => err instanceof ZodError, + throwOnError: (err) => err instanceof ZodError, }, }, }); diff --git a/src/page/Auth/FindPassword/SendAuthNumber/index.tsx b/src/page/Auth/FindPassword/SendAuthNumber/index.tsx index e59748cf..eeccacea 100644 --- a/src/page/Auth/FindPassword/SendAuthNumber/index.tsx +++ b/src/page/Auth/FindPassword/SendAuthNumber/index.tsx @@ -32,7 +32,7 @@ export default function FindPassword() { type="button" className={styles['auth-button']} onClick={() => verifyEmail.mutate(emailInput)} - disabled={verifyEmail.isLoading} + disabled={verifyEmail.isPending} > {verifyEmail.isSuccess ? '재발송' : '인증번호 발송'} diff --git a/src/query/auth.ts b/src/query/auth.ts index 2e1a0082..f971d0d1 100644 --- a/src/query/auth.ts +++ b/src/query/auth.ts @@ -35,10 +35,10 @@ export const useLogin = () => { }; export const useVerifyEmail = () => { - const { mutate, isLoading, isSuccess } = useMutation({ + const { mutate, isPending, isSuccess } = useMutation({ mutationFn: (emailInput: string) => findPasswordVerify({ email: emailInput }), }); - return { verifyEmail: { mutate, isLoading, isSuccess } }; + return { verifyEmail: { mutate, isPending, isSuccess } }; }; export const useSubmit = () => { diff --git a/src/query/shopCategory.ts b/src/query/shopCategory.ts index 21893e6d..be05037d 100644 --- a/src/query/shopCategory.ts +++ b/src/query/shopCategory.ts @@ -4,7 +4,7 @@ import getShopCategory from 'api/category'; const useShopCategory = () => { const { data: categoryList } = useQuery({ queryKey: ['shopCategory'], - queryFn: () => getShopCategory, + queryFn: () => getShopCategory(), }); return { categoryList }; }; diff --git a/src/query/shops.ts b/src/query/shops.ts index 4b0cf1aa..ea48522e 100644 --- a/src/query/shops.ts +++ b/src/query/shops.ts @@ -4,7 +4,7 @@ import { getShopList } from 'api/shop'; const useShopList = () => { const { data: shopList, isError } = useQuery({ queryKey: ['allshops'], - queryFn: () => getShopList, + queryFn: () => getShopList(), }); return { shopList, isError }; }; diff --git a/src/query/storeCategory.ts b/src/query/storeCategory.ts deleted file mode 100644 index e69de29b..00000000 From 8e6b9e475fd2f9582b1a57a810f944ad0c3ccea8 Mon Sep 17 00:00:00 2001 From: dooohun Date: Thu, 21 Dec 2023 20:03:08 +0900 Subject: [PATCH 02/27] =?UTF-8?q?feat:=20=EC=B9=B4=ED=85=8C=EA=B3=A0?= =?UTF-8?q?=EB=A6=AC=20=EC=84=A0=ED=83=9D=20=EB=A1=9C=EC=A7=81=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view/Mobile/ShopCategory/index.tsx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/page/ShopRegistration/view/Mobile/ShopCategory/index.tsx b/src/page/ShopRegistration/view/Mobile/ShopCategory/index.tsx index 62bbf143..db2e0457 100644 --- a/src/page/ShopRegistration/view/Mobile/ShopCategory/index.tsx +++ b/src/page/ShopRegistration/view/Mobile/ShopCategory/index.tsx @@ -2,6 +2,8 @@ import { useState } from 'react'; import useStepStore from 'store/useStepStore'; import useShopCategory from 'query/shopCategory'; import cn from 'utils/ts/className'; +import { Category as CategoryProps } from 'model/category/storeCategory'; +import useModalStore from 'store/modalStore'; import styles from './ShopCategory.module.scss'; type Category = string; @@ -10,6 +12,12 @@ export default function ShopCategory() { const { categoryList } = useShopCategory(); const { increaseStep } = useStepStore(); const [selectedCategory, setSelectedCategory] = useState(null); + const { setCategoryState } = useModalStore(); + + const handleCategoryClick = (category: CategoryProps) => { + setSelectedCategory(category.name); + setCategoryState([category.name, category.id]); + }; return (
@@ -22,7 +30,7 @@ export default function ShopCategory() { [styles['category__menu--selected']]: category.name === selectedCategory, })} type="button" - onClick={() => setSelectedCategory(category.name)} + onClick={() => handleCategoryClick(category)} key={category.id} > From 3c5b982a8ed446ab4170a9f3294409d23b6a195f Mon Sep 17 00:00:00 2001 From: dooohun Date: Fri, 22 Dec 2023 16:21:53 +0900 Subject: [PATCH 03/27] =?UTF-8?q?feat:=20=EB=AA=A8=EB=B0=94=EC=9D=BC=20?= =?UTF-8?q?=EC=82=AC=EC=A7=84=20=EB=93=B1=EB=A1=9D=20=EB=A1=9C=EC=A7=81=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view/Mobile/Main/Main.module.scss | 22 +++++++++++++++++ .../view/Mobile/Main/index.tsx | 24 +++++++++++++++---- 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/src/page/ShopRegistration/view/Mobile/Main/Main.module.scss b/src/page/ShopRegistration/view/Mobile/Main/Main.module.scss index 4da8d273..830c10ad 100644 --- a/src/page/ShopRegistration/view/Mobile/Main/Main.module.scss +++ b/src/page/ShopRegistration/view/Mobile/Main/Main.module.scss @@ -19,6 +19,28 @@ } } + &__image-upload { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + cursor: pointer; + width: 295px; + height: 200px; + border: 1px solid #858585; + margin-bottom: 32px; + } + + &__upload-file { + display: none; + } + + &__text { + margin-top: 8px; + font-size: 14px; + color: #858585; + } + &__label { display: flex; justify-content: space-between; diff --git a/src/page/ShopRegistration/view/Mobile/Main/index.tsx b/src/page/ShopRegistration/view/Mobile/Main/index.tsx index 5d978dd6..47c21cb3 100644 --- a/src/page/ShopRegistration/view/Mobile/Main/index.tsx +++ b/src/page/ShopRegistration/view/Mobile/Main/index.tsx @@ -1,16 +1,32 @@ import { ReactComponent as EmptyImgIcon } from 'assets/svg/shopRegistration/mobile-empty-img.svg'; import useStepStore from 'store/useStepStore'; +import useImageUpload from 'utils/hooks/useImageUpload'; import styles from './Main.module.scss'; export default function Main() { const { increaseStep } = useStepStore(); + const { imgFile, imgRef, saveImgFile } = useImageUpload(); return (
-
- -
등록된 이미지가 없습니다.
-
+