fix: 충돌 수정

imddoy · Dec 3, 2024 · 259ce78 · 259ce78
2 parents 0ad99cd + 12668ca
commit 259ce78
Show file tree

Hide file tree

Showing 47 changed files with 2,559 additions and 179 deletions.
diff --git a/index.html b/index.html
@@ -3,6 +3,8 @@
   <head>
     <!-- Google tag (gtag.js) -->
     <script async src="https://www.googletagmanager.com/gtag/js?id=G-HHZWCY4574"></script>
+    <script type="text/javascript" src="//dapi.kakao.com/v2/maps/sdk.js?appkey=f4b73490dbec6c62c45107b45cc7ba84&libraries=services,clusterer,drawing"></script>
+
     <script>
       window.dataLayer = window.dataLayer || [];
       function gtag() {
@@ -31,5 +33,7 @@
         }
       })();
     </script>
+
+
   </body>
 </html>
diff --git a/package.json b/package.json
@@ -41,20 +41,24 @@
     "axios": "^1.7.2",
     "dayjs": "^1.11.11",
     "jotai": "^2.8.4",
+    "lodash": "^4.17.21",
     "lottie-react": "^2.4.0",
     "postcss": "^8.4.38",
     "postcss-scss": "^4.0.9",
     "prerender-spa-plugin": "^3.4.0",
     "puppeteer-core": "^22.15.0",
     "react": "^18.3.1",
     "react-beautiful-dnd": "^13.1.1",
+    "react-calendar": "^5.1.0",
     "react-components": "^0.5.1",
     "react-csv": "^2.2.2",
     "react-dom": "^18.3.1",
     "react-helmet-async": "^2.0.5",
     "react-image-crop": "^11.0.6",
+    "react-kakao-maps-sdk": "^1.1.27",
     "react-lottie-player": "^2.0.0",
     "react-router-dom": "^6.24.0",
+    "react-time-picker": "^7.0.0",
     "shelljs": "^0.8.5",
     "styled-components": "^6.1.11",
     "styled-reset": "^4.5.2",
@@ -77,6 +81,7 @@
     "@storybook/react": "^8.1.11",
     "@storybook/react-vite": "^8.1.11",
     "@storybook/test": "^8.1.11",
+    "@types/lodash": "^4",
     "@types/prettier-linter-helpers": "^1",
     "@types/qs": "^6",
     "@types/react": "^18.3.3",

diff --git a/public/svgs/beat_map_marker.svg b/public/svgs/beat_map_marker.svg
diff --git a/public/svgs/icon_search.svg b/public/svgs/icon_search.svg
diff --git a/public/svgs/kakao_map_arrow.svg b/public/svgs/kakao_map_arrow.svg
diff --git a/src/App.css b/src/App.css
@@ -1,5 +1,5 @@
 #root {
-  --vh: 100%;
+  --dvh: 100%;
   max-width: 1280px;
   margin: 0 auto;
   padding: 2rem;

