From b5147162a8e53e3cf235392e58e79181c80be51e Mon Sep 17 00:00:00 2001
From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com>
Date: Tue, 6 Feb 2024 16:08:09 +0900
Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=92=84=20design:=20/my-artist-event?=
=?UTF-8?q?=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=94=94=EC=9E=90=EC=9D=B8=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/(route)/(header)/my-artist-event/page.tsx | 2 +-
app/_components/Header.tsx | 1 -
app/_hooks/useHeaderTitle.tsx | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/app/(route)/(header)/my-artist-event/page.tsx b/app/(route)/(header)/my-artist-event/page.tsx
index 17cc82e2..5fee443a 100644
--- a/app/(route)/(header)/my-artist-event/page.tsx
+++ b/app/(route)/(header)/my-artist-event/page.tsx
@@ -3,7 +3,7 @@ import MyArtistEvent from "./_components/MyArtistEvent";
const MyArtistEventPage = () => {
return (
-
+
);
diff --git a/app/_components/Header.tsx b/app/_components/Header.tsx
index afee1371..5a21a364 100644
--- a/app/_components/Header.tsx
+++ b/app/_components/Header.tsx
@@ -1,6 +1,5 @@
"use client";
-import classNames from "classnames";
import { useParams, usePathname, useRouter } from "next/navigation";
import BottomSheet from "@/components/bottom-sheet/BottomSheetMaterial";
import { useBottomSheet } from "@/hooks/useBottomSheet";
diff --git a/app/_hooks/useHeaderTitle.tsx b/app/_hooks/useHeaderTitle.tsx
index 988d5ddc..2527a4c2 100644
--- a/app/_hooks/useHeaderTitle.tsx
+++ b/app/_hooks/useHeaderTitle.tsx
@@ -16,7 +16,7 @@ const useHeaderTitle = () => {
title = "팔로우 아티스트 수정";
break;
case "/my-artist-event":
- title = "내 아티스트의 새 행사";
+ title = "내 아티스트의 행사";
break;
case "/signup":
title = "회원가입";
From 4595c4313a47abc3b6bde74d38cfcb9a1066adf8 Mon Sep 17 00:00:00 2001
From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com>
Date: Tue, 6 Feb 2024 16:14:50 +0900
Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=92=84=20design(BottomNav.tsx):=20?=
=?UTF-8?q?=ED=95=98=EB=8B=A8=EB=B0=94=20=EB=94=94=EC=9E=90=EC=9D=B8=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/BottomNav.tsx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/_components/BottomNav.tsx b/app/_components/BottomNav.tsx
index a4f53d86..98203ba9 100644
--- a/app/_components/BottomNav.tsx
+++ b/app/_components/BottomNav.tsx
@@ -29,7 +29,7 @@ const BottomNav = () => {
];
return (
-
}
- className="w-320"
+ className="flex flex-col items-center"
>
-
- {artists.map((artist, index) => (
- -
- {artist.name}
-
- ))}
-
+
+
+ {artists.map((artist, index) => (
+ -
+ {artist.name}
+
+ ))}
+
+
);
From 7f5e48e372c565875df2189af526ce7b7ad670ff Mon Sep 17 00:00:00 2001
From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com>
Date: Wed, 7 Feb 2024 19:01:36 +0900
Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=92=84=20design:=20=EC=BA=90=EB=9F=AC?=
=?UTF-8?q?=EC=85=80=20UI=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/(route)/(bottom-nav)/page.tsx | 2 +-
.../_components/artist-list/ArtistList.tsx | 2 +-
app/(route)/_components/carousel/Carousel.tsx | 17 +++++
.../carousel/FavArtistEventsCarousel.tsx | 18 +++--
.../carousel/NewestEventsCarousel.tsx | 4 +-
.../carousel/PopularEventsCarousel.tsx | 4 +-
app/_components/Carousel.tsx | 30 --------
package-lock.json | 74 ++-----------------
package.json | 3 -
9 files changed, 40 insertions(+), 114 deletions(-)
create mode 100644 app/(route)/_components/carousel/Carousel.tsx
delete mode 100644 app/_components/Carousel.tsx
diff --git a/app/(route)/(bottom-nav)/page.tsx b/app/(route)/(bottom-nav)/page.tsx
index a309837d..ad71b4f4 100644
--- a/app/(route)/(bottom-nav)/page.tsx
+++ b/app/(route)/(bottom-nav)/page.tsx
@@ -11,7 +11,7 @@ const Home = () => {
-
+
diff --git a/app/(route)/_components/artist-list/ArtistList.tsx b/app/(route)/_components/artist-list/ArtistList.tsx
index 006c6269..d6980da7 100644
--- a/app/(route)/_components/artist-list/ArtistList.tsx
+++ b/app/(route)/_components/artist-list/ArtistList.tsx
@@ -26,7 +26,7 @@ const ArtistList = () => {
};
return (
-
+
아티스트로 찾아보기
{
+ return (
+
+ {title &&
{title}
}
+
{children}
+
+ );
+};
+
+export default Carousel;
diff --git a/app/(route)/_components/carousel/FavArtistEventsCarousel.tsx b/app/(route)/_components/carousel/FavArtistEventsCarousel.tsx
index 555be760..c2839da3 100644
--- a/app/(route)/_components/carousel/FavArtistEventsCarousel.tsx
+++ b/app/(route)/_components/carousel/FavArtistEventsCarousel.tsx
@@ -3,10 +3,10 @@
import Link from "next/link";
import { useRouter } from "next/navigation";
import { useState } from "react";
-import Carousel from "@/components/Carousel";
import VerticalEventCard from "@/components/card/VerticalEventCard";
import { MOCK_EVENTS } from "@/constants/mock";
import Hero from "@/public/icon/hero.svg";
+import Carousel from "./Carousel";
const FavArtistEventsCarousel = () => {
// 추후 next auth로 변경 예정
@@ -26,7 +26,7 @@ const FavArtistEventsCarousel = () => {
}
return (
-
+
{MOCK_EVENTS.map((event, index) => (
@@ -38,7 +38,7 @@ const FavArtistEventsCarousel = () => {
return (
-
+
내 아티스트의 새 행사
{hasFavoriteEvents && (
@@ -60,11 +60,13 @@ const NoFavCard = ({ href, buttonName }: NoFavCardProps) => {
const router = useRouter();
return (
-
-
-
-
router.push(href)} className="h-32 cursor-pointer rounded-full bg-gray-900 px-16 text-14 font-600 leading-loose text-white-white ">
- {buttonName}
+
+
+
+
+
router.push(href)} className="h-32 cursor-pointer rounded-full bg-gray-900 px-16 text-14 font-600 leading-loose text-white-white ">
+ {buttonName}
+
diff --git a/app/(route)/_components/carousel/NewestEventsCarousel.tsx b/app/(route)/_components/carousel/NewestEventsCarousel.tsx
index 1da0fdd5..73d182f9 100644
--- a/app/(route)/_components/carousel/NewestEventsCarousel.tsx
+++ b/app/(route)/_components/carousel/NewestEventsCarousel.tsx
@@ -1,10 +1,10 @@
-import Carousel from "@/components/Carousel";
import VerticalEventCard from "@/components/card/VerticalEventCard";
import { MOCK_EVENTS } from "@/constants/mock";
+import Carousel from "./Carousel";
const NewestEventsCarousel = () => {
return (
-
+
);
diff --git a/app/(route)/_components/carousel/PopularEventsCarousel.tsx b/app/(route)/_components/carousel/PopularEventsCarousel.tsx
index c4328f09..e5ef75e7 100644
--- a/app/(route)/_components/carousel/PopularEventsCarousel.tsx
+++ b/app/(route)/_components/carousel/PopularEventsCarousel.tsx
@@ -1,10 +1,10 @@
-import Carousel from "@/components/Carousel";
import VerticalEventCard from "@/components/card/VerticalEventCard";
import { MOCK_EVENTS } from "@/constants/mock";
+import Carousel from "./Carousel";
const PopularEventsCarousel = () => {
return (
-
+
);
diff --git a/app/_components/Carousel.tsx b/app/_components/Carousel.tsx
deleted file mode 100644
index 08e6e618..00000000
--- a/app/_components/Carousel.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-"use client";
-
-import { ReactNode } from "react";
-import Slider, { Settings } from "react-slick";
-import "slick-carousel/slick/slick-theme.css";
-import "slick-carousel/slick/slick.css";
-
-interface CarouselProps {
- customSettings?: Settings;
- title?: string;
- children: ReactNode;
-}
-
-const Carousel = ({ customSettings, title, children }: CarouselProps) => {
- const settings = {
- slidesToShow: 3,
- slidesToScroll: 1,
- speed: 500,
- ...customSettings,
- };
-
- return (
-
- {title &&
{title}
}
- {children}
-
- );
-};
-
-export default Carousel;
diff --git a/package-lock.json b/package-lock.json
index 7404f80d..ad372ca6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,6 @@
"@tanstack/react-query-devtools": "^5.17.19",
"@tanstack/react-query-next-experimental": "^5.17.19",
"@types/classnames": "^2.3.1",
- "@types/react-slick": "^0.23.13",
"classnames": "^2.5.1",
"date-fns": "^3.3.1",
"next": "14.1.0",
@@ -26,8 +25,6 @@
"react-hook-form": "^7.49.3",
"react-hot-toast": "^2.4.1",
"react-infinite-scroller": "^1.2.6",
- "react-slick": "^0.29.0",
- "slick-carousel": "^1.8.1",
"tailwind-scrollbar-hide": "^1.1.7",
"zustand": "^4.5.0"
},
@@ -3313,12 +3310,14 @@
"node_modules/@types/prop-types": {
"version": "15.7.11",
"resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.11.tgz",
- "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng=="
+ "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==",
+ "devOptional": true
},
"node_modules/@types/react": {
"version": "18.2.48",
"resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.48.tgz",
"integrity": "sha512-qboRCl6Ie70DQQG9hhNREz81jqC1cs9EVNcjQ1AU+jH6NFfSAhVVbrrY/+nSF+Bsk4AOwm9Qa61InvMCyV+H3w==",
+ "devOptional": true,
"dependencies": {
"@types/prop-types": "*",
"@types/scheduler": "*",
@@ -3343,18 +3342,11 @@
"@types/react": "*"
}
},
- "node_modules/@types/react-slick": {
- "version": "0.23.13",
- "resolved": "https://registry.npmjs.org/@types/react-slick/-/react-slick-0.23.13.tgz",
- "integrity": "sha512-bNZfDhe/L8t5OQzIyhrRhBr/61pfBcWaYJoq6UDqFtv5LMwfg4NsVDD2J8N01JqdAdxLjOt66OZEp6PX+dGs/A==",
- "dependencies": {
- "@types/react": "*"
- }
- },
"node_modules/@types/scheduler": {
"version": "0.16.8",
"resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz",
- "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A=="
+ "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==",
+ "devOptional": true
},
"node_modules/@types/semver": {
"version": "7.5.6",
@@ -4583,11 +4575,6 @@
"node": ">=10.13.0"
}
},
- "node_modules/enquire.js": {
- "version": "2.1.6",
- "resolved": "https://registry.npmjs.org/enquire.js/-/enquire.js-2.1.6.tgz",
- "integrity": "sha512-/KujNpO+PT63F7Hlpu4h3pE3TokKRHN26JYmQpPyjkRD/N57R7bPDNojMXdi7uveAKjYB7yQnartCxZnFWr0Xw=="
- },
"node_modules/entities": {
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
@@ -6131,12 +6118,6 @@
"url": "https://github.com/sponsors/panva"
}
},
- "node_modules/jquery": {
- "version": "3.7.1",
- "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
- "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==",
- "peer": true
- },
"node_modules/js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -6190,14 +6171,6 @@
"integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
"dev": true
},
- "node_modules/json2mq": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/json2mq/-/json2mq-0.2.0.tgz",
- "integrity": "sha512-SzoRg7ux5DWTII9J2qkrZrqV1gt+rTaoufMxEzXbS26Uid0NwaJd123HcoB80TgubEppxxIGdNxCx50fEoEWQA==",
- "dependencies": {
- "string-convert": "^0.2.0"
- }
- },
"node_modules/json5": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
@@ -6304,7 +6277,8 @@
"node_modules/lodash.debounce": {
"version": "4.0.8",
"resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
- "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
+ "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
+ "dev": true
},
"node_modules/lodash.memoize": {
"version": "4.1.2",
@@ -7360,22 +7334,6 @@
"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
},
- "node_modules/react-slick": {
- "version": "0.29.0",
- "resolved": "https://registry.npmjs.org/react-slick/-/react-slick-0.29.0.tgz",
- "integrity": "sha512-TGdOKE+ZkJHHeC4aaoH85m8RnFyWqdqRfAGkhd6dirmATXMZWAxOpTLmw2Ll/jPTQ3eEG7ercFr/sbzdeYCJXA==",
- "dependencies": {
- "classnames": "^2.2.5",
- "enquire.js": "^2.1.6",
- "json2mq": "^0.2.0",
- "lodash.debounce": "^4.0.8",
- "resize-observer-polyfill": "^1.5.0"
- },
- "peerDependencies": {
- "react": "^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0 || ^18.0.0",
- "react-dom": "^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0 || ^18.0.0"
- }
- },
"node_modules/read-cache": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
@@ -7504,11 +7462,6 @@
"jsesc": "bin/jsesc"
}
},
- "node_modules/resize-observer-polyfill": {
- "version": "1.5.1",
- "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
- "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
- },
"node_modules/resolve": {
"version": "1.22.8",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
@@ -7768,14 +7721,6 @@
"node": ">=8"
}
},
- "node_modules/slick-carousel": {
- "version": "1.8.1",
- "resolved": "https://registry.npmjs.org/slick-carousel/-/slick-carousel-1.8.1.tgz",
- "integrity": "sha512-XB9Ftrf2EEKfzoQXt3Nitrt/IPbT+f1fgqBdoxO3W/+JYvtEOW6EgxnWfr9GH6nmULv7Y2tPmEX3koxThVmebA==",
- "peerDependencies": {
- "jquery": ">=1.8.0"
- }
- },
"node_modules/snake-case": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/snake-case/-/snake-case-3.0.4.tgz",
@@ -7811,11 +7756,6 @@
"node": ">=10.0.0"
}
},
- "node_modules/string-convert": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/string-convert/-/string-convert-0.2.1.tgz",
- "integrity": "sha512-u/1tdPl4yQnPBjnVrmdLo9gtuLvELKsAoRapekWggdiQNvvvum+jYF329d84NAa660KQw7pB2n36KrIKVoXa3A=="
- },
"node_modules/string-width": {
"version": "5.1.2",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
diff --git a/package.json b/package.json
index c83d58e1..f22ea04b 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,6 @@
"@tanstack/react-query-devtools": "^5.17.19",
"@tanstack/react-query-next-experimental": "^5.17.19",
"@types/classnames": "^2.3.1",
- "@types/react-slick": "^0.23.13",
"classnames": "^2.5.1",
"date-fns": "^3.3.1",
"next": "14.1.0",
@@ -27,8 +26,6 @@
"react-hook-form": "^7.49.3",
"react-hot-toast": "^2.4.1",
"react-infinite-scroller": "^1.2.6",
- "react-slick": "^0.29.0",
- "slick-carousel": "^1.8.1",
"tailwind-scrollbar-hide": "^1.1.7",
"zustand": "^4.5.0"
},