Merge branch 'dev' of https://github.com/prgrms-web-devcourse-final-project/WEB5_6_HaeDokCoding_FE into dev

EunbinJung · EunbinJung · commit 2591b6971e0a · 2025-10-16T10:38:40.000+09:00
diff --git a/public/fonts/NanumSquareNeo-Variable.ttf b/public/fonts/NanumSquareNeo-Variable.ttf
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -1,6 +1,5 @@
 import '@/shared/styles/global.css';
 import type { Metadata } from 'next';
-import '@/shared/styles/global.css';
 import { Toaster } from 'react-hot-toast';
 import ScrollTopBtnWrapper from '@/shared/components/scroll-top/ScrollTopBtnWrapper';
 import KaKaoScript from './api/kakao/KaKaoScript';
diff --git a/src/domains/login/hook/useLoginRedirect.ts b/src/domains/login/hook/useLoginRedirect.ts
@@ -1,5 +1,5 @@
 import { useAuthStore } from '@/domains/shared/store/auth';
-import { useEffect, useState } from 'react';
+import { useEffect, useState, useRef } from 'react';
 import { usePathname, useRouter } from 'next/navigation';
 import { getCookie, removeCookie } from '@/domains/shared/auth/utils/cookie';
 import { useToast } from '@/shared/hook/useToast';
