From bd8c76bc1df682246551dace67e1f6cbc6237983 Mon Sep 17 00:00:00 2001 From: un0211 Date: Thu, 4 Jul 2024 13:54:58 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=9B=A0=20=20fix(#168):=20=EC=B4=88?= =?UTF-8?q?=EB=8C=80=EC=95=8C=EB=A6=BC=EC=97=90=EC=84=9C=20user=20?= =?UTF-8?q?=EC=A0=91=EA=B7=BC=20=EC=8B=9C=20=EC=97=90=EB=9F=AC=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/InviteNotice/index.tsx | 6 ------ src/layouts/MainLayout.tsx | 2 ++ src/pages/_app.tsx | 2 -- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/components/InviteNotice/index.tsx b/src/components/InviteNotice/index.tsx index 64104996..6cbb2acb 100644 --- a/src/components/InviteNotice/index.tsx +++ b/src/components/InviteNotice/index.tsx @@ -1,19 +1,13 @@ import { useEffect, useState } from 'react'; -import { useSelector } from 'react-redux'; import { toast, ToastContainer } from 'react-toastify'; import 'react-toastify/dist/ReactToastify.css'; import { TOAST_DEFAULT_SETTING } from '@/constants'; import useFetchData from '@/hooks/useFetchData'; import { getInvitationsList } from '@/services/getService'; -import { RootState } from '@/store/store'; import { Invitation, InvitationsResponse } from '@/types/Invitation.interface'; export default function InvitationNotice() { - const { user } = useSelector((state: RootState) => state.user); - - if (!user) return null; - // NOTE: 3초마다 refetch 하도록 설정 const { data } = useFetchData(['invitations', 'notice'], () => getInvitationsList(), 5000); const [savedInvitations, setSavedInvitations] = useState(data?.invitations || []); diff --git a/src/layouts/MainLayout.tsx b/src/layouts/MainLayout.tsx index e4d4a246..119f0f03 100644 --- a/src/layouts/MainLayout.tsx +++ b/src/layouts/MainLayout.tsx @@ -2,6 +2,7 @@ import { useRouter } from 'next/router'; import { useSelector } from 'react-redux'; import Header from '@/components/Header'; +import InvitationNotice from '@/components/InviteNotice'; import Sidebar from '@/components/Sidebar'; import { RootState } from '@/store/store'; @@ -31,6 +32,7 @@ export default function MainLayout({ children }: { children: React.ReactNode }) return (
+ {user && }
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index 67197907..f1b243cd 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -6,7 +6,6 @@ import Head from 'next/head'; import { Provider } from 'react-redux'; import { PersistGate } from 'redux-persist/integration/react'; -import InvitationNotice from '@/components/InviteNotice'; import Modal from '@/components/Modal'; import Redirect from '@/components/Redirect'; import MainLayout from '@/layouts/MainLayout'; @@ -27,7 +26,6 @@ export default function App({ Component, pageProps }: AppProps) { -