Merge branch 'main' into feat/auth

src/apis/space/patchSpaceUser.ts

@@ -2,13 +2,6 @@ import { axiosInstance } from '@/apis';
 import { END_POINTS } from '@/constants';
 import type { ApiResponseType } from '@/types';
 
-// export type SpaceUserPropsType = {
-//   spaceId: number;
-//   userId?: number; //해당 유저가 방장이 되는 경우에만 추가함.
-//   isAdmin?: boolean;
-//   image?: File | null;
-//   userNickName?: string;
-// };
 export const patchSpaceUser = async (patchInfo: FormData) => {
   const { data } = await axiosInstance.patch<ApiResponseType>(
     END_POINTS.SPACE_USER,

src/components/Create/CreateSelectBox/index.tsx

@@ -1,4 +1,4 @@
-import { useDimensions, useSpaceInfoQuery, useTagMutation } from '@/hooks';
+import { useDimensions, useTagMutation } from '@/hooks';
 import type { SelectBoxProps, selectType } from '@/types';
 import { toastColorMessage } from '@/utils';
 import { motion } from 'framer-motion';
@@ -24,11 +24,8 @@ export const CreateSelectBox = (props: SelectBoxProps) => {
   const [searchValue, setSearchValue] = useState<string>('');
   const { spaceId } = useParams();
 
-  const { refetch } = useSpaceInfoQuery(spaceId!);
-
   useEffect(() => {
     setState(select);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [select]);
 
   const toggleOpen = () => {
@@ -45,8 +42,8 @@ export const CreateSelectBox = (props: SelectBoxProps) => {
       return toastColorMessage('값이 비어있습니다.');
     if (select.findIndex((prevState) => prevState.title === searchValue) !== -1)
       return toastColorMessage('이미 있는 태그입니다.');
+
     postTagAction({ spaceId: Number(spaceId)!, tagName: searchValue });
-    refetch();
     setSearchValue('');
   };
 

src/components/Main/Comments/index.tsx

@@ -33,6 +33,7 @@ export const DetailComments = (props: DetailCommentType) => {
     }
     setIsReply({ open: true, refId: refId, id: id });
   };
+
   return (
     <>
       <S.Wrapper isOpen={isOpen}>

src/components/Main/MainBody/MainBody.tsx

@@ -79,12 +79,9 @@ export const MainBody = (props: PostListPropType) => {
 
   const { postList, total, page: curPage, itemLength } = spacePostList!;
 
-  useEffect(() => {}, [spaceId]);
-
   useEffect(() => {
     setSearchParams(objectHelperWithNotUndefined(query));
     refetch();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [refetch, query]);
 
   const detailModalOpen = useDetailModalOpen();

src/components/Main/Setting/index.tsx

@@ -88,12 +88,15 @@ export const SettingComponent = React.forwardRef(
     const changeAdminAction = (userId: number) => {
       onClose();
       const formData = new FormData();
-      const spaceUserDTO = {
+      const DTO = {
         spaceId: spaceId,
         userId,
         isAdmin: true,
       };
-      formData.append('spaceUserDTO', JSON.stringify(spaceUserDTO));
+      const spaceUserDTO = new Blob([JSON.stringify(DTO)], {
+        type: 'application/json',
+      });
+      formData.append('spaceUserDTO', spaceUserDTO);
       userUpdateAction(formData);
     };
 

src/components/common/Calender/index.tsx

@@ -5,10 +5,12 @@ import { ko } from 'date-fns/esm/locale';
 import getYear from 'date-fns/getYear';
 import { useEffect, useState } from 'react';
 import 'react-datepicker/dist/react-datepicker.css';
+import { useSearchParams } from 'react-router-dom';
 import { ReactComponent as CalenderIcon } from '@/assets/svg/calenderIcon.svg';
 import { ReactComponent as DownIcon } from '@/assets/svg/chevron/chevron_down.svg';
 import { ReactComponent as UpIcon } from '@/assets/svg/chevron/chevron_up.svg';
 import { ReactComponent as MainCalenderIcon } from '@/assets/svg/mainCalender.svg';
+import { BasicButton } from '..';
 import './calender.css';
 import { S } from './style';
 import { MONTHS, YEARS } from './util';
@@ -32,6 +34,7 @@ export const Calender = ({
   dateInfo,
   fontSize,
 }: CalenderPropsType) => {
+  const [searchParams, setSearchParams] = useSearchParams();
   const [startDate, setStartDate] = useState<Date | null>(
     dateInfo?.startDate ? new Date(dateInfo.startDate!) : null
   );
@@ -42,7 +45,6 @@ export const Calender = ({
   useEffect(() => {
     dateInfo?.startDate && setStartDate(new Date(dateInfo.startDate));
     dateInfo?.endDate && setEndDate(new Date(dateInfo.endDate));
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   const [isDropdownOpen, setIsDropdownOpen] = useState([false, false]);
@@ -80,9 +82,24 @@ export const Calender = ({
       }
       setDateInfo(newDateStr);
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [startDate, endDate]);
 
+  //날짜 리셋
+  const onResetDate = () => {
+    setStartDate(null);
+    setEndDate(null);
+    removeQueryParam('startDate');
+    removeQueryParam('endDate');
+    location.reload();
+  };
+
+  const removeQueryParam = (keyToRemove: string) => {
+    if (searchParams.has(keyToRemove)) {
+      searchParams.delete(keyToRemove); // 기존의 searchParams를 직접 수정
+      setSearchParams(new URLSearchParams(searchParams)); // 새로운 인스턴스로 업데이트
+    }
+  };
+
   return (
     <div
       className="custom-react-datepicker__wrapper"
@@ -200,6 +217,14 @@ export const Calender = ({
                       ))}
                     </select>
                   )}
+                  <BasicButton
+                    width={40}
+                    color={'white'}
+                    height={10}
+                    onClick={onResetDate}
+                  >
+                    reset
+                  </BasicButton>
                 </div>
               </div>
             </div>

src/modal/Detail/style.ts

@@ -222,7 +222,7 @@ const BackClickBlock = styled.div<{ isOpen: boolean }>`
 `;
 
 const MenuGroup = styled.div<{ isOpen: boolean; width?: number; top?: number }>`
-  right: -140px;
+  right: -100px;
   top: ${({ top }) => (top ? top : 20)}px;
   position: absolute;
   width: ${({ width }) => (width ? width : 102)}px;

src/pages/CreatePost/index.tsx

@@ -59,7 +59,6 @@ const CreatePost = () => {
         navigate(PATH.SPACE);
       }
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [postId]);
 
   const { createPostAction, postCreateSuccess } = usePostCreateMutation();
@@ -214,7 +213,7 @@ const CreatePost = () => {
       postId,
     };
 
-    if (imageArr.convertedImages) {
+    if (imageArr.convertedImages.length) {
       imageArr.convertedImages.forEach((image) => {
         const blobImg = new Blob([image], {
           type: 'image/jpeg',