From 2f18a436cce82fcdbd55fab6207455046505f528 Mon Sep 17 00:00:00 2001 From: ChaeyeonYang <69382168+chaeyeon-yang@users.noreply.github.com> Date: Thu, 5 Oct 2023 23:13:31 +0900 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=EC=86=8C=EA=B0=9C=20=EB=8D=94?= =?UTF-8?q?=EB=B3=B4=EA=B8=B0=20=EB=B2=84=ED=8A=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../atoms/DetailBtn/index.stories.tsx | 18 ++++++++++++++ src/components/atoms/DetailBtn/index.tsx | 24 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 src/components/atoms/DetailBtn/index.stories.tsx create mode 100644 src/components/atoms/DetailBtn/index.tsx diff --git a/src/components/atoms/DetailBtn/index.stories.tsx b/src/components/atoms/DetailBtn/index.stories.tsx new file mode 100644 index 00000000..1d570b98 --- /dev/null +++ b/src/components/atoms/DetailBtn/index.stories.tsx @@ -0,0 +1,18 @@ +import { Meta, StoryFn } from "@storybook/react"; +import DetailBtn, { TDetailBtn } from "."; +import { BrowserRouter as Router } from "react-router-dom"; + +export default { + title: "atoms/DetailBtn", + component: DetailBtn, + tags: ["autodocs"], +} as Meta; + +// Story 함수의 타입 정의 +const Template: StoryFn = (args) => ( + + + +); + +export const Default = Template.bind({}); diff --git a/src/components/atoms/DetailBtn/index.tsx b/src/components/atoms/DetailBtn/index.tsx new file mode 100644 index 00000000..e0b99b00 --- /dev/null +++ b/src/components/atoms/DetailBtn/index.tsx @@ -0,0 +1,24 @@ +import StorefrontOutlinedIcon from "@mui/icons-material/StorefrontOutlined"; +import { useNavigate } from "react-router-dom"; + +export type TDetailBtn = { + id: number; +}; + +const DetailBtn = ({ id }: TDetailBtn) => { + const navigate = useNavigate(); + const handleDetailClick = () => { + navigate(`/rentalOffice/${id}`); + }; + return ( + + ); +}; + +export default DetailBtn; From c168098d78bc42e6028fd04345a68b7a099027d6 Mon Sep 17 00:00:00 2001 From: ChaeyeonYang <69382168+chaeyeon-yang@users.noreply.github.com> Date: Thu, 5 Oct 2023 23:14:05 +0900 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20naverdirect=20=EB=B2=84=ED=8A=BC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/atoms/NaverDirectionBtn/index.stories.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/atoms/NaverDirectionBtn/index.stories.tsx b/src/components/atoms/NaverDirectionBtn/index.stories.tsx index 23ce9275..beb667db 100644 --- a/src/components/atoms/NaverDirectionBtn/index.stories.tsx +++ b/src/components/atoms/NaverDirectionBtn/index.stories.tsx @@ -1,9 +1,8 @@ -import React from "react"; import NaverDirectionBtn, { TNaverDirectionBtn } from "@/components/atoms/NaverDirectionBtn/index"; import { Meta, StoryFn } from "@storybook/react"; export default { - title: "Example/NaverDirectionBtn", + title: "atoms/NaverDirectionBtn", component: NaverDirectionBtn, tags: ["autodocs"], } as Meta; From 4fb51f2f91b1d851ed665a9edf91b89a42772715 Mon Sep 17 00:00:00 2001 From: ChaeyeonYang <69382168+chaeyeon-yang@users.noreply.github.com> Date: Thu, 5 Oct 2023 23:14:38 +0900 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=EB=B0=94=ED=85=80=20=EB=AA=A8?= =?UTF-8?q?=EB=B0=94=EC=9D=BC=20=EC=B9=B4=EB=93=9C=EC=97=90=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/molecules/MobileCard/index.tsx | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/components/molecules/MobileCard/index.tsx b/src/components/molecules/MobileCard/index.tsx index d59602f9..52b6b39e 100644 --- a/src/components/molecules/MobileCard/index.tsx +++ b/src/components/molecules/MobileCard/index.tsx @@ -1,29 +1,31 @@ import MobileCardInfo from "@/components/atoms/MobileCardInfo"; import NaverDirectionBtn from "@/components/atoms/NaverDirectionBtn"; import { TStoreListDetail } from "@/types/admin/StoreTypes"; +import DetailBtn from "@/components/atoms/DetailBtn"; export type TMobileCard = { storeDetail: TStoreListDetail; }; -const MobileCard = (storeDetail: TMobileCard) => { +const MobileCard = ({ storeDetail }: TMobileCard) => { return (
-
- {storeDetail.storeDetail.name} -
-
{storeDetail.storeDetail.category}
+
{storeDetail.name}
+
{storeDetail.category}
- - + + +
+
+ +
-
); }; From b5167e136e55e9ca6d025113fac9914f58402b68 Mon Sep 17 00:00:00 2001 From: ChaeyeonYang <69382168+chaeyeon-yang@users.noreply.github.com> Date: Thu, 5 Oct 2023 23:14:48 +0900 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=EB=B0=98=EC=9D=91=ED=98=95=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/pages/RentalLocation/RentalLocationPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/pages/RentalLocation/RentalLocationPage.tsx b/src/components/pages/RentalLocation/RentalLocationPage.tsx index eaf04849..03e0deef 100644 --- a/src/components/pages/RentalLocation/RentalLocationPage.tsx +++ b/src/components/pages/RentalLocation/RentalLocationPage.tsx @@ -212,7 +212,7 @@ const RentalInfo = () => { isBottomSheetOpen={isBottomOpen} setIsBottomSheetOpen={setIsBottomOpen} snapPoints={[280, 280, 0]} - _className="hidden md:block sm:block" + _className="hidden lg:block" >