From 73a4c1632293f4d6b4d3a292d4b5a704332efec9 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Mon, 3 Feb 2025 21:51:28 -0800 Subject: [PATCH] cleanup: use native html forms for earch and communities --- package.json | 2 +- .../components/lemmy/comment/Comment.svelte | 4 +- .../components/lemmy/comment/Comments.svelte | 12 +- .../lemmy/dropdowns/Location.svelte | 4 +- .../components/lemmy/dropdowns/Sort.svelte | 6 +- src/lib/components/ui/ExpandableImage.svelte | 12 +- .../components/ui/layout/pages/Tabs.svelte | 4 +- src/lib/components/ui/navbar/NavButton.svelte | 4 +- .../ui/navbar/commands/Commands.svelte | 4 +- .../ui/navbar/commands/actions.svelte.ts | 2 +- .../ui/sidebar/ProfileButton.svelte | 4 +- .../ui/sidebar/SidebarButton.svelte | 4 +- src/lib/mono/forms/select/Select.svelte | 16 +-- src/lib/util.svelte.ts | 2 +- src/routes/+error.svelte | 10 +- src/routes/+layout.svelte | 33 +++-- src/routes/+page.svelte | 6 +- src/routes/admin/applications/+page.svelte | 6 +- src/routes/c/[name]/+page.svelte | 10 +- src/routes/c/[name]/settings/+layout.svelte | 2 +- src/routes/communities/+page.svelte | 82 +++++++------ src/routes/inbox/+page.svelte | 28 ++--- src/routes/login/+page.svelte | 8 +- src/routes/moderation/+page.svelte | 4 +- src/routes/modlog/+page.svelte | 26 ++-- .../password_change/[token]/+error.svelte | 4 +- .../post/[instance]/[id=integer]/+page.svelte | 12 +- .../(local_user)/password/+layout.svelte | 8 +- .../(local_user)/password/2fa/+page.svelte | 4 +- src/routes/profile/+layout.svelte | 21 ++-- src/routes/profile/media/+page.svelte | 6 +- src/routes/saved/+page.svelte | 6 +- src/routes/search/+page.svelte | 116 +++++++++--------- src/routes/signup/[instance]/+page.svelte | 6 +- src/routes/u/[name]/+page.svelte | 10 +- src/routes/util/+layout.svelte | 8 +- src/routes/verify_email/[token]/+error.svelte | 4 +- 37 files changed, 254 insertions(+), 246 deletions(-) diff --git a/package.json b/package.json index d58fab64..3ae17996 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "@sveltejs/adapter-node": "^5.2.9", "@sveltejs/adapter-vercel": "^5.4.6", "@sveltejs/kit": "^2.15.0", - "@sveltejs/vite-plugin-svelte": "^3.1.2", + "@sveltejs/vite-plugin-svelte": "4.0.0-next.6", "@tailwindcss/container-queries": "^0.1.1", "@tanstack/svelte-virtual": "^3.8.1", "@types/nprogress": "^0.2.0", diff --git a/src/lib/components/lemmy/comment/Comment.svelte b/src/lib/components/lemmy/comment/Comment.svelte index bcb186b1..df8755f7 100644 --- a/src/lib/components/lemmy/comment/Comment.svelte +++ b/src/lib/components/lemmy/comment/Comment.svelte @@ -25,7 +25,7 @@ import { Button, Modal } from 'mono-svelte' import { publishedToDate } from '$lib/components/util/date.js' import ShieldIcon from '../moderation/ShieldIcon.svelte' - import { page } from '$app/stores' + import { page } from '$app/state' import { onMount } from 'svelte' import { t } from '$lib/translations' import { fly, slide } from 'svelte/transition' @@ -90,7 +90,7 @@ } onMount(() => { - if ('#' + node.comment_view.comment.id.toString() == $page.url.hash) { + if ('#' + node.comment_view.comment.id.toString() == page.url.hash) { highlight = 'text-primary-900 dark:text-primary-100 font-medium' setTimeout(() => (highlight = 'duration-[3s] transition-all'), 500) diff --git a/src/lib/components/lemmy/comment/Comments.svelte b/src/lib/components/lemmy/comment/Comments.svelte index 8f206c4d..3e3dd5bd 100644 --- a/src/lib/components/lemmy/comment/Comments.svelte +++ b/src/lib/components/lemmy/comment/Comments.svelte @@ -2,7 +2,7 @@ import Comments from './Comments.svelte' import Comment from './Comment.svelte' import { buildCommentsTree, type CommentNodeI } from './comments.svelte' - import { page } from '$app/stores' + import { page } from '$app/state' import { onMount, setContext } from 'svelte' import { Icon, ArrowDownCircle } from 'svelte-hero-icons' import { getClient } from '$lib/lemmy.js' @@ -28,8 +28,8 @@ onMount(() => { hydrated = true - if (isParent && $page.url.hash && browser) { - document.getElementById($page.url.hash)?.scrollIntoView({ + if (isParent && page.url.hash && browser) { + document.getElementById(page.url.hash)?.scrollIntoView({ behavior: 'smooth', block: 'center', }) @@ -51,7 +51,7 @@ try { parent.loading = true - const newComments = await getClient($page.params.instance).getComments({ + const newComments = await getClient(page.params.instance).getComments({ max_depth: 5, parent_id: parent.comment_view.comment.id, type_: 'All', @@ -128,7 +128,7 @@ - {/snippet} + {/snippet} {#snippet prefix()} - - {/snippet} + + {/snippet} {$t('routes.profile.media.title')} {#snippet prefix()} - - {/snippet} + + {/snippet} {$t('routes.profile.upvoted')} {#snippet prefix()} - - {/snippet} + + {/snippet} {$t('routes.profile.downvoted')} diff --git a/src/routes/profile/media/+page.svelte b/src/routes/profile/media/+page.svelte index 2be45c0b..ceb92fbe 100644 --- a/src/routes/profile/media/+page.svelte +++ b/src/routes/profile/media/+page.svelte @@ -1,5 +1,5 @@
@@ -44,7 +44,7 @@ }, ]} class="overflow-auto" - currentRoute={$page.url.toString()} + currentRoute={page.url.toString()} />
{@render children?.()} diff --git a/src/routes/verify_email/[token]/+error.svelte b/src/routes/verify_email/[token]/+error.svelte index 8cdecd70..ab7115cf 100644 --- a/src/routes/verify_email/[token]/+error.svelte +++ b/src/routes/verify_email/[token]/+error.svelte @@ -1,5 +1,5 @@ @@ -14,5 +14,5 @@ {$t('message.error')}

{$t('routes.verifyEmail.error')}

- {$page.error?.message} + {page.error?.message}