fix: make metadata server sided
This commit is contained in:
7 files changed
+212
-163
No files matched your search
@@ -3,11 +3,32 @@ import { LibraryLoading } from "@/components/library-loading"
|
||||
import { api } from "@/convex/_generated/api"
|
||||
import { fetchQuery } from "convex/nextjs"
|
||||
import type { Id } from "@/convex/_generated/dataModel"
|
||||
import { Metadata } from "next"
|
||||
|
||||
interface PageProps {
|
||||
params: Promise<{ id: string }>
|
||||
}
|
||||
|
||||
export async function generateMetadata({
|
||||
params,
|
||||
}: PageProps): Promise<Metadata> {
|
||||
const { id } = await params
|
||||
const album = await fetchQuery(api.library.browseAlbumDetail, {
|
||||
id: id as Id<"albums">,
|
||||
})
|
||||
|
||||
return {
|
||||
title: `${album ? `${album.title} - oTunes` : "oTunes"}`,
|
||||
openGraph: {
|
||||
title: `${album ? `${album.title} - oTunes` : "oTunes"}`,
|
||||
description: `${album ? album.artist.name : null}`,
|
||||
images: album
|
||||
? { url: `/api/album/${album.id}/cover`, width: 512, height: 512 }
|
||||
: [],
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
export default async function Page({ params }: PageProps) {
|
||||
const { id } = await params
|
||||
const album = await fetchQuery(api.library.browseAlbumDetail, {
|
||||
@@ -32,13 +53,5 @@ export default async function Page({ params }: PageProps) {
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<title>{`${album.title} - oTunes`}</title>
|
||||
<meta property="og:title" content={`${album.title}`} />
|
||||
<meta property="og:description" content={`${album.artist.name}`} />
|
||||
<meta property="og:image" content={`/api/album/${album.id}/cover`} />
|
||||
<AlbumView album={album} />
|
||||
</>
|
||||
)
|
||||
return <AlbumView album={album} />
|
||||
}
|
||||
@@ -1,16 +1,41 @@
|
||||
"use client"
|
||||
|
||||
import { useParams } from "next/navigation"
|
||||
import { useQuery } from "convex/react"
|
||||
|
||||
import { fetchQuery } from "convex/nextjs"
|
||||
import { ArtistView } from "@/components/artist-view"
|
||||
import { LibraryLoading } from "@/components/library-loading"
|
||||
import { api } from "@/convex/_generated/api"
|
||||
import type { Id } from "@/convex/_generated/dataModel"
|
||||
import { Metadata } from "next"
|
||||
|
||||
export default function Page() {
|
||||
const { id } = useParams<{ id: string }>()
|
||||
const data = useQuery(api.library.browseArtistDetail, {
|
||||
interface PageProps {
|
||||
params: Promise<{ id: string }>
|
||||
}
|
||||
|
||||
export async function generateMetadata({
|
||||
params,
|
||||
}: PageProps): Promise<Metadata> {
|
||||
const { id } = await params
|
||||
const data = await fetchQuery(api.library.browseArtistDetail, {
|
||||
id: id as Id<"artists">,
|
||||
})
|
||||
|
||||
return {
|
||||
title: `${data ? `${data.artist.name} - oTunes` : "oTunes"}`,
|
||||
openGraph: {
|
||||
title: `${data ? `${data.artist.name} - oTunes` : "oTunes"}`,
|
||||
description: "oTunes",
|
||||
images: data
|
||||
? {
|
||||
url: `/api/artist/${data.artist.id}/cover`,
|
||||
width: 512,
|
||||
height: 512,
|
||||
}
|
||||
: [],
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
export default async function Page({ params }: PageProps) {
|
||||
const { id } = await params
|
||||
const data = await fetchQuery(api.library.browseArtistDetail, {
|
||||
id: id as Id<"artists">,
|
||||
})
|
||||
|
||||
@@ -37,7 +62,10 @@ export default function Page() {
|
||||
<title>{`${data.artist.name} - oTunes`}</title>
|
||||
<meta property="og:title" content={`${data.artist.name}`} />
|
||||
{/*<meta property="og:description" content={`${playlist.owner.name}`} />*/}
|
||||
<meta property="og:image" content={`/api/artist/${data.artist.id}/cover`} />
|
||||
<meta
|
||||
property="og:image"
|
||||
content={`/api/artist/${data.artist.id}/cover`}
|
||||
/>
|
||||
<ArtistView
|
||||
artist={data.artist}
|
||||
albums={data.albums}
|
||||
|
||||
@@ -1,28 +1,46 @@
|
||||
"use client"
|
||||
|
||||
import { useParams } from "next/navigation"
|
||||
import { useQuery } from "convex/react"
|
||||
|
||||
import { fetchQuery } from "convex/nextjs"
|
||||
import { ArtistsView } from "@/components/artists-view"
|
||||
import { LibraryLoading } from "@/components/library-loading"
|
||||
import { api } from "@/convex/_generated/api"
|
||||
import { Metadata } from "next"
|
||||
|
||||
export default function Page() {
|
||||
const { id } = useParams<{ id: string }>()
|
||||
const artists = useQuery(api.library.browseArtists)
|
||||
const albums = useQuery(api.library.browseAlbums)
|
||||
interface PageProps {
|
||||
params: Promise<{ id: string }>
|
||||
}
|
||||
|
||||
export async function generateMetadata({
|
||||
params,
|
||||
}: PageProps): Promise<Metadata> {
|
||||
const { id } = await params
|
||||
const artists = await fetchQuery(api.library.browseArtists)
|
||||
const selectedArtist = artists.find((artist) => artist.id === id)
|
||||
|
||||
return {
|
||||
title: `${selectedArtist ? `${selectedArtist.name} - oTunes` : "oTunes"}`,
|
||||
openGraph: {
|
||||
title: `${selectedArtist ? `${selectedArtist.name} - oTunes` : "oTunes"}`,
|
||||
description: "oTunes",
|
||||
images: selectedArtist
|
||||
? {
|
||||
url: `/api/artist/${selectedArtist.id}/cover`,
|
||||
width: 512,
|
||||
height: 512,
|
||||
}
|
||||
: [],
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
export default async function Page({ params }: PageProps) {
|
||||
const { id } = await params
|
||||
const artists = await fetchQuery(api.library.browseArtists)
|
||||
const albums = await fetchQuery(api.library.browseAlbums)
|
||||
|
||||
return (
|
||||
<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>
|
||||
|
||||
{artists === undefined || albums === undefined ? (
|
||||
<LibraryLoading />
|
||||
) : (
|
||||
<ArtistsView artists={artists} albums={albums} artistId={id} />
|
||||
)}
|
||||
<ArtistsView artists={artists} albums={albums} artistId={id} />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -1,14 +1,11 @@
|
||||
"use client"
|
||||
|
||||
import { useQuery } from "convex/react"
|
||||
|
||||
import { fetchQuery } from "convex/nextjs"
|
||||
import { ArtistsView } from "@/components/artists-view"
|
||||
import { LibraryLoading } from "@/components/library-loading"
|
||||
import { api } from "@/convex/_generated/api"
|
||||
|
||||
export default function Page() {
|
||||
const artists = useQuery(api.library.browseArtists)
|
||||
const albums = useQuery(api.library.browseAlbums)
|
||||
export default async function Page() {
|
||||
const artists = await fetchQuery(api.library.browseArtists)
|
||||
const albums = await fetchQuery(api.library.browseAlbums)
|
||||
|
||||
return (
|
||||
<div className="flex h-svh flex-col">
|
||||
|
||||
@@ -3,11 +3,32 @@ import { PlaylistView } from "@/components/playlist-view"
|
||||
import { api } from "@/convex/_generated/api"
|
||||
import { fetchQuery } from "convex/nextjs"
|
||||
import type { Id } from "@/convex/_generated/dataModel"
|
||||
import { Metadata } from "next"
|
||||
|
||||
interface PageProps {
|
||||
params: Promise<{ id: string }>
|
||||
}
|
||||
|
||||
export async function generateMetadata({
|
||||
params,
|
||||
}: PageProps): Promise<Metadata> {
|
||||
const { id } = await params
|
||||
const playlist = await fetchQuery(api.playlists.browsePlaylistDetail, {
|
||||
id: id as Id<"playlists">,
|
||||
})
|
||||
|
||||
return {
|
||||
title: `${playlist ? `${playlist.title} - oTunes` : "oTunes"}`,
|
||||
openGraph: {
|
||||
title: `${playlist ? `${playlist.title} - oTunes` : "oTunes"}`,
|
||||
description: `${playlist ? playlist.owner : null}`,
|
||||
images: playlist
|
||||
? { url: `/api/playlist/${playlist.id}/cover`, width: 512, height: 512 }
|
||||
: [],
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
export default async function Page({ params }: PageProps) {
|
||||
const { id } = await params
|
||||
const playlist = await fetchQuery(api.playlists.browsePlaylistDetail, {
|
||||
@@ -32,16 +53,5 @@ export default async function Page({ params }: PageProps) {
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<title>{`${playlist.title} - oTunes`}</title>
|
||||
<meta property="og:title" content={`${playlist.title}`} />
|
||||
<meta property="og:description" content={`${playlist.owner.name}`} />
|
||||
<meta
|
||||
property="og:image"
|
||||
content={`/api/playlist/${playlist.id}/cover`}
|
||||
/>
|
||||
<PlaylistView playlist={playlist} />
|
||||
</>
|
||||
)
|
||||
return <PlaylistView playlist={playlist} />
|
||||
}
|
||||
@@ -18,6 +18,7 @@ const fontMono = Geist_Mono({
|
||||
export const metadata: Metadata = {
|
||||
title: "oTunes",
|
||||
description: "Our Music",
|
||||
metadataBase: new URL(process.env.HOSTED_URL || "http://localhost:3000"),
|
||||
}
|
||||
|
||||
export default function RootLayout({
|
||||
|
||||
+92
-110
@@ -32,6 +32,7 @@ function ArtistAvatar({ artist }: { artist: BrowseArtist }) {
|
||||
src={artistCoverUrl(artist.id)}
|
||||
alt={artist.name}
|
||||
fill
|
||||
sizes="(max-width: 256px) 100vw, (max-width: 1024px) 50vw, 33vw"
|
||||
className="object-cover"
|
||||
/>
|
||||
</div>
|
||||
@@ -150,119 +151,100 @@ export function ArtistsView({
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<title>{`${selectedArtist && artistId ? `${selectedArtist.name} - oTunes` : "oTunes"}`}</title>
|
||||
<meta
|
||||
property="og:title"
|
||||
content={`${selectedArtist && artistId ? selectedArtist?.name : "oTunes"}`}
|
||||
/>
|
||||
<meta
|
||||
property="og:description"
|
||||
content={`${selectedArtist && artistId ? "oTunes" : null}`}
|
||||
/>
|
||||
<meta
|
||||
property="og:image"
|
||||
content={`${selectedArtist && artistId ? "/api/artist/${selectedArtist?.id}/cover" : null}`}
|
||||
/>
|
||||
<div className="flex min-h-0 flex-1">
|
||||
<ScrollArea className="w-72 shrink-0 border-r">
|
||||
<div className="w-full pb-28">
|
||||
{sortedArtists.map((artist) => (
|
||||
<ArtistListItem
|
||||
key={artist.id}
|
||||
artist={artist}
|
||||
albumCount={albumCountByArtistId.get(artist.id) ?? 0}
|
||||
isSelected={artist.id === selectedId}
|
||||
isFavorite={isArtistFavorite(artist.id)}
|
||||
onSelect={() => router.push(`/library/artists/${artist.id}`)}
|
||||
onMediaAction={(action) =>
|
||||
void handleMediaAction(artist.id, action)
|
||||
}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
</ScrollArea>
|
||||
<div className="flex min-h-0 flex-1">
|
||||
<ScrollArea className="w-72 shrink-0 border-r">
|
||||
<div className="w-full pb-28">
|
||||
{sortedArtists.map((artist) => (
|
||||
<ArtistListItem
|
||||
key={artist.id}
|
||||
artist={artist}
|
||||
albumCount={albumCountByArtistId.get(artist.id) ?? 0}
|
||||
isSelected={artist.id === selectedId}
|
||||
isFavorite={isArtistFavorite(artist.id)}
|
||||
onSelect={() => router.push(`/library/artists/${artist.id}`)}
|
||||
onMediaAction={(action) =>
|
||||
void handleMediaAction(artist.id, action)
|
||||
}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
</ScrollArea>
|
||||
|
||||
<ScrollArea className="min-w-0 flex-1">
|
||||
{selectedArtist ? (
|
||||
<div className="pb-28">
|
||||
<div className="flex min-w-0 items-center justify-between gap-4 border-b px-6 py-4">
|
||||
<Link
|
||||
href={`/artist/${selectedArtist.id}`}
|
||||
className="group inline-flex min-w-0 flex-1 items-center gap-1 text-xl font-bold tracking-tight hover:underline"
|
||||
<ScrollArea className="min-w-0 flex-1">
|
||||
{selectedArtist ? (
|
||||
<div className="pb-28">
|
||||
<div className="flex min-w-0 items-center justify-between gap-4 border-b px-6 py-4">
|
||||
<Link
|
||||
href={`/artist/${selectedArtist.id}`}
|
||||
className="group inline-flex min-w-0 flex-1 items-center gap-1 text-xl font-bold tracking-tight hover:underline"
|
||||
>
|
||||
<span className="min-w-0 truncate">{selectedArtist.name}</span>
|
||||
<ChevronRightIcon className="size-5 shrink-0 text-muted-foreground transition-transform group-hover:translate-x-0.5" />
|
||||
</Link>
|
||||
|
||||
<div className="flex shrink-0 items-center gap-2">
|
||||
<Button
|
||||
size="icon"
|
||||
className="rounded-full"
|
||||
aria-label="Play"
|
||||
onClick={() =>
|
||||
void playArtist(selectedArtist.id as Id<"artists">)
|
||||
}
|
||||
>
|
||||
<span className="min-w-0 truncate">
|
||||
{selectedArtist.name}
|
||||
</span>
|
||||
<ChevronRightIcon className="size-5 shrink-0 text-muted-foreground transition-transform group-hover:translate-x-0.5" />
|
||||
</Link>
|
||||
|
||||
<div className="flex shrink-0 items-center gap-2">
|
||||
<Button
|
||||
size="icon"
|
||||
className="rounded-full"
|
||||
aria-label="Play"
|
||||
onClick={() =>
|
||||
void playArtist(selectedArtist.id as Id<"artists">)
|
||||
}
|
||||
>
|
||||
<Play className="fill-current" />
|
||||
</Button>
|
||||
<Button
|
||||
variant="secondary"
|
||||
size="icon"
|
||||
className="rounded-full"
|
||||
aria-label="Shuffle"
|
||||
onClick={() =>
|
||||
void playArtistShuffled(
|
||||
selectedArtist.id as Id<"artists">
|
||||
)
|
||||
}
|
||||
>
|
||||
<Shuffle />
|
||||
</Button>
|
||||
<FavoriteMediaButton
|
||||
isFavorite={isArtistFavorite(selectedArtist.id)}
|
||||
onToggle={() =>
|
||||
void toggleArtistFavorite(
|
||||
selectedArtist.id as Id<"artists">
|
||||
)
|
||||
}
|
||||
favoritedLabel={`Remove ${selectedArtist.name} from favorites`}
|
||||
unfavoritedLabel={`Favorite ${selectedArtist.name}`}
|
||||
/>
|
||||
<MediaContextMenu
|
||||
label={`More options for ${selectedArtist.name}`}
|
||||
selectedCount={artistAlbums.length}
|
||||
onOpenMenu={() => {}}
|
||||
onAction={(action) =>
|
||||
void handleMediaAction(selectedArtist.id, action)
|
||||
}
|
||||
favorited={isArtistFavorite(selectedArtist.id)}
|
||||
trackRowTrigger={false}
|
||||
triggerVariant="secondary"
|
||||
triggerClassName="rounded-full"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="p-6">
|
||||
{artistAlbums.length > 0 ? (
|
||||
<div className="grid grid-cols-2 gap-x-6 gap-y-8 sm:grid-cols-3 lg:grid-cols-4">
|
||||
{artistAlbums.map((album) => (
|
||||
<AlbumCard key={album.id} album={album} />
|
||||
))}
|
||||
</div>
|
||||
) : (
|
||||
<p className="text-sm text-muted-foreground">
|
||||
No albums for this artist.
|
||||
</p>
|
||||
)}
|
||||
<Play className="fill-current" />
|
||||
</Button>
|
||||
<Button
|
||||
variant="secondary"
|
||||
size="icon"
|
||||
className="rounded-full"
|
||||
aria-label="Shuffle"
|
||||
onClick={() =>
|
||||
void playArtistShuffled(selectedArtist.id as Id<"artists">)
|
||||
}
|
||||
>
|
||||
<Shuffle />
|
||||
</Button>
|
||||
<FavoriteMediaButton
|
||||
isFavorite={isArtistFavorite(selectedArtist.id)}
|
||||
onToggle={() =>
|
||||
void toggleArtistFavorite(
|
||||
selectedArtist.id as Id<"artists">
|
||||
)
|
||||
}
|
||||
favoritedLabel={`Remove ${selectedArtist.name} from favorites`}
|
||||
unfavoritedLabel={`Favorite ${selectedArtist.name}`}
|
||||
/>
|
||||
<MediaContextMenu
|
||||
label={`More options for ${selectedArtist.name}`}
|
||||
selectedCount={artistAlbums.length}
|
||||
onOpenMenu={() => {}}
|
||||
onAction={(action) =>
|
||||
void handleMediaAction(selectedArtist.id, action)
|
||||
}
|
||||
favorited={isArtistFavorite(selectedArtist.id)}
|
||||
trackRowTrigger={false}
|
||||
triggerVariant="secondary"
|
||||
triggerClassName="rounded-full"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
) : null}
|
||||
</ScrollArea>
|
||||
</div>
|
||||
</>
|
||||
|
||||
<div className="p-6">
|
||||
{artistAlbums.length > 0 ? (
|
||||
<div className="grid grid-cols-2 gap-x-6 gap-y-8 sm:grid-cols-3 lg:grid-cols-4">
|
||||
{artistAlbums.map((album) => (
|
||||
<AlbumCard key={album.id} album={album} />
|
||||
))}
|
||||
</div>
|
||||
) : (
|
||||
<p className="text-sm text-muted-foreground">
|
||||
No albums for this artist.
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
) : null}
|
||||
</ScrollArea>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
Reference in new issue
Block a user