fix(web): keep mobile navigation in a top bar

This commit is contained in:
joshuafhiggins committed 2026-11-03 14:39:59 -05:00
1 parent 23de1dd120
commit 325ea340d8
7 files changed
+34 -25

No files matched your search

@@ -1,5 +1,7 @@
"use client"
import { PageHeader } from "@/components/library-skeletons"
import Link from "next/link"
import { Home, Search } from "lucide-react"
@@ -8,6 +10,7 @@ import { Button } from "@/components/ui/button"
export default function Page() {
return (
<div className="flex h-svh flex-col">
<PageHeader />
<div className="flex flex-1 items-center justify-center px-6 pb-28">
<div className="flex max-w-md flex-col items-center text-center">
<p className="text-sm font-medium text-muted-foreground">404</p>
+3 -1
View File
@@ -2,6 +2,7 @@
import { useSearchParams } from "next/navigation"
import { MobileSidebarTrigger } from "@/components/mobile-sidebar-trigger"
import { SearchResultsSkeleton } from "@/components/library-skeletons"
import { SearchPrompt } from "@/components/search-prompt"
import { Skeleton } from "@/components/ui/skeleton"
@@ -11,7 +12,8 @@ export default function Loading() {
return (
<div className="flex h-svh flex-col">
<header className="flex items-center justify-center border-b px-4 py-3">
<header className="flex items-center justify-center gap-2 border-b px-4 py-3">
<MobileSidebarTrigger />
<Skeleton className="h-10 w-full max-w-xl rounded-full" />
</header>
{hasQuery ? <SearchResultsSkeleton /> : <SearchPrompt />}
+5 -7
View File
@@ -1,6 +1,6 @@
"use client"
import { MobileSidebarTrigger } from "@/components/mobile-sidebar-trigger"
import { PageHeader } from "@/components/library-skeletons"
import * as React from "react"
import Image from "next/image"
import Link from "next/link"
@@ -389,6 +389,7 @@ export function AlbumView({
return (
<div className="flex h-svh flex-col">
<PageHeader />
<ScrollArea className="min-h-0 flex-1 [&_[data-slot=scroll-area-viewport]>div]:block!">
<div className="pb-28">
<div className="mx-auto w-full min-w-0 max-w-9/10">
@@ -409,12 +410,9 @@ export function AlbumView({
<p className="text-xs font-medium tracking-wide text-muted-foreground uppercase">
Album
</p>
<div className="flex min-w-0 items-center justify-center gap-2 sm:justify-start md:contents">
<MobileSidebarTrigger />
<h1 className="text-3xl font-bold tracking-tight sm:text-4xl">
{album.title}
</h1>
</div>
<h1 className="text-3xl font-bold tracking-tight sm:text-4xl">
{album.title}
</h1>
<Link
href={"/artist/" + album.artist.id}
className="inline-block text-lg font-semibold text-primary hover:underline"
+5 -7
View File
@@ -1,6 +1,6 @@
"use client"
import { MobileSidebarTrigger } from "@/components/mobile-sidebar-trigger"
import { PageHeader } from "@/components/library-skeletons"
import * as React from "react"
import Image from "next/image"
import { Play, Shuffle } from "lucide-react"
@@ -65,6 +65,7 @@ export function ArtistView({
return (
<div className="flex h-svh flex-col">
<PageHeader />
<ScrollArea className="min-h-0 flex-1">
<div className="pb-28">
<div className="flex min-w-0 items-center gap-4 px-6 pt-6 pb-8 sm:gap-6">
@@ -80,12 +81,9 @@ export function ArtistView({
</div>
<div className="flex min-w-0 flex-1 flex-col gap-4">
<div className="flex min-w-0 items-center gap-2 md:contents">
<MobileSidebarTrigger />
<h1 className="min-w-0 truncate text-3xl font-bold tracking-tight sm:text-4xl lg:text-5xl">
{artist.name}
</h1>
</div>
<h1 className="min-w-0 truncate text-3xl font-bold tracking-tight sm:text-4xl lg:text-5xl">
{artist.name}
</h1>
<div className="flex flex-wrap items-center gap-2">
<Button
+10 -3
View File
@@ -19,11 +19,16 @@ function LoadingRegion({
)
}
export function PageHeader({ title }: { title: string }) {
export function PageHeader({ title }: { title?: string }) {
return (
<header className="flex items-center gap-2 border-b px-4 py-3">
<header
className={cn(
"flex shrink-0 items-center gap-2 border-b px-4 py-3",
!title && "md:hidden"
)}
>
<MobileSidebarTrigger />
<h1 className="text-lg font-semibold">{title}</h1>
{title ? <h1 className="text-lg font-semibold">{title}</h1> : null}
</header>
)
}
@@ -135,6 +140,7 @@ export function SongListSkeleton() {
export function CollectionDetailSkeleton() {
return (
<LoadingRegion className="flex h-svh flex-col overflow-hidden pb-28">
<PageHeader />
<div className="mx-auto w-full max-w-9/10 min-w-0">
<div className="flex flex-col gap-8 px-6 pt-6 pb-8 sm:flex-row sm:items-end">
<Skeleton className="mx-auto aspect-square w-full max-w-60 shrink-0 rounded-lg sm:mx-0" />
@@ -163,6 +169,7 @@ export function CollectionDetailSkeleton() {
export function ArtistDetailSkeleton() {
return (
<LoadingRegion className="flex h-svh flex-col overflow-hidden pb-28">
<PageHeader />
<div className="flex min-w-0 items-center gap-4 px-6 pt-6 pb-8 sm:gap-6">
<Skeleton className="size-32 shrink-0 rounded-full sm:size-40" />
<div className="flex min-w-0 flex-1 flex-col gap-4">
+3
View File
@@ -1,6 +1,9 @@
import { PageHeader } from "@/components/library-skeletons"
export function PageMessage({ children }: { children: React.ReactNode }) {
return (
<div className="flex h-svh flex-col">
<PageHeader />
<div className="flex flex-1 items-center justify-center pb-28">
<p className="text-sm text-muted-foreground">{children}</p>
</div>
+5 -7
View File
@@ -1,6 +1,6 @@
"use client"
import { MobileSidebarTrigger } from "@/components/mobile-sidebar-trigger"
import { PageHeader } from "@/components/library-skeletons"
import { stationArtistId } from "@/lib/station-artist"
import * as React from "react"
import Image from "next/image"
@@ -519,6 +519,7 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
return (
<div className="flex h-svh flex-col">
<PageHeader />
<ScrollArea className="min-h-0 flex-1">
<div className="pb-28">
<div className="mx-auto w-full min-w-0 max-w-9/10">
@@ -545,12 +546,9 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
<p className="text-xs font-medium tracking-wide text-muted-foreground uppercase">
Playlist
</p>
<div className="flex min-w-0 items-center justify-center gap-2 sm:justify-start md:contents">
<MobileSidebarTrigger />
<h1 className="text-3xl font-bold tracking-tight sm:text-4xl">
{playlist.title}
</h1>
</div>
<h1 className="text-3xl font-bold tracking-tight sm:text-4xl">
{playlist.title}
</h1>
<p className="text-lg font-semibold text-primary">
{playlist.owner.name}
</p>