chore: 충돌 해결

softeerbootcamp4th · Aug 18, 2024 · 17d0435 · 17d0435
1 parent 9fe3bf9
commit 17d0435
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 69 deletions.
diff --git a/client/src/features/CasperCustom/CustomProcess/CasperCustomFinishing.tsx b/client/src/features/CasperCustom/CustomProcess/CasperCustomFinishing.tsx
@@ -4,9 +4,9 @@ import { CASPER_SIZE_OPTION } from "@/constants/CasperCustom/casper";
 import { DISSOLVE } from "@/constants/animation";
 import { SCROLL_MOTION } from "@/constants/animation";
 import { CasperFlipCard } from "@/features/CasperCustom/CasperCard/CasperFlipCard";
-import { CasperCardType } from "@/features/CasperShowCase/TransitionCasperCards";
 import useCasperCustomStateContext from "@/hooks/useCasperCustomStateContext";
 import useToast from "@/hooks/useToast";
+import type { CasperCardType } from "@/types/casper";
 
 interface CasperCustomFinishingProps {
     navigateNextStep: () => void;

diff --git a/client/src/features/CasperShowCase/TransitionCasperCardItem.tsx b/client/src/features/CasperShowCase/TransitionCasperCardItem.tsx
@@ -1,8 +1,8 @@
 import { useState } from "react";
 import { CASPER_CARD_SIZE, CASPER_SIZE_OPTION } from "@/constants/CasperCustom/casper";
+import { CasperFlipCard } from "@/features/CasperCustom/CasperCard/CasperFlipCard";
 import useLazyLoading from "@/hooks/useLazyLoading";
 import type { CasperCardType } from "@/types/casper";
-import { CasperFlipCard } from "../CasperCustom/CasperFlipCard";
 
 interface TransitionCasperCardItemProps {
     cardItem: CasperCardType;

diff --git a/client/src/features/CasperShowCase/TransitionCasperCards.tsx b/client/src/features/CasperShowCase/TransitionCasperCards.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useMemo, useRef, useState } from "react";
 import { AnimatePresence, type ResolvedValues, motion, useAnimation } from "framer-motion";
 import { CARD_TRANSITION } from "@/constants/CasperShowCase/showCase";
-import { CasperCardType } from "@/types/casper";
+import type { CasperCardType } from "@/types/casper";
 import { TransitionCasperCardItem } from "./TransitionCasperCardItem";
 
 interface TransitionCasperCardsProps {

diff --git a/client/src/features/Rush/BalanceGame.tsx b/client/src/features/Rush/BalanceGame.tsx
diff --git a/client/src/pages/Rush/index.tsx b/client/src/pages/Rush/index.tsx
@@ -30,7 +30,7 @@ export default function Rush() {
 
     return (
         <div ref={containerRef} className="h-screen overflow-auto snap-y snap-mandatory">
-            <Headline id={RUSH_SECTIONS.HEADLINE} handleScrollToTarget={handleScrollToTarget} />
+            <Headline id={RUSH_SECTIONS.HEADLINE} handleClickScroll={handleScrollToTarget} />
             <Intro ref={targetRef} id={RUSH_SECTIONS.INTRO} />
             <FAQ id={RUSH_SECTIONS.FAQ} />
             <ElectricReason id={RUSH_SECTIONS.ELECTRIC_REASON} />