Merge pull request #2 from sillyangel/miniplayerfeature

made the new miniplayerfeature better
This commit is contained in:
2025-06-19 14:35:26 -05:00
committed by GitHub
3 changed files with 104 additions and 51 deletions

View File

@@ -2,7 +2,7 @@
import React, { useEffect, useRef, useState } from 'react'; import React, { useEffect, useRef, useState } from 'react';
import Image from 'next/image'; import Image from 'next/image';
import { useAudioPlayer } from '@/app/components/AudioPlayerContext'; import { useAudioPlayer } from '@/app/components/AudioPlayerContext';
import { FaPlay, FaPause, FaVolumeHigh, FaForward, FaBackward } from "react-icons/fa6"; import { FaPlay, FaPause, FaVolumeHigh, FaForward, FaBackward, FaCompress, FaVolumeXmark } from "react-icons/fa6";
import ColorThief from '@neutrixs/colorthief'; import ColorThief from '@neutrixs/colorthief';
import { Progress } from '@/components/ui/progress'; import { Progress } from '@/components/ui/progress';
import { useToast } from '@/hooks/use-toast'; import { useToast } from '@/hooks/use-toast';
@@ -15,6 +15,7 @@ export const AudioPlayer: React.FC = () => {
const [showVolumeSlider, setShowVolumeSlider] = useState(false); const [showVolumeSlider, setShowVolumeSlider] = useState(false);
const [volume, setVolume] = useState(1); const [volume, setVolume] = useState(1);
const [isClient, setIsClient] = useState(false); const [isClient, setIsClient] = useState(false);
const [isMinimized, setIsMinimized] = useState(false);
const audioCurrent = audioRef.current; const audioCurrent = audioRef.current;
const { toast } = useToast(); const { toast } = useToast();
@@ -151,65 +152,106 @@ export const AudioPlayer: React.FC = () => {
return `${minutes}:${secs}`; return `${minutes}:${secs}`;
} }
if (!isClient) { if (!isClient || !currentTrack) {
return null; return null;
} }
// Mini player (collapsed state)
if (isMinimized) {
return (
<div className="fixed bottom-4 left-4 z-50">
<div
className="bg-background/95 backdrop-blur-sm border rounded-lg shadow-lg cursor-pointer hover:scale-[1.02] transition-transform w-80"
onClick={() => setIsMinimized(false)}
>
<div className="flex items-center p-3">
<Image
src={currentTrack.coverArt || '/default-user.jpg'}
alt={currentTrack.name}
width={40}
height={40}
className="w-10 h-10 rounded-md flex-shrink-0"
/>
<div className="flex-1 min-w-0 mx-3 group">
<div className="overflow-hidden">
<p className="font-semibold text-sm whitespace-nowrap group-hover:animate-scroll">
{currentTrack.name}
</p>
</div>
<p className="text-xs text-muted-foreground truncate">{currentTrack.artist}</p>
</div>
<div className="flex items-center justify-center space-x-2">
<button className="p-1.5 hover:bg-gray-700/50 rounded-full transition-colors" onClick={playPreviousTrack}>
<FaBackward className="w-3 h-3" />
</button>
<button className="p-2 hover:bg-gray-700/50 rounded-full transition-colors" onClick={togglePlayPause}>
{isPlaying ? <FaPause className="w-4 h-4" /> : <FaPlay className="w-4 h-4" />}
</button>
<button className="p-1.5 hover:bg-gray-700/50 rounded-full transition-colors" onClick={playNextTrack}>
<FaForward className="w-3 h-3" />
</button>
</div>
</div>
</div>
<audio ref={audioRef} hidden />
</div>
);
}
// Compact floating player (default state)
return ( return (
<div className="bg-background w-full text-white border-t border-t-1"> <div className="fixed bottom-4 left-4 right-4 z-50">
{currentTrack ? ( <div className="bg-background/95 backdrop-blur-sm border rounded-lg shadow-lg p-3 pb-0 cursor-pointer hover:scale-[1.01] transition-transform">
<div className="flex items-center justify-between px-4 py-4"> <div className="flex items-center justify-between mb-3">
{/* Left side - Album art and track info */}
<div className="flex items-center flex-1 min-w-0"> <div className="flex items-center flex-1 min-w-0">
<Image <Image
src={currentTrack.coverArt || '/default-user.jpg'} src={currentTrack.coverArt || '/default-user.jpg'}
alt={currentTrack.name} alt={currentTrack.name}
width={96} width={40}
height={96} height={40}
className="w-12 h-12 mr-3 rounded-md flex-shrink-0" className="w-10 h-10 rounded-md mr-3 flex-shrink-0"
/> />
<div className="flex-1 min-w-0"> <div className="flex-1 min-w-0">
<p className="font-semibold truncate">{currentTrack.name}</p> <p className="font-semibold truncate text-sm">{currentTrack.name}</p>
<p className='text-sm text-gray-400 truncate'>{currentTrack.artist}</p> <p className="text-xs text-muted-foreground truncate">{currentTrack.artist}</p>
</div> </div>
</div> </div>
{/* Control buttons */}
{/* Center - Control buttons and progress bar */} <div className="flex items-center justify-center space-x-2">
<div className="flex flex-col items-center flex-1 max-w-md mx-6"> <button className="p-1.5 hover:bg-gray-700/50 rounded-full transition-colors" onClick={playPreviousTrack}>
{/* Control buttons */} <FaBackward className="w-3 h-3" />
<div className="flex items-center space-x-2 mb-2"> </button>
<button className="p-2 hover:bg-gray-700 rounded-full transition-colors" onClick={playPreviousTrack}> <button className="p-2 hover:bg-gray-700/50 rounded-full transition-colors" onClick={togglePlayPause}>
<FaBackward className="w-4 h-4" /> {isPlaying ? <FaPause className="w-4 h-4" /> : <FaPlay className="w-4 h-4" />}
</button> </button>
<button className='p-3 hover:bg-gray-700 rounded-full transition-colors' onClick={togglePlayPause}> <button className="p-1.5 hover:bg-gray-700/50 rounded-full transition-colors" onClick={playNextTrack}>
{isPlaying ? <FaPause className="w-5 h-5" /> : <FaPlay className="w-5 h-5" />} <FaForward className="w-3 h-3" />
</button> </button>
<button className='p-2 hover:bg-gray-700 rounded-full transition-colors' onClick={playNextTrack}> </div>
<FaForward className="w-4 h-4" /> <div className="flex items-center space-x-1 ml-2">
</button> <button
</div> className="p-1.5 hover:bg-gray-700/50 rounded-full transition-colors"
onClick={() => setIsMinimized(true)}
{/* Progress bar below buttons - full width of this section */} title="Minimize"
<div className="flex items-center space-x-2 w-full"> >
<span className="text-xs text-gray-400 w-10 text-right"> <FaCompress className="w-3 h-3" />
{formatTime(audioCurrent?.currentTime ?? 0)} </button>
</span>
<Progress value={progress} className="flex-1 cursor-pointer" onClick={handleProgressClick}/>
<span className="text-xs text-gray-400 w-10">
{formatTime(audioCurrent?.duration ?? 0)}
</span>
</div>
</div> </div>
{/* Right side - Extra space for balance */}
<div className="flex-1"></div>
</div> </div>
) : ( </div>
<div className="p-4">
<p>No track playing</p>
</div>
)}
<audio ref={audioRef} hidden /> <audio ref={audioRef} hidden />
</div> </div>
); );
}; };
// {/* Progress bar */}
// <div className="flex items-center space-x-2">
// <span className="text-xs text-muted-foreground w-8 text-right">
// {formatTime(audioCurrent?.currentTime ?? 0)}
// </span>
// <Progress value={progress} className="flex-1 cursor-pointer h-1" onClick={handleProgressClick}/>
// <span className="text-xs text-muted-foreground w-8">
// {formatTime(audioCurrent?.duration ?? 0)}
// </span>
// </div>

View File

@@ -45,16 +45,14 @@ const Ihateserverside: React.FC<IhateserversideProps> = ({ children }) => {
/> />
</div> </div>
)} )}
<div className={`flex-1 overflow-y-auto ${isStatusBarVisible ? 'pb-24' : ''}`}> <div className="flex-1 overflow-y-auto">
<div>{children}</div> <div>{children}</div>
</div> </div>
</div> </div>
{/* Audio Player */} {/* Floating Audio Player */}
{isStatusBarVisible && ( {isStatusBarVisible && (
<div className="fixed bottom-0 left-0 right-0 z-50 bg-background"> <AudioPlayer />
<AudioPlayer />
</div>
)} )}
<Toaster /> <Toaster />
</div> </div>

View File

@@ -11,6 +11,19 @@ body {
.text-balance { .text-balance {
text-wrap: balance; text-wrap: balance;
} }
.animate-scroll {
animation: scroll 8s linear infinite;
}
}
@keyframes scroll {
0%, 20% {
transform: translateX(0);
}
80%, 100% {
transform: translateX(-100%);
}
} }
@layer base { @layer base {