From fc6fc097e9091329ad8c20e50fe142a978343dcf Mon Sep 17 00:00:00 2001 From: bytedream Date: Thu, 30 Nov 2023 23:25:04 +0100 Subject: [PATCH] lint --- src/lib/server/database.ts | 1 + src/routes/admin/admin/+page.svelte | 1 + src/routes/admin/admin/+server.ts | 9 +-------- src/routes/admin/reports/+page.svelte | 2 ++ src/routes/admin/settings/+page.server.ts | 1 + src/routes/admin/users/+page.svelte | 8 ++++++-- src/routes/register/Register.svelte | 1 - 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/lib/server/database.ts b/src/lib/server/database.ts index 9208493..dbcc9e7 100644 --- a/src/lib/server/database.ts +++ b/src/lib/server/database.ts @@ -110,6 +110,7 @@ export class Settings extends Model { @Column({ type: DataTypes.STRING, allowNull: false, + // eslint-disable-next-line @typescript-eslint/no-explicit-any get(this: Settings): any { const value = this.getDataValue('value'); return value != null ? JSON.parse(value) : null; diff --git a/src/routes/admin/admin/+page.svelte b/src/routes/admin/admin/+page.svelte index 94d1c16..30efc5d 100644 --- a/src/routes/admin/admin/+page.svelte +++ b/src/routes/admin/admin/+page.svelte @@ -8,6 +8,7 @@ import ErrorToast from '$lib/components/Toast/ErrorToast.svelte'; import { buttonTriggeredRequest } from '$lib/components/utils'; import { goto } from '$app/navigation'; + // eslint-disable-next-line @typescript-eslint/no-unused-vars import { adminCount } from '$lib/stores'; let allPermissionBadges = { diff --git a/src/routes/admin/admin/+server.ts b/src/routes/admin/admin/+server.ts index 732c748..d99a432 100644 --- a/src/routes/admin/admin/+server.ts +++ b/src/routes/admin/admin/+server.ts @@ -1,14 +1,7 @@ import type { RequestHandler } from '@sveltejs/kit'; import { Permissions } from '$lib/permissions'; -import { - addSession, - deleteAllUserSessions, - deleteSession, - getSession, - updateAllUserSessions -} from '$lib/server/session'; +import { deleteAllUserSessions, getSession, updateAllUserSessions } from '$lib/server/session'; import { Admin } from '$lib/server/database'; -import { env as publicEnv } from '$env/dynamic/public'; export const POST = (async ({ request, cookies }) => { if (getSession(cookies, { permissions: [Permissions.AdminWrite] }) == null) { diff --git a/src/routes/admin/reports/+page.svelte b/src/routes/admin/reports/+page.svelte index 032819f..523926a 100644 --- a/src/routes/admin/reports/+page.svelte +++ b/src/routes/admin/reports/+page.svelte @@ -7,6 +7,7 @@ import Select from '$lib/components/Input/Select.svelte'; import Input from '$lib/components/Input/Input.svelte'; import Textarea from '$lib/components/Input/Textarea.svelte'; + // eslint-disable-next-line @typescript-eslint/no-unused-vars import { reportCount } from '$lib/stores'; import HeaderBar from './HeaderBar.svelte'; import { MagnifyingGlass, Plus, Share } from 'svelte-heros-v2'; @@ -19,6 +20,7 @@ export let data: PageData; let currentPageReports: (typeof Report.prototype.dataValues)[] = []; + // eslint-disable-next-line @typescript-eslint/no-explicit-any let currentPageReportsRequest: Promise = Promise.resolve(); let reportsPerPage = 50; let reportPage = 0; diff --git a/src/routes/admin/settings/+page.server.ts b/src/routes/admin/settings/+page.server.ts index 87b4324..495a1bc 100644 --- a/src/routes/admin/settings/+page.server.ts +++ b/src/routes/admin/settings/+page.server.ts @@ -16,6 +16,7 @@ export const load: PageServerLoad = async ({ parent, cookies }) => { (prev, curr) => { return { ...prev, [curr.key]: curr.value }; }, + // eslint-disable-next-line @typescript-eslint/no-explicit-any {} as { [key: string]: any } ); diff --git a/src/routes/admin/users/+page.svelte b/src/routes/admin/users/+page.svelte index 9185cd9..e5e67d8 100644 --- a/src/routes/admin/users/+page.svelte +++ b/src/routes/admin/users/+page.svelte @@ -41,8 +41,10 @@ } $: fetchPageUsers(userPage); - // prettier-ignore - function fetchFilterPageUsers(_: any) { userPage == 0 ? fetchPageUsers(0) : userPage = 0 } + // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars + function fetchFilterPageUsers(_: any) { + userPage == 0 ? fetchPageUsers(0) : (userPage = 0); + } $: fetchFilterPageUsers(userFilter); let sortKey: string | null = null; @@ -118,6 +120,7 @@ {#key currentPageUsersRequest} + {#await currentPageUsersRequest then _} {#each currentPageUsers as user, i} @@ -210,6 +213,7 @@
+ {#each Array(currentPageUsers.length === usersPerPage || userPage > 0 ? Math.ceil(data.count / usersPerPage) || 1 : 1) as _, i}