Merge pull request #64 from ej070961/develop

fix: 프리사인드 axiosInstance 설정
K-Hackathon-Fledge · Aug 10, 2024 · 63ed0d4 · 63ed0d4
2 parents 2446e57 + 2472189
commit 63ed0d4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/src/apis/file-upload.ts b/src/apis/file-upload.ts
@@ -1,21 +1,19 @@
 import axios from "axios";
 import { CommonError } from "../@types/api";
+import { axiosInstance } from ".";
 
 export const getPresignedUrl = async (
   prefix: string,
   fileName: string,
   accesstoken: string
 ) => {
   try {
-    const res = await axios.get(
-      `/api/v1/files/presigned-url?prefix=images/${prefix}&fileName=${fileName}`,
+    const res = await axiosInstance.get(
+      `/files/presigned-url?prefix=images/${prefix}&fileName=${fileName}`,
       {
         headers: {
           Authorization: `Bearer ${accesstoken}`,
-          // 다른 헤더를 추가할 수 있습니다.
-          "Content-Type": "application/json",
         },
-        withCredentials: true,
       }
     );
     return res.data;

diff --git a/src/components/SponsorDetail/ContentDetail.tsx b/src/components/SponsorDetail/ContentDetail.tsx
@@ -12,7 +12,7 @@ function ContentDetail({ data }: ContentDetailProps) {
     <Container>
       <RowBox className="justify-between items-center">
         <span className="d-day">D-{data.leftDays}</span>
-        <ColBox className="justify-end">
+        <ColBox className="justify-end ">
           <label className="medium-20">후원기간</label>
           <span className="medium-20">{data.expirationDate}</span>
         </ColBox>
@@ -64,7 +64,7 @@ const Container = styled.div`
     ${tw`font-bold text-bold-64 text-subColor`}
   }
   .medium-20 {
-    ${tw`font-medium text-fontColor3 text-medium-20 w-[79px]`}
+    ${tw`font-medium text-fontColor3 text-medium-20 `}
   }
   .title {
     ${tw`font-bold text-bold-48 text-fontColor1`}

diff --git a/src/components/SponsorDetail/DonateModal.tsx b/src/components/SponsorDetail/DonateModal.tsx
@@ -67,15 +67,15 @@ function DonateModal({ onClose }: { onClose: () => void }) {
       account
     );
 
-    if (res.success) {
+    if (res.status === 200) {
       setIsFinished(true);
     }
   };
   if (!isLoading && !isProgressLoading && data && ProgressData) {
     return (
       <Overlay onClick={onClose}>
         {!isFinished ? (
-          <Wrapper>
+          <Wrapper onClick={(e) => e.stopPropagation()}>
             <InputForm onSubmit={handleSubmit(onSubmitHandler)}>
               <span className="d-day">D-{data.leftDays}</span>
               <span className="bold-36">{data.title}</span>
@@ -117,7 +117,7 @@ function DonateModal({ onClose }: { onClose: () => void }) {
             </InputForm>
           </Wrapper>
         ) : (
-          <Wrapper>
+          <Wrapper onClick={(e) => e.stopPropagation()}>
             <span className="bold-36">후원이 완료되었습니다.</span>
             <span className="medium-20">
               {nickname} 후원자님의 보탬이 {data.nickname} 님에게 큰 도움이

diff --git a/src/components/SponsorDetail/Header.tsx b/src/components/SponsorDetail/Header.tsx
@@ -26,7 +26,7 @@ function Header({ memberId, nickname }: HeaderProps) {
   const navigate = useNavigate();
   const { supportId } = useParams<{ supportId: string }>();
   const accessToken = useAuthStore((state) => state.accessToken!);
-
+  console.log(isOpenDonate);
   // 수정하기 클릭시 함수 호출
   const handleUpdate = async () => {
     const res = await getUpdate(supportId!, accessToken);