From 11ece69e006b446b9ca4e06eb5af5662bc811469 Mon Sep 17 00:00:00 2001 From: Matt Strapp Date: Fri, 29 Sep 2023 10:11:33 -0500 Subject: Formatting Signed-off-by: Matt Strapp --- app/.eslintrc.cjs | 16 ++++----- app/.prettierrc | 3 +- app/postcss.config.cjs | 6 ++-- app/src/app.d.ts | 2 +- app/src/app.html | 1 + app/src/hooks.server.ts | 18 +++++----- app/src/lib/svelte/Navigation.svelte | 20 ++++++------ app/src/lib/svelte/ReloadPrompt.svelte | 60 ++++++++++++++++------------------ app/src/lib/ts/download.ts | 32 +++++++++--------- app/src/lib/ts/truncate.worker.ts | 14 ++++---- app/src/lib/types/truncate-worker.ts | 10 +++--- app/src/routes/+layout.svelte | 24 +++++++------- app/src/routes/+layout.ts | 2 +- app/src/routes/+page.svelte | 9 +++-- app/src/routes/truncate/+page.svelte | 48 +++++++++++++-------------- app/svelte.config.js | 12 +++---- app/tailwind.config.ts | 28 ++++++++-------- app/tsconfig.json | 7 ++-- app/vite.config.ts | 32 +++++++++--------- 19 files changed, 173 insertions(+), 171 deletions(-) (limited to 'app') diff --git a/app/.eslintrc.cjs b/app/.eslintrc.cjs index 4b29a01..aa4b532 100644 --- a/app/.eslintrc.cjs +++ b/app/.eslintrc.cjs @@ -4,27 +4,27 @@ module.exports = { 'eslint:recommended', 'plugin:@typescript-eslint/recommended', 'plugin:svelte/recommended', - 'prettier' + 'prettier', ], parser: '@typescript-eslint/parser', plugins: ['@typescript-eslint'], parserOptions: { sourceType: 'module', ecmaVersion: 2020, - extraFileExtensions: ['.svelte'] + extraFileExtensions: ['.svelte'], }, env: { browser: true, es2017: true, - node: true + node: true, }, overrides: [ { files: ['*.svelte'], parser: 'svelte-eslint-parser', parserOptions: { - parser: '@typescript-eslint/parser' - } - } - ] -}; + parser: '@typescript-eslint/parser', + }, + }, + ], +} diff --git a/app/.prettierrc b/app/.prettierrc index 0580f3e..0a1cfd7 100644 --- a/app/.prettierrc +++ b/app/.prettierrc @@ -1,7 +1,8 @@ { "useTabs": false, "singleQuote": true, - "trailingComma": "none", + "semi": false, + "trailingComma": "es5", "printWidth": 100, "plugins": ["prettier-plugin-svelte"], "overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }] diff --git a/app/postcss.config.cjs b/app/postcss.config.cjs index 5cbc2c7..33ad091 100644 --- a/app/postcss.config.cjs +++ b/app/postcss.config.cjs @@ -1,6 +1,6 @@ module.exports = { plugins: { tailwindcss: {}, - autoprefixer: {} - } -}; + autoprefixer: {}, + }, +} diff --git a/app/src/app.d.ts b/app/src/app.d.ts index bf2855f..bbacd79 100644 --- a/app/src/app.d.ts +++ b/app/src/app.d.ts @@ -2,7 +2,7 @@ // for information about these interfaces // and what to do when importing types -import 'vite-plugin-pwa/info'; +import 'vite-plugin-pwa/info' declare namespace App { // interface Locals {} diff --git a/app/src/app.html b/app/src/app.html index 4950b86..2ce4c3b 100644 --- a/app/src/app.html +++ b/app/src/app.html @@ -7,6 +7,7 @@ %sveltekit.head% +
%sveltekit.body%
diff --git a/app/src/hooks.server.ts b/app/src/hooks.server.ts index bf7121a..3abdfb3 100644 --- a/app/src/hooks.server.ts +++ b/app/src/hooks.server.ts @@ -1,5 +1,5 @@ -import { minify } from 'html-minifier-terser'; -import { building } from '$app/environment'; +import { minify } from 'html-minifier-terser' +import { building } from '$app/environment' const minification_options = { collapseBooleanAttributes: true, @@ -18,19 +18,19 @@ const minification_options = { removeScriptTypeAttributes: true, removeStyleLinkTypeAttributes: true, sortAttributes: true, - sortClassName: true -}; + sortClassName: true, +} /** @type {import('@sveltejs/kit').Handle} */ export async function handle({ event, resolve }) { - let page = ''; + let page = '' return resolve(event, { transformPageChunk: ({ html, done }) => { - page += html; + page += html if (done) { - return building ? minify(page, minification_options) : page; + return building ? minify(page, minification_options) : page } - } - }); + }, + }) } diff --git a/app/src/lib/svelte/Navigation.svelte b/app/src/lib/svelte/Navigation.svelte index 9246c28..fa9182f 100644 --- a/app/src/lib/svelte/Navigation.svelte +++ b/app/src/lib/svelte/Navigation.svelte @@ -1,22 +1,22 @@ diff --git a/app/src/lib/svelte/ReloadPrompt.svelte b/app/src/lib/svelte/ReloadPrompt.svelte index d54a202..e6effbb 100644 --- a/app/src/lib/svelte/ReloadPrompt.svelte +++ b/app/src/lib/svelte/ReloadPrompt.svelte @@ -1,34 +1,32 @@ \ No newline at end of file + const { updateServiceWorker } = useRegisterSW({ + onRegisteredSW(r) { + console.log('SW Registered: ', r) + }, + onNeedRefresh() { + toastStore.trigger({ + message: 'A new version of the application is available.', + autohide: false, + action: { + label: 'Refresh', + response: updateServiceWorker, + }, + }) + }, + onOfflineReady() { + toastStore.trigger({ + background: 'variant-filled-success', + message: 'Now ready for offline use!', + timeout: 5000, + }) + }, + onRegisterError(err) { + console.error('SW Registration Error: ', err) + }, + }) + diff --git a/app/src/lib/ts/download.ts b/app/src/lib/ts/download.ts index c3e98b0..48debec 100644 --- a/app/src/lib/ts/download.ts +++ b/app/src/lib/ts/download.ts @@ -5,33 +5,33 @@ export default async function saveFile(blob: ArrayBuffer, suggestedName: string 'showSaveFilePicker' in window && (() => { try { - return window.self === window.top; + return window.self === window.top } catch { - return false; + return false } - })(); + })() if (supportsFSAccess) { try { const handle = await window.showSaveFilePicker({ - suggestedName: suggestedName - }); - const writable = await handle.createWritable(); - await writable.write(blob); - await writable.close(); - return; + suggestedName: suggestedName, + }) + const writable = await handle.createWritable() + await writable.write(blob) + await writable.close() + return } catch (err: unknown) { // TypeScript if ((err as Error)?.name !== 'AbortError') { - return Promise.reject(err); + return Promise.reject(err) } } } else { - const anchor = document.createElement('a'); - anchor.download = suggestedName ?? 'truncated'; - anchor.href = URL.createObjectURL(new Blob([blob])); - anchor.click(); - URL.revokeObjectURL(anchor.href); - document.body.removeChild(anchor); + const anchor = document.createElement('a') + anchor.download = suggestedName ?? 'truncated' + anchor.href = URL.createObjectURL(new Blob([blob])) + anchor.click() + URL.revokeObjectURL(anchor.href) + document.body.removeChild(anchor) } } diff --git a/app/src/lib/ts/truncate.worker.ts b/app/src/lib/ts/truncate.worker.ts index 9ddf63c..da75041 100644 --- a/app/src/lib/ts/truncate.worker.ts +++ b/app/src/lib/ts/truncate.worker.ts @@ -1,9 +1,9 @@ -import type { TruncateRequest, TruncateResponse } from '../types/truncate-worker'; +import type { TruncateRequest, TruncateResponse } from '../types/truncate-worker' onmessage = async (message: MessageEvent) => { - console.log('File received. Truncating...'); - const file = message.data.file; - const buffer = await file.arrayBuffer(); - const truncated = buffer.slice(0, message.data.size); - postMessage({ file: truncated } as TruncateResponse); -}; + console.log('File received. Truncating...') + const file = message.data.file + const buffer = await file.arrayBuffer() + const truncated = buffer.slice(0, message.data.size) + postMessage({ file: truncated } as TruncateResponse) +} diff --git a/app/src/lib/types/truncate-worker.ts b/app/src/lib/types/truncate-worker.ts index 7052d17..2691ccb 100644 --- a/app/src/lib/types/truncate-worker.ts +++ b/app/src/lib/types/truncate-worker.ts @@ -1,8 +1,8 @@ export type TruncateRequest = { - file: File; - size: number; -}; + file: File + size: number +} export type TruncateResponse = { - file: ArrayBuffer; -}; + file: ArrayBuffer +} diff --git a/app/src/routes/+layout.svelte b/app/src/routes/+layout.svelte index 087465b..df0f707 100644 --- a/app/src/routes/+layout.svelte +++ b/app/src/routes/+layout.svelte @@ -1,34 +1,34 @@ diff --git a/app/src/routes/+layout.ts b/app/src/routes/+layout.ts index 189f71e..176ae64 100644 --- a/app/src/routes/+layout.ts +++ b/app/src/routes/+layout.ts @@ -1 +1 @@ -export const prerender = true; +export const prerender = true diff --git a/app/src/routes/+page.svelte b/app/src/routes/+page.svelte index e34c31e..123282c 100644 --- a/app/src/routes/+page.svelte +++ b/app/src/routes/+page.svelte @@ -1,15 +1,14 @@ - Coming Soon(TM) + Coming Soon(TM)
-
-

Welcome to a placeholder.

-
+
+

Welcome to a placeholder.

+
diff --git a/app/src/routes/truncate/+page.svelte b/app/src/routes/truncate/+page.svelte index 635b6bc..6db6d25 100644 --- a/app/src/routes/truncate/+page.svelte +++ b/app/src/routes/truncate/+page.svelte @@ -1,36 +1,36 @@