Merge pull request #154 from kakao-tech-campus-2nd-step3/revert-153-f…

…eature/footer_리펙토링-#146

Revert "Feature/footer 리펙토링 #146"

src/api/axiosInstance.ts

@@ -19,8 +19,8 @@ const needAuthDefaultApi = axios.create({
   baseURL: process.env.REACT_APP_API_URL,
   headers: {
     "Content-Type": "application/json",
-    Authorization: JSON.parse(localStorage.getItem("poomasi-user") || "{}")?.token
-      ? `Bearer ${JSON.parse(localStorage.getItem("poomasi-user") || "{}").token}`
+    Authorization: JSON.parse(localStorage.getItem("poomasi_user") || "{}")?.token
+      ? `Bearer ${JSON.parse(localStorage.getItem("poomasi_user") || "{}").token}`
       : undefined,
   },
   withCredentials: true,

src/api/businessApi.ts

@@ -13,6 +13,6 @@ const useCreateBusiness = () => {
   return useMutation({ mutationFn: fetcher });
 };
 
-const useGetBusiness = () => null;
+const useGetBusinessDetail = () => null;
 
-export { useCreateBusiness, useGetBusiness };
+export { useCreateBusiness, useGetBusinessDetail };

src/api/emailApi.ts

@@ -13,21 +13,11 @@ type LoginData = {
   password: string;
 };
 
-type FarmerRegisterData = {
+type FarmerData = {
   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;
@@ -49,7 +39,7 @@ const useLoginEmail = () => {
 };
 
 const useCreateFarmer = () => {
-  const fetcher = (farmerData: FarmerRegisterData) =>
+  const fetcher = (farmerData: FarmerData) =>
     needAuthDefaultApi.put(`/api/members/to-farmer`, farmerData).then(({ data }) => data);
   return useMutation({ mutationFn: fetcher });
 };
@@ -68,20 +58,6 @@ 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) =>
@@ -106,12 +82,4 @@ const useDeleteAccount = () => {
   });
 };
 
-export {
-  useCreateEmail,
-  useLoginEmail,
-  useUpdateEmail,
-  useUpdateAddress,
-  useCreateFarmer,
-  useUpdateFarmer,
-  useDeleteAccount,
-};
+export { useCreateEmail, useLoginEmail, useUpdateEmail, useUpdateAddress, useCreateFarmer, useDeleteAccount };

src/api/farmApi.ts

@@ -18,22 +18,6 @@ type FarmData = {
   endTime: string;
 };
 
-type ReservationData = {
-  farmId: number;
-  startTime: string;
-  endTime: string;
-  date: ["startDate", "endDate"];
-};
-
-const useGetFarm = () => {
-  const fetcher = () => defaultApi.get(`/api/farms/{farmId}/detail`).then(({ data }) => data);
-
-  return useQuery({
-    queryKey: ["farms"],
-    queryFn: fetcher,
-  });
-};
-
 const useGetFarms = () => {
   const fetcher = () => defaultApi.get(`/api/farms`).then(({ data }) => data);
 
@@ -53,7 +37,7 @@ const useGetFarmDetail = (farmId: number) => {
 };
 
 const useCreateFarms = () => {
-  const fetcher = (farmData: FarmData) => defaultApi.post(`/api/farmer/farms`, farmData).then(({ data }) => data);
+  const fetcher = (farmData: FarmData) => defaultApi.post(`/api/farms`, farmData).then(({ data }) => data);
 
   return useMutation({ mutationFn: fetcher });
 };
@@ -73,42 +57,4 @@ const useUpdateFarms = (farmId: number) => {
   });
 };
 
-const useDeleteFarms = (farmId: number) => {
-  const queryClient = useQueryClient();
-
-  const fetcher = () => defaultApi.delete(`/api/farmer/farms/${farmId}`).then(({ data }) => data);
-
-  return useMutation({
-    mutationFn: fetcher,
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ["farms"] });
-    },
-  });
-};
-
-const useCreateReservations = () => {
-  const fetcher = (reservationData: ReservationData) =>
-    defaultApi.post(`/api/farms/schedule`, reservationData).then(({ data }) => data);
-
-  return useMutation({ mutationFn: fetcher });
-};
-
-const useGetReservations = (farmId: number) => {
-  const fetcher = () => defaultApi.get(`/api/farms/schedule?farmId=17&year=2024&month=10`).then(({ data }) => data);
-
-  return useQuery({
-    queryKey: ["reservations", farmId],
-    queryFn: fetcher,
-  });
-};
-
-export {
-  useGetFarm,
-  useGetFarms,
-  useGetFarmDetail,
-  useCreateFarms,
-  useUpdateFarms,
-  useDeleteFarms,
-  useCreateReservations,
-  useGetReservations,
-};
+export { useGetFarms, useGetFarmDetail, useCreateFarms, useUpdateFarms };

src/api/intercepters.ts

@@ -13,10 +13,10 @@ const refrechIntercepter = async (response: AxiosResponse): Promise<AxiosRespons
       alert("로그아웃 되었습니다. 다시 로그인해주세요.");
       window.location.href = "/";
     });
-    const user = JSON.parse(localStorage.getItem("poomasi-user") || "{}");
+    const user = JSON.parse(localStorage.getItem("poomasi_user") || "{}");
 
     localStorage.setItem(
-      "poomasi-user",
+      "poomasi_user",
       JSON.stringify({
         ...user,
         token: result,

src/api/productApi.ts

@@ -5,18 +5,12 @@ type ProductData = {
   categoryId: number;
   name: string;
   description: string;
+  imageUrl: string;
   stock: string;
   price: string;
   growEnv: string;
   shippingFee: string;
   phoneNumber: string;
-  mainTitle: string;
-  subTitle1: string;
-  subDesc1: string;
-  subTitle2: string;
-  subDesc2: string;
-  subTitle3: string;
-  subDesc3: string;
 };
 
 const useGetProducts = () => {

src/atoms/userAtom.ts

@@ -7,7 +7,7 @@ type UserAtomValue = {
   role: string;
 };
 
-const userAtom = atom(localStorage.getItem("poomasi-user") ?? "");
+const userAtom = atom(localStorage.getItem("poomasi_user") ?? "");
 
 const userAtomWithPersistence = atom(
   get => {
@@ -16,7 +16,7 @@ const userAtomWithPersistence = atom(
   },
   (_, set, data: UserAtomValue | null) => {
     set(userAtom, JSON.stringify(data));
-    localStorage.setItem("poomasi-user", JSON.stringify(data));
+    localStorage.setItem("poomasi_user", JSON.stringify(data));
   },
 );
 

src/components/common/KaKaoLoginButton.tsx

@@ -4,7 +4,7 @@ import Image from "@components/common/Image";
 type KaKaoLoginButtonProps = ImageProps;
 
 const KaKaoLoginButton = ({ ...props }: KaKaoLoginButtonProps) => {
-  const link = `${process.env.REACT_APP_API_URL}/oauth2/authentication/kakao`;
+  const link = "https://api.poomasi.shop/oauth2/authentication/kakao";
 
   return (
     <Link href={link} isExternal>