@@ -53,7 +58,7 @@
diff --git a/src/routes/communities/+page.svelte b/src/routes/communities/+page.svelte
index 8715c934..98dc66a5 100644
--- a/src/routes/communities/+page.svelte
+++ b/src/routes/communities/+page.svelte
@@ -4,42 +4,71 @@
import { page } from '$app/stores'
import {
ChatBubbleOvalLeftEllipsis,
+ Check,
GlobeAmericas,
Icon,
+ InformationCircle,
PencilSquare,
+ Plus,
QuestionMarkCircle,
UserGroup,
} from 'svelte-hero-icons'
import CommunityLink from '$lib/components/lemmy/community/CommunityLink.svelte'
import Subscribe from './Subscribe.svelte'
import Pageination from '$lib/components/ui/Pageination.svelte'
- import { searchParam } from '$lib/util.js'
+ import {
+ DOMAIN_REGEX,
+ DOMAIN_REGEX_FORMS,
+ isSubscribed,
+ searchParam,
+ } from '$lib/util.js'
import { addSubscription } from '$lib/lemmy/user.js'
- import { LINKED_INSTANCE_URL } from '$lib/instance.js'
import { profile } from '$lib/auth.js'
- import { Button, Select, TextInput } from 'mono-svelte'
+ import { Button, Material, Popover, Select, TextInput } from 'mono-svelte'
import Sort from '$lib/components/lemmy/Sort.svelte'
+ import Placeholder from '$lib/components/ui/Placeholder.svelte'
+ import FormattedNumber from '$lib/components/util/FormattedNumber.svelte'
+ import CommunityItem from '$lib/components/lemmy/community/CommunityItem.svelte'
export let data
- let search = ''
+ let search = data.query || ''
+ let instance = ''
Communities
-
Communities
-
- Can't find a community on your home instance? Go to the
+ Communities
+
- search
-
- page, and search with this syntax:
- !community@instance.com
-
+
+
+
+ Can't find a community on your home instance? Go to the
+ search
+
+ page, and search with this syntax:
+ !community@instance.com
+
+
+
+
-
- () => searchParam($page.url, 'q', search, 'page')}
- />
-
-
+
{#if data.communities.length > 0}
{
- $page.url.searchParams.set('page', p.detail.toString())
-
- goto($page.url.toString(), {
- invalidateAll: true,
- })
- }}
+ on:change={(p) => searchParam($page.url, 'page', p.detail.toString())}
/>
{/if}
diff --git a/src/routes/communities/+page.ts b/src/routes/communities/+page.ts
index 53f6e95a..42387580 100644
--- a/src/routes/communities/+page.ts
+++ b/src/routes/communities/+page.ts
@@ -25,6 +25,8 @@ export async function load({ url, fetch }) {
})),
type: type,
sort: sort,
+ query: query,
+ page: page,
}
} else {
return {
@@ -37,6 +39,8 @@ export async function load({ url, fetch }) {
})),
type: type,
sort: sort,
+ query: query,
+ page: page,
}
}
}
diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte
index b6f26956..d19673d0 100644
--- a/src/routes/settings/+page.svelte
+++ b/src/routes/settings/+page.svelte
@@ -26,23 +26,46 @@
Settings
-
-
- Settings
-
-
General
+
+ Settings
+
+
+
+
UI
+
+ Post style
+
+
+ {#if $userSettings.view == 'list'}
+ Show posts in a list, with post bodies and compact images.
+ {:else if $userSettings.view == 'compact'}
+ Show posts in a list, without post bodies and with tighter spacing.
+ {:else if $userSettings.view == 'card'}
+ Show posts in cards, with large images.
+ {/if}
+
+
+
+ Random placeholders
+
+ Show a random placeholder for forms for comments, posts, etc.
+
+
+ {$userSettings.randomPlaceholders ? 'Enabled' : 'Disabled'}
+
+
+
Default sort
The default sort to use for feeds.
@@ -76,17 +99,42 @@
- Post style
-
-
- {#if $userSettings.view == 'list'}
- Show posts in a list, with post bodies and compact images.
- {:else if $userSettings.view == 'compact'}
- Show posts in a list, without post bodies and with tighter spacing.
- {:else if $userSettings.view == 'card'}
- Show posts in cards, with large images.
- {/if}
-
+ Use display name
+
+ Show a user's display name instead of their account username.
+
+
+
+ {$userSettings.displayNames ? 'Enabled' : 'Disabled'}
+
+
+
+
Posts
+
+ Fade read posts
+ Fade the title of posts you've already read.
+
+ {$userSettings.markReadPosts ? 'Enabled' : 'Disabled'}
+
+
+
+ NSFW blur
+
+ Blur images and remove post bodies of NSFW content.
+
+
+ {$userSettings.nsfwBlur ? 'Enabled' : 'Disabled'}
+
+
+
+ Expand Images
+
+ Clicking on an image brings you to an expanded view rather than sending
+ you to the post page.
+
+
+ {$userSettings.expandImages ? 'Enabled' : 'Disabled'}
+
Hide Posts
@@ -110,45 +158,6 @@
-
-
- Use display name
-
-
- Show a user's display name instead of their account username.
-
-
-
-
- Random placeholders
-
-
- Show a random placeholder for forms for comments, posts, etc.
-
-
-
-
UI
-
-
- Fade read posts
-
- Fade the title of posts you've already read.
-
-
-
- NSFW blur
-
- Blur images of NSFW content.
-
-
-
- Expand Images
-
-
- Clicking on an image brings you to an expanded view rather than sending
- you to the post page.
-
-
Instances
@@ -215,17 +224,19 @@
Font
What font Photon should use.
-
- Debug Info
-
+ Debug Info
Show an option to show debug information. (in posts and such)
+
+
+ {$userSettings.debugInfo ? 'Enabled' : 'Disabled'}
+
diff --git a/src/routes/settings/Setting.svelte b/src/routes/settings/Setting.svelte
index edf6913a..7f386b4d 100644
--- a/src/routes/settings/Setting.svelte
+++ b/src/routes/settings/Setting.svelte
@@ -2,12 +2,20 @@
import { Material } from 'mono-svelte'
-