From 6afb03ea2b7860f3adfef68072540c81d14d8817 Mon Sep 17 00:00:00 2001 From: Xyphyn Date: Sun, 10 Sep 2023 13:05:58 -0700 Subject: [PATCH] feat: design tweaks --- package.json | 2 +- src/lib/components/lemmy/ViewSelect.svelte | 11 +- .../lemmy/comment/CommentVote.svelte | 80 ++---- .../components/lemmy/comment/Comments.svelte | 8 +- .../lemmy/moderation/ModerationMenu.svelte | 3 +- src/lib/components/lemmy/post/Post.svelte | 271 ++++++++++-------- .../components/lemmy/post/PostActions.svelte | 9 +- src/lib/components/lemmy/post/PostFeed.svelte | 7 +- src/lib/components/lemmy/post/PostVote.svelte | 99 ++----- src/lib/settings.ts | 13 +- src/routes/settings/+page.svelte | 33 +-- 11 files changed, 238 insertions(+), 298 deletions(-) diff --git a/package.json b/package.json index 087e2c3b..997caff2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "photon-lemmy", - "version": "1.4.3", + "version": "1.4.5", "private": true, "scripts": { "dev": "vite dev", diff --git a/src/lib/components/lemmy/ViewSelect.svelte b/src/lib/components/lemmy/ViewSelect.svelte index 6971760e..12b47444 100644 --- a/src/lib/components/lemmy/ViewSelect.svelte +++ b/src/lib/components/lemmy/ViewSelect.svelte @@ -2,17 +2,14 @@ import { userSettings } from '$lib/settings.js' import { Select } from 'mono-svelte' import { Icon, ViewColumns } from 'svelte-hero-icons' - - let value = `${$userSettings.showCompactPosts}` - - $: $userSettings.showCompactPosts = value == 'true' - View - - + + + diff --git a/src/lib/components/lemmy/comment/CommentVote.svelte b/src/lib/components/lemmy/comment/CommentVote.svelte index a59a08e6..3077899a 100644 --- a/src/lib/components/lemmy/comment/CommentVote.svelte +++ b/src/lib/components/lemmy/comment/CommentVote.svelte @@ -80,66 +80,26 @@ ` -{#if $userSettings.newVote} -
- - - - - -
-{:else}
+ - - - - -
-{/if} + + + + + + + diff --git a/src/lib/components/lemmy/comment/Comments.svelte b/src/lib/components/lemmy/comment/Comments.svelte index fd59bfb5..604f619c 100644 --- a/src/lib/components/lemmy/comment/Comments.svelte +++ b/src/lib/components/lemmy/comment/Comments.svelte @@ -99,7 +99,7 @@ in:fly={{ opacity: 0, y: -4 }} class={isParent ? 'divide-y dark:divide-zinc-800 divide-slate-200' - : 'pl-3.5 border-l-2 border-slate-200 dark:border-zinc-800 my-1'} + : 'pl-3.5 border-l border-slate-200 dark:border-zinc-800 my-1'} > {#each nodes as node (node.comment_view.comment.id)} { node.loading = true fetchChildren(node).then(() => (node.loading = false)) }} > - + {node.comment_view.counts.child_count} more diff --git a/src/lib/components/lemmy/moderation/ModerationMenu.svelte b/src/lib/components/lemmy/moderation/ModerationMenu.svelte index 77d93d52..a591a692 100644 --- a/src/lib/components/lemmy/moderation/ModerationMenu.svelte +++ b/src/lib/components/lemmy/moderation/ModerationMenu.svelte @@ -86,9 +86,10 @@ {/if} @@ -122,7 +127,7 @@ - + - {:else} - -
- - - - - -
-
- - - - - - - - -
-
- {/if} +
+ + + + + + + + +
+ diff --git a/src/lib/settings.ts b/src/lib/settings.ts index 75be96a0..5a173ffa 100644 --- a/src/lib/settings.ts +++ b/src/lib/settings.ts @@ -16,17 +16,21 @@ const toBool = (str: string | undefined) => { } interface Settings { - newComments: boolean expandableImages: boolean + // should have been named "fade" read posts markReadPosts: boolean + // ??? instance?: string - revertColors: boolean showInstances: { user: boolean community: boolean comments: boolean } + // deprecated showCompactPosts: boolean + + view: 'card' | 'list' | 'compact' + defaultSort: { sort: SortType feed: 'All' | 'Subscribed' | 'Local' @@ -36,7 +40,6 @@ interface Settings { deleted: boolean removed: boolean } - fullWidthLayout: boolean expandSidebar: boolean notifications: { enabled: boolean @@ -58,10 +61,8 @@ interface Settings { } export const defaultSettings: Settings = { - newComments: true, expandableImages: toBool(env.PUBLIC_EXPANDABLE_IMAGES) ?? true, markReadPosts: toBool(env.PUBLIC_MARK_READ_POSTS) ?? true, - revertColors: toBool(env.PUBLIC_REVERT_VOTE_COLORS) ?? false, showInstances: { user: toBool(env.PUBLIC_SHOW_INSTANCES_USER) ?? false, community: toBool(env.PUBLIC_SHOW_INSTANCES_COMMUNITY) ?? true, @@ -77,7 +78,6 @@ export const defaultSettings: Settings = { deleted: toBool(env.PUBLIC_HIDE_DELETED) ?? true, removed: toBool(env.PUBLIC_HIDE_REMOVED) ?? false, }, - fullWidthLayout: toBool(env.PUBLIC_FULL_WIDTH_LAYOUT) ?? false, expandSidebar: toBool(env.PUBLIC_EXPAND_SIDEBAR) ?? true, notifications: { enabled: false, @@ -95,6 +95,7 @@ export const defaultSettings: Settings = { debugInfo: false, systemUI: true, expandImages: true, + view: 'list', } export const userSettings = writable(defaultSettings) diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte index 91034e3f..b6f26956 100644 --- a/src/routes/settings/+page.svelte +++ b/src/routes/settings/+page.svelte @@ -75,6 +75,19 @@ + + 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} +

+
Hide Posts @@ -117,34 +130,16 @@ UI - Mark read posts + Fade read posts Fade the title of posts you've already read. - - - Revert vote colors - - - Make upvotes orange and downvotes blue, like Reddit used to do. - - - - Post style - - NSFW blur Blur images of NSFW content. - - - New vote design - - Alternate vote design - Expand Images