diff --git a/.vscode/settings.json b/.vscode/settings.json index f2b25e04..93c3f4de 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,5 +2,6 @@ "i18n-ally.localesPaths": [ "src/lib/i18n", "src/routes/inbox/messages" - ] + ], + "i18n-ally.keystyle": "nested" } \ No newline at end of file diff --git a/src/routes/communities/+page.svelte b/src/routes/communities/+page.svelte index 9ea857b8..0292721c 100644 --- a/src/routes/communities/+page.svelte +++ b/src/routes/communities/+page.svelte @@ -4,12 +4,12 @@ import CommunityItem from '$lib/components/lemmy/community/CommunityItem.svelte' import Location from '$lib/components/lemmy/dropdowns/Location.svelte' import Sort from '$lib/components/lemmy/dropdowns/Sort.svelte' + 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 Pageination from '$lib/components/ui/Pageination.svelte' import Placeholder from '$lib/components/ui/Placeholder.svelte' - import SectionTitle from '$lib/components/ui/SectionTitle.svelte' import { t } from '$lib/i18n/translations.js' import { LINKED_INSTANCE_URL } from '$lib/instance.svelte' import { Material, Option } from 'mono-svelte' @@ -17,7 +17,6 @@ import { expoOut } from 'svelte/easing' import { fly } from 'svelte/transition' import SearchBar from '../search/SearchBar.svelte' - import EndPlaceholder from '$lib/components/ui/EndPlaceholder.svelte' let { data } = $props() @@ -44,43 +43,46 @@
{$t('routes.communities.title')} + + {#snippet extended()} +
+ + +
+ form?.requestSubmit()} + > + {#if !LINKED_INSTANCE_URL} + {@const instanceSet = new Set( + profile.meta.profiles.map(i => i.instance), + )} + {#if instanceSet.size > 1} + + {#each instanceSet as instance} + + {/each} + {/if} + {/if} + + form?.requestSubmit()} + /> +
+ + {/snippet}
-
- - -
- form?.requestSubmit()} - > - {#if !LINKED_INSTANCE_URL} - {@const instanceSet = new Set( - profile.meta.profiles.map(i => i.instance), - )} - {#if instanceSet.size > 1} - - {#each instanceSet as instance} - - {/each} - {/if} - {/if} - - form?.requestSubmit()} - /> -
- {#if navigating.to?.route.id == '/communities'} -
+
{#each new Array(5) as _, index} {_}
+ {$t('routes.search.top')}
0} - + {$t('routes.search.other')} {/if} diff --git a/src/routes/instances/+layout.svelte b/src/routes/instances/+layout.svelte index 8492808e..811bc76c 100644 --- a/src/routes/instances/+layout.svelte +++ b/src/routes/instances/+layout.svelte @@ -5,7 +5,6 @@ let { children } = $props() -
Instances
+
Instances
{@render children?.()} diff --git a/src/routes/instances/blocked/+page.svelte b/src/routes/instances/blocked/+page.svelte new file mode 100644 index 00000000..ebe18d6c --- /dev/null +++ b/src/routes/instances/blocked/+page.svelte @@ -0,0 +1,69 @@ + + +{#if data} +
+
triggerFilter(filter)}> + +
+ {#if data.blocked && data.blocked.length > 0} + {#if loading} + + {/if} + + {#snippet item(index)} + {#if data.blocked[index]} +
+
+ {data.blocked[index].domain} + + {data.blocked[index].software ?? 'Unknown'} • + +
+
+ {/if} + {/snippet} +
+ {:else} + + {/if} +
+{/if} diff --git a/src/routes/instances/linked/+page.svelte b/src/routes/instances/linked/+page.svelte index 9cec6fbe..3a10b938 100644 --- a/src/routes/instances/linked/+page.svelte +++ b/src/routes/instances/linked/+page.svelte @@ -3,27 +3,46 @@ import Placeholder from '$lib/components/ui/Placeholder.svelte' import RelativeDate from '$lib/components/util/RelativeDate.svelte' import { publishedToDate } from '$lib/components/util/date.js' - import { Material } from 'mono-svelte' + import { t } from '$lib/i18n/translations.js' + import { Spinner, TextInput } from 'mono-svelte' import { Check } from 'svelte-hero-icons' - let { data } = $props() + let { data: passedData } = $props() + let data = $state(passedData) + + let filter = $state('') + + let loading = $state(false) + + function triggerFilter(filter: string) { + if (!passedData.linked) return + loading = true + data.linked = passedData.linked.filter(i => i.domain.includes(filter)) + loading = false + } {#if data} -
- - {#if data.linked && data.linked.length > 0} - - {#snippet item(index)} +
+
triggerFilter(filter)}> + +
+ {#if data.linked && data.linked.length > 0} + {#if loading} + + {/if} + + {#snippet item(index)} + {#if data.linked[index]}
{data.linked[index].domain} @@ -36,15 +55,15 @@
- {/snippet} -
- {:else} - - {/if} - + {/if} + {/snippet} + + {:else} + + {/if}
{/if}