From b4b0d8d6b7d874a7cd230064d7cf38f06e754cea Mon Sep 17 00:00:00 2001
From: sevonj <100710152+sevonj@users.noreply.github.com>
Date: Fri, 26 Jul 2024 12:02:30 +0300
Subject: [PATCH 1/3] feat-feed-indicator
---
src/lib/components/lemmy/post/feed/VirtualFeed.svelte | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/src/lib/components/lemmy/post/feed/VirtualFeed.svelte b/src/lib/components/lemmy/post/feed/VirtualFeed.svelte
index 3ada2b0c..6469f0c3 100644
--- a/src/lib/components/lemmy/post/feed/VirtualFeed.svelte
+++ b/src/lib/components/lemmy/post/feed/VirtualFeed.svelte
@@ -36,6 +36,7 @@
import { t } from '$lib/translations'
import InfiniteScroll from 'svelte-infinite-scroll'
import type { Readable } from 'svelte/motion'
+ import EndPlaceholder from '$lib/components/ui/EndPlaceholder.svelte';
export let posts: PostView[]
export let community: boolean = false
@@ -274,6 +275,16 @@
+ {:else}
+
+
+ {#if feedData.community_name}
+ You have reached the end of {feedData.community_name}.
+ {:else}
+ You have reached the end of the feed.
+ {/if}
+
+
{/if}
{/if}
From f56167099d00b23c196a73e123694e27441b47a2 Mon Sep 17 00:00:00 2001
From: sevonj <100710152+sevonj@users.noreply.github.com>
Date: Thu, 1 Aug 2024 14:58:04 +0300
Subject: [PATCH 2/3] endfeed translation
---
src/lib/components/lemmy/post/feed/VirtualFeed.svelte | 9 ++++-----
src/lib/i18n/en.json | 3 ++-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/lib/components/lemmy/post/feed/VirtualFeed.svelte b/src/lib/components/lemmy/post/feed/VirtualFeed.svelte
index 6469f0c3..6c91164b 100644
--- a/src/lib/components/lemmy/post/feed/VirtualFeed.svelte
+++ b/src/lib/components/lemmy/post/feed/VirtualFeed.svelte
@@ -278,11 +278,10 @@
{:else}
- {#if feedData.community_name}
- You have reached the end of {feedData.community_name}.
- {:else}
- You have reached the end of the feed.
- {/if}
+ {$t('routes.frontpage.endFeed', {
+ // @ts-ignore
+ community_name: feedData.community_name ?? 'undefined',
+ })}
{/if}
diff --git a/src/lib/i18n/en.json b/src/lib/i18n/en.json
index be77a8a5..967182b4 100644
--- a/src/lib/i18n/en.json
+++ b/src/lib/i18n/en.json
@@ -183,7 +183,8 @@
"routes": {
"frontpage": {
"title": "Frontpage",
- "footer": "{{users:number}} active {{users; 1:user; default:users;}}"
+ "footer": "{{users:number}} active {{users; 1:user; default:users;}}",
+ "endFeed": "You have reached the end of {{community_name; undefined:the feed.; default:{{community_name}}.}}"
},
"modlog": "Modlog",
"instances": "Instances",
From 4f52f2cc1117bb84063d25c6c7318f1daf9664c8 Mon Sep 17 00:00:00 2001
From: Xylight
Date: Fri, 2 Aug 2024 13:33:02 -0700
Subject: [PATCH 3/3] misc: add a scroll to top button
---
src/lib/components/lemmy/post/feed/VirtualFeed.svelte | 9 +++++++--
src/lib/components/ui/EndPlaceholder.svelte | 7 ++++---
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/lib/components/lemmy/post/feed/VirtualFeed.svelte b/src/lib/components/lemmy/post/feed/VirtualFeed.svelte
index 6c91164b..ba7679d4 100644
--- a/src/lib/components/lemmy/post/feed/VirtualFeed.svelte
+++ b/src/lib/components/lemmy/post/feed/VirtualFeed.svelte
@@ -11,6 +11,7 @@
import { Badge, Button } from 'mono-svelte'
import {
ArchiveBox,
+ ChevronDoubleUp,
ExclamationTriangle,
Icon,
Minus,
@@ -36,7 +37,7 @@
import { t } from '$lib/translations'
import InfiniteScroll from 'svelte-infinite-scroll'
import type { Readable } from 'svelte/motion'
- import EndPlaceholder from '$lib/components/ui/EndPlaceholder.svelte';
+ import EndPlaceholder from '$lib/components/ui/EndPlaceholder.svelte'
export let posts: PostView[]
export let community: boolean = false
@@ -223,7 +224,7 @@
bind:this={virtualItemEls[index]}
data-index={row.index}
class="relative post-container"
- in:fly={{ y: -16, easing: expoOut, duration: 500, opacity: 0 }}
+ in:fly={{ y: -16, easing: expoOut, duration: 500, opacity: 0 }}
>
{#if posts[row.index]}
+
+ {$t('routes.post.scrollToTop')}
+
{/if}
diff --git a/src/lib/components/ui/EndPlaceholder.svelte b/src/lib/components/ui/EndPlaceholder.svelte
index c47da1d3..06eaee1c 100644
--- a/src/lib/components/ui/EndPlaceholder.svelte
+++ b/src/lib/components/ui/EndPlaceholder.svelte
@@ -1,9 +1,10 @@
-
+
-
+