Merge remote-tracking branch 'origin/dev' into refactor/recipeFetch

Author: mtm-git1018

public/fonts/NanumSquareNeo-Variable.ttf

@@ -1,12 +1,13 @@
-import FooterWrapper from '@/shared/components/footer/FooterWrapper';
 import Header from '@/shared/components/header/Header';
 
 function NoLayout({ children }: { children: React.ReactNode }) {
   return (
     <>
-      <Header className="bg-transparent w-full h-[44px] md:h-[60px] flex items-center justify-between px-[12px] fixed top-0 left-0 z-50 transition-transform duration-200 ease-in-ou" />
+      <Header
+        isMain={true}
+        className="w-full h-[44px] md:h-[60px] flex items-center justify-between px-[12px] fixed top-0 left-0 z-50 transition-transform duration-200 ease-in-ou"
+      />
       <main className="flex flex-1">{children}</main>
-      <FooterWrapper />
     </>
   );
 }

src/app/(main)/layout.tsx

@@ -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);

src/domains/login/hook/useLoginRedirect.ts

@@ -44,11 +44,23 @@ function CocktailDrop({ isDesktop = false }: CocktailDropProps) {
       );
 
       // 로고 위에서 아래로 자연스럽게 등장
+      const screenWidth = window.innerWidth;
+      const viewportHeight = window.innerHeight;
+      const isTablet = screenWidth >= 640 && screenWidth < 1024;
+      const isMobile = screenWidth < 640;
+
+      // 뷰포트 높이 기반으로 로고 위치 계산
+      const logoFinalY = isMobile
+        ? `-${viewportHeight * 0.3}px`
+        : isTablet
+          ? `-${viewportHeight * -0.8}px`
+          : '0px';
+
       gsap.fromTo(
         logoRef.current,
         { y: -300, opacity: 0 },
         {
-          y: !isDesktop ? -230 : -18, // 데스크톱이 아닐 때 더 위로
+          y: logoFinalY, // 뷰포트 높이 기반 계산
           opacity: 1,
           duration: 3,
           ease: 'power3.out',
@@ -69,7 +81,7 @@ function CocktailDrop({ isDesktop = false }: CocktailDropProps) {
   return (
     <div
       ref={containerRef}
-      className="relative w-full lg:min-h-[110vh] min-h-[89vh] flex flex-col md:justify-center justify-end items-center mt-10 overflow-hidden"
+      className="relative w-full lg:min-h-[120vh] md:min-h-[95vh] min-h-[87vh] flex flex-col lg:justify-center md:justify-center justify-end items-center mt-10 overflow-hidden"
       id="scroll-fixed"
     >
       {/* 대각선 줄 1 */}
@@ -84,7 +96,7 @@ function CocktailDrop({ isDesktop = false }: CocktailDropProps) {
       />
 
       {/* 로고 */}
-      <div ref={logoRef} className="absolute md:w-115 w-85 md:h-90 h-40">
+      <div ref={logoRef} className="absolute z-4 md:w-115 w-65 md:h-90 h-40">
         <Image
           src="/logo.svg"
           alt="로고 이미지"
@@ -95,20 +107,17 @@ function CocktailDrop({ isDesktop = false }: CocktailDropProps) {
         />
       </div>
 
-      <div className="w-full md:h-90 h-30"></div>
-
       {/* 컵 이미지 - 모바일에서 바닥에 붙도록 */}
-      <div className="md:relative absolute bottom-0">
+      <div className="z-5 absolute bottom-0">
         <Image
           src={Cocktailcup}
           alt="칵테일 컵"
-          width={900}
-          height={700}
           priority
-          className="md:w-auto md:h-auto w-[500px] h-[400px] object-cover"
+          style={{ height: 'auto' }}
+          className="md:w-[700px] w-[500px] object-contain"
         />
       </div>
-      <div className="absolute md:bottom-35 bottom-20 flex items-center justify-center z-3 w-full">
+      <div className="absolute md:bottom-35 bottom-20 flex items-center justify-center z-10 w-full">
         <PassBtn />
       </div>
     </div>

src/domains/main/cocktailDrop/CocktailDrop.tsx

@@ -3,8 +3,8 @@ import Image from 'next/image';
 function HomeLogo({ isDesktop }: { isDesktop: boolean }) {
   return (
     <div
-      className="z-5 absolute md:top-8 md:left-10 md:translate-none top-13 left-1/2 -translate-x-1/2"
-      style={{ width: !isDesktop ? 400 : 700, height: !isDesktop ? 70 : 240 }}
+      className="z-5 absolute md:top-22 md:left-10 md:translate-none top-30 left-1/2 -translate-x-1/2"
+      style={{ width: !isDesktop ? 400 : 580, height: !isDesktop ? 70 : 210 }}
     >
       <Image src={'/logo.svg'} alt="로고 이미지" fill priority className="object-contain" />
     </div>

src/domains/main/components/3d/HomeLogo.tsx

@@ -42,8 +42,8 @@ function Model({ onLoaded }: Props) {
   return (
     <primitive
       object={scene}
-      scale={5.8}
-      position={[0, -1.2, 0]}
+      scale={4.6}
+      position={[0, -0.6, 0]}
       rotation={[-0.15, Math.PI + 3, 0]}
     />
   );

src/domains/main/components/3d/HomeModel.tsx

@@ -2,8 +2,9 @@ function HomeText({ isDesktop }: { isDesktop: boolean }) {
   return (
     <>
       {!isDesktop ? (
-        <p className="absolute top-32 text-sm left-1/2 -translate-x-1/2 whitespace-nowrap">
-          어떤 칵테일이 끌리시나요? SSoul이 쉽게 골라드릴게요.
+        <p className="absolute top-48 text-sm left-1/2 -translate-x-1/2 text-center mt-4">
+          어떤 칵테일이 끌리시나요? <br />
+          SSoul이 쉽게 골라드릴게요.
         </p>
       ) : (
         <p className="absolute bottom-45 right-12 font-serif text-xl text-right font-normal z-20">

src/domains/main/components/3d/HomeText.tsx

@@ -19,7 +19,7 @@ function ModelImage({ onLoaded }: Props) {
           width={260}
           height={290}
           priority
-          className="object-cover w-[300px] h-[390px]"
+          className="object-cover w-[300px] h-[350px]"
         />
       </div>
     </div>

src/domains/main/components/3d/ModelImage.tsx

@@ -14,6 +14,10 @@ function StarMain() {
   useEffect(() => {
     if (!background.current || !foreground.current) return;
 
+    // 모바일에서는 별 애니메이션 비활성화
+    const isMobile = window.innerWidth < 768;
+    if (isMobile) return;
+
     const bgX = gsap.quickSetter(background.current, 'x', 'px');
     const bgY = gsap.quickSetter(background.current, 'y', 'px');
     const bgRotate = gsap.quickSetter(background.current, 'rotate', 'deg');
@@ -43,20 +47,11 @@ function StarMain() {
       mouse.current = { x, y };
     };
 
-    const handleTouchMove = (e: TouchEvent) => {
-      const touch = e.touches[0];
-      const x = (touch.clientX / window.innerWidth - 0.5) * 2;
-      const y = (touch.clientY / window.innerHeight - 0.5) * 2;
-      mouse.current = { x, y };
-    };
-
     window.addEventListener('mousemove', handleMouseMove);
-    window.addEventListener('touchmove', handleTouchMove);
     rafId.current = requestAnimationFrame(update);
 
     return () => {
       window.removeEventListener('mousemove', handleMouseMove);
-      window.removeEventListener('touchmove', handleTouchMove);
       if (rafId.current) cancelAnimationFrame(rafId.current);
     };
   }, []);