diff --git a/src/Components/TrackCard.tsx b/src/Components/TrackCard.tsx index 207a3ac..39b6051 100644 --- a/src/Components/TrackCard.tsx +++ b/src/Components/TrackCard.tsx @@ -27,33 +27,38 @@ export default function TrackCard({ track, index, theme }: TrackCardProps) { theme.card.border, )} style={{}} + p="sm" > - - +
+ {/* Track Number and Title */} + {index + 1} - + {track.label} - - + {/* Badges and Duration */} +
+ {track.__SPOTIFY_URL__ && ( {track.duration} - - +
+
setModalOpened(false)} track={track} theme={theme} /> diff --git a/src/Components/TrackModal.tsx b/src/Components/TrackModal.tsx index f320505..bf0d4bf 100644 --- a/src/Components/TrackModal.tsx +++ b/src/Components/TrackModal.tsx @@ -36,19 +36,23 @@ export default function TrackModal({ opened, onClose, track, theme }: TrackModal boxShadow: "none", }, }} + size="lg" + padding="md" > - - {track.label} + + + {track.label} + + Studio Version } /> - 0 ? Object.keys(songLink).length : 4}> + {songLink && Object.entries(songLink).map(([key, value]) => { let themeColor: { @@ -93,7 +97,7 @@ export default function TrackModal({ opened, onClose, track, theme }: TrackModal return ( @@ -121,19 +125,23 @@ export default function TrackModal({ opened, onClose, track, theme }: TrackModal color={theme.accent.DEFAULT} size={"lg"} label={ - + <Title c={theme.accent.DEFAULT} order={3} className="text-lg sm:text-xl"> Fan Live Versions } /> - + {track.emilyLive.map((live) => ( - - - By: {live.author} - {live.location} - + + + + By: {live.author} + + + {live.location} + + {new Date(live.date).toLocaleDateString("en-US", { year: "numeric", month: "long", day: "numeric" })} @@ -146,6 +154,7 @@ export default function TrackModal({ opened, onClose, track, theme }: TrackModal href={live.url} target="_blank" rel="noopener noreferrer" + className="shrink-0" > @@ -162,22 +171,24 @@ export default function TrackModal({ opened, onClose, track, theme }: TrackModal color={theme.accent.DEFAULT} size={"lg"} label={ - + <Title c={theme.accent.DEFAULT} order={3} className="text-lg sm:text-xl"> Linkin Park Live Versions } /> - - - + + + {new Date(track.lpLive.date).toLocaleDateString("en-US", { year: "numeric", month: "long", day: "numeric", })} - {track.lpLive.location} - + + {track.lpLive.location} + + {track.lpLive.disclaimer} @@ -190,6 +201,7 @@ export default function TrackModal({ opened, onClose, track, theme }: TrackModal href={track.lpLive.url} target="_blank" rel="noopener noreferrer" + className="shrink-0" > @@ -203,14 +215,14 @@ export default function TrackModal({ opened, onClose, track, theme }: TrackModal color={theme.accent.DEFAULT} size={"lg"} label={ - + <Title c={theme.accent.DEFAULT} order={3} className="text-lg sm:text-xl"> LP TV } /> - - - + + + {new Date(track.lpTV.date).toLocaleDateString("en-US", { year: "numeric", month: "long", @@ -227,6 +239,7 @@ export default function TrackModal({ opened, onClose, track, theme }: TrackModal href={track.lpTV.url} target="_blank" rel="noopener noreferrer" + className="shrink-0" > diff --git a/src/app/album/[albumId]/page.tsx b/src/app/album/[albumId]/page.tsx index 35bbd55..47a4857 100644 --- a/src/app/album/[albumId]/page.tsx +++ b/src/app/album/[albumId]/page.tsx @@ -46,12 +46,12 @@ export default async function AlbumDetail({ params }: { params: Promise<{ albumI viewTransitionName: `album-card-background-${album.id}`, }} > - + {/* Back Button */} - - + + - + {album.label}</span> - + {album.description} @@ -109,17 +110,17 @@ export default async function AlbumDetail({ params }: { params: Promise<{ albumI Track List - + {album.tracks.map((track, index) => ( ))}