chore: prettier format

This commit is contained in:
Maya 2025-09-10 10:38:14 +03:00
parent 2dafc0f730
commit 1710cd038e
No known key found for this signature in database
24 changed files with 130 additions and 102 deletions

View File

@ -1,5 +1,7 @@
{
"useTabs": true,
"tabWidth": 4,
"singleQuote": false
"singleQuote": false,
"plugins": ["prettier-plugin-svelte"],
"overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }]
}

View File

@ -4,12 +4,18 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="icon" href="%sveltekit.assets%/favicon.png" />
<link rel="apple-touch-icon" href="%sveltekit.assets%/favicon.png">
<link rel="apple-touch-icon" href="%sveltekit.assets%/favicon.png" />
<link rel="apple-touch-startup-image" href="%sveltekit.assets%/lettermark.jpg">
<meta name="mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
<link
rel="apple-touch-startup-image"
href="%sveltekit.assets%/lettermark.jpg"
/>
<meta name="mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta
name="apple-mobile-web-app-status-bar-style"
content="black-translucent"
/>
%sveltekit.head%
<script>
@ -34,8 +40,8 @@
// Lock dark reader if it's set to dark mode
if (theme === "dark") {
const lock = document.createElement('meta');
lock.name = 'darkreader-lock';
const lock = document.createElement("meta");
lock.name = "darkreader-lock";
document.head.appendChild(lock);
}
})();

View File

@ -1,15 +1,18 @@
import type { Handle } from '@sveltejs/kit';
import { paraglideMiddleware } from '$lib/paraglide/server';
import type { Handle } from "@sveltejs/kit";
import { paraglideMiddleware } from "$lib/paraglide/server";
// creating a handle to use the paraglide middleware
const paraglideHandle: Handle = ({ event, resolve }) =>
paraglideMiddleware(event.request, ({ request: localizedRequest, locale }) => {
event.request = localizedRequest;
return resolve(event, {
transformPageChunk: ({ html }) => {
return html.replace('%lang%', locale);
}
});
});
paraglideMiddleware(
event.request,
({ request: localizedRequest, locale }) => {
event.request = localizedRequest;
return resolve(event, {
transformPageChunk: ({ html }) => {
return html.replace("%lang%", locale);
},
});
},
);
export const handle: Handle = paraglideHandle;
export const handle: Handle = paraglideHandle;

View File

@ -1,6 +1,6 @@
import type { Reroute } from '@sveltejs/kit';
import { deLocalizeUrl } from '$lib/paraglide/runtime';
import type { Reroute } from "@sveltejs/kit";
import { deLocalizeUrl } from "$lib/paraglide/runtime";
export const reroute: Reroute = (request) => {
return deLocalizeUrl(request.url).pathname;
};
};

View File

@ -102,7 +102,7 @@
{m["upload.uploader.text"]({
action: jpegify
? m["upload.uploader.jpegify"]()
: m["upload.uploader.convert"]()
: m["upload.uploader.convert"](),
})}
</h2>
</Panel>

View File

@ -15,21 +15,21 @@
</script>
{#if dialogList.length > 0}
<div
class="fixed inset-0 flex items-center justify-center bg-black bg-opacity-50 backdrop-blur-sm z-40"
in:fade={{
duration,
easing: quintOut,
}}
out:fade={{
duration,
easing: quintOut,
}}
>
{#each dialogList as { id, title, message, buttons, type }, i}
{#if i === 0}
<Dialog {id} {title} {message} {buttons} {type} />
{/if}
{/each}
</div>
<div
class="fixed inset-0 flex items-center justify-center bg-black bg-opacity-50 backdrop-blur-sm z-40"
in:fade={{
duration,
easing: quintOut,
}}
out:fade={{
duration,
easing: quintOut,
}}
>
{#each dialogList as { id, title, message, buttons, type }, i}
{#if i === 0}
<Dialog {id} {title} {message} {buttons} {type} />
{/if}
{/each}
</div>
{/if}

View File

@ -3,16 +3,16 @@
</script>
<div class="flex md:hidden justify-center items-center pb-8 pt-4">
<a
class="flex items-center justify-center bg-panel p-2 rounded-[20px] shadow-panel"
href="/"
>
<div
class="h-14 bg-accent rounded-[14px] flex items-center justify-center"
>
<div class="w-28 h-5">
<Logo />
</div>
</div>
</a>
</div>
<a
class="flex items-center justify-center bg-panel p-2 rounded-[20px] shadow-panel"
href="/"
>
<div
class="h-14 bg-accent rounded-[14px] flex items-center justify-center"
>
<div class="w-28 h-5">
<Logo />
</div>
</div>
</a>
</div>

View File

@ -3,5 +3,5 @@
</script>
<div class="hidden md:flex p-8 w-screen justify-center">
<Navbar />
</div>
<Navbar />
</div>

View File

@ -1,2 +1,2 @@
export { default as Desktop } from "./Desktop.svelte";
export { default as Mobile } from "./Mobile.svelte";
export { default as Mobile } from "./Mobile.svelte";

View File

@ -5,7 +5,7 @@
import { quintOut } from "svelte/easing";
import { fly, fade } from "$lib/animation";
let { children } = $props();
let { children } = $props();
</script>
<div class="grid grid-rows-1 grid-cols-1 h-full flex-grow">

View File

@ -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';
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";

View File

@ -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);

View File

@ -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",

View File

@ -264,7 +264,7 @@ export class VertdConverter extends Converter {
token: uploadRes.auth,
to,
speed,
keepMetadata
keepMetadata,
},
};
ws.send(JSON.stringify(msg));

View File

@ -59,4 +59,4 @@ export const error = (prefix: string | string[], ...args: any[]) => {
),
...args,
);
}
};

