From de26affacd4cbdd4a7f692cfd8fe6bf594c8d924 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Sun, 7 Sep 2025 10:30:12 -0700 Subject: [PATCH] refactor: switch headers to barrel --- .../components/lemmy/comment/Comment.svelte | 21 ++++++++++++++----- .../lemmy/comment/CommentActions.svelte | 4 ++-- .../lemmy/comment/CommentForm.svelte | 4 ++-- .../lemmy/comment/CommentItem.svelte | 2 +- .../lemmy/comment/CommentTree.svelte | 5 ++--- src/lib/components/lemmy/comment/index.ts | 9 ++++++++ .../lemmy/moderation/RemoveModal.svelte | 2 +- .../lemmy/moderation/ReportModal.svelte | 2 +- .../lemmy/post/form/PostForm.svelte | 16 +++----------- src/lib/i18n/en.json | 4 ++++ src/routes/+page.svelte | 2 +- src/routes/accounts/+page.svelte | 2 +- .../externalInteraction/+page.svelte | 2 +- src/routes/admin/applications/+page.svelte | 2 +- src/routes/admin/config/+page.svelte | 2 +- src/routes/admin/federation/+page.svelte | 2 +- src/routes/admin/media/+page.svelte | 2 +- src/routes/admin/taglines/+page.svelte | 2 +- src/routes/admin/team/+page.svelte | 2 +- src/routes/c/[name]/+page.svelte | 2 +- src/routes/c/[name]/settings/+page.svelte | 2 +- .../c/[name]/settings/team/+page.svelte | 2 +- .../[instance]/[id]/confirm/+page.svelte | 2 +- src/routes/communities/+page.svelte | 2 +- src/routes/create/+layout.svelte | 2 +- src/routes/inbox/+page.svelte | 2 +- src/routes/inbox/InboxItem.svelte | 2 +- src/routes/inbox/messages/+page.svelte | 2 +- .../messages/[user_id=integer]/+page.svelte | 2 +- src/routes/instances/+layout.svelte | 2 +- src/routes/legal/+page.svelte | 2 +- src/routes/login/+page.svelte | 2 +- src/routes/login/guest/+page.svelte | 2 +- src/routes/login_reset/+page.svelte | 2 +- src/routes/moderation/+page.svelte | 2 +- src/routes/moderation/Report.svelte | 2 +- .../moderation/c/[id=integer]/+page.svelte | 2 +- .../moderation/communities/+page.svelte | 2 +- src/routes/modlog/+page.svelte | 2 +- .../password_change/[token]/+page.svelte | 2 +- .../[id=integer]/CommentProvider.svelte | 12 ++++++----- .../[id=integer]/confirm/+page.svelte | 2 +- .../profile/(local_user)/blocks/+page.svelte | 2 +- .../(local_user)/password/+layout.svelte | 2 +- .../(local_user)/settings/+page.svelte | 2 +- src/routes/profile/media/+page.svelte | 2 +- src/routes/profile/voted/[type]/+page.svelte | 2 +- src/routes/saved/+page.svelte | 10 ++++----- src/routes/search/+page.svelte | 2 +- src/routes/settings/+layout.svelte | 2 +- src/routes/signup/+page.svelte | 2 +- src/routes/signup/[instance]/+page.svelte | 2 +- src/routes/theme/+page.svelte | 2 +- src/routes/translators/+page.svelte | 2 +- src/routes/u/[name]/+page.svelte | 2 +- src/routes/util/instance/+page.svelte | 2 +- 56 files changed, 96 insertions(+), 83 deletions(-) create mode 100644 src/lib/components/lemmy/comment/index.ts diff --git a/src/lib/components/lemmy/comment/Comment.svelte b/src/lib/components/lemmy/comment/Comment.svelte index 58e98aaf..80aacbc6 100644 --- a/src/lib/components/lemmy/comment/Comment.svelte +++ b/src/lib/components/lemmy/comment/Comment.svelte @@ -1,7 +1,6 @@ diff --git a/src/routes/c/[name]/settings/team/+page.svelte b/src/routes/c/[name]/settings/team/+page.svelte index fd335aed..5e24d66d 100644 --- a/src/routes/c/[name]/settings/team/+page.svelte +++ b/src/routes/c/[name]/settings/team/+page.svelte @@ -3,7 +3,7 @@ import UserAutocomplete from '$lib/components/lemmy/user/UserAutocomplete.svelte' import Avatar from '$lib/components/ui/Avatar.svelte' import CommonList from '$lib/components/ui/layout/CommonList.svelte' - import Header from '$lib/components/ui/layout/pages/Header.svelte' + import { Header } from '$lib/components/ui/layout' import { t } from '$lib/i18n/translations.js' import { getClient } from '$lib/client/lemmy.svelte' import { errorMessage } from '$lib/lemmy/error.js' diff --git a/src/routes/comment/[instance]/[id]/confirm/+page.svelte b/src/routes/comment/[instance]/[id]/confirm/+page.svelte index 6993541f..6eda8a95 100644 --- a/src/routes/comment/[instance]/[id]/confirm/+page.svelte +++ b/src/routes/comment/[instance]/[id]/confirm/+page.svelte @@ -3,7 +3,7 @@ import { resolveRoute } from '$app/paths' import { page } from '$app/state' import { profile } from '$lib/auth.svelte' - import Header from '$lib/components/ui/layout/pages/Header.svelte' + import { Header } from '$lib/components/ui/layout' import ProfileButton from '$lib/components/ui/sidebar/ProfileButton.svelte' import SidebarButton from '$lib/components/ui/sidebar/SidebarButton.svelte' import { t } from '$lib/i18n/translations' diff --git a/src/routes/communities/+page.svelte b/src/routes/communities/+page.svelte index ab731960..d83dc7bf 100644 --- a/src/routes/communities/+page.svelte +++ b/src/routes/communities/+page.svelte @@ -6,7 +6,7 @@ import EndPlaceholder from '$lib/components/ui/EndPlaceholder.svelte' import Skeleton from '$lib/components/ui/generic/Skeleton.svelte' import CommonList from '$lib/components/ui/layout/CommonList.svelte' - import Header from '$lib/components/ui/layout/pages/Header.svelte' + import { Header } from '$lib/components/ui/layout' import Pageination from '$lib/components/ui/layout/Pageination.svelte' import Placeholder from '$lib/components/ui/Placeholder.svelte' import { t } from '$lib/i18n/translations.js' diff --git a/src/routes/create/+layout.svelte b/src/routes/create/+layout.svelte index d57d5bba..38b79312 100644 --- a/src/routes/create/+layout.svelte +++ b/src/routes/create/+layout.svelte @@ -1,6 +1,6 @@ diff --git a/src/routes/modlog/+page.svelte b/src/routes/modlog/+page.svelte index 1f0cbbd9..44a72bda 100644 --- a/src/routes/modlog/+page.svelte +++ b/src/routes/modlog/+page.svelte @@ -22,7 +22,7 @@ } from 'svelte-hero-icons' import ModlogItemCard from './item/ModlogItemCard.svelte' import ModlogItemTable from './item/ModlogItemTable.svelte' - import Header from '$lib/components/ui/layout/pages/Header.svelte' + import { Header } from '$lib/components/ui/layout' import { t } from '$lib/i18n/translations' import { client } from '$lib/client/lemmy.svelte' import Spinner from 'mono-svelte/loader/Spinner.svelte' diff --git a/src/routes/password_change/[token]/+page.svelte b/src/routes/password_change/[token]/+page.svelte index 1d1f72fa..b4c0f76c 100644 --- a/src/routes/password_change/[token]/+page.svelte +++ b/src/routes/password_change/[token]/+page.svelte @@ -2,7 +2,7 @@ import { preventDefault } from 'svelte/legacy' import { goto } from '$app/navigation' - import Header from '$lib/components/ui/layout/pages/Header.svelte' + import { Header } from '$lib/components/ui/layout' import { DEFAULT_INSTANCE_URL, LINKED_INSTANCE_URL, diff --git a/src/routes/post/[instance]/[id=integer]/CommentProvider.svelte b/src/routes/post/[instance]/[id=integer]/CommentProvider.svelte index f0368351..aa87d1ca 100644 --- a/src/routes/post/[instance]/[id=integer]/CommentProvider.svelte +++ b/src/routes/post/[instance]/[id=integer]/CommentProvider.svelte @@ -2,10 +2,6 @@ import { browser } from '$app/environment' import { page } from '$app/state' import { profile } from '$lib/auth.svelte' - import CommentForm from '$lib/components/lemmy/comment/CommentForm.svelte' - import CommentListVirtualizer from '$lib/components/lemmy/comment/CommentListVirtualizer.svelte' - import Comments from '$lib/components/lemmy/comment/CommentTree.svelte' - import { buildCommentsTree } from '$lib/components/lemmy/comment/comments.svelte' import EndPlaceholder from '$lib/components/ui/EndPlaceholder.svelte' import { t } from '$lib/i18n/translations' import { settings } from '$lib/settings.svelte' @@ -26,6 +22,12 @@ Star, Trophy, } from 'svelte-hero-icons' + import { + buildCommentsTree, + CommentForm, + CommentListVirtualizer, + CommentTree, + } from '$lib/components/lemmy/comment' interface Props { post: PostView @@ -160,7 +162,7 @@ {:else}
- +
{/if} diff --git a/src/routes/post/[instance]/[id=integer]/confirm/+page.svelte b/src/routes/post/[instance]/[id=integer]/confirm/+page.svelte index 1cefd9bb..4460d1b3 100644 --- a/src/routes/post/[instance]/[id=integer]/confirm/+page.svelte +++ b/src/routes/post/[instance]/[id=integer]/confirm/+page.svelte @@ -3,7 +3,7 @@ import { resolveRoute } from '$app/paths' import { page } from '$app/state' import { profile } from '$lib/auth.svelte' - import Header from '$lib/components/ui/layout/pages/Header.svelte' + import { Header } from '$lib/components/ui/layout' import ProfileButton from '$lib/components/ui/sidebar/ProfileButton.svelte' import SidebarButton from '$lib/components/ui/sidebar/SidebarButton.svelte' import { t } from '$lib/i18n/translations' diff --git a/src/routes/profile/(local_user)/blocks/+page.svelte b/src/routes/profile/(local_user)/blocks/+page.svelte index c71de3e0..85541f83 100644 --- a/src/routes/profile/(local_user)/blocks/+page.svelte +++ b/src/routes/profile/(local_user)/blocks/+page.svelte @@ -4,7 +4,7 @@ import EndPlaceholder from '$lib/components/ui/EndPlaceholder.svelte' import Entity from '$lib/components/ui/Entity.svelte' import CommonList from '$lib/components/ui/layout/CommonList.svelte' - import Header from '$lib/components/ui/layout/pages/Header.svelte' + import { Header } from '$lib/components/ui/layout' import Placeholder from '$lib/components/ui/Placeholder.svelte' import { t } from '$lib/i18n/translations.js' import type { diff --git a/src/routes/profile/(local_user)/password/+layout.svelte b/src/routes/profile/(local_user)/password/+layout.svelte index bb972e30..d9cd697d 100644 --- a/src/routes/profile/(local_user)/password/+layout.svelte +++ b/src/routes/profile/(local_user)/password/+layout.svelte @@ -2,7 +2,7 @@ import { t } from '$lib/i18n/translations' import { page } from '$app/state' - import Header from '$lib/components/ui/layout/pages/Header.svelte' + import { Header } from '$lib/components/ui/layout' import Tabs from '$lib/components/ui/layout/pages/Tabs.svelte' /** * @typedef {Object} Props diff --git a/src/routes/profile/(local_user)/settings/+page.svelte b/src/routes/profile/(local_user)/settings/+page.svelte index a2d497f8..aedf68fd 100644 --- a/src/routes/profile/(local_user)/settings/+page.svelte +++ b/src/routes/profile/(local_user)/settings/+page.svelte @@ -4,7 +4,7 @@ import type { SaveUserSettings } from '$lib/client/types' 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 { Header } from '$lib/components/ui/layout' import { t } from '$lib/i18n/translations.js' import { Badge, diff --git a/src/routes/profile/media/+page.svelte b/src/routes/profile/media/+page.svelte index d136e192..9439e589 100644 --- a/src/routes/profile/media/+page.svelte +++ b/src/routes/profile/media/+page.svelte @@ -1,6 +1,6 @@ diff --git a/src/routes/u/[name]/+page.svelte b/src/routes/u/[name]/+page.svelte index 78d0c48f..741aa4db 100644 --- a/src/routes/u/[name]/+page.svelte +++ b/src/routes/u/[name]/+page.svelte @@ -1,6 +1,5 @@