Skip to content

ArtistHydrated type and release card grid refactor #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frederickobrien merged 1 commit into from
Oct 28, 2025
Merged

ArtistHydrated type and release card grid refactor #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions api/src/routes/artists/[slug]/+server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { TABLES } from '../../../../../shared/config';
import { handlePostgrestQuery, supabase } from '$lib/server/supabase';
import type { Artist } from '../../../../../shared/types/core';
import type { ArtistHydrated } from '../../../../../shared/types/hydrated';

export async function GET({ params }) {
return handlePostgrestQuery<Artist>(
async () => await supabase.from(TABLES.artists).select().eq('id', params.slug).single(),
return handlePostgrestQuery<ArtistHydrated>(
async () => await supabase.from(TABLES.artistsRich).select().eq('id', params.slug).single(),
{ errorMessage: 'Failed to fetch artist' }
);
}
Expand Down
10 changes: 4 additions & 6 deletions app/src/lib/components/ReleaseCard.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@
let {
link,
name,
artist,
coverArt,
hideArtist = false
artist = undefined,
coverArt
}: {
link: string;
name: string;
artist: string;
artist?: string;
coverArt: string;
hideArtist?: boolean;
} = $props();

const randomRotation = Math.floor(Math.random() * 4) - 2;
Expand All @@ -20,7 +18,7 @@
<div class="release-card">
<img src={coverArt} alt={`Artwork for ${name} by ${artist}`} />
<div class="release-name">{name}</div>
{#if !hideArtist}
{#if artist}
<div class="artist-name">
{artist}
</div>
Expand Down
16 changes: 10 additions & 6 deletions app/src/lib/components/ReleaseCardGrid.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,29 @@
<script lang="ts">
import type { ReleaseHydrated } from '../../../../shared/types/hydrated';
import { makeImageLink } from '$lib/utils';
import ReleaseCard from './ReleaseCard.svelte';
import type { Release } from '../../../../shared/types/core';
import type { ReleaseHydrated } from '../../../../shared/types/hydrated';

let {
releases,
hideArtistName = false
showArtistName = false
}: {
releases: ReleaseHydrated[];
hideArtistName?: boolean;
releases: (Release | ReleaseHydrated)[];
showArtistName?: boolean;
} = $props();

const isHydrated = (release: Release | ReleaseHydrated): release is ReleaseHydrated => {
return (release as ReleaseHydrated).artist !== undefined;
};
</script>

<div class="releases-grid">
{#each releases as release}
<ReleaseCard
link={`/releases/${release.id}`}
name={release.title}
artist={release.artist?.name}
artist={isHydrated(release) && showArtistName ? release.artist.name : undefined}
coverArt={makeImageLink(release.artwork_ipfs_cid, 200)}
hideArtist={hideArtistName}
/>
{/each}
</div>
Expand Down
2 changes: 0 additions & 2 deletions app/src/lib/components/search/SearchResults.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,8 @@
{#each searchResultsReleases as release}
<ReleaseCard
name={release.name}
artist={'tbd'}
coverArt={release.image_cid ? makeImageLink(release.image_cid, 200) : ''}
link={`/releases/${release.id}`}
hideArtist={true}
/>
{/each}
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/src/routes/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<section>
<a href="/releases"><h2>Releases</h2></a>

<ReleaseCardGrid releases={albumsAndEPs} />
<ReleaseCardGrid releases={albumsAndEPs} showArtistName />
</section>

<section>
Expand Down
28 changes: 0 additions & 28 deletions app/src/routes/artists/[slug]/+page.server.ts
View file
Open in desktop

This file was deleted.

31 changes: 11 additions & 20 deletions app/src/routes/artists/[slug]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,29 @@
<script lang="ts">
import ReleaseCardGrid from '$lib/components/ReleaseCardGrid.svelte';
import type { ReleaseHydrated } from '../../../../../shared/types/hydrated';
import type { ArtistHydrated } from '../../../../../shared/types/hydrated';
import { makeImageLink } from '$lib/utils';
import { toggleFollowedArtist } from '$lib/remote-functions/user.remote';
import SectionLink from '$lib/components/layout/SectionLink.svelte';
import type { Artist } from '../../../../../shared/types/core';
import type { Release } from '../../../../../shared/types/core';

let {
data
}: { data: { artist: Artist; releases: ReleaseHydrated[]; followedArtists: string[] } } =
$props();
let { data }: { data: { artist: ArtistHydrated; followedArtists: string[] } } = $props();

const sortReleasesByDate = (releases: Release[]) => {
return releases.sort((a, b) => {
return new Date(b.release_date).getTime() - new Date(a.release_date).getTime();
});
};

const { name, bio, website_url, image_ipfs_cid } = $derived(data.artist);
const releases = $derived(data.releases);
let updatingFollow = $state(false);
const releases = $derived(sortReleasesByDate(data.artist.releases));

const filterReleasesByType = (type: 'album' | 'ep' | 'single', releases: ReleaseHydrated[]) => {
const filterReleasesByType = (type: 'album' | 'ep' | 'single', releases: Release[]) => {
return releases.filter((release) => release.release_type === type);
};

const lps = $derived(filterReleasesByType('album', releases));
const eps = $derived(filterReleasesByType('ep', releases));
const singles = $derived(filterReleasesByType('single', releases));

function handleUpdate() {
updatingFollow = true;
return async ({ update }: { update: () => Promise<void> }) => {
await update();
updatingFollow = false;
};
}
</script>

<svelte:head>
Expand Down Expand Up @@ -90,7 +84,6 @@
artistName: name
};
})}
hideArtistName
/>
</div>
{/if}
Expand All @@ -105,7 +98,6 @@
artistName: name
};
})}
hideArtistName
/>
</div>
{/if}
Expand All @@ -120,7 +112,6 @@
artistName: name
};
})}
hideArtistName
/>
</div>
{/if}
Expand Down
18 changes: 18 additions & 0 deletions app/src/routes/artists/[slug]/+page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { API_BASE } from '$lib/global/config';
import type { PostgrestResponse } from '@supabase/supabase-js';
import { error } from '@sveltejs/kit';
import type { ArtistHydrated } from '../../../../../shared/types/hydrated';

