diff --git a/src/app/(route)/login/google/page.tsx b/src/app/(route)/login/google/page.tsx index 65b5a220..999840b8 100644 --- a/src/app/(route)/login/google/page.tsx +++ b/src/app/(route)/login/google/page.tsx @@ -6,9 +6,14 @@ import { useRouter } from 'next/navigation' import Loading from '@/_components/common/Loading' import { useMainQuery } from '@/_hooks/useMainQuery' import ErrorPage from '@/(route)/error' +import { useCustomQuery } from '@/_hooks/useCustomQuery' +import { mainInfo } from '@/_service/main' const OauthPage = () => { - const { isLoading, isError, data } = useMainQuery() + const { isLoading, isError, data } = useCustomQuery( + ['main'], + mainInfo, + ) const [accessToken, setAccessToken] = useState('') const [refreshToken, setRefreshToken] = useState('') const router = useRouter() diff --git a/src/app/(route)/main/page.tsx b/src/app/(route)/main/page.tsx index 23efa390..68831918 100644 --- a/src/app/(route)/main/page.tsx +++ b/src/app/(route)/main/page.tsx @@ -1,14 +1,17 @@ 'use client' import MainPage from '@/_components/main/MainPage' -import { useMainQuery } from '@/_hooks/useMainQuery' import InactivePage from '@/_components/inactive/InActivePage' import Loading from '@/_components/common/Loading' import Error from '@/(route)/error' +import { useCustomQuery } from '@/_hooks/useCustomQuery' +import { mainInfo } from '@/_service/main' export default function MainpagePage() { - const { isLoading, isError, data } = useMainQuery() - + const { isLoading, isError, data } = useCustomQuery( + ['main'], + mainInfo, + ) if (isLoading) { return } diff --git a/src/app/(route)/mypage/page.tsx b/src/app/(route)/mypage/page.tsx index f4437232..a3963d20 100644 --- a/src/app/(route)/mypage/page.tsx +++ b/src/app/(route)/mypage/page.tsx @@ -2,14 +2,18 @@ import MypageSecondBoxContainer from '@/_components/mypage/containers/MypageSecondBoxContainer' import MypageThirdBoxContainer from '@/_components/mypage/containers/MypageThirdBoxContainer' -import { useMyPageQuery } from '@/_hooks/useMypageQuery' import Loading from '@/_components/common/Loading' import Profile from '@/_components/information/Profile' import ErrorPage from '@/(route)/error' import Header from '@/_components/layout/Header' +import { useCustomQuery } from '@/_hooks/useCustomQuery' +import { myPageInfo } from '@/_service/mypage' export default function MyPage() { - const { isLoading, isError, data } = useMyPageQuery() + const { isLoading, isError, data } = useCustomQuery( + ['myPage'], + myPageInfo, + ) if (isLoading) { return } diff --git a/src/app/_hooks/useCustomQuery.ts b/src/app/_hooks/useCustomQuery.ts new file mode 100644 index 00000000..9dd720b7 --- /dev/null +++ b/src/app/_hooks/useCustomQuery.ts @@ -0,0 +1,14 @@ +'use client' +import { useQuery } from '@tanstack/react-query' + +export const useCustomQuery = ( + queryKey: string[], + queryFn?: () => Promise, +) => { + const { isLoading, isError, data } = useQuery({ + queryKey, + queryFn: queryFn, + }) + + return { isLoading, isError, data } +} diff --git a/src/app/_hooks/useMainQuery.ts b/src/app/_hooks/useMainQuery.ts deleted file mode 100644 index 605df8fe..00000000 --- a/src/app/_hooks/useMainQuery.ts +++ /dev/null @@ -1,14 +0,0 @@ -'use client' - -import { useQuery } from '@tanstack/react-query' -import { mainInfo } from '@/_service/main' - -export const useMainQuery = () => { - const queryKey = ['main'] - const { isLoading, isError, data } = useQuery({ - queryKey, - queryFn: mainInfo, - }) - - return { isLoading, isError, data } -} diff --git a/src/app/_hooks/useMypageQuery.ts b/src/app/_hooks/useMypageQuery.ts deleted file mode 100644 index d5cce117..00000000 --- a/src/app/_hooks/useMypageQuery.ts +++ /dev/null @@ -1,14 +0,0 @@ -'use client' - -import { useQuery } from '@tanstack/react-query' -import { myPageInfo } from '@/_service/mypage' - -export const useMyPageQuery = () => { - const queryKey = ['myPage'] - const { isLoading, isError, data } = useQuery({ - queryKey, - queryFn: myPageInfo, - }) - - return { isLoading, isError, data } -} diff --git a/src/app/_hooks/useUserinfoPostMutation.ts b/src/app/_hooks/useUserinfoPostMutation.ts deleted file mode 100644 index e69de29b..00000000 diff --git a/src/app/_hooks/useWebSocket.ts b/src/app/_hooks/useWebSocket.ts index f90fd2e4..17fe81dd 100644 --- a/src/app/_hooks/useWebSocket.ts +++ b/src/app/_hooks/useWebSocket.ts @@ -1,9 +1,9 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { realTimeMessagesState } from '@/_atom/chat' import { CompatClient, Stomp } from '@stomp/stompjs' -import Cookies from 'js-cookie' import { useEffect, useState } from 'react' import { useSetRecoilState } from 'recoil' +import Cookies from 'js-cookie' import SockJS from 'sockjs-client' const useWebsocket = (roomId: number) => {