From 0281e6f56a221992f7104d64583ad9294f240c70 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Sun, 7 Sep 2025 09:50:01 -0700 Subject: [PATCH] refactor: prefer barrel exports --- src/lib/client/base.ts | 2 + src/lib/client/lemmy/lemmy.ts | 10 ++++ src/lib/client/piefed/piefed.ts | 7 +++ src/lib/components/helper/Empty.svelte | 11 ----- src/lib/components/lemmy/PictrsImage.svelte | 2 +- .../lemmy/community/CommunityForm.svelte | 22 ++++----- .../lemmy/community/CommunityItem.svelte | 2 +- src/lib/components/lemmy/community/index.ts | 7 +++ .../InstanceCard.svelte} | 12 ++--- .../lemmy/moderation/BanModal.svelte | 27 +++++------ .../components/lemmy/moderation/moderation.ts | 1 + src/lib/components/lemmy/post/PostMeta.svelte | 2 +- src/lib/components/ui/SectionTitle.svelte | 15 ------ src/lib/components/ui/StickyCard.svelte | 16 ------- .../ui/{ => layout}/Pageination.svelte | 0 .../components/ui/layout}/SearchBar.svelte | 0 src/lib/components/ui/layout/index.ts | 6 +++ src/lib/components/ui/navbar/Profile.svelte | 2 +- src/lib/mono/forms/Label.svelte | 5 +- src/lib/promise.svelte.ts | 17 ------- src/lib/util.svelte.ts | 15 ++++++ src/lib/version.ts | 46 ------------------- src/routes/+layout.svelte | 2 +- src/routes/+page.svelte | 2 +- src/routes/+page.ts | 2 +- .../externalInteraction/+page.svelte | 2 +- src/routes/admin/applications/+page.svelte | 2 +- src/routes/admin/applications/+page.ts | 2 +- .../admin/applications/Application.svelte | 29 ++++++------ src/routes/admin/config/+page.svelte | 10 ++-- src/routes/admin/federation/+page.ts | 2 +- src/routes/admin/media/+page.svelte | 2 +- src/routes/admin/media/+page.ts | 2 +- src/routes/c/[name]/+layout.ts | 2 +- src/routes/c/[name]/+page.svelte | 2 +- src/routes/c/[name]/settings/+page.svelte | 6 ++- src/routes/communities/+page.svelte | 6 +-- src/routes/communities/+page.ts | 2 +- src/routes/inbox/+page.svelte | 2 +- src/routes/inbox/+page.ts | 2 +- src/routes/inbox/InboxItem.svelte | 6 --- src/routes/inbox/messages/+page.svelte | 2 +- src/routes/inbox/messages/+page.ts | 2 +- .../inbox/messages/[user_id=integer]/+page.ts | 2 +- src/routes/moderation/+page.svelte | 4 +- src/routes/moderation/+page.ts | 2 +- src/routes/moderation/Report.svelte | 13 +++--- .../moderation/communities/+page.svelte | 2 +- src/routes/modlog/+page.svelte | 4 +- src/routes/modlog/item/ModlogItemCard.svelte | 19 ++++---- src/routes/modlog/item/ModlogItemTable.svelte | 2 +- .../post/[instance]/[id=integer]/+page.svelte | 2 +- .../post/[instance]/[id=integer]/+page.ts | 2 +- .../profile/(local_user)/blocks/+page.svelte | 10 ++-- .../(local_user)/settings/+page.svelte | 10 ++-- src/routes/profile/media/+page.svelte | 2 +- src/routes/profile/media/+page.ts | 2 +- src/routes/profile/user/+page.svelte | 2 +- src/routes/saved/+page.svelte | 2 +- src/routes/search/+page.svelte | 14 ++---- src/routes/search/+page.ts | 2 +- src/routes/signup/[instance]/+page.svelte | 14 +++--- src/routes/u/[name]/+page.svelte | 2 +- src/routes/u/[name]/+page.ts | 2 +- 64 files changed, 181 insertions(+), 249 deletions(-) delete mode 100644 src/lib/components/helper/Empty.svelte create mode 100644 src/lib/components/lemmy/community/index.ts rename src/lib/components/lemmy/{SiteCard.svelte => instance/InstanceCard.svelte} (92%) delete mode 100644 src/lib/components/ui/SectionTitle.svelte delete mode 100644 src/lib/components/ui/StickyCard.svelte rename src/lib/components/ui/{ => layout}/Pageination.svelte (100%) rename src/{routes/search => lib/components/ui/layout}/SearchBar.svelte (100%) create mode 100644 src/lib/components/ui/layout/index.ts delete mode 100644 src/lib/promise.svelte.ts delete mode 100644 src/lib/version.ts diff --git a/src/lib/client/base.ts b/src/lib/client/base.ts index 2a943c70..34a66b51 100644 --- a/src/lib/client/base.ts +++ b/src/lib/client/base.ts @@ -20,6 +20,7 @@ export abstract class BaseClient { abstract type: ClientType abstract getSite(): Promise + abstract editSite(form: types.EditSite): Promise abstract generateTotpSecret(): Promise abstract listLogins(): Promise abstract listAllMedia(form: types.ListMedia): Promise @@ -221,6 +222,7 @@ export abstract class BaseClient { abstract uploadImage( form: types.UploadImage, ): Promise + abstract deleteImage(form: types.DeleteImage): Promise abstract setFlair?(form: types.SetPersonFlair): Promise } diff --git a/src/lib/client/lemmy/lemmy.ts b/src/lib/client/lemmy/lemmy.ts index 0be24707..b6d0534e 100644 --- a/src/lib/client/lemmy/lemmy.ts +++ b/src/lib/client/lemmy/lemmy.ts @@ -476,4 +476,14 @@ export class LemmyClient implements BaseClient { ): ReturnType { return await this.#client.uploadImage(...params) } + async editSite( + ...params: Parameters + ): ReturnType { + return await this.#client.editSite(...params) + } + async deleteImage( + ...params: Parameters + ): ReturnType { + return await this.#client.deleteImage(...params) + } } diff --git a/src/lib/client/piefed/piefed.ts b/src/lib/client/piefed/piefed.ts index 10d83f8c..bec6ad34 100644 --- a/src/lib/client/piefed/piefed.ts +++ b/src/lib/client/piefed/piefed.ts @@ -908,4 +908,11 @@ export class PiefedClient implements BaseClient { return toPersonView(response.person_view) } + + async editSite(): ReturnType { + throw new Error('unsupported') + } + async deleteImage(): ReturnType { + throw new Error('unsupported') + } } diff --git a/src/lib/components/helper/Empty.svelte b/src/lib/components/helper/Empty.svelte deleted file mode 100644 index 2514dc6a..00000000 --- a/src/lib/components/helper/Empty.svelte +++ /dev/null @@ -1,11 +0,0 @@ - - -{@render children?.({ ...rest })} diff --git a/src/lib/components/lemmy/PictrsImage.svelte b/src/lib/components/lemmy/PictrsImage.svelte index 8935509b..7ed255b7 100644 --- a/src/lib/components/lemmy/PictrsImage.svelte +++ b/src/lib/components/lemmy/PictrsImage.svelte @@ -90,7 +90,7 @@ disabled={loading} > {#snippet prefix()} - + {/snippet} diff --git a/src/lib/components/lemmy/community/CommunityForm.svelte b/src/lib/components/lemmy/community/CommunityForm.svelte index ff772e53..ea888edc 100644 --- a/src/lib/components/lemmy/community/CommunityForm.svelte +++ b/src/lib/components/lemmy/community/CommunityForm.svelte @@ -3,25 +3,25 @@ import { profile } from '$lib/auth.svelte.js' import ImageInputUpload from '$lib/components/form/ImageInputUpload.svelte' import MarkdownEditor from '$lib/components/markdown/MarkdownEditor.svelte' - import Header from '$lib/components/ui/layout/pages/Header.svelte' - import SectionTitle from '$lib/components/ui/SectionTitle.svelte' import { t } from '$lib/i18n/translations' - import { getClient, site } from '$lib/client/lemmy.svelte' + import { client, site } from '$lib/client/lemmy.svelte' import { errorMessage } from '$lib/lemmy/error' import { addSubscription } from '$lib/lemmy/user.js' import { Badge, Button, + Label, MenuButton, Switch, TextInput, toast, + Option, + Select, + Material, + Menu } from 'mono-svelte' - import Option from 'mono-svelte/forms/select/Option.svelte' - import Select from 'mono-svelte/forms/select/Select.svelte' - import Material from 'mono-svelte/materials/Material.svelte' - import Menu from 'mono-svelte/popover/Menu.svelte' import { GlobeAlt, Icon, MapPin, Plus } from 'svelte-hero-icons' + import { Header } from '$lib/components/ui/layout' interface Props { /** @@ -68,7 +68,7 @@ try { const res = edit - ? await getClient().editCommunity({ + ? await client().editCommunity({ title: formData.displayName, description: formData.sidebar, nsfw: formData.nsfw, @@ -79,7 +79,7 @@ visibility: formData.visibility, discussion_languages: formData.languages, }) - : await getClient().createCommunity({ + : await client().createCommunity({ name: formData.name, title: formData.displayName, description: formData.sidebar, @@ -146,7 +146,7 @@ class="flex flex-col gap-4 h-full w-full" > {#if formtitle}{@render formtitle()}{:else} -
{$t('routes.createCommunity')}
+
{$t('form.post.community')}
{/if}
- {$t('form.profile.languages.title')} + {#if site.data}
diff --git a/src/lib/components/lemmy/community/CommunityItem.svelte b/src/lib/components/lemmy/community/CommunityItem.svelte index c06a5a7c..180226ed 100644 --- a/src/lib/components/lemmy/community/CommunityItem.svelte +++ b/src/lib/components/lemmy/community/CommunityItem.svelte @@ -1,6 +1,5 @@ - - - {@render children?.()} - diff --git a/src/lib/components/ui/StickyCard.svelte b/src/lib/components/ui/StickyCard.svelte deleted file mode 100644 index 08578fa6..00000000 --- a/src/lib/components/ui/StickyCard.svelte +++ /dev/null @@ -1,16 +0,0 @@ - - - diff --git a/src/lib/components/ui/Pageination.svelte b/src/lib/components/ui/layout/Pageination.svelte similarity index 100% rename from src/lib/components/ui/Pageination.svelte rename to src/lib/components/ui/layout/Pageination.svelte diff --git a/src/routes/search/SearchBar.svelte b/src/lib/components/ui/layout/SearchBar.svelte similarity index 100% rename from src/routes/search/SearchBar.svelte rename to src/lib/components/ui/layout/SearchBar.svelte diff --git a/src/lib/components/ui/layout/index.ts b/src/lib/components/ui/layout/index.ts new file mode 100644 index 00000000..efb51d71 --- /dev/null +++ b/src/lib/components/ui/layout/index.ts @@ -0,0 +1,6 @@ +export { default as Header } from './pages/Header.svelte' +export { default as Tabs } from './pages/Tabs.svelte' +export { default as CommonList } from './CommonList.svelte' +export { default as SearchBar } from './SearchBar.svelte' +export { default as Shell } from './Shell.svelte' +export { default as Pageination } from './Pageination.svelte' diff --git a/src/lib/components/ui/navbar/Profile.svelte b/src/lib/components/ui/navbar/Profile.svelte index d4f4b7bd..fbabdc05 100644 --- a/src/lib/components/ui/navbar/Profile.svelte +++ b/src/lib/components/ui/navbar/Profile.svelte @@ -6,7 +6,7 @@ isAdmin, } from '$lib/components/lemmy/moderation/moderation' - import SiteCard from '$lib/components/lemmy/SiteCard.svelte' + import SiteCard from '$lib/components/lemmy/instance/InstanceCard.svelte' import { t } from '$lib/i18n/translations' import { site } from '$lib/client/lemmy.svelte' import { settings } from '$lib/settings.svelte' diff --git a/src/lib/mono/forms/Label.svelte b/src/lib/mono/forms/Label.svelte index cd8d106f..f8dd41ed 100644 --- a/src/lib/mono/forms/Label.svelte +++ b/src/lib/mono/forms/Label.svelte @@ -22,7 +22,8 @@ }: Props = $props() -