-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #28 from Nico1eKim/feat/my-artist-event
✨ feat: my-artist-evnet 구현
- Loading branch information
Showing
15 changed files
with
158 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| import { EventMockData } from "@/components/card/EventMockData"; | ||
| import HorizontalEventCard from "@/components/card/HorizontalEventCard"; | ||
|
|
||
| const MyArtistEvent = () => { | ||
| // 좋아요 한 아티스트의 새 행사 로직은 추후 구현 | ||
|
|
||
| return ( | ||
| <> | ||
| {EventMockData.map((event, index) => ( | ||
| <div key={index}> | ||
| <HorizontalEventCard | ||
| placeName={event.placeName} | ||
| artistName={event.artistName} | ||
| eventType={event.eventType} | ||
| address={event.address} | ||
| startDate={event.startDate} | ||
| endDate={event.endDate} | ||
| gifts={event.gifts} | ||
| /> | ||
| </div> | ||
| ))} | ||
| </> | ||
| ); | ||
| }; | ||
|
|
||
| export default MyArtistEvent; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| import Header from "@/components/Header"; | ||
| import MyArtistEvent from "./_components/MyArtistEvent"; | ||
|
|
||
| const MyArtistEventPage = () => { | ||
| return ( | ||
| <div className="flex h-dvh w-dvw flex-col px-20 pt-32"> | ||
| <div className="flex items-center gap-8 self-start pb-20"> | ||
| <Header /> | ||
| </div> | ||
| <MyArtistEvent /> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export default MyArtistEventPage; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| const Chip = ({ chipName }: { chipName: string }) => { | ||
| // bg 색도 받아와야함..!? | ||
| return <div className="gap-10 flex items-center rounded-[4px] bg-[#C3C3C3] px-4 py-0">{chipName}</div>; | ||
| }; | ||
|
|
||
| export default Chip; |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| import { EventCardProps } from "@/types/index"; | ||
| import Chip from "./Chip"; | ||
|
|
||
| const HorizontalEventCard = ({ placeName, artistName, eventType, address, startDate, endDate, gifts }: EventCardProps) => { | ||
| // "2024-" 부분을 제외하고 날짜를 보여주기 위해 Date 객체 사용 | ||
| const formattedStartDate = new Date(startDate).toLocaleDateString(undefined, { month: "2-digit", day: "2-digit" }); | ||
| const formattedEndDate = new Date(endDate).toLocaleDateString(undefined, { month: "2-digit", day: "2-digit" }); | ||
|
|
||
| return ( | ||
| <div className="flex w-320 items-center gap-12 self-stretch border-b border-solid border-[#E0E2E6] py-12"> | ||
| <div className="h-112 w-84 bg-[#e7e7e7]" /> | ||
| <div className="flex flex-col gap-4"> | ||
| <p>{placeName}</p> | ||
| <div className="flex items-center gap-8"> | ||
| <p>{artistName}</p> | ||
| <Chip chipName={eventType} /> | ||
| </div> | ||
| <div className="flex"> | ||
| <p className="border-r border-solid border-black pr-4"> | ||
| {formattedStartDate} ~ {formattedEndDate} | ||
| </p> | ||
| <p className="pl-4">{address}</p> | ||
| </div> | ||
| <div className="flex gap-4"> | ||
| {gifts?.map((gift, index) => ( | ||
| <div key={index}> | ||
| <Chip chipName={gift} /> | ||
| </div> | ||
| ))} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export default HorizontalEventCard; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| import { EventCardProps } from "@/types/index"; | ||
| import Chip from "./Chip"; | ||
|
|
||
| const VerticalEventCard = ({ placeName, artistName, eventType, address, startDate, endDate }: EventCardProps) => { | ||
| // "2024-" 부분을 제외하고 날짜를 보여주기 위해 Date 객체 사용 | ||
| const formattedStartDate = new Date(startDate).toLocaleDateString(undefined, { month: "2-digit", day: "2-digit" }); | ||
| const formattedEndDate = new Date(endDate).toLocaleDateString(undefined, { month: "2-digit", day: "2-digit" }); | ||
|
|
||
| return ( | ||
| <div className="flex w-180 flex-col gap-8 border border-solid border-black p-[10px]"> | ||
| <div className="h-160 bg-[#e7e7e7]" /> | ||
| <div className="flex flex-col gap-4"> | ||
| <p>{placeName}</p> | ||
| <div className="flex"> | ||
| <p className="border-r border-solid border-black pr-4"> | ||
| {formattedStartDate} ~ {formattedEndDate} | ||
| </p> | ||
| <p className="pl-4">{address}</p> | ||
| </div> | ||
| <div className="flex gap-4"> | ||
| <p>{artistName}</p> | ||
| <Chip chipName={eventType} /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export default VerticalEventCard; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters