From 17aedff689842932aee1c2d86d5f8f66d7655037 Mon Sep 17 00:00:00 2001 From: Xylight Date: Fri, 6 Feb 2026 15:46:33 -0800 Subject: [PATCH] design: improve settings reachability --- src/lib/app/i18n/en.json | 2 +- src/lib/ui/layout/CommonItem.svelte | 10 +- .../ui/layout/pages/TabbedLayoutShell.svelte | 55 ++++++++ src/routes/+page.svelte | 2 +- src/routes/search/+page.svelte | 55 +++++--- src/routes/search/+page.ts | 6 +- src/routes/settings/+layout.svelte | 130 ++++++++++-------- src/routes/settings/+page.svelte | 0 src/routes/settings/+page.ts | 5 +- src/routes/settings/Setting.svelte | 2 +- src/routes/settings/ToggleSetting.svelte | 2 +- src/routes/settings/app/+page.svelte | 4 +- src/routes/theme/+page.svelte | 6 +- 13 files changed, 188 insertions(+), 91 deletions(-) create mode 100644 src/lib/ui/layout/pages/TabbedLayoutShell.svelte create mode 100644 src/routes/settings/+page.svelte diff --git a/src/lib/app/i18n/en.json b/src/lib/app/i18n/en.json index 9afb6679..0b9dba3a 100644 --- a/src/lib/app/i18n/en.json +++ b/src/lib/app/i18n/en.json @@ -944,7 +944,7 @@ "title": "Account" }, "donate": { - "description": "Photon will always be free and open-source, and is continously developed and designed to be helpful. If you like Photon and want to finanically support its development, you can donate here." + "description": "Photon will always be free and open-source, and is continously developed and designed to be helpful. If you like Photon and want to financially support its development, you can donate here." } }, "error": { diff --git a/src/lib/ui/layout/CommonItem.svelte b/src/lib/ui/layout/CommonItem.svelte index cca7c572..e23f6b62 100644 --- a/src/lib/ui/layout/CommonItem.svelte +++ b/src/lib/ui/layout/CommonItem.svelte @@ -26,7 +26,7 @@ 'flex gap-2 p-5', orientation == 'horizontal' ? 'flex-row items-center' - : 'flex-col items-staRT', + : 'flex-col items-start', ]} > @@ -34,9 +34,11 @@

{title}

-

- {detail} -

+ {#if detail} +

+ {detail} +

+ {/if}
{@render children?.()} diff --git a/src/lib/ui/layout/pages/TabbedLayoutShell.svelte b/src/lib/ui/layout/pages/TabbedLayoutShell.svelte new file mode 100644 index 00000000..9a006c39 --- /dev/null +++ b/src/lib/ui/layout/pages/TabbedLayoutShell.svelte @@ -0,0 +1,55 @@ + + +{#if !onBaseRoute} + +{/if} + +{@render header?.()} +{#if onBaseRoute} + + {#snippet item(route)} + + {#if route.icon} + + {/if} +
+
+ {route.name} +
+ {#if route.detail} +
+ {route.detail} +
+ {/if} +
+ +
+ {/snippet} +
+{:else} + {@render children?.()} +{/if} diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index b5d672eb..a78419f4 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -57,7 +57,7 @@ diff --git a/src/routes/search/+page.svelte b/src/routes/search/+page.svelte index 091f738b..b401e672 100644 --- a/src/routes/search/+page.svelte +++ b/src/routes/search/+page.svelte @@ -13,15 +13,17 @@ isUser, } from '$lib/feature/legacy/item' import { PostItem } from '$lib/feature/post' + import UserAutocomplete from '$lib/feature/user/UserAutocomplete.svelte' import UserItem from '$lib/feature/user/UserItem.svelte' import ObjectAutocomplete from '$lib/ui/form/ObjectAutocomplete.svelte' import Skeleton from '$lib/ui/generic/Skeleton.svelte' import Placeholder from '$lib/ui/info/Placeholder.svelte' import { CommonList, Header, Pageination, SearchBar } from '$lib/ui/layout' import { Button, Option, Select, TextLoader } from 'mono-svelte' + import Menu from 'mono-svelte/popover/Menu.svelte' import { AdjustmentsHorizontal, - ChevronDoubleDown, + BarsArrowDown, GlobeAmericas, Icon, MagnifyingGlass, @@ -33,8 +35,6 @@ let searchElement: HTMLInputElement | undefined = $state() let form = $state() - - let moreOptions = $state(false) form?.requestSubmit()} /> - + + {#snippet target(attachment)} +
{/snippet} -{#if moreOptions} -
+{#snippet extraOptions()} +
+ searchParam( + page.url, + 'community', + c?.community.id || undefined, + 'page', + )} + /> + - searchParam(page.url, 'community', c?.id || undefined, 'page')} + searchParam( + page.url, + 'community', + c?.community.id || undefined, + 'page', + )} />
-{/if} +{/snippet} + {#if !data.results} {#if navigating.to?.route.id == '/search'}
diff --git a/src/routes/search/+page.ts b/src/routes/search/+page.ts index abe90142..cec6a51f 100644 --- a/src/routes/search/+page.ts +++ b/src/routes/search/+page.ts @@ -8,7 +8,8 @@ import { getItemPublished } from '$lib/feature/legacy/item' export async function load({ url, fetch }) { const query = url.searchParams.get('q') const page = Number(url.searchParams.get('page')) || 1 - const community = Number(url.searchParams.get('community')) || undefined + const community = Number(url.searchParams.get('community')) + const creator = Number(url.searchParams.get('creator')) const sort = url.searchParams.get('sort') || 'New' const type = url.searchParams.get('type') || @@ -19,7 +20,8 @@ export async function load({ url, fetch }) { if (query) { const results = await client({ func: fetch }).search({ q: query, - community_id: community ?? undefined, + community_id: community, + creator_id: creator, limit: 20, page: page, sort: (sort as SortType) || 'TopAll', diff --git a/src/routes/settings/+layout.svelte b/src/routes/settings/+layout.svelte index 1dab8c15..392234fb 100644 --- a/src/routes/settings/+layout.svelte +++ b/src/routes/settings/+layout.svelte @@ -1,9 +1,20 @@