From 3a77f0584016e3fd80c68e17f0f158fca0362f91 Mon Sep 17 00:00:00 2001 From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com> Date: Thu, 1 Feb 2024 18:29:25 +0900 Subject: [PATCH 01/16] =?UTF-8?q?=E2=9C=A8=20feat:=20=ED=95=98=EB=8B=A8=20?= =?UTF-8?q?=EB=84=A4=EB=B9=84=EA=B2=8C=EC=9D=B4=EC=85=98=20=EB=B0=94=20?= =?UTF-8?q?=EC=9E=91=EC=97=85=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(route)/_components/BottomNav.tsx | 30 -------------- app/(route)/page.tsx | 2 +- app/_components/BottomNav.tsx | 60 +++++++++++++++++++++++++++ public/icon/home.svg | 3 ++ public/icon/no-profile.svg | 10 ++--- public/icon/search_black.svg | 12 +++--- 6 files changed, 73 insertions(+), 44 deletions(-) delete mode 100644 app/(route)/_components/BottomNav.tsx create mode 100644 app/_components/BottomNav.tsx create mode 100644 public/icon/home.svg diff --git a/app/(route)/_components/BottomNav.tsx b/app/(route)/_components/BottomNav.tsx deleted file mode 100644 index 91991e64..00000000 --- a/app/(route)/_components/BottomNav.tsx +++ /dev/null @@ -1,30 +0,0 @@ -import Image from "next/image"; -import Link from "next/link"; - -const BottomNav = () => { - return ( - - ); -}; - -interface NavButtonProps { - href: string; - button_type: string; - src: string; -} - -const NavButton = ({ href, button_type, src }: NavButtonProps) => { - return ( - - {button_type} -
{button_type}
- - ); -}; - -export default BottomNav; diff --git a/app/(route)/page.tsx b/app/(route)/page.tsx index aa4d1b4f..0473c9cb 100644 --- a/app/(route)/page.tsx +++ b/app/(route)/page.tsx @@ -1,5 +1,5 @@ import ArtistList from "@/components/artist-list/ArtistList"; -import BottomNav from "./_components/BottomNav"; +import BottomNav from "../_components/BottomNav"; import FavArtistEventsCarousel from "./_components/carousel/FavArtistEventsCarousel"; import NewestEventsCarousel from "./_components/carousel/NewestEventsCarousel"; import PopularEventsCarousel from "./_components/carousel/PopularEventsCarousel"; diff --git a/app/_components/BottomNav.tsx b/app/_components/BottomNav.tsx new file mode 100644 index 00000000..f08d55cc --- /dev/null +++ b/app/_components/BottomNav.tsx @@ -0,0 +1,60 @@ +"use client"; + +import Image from "next/image"; +import Link from "next/link"; +import { usePathname } from "next/navigation"; +import { ReactElement, cloneElement } from "react"; +import PostIcon from "@/public/icon/add-outline_black.svg"; +import HomeIcon from "@/public/icon/home.svg"; +import SearchIcon from "@/public/icon/search_black.svg"; + +const MOCK_USER_INFO = { + nickName: "민정사랑해", + email: "iloveminjeong@mail.com", + profileImg: null, +}; + +const BottomNav = () => { + const pathname = usePathname(); + + const navButtons = [ + { href: "/", icon: , label: "홈" }, + { href: "/search", icon: , label: "둘러보기" }, + { href: "/post", icon: , label: "등록하기" }, + { + href: "/mypage", + icon: 프로필 이미지, + label: "마이페이지", + }, + ]; + + return ( + + ); +}; + +interface NavItemProps { + href: string; + icon: ReactElement; + label: string; + isActive: boolean; +} + +const NavButton = ({ href, icon, label, isActive }: NavItemProps) => { + let clonedIcon = cloneElement(icon, { + stroke: isActive ? "#FF50AA" : "#494F5A", + }); + + return ( + + {clonedIcon} +

{label}

+ + ); +}; + +export default BottomNav; diff --git a/public/icon/home.svg b/public/icon/home.svg new file mode 100644 index 00000000..511df19d --- /dev/null +++ b/public/icon/home.svg @@ -0,0 +1,3 @@ + + + diff --git a/public/icon/no-profile.svg b/public/icon/no-profile.svg index d4e7eb79..21bb4c43 100644 --- a/public/icon/no-profile.svg +++ b/public/icon/no-profile.svg @@ -1,9 +1,5 @@ - - - - - - - + + + diff --git a/public/icon/search_black.svg b/public/icon/search_black.svg index fb4b627f..b8d601ca 100644 --- a/public/icon/search_black.svg +++ b/public/icon/search_black.svg @@ -1,7 +1,7 @@ - - - - - - + + + + + + From 8e67814b4d7815a6fc0a77a6941805fc5d0c377d Mon Sep 17 00:00:00 2001 From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com> Date: Thu, 1 Feb 2024 20:57:12 +0900 Subject: [PATCH 02/16] =?UTF-8?q?=F0=9F=A9=B9=20chore:=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=EC=BD=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/_components/BottomNav.tsx | 2 +- public/icon/add-outline.svg | 4 ++++ public/icon/add-outline_black.svg | 6 ------ 3 files changed, 5 insertions(+), 7 deletions(-) create mode 100644 public/icon/add-outline.svg delete mode 100644 public/icon/add-outline_black.svg diff --git a/app/_components/BottomNav.tsx b/app/_components/BottomNav.tsx index f08d55cc..67d1c078 100644 --- a/app/_components/BottomNav.tsx +++ b/app/_components/BottomNav.tsx @@ -4,7 +4,7 @@ import Image from "next/image"; import Link from "next/link"; import { usePathname } from "next/navigation"; import { ReactElement, cloneElement } from "react"; -import PostIcon from "@/public/icon/add-outline_black.svg"; +import PostIcon from "@/public/icon/add-outline.svg"; import HomeIcon from "@/public/icon/home.svg"; import SearchIcon from "@/public/icon/search_black.svg"; diff --git a/public/icon/add-outline.svg b/public/icon/add-outline.svg new file mode 100644 index 00000000..b4ce23c5 --- /dev/null +++ b/public/icon/add-outline.svg @@ -0,0 +1,4 @@ + + + + diff --git a/public/icon/add-outline_black.svg b/public/icon/add-outline_black.svg deleted file mode 100644 index 34f63aca..00000000 --- a/public/icon/add-outline_black.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - From d8f47cf658c376269b66378c853065a221a87f6b Mon Sep 17 00:00:00 2001 From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com> Date: Thu, 1 Feb 2024 22:59:15 +0900 Subject: [PATCH 03/16] =?UTF-8?q?=F0=9F=92=84=20design:=20=EC=83=81?= =?UTF-8?q?=EB=8B=A8=20=ED=97=A4=EB=8D=94=20=EC=8A=A4=ED=83=80=EC=9D=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 --- app/_components/Header.tsx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/_components/Header.tsx b/app/_components/Header.tsx index 7812dde5..526301d5 100644 --- a/app/_components/Header.tsx +++ b/app/_components/Header.tsx @@ -1,15 +1,15 @@ "use client"; -import Image from "next/image"; import { usePathname, useRouter } from "next/navigation"; -import leftArrow from "@/public/icon/left-arrow.svg"; +import ArrowLeft from "@/public/icon/arrow-left_lg.svg"; const TITLE: { [a: string]: string } = { "/setting/password": "비밀번호 변경", "/setting/profile": "프로필 수정", - "/setting/favorite": "좋아하는 아티스트 수정", - "/mypage": "마이페이지", + "/setting/favorite": "팔로우 아티스트 수정", "/my-artist-event": "좋아요한 아티스트의 새 행사", + "/signup": "회원가입", + "/post": "등록하기", }; const Header = () => { @@ -17,12 +17,12 @@ const Header = () => { const pathname = usePathname(); return ( - <> +
-

{TITLE[pathname]}

- +

{TITLE[pathname]}

+
); }; export default Header; From d7033537aa8b271ea1dd840b1c8731a9eab88c2d Mon Sep 17 00:00:00 2001 From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com> Date: Fri, 2 Feb 2024 00:07:35 +0900 Subject: [PATCH 04/16] =?UTF-8?q?=F0=9F=92=84=20design:=20=ED=95=98?= =?UTF-8?q?=EB=8B=A8=20=EB=B2=84=ED=8A=BC=20=EB=94=94=EC=9E=90=EC=9D=B8=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/[id]/_components/ReviewButton.tsx | 5 ----- app/_components/button/BottomButton.tsx | 20 +++++++++++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) delete mode 100644 app/(route)/event/[id]/_components/ReviewButton.tsx create mode 100644 app/_components/button/BottomButton.tsx diff --git a/app/(route)/event/[id]/_components/ReviewButton.tsx b/app/(route)/event/[id]/_components/ReviewButton.tsx deleted file mode 100644 index d63016d1..00000000 --- a/app/(route)/event/[id]/_components/ReviewButton.tsx +++ /dev/null @@ -1,5 +0,0 @@ -const ReviewButton = () => { - return ; -}; - -export default ReviewButton; diff --git a/app/_components/button/BottomButton.tsx b/app/_components/button/BottomButton.tsx new file mode 100644 index 00000000..d51099df --- /dev/null +++ b/app/_components/button/BottomButton.tsx @@ -0,0 +1,20 @@ +import { ReactNode } from "react"; +import Button from "@/components/button"; + +interface Props { + onClick?: () => void; + children: ReactNode; + isDisabled?: boolean; +} + +const BottomButton = ({ onClick, children, isDisabled }: Props) => { + return ( +
+ +
+ ); +}; + +export default BottomButton; From e7191c7b8ecdfcb4902ff66390afe1bcd14343a3 Mon Sep 17 00:00:00 2001 From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com> Date: Fri, 2 Feb 2024 00:08:34 +0900 Subject: [PATCH 05/16] =?UTF-8?q?=F0=9F=A9=B9=20chore:=20=ED=9B=84?= =?UTF-8?q?=EA=B8=B0=20=EC=9E=91=EC=84=B1=20=ED=8E=98=EC=9D=B4=EC=A7=80?= =?UTF-8?q?=EC=97=90=20=EB=B2=84=ED=8A=BC=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(route)/event/[id]/_components/tabs/ReviewTab.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/(route)/event/[id]/_components/tabs/ReviewTab.tsx b/app/(route)/event/[id]/_components/tabs/ReviewTab.tsx index 2c3b7498..45e0d220 100644 --- a/app/(route)/event/[id]/_components/tabs/ReviewTab.tsx +++ b/app/(route)/event/[id]/_components/tabs/ReviewTab.tsx @@ -1,5 +1,5 @@ +import BottomButton from "@/components/button/BottomButton"; import Review from "../../../../../_components/Review"; -import ReviewButton from "../ReviewButton"; const REVIEWS = [ { @@ -37,7 +37,7 @@ const REVIEWS = [ const ReviewTab = () => { return (
- + 후기 작성하기
    {REVIEWS.map((data, index) => (
  • From 648e7dd6219af0ed4b0611f279b75105f26071bf Mon Sep 17 00:00:00 2001 From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com> Date: Fri, 2 Feb 2024 00:09:26 +0900 Subject: [PATCH 06/16] =?UTF-8?q?=F0=9F=A9=B9=20chore:=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EB=93=B1=EB=A1=9D=20=ED=8E=98=EC=9D=B4=EC=A7=80?= =?UTF-8?q?=EC=97=90=20=EB=B2=84=ED=8A=BC=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(route)/event/[id]/edit/_components/EditContent.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/(route)/event/[id]/edit/_components/EditContent.tsx b/app/(route)/event/[id]/edit/_components/EditContent.tsx index 8b1999c2..9b09c2a4 100644 --- a/app/(route)/event/[id]/edit/_components/EditContent.tsx +++ b/app/(route)/event/[id]/edit/_components/EditContent.tsx @@ -5,6 +5,7 @@ import SubInput from "@/(route)/post/_components/_inputs/SubInput"; import { PostType } from "@/(route)/post/page"; import classNames from "classnames"; import { useFormContext } from "react-hook-form"; +import BottomButton from "@/components/button/BottomButton"; import TextModal from "@/components/modal/TextModal"; import { useModal } from "@/hooks/useModal"; import { useStore } from "@/store/index"; @@ -71,9 +72,9 @@ const EditContent = () => { - + openModal("endEdit")}> + 수정사항 등록 + {modal === "endEdit" && ( )} From af013285277b833776e569d29acd7ed5e991ffbe Mon Sep 17 00:00:00 2001 From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com> Date: Fri, 2 Feb 2024 00:10:05 +0900 Subject: [PATCH 07/16] =?UTF-8?q?=F0=9F=A9=B9=20chore:=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=ED=95=98=EA=B8=B0=20=ED=8E=98=EC=9D=B4=EC=A7=80?= =?UTF-8?q?=EC=97=90=20=EB=B2=84=ED=8A=BC=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(route)/post/_components/DetailInfo.tsx | 4 +++- app/(route)/post/_components/MainInfo.tsx | 6 +++++- app/(route)/post/_components/StarInfo.tsx | 4 +++- app/(route)/post/_components/SubInfo.tsx | 4 +++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/app/(route)/post/_components/DetailInfo.tsx b/app/(route)/post/_components/DetailInfo.tsx index 6a90348e..e9cbb035 100644 --- a/app/(route)/post/_components/DetailInfo.tsx +++ b/app/(route)/post/_components/DetailInfo.tsx @@ -1,5 +1,6 @@ import { useFormContext } from "react-hook-form"; import ProgressBar from "@/components/ProgressBar"; +import BottomButton from "@/components/button/BottomButton"; import { useStore } from "@/store/index"; import { PostType } from "../page"; import FunnelTitle from "./FunnelTitle"; @@ -15,7 +16,8 @@ const DetailInfo = () => { - 100} /> + {/* 100} /> */} + 100}>작성 완료
); }; diff --git a/app/(route)/post/_components/MainInfo.tsx b/app/(route)/post/_components/MainInfo.tsx index bcf6ad5c..015b3747 100644 --- a/app/(route)/post/_components/MainInfo.tsx +++ b/app/(route)/post/_components/MainInfo.tsx @@ -3,6 +3,7 @@ import "react-day-picker/dist/style.css"; import { useFormContext } from "react-hook-form"; import ProgressBar from "@/components/ProgressBar"; +import BottomButton from "@/components/button/BottomButton"; import { PostType } from "../page"; import FunnelTitle from "./FunnelTitle"; import PostFooter from "./PostFooter"; @@ -26,7 +27,10 @@ const MainInfo = ({ onNextStep }: Props) => { - + {/* */} + + 다음으로 + ); }; diff --git a/app/(route)/post/_components/StarInfo.tsx b/app/(route)/post/_components/StarInfo.tsx index 4446264d..d1c0f82d 100644 --- a/app/(route)/post/_components/StarInfo.tsx +++ b/app/(route)/post/_components/StarInfo.tsx @@ -1,4 +1,5 @@ import ProgressBar from "@/components/ProgressBar"; +import BottomButton from "@/components/button/BottomButton"; import FunnelTitle from "./FunnelTitle"; import PostFooter from "./PostFooter"; import StarInput from "./_inputs/StarInput"; @@ -13,7 +14,8 @@ const StarInfo = ({ onNextStep }: Props) => { - + {/* */} + 다음으로 ); }; diff --git a/app/(route)/post/_components/SubInfo.tsx b/app/(route)/post/_components/SubInfo.tsx index 09c34db9..52e26ec5 100644 --- a/app/(route)/post/_components/SubInfo.tsx +++ b/app/(route)/post/_components/SubInfo.tsx @@ -1,6 +1,7 @@ "use client"; import ProgressBar from "@/components/ProgressBar"; +import BottomButton from "@/components/button/BottomButton"; import FunnelTitle from "./FunnelTitle"; import PostFooter from "./PostFooter"; import SubInput from "./_inputs/SubInput"; @@ -15,7 +16,8 @@ const SubInfo = ({ onNextStep }: Props) => { - + {/* */} + 다음으로 ); }; From 5232b6596fad5c4d77a1864519ca28e6c869436a Mon Sep 17 00:00:00 2001 From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com> Date: Fri, 2 Feb 2024 00:38:44 +0900 Subject: [PATCH 08/16] =?UTF-8?q?=F0=9F=A9=B9=20chore:=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=ED=8E=98=EC=9D=B4=EC=A7=80=EC=97=90=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(route)/setting/favorite/page.tsx | 4 +++- app/(route)/setting/password/page.tsx | 4 +++- app/(route)/setting/profile/page.tsx | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/(route)/setting/favorite/page.tsx b/app/(route)/setting/favorite/page.tsx index 2b60a020..52380ba5 100644 --- a/app/(route)/setting/favorite/page.tsx +++ b/app/(route)/setting/favorite/page.tsx @@ -3,6 +3,7 @@ import { MOCK } from "app/_constants/mock"; import classNames from "classnames"; import { useEffect, useState } from "react"; +import BottomButton from "@/components/button/BottomButton"; import useInfScroll from "@/hooks/useInfScroll"; const INITIAL = ["정우"]; @@ -40,7 +41,8 @@ const FavoritePage = () => { ))}
- + {/* */} + 변경 내용 저장 ); }; diff --git a/app/(route)/setting/password/page.tsx b/app/(route)/setting/password/page.tsx index 18aa02bd..a61ada5d 100644 --- a/app/(route)/setting/password/page.tsx +++ b/app/(route)/setting/password/page.tsx @@ -1,6 +1,7 @@ "use client"; import { SubmitHandler, useForm } from "react-hook-form"; +import BottomButton from "@/components/button/BottomButton"; import InputText from "@/components/input/InputText"; import useEnterNext from "@/hooks/useEnterNext"; import { ERROR_MESSAGES, REG_EXP } from "@/utils/signupValidation"; @@ -77,7 +78,8 @@ const PasswordPage = () => { 새 비밀번호 확인 - + {/* */} + 변경 내용 저장 ); }; diff --git a/app/(route)/setting/profile/page.tsx b/app/(route)/setting/profile/page.tsx index 022cff31..9533205a 100644 --- a/app/(route)/setting/profile/page.tsx +++ b/app/(route)/setting/profile/page.tsx @@ -3,6 +3,7 @@ import Image from "next/image"; import { useEffect, useState } from "react"; import { SubmitHandler, useForm } from "react-hook-form"; +import BottomButton from "@/components/button/BottomButton"; import InputFile from "@/components/input/InputFile"; import InputText from "@/components/input/InputText"; import { ERROR_MESSAGES, REG_EXP } from "@/utils/signupValidation"; @@ -68,7 +69,8 @@ const ProfilePage = () => { 닉네임 - + {/* */} + 변경 내용 저장 ); }; From feba06d6889828293606fb595cdd65529864b6fc Mon Sep 17 00:00:00 2001 From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com> Date: Fri, 2 Feb 2024 00:39:16 +0900 Subject: [PATCH 09/16] =?UTF-8?q?=F0=9F=A9=B9=20chore:=20=ED=9A=8C?= =?UTF-8?q?=EC=9B=90=EA=B0=80=EC=9E=85=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(route)/signup/_components/step/AccountInfo.tsx | 8 ++++++-- app/(route)/signup/_components/step/MyArtistsInfo.tsx | 8 ++++++-- app/(route)/signup/_components/step/ProfileInfo.tsx | 8 ++++++-- app/_components/button/BottomButton.tsx | 6 ++++-- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/app/(route)/signup/_components/step/AccountInfo.tsx b/app/(route)/signup/_components/step/AccountInfo.tsx index 9a42c56d..f1d22a52 100644 --- a/app/(route)/signup/_components/step/AccountInfo.tsx +++ b/app/(route)/signup/_components/step/AccountInfo.tsx @@ -1,4 +1,5 @@ import { useFormContext } from "react-hook-form"; +import BottomButton from "@/components/button/BottomButton"; import InputText from "@/components/input/InputText"; import { ERROR_MESSAGES, REG_EXP } from "@/utils/signupValidation"; import { SignUpFormType } from "@/types/index"; @@ -48,9 +49,12 @@ const AccountInfo = ({ onNext }: { onNext: () => void }) => { > 비밀번호 확인 - + */} + + 다음으로 + ); }; diff --git a/app/(route)/signup/_components/step/MyArtistsInfo.tsx b/app/(route)/signup/_components/step/MyArtistsInfo.tsx index 0b87c2d4..1f18cb1a 100644 --- a/app/(route)/signup/_components/step/MyArtistsInfo.tsx +++ b/app/(route)/signup/_components/step/MyArtistsInfo.tsx @@ -1,5 +1,6 @@ import { MOCK } from "app/_constants/mock"; import { useFormContext, useWatch } from "react-hook-form"; +import BottomButton from "@/components/button/BottomButton"; import { SignUpFormType } from "@/types/index"; import SearchArtist from "../SearchArtist"; @@ -23,10 +24,13 @@ const MyArtistsInfo = () => { return ( <> - - + */} + + 오프너 시작하기 + ); }; diff --git a/app/(route)/signup/_components/step/ProfileInfo.tsx b/app/(route)/signup/_components/step/ProfileInfo.tsx index 1e365c52..91f39df6 100644 --- a/app/(route)/signup/_components/step/ProfileInfo.tsx +++ b/app/(route)/signup/_components/step/ProfileInfo.tsx @@ -1,4 +1,5 @@ import { useFormContext } from "react-hook-form"; +import BottomButton from "@/components/button/BottomButton"; import InputText from "@/components/input/InputText"; import { ERROR_MESSAGES, REG_EXP } from "@/utils/signupValidation"; import { SignUpFormType } from "@/types/index"; @@ -19,9 +20,12 @@ const ProfileInfo = ({ onNext }: { onNext: () => void }) => { > 닉네임 - + */} + + 다음으로 + ); }; diff --git a/app/_components/button/BottomButton.tsx b/app/_components/button/BottomButton.tsx index d51099df..695c40ad 100644 --- a/app/_components/button/BottomButton.tsx +++ b/app/_components/button/BottomButton.tsx @@ -5,14 +5,16 @@ interface Props { onClick?: () => void; children: ReactNode; isDisabled?: boolean; + isSkip?: boolean; } -const BottomButton = ({ onClick, children, isDisabled }: Props) => { +const BottomButton = ({ onClick, children, isDisabled, isSkip = false }: Props) => { return ( -
+
+ {isSkip && }
); }; From 42ce6758fab02c5a104dcc7df043f41f24ecb4f2 Mon Sep 17 00:00:00 2001 From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com> Date: Fri, 2 Feb 2024 01:48:37 +0900 Subject: [PATCH 10/16] =?UTF-8?q?=F0=9F=92=84=20design:=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EB=91=90=EA=B0=9C=EC=9D=B8=20=ED=95=98=EB=8B=A8=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EC=A0=9C=EC=9E=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../[id]/_components/BottomDoubleButton.tsx | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 app/(route)/event/[id]/_components/BottomDoubleButton.tsx diff --git a/app/(route)/event/[id]/_components/BottomDoubleButton.tsx b/app/(route)/event/[id]/_components/BottomDoubleButton.tsx new file mode 100644 index 00000000..93d02849 --- /dev/null +++ b/app/(route)/event/[id]/_components/BottomDoubleButton.tsx @@ -0,0 +1,27 @@ +import React from "react"; +import Button from "@/components/button"; + +interface Props { + onClickLeft: () => void; + onClickRight: () => void; +} + +const BottomDoubleButton = ({ onClickLeft, onClickRight }: Props) => { + return ( +
+
+ {/* 추후 회색으로 변경 예정 */} + +
+
+ +
+
+ ); +}; + +export default BottomDoubleButton; From 542d0198c5d440e623e0f71024c0254449bf207f Mon Sep 17 00:00:00 2001 From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com> Date: Fri, 2 Feb 2024 02:36:32 +0900 Subject: [PATCH 11/16] =?UTF-8?q?=F0=9F=92=84=20design:=20=EC=84=B8?= =?UTF-8?q?=EB=A1=9C=ED=98=95=20=EC=B9=B4=EB=93=9C=20=EB=94=94=EC=9E=90?= =?UTF-8?q?=EC=9D=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/_components/card/VerticalEventCard.tsx | 32 ++++++++++++++++------ 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/app/_components/card/VerticalEventCard.tsx b/app/_components/card/VerticalEventCard.tsx index 59328093..7592a262 100644 --- a/app/_components/card/VerticalEventCard.tsx +++ b/app/_components/card/VerticalEventCard.tsx @@ -1,4 +1,6 @@ +import Image from "next/image"; import { EventCardType } from "@/types/index"; +import HeartButton from "../button/HeartButton"; import Chip from "./Chip"; interface Props { @@ -13,18 +15,32 @@ const VerticalEventCard = ({ data }: Props) => { const formattedEndDate = `${endDate[1]}.${endDate[2]}`; return ( -
-
+
+
+
+ +
+ 행사 포스터 +
-

{data.placeName}

-
-

+

{data.placeName}

+
+

{formattedStartDate} ~ {formattedEndDate}

-

{data.address}

+

{data.address}

-
-

{data.artistName}

+
+

{data.artistName}

+ {/* 공통 컴포넌트로 수정 예정 */}
From 07229001c7049d856d353b4bf459ab72f489ae09 Mon Sep 17 00:00:00 2001 From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com> Date: Fri, 2 Feb 2024 02:39:57 +0900 Subject: [PATCH 12/16] =?UTF-8?q?=F0=9F=A9=B9=20chore:=20=EC=B9=B4?= =?UTF-8?q?=EB=93=9C=20=EA=B4=80=EB=A0=A8=20=ED=8C=8C=EC=9D=BC=EB=93=A4=20?= =?UTF-8?q?=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../carousel/FavArtistEventsCarousel.tsx | 47 +++++++++---------- .../carousel/NewestEventsCarousel.tsx | 2 +- .../carousel/PopularEventsCarousel.tsx | 2 +- .../mypage/_components/EventCalendar.tsx | 4 ++ app/_components/card/EventMockData.ts | 28 ++++++++++- app/_types/index.ts | 1 + 6 files changed, 56 insertions(+), 28 deletions(-) diff --git a/app/(route)/_components/carousel/FavArtistEventsCarousel.tsx b/app/(route)/_components/carousel/FavArtistEventsCarousel.tsx index 4a4549e3..a48c4c08 100644 --- a/app/(route)/_components/carousel/FavArtistEventsCarousel.tsx +++ b/app/(route)/_components/carousel/FavArtistEventsCarousel.tsx @@ -6,15 +6,6 @@ import Carousel from "@/components/Carousel"; import { EventMockData } from "@/components/card/EventMockData"; import VerticalEventCard from "@/components/card/VerticalEventCard"; -const DATA = { - placeName: "카페", - artistName: "아티스트", - eventType: "생일 카페", - address: "주소", - startDate: "날짜", - endDate: "날짜", -}; - const FavArtistEventsCarousel = () => { // 추후 next auth로 변경 예정 const [status, setStatus] = useState(true); @@ -24,27 +15,33 @@ const FavArtistEventsCarousel = () => { const hasFavoriteEvents = EventMockData.length > 0; // const hasFavoriteEvents = false; + const renderContent = () => { + if (!status) { + return ; + } + + if (!hasFavoriteEvents) { + ; + } + + return ( + + {EventMockData.map((event, index) => ( +
+ +
+ ))} + + ); + }; + return ( <>

좋아요한 아티스트의 새 행사

전체보기
- {status ? ( - hasFavoriteEvents ? ( - - - - - - - - ) : ( - - ) - ) : ( - - )} + {renderContent()} ); }; @@ -57,7 +54,7 @@ interface NoFavCardProps { const NoFavCard = ({ href, buttonName }: NoFavCardProps) => { return (
- + {buttonName}
diff --git a/app/(route)/_components/carousel/NewestEventsCarousel.tsx b/app/(route)/_components/carousel/NewestEventsCarousel.tsx index 216ec8a1..2d559073 100644 --- a/app/(route)/_components/carousel/NewestEventsCarousel.tsx +++ b/app/(route)/_components/carousel/NewestEventsCarousel.tsx @@ -4,7 +4,7 @@ import VerticalEventCard from "@/components/card/VerticalEventCard"; const NewestEventsCarousel = () => { return ( - + ); diff --git a/app/(route)/_components/carousel/PopularEventsCarousel.tsx b/app/(route)/_components/carousel/PopularEventsCarousel.tsx index d290f3c1..8e23a24c 100644 --- a/app/(route)/_components/carousel/PopularEventsCarousel.tsx +++ b/app/(route)/_components/carousel/PopularEventsCarousel.tsx @@ -4,7 +4,7 @@ import VerticalEventCard from "@/components/card/VerticalEventCard"; const PopularEventsCarousel = () => { return ( - + ); diff --git a/app/(route)/mypage/_components/EventCalendar.tsx b/app/(route)/mypage/_components/EventCalendar.tsx index f93c6fd4..d5e2dc16 100644 --- a/app/(route)/mypage/_components/EventCalendar.tsx +++ b/app/(route)/mypage/_components/EventCalendar.tsx @@ -12,6 +12,7 @@ interface ScheduleData { address: string; startDate: string; endDate: string; + eventImage: string; } const mockData: ScheduleData[] = [ @@ -22,6 +23,7 @@ const mockData: ScheduleData[] = [ address: "마포구", startDate: "2024-01-25T00:00:00", endDate: "2024-02-01T00:00:00", + eventImage: "", }, { @@ -31,6 +33,7 @@ const mockData: ScheduleData[] = [ address: "마포구", startDate: "2024-01-28T00:00:00", endDate: "2024-01-31T00:00:00", + eventImage: "", }, { placeName: "김민지 카페", @@ -39,6 +42,7 @@ const mockData: ScheduleData[] = [ address: "마포구", startDate: "2024-01-26T00:00:00", endDate: "2024-01-28T00:00:00", + eventImage: "", }, ]; diff --git a/app/_components/card/EventMockData.ts b/app/_components/card/EventMockData.ts index 92db1de3..f2572223 100644 --- a/app/_components/card/EventMockData.ts +++ b/app/_components/card/EventMockData.ts @@ -1,12 +1,14 @@ export const EventMockData = [ { - placeName: "최승철 카페", + placeName: "최승철 카페 카페 이름이 매우 길어요", artistName: "최승철", eventType: "생일카페", address: "마포구", startDate: "2024-01-28", endDate: "2024-01-30", gifts: ["컵홀더", "포토카드", "엽서", "스티커"], + eventImage: + "https://i.namu.wiki/i/cVUeYWpLEnOij4dYSX9dC12I4Ns552izzk0koy-fOnWs6T17-zbthepDB3d-8fvRLkqVpPB_fDx3x2vpXlw5zf-E3qGLEn3NzU6b6R4BjIK-I4ovu0xJlhTobjdAsuLzIAyGk52T7wYKQI0D32ZiyA.webp", }, { placeName: "윤정한 카페", @@ -17,6 +19,8 @@ export const EventMockData = [ startDate: "2024-01-28", endDate: "2024-01-30", gifts: ["컵홀더", "포토카드", "엽서", "스티커"], + eventImage: + "https://i.namu.wiki/i/ih4PcJTM8PGahDKVMYEwEjrC0vMmddvSXpqRDXQTvZcCJV15TlntztbIHBY1F_nBDWcXUpolcAO5uqqhCtu32ZE_qNurPG9RTmBan8V02P0Bscv2FE7TwT6aufvY24G-r_Fsy1XxXQPBffXRwa5xaA.webp", }, { placeName: "홍지수 카페", @@ -27,6 +31,8 @@ export const EventMockData = [ startDate: "2024-01-28", endDate: "2024-01-30", gifts: ["컵홀더", "포토카드", "엽서", "스티커"], + eventImage: + "https://i.namu.wiki/i/c5dTk5Q7fJffyTVjpS_pR5tKHkaO622VIGckO2UMSd_t-eSowqlardGCFh3VIXQo3zElqYk2Efi08MqulFX7UXWo_yiO6i5kE8g76Vvq4QCv7P1dVUgbIJZG3fhc6jaJsEf-kT7t-evs0C4C_FGChg.webp", }, { placeName: "문준휘 카페", @@ -37,6 +43,8 @@ export const EventMockData = [ startDate: "2024-01-28", endDate: "2024-01-30", gifts: ["컵홀더", "포토카드", "엽서", "스티커"], + eventImage: + "https://i.namu.wiki/i/Up9Lcqxr67_7YCWAJ3K7nL7reiObQvNsneW9lVRcH9zJlAaB6_iBL40fNptbmo_MogjR-zbkoGPKs7E3Y1bsv0rBwRu7RvBuEHmNqu_8nKdXEyfAA6VaQmVMVfgE3Idyfkbsm6Rbj3LyJVoHiusNyA.webp", }, { placeName: "권순영 카페", @@ -47,6 +55,8 @@ export const EventMockData = [ startDate: "2024-01-28", endDate: "2024-01-30", gifts: ["컵홀더", "포토카드", "엽서", "스티커"], + eventImage: + "https://i.namu.wiki/i/q81B70Xx5hl4Ps0dULoQCHiqRHOCg9xeJaAlOKpNeytaQf5xaw4Qom7NS4FUbEX_SbcozM0UIO75jYTCXortVpsUbgtBLH9pXGJ8mvbH1KeMQP1LGweQfwR_chaN7fuPxA_Dr7hqG92-c7IU9b4s6w.webp", }, { placeName: "전원우 카페", @@ -57,6 +67,8 @@ export const EventMockData = [ startDate: "2024-01-28", endDate: "2024-01-30", gifts: ["컵홀더", "포토카드", "엽서", "스티커"], + eventImage: + "https://i.namu.wiki/i/mIBNitRZKRFMcIrrGj9kPaitPy6lKAsbAY3sTxv-WCs3SWpEexCOk4_LHPfC06YxUXruRJ4Oy_rI8QnqZdjxB2XHearzAG1CQbdiw0iIRCC67mzS-D85cTGBMV5mxnzswIWDtDvdT0gl-AYmLAFOeA.webp", }, { placeName: "이지훈 카페", @@ -67,6 +79,8 @@ export const EventMockData = [ startDate: "2024-01-28", endDate: "2024-01-30", gifts: ["컵홀더", "포토카드", "엽서", "스티커"], + eventImage: + "https://i.namu.wiki/i/xqplchTSk2YQNSfiOeXSML0o16jhkSYO_SaPbA__YLoPkqf7m6LvK8SoKYMn92YsIUeyQotbsp8nF7L1tF19geA4YScHru91tbXEvFIZ0EFtL4GJ-HzEp9hoSlZy1THUAhYLS-fxMwH8EG53fjHy6Q.webp", }, { placeName: "서명호 카페", @@ -77,6 +91,8 @@ export const EventMockData = [ startDate: "2024-01-28", endDate: "2024-01-30", gifts: ["컵홀더", "포토카드", "엽서", "스티커"], + eventImage: + "https://i.namu.wiki/i/-DQNkooD8TmSLN4QKCN5XfZk5dLl7TTPTAZvF-Yz6bfADYU6Ftb9g89DsP1JwtRENSaeKHvjRxR3HJdwTpRTdfQybRohEE3MjHF77W1-to_SUeoKti1WQzwbtgP0l23sfI7E53670t7f8VXOVbAw6A.webp", }, { placeName: "김민규 카페", @@ -87,6 +103,8 @@ export const EventMockData = [ startDate: "2024-01-28", endDate: "2024-01-30", gifts: ["컵홀더", "포토카드", "엽서", "스티커"], + eventImage: + "https://i.namu.wiki/i/dgtlF-9k6OFGAMBPzDuCIXUtfLGEILClbkcuTljNpAI2z9sDGAHJlllddsHzEhnIzotHKYeFHBp7-3nD-iY9LlMq3K-04KfzDWyS0wmSO0BdeOV3vai1JQ4LqoNiziWdVK0-JcWh23jfpizrxtCldg.webp", }, { placeName: "이석민 카페", @@ -97,6 +115,8 @@ export const EventMockData = [ startDate: "2024-01-28", endDate: "2024-01-30", gifts: ["컵홀더", "포토카드", "엽서", "스티커"], + eventImage: + "https://i.namu.wiki/i/o2BCmdj_aZORmwm7THhsvmmu73F-amPFMcHShE-Ko-WtP1q50Qg5y3QZSwdUjILA-kQZS7xc7n8JUIwNWug7RhVtTZ5SmRAJpUITm_hbJrbr_pwu4ocTG9ZDcvnTaqff3phNSEwUsYgIkKaybVEhZw.webp", }, { placeName: "부승관 카페", @@ -107,6 +127,8 @@ export const EventMockData = [ startDate: "2024-01-28", endDate: "2024-01-30", gifts: ["컵홀더", "포토카드", "엽서", "스티커"], + eventImage: + "https://i.namu.wiki/i/xnMXHIEVbD9hczcvXAujBvOrlJ206dsAaLWGuxZyPJhJcG5AX4tJkusB6f_RdJwHYZJPvX3w_8lfnv-mkk1FcC2ONYtwKULNSVVZZs8VPG2hEtW5xCWF4hNcVLf-BKTF8fnWmsME3EzpKtfBnGarzQ.webp", }, { placeName: "최한솔 카페", @@ -117,6 +139,8 @@ export const EventMockData = [ startDate: "2024-01-28", endDate: "2024-01-30", gifts: ["컵홀더", "포토카드", "엽서", "스티커"], + eventImage: + "https://i.namu.wiki/i/ydXRy-sRwT9oYNqkNav_mooSYtgjmyqCqWbXS0e1jaltpCRmrrpyKlKUfRJyabn0bXyt1g8L3ZG4Qp3NOp1u2Y2SMFxM3szqoG6lqm-IalUKaj8KD70UAsjNUPRsznq_iNy_U9WaSNcnqVlTgKMZwQ.webp", }, { placeName: "이찬 카페", @@ -127,5 +151,7 @@ export const EventMockData = [ startDate: "2024-01-28", endDate: "2024-01-30", gifts: ["컵홀더", "포토카드", "엽서", "스티커"], + eventImage: + "https://i.namu.wiki/i/Jlh9d_TSuVTU8oGNge67qcK08CtwsUaHDFCPzCFnUigDIvA2hIQbLxnyle2A5ZIDK6C7vKMtVDmDRTDmT5j9xnr_UXhw6ENoiSHccpEFNN3KNZZSRuIbM4TrgVcAThdIG1AqUtFbsLdXb1O0-W2gIw.webp", }, ]; diff --git a/app/_types/index.ts b/app/_types/index.ts index 0717bf49..c82d6f78 100644 --- a/app/_types/index.ts +++ b/app/_types/index.ts @@ -45,4 +45,5 @@ export interface EventCardType { startDate: string; endDate: string; gifts?: string[]; + eventImage: string; } From cf7823ec2bc388bc55061243a8adf60e89bbfcda Mon Sep 17 00:00:00 2001 From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com> Date: Fri, 2 Feb 2024 12:06:29 +0900 Subject: [PATCH 13/16] =?UTF-8?q?=F0=9F=92=84=20design:=20/event/id=20?= =?UTF-8?q?=ED=95=98=EC=9C=84=20=ED=8E=98=EC=9D=B4=EC=A7=80=EB=93=A4?= =?UTF-8?q?=EC=97=90=20header=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(route)/event/[id]/_components/Header.tsx | 31 ++++++++++++++++--- app/(route)/event/[id]/layout.tsx | 17 ++++++++++ app/(route)/event/[id]/page.tsx | 2 -- 3 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 app/(route)/event/[id]/layout.tsx diff --git a/app/(route)/event/[id]/_components/Header.tsx b/app/(route)/event/[id]/_components/Header.tsx index bcbbfdaf..9834f527 100644 --- a/app/(route)/event/[id]/_components/Header.tsx +++ b/app/(route)/event/[id]/_components/Header.tsx @@ -1,20 +1,43 @@ "use client"; +import { usePathname, useRouter } from "next/navigation"; import BottomSheetFrame from "@/components/bottom-sheet/BottomSheetFrame"; import { useBottomSheet } from "@/hooks/useBottomSheet"; +import ArrowLeft from "@/public/icon/arrow-left_lg.svg"; +import KebabButton from "@/public/icon/kebab.svg"; -const Header = () => { +interface Props { + params: { id: number }; +} + +const Header = ({ params }: Props) => { const { bottomSheet, openBottomSheet, closeBottomSheet } = useBottomSheet(); const openKebeb = () => { openBottomSheet("event-kebab"); }; + const router = useRouter(); + const pathname = usePathname(); + + let title = "카페 이름"; // 기본값 + + if (pathname === `/event/${params.id}`) { + title = "카페 이름"; // 추후 id에 따른 카페 이름으로 변경 + } else if (pathname === `/event/${params.id}/post`) { + title = "후기 작성하기"; + } else if (pathname === `/event/${params.id}/edit`) { + title = "수정 등록하기"; + } else if (pathname === `/event/${params.id}/approve`) { + title = "수정 승인하기"; + } + return ( <> -
- 파이키 - +
+ router.back()} className="cursor-pointer" /> +

{title}

+ {pathname === `/event/${params.id}` && }
{bottomSheet === "event-kebab" && ( diff --git a/app/(route)/event/[id]/layout.tsx b/app/(route)/event/[id]/layout.tsx new file mode 100644 index 00000000..19d8fff0 --- /dev/null +++ b/app/(route)/event/[id]/layout.tsx @@ -0,0 +1,17 @@ +import { ReactElement } from "react"; +import Header from "./_components/Header"; + +interface Props { + children: ReactElement; + params: { id: number }; +} + +const SettingLayout = ({ children, params }: Props) => { + return ( + <> +
+ {children} + + ); +}; +export default SettingLayout; diff --git a/app/(route)/event/[id]/page.tsx b/app/(route)/event/[id]/page.tsx index 889c9a0b..85b8adab 100644 --- a/app/(route)/event/[id]/page.tsx +++ b/app/(route)/event/[id]/page.tsx @@ -1,6 +1,5 @@ import Tabs from "@/components/Tabs"; import Banner from "./_components/Banner"; -import Header from "./_components/Header"; import DescriptionTab from "./_components/tabs/DescriptionTab"; import LocationTab from "./_components/tabs/LocationTab"; import ReviewTab from "./_components/tabs/ReviewTab"; @@ -8,7 +7,6 @@ import ReviewTab from "./_components/tabs/ReviewTab"; const EventInfoPage = () => { return ( <> -
From 30944cf82d93ce64cb1cd84fa318ef7180c23b6d Mon Sep 17 00:00:00 2001 From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com> Date: Fri, 2 Feb 2024 12:07:12 +0900 Subject: [PATCH 14/16] =?UTF-8?q?=F0=9F=A9=B9=20chore:=20header=20?= =?UTF-8?q?=EC=8B=9C=EB=A9=98=ED=8B=B1=20=ED=83=9C=EA=B7=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/_components/Header.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/_components/Header.tsx b/app/_components/Header.tsx index 526301d5..63b50870 100644 --- a/app/_components/Header.tsx +++ b/app/_components/Header.tsx @@ -17,12 +17,12 @@ const Header = () => { const pathname = usePathname(); return ( -
+

{TITLE[pathname]}

-
+
); }; export default Header; From bae05921ed37afbefce36b4a12e75de6ccdfa982 Mon Sep 17 00:00:00 2001 From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com> Date: Fri, 2 Feb 2024 12:11:15 +0900 Subject: [PATCH 15/16] =?UTF-8?q?=F0=9F=A9=B9=20chore:=20=EC=97=90?= =?UTF-8?q?=EB=9F=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(route)/search/page.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/(route)/search/page.tsx b/app/(route)/search/page.tsx index 5aeaa69a..86141308 100644 --- a/app/(route)/search/page.tsx +++ b/app/(route)/search/page.tsx @@ -19,6 +19,7 @@ const MOCK_EVENTS = [ endDate: "2024-01-30", address: "중구", gifts: ["포토카드", "엽서"], + eventImage: "https://thumb.mtstarnews.com/06/2023/09/2023090715013844673_1.jpg/dims/optimize", }, { placeName: "강남역", @@ -28,6 +29,7 @@ const MOCK_EVENTS = [ endDate: "2024-01-30", address: "강남구", gifts: ["포토카드", "엽서"], + eventImage: "https://thumb.mtstarnews.com/06/2023/09/2023090715013844673_1.jpg/dims/optimize", }, ]; From eec9652dc47538420be3765de16cf51678a365aa Mon Sep 17 00:00:00 2001 From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com> Date: Fri, 2 Feb 2024 12:14:37 +0900 Subject: [PATCH 16/16] =?UTF-8?q?=F0=9F=A9=B9=20chore:=20autoscroll=20?= =?UTF-8?q?=EC=9E=90=EB=8F=99=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(route)/_components/carousel/NewestEventsCarousel.tsx | 2 +- app/(route)/_components/carousel/PopularEventsCarousel.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/(route)/_components/carousel/NewestEventsCarousel.tsx b/app/(route)/_components/carousel/NewestEventsCarousel.tsx index 2d559073..216ec8a1 100644 --- a/app/(route)/_components/carousel/NewestEventsCarousel.tsx +++ b/app/(route)/_components/carousel/NewestEventsCarousel.tsx @@ -4,7 +4,7 @@ import VerticalEventCard from "@/components/card/VerticalEventCard"; const NewestEventsCarousel = () => { return ( - + ); diff --git a/app/(route)/_components/carousel/PopularEventsCarousel.tsx b/app/(route)/_components/carousel/PopularEventsCarousel.tsx index 8e23a24c..d290f3c1 100644 --- a/app/(route)/_components/carousel/PopularEventsCarousel.tsx +++ b/app/(route)/_components/carousel/PopularEventsCarousel.tsx @@ -4,7 +4,7 @@ import VerticalEventCard from "@/components/card/VerticalEventCard"; const PopularEventsCarousel = () => { return ( - + );