@@ -12,6 +12,7 @@ export const useLoginRedirect = () => {
 
   const [loading, setLoading] = useState(true);
   const [welcomeModalOpen, setWelcomeModalOpen] = useState(false);
+  const hasShownToast = useRef(false);
 
   useEffect(() => {
     if (!user && loading) {
@@ -39,7 +40,8 @@ export const useLoginRedirect = () => {
 
     if (pathname.startsWith('/login/user/first-user')) {
       setWelcomeModalOpen(true);
-    } else if (pathname.startsWith('/login/user/success')) {
+    } else if (pathname.startsWith('/login/user/success') && !hasShownToast.current) {
+      hasShownToast.current = true;
       toastSuccess(`${user.nickname}님 \n 로그인 성공 🎉`);
       router.replace(preLoginPath);
       setTimeout(() => removeCookie('preLoginPath'), 500);
diff --git a/src/domains/main/api/useSSENotification.ts b/src/domains/main/api/useSSENotification.ts
@@ -0,0 +1,64 @@
+import { useEffect, useRef, useState } from 'react';
+import { getApi } from '@/app/api/config/appConfig';
+
+export function useSSENotification(isLoggedIn: boolean) {
+  const [hasNewNotification, setHasNewNotification] = useState(false);
+  const eventSourceRef = useRef<EventSource | null>(null);
+  const isConnectingRef = useRef(false);
+
+  useEffect(() => {
+    // 로그인 안 했으면 연결 안 함
+    if (!isLoggedIn) {
+      if (eventSourceRef.current) {
+        eventSourceRef.current.close();
+        eventSourceRef.current = null;
+        isConnectingRef.current = false;
+      }
+      return;
+    }
+
+    // 이미 연결 중이거나 연결되어 있으면 중복 방지
+    if (isConnectingRef.current || eventSourceRef.current) {
+      return;
+    }
+
+    isConnectingRef.current = true;
+
+    const eventSource = new EventSource(`${getApi}/me/subscribe`, {
+      withCredentials: true,
+    });
+
+    eventSourceRef.current = eventSource;
+
+    eventSource.onopen = () => {
+      isConnectingRef.current = false;
+    };
+
+    eventSource.onmessage = () => {
+      setHasNewNotification(true);
+    };
+
+    eventSource.onerror = () => {
+      isConnectingRef.current = false;
+
+      if (eventSource.readyState === EventSource.CLOSED) {
+        eventSourceRef.current = null;
+      }
+    };
+
+    // cleanup 함수
+    return () => {
+      if (eventSourceRef.current) {
+        eventSourceRef.current.close();
+        eventSourceRef.current = null;
+      }
+      isConnectingRef.current = false;
+    };
+  }, [isLoggedIn]); // isLoggedIn만 의존성으로
+
+  const clearNotification = () => {
+    setHasNewNotification(false);
+  };
+
+  return { hasNewNotification, clearNotification };
+}
diff --git a/src/domains/main/components/mainSlide/components/mobile/MobileAbv.tsx b/src/domains/main/components/mainSlide/components/mobile/MobileAbv.tsx
@@ -53,7 +53,10 @@ function MobileAbv() {
             <h2 className="text-xl sm:text-2xl font-black text-white">내 알콜도수 UP</h2>
             <button
               type="button"
-              className={clsx(`block duration-300 sm:hidden`, isClick ? 'rotate-135' : 'rotate-0')}
+              className={clsx(
+                `block z-1 duration-300 sm:hidden`,
+                isClick ? 'rotate-[135deg]' : 'rotate-0'
+              )}
               onClick={() => setIsClick(!isClick)}
             >
               <Add />
diff --git a/src/domains/main/components/mainSlide/components/mobile/MobileSlideCommunity.tsx b/src/domains/main/components/mainSlide/components/mobile/MobileSlideCommunity.tsx
@@ -16,7 +16,10 @@ function MobileSlideCommunity() {
             <h2 className="text-xl sm:text-2xl font-black text-white">함께 나누는 칵테일 이야기</h2>
             <button
               type="button"
-              className={clsx(`block duration-300 sm:hidden`, isClick ? 'rotate-135' : 'rotate-0')}
+              className={clsx(
+                `block duration-300 z-1 sm:hidden`,
+                isClick ? 'rotate-[135deg]' : 'rotate-0'
+              )}
               onClick={() => setIsClick(!isClick)}
             >
               <Add />
diff --git a/src/domains/main/components/mainSlide/components/mobile/MobileSlideTest.tsx b/src/domains/main/components/mainSlide/components/mobile/MobileSlideTest.tsx
@@ -25,10 +25,15 @@ function MobileSlideTest() {
           <h2 className="text-xl sm:text-2xl font-black text-white">AI기반 취향테스트</h2>
           <button
             type="button"
-            className={clsx(`block duration-300 sm:hidden`, isClick ? 'rotate-135' : 'rotate-0')}
-            onClick={() => setIsClick(!isClick)}
+            className={clsx(
+              `block duration-300  z-1 sm:hidden`,
+              isClick ? 'rotate-[135deg]' : 'rotate-0'
+            )}
+            onClick={() => {
+              setIsClick(!isClick);
+            }}
           >
-            <Add />
+            <Add className="pointer-events-none" />
           </button>
         </header>
         <div
diff --git a/src/domains/mypage/components/pages/my-active/MyLike.tsx b/src/domains/mypage/components/pages/my-active/MyLike.tsx
@@ -20,18 +20,6 @@ function MyLike() {
     fetchLike();
   }, []);
 
-  useEffect(() => {
-    console.log(myLike);
-  }, [myLike]);
-
-  return (
-    <section className="flex justify-center">
-      {myLike.length > 0 ? (
-        <PostCard posts={myLike} isLoading={isLoading} />
-      ) : (
-        <div>아직 좋아요를 누른 글이 없습니다</div>
-      )}
-    </section>
-  );
+  return <PostCard posts={myLike} isLoading={isLoading} />;
 }
 export default MyLike;
diff --git a/src/shared/components/header/Header.tsx b/src/shared/components/header/Header.tsx
@@ -46,6 +46,12 @@ function Header({ className, isMain = false }: Props) {
       return;
     }
 
+    if (y <= 10) {
+      setVisible(true);
+      setShowShadow(false);
+      return;
+    }
+
     setLastScrollTop(y); // 마지막 위치 갱신
   }, [lastScrollTop, y]);
 
diff --git a/src/shared/components/header/HeaderBtn.tsx b/src/shared/components/header/HeaderBtn.tsx
@@ -8,26 +8,34 @@ import { useAuthStore } from '@/domains/shared/store/auth';
 import { setPreLoginPath } from '@/domains/shared/auth/utils/setPreLoginPath';
 import { useState } from 'react';
 import LogoutConfirm from '@/domains/login/components/LogoutConfirm';
+import { useSSENotification } from '@/domains/main/api/useSSENotification';
 
 function HeaderBtn({ pathname }: { pathname: string }) {
   const { isLoggedIn } = useAuthStore();
   const router = useRouter();
   const [logoutModalOpen, setLogoutModalOpen] = useState(false);
 
+  const { hasNewNotification, clearNotification } = useSSENotification(isLoggedIn);
+
   const navButtons = [
     {
       icon: Bell,
       label: '알림',
       className: pathname === '/mypage/my-alarm' ? 'text-tertiary' : 'text-current',
       hiddenMobile: true,
-      onClick: () => router.push('/mypage/my-alarm'),
+      onClick: () => {
+        clearNotification();
+        router.push('/mypage/my-alarm');
+      },
+      showBadge: true,
     },
     {
       icon: User,
       label: '마이 페이지',
       className: pathname === '/mypage' ? 'text-tertiary' : 'text-current',
       hiddenMobile: true,
       onClick: () => router.push('/mypage'),
+      showBadge: false,
     },
   ];
 
@@ -50,18 +58,24 @@ function HeaderBtn({ pathname }: { pathname: string }) {
         {/* 아이콘 버튼들 */}
         <div className="flex gap-2">
           {isLoggedIn &&
-            navButtons.map(({ icon: Icon, label, onClick, className, hiddenMobile }) => (
+            navButtons.map(({ icon: Icon, label, onClick, className, hiddenMobile, showBadge }) => (
               <button
                 key={label}
                 aria-label={label}
                 onClick={onClick}
                 className={tw(
                   className,
                   hiddenMobile ? 'hidden sm:flex' : '',
-                  'items-center justify-center rounded-full w-7 h-7 hover:bg-secondary/10 transition-colors duration-200'
+                  'relative items-center justify-center rounded-full w-7 h-7 hover:bg-secondary/10 transition-colors duration-200'
                 )}
               >
                 <Icon width={24} height={24} className="text-current" />
+                {showBadge && hasNewNotification && (
+                  <span
+                    className=" absolute items-center justify-center top-1 right-1 w-2 h-2 bg-red-500
+                    rounded-full"
+                  ></span>
+                )}
               </button>
             ))}
         </div>
