From a392a542ee5580b840529a7f24ec4d592f9755e4 Mon Sep 17 00:00:00 2001 From: me-it-is <188520719+me-it-is@users.noreply.github.com> Date: Fri, 23 Oct 2026 12:04:41 -0700 Subject: [PATCH 1/3] switch from $ aliases to # --- package.json | 14 +++++++++++++- src/app.d.ts | 4 ++-- src/hooks.server.ts | 8 ++++---- src/lib/auth/permissions.ts | 4 ++-- src/lib/auth/session.ts | 6 +++--- src/lib/components/ContactForm.svelte | 14 +++++++------- src/lib/components/ErrorPage.svelte | 2 +- src/lib/components/SectionHeader.svelte | 2 +- .../components/admin/EditableItemList.svelte | 8 ++++---- .../components/info/BellScheduleTable.svelte | 4 ++-- .../components/info/BellScheduleTabs.svelte | 8 ++++---- .../components/info/BoardNoteContent.svelte | 2 +- src/lib/components/info/BulletinBoard.svelte | 6 +++--- src/lib/components/info/LinkCardContent.svelte | 2 +- src/lib/components/info/LinkCardList.svelte | 6 +++--- src/lib/db/s3.ts | 2 +- src/lib/models/basicModels.ts | 2 +- src/lib/models/sessionModel.ts | 4 ++-- src/lib/types/session.ts | 2 +- src/lib/util/adminApiClient.ts | 2 +- src/routes/(public)/+error.svelte | 2 +- src/routes/(public)/+layout.ts | 4 ++-- src/routes/(public)/+page.svelte | 6 +++--- src/routes/(public)/+page.ts | 6 +++--- src/routes/(public)/Footer.svelte | 4 ++-- src/routes/(public)/Header.svelte | 2 +- src/routes/(public)/QuickLinks.svelte | 18 +++++++++--------- src/routes/(public)/about/+page.svelte | 12 ++++++------ src/routes/(public)/clubs/+page.ts | 2 +- src/routes/(public)/clubs/ClubList.svelte | 6 +++--- src/routes/(public)/discord/+page.svelte | 8 ++++---- src/routes/(public)/extra/+page.svelte | 4 ++-- .../(public)/file-transfer/+page.server.ts | 2 +- src/routes/(public)/file-transfer/+page.svelte | 2 +- src/routes/(public)/file-transfer/+page.ts | 2 +- .../(public)/file-transfer/FileTransfer.svelte | 14 +++++++------- .../(public)/link-generator/+page.svelte | 2 +- .../link-generator/ShortLinkForm.svelte | 12 ++++++------ .../(public)/link-generator/edit/+page.svelte | 6 +++--- .../link-generator/edit/LinkEditForm.svelte | 10 +++++----- .../link-generator/edit/LinkLoginForm.svelte | 6 +++--- .../(public)/link/[link]/+page.server.ts | 4 ++-- src/routes/(public)/qr-generator/+page.svelte | 2 +- .../(public)/qr-generator/QrCodeForm.svelte | 2 +- src/routes/+error.svelte | 2 +- src/routes/+layout.svelte | 6 +++--- src/routes/admin/(auth)/+error.svelte | 2 +- src/routes/admin/(auth)/Header.svelte | 2 +- src/routes/admin/(auth)/login/+page.server.ts | 2 +- .../admin/(auth)/login/google/+server.ts | 2 +- .../(auth)/login/google/callback/+server.ts | 8 ++++---- src/routes/admin/(auth)/logout/+server.ts | 2 +- src/routes/admin/panel/+layout.server.ts | 2 +- src/routes/admin/panel/+layout.svelte | 4 ++-- src/routes/admin/panel/+page.svelte | 12 ++++++------ src/routes/admin/panel/+page.ts | 4 ++-- src/routes/admin/panel/clubs/+page.svelte | 6 +++--- src/routes/admin/panel/clubs/+page.ts | 4 ++-- .../panel/clubs/AutoImportClubsButton.svelte | 10 +++++----- .../admin/panel/clubs/EditableClubForm.svelte | 10 +++++----- .../panel/home/bell-schedule/+page.svelte | 12 ++++++------ .../admin/panel/home/bell-schedule/+page.ts | 4 ++-- .../home/bell-schedule/DefaultSchedules.svelte | 6 +++--- .../bell-schedule/SpecialScheduleRow.svelte | 6 +++--- .../panel/home/bulletin-board/+page.svelte | 10 +++++----- .../admin/panel/home/bulletin-board/+page.ts | 4 ++-- .../bulletin-board/EditableNoteForm.svelte | 10 +++++----- .../admin/panel/home/contact-info/+page.svelte | 8 ++++---- .../admin/panel/home/contact-info/+page.ts | 4 ++-- .../panel/home/saved-schedules/+page.svelte | 10 +++++----- .../admin/panel/home/saved-schedules/+page.ts | 4 ++-- .../saved-schedules/SavedScheduleForm.svelte | 12 ++++++------ .../admin/panel/home/useful-links/+page.svelte | 8 ++++---- .../admin/panel/home/useful-links/+page.ts | 4 ++-- .../useful-links/EditableLinkCardForm.svelte | 10 +++++----- src/routes/admin/panel/links/+page.svelte | 8 ++++---- .../admin/panel/links/EditableLink.svelte | 4 ++-- .../admin/panel/links/EditableLinkForm.svelte | 10 +++++----- src/routes/admin/panel/pages.ts | 2 +- src/routes/admin/panel/profile/+page.svelte | 2 +- src/routes/admin/panel/users/+page.svelte | 10 +++++----- .../admin/panel/users/EditableUser.svelte | 6 +++--- .../admin/panel/users/EditableUserForm.svelte | 4 ++-- .../v2/file_transfer/[code]/files/+server.ts | 6 +++--- .../v2/page_data/announcement/edit/+server.ts | 2 +- .../api/v2/page_data/announcement/model.ts | 2 +- .../api/v2/page_data/announcement/types.ts | 2 +- .../api/v2/page_data/announcement/validator.ts | 2 +- .../bellScheduleDefaults/edit/+server.ts | 2 +- .../bellScheduleOverrides/edit/+server.ts | 2 +- .../bellScheduleOverrides/edit/[id]/+server.ts | 2 +- .../bellSchedule/bellSchedules/edit/+server.ts | 2 +- .../bellSchedules/edit/[id]/+server.ts | 2 +- .../bellSchedules/edit/order/+server.ts | 2 +- .../api/v2/page_data/bellSchedule/model.ts | 2 +- .../api/v2/page_data/bellSchedule/types.ts | 2 +- .../api/v2/page_data/bellSchedule/validator.ts | 4 ++-- .../v2/page_data/bulletinBoard/edit/+server.ts | 2 +- .../bulletinBoard/edit/[id]/+server.ts | 2 +- .../bulletinBoard/edit/order/+server.ts | 2 +- .../api/v2/page_data/bulletinBoard/model.ts | 2 +- .../api/v2/page_data/bulletinBoard/types.ts | 2 +- .../v2/page_data/bulletinBoard/validator.ts | 4 ++-- .../api/v2/page_data/clubs/edit/+server.ts | 2 +- .../v2/page_data/clubs/edit/[id]/+server.ts | 2 +- .../api/v2/page_data/clubs/edit/all/+server.ts | 2 +- src/routes/api/v2/page_data/clubs/types.ts | 2 +- src/routes/api/v2/page_data/clubs/validator.ts | 2 +- .../api/v2/page_data/commonEditEndpoints.ts | 6 +++--- .../v2/page_data/contactInfo/edit/+server.ts | 4 ++-- .../page_data/contactInfo/edit/[id]/+server.ts | 4 ++-- .../contactInfo/edit/order/+server.ts | 4 ++-- .../v2/page_data/usefulLinks/edit/+server.ts | 2 +- .../page_data/usefulLinks/edit/[id]/+server.ts | 2 +- .../usefulLinks/edit/order/+server.ts | 2 +- .../api/v2/page_data/usefulLinks/types.ts | 2 +- .../api/v2/page_data/usefulLinks/validator.ts | 2 +- src/routes/api/v2/short_link/edit/+server.ts | 2 +- .../api/v2/short_link/edit/[id]/+server.ts | 8 ++++---- .../edit/[id]/resetPassword/+server.ts | 6 +++--- src/routes/api/v2/short_link/types.ts | 2 +- src/routes/api/v2/users/edit/+server.ts | 2 +- src/routes/api/v2/users/edit/[id]/+server.ts | 4 ++-- src/routes/api/v2/users/validator.ts | 2 +- vite.config.ts | 7 ------- 125 files changed, 300 insertions(+), 295 deletions(-) diff --git a/package.json b/package.json index cbcf643a..ca0ed556 100644 --- a/package.json +++ b/package.json @@ -57,5 +57,17 @@ "node": ">=18", "pnpm": ">=9" }, - "packageManager": "pnpm@10.12.4+sha256.cadfd9e6c9fcc2cb76fe7c0779a5250b632898aea5f53d833a73690c77a778d9" + "packageManager": "pnpm@10.12.4+sha256.cadfd9e6c9fcc2cb76fe7c0779a5250b632898aea5f53d833a73690c77a778d9", + "imports": { + "#lib": "./src/lib/index.js", + "#lib/*": "./src/lib/*", + "#components": "./src/lib/components/index.js", + "#components/*": "./src/lib/components/*", + "#assets": "./src/lib/assets/index.js", + "#assets/*": "./src/lib/assets/*", + "#styles": "./src/lib/styles/index.js", + "#styles/*": "./src/lib/styles/*", + "#api": "./src/routes/api/v2/index.js", + "#api/*": "./src/routes/api/v2/*" + } } diff --git a/src/app.d.ts b/src/app.d.ts index fe685445..7f1ec76f 100644 --- a/src/app.d.ts +++ b/src/app.d.ts @@ -1,7 +1,7 @@ // See https://kit.svelte.dev/docs/types#app -import type { ISession } from '$lib/types/session'; -import { Permissions } from '$lib/auth/permissions'; +import type { ISession } from '#lib/types/session'; +import { Permissions } from '#lib/auth/permissions'; // for information about these interfaces declare global { diff --git a/src/hooks.server.ts b/src/hooks.server.ts index 75670842..314b2d59 100644 --- a/src/hooks.server.ts +++ b/src/hooks.server.ts @@ -2,11 +2,11 @@ import { deleteSessionTokenCookie, setSessionTokenCookie, validateAndRenewSession, -} from '$lib/auth/session'; -import connect from '$lib/db/mongodb'; +} from '#lib/auth/session'; +import connect from '#lib/db/mongodb'; import type { Handle } from '@sveltejs/kit'; -import { Permissions } from '$lib/auth/permissions'; -import { startFileClearInterval } from '$lib/db/s3'; +import { Permissions } from '#lib/auth/permissions'; +import { startFileClearInterval } from '#lib/db/s3'; import { dev } from '$app/environment'; // Ensure correct time zone diff --git a/src/lib/auth/permissions.ts b/src/lib/auth/permissions.ts index a4e40517..323bb40b 100644 --- a/src/lib/auth/permissions.ts +++ b/src/lib/auth/permissions.ts @@ -1,5 +1,5 @@ -import type { ISessionUser } from '$api/users/types'; -import type { ISession } from '$lib/types/session'; +import type { ISessionUser } from '#api/users/types'; +import type { ISession } from '#lib/types/session'; export enum Permission { /** diff --git a/src/lib/auth/session.ts b/src/lib/auth/session.ts index 89cca090..ef718d7d 100644 --- a/src/lib/auth/session.ts +++ b/src/lib/auth/session.ts @@ -1,6 +1,6 @@ -import type { ISessionUser } from '$api/users/types'; -import { Session } from '$lib/models/sessionModel'; -import type { ISession } from '$lib/types/session'; +import type { ISessionUser } from '#api/users/types'; +import { Session } from '#lib/models/sessionModel'; +import type { ISession } from '#lib/types/session'; import { sha256 } from '@oslojs/crypto/sha2'; import { encodeBase32LowerCaseNoPadding } from '@oslojs/encoding'; import type { Cookies } from '@sveltejs/kit'; diff --git a/src/lib/components/ContactForm.svelte b/src/lib/components/ContactForm.svelte index be6f1248..4b6148a7 100644 --- a/src/lib/components/ContactForm.svelte +++ b/src/lib/components/ContactForm.svelte @@ -9,15 +9,15 @@ diff --git a/src/lib/components/SectionHeader.svelte b/src/lib/components/SectionHeader.svelte index 9a7ae060..529fa566 100644 --- a/src/lib/components/SectionHeader.svelte +++ b/src/lib/components/SectionHeader.svelte @@ -1,5 +1,5 @@ diff --git a/src/routes/(public)/+layout.ts b/src/routes/(public)/+layout.ts index ad9eb9a3..c78c3c38 100644 --- a/src/routes/(public)/+layout.ts +++ b/src/routes/(public)/+layout.ts @@ -1,5 +1,5 @@ -import type { IAnnouncement } from '$api/page_data/announcement/types'; -import type { LinkCardListData } from '$api/page_data/usefulLinks/types'; +import type { IAnnouncement } from '#api/page_data/announcement/types'; +import type { LinkCardListData } from '#api/page_data/usefulLinks/types'; import type { LayoutLoad } from './$types'; export const load = (async ({ url, fetch }) => { diff --git a/src/routes/(public)/+page.svelte b/src/routes/(public)/+page.svelte index bbc0f59c..9b186942 100644 --- a/src/routes/(public)/+page.svelte +++ b/src/routes/(public)/+page.svelte @@ -1,8 +1,8 @@
diff --git a/src/routes/(public)/extra/+page.svelte b/src/routes/(public)/extra/+page.svelte index e1fab963..fcb09abe 100644 --- a/src/routes/(public)/extra/+page.svelte +++ b/src/routes/(public)/extra/+page.svelte @@ -1,7 +1,7 @@ diff --git a/src/routes/(public)/file-transfer/+page.server.ts b/src/routes/(public)/file-transfer/+page.server.ts index 52a6cd72..e5c310d1 100644 --- a/src/routes/(public)/file-transfer/+page.server.ts +++ b/src/routes/(public)/file-transfer/+page.server.ts @@ -1,6 +1,6 @@ import { redirect } from '@sveltejs/kit'; import type { PageServerLoad } from './$types'; -import { fileTransferCodeValidator } from '$api/file_transfer/validator'; +import { fileTransferCodeValidator } from '#api/file_transfer/validator'; export const load = (async ({ url, cookies }) => { let existingCode = url.searchParams.get('code'); diff --git a/src/routes/(public)/file-transfer/+page.svelte b/src/routes/(public)/file-transfer/+page.svelte index 6fed2c60..2d690ad7 100644 --- a/src/routes/(public)/file-transfer/+page.svelte +++ b/src/routes/(public)/file-transfer/+page.svelte @@ -1,5 +1,5 @@ diff --git a/src/routes/(public)/link-generator/ShortLinkForm.svelte b/src/routes/(public)/link-generator/ShortLinkForm.svelte index 41e22ab7..b3e3dc68 100644 --- a/src/routes/(public)/link-generator/ShortLinkForm.svelte +++ b/src/routes/(public)/link-generator/ShortLinkForm.svelte @@ -1,8 +1,8 @@ diff --git a/src/routes/(public)/qr-generator/QrCodeForm.svelte b/src/routes/(public)/qr-generator/QrCodeForm.svelte index 14fa31b8..05d6a003 100644 --- a/src/routes/(public)/qr-generator/QrCodeForm.svelte +++ b/src/routes/(public)/qr-generator/QrCodeForm.svelte @@ -1,5 +1,5 @@ diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 0e035193..05ea855e 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -1,8 +1,8 @@ diff --git a/src/routes/admin/(auth)/Header.svelte b/src/routes/admin/(auth)/Header.svelte index f9ca2e11..24debaed 100644 --- a/src/routes/admin/(auth)/Header.svelte +++ b/src/routes/admin/(auth)/Header.svelte @@ -1,7 +1,7 @@ @@ -10,11 +10,11 @@
- +
If you are looking for a shortened URL, try clicking here.
If that doesn't work, double check the URL you entered, and if you think its correct, contact the diff --git a/src/lib/components/SectionHeader.svelte b/src/lib/components/SectionHeader.svelte index 529fa566..2c379e74 100644 --- a/src/lib/components/SectionHeader.svelte +++ b/src/lib/components/SectionHeader.svelte @@ -1,5 +1,5 @@ @@ -9,6 +9,6 @@
- +
diff --git a/src/routes/admin/(auth)/Header.svelte b/src/routes/admin/(auth)/Header.svelte index 24debaed..d7eb7be5 100644 --- a/src/routes/admin/(auth)/Header.svelte +++ b/src/routes/admin/(auth)/Header.svelte @@ -1,9 +1,9 @@