From a45e2ebefc8ace66c72334806584330f5dc7bf7e Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Wed, 8 May 2024 16:59:48 +0900 Subject: [PATCH 01/10] =?UTF-8?q?refactor:=20=EC=B0=B8=EC=A1=B0=20?= =?UTF-8?q?=EB=8F=99=EC=9D=BC=EC=84=B1=EC=9D=84=20=EC=9C=84=ED=95=B4=20Que?= =?UTF-8?q?ryClient=EB=A5=BC=20useState=EB=A1=9C=20=EC=A0=95=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.tsx | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 1b1caa3a..369a2a31 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,23 +1,26 @@ import { Global, ThemeProvider } from '@emotion/react'; import styled from '@emotion/styled'; -import { useEffect } from 'react'; +import { useEffect, useState } from 'react'; import { QueryClient, QueryClientProvider } from 'react-query'; import Router from './Router'; import gStyle from './styles/GlobalStyles'; import theme from './styles/theme'; -const queryClient = new QueryClient({ - defaultOptions: { - queries: { - suspense: true, - useErrorBoundary: true, - retry: 0, - }, - }, -}); - function App() { + const [queryClient] = useState( + () => + new QueryClient({ + defaultOptions: { + queries: { + suspense: true, + useErrorBoundary: true, + retry: 0, + }, + }, + }), + ); + const setScreenSize = () => { // vh 관련 const vh = window.innerHeight * 0.01; From 516642ea692a44eab5ac9fb435a89453b4a1e627 Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Wed, 8 May 2024 22:17:07 +0900 Subject: [PATCH 02/10] =?UTF-8?q?refactor:=20mutation=20=EB=A6=AC=ED=84=B4?= =?UTF-8?q?=20=ED=98=95=EC=8B=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/LecueNote/hooks/usePostLecueNote.ts | 2 +- src/LecueNote/hooks/usePutPresignedUrl.ts | 2 +- src/LecueNote/page/LeceuNotePage/index.tsx | 13 ++++++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/LecueNote/hooks/usePostLecueNote.ts b/src/LecueNote/hooks/usePostLecueNote.ts index 528c7f51..cd79a5a2 100644 --- a/src/LecueNote/hooks/usePostLecueNote.ts +++ b/src/LecueNote/hooks/usePostLecueNote.ts @@ -30,7 +30,7 @@ const usePostLecueNote = () => { navigate(`/lecue-book/${bookUuid}`); }, }); - return mutation; + return { postMutation: mutation.mutate, isLoading: mutation.isLoading }; }; export default usePostLecueNote; diff --git a/src/LecueNote/hooks/usePutPresignedUrl.ts b/src/LecueNote/hooks/usePutPresignedUrl.ts index 116d6583..635cea62 100644 --- a/src/LecueNote/hooks/usePutPresignedUrl.ts +++ b/src/LecueNote/hooks/usePutPresignedUrl.ts @@ -16,7 +16,7 @@ const usePutPresignedUrl = () => { }, onError: () => navigate('/error'), }); - return mutation; + return { putMutation: mutation.mutate, isLoading: mutation.isLoading }; }; export default usePutPresignedUrl; diff --git a/src/LecueNote/page/LeceuNotePage/index.tsx b/src/LecueNote/page/LeceuNotePage/index.tsx index 77553920..3142e7a6 100644 --- a/src/LecueNote/page/LeceuNotePage/index.tsx +++ b/src/LecueNote/page/LeceuNotePage/index.tsx @@ -21,8 +21,11 @@ function LecueNotePage() { const MAX_LENGTH = 1000; const navigate = useNavigate(); const location = useLocation(); - const putMutation = usePutPresignedUrl(); - const postMutation = usePostLecueNote(); + const { putMutation } = usePutPresignedUrl(); + const { postMutation } = usePostLecueNote(); + const isMutationLoading = + usePutPresignedUrl().isLoading || usePostLecueNote().isLoading; + const noteContents = sessionStorage.getItem('noteContents'); const { bookId } = location.state || {}; @@ -84,14 +87,14 @@ function LecueNotePage() { const handleClickCompleteModal = async () => { if (lecueNoteState.imgToBinary) { if (lecueNoteState.imgToBinary.result && lecueNoteState.file) { - putMutation.mutate({ + putMutation({ presignedUrl: lecueNoteState.presignedUrl, binaryFile: lecueNoteState.imgToBinary.result, fileType: lecueNoteState.file.type, }); } } - postMutation.mutate({ + postMutation({ contents: lecueNoteState.contents, color: lecueNoteState.textColor, fileName: lecueNoteState.filename, @@ -103,7 +106,7 @@ function LecueNotePage() { sessionStorage.setItem('noteContents', ''); }; - return putMutation.isLoading || postMutation.isLoading ? ( + return isMutationLoading ? ( ) : ( From 849bf5e146c50feb65b1107f63049819cb57b924 Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Wed, 8 May 2024 22:26:55 +0900 Subject: [PATCH 03/10] =?UTF-8?q?feat:=20=EC=A6=90=EA=B2=A8=EC=B0=BE?= =?UTF-8?q?=EA=B8=B0=20=EA=B4=80=EB=A0=A8=20=EC=BF=BC=EB=A6=AC=ED=82=A4=20?= =?UTF-8?q?=EC=83=81=EC=88=98=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/constants/queryKeys.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/constants/queryKeys.ts diff --git a/src/constants/queryKeys.ts b/src/constants/queryKeys.ts new file mode 100644 index 00000000..f2452527 --- /dev/null +++ b/src/constants/queryKeys.ts @@ -0,0 +1,10 @@ +export const QUERY_KEY = { + favorite: { + getFavoriteHome: 'get-favorite', + getFavoriteMypage: 'get-mypage-favorite', + getFavoriteLecueBook: 'get-my-lecueBook', + }, + nickname: { + getNickName: 'get-nickname', + }, +}; From df3e744b85e229645b279c8660f4cc0258ad8d74 Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Wed, 8 May 2024 22:27:10 +0900 Subject: [PATCH 04/10] =?UTF-8?q?chore:=20=EC=83=81=EC=88=98=ED=99=94?= =?UTF-8?q?=ED=95=9C=20=EC=BF=BC=EB=A6=AC=ED=82=A4=EB=A1=9C=20=EB=8C=80?= =?UTF-8?q?=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libs/hooks/useDeleteFavorite.ts | 7 ++++--- src/libs/hooks/useGetFavorite.ts | 3 ++- src/libs/hooks/useGetMyNickname.ts | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/libs/hooks/useDeleteFavorite.ts b/src/libs/hooks/useDeleteFavorite.ts index dc200741..54f5f8ff 100644 --- a/src/libs/hooks/useDeleteFavorite.ts +++ b/src/libs/hooks/useDeleteFavorite.ts @@ -1,6 +1,7 @@ import { useMutation, useQueryClient } from 'react-query'; import { useNavigate } from 'react-router-dom'; +import { QUERY_KEY } from '../../constants/queryKeys'; import deleteFavorite from '../api/deleteFavorite'; const useDeleteFavorite = (state: string) => { @@ -10,19 +11,19 @@ const useDeleteFavorite = (state: string) => { const handleRefetchQueries = (state: string) => { switch (state) { case 'home': - queryClient.refetchQueries(['get-favorite'], { + queryClient.refetchQueries([QUERY_KEY.favorite.getFavoriteHome], { exact: true, }); break; case 'favoriteBook': - queryClient.refetchQueries(['get-mypage-favorite'], { + queryClient.refetchQueries([QUERY_KEY.favorite.getFavoriteMypage], { exact: true, }); break; case 'myLecueBook': - queryClient.refetchQueries(['get-my-lecueBook'], { + queryClient.refetchQueries([QUERY_KEY.favorite.getFavoriteLecueBook], { exact: true, }); break; diff --git a/src/libs/hooks/useGetFavorite.ts b/src/libs/hooks/useGetFavorite.ts index fc48f529..316b132f 100644 --- a/src/libs/hooks/useGetFavorite.ts +++ b/src/libs/hooks/useGetFavorite.ts @@ -1,13 +1,14 @@ import { useQuery } from 'react-query'; import { useNavigate } from 'react-router-dom'; +import { QUERY_KEY } from '../../constants/queryKeys'; import getFavorite from '../api/getFavorite'; const useGetFavorite = () => { const navigate = useNavigate(); const { isLoading: isLoadingFavorite, data: favorite } = useQuery({ - queryKey: ['get-favorite'], + queryKey: [QUERY_KEY.favorite.getFavoriteHome], queryFn: () => getFavorite(), onError: () => navigate('/error'), refetchOnWindowFocus: false, diff --git a/src/libs/hooks/useGetMyNickname.ts b/src/libs/hooks/useGetMyNickname.ts index f28fede8..46d7235f 100644 --- a/src/libs/hooks/useGetMyNickname.ts +++ b/src/libs/hooks/useGetMyNickname.ts @@ -1,12 +1,13 @@ import { useQuery } from 'react-query'; import { useNavigate } from 'react-router-dom'; +import { QUERY_KEY } from '../../constants/queryKeys'; import { getMyNickName } from '../api/getMyNickName'; export default function useGetMyNickName() { const navigate = useNavigate(); const { data: myNickName, isLoading } = useQuery( - ['useGetMyNickName'], + [QUERY_KEY.nickname.getNickName], () => getMyNickName(), { onError: () => { From 908dcb8a2ffb27d17be6d08018bc06e707bf954e Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Wed, 8 May 2024 22:30:02 +0900 Subject: [PATCH 05/10] =?UTF-8?q?chore:=20=EC=A7=81=EA=B4=80=EC=A0=81?= =?UTF-8?q?=EC=9D=B8=20=EB=84=A4=EC=9D=B4=EB=B0=8D=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/History/components/MyLecueBook/index.tsx | 2 +- src/components/common/LecueBook/index.tsx | 2 +- src/libs/hooks/useDeleteFavorite.ts | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/History/components/MyLecueBook/index.tsx b/src/History/components/MyLecueBook/index.tsx index 116a45fc..571b020b 100644 --- a/src/History/components/MyLecueBook/index.tsx +++ b/src/History/components/MyLecueBook/index.tsx @@ -26,7 +26,7 @@ function MyLecueBook(props: LecueBookProps) { const deleteBookMutation = useDeleteMyBook(); const postFavoriteMutation = usePostFavorite(); - const deleteFavoriteMutation = useDeleteFavorite('myLecueBook'); + const deleteFavoriteMutation = useDeleteFavorite('lecueBook'); const convertNoteCount = (noteNum: number) => { setNoteCount(noteNum.toLocaleString()); diff --git a/src/components/common/LecueBook/index.tsx b/src/components/common/LecueBook/index.tsx index cf70620e..ef5f2fa7 100644 --- a/src/components/common/LecueBook/index.tsx +++ b/src/components/common/LecueBook/index.tsx @@ -28,7 +28,7 @@ function LecueBook(props: LecueBookProps) { const navigate = useNavigate(); - const deleteMypageMutation = useDeleteFavorite('favoriteBook'); + const deleteMypageMutation = useDeleteFavorite('mypage'); const deleteHomeMutation = useDeleteFavorite('home'); const handleClickFavoriteBtn = ( diff --git a/src/libs/hooks/useDeleteFavorite.ts b/src/libs/hooks/useDeleteFavorite.ts index 54f5f8ff..041769e4 100644 --- a/src/libs/hooks/useDeleteFavorite.ts +++ b/src/libs/hooks/useDeleteFavorite.ts @@ -4,25 +4,25 @@ import { useNavigate } from 'react-router-dom'; import { QUERY_KEY } from '../../constants/queryKeys'; import deleteFavorite from '../api/deleteFavorite'; -const useDeleteFavorite = (state: string) => { +const useDeleteFavorite = (location: string) => { const navigate = useNavigate(); const queryClient = useQueryClient(); - const handleRefetchQueries = (state: string) => { - switch (state) { + const handleRefetchQueries = (location: string) => { + switch (location) { case 'home': queryClient.refetchQueries([QUERY_KEY.favorite.getFavoriteHome], { exact: true, }); break; - case 'favoriteBook': + case 'mypage': queryClient.refetchQueries([QUERY_KEY.favorite.getFavoriteMypage], { exact: true, }); break; - case 'myLecueBook': + case 'lecueBook': queryClient.refetchQueries([QUERY_KEY.favorite.getFavoriteLecueBook], { exact: true, }); @@ -36,7 +36,7 @@ const useDeleteFavorite = (state: string) => { }, onError: () => navigate('/error'), onSuccess: () => { - handleRefetchQueries(state); + handleRefetchQueries(location); }, }); return mutation.mutate; From 595572f0c4624eea12ece6904a8cea74283d7fce Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Wed, 8 May 2024 22:35:08 +0900 Subject: [PATCH 06/10] =?UTF-8?q?chore:=20=EC=BF=BC=EB=A6=AC=ED=82=A4=20?= =?UTF-8?q?=EC=A7=81=EA=B4=80=EC=A0=81=EC=9D=B8=20=EB=84=A4=EC=9D=B4?= =?UTF-8?q?=EB=B0=8D=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/constants/queryKeys.ts | 6 +++--- src/libs/hooks/useDeleteFavorite.ts | 6 +++--- src/libs/hooks/useGetFavorite.ts | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/constants/queryKeys.ts b/src/constants/queryKeys.ts index f2452527..e44f0ceb 100644 --- a/src/constants/queryKeys.ts +++ b/src/constants/queryKeys.ts @@ -1,8 +1,8 @@ export const QUERY_KEY = { favorite: { - getFavoriteHome: 'get-favorite', - getFavoriteMypage: 'get-mypage-favorite', - getFavoriteLecueBook: 'get-my-lecueBook', + getHomeFavorite: 'get-favorite', + getMypageFavorite: 'get-mypage-favorite', + getLecueBookFavorite: 'get-my-lecueBook', }, nickname: { getNickName: 'get-nickname', diff --git a/src/libs/hooks/useDeleteFavorite.ts b/src/libs/hooks/useDeleteFavorite.ts index 041769e4..2444e9b1 100644 --- a/src/libs/hooks/useDeleteFavorite.ts +++ b/src/libs/hooks/useDeleteFavorite.ts @@ -11,19 +11,19 @@ const useDeleteFavorite = (location: string) => { const handleRefetchQueries = (location: string) => { switch (location) { case 'home': - queryClient.refetchQueries([QUERY_KEY.favorite.getFavoriteHome], { + queryClient.refetchQueries([QUERY_KEY.favorite.getHomeFavorite], { exact: true, }); break; case 'mypage': - queryClient.refetchQueries([QUERY_KEY.favorite.getFavoriteMypage], { + queryClient.refetchQueries([QUERY_KEY.favorite.getMypageFavorite], { exact: true, }); break; case 'lecueBook': - queryClient.refetchQueries([QUERY_KEY.favorite.getFavoriteLecueBook], { + queryClient.refetchQueries([QUERY_KEY.favorite.getLecueBookFavorite], { exact: true, }); break; diff --git a/src/libs/hooks/useGetFavorite.ts b/src/libs/hooks/useGetFavorite.ts index 316b132f..d2bf806c 100644 --- a/src/libs/hooks/useGetFavorite.ts +++ b/src/libs/hooks/useGetFavorite.ts @@ -8,7 +8,7 @@ const useGetFavorite = () => { const navigate = useNavigate(); const { isLoading: isLoadingFavorite, data: favorite } = useQuery({ - queryKey: [QUERY_KEY.favorite.getFavoriteHome], + queryKey: [QUERY_KEY.favorite.getHomeFavorite], queryFn: () => getFavorite(), onError: () => navigate('/error'), refetchOnWindowFocus: false, From c2da51a8874c88116e813daa5faeb928c238beca Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Wed, 8 May 2024 22:35:17 +0900 Subject: [PATCH 07/10] =?UTF-8?q?chore:=20=EC=83=81=EC=88=98=ED=99=94?= =?UTF-8?q?=ED=95=9C=20=EC=BF=BC=EB=A6=AC=ED=82=A4=EB=A1=9C=20=EB=8C=80?= =?UTF-8?q?=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/History/hooks/useDeleteMyBook.ts | 3 ++- src/History/hooks/useGetMyBookList.ts | 3 ++- src/History/hooks/useGetMyFavorite.ts | 3 ++- src/libs/hooks/usePostFavorite.ts | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/History/hooks/useDeleteMyBook.ts b/src/History/hooks/useDeleteMyBook.ts index 413bbeae..ccdc9d29 100644 --- a/src/History/hooks/useDeleteMyBook.ts +++ b/src/History/hooks/useDeleteMyBook.ts @@ -1,6 +1,7 @@ import { useMutation, useQueryClient } from 'react-query'; import { useNavigate } from 'react-router-dom'; +import { QUERY_KEY } from '../../constants/queryKeys'; import { deleteMyBook } from '../api/deleteMyBook'; const useDeleteMyBook = () => { @@ -12,7 +13,7 @@ const useDeleteMyBook = () => { }, onError: () => navigate('/error'), onSuccess: () => { - queryClient.refetchQueries(['get-my-lecueBook'], { + queryClient.refetchQueries([QUERY_KEY.favorite.getLecueBookFavorite], { exact: true, }); }, diff --git a/src/History/hooks/useGetMyBookList.ts b/src/History/hooks/useGetMyBookList.ts index 0141d8a0..d039e01d 100644 --- a/src/History/hooks/useGetMyBookList.ts +++ b/src/History/hooks/useGetMyBookList.ts @@ -1,12 +1,13 @@ import { useQuery } from 'react-query'; import { useNavigate } from 'react-router-dom'; +import { QUERY_KEY } from '../../constants/queryKeys'; import { getMyBookList } from '../api/getMyBookList'; export default function useGetMyBookList() { const navigate = useNavigate(); const { data: myBookList, isLoading } = useQuery( - ['get-my-lecueBook'], + [QUERY_KEY.favorite.getLecueBookFavorite], () => getMyBookList(), { onError: () => { diff --git a/src/History/hooks/useGetMyFavorite.ts b/src/History/hooks/useGetMyFavorite.ts index 23956ee3..bc613e06 100644 --- a/src/History/hooks/useGetMyFavorite.ts +++ b/src/History/hooks/useGetMyFavorite.ts @@ -1,12 +1,13 @@ import { useQuery } from 'react-query'; import { useNavigate } from 'react-router-dom'; +import { QUERY_KEY } from '../../constants/queryKeys'; import { getMyFavorite } from '../api/getMyFavorite'; export default function useGetMyFavorite() { const navigate = useNavigate(); const { data: myFavoriteList, isLoading } = useQuery( - ['get-mypage-favorite'], + [QUERY_KEY.favorite.getMypageFavorite], () => getMyFavorite(), { onError: () => { diff --git a/src/libs/hooks/usePostFavorite.ts b/src/libs/hooks/usePostFavorite.ts index 935869fa..8fd071af 100644 --- a/src/libs/hooks/usePostFavorite.ts +++ b/src/libs/hooks/usePostFavorite.ts @@ -1,6 +1,7 @@ import { useMutation, useQueryClient } from 'react-query'; import { useNavigate } from 'react-router-dom'; +import { QUERY_KEY } from '../../constants/queryKeys'; import postFavorite from '../api/postFavorite'; const usePostFavorite = () => { @@ -12,7 +13,7 @@ const usePostFavorite = () => { }, onError: () => navigate('/error'), onSuccess: () => { - queryClient.refetchQueries(['get-my-lecueBook'], { + queryClient.refetchQueries([QUERY_KEY.favorite.getLecueBookFavorite], { exact: true, }); }, From 3f97ce3e222f536ac82b9c380d50cb7aa424e05a Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Wed, 8 May 2024 22:35:48 +0900 Subject: [PATCH 08/10] =?UTF-8?q?chore:=20=EC=BF=BC=EB=A6=AC=ED=82=A4=20?= =?UTF-8?q?=ED=98=95=EC=8B=9D=20=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/constants/queryKeys.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/constants/queryKeys.ts b/src/constants/queryKeys.ts index e44f0ceb..44695646 100644 --- a/src/constants/queryKeys.ts +++ b/src/constants/queryKeys.ts @@ -1,8 +1,8 @@ export const QUERY_KEY = { favorite: { - getHomeFavorite: 'get-favorite', + getHomeFavorite: 'get-home-favorite', getMypageFavorite: 'get-mypage-favorite', - getLecueBookFavorite: 'get-my-lecueBook', + getLecueBookFavorite: 'get-lecueBook-favorite', }, nickname: { getNickName: 'get-nickname', From 1111cd2078d06432ef7eba7ff03ab9290aa06338 Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Wed, 8 May 2024 22:42:53 +0900 Subject: [PATCH 09/10] =?UTF-8?q?feat:=20=ED=99=88=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EB=A0=88=ED=81=90=EB=B6=81=20=EB=B6=88=EB=9F=AC=EC=98=A4?= =?UTF-8?q?=EB=8A=94=20=EC=BF=BC=EB=A6=AC=ED=82=A4=20=EC=83=81=EC=88=98?= =?UTF-8?q?=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Home/constants/homeQueryKey.ts | 3 +++ src/Home/hooks/useGetLecueBook.ts | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 src/Home/constants/homeQueryKey.ts diff --git a/src/Home/constants/homeQueryKey.ts b/src/Home/constants/homeQueryKey.ts new file mode 100644 index 00000000..ad01508a --- /dev/null +++ b/src/Home/constants/homeQueryKey.ts @@ -0,0 +1,3 @@ +export const HOME_QUERY_KEY = { + getLecueBook: ['get-lecue-book'], +}; diff --git a/src/Home/hooks/useGetLecueBook.ts b/src/Home/hooks/useGetLecueBook.ts index a43b43ea..bb6db306 100644 --- a/src/Home/hooks/useGetLecueBook.ts +++ b/src/Home/hooks/useGetLecueBook.ts @@ -2,12 +2,13 @@ import { useQuery } from 'react-query'; import { useNavigate } from 'react-router-dom'; import getLecueBook from '../api/getLecueBook'; +import { HOME_QUERY_KEY } from '../constants/homeQueryKey'; const useGetLecueBook = () => { const navigate = useNavigate(); const { isLoading: isLoadingLecueBook, data: lecueBook } = useQuery({ - queryKey: ['get-lecue-book'], + queryKey: HOME_QUERY_KEY.getLecueBook, queryFn: () => getLecueBook(), onError: () => navigate('/error'), refetchOnWindowFocus: false, From 99077eeadb16eca59715a294bfc66992487c13ea Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Wed, 8 May 2024 22:43:22 +0900 Subject: [PATCH 10/10] =?UTF-8?q?chore:=20=EC=BF=BC=EB=A6=AC=20=ED=82=A4?= =?UTF-8?q?=20=EB=B0=B0=EC=97=B4=20=ED=98=95=EC=8B=9D=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/History/hooks/useDeleteMyBook.ts | 2 +- src/History/hooks/useGetMyBookList.ts | 2 +- src/History/hooks/useGetMyFavorite.ts | 2 +- src/constants/queryKeys.ts | 8 ++++---- src/libs/hooks/useDeleteFavorite.ts | 6 +++--- src/libs/hooks/useGetFavorite.ts | 2 +- src/libs/hooks/useGetMyNickname.ts | 2 +- src/libs/hooks/usePostFavorite.ts | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/History/hooks/useDeleteMyBook.ts b/src/History/hooks/useDeleteMyBook.ts index ccdc9d29..7f50986b 100644 --- a/src/History/hooks/useDeleteMyBook.ts +++ b/src/History/hooks/useDeleteMyBook.ts @@ -13,7 +13,7 @@ const useDeleteMyBook = () => { }, onError: () => navigate('/error'), onSuccess: () => { - queryClient.refetchQueries([QUERY_KEY.favorite.getLecueBookFavorite], { + queryClient.refetchQueries(QUERY_KEY.favorite.getLecueBookFavorite, { exact: true, }); }, diff --git a/src/History/hooks/useGetMyBookList.ts b/src/History/hooks/useGetMyBookList.ts index d039e01d..57c8877f 100644 --- a/src/History/hooks/useGetMyBookList.ts +++ b/src/History/hooks/useGetMyBookList.ts @@ -7,7 +7,7 @@ import { getMyBookList } from '../api/getMyBookList'; export default function useGetMyBookList() { const navigate = useNavigate(); const { data: myBookList, isLoading } = useQuery( - [QUERY_KEY.favorite.getLecueBookFavorite], + QUERY_KEY.favorite.getLecueBookFavorite, () => getMyBookList(), { onError: () => { diff --git a/src/History/hooks/useGetMyFavorite.ts b/src/History/hooks/useGetMyFavorite.ts index bc613e06..d4270155 100644 --- a/src/History/hooks/useGetMyFavorite.ts +++ b/src/History/hooks/useGetMyFavorite.ts @@ -7,7 +7,7 @@ import { getMyFavorite } from '../api/getMyFavorite'; export default function useGetMyFavorite() { const navigate = useNavigate(); const { data: myFavoriteList, isLoading } = useQuery( - [QUERY_KEY.favorite.getMypageFavorite], + QUERY_KEY.favorite.getMypageFavorite, () => getMyFavorite(), { onError: () => { diff --git a/src/constants/queryKeys.ts b/src/constants/queryKeys.ts index 44695646..c299409a 100644 --- a/src/constants/queryKeys.ts +++ b/src/constants/queryKeys.ts @@ -1,10 +1,10 @@ export const QUERY_KEY = { favorite: { - getHomeFavorite: 'get-home-favorite', - getMypageFavorite: 'get-mypage-favorite', - getLecueBookFavorite: 'get-lecueBook-favorite', + getHomeFavorite: ['get-home-favorite'], + getMypageFavorite: ['get-mypage-favorite'], + getLecueBookFavorite: ['get-lecueBook-favorite'], }, nickname: { - getNickName: 'get-nickname', + getNickName: ['get-nickname'], }, }; diff --git a/src/libs/hooks/useDeleteFavorite.ts b/src/libs/hooks/useDeleteFavorite.ts index 2444e9b1..74f4609a 100644 --- a/src/libs/hooks/useDeleteFavorite.ts +++ b/src/libs/hooks/useDeleteFavorite.ts @@ -11,19 +11,19 @@ const useDeleteFavorite = (location: string) => { const handleRefetchQueries = (location: string) => { switch (location) { case 'home': - queryClient.refetchQueries([QUERY_KEY.favorite.getHomeFavorite], { + queryClient.refetchQueries(QUERY_KEY.favorite.getHomeFavorite, { exact: true, }); break; case 'mypage': - queryClient.refetchQueries([QUERY_KEY.favorite.getMypageFavorite], { + queryClient.refetchQueries(QUERY_KEY.favorite.getMypageFavorite, { exact: true, }); break; case 'lecueBook': - queryClient.refetchQueries([QUERY_KEY.favorite.getLecueBookFavorite], { + queryClient.refetchQueries(QUERY_KEY.favorite.getLecueBookFavorite, { exact: true, }); break; diff --git a/src/libs/hooks/useGetFavorite.ts b/src/libs/hooks/useGetFavorite.ts index d2bf806c..61ae6e39 100644 --- a/src/libs/hooks/useGetFavorite.ts +++ b/src/libs/hooks/useGetFavorite.ts @@ -8,7 +8,7 @@ const useGetFavorite = () => { const navigate = useNavigate(); const { isLoading: isLoadingFavorite, data: favorite } = useQuery({ - queryKey: [QUERY_KEY.favorite.getHomeFavorite], + queryKey: QUERY_KEY.favorite.getHomeFavorite, queryFn: () => getFavorite(), onError: () => navigate('/error'), refetchOnWindowFocus: false, diff --git a/src/libs/hooks/useGetMyNickname.ts b/src/libs/hooks/useGetMyNickname.ts index 46d7235f..5b2a5cdf 100644 --- a/src/libs/hooks/useGetMyNickname.ts +++ b/src/libs/hooks/useGetMyNickname.ts @@ -7,7 +7,7 @@ import { getMyNickName } from '../api/getMyNickName'; export default function useGetMyNickName() { const navigate = useNavigate(); const { data: myNickName, isLoading } = useQuery( - [QUERY_KEY.nickname.getNickName], + QUERY_KEY.nickname.getNickName, () => getMyNickName(), { onError: () => { diff --git a/src/libs/hooks/usePostFavorite.ts b/src/libs/hooks/usePostFavorite.ts index 8fd071af..99f00d75 100644 --- a/src/libs/hooks/usePostFavorite.ts +++ b/src/libs/hooks/usePostFavorite.ts @@ -13,7 +13,7 @@ const usePostFavorite = () => { }, onError: () => navigate('/error'), onSuccess: () => { - queryClient.refetchQueries([QUERY_KEY.favorite.getLecueBookFavorite], { + queryClient.refetchQueries(QUERY_KEY.favorite.getLecueBookFavorite, { exact: true, }); },