Merge branch 'main' into develop

Author: HaeJungg

public/assets/images/og.png

@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import type { Meta, StoryFn } from '@storybook/react';
 import categoryData from '@/src/data/category.json';
-import InternalCategory, { InternalCategoryProps } from '.';
+import InternalCategory from '.';
 
 const meta: Meta = {
   title: 'layout/category',

src/app/(crew)/_components/category/internal-category/internal-category.stories.tsx

@@ -24,7 +24,7 @@ export default function HeroCrew() {
         </div>
         <Link
           href={isAuth ? '/crew/create' : `/login?redirect=${currentPath}`}
-          className="btn-filled -translate-y-1 items-center rounded-xl px-4 py-2 text-sm font-semibold md:h-11 md:text-lg md:font-bold"
+          className="btn-filled h-10 -translate-y-1 items-center rounded-xl px-4 py-2 text-base font-semibold md:h-11 md:text-lg md:font-bold"
         >
           크루 만들기
         </Link>

src/app/(crew)/_components/hero/hero-crew.tsx

@@ -35,11 +35,15 @@ export default function GatheringDetailModalContainer({
       close();
       onUpdate?.();
     } catch (error) {
-      if (error instanceof ApiError && error.status === 401) {
-        const redirectUrl = `/login?redirect=${encodeURIComponent(window.location.pathname)}`;
-        router.push(redirectUrl);
-      } else {
-        showToast('참여 중 에러가 발생했습니다.', 'error');
+      if (error instanceof ApiError) {
+        if (error.status === 401) {
+          const redirectUrl = `/login?redirect=${encodeURIComponent(window.location.pathname)}`;
+          router.push(redirectUrl);
+        } else if (error.status === 404 && error.message === '크루 멤버가 아닙니다.') {
+          showToast('크루 멤버가 아닙니다. 크루를 참여해보세요!', 'error');
+        } else {
+          showToast('참여 중 에러가 발생했습니다.', 'error');
+        }
       }
     }
   };

src/app/(crew)/crew/detail/[id]/_components/gathering-detail-modal/container.tsx

@@ -91,13 +91,13 @@ export default function HomePage() {
               classNames={{
                 root: 'w-full',
                 input:
-                  'h-11 w-full rounded-xl border-0 pl-10 font-pretendard text-base font-medium text-gray-800 placeholder:text-gray-500',
+                  'h-10 md:h-11 w-full rounded-xl border-0 pl-10 font-pretendard text-base font-medium text-gray-800 placeholder:text-gray-500',
               }}
             />
             <Button
               type="button"
               onClick={handleSearch}
-              className="btn-filled flex h-11 min-w-21.5 px-7 text-base font-semibold"
+              className="btn-filled flex h-10 min-w-26 px-7 text-base font-semibold md:h-11 md:text-lg"
             >
               검색
             </Button>

src/app/(crew)/page.tsx

@@ -30,7 +30,7 @@ export default function Button({
     <button
       // eslint-disable-next-line react/button-has-type
       type={type}
-      className={`typo-lg-semibold flex items-center justify-center rounded-xl py-2 ${className}`}
+      className={`flex items-center justify-center rounded-xl py-2 ${className}`}
       onClick={onClick}
       onMouseEnter={onMouseEnter}
       disabled={disabled}

src/components/common/button/index.tsx

@@ -18,7 +18,7 @@ export default function Header() {
   const { data: user } = useUser();
 
   return (
-    <div className="sticky top-0 z-10">
+    <div className="sticky top-0 z-50">
       <HeaderPresenter
         isAuth={isAuth}
         handleLogout={handleLogout}

src/components/common/header/container.tsx

@@ -26,6 +26,10 @@ export default function FileInput({ value, isBlur, error, onChange }: FileInputP
   const fileInput = useRef<HTMLInputElement>(null);
 
   const handleFileLoad = (file: File) => {
+    if (!file || !(file instanceof Blob)) {
+      return;
+    }
+
     // 이전 FileReader가 있을 경우 중단
     if (fileReader) {
       fileReader.abort();

src/components/common/input/file-input-wrap/file-input/index.tsx

@@ -31,6 +31,7 @@ const config: Config = {
         7.5: '30px',
         12.5: '50px',
         21.5: '86px',
+        26: '104px',
         27.5: '110px',
       },
       width: {