View File

@ -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",
],
)}
</p>
{:else}

View File

@ -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),
})}
</button>
</div>
</div>

View File

@ -82,13 +82,16 @@
</button>
</div>
</div>
<div class="grid gap-3 grid-cols-2 md:grid-cols-4" class:opacity-50={!settings.useDefaultFormat}>
<div
class="grid gap-3 grid-cols-2 md:grid-cols-4"
class:opacity-50={!settings.useDefaultFormat}
>
<div class="flex flex-col gap-2">
<p class="text-sm font-bold">
{m["settings.conversion.default_format_image"]()}
</p>
<FormatDropdown
categories={{image: categories.image}}
categories={{ image: categories.image }}
from={".png"}
bind:selected={settings.defaultFormat.image}
disabled={!settings.useDefaultFormat}
@ -99,7 +102,7 @@
{m["settings.conversion.default_format_audio"]()}
</p>
<FormatDropdown
categories={{audio: categories.audio}}
categories={{ audio: categories.audio }}
from={".mp3"}
bind:selected={settings.defaultFormat.audio}
disabled={!settings.useDefaultFormat}
@ -110,7 +113,7 @@
{m["settings.conversion.default_format_video"]()}
</p>
<FormatDropdown
categories={{video: categories.video}}
categories={{ video: categories.video }}
from={".mp4"}
bind:selected={settings.defaultFormat.video}
disabled={!settings.useDefaultFormat}
@ -121,7 +124,7 @@
{m["settings.conversion.default_format_document"]()}
</p>
<FormatDropdown
categories={{doc: categories.doc}}
categories={{ doc: categories.doc }}
from={".docx"}
bind:selected={settings.defaultFormat.document}
disabled={!settings.useDefaultFormat}

View File

@ -45,7 +45,7 @@
vertdCommit = null;
vertdLoaded.set(false);
// const converter = converters.find((c) => 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"]()}
</p>
<p class="text-sm text-muted font-normal">
{@html link("vertd_link", m["settings.vertd.hosting_info"](), GITHUB_URL_VERTD)}
{@html link(
"vertd_link",
m["settings.vertd.hosting_info"](),
GITHUB_URL_VERTD,
)}
</p>
<div class="flex flex-col gap-2">
<p class="text-base font-bold">{m["settings.vertd.instance_url"]()}</p>
<p class="text-base font-bold">
{m["settings.vertd.instance_url"]()}
</p>
<input
type="text"
placeholder={m["settings.vertd.url_placeholder"]()}
@ -95,7 +102,9 @@
</div>
<div class="flex flex-col gap-4">
<div class="flex flex-col gap-2">
<p class="text-base font-bold">{m["settings.vertd.conversion_speed"]()}</p>
<p class="text-base font-bold">
{m["settings.vertd.conversion_speed"]()}
</p>
<p class="text-sm text-muted font-normal">
{m["settings.vertd.speed_description"]()}
</p>
@ -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) => {

View File

@ -34,7 +34,7 @@ function addDialog(
};
dialogs.update((currentDialogs) => [...currentDialogs, newDialog]);
return id;
return id;
}
function removeDialog(id: number) {

View File

@ -1,3 +1,3 @@
export * from "./file.svelte";
export * from "./util";
export * from "./conversion-worker";
export * from "./conversion-worker";

View File

@ -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
},
});

View File

@ -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(

View File

@ -271,7 +271,7 @@
})}
</p>
</div>
{:else if (isVideo && $vertdLoaded) && (!isAudio && !isImage && !isDocument)}
{:else if isVideo && $vertdLoaded && !isAudio && !isImage && !isDocument}
<div
class="h-full flex flex-col text-center justify-center text-failure"
>