@@ -64,22 +72,48 @@ export function AlbumCard({ album }: { album: Album }) {
-
+ {
+ event.preventDefault()
+ void openAddAlbumToPlaylist(album.id as Id<"albums">)
+ }}
+ >
Add to Playlist
-
+ event.preventDefault()}
+ >
Play Next
-
+ event.preventDefault()}
+ >
Play Last
-
- Favorite
+
+
+ Go to Artist
+
+
+
+
+ {
+ event.preventDefault()
+ void toggleAlbumFavorite(album.id as Id<"albums">)
+ }}
+ >
+ {isAlbumFavorite(album.id) ? "Unfavorite" : "Favorite"}
diff --git a/components/album-view.tsx b/components/album-view.tsx
index 60dbd4b..8837b33 100644
--- a/components/album-view.tsx
+++ b/components/album-view.tsx
@@ -5,7 +5,9 @@ import Image from "next/image"
import Link from "next/link"
import { Play, Share2, Shuffle, Star } from "lucide-react"
+import { useAddToPlaylist } from "@/components/add-to-playlist-provider"
import { FavoriteMediaButton } from "@/components/favorite-media-button"
+import { useFavorites } from "@/components/favorites-provider"
import { toast } from "sonner"
import {
@@ -16,7 +18,8 @@ import { Button } from "@/components/ui/button"
import { ScrollArea } from "@/components/ui/scroll-area"
import { useTrackSelection } from "@/hooks/use-track-selection"
import { cn } from "@/lib/utils"
-import type { AlbumDetail, AlbumTrack } from "@/lib/data"
+import type { Id } from "@/convex/_generated/dataModel"
+import type { BrowseAlbumDetail, BrowseAlbumTrack } from "@/convex/library"
import {
getSelectionRangePositions,
isInSelectionRange,
@@ -60,6 +63,7 @@ function formatMetadata(genre: string | null, year: number | null): string | nul
function TrackRow({
track,
index,
+ artist,
isActive,
isSelected,
selectionPosition,
@@ -71,8 +75,9 @@ function TrackRow({
onPrepareContextMenu,
onMediaAction,
}: {
- track: AlbumTrack
+ track: BrowseAlbumTrack
index: number
+ artist: BrowseAlbumDetail["artist"]
isActive: boolean
isSelected: boolean
selectionPosition: SelectionRangePosition
@@ -172,29 +177,32 @@ function TrackRow({
onMediaAction(action, track.id)}
- triggerClassName={cn(
- "size-8 shrink-0 transition-opacity",
- inRange
- ? "text-primary-foreground opacity-100 hover:bg-white/15 hover:text-primary-foreground"
- : "opacity-0 group-hover:opacity-100 data-[state=open]:opacity-100"
- )}
+ favorited={isFavorite}
+ navigation={{
+ artist: { id: artist.id },
+ }}
/>
)
}
-export function AlbumView({ album }: { album: AlbumDetail }) {
+export function AlbumView({ album }: { album: BrowseAlbumDetail }) {
+ const { openAddToPlaylist } = useAddToPlaylist()
+ const {
+ isSongFavorite,
+ isAlbumFavorite,
+ toggleSongFavorite,
+ toggleAlbumFavorite,
+ favoriteSongs,
+ } = useFavorites()
const metadata = formatMetadata(album.genre, album.year)
const [activeTrackId, setActiveTrackId] = React.useState(
() => album.tracks[0]?.id ?? ""
)
- const [isAlbumFavorite, setIsAlbumFavorite] = React.useState(false)
- const [favoriteIds, setFavoriteIds] = React.useState