External/5chan
1
0
Fork 0
mirror of https://github.com/bitsocialnet/5chan.git synced 2026-08-03 07:41:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

update loading strings

Browse Source
This commit is contained in:
Tom (plebeius.eth)
2025-02-20 13:54:55 +01:00
parent 684ca25a65
commit 68a2d301f1
39 changed files with 90 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/post-desktop/post-desktop.tsx
+1 -1
View File
@@ -524,7 +524,7 @@ const PostDesktop = ({ openReplyModal, post, roles, showAllReplies, showReplies
{!isInPendingPostView &&
!isDescription &&
!isRules &&
(stateString && stateString !== 'Failed' && state !== 'succeeded' ? (
(stateString && stateString !== 'Failed' && state !== 'succeeded' && isInPostPageView ? (
<div className={styles.stateString}>
<br />
<LoadingEllipsis string={stateString} />
src/components/post-mobile/post-mobile.tsx
+1 -1
View File
@@ -450,7 +450,7 @@ const PostMobile = ({ openReplyModal, post, roles, showAllReplies, showReplies =
{!isInPendingPostView &&
!isDescription &&
!isRules &&
(stateString && stateString !== 'Failed' && state !== 'succeeded' ? (
(stateString && stateString !== 'Failed' && state !== 'succeeded' && isInPostPageView ? (
<div className={styles.stateString}>
<LoadingEllipsis string={stateString} />
</div>
src/views/board/board.tsx
+9 -3
View File
@@ -121,7 +121,6 @@ const Board = () => {
const { activeCid, threadCid, closeModal, openReplyModal, showReplyModal, scrollY, subplebbitAddress: postSubplebbitAddress } = useReplyModal();
const { blocked, unblock } = useBlock({ address: subplebbitAddress });
const loadingStateString = useFeedStateString(subplebbitAddresses) || t('loading_board');
const handleNewerPostsButtonClick = () => {
window.scrollTo({ top: 0, left: 0 });
@@ -144,6 +143,13 @@ const Board = () => {
filter: hideThreadsWithoutImages ? threadsWithoutImagesFilter : undefined,
});
const feedLength = feed.length;
const weeklyFeedLength = weeklyFeed.length;
const monthlyFeedLength = monthlyFeed.length;
const hasFeedLoaded = !!feed;
const loadingStateString =
!hasFeedLoaded || (feedLength === 0 && !(weeklyFeedLength > feedLength || monthlyFeedLength > feedLength)) ? t('loading_feed') : t('looking_for_more_posts');
const [showMorePostsSuggestion, setShowMorePostsSuggestion] = useState(false);
useEffect(() => {
const timer = setTimeout(() => {
@@ -181,7 +187,7 @@ const Board = () => {
<div className={styles.morePostsSuggestion}>
<Trans
i18nKey='more_threads_last_week'
values={{ currentTimeFilterName }}
values={{ currentTimeFilterName, count: feed.length }}
components={{
1: <Link to={(isInAllView ? '/p/all' : isInSubscriptionsView ? '/p/subscriptions' : `/p/${subplebbitAddress}`) + '/1w'} />,
}}
@@ -191,7 +197,7 @@ const Board = () => {
<div className={styles.morePostsSuggestion}>
<Trans
i18nKey='more_threads_last_month'
values={{ currentTimeFilterName }}
values={{ currentTimeFilterName, count: feed.length }}
components={{
1: <Link to={(isInAllView ? '/p/all' : isInSubscriptionsView ? '/p/subscriptions' : `/p/${subplebbitAddress}`) + '/1m'} />,
}}
src/views/catalog/catalog.tsx
+9 -3
View File
@@ -129,7 +129,13 @@ const Catalog = () => {
const subplebbit = useSubplebbit({ subplebbitAddress });
const { error, shortAddress, state, title } = subplebbit || {};
const { blocked, unblock } = useBlock({ address: subplebbitAddress });
const loadingStateString = useFeedStateString(subplebbitAddresses) || t('loading');
const feedLength = feed.length;
const weeklyFeedLength = weeklyFeed.length;
const monthlyFeedLength = monthlyFeed.length;
const hasFeedLoaded = !!feed;
const loadingStateString =
!hasFeedLoaded || (feedLength === 0 && !(weeklyFeedLength > feedLength || monthlyFeedLength > feedLength)) ? t('loading_feed') : t('looking_for_more_posts');
const loadingString = (
<div className={styles.stateString}>
@@ -185,7 +191,7 @@ const Catalog = () => {
<div className={styles.stateString}>
<Trans
i18nKey='more_threads_last_week'
values={{ currentTimeFilterName }}
values={{ currentTimeFilterName, count: feed.length }}
components={{
1: <Link to={(isInAllView ? '/p/all/catalog' : isInSubscriptionsView ? '/p/subscriptions/catalog' : `/p/${subplebbitAddress}/catalog`) + '/1w'} />,
}}
@@ -195,7 +201,7 @@ const Catalog = () => {
<div className={styles.stateString}>
<Trans
i18nKey='more_threads_last_month'
values={{ currentTimeFilterName }}
values={{ currentTimeFilterName, count: feed.length }}
components={{
1: <Link to={(isInAllView ? '/p/all/catalog' : isInSubscriptionsView ? '/p/subscriptions/catalog' : `/p/${subplebbitAddress}/catalog`) + '/1m'} />,
}}