Merge branch 'dev'

Author: jyn

public/images/icons/fire.svg

@@ -37,9 +37,9 @@ export const ActivityCard = ({
     </div>
 
     {/* 콘텐츠 영역 */}
-    <div className="flex flex-1 flex-col rounded-[1.2rem] px-[1.7rem] py-[1.2rem] md:z-10 md:rounded-t-[2.6rem] md:bg-white md:px-[3rem] md:py-[1rem]">
+    <div className="flex flex-1 flex-col rounded-[1.2rem] px-[1.7rem] py-[1.2rem] md:z-10 md:rounded-t-[2.6rem] md:bg-white md:px-[3rem] md:py-[2rem] lg:px-[2.8rem] lg:py-[2.4rem]">
       {/* 제목과 별점 그룹 */}
-      <div className="mt-[0.5rem] flex flex-col gap-[0.6rem] md:mt-[1.4rem]">
+      <div className="mt-[0.5rem] flex flex-col gap-[0.6rem]">
         {/* 제목 */}
         <h3 className="line-clamp-1 text-[1.4rem] leading-[1.8rem] font-semibold text-gray-900 md:overflow-hidden md:text-[1.8rem] md:text-ellipsis md:whitespace-nowrap">
           {activity.title}

public/images/icons/skate.svg

@@ -1,6 +1,7 @@
 'use client';
 
 import { ChevronDown } from 'lucide-react';
+import Image from 'next/image';
 import { useState } from 'react';
 
 import { ActivityCard } from '@/features/activities/components/activity-card';
@@ -27,15 +28,15 @@ interface AllActivitiesProps {
  * @description 모든 체험 목록을 표시하는 컴포넌트입니다.
  */
 const AllActivities = ({ keyword }: AllActivitiesProps) => {
-  const [active, setActive] = useState('문화 · 예술');
+  const [active, setActive] = useState('');
   const [page, setPage] = useState(1);
   const [selectedSort, setSelectedSort] = useState<
     'latest' | 'price_asc' | 'price_desc'
   >('latest');
 
   const { data, isLoading, isError, size } = useResActivitiesQuery({
     sort: selectedSort,
-    category: active,
+    category: active || undefined,
     page,
     keyword,
   });
@@ -58,9 +59,13 @@ const AllActivities = ({ keyword }: AllActivitiesProps) => {
     <div className="px-[2.4rem] md:px-[3rem] lg:px-[4rem]">
       <div className="mb-[1rem] flex items-center justify-between md:mb-[1.6rem] lg:mb-[2rem]">
         <p className="flex items-center gap-2 text-[1.8rem] font-bold text-gray-950 md:text-[3.2rem]">
-          <span role="img" aria-label="모든 체험">
-            🛼
-          </span>{' '}
+          <Image
+            src="/images/icons/skate.svg"
+            alt="모든 체험"
+            width={18}
+            height={18}
+            className="size-[1.8rem] md:size-[3.2rem]"
+          />
           모든 체험
         </p>
         <Dropdown

src/features/activities/components/activity-card.tsx

@@ -4,6 +4,7 @@ import 'swiper/css';
 import 'swiper/css/navigation';
 
 import { ChevronLeft, ChevronRight } from 'lucide-react';
+import Image from 'next/image';
 import { useRef } from 'react';
 import type { Swiper as SwiperType } from 'swiper';
 import { Autoplay, Navigation } from 'swiper/modules';
@@ -43,9 +44,13 @@ const BestActivities = () => {
       {/* 헤더: 항상 노출 */}
       <div className="mb-[4rem] flex items-center justify-between md:mb-[1.6rem] lg:mb-[2rem]">
         <p className="flex items-center gap-2 text-[1.8rem] font-bold text-gray-950 md:text-[3.2rem]">
-          <span role="img" aria-label="fire">
-            🔥
-          </span>{' '}
+          <Image
+            src="/images/icons/fire.svg"
+            alt="인기 체험"
+            width={18}
+            height={18}
+            className="size-[1.8rem] md:size-[3.2rem]"
+          />
           인기 체험
         </p>
         <div className="flex gap-2">

src/features/activities/components/all-activities.tsx

@@ -1,4 +1,5 @@
 import { ChevronLeft, ChevronRight } from 'lucide-react';
+import Image from 'next/image';
 import type { Swiper as SwiperType } from 'swiper';
 import { Autoplay, Navigation } from 'swiper/modules';
 import { Swiper, SwiperSlide } from 'swiper/react';
@@ -67,9 +68,13 @@ const Hero = ({ swiperRef, ActivityCard, router }: HeroProps) => {
         <div className="relative">
           <div className="mb-6 flex items-center justify-between">
             <p className="flex items-center gap-2 text-[1.8rem] font-bold text-gray-950 md:text-[3rem]">
-              <span role="img" aria-label="인기 체험을 나타내는 불 아이콘">
-                🔥
-              </span>{' '}
+              <Image
+                src="/images/icons/fire.svg"
+                alt="인기 체험"
+                width={18}
+                height={18}
+                className="size-[1.8rem] md:size-[3.2rem]"
+              />
               인기 체험
             </p>
             <div className="flex space-x-2">

src/features/activities/components/best-activities.tsx

@@ -64,7 +64,7 @@ const Footer: React.FC = () => {
             target="_blank"
             rel="noopener noreferrer"
           >
-            <Image src="/images/icons/x.svg" alt="x" width={20} height={20} />
+            <Image src="/images/icons/X.svg" alt="X" width={20} height={20} />
           </a>
         </div>
       </div>

src/features/landing/components/hero.tsx

@@ -9,13 +9,13 @@ import { useAuthStore } from '@/features/auth/stores/useAuthStore';
 import Dropdown from '@/shared/components/dropdown';
 
 const Header: React.FC = () => {
-  const { isLoggedIn } = useAuthStore();
+  const { user, isLoggedIn } = useAuthStore();
   const logout = useAuthStore((state) => state.logout);
   const router = useRouter();
 
   const handleLogout = () => {
     logout();
-    router.push('/');
+    router.push('/activities');
   };
 
   return (
@@ -65,7 +65,11 @@ const Header: React.FC = () => {
                     height={30}
                     className="rounded-full"
                   />
-                  <span className="txt-14-medium text-gray-950">정만철</span>
+                  {isLoggedIn && user && (
+                    <span className="txt-14-medium text-gray-950">
+                      {user.nickname}
+                    </span>
+                  )}
                 </button>
               }
               dropdownClassName="absolute left-1/2 -translate-x-[55%]"

src/shared/components/footer.tsx

@@ -4,7 +4,7 @@ export const searchVariant = {
       'flex-center flex-col gap-[1.2rem] py-[1.6rem] md:py-[3.2rem] md:px-[4rem] md:gap-[3.6rem] mt-[1.2rem] lg:mt-[3rem]',
     title: 'font-bold text-[1.6rem] text-gray-950 md:text-[3.2rem] pb-[1rem]',
     inputBox:
-      'flex h-[4.9rem] w-full items-center rounded-full bg-white border focus-within:border-[#3D9EF2] py-[0.6rem] pr-[0.8rem] pl-[2rem] shadow-md md:h-[7rem] md:w-[62.8rem] lg:w-[104rem] lg:py-[1rem] lg:pr-[1.2rem] lg:pl-[3.2rem]',
+      'flex w-[32.7rem] h-[4.9rem] md:w-[62.8rem] items-center rounded-full bg-white border focus-within:border-[#3D9EF2] py-[0.6rem] pr-[0.8rem] pl-[2rem] shadow-experience-card md:h-[7rem] md:w-[62.8rem] lg:w-[104rem] md:py-[1rem] md:pr-[1.2rem] md:pl-[3.2rem]',
     input:
       'text-medium flex-1 px-4 text-[1.4rem] text-black outline-none placeholder:text-gray-500 md:text-[1.8rem] caret-[#0094FF]',
     button: