diff --git a/.prettierrc b/.prettierrc index 10d31c3..f371e21 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,5 +1,7 @@ { "useTabs": true, "tabWidth": 4, - "singleQuote": false + "singleQuote": false, + "plugins": ["prettier-plugin-svelte"], + "overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }] } diff --git a/src/app.html b/src/app.html index 7febd2a..75e8a49 100644 --- a/src/app.html +++ b/src/app.html @@ -4,12 +4,18 @@ - + - - - - + + + + %sveltekit.head% {#if dialogList.length > 0} -
- {#each dialogList as { id, title, message, buttons, type }, i} - {#if i === 0} - - {/if} - {/each} -
+
+ {#each dialogList as { id, title, message, buttons, type }, i} + {#if i === 0} + + {/if} + {/each} +
{/if} diff --git a/src/lib/components/layout/MobileLogo.svelte b/src/lib/components/layout/MobileLogo.svelte index 1336c6c..a438693 100644 --- a/src/lib/components/layout/MobileLogo.svelte +++ b/src/lib/components/layout/MobileLogo.svelte @@ -3,16 +3,16 @@
- -
-
- -
-
- -
\ No newline at end of file + +
+
+ +
+
+ + diff --git a/src/lib/components/layout/Navbar/Desktop.svelte b/src/lib/components/layout/Navbar/Desktop.svelte index 18b54aa..662e024 100644 --- a/src/lib/components/layout/Navbar/Desktop.svelte +++ b/src/lib/components/layout/Navbar/Desktop.svelte @@ -3,5 +3,5 @@ \ No newline at end of file + + diff --git a/src/lib/components/layout/Navbar/index.ts b/src/lib/components/layout/Navbar/index.ts index e7fc632..695ffbe 100644 --- a/src/lib/components/layout/Navbar/index.ts +++ b/src/lib/components/layout/Navbar/index.ts @@ -1,2 +1,2 @@ export { default as Desktop } from "./Desktop.svelte"; -export { default as Mobile } from "./Mobile.svelte"; \ No newline at end of file +export { default as Mobile } from "./Mobile.svelte"; diff --git a/src/lib/components/layout/PageContent.svelte b/src/lib/components/layout/PageContent.svelte index 1845511..8feab3a 100644 --- a/src/lib/components/layout/PageContent.svelte +++ b/src/lib/components/layout/PageContent.svelte @@ -5,7 +5,7 @@ import { quintOut } from "svelte/easing"; import { fly, fade } from "$lib/animation"; - let { children } = $props(); + let { children } = $props();
diff --git a/src/lib/components/layout/index.ts b/src/lib/components/layout/index.ts index b13e481..fc1ddc8 100644 --- a/src/lib/components/layout/index.ts +++ b/src/lib/components/layout/index.ts @@ -1,7 +1,7 @@ -export { default as UploadRegion } from './UploadRegion.svelte'; -export { default as Gradients } from './Gradients.svelte'; -export { default as Toasts } from './Toasts.svelte'; -export { default as Dialogs } from './Dialogs.svelte'; -export { default as PageContent } from './PageContent.svelte'; -export { default as MobileLogo } from './MobileLogo.svelte'; -export { default as Footer } from './Footer.svelte'; \ No newline at end of file +export { default as UploadRegion } from "./UploadRegion.svelte"; +export { default as Gradients } from "./Gradients.svelte"; +export { default as Toasts } from "./Toasts.svelte"; +export { default as Dialogs } from "./Dialogs.svelte"; +export { default as PageContent } from "./PageContent.svelte"; +export { default as MobileLogo } from "./MobileLogo.svelte"; +export { default as Footer } from "./Footer.svelte"; diff --git a/src/lib/converters/index.ts b/src/lib/converters/index.ts index 5c03d02..7a45877 100644 --- a/src/lib/converters/index.ts +++ b/src/lib/converters/index.ts @@ -48,7 +48,6 @@ categories.doc.formats = ?.supportedFormats.filter((f) => f.toSupported && f.isNative) .map((f) => f.name) || []; - export const byNative = (format: string) => { return (a: Converter, b: Converter) => { const aFormat = a.supportedFormats.find((f) => f.name === format); diff --git a/src/lib/converters/magick.svelte.ts b/src/lib/converters/magick.svelte.ts index 892e425..3846b1b 100644 --- a/src/lib/converters/magick.svelte.ts +++ b/src/lib/converters/magick.svelte.ts @@ -86,7 +86,7 @@ export class MagickConverter extends Converter { super(); log(["converters", this.name], `created converter`); if (!browser) return; - + this.status = "downloading"; log(["converters", this.name], `loading worker @ ${MagickWorker}`); @@ -114,7 +114,10 @@ export class MagickConverter extends Converter { let compression: number | undefined = args.at(0); if (!compression) { compression = Settings.instance.settings.magickQuality ?? 100; - log(["converters", this.name], `using user setting for quality: ${compression}%`); + log( + ["converters", this.name], + `using user setting for quality: ${compression}%`, + ); } log(["converters", this.name], `converting ${input.name} to ${to}`); @@ -138,7 +141,8 @@ export class MagickConverter extends Converter { } // every other format handled by magick worker - const keepMetadata: boolean = Settings.instance.settings.metadata ?? true; + const keepMetadata: boolean = + Settings.instance.settings.metadata ?? true; log(["converters", this.name], `keep metadata: ${keepMetadata}`); const msg = { type: "convert", diff --git a/src/lib/converters/vertd.svelte.ts b/src/lib/converters/vertd.svelte.ts index 52d1040..f837121 100644 --- a/src/lib/converters/vertd.svelte.ts +++ b/src/lib/converters/vertd.svelte.ts @@ -264,7 +264,7 @@ export class VertdConverter extends Converter { token: uploadRes.auth, to, speed, - keepMetadata + keepMetadata, }, }; ws.send(JSON.stringify(msg)); diff --git a/src/lib/logger/index.ts b/src/lib/logger/index.ts index ee414ba..985f76a 100644 --- a/src/lib/logger/index.ts +++ b/src/lib/logger/index.ts @@ -59,4 +59,4 @@ export const error = (prefix: string | string[], ...args: any[]) => { ), ...args, ); -} +}; diff --git a/src/lib/sections/about/Credits.svelte b/src/lib/sections/about/Credits.svelte index e95af6a..c8800d8 100644 --- a/src/lib/sections/about/Credits.svelte +++ b/src/lib/sections/about/Credits.svelte @@ -102,7 +102,10 @@ m["about.credits.github_description"](), ["/jpegify", GITHUB_URL_VERT], [false, true], - ["text-black dynadark:text-white", "text-blue-500 font-normal hover:underline"] + [ + "text-black dynadark:text-white", + "text-blue-500 font-normal hover:underline", + ], )}

{:else} diff --git a/src/lib/sections/about/Donate.svelte b/src/lib/sections/about/Donate.svelte index 6ff6a2f..0d1a87b 100644 --- a/src/lib/sections/about/Donate.svelte +++ b/src/lib/sections/about/Donate.svelte @@ -67,10 +67,7 @@ if (!res.ok) { paymentState = "prepay"; - addToast( - "error", - m["about.donate.payment_error"](), - ); + addToast("error", m["about.donate.payment_error"]()); return; } @@ -102,9 +99,9 @@ const period = submitResult.error.message?.endsWith(".") ? "" : "."; addToast( "error", - m["about.donate.payment_failed"]({ + m["about.donate.payment_failed"]({ message: submitResult.error.message || "", - period + period, }), ); enablePay = true; @@ -124,9 +121,9 @@ const period = res.error.message?.endsWith(".") ? "" : "."; addToast( "error", - m["about.donate.payment_failed"]({ + m["about.donate.payment_failed"]({ message: res.error.message || "", - period + period, }), ); } else { @@ -152,10 +149,7 @@ addToast("success", m["about.donate.thank_you"]()); break; default: - addToast( - "error", - m["about.donate.donation_error"](), - ); + addToast("error", m["about.donate.donation_error"]()); } goto("/about"); @@ -298,7 +292,9 @@ class="btn w-full h-12 bg-accent-red text-black rounded-full mt-4" onclick={donate} > - {m["about.donate.donate_amount"]({ amount: amount.toFixed(2) })} + {m["about.donate.donate_amount"]({ + amount: amount.toFixed(2), + })}
diff --git a/src/lib/sections/settings/Conversion.svelte b/src/lib/sections/settings/Conversion.svelte index 091af9d..19da89e 100644 --- a/src/lib/sections/settings/Conversion.svelte +++ b/src/lib/sections/settings/Conversion.svelte @@ -82,13 +82,16 @@ -
+

{m["settings.conversion.default_format_image"]()}

c.name === "vertd"); - // if (converter) converter.status = "not-ready"; + // if (converter) converter.status = "not-ready"; } return () => { @@ -71,7 +71,8 @@ "!text-muted": vertdCommit === "loading", })} > - {m["settings.vertd.status"]()} {vertdCommit + {m["settings.vertd.status"]()} + {vertdCommit ? vertdCommit === "loading" ? m["settings.vertd.loading"]() : m["settings.vertd.available"]({ commitId: vertdCommit }) @@ -83,10 +84,16 @@ {@html m["settings.vertd.description"]()}

- {@html link("vertd_link", m["settings.vertd.hosting_info"](), GITHUB_URL_VERTD)} + {@html link( + "vertd_link", + m["settings.vertd.hosting_info"](), + GITHUB_URL_VERTD, + )}

-

{m["settings.vertd.instance_url"]()}

+

+ {m["settings.vertd.instance_url"]()} +

-

{m["settings.vertd.conversion_speed"]()}

+

+ {m["settings.vertd.conversion_speed"]()} +

{m["settings.vertd.speed_description"]()}

@@ -113,7 +122,9 @@ selected={(() => { switch (settings.vertdSpeed) { case "verySlow": - return m["settings.vertd.speeds.very_slow"](); + return m[ + "settings.vertd.speeds.very_slow" + ](); case "slower": return m["settings.vertd.speeds.slower"](); case "slow": @@ -123,7 +134,9 @@ case "fast": return m["settings.vertd.speeds.fast"](); case "ultraFast": - return m["settings.vertd.speeds.ultra_fast"](); + return m[ + "settings.vertd.speeds.ultra_fast" + ](); } })()} onselect={(selected) => { diff --git a/src/lib/store/DialogProvider.ts b/src/lib/store/DialogProvider.ts index a66934d..fa12840 100644 --- a/src/lib/store/DialogProvider.ts +++ b/src/lib/store/DialogProvider.ts @@ -34,7 +34,7 @@ function addDialog( }; dialogs.update((currentDialogs) => [...currentDialogs, newDialog]); - return id; + return id; } function removeDialog(id: number) { diff --git a/src/lib/types/index.ts b/src/lib/types/index.ts index dc857ca..a69c1a0 100644 --- a/src/lib/types/index.ts +++ b/src/lib/types/index.ts @@ -1,3 +1,3 @@ export * from "./file.svelte"; export * from "./util"; -export * from "./conversion-worker"; \ No newline at end of file +export * from "./conversion-worker"; diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index fb98968..d20ed6b 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -57,8 +57,7 @@ formats: getSupportedFormats("vertd"), icon: Film, title: m["upload.cards.video"](), - status: - $vertdLoaded === true ? "ready" : "not-ready", // not using converter.status for this + status: $vertdLoaded === true ? "ready" : "not-ready", // not using converter.status for this }, }); diff --git a/src/routes/about/+page.svelte b/src/routes/about/+page.svelte index 1437ef6..5ff0993 100644 --- a/src/routes/about/+page.svelte +++ b/src/routes/about/+page.svelte @@ -90,7 +90,7 @@ const excludedNames = new Set([ ...mainContribs.map((c) => c.github.split("/").pop()), ...notableContribs.map((c) => c.github.split("/").pop()), - "Z2r-YT" + "Z2r-YT", ]); const filteredContribs = allContribs.filter( diff --git a/src/routes/convert/+page.svelte b/src/routes/convert/+page.svelte index c4dbcf7..296ee30 100644 --- a/src/routes/convert/+page.svelte +++ b/src/routes/convert/+page.svelte @@ -271,7 +271,7 @@ })}

- {:else if (isVideo && $vertdLoaded) && (!isAudio && !isImage && !isDocument)} + {:else if isVideo && $vertdLoaded && !isAudio && !isImage && !isDocument}