Merge pull request #149 from kakao-tech-campus-2nd-step3/Feature/Orde…

…rRefactor-#139 Feature/order refactor #139
kakao-tech-campus-2nd-step3 · Nov 19, 2024 · 2e7defa · 2e7defa
2 parents 7278bba + ba3f938
commit 2e7defa
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 10 deletions.
diff --git a/src/api/emailApi.ts b/src/api/emailApi.ts
@@ -13,11 +13,21 @@ type LoginData = {
   password: string;
 };
 
-type FarmerData = {
+type FarmerRegisterData = {
   name: string;
   address: string;
   phone: string;
 };
+
+type FarmerData = {
+  name: string;
+  email: string;
+  password: string;
+  phoneNumber: string;
+  storeName: string;
+  storeAddress: string;
+};
+
 type AddressData = {
   defaultAddress: string;
   addressDetail: string;
@@ -39,7 +49,7 @@ const useLoginEmail = () => {
 };
 
 const useCreateFarmer = () => {
-  const fetcher = (farmerData: FarmerData) =>
+  const fetcher = (farmerData: FarmerRegisterData) =>
     needAuthDefaultApi.put(`/api/members/to-farmer`, farmerData).then(({ data }) => data);
   return useMutation({ mutationFn: fetcher });
 };
@@ -58,6 +68,20 @@ const useUpdateEmail = () => {
   });
 };
 
+const useUpdateFarmer = () => {
+  const queryClient = useQueryClient();
+  const fetcher = (updateData: FarmerData) =>
+    needAuthDefaultApi.put(`/api/members/update/farmer`, updateData).then(({ data }) => data);
+
+  return useMutation({
+    mutationFn: fetcher,
+    onSuccess: () =>
+      queryClient.invalidateQueries({
+        queryKey: ["farmer"],
+      }),
+  });
+};
+
 const useUpdateAddress = () => {
   const queryClient = useQueryClient();
   const fetcher = (updateData: AddressData) =>
@@ -82,4 +106,12 @@ const useDeleteAccount = () => {
   });
 };
 
-export { useCreateEmail, useLoginEmail, useUpdateEmail, useUpdateAddress, useCreateFarmer, useDeleteAccount };
+export {
+  useCreateEmail,
+  useLoginEmail,
+  useUpdateEmail,
+  useUpdateAddress,
+  useCreateFarmer,
+  useUpdateFarmer,
+  useDeleteAccount,
+};
diff --git a/src/api/productApi.ts b/src/api/productApi.ts
@@ -20,7 +20,7 @@ type ProductData = {
 };
 
 const useGetProducts = () => {
-  const fetcher = () => defaultApi.get(`/products`).then(({ data }) => data);
+  const fetcher = () => defaultApi.get(`/api/products`).then(({ data }) => data);
 
   return useQuery({
     queryKey: ["products"],
@@ -29,7 +29,7 @@ const useGetProducts = () => {
 };
 
 const useGetProductDetail = (productId: number) => {
-  const fetcher = () => defaultApi.get(`/products/${productId}`).then(({ data }) => data);
+  const fetcher = () => defaultApi.get(`/api/products/${productId}`).then(({ data }) => data);
   return useQuery({
     queryKey: ["products", productId],
     queryFn: fetcher,
@@ -38,7 +38,7 @@ const useGetProductDetail = (productId: number) => {
 };
 
 const useCreateProducts = () => {
-  const fetcher = (productData: ProductData) => defaultApi.post(`/products`, productData).then(({ data }) => data);
+  const fetcher = (productData: ProductData) => defaultApi.post(`/api/products`, productData).then(({ data }) => data);
 
   return useMutation({ mutationFn: fetcher });
 };
@@ -47,7 +47,7 @@ const useUpdateProducts = (productId: number) => {
   const queryClient = useQueryClient();
 
   const fetcher = (productData: ProductData) =>
-    defaultApi.put(`/products/${productId}`, productData).then(({ data }) => data);
+    defaultApi.put(`/api/products/${productId}`, productData).then(({ data }) => data);
 
   return useMutation({
     mutationFn: fetcher,

diff --git a/src/components/features/MyPage/Category.tsx b/src/components/features/MyPage/Category.tsx
@@ -13,7 +13,7 @@ const Category = () => (
       </Flex>
       <ChakraLink
         as={Link}
-        w="50px"
+        w="100px"
         h="20px"
         mt={3}
         ml={5}

diff --git a/src/components/features/StorePage/StoreBanner.tsx b/src/components/features/StorePage/StoreBanner.tsx
@@ -8,7 +8,7 @@ const StoreBanner = () => (
       <Image h="full" src="/assets/image/vegetables.png" />
       <Flex align="center" justify="center" direction="column" w="470px" h="full" color="white">
         <Text fontSize="xl" fontWeight="bold">
-          믿고 먹는 건간한 먹거리,{" "}
+          믿고 먹는 건강한 먹거리,{" "}
           <Text as="span" color="#48BB78">
             품앗이
           </Text>{" "}

diff --git a/src/pages/MyPage/ProductWishlistPage.tsx b/src/pages/MyPage/ProductWishlistPage.tsx
@@ -3,7 +3,7 @@ import Card from "@components/common/Card";
 import ProductWish from "@components/features/MyPage/Wishlist/ProductWish";
 
 const ProductWishlistPage = () => (
-  <Card title="위시리스트-농산물" w="100%" h="fit-content" p="10">
+  <Card title="위시리스트" w="100%" h="fit-content" p="10">
     <ProductWish />
   </Card>
 );