Enhance album and queue pages with improved UI components and functionality

- Added new icons and improved layout in AlbumPage for better track display
- Implemented track addition to queue functionality in AlbumPage
- Enhanced QueuePage with clearer song information and improved styling
- Added scrollable area for queue display and improved user interaction elements
This commit is contained in:
2025-06-19 03:09:55 +00:00
committed by GitHub
parent 717155ea22
commit 6f3cf5e579
6 changed files with 420 additions and 123 deletions

View File

@@ -4,13 +4,14 @@ import { useParams } from 'next/navigation';
import Image from 'next/image';
import { Album, Song } from '@/lib/navidrome';
import { useNavidrome } from '@/app/components/NavidromeContext';
import { Play, Heart } from 'lucide-react';
import { Play, Heart, Clock, User, Plus } from 'lucide-react';
import { Button } from '@/components/ui/button';
import Link from 'next/link';
import { PlusIcon } from "@radix-ui/react-icons";
import { useAudioPlayer } from '@/app/components/AudioPlayerContext'
import Loading from "@/app/components/loading";
import { Separator } from '@/components/ui/separator';
import { ScrollArea } from '@/components/ui/scroll-area';
import { getNavidromeAPI } from '@/lib/navidrome';
export default function AlbumPage() {
@@ -20,7 +21,7 @@ export default function AlbumPage() {
const [loading, setLoading] = useState(true);
const [isStarred, setIsStarred] = useState(false);
const { getAlbum, starItem, unstarItem } = useNavidrome();
const { playTrack, addAlbumToQueue, playAlbum, playAlbumFromTrack } = useAudioPlayer();
const { playTrack, addAlbumToQueue, playAlbum, playAlbumFromTrack, addToQueue, currentTrack } = useAudioPlayer();
const api = getNavidromeAPI();
useEffect(() => {
@@ -80,6 +81,26 @@ export default function AlbumPage() {
}
};
const handleAddToQueue = (song: Song) => {
const track = {
id: song.id,
name: song.title,
url: api.getStreamUrl(song.id),
artist: song.artist,
album: song.album,
duration: song.duration,
coverArt: song.coverArt ? api.getCoverArtUrl(song.coverArt, 300) : undefined,
albumId: song.albumId,
artistId: song.artistId
};
addToQueue(track);
};
const isCurrentlyPlaying = (song: Song): boolean => {
return currentTrack?.id === song.id;
};
const formatDuration = (duration: number): string => {
const minutes = Math.floor(duration / 60);
const seconds = duration % 60;
@@ -123,26 +144,80 @@ export default function AlbumPage() {
</div>
</div>
</div>
<div className="space-y-2">
<div className="space-y-4">
<Separator />
{tracklist.map((song, index) => (
<div key={song.id} className="py-2 flex justify-between items-center hover:bg-hover rounded-lg cursor-pointer" onClick={() => handlePlayClick(song)}>
<div className="flex items-center">
<div className="mr-2 w-6 text-right">{song.track || index + 1}</div>
<div>
<p className="font-semibold text-lg flex items-center">
{song.title}
</p>
<p className="text-sm font-normal flex items-center">
<p className="text-gray-400">{song.artist}</p>
</p>
</div>
<ScrollArea className="h-[calc(100vh-500px)]">
{tracklist.length === 0 ? (
<div className="text-center py-12">
<p className="text-muted-foreground">No tracks available.</p>
</div>
<div className="flex items-center space-x-2">
<p className="text-sm mr-4">{formatDuration(song.duration)}</p>
) : (
<div className="space-y-1">
{tracklist.map((song, index) => (
<div
key={song.id}
className={`group flex items-center p-3 rounded-lg hover:bg-accent/50 cursor-pointer transition-colors ${
isCurrentlyPlaying(song) ? 'bg-accent/50 border-l-4 border-primary' : ''
}`}
onClick={() => handlePlayClick(song)}
>
{/* Track Number / Play Indicator */}
<div className="w-8 text-center text-sm text-muted-foreground mr-3">
{isCurrentlyPlaying(song) ? (
<div className="w-4 h-4 mx-auto">
<div className="w-full h-full bg-primary rounded-full animate-pulse" />
</div>
) : (
<>
<span className="group-hover:hidden">{song.track || index + 1}</span>
<Play className="w-4 h-4 mx-auto hidden group-hover:block" />
</>
)}
</div>
{/* Song Info */}
<div className="flex-1 min-w-0 mr-4">
<div className="flex items-center gap-2 mb-1">
<p className={`font-semibold truncate ${
isCurrentlyPlaying(song) ? 'text-primary' : ''
}`}>
{song.title}
</p>
</div>
<div className="flex items-center text-sm text-muted-foreground">
<div className="flex items-center gap-1">
<User className="w-3 h-3" />
<span className="truncate">{song.artist}</span>
</div>
</div>
</div>
{/* Duration */}
<div className="flex items-center text-sm text-muted-foreground mr-4">
<Clock className="w-3 h-3 mr-1" />
{formatDuration(song.duration)}
</div>
{/* Actions */}
<div className="flex items-center space-x-2 opacity-0 group-hover:opacity-100 transition-opacity">
<Button
variant="ghost"
size="sm"
onClick={(e) => {
e.stopPropagation();
handleAddToQueue(song);
}}
className="h-8 w-8 p-0"
>
<Plus className="w-4 h-4" />
</Button>
</div>
</div>
))}
</div>
</div>
))}
)}
</ScrollArea>
</div>
</div>
</div>

View File

@@ -156,21 +156,27 @@ export const AudioPlayer: React.FC = () => {
}
return (
<div className="bg-background w-full text-white p-4 border-t border-t-1">
<div className="bg-background w-full text-white border-t border-t-1">
{currentTrack ? (
<div className="flex items-center">
<Image
src={currentTrack.coverArt || '/default-user.jpg'}
alt={currentTrack.name}
width={64}
height={64}
className="w-16 h-16 mr-4 rounded-md"
/>
<div className="flex-1 w-auto mr-4">
<p className="mb-0 font-semibold">{currentTrack.name}</p>
<p className='text-sm mt-0 text-gray-400'>{currentTrack.artist}</p>
<div className="flex items-center justify-between px-4 py-4">
{/* Left side - Album art and track info */}
<div className="flex items-center flex-1 min-w-0">
<Image
src={currentTrack.coverArt || '/default-user.jpg'}
alt={currentTrack.name}
width={96}
height={96}
className="w-12 h-12 mr-3 rounded-md flex-shrink-0"
/>
<div className="flex-1 min-w-0">
<p className="font-semibold truncate">{currentTrack.name}</p>
<p className='text-sm text-gray-400 truncate'>{currentTrack.artist}</p>
</div>
</div>
<div className="flex flex-col items-center mr-6">
{/* Center - Control buttons and progress bar */}
<div className="flex flex-col items-center flex-1 max-w-md mx-6">
{/* Control buttons */}
<div className="flex items-center space-x-2 mb-2">
<button className="p-2 hover:bg-gray-700 rounded-full transition-colors" onClick={playPreviousTrack}>
<FaBackward className="w-4 h-4" />
@@ -182,6 +188,8 @@ export const AudioPlayer: React.FC = () => {
<FaForward className="w-4 h-4" />
</button>
</div>
{/* Progress bar below buttons - full width of this section */}
<div className="flex items-center space-x-2 w-full">
<span className="text-xs text-gray-400 w-10 text-right">
{formatTime(audioCurrent?.currentTime ?? 0)}
@@ -192,9 +200,14 @@ export const AudioPlayer: React.FC = () => {
</span>
</div>
</div>
{/* Right side - Extra space for balance */}
<div className="flex-1"></div>
</div>
) : (
<p>No track playing</p>
<div className="p-4">
<p>No track playing</p>
</div>
)}
<audio ref={audioRef} hidden />
</div>

View File

@@ -62,15 +62,17 @@ export function ArtistIcon({
<div className={cn("space-y-3", className)} {...props}>
<ContextMenu>
<ContextMenuTrigger>
<div className={cn("overflow-hidden")} onClick={handleClick}>
<div
className="overflow-hidden rounded-full cursor-pointer flex-shrink-0"
onClick={handleClick}
style={{ width: size, height: size }}
>
<Image
src={artistImageUrl}
alt={artist.name}
width={width}
height={height}
className={cn(
"transition-all hover:scale-105"
)}
width={size}
height={size}
className="w-full h-full object-cover transition-all hover:scale-105"
/>
</div>
</ContextMenuTrigger>

View File

@@ -221,9 +221,11 @@ export default function SongsPage() {
<div className="w-full h-full bg-primary rounded-full animate-pulse" />
</div>
) : (
<span className="group-hover:hidden">{index + 1}</span>
<>
<span className="group-hover:hidden">{index + 1}</span>
<Play className="w-4 h-4 mx-auto hidden group-hover:block" />
</>
)}
<Play className="w-4 h-4 mx-auto hidden group-hover:block" />
</div>
{/* Album Art */}

View File

@@ -3,97 +3,181 @@
import React from 'react';
import Image from 'next/image';
import { useAudioPlayer } from '@/app/components/AudioPlayerContext';
import { Button } from '@/components/ui/button';
import { Separator } from '@/components/ui/separator';
import { ScrollArea } from '@/components/ui/scroll-area';
import { Play, X, Clock, User, Disc, Trash2, SkipForward } from 'lucide-react';
const QueuePage: React.FC = () => {
const { queue, currentTrack, removeTrackFromQueue, clearQueue, skipToTrackInQueue } = useAudioPlayer();
return (
<div className="p-4">
<div className="flex items-center justify-between mb-6">
<div>
<h1 className="text-2xl font-semibold mb-1">Queue</h1>
<p className="text-sm text-muted-foreground">Click on a track to skip to it</p>
</div>
<button
onClick={clearQueue}
className="px-4 py-2 bg-destructive text-destructive-foreground rounded-md hover:bg-destructive/90"
disabled={queue.length === 0}
>
Clear queue
</button>
</div>
const formatDuration = (seconds: number): string => {
const minutes = Math.floor(seconds / 60);
const remainingSeconds = seconds % 60;
return `${minutes}:${remainingSeconds.toString().padStart(2, '0')}`;
};
{/* Currently Playing */}
{currentTrack && (
<div className="mb-6">
<h2 className="text-lg font-semibold mb-3">Now Playing</h2>
<div className="p-4 bg-accent/50 rounded-lg border-l-4 border-primary">
<div className="flex items-center">
<Image
src={currentTrack.coverArt || '/default-user.jpg'}
alt={currentTrack.name}
width={60}
height={60}
className="rounded-md mr-4"
/>
<div className="flex-1">
<p className="font-semibold text-lg">{currentTrack.name}</p>
<p className="text-sm text-muted-foreground">{currentTrack.artist}</p>
<p className="text-xs text-muted-foreground">{currentTrack.album}</p>
</div>
<div className="text-sm text-muted-foreground">
{Math.floor(currentTrack.duration / 60)}:{(currentTrack.duration % 60).toString().padStart(2, '0')}
return (
<div className="h-full px-4 py-6 lg:px-8">
<div className="space-y-6">
{/* Header */}
<div className="flex items-center justify-between">
<div className="space-y-2">
<h1 className="text-3xl font-semibold tracking-tight">Queue</h1>
<p className="text-sm text-muted-foreground">
{currentTrack ? `Now playing • ${queue.length} songs up next` : `${queue.length} songs in queue`}
</p>
</div>
<Button
onClick={clearQueue}
variant="destructive"
disabled={queue.length === 0 && !currentTrack}
className="flex items-center gap-2"
>
<Trash2 className="w-4 h-4" />
Clear Queue
</Button>
</div>
<Separator />
{/* Currently Playing */}
{currentTrack && (
<div className="space-y-3">
<h2 className="text-lg font-semibold">Now Playing</h2>
<div className="p-4 bg-accent/30 rounded-lg border-l-4 border-primary">
<div className="flex items-center">
{/* Album Art */}
<div className="w-16 h-16 mr-4 flex-shrink-0">
<Image
src={currentTrack.coverArt || '/default-user.jpg'}
alt={currentTrack.album}
width={64}
height={64}
className="w-full h-full object-cover rounded-md"
/>
</div>
{/* Song Info */}
<div className="flex-1 min-w-0 mr-4">
<div className="flex items-center gap-2 mb-1">
<p className="font-semibold text-lg text-primary truncate">
{currentTrack.name}
</p>
<div className="w-3 h-3 bg-primary rounded-full animate-pulse flex-shrink-0" />
</div>
<div className="flex items-center text-sm text-muted-foreground space-x-4">
<div className="flex items-center gap-1">
<User className="w-3 h-3" />
<span className="truncate">{currentTrack.artist}</span>
</div>
<div className="flex items-center gap-1">
<Disc className="w-3 h-3" />
<span className="truncate">{currentTrack.album}</span>
</div>
</div>
</div>
{/* Duration */}
<div className="flex items-center text-sm text-muted-foreground">
<Clock className="w-3 h-3 mr-1" />
{formatDuration(currentTrack.duration)}
</div>
</div>
</div>
</div>
</div>
)}
{/* Queue */}
<div>
<h2 className="text-lg font-semibold mb-3">Up Next</h2>
{queue.length === 0 ? (
<p className="text-muted-foreground">No tracks in the queue</p>
) : (
<div className="space-y-2">
{queue.map((track, index) => (
<div
key={`${track.id}-${index}`}
className="flex items-center p-3 rounded-lg hover:bg-accent/50 cursor-pointer group"
onClick={() => skipToTrackInQueue(index)}
>
<div className="w-8 text-center text-sm text-muted-foreground mr-3">
{index + 1}
</div>
<Image
src={track.coverArt || '/default-user.jpg'}
alt={track.name}
width={50}
height={50}
className="rounded-md mr-4"
/>
<div className="flex-1 min-w-0">
<p className="font-semibold truncate">{track.name}</p>
<p className="text-sm text-muted-foreground truncate">{track.artist}</p>
</div>
<div className="flex items-center space-x-4">
<div className="text-sm text-muted-foreground">
{Math.floor(track.duration / 60)}:{(track.duration % 60).toString().padStart(2, '0')}
</div>
<button
onClick={(e) => {
e.stopPropagation();
removeTrackFromQueue(index);
}}
className="opacity-0 group-hover:opacity-100 px-3 py-1 text-sm bg-destructive text-destructive-foreground rounded hover:bg-destructive/90 transition-all"
>
Remove
</button>
</div>
</div>
))}
</div>
)}
{/* Queue */}
<div className="space-y-3">
<div className="flex items-center justify-between">
<h2 className="text-lg font-semibold">Up Next</h2>
{queue.length > 0 && (
<p className="text-sm text-muted-foreground">
{queue.length} song{queue.length !== 1 ? 's' : ''}
</p>
)}
</div>
<ScrollArea className="h-[calc(100vh-400px)]">
{queue.length === 0 ? (
<div className="text-center py-12">
<div className="w-16 h-16 mx-auto mb-4 rounded-full bg-muted flex items-center justify-center">
<SkipForward className="w-8 h-8 text-muted-foreground" />
</div>
<p className="text-muted-foreground text-lg font-medium mb-2">No songs in queue</p>
<p className="text-muted-foreground text-sm">
Add songs to your queue to see them here
</p>
</div>
) : (
<div className="space-y-1">
{queue.map((track, index) => (
<div
key={`${track.id}-${index}`}
className="group flex items-center p-3 rounded-lg hover:bg-accent/50 cursor-pointer transition-colors"
onClick={() => skipToTrackInQueue(index)}
>
{/* Track Number / Play Indicator */}
<div className="w-8 text-center text-sm text-muted-foreground mr-3">
<span className="group-hover:hidden">{index + 1}</span>
<Play className="w-4 h-4 mx-auto hidden group-hover:block" />
</div>
{/* Album Art */}
<div className="w-12 h-12 mr-4 flex-shrink-0">
<Image
src={track.coverArt || '/default-user.jpg'}
alt={track.album}
width={48}
height={48}
className="w-full h-full object-cover rounded-md"
/>
</div>
{/* Song Info */}
<div className="flex-1 min-w-0 mr-4">
<div className="flex items-center gap-2 mb-1">
<p className="font-semibold truncate">{track.name}</p>
</div>
<div className="flex items-center text-sm text-muted-foreground space-x-4">
<div className="flex items-center gap-1">
<User className="w-3 h-3" />
<span className="truncate">{track.artist}</span>
</div>
<div className="flex items-center gap-1">
<Disc className="w-3 h-3" />
<span className="truncate">{track.album}</span>
</div>
</div>
</div>
{/* Duration */}
<div className="flex items-center text-sm text-muted-foreground mr-4">
<Clock className="w-3 h-3 mr-1" />
{formatDuration(track.duration)}
</div>
{/* Actions */}
<div className="flex items-center space-x-2 opacity-0 group-hover:opacity-100 transition-opacity">
<Button
variant="ghost"
size="sm"
onClick={(e) => {
e.stopPropagation();
removeTrackFromQueue(index);
}}
className="h-8 w-8 p-0 hover:bg-destructive hover:text-destructive-foreground"
>
<X className="w-4 h-4" />
</Button>
</div>
</div>
))}
</div>
)}
</ScrollArea>
</div>
</div>
</div>
);

121
theme.md Normal file
View File

@@ -0,0 +1,121 @@
# Violet
```css
@layer base {
:root {
--background: 0 0% 100%;
--foreground: 224 71.4% 4.1%;
--card: 0 0% 100%;
--card-foreground: 224 71.4% 4.1%;
--popover: 0 0% 100%;
--popover-foreground: 224 71.4% 4.1%;
--primary: 262.1 83.3% 57.8%;
--primary-foreground: 210 20% 98%;
--secondary: 220 14.3% 95.9%;
--secondary-foreground: 220.9 39.3% 11%;
--muted: 220 14.3% 95.9%;
--muted-foreground: 220 8.9% 46.1%;
--accent: 220 14.3% 95.9%;
--accent-foreground: 220.9 39.3% 11%;
--destructive: 0 84.2% 60.2%;
--destructive-foreground: 210 20% 98%;
--border: 220 13% 91%;
--input: 220 13% 91%;
--ring: 262.1 83.3% 57.8%;
--radius: 0.65rem;
--chart-1: 12 76% 61%;
--chart-2: 173 58% 39%;
--chart-3: 197 37% 24%;
--chart-4: 43 74% 66%;
--chart-5: 27 87% 67%;
}
.dark {
--background: 224 71.4% 4.1%;
--foreground: 210 20% 98%;
--card: 224 71.4% 4.1%;
--card-foreground: 210 20% 98%;
--popover: 224 71.4% 4.1%;
--popover-foreground: 210 20% 98%;
--primary: 263.4 70% 50.4%;
--primary-foreground: 210 20% 98%;
--secondary: 215 27.9% 16.9%;
--secondary-foreground: 210 20% 98%;
--muted: 215 27.9% 16.9%;
--muted-foreground: 217.9 10.6% 64.9%;
--accent: 215 27.9% 16.9%;
--accent-foreground: 210 20% 98%;
--destructive: 0 62.8% 30.6%;
--destructive-foreground: 210 20% 98%;
--border: 215 27.9% 16.9%;
--input: 215 27.9% 16.9%;
--ring: 263.4 70% 50.4%;
--chart-1: 220 70% 50%;
--chart-2: 160 60% 45%;
--chart-3: 30 80% 55%;
--chart-4: 280 65% 60%;
--chart-5: 340 75% 55%;
}
}
```
# Blue
```css@layer base {
:root {
--background: 0 0% 100%;
--foreground: 240 10% 3.9%;
--card: 0 0% 100%;
--card-foreground: 240 10% 3.9%;
--popover: 0 0% 100%;
--popover-foreground: 240 10% 3.9%;
--primary: 221.2 83.2% 53.3%;
--primary-foreground: 0 0% 98%;
--secondary: 240 4.8% 95.9%;
--secondary-foreground: 240 5.9% 10%;
--muted: 240 4.8% 95.9%;
--muted-foreground: 240 3.8% 46.1%;
--accent: 240 4.8% 95.9%;
--accent-foreground: 240 5.9% 10%;
--destructive: 0 84.2% 60.2%;
--destructive-foreground: 0 0% 98%;
--border: 240 5.9% 90%;
--input: 240 5.9% 90%;
--ring: 240 5.9% 10%;
--radius: 0.5rem;
--chart-1: 12 76% 61%;
--chart-2: 173 58% 39%;
--chart-3: 197 37% 24%;
--chart-4: 43 74% 66%;
--chart-5: 27 87% 67%;
}
.dark {
--background: 240 10% 3.9%;
--foreground: 0 0% 98%;
--card: 240 10% 3.9%;
--card-foreground: 0 0% 98%;
--popover: 240 10% 3.9%;
--popover-foreground: 0 0% 98%;
--primary: 217.2 91.2% 59.8%;
--primary-foreground: 222.2 47.4% 11.2%;
--secondary: 217.2 32.6% 17.5%;
--secondary-foreground: 0 0% 98%;
--muted: 217.2 32.6% 17.5%;
--muted-foreground: 215 20.2% 65.1%;
--accent: 217.2 32.6% 17.5%;
--accent-foreground: 0 0% 98%;
--destructive: 0 62.8% 30.6%;
--destructive-foreground: 0 0% 98%;
--border: 217.2 32.6% 17.5%;
--input: 217.2 32.6% 17.5%;
--ring: 224.3 76.3% 48%;
--chart-1: 220 70% 50%;
--chart-2: 160 60% 45%;
--chart-3: 30 80% 55%;
--chart-4: 280 65% 60%;
--chart-5: 340 75% 55%;
--hover: 240 27% 11%;
}
}
```