sandcms 0.7.0 → 0.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +4 -4
- package/dist/admin/Admin.svelte +7 -5
- package/dist/admin/AssetAttachment.svelte +8 -3
- package/dist/admin/AssetAttachment.svelte.d.ts +3 -0
- package/dist/admin/Editor.svelte +5 -9
- package/dist/admin/Fields.svelte +2 -1
- package/dist/admin/Gallery.svelte +221 -76
- package/dist/admin/Inbox.svelte +3 -2
- package/dist/admin/MediaPicker.svelte +36 -20
- package/dist/admin/Navigation.svelte +13 -2
- package/dist/admin/Pages.svelte +195 -0
- package/dist/admin/Pages.svelte.d.ts +7 -0
- package/dist/admin/Shell.svelte +27 -5
- package/dist/admin/SortableList.svelte +82 -61
- package/dist/admin/SortableList.svelte.d.ts +3 -1
- package/dist/admin/Users.svelte +8 -3
- package/dist/admin/generated/admin.css +300 -20
- package/dist/admin/navigation.d.ts +9 -0
- package/dist/admin/navigation.js +20 -1
- package/dist/admin/types.d.ts +1 -0
- package/dist/blueprints/labels.d.ts +6 -0
- package/dist/blueprints/labels.js +14 -0
- package/dist/blueprints/load.js +11 -2
- package/dist/blueprints/types.d.ts +2 -2
- package/dist/cli/admin.d.ts +39 -0
- package/dist/cli/admin.js +95 -0
- package/dist/cli/backup.js +4 -4
- package/dist/cli/doctor.d.ts +8 -1
- package/dist/cli/doctor.js +19 -9
- package/dist/cli/email-test.d.ts +3 -0
- package/dist/cli/email-test.js +20 -0
- package/dist/cli/files.js +2 -1
- package/dist/cli/index.js +373 -135
- package/dist/cli/rebaseline.d.ts +10 -0
- package/dist/cli/rebaseline.js +117 -0
- package/dist/cli/upgrade.js +17 -9
- package/dist/env.d.ts +0 -8
- package/dist/env.js +0 -8
- package/dist/notification-fields.js +2 -1
- package/dist/server/admin-load.d.ts +72 -0
- package/dist/server/admin-load.js +20 -0
- package/dist/server/api-keys.d.ts +96 -0
- package/dist/server/api-keys.js +115 -0
- package/dist/server/api.js +16 -61
- package/dist/server/cms.d.ts +0 -5
- package/dist/server/cms.js +4 -3
- package/dist/server/db/auto-migrate.d.ts +0 -4
- package/dist/server/db/auto-migrate.js +12 -3
- package/dist/server/db/legacy.d.ts +13 -0
- package/dist/server/db/legacy.js +60 -0
- package/dist/server/db/migration-data.js +2 -38
- package/dist/server/db/migrations/{0000_foundation.sql → 0000_baseline.sql} +120 -4
- package/dist/server/db/migrations/meta/0000_snapshot.json +578 -3
- package/dist/server/db/migrations/meta/_journal.json +2 -65
- package/dist/server/db/schema.js +8 -6
- package/dist/server/db/store.d.ts +25 -2
- package/dist/server/db/store.js +90 -26
- package/dist/server/forms.js +2 -1
- package/dist/server/media/runner.d.ts +1 -1
- package/dist/server/media/runner.js +1 -1
- package/dist/server/media/service.d.ts +0 -4
- package/dist/server/media/service.js +0 -2
- package/dist/server/media/verify.d.ts +28 -0
- package/dist/server/media/verify.js +94 -2
- package/dist/server/platform/snapshots.js +3 -3
- package/docs/acceptance.md +2 -2
- package/docs/api.md +15 -1
- package/docs/cloudflare.md +9 -41
- package/docs/content.md +18 -3
- package/docs/deployment.md +97 -34
- package/docs/email.md +6 -0
- package/docs/forms.md +1 -1
- package/docs/media.md +10 -1
- package/docs/package.md +4 -4
- package/docs/releases.md +21 -1
- package/docs/upgrades.md +41 -7
- package/package.json +4 -10
- package/templates/Dockerfile +6 -2
- package/templates/integration.ts +10 -5
- package/templates/openship.json +9 -0
- package/templates/sandcms/config.yaml +1 -0
- package/dist/server/db/migrations/0001_independent_password_resets.sql +0 -3
- package/dist/server/db/migrations/0002_email_failure_reason.sql +0 -1
- package/dist/server/db/migrations/0003_direct_r2_uploads.sql +0 -10
- package/dist/server/db/migrations/0004_agent_api_keys.sql +0 -38
- package/dist/server/db/migrations/0005_api_retention_and_pagination.sql +0 -3
- package/dist/server/db/migrations/0006_durable_media_deletion.sql +0 -7
- package/dist/server/db/migrations/0007_content_and_job_indexes.sql +0 -2
- package/dist/server/db/migrations/0008_search_text_cache.sql +0 -45
- package/dist/server/db/migrations/0009_local_media.sql +0 -9
- package/dist/server/db/migrations/meta/0001_snapshot.json +0 -1197
- package/dist/server/db/migrations/meta/0002_snapshot.json +0 -1204
- package/dist/server/db/migrations/meta/0003_snapshot.json +0 -1281
- package/dist/server/db/migrations/meta/0004_snapshot.json +0 -1546
- package/dist/server/db/migrations/meta/0005_snapshot.json +0 -1572
- package/dist/server/db/migrations/meta/0006_snapshot.json +0 -1627
- package/dist/server/db/migrations/meta/0007_snapshot.json +0 -1643
- package/dist/server/db/migrations/meta/0008_snapshot.json +0 -1711
- package/dist/server/db/migrations/meta/0009_snapshot.json +0 -1763
- package/dist/server/media/import-r2.d.ts +0 -56
- package/dist/server/media/import-r2.js +0 -342
- package/dist/worker/index.d.ts +0 -10
- package/dist/worker/index.js +0 -460
- package/dist/worker/local.d.ts +0 -5
- package/dist/worker/local.js +0 -57
- package/dist/worker/source.d.ts +0 -2
- package/dist/worker/source.js +0 -31
- package/dist/worker/svg.d.ts +0 -1
- package/dist/worker/svg.js +0 -2
- package/dist/worker/uploads.d.ts +0 -22
- package/dist/worker/uploads.js +0 -48
|
@@ -0,0 +1,195 @@
|
|
|
1
|
+
<script lang="ts">
|
|
2
|
+
import { goto, refreshAll } from '$app/navigation';
|
|
3
|
+
import { Icon } from '@lucide/svelte';
|
|
4
|
+
import * as Table from './components/ui/table/index.js';
|
|
5
|
+
import * as Card from './components/ui/card/index.js';
|
|
6
|
+
import * as DropdownMenu from './components/ui/dropdown-menu/index.js';
|
|
7
|
+
import { Badge } from './components/ui/badge/index.js';
|
|
8
|
+
import { Input } from './components/ui/input/index.js';
|
|
9
|
+
import type { AdminData, Entry } from './types.js';
|
|
10
|
+
import { api, date, message } from './client.js';
|
|
11
|
+
import { blueprintHref, previewPath } from './navigation.js';
|
|
12
|
+
import Notice from './Notice.svelte';
|
|
13
|
+
import RowMenu from './RowMenu.svelte';
|
|
14
|
+
import Files from '@lucide/svelte/icons/files';
|
|
15
|
+
import ArrowUp from '@lucide/svelte/icons/arrow-up';
|
|
16
|
+
import ArrowDown from '@lucide/svelte/icons/arrow-down';
|
|
17
|
+
import ArrowUpRight from '@lucide/svelte/icons/arrow-up-right';
|
|
18
|
+
import PenLine from '@lucide/svelte/icons/pen-line';
|
|
19
|
+
import Upload from '@lucide/svelte/icons/upload';
|
|
20
|
+
import EyeOff from '@lucide/svelte/icons/eye-off';
|
|
21
|
+
let { data }: { data: AdminData } = $props();
|
|
22
|
+
type Sort = 'title' | 'path' | 'status' | 'updated';
|
|
23
|
+
let query = $state(''),
|
|
24
|
+
sort = $state<Sort>('title'),
|
|
25
|
+
descending = $state(false),
|
|
26
|
+
busy = $state(false),
|
|
27
|
+
error = $state('');
|
|
28
|
+
const changed = (entry: Entry) =>
|
|
29
|
+
!!entry.published && JSON.stringify(entry.draft) !== JSON.stringify(entry.published);
|
|
30
|
+
const status = (entry: Entry | undefined) =>
|
|
31
|
+
!entry?.published
|
|
32
|
+
? { label: 'Draft', rank: 0 }
|
|
33
|
+
: changed(entry)
|
|
34
|
+
? { label: 'Changes not live', rank: 1 }
|
|
35
|
+
: { label: 'Published', rank: 2 };
|
|
36
|
+
const rows = $derived.by(() => {
|
|
37
|
+
const entries = new Map((data.entries ?? []).map((entry) => [entry.blueprint, entry]));
|
|
38
|
+
return (data.blueprints ?? [])
|
|
39
|
+
.filter((blueprint) => blueprint.kind === 'page')
|
|
40
|
+
.map((blueprint) => {
|
|
41
|
+
const entry = entries.get(blueprint.id);
|
|
42
|
+
return {
|
|
43
|
+
blueprint,
|
|
44
|
+
entry,
|
|
45
|
+
path: previewPath(blueprint, entry) ?? blueprint.preview?.replace(/\{\w+\}/g, '…'),
|
|
46
|
+
status: status(entry)
|
|
47
|
+
};
|
|
48
|
+
});
|
|
49
|
+
});
|
|
50
|
+
const visible = $derived.by(() => {
|
|
51
|
+
const terms = query.trim().toLowerCase().split(/\s+/).filter(Boolean);
|
|
52
|
+
const matches = rows.filter((row) => {
|
|
53
|
+
const text = [row.blueprint.label, row.blueprint.id, row.path, row.blueprint.description]
|
|
54
|
+
.join(' ')
|
|
55
|
+
.toLowerCase();
|
|
56
|
+
return terms.every((term) => text.includes(term));
|
|
57
|
+
});
|
|
58
|
+
const key = (row: (typeof rows)[number]): string | number =>
|
|
59
|
+
sort === 'title'
|
|
60
|
+
? row.blueprint.label
|
|
61
|
+
: sort === 'path'
|
|
62
|
+
? (row.path ?? '')
|
|
63
|
+
: sort === 'status'
|
|
64
|
+
? row.status.rank
|
|
65
|
+
: (row.entry?.updatedAt ?? 0);
|
|
66
|
+
return matches.toSorted((a, b) => {
|
|
67
|
+
const [x, y] = [key(a), key(b)];
|
|
68
|
+
const order =
|
|
69
|
+
typeof x === 'number' && typeof y === 'number'
|
|
70
|
+
? x - y
|
|
71
|
+
: String(x).localeCompare(String(y), undefined, { numeric: true, sensitivity: 'base' });
|
|
72
|
+
return (descending ? -order : order) || a.blueprint.label.localeCompare(b.blueprint.label);
|
|
73
|
+
});
|
|
74
|
+
});
|
|
75
|
+
function toggle(next: Sort) {
|
|
76
|
+
if (sort === next) descending = !descending;
|
|
77
|
+
else {
|
|
78
|
+
sort = next;
|
|
79
|
+
descending = next === 'updated';
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
async function act(path: string, entry: Entry) {
|
|
83
|
+
if (busy) return;
|
|
84
|
+
busy = true;
|
|
85
|
+
error = '';
|
|
86
|
+
try {
|
|
87
|
+
await api(path, { id: entry.id, version: entry.version });
|
|
88
|
+
await refreshAll();
|
|
89
|
+
} catch (e) {
|
|
90
|
+
error = message(e);
|
|
91
|
+
} finally {
|
|
92
|
+
busy = false;
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
const open = (url: string) => window.open(url, '_blank', 'noopener');
|
|
96
|
+
</script>
|
|
97
|
+
|
|
98
|
+
{#snippet heading(label: string, key: Sort)}
|
|
99
|
+
<Table.Head aria-sort={sort === key ? (descending ? 'descending' : 'ascending') : undefined}
|
|
100
|
+
><button type="button" class="cms-sort" onclick={() => toggle(key)}
|
|
101
|
+
>{label}{#if sort === key}{#if descending}<ArrowDown size={13} />{:else}<ArrowUp
|
|
102
|
+
size={13}
|
|
103
|
+
/>{/if}{/if}</button
|
|
104
|
+
></Table.Head
|
|
105
|
+
>
|
|
106
|
+
{/snippet}
|
|
107
|
+
|
|
108
|
+
<div class="cms-page-heading">
|
|
109
|
+
<div>
|
|
110
|
+
<h1>Pages</h1>
|
|
111
|
+
<p class="cms-muted">
|
|
112
|
+
{rows.length === 1 ? '1 page' : rows.length + ' pages'} on {data.site ?? 'this site'}
|
|
113
|
+
</p>
|
|
114
|
+
</div>
|
|
115
|
+
</div>
|
|
116
|
+
{#if error}<Notice error>{error}</Notice>{/if}
|
|
117
|
+
<div class="cms-stack">
|
|
118
|
+
{#if rows.length}<Input
|
|
119
|
+
aria-label="Search pages"
|
|
120
|
+
placeholder="Search pages"
|
|
121
|
+
type="search"
|
|
122
|
+
maxlength={200}
|
|
123
|
+
bind:value={query}
|
|
124
|
+
/>{/if}
|
|
125
|
+
<Card.Root class="gap-0 py-0">
|
|
126
|
+
{#if visible.length}
|
|
127
|
+
<Table.Root>
|
|
128
|
+
<Table.Header
|
|
129
|
+
><Table.Row
|
|
130
|
+
>{@render heading('Title', 'title')}{@render heading('URL', 'path')}{@render heading(
|
|
131
|
+
'Status',
|
|
132
|
+
'status'
|
|
133
|
+
)}{@render heading('Last updated', 'updated')}<Table.Head
|
|
134
|
+
><span class="sr-only">Actions</span></Table.Head
|
|
135
|
+
></Table.Row
|
|
136
|
+
></Table.Header
|
|
137
|
+
><Table.Body
|
|
138
|
+
>{#each visible as row (row.blueprint.id)}<Table.Row
|
|
139
|
+
><Table.Cell
|
|
140
|
+
><a class="cms-entry-link" href={blueprintHref(row.blueprint)}
|
|
141
|
+
><Icon icon={row.blueprint.navigationIcon} size={17} />{row.blueprint.label}</a
|
|
142
|
+
></Table.Cell
|
|
143
|
+
><Table.Cell class="cms-muted"
|
|
144
|
+
>{#if row.path}<code class="cms-page-path">{row.path}</code
|
|
145
|
+
>{:else}—{/if}</Table.Cell
|
|
146
|
+
><Table.Cell
|
|
147
|
+
><Badge variant={row.status.rank === 2 ? 'default' : 'outline'}
|
|
148
|
+
>{row.status.label}</Badge
|
|
149
|
+
></Table.Cell
|
|
150
|
+
><Table.Cell class="cms-muted"
|
|
151
|
+
>{row.entry ? date(row.entry.updatedAt) : 'Never'}</Table.Cell
|
|
152
|
+
><Table.Cell class="text-right"
|
|
153
|
+
><RowMenu label={'Actions for ' + row.blueprint.label}
|
|
154
|
+
><DropdownMenu.Item onSelect={() => goto(blueprintHref(row.blueprint))}
|
|
155
|
+
><PenLine /> Edit</DropdownMenu.Item
|
|
156
|
+
>{#if row.entry && row.path}{@const entry = row.entry}<DropdownMenu.Item
|
|
157
|
+
onSelect={() =>
|
|
158
|
+
open(
|
|
159
|
+
entry.published && !changed(entry)
|
|
160
|
+
? row.path!
|
|
161
|
+
: row.path + '?cmsPreview=' + entry.id
|
|
162
|
+
)}
|
|
163
|
+
><ArrowUpRight />
|
|
164
|
+
{entry.published && !changed(entry)
|
|
165
|
+
? 'View page'
|
|
166
|
+
: 'Preview draft'}</DropdownMenu.Item
|
|
167
|
+
>{/if}{#if row.entry}{@const entry =
|
|
168
|
+
row.entry}{#if !entry.published || changed(entry)}<DropdownMenu.Separator
|
|
169
|
+
/><DropdownMenu.Item
|
|
170
|
+
disabled={busy}
|
|
171
|
+
onSelect={() => act('content/publish', entry)}
|
|
172
|
+
><Upload />
|
|
173
|
+
{entry.published ? 'Publish changes' : 'Publish'}</DropdownMenu.Item
|
|
174
|
+
>{/if}{#if entry.published}{#if !changed(entry)}<DropdownMenu.Separator
|
|
175
|
+
/>{/if}<DropdownMenu.Item
|
|
176
|
+
disabled={busy}
|
|
177
|
+
onSelect={() => act('content/unpublish', entry)}
|
|
178
|
+
><EyeOff /> Unpublish</DropdownMenu.Item
|
|
179
|
+
>{/if}{/if}</RowMenu
|
|
180
|
+
></Table.Cell
|
|
181
|
+
></Table.Row
|
|
182
|
+
>{/each}</Table.Body
|
|
183
|
+
>
|
|
184
|
+
</Table.Root>
|
|
185
|
+
{:else if rows.length}
|
|
186
|
+
<p class="cms-empty cms-muted">No pages match “{query.trim()}”.</p>
|
|
187
|
+
{:else}
|
|
188
|
+
<div class="cms-empty">
|
|
189
|
+
<Files size={32} />
|
|
190
|
+
<h2>No pages yet</h2>
|
|
191
|
+
<p>Add a blueprint with <code>kind: page</code> to create one.</p>
|
|
192
|
+
</div>
|
|
193
|
+
{/if}
|
|
194
|
+
</Card.Root>
|
|
195
|
+
</div>
|
package/dist/admin/Shell.svelte
CHANGED
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
import * as DropdownMenu from './components/ui/dropdown-menu/index.js';
|
|
10
10
|
import Navigation from './Navigation.svelte';
|
|
11
11
|
import GlobalSearch from './GlobalSearch.svelte';
|
|
12
|
+
import { inPagesIndex, pagesHref } from './navigation.js';
|
|
12
13
|
import Layers from '@lucide/svelte/icons/layers';
|
|
13
14
|
import LayoutDashboard from '@lucide/svelte/icons/layout-dashboard';
|
|
14
15
|
import Image from '@lucide/svelte/icons/image';
|
|
@@ -20,6 +21,19 @@
|
|
|
20
21
|
import LogOut from '@lucide/svelte/icons/log-out';
|
|
21
22
|
let { data, children }: { data: AdminData; children: Snippet } = $props();
|
|
22
23
|
let open = $state(false);
|
|
24
|
+
// Without a configured logo, show the host page's favicon; fall back to the site initial.
|
|
25
|
+
let favicon = $state<string>();
|
|
26
|
+
let logoFailed = $state(false);
|
|
27
|
+
const logo = $derived(data.logo === false ? undefined : (data.logo ?? favicon));
|
|
28
|
+
$effect(() => {
|
|
29
|
+
if (data.logo !== undefined) return;
|
|
30
|
+
const link = document.querySelector<HTMLLinkElement>('link[rel~="icon"]');
|
|
31
|
+
favicon = link?.href || undefined;
|
|
32
|
+
});
|
|
33
|
+
$effect(() => {
|
|
34
|
+
void logo;
|
|
35
|
+
logoFailed = false;
|
|
36
|
+
});
|
|
23
37
|
afterNavigate(() => (open = false));
|
|
24
38
|
const selected = (href: string) =>
|
|
25
39
|
href === '/admin'
|
|
@@ -30,6 +44,7 @@
|
|
|
30
44
|
const blueprint = data.blueprint;
|
|
31
45
|
if (blueprint) {
|
|
32
46
|
const href = (blueprint.kind === 'form' ? '/admin/forms/' : '/admin/content/') + blueprint.id;
|
|
47
|
+
if (inPagesIndex(blueprint)) list.push({ label: 'Pages', href: pagesHref });
|
|
33
48
|
list.push({ label: blueprint.label, href });
|
|
34
49
|
if (data.editing && blueprint.kind === 'collection')
|
|
35
50
|
list.push({
|
|
@@ -37,10 +52,12 @@
|
|
|
37
52
|
});
|
|
38
53
|
} else {
|
|
39
54
|
const label = (
|
|
40
|
-
{
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
55
|
+
{
|
|
56
|
+
pages: 'Pages',
|
|
57
|
+
media: 'Media library',
|
|
58
|
+
users: 'Users',
|
|
59
|
+
account: 'Your account'
|
|
60
|
+
} as Record<string, string>
|
|
44
61
|
)[data.screen];
|
|
45
62
|
if (label) list.push({ label });
|
|
46
63
|
}
|
|
@@ -58,7 +75,12 @@
|
|
|
58
75
|
<aside class:cms-open={open} class="cms-sidebar">
|
|
59
76
|
<a href="/admin" class="cms-wordmark"><Layers size={21} /> SandCMS</a>
|
|
60
77
|
<div class="cms-site">
|
|
61
|
-
|
|
78
|
+
{#if logo && !logoFailed}<img
|
|
79
|
+
class="cms-site-logo"
|
|
80
|
+
src={logo}
|
|
81
|
+
alt=""
|
|
82
|
+
onerror={() => (logoFailed = true)}
|
|
83
|
+
/>{:else}<span class="cms-site-icon">{data.site?.slice(0, 1) ?? 'S'}</span>{/if}
|
|
62
84
|
<strong>{data.site}</strong>
|
|
63
85
|
</div>
|
|
64
86
|
<nav aria-label="Admin navigation">
|
|
@@ -6,12 +6,15 @@
|
|
|
6
6
|
items,
|
|
7
7
|
onchange,
|
|
8
8
|
children,
|
|
9
|
-
label = 'image'
|
|
9
|
+
label = 'image',
|
|
10
|
+
layout = 'list'
|
|
10
11
|
}: {
|
|
11
12
|
items: T[];
|
|
12
13
|
onchange: (items: T[]) => void;
|
|
13
|
-
|
|
14
|
+
/** Grid items render their own drag handle with the third argument. */
|
|
15
|
+
children: Snippet<[T, number, Snippet<[number]>]>;
|
|
14
16
|
label?: string;
|
|
17
|
+
layout?: 'list' | 'grid';
|
|
15
18
|
} = $props();
|
|
16
19
|
let list: HTMLDivElement;
|
|
17
20
|
let dragging = $state<number | null>(null);
|
|
@@ -33,71 +36,89 @@
|
|
|
33
36
|
}
|
|
34
37
|
</script>
|
|
35
38
|
|
|
36
|
-
|
|
39
|
+
{#snippet handle(i: number)}
|
|
40
|
+
<button
|
|
41
|
+
type="button"
|
|
42
|
+
class="cms-drag-handle"
|
|
43
|
+
aria-label={`Drag ${label} ${i + 1} to reorder`}
|
|
44
|
+
onpointerdown={(event) => {
|
|
45
|
+
if (event.button !== 0) return;
|
|
46
|
+
dragging = i;
|
|
47
|
+
over = i;
|
|
48
|
+
event.currentTarget.setPointerCapture(event.pointerId);
|
|
49
|
+
}}
|
|
50
|
+
onpointermove={(event) => {
|
|
51
|
+
if (dragging === null) return;
|
|
52
|
+
const target = document
|
|
53
|
+
.elementFromPoint(event.clientX, event.clientY)
|
|
54
|
+
?.closest<HTMLElement>('[data-sort-index]');
|
|
55
|
+
over = target && target.parentElement === list ? Number(target.dataset.sortIndex) : null;
|
|
56
|
+
if (event.clientY < 60) window.scrollBy(0, -20);
|
|
57
|
+
else if (event.clientY > window.innerHeight - 60) window.scrollBy(0, 20);
|
|
58
|
+
}}
|
|
59
|
+
onpointerup={(event) => {
|
|
60
|
+
if (dragging !== null && over !== null) void move(dragging, over);
|
|
61
|
+
dragging = over = null;
|
|
62
|
+
event.currentTarget.releasePointerCapture(event.pointerId);
|
|
63
|
+
}}
|
|
64
|
+
onpointercancel={() => {
|
|
65
|
+
dragging = over = null;
|
|
66
|
+
}}
|
|
67
|
+
onlostpointercapture={() => {
|
|
68
|
+
dragging = over = null;
|
|
69
|
+
}}
|
|
70
|
+
onkeydown={(event) => {
|
|
71
|
+
if (event.key === 'Escape') dragging = over = null;
|
|
72
|
+
const step = { ArrowUp: -1, ArrowLeft: -1, ArrowDown: 1, ArrowRight: 1 }[event.key];
|
|
73
|
+
if (step) {
|
|
74
|
+
event.preventDefault();
|
|
75
|
+
void move(i, i + step);
|
|
76
|
+
}
|
|
77
|
+
}}
|
|
78
|
+
><GripVertical size={layout === 'grid' ? 14 : 18} />{#if layout === 'grid'}<span
|
|
79
|
+
aria-hidden="true">{i + 1}</span
|
|
80
|
+
>{/if}</button
|
|
81
|
+
>
|
|
82
|
+
{/snippet}
|
|
83
|
+
|
|
84
|
+
<div
|
|
85
|
+
bind:this={list}
|
|
86
|
+
class="cms-sortable"
|
|
87
|
+
class:cms-sortable-grid={layout === 'grid'}
|
|
88
|
+
role="list"
|
|
89
|
+
aria-label={'Ordered ' + label + ' list'}
|
|
90
|
+
>
|
|
37
91
|
{#each items as item, i}
|
|
38
92
|
<div
|
|
39
93
|
class="cms-sortable-row"
|
|
40
|
-
class:cms-drag-over={over === i}
|
|
94
|
+
class:cms-drag-over={over === i && dragging !== i}
|
|
95
|
+
class:cms-dragging={dragging === i}
|
|
41
96
|
role="listitem"
|
|
42
97
|
data-sort-index={i}
|
|
43
98
|
>
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
dragging = over = null;
|
|
68
|
-
event.currentTarget.releasePointerCapture(event.pointerId);
|
|
69
|
-
}}
|
|
70
|
-
onpointercancel={() => {
|
|
71
|
-
dragging = over = null;
|
|
72
|
-
}}
|
|
73
|
-
onlostpointercapture={() => {
|
|
74
|
-
dragging = over = null;
|
|
75
|
-
}}
|
|
76
|
-
onkeydown={(event) => {
|
|
77
|
-
if (event.key === 'Escape') dragging = over = null;
|
|
78
|
-
if (event.key === 'ArrowUp' || event.key === 'ArrowDown') {
|
|
79
|
-
event.preventDefault();
|
|
80
|
-
move(i, i + (event.key === 'ArrowUp' ? -1 : 1));
|
|
81
|
-
}
|
|
82
|
-
}}><GripVertical size={18} /></button
|
|
83
|
-
>
|
|
84
|
-
<span>{i + 1}</span>
|
|
85
|
-
<Button
|
|
86
|
-
variant="ghost"
|
|
87
|
-
size="icon-sm"
|
|
88
|
-
disabled={i === 0}
|
|
89
|
-
aria-label={`Move ${label} ${i + 1} earlier`}
|
|
90
|
-
onclick={() => move(i, i - 1)}>↑</Button
|
|
91
|
-
>
|
|
92
|
-
<Button
|
|
93
|
-
variant="ghost"
|
|
94
|
-
size="icon-sm"
|
|
95
|
-
disabled={i === items.length - 1}
|
|
96
|
-
aria-label={`Move ${label} ${i + 1} later`}
|
|
97
|
-
onclick={() => move(i, i + 1)}>↓</Button
|
|
98
|
-
>
|
|
99
|
-
</div>
|
|
100
|
-
<div class="cms-sort-content">{@render children(item, i)}</div>
|
|
99
|
+
{#if layout === 'grid'}
|
|
100
|
+
{@render children(item, i, handle)}
|
|
101
|
+
{:else}
|
|
102
|
+
<div class="cms-sort-controls">
|
|
103
|
+
{@render handle(i)}
|
|
104
|
+
<span>{i + 1}</span>
|
|
105
|
+
<Button
|
|
106
|
+
variant="ghost"
|
|
107
|
+
size="icon-sm"
|
|
108
|
+
disabled={i === 0}
|
|
109
|
+
aria-label={`Move ${label} ${i + 1} earlier`}
|
|
110
|
+
onclick={() => move(i, i - 1)}>↑</Button
|
|
111
|
+
>
|
|
112
|
+
<Button
|
|
113
|
+
variant="ghost"
|
|
114
|
+
size="icon-sm"
|
|
115
|
+
disabled={i === items.length - 1}
|
|
116
|
+
aria-label={`Move ${label} ${i + 1} later`}
|
|
117
|
+
onclick={() => move(i, i + 1)}>↓</Button
|
|
118
|
+
>
|
|
119
|
+
</div>
|
|
120
|
+
<div class="cms-sort-content">{@render children(item, i, handle)}</div>
|
|
121
|
+
{/if}
|
|
101
122
|
</div>
|
|
102
123
|
{/each}
|
|
103
124
|
</div>
|
|
@@ -3,8 +3,10 @@ declare function $$render<T>(): {
|
|
|
3
3
|
props: {
|
|
4
4
|
items: T[];
|
|
5
5
|
onchange: (items: T[]) => void;
|
|
6
|
-
|
|
6
|
+
/** Grid items render their own drag handle with the third argument. */
|
|
7
|
+
children: Snippet<[T, number, Snippet<[number]>]>;
|
|
7
8
|
label?: string;
|
|
9
|
+
layout?: "list" | "grid";
|
|
8
10
|
};
|
|
9
11
|
exports: {};
|
|
10
12
|
bindings: "";
|
package/dist/admin/Users.svelte
CHANGED
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
import type { AdminData } from './types.js';
|
|
7
7
|
import { api, message } from './client.js';
|
|
8
8
|
import { Button } from './components/ui/button/index.js';
|
|
9
|
+
import { Badge } from './components/ui/badge/index.js';
|
|
9
10
|
import { Input } from './components/ui/input/index.js';
|
|
10
11
|
import { Label } from './components/ui/label/index.js';
|
|
11
12
|
import * as Dialog from './components/ui/dialog/index.js';
|
|
@@ -100,9 +101,13 @@
|
|
|
100
101
|
></Table.Header
|
|
101
102
|
><Table.Body
|
|
102
103
|
>{#each data.users ?? [] as user (user.id)}<Table.Row
|
|
103
|
-
><Table.Cell
|
|
104
|
-
|
|
105
|
-
>{
|
|
104
|
+
><Table.Cell
|
|
105
|
+
><span class="inline-flex items-center gap-2"
|
|
106
|
+
><span class="font-medium">{user.name}</span>{#if user.id === data.user?.id}<Badge
|
|
107
|
+
variant="outline"
|
|
108
|
+
class="font-normal">You</Badge
|
|
109
|
+
>{/if}</span
|
|
110
|
+
></Table.Cell
|
|
106
111
|
><Table.Cell>{user.email}</Table.Cell><Table.Cell class="capitalize"
|
|
107
112
|
>{user.role}</Table.Cell
|
|
108
113
|
><Table.Cell>{user.twoFactorEnabled ? 'Enabled' : 'Off'}</Table.Cell><Table.Cell
|