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

Author: mtm-git1018

package-lock.json

@@ -20,7 +20,6 @@
   "dependencies": {
     "@react-three/drei": "^10.7.6",
     "@react-three/fiber": "^9.3.0",
-    "@react-three/gltfjsx": "^4.3.4",
     "@react-three/postprocessing": "^3.0.4",
     "@tanstack/react-query": "^5.90.2",
     "@tanstack/react-virtual": "^3.13.12",

package.json

@@ -0,0 +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" />
+      <main className="flex flex-1">{children}</main>
+      <FooterWrapper />
+    </>
+  );
+}
+export default NoLayout;

public/mobileCocktail.webp

@@ -5,10 +5,15 @@ import Cocktailcup from '../../../../public/CocktailDrop.webp';
 import { useLayoutEffect, useRef } from 'react';
 import gsap from 'gsap';
 import { ScrollTrigger } from 'gsap/all';
+import PassBtn from './PassBtn';
 
 gsap.registerPlugin(ScrollTrigger);
 
-function CocktailDrop() {
+interface CocktailDropProps {
+  isDesktop?: boolean;
+}
+
+function CocktailDrop({ isDesktop = false }: CocktailDropProps) {
   const containerRef = useRef<HTMLDivElement>(null);
   const logoRef = useRef<HTMLDivElement>(null);
   const line1Ref = useRef<HTMLDivElement>(null);
@@ -39,12 +44,11 @@ function CocktailDrop() {
       );
 
       // 로고 위에서 아래로 자연스럽게 등장
-      const isMobile = window.innerWidth < 768;
       gsap.fromTo(
         logoRef.current,
         { y: -300, opacity: 0 },
         {
-          y: isMobile ? -140 : -40, // 모바일에서는 더 위로
+          y: !isDesktop ? -230 : -18, // 데스크톱이 아닐 때 더 위로
           opacity: 1,
           duration: 3,
           ease: 'power3.out',
@@ -60,12 +64,12 @@ function CocktailDrop() {
     }, containerRef);
 
     return () => ctx.revert();
-  }, [containerRef]);
+  }, [containerRef, isDesktop]);
 
   return (
     <div
       ref={containerRef}
-      className="relative w-full md:min-h-[110vh] min-h-[74vh] flex flex-col md:justify-center justify-end items-center mt-10 overflow-hidden"
+      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"
       id="scroll-fixed"
     >
       {/* 대각선 줄 1 */}
@@ -80,7 +84,7 @@ function CocktailDrop() {
       />
 
       {/* 로고 */}
-      <div ref={logoRef} className="absolute z-20 md:w-115 w-65 md:h-90 h-40">
+      <div ref={logoRef} className="absolute md:w-115 w-85 md:h-90 h-40">
         <Image
           src="/logo.svg"
           alt="로고 이미지"
@@ -94,17 +98,19 @@ function CocktailDrop() {
       <div className="w-full md:h-90 h-30"></div>
 
       {/* 컵 이미지 - 모바일에서 바닥에 붙도록 */}
-      <div className="z-10 md:relative absolute bottom-0">
+      <div className="md:relative absolute bottom-0">
         <Image
           src={Cocktailcup}
           alt="칵테일 컵"
           width={900}
-          height={800}
+          height={700}
           priority
-          style={{ width: 'auto', height: 'auto' }}
-          className="md:w-auto md:h-auto w-[300px] h-[300px] object-contain"
+          className="md:w-auto md:h-auto w-[500px] h-[400px] object-cover"
         />
       </div>
+      <div className="absolute md:bottom-35 bottom-20 flex items-center justify-center z-3 w-full">
+        <PassBtn />
+      </div>
     </div>
   );
 }

src/app/(no-layout)/design-system/page.tsx renamed to src/app/(main)/design-system/page.tsx

@@ -0,0 +1,20 @@
+import { useRouter } from 'next/navigation';
+
+function PassBtn() {
+  const router = useRouter();
+  const handleClick = () => {
+    router.push('/recommend');
+  };
+  return (
+    <button
+      onClick={handleClick}
+      className="w-[90%] md:w-120 py-5 md:px-20 px-5 md:text-2xl text-lg rounded-xl flex items-center justify-center bg-tertiary/70"
+    >
+      <span className="text-primary font-serif whitespace-nowrap">
+        칵테일 취향추천 <span className="text-secondary font-serif">바로가기</span>
+      </span>
+    </button>
+  );
+}
+
+export default PassBtn;

src/app/(main)/layout.tsx

@@ -1,9 +1,9 @@
 'use client';
 
 import { Environment, OrbitControls, useGLTF } from '@react-three/drei';
-import { Canvas, useFrame, useThree } from '@react-three/fiber';
+import { Canvas } from '@react-three/fiber';
 import { Bloom, EffectComposer } from '@react-three/postprocessing';
-import { useEffect, useRef } from 'react';
+import { useEffect } from 'react';
 import * as THREE from 'three';
 
 interface Props {
@@ -42,7 +42,7 @@ function Model({ onLoaded }: Props) {
   return (
     <primitive
       object={scene}
-      scale={6.4}
+      scale={5.8}
       position={[0, -1.2, 0]}
       rotation={[-0.15, Math.PI + 3, 0]}
     />

src/app/(no-layout)/page.tsx renamed to src/app/(main)/page.tsx

@@ -1,4 +1,6 @@
 import { useEffect } from 'react';
+import MobileCocktailDrop from '../../../../../public/mobileCocktail.webp';
+import Image from 'next/image';
 
 interface Props {
   onLoaded: () => void;
@@ -8,7 +10,20 @@ function ModelImage({ onLoaded }: Props) {
   useEffect(() => {
     onLoaded();
   });
-  return <div className="w-full"></div>;
+  return (
+    <div className="w-full flex justify-center items-center absolute bottom-13 left-1/2 -translate-x-1/2">
+      <div className="rounded-tr-4xl rounded-tl-4xl overflow-hidden">
+        <Image
+          src={MobileCocktailDrop}
+          alt="모바일 칵테일 드랍"
+          width={260}
+          height={290}
+          priority
+          className="object-cover w-[300px] h-[390px]"
+        />
+      </div>
+    </div>
+  );
 }
 
 export default ModelImage;