From c1c821d7030c8189cd7b44c3375054b617bb2fe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Majdand=C5=BEi=C4=87?= Date: Wed, 12 Jun 2024 00:03:25 +0200 Subject: [PATCH] Code format --- src/App.svelte | 1 - src/lib/database/food.ts | 5 +- src/lib/ipc.ts | 18 +++--- src/lib/router/Router.svelte | 18 +++--- src/lib/router/routes/Home.svelte | 20 +++---- src/lib/router/routes/IPC.svelte | 12 ++-- src/lib/router/routes/Versions.svelte | 57 +++++++++--------- src/lib/utils.ts | 84 +++++++++++++-------------- 8 files changed, 107 insertions(+), 108 deletions(-) diff --git a/src/App.svelte b/src/App.svelte index 561e276..aafff2b 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -4,7 +4,6 @@ import { onMount } from 'svelte' import { type Food, FoodService } from '$lib/database/food' - import type { Writable } from 'svelte/store' let food: Food[] = [] onMount(async () => { diff --git a/src/lib/database/food.ts b/src/lib/database/food.ts index 124411c..3b60ce7 100644 --- a/src/lib/database/food.ts +++ b/src/lib/database/food.ts @@ -12,7 +12,8 @@ const FoodService = { async GetAll() { return await db.select('SELECT rowid, food, amount, per100, energy FROM food ORDER BY date DESC') }, - async SetAll(data: Food[]) {} + async SetAll(data: Food[]) { + } } -export {FoodService} +export { FoodService } diff --git a/src/lib/ipc.ts b/src/lib/ipc.ts index 3796316..c6dbde9 100644 --- a/src/lib/ipc.ts +++ b/src/lib/ipc.ts @@ -2,28 +2,26 @@ // This file was generated by [tauri-specta](https://github.com/oscartbeaumont/tauri-specta). Do not edit this file manually. declare global { - interface Window { - __TAURI_INVOKE__(cmd: string, args?: Record): Promise; - } + interface Window { + __TAURI_INVOKE__(cmd: string, args?: Record): Promise; + } } // Function avoids 'window not defined' in SSR -const invoke = () => window.__TAURI_INVOKE__; +const invoke = () => window.__TAURI_INVOKE__ export function helloTauri() { - return invoke()("hello_tauri") + return invoke()('hello_tauri') } export function hash256sum(hashInput: string) { - return invoke()("hash256sum", { hashInput }) + return invoke()('hash256sum', { hashInput }) } export function storeSetKey(key: string, value: string) { - return invoke()("store_set_key", { key,value }) + return invoke()('store_set_key', { key, value }) } export function storeReadKey(key: string) { - return invoke()("store_read_key", { key }) + return invoke()('store_read_key', { key }) } - - diff --git a/src/lib/router/Router.svelte b/src/lib/router/Router.svelte index b7e8737..e3f4446 100644 --- a/src/lib/router/Router.svelte +++ b/src/lib/router/Router.svelte @@ -1,15 +1,15 @@ diff --git a/src/lib/router/routes/Home.svelte b/src/lib/router/routes/Home.svelte index 1a1c572..b4fe411 100644 --- a/src/lib/router/routes/Home.svelte +++ b/src/lib/router/routes/Home.svelte @@ -1,14 +1,14 @@
-

Welcome

-

- This is a   - - svelte logo +

Welcome

+

+ This is a   + + svelte logo -  -  - - svelte logo +  -  + + svelte logo -   Template -

+   Template +

diff --git a/src/lib/router/routes/IPC.svelte b/src/lib/router/routes/IPC.svelte index e9b7e36..a2be0b0 100644 --- a/src/lib/router/routes/IPC.svelte +++ b/src/lib/router/routes/IPC.svelte @@ -1,11 +1,11 @@
- - - + + +
diff --git a/src/lib/router/routes/Versions.svelte b/src/lib/router/routes/Versions.svelte index a3c9cd3..26931a6 100644 --- a/src/lib/router/routes/Versions.svelte +++ b/src/lib/router/routes/Versions.svelte @@ -1,34 +1,35 @@
-

Versions

-
    - {#await getVersions() then versions} - {#each Object.entries(versions) as [key, val]} -
  • - {key} - {val} -
  • - {/each} - {/await} -
+

Versions

+
    + {#await getVersions() then versions} + {#each Object.entries(versions) as [key, val]} +
  • + {key} - {val} +
  • + {/each} + {/await} +
diff --git a/src/lib/utils.ts b/src/lib/utils.ts index fd20585..2299e58 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -4,59 +4,59 @@ import { cubicOut } from 'svelte/easing' import type { TransitionConfig } from 'svelte/transition' export function cn(...inputs: ClassValue[]) { - return twMerge(clsx(inputs)) + return twMerge(clsx(inputs)) } type FlyAndScaleParams = { - y?: number - x?: number - start?: number - duration?: number + y?: number + x?: number + start?: number + duration?: number } export const flyAndScale = ( - node: Element, - params: FlyAndScaleParams = { y: -8, x: 0, start: 0.95, duration: 150 } + node: Element, + params: FlyAndScaleParams = { y: -8, x: 0, start: 0.95, duration: 150 } ): TransitionConfig => { - const style = getComputedStyle(node) - const transform = style.transform === 'none' ? '' : style.transform + const style = getComputedStyle(node) + const transform = style.transform === 'none' ? '' : style.transform - const scaleConversion = ( - valueA: number, - scaleA: [number, number], - scaleB: [number, number] - ) => { - const [minA, maxA] = scaleA - const [minB, maxB] = scaleB + const scaleConversion = ( + valueA: number, + scaleA: [number, number], + scaleB: [number, number] + ) => { + const [minA, maxA] = scaleA + const [minB, maxB] = scaleB - const percentage = (valueA - minA) / (maxA - minA) - const valueB = percentage * (maxB - minB) + minB + const percentage = (valueA - minA) / (maxA - minA) + const valueB = percentage * (maxB - minB) + minB - return valueB - } + return valueB + } - const styleToString = ( - style: Record - ): string => { - return Object.keys(style).reduce((str, key) => { - if (style[key] === undefined) return str - return str + `${key}:${style[key]};` - }, '') - } + const styleToString = ( + style: Record + ): string => { + return Object.keys(style).reduce((str, key) => { + if (style[key] === undefined) return str + return str + `${key}:${style[key]};` + }, '') + } - return { - duration: params.duration ?? 200, - delay: 0, - css: t => { - const y = scaleConversion(t, [0, 1], [params.y ?? 5, 0]) - const x = scaleConversion(t, [0, 1], [params.x ?? 0, 0]) - const scale = scaleConversion(t, [0, 1], [params.start ?? 0.95, 1]) + return { + duration: params.duration ?? 200, + delay: 0, + css: t => { + const y = scaleConversion(t, [0, 1], [params.y ?? 5, 0]) + const x = scaleConversion(t, [0, 1], [params.x ?? 0, 0]) + const scale = scaleConversion(t, [0, 1], [params.start ?? 0.95, 1]) - return styleToString({ - transform: `${transform} translate3d(${x}px, ${y}px, 0) scale(${scale})`, - opacity: t - }) - }, - easing: cubicOut - } + return styleToString({ + transform: `${transform} translate3d(${x}px, ${y}px, 0) scale(${scale})`, + opacity: t + }) + }, + easing: cubicOut + } }