feat: lightroom-style workspace UI with album covers

Backend:
- expose cover thumbnail URL on album responses (LEFT JOIN + presign)
- auto-assign cover only when empty; FK cover_photo_id -> photos ON DELETE SET NULL
- add photos_count / members_count to album responses; cover repo test

Frontend:
- split layouts into (app) shell (resizable rail + contextual panel) and (public)
- album rail + create-album dialog; album panel with cover picker / make-cover
- photo viewer route with filmstrip, replacing lightbox; share reuses it
- grid density slider, toolbar + drag-and-drop upload, dark graphite default

OpenSpec: add lightroom-workspace-ui change (proposal, design, specs, tasks)
This commit is contained in:
iu
2026-10-10 18:15:13 +03:00
parent b90e6b0267
commit 304cfedb75
47 changed files with 1942 additions and 601 deletions
@@ -0,0 +1,230 @@
<script lang="ts">
import { page } from '$app/stores';
import { goto } from '$app/navigation';
import { api } from '$lib/api';
import PhotoGrid from '$lib/components/PhotoGrid.svelte';
import Uploader from '$lib/components/Uploader.svelte';
import DensityControl from '$lib/components/DensityControl.svelte';
import Icon from '$lib/components/Icon.svelte';
import { auth } from '$lib/stores/auth.svelte';
import { albums } from '$lib/stores/albums.svelte';
import { SSEClient, type SSEEvent } from '$lib/sse';
import type { Album, Photo } from '$lib/types';
const albumId = $derived($page.params.id ?? '');
let album = $state<Album | null>(null);
let role = $state('');
let photos = $state<Photo[]>([]);
let nextCursor = $state('');
let loading = $state(true);
let error = $state('');
let dragging = $state(false);
let uploader = $state<{ pick: () => void; upload: (files: FileList | File[]) => void }>();
let canUpload = $derived(['owner', 'admin', 'editor', 'member'].includes(role));
async function loadAlbum() {
const data = await api<{ album: Album; role: string }>(`/albums/${albumId}`);
album = data.album;
role = data.role;
albums.upsert(data.album);
}
async function loadPhotos() {
const data = await api<{ photos: Photo[]; next_cursor: string }>(
`/albums/${albumId}/photos`
);
photos = data.photos;
nextCursor = data.next_cursor;
}
async function loadMore() {
if (!nextCursor) return;
const data = await api<{ photos: Photo[]; next_cursor: string }>(
`/albums/${albumId}/photos?cursor=${encodeURIComponent(nextCursor)}`
);
photos = [...photos, ...data.photos];
nextCursor = data.next_cursor;
}
$effect(() => {
const id = albumId;
loading = true;
error = '';
Promise.all([loadAlbum(), loadPhotos()])
.catch((e) => (error = (e as Error).message))
.finally(() => (loading = false));
});
let client: SSEClient | null = null;
$effect(() => {
const id = albumId;
if (!auth.access) return;
client = new SSEClient({
path: `/api/sse/albums/${id}`,
onEvent: handleEvent,
onReconnect: () => loadPhotos()
});
client.connect(auth.access);
return () => {
client?.close();
client = null;
};
});
function handleEvent(ev: SSEEvent) {
const data = ev.data as Record<string, unknown>;
switch (ev.type) {
case 'photo.created': {
const photo = data as unknown as Photo;
if (photos.some((p) => p.id === photo.id)) {
photos = photos.map((p) => (p.id === photo.id ? photo : p));
} else {
photos = [photo, ...photos];
}
break;
}
case 'photo.deleted': {
photos = photos.filter((p) => p.id !== data.id);
break;
}
case 'like.added': {
photos = photos.map((p) =>
p.id === data.photo_id
? {
...p,
likes_count: p.likes_count + 1,
liked_by_me: data.user_id === auth.user?.id || p.liked_by_me
}
: p
);
break;
}
case 'like.removed': {
photos = photos.map((p) =>
p.id === data.photo_id
? { ...p, likes_count: Math.max(0, p.likes_count - 1), liked_by_me: false }
: p
);
break;
}
case 'comment.created': {
const comment = data as unknown as { photo_id: string };
photos = photos.map((p) =>
p.id === comment.photo_id ? { ...p, comments_count: p.comments_count + 1 } : p
);
break;
}
case 'album.updated': {
loadAlbum().catch(() => {});
break;
}
}
}
function onDrop(ev: DragEvent) {
ev.preventDefault();
dragging = false;
if (canUpload && ev.dataTransfer?.files?.length) {
uploader?.upload(ev.dataTransfer.files);
}
}
</script>
{#if loading}
<p class="text-text-muted p-4">Загрузка…</p>
{:else if error}
<p class="text-danger p-4">{error}</p>
{:else}
<div
class="relative flex min-h-full flex-col"
role="region"
aria-label="Альбом"
ondragover={(e) => {
if (!canUpload) return;
e.preventDefault();
dragging = true;
}}
ondragleave={(e) => {
if (!e.currentTarget.contains(e.relatedTarget as Node)) dragging = false;
}}
ondrop={onDrop}
>
<div
class="border-border bg-chrome sticky top-0 z-10 flex items-center justify-between gap-3 border-b px-3 py-2"
>
<h1 class="text-text truncate text-sm font-medium">{album?.title ?? ''}</h1>
<div class="flex items-center gap-3">
<DensityControl />
{#if canUpload}
<button
type="button"
class="text-text-muted hover:bg-bg-muted hover:text-text inline-flex items-center justify-center rounded-md p-1.5"
aria-label="Загрузить фото"
title="Загрузить фото"
onclick={() => uploader?.pick()}
>
<Icon name="cloud_upload" />
</button>
{/if}
</div>
</div>
<div class="flex-1 p-3 sm:p-4">
{#if canUpload && photos.length === 0}
<button
type="button"
class="border-border text-text-muted hover:border-primary flex w-full flex-col items-center gap-3 rounded-xl border-2 border-dashed p-12 text-center"
onclick={() => uploader?.pick()}
>
<Icon name="cloud_upload" class="size-10 text-text-subtle" />
<span>Перетащите фото сюда или выберите файлы</span>
</button>
{:else}
<PhotoGrid
{photos}
onOpen={(i) => {
const p = photos[i];
if (p) goto(`/albums/${albumId}/photos/${p.id}`);
}}
/>
{/if}
{#if nextCursor}
<div class="mt-6 text-center">
<button
type="button"
class="border-border text-text hover:bg-bg-muted inline-flex items-center gap-1.5 rounded-lg border px-4 py-2 text-sm"
onclick={loadMore}
>
<Icon name="expand_more" class="size-4" />
Показать ещё
</button>
</div>
{/if}
</div>
{#if dragging}
<div
class="bg-bg/80 border-primary pointer-events-none fixed inset-3 z-40 flex items-center justify-center rounded-xl border-2 border-dashed"
>
<span class="text-text inline-flex items-center gap-2 text-lg">
<Icon name="cloud_upload" class="size-6" />
Отпустите, чтобы загрузить
</span>
</div>
{/if}
<Uploader
bind:this={uploader}
{albumId}
onUploaded={(created) => {
for (const p of created) {
if (!photos.some((x) => x.id === p.id)) photos = [p, ...photos];
}
}}
/>
</div>
{/if}
@@ -0,0 +1,188 @@
<script lang="ts">
import { page } from '$app/stores';
import { api } from '$lib/api';
import Icon from '$lib/components/Icon.svelte';
import { auth } from '$lib/stores/auth.svelte';
import type { Album, AlbumMember } from '$lib/types';
const albumId = $derived($page.params.id);
let members = $state<AlbumMember[]>([]);
let role = $state('');
let inviteRole = $state('member');
let inviteUses = $state(1);
let inviteExpires = $state('168h');
let inviteUrl = $state('');
let error = $state('');
const assignableRoles = $derived(
role === 'owner'
? ['admin', 'editor', 'member', 'viewer']
: role === 'admin'
? ['editor', 'member', 'viewer']
: []
);
const inviteRoles = $derived(role === 'owner' ? ['admin', 'editor', 'member', 'viewer'] : ['member', 'viewer']);
async function load() {
try {
const [membersData, albumData] = await Promise.all([
api<{ members: AlbumMember[] }>(`/albums/${albumId}/members`),
api<{ album: Album; role: string }>(`/albums/${albumId}`)
]);
members = membersData.members;
role = albumData.role;
} catch (e) {
error = (e as Error).message;
}
}
$effect(() => {
load();
});
async function invite(ev: Event) {
ev.preventDefault();
error = '';
try {
const data = await api<{ invite: { token: string } }>(`/albums/${albumId}/invites`, {
method: 'POST',
body: { role: inviteRole, expires_in: inviteExpires, max_uses: inviteUses }
});
inviteUrl = `${location.origin}/invites/${data.invite.token}`;
} catch (e) {
error = (e as Error).message;
}
}
async function changeRole(userId: string, newRole: string) {
try {
await api(`/albums/${albumId}/members/${userId}`, {
method: 'PATCH',
body: { role: newRole }
});
await load();
} catch (e) {
error = (e as Error).message;
}
}
async function removeMember(userId: string) {
try {
await api(`/albums/${albumId}/members/${userId}`, { method: 'DELETE' });
await load();
} catch (e) {
error = (e as Error).message;
}
}
async function copy(text: string) {
try {
await navigator.clipboard.writeText(text);
} catch {
/* clipboard недоступен */
}
}
</script>
<div class="mb-6 flex items-center justify-between">
<h1 class="text-2xl font-bold">Участники</h1>
<a href="/albums/{albumId}" class="text-primary inline-flex items-center gap-1 text-sm">
<Icon name="arrow_back" class="size-4" />
К альбому
</a>
</div>
{#if error}<p class="text-danger mb-4 text-sm">{error}</p>{/if}
<ul class="mb-8 divide-y divide-border border-border rounded-xl border">
<li class="bg-bg-muted flex items-center justify-between px-4 py-3">
<span class="font-medium">Владелец</span>
</li>
{#each members as member (member.user_id)}
<li class="flex items-center justify-between gap-4 px-4 py-3">
<span class="text-text"
>{member.user.name} <span class="text-text-muted text-sm">({member.user.email})</span></span
>
<div class="flex items-center gap-2">
{#if assignableRoles.length > 0}
<select
value={member.role}
onchange={(e) => changeRole(member.user_id, e.currentTarget.value)}
class="border-border bg-bg-elevated text-text rounded-lg border px-2 py-1 text-sm"
>
{#each Array.from(new Set([member.role, ...assignableRoles])) as r}
<option value={r}>{r}</option>
{/each}
</select>
<button
type="button"
class="text-danger inline-flex items-center gap-1 text-sm"
onclick={() => removeMember(member.user_id)}
>
<Icon name="delete" class="size-4" />
Удалить
</button>
{:else}
<span class="text-text-muted text-sm">{member.role}</span>
{/if}
</div>
</li>
{/each}
</ul>
{#if assignableRoles.length > 0}
<form class="border-border bg-bg-elevated space-y-3 rounded-xl border p-4" onsubmit={invite}>
<h2 class="font-semibold">Пригласить</h2>
<div class="flex flex-wrap gap-3">
<label class="text-sm">
<span class="text-text-muted mb-1 block">Роль</span>
<select
bind:value={inviteRole}
class="border-border bg-bg text-text rounded-lg border px-2 py-1.5"
>
{#each inviteRoles as r}
<option value={r}>{r}</option>
{/each}
</select>
</label>
<label class="text-sm">
<span class="text-text-muted mb-1 block">Использований</span>
<input
type="number"
min="1"
bind:value={inviteUses}
class="border-border bg-bg text-text w-24 rounded-lg border px-2 py-1.5"
/>
</label>
<label class="text-sm">
<span class="text-text-muted mb-1 block">Срок</span>
<input
bind:value={inviteExpires}
class="border-border bg-bg text-text w-32 rounded-lg border px-2 py-1.5"
/>
</label>
</div>
<button
class="bg-primary text-primary-fg inline-flex items-center gap-1.5 rounded-lg px-4 py-2 text-sm"
type="submit"
>
<Icon name="add_link" class="size-4" />
Создать ссылку
</button>
{#if inviteUrl}
<div class="flex items-center gap-2 text-sm">
<span class="text-text-muted break-all">Ссылка: <a class="text-primary" href={inviteUrl}>{inviteUrl}</a></span>
<button
type="button"
class="text-text-muted hover:text-text inline-flex shrink-0 items-center gap-1"
aria-label="Скопировать ссылку"
title="Скопировать ссылку"
onclick={() => copy(inviteUrl)}
>
<Icon name="content_copy" class="size-4" />
</button>
</div>
{/if}
</form>
{/if}
@@ -0,0 +1,83 @@
<script lang="ts">
import { page } from '$app/stores';
import { goto } from '$app/navigation';
import { api } from '$lib/api';
import Viewer from '$lib/components/Viewer.svelte';
import { albums } from '$lib/stores/albums.svelte';
import type { Album, Photo } from '$lib/types';
const albumId = $derived($page.params.id ?? '');
const photoId = $derived($page.params.photoId ?? '');
let photos = $state<Photo[]>([]);
let role = $state('');
let loading = $state(true);
let error = $state('');
let saved = $state(false);
const canEdit = $derived(role === 'owner' || role === 'admin');
const index = $derived(photos.findIndex((p) => p.id === photoId));
$effect(() => {
const id = albumId;
loading = true;
error = '';
Promise.all([
api<{ photos: Photo[] }>(`/albums/${id}/photos?limit=100`),
api<{ album: Album; role: string }>(`/albums/${id}`)
])
.then(([p, a]) => {
photos = p.photos;
role = a.role;
})
.catch((e) => (error = (e as Error).message))
.finally(() => (loading = false));
});
function close() {
goto(`/albums/${albumId}`);
}
function change(i: number) {
const p = photos[i];
if (p) goto(`/albums/${albumId}/photos/${p.id}`, { replaceState: true, noScroll: true });
}
async function makeCover(photo: Photo) {
if (!canEdit) return;
try {
await albums.setCover(albumId, photo.id);
saved = true;
setTimeout(() => (saved = false), 2000);
} catch (e) {
error = (e as Error).message;
}
}
</script>
{#if loading}
<p class="text-text-muted p-4">Загрузка…</p>
{:else if error}
<p class="text-danger p-4">{error}</p>
{:else if index < 0}
<div class="text-text-muted p-6 text-center">
<p class="mb-3">Фото не найдено.</p>
<a href="/albums/{albumId}" class="text-primary">К альбому</a>
</div>
{:else}
<div class="flex h-full flex-col">
{#if saved}
<p class="bg-success/10 text-success px-3 py-1 text-center text-xs">Обложка обновлена</p>
{/if}
<div class="min-h-0 flex-1">
<Viewer
{photos}
{index}
{canEdit}
onClose={close}
onIndexChange={change}
onMakeCover={makeCover}
/>
</div>
</div>
{/if}
@@ -0,0 +1,168 @@
<script lang="ts">
import { page } from '$app/stores';
import { goto } from '$app/navigation';
import { api } from '$lib/api';
import Icon from '$lib/components/Icon.svelte';
import type { Album, ShareLink } from '$lib/types';
const albumId = $derived($page.params.id);
let album = $state<Album | null>(null);
let shareLinks = $state<ShareLink[]>([]);
let title = $state('');
let description = $state('');
let expiresIn = $state('168h');
let error = $state('');
let saved = $state(false);
async function load() {
try {
const [albumData, linksData] = await Promise.all([
api<{ album: Album }>(`/albums/${albumId}`),
api<{ share_links: ShareLink[] }>(`/albums/${albumId}/share`)
]);
album = albumData.album;
title = album.title;
description = album.description;
shareLinks = linksData.share_links;
} catch (e) {
error = (e as Error).message;
}
}
$effect(() => {
load();
});
async function save(ev: Event) {
ev.preventDefault();
error = '';
saved = false;
try {
const data = await api<{ album: Album }>(`/albums/${albumId}`, {
method: 'PATCH',
body: { title, description }
});
album = data.album;
saved = true;
} catch (e) {
error = (e as Error).message;
}
}
async function createLink(ev: Event) {
ev.preventDefault();
try {
await api(`/albums/${albumId}/share`, { method: 'POST', body: { expires_in: expiresIn } });
await load();
} catch (e) {
error = (e as Error).message;
}
}
async function revoke(id: string) {
try {
await api(`/albums/${albumId}/share/${id}`, { method: 'DELETE' });
shareLinks = shareLinks.filter((l) => l.id !== id);
} catch (e) {
error = (e as Error).message;
}
}
async function removeAlbum() {
if (!confirm('Удалить альбом вместе с фото?')) return;
try {
await api(`/albums/${albumId}`, { method: 'DELETE' });
goto('/');
} catch (e) {
error = (e as Error).message;
}
}
</script>
<div class="mb-6 flex items-center justify-between">
<h1 class="text-2xl font-bold">Настройки</h1>
<a href="/albums/{albumId}" class="text-primary inline-flex items-center gap-1 text-sm">
<Icon name="arrow_back" class="size-4" />
К альбому
</a>
</div>
{#if error}<p class="text-danger mb-4 text-sm">{error}</p>{/if}
<form class="border-border bg-bg-elevated mb-6 space-y-3 rounded-xl border p-4" onsubmit={save}>
<h2 class="font-semibold">Альбом</h2>
<label class="block">
<span class="text-text-muted mb-1 block text-sm">Название</span>
<input
bind:value={title}
class="border-border bg-bg text-text w-full rounded-lg border px-3 py-2"
/>
</label>
<label class="block">
<span class="text-text-muted mb-1 block text-sm">Описание</span>
<textarea
bind:value={description}
rows="3"
class="border-border bg-bg text-text w-full rounded-lg border px-3 py-2"
></textarea>
</label>
<button
class="bg-primary text-primary-fg inline-flex items-center gap-1.5 rounded-lg px-4 py-2 text-sm"
type="submit"
>
<Icon name="save" class="size-4" />
Сохранить
</button>
{#if saved}<span class="text-success ml-3 text-sm">Сохранено</span>{/if}
</form>
<div class="border-border bg-bg-elevated mb-6 space-y-3 rounded-xl border p-4">
<h2 class="font-semibold">Ссылки для просмотра</h2>
<form class="flex items-end gap-2" onsubmit={createLink}>
<label class="text-sm">
<span class="text-text-muted mb-1 block">Срок действия</span>
<input
bind:value={expiresIn}
class="border-border bg-bg text-text w-32 rounded-lg border px-2 py-1.5"
/>
</label>
<button
class="bg-primary text-primary-fg inline-flex items-center gap-1.5 rounded-lg px-4 py-2 text-sm"
type="submit"
>
<Icon name="add_link" class="size-4" />
Создать ссылку
</button>
</form>
<ul class="divide-border divide-y">
{#each shareLinks as link (link.id)}
<li class="flex items-center justify-between gap-2 py-2 text-sm">
<span class="text-text-muted truncate">
{link.revoked_at ? 'отозвана' : 'до ' + new Date(link.expires_at).toLocaleString()}
· <a class="text-primary" href="/share/{link.token}">/share/{link.token}</a>
</span>
{#if !link.revoked_at}
<button
type="button"
class="text-danger inline-flex shrink-0 items-center gap-1"
onclick={() => revoke(link.id)}
>
<Icon name="link_off" class="size-4" />
Отозвать
</button>
{/if}
</li>
{/each}
</ul>
</div>
<button
type="button"
class="border-danger text-danger inline-flex items-center gap-1.5 rounded-lg border px-4 py-2 text-sm"
onclick={removeAlbum}
>
<Icon name="delete_forever" class="size-4" />
Удалить альбом
</button>