chore : 에러 수정

package.json

@@ -22,11 +22,7 @@
         "react-dom": "^18.3.1",
         "react-icons": "^5.3.0",
         "react-spring": "^9.7.4",
-<<<<<<< HEAD
         "react-spring-bottom-sheet": "^3.4.1",
-=======
-        "react-spring-bottom-sheet": "3.5.0-alpha.0",
->>>>>>> main
         "sharp": "^0.33.5",
         "swiper": "^11.1.15",
         "ts-pattern": "^5.5.0",

src/App.tsx

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 import ToastContainer from './components/Common/ToastContainer/ToastContainer';
-=======
-import ToastContainer from './components/common/ToastContainer/ToastContainer';
->>>>>>> main
 
 export const App = () => {
     return (

src/components/Common/BottleLetter/Bottle/Bottle.tsx

@@ -2,12 +2,6 @@ import React from 'react';
 
 export const Bottle = () => {
     return (
-<<<<<<< HEAD
         <img src="/유리병_샘플.png" className="object-contain w-full h-full" />
-=======
-        <div className="">
-            <img src="/유리병_샘플.png" className="h-[100px]" />
-        </div>
->>>>>>> main
     );
 };

src/components/Common/BottleLetter/BottleLetter.stories.tsx

@@ -6,16 +6,13 @@ const meta: Meta<typeof BottleLetter> = {
     component: BottleLetter,
     title: 'BottleLetter',
     tags: ['autodocs'],
-<<<<<<< HEAD
     decorators: [
         (Story) => (
             <div style={{ width: '200px', height: '200px' }}>
                 <Story />
             </div>
         )
     ],
-=======
->>>>>>> main
     argTypes: {}
 };
 export default meta;

src/components/Common/BottleLetter/BottleLetter.tsx

@@ -20,21 +20,12 @@ interface BottleLetterProps {
 // 유리병 관련 이벤트는 나중에 추가해야 될 것 같습니다
 export const BottleLetter = ({ Letter }: BottleLetterProps) => {
     return (
-<<<<<<< HEAD
         <div className="relative w-full h-full">
             <div className="absolute top-0 left-0 w-full h-full">
                 <Bottle />
                 <div className="w-[50%] h-[50%] absolute top-[25%] left-[30%] rotate-[-30deg] ">
                     <Label imgSrc={Letter.label} />
                 </div>
-=======
-        <div className="relative">
-            <div className="absolute top-0 left-0">
-                <Bottle />
-            </div>
-            <div className="absolute top-6 left-5 rotate-[-30deg]">
-                <Label imgSrc={Letter.label} />
->>>>>>> main
             </div>
         </div>
     );

src/components/Common/BottleLetter/Label/Label.tsx

@@ -5,13 +5,5 @@ interface LabelProps {
 }
 
 export const Label = ({ imgSrc }: LabelProps) => {
-<<<<<<< HEAD
     return <img src={`/${imgSrc}`} className="object-contain w-full h-full" />;
-=======
-    return (
-        <div className="">
-            <img src={`/${imgSrc}`} className="h-[50px]" />
-        </div>
-    );
->>>>>>> main
 };

src/components/Common/ItemSlider/ItemSlider.tsx

@@ -44,25 +44,15 @@ export const ItemSlider = ({
         switch (itemType) {
             case 'text':
                 return (
-<<<<<<< HEAD
                     <div className="flex items-center justify-center h-full p-2">
-=======
-                    <div className="p-2 h-full flex justify-center items-center">
->>>>>>> main
                         {item.name}
                     </div>
                 );
             case 'image':
                 return (
-<<<<<<< HEAD
                     <div className="flex items-center justify-center h-full">
                         <img
                             className="object-cover w-full h-full rounded"
-=======
-                    <div className="h-full flex justify-center items-center">
-                        <img
-                            className="w-full h-full object-cover rounded"
->>>>>>> main
                             src={getImagePath(item.id)}
                             alt={item.name}
                         />
@@ -86,11 +76,7 @@ export const ItemSlider = ({
                     <SwiperSlide
                         style={slideStyle}
                         key={item.id}
-<<<<<<< HEAD
                         className="flex justify-center align-middle rounded-md bg-slate-200"
-=======
-                        className="rounded-md bg-slate-200 flex justify-center align-middle"
->>>>>>> main
                     >
                         {getSliderContent(item)}
                     </SwiperSlide>

src/components/Common/NotificationBadge/NotificationBadge.stories.tsx

@@ -13,19 +13,11 @@ export default meta;
 type Story = StoryObj<typeof NotificationBadge>;
 
 export const notificationMin: Story = {
-<<<<<<< HEAD
     args: { badgeType: 'basic', count: 1 }
 };
 
 export const notificationMax: Story = {
     args: { badgeType: 'basic', count: 100 }
-=======
-    args: { badgeType: 'notification', count: 1 }
-};
-
-export const notificationMax: Story = {
-    args: { badgeType: 'notification', count: 100 }
->>>>>>> main
 };
 
 export const dday: Story = {

src/components/Common/NotificationBadge/NotificationBadge.tsx

@@ -1,19 +1,14 @@
 import React from 'react';
 
 interface NotificationBadgeProps {
-<<<<<<< HEAD
     badgeType: 'basic' | 'dday';
-=======
-    badgeType: 'notification' | 'dday';
->>>>>>> main
     count: number;
 }
 
 export const NotificationBadge = ({
     badgeType,
     count
 }: NotificationBadgeProps) => {
-<<<<<<< HEAD
     const MAX_COUNT = 99;
     const BaseStyle =
         'inline-flex items-center justify-center text-center align-text-middle';
@@ -26,15 +21,6 @@ export const NotificationBadge = ({
         switch (badgeType) {
             case 'basic':
                 if (count > MAX_COUNT) {
-=======
-    const NotificationBadgeStyle =
-        'bg-red-600 px-2 py-1 rounded-full text-white font-semibold';
-
-    const NotificationBadgeContent = (type, count: number) => {
-        switch (type) {
-            case 'notification':
-                if (count > 99) {
->>>>>>> main
                     return (
                         <>
                             <span style={{ position: 'relative', top: '-1px' }}>
@@ -63,24 +49,13 @@ export const NotificationBadge = ({
                     </>
                 );
             default:
-<<<<<<< HEAD
                 return null;
-=======
-                break;
->>>>>>> main
         }
     };
 
     return (
-<<<<<<< HEAD
         <div className={`${BaseStyle} ${styleMap[badgeType]}`}>
             {renderContent(badgeType, count)}
-=======
-        <div
-            className={`${NotificationBadgeStyle} inline-flex items-center justify-center text-center align-text-middle`}
-        >
-            {NotificationBadgeContent(badgeType, count)}
->>>>>>> main
         </div>
     );
 };

src/components/common/Modal/Modal.tsx

@@ -1,10 +1,6 @@
 import React from 'react';
-<<<<<<< HEAD
 
 import { Overlay } from '@/components/Common/Overlay/Overlay';
-=======
-import { Overlay } from '@/components/common/Overlay/Overlay';
->>>>>>> main
 
 interface ModalProps {
     children: React.ReactNode;

src/components/common/Overlay/Overlay.stories.tsx

@@ -1,10 +1,6 @@
 import type { Meta, StoryObj } from '@storybook/react';
 
-<<<<<<< HEAD
 import { Overlay } from '@/components/Common/Overlay/Overlay';
-=======
-import { Overlay } from './Overlay';
->>>>>>> main
 
 const meta: Meta<typeof Overlay> = {
     component: Overlay,

src/hooks/useModal.tsx

@@ -1,9 +1,5 @@
 import React from 'react';
-<<<<<<< HEAD
 import { Modal } from '@/components/Common/Modal/Modal';
-=======
-import { Modal } from '@/components/common/Modal/Modal';
->>>>>>> main
 import { useState } from 'react';
 
 /**

tailwind.config.js

@@ -3,12 +3,9 @@ export default {
     content: ['./src/**/*.{html,js,jsx,ts,tsx}'],
     theme: {
         extend: {
-<<<<<<< HEAD
             colors: {
                 primary: '#D1D5DB'
             },
-=======
->>>>>>> main
             keyframes: {
                 fadeIn: {
                     '0%': { opacity: '0', transform: 'translateY(-20px)' },
@@ -20,20 +17,10 @@ export default {
                     '90%': { opacity: '1', transform: 'translateY(0)' },
                     '100%': { opacity: '0', transform: 'translateY(-20px)' }
                 }
-<<<<<<< HEAD
             },
             animation: {
                 fadeIn: 'fadeIn 2s ease forwards',
                 'toast-slide-in': 'toast-slide-in 2s ease forwards'
-=======
-            }
-        },
-        animation: {
-            fadeIn: 'fadeIn 2s ease forwards',
-            'toast-slide-in': 'toast-slide-in 2s ease forwards',
-            colors: {
-                primary: '#D1D5DB'
->>>>>>> main
             }
         }
     },
@@ -44,10 +31,6 @@ export default {
                     '@apply bg-primary w-full rounded p-6 text-black hover:opacity-80':
                         ''
                 },
-<<<<<<< HEAD
-=======
-
->>>>>>> main
                 '.text-btn': {
                     '@apply text-black hover:underline': ''
                 }

yarn.lock

@@ -8243,31 +8243,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
 "react-spring-bottom-sheet@npm:^3.4.1":
   version: 3.4.1
   resolution: "react-spring-bottom-sheet@npm:3.4.1"
-=======
-"react-spring-bottom-sheet@npm:3.5.0-alpha.0":
-  version: 3.5.0-alpha.0
-  resolution: "react-spring-bottom-sheet@npm:3.5.0-alpha.0"
->>>>>>> main
   dependencies:
     "@juggle/resize-observer": "npm:^3.2.0"
     "@reach/portal": "npm:^0.13.0"
     "@xstate/react": "npm:^1.2.0"
     body-scroll-lock: "npm:^3.1.5"
     focus-trap: "npm:^6.2.2"
-<<<<<<< HEAD
     react-spring: "npm:^8.0.27"
-=======
-    react-spring: "npm:^9.4.5"
->>>>>>> main
     react-use-gesture: "npm:^8.0.1"
     xstate: "npm:^4.15.1"
   peerDependencies:
     react: ^16.14.0 || 17 || 18
-<<<<<<< HEAD
   checksum: 10c0/bb9d70a0dd25a5fd924e359c050bf4ec5f6ee609218bcc059151651f3fd338d2183bd81df1202e2f5cf35ad1f4a84b765f72b7643d853fe68e08269fcf10d29d
   languageName: node
   linkType: hard
@@ -8286,13 +8275,6 @@ __metadata:
   linkType: hard
 
 "react-spring@npm:^9.7.4":
-=======
-  checksum: 10c0/4db964125a8b27eda3ab2737eddbd199ac1309d889a3a79cf69612b1d7d94da2db360ce8f633cc33e63fff1902ed2d932a499357d9a0da0c2cc6f74b52d0a3ad
-  languageName: node
-  linkType: hard
-
-"react-spring@npm:^9.4.5, react-spring@npm:^9.7.4":
->>>>>>> main
   version: 9.7.4
   resolution: "react-spring@npm:9.7.4"
   dependencies:
@@ -10133,11 +10115,7 @@ __metadata:
     react-dom: "npm:^18.3.1"
     react-icons: "npm:^5.3.0"
     react-spring: "npm:^9.7.4"
-<<<<<<< HEAD
     react-spring-bottom-sheet: "npm:^3.4.1"
-=======
-    react-spring-bottom-sheet: "npm:3.5.0-alpha.0"
->>>>>>> main
     sharp: "npm:^0.33.5"
     storybook: "npm:8.4.4"
     swiper: "npm:^11.1.15"