From f2871b98db75c1abc5f3cb36b603f36c5616fa25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Kr=C3=BCger?= Date: Sat, 7 Mar 2026 10:49:35 +0100 Subject: [PATCH] style: apply prettier formatting across frontend components and pages Co-Authored-By: Claude Sonnet 4.6 --- .../src/lib/components/header/header.svelte | 1 - .../src/lib/components/ui/badge/badge.svelte | 75 ++++--- .../ui/calendar/calendar-caption.svelte | 118 +++++----- .../ui/calendar/calendar-cell.svelte | 26 +-- .../ui/calendar/calendar-day.svelte | 58 ++--- .../ui/calendar/calendar-grid-body.svelte | 14 +- .../ui/calendar/calendar-grid-head.svelte | 14 +- .../ui/calendar/calendar-grid-row.svelte | 14 +- .../ui/calendar/calendar-grid.svelte | 20 +- .../ui/calendar/calendar-head-cell.svelte | 26 +-- .../ui/calendar/calendar-header.svelte | 26 +-- .../ui/calendar/calendar-heading.svelte | 20 +- .../ui/calendar/calendar-month-select.svelte | 82 +++---- .../ui/calendar/calendar-month.svelte | 18 +- .../ui/calendar/calendar-months.svelte | 24 +- .../ui/calendar/calendar-nav.svelte | 24 +- .../ui/calendar/calendar-next-button.svelte | 44 ++-- .../ui/calendar/calendar-prev-button.svelte | 44 ++-- .../ui/calendar/calendar-year-select.svelte | 80 +++---- .../components/ui/calendar/calendar.svelte | 206 +++++++++--------- .../src/lib/components/ui/calendar/index.ts | 38 ++-- .../src/lib/components/ui/popover/index.ts | 22 +- .../ui/popover/popover-close.svelte | 4 +- .../ui/popover/popover-content.svelte | 50 ++--- .../ui/popover/popover-portal.svelte | 4 +- .../ui/popover/popover-trigger.svelte | 22 +- .../lib/components/ui/popover/popover.svelte | 4 +- .../frontend/src/routes/admin/+layout.svelte | 6 +- .../admin/articles/[id]/+page.server.ts | 5 +- .../routes/admin/articles/[id]/+page.svelte | 30 ++- .../routes/admin/articles/new/+page.svelte | 41 +++- .../src/routes/admin/users/+page.svelte | 56 +++-- .../src/routes/admin/users/[id]/+page.svelte | 22 +- .../src/routes/admin/videos/[id]/+page.svelte | 37 +++- .../src/routes/admin/videos/new/+page.svelte | 20 +- 35 files changed, 706 insertions(+), 589 deletions(-) diff --git a/packages/frontend/src/lib/components/header/header.svelte b/packages/frontend/src/lib/components/header/header.svelte index 0c3e0ce..b6d1ed0 100644 --- a/packages/frontend/src/lib/components/header/header.svelte +++ b/packages/frontend/src/lib/components/header/header.svelte @@ -320,6 +320,5 @@ {/if} - diff --git a/packages/frontend/src/lib/components/ui/badge/badge.svelte b/packages/frontend/src/lib/components/ui/badge/badge.svelte index e3164ba..80c63d6 100644 --- a/packages/frontend/src/lib/components/ui/badge/badge.svelte +++ b/packages/frontend/src/lib/components/ui/badge/badge.svelte @@ -1,50 +1,49 @@ - {@render children?.()} + {@render children?.()} diff --git a/packages/frontend/src/lib/components/ui/calendar/calendar-caption.svelte b/packages/frontend/src/lib/components/ui/calendar/calendar-caption.svelte index 5c93037..c541f3d 100644 --- a/packages/frontend/src/lib/components/ui/calendar/calendar-caption.svelte +++ b/packages/frontend/src/lib/components/ui/calendar/calendar-caption.svelte @@ -1,76 +1,76 @@ {#snippet MonthSelect()} - { - if (!placeholder) return; - const v = Number.parseInt(e.currentTarget.value); - const newPlaceholder = placeholder.set({ month: v }); - placeholder = newPlaceholder.subtract({ months: monthIndex }); - }} - /> + { + if (!placeholder) return; + const v = Number.parseInt(e.currentTarget.value); + const newPlaceholder = placeholder.set({ month: v }); + placeholder = newPlaceholder.subtract({ months: monthIndex }); + }} + /> {/snippet} {#snippet YearSelect()} - + {/snippet} {#if captionLayout === "dropdown"} - {@render MonthSelect()} - {@render YearSelect()} + {@render MonthSelect()} + {@render YearSelect()} {:else if captionLayout === "dropdown-months"} - {@render MonthSelect()} - {#if placeholder} - {formatYear(placeholder)} - {/if} + {@render MonthSelect()} + {#if placeholder} + {formatYear(placeholder)} + {/if} {:else if captionLayout === "dropdown-years"} - {#if placeholder} - {formatMonth(placeholder)} - {/if} - {@render YearSelect()} + {#if placeholder} + {formatMonth(placeholder)} + {/if} + {@render YearSelect()} {:else} - {formatMonth(month)} {formatYear(month)} + {formatMonth(month)} {formatYear(month)} {/if} diff --git a/packages/frontend/src/lib/components/ui/calendar/calendar-cell.svelte b/packages/frontend/src/lib/components/ui/calendar/calendar-cell.svelte index 4cdb548..7d872d6 100644 --- a/packages/frontend/src/lib/components/ui/calendar/calendar-cell.svelte +++ b/packages/frontend/src/lib/components/ui/calendar/calendar-cell.svelte @@ -1,19 +1,19 @@ diff --git a/packages/frontend/src/lib/components/ui/calendar/calendar-day.svelte b/packages/frontend/src/lib/components/ui/calendar/calendar-day.svelte index 19d7bde..e1c0dde 100644 --- a/packages/frontend/src/lib/components/ui/calendar/calendar-day.svelte +++ b/packages/frontend/src/lib/components/ui/calendar/calendar-day.svelte @@ -1,35 +1,35 @@ span]:text-xs [&>span]:opacity-70", - className - )} - {...restProps} + bind:ref + class={cn( + buttonVariants({ variant: "ghost" }), + "flex size-(--cell-size) flex-col items-center justify-center gap-1 p-0 leading-none font-normal whitespace-nowrap select-none", + "[&[data-today]:not([data-selected])]:bg-accent [&[data-today]:not([data-selected])]:text-accent-foreground [&[data-today][data-disabled]]:text-muted-foreground", + "data-[selected]:bg-primary dark:data-[selected]:hover:bg-accent/50 data-[selected]:text-primary-foreground", + // Outside months + "[&[data-outside-month]:not([data-selected])]:text-muted-foreground [&[data-outside-month]:not([data-selected])]:hover:text-accent-foreground", + // Disabled + "data-[disabled]:text-muted-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50", + // Unavailable + "data-[unavailable]:text-muted-foreground data-[unavailable]:line-through", + // hover + "dark:hover:text-accent-foreground", + // focus + "focus:border-ring focus:ring-ring/50 focus:relative", + // inner spans + "[&>span]:text-xs [&>span]:opacity-70", + className, + )} + {...restProps} /> diff --git a/packages/frontend/src/lib/components/ui/calendar/calendar-grid-body.svelte b/packages/frontend/src/lib/components/ui/calendar/calendar-grid-body.svelte index 8cd86de..ecbbbd7 100644 --- a/packages/frontend/src/lib/components/ui/calendar/calendar-grid-body.svelte +++ b/packages/frontend/src/lib/components/ui/calendar/calendar-grid-body.svelte @@ -1,12 +1,12 @@ diff --git a/packages/frontend/src/lib/components/ui/calendar/calendar-grid-head.svelte b/packages/frontend/src/lib/components/ui/calendar/calendar-grid-head.svelte index 333edc4..b195f74 100644 --- a/packages/frontend/src/lib/components/ui/calendar/calendar-grid-head.svelte +++ b/packages/frontend/src/lib/components/ui/calendar/calendar-grid-head.svelte @@ -1,12 +1,12 @@ diff --git a/packages/frontend/src/lib/components/ui/calendar/calendar-grid-row.svelte b/packages/frontend/src/lib/components/ui/calendar/calendar-grid-row.svelte index 9032236..ec9c978 100644 --- a/packages/frontend/src/lib/components/ui/calendar/calendar-grid-row.svelte +++ b/packages/frontend/src/lib/components/ui/calendar/calendar-grid-row.svelte @@ -1,12 +1,12 @@ diff --git a/packages/frontend/src/lib/components/ui/calendar/calendar-grid.svelte b/packages/frontend/src/lib/components/ui/calendar/calendar-grid.svelte index e0c8627..80a53e9 100644 --- a/packages/frontend/src/lib/components/ui/calendar/calendar-grid.svelte +++ b/packages/frontend/src/lib/components/ui/calendar/calendar-grid.svelte @@ -1,16 +1,16 @@ diff --git a/packages/frontend/src/lib/components/ui/calendar/calendar-head-cell.svelte b/packages/frontend/src/lib/components/ui/calendar/calendar-head-cell.svelte index 131807e..7919c72 100644 --- a/packages/frontend/src/lib/components/ui/calendar/calendar-head-cell.svelte +++ b/packages/frontend/src/lib/components/ui/calendar/calendar-head-cell.svelte @@ -1,19 +1,19 @@ diff --git a/packages/frontend/src/lib/components/ui/calendar/calendar-header.svelte b/packages/frontend/src/lib/components/ui/calendar/calendar-header.svelte index c39e955..bd4920d 100644 --- a/packages/frontend/src/lib/components/ui/calendar/calendar-header.svelte +++ b/packages/frontend/src/lib/components/ui/calendar/calendar-header.svelte @@ -1,19 +1,19 @@ diff --git a/packages/frontend/src/lib/components/ui/calendar/calendar-heading.svelte b/packages/frontend/src/lib/components/ui/calendar/calendar-heading.svelte index a9b9810..7d995e1 100644 --- a/packages/frontend/src/lib/components/ui/calendar/calendar-heading.svelte +++ b/packages/frontend/src/lib/components/ui/calendar/calendar-heading.svelte @@ -1,16 +1,16 @@ diff --git a/packages/frontend/src/lib/components/ui/calendar/calendar-month-select.svelte b/packages/frontend/src/lib/components/ui/calendar/calendar-month-select.svelte index 664afab..4a1aa8d 100644 --- a/packages/frontend/src/lib/components/ui/calendar/calendar-month-select.svelte +++ b/packages/frontend/src/lib/components/ui/calendar/calendar-month-select.svelte @@ -1,48 +1,48 @@ - - {#snippet child({ props, monthItems, selectedMonthItem })} - - - {/snippet} - + + {#snippet child({ props, monthItems, selectedMonthItem })} + + + {/snippet} + diff --git a/packages/frontend/src/lib/components/ui/calendar/calendar-month.svelte b/packages/frontend/src/lib/components/ui/calendar/calendar-month.svelte index e747fae..17358d4 100644 --- a/packages/frontend/src/lib/components/ui/calendar/calendar-month.svelte +++ b/packages/frontend/src/lib/components/ui/calendar/calendar-month.svelte @@ -1,15 +1,15 @@
- {@render children?.()} + {@render children?.()}
diff --git a/packages/frontend/src/lib/components/ui/calendar/calendar-months.svelte b/packages/frontend/src/lib/components/ui/calendar/calendar-months.svelte index f717a9d..e78cfd0 100644 --- a/packages/frontend/src/lib/components/ui/calendar/calendar-months.svelte +++ b/packages/frontend/src/lib/components/ui/calendar/calendar-months.svelte @@ -1,19 +1,19 @@
- {@render children?.()} + {@render children?.()}
diff --git a/packages/frontend/src/lib/components/ui/calendar/calendar-nav.svelte b/packages/frontend/src/lib/components/ui/calendar/calendar-nav.svelte index 27f33d7..336e8e4 100644 --- a/packages/frontend/src/lib/components/ui/calendar/calendar-nav.svelte +++ b/packages/frontend/src/lib/components/ui/calendar/calendar-nav.svelte @@ -1,19 +1,19 @@ diff --git a/packages/frontend/src/lib/components/ui/calendar/calendar-next-button.svelte b/packages/frontend/src/lib/components/ui/calendar/calendar-next-button.svelte index 5c5a78d..568f4b8 100644 --- a/packages/frontend/src/lib/components/ui/calendar/calendar-next-button.svelte +++ b/packages/frontend/src/lib/components/ui/calendar/calendar-next-button.svelte @@ -1,31 +1,31 @@ {#snippet Fallback()} - + {/snippet} diff --git a/packages/frontend/src/lib/components/ui/calendar/calendar-prev-button.svelte b/packages/frontend/src/lib/components/ui/calendar/calendar-prev-button.svelte index 33cfd63..9909b00 100644 --- a/packages/frontend/src/lib/components/ui/calendar/calendar-prev-button.svelte +++ b/packages/frontend/src/lib/components/ui/calendar/calendar-prev-button.svelte @@ -1,31 +1,31 @@ {#snippet Fallback()} - + {/snippet} diff --git a/packages/frontend/src/lib/components/ui/calendar/calendar-year-select.svelte b/packages/frontend/src/lib/components/ui/calendar/calendar-year-select.svelte index 33cc961..06e017a 100644 --- a/packages/frontend/src/lib/components/ui/calendar/calendar-year-select.svelte +++ b/packages/frontend/src/lib/components/ui/calendar/calendar-year-select.svelte @@ -1,47 +1,47 @@ - - {#snippet child({ props, yearItems, selectedYearItem })} - - - {/snippet} - + + {#snippet child({ props, yearItems, selectedYearItem })} + + + {/snippet} + diff --git a/packages/frontend/src/lib/components/ui/calendar/calendar.svelte b/packages/frontend/src/lib/components/ui/calendar/calendar.svelte index 29b6fff..0f842b0 100644 --- a/packages/frontend/src/lib/components/ui/calendar/calendar.svelte +++ b/packages/frontend/src/lib/components/ui/calendar/calendar.svelte @@ -1,42 +1,42 @@ - {#snippet children({ months, weekdays })} - - - - - - {#each months as month, monthIndex (month)} - - - - - - - - {#each weekdays as weekday (weekday)} - - {weekday.slice(0, 2)} - - {/each} - - - - {#each month.weeks as weekDates (weekDates)} - - {#each weekDates as date (date)} - - {#if day} - {@render day({ - day: date, - outsideMonth: !isEqualMonth(date, month.value), - })} - {:else} - - {/if} - - {/each} - - {/each} - - - - {/each} - - {/snippet} + {#snippet children({ months, weekdays })} + + + + + + {#each months as month, monthIndex (month)} + + + + + + + + {#each weekdays as weekday (weekday)} + + {weekday.slice(0, 2)} + + {/each} + + + + {#each month.weeks as weekDates (weekDates)} + + {#each weekDates as date (date)} + + {#if day} + {@render day({ + day: date, + outsideMonth: !isEqualMonth(date, month.value), + })} + {:else} + + {/if} + + {/each} + + {/each} + + + + {/each} + + {/snippet} diff --git a/packages/frontend/src/lib/components/ui/calendar/index.ts b/packages/frontend/src/lib/components/ui/calendar/index.ts index f3a16d2..8347a54 100644 --- a/packages/frontend/src/lib/components/ui/calendar/index.ts +++ b/packages/frontend/src/lib/components/ui/calendar/index.ts @@ -18,23 +18,23 @@ import Nav from "./calendar-nav.svelte"; import Caption from "./calendar-caption.svelte"; export { - Day, - Cell, - Grid, - Header, - Months, - GridRow, - Heading, - GridBody, - GridHead, - HeadCell, - NextButton, - PrevButton, - Nav, - Month, - YearSelect, - MonthSelect, - Caption, - // - Root as Calendar, + Day, + Cell, + Grid, + Header, + Months, + GridRow, + Heading, + GridBody, + GridHead, + HeadCell, + NextButton, + PrevButton, + Nav, + Month, + YearSelect, + MonthSelect, + Caption, + // + Root as Calendar, }; diff --git a/packages/frontend/src/lib/components/ui/popover/index.ts b/packages/frontend/src/lib/components/ui/popover/index.ts index b79d12e..5fb2ee9 100644 --- a/packages/frontend/src/lib/components/ui/popover/index.ts +++ b/packages/frontend/src/lib/components/ui/popover/index.ts @@ -5,15 +5,15 @@ import Trigger from "./popover-trigger.svelte"; import Portal from "./popover-portal.svelte"; export { - Root, - Content, - Trigger, - Close, - Portal, - // - Root as Popover, - Content as PopoverContent, - Trigger as PopoverTrigger, - Close as PopoverClose, - Portal as PopoverPortal, + Root, + Content, + Trigger, + Close, + Portal, + // + Root as Popover, + Content as PopoverContent, + Trigger as PopoverTrigger, + Close as PopoverClose, + Portal as PopoverPortal, }; diff --git a/packages/frontend/src/lib/components/ui/popover/popover-close.svelte b/packages/frontend/src/lib/components/ui/popover/popover-close.svelte index c360925..fd2c882 100644 --- a/packages/frontend/src/lib/components/ui/popover/popover-close.svelte +++ b/packages/frontend/src/lib/components/ui/popover/popover-close.svelte @@ -1,7 +1,7 @@ diff --git a/packages/frontend/src/lib/components/ui/popover/popover-content.svelte b/packages/frontend/src/lib/components/ui/popover/popover-content.svelte index 3d79f3c..3d867e2 100644 --- a/packages/frontend/src/lib/components/ui/popover/popover-content.svelte +++ b/packages/frontend/src/lib/components/ui/popover/popover-content.svelte @@ -1,31 +1,31 @@ - + diff --git a/packages/frontend/src/lib/components/ui/popover/popover-portal.svelte b/packages/frontend/src/lib/components/ui/popover/popover-portal.svelte index dd8265f..8115718 100644 --- a/packages/frontend/src/lib/components/ui/popover/popover-portal.svelte +++ b/packages/frontend/src/lib/components/ui/popover/popover-portal.svelte @@ -1,7 +1,7 @@ diff --git a/packages/frontend/src/lib/components/ui/popover/popover-trigger.svelte b/packages/frontend/src/lib/components/ui/popover/popover-trigger.svelte index 586323c..a58180b 100644 --- a/packages/frontend/src/lib/components/ui/popover/popover-trigger.svelte +++ b/packages/frontend/src/lib/components/ui/popover/popover-trigger.svelte @@ -1,17 +1,17 @@ diff --git a/packages/frontend/src/lib/components/ui/popover/popover.svelte b/packages/frontend/src/lib/components/ui/popover/popover.svelte index 6b1aa5f..b485e41 100644 --- a/packages/frontend/src/lib/components/ui/popover/popover.svelte +++ b/packages/frontend/src/lib/components/ui/popover/popover.svelte @@ -1,7 +1,7 @@ diff --git a/packages/frontend/src/routes/admin/+layout.svelte b/packages/frontend/src/routes/admin/+layout.svelte index 9db41b8..ae1e628 100644 --- a/packages/frontend/src/routes/admin/+layout.svelte +++ b/packages/frontend/src/routes/admin/+layout.svelte @@ -17,10 +17,12 @@
-
- + {$_("admin.nav.back_mobile")} {#each navLinks as link (link.href)} diff --git a/packages/frontend/src/routes/admin/articles/[id]/+page.server.ts b/packages/frontend/src/routes/admin/articles/[id]/+page.server.ts index 1afe111..be94032 100644 --- a/packages/frontend/src/routes/admin/articles/[id]/+page.server.ts +++ b/packages/frontend/src/routes/admin/articles/[id]/+page.server.ts @@ -5,7 +5,10 @@ export async function load({ params, fetch, cookies }) { const token = cookies.get("session_token") || ""; const [articles, modelsResult] = await Promise.all([ adminListArticles(fetch, token).catch(() => []), - adminListUsers({ role: "model", limit: 200 }, fetch, token).catch(() => ({ items: [], total: 0 })), + adminListUsers({ role: "model", limit: 200 }, fetch, token).catch(() => ({ + items: [], + total: 0, + })), ]); const article = articles.find((a) => a.id === params.id); if (!article) throw error(404, "Article not found"); diff --git a/packages/frontend/src/routes/admin/articles/[id]/+page.svelte b/packages/frontend/src/routes/admin/articles/[id]/+page.svelte index 9068557..99ab688 100644 --- a/packages/frontend/src/routes/admin/articles/[id]/+page.svelte +++ b/packages/frontend/src/routes/admin/articles/[id]/+page.svelte @@ -107,13 +107,13 @@ + onclick={() => (editorTab = "write")}>{$_("admin.common.write")} + onclick={() => (editorTab = "preview")}>{$_("admin.common.preview")}
@@ -127,7 +127,9 @@ {#if preview} {@html preview} {:else} -

{$_("admin.article_form.preview_placeholder")}

+

+ {$_("admin.article_form.preview_placeholder")} +

{/if}
@@ -152,7 +154,11 @@ {#if selectedAuthor} {#if selectedAuthor.avatar} - + {/if} {selectedAuthor.artist_name} {:else} @@ -164,7 +170,11 @@ {#each data.authors as author (author.id)} {#if author.avatar} - + {/if} {author.artist_name} @@ -195,7 +205,11 @@
- diff --git a/packages/frontend/src/routes/admin/articles/new/+page.svelte b/packages/frontend/src/routes/admin/articles/new/+page.svelte index 7467fb9..d38c2c3 100644 --- a/packages/frontend/src/routes/admin/articles/new/+page.svelte +++ b/packages/frontend/src/routes/admin/articles/new/+page.svelte @@ -98,13 +98,22 @@
- +
-