misc: hoist PlayerBar to layout
This commit is contained in:
7 files changed
+11
-25
No files matched your search
+5
-1
@@ -5,6 +5,7 @@ import { ThemeProvider } from "@/components/theme-provider"
|
||||
import { cn } from "@/lib/utils";
|
||||
import { SidebarInset, SidebarProvider } from "@/components/ui/sidebar"
|
||||
import { AppSidebar } from "@/components/app-sidebar"
|
||||
import { PlayerBar } from "@/components/player-bar"
|
||||
|
||||
const inter = Inter({subsets:['latin'],variable:'--font-sans'})
|
||||
|
||||
@@ -28,7 +29,10 @@ export default function RootLayout({
|
||||
<ThemeProvider>
|
||||
<SidebarProvider>
|
||||
<AppSidebar />
|
||||
<SidebarInset>{children}</SidebarInset>
|
||||
<SidebarInset>
|
||||
{children}
|
||||
<PlayerBar />
|
||||
</SidebarInset>
|
||||
</SidebarProvider>
|
||||
</ThemeProvider>
|
||||
</body>
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
import { AlbumCard } from "@/components/album-card"
|
||||
import { PlayerBar } from "@/components/player-bar"
|
||||
import { albums } from "@/lib/data"
|
||||
|
||||
export default function Page() {
|
||||
return (
|
||||
<div className="relative flex h-svh flex-col">
|
||||
<div className="flex h-svh flex-col">
|
||||
<header className="flex items-center gap-2 border-b px-4 py-3">
|
||||
<h1 className="text-lg font-semibold">Albums</h1>
|
||||
</header>
|
||||
@@ -16,8 +15,6 @@ export default function Page() {
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<PlayerBar />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -1,10 +1,9 @@
|
||||
import { ArtistCard } from "@/components/artist-card"
|
||||
import { PlayerBar } from "@/components/player-bar"
|
||||
import { artists } from "@/lib/data"
|
||||
|
||||
export default function Page() {
|
||||
return (
|
||||
<div className="relative flex h-svh flex-col">
|
||||
<div className="flex h-svh flex-col">
|
||||
<header className="flex items-center gap-2 border-b px-4 py-3">
|
||||
<h1 className="text-lg font-semibold">Artists</h1>
|
||||
</header>
|
||||
@@ -16,8 +15,6 @@ export default function Page() {
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<PlayerBar />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
+1
-4
@@ -1,12 +1,11 @@
|
||||
"use client"
|
||||
|
||||
import { ContentCarousel } from "@/components/content-carousel"
|
||||
import { PlayerBar } from "@/components/player-bar"
|
||||
import { recentlyAdded, recentlyPlayed } from "@/lib/data"
|
||||
|
||||
export default function Page() {
|
||||
return (
|
||||
<div className="relative flex h-svh flex-col">
|
||||
<div className="flex h-svh flex-col">
|
||||
<header className="flex items-center gap-2 border-b px-4 py-3">
|
||||
<h1 className="text-lg font-semibold">Home</h1>
|
||||
</header>
|
||||
@@ -25,8 +24,6 @@ export default function Page() {
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<PlayerBar />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -1,10 +1,9 @@
|
||||
import { AlbumCard } from "@/components/album-card"
|
||||
import { PlayerBar } from "@/components/player-bar"
|
||||
import { albums } from "@/lib/data"
|
||||
|
||||
export default function Page() {
|
||||
return (
|
||||
<div className="relative flex h-svh flex-col">
|
||||
<div className="flex h-svh flex-col">
|
||||
<header className="flex items-center gap-2 border-b px-4 py-3">
|
||||
<h1 className="text-lg font-semibold">Recently Added</h1>
|
||||
</header>
|
||||
@@ -16,8 +15,6 @@ export default function Page() {
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<PlayerBar />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -1,10 +1,9 @@
|
||||
import { AlbumCard } from "@/components/album-card"
|
||||
import { PlayerBar } from "@/components/player-bar"
|
||||
import { albums } from "@/lib/data"
|
||||
|
||||
export default function Page() {
|
||||
return (
|
||||
<div className="relative flex h-svh flex-col">
|
||||
<div className="flex h-svh flex-col">
|
||||
<header className="flex items-center gap-2 border-b px-4 py-3">
|
||||
<h1 className="text-lg font-semibold">Recently Played</h1>
|
||||
</header>
|
||||
@@ -16,8 +15,6 @@ export default function Page() {
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<PlayerBar />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
+1
-4
@@ -1,13 +1,12 @@
|
||||
"use client"
|
||||
|
||||
import { AlbumCard } from "@/components/album-card"
|
||||
import { PlayerBar } from "@/components/player-bar"
|
||||
import { albums } from "@/lib/data"
|
||||
import { SearchIcon } from "lucide-react"
|
||||
|
||||
export default function Page() {
|
||||
return (
|
||||
<div className="relative flex h-svh flex-col">
|
||||
<div className="flex h-svh flex-col">
|
||||
<header className="flex items-center justify-around gap-2 border-b px-4 py-2">
|
||||
<div className="relative w-full max-w-md">
|
||||
<SearchIcon className="pointer-events-none absolute top-1/2 left-3 size-4 -translate-y-1/2 text-muted-foreground" />
|
||||
@@ -27,8 +26,6 @@ export default function Page() {
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<PlayerBar />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
Reference in new issue
Block a user