From 87afccea016943a8d0c7944e63a0a86d77d0357c Mon Sep 17 00:00:00 2001 From: ooherin <555ohr@naver.com> Date: Wed, 6 Dec 2023 00:50:47 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=93=9Dfix=20:=20=ED=83=9C=EA=B7=B8=20?= =?UTF-8?q?=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apis/space/patchSpaceUser.ts | 7 ------- src/components/Create/CreateSelectBox/index.tsx | 7 ++----- src/components/Main/Setting/index.tsx | 4 ++++ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/apis/space/patchSpaceUser.ts b/src/apis/space/patchSpaceUser.ts index 9293d6d6..8287f445 100644 --- a/src/apis/space/patchSpaceUser.ts +++ b/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( END_POINTS.SPACE_USER, diff --git a/src/components/Create/CreateSelectBox/index.tsx b/src/components/Create/CreateSelectBox/index.tsx index 79c0347a..ff2db7a3 100644 --- a/src/components/Create/CreateSelectBox/index.tsx +++ b/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(''); 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(''); }; diff --git a/src/components/Main/Setting/index.tsx b/src/components/Main/Setting/index.tsx index 7f3b9556..35f7cd1e 100644 --- a/src/components/Main/Setting/index.tsx +++ b/src/components/Main/Setting/index.tsx @@ -88,6 +88,10 @@ export const SettingComponent = React.forwardRef( userId, isAdmin: true, }; + const image = new Blob([], { + type: 'image/jpeg', + }); + formData.append('image', image, 'image'); formData.append('spaceUserDTO', JSON.stringify(spaceUserDTO)); userUpdateAction(formData); }; From 6bcdf0e0b2c653593c070f62cdf9aab9af2934bb Mon Sep 17 00:00:00 2001 From: ooherin <555ohr@naver.com> Date: Wed, 6 Dec 2023 01:41:21 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=93=9Dfix=20:=20=EB=B0=A9=EC=9E=A5=20?= =?UTF-8?q?=EB=84=98=EA=B2=A8=EC=A3=BC=EB=8A=94=20=EB=B2=84=EA=B7=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Main/Setting/index.tsx | 9 ++++----- src/components/common/Calender/index.tsx | 1 - src/constants/api.ts | 10 +++++++--- src/modal/Detail/style.ts | 2 +- src/pages/CreatePost/index.tsx | 3 +-- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/components/Main/Setting/index.tsx b/src/components/Main/Setting/index.tsx index 35f7cd1e..d8462ef9 100644 --- a/src/components/Main/Setting/index.tsx +++ b/src/components/Main/Setting/index.tsx @@ -83,16 +83,15 @@ export const SettingComponent = React.forwardRef( const changeAdminAction = (userId: number) => { onClose(); const formData = new FormData(); - const spaceUserDTO = { + const DTO = { spaceId: spaceId, userId, isAdmin: true, }; - const image = new Blob([], { - type: 'image/jpeg', + const spaceUserDTO = new Blob([JSON.stringify(DTO)], { + type: 'application/json', }); - formData.append('image', image, 'image'); - formData.append('spaceUserDTO', JSON.stringify(spaceUserDTO)); + formData.append('spaceUserDTO', spaceUserDTO); userUpdateAction(formData); }; diff --git a/src/components/common/Calender/index.tsx b/src/components/common/Calender/index.tsx index e41bf4fc..be47fb08 100644 --- a/src/components/common/Calender/index.tsx +++ b/src/components/common/Calender/index.tsx @@ -80,7 +80,6 @@ export const Calender = ({ } setDateInfo(newDateStr); } - // eslint-disable-next-line react-hooks/exhaustive-deps }, [startDate, endDate]); return ( diff --git a/src/constants/api.ts b/src/constants/api.ts index 9eff0bbf..247b9ca4 100644 --- a/src/constants/api.ts +++ b/src/constants/api.ts @@ -1,15 +1,19 @@ -export const Dev = process.env.NODE_ENV === 'development'; +export const Dev = process.env.NODE_ENV !== 'development'; export const NETWORK = { RETRY_COUNT: 2, TIMEOUT: 10000, }; -export const BASE_URL = import.meta.env.VITE_BASE_URL; +// export const BASE_URL = Dev +// ? 'http://localhost:3000' +// : import.meta.env.VITE_BASE_URL; + +export const BASE_URL = 'http://localhost:3000'; export const AXIOS_BASE_URL = Dev ? '/' : import.meta.env.VITE_BACK_URL; -export const END_POINTS = { +export const END_POINTS = { USER: '/user', TOKEN: '/user/refreshToken', MY_POST_LIST: `/user/mypost`, diff --git a/src/modal/Detail/style.ts b/src/modal/Detail/style.ts index 92258423..54d498c7 100644 --- a/src/modal/Detail/style.ts +++ b/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; diff --git a/src/pages/CreatePost/index.tsx b/src/pages/CreatePost/index.tsx index 61be8547..a1777c58 100644 --- a/src/pages/CreatePost/index.tsx +++ b/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', From 376a132a1e03ef6b99588cef71f52e1aa4404e9d Mon Sep 17 00:00:00 2001 From: ooherin <555ohr@naver.com> Date: Wed, 6 Dec 2023 02:49:37 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=8C=88feat=20:=20=EB=8B=AC=EB=A0=A5?= =?UTF-8?q?=20=EB=A6=AC=EC=85=8B=20=EB=B2=84=ED=8A=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Main/Comments/index.tsx | 1 + src/components/Main/MainBody/MainBody.tsx | 3 --- src/components/common/Calender/index.tsx | 28 ++++++++++++++++++++++- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/components/Main/Comments/index.tsx b/src/components/Main/Comments/index.tsx index d33d6be4..f31605bb 100644 --- a/src/components/Main/Comments/index.tsx +++ b/src/components/Main/Comments/index.tsx @@ -33,6 +33,7 @@ export const DetailComments = (props: DetailCommentType) => { } setIsReply({ open: true, refId: refId, id: id }); }; + return ( <> diff --git a/src/components/Main/MainBody/MainBody.tsx b/src/components/Main/MainBody/MainBody.tsx index 965a293a..5652d132 100644 --- a/src/components/Main/MainBody/MainBody.tsx +++ b/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(); diff --git a/src/components/common/Calender/index.tsx b/src/components/common/Calender/index.tsx index be47fb08..0545e94d 100644 --- a/src/components/common/Calender/index.tsx +++ b/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( 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]); @@ -82,6 +84,22 @@ export const Calender = ({ } }, [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 (
)} + + reset +
From 869c30b4aa11bb2c96c272d34d2a079221379a02 Mon Sep 17 00:00:00 2001 From: Jihyeong00 Date: Wed, 6 Dec 2023 03:00:46 +0900 Subject: [PATCH 4/4] Update api.ts --- src/constants/api.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/constants/api.ts b/src/constants/api.ts index da83a43e..4d3bd0bf 100644 --- a/src/constants/api.ts +++ b/src/constants/api.ts @@ -1,15 +1,11 @@ -export const Dev = process.env.NODE_ENV !== 'development'; +export const Dev = process.env.NODE_ENV === 'development'; export const NETWORK = { RETRY_COUNT: 2, TIMEOUT: 10000, }; -// export const BASE_URL = Dev -// ? 'http://localhost:3000' -// : import.meta.env.VITE_BASE_URL; - -export const BASE_URL = 'http://localhost:3000'; +export const BASE_URL = import.meta.env.VITE_BASE_URL; export const AXIOS_BASE_URL = import.meta.env.VITE_BACK_URL;