Merge branch 'main' of https://github.com/SCBJ-7/SCBJ-FE into feature/#…

…212-saledetail-api
SCBJ-7 · Jan 25, 2024 · 7172da7 · 7172da7
2 parents 14fb434 + e3b5f17
commit 7172da7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/apis/fetchAlarm.ts b/src/apis/fetchAlarm.ts
@@ -1,8 +1,8 @@
 import { END_POINTS } from "@constants/api";
-import { axiosInstance } from "./axiosInstance";
+import axios from "axios";
 import { AlarmType } from "@type/alarm";
 
 export const fetchAlarm = async (): Promise<AlarmType[]> => {
-  const { data } = await axiosInstance.get(END_POINTS.ALARM);
+  const { data } = await axios.get(END_POINTS.ALARM);
   return data.data;
 };
diff --git a/src/pages/homePage/itemCarousel/itemCarouselUnit/ItemCarouselUnit.tsx b/src/pages/homePage/itemCarousel/itemCarouselUnit/ItemCarouselUnit.tsx
@@ -27,11 +27,14 @@ const ItemCarouselUnit = ({ item }: UnitProps) => {
     navigate(PATH.DETAIL_ROOM(hotel[num].id));
   };
 
-  //정렬 수정
+  // 터치 이벤트 제한
   return (
     <S.LocaleWrapper $display={hotel ? "block" : "none"}>
       {hotel[0] && (
-        <S.ItemUnit onClick={() => onClickHandler(0)}>
+        <S.ItemUnit
+          onClick={() => onClickHandler(0)}
+          onTouchStart={(e) => e.preventDefault()}
+        >
           <img src={hotel[0].imageUrl} onClick={() => onClickHandler(0)} />
           <div className="item-info">
             <div className="hotel_title">
@@ -52,7 +55,10 @@ const ItemCarouselUnit = ({ item }: UnitProps) => {
         </S.ItemUnit>
       )}
       {hotel[1] && (
-        <S.ItemUnit onClick={() => onClickHandler(1)}>
+        <S.ItemUnit
+          onClick={() => onClickHandler(1)}
+          onTouchStart={(e) => e.preventDefault()}
+        >
           <img src={hotel[1].imageUrl} onClick={() => onClickHandler(0)} />
           <div className="item-info">
             <div className="hotel_title">