Skip to content

Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.

feat(cloud): unify console UI and add quota-aware overviews

Timothy Yin6046c5b12be5
diff --git a/apps/cloud/app/assets/cloud.css b/apps/cloud/app/assets/cloud.css
index fd1915d6..35691ebe 100644
--- a/apps/cloud/app/assets/cloud.css
+++ b/apps/cloud/app/assets/cloud.css
@@ -3308,3 +3308,336 @@ a.cf-domain-address:hover {
grid-template-columns: minmax(0, 1fr);
}
}
+
+/* Shared console primitives: theme tokens stay local to Cloud and Platform. */
+.cf-progress {
+ overflow: hidden;
+ height: 4px;
+ width: 100%;
+ border-radius: 999px;
+ background: var(--muted);
+}
+.cf-progress-indicator {
+ height: 100%;
+ background: var(--primary);
+ transition: width 180ms ease;
+ border-radius: inherit;
+}
+.cf-skeleton {
+ display: inline-block;
+ min-height: 1em;
+ border-radius: 5px;
+ background: var(--muted);
+ animation: cf-pulse 1.8s ease-in-out infinite;
+}
+@keyframes cf-pulse {
+ 50% {
+ opacity: 0.45;
+ }
+}
+.cf-separator {
+ height: 1px;
+ width: 100%;
+ background: var(--border);
+ flex-shrink: 0;
+}
+.cf-alert {
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
+ justify-content: space-between;
+ gap: 12px;
+ padding: 14px 16px;
+ border: 1px solid var(--border);
+ border-radius: 8px;
+ background: var(--secondary);
+ font-size: 13px;
+}
+.cf-alert[data-tone='error'] {
+ color: var(--destructive);
+}
+.cf-alert p {
+ color: var(--muted-foreground);
+ font-size: 12px;
+ margin-top: 3px;
+}
+.cf-select {
+ width: 100%;
+ cursor: pointer;
+}
+.cf-table {
+ width: 100%;
+ border-collapse: collapse;
+ font-size: 13px;
+ text-align: left;
+}
+.cf-table th {
+ font-size: 11px;
+ font-weight: 550;
+ color: var(--muted-foreground);
+}
+.cf-table :is(th, td) {
+ padding: 12px 16px;
+ border-bottom: 1px solid var(--border);
+ vertical-align: middle;
+}
+.cf-table tbody tr:last-child td {
+ border-bottom: 0;
+}
+.cf-segmented-control {
+ display: inline-flex;
+ padding: 4px;
+ gap: 3px;
+ border: 1px solid var(--border);
+ border-radius: 8px;
+ background: var(--muted);
+}
+.cf-segmented-item {
+ border: 0;
+ background: transparent;
+ color: var(--muted-foreground);
+ border-radius: 5px;
+ padding: 7px 13px;
+ font: inherit;
+ font-size: 12px;
+ cursor: pointer;
+}
+.cf-segmented-item[data-state='checked'] {
+ background: var(--card);
+ color: var(--foreground);
+ box-shadow: 0 1px 3px #0000000a;
+}
+.cf-segmented-item:disabled {
+ opacity: 0.5;
+ cursor: not-allowed;
+}
+.cf-stat-card {
+ padding: 18px;
+ display: grid;
+ align-content: start;
+ gap: 10px;
+}
+.cf-stat-card strong {
+ font-size: 25px;
+ font-weight: 600;
+ line-height: 1.25;
+ letter-spacing: -0.03em;
+}
+.cf-stat-label {
+ font-size: 12px;
+ color: var(--muted-foreground);
+}
+.cf-stat-card a {
+ font-size: 12px;
+}
+.cf-stat-card .cf-progress {
+ margin-top: 2px;
+}
+.cf-workspace-toolbar .cf-button svg {
+ color: currentColor;
+}
+.cf-pricing.cf-pricing-embedded {
+ padding: 0;
+ margin: 0;
+ max-width: none;
+}
+.cf-plan-page .cf-plan-options {
+ padding: 0;
+ margin-top: 6px;
+}
+.cf-plan-usage-notes {
+ display: grid;
+ gap: 6px;
+ margin-top: 12px;
+}
+.cf-dashboard-heading .cf-eyebrow {
+ margin-bottom: 8px;
+}
+.cf-dashboard-heading {
+ margin-bottom: 0;
+}
+.cf-dashboard-metrics {
+ display: grid;
+ grid-template-columns: repeat(3, minmax(0, 1fr));
+ gap: 14px;
+}
+.cf-dashboard-columns {
+ display: grid;
+ grid-template-columns: minmax(0, 1.7fr) minmax(260px, 1fr);
+ gap: 20px;
+ align-items: start;
+}
+.cf-dashboard-panel {
+ padding: 20px;
+ display: grid;
+ gap: 18px;
+ min-width: 0;
+}
+.cf-dashboard-panel h2 {
+ font-size: 15px;
+ font-weight: 600;
+}
+.cf-dashboard-section-heading {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: 12px;
+}
+.cf-dashboard-section-heading svg {
+ flex-shrink: 0;
+}
+.cf-dashboard-site-list {
+ padding: 0;
+ margin: 0;
+ list-style: none;
+}
+.cf-dashboard-site-list li + li {
+ border-top: 1px solid var(--border);
+}
+.cf-dashboard-site {
+ display: flex;
+ align-items: center;
+ gap: 12px;
+ padding: 14px 0;
+ color: var(--foreground);
+}
+.cf-dashboard-site strong {
+ display: block;
+ font-size: 13px;
+ font-weight: 550;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+.cf-dashboard-site small,
+.cf-dashboard-tool small {
+ display: block;
+ font-size: 12px;
+ color: var(--muted-foreground);
+ margin-top: 3px;
+}
+.cf-dashboard-site[aria-disabled='true'] {
+ opacity: 0.65;
+}
+.cf-dashboard-tool {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ gap: 15px;
+ color: var(--foreground);
+ font-size: 13px;
+}
+.cf-dashboard-tool:hover strong,
+.cf-dashboard-site:hover strong {
+ color: var(--primary);
+}
+.cf-dashboard-empty {
+ padding: 30px 12px;
+ display: grid;
+ justify-items: center;
+ text-align: center;
+ gap: 9px;
+ color: var(--muted-foreground);
+ font-size: 13px;
+}
+.cf-dashboard-empty h3 {
+ color: var(--foreground);
+ font-size: 14px;
+}
+.cf-dashboard-panel .cf-workspace-toolbar {
+ margin-bottom: 0;
+ padding-top: 16px;
+ border-top: 1px solid var(--border);
+}
+.cf-dashboard-panel .cf-quota-notice {
+ margin-top: -6px;
+}
+.cf-site-health-list {
+ margin: 0;
+ padding: 0;
+ list-style: none;
+ display: grid;
+ gap: 16px;
+}
+.cf-site-health-list li {
+ display: flex;
+ align-items: flex-start;
+ gap: 10px;
+ font-size: 13px;
+}
+.cf-site-health-list svg {
+ color: var(--primary);
+ margin-top: 3px;
+ flex-shrink: 0;
+}
+.cf-site-health-list p {
+ font-size: 12px;
+ color: var(--muted-foreground);
+ margin-top: 3px;
+}
+.cf-dashboard .cf-site-page-header {
+ margin-bottom: 0;
+}
+@media (max-width: 900px) {
+ .cf-dashboard-columns {
+ grid-template-columns: 1fr;
+ }
+}
+@media (max-width: 560px) {
+ .cf-dashboard-metrics {
+ grid-template-columns: 1fr;
+ gap: 10px;
+ }
+ .cf-stat-card {
+ padding: 16px;
+ }
+ .cf-dashboard-panel {
+ padding: 16px;
+ }
+ .cf-quota-notice {
+ align-items: flex-start;
+ }
+}
+@media (prefers-reduced-motion: reduce) {
+ .cf-skeleton {
+ animation: none;
+ }
+ .cf-progress-indicator {
+ transition: none;
+ }
+}
+.cf-button-soft {
+ background: var(--secondary);
+ color: var(--secondary-foreground);
+ border-color: transparent;
+}
+.cf-button-soft:hover {
+ border-color: var(--border);
+}
+.cf-progress.is-over .cf-progress-indicator {
+ background: var(--destructive);
+}
+.cf-plan-page .cf-quota-card .cf-progress {
+ margin-top: 10px;
+ margin-bottom: 8px;
+}
+@media (max-width: 560px) {
+ .cf-dashboard-metrics {
+ grid-template-columns: repeat(2, minmax(0, 1fr));
+ }
+ .cf-dashboard-metrics > :last-child:nth-child(odd) {
+ grid-column: 1 / -1;
+ }
+ .cf-stat-label {
+ overflow-wrap: anywhere;
+ }
+}
+
+.cf-dashboard .cf-dashboard-heading {
+ margin-bottom: 0;
+}
+.cf-stat-card .cf-text-link {
+ display: inline-flex;
+ align-items: center;
+ gap: 4px;
+}
diff --git a/apps/cloud/app/assets/console-tailwind.css b/apps/cloud/app/assets/console-tailwind.css
new file mode 100644
index 00000000..60ae8475
--- /dev/null
+++ b/apps/cloud/app/assets/console-tailwind.css
@@ -0,0 +1,16 @@
+@layer theme, base, components, utilities;
+@import 'tailwindcss/theme.css' layer(theme);
+@import 'tailwindcss/utilities.css' layer(utilities);
+@source '../';
+@source '../../../admin/app/';
+@theme inline {
+ --color-background: var(--background);
+ --color-foreground: var(--foreground);
+ --color-card: var(--card);
+ --color-muted: var(--muted);
+ --color-muted-foreground: var(--muted-foreground);
+ --color-primary: var(--primary);
+ --color-primary-foreground: var(--primary-foreground);
+ --color-border: var(--border);
+ --color-destructive: var(--destructive);
+}
diff --git a/apps/cloud/app/components/CloudAlbumsManager.vue b/apps/cloud/app/components/CloudAlbumsManager.vue
index 5cc2aecd..67543937 100644
--- a/apps/cloud/app/components/CloudAlbumsManager.vue
+++ b/apps/cloud/app/components/CloudAlbumsManager.vue
@@ -1,4 +1,14 @@
<script setup lang="ts">
+import {
+ ArrowDown as ButtonIconArrowDown,
+ ArrowUp as ButtonIconArrowUp,
+ Ellipsis as ButtonIconEllipsis,
+ ImagePlus as ButtonIconImagePlus,
+ Plus as ButtonIconPlus,
+ RefreshCw as ButtonIconRefreshCw,
+ Star as ButtonIconStar,
+ X as ButtonIconX,
+} from 'lucide-vue-next'
const { t } = useI18n()
import { isValidAlbumSlug } from '@chronoframe/contracts/album-slug'
@@ -77,7 +87,10 @@ const columns: TableColumn<Album & { photoIds: string[] }>[] = [
{ accessorKey: 'description', header: t('cloud.messages.description') },
{ id: 'count', header: t('cloud.messages.photographs') },
{ id: 'visibility', header: t('cloud.messages.visibility') },
- { id: 'actions', header: '' },
+ {
+ id: 'actions',
+ header: () => h('span', { class: 'sr-only' }, t('cloud.dashboard.actions')),
+ },
]
function cover(album: Album & { photoIds: string[] }) {
return photos.value.find(
@@ -300,11 +313,11 @@ function menu(album: Album) {
}}
</p>
</div>
- <UButton
+ <CloudButton
v-if="admin"
- icon="i-lucide-plus"
+ :icon="ButtonIconPlus"
@click="create"
- >{{ $t('cloud.messages.createAlbum') }}</UButton
+ >{{ $t('cloud.messages.createAlbum') }}</CloudButton
>
</div>
<div class="cf-library-toolbar">
@@ -314,10 +327,9 @@ function menu(album: Album) {
:placeholder="$t('cloud.messages.searchAlbums')"
:aria-label="$t('cloud.messages.searchAlbums2')"
class="cf-library-search"
- /><UButton
- color="neutral"
+ /><CloudButton
variant="ghost"
- icon="i-lucide-refresh-cw"
+ :icon="ButtonIconRefreshCw"
:aria-label="$t('cloud.messages.refreshAlbums')"
:loading="loading"
@click="refreshMedia"
@@ -385,31 +397,28 @@ function menu(album: Album) {
></template
><template #actions-cell="{ row }"
><div class="flex items-center gap-1">
- <UButton
+ <CloudButton
v-if="admin"
- color="neutral"
variant="ghost"
- icon="i-lucide-arrow-up"
- size="xs"
+ :icon="ButtonIconArrowUp"
+ size="sm"
:disabled="busy || albums[0]?.id === row.original.id"
:aria-label="$t('cloud.ui.moveUp', { title: row.original.title })"
@click="moveAlbum(row.original, -1)"
- /><UButton
+ /><CloudButton
v-if="admin"
- color="neutral"
variant="ghost"
- icon="i-lucide-arrow-down"
- size="xs"
+ :icon="ButtonIconArrowDown"
+ size="sm"
:disabled="busy || albums.at(-1)?.id === row.original.id"
:aria-label="
$t('cloud.ui.moveDown', { title: row.original.title })
"
@click="moveAlbum(row.original, 1)"
/><UDropdownMenu :items="menu(row.original)"
- ><UButton
- color="neutral"
+ ><CloudButton
variant="ghost"
- icon="i-lucide-ellipsis"
+ :icon="ButtonIconEllipsis"
:aria-label="
$t('cloud.ui.actionsNamed', { title: row.original.title })
"
@@ -434,11 +443,11 @@ function menu(album: Album) {
)
}}
</p>
- <UButton
+ <CloudButton
v-if="admin && !albums.length"
variant="soft"
@click="create"
- >{{ $t('cloud.messages.createAlbum') }}</UButton
+ >{{ $t('cloud.messages.createAlbum') }}</CloudButton
>
</div></template
></ConsoleMediaTable
@@ -524,14 +533,13 @@ function menu(album: Album) {
})
}}
</h3>
- <UButton
- color="neutral"
- variant="outline"
- icon="i-lucide-image-plus"
+ <CloudButton
+ variant="secondary"
+ :icon="ButtonIconImagePlus"
size="sm"
id="album-select-photographs"
@click="picker = !picker"
- >{{ $t('cloud.messages.selectPhotographs') }}</UButton
+ >{{ $t('cloud.messages.selectPhotographs') }}</CloudButton
>
</div>
<div
@@ -543,34 +551,31 @@ function menu(album: Album) {
:src="photo.thumbnailUrl || ''"
:alt="photo.title || $t('cloud.messages.photograph')"
/><span>{{ photo.title }}</span
- ><UButton
+ ><CloudButton
:color="draft.coverPhotoId === photo.id ? 'primary' : 'neutral'"
variant="ghost"
- icon="i-lucide-star"
- size="xs"
+ :icon="ButtonIconStar"
+ size="sm"
:aria-label="$t('cloud.ui.setCover', { title: photo.title })"
@click="draft.coverPhotoId = photo.id"
- /><UButton
- color="neutral"
+ /><CloudButton
variant="ghost"
- icon="i-lucide-arrow-up"
- size="xs"
+ :icon="ButtonIconArrowUp"
+ size="sm"
:disabled="index === 0"
:aria-label="$t('cloud.ui.moveUp', { title: photo.title })"
@click="movePhoto(index, -1)"
- /><UButton
- color="neutral"
+ /><CloudButton
variant="ghost"
- icon="i-lucide-arrow-down"
- size="xs"
+ :icon="ButtonIconArrowDown"
+ size="sm"
:disabled="index === chosen.length - 1"
:aria-label="$t('cloud.ui.moveDown', { title: photo.title })"
@click="movePhoto(index, 1)"
- /><UButton
- color="error"
- variant="ghost"
- icon="i-lucide-x"
- size="xs"
+ /><CloudButton
+ variant="destructive"
+ :icon="ButtonIconX"
+ size="sm"
:aria-label="
$t('cloud.ui.removeFromAlbum', { title: photo.title })
"
@@ -628,24 +633,23 @@ function menu(album: Album) {
<span class="text-sm text-muted">{{
$t('cloud.ui.selectedCount', { count: draft.photoIds.length })
}}</span
- ><UButton @click="picker = false">{{
+ ><CloudButton @click="picker = false">{{
$t('cloud.messages.done')
- }}</UButton>
+ }}</CloudButton>
</div>
</div></template
><template #footer
- ><UButton
- color="neutral"
- variant="outline"
+ ><CloudButton
+ variant="secondary"
:disabled="saving"
@click="editor = false"
- >{{ $t('cloud.messages.cancel') }}</UButton
- ><UButton
+ >{{ $t('cloud.messages.cancel') }}</CloudButton
+ ><CloudButton
type="submit"
form="cloud-album-form"
:loading="saving"
:disabled="!loaded || !draft.title.trim()"
- >{{ $t('cloud.messages.saveAlbum') }}</UButton
+ >{{ $t('cloud.messages.saveAlbum') }}</CloudButton
></template
></USlideover
>
@@ -657,16 +661,15 @@ function menu(album: Album) {
$t('cloud.messages.photographsRemainInYourLibraryTheyMayBecomePublic')
"
><template #footer
- ><UButton
- color="neutral"
- variant="outline"
+ ><CloudButton
+ variant="secondary"
@click="removeOpen = false"
- >{{ $t('cloud.messages.cancel') }}</UButton
- ><UButton
- color="error"
+ >{{ $t('cloud.messages.cancel') }}</CloudButton
+ ><CloudButton
+ variant="destructive"
:loading="busy"
@click="remove"
- >{{ $t('cloud.messages.deleteAlbum2') }}</UButton
+ >{{ $t('cloud.messages.deleteAlbum2') }}</CloudButton
></template
></UModal
>
diff --git a/apps/cloud/app/components/CloudPageHeader.vue b/apps/cloud/app/components/CloudPageHeader.vue
new file mode 100644
index 00000000..b70c771c
--- /dev/null
+++ b/apps/cloud/app/components/CloudPageHeader.vue
@@ -0,0 +1,28 @@
+<script setup lang="ts">
+defineProps<{ title: string; description?: string; eyebrow?: string }>()
+</script>
+<template>
+ <header class="cf-page-heading cf-dashboard-heading">
+ <div class="min-w-0">
+ <p
+ v-if="eyebrow"
+ class="cf-eyebrow"
+ >
+ {{ eyebrow }}
+ </p>
+ <h1 class="cf-page-title">{{ title }}</h1>
+ <p
+ v-if="description"
+ class="cf-page-description"
+ >
+ {{ description }}
+ </p>
+ </div>
+ <div
+ v-if="$slots.default"
+ class="flex flex-wrap items-center gap-2"
+ >
+ <slot />
+ </div>
+ </header>
+</template>
diff --git a/apps/cloud/app/components/CloudPhotoLibrary.vue b/apps/cloud/app/components/CloudPhotoLibrary.vue
index e290cbdf..f3edce7d 100644
--- a/apps/cloud/app/components/CloudPhotoLibrary.vue
+++ b/apps/cloud/app/components/CloudPhotoLibrary.vue
@@ -1,4 +1,13 @@
<script setup lang="ts">
+import {
+ ArrowUpDown as ButtonIconArrowUpDown,
+ Ellipsis as ButtonIconEllipsis,
+ Filter as ButtonIconFilter,
+ FolderPlus as ButtonIconFolderPlus,
+ RefreshCw as ButtonIconRefreshCw,
+ Trash2 as ButtonIconTrash2,
+ Upload as ButtonIconUpload,
+} from 'lucide-vue-next'
const { t, locale } = useI18n()
import type { Photo } from '@chronoframe/contracts/resources'
@@ -10,9 +19,12 @@ const {
albums,
jobs,
loading,
+ ready,
admin,
busy,
uploadOpen,
+ connectionId,
+ connections,
editPhoto,
photoLoaded,
loadPhoto,
@@ -23,6 +35,26 @@ const {
api,
base,
} = useCloudSiteMedia()
+const quota = useCloudQuota(useEntryContext().value?.workspaceId)
+const uploadAdmission = computed(() => {
+ if (!ready.value) return { allowed: false, reason: 'checking' }
+ const connection = connections.value.find((c) => c.id === connectionId.value)
+ const mode = !connection || connection.pool_id ? 'platform' : 'byos'
+ const resources =
+ mode === 'byos'
+ ? (['byos', 'photos', 'monthlyBytes', 'fileBytes'] as const)
+ : (['photos', 'storageBytes', 'monthlyBytes', 'fileBytes'] as const)
+ return (
+ resources
+ .map((resource) => quota.gate(resource, mode))
+ .find((gate) => !gate.allowed) ?? { allowed: true, reason: '' }
+ )
+})
+async function openUpload() {
+ await quota.refresh()
+ if (uploadAdmission.value.allowed && !quota.error.value)
+ uploadOpen.value = true
+}
const search = ref(''),
selection = ref<Record<string, boolean>>({}),
editor = ref(false),
@@ -53,7 +85,10 @@ const columns: TableColumn<Photo>[] = [
{ accessorKey: 'tags', header: t('cloud.messages.tags') },
{ accessorKey: 'dateTaken', header: t('cloud.messages.dateTaken') },
{ accessorKey: 'fileSize', header: t('cloud.messages.size') },
- { id: 'actions', header: '' },
+ {
+ id: 'actions',
+ header: () => h('span', { class: 'sr-only' }, t('cloud.dashboard.actions')),
+ },
]
const pendingJobs = computed(() =>
jobs.value.filter((j) => j.state !== 'succeeded'),
@@ -159,13 +194,20 @@ watch(
}}
</p>
</div>
- <UButton
+ <CloudButton
v-if="admin"
- icon="i-lucide-upload"
- @click="uploadOpen = true"
- >{{ $t('cloud.messages.upload') }}</UButton
+ :icon="ButtonIconUpload"
+ :disabled="!uploadAdmission.allowed || !!quota.error.value"
+ @click="openUpload"
+ >{{ $t('cloud.messages.upload') }}</CloudButton
>
</div>
+ <CloudQuotaNotice
+ v-if="admin && (uploadAdmission.reason || quota.error.value)"
+ :reason="uploadAdmission.reason"
+ :error="!!quota.error.value"
+ @retry="quota.refresh()"
+ />
<div class="cf-library-toolbar">
<UInput
v-model="search"
@@ -174,23 +216,20 @@ watch(
:aria-label="$t('cloud.messages.searchPhotographs2')"
class="cf-library-search"
/><UPopover
- ><UButton
- color="neutral"
- :variant="hasActiveFilters ? 'soft' : 'outline'"
- icon="i-lucide-filter"
- >{{ $t('cloud.messages.filters') }}</UButton
+ ><CloudButton
+ :variant="hasActiveFilters ? 'soft' : 'secondary'"
+ :icon="ButtonIconFilter"
+ >{{ $t('cloud.messages.filters') }}</CloudButton
><template #content><OverlayFilterPanel /></template></UPopover
><UPopover
- ><UButton
- color="neutral"
- variant="outline"
- icon="i-lucide-arrow-up-down"
- >{{ $t('cloud.messages.sort') }}</UButton
+ ><CloudButton
+ variant="secondary"
+ :icon="ButtonIconArrowUpDown"
+ >{{ $t('cloud.messages.sort') }}</CloudButton
><template #content><OverlaySortPanel /></template></UPopover
- ><UButton
- color="neutral"
+ ><CloudButton
variant="ghost"
- icon="i-lucide-refresh-cw"
+ :icon="ButtonIconRefreshCw"
:aria-label="$t('cloud.messages.refreshPhotographs')"
:loading="loading"
@click="refreshMedia"
@@ -201,27 +240,25 @@ watch(
class="cf-selection-bar"
>
<span>{{ $t('cloud.ui.selectedCount', { count: chosen.length }) }}</span
- ><UButton
+ ><CloudButton
v-if="admin"
size="sm"
variant="soft"
- icon="i-lucide-folder-plus"
+ :icon="ButtonIconFolderPlus"
@click="albumOpen = true"
- >{{ $t('cloud.messages.addToAlbum') }}</UButton
- ><UButton
+ >{{ $t('cloud.messages.addToAlbum') }}</CloudButton
+ ><CloudButton
+ variant="destructive"
v-if="admin"
size="sm"
- color="error"
- variant="soft"
- icon="i-lucide-trash-2"
+ :icon="ButtonIconTrash2"
@click="deleteOpen = true"
- >{{ $t('cloud.messages.delete') }}</UButton
- ><UButton
- color="neutral"
+ >{{ $t('cloud.messages.delete') }}</CloudButton
+ ><CloudButton
size="sm"
variant="ghost"
@click="selection = {}"
- >{{ $t('cloud.messages.clear') }}</UButton
+ >{{ $t('cloud.messages.clear') }}</CloudButton
>
</div>
<div class="cf-library-table">
@@ -305,10 +342,9 @@ watch(
}}</span></template
><template #actions-cell="{ row }"
><UDropdownMenu :items="actions(row.original)"
- ><UButton
- color="neutral"
+ ><CloudButton
variant="ghost"
- icon="i-lucide-ellipsis"
+ :icon="ButtonIconEllipsis"
:aria-label="
$t('cloud.ui.actionsNamed', { title: row.original.title })
" /></UDropdownMenu></template
@@ -334,11 +370,12 @@ watch(
)
}}
</p>
- <UButton
+ <CloudButton
v-if="admin && !photos.length"
variant="soft"
- @click="uploadOpen = true"
- >{{ $t('cloud.messages.upload') }}</UButton
+ :disabled="!uploadAdmission.allowed || !!quota.error.value"
+ @click="openUpload"
+ >{{ $t('cloud.messages.upload') }}</CloudButton
>
</div></template
></ConsoleMediaTable
@@ -388,10 +425,9 @@ watch(
></span
>
</div>
- <UButton
+ <CloudButton
v-if="admin && job.state === 'failed'"
- color="neutral"
- variant="outline"
+ variant="secondary"
size="sm"
:disabled="busy"
@click="
@@ -404,14 +440,13 @@ watch(
$t('cloud.messages.jobQueuedAgain'),
)
"
- >{{ $t('cloud.messages.retry') }}</UButton
- ><UButton
+ >{{ $t('cloud.messages.retry') }}</CloudButton
+ ><CloudButton
+ variant="destructive"
v-if="admin && job.state !== 'cancelled'"
- color="error"
- variant="ghost"
size="sm"
@click="removePhoto(job.photo_id)"
- >{{ $t('cloud.messages.remove') }}</UButton
+ >{{ $t('cloud.messages.remove') }}</CloudButton
>
</div>
</section>
@@ -446,17 +481,16 @@ watch(
v-model:tags="editPhoto.tags"
v-model:rating="editPhoto.rating" /></UForm></template
><template #footer
- ><UButton
- color="neutral"
- variant="outline"
+ ><CloudButton
+ variant="secondary"
@click="editor = false"
- >{{ $t('cloud.messages.cancel') }}</UButton
- ><UButton
+ >{{ $t('cloud.messages.cancel') }}</CloudButton
+ ><CloudButton
type="submit"
form="cloud-edit-photo"
:loading="busy"
:disabled="photoLoaded !== editPhoto.id || !editPhoto.title.trim()"
- >{{ $t('cloud.messages.saveChanges') }}</UButton
+ >{{ $t('cloud.messages.saveChanges') }}</CloudButton
></template
></USlideover
>
@@ -495,13 +529,12 @@ watch(
)
"
><template #footer
- ><UButton
- color="neutral"
- variant="outline"
+ ><CloudButton
+ variant="secondary"
@click="deleteOpen = false"
- >{{ $t('cloud.messages.cancel') }}</UButton
- ><UButton
- color="error"
+ >{{ $t('cloud.messages.cancel') }}</CloudButton
+ ><CloudButton
+ variant="destructive"
:loading="saving"
@click="deleteChosen"
>{{
@@ -510,7 +543,7 @@ watch(
{ count: chosen.length },
chosen.length,
)
- }}</UButton
+ }}</CloudButton
></template
></UModal
>
@@ -532,16 +565,15 @@ watch(
{{ $t('cloud.messages.createAnAlbumFirstFromTheAlbumsPage') }}
</p></template
><template #footer
- ><UButton
- color="neutral"
- variant="outline"
+ ><CloudButton
+ variant="secondary"
@click="albumOpen = false"
- >{{ $t('cloud.messages.cancel') }}</UButton
- ><UButton
+ >{{ $t('cloud.messages.cancel') }}</CloudButton
+ ><CloudButton
:disabled="!targetAlbum"
:loading="busy"
@click="addToAlbum"
- >{{ $t('cloud.messages.addPhotographs') }}</UButton
+ >{{ $t('cloud.messages.addPhotographs') }}</CloudButton
></template
></UModal
>
diff --git a/apps/cloud/app/components/CloudPricing.vue b/apps/cloud/app/components/CloudPricing.vue
index 2f0fe84b..249a0aa2 100644
--- a/apps/cloud/app/components/CloudPricing.vue
+++ b/apps/cloud/app/components/CloudPricing.vue
@@ -17,6 +17,12 @@ const props = withDefaults(
const { t, locale } = useI18n(),
links = useCloudLinks(),
interval = ref<1 | 3>(1)
+const billingPeriod = computed({
+ get: () => String(interval.value),
+ set: (value: string) => {
+ interval.value = value === '3' ? 3 : 1
+ },
+})
const billing = props.portal
? (props.workspaceBilling ?? useWorkspaceBilling())
: null
@@ -98,7 +104,10 @@ async function checkout(plan: any) {
}
</script>
<template>
- <div class="cf-pricing">
+ <div
+ class="cf-pricing"
+ :class="{ 'cf-pricing-embedded': embedded }"
+ >
<div :class="embedded ? 'cf-plan-options-heading' : 'cf-pricing-heading'">
<p
v-if="!embedded"
@@ -117,23 +126,17 @@ async function checkout(plan: any) {
)
}}
</p>
- <fieldset class="cf-billing-toggle">
- <legend class="sr-only">{{ $t('cloud.billing.interval') }}</legend>
- <label
- v-for="n in [1, 3] as const"
- :key="n"
- :class="{ active: interval === n }"
- ><input
- v-model="interval"
- type="radio"
- name="billing-interval"
- :disabled="portal && !!payment?.pending"
- :value="n"
- /><span>{{
- $t('cloud.billing.' + (n === 1 ? 'monthly' : 'quarterly'))
- }}</span></label
- >
- </fieldset>
+ <CloudRadioGroup
+ v-model="billingPeriod"
+ :label="$t('cloud.billing.interval')"
+ :options="
+ [1, 3].map((n) => ({
+ value: String(n),
+ label: $t('cloud.billing.' + (n === 1 ? 'monthly' : 'quarterly')),
+ disabled: portal && !!payment?.pending,
+ }))
+ "
+ />
<p class="cf-field-hint">
{{
payment?.enabled
@@ -351,7 +354,7 @@ async function checkout(plan: any) {
<h2>{{ $t('cloud.billing.compare') }}</h2>
<p class="cf-field-hint">{{ $t('cloud.billing.comparisonHelp') }}</p>
<div class="cf-table-scroll">
- <table>
+ <CloudTable>
<caption class="sr-only">
{{
$t('cloud.billing.compare')
@@ -392,7 +395,7 @@ async function checkout(plan: any) {
</td>
</tr>
</tbody>
- </table>
+ </CloudTable>
</div>
</section></template
>
diff --git a/apps/cloud/app/components/CloudQuotaNotice.vue b/apps/cloud/app/components/CloudQuotaNotice.vue
new file mode 100644
index 00000000..c3df19d2
--- /dev/null
+++ b/apps/cloud/app/components/CloudQuotaNotice.vue
@@ -0,0 +1,36 @@
+<script setup lang="ts">
+defineProps<{ reason: string; error?: boolean; resource?: string }>()
+const emit = defineEmits<{ retry: [] }>()
+</script>
+<template>
+ <CloudAlert
+ v-if="reason || error"
+ class="cf-quota-notice"
+ :tone="error ? 'error' : 'info'"
+ ><div>
+ <strong>{{
+ $t(
+ error
+ ? 'cloud.dashboard.quotaUnavailable'
+ : `cloud.dashboard.quota_${reason}`,
+ )
+ }}</strong>
+ <p v-if="reason === 'upgrade'">{{ $t('cloud.dashboard.quotaHelp') }}</p>
+ </div>
+ <CloudButton
+ v-if="error"
+ variant="secondary"
+ size="sm"
+ @click="emit('retry')"
+ >{{ $t('cloud.messages.retry') }}</CloudButton
+ ><CloudButton
+ v-else-if="reason === 'upgrade'"
+ as-child
+ variant="secondary"
+ size="sm"
+ ><NuxtLink to="/account/plan#plans">{{
+ $t('cloud.dashboard.viewPlans')
+ }}</NuxtLink></CloudButton
+ ></CloudAlert
+ >
+</template>
diff --git a/apps/cloud/app/components/CloudSidebarNavigation.vue b/apps/cloud/app/components/CloudSidebarNavigation.vue
index 54ffc7eb..1e23d6f7 100644
--- a/apps/cloud/app/components/CloudSidebarNavigation.vue
+++ b/apps/cloud/app/components/CloudSidebarNavigation.vue
@@ -116,6 +116,14 @@ watch(mode, (next) => {
<template v-else
><p class="cf-nav-label">{{ $t('cloud.messages.workspace2') }}</p>
<nav :aria-label="$t('cloud.messages.portalNavigation')">
+ <NuxtLink
+ to="/workspace"
+ :class="{ active: route.path === '/workspace' }"
+ :aria-current="route.path === '/workspace' ? 'page' : undefined"
+ ><LayoutDashboard :size="17" />{{
+ $t('cloud.dashboard.workspaceOverview')
+ }}</NuxtLink
+ >
<NuxtLink
to="/sites"
:class="{ active: route.path === '/sites' }"
diff --git a/apps/cloud/app/components/CloudSiteCreate.vue b/apps/cloud/app/components/CloudSiteCreate.vue
index 9eb3b604..5f5c6bd1 100644
--- a/apps/cloud/app/components/CloudSiteCreate.vue
+++ b/apps/cloud/app/components/CloudSiteCreate.vue
@@ -3,7 +3,10 @@ const { t } = useI18n()
const siteBaseDomain = useRuntimeConfig().public.siteBaseDomain
import { Plus, ArrowRight, Layers } from 'lucide-vue-next'
-defineProps<{ workspaceName?: string }>()
+const props = defineProps<{ workspaceName?: string; workspaceId?: number }>()
+const quota = useCloudQuota(() => props.workspaceId)
+const admission = computed(() => quota.gate('sites'))
+const checking = ref(false)
const open = ref(false)
const name = ref('')
const slug = ref('')
@@ -18,6 +21,10 @@ const validSlug = computed(() =>
/^[a-z0-9](?:[a-z0-9-]{1,38}[a-z0-9])$/.test(slug.value),
)
async function show() {
+ checking.value = true
+ await quota.refresh()
+ checking.value = false
+ if (!admission.value.allowed || quota.error.value) return
open.value = true
await nextTick()
document.getElementById('site-name')?.focus()
@@ -28,7 +35,7 @@ async function cancel() {
document.getElementById('create-site-trigger')?.focus()
}
async function create() {
- if (busy.value) return
+ if (busy.value || !admission.value.allowed || quota.error.value) return
busy.value = true
error.value = ''
requestId ||= crypto.randomUUID()
@@ -40,6 +47,7 @@ async function create() {
await navigateTo(`/sites/${result.site.siteId}`)
} catch (cause) {
const status = (cause as { statusCode?: number }).statusCode
+ if (status === 403) await quota.refresh()
error.value =
status === 409
? t('cloud.messages.thisAddressIsAlreadyTakenOrThisRequestChanged')
@@ -63,10 +71,17 @@ async function create() {
v-if="!open"
id="create-site-trigger"
size="sm"
+ :disabled="!admission.allowed || !!quota.error.value || checking"
+ :loading="checking"
@click="show"
><Plus :size="15" />{{ $t('cloud.messages.createSite') }}</CloudButton
>
</div>
+ <CloudQuotaNotice
+ :reason="admission.reason"
+ :error="!!quota.error.value"
+ @retry="quota.refresh()"
+ />
<CloudCard
v-if="open"
class="cf-create-panel"
@@ -132,7 +147,13 @@ async function create() {
<div class="cf-site-actions">
<CloudButton
type="submit"
- :disabled="busy || !name.trim() || !validSlug"
+ :disabled="
+ busy ||
+ !name.trim() ||
+ !validSlug ||
+ !admission.allowed ||
+ !!quota.error.value
+ "
>{{
busy
? $t('cloud.messages.creating')
diff --git a/apps/cloud/app/components/CloudStorageSettings.vue b/apps/cloud/app/components/CloudStorageSettings.vue
index 52898795..7c69ee1a 100644
--- a/apps/cloud/app/components/CloudStorageSettings.vue
+++ b/apps/cloud/app/components/CloudStorageSettings.vue
@@ -10,6 +10,8 @@ const {
busy,
admin,
} = useCloudSiteMedia()
+const quota = useCloudQuota(useEntryContext().value?.workspaceId)
+const byosAdmission = computed(() => quota.gate('byos'))
</script>
<template>
<CloudCard
@@ -26,9 +28,15 @@ const {
</p>
</div>
<div class="cf-panel-body cf-media-controls">
+ <CloudQuotaNotice
+ v-if="admin && (byosAdmission.reason || quota.error.value)"
+ :reason="byosAdmission.reason"
+ :error="!!quota.error.value"
+ @retry="quota.refresh()"
+ />
<label class="cf-field-label"
>{{ $t('cloud.messages.storageConnection')
- }}<select
+ }}<CloudSelect
v-model="connectionId"
class="cf-input"
:disabled="!admin"
@@ -52,7 +60,7 @@ const {
})
}}
</option>
- </select></label
+ </CloudSelect></label
>
<details
v-if="
@@ -93,7 +101,7 @@ const {
</form>
</details>
<details
- v-if="admin && allowance?.byosLimits.byos"
+ v-if="admin && byosAdmission.allowed && !quota.error.value"
class="cf-storage-details"
>
<summary>{{ $t('cloud.messages.connectStorage') }}</summary>
diff --git a/apps/cloud/app/components/CloudUploadDrawer.vue b/apps/cloud/app/components/CloudUploadDrawer.vue
index 0ff08524..f486188d 100644
--- a/apps/cloud/app/components/CloudUploadDrawer.vue
+++ b/apps/cloud/app/components/CloudUploadDrawer.vue
@@ -147,18 +147,16 @@ async function dropFiles(event: DragEvent) {
</p>
</div></template
><template #footer
- ><UButton
+ ><CloudButton
+ variant="destructive"
v-if="uploading"
- color="error"
- variant="soft"
@click="cancel"
- >{{ $t('cloud.messages.cancelUpload') }}</UButton
- ><UButton
+ >{{ $t('cloud.messages.cancelUpload') }}</CloudButton
+ ><CloudButton
v-else
- color="neutral"
- variant="outline"
+ variant="secondary"
@click="uploadOpen = false"
- >{{ $t('cloud.messages.done') }}</UButton
+ >{{ $t('cloud.messages.done') }}</CloudButton
></template
></USlideover
>
diff --git a/apps/cloud/app/components/ui/alert/CloudAlert.vue b/apps/cloud/app/components/ui/alert/CloudAlert.vue
new file mode 100644
index 00000000..a9e93c0a
--- /dev/null
+++ b/apps/cloud/app/components/ui/alert/CloudAlert.vue
@@ -0,0 +1,14 @@
+<script setup lang="ts">
+withDefaults(defineProps<{ tone?: 'info' | 'error' | 'success' }>(), {
+ tone: 'info',
+})
+</script>
+<template>
+ <div
+ :role="tone === 'error' ? 'alert' : 'status'"
+ class="cf-alert"
+ :data-tone="tone"
+ >
+ <slot />
+ </div>
+</template>
diff --git a/apps/cloud/app/components/ui/alert/index.ts b/apps/cloud/app/components/ui/alert/index.ts
new file mode 100644
index 00000000..11991861
--- /dev/null
+++ b/apps/cloud/app/components/ui/alert/index.ts
@@ -0,0 +1 @@
+export { default as CloudAlert } from './CloudAlert.vue'
diff --git a/apps/cloud/app/components/ui/button/CloudButton.vue b/apps/cloud/app/components/ui/button/CloudButton.vue
index 340cd0c0..adf62871 100644
--- a/apps/cloud/app/components/ui/button/CloudButton.vue
+++ b/apps/cloud/app/components/ui/button/CloudButton.vue
@@ -1,4 +1,5 @@
<script setup lang="ts">
+import type { Component } from 'vue'
import { Primitive, type PrimitiveProps } from 'reka-ui'
import { cva, type VariantProps } from 'class-variance-authority'
import { cn } from '../../../utils/cn'
@@ -8,6 +9,7 @@ const variants = cva('cf-button', {
variant: {
default: 'cf-button-primary',
secondary: 'cf-button-secondary',
+ soft: 'cf-button-soft',
ghost: 'cf-button-ghost',
destructive: 'cf-button-destructive',
},
@@ -26,6 +28,7 @@ const props = withDefaults(
PrimitiveProps & {
variant?: ButtonVariants['variant']
size?: ButtonVariants['size']
+ icon?: Component
loading?: boolean
disabled?: boolean
class?: string
@@ -49,6 +52,11 @@ const props = withDefaults(
class="cf-spin"
:size="16"
aria-hidden="true"
+ /><component
+ v-else-if="icon"
+ :is="icon"
+ :size="16"
+ aria-hidden="true"
/><slot />
</Primitive>
</template>
diff --git a/apps/cloud/app/components/ui/card/CloudStatCard.vue b/apps/cloud/app/components/ui/card/CloudStatCard.vue
new file mode 100644
index 00000000..0c8484a3
--- /dev/null
+++ b/apps/cloud/app/components/ui/card/CloudStatCard.vue
@@ -0,0 +1,28 @@
+<script setup lang="ts">
+defineProps<{
+ label: string
+ value?: string | number
+ detail?: string
+ loading?: boolean
+ progress?: number
+}>()
+</script>
+<template>
+ <CloudCard class="cf-stat-card"
+ ><span class="cf-stat-label">{{ label }}</span
+ ><CloudSkeleton
+ v-if="loading"
+ class="h-7 w-20" /><strong v-else>{{ value ?? '—' }}</strong
+ ><CloudProgress
+ v-if="progress !== undefined"
+ :value="progress"
+ :aria-label="label" />
+ <p
+ v-if="detail"
+ class="cf-field-hint"
+ >
+ {{ detail }}
+ </p>
+ <slot
+ /></CloudCard>
+</template>
diff --git a/apps/cloud/app/components/ui/card/index.ts b/apps/cloud/app/components/ui/card/index.ts
index b2a65353..f4a1cfc2 100644
--- a/apps/cloud/app/components/ui/card/index.ts
+++ b/apps/cloud/app/components/ui/card/index.ts
@@ -1 +1,2 @@
export { default as CloudCard } from './CloudCard.vue'
+export { default as CloudStatCard } from './CloudStatCard.vue'
diff --git a/apps/cloud/app/components/ui/progress/CloudProgress.vue b/apps/cloud/app/components/ui/progress/CloudProgress.vue
new file mode 100644
index 00000000..f0afa1be
--- /dev/null
+++ b/apps/cloud/app/components/ui/progress/CloudProgress.vue
@@ -0,0 +1,22 @@
+<script setup lang="ts">
+import { ProgressRoot, ProgressIndicator } from 'reka-ui'
+withDefaults(defineProps<{ value?: number; max?: number }>(), {
+ value: 0,
+ max: 100,
+})
+</script>
+<template>
+ <ProgressRoot
+ :model-value="value"
+ :max="max"
+ class="cf-progress"
+ >
+ <ProgressIndicator
+ class="cf-progress-indicator"
+ :style="{
+ width:
+ Math.min(100, Math.max(0, (value / Math.max(1, max)) * 100)) + '%',
+ }"
+ />
+ </ProgressRoot>
+</template>
diff --git a/apps/cloud/app/components/ui/progress/index.ts b/apps/cloud/app/components/ui/progress/index.ts
new file mode 100644
index 00000000..b86056e3
--- /dev/null
+++ b/apps/cloud/app/components/ui/progress/index.ts
@@ -0,0 +1 @@
+export { default as CloudProgress } from './CloudProgress.vue'
diff --git a/apps/cloud/app/components/ui/radio-group/CloudRadioGroup.vue b/apps/cloud/app/components/ui/radio-group/CloudRadioGroup.vue
new file mode 100644
index 00000000..366daca3
--- /dev/null
+++ b/apps/cloud/app/components/ui/radio-group/CloudRadioGroup.vue
@@ -0,0 +1,23 @@
+<script setup lang="ts">
+import { RadioGroupRoot, RadioGroupItem } from 'reka-ui'
+defineProps<{
+ options: { value: string; label: string; disabled?: boolean }[]
+ label: string
+}>()
+const model = defineModel<string>()
+</script>
+<template>
+ <RadioGroupRoot
+ v-model="model"
+ class="cf-segmented-control"
+ :aria-label="label"
+ ><RadioGroupItem
+ v-for="option in options"
+ :key="option.value"
+ :value="option.value"
+ :disabled="option.disabled"
+ class="cf-segmented-item"
+ >{{ option.label }}</RadioGroupItem
+ ></RadioGroupRoot
+ >
+</template>
diff --git a/apps/cloud/app/components/ui/radio-group/index.ts b/apps/cloud/app/components/ui/radio-group/index.ts
new file mode 100644
index 00000000..453cc23c
--- /dev/null
+++ b/apps/cloud/app/components/ui/radio-group/index.ts
@@ -0,0 +1 @@
+export { default as CloudRadioGroup } from './CloudRadioGroup.vue'
diff --git a/apps/cloud/app/components/ui/select/CloudSelect.vue b/apps/cloud/app/components/ui/select/CloudSelect.vue
new file mode 100644
index 00000000..b14dc7a6
--- /dev/null
+++ b/apps/cloud/app/components/ui/select/CloudSelect.vue
@@ -0,0 +1,19 @@
+<script setup lang="ts">
+const props = defineProps<{ value?: string | number | boolean | null }>()
+const model = defineModel<string | number | boolean | null>()
+// Preserve native controlled-value forms as well as v-model consumers.
+const selected = computed({
+ get: () => (props.value !== undefined ? props.value : model.value),
+ set: (value) => {
+ if (props.value === undefined) model.value = value
+ },
+})
+</script>
+<template>
+ <select
+ v-model="selected"
+ class="cf-input cf-select"
+ >
+ <slot />
+ </select>
+</template>
diff --git a/apps/cloud/app/components/ui/select/index.ts b/apps/cloud/app/components/ui/select/index.ts
new file mode 100644
index 00000000..068d7999
--- /dev/null
+++ b/apps/cloud/app/components/ui/select/index.ts
@@ -0,0 +1 @@
+export { default as CloudSelect } from './CloudSelect.vue'
diff --git a/apps/cloud/app/components/ui/separator/CloudSeparator.vue b/apps/cloud/app/components/ui/separator/CloudSeparator.vue
new file mode 100644
index 00000000..6dbc4364
--- /dev/null
+++ b/apps/cloud/app/components/ui/separator/CloudSeparator.vue
@@ -0,0 +1,9 @@
+<script setup lang="ts">
+import { Separator } from 'reka-ui'
+</script>
+<template>
+ <Separator
+ decorative
+ class="cf-separator"
+ />
+</template>
diff --git a/apps/cloud/app/components/ui/separator/index.ts b/apps/cloud/app/components/ui/separator/index.ts
new file mode 100644
index 00000000..8091a830
--- /dev/null
+++ b/apps/cloud/app/components/ui/separator/index.ts
@@ -0,0 +1 @@
+export { default as CloudSeparator } from './CloudSeparator.vue'
diff --git a/apps/cloud/app/components/ui/skeleton/CloudSkeleton.vue b/apps/cloud/app/components/ui/skeleton/CloudSkeleton.vue
new file mode 100644
index 00000000..ac29ea93
--- /dev/null
+++ b/apps/cloud/app/components/ui/skeleton/CloudSkeleton.vue
@@ -0,0 +1,7 @@
+<template>
+ <span
+ aria-hidden="true"
+ class="cf-skeleton"
+ ><slot>&nbsp;</slot></span
+ >
+</template>
diff --git a/apps/cloud/app/components/ui/skeleton/index.ts b/apps/cloud/app/components/ui/skeleton/index.ts
new file mode 100644
index 00000000..0f6f20c0
--- /dev/null
+++ b/apps/cloud/app/components/ui/skeleton/index.ts
@@ -0,0 +1 @@
+export { default as CloudSkeleton } from './CloudSkeleton.vue'
diff --git a/apps/cloud/app/components/ui/table/CloudTable.vue b/apps/cloud/app/components/ui/table/CloudTable.vue
new file mode 100644
index 00000000..23c21291
--- /dev/null
+++ b/apps/cloud/app/components/ui/table/CloudTable.vue
@@ -0,0 +1,5 @@
+<template>
+ <table class="cf-table">
+ <slot />
+ </table>
+</template>
diff --git a/apps/cloud/app/components/ui/table/index.ts b/apps/cloud/app/components/ui/table/index.ts
new file mode 100644
index 00000000..2eb12de5
--- /dev/null
+++ b/apps/cloud/app/components/ui/table/index.ts
@@ -0,0 +1 @@
+export { default as CloudTable } from './CloudTable.vue'
diff --git a/apps/cloud/app/composables/useCloudQuota.ts b/apps/cloud/app/composables/useCloudQuota.ts
new file mode 100644
index 00000000..159e8648
--- /dev/null
+++ b/apps/cloud/app/composables/useCloudQuota.ts
@@ -0,0 +1,26 @@
+import type { MaybeRefOrGetter } from 'vue'
+import { quotaGate, type QuotaResource } from '../utils/quota-gate'
+/** Presentation preflight only; each write still applies the server's atomic admission checks. */
+export function useCloudQuota(
+ workspaceId: MaybeRefOrGetter<number | undefined>,
+) {
+ const id = computed(() => Number(toValue(workspaceId)) || 0)
+ const request = useFetch<any>('/api/billing/plan', {
+ query: computed(() => ({ workspaceId: id.value })),
+ key: computed(() => `quota-${id.value}`),
+ immediate: !!id.value,
+ })
+ useIntervalFn(() => {
+ if (
+ id.value &&
+ document.visibilityState === 'visible' &&
+ request.status.value !== 'pending'
+ )
+ void request.refresh()
+ }, 15000)
+ return {
+ ...request,
+ gate: (resource: QuotaResource, mode: 'platform' | 'byos' = 'platform') =>
+ quotaGate(request.data.value, resource, mode),
+ }
+}
diff --git a/apps/cloud/app/middleware/platform.global.ts b/apps/cloud/app/middleware/platform.global.ts
index b43718c9..94ae47b5 100644
--- a/apps/cloud/app/middleware/platform.global.ts
+++ b/apps/cloud/app/middleware/platform.global.ts
@@ -10,20 +10,21 @@ export default defineNuxtRouteMiddleware(async (to) => {
() => null,
)
if (path === '/' && useCloudRequestURL().hostname === 'app.chronoframe.art')
- return navigateTo('/sites', { redirectCode: 302 })
+ return navigateTo('/workspace', { redirectCode: 302 })
if (path === '/dashboard' || path.startsWith('/dashboard/'))
- return navigateTo('/sites', { redirectCode: 302 })
+ return navigateTo('/workspace', { redirectCode: 302 })
if (['/signin', '/signup'].includes(path)) {
const session = await useRequestFetch()<{ authenticated: boolean }>(
'/api/auth/session',
).catch(() => null)
if (session?.authenticated)
- return navigateTo('/sites', { redirectCode: 302 })
+ return navigateTo('/workspace', { redirectCode: 302 })
}
if (
(path === '/pricing' &&
(useCloudRequestURL().hostname === 'app.chronoframe.art' ||
to.query.portal === '1')) ||
+ path === '/workspace' ||
path === '/account' ||
path.startsWith('/account/') ||
path === '/sites' ||
@@ -46,7 +47,7 @@ export default defineNuxtRouteMiddleware(async (to) => {
context.value = null
return navigateTo('/signin', { redirectCode: 302 })
}
- if (path === '/sites') {
+ if (path === '/sites' || path === '/workspace') {
const result = await fetcher<{ sites: EntrySiteSummary[] }>('/api/sites')
catalog.value = { userId: session.user.id, sites: result.sites }
}
diff --git a/apps/cloud/app/pages/account/plan.vue b/apps/cloud/app/pages/account/plan.vue
index ba059d11..032df1b7 100644
--- a/apps/cloud/app/pages/account/plan.vue
+++ b/apps/cloud/app/pages/account/plan.vue
@@ -173,19 +173,11 @@ const date = (time: number) => new Date(time).toLocaleString(locale.value)
>/ {{ allowance(key, data.plan.limits[key], locale) }}</span
>
</p>
- <div
- class="cf-quota-track"
- role="progressbar"
+ <CloudProgress
+ :value="ratio(key)"
:aria-label="$t('cloud.billing.' + key)"
- :aria-valuemin="0"
- :aria-valuemax="100"
- :aria-valuenow="ratio(key)"
- >
- <span
- :style="{ width: ratio(key) + '%' }"
- :class="{ 'is-over': used(key)! > data.plan.limits[key] }"
- />
- </div>
+ :class="{ 'is-over': used(key)! > data.plan.limits[key] }"
+ />
<small
:class="{
'cf-error-message': used(key)! > data.plan.limits[key],
@@ -205,17 +197,22 @@ const date = (time: number) => new Date(time).toLocaleString(locale.value)
>
</article>
</div>
- <p class="cf-field-hint">{{ $t('cloud.billing.usageHelp') }}</p>
+ <div class="cf-plan-usage-notes">
+ <p class="cf-field-hint">{{ $t('cloud.billing.usageHelp') }}</p>
+ <p class="cf-field-hint">
+ {{ $t('cloud.billing.byos') }}:
+ {{
+ data.plan.limits.byos
+ ? $t('cloud.billing.yes')
+ : $t('cloud.billing.no')
+ }}
+ ·
+ {{
+ $t('cloud.billing.connectionCount', { count: data.usage.byos })
+ }}
+ </p>
+ </div>
</section>
- <p class="cf-field-hint">
- {{ $t('cloud.billing.byos') }}:
- {{
- data.plan.limits.byos
- ? $t('cloud.billing.yes')
- : $t('cloud.billing.no')
- }}
- · {{ $t('cloud.billing.connectionCount', { count: data.usage.byos }) }}
- </p>
<section
id="plans"
class="cf-plan-options"
diff --git a/apps/cloud/app/pages/signin.vue b/apps/cloud/app/pages/signin.vue
index 3163888f..692d1720 100644
--- a/apps/cloud/app/pages/signin.vue
+++ b/apps/cloud/app/pages/signin.vue
@@ -76,7 +76,7 @@ async function submit() {
return
}
}
- await navigateTo('/sites', { external: true })
+ await navigateTo('/workspace', { external: true })
} catch (cause) {
error.value = accountError(cause, t)
} finally {
@@ -93,7 +93,7 @@ async function passkeySignIn() {
try {
const result = await useCloudAccount().signIn.passkey()
if (result.error) throw result.error
- await navigateTo('/sites', { external: true })
+ await navigateTo('/workspace', { external: true })
} catch (cause) {
error.value = accountError(cause, t)
} finally {
@@ -187,7 +187,7 @@ async function resend() {
><label for="factor">{{
$t('cloud.messages.verificationMethod')
}}</label
- ><select
+ ><CloudSelect
id="factor"
v-model="factor"
:disabled="busy"
@@ -205,7 +205,7 @@ async function resend() {
<option value="recovery">
{{ $t('cloud.messages.recoveryCode') }}
</option>
- </select></template
+ </CloudSelect></template
>
<template v-if="step !== 'credentials'"
><label for="code">{{
diff --git a/apps/cloud/app/pages/signup.vue b/apps/cloud/app/pages/signup.vue
index b4945133..312baa6e 100644
--- a/apps/cloud/app/pages/signup.vue
+++ b/apps/cloud/app/pages/signup.vue
@@ -34,7 +34,7 @@ async function submit() {
method: 'POST',
body: { email: email.value, otp: code.value },
})
- await navigateTo('/sites', { external: true })
+ await navigateTo('/workspace', { external: true })
}
} catch (cause) {
error.value = accountError(cause, t)
diff --git a/apps/cloud/app/pages/sites/[siteId]/domains.vue b/apps/cloud/app/pages/sites/[siteId]/domains.vue
index 46feb514..f08420cd 100644
--- a/apps/cloud/app/pages/sites/[siteId]/domains.vue
+++ b/apps/cloud/app/pages/sites/[siteId]/domains.vue
@@ -12,6 +12,8 @@ useSeoMeta({
})
const site = useEntryContext().value!,
base = `/api/sites/${site.siteId}`
+const quota = useCloudQuota(site.workspaceId)
+const admission = computed(() => quota.gate('customDomains'))
const {
data: result,
error,
@@ -76,7 +78,9 @@ function beginRename() {
failure.value = false
renameOpen.value = true
}
-function beginAdd() {
+async function beginAdd() {
+ await quota.refresh()
+ if (!admission.value.allowed || quota.error.value) return
notice.value = ''
failure.value = false
addOpen.value = true
@@ -87,7 +91,7 @@ function beginRemove(domain: CustomDomain) {
removal.value = domain
}
async function refreshAll() {
- await Promise.all([refresh(), refreshSettings()])
+ await Promise.all([refresh(), refreshSettings(), quota.refresh()])
}
async function run(body: Record<string, unknown>) {
if (busy.value || !data.value?.admin) return
@@ -100,7 +104,7 @@ async function run(body: Record<string, unknown>) {
{ method: 'POST', body },
)
if (!mounted) return false
- await Promise.all([refresh(), refreshSettings()])
+ await Promise.all([refresh(), refreshSettings(), quota.refresh()])
notice.value = t('cloud.domains.saved')
if (body.action === 'add') {
expandedHost.value = response.domain?.hostname ?? String(body.hostname)
@@ -285,19 +289,21 @@ async function copy(value: string) {
<CloudButton
v-if="data.admin"
size="sm"
- :disabled="busy || !data.enabled || !data.customDomainLimit"
+ :disabled="
+ busy || !data.enabled || !admission.allowed || !!quota.error.value
+ "
@click="beginAdd"
><Plus :size="14" />{{ t('cloud.domains.add') }}</CloudButton
>
</div>
+ <CloudQuotaNotice
+ v-if="data.admin && (admission.reason || quota.error.value)"
+ :reason="admission.reason"
+ :error="!!quota.error.value"
+ @retry="quota.refresh()"
+ />
<p
- v-if="!data.customDomainLimit"
- class="cf-notice"
- >
- {{ t('cloud.storageAllowance.noCustomDomains') }}
- </p>
- <p
- v-else-if="!data.enabled"
+ v-if="!data.enabled"
class="cf-notice"
>
{{ t('cloud.domains.disabled') }}
@@ -394,7 +400,12 @@ async function copy(value: string) {
>{{ t('cloud.messages.cancel') }}</CloudButton
><CloudButton
type="submit"
- :disabled="busy || !hostname.trim()"
+ :disabled="
+ busy ||
+ !hostname.trim() ||
+ !admission.allowed ||
+ !!quota.error.value
+ "
:loading="busy"
>{{ t('cloud.domainFlow.continue') }}</CloudButton
>
diff --git a/apps/cloud/app/pages/sites/[siteId]/overview.vue b/apps/cloud/app/pages/sites/[siteId]/overview.vue
index 6766a395..ad729b5c 100644
--- a/apps/cloud/app/pages/sites/[siteId]/overview.vue
+++ b/apps/cloud/app/pages/sites/[siteId]/overview.vue
@@ -1,63 +1,192 @@
<script setup lang="ts">
-const { t } = useI18n()
-
+import {
+ CheckCircle2,
+ Images,
+ ArrowUpRight,
+ LibraryBig,
+ Globe,
+ HardDrive,
+ Settings2,
+ CircleAlert,
+} from 'lucide-vue-next'
definePageMeta({ layout: 'portal' })
+const { t } = useI18n()
useSeoMeta({
- title: t('cloud.messages.overviewChronoframeCloud'),
+ title: () => t('cloud.messages.overviewChronoframeCloud'),
robots: 'noindex',
})
-const site = useEntryContext().value!
-const { photos, albums, jobs, loading, ready } = useCloudSiteMedia()
-const processingCount = computed(
+const activeContext = useEntryContext(),
+ site = shallowRef(activeContext.value!)
+watch(activeContext, (next) => {
+ if (next?.scope === site.value.scope) site.value = next
+})
+const { photos, albums, jobs, loading, ready, connections, connectionId } =
+ useCloudSiteMedia()
+const processing = computed(
() =>
- jobs.value.filter((job: { state: string }) =>
+ jobs.value.filter((job) =>
['queued', 'running', 'retry_wait'].includes(job.state),
).length,
)
+const failed = computed(
+ () => jobs.value.filter((job) => job.state === 'failed').length,
+)
+const connection = computed(() =>
+ connections.value.find((item) => item.id === connectionId.value),
+)
+const actions = computed(() => [
+ {
+ path: 'photos',
+ icon: Images,
+ title: t('cloud.messages.photoLibrary'),
+ help: t('cloud.dashboard.libraryHelp'),
+ },
+ {
+ path: 'albums',
+ icon: LibraryBig,
+ title: t('cloud.messages.albums'),
+ help: t('cloud.dashboard.albumHelp'),
+ },
+ {
+ path: 'information',
+ icon: Settings2,
+ title: t('cloud.messages.siteInformation'),
+ help: t('cloud.dashboard.informationHelp'),
+ },
+ {
+ path: 'domains',
+ icon: Globe,
+ title: t('cloud.messages.domains'),
+ help: t('cloud.dashboard.domainsHelp'),
+ },
+ {
+ path: 'storage',
+ icon: HardDrive,
+ title: t('cloud.messages.storage'),
+ help: t('cloud.dashboard.storageHelp'),
+ },
+])
</script>
<template>
- <div>
+ <div class="cf-dashboard grid gap-6">
<CloudSitePublication />
- <div
- class="cf-overview-stats"
+ <section
+ class="cf-dashboard-metrics"
:aria-busy="loading"
+ :aria-label="$t('cloud.dashboard.contentOverview')"
>
- <CloudCard
- ><div class="cf-panel-body">
- <span class="cf-field-label">{{
- $t('cloud.messages.photographs')
- }}</span
- ><strong>{{ ready ? photos.length : '—' }}</strong
- ><NuxtLink
- :to="`/sites/${site.siteId}/photos`"
- class="cf-text-link"
- >{{ $t('cloud.messages.openPhotoLibrary') }}</NuxtLink
- >
- </div></CloudCard
- ><CloudCard
- ><div class="cf-panel-body">
- <span class="cf-field-label">{{ $t('cloud.messages.albums') }}</span
- ><strong>{{ ready ? albums.length : '—' }}</strong
- ><NuxtLink
- :to="`/sites/${site.siteId}/albums`"
- class="cf-text-link"
- >{{ $t('cloud.messages.manageAlbums') }}</NuxtLink
- >
- </div></CloudCard
- ><CloudCard
- ><div class="cf-panel-body">
- <span class="cf-field-label">{{
- $t('cloud.messages.processing')
- }}</span
- ><strong>{{ ready ? processingCount : '—' }}</strong>
- <p class="cf-field-hint">
- {{
- $t(
- 'cloud.messages.uploadAndProcessingDetailsAreInYourPhotoLibrary',
- )
- }}
- </p>
- </div></CloudCard
+ <CloudStatCard
+ :label="$t('cloud.messages.photographs')"
+ :value="photos.length"
+ :loading="!ready"
+ ><NuxtLink
+ :to="`/sites/${site.siteId}/photos`"
+ class="cf-text-link"
+ >{{ $t('cloud.messages.openPhotoLibrary')
+ }}<ArrowUpRight :size="12" /></NuxtLink
+ ></CloudStatCard>
+ <CloudStatCard
+ :label="$t('cloud.messages.albums')"
+ :value="albums.length"
+ :loading="!ready"
+ ><NuxtLink
+ :to="`/sites/${site.siteId}/albums`"
+ class="cf-text-link"
+ >{{ $t('cloud.messages.manageAlbums')
+ }}<ArrowUpRight :size="12" /></NuxtLink
+ ></CloudStatCard>
+ <CloudStatCard
+ :label="$t('cloud.messages.processing')"
+ :value="processing"
+ :loading="!ready"
+ :detail="
+ failed
+ ? $t('cloud.dashboard.failedJobs', { count: failed })
+ : $t('cloud.dashboard.processingHelp')
+ "
+ />
+ </section>
+ <div class="cf-dashboard-columns">
+ <CloudCard class="cf-dashboard-panel"
+ ><div class="cf-dashboard-section-heading">
+ <h2>{{ $t('cloud.dashboard.manageGallery') }}</h2>
+ <span class="cf-field-hint">{{ site.name }}</span>
+ </div>
+ <div class="grid gap-5">
+ <NuxtLink
+ v-for="action in actions"
+ :key="action.path"
+ :to="`/sites/${site.siteId}/${action.path}`"
+ class="cf-dashboard-tool"
+ ><component
+ :is="action.icon"
+ :size="18" /><span class="min-w-0 flex-1"
+ ><strong>{{ action.title }}</strong
+ ><small>{{ action.help }}</small></span
+ ><ArrowUpRight :size="15"
+ /></NuxtLink></div
+ ></CloudCard>
+ <CloudCard class="cf-dashboard-panel"
+ ><h2>{{ $t('cloud.dashboard.siteHealth') }}</h2>
+ <CloudSkeleton
+ v-if="!ready"
+ class="h-32 w-full"
+ />
+ <ul
+ v-else
+ class="cf-site-health-list"
+ >
+ <li>
+ <component
+ :is="failed ? CircleAlert : CheckCircle2"
+ :size="17"
+ />
+ <div>
+ <strong>{{
+ $t(
+ failed
+ ? 'cloud.dashboard.needsAttention'
+ : 'cloud.dashboard.processingHealthy',
+ )
+ }}</strong>
+ <p>
+ {{
+ failed
+ ? $t('cloud.dashboard.failedJobs', { count: failed })
+ : $t('cloud.dashboard.processingHelp')
+ }}
+ </p>
+ </div>
+ </li>
+ <li>
+ <HardDrive :size="17" />
+ <div>
+ <strong>{{
+ $t(
+ connection?.pool_id
+ ? 'cloud.messages.platformStorage'
+ : connection
+ ? 'cloud.billing.byos'
+ : 'cloud.dashboard.storagePending',
+ )
+ }}</strong>
+ <p>{{ $t('cloud.dashboard.storageHelp') }}</p>
+ </div>
+ </li>
+ <li>
+ <Globe :size="17" />
+ <div>
+ <strong>{{
+ $t(
+ site.published
+ ? 'cloud.messages.publishedGallery'
+ : 'cloud.messages.privateDraft',
+ )
+ }}</strong>
+ <p>{{ $t('cloud.dashboard.publicationHelp') }}</p>
+ </div>
+ </li>
+ </ul></CloudCard
>
</div>
</div>
diff --git a/apps/cloud/app/pages/sites/index.vue b/apps/cloud/app/pages/sites/index.vue
index ac19b851..f84a20e3 100644
--- a/apps/cloud/app/pages/sites/index.vue
+++ b/apps/cloud/app/pages/sites/index.vue
@@ -4,15 +4,18 @@ const { t } = useI18n()
import { ArrowUpRight, Images, ShieldCheck } from 'lucide-vue-next'
const siteLink = resolveComponent('NuxtLink')
definePageMeta({ layout: 'portal' })
-const workspace = ref<{ name: string } | null>(null)
+const workspace = ref<{ id: number; name: string } | null>(null)
const workspaceError = ref(false)
async function prepareWorkspace() {
workspaceError.value = false
try {
workspace.value = (
- await $fetch<{ workspace: { name: string } }>('/api/workspaces/default', {
- method: 'POST',
- })
+ await $fetch<{ workspace: { id: number; name: string } }>(
+ '/api/workspaces/default',
+ {
+ method: 'POST',
+ },
+ )
).workspace
} catch {
workspaceError.value = true
@@ -63,6 +66,7 @@ const sites = ref(
<CloudSiteCreate
v-if="workspace"
:workspace-name="workspace.name"
+ :workspace-id="workspace.id"
/>
<div
v-if="sites.length"
diff --git a/apps/cloud/app/pages/workspace.vue b/apps/cloud/app/pages/workspace.vue
new file mode 100644
index 00000000..cbb91d62
--- /dev/null
+++ b/apps/cloud/app/pages/workspace.vue
@@ -0,0 +1,178 @@
+<script setup lang="ts">
+import { ArrowUpRight, Images, SlidersHorizontal } from 'lucide-vue-next'
+import type { EntrySiteCatalog } from '@chronoframe/contracts/entry'
+import { allowance } from '../utils/billing-format'
+definePageMeta({ layout: 'portal' })
+const { t, locale } = useI18n(),
+ billing = useWorkspaceBilling()
+await billing.ready
+useIntervalFn(() => {
+ if (
+ document.visibilityState === 'visible' &&
+ billing.status.value !== 'pending'
+ )
+ void billing.refresh()
+}, 15000)
+const catalog = useState<EntrySiteCatalog | null>(
+ 'platform-site-catalog',
+ () => null,
+)
+const sites = computed(
+ () =>
+ catalog.value?.sites.filter(
+ (site) => site.workspaceId === billing.selected.value,
+ ) ?? [],
+)
+const active = computed(
+ () => sites.value.filter((site) => site.published && !site.suspended).length,
+)
+const data = billing.data
+const meters = ['storageBytes', 'photos', 'sites'] as const
+const progress = (key: string) =>
+ Math.min(
+ 100,
+ (Number(data.value?.usage[key] ?? 0) /
+ Math.max(1, Number(data.value?.plan.limits[key] ?? 0))) *
+ 100,
+ )
+useSeoMeta({
+ title: () => t('cloud.dashboard.workspaceOverview') + ' — ChronoFrame Cloud',
+ robots: 'noindex',
+})
+</script>
+<template>
+ <div class="cf-dashboard grid gap-6">
+ <CloudPageHeader
+ :title="$t('cloud.dashboard.workspaceOverview')"
+ :description="$t('cloud.dashboard.workspaceHelp')"
+ ><CloudBadge v-if="data">{{ data.plan.name }}</CloudBadge
+ ><CloudButton
+ as-child
+ variant="secondary"
+ size="sm"
+ ><NuxtLink to="/account/plan"
+ >{{ $t('cloud.dashboard.planUsage')
+ }}<ArrowUpRight :size="14" /></NuxtLink></CloudButton
+ ></CloudPageHeader>
+ <CloudAlert
+ v-if="billing.error.value"
+ tone="error"
+ >{{ $t('cloud.dashboard.quotaUnavailable')
+ }}<CloudButton
+ size="sm"
+ variant="secondary"
+ @click="billing.refresh()"
+ >{{ $t('cloud.messages.retry') }}</CloudButton
+ ></CloudAlert
+ >
+ <section
+ class="cf-dashboard-metrics"
+ :aria-label="$t('cloud.dashboard.resources')"
+ >
+ <CloudStatCard
+ v-for="key in meters"
+ :key="key"
+ :label="$t('cloud.billing.' + key)"
+ :loading="!data"
+ :value="data ? allowance(key, data.usage[key], locale) : undefined"
+ :detail="
+ data
+ ? $t('cloud.dashboard.ofLimit', {
+ limit: allowance(key, data.plan.limits[key], locale),
+ })
+ : undefined
+ "
+ :progress="data ? progress(key) : undefined"
+ />
+ </section>
+ <div class="cf-dashboard-columns">
+ <CloudCard class="cf-dashboard-panel">
+ <div class="cf-dashboard-section-heading">
+ <div>
+ <h2>{{ $t('cloud.dashboard.galleries') }}</h2>
+ <p class="cf-field-hint">
+ {{ $t('cloud.dashboard.liveGalleries', { count: active }) }}
+ </p>
+ </div>
+ <CloudButton
+ as-child
+ variant="ghost"
+ size="sm"
+ ><NuxtLink to="/sites"
+ >{{ $t('cloud.messages.allSites')
+ }}<ArrowUpRight :size="14" /></NuxtLink
+ ></CloudButton>
+ </div>
+ <ul
+ v-if="sites.length"
+ class="cf-dashboard-site-list"
+ >
+ <li
+ v-for="site in sites.slice(0, 5)"
+ :key="site.siteId"
+ >
+ <component
+ :is="site.suspended ? 'div' : resolveComponent('NuxtLink')"
+ :to="
+ site.suspended ? undefined : `/sites/${site.siteId}/overview`
+ "
+ :aria-disabled="site.suspended || undefined"
+ class="cf-dashboard-site"
+ ><span class="cf-site-icon"><Images :size="18" /></span
+ ><span class="min-w-0 flex-1"
+ ><strong>{{ site.name }}</strong
+ ><small>{{
+ site.suspended
+ ? $t('cloud.enforcement.siteSuspended')
+ : site.published
+ ? $t('cloud.messages.publishedGallery')
+ : $t('cloud.messages.privateDraft')
+ }}</small></span
+ ><ArrowUpRight
+ v-if="!site.suspended"
+ :size="15"
+ /></component>
+ </li>
+ </ul>
+ <div
+ v-else-if="data"
+ class="cf-dashboard-empty"
+ >
+ <Images :size="26" />
+ <h3>{{ $t('cloud.messages.noSitesYet') }}</h3>
+ <p>{{ $t('cloud.dashboard.emptyHelp') }}</p>
+ </div>
+ <CloudSkeleton
+ v-else
+ class="h-28 w-full"
+ />
+ <CloudSiteCreate
+ v-if="data && billing.workspaces.value[0]?.owned"
+ :workspace-id="data.workspace.id"
+ :workspace-name="data.workspace.name"
+ />
+ </CloudCard>
+ <CloudCard class="cf-dashboard-panel"
+ ><div class="cf-dashboard-section-heading">
+ <h2>{{ $t('cloud.dashboard.workspaceTools') }}</h2>
+ <SlidersHorizontal :size="17" />
+ </div>
+ <p class="cf-field-hint">{{ $t('cloud.dashboard.toolsHelp') }}</p>
+ <NuxtLink
+ to="/account/plan"
+ class="cf-dashboard-tool"
+ ><span
+ ><strong>{{ $t('cloud.dashboard.planUsage') }}</strong
+ ><small>{{ $t('cloud.dashboard.planHelp') }}</small></span
+ ><ArrowUpRight :size="15" /></NuxtLink
+ ><CloudSeparator /><NuxtLink
+ to="/account"
+ class="cf-dashboard-tool"
+ ><span
+ ><strong>{{ $t('cloud.dashboard.accountSecurity') }}</strong
+ ><small>{{ $t('cloud.dashboard.accountHelp') }}</small></span
+ ><ArrowUpRight :size="15" /></NuxtLink
+ ></CloudCard>
+ </div>
+ </div>
+</template>
diff --git a/apps/cloud/app/utils/quota-gate.ts b/apps/cloud/app/utils/quota-gate.ts
new file mode 100644
index 00000000..740cd9c6
--- /dev/null
+++ b/apps/cloud/app/utils/quota-gate.ts
@@ -0,0 +1,33 @@
+export type QuotaResource =
+ | 'fileBytes'
+ | 'sites'
+ | 'customDomains'
+ | 'photos'
+ | 'storageBytes'
+ | 'monthlyBytes'
+ | 'byos'
+export function quotaGate(
+ data: any,
+ resource: QuotaResource,
+ mode: 'platform' | 'byos' = 'platform',
+) {
+ if (!data) return { allowed: false, reason: 'checking', used: 0, limit: 0 }
+ if (data.workspace?.role !== 'admin')
+ return { allowed: false, reason: 'permission', used: 0, limit: 0 }
+ if (!data.plan || !data.usage)
+ return { allowed: false, reason: 'checking', used: 0, limit: 0 }
+ const limits =
+ mode === 'byos' || resource === 'byos'
+ ? data.plan.byosLimits
+ : data.plan.limits
+ const limit = Number(limits?.[resource] ?? 0),
+ used = Number(data.usage?.[resource] ?? 0)
+ if (resource === 'byos')
+ return { allowed: !!limit, reason: limit ? '' : 'upgrade', used, limit }
+ return {
+ allowed: limit > used,
+ reason: limit > used ? '' : 'upgrade',
+ used,
+ limit,
+ }
+}
diff --git a/apps/cloud/i18n/locales/en.json b/apps/cloud/i18n/locales/en.json
index 1dfff5b0..4d80b7db 100644
--- a/apps/cloud/i18n/locales/en.json
+++ b/apps/cloud/i18n/locales/en.json
@@ -713,6 +713,42 @@
"return_failed": "We could not verify this checkout. Check your account or try again.",
"return_expired": "This checkout has expired. You can start a new one from the plans below.",
"checkAgain": "Check payment status"
+ },
+ "dashboard": {
+ "workspaceOverview": "Workspace overview",
+ "workspaceHelp": "Your galleries, resources and next steps in one place.",
+ "resources": "Workspace resources",
+ "ofLimit": "of {limit} total",
+ "galleries": "Your galleries",
+ "liveGalleries": "{count} published and available",
+ "emptyHelp": "Create your first gallery. You can publish before uploading photographs.",
+ "workspaceTools": "Workspace settings",
+ "toolsHelp": "Keep your subscription and account in order.",
+ "planUsage": "Plan & usage",
+ "planHelp": "Live allowances, subscriptions and billing.",
+ "accountSecurity": "Account & security",
+ "accountHelp": "Your profile, sign-in methods and protection.",
+ "quotaUnavailable": "We could not check your allowance. Try again before continuing.",
+ "quota_checking": "Checking available allowance…",
+ "quota_permission": "A workspace administrator can manage this resource.",
+ "quota_upgrade": "Your current plan has no available allowance for this action.",
+ "quotaHelp": "Review your usage, free up resources, or choose a plan with more room.",
+ "viewPlans": "View plans & usage",
+ "libraryHelp": "Upload, organize and edit your photographs.",
+ "albumHelp": "Build collections and control their visibility.",
+ "informationHelp": "Set your gallery name, identity and presentation.",
+ "domainsHelp": "Manage your default address and custom domains.",
+ "storageHelp": "Review where your photographs are stored.",
+ "contentOverview": "Content overview",
+ "failedJobs": "{count} processing tasks need attention.",
+ "processingHelp": "Uploads and processing details are in the photo library.",
+ "manageGallery": "Manage your gallery",
+ "siteHealth": "Site status",
+ "needsAttention": "Processing needs attention",
+ "processingHealthy": "Media processing is up to date",
+ "storagePending": "Storage not connected",
+ "publicationHelp": "Publishing does not require photographs or a storage connection.",
+ "actions": "Actions"
}
}
}
diff --git a/apps/cloud/i18n/locales/zh-Hans.json b/apps/cloud/i18n/locales/zh-Hans.json
index 3a144584..ae73b074 100644
--- a/apps/cloud/i18n/locales/zh-Hans.json
+++ b/apps/cloud/i18n/locales/zh-Hans.json
@@ -713,6 +713,42 @@
"return_failed": "无法核验这笔付款,请检查登录账号或重试。",
"return_expired": "这笔付款已过期,可以在下方选择套餐重新发起。",
"checkAgain": "检查付款状态"
+ },
+ "dashboard": {
+ "workspaceOverview": "工作区概览",
+ "workspaceHelp": "在这里查看站点、资源用量与下一步操作。",
+ "resources": "工作区资源",
+ "ofLimit": "总额度 {limit}",
+ "galleries": "你的站点",
+ "liveGalleries": "{count} 个站点已发布并可访问",
+ "emptyHelp": "创建第一个站点,无需先上传照片即可发布。",
+ "workspaceTools": "工作区管理",
+ "toolsHelp": "管理订阅、额度及账户安全。",
+ "planUsage": "套餐与用量",
+ "planHelp": "查看实时额度、订阅和账单。",
+ "accountSecurity": "账户与安全",
+ "accountHelp": "管理个人资料、登录方式和安全设置。",
+ "quotaUnavailable": "暂时无法确认可用额度,请重试后继续。",
+ "quota_checking": "正在确认可用额度…",
+ "quota_permission": "此操作需要工作区管理员权限。",
+ "quota_upgrade": "当前套餐没有此操作所需的可用额度。",
+ "quotaHelp": "查看用量、释放已有资源,或选择提供更多额度的套餐。",
+ "viewPlans": "查看套餐与用量",
+ "libraryHelp": "上传、整理和编辑照片。",
+ "albumHelp": "创建相簿并管理可见性。",
+ "informationHelp": "设置站点名称、标识和展示风格。",
+ "domainsHelp": "管理默认地址与自定义域名。",
+ "storageHelp": "查看并管理照片的存储位置。",
+ "contentOverview": "内容概览",
+ "failedJobs": "{count} 个处理任务需要关注。",
+ "processingHelp": "上传和处理详情可在照片库中查看。",
+ "manageGallery": "管理站点",
+ "siteHealth": "站点状态",
+ "needsAttention": "部分处理任务需要关注",
+ "processingHealthy": "媒体处理状态正常",
+ "storagePending": "尚未连接存储",
+ "publicationHelp": "无需先上传照片或配置存储,即可发布站点。",
+ "actions": "操作"
}
}
}
diff --git a/apps/cloud/nuxt.config.ts b/apps/cloud/nuxt.config.ts
index f7a3c8e4..4fd97250 100644
--- a/apps/cloud/nuxt.config.ts
+++ b/apps/cloud/nuxt.config.ts
@@ -68,7 +68,7 @@ export default defineNuxtConfig({
workerSecret: '',
},
},
- css: ['~/assets/cloud.css'],
+ css: ['~/assets/console-tailwind.css', '~/assets/cloud.css'],
hooks: {
'pages:extend'(pages) {
// The portal shares console capabilities, not the public gallery route tree.
diff --git a/tests/console-quota.test.ts b/tests/console-quota.test.ts
new file mode 100644
index 00000000..6b26466f
--- /dev/null
+++ b/tests/console-quota.test.ts
@@ -0,0 +1,53 @@
+import assert from 'node:assert/strict'
+import test from 'node:test'
+import { quotaGate } from '../apps/cloud/app/utils/quota-gate.ts'
+
+test('Quota preflight blocks unknown or read-only contexts before opening a form', () => {
+ assert.equal(quotaGate(null, 'sites').reason, 'checking')
+ assert.equal(
+ quotaGate({ workspace: { role: 'member' } }, 'sites').reason,
+ 'permission',
+ )
+})
+test('Quota preflight uses complete workspace usage and treats the exact limit as exhausted', () => {
+ const data = {
+ workspace: { role: 'admin' },
+ plan: {
+ limits: {
+ sites: 1,
+ customDomains: 2,
+ photos: 10,
+ storageBytes: 100,
+ monthlyBytes: 200,
+ fileBytes: 20,
+ },
+ byosLimits: { byos: 0, photos: 3, monthlyBytes: 50 },
+ },
+ usage: {
+ sites: 1,
+ customDomains: 1,
+ photos: 3,
+ storageBytes: 100,
+ monthlyBytes: 20,
+ },
+ }
+ assert.equal(quotaGate(data, 'sites').allowed, false)
+ assert.equal(quotaGate(data, 'customDomains').allowed, true)
+ assert.equal(quotaGate(data, 'storageBytes').allowed, false)
+ assert.equal(quotaGate(data, 'photos').allowed, true)
+ assert.equal(quotaGate(data, 'photos', 'byos').allowed, false)
+ assert.equal(quotaGate(data, 'byos').allowed, false)
+ assert.equal(quotaGate(data, 'monthlyBytes', 'byos').allowed, true)
+ data.usage.customDomains = 2
+ assert.equal(quotaGate(data, 'customDomains').reason, 'upgrade')
+})
+test('Quota preflight denies missing and zero limits without inventing unlimited allowance', () => {
+ const data = {
+ workspace: { role: 'admin' },
+ plan: { limits: {}, byosLimits: { byos: 1 } },
+ usage: {},
+ }
+ assert.equal(quotaGate(data, 'sites').allowed, false)
+ assert.equal(quotaGate(data, 'fileBytes').allowed, false)
+ assert.equal(quotaGate(data, 'byos').allowed, true)
+})