EZPPFarm/EZPPLauncher
1
0 Fork 0
Code Issues Pull Requests Actions Releases 37 Activity

style: format files with prettier and fix eslint issues

Browse Source
This commit is contained in:
HorizonCode committed 2026-10-31 21:27:28 +01:00
1 parent 7648d1fd4c
commit a2b03d3014
42 files changed
+202 -229
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/lib/components/presence/DiscordPresenceEditor.svelte
+25 -25
View File
@@ -10,7 +10,6 @@
import {
DEFAULT_DISCORD_PRESENCE_CONFIG,
DISCORD_PRESENCE_PRESETS,
discordPresenceCustomConfig,
interpolatePresenceString,
loadDiscordPresenceConfig,
pushIdlePresenceFromConfig,
@@ -25,14 +24,11 @@
Check,
Clock,
Code2,
Copy,
ExternalLink,
Eye,
Gamepad2,
Globe,
Home,
Image as ImageIcon,
Info,
Link,
LoaderCircle,
Maximize2,
@@ -41,10 +37,8 @@
Play,
Plus,
RotateCcw,
Save,
Sparkles,
Type,
User,
X,
} from '@lucide/svelte';
import { invoke } from '@tauri-apps/api/core';
@@ -101,8 +95,10 @@
// Preset selector
let selectedPresetName = $state<string>('EZPPFarm Default');
const SIM_MODES = ['osu!', 'taiko', 'catch', 'mania'] as const;
// Simulation parameters for preview
let simMode = $state<'osu!' | 'taiko' | 'catch' | 'mania'>('osu!');
let simMode = $state<(typeof SIM_MODES)[number]>('osu!');
let simAction = $state<string>('Playing...');
let simBeatmapIndex = $state<number>(0);
let simRank = $state<number>(1337);
@@ -206,7 +202,11 @@
if (standalone) {
try {
unlistenSync = await listen<any>('sync-theme-editor-global-data', (event) => {
unlistenSync = await listen<{
user?: Parameters<typeof currentUser.set>[0];
info?: Parameters<typeof currentUserInfo.set>[0];
launcherVersion?: string;
}>('sync-theme-editor-global-data', (event) => {
if (event.payload?.user) currentUser.set(event.payload.user);
if (event.payload?.info) currentUserInfo.set(event.payload.info);
if (event.payload?.launcherVersion) launcherVersion.set(event.payload.launcherVersion);
@@ -844,7 +844,7 @@
Details (First Line)
</Label>
<span class="text-[10px] text-muted-foreground"
>[{'{'}mode{'}'}] {'{'}action{'}'}</span
>[{'{'}mode}] {'{'}action}</span
>
</div>
<Input
@@ -852,7 +852,7 @@
bind:value={workingConfig.playingDetails}
onfocus={() => handleInputFocus('playingDetails')}
onblur={handleInputBlur}
placeholder="[{'{'}mode{'}'}] {'{'}action{'}'}"
placeholder="[{'{'}mode}] {'{'}action}"
class="h-8 bg-black/40 text-xs border-theme-800 focus:border-primary"
/>
</div>
@@ -862,14 +862,14 @@
<Label class="text-[11px] font-medium text-theme-200" for="playing-state">
State (Second Line)
</Label>
<span class="text-[10px] text-muted-foreground">{'{'}beatmap{'}'}</span>
<span class="text-[10px] text-muted-foreground">{'{'}beatmap}</span>
</div>
<Input
id="playing-state"
bind:value={workingConfig.playingState}
onfocus={() => handleInputFocus('playingState')}
onblur={handleInputBlur}
placeholder="{'{'}beatmap{'}'}"
placeholder="{'{'}beatmap}"
class="h-8 bg-black/40 text-xs border-theme-800 focus:border-primary"
/>
</div>
@@ -907,14 +907,14 @@
>
Cover Art Hover Tooltip
</Label>
<span class="text-[10px] text-muted-foreground">{'{'}beatmap{'}'}</span>
<span class="text-[10px] text-muted-foreground">{'{'}beatmap}</span>
</div>
<Input
id="playing-large-text"
bind:value={workingConfig.playingLargeImageText}
onfocus={() => handleInputFocus('playingLargeImageText')}
onblur={handleInputBlur}
placeholder="{'{'}beatmap{'}'}"
placeholder="{'{'}beatmap}"
class="h-8 bg-black/40 text-xs border-theme-800 focus:border-primary"
/>
</div>
@@ -945,7 +945,7 @@
Small Badge Hover Tooltip
</Label>
<span class="text-[10px] text-muted-foreground"
>{'{'}username{'}'} (#{'{'}rank{'}'})</span
>{'{'}username} (#{'{'}rank})</span
>
</div>
<Input
@@ -953,7 +953,7 @@
bind:value={workingConfig.playingSmallImageText}
onfocus={() => handleInputFocus('playingSmallImageText')}
onblur={handleInputBlur}
placeholder="{'{'}username{'}'} (#{'{'}rank{'}'})"
placeholder="{'{'}username} (#{'{'}rank})"
class="h-8 bg-black/40 text-xs border-theme-800 focus:border-primary"
/>
</div>
@@ -1031,7 +1031,7 @@
<ThemeSection
title="Button 1 (Playing In-Game)"
icon={Link}
description="Primary action button shown while playing osu! (supports {'{'}beatmapUrl{'}'})"
description="Primary action button shown while playing osu! (supports {'{'}beatmapUrl})"
>
<div class="space-y-3">
<div
@@ -1067,7 +1067,7 @@
bind:value={workingConfig.playingButton1.url}
onfocus={() => handleInputFocus('playingButton1Url')}
onblur={handleInputBlur}
placeholder="{'{'}beatmapUrl{'}'}"
placeholder="{'{'}beatmapUrl}"
class="h-8 bg-black/40 text-xs border-theme-800 focus:border-primary"
/>
</div>
@@ -1128,7 +1128,7 @@
bordered={false}
>
<div class="space-y-2">
{#each DISCORD_PRESENCE_PRESETS as preset}
{#each DISCORD_PRESENCE_PRESETS as preset (preset.name)}
<div
class="flex flex-col gap-1.5 rounded-xl border border-theme-800/80 bg-theme-900/40 p-3 transition-colors hover:border-theme-700 {selectedPresetName ===
preset.name
@@ -1170,7 +1170,7 @@
description="Click any variable to copy or evaluate in the active field"
>
<div class="space-y-1.5">
{#each PLACEHOLDERS as p}
{#each PLACEHOLDERS as p (p.token)}
<div
class="flex items-center justify-between rounded-lg border border-theme-800/40 bg-black/30 px-2.5 py-1.5 text-[11px]"
>
@@ -1215,7 +1215,7 @@
</span>
</div>
<div class="flex flex-wrap gap-1">
{#each PLACEHOLDERS as p}
{#each PLACEHOLDERS as p (p.token)}
<button
type="button"
class="group flex items-center gap-1 rounded border border-theme-800 bg-theme-900/90 px-1.5 py-0.5 text-[10px] text-theme-200 transition-all hover:border-primary/60 hover:bg-primary/20 hover:text-white active:scale-95"
@@ -1354,14 +1354,14 @@
<div class="flex items-center gap-2">
<span class="text-muted-foreground">Mode:</span>
<div class="flex gap-0.5">
{#each ['osu!', 'taiko', 'catch', 'mania'] as mode}
{#each SIM_MODES as mode (mode)}
<button
type="button"
class="rounded px-2 py-0.5 text-[10px] font-semibold transition-colors {simMode ===
mode
? 'bg-primary text-primary-foreground'
: 'bg-black/40 text-theme-300 hover:text-white'}"
onclick={() => (simMode = mode as any)}
onclick={() => (simMode = mode)}
>
{mode}
</button>
@@ -1372,7 +1372,7 @@
<div class="flex items-center gap-2">
<span class="text-muted-foreground">Action:</span>
<div class="flex gap-0.5">
{#each ['Playing...', 'Editing...', 'AFK...'] as act}
{#each ['Playing...', 'Editing...', 'AFK...'] as act (act)}
<button
type="button"
class="rounded px-2 py-0.5 text-[10px] transition-colors {simAction === act
@@ -1392,7 +1392,7 @@
bind:value={simBeatmapIndex}
class="rounded border border-theme-800 bg-black/60 px-2 py-0.5 text-[10px] text-theme-200"
>
{#each SAMPLE_BEATMAPS as b, idx}
{#each SAMPLE_BEATMAPS as b, idx (`${b.artist}-${b.title}-${idx}`)}
<option value={idx}>{b.artist} - {b.title}</option>
{/each}
</select>
src/lib/components/theme/ThemeElementInspector.svelte
+6 -4
View File
@@ -18,8 +18,6 @@
import { getThemeDataSampleValue, resolveThemeDataValue, themeGlobalData } from '$lib/themeData';
import type { ThemeFontChoice } from '$lib/themeFonts';
import { DEFAULT_THEME_ICON_SET, type ThemeIconSet } from '$lib/themeIcons';
import { openURL } from '$lib/utils';
import { sileo } from 'sileo';
import {
THEME_DATA_FIELDS,
THEME_PARTICLE_PRESETS,
@@ -32,6 +30,7 @@
type ThemeV2WidgetKind,
type ThemeV2WidgetVariant,
} from '$lib/themeV2';
import { openURL } from '$lib/utils';
import {
CircleUser,
Clock,
@@ -51,6 +50,7 @@
Timer,
Type,
} from '@lucide/svelte';
import { sileo } from 'sileo';
let {
element = $bindable(),
@@ -1643,7 +1643,8 @@
Test Button Action
</Button>
<p class="text-[9px] leading-relaxed text-muted-foreground">
In editor mode, canvas clicks select layers for dragging. Test actions using this button, or Shift+click on canvas.
In editor mode, canvas clicks select layers for dragging. Test actions using this button,
or Shift+click on canvas.
</p>
</div>
<div class="grid grid-cols-2 gap-2">
@@ -2502,7 +2503,8 @@
{:else if element.widget === 'telemetry'}
Pill bar showing beatmap counts, skin counts, ping, and osu! build.
{:else if element.widget === 'header'}
Launcher title and dynamic greeting. Full shows title and subtitle, Compact shows an inline pill greeting, and Minimal displays title only.
Launcher title and dynamic greeting. Full shows title and subtitle, Compact shows an
inline pill greeting, and Minimal displays title only.
{:else}
Launcher title and dynamic greeting.
{/if}
src/lib/components/theme/ThemeIconPicker.svelte
+1 -1
View File
@@ -9,7 +9,7 @@
} from '$lib/themeIconCatalog';
import { DEFAULT_THEME_ICON_SET, type ThemeIconSet } from '$lib/themeIcons';
import ThemeIcon from './ThemeIcon.svelte';
import { Check, ChevronDown, ChevronsUpDown, LayoutGrid, List, Search, X } from '@lucide/svelte';
import { Check, ChevronsUpDown, LayoutGrid, List, Search, X } from '@lucide/svelte';
let {
value = $bindable(undefined),
src/lib/components/theme/ThemeTextStyleControls.svelte
+1 -5
View File
@@ -4,11 +4,7 @@
import Input from '$lib/components/ui/input/input.svelte';
import Label from '$lib/components/ui/label/label.svelte';
import * as Select from '$lib/components/ui/select';
import type {
ThemeV2TextDecoration,
ThemeV2TextStyle,
ThemeV2TextTransform,
} from '$lib/themeV2';
import type { ThemeV2TextDecoration, ThemeV2TextStyle, ThemeV2TextTransform } from '$lib/themeV2';
import { Bold, Italic, RotateCcw, Strikethrough, Underline } from '@lucide/svelte';
let {
src/lib/components/theme/ThemeV2Elements.svelte
+1 -11
View File
@@ -44,17 +44,7 @@
} from '$lib/themeV2';
import { currentUser } from '$lib/userAuthentication';
import { countryCodeToEmoji, formatRelativeTime, openURL } from '$lib/utils';
import {
Boxes,
ChevronRight,
Clock,
Medal,
Move,
RotateCw,
TrendingDown,
TrendingUp,
Trophy,
} from '@lucide/svelte';
import { Boxes, ChevronRight, Clock, Move, RotateCw, Trophy } from '@lucide/svelte';
import { onDestroy } from 'svelte';
import { SvelteSet } from 'svelte/reactivity';
import { TextMorph } from 'torph/svelte';
src/lib/components/ui/calendar/calendar-caption.svelte
+15 -15
View File
@@ -1,9 +1,9 @@
<script lang="ts">
import type { ComponentProps } from "svelte";
import type Calendar from "./calendar.svelte";
import CalendarMonthSelect from "./calendar-month-select.svelte";
import CalendarYearSelect from "./calendar-year-select.svelte";
import { DateFormatter, getLocalTimeZone, type DateValue } from "@internationalized/date";
import CalendarMonthSelect from './calendar-month-select.svelte';
import CalendarYearSelect from './calendar-year-select.svelte';
import type Calendar from './calendar.svelte';
import { DateFormatter, getLocalTimeZone, type DateValue } from '@internationalized/date';
import type { ComponentProps } from 'svelte';
let {
captionLayout,
@@ -16,11 +16,11 @@
placeholder = $bindable(),
monthIndex = 0,
}: {
captionLayout: ComponentProps<typeof Calendar>["captionLayout"];
months: ComponentProps<typeof CalendarMonthSelect>["months"];
monthFormat: ComponentProps<typeof CalendarMonthSelect>["monthFormat"];
years: ComponentProps<typeof CalendarYearSelect>["years"];
yearFormat: ComponentProps<typeof CalendarYearSelect>["yearFormat"];
captionLayout: ComponentProps<typeof Calendar>['captionLayout'];
months: ComponentProps<typeof CalendarMonthSelect>['months'];
monthFormat: ComponentProps<typeof CalendarMonthSelect>['monthFormat'];
years: ComponentProps<typeof CalendarYearSelect>['years'];
yearFormat: ComponentProps<typeof CalendarYearSelect>['yearFormat'];
month: DateValue;
placeholder: DateValue | undefined;
locale: string;
@@ -29,13 +29,13 @@
function formatYear(date: DateValue) {
const dateObj = date.toDate(getLocalTimeZone());
if (typeof yearFormat === "function") return yearFormat(dateObj.getFullYear());
if (typeof yearFormat === 'function') return yearFormat(dateObj.getFullYear());
return new DateFormatter(locale, { year: yearFormat }).format(dateObj);
}
function formatMonth(date: DateValue) {
const dateObj = date.toDate(getLocalTimeZone());
if (typeof monthFormat === "function") return monthFormat(dateObj.getMonth() + 1);
if (typeof monthFormat === 'function') return monthFormat(dateObj.getMonth() + 1);
return new DateFormatter(locale, { month: monthFormat }).format(dateObj);
}
</script>
@@ -58,15 +58,15 @@
<CalendarYearSelect {years} {yearFormat} value={month.year} />
{/snippet}
{#if captionLayout === "dropdown"}
{#if captionLayout === 'dropdown'}
{@render MonthSelect()}
{@render YearSelect()}
{:else if captionLayout === "dropdown-months"}
{:else if captionLayout === 'dropdown-months'}
{@render MonthSelect()}
{#if placeholder}
{formatYear(placeholder)}
{/if}
{:else if captionLayout === "dropdown-years"}
{:else if captionLayout === 'dropdown-years'}
{#if placeholder}
{formatMonth(placeholder)}
{/if}
src/lib/components/ui/calendar/calendar-cell.svelte
+3 -3
View File
@@ -1,6 +1,6 @@
<script lang="ts">
import { Calendar as CalendarPrimitive } from "bits-ui";
import { cn } from "$lib/utils.js";
import { cn } from '$lib/utils.js';
import { Calendar as CalendarPrimitive } from 'bits-ui';
let {
ref = $bindable(null),
@@ -12,7 +12,7 @@
<CalendarPrimitive.Cell
bind:ref
class={cn(
"relative size-(--cell-size) p-0 text-center text-sm focus-within:z-20 [&:first-child[data-selected]_[data-bits-day]]:rounded-s-md [&:last-child[data-selected]_[data-bits-day]]:rounded-e-md",
'relative size-(--cell-size) p-0 text-center text-sm focus-within:z-20 [&:first-child[data-selected]_[data-bits-day]]:rounded-s-md [&:last-child[data-selected]_[data-bits-day]]:rounded-e-md',
className
)}
{...restProps}
src/lib/components/ui/calendar/calendar-day.svelte
+13 -13
View File
@@ -1,7 +1,7 @@
<script lang="ts">
import { buttonVariants } from "$lib/components/ui/button/index.js";
import { cn } from "$lib/utils.js";
import { Calendar as CalendarPrimitive } from "bits-ui";
import { buttonVariants } from '$lib/components/ui/button/index.js';
import { cn } from '$lib/utils.js';
import { Calendar as CalendarPrimitive } from 'bits-ui';
let {
ref = $bindable(null),
@@ -13,22 +13,22 @@
<CalendarPrimitive.Day
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",
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",
'[&[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",
'data-[disabled]:text-muted-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
// Unavailable
"data-[unavailable]:text-muted-foreground data-[unavailable]:line-through",
'data-[unavailable]:text-muted-foreground data-[unavailable]:line-through',
// hover
"dark:hover:text-accent-foreground",
'dark:hover:text-accent-foreground',
// focus
"focus:border-ring focus:ring-ring/50 focus:relative",
'focus:border-ring focus:ring-ring/50 focus:relative',
// inner spans
"[&>span]:text-xs [&>span]:opacity-70",
'[&>span]:text-xs [&>span]:opacity-70',
className
)}
{...restProps}
src/lib/components/ui/calendar/calendar-grid-body.svelte
+2 -2
View File
@@ -1,6 +1,6 @@
<script lang="ts">
import { Calendar as CalendarPrimitive } from "bits-ui";
import { cn } from "$lib/utils.js";
import { cn } from '$lib/utils.js';
import { Calendar as CalendarPrimitive } from 'bits-ui';
let {
ref = $bindable(null),
src/lib/components/ui/calendar/calendar-grid-head.svelte
+2 -2
View File
@@ -1,6 +1,6 @@
<script lang="ts">
import { Calendar as CalendarPrimitive } from "bits-ui";
import { cn } from "$lib/utils.js";
import { cn } from '$lib/utils.js';
import { Calendar as CalendarPrimitive } from 'bits-ui';
let {
ref = $bindable(null),
src/lib/components/ui/calendar/calendar-grid-row.svelte
+3 -3
View File
@@ -1,6 +1,6 @@
<script lang="ts">
import { Calendar as CalendarPrimitive } from "bits-ui";
import { cn } from "$lib/utils.js";
import { cn } from '$lib/utils.js';
import { Calendar as CalendarPrimitive } from 'bits-ui';
let {
ref = $bindable(null),
@@ -9,4 +9,4 @@
}: CalendarPrimitive.GridRowProps = $props();
</script>
<CalendarPrimitive.GridRow bind:ref class={cn("flex", className)} {...restProps} />
<CalendarPrimitive.GridRow bind:ref class={cn('flex', className)} {...restProps} />
src/lib/components/ui/calendar/calendar-grid.svelte
+3 -3
View File
@@ -1,6 +1,6 @@
<script lang="ts">
import { Calendar as CalendarPrimitive } from "bits-ui";
import { cn } from "$lib/utils.js";
import { cn } from '$lib/utils.js';
import { Calendar as CalendarPrimitive } from 'bits-ui';
let {
ref = $bindable(null),
@@ -11,6 +11,6 @@
<CalendarPrimitive.Grid
bind:ref
class={cn("mt-4 flex w-full border-collapse flex-col gap-1", className)}
class={cn('mt-4 flex w-full border-collapse flex-col gap-1', className)}
{...restProps}
/>
src/lib/components/ui/calendar/calendar-head-cell.svelte
+3 -3
View File
@@ -1,6 +1,6 @@
<script lang="ts">
import { Calendar as CalendarPrimitive } from "bits-ui";
import { cn } from "$lib/utils.js";
import { cn } from '$lib/utils.js';
import { Calendar as CalendarPrimitive } from 'bits-ui';
let {
ref = $bindable(null),
@@ -12,7 +12,7 @@
<CalendarPrimitive.HeadCell
bind:ref
class={cn(
"text-muted-foreground w-(--cell-size) rounded-md text-[0.8rem] font-normal",
'text-muted-foreground w-(--cell-size) rounded-md text-[0.8rem] font-normal',
className
)}
{...restProps}
src/lib/components/ui/calendar/calendar-header.svelte
+3 -3
View File
@@ -1,6 +1,6 @@
<script lang="ts">
import { Calendar as CalendarPrimitive } from "bits-ui";
import { cn } from "$lib/utils.js";
import { cn } from '$lib/utils.js';
import { Calendar as CalendarPrimitive } from 'bits-ui';
let {
ref = $bindable(null),
@@ -12,7 +12,7 @@
<CalendarPrimitive.Header
bind:ref
class={cn(
"flex h-(--cell-size) w-full items-center justify-center gap-1.5 text-sm font-medium",
'flex h-(--cell-size) w-full items-center justify-center gap-1.5 text-sm font-medium',
className
)}
{...restProps}
src/lib/components/ui/calendar/calendar-heading.svelte
+3 -3
View File
@@ -1,6 +1,6 @@
<script lang="ts">
import { Calendar as CalendarPrimitive } from "bits-ui";
import { cn } from "$lib/utils.js";
import { cn } from '$lib/utils.js';
import { Calendar as CalendarPrimitive } from 'bits-ui';
let {
ref = $bindable(null),
@@ -11,6 +11,6 @@
<CalendarPrimitive.Heading
bind:ref
class={cn("px-(--cell-size) text-sm font-medium", className)}
class={cn('px-(--cell-size) text-sm font-medium', className)}
{...restProps}
/>
src/lib/components/ui/calendar/calendar-month-select.svelte
+4 -4
View File
@@ -1,7 +1,7 @@
<script lang="ts">
import { Calendar as CalendarPrimitive } from "bits-ui";
import { cn, type WithoutChildrenOrChild } from "$lib/utils.js";
import ChevronDownIcon from "@lucide/svelte/icons/chevron-down";
import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
import ChevronDownIcon from '@lucide/svelte/icons/chevron-down';
import { Calendar as CalendarPrimitive } from 'bits-ui';
let {
ref = $bindable(null),
@@ -14,7 +14,7 @@
<span
class={cn(
"has-focus:border-ring border-input has-focus:ring-ring/50 relative flex rounded-md border shadow-xs has-focus:ring-[3px]",
'has-focus:border-ring border-input has-focus:ring-ring/50 relative flex rounded-md border shadow-xs has-focus:ring-[3px]',
className
)}
>
src/lib/components/ui/calendar/calendar-month.svelte
+3 -3
View File
@@ -1,6 +1,6 @@
<script lang="ts">
import { type WithElementRef, cn } from "$lib/utils.js";
import type { HTMLAttributes } from "svelte/elements";
import { type WithElementRef, cn } from '$lib/utils.js';
import type { HTMLAttributes } from 'svelte/elements';
let {
ref = $bindable(null),
@@ -10,6 +10,6 @@
}: WithElementRef<HTMLAttributes<HTMLElement>> = $props();
</script>
<div {...restProps} bind:this={ref} class={cn("flex flex-col", className)}>
<div {...restProps} bind:this={ref} class={cn('flex flex-col', className)}>
{@render children?.()}
</div>
src/lib/components/ui/calendar/calendar-months.svelte
+3 -3
View File
@@ -1,6 +1,6 @@
<script lang="ts">
import type { HTMLAttributes } from "svelte/elements";
import { cn, type WithElementRef } from "$lib/utils.js";
import { cn, type WithElementRef } from '$lib/utils.js';
import type { HTMLAttributes } from 'svelte/elements';
let {
ref = $bindable(null),
@@ -12,7 +12,7 @@
<div
bind:this={ref}
class={cn("relative flex flex-col gap-4 md:flex-row", className)}
class={cn('relative flex flex-col gap-4 md:flex-row', className)}
{...restProps}
>
{@render children?.()}
src/lib/components/ui/calendar/calendar-nav.svelte
+3 -3
View File
@@ -1,6 +1,6 @@
<script lang="ts">
import { cn, type WithElementRef } from "$lib/utils.js";
import type { HTMLAttributes } from "svelte/elements";
import { cn, type WithElementRef } from '$lib/utils.js';
import type { HTMLAttributes } from 'svelte/elements';
let {
ref = $bindable(null),
@@ -13,7 +13,7 @@
<nav
{...restProps}
bind:this={ref}
class={cn("absolute inset-x-0 top-0 flex w-full items-center justify-between gap-1", className)}
class={cn('absolute inset-x-0 top-0 flex w-full items-center justify-between gap-1', className)}
>
{@render children?.()}
</nav>
src/lib/components/ui/calendar/calendar-next-button.svelte
+6 -6
View File
@@ -1,14 +1,14 @@
<script lang="ts">
import { Calendar as CalendarPrimitive } from "bits-ui";
import ChevronRightIcon from "@lucide/svelte/icons/chevron-right";
import { buttonVariants, type ButtonVariant } from "$lib/components/ui/button/index.js";
import { cn } from "$lib/utils.js";
import { buttonVariants, type ButtonVariant } from '$lib/components/ui/button/index.js';
import { cn } from '$lib/utils.js';
import ChevronRightIcon from '@lucide/svelte/icons/chevron-right';
import { Calendar as CalendarPrimitive } from 'bits-ui';
let {
ref = $bindable(null),
class: className,
children,
variant = "ghost",
variant = 'ghost',
...restProps
}: CalendarPrimitive.NextButtonProps & {
variant?: ButtonVariant;
@@ -23,7 +23,7 @@
bind:ref
class={cn(
buttonVariants({ variant }),
"size-(--cell-size) bg-transparent p-0 select-none disabled:opacity-50 rtl:rotate-180",
'size-(--cell-size) bg-transparent p-0 select-none disabled:opacity-50 rtl:rotate-180',
className
)}
children={children || Fallback}
src/lib/components/ui/calendar/calendar-prev-button.svelte
+6 -6
View File
@@ -1,14 +1,14 @@
<script lang="ts">
import { Calendar as CalendarPrimitive } from "bits-ui";
import ChevronLeftIcon from "@lucide/svelte/icons/chevron-left";
import { buttonVariants, type ButtonVariant } from "$lib/components/ui/button/index.js";
import { cn } from "$lib/utils.js";
import { buttonVariants, type ButtonVariant } from '$lib/components/ui/button/index.js';
import { cn } from '$lib/utils.js';
import ChevronLeftIcon from '@lucide/svelte/icons/chevron-left';
import { Calendar as CalendarPrimitive } from 'bits-ui';
let {
ref = $bindable(null),
class: className,
children,
variant = "ghost",
variant = 'ghost',
...restProps
}: CalendarPrimitive.PrevButtonProps & {
variant?: ButtonVariant;
@@ -23,7 +23,7 @@
bind:ref
class={cn(
buttonVariants({ variant }),
"size-(--cell-size) bg-transparent p-0 select-none disabled:opacity-50 rtl:rotate-180",
'size-(--cell-size) bg-transparent p-0 select-none disabled:opacity-50 rtl:rotate-180',
className
)}
children={children || Fallback}
src/lib/components/ui/calendar/calendar-year-select.svelte
+4 -4
View File
@@ -1,7 +1,7 @@
<script lang="ts">
import { Calendar as CalendarPrimitive } from "bits-ui";
import { cn, type WithoutChildrenOrChild } from "$lib/utils.js";
import ChevronDownIcon from "@lucide/svelte/icons/chevron-down";
import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
import ChevronDownIcon from '@lucide/svelte/icons/chevron-down';
import { Calendar as CalendarPrimitive } from 'bits-ui';
let {
ref = $bindable(null),
@@ -13,7 +13,7 @@
<span
class={cn(
"has-focus:border-ring border-input has-focus:ring-ring/50 relative flex rounded-md border shadow-xs has-focus:ring-[3px]",
'has-focus:border-ring border-input has-focus:ring-ring/50 relative flex rounded-md border shadow-xs has-focus:ring-[3px]',
className
)}
>
src/lib/components/ui/calendar/calendar.svelte
+19 -19
View File
@@ -1,41 +1,41 @@
<script lang="ts">
import { Calendar as CalendarPrimitive } from "bits-ui";
import * as Calendar from "./index.js";
import { cn, type WithoutChildrenOrChild } from "$lib/utils.js";
import type { ButtonVariant } from "../button/button.svelte";
import { isEqualMonth, type DateValue } from "@internationalized/date";
import type { Snippet } from "svelte";
import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
import type { ButtonVariant } from '../button/button.svelte';
import * as Calendar from './index.js';
import { isEqualMonth, type DateValue } from '@internationalized/date';
import { Calendar as CalendarPrimitive } from 'bits-ui';
import type { Snippet } from 'svelte';
let {
ref = $bindable(null),
value = $bindable(),
placeholder = $bindable(),
class: className,
weekdayFormat = "short",
buttonVariant = "ghost",
captionLayout = "label",
locale = "en-US",
weekdayFormat = 'short',
buttonVariant = 'ghost',
captionLayout = 'label',
locale = 'en-US',
months: monthsProp,
years,
monthFormat: monthFormatProp,
yearFormat = "numeric",
yearFormat = 'numeric',
day,
disableDaysOutsideMonth = false,
...restProps
}: WithoutChildrenOrChild<CalendarPrimitive.RootProps> & {
buttonVariant?: ButtonVariant;
captionLayout?: "dropdown" | "dropdown-months" | "dropdown-years" | "label";
months?: CalendarPrimitive.MonthSelectProps["months"];
years?: CalendarPrimitive.YearSelectProps["years"];
monthFormat?: CalendarPrimitive.MonthSelectProps["monthFormat"];
yearFormat?: CalendarPrimitive.YearSelectProps["yearFormat"];
captionLayout?: 'dropdown' | 'dropdown-months' | 'dropdown-years' | 'label';
months?: CalendarPrimitive.MonthSelectProps['months'];
years?: CalendarPrimitive.YearSelectProps['years'];
monthFormat?: CalendarPrimitive.MonthSelectProps['monthFormat'];
yearFormat?: CalendarPrimitive.YearSelectProps['yearFormat'];
day?: Snippet<[{ day: DateValue; outsideMonth: boolean }]>;
} = $props();
const monthFormat = $derived.by(() => {
if (monthFormatProp) return monthFormatProp;
if (captionLayout.startsWith("dropdown")) return "short";
return "long";
if (captionLayout.startsWith('dropdown')) return 'short';
return 'long';
});
</script>
@@ -50,7 +50,7 @@ get along, so we shut typescript up by casting `value` to `never`.
{weekdayFormat}
{disableDaysOutsideMonth}
class={cn(
"bg-background group/calendar p-3 [--cell-size:--spacing(8)] [[data-slot=card-content]_&]:bg-transparent [[data-slot=popover-content]_&]:bg-transparent",
'bg-background group/calendar p-3 [--cell-size:--spacing(8)] [[data-slot=card-content]_&]:bg-transparent [[data-slot=popover-content]_&]:bg-transparent',
className
)}
{locale}
src/lib/components/ui/calendar/index.ts
+18 -18
View File
@@ -1,21 +1,21 @@
import Root from "./calendar.svelte";
import Cell from "./calendar-cell.svelte";
import Day from "./calendar-day.svelte";
import Grid from "./calendar-grid.svelte";
import Header from "./calendar-header.svelte";
import Months from "./calendar-months.svelte";
import GridRow from "./calendar-grid-row.svelte";
import Heading from "./calendar-heading.svelte";
import GridBody from "./calendar-grid-body.svelte";
import GridHead from "./calendar-grid-head.svelte";
import HeadCell from "./calendar-head-cell.svelte";
import NextButton from "./calendar-next-button.svelte";
import PrevButton from "./calendar-prev-button.svelte";
import MonthSelect from "./calendar-month-select.svelte";
import YearSelect from "./calendar-year-select.svelte";
import Month from "./calendar-month.svelte";
import Nav from "./calendar-nav.svelte";
import Caption from "./calendar-caption.svelte";
import Caption from './calendar-caption.svelte';
import Cell from './calendar-cell.svelte';
import Day from './calendar-day.svelte';
import GridBody from './calendar-grid-body.svelte';
import GridHead from './calendar-grid-head.svelte';
import GridRow from './calendar-grid-row.svelte';
import Grid from './calendar-grid.svelte';
import HeadCell from './calendar-head-cell.svelte';
import Header from './calendar-header.svelte';
import Heading from './calendar-heading.svelte';
import MonthSelect from './calendar-month-select.svelte';
import Month from './calendar-month.svelte';
import Months from './calendar-months.svelte';
import Nav from './calendar-nav.svelte';
import NextButton from './calendar-next-button.svelte';
import PrevButton from './calendar-prev-button.svelte';
import YearSelect from './calendar-year-select.svelte';
import Root from './calendar.svelte';
export {
Day,
src/lib/components/ui/date-picker/date-picker.svelte
+1 -1
View File
@@ -73,7 +73,7 @@
return;
}
let next = '';
let next: string;
if (withTime) {
const d = new Date(
calendarValue.year,
src/lib/components/ui/popover/index.ts
+5 -5
View File
@@ -1,8 +1,8 @@
import Root from "./popover.svelte";
import Close from "./popover-close.svelte";
import Content from "./popover-content.svelte";
import Trigger from "./popover-trigger.svelte";
import Portal from "./popover-portal.svelte";
import Close from './popover-close.svelte';
import Content from './popover-content.svelte';
import Portal from './popover-portal.svelte';
import Trigger from './popover-trigger.svelte';
import Root from './popover.svelte';
export {
Root,
src/lib/components/ui/popover/popover-close.svelte
+1 -1
View File
@@ -1,5 +1,5 @@
<script lang="ts">
import { Popover as PopoverPrimitive } from "bits-ui";
import { Popover as PopoverPrimitive } from 'bits-ui';
let { ref = $bindable(null), ...restProps }: PopoverPrimitive.CloseProps = $props();
</script>
src/lib/components/ui/popover/popover-content.svelte
+6 -6
View File
@@ -1,14 +1,14 @@
<script lang="ts">
import { Popover as PopoverPrimitive } from "bits-ui";
import PopoverPortal from "./popover-portal.svelte";
import { cn, type WithoutChildrenOrChild } from "$lib/utils.js";
import type { ComponentProps } from "svelte";
import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
import PopoverPortal from './popover-portal.svelte';
import { Popover as PopoverPrimitive } from 'bits-ui';
import type { ComponentProps } from 'svelte';
let {
ref = $bindable(null),
class: className,
sideOffset = 4,
align = "center",
align = 'center',
portalProps,
...restProps
}: PopoverPrimitive.ContentProps & {
@@ -23,7 +23,7 @@
{sideOffset}
{align}
class={cn(
"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-end-2 data-[side=right]:slide-in-from-start-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-72 origin-(--bits-popover-content-transform-origin) rounded-md border p-4 shadow-md outline-hidden",
'bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-end-2 data-[side=right]:slide-in-from-start-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-72 origin-(--bits-popover-content-transform-origin) rounded-md border p-4 shadow-md outline-hidden',
className
)}
{...restProps}
src/lib/components/ui/popover/popover-portal.svelte
+1 -1
View File
@@ -1,5 +1,5 @@
<script lang="ts">
import { Popover as PopoverPrimitive } from "bits-ui";
import { Popover as PopoverPrimitive } from 'bits-ui';
let { ...restProps }: PopoverPrimitive.PortalProps = $props();
</script>
src/lib/components/ui/popover/popover-trigger.svelte
+3 -3
View File
@@ -1,6 +1,6 @@
<script lang="ts">
import { cn } from "$lib/utils.js";
import { Popover as PopoverPrimitive } from "bits-ui";
import { cn } from '$lib/utils.js';
import { Popover as PopoverPrimitive } from 'bits-ui';
let {
ref = $bindable(null),
@@ -12,6 +12,6 @@
<PopoverPrimitive.Trigger
bind:ref
data-slot="popover-trigger"
class={cn("", className)}
class={cn('', className)}
{...restProps}
/>
src/lib/components/ui/popover/popover.svelte
+1 -1
View File
@@ -1,5 +1,5 @@
<script lang="ts">
import { Popover as PopoverPrimitive } from "bits-ui";
import { Popover as PopoverPrimitive } from 'bits-ui';
let { open = $bindable(false), ...restProps }: PopoverPrimitive.RootProps = $props();
</script>
src/lib/components/ui/tooltip/index.ts
+6 -6
View File
@@ -1,9 +1,9 @@
import Root from "./tooltip.svelte";
import Content from "./tooltip-content.svelte";
import Trigger from "./tooltip-trigger.svelte";
import Provider from "./tooltip-provider.svelte";
import Portal from "./tooltip-portal.svelte";
import Arrow from "./tooltip-arrow.svelte";
import Arrow from './tooltip-arrow.svelte';
import Content from './tooltip-content.svelte';
import Portal from './tooltip-portal.svelte';
import Provider from './tooltip-provider.svelte';
import Trigger from './tooltip-trigger.svelte';
import Root from './tooltip.svelte';
export {
Root,
src/lib/components/ui/tooltip/tooltip-content.svelte
+5 -5
View File
@@ -1,8 +1,8 @@
<script lang="ts">
import { Tooltip as TooltipPrimitive } from "bits-ui";
import TooltipPortal from "./tooltip-portal.svelte";
import { cn, type WithoutChildrenOrChild } from "$lib/utils.js";
import type { ComponentProps } from "svelte";
import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
import TooltipPortal from './tooltip-portal.svelte';
import { Tooltip as TooltipPrimitive } from 'bits-ui';
import type { ComponentProps } from 'svelte';
let {
ref = $bindable(null),
@@ -21,7 +21,7 @@
data-slot="tooltip-content"
{sideOffset}
class={cn(
"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-end-2 data-[side=right]:slide-in-from-start-2 data-[side=top]:slide-in-from-bottom-2 z-50 overflow-hidden rounded-md border border-border px-3 py-1.5 text-xs shadow-md",
'bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-end-2 data-[side=right]:slide-in-from-start-2 data-[side=top]:slide-in-from-bottom-2 z-50 overflow-hidden rounded-md border border-border px-3 py-1.5 text-xs shadow-md',
className
)}
{...restProps}
src/lib/components/ui/tooltip/tooltip-portal.svelte
+1 -1
View File
@@ -1,5 +1,5 @@
<script lang="ts">
import { Tooltip as TooltipPrimitive } from "bits-ui";
import { Tooltip as TooltipPrimitive } from 'bits-ui';
let { ...restProps }: TooltipPrimitive.PortalProps = $props();
</script>
src/lib/components/ui/tooltip/tooltip-provider.svelte
+3 -9
View File
@@ -1,13 +1,7 @@
<script lang="ts">
import { Tooltip as TooltipPrimitive } from "bits-ui";
import { Tooltip as TooltipPrimitive } from 'bits-ui';
let {
delayDuration = 100,
...restProps
}: TooltipPrimitive.ProviderProps = $props();
let { delayDuration = 100, ...restProps }: TooltipPrimitive.ProviderProps = $props();
</script>
<TooltipPrimitive.Provider
{delayDuration}
{...restProps}
/>
<TooltipPrimitive.Provider {delayDuration} {...restProps} />
src/lib/components/ui/tooltip/tooltip-trigger.svelte
+3 -3
View File
@@ -1,6 +1,6 @@
<script lang="ts">
import { cn } from "$lib/utils.js";
import { Tooltip as TooltipPrimitive } from "bits-ui";
import { cn } from '$lib/utils.js';
import { Tooltip as TooltipPrimitive } from 'bits-ui';
let {
ref = $bindable(null),
@@ -12,6 +12,6 @@
<TooltipPrimitive.Trigger
bind:ref
data-slot="tooltip-trigger"
class={cn("", className)}
class={cn('', className)}
{...restProps}
/>
src/lib/components/ui/tooltip/tooltip.svelte
+1 -1
View File
@@ -1,5 +1,5 @@
<script lang="ts">
import { Tooltip as TooltipPrimitive } from "bits-ui";
import { Tooltip as TooltipPrimitive } from 'bits-ui';
let { open = $bindable(false), ...restProps }: TooltipPrimitive.RootProps = $props();
</script>
src/lib/themeData.ts
+1 -1
View File
@@ -177,7 +177,7 @@ export const resolveThemeDataValue = (
const { global, theme, screen, mode = 'osu', now = new Date() } = context;
const stats = global.user.stats[mode];
let value = '';
let value: string;
switch (field) {
case 'user.name':
value = global.user.name;
src/lib/themeIconCatalog.ts
+1 -6
View File
@@ -1,10 +1,5 @@
import { THEME_ICON_BODIES, type ThemeIconBody } from './themeIconData';
import {
DEFAULT_THEME_ICON_SET,
THEME_ICON_NAMES,
type ThemeIconName,
type ThemeIconSet,
} from './themeIcons';
import { DEFAULT_THEME_ICON_SET, THEME_ICON_NAMES, type ThemeIconSet } from './themeIcons';
import lucideCollection from '@iconify-json/lucide/icons.json';
import phCollection from '@iconify-json/ph/icons.json';
import tablerCollection from '@iconify-json/tabler/icons.json';
src/lib/themeIcons.ts
-2
View File
@@ -78,8 +78,6 @@ export const THEME_ICON_NAMES = [
export type ThemeIconName = (typeof THEME_ICON_NAMES)[number] | (string & {});
const ICON_NAME_SET = new Set<string>(THEME_ICON_NAMES);
export const isThemeIconName = (value: unknown): value is ThemeIconName =>
typeof value === 'string' && value.trim().length > 0 && value.length <= 120;
src/lib/themePreview.ts
+11 -5
View File
@@ -5,7 +5,6 @@ import {
themeGlobalData,
} from './themeData';
import { getThemeIconBody } from './themeIconCatalog';
import { THEME_ICON_BODIES } from './themeIconData';
import {
themeArcGeometry,
themeClockDate,
@@ -1215,7 +1214,7 @@ const drawFooter = (context: PreviewContext, chrome?: ThemeV2Chrome) => {
ctx.restore();
};
const getWidgetPlayerData = (context: PreviewContext) => {
const getWidgetPlayerData = (_context: PreviewContext) => {
const globalData = get(themeGlobalData);
const name = globalData?.user?.name || getThemeDataSampleValue('user.name') || 'Player';
const rank = globalData?.user?.stats?.osu?.rank
@@ -1318,8 +1317,7 @@ const drawWidgetElement = async (context: PreviewContext, element: ThemeV2Widget
} else if (element.widget === 'header') {
const { name } = getWidgetPlayerData(context);
const hour = new Date().getHours();
const timeGreeting =
hour < 12 ? 'Good morning' : hour < 18 ? 'Good afternoon' : 'Good evening';
const timeGreeting = hour < 12 ? 'Good morning' : hour < 18 ? 'Good afternoon' : 'Good evening';
const greeting = `${timeGreeting}, ${name}!`;
ctx.save();
@@ -1822,7 +1820,15 @@ const drawWidgetElement = async (context: PreviewContext, element: ThemeV2Widget
const badgeW = 24;
const badgeH = 20;
const badgeX = element.x + element.width - badgeW - 10;
fillRoundedRect(ctx, badgeX, centerY - badgeH / 2, badgeW, badgeH, 4, 'rgba(251, 191, 36, 0.2)');
fillRoundedRect(
ctx,
badgeX,
centerY - badgeH / 2,
badgeW,
badgeH,
4,
'rgba(251, 191, 36, 0.2)'
);
strokeRoundedRect(
ctx,
badgeX,
src/screens/Launch.svelte
+2 -10
View File
@@ -156,7 +156,6 @@
Clock,
ExternalLink,
Medal,
Sparkles,
TrendingDown,
TrendingUp,
Trophy,
@@ -650,7 +649,6 @@
userEvents.length === 0 ? 0 : Math.min(recentActivityIndex, userEvents.length - 1)
);
const activeEvent = $derived(userEvents[safeEventIndex]);
const latestEvent = $derived(activeEvent ?? userEvents[0]);
const timeGreeting = $derived.by(() => {
const hour = new Date().getHours();
@@ -2607,7 +2605,7 @@
<!-- Mini Feed of Recent Plays (clickable chips) -->
{#if userEvents.length > 1}
<div class="flex items-center gap-1.5 pt-0.5 overflow-x-auto no-scrollbar">
{#each userEvents.slice(0, 4) as event, idx}
{#each userEvents.slice(0, 4) as event, idx (`${event.time}-${idx}`)}
{@const eventGrade = gradeBadgeStyle(event.grade)}
<button
type="button"
@@ -3226,13 +3224,7 @@
variant="outline"
size="sm"
class="h-8 gap-1.5 px-3 text-xs shrink-0"
onclick={async () => {
try {
await invoke('open_presence_editor');
} catch {
presenceEditorOpen = true;
}
}}
onclick={openDiscordPresenceEditor}
>
<ThemeIcon name="palette" set={iconSet} class="size-3.5" />
Customize Activity