export const load = async ({ params, fetch }) => {
const matchingArtist: PostgrestResponse<ArtistHydrated> = await fetch(
`${API_BASE}/artists/${params.slug}`
).then((res) => {
return res.json();
});

if (matchingArtist.error) error(404, 'Artist not found');

return {
artist: matchingArtist
};
};
2 changes: 1 addition & 1 deletion app/src/routes/me/collections/[slug]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<div>{description}</div>
{/if}
</div>
<ReleaseCardGrid {releases} />
<ReleaseCardGrid {releases} showArtistName />
</div>

<form {...deleteCollection.for(id)}>
Expand Down
2 changes: 1 addition & 1 deletion app/src/routes/releases/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@

<h2>Releases</h2>

<ReleaseCardGrid releases={data.releases} />
<ReleaseCardGrid releases={data.releases} showArtistName />
1 change: 1 addition & 0 deletions shared/config/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export const REVENUE_SPLIT = {
export const TABLES = {
users: "users",
artists: "artists",
artistsRich: "artists_rich",
artistMembers: "artist_members",
tracks: "tracks",
releaseTracks: "release_tracks",
Expand Down
8 changes: 6 additions & 2 deletions shared/types/hydrated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,14 @@ export interface TrackHydrated extends Track {
artist: Artist;
}

export interface ArtistHydrated extends Artist {
releases: Release[];
}

export interface CollectionHydrated extends Collection {
releases: ReleaseHydrated[];
releases: ReleaseHydrated[];
}

export interface MixtapeHydrated extends Mixtape {
tracks: TrackHydrated[]
tracks: TrackHydrated[];
}