Merge pull request #80 from next-petree/FEAT_mypage34

FIX: 프로필 사진 modal 삭제 및 로직 개선

src/component/Header/Header.tsx

@@ -15,16 +15,26 @@ import {
 
 import NavDropdown from "../Dropdown/NavDropdown";
 import DecodeToken from "../../utils/DecodeJWT/DecodeJWT";
+import { useNavigate } from "react-router-dom";
+import Swal from "sweetalert2";
+import alertList from "../../utils/Swal1";
 
 const Header = () => {
   const [isLoggedIn, setIsLoggedIn] = useState<boolean>(false);
-  const [isCilcked, setIsCilcked] = useState<boolean>(false);
-
+  const navigate = useNavigate();
   const profileImg = useAppSelector(selectBreederProfile);
-  console.log(profileImg);
 
-  const handleClick = () => {
-    setIsCilcked(prev => !prev);
+  const handleClick = async () => {
+    if(isLoggedIn) {
+      navigate("/mypage/modifyauth")
+    }
+    else {
+      const answer = await Swal.fire({
+        ...alertList.infoMessage("로그인을 먼저 진행해주세요"),
+        width: "350px",
+      });
+      if(answer) navigate("/login");
+    }
   };
 
   const decodedData = DecodeToken();
@@ -63,10 +73,6 @@ const Header = () => {
           <UserProfileImage $imgSrc={profileImg} />
         </div>
       </HeaderContent>
-
-      {isCilcked && (
-        <NavDropdown profileUrl={profileImg} loggedIn={isLoggedIn} />
-      )}
     </Container>
   );
 };

src/component/MyPage/ProfileContent/ProfileContentForms1/LivingEnvironmentForm.tsx

@@ -18,9 +18,13 @@ import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import alertList from "../../../../utils/Swal1";
 import Swal from "sweetalert2";
-import { LivingEnvironmentsResultResponse } from "../../../../types/MypageType1";
+import {
+  LivingEnvironmentsData,
+  LivingEnvironmentsResultResponse,
+  LivingEnvironmentsUploadResultResponse,
+} from "../../../../types/MypageType1";
 import { LivingEnvironmentUrl } from "../../../../utils/MypageUrl1";
-import { get } from "../../../../api/api";
+import { get, put } from "../../../../api/api";
 import React from "react";
 
 export interface ILivingEnvironment {
@@ -38,14 +42,45 @@ const LivingEnvironmentForm = () => {
     setValue,
   } = useForm<ILivingEnvironment>();
   const getUser = DecodeToken();
-  const [imageData, setImageData] = useState<LivingEnvironmentsResultResponse[]>([]);
-  const onValid = async (data: any) => {
+  const [deleteImgId, setDeleteImgId] = useState<number[]>([])
+  const [imageData, setImageData] = useState<LivingEnvironmentsData[]>([]);
+  const onValid = async ({livingRoom,bathRoom,yard,}: ILivingEnvironment) => {
     const answer = await Swal.fire({
       ...alertList.doubleCheckMessage("주거 환경을 저장 하시겠습니까?"),
       width: "350px",
     });
     if (answer.isConfirmed) {
-      const form = new FormData();
+      try {
+        const form = new FormData();
+        const id = Array.from(new Set(deleteImgId));
+        console.log(id)
+        if (livingRoom && livingRoom.length > 0) {
+          form.append("livingRoomImg", livingRoom[0]);
+        }
+        else {
+          form.append("livingRoomImg","");
+        }
+
+        if (bathRoom && bathRoom.length > 0) {
+          form.append("bathRoomImg", bathRoom[0]);
+        }
+        else {
+          form.append("bathRoomImg", "");
+        }
+
+        if (yard && yard.length > 0) {
+          form.append("yardImg", yard[0]);
+        }
+        else {
+          form.append("yardImg", "");
+        }
+        form.append("deletedImgsId", `${id}`);
+        const url = LivingEnvironmentUrl();
+        const response = await put<LivingEnvironmentsUploadResultResponse>(
+          url,
+          form
+        );
+      } catch (e) {}
     }
   };
   // 이미지 url만 보내면 업로드가 되는 건지
@@ -82,40 +117,44 @@ const LivingEnvironmentForm = () => {
     if (data === "yard") {
       setImagesPre({ ...imagesPre, yard: "" });
       setValue(data, null);
+      if(imageData[2] && imageData[2].id) {
+        setDeleteImgId([...deleteImgId, imageData[2].id])
+      }
     } else if (data === "bathRoom") {
       setImagesPre({ ...imagesPre, bathRoom: "" });
       setValue(data, null);
+      if(imageData[1] && imageData[1].id) {
+        setDeleteImgId([...deleteImgId, imageData[1].id])
+      }
     } else if (data === "livingRoom") {
       setImagesPre({ ...imagesPre, livingRoom: "" });
       setValue(data, null);
+      if(imageData[0] && imageData[0].id) {
+        setDeleteImgId([...deleteImgId, imageData[0].id])
+      }
     }
   };
   //spaceType: "LIVING_ROOM" | "BATH_ROOM" | "YARD";
   const getLivingEnvironments = async () => {
     try {
       const url = LivingEnvironmentUrl();
-      const response = await get<LivingEnvironmentsResultResponse[]>(url);
-      setImageData(response.data);
-      if (imageData[0].imgUrl) {
-        setImagesPre({ ...imagesPre, livingRoom: imageData[0].imgUrl });
-      }
-      if (imageData[1].imgUrl) {
-        setImagesPre({ ...imagesPre, bathRoom: imageData[1].imgUrl });
-      }
-      if (imageData[2].imgUrl) {
-        setImagesPre({ ...imagesPre, yard: imageData[2].imgUrl });
-      }
+      const response = await get<LivingEnvironmentsResultResponse>(url);
+      setImageData(response.data.data);
+      setImagesPre({
+        livingRoom: response.data.data[0].imgUrl,
+        bathRoom: response.data.data[1].imgUrl,
+        yard: response.data.data[2].imgUrl,
+      });
     } catch (e) {}
   };
   useEffect(() => {
     getLivingEnvironments();
   }, []);
-
   return (
     <Container>
       <Form onSubmit={handleSubmit(onValid)}>
         <Infos>
-          <Title>주거환경</Title>
+          <Title>주거환경{}</Title>
           <Images>
             <ImageContainer>
               {imagesPre.yard !== "" ? (

src/types/MypageType1.ts

@@ -71,7 +71,17 @@ interface MajordogData {
 }
 
 export interface LivingEnvironmentsResultResponse {
+  status: "SUCCESS" | "FAIL";
+  data: LivingEnvironmentsData[];
+}
+
+export interface LivingEnvironmentsData {
   imgUrl: string;
   spaceType: "LIVING_ROOM" | "BATH_ROOM" | "YARD";
   id: number;
 }
+
+export interface LivingEnvironmentsUploadResultResponse {
+  status: "SUCCESS" | "FAIL";
+  data: string;
+}