diff --git a/src/App.tsx b/src/App.tsx
@@ -25,8 +25,8 @@ function App() {
   const queryClient = new QueryClient();
 
   function setScreenSize() {
-    const vh = window.innerHeight * 0.01;
-    document.documentElement.style.setProperty("--vh", `${vh}px`);
+    const dvh = window.innerHeight * 0.01;
+    document.documentElement.style.setProperty("--dvh", `${dvh}px`);
   }
 
   useEffect(() => {

diff --git a/src/apis/domains/admins/api.ts b/src/apis/domains/admins/api.ts
@@ -1,7 +1,7 @@
 import { put } from "@apis/index";
 import { components } from "@typings/api/schema";
 
-export type SuccessResponse = components["schemas"]["SuccessResponse"];
+export type SuccessResponse = components["schemas"]["SuccessResponseVoid"];
 
 // 캐러셀 수정 API (PUT)
 export const updateCarousel = async (formData): Promise<SuccessResponse | null> => {

diff --git a/src/apis/domains/home/api.ts b/src/apis/domains/home/api.ts
@@ -3,7 +3,7 @@ import { components } from "@typings/api/schema";
 import { ApiResponseType } from "@typings/commonType";
 import { AxiosResponse } from "axios";
 
-type HomeResponse = components["schemas"]["HomeResponse"];
+type HomeResponse = components["schemas"]["HomeFindAllResponse"];
 
 // 1. API 요청 함수 작성 및 타입 추가
 export const getAllScheduleList = async (): Promise<HomeResponse | null> => {

diff --git a/src/assets/svgs/BeatMapMarker.tsx b/src/assets/svgs/BeatMapMarker.tsx
@@ -0,0 +1,12 @@
+import * as React from "react";
+import type { SVGProps } from "react";
+const SvgBeatMapMarker = (props: SVGProps<SVGSVGElement>) => (
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 31" {...props}>
+    <path
+      fill="#FB247F"
+      d="M3.434 3.434c4.579-4.579 12.002-4.579 16.581 0a11.724 11.724 0 0 1 1.155 15.237l-8.2 11.15c-.618.84-1.873.84-2.491 0l-8.2-11.15A11.724 11.724 0 0 1 3.434 3.434"
+    />
+    <circle cx={12} cy={12} r={5} fill="#fff" />
+  </svg>
+);
+export default SvgBeatMapMarker;
diff --git a/src/assets/svgs/IconSearch.tsx b/src/assets/svgs/IconSearch.tsx
@@ -0,0 +1,13 @@
+import * as React from "react";
+import type { SVGProps } from "react";
+const SvgIconSearch = (props: SVGProps<SVGSVGElement>) => (
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" {...props}>
+    <path
+      fill="#F4F4F4"
+      fillRule="evenodd"
+      d="M6.964 6.964a5 5 0 1 1 7.072 7.071 5 5 0 0 1-7.072-7.07m-1.06-1.06a6.5 6.5 0 0 0 8.631 9.692l3.934 3.934a.75.75 0 1 0 1.06-1.06l-3.934-3.934a6.5 6.5 0 0 0-9.691-8.632"
+      clipRule="evenodd"
+    />
+  </svg>
+);
+export default SvgIconSearch;
diff --git a/src/assets/svgs/KakaoMapArrow.tsx b/src/assets/svgs/KakaoMapArrow.tsx
@@ -0,0 +1,12 @@
+import * as React from "react";
+import type { SVGProps } from "react";
+const SvgKakaoMapArrow = (props: SVGProps<SVGSVGElement>) => (
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 18 18" {...props}>
+    <circle cx={9} cy={9} r={9} fill="#626262" />
+    <path
+      fill="#fff"
+      d="M12.57 6a.5.5 0 0 0-.5-.5h-4.5a.5.5 0 0 0 0 1h4v4a.5.5 0 0 0 1 0zm-6.146 6.354 6-6-.707-.708-6 6z"
+    />
+  </svg>
+);
+export default SvgKakaoMapArrow;
diff --git a/src/assets/svgs/index.ts b/src/assets/svgs/index.ts
@@ -0,0 +1,68 @@
+export { default as BannerBasic } from "./BannerBasic";
+export { default as BeatMapMarker } from "./BeatMapMarker";
+export { default as BtnFloating } from "./BtnFloating";
+export { default as BtnModalDelete } from "./BtnModalDelete";
+export { default as ButtonDelete24 } from "./ButtonDelete24";
+export { default as CarouselPartInactive } from "./CarouselPartInactive";
+export { default as Empty } from "./Empty";
+export { default as IcomCopy } from "./IcomCopy";
+export { default as IconArrowLeft } from "./IconArrowLeft";
+export { default as IconArrowRight } from "./IconArrowRight";
+export { default as IconArrowDown } from "./IconArrowDown";
+export { default as IconArrowUp } from "./IconArrowUp";
+export { default as IconBnk } from "./IconBnk";
+export { default as IconCalendar } from "./IconCalendar";
+export { default as IconCamera } from "./IconCamera";
+export { default as IconCheckboxDisabledOn } from "./IconCheckboxDisabledOn";
+export { default as IconCheckboxSelectedOn } from "./IconCheckboxSelectedOn";
+export { default as IconCheckboxUnselectedOn } from "./IconCheckboxUnselectedOn";
+export { default as IconChecked } from "./IconChecked";
+export { default as IconCheck } from "./IconCheck";
+export { default as IconChevronBack } from "./IconChevronBack";
+export { default as IconEmpty } from "./IconEmpty";
+export { default as IconEyeOff } from "./IconEyeOff";
+export { default as IconEyeOn } from "./IconEyeOn";
+export { default as IconFooterLogo } from "./IconFooterLogo";
+export { default as IconHanna } from "./IconHanna";
+export { default as IconIbk } from "./IconIbk";
+export { default as IconIm } from "./IconIm";
+export { default as IconImg } from "./IconImg";
+export { default as IconKabank } from "./IconKabank";
+export { default as IconKb } from "./IconKb";
+export { default as IconLargeBand } from "./IconLargeBand";
+export { default as IconLargeDance } from "./IconLargeDance";
+export { default as IconLargeEtc } from "./IconLargeEtc";
+export { default as IconLargeMusical } from "./IconLargeMusical";
+export { default as IconLogo } from "./IconLogo";
+export { default as IconMinus } from "./IconMinus";
+export { default as IconNonghyup } from "./IconNonghyup";
+export { default as IconPhotoDelete } from "./IconPhotoDelete";
+export { default as IconPlus } from "./IconPlus";
+export { default as IconProfile } from "./IconProfile";
+export { default as IconRoleAdd } from "./IconRoleAdd";
+export { default as IconSaemauel } from "./IconSaemauel";
+export { default as IconSc } from "./IconSc";
+export { default as IconSearch } from "./IconSearch";
+export { default as IconShinhan } from "./IconShinhan";
+export { default as IconShinhyup } from "./IconShinhyup";
+export { default as IconSmallBand } from "./IconSmallBand";
+export { default as IconSmallDance } from "./IconSmallDance";
+export { default as IconSmallEtc } from "./IconSmallEtc";
+export { default as IconSmallMusical } from "./IconSmallMusical";
+export { default as IconSoohyup } from "./IconSoohyup";
+export { default as IconTextfiedlDelete } from "./IconTextfiedlDelete";
+export { default as IconTime } from "./IconTime";
+export { default as IconToggleOff } from "./IconToggleOff";
+export { default as IconToggleOn } from "./IconToggleOn";
+export { default as IconToss } from "./IconToss";
+export { default as IconWoochaegook } from "./IconWoochaegook";
+export { default as IconWoori } from "./IconWoori";
+export { default as IconXButton } from "./IconXButton";
+export { default as IcDelete } from "./IcDelete";
+export { default as IcHamburgar } from "./IcHamburgar";
+export { default as IcOutlinePlace } from "./IcOutlinePlace";
+export { default as KakaoMapArrow } from "./KakaoMapArrow";
+export { default as NotFoundAsset } from "./NotFoundAsset";
+export { default as Subtract } from "./Subtract";
+export { default as Switch } from "./Switch";
+export { default as Union } from "./Union";
diff --git a/src/assets/svgs/index.tsx b/src/assets/svgs/index.tsx
@@ -1,4 +1,5 @@
 export { default as BannerBasic } from "./BannerBasic";
+export { default as BeatMapMarker } from "./BeatMapMarker";
 export { default as BtnFloating } from "./BtnFloating";
 export { default as BtnModalDelete } from "./BtnModalDelete";
 export { default as ButtonDelete24 } from "./ButtonDelete24";
@@ -43,6 +44,7 @@ export { default as IconProfile } from "./IconProfile";
 export { default as IconRoleAdd } from "./IconRoleAdd";
 export { default as IconSaemauel } from "./IconSaemauel";
 export { default as IconSc } from "./IconSc";
+export { default as IconSearch } from "./IconSearch";
 export { default as IconShinhan } from "./IconShinhan";
 export { default as IconShinhyup } from "./IconShinhyup";
 export { default as IconSmallBand } from "./IconSmallBand";
@@ -61,6 +63,7 @@ export { default as IconXButton } from "./IconXButton";
 export { default as IcOutlinePlace } from "./IcOutlinePlace";
 export { default as IcRadioSelected } from "./IcRadioSelected";
 export { default as IcRadioUnselected } from "./IcRadioUnselected";
+export { default as KakaoMapArrow } from "./KakaoMapArrow";
 export { default as NotFoundAsset } from "./NotFoundAsset";
 export { default as SelectionControlCheckboxSelectedOff } from "./SelectionControlCheckboxSelectedOff";
 export { default as Subtract } from "./Subtract";

diff --git a/src/components/commons/bottomSheet/BottomSheet.styled.ts b/src/components/commons/bottomSheet/BottomSheet.styled.ts
@@ -22,9 +22,10 @@ export const BottomSheetWrapper = styled.section<{ $isOpen: boolean }>`
   animation: ${({ $isOpen }) => ($isOpen ? bottomSheetUp : bottomSheetDown)} 250ms ease-in-out;
 `;
 
-export const BottomSheetLayout = styled.section`
+export const BottomSheetLayout = styled.section<{ $paddingTop?: string }>`
   width: 37.5rem;
-  padding: 3.6rem 2.4rem 2.8rem;
+  padding: ${({ $paddingTop }) =>
+    $paddingTop ? `${$paddingTop} 2.4rem 2.8rem` : "3.6rem 2.4rem 2.8rem"};
 
   background-color: ${({ theme }) => theme.colors.gray_800};
   border-radius: 2rem 2rem 0 0;

diff --git a/src/components/commons/bottomSheet/BottomSheet.tsx b/src/components/commons/bottomSheet/BottomSheet.tsx
@@ -6,12 +6,13 @@ export interface BottomSheetPropType {
   isOpen: boolean;
   children?: ReactNode;
   title?: string;
+  paddingTop?: string;
 }
 
-const BottomSheet = ({ isOpen, title, children }: BottomSheetPropType) => {
+const BottomSheet = ({ isOpen, title, paddingTop, children }: BottomSheetPropType) => {
   return (
     <S.BottomSheetWrapper $isOpen={isOpen} onClick={(e) => e.stopPropagation()}>
-      <S.BottomSheetLayout>
+      <S.BottomSheetLayout $paddingTop={paddingTop}>
         <S.Title>{title}</S.Title>
         {children}
       </S.BottomSheetLayout>

diff --git a/src/components/commons/datePicker/DatePicker.tsx b/src/components/commons/datePicker/DatePicker.tsx
@@ -0,0 +1,30 @@
+import Calendar from "react-calendar";
+import "react-calendar/dist/Calendar.css";
+import "./calendar.css";
+interface DatePickerProps {
+  date: Date | undefined;
+  onChangeDate: (date: Date) => void;
+}
+
+const DatePicker = ({ date, onChangeDate }: DatePickerProps) => {
+  const isPastDate = (date) => {
+    const today = new Date();
+    today.setHours(0, 0, 0, 0);
+
+    return date < today;
+  };
+
+  return (
+    <Calendar
+      value={date}
+      onChange={onChangeDate}
+      calendarType="gregory"
+      locale="ko-KR"
+      className="custom-calendar"
+      formatDay={(_, date) => date.getDate().toString()}
+      tileClassName={({ date }) => (isPastDate(date) ? "past-date" : "")}
+    />
+  );
+};
+
+export default DatePicker;