cleanup: use context api for select menus and options

This commit is contained in:
James Xylight committed 2025-02-03 19:31:47 -08:00
1 parent ee08787afc
commit dd9abe5345
20 files changed
+271 -336

No files matched your search

+10 -9
View File
@@ -12,6 +12,7 @@
import { DocumentPlus, Icon } from 'svelte-hero-icons'
import { t } from '$lib/translations.js'
import Header from '$lib/components/ui/layout/pages/Header.svelte'
import Option from 'mono-svelte/forms/select/Option.svelte'
interface Props {
data: PageData
@@ -149,15 +150,15 @@
bind:value={formData.registration_mode}
class="w-max"
>
<option value="Open">
<Option value="Open">
{$t('routes.admin.config.registration.open')}
</option>
<option value="RequireApplication">
</Option>
<Option value="RequireApplication">
{$t('routes.admin.config.registration.application')}
</option>
<option value="Closed">
</Option>
<Option value="Closed">
{$t('routes.admin.config.registration.closed')}
</option>
</Option>
</Select>
{#if formData.registration_mode == 'RequireApplication'}
<MarkdownEditor
@@ -192,10 +193,10 @@
bind:value={formData.default_post_listing_type}
class="w-max"
>
<option value="All">{$t('routes.admin.config.listingType.all')}</option>
<option value="Local">
<Option value="All">{$t('routes.admin.config.listingType.all')}</Option>
<Option value="Local">
{$t('routes.admin.config.listingType.local')}
</option>
</Option>
</Select>
<Switch bind:checked={formData.private_instance} defaultValue={true}>
{$t('routes.admin.config.private')}
+3 -2
View File
@@ -16,6 +16,7 @@
import { Button, Material, Select } from 'mono-svelte'
import { t } from '$lib/translations'
import Header from '$lib/components/ui/layout/pages/Header.svelte'
import Option from 'mono-svelte/forms/select/Option.svelte'
let { data = $bindable() } = $props()
@@ -40,8 +41,8 @@
{$t('filter.filter')}
</span>
{/snippet}
<option value="all">{$t('filter.location.all')}</option>
<option value="unread">{$t('filter.unread')}</option>
<Option value="all">{$t('filter.location.all')}</Option>
<Option value="unread">{$t('filter.unread')}</Option>
</Select>
<Button href="/modlog" class="h-max ml-auto">
<Icon src={Newspaper} size="16" mini />
+22 -21
View File
@@ -21,6 +21,7 @@
import Placeholder from '$lib/components/ui/Placeholder.svelte'
import { isAdmin } from '$lib/components/lemmy/moderation/moderation.js'
import { browser } from '$app/environment'
import Option from 'mono-svelte/forms/select/Option.svelte'
let { data = $bindable() } = $props()
@@ -50,40 +51,40 @@
on:change={(e) => searchParam($page.url, 'type', data.type, 'page')}
class="w-48"
>
{#snippet label()}
{#snippet customLabel()}
<span class="flex gap-1 items-center">
<Icon src={Bars3BottomRight} size="15" mini />
Type
</span>
{/snippet}
<option value="All">All</option>
<option value="ModRemovePost">Remove Post</option>
<option value="ModLockPost">Lock Post</option>
<option value="ModFeaturePost">Feature Post</option>
<option value="ModRemoveComment">Remove Comment</option>
<option value="ModRemoveCommunity">Remove Community</option>
<option value="ModBanFromCommunity">Ban From Community</option>
<option value="ModAddCommunity">Add Moderator</option>
<option value="ModTransferCommunity">Transfer Community</option>
<option value="ModAdd">Add Admin</option>
<option value="ModBan">Ban Admin</option>
<option value="ModHideCommunity">Hide Community</option>
<option value="AdminPurgePerson">Purge User</option>
<option value="AdminPurgeCommunity">Purge Community</option>
<option value="AdminPurgePost">Purge Post</option>
<option value="AdminPurgeComment">Purge Comment</option>
<Option value="All">All</Option>
<Option value="ModRemovePost">Remove Post</Option>
<Option value="ModLockPost">Lock Post</Option>
<Option value="ModFeaturePost">Feature Post</Option>
<Option value="ModRemoveComment">Remove Comment</Option>
<Option value="ModRemoveCommunity">Remove Community</Option>
<Option value="ModBanFromCommunity">Ban From Community</Option>
<Option value="ModAddCommunity">Add Moderator</Option>
<Option value="ModTransferCommunity">Transfer Community</Option>
<Option value="ModAdd">Add Admin</Option>
<Option value="ModBan">Ban Admin</Option>
<Option value="ModHideCommunity">Hide Community</Option>
<Option value="AdminPurgePerson">Purge User</Option>
<Option value="AdminPurgeCommunity">Purge Community</Option>
<Option value="AdminPurgePost">Purge Post</Option>
<Option value="AdminPurgeComment">Purge Comment</Option>
</Select>
<Select bind:value={view} class="w-36">
{#snippet label()}
{#snippet customLabel()}
<span class="flex gap-1 items-center">
<Icon src={ViewColumns} size="15" mini />
View
</span>
{/snippet}
<option value="false">Table</option>
<option value="true">Cards</option>
<option value="undefined">Default</option>
<Option value="false">Table</Option>
<Option value="true">Cards</Option>
<Option value="undefined">Default</Option>
</Select>
</div>
<div class="flex flex-col md:flex-row md:items-center gap-2 w-full">
@@ -22,6 +22,11 @@
BookmarkSlash,
ArrowUp,
ArrowDown,
Fire,
Trophy,
Star,
Clock,
ArrowTrendingDown,
} from 'svelte-hero-icons'
import PostMeta, {
parseTags,
@@ -49,6 +54,7 @@
import Header from '$lib/components/ui/layout/pages/Header.svelte'
import { fly } from 'svelte/transition'
import { expoOut } from 'svelte/easing'
import Option from 'mono-svelte/forms/select/Option.svelte'
let { data = $bindable() } = $props()
@@ -404,13 +410,17 @@
bind:value={commentSort}
on:change={reloadComments}
>
<option value="Hot">{$t('filter.sort.hot')}</option>
<option value="Top">{$t('filter.sort.top.label')}</option>
<option value="New">{$t('filter.sort.new')}</option>
<option value="Old">{$t('filter.sort.old')}</option>
<option value="Controversial">
<Option icon={Fire} value="Hot">{$t('filter.sort.hot')}</Option>
<Option icon={Trophy} value="Top">
{$t('filter.sort.top.label')}
</Option>
<Option icon={Star} value="New">{$t('filter.sort.new')}</Option>
<Option icon={Clock} value="Old">
{$t('filter.sort.old')}
</Option>
<Option icon={ArrowTrendingDown} value="Controversial">
{$t('filter.sort.controversial')}
</option>
</Option>
</Select>
<Button size="square-md" onclick={reloadComments}>
{#snippet prefix()}
@@ -450,13 +460,17 @@
{#if commenting || !$profile.jwt}
<div class="gap-2 flex items-center">
<Select size="md" bind:value={commentSort} on:change={reloadComments}>
<option value="Hot">{$t('filter.sort.hot')}</option>
<option value="Top">{$t('filter.sort.top.label')}</option>
<option value="New">{$t('filter.sort.new')}</option>
<option value="Old">{$t('filter.sort.old')}</option>
<option value="Controversial">
<Option icon={Fire} value="Hot">{$t('filter.sort.hot')}</Option>
<Option icon={Trophy} value="Top">
{$t('filter.sort.top.label')}
</Option>
<Option icon={Star} value="New">{$t('filter.sort.new')}</Option>
<Option icon={Clock} value="Old">
{$t('filter.sort.old')}
</Option>
<Option icon={ArrowTrendingDown} value="Controversial">
{$t('filter.sort.controversial')}
</option>
</Option>
</Select>
<Button size="square-md" onclick={reloadComments}>
{#snippet prefix()}
+7 -9
View File
@@ -23,6 +23,7 @@
ChatBubbleOvalLeft,
AdjustmentsHorizontal,
} from 'svelte-hero-icons'
import Option from 'mono-svelte/forms/select/Option.svelte'
let { data } = $props()
@@ -51,18 +52,15 @@
{$t('filter.filter')}
</div>
{/snippet}
<option value="all">
<Icon src={Bars3} micro size="15" />
<Option icon={Bars3} value="all">
{$t('content.all')}
</option>
<option value="posts">
<Icon src={PencilSquare} micro size="15" />
</Option>
<Option icon={PencilSquare} value="posts">
{$t('content.posts')}
</option>
<option value="comments">
<Icon src={ChatBubbleOvalLeft} micro size="15" />
</Option>
<Option icon={ChatBubbleOvalLeft} value="comments">
{$t('content.comments')}
</option>
</Option>
</Select>
</div>
{/snippet}
+6 -5
View File
@@ -40,6 +40,7 @@
import Tabs from '$lib/components/ui/layout/pages/Tabs.svelte'
import { contentPadding } from '$lib/components/ui/layout/Shell.svelte'
import { goto } from '$app/navigation'
import Option from 'mono-svelte/forms/select/Option.svelte'
type Result = PostView | CommentView | PersonView | CommunityView
@@ -111,11 +112,11 @@
{$t('filter.type')}
</span>
{/snippet}
<option value="All">{$t('content.all')}</option>
<option value="Posts">{$t('content.posts')}</option>
<option value="Comments">{$t('content.comments')}</option>
<option value="Communities">{$t('content.communities')}</option>
<option value="Users">{$t('content.users')}</option>
<Option value="All">{$t('content.all')}</Option>
<Option value="Posts">{$t('content.posts')}</Option>
<Option value="Comments">{$t('content.comments')}</Option>
<Option value="Communities">{$t('content.communities')}</Option>
<Option value="Users">{$t('content.users')}</Option>
</Select>
<Sort navigate bind:selected={data.sort} />
{#snippet summary()}
+32 -20
View File
@@ -33,6 +33,11 @@
Plus,
Trash,
ArrowTopRightOnSquare,
Fire,
Trophy,
Star,
Clock,
ArrowTrendingDown,
} from 'svelte-hero-icons'
import MarkdownEditor from '$lib/components/markdown/MarkdownEditor.svelte'
import { removalTemplate } from '$lib/components/lemmy/moderation/moderation.js'
@@ -47,6 +52,7 @@
import Header from '$lib/components/ui/layout/pages/Header.svelte'
import { profile } from '$lib/auth.svelte'
import AccountPage from '../profile/(local_user)/settings/+page.svelte'
import Option from 'mono-svelte/forms/select/Option.svelte'
let importing = $state(false)
let importText = $state('')
@@ -227,20 +233,20 @@
{/snippet}
<!--@ts-ignore-->
<Select bind:value={settings.language}>
<option value={null}>
<Option value={null}>
<Icon src={Language} size="16" mini />
{$t('settings.app.lang.auto')}
</option>
</Option>
{#each $locales as locale}
{@const mapped = localeMap.get(locale) ?? {
flag: '',
translated: 1,
name: locale,
}}
<option value={locale}>
<Option value={locale}>
{mapped?.flag}
{mapped?.name}
</option>
</Option>
{/each}
</Select>
</Setting>
@@ -292,14 +298,14 @@
{$t('filter.location.label')}
</span>
{/snippet}
<option value="All">{$t('filter.location.all')}</option>
<option value="Local">{$t('filter.location.local')}</option>
<option value="Subscribed">
<Option value="All">{$t('filter.location.all')}</Option>
<Option value="Local">{$t('filter.location.local')}</Option>
<Option value="Subscribed">
{$t('filter.location.subscribed')}
</option>
<option value="Moderator">
</Option>
<Option value="Moderator">
{$t('filter.location.moderator')}
</option>
</Option>
</Select>
</div>
<div class="max-w-full">
@@ -314,9 +320,15 @@
</span>
{/snippet}
<option value="Hot">{$t('filter.sort.hot')}</option>
<option value="Top">{$t('filter.sort.top.label')}</option>
<option value="New">{$t('filter.sort.new')}</option>
<Option icon={Fire} value="Hot">{$t('filter.sort.hot')}</Option>
<Option icon={Trophy} value="Top">
{$t('filter.sort.top.label')}
</Option>
<Option icon={Star} value="New">{$t('filter.sort.new')}</Option>
<Option icon={Clock} value="Old">{$t('filter.sort.old')}</Option>
<Option icon={ArrowTrendingDown} value="Controversial">
{$t('filter.sort.controversial')}
</Option>
</Select>
</div>
</div>
@@ -369,10 +381,10 @@
<span>{$t('settings.app.font.description')}</span>
{/snippet}
<Select bind:value={settings.font}>
<option value="inter">Inter</option>
<option value="satoshi/nunito">Satoshi + Nunito</option>
<option value="system">System UI</option>
<option value="browser">Browser</option>
<Option value="inter">Inter</Option>
<Option value="satoshi/nunito">Satoshi + Nunito</Option>
<Option value="system">System UI</Option>
<Option value="browser">Browser</Option>
</Select>
</Setting>
<Setting>
@@ -491,9 +503,9 @@
</span>
{/snippet}
<Select bind:value={settings.embeds.youtube}>
<option value="youtube">YouTube</option>
<option value="invidious">Invidious</option>
<option value="piped">Piped</option>
<Option value="youtube">YouTube</Option>
<Option value="invidious">Invidious</Option>
<Option value="piped">Piped</Option>
</Select>
</Setting>
{#if settings.embeds.youtube == 'invidious'}
+7 -6
View File
@@ -37,6 +37,7 @@
import EntityHeader from '$lib/components/ui/EntityHeader.svelte'
import { publishedToDate } from '$lib/components/util/date.js'
import { formatRelativeDate } from '$lib/components/util/RelativeDate.svelte'
import Option from 'mono-svelte/forms/select/Option.svelte'
interface Props {
data: any
@@ -303,9 +304,9 @@
{$t('filter.type')}
</span>
{/snippet}
<option value="all">{$t('content.all')}</option>
<option value="posts">{$t('content.posts')}</option>
<option value="comments">{$t('content.comments')}</option>
<Option value="all">{$t('content.all')}</Option>
<Option value="posts">{$t('content.posts')}</Option>
<Option value="comments">{$t('content.comments')}</Option>
</Select>
<Select
bind:value={data.sort}
@@ -317,9 +318,9 @@
{$t('filter.sort.label')}
</span>
{/snippet}
<option value="New">{$t('filter.sort.new')}</option>
<option value="TopAll">{$t('filter.sort.top.label')}</option>
<option value="Old">{$t('filter.sort.old')}</option>
<Option value="New">{$t('filter.sort.new')}</Option>
<Option value="TopAll">{$t('filter.sort.top.label')}</Option>
<Option value="Old">{$t('filter.sort.old')}</Option>
</Select>
</div>
{#if data.items.length == 0}