From 25b1ab8d8e3a9c655a541fe512d0dca9fcfe0e76 Mon Sep 17 00:00:00 2001 From: Xylight Date: Thu, 4 Jul 2024 14:13:36 -0700 Subject: [PATCH] feat: add retry option --- src/lib/i18n/en.json | 3 +- src/routes/+error.svelte | 3 +- src/routes/+page.svelte | 70 +++++++++++++++++++----- src/routes/+page.ts | 3 - src/routes/settings/+page.svelte | 1 + src/routes/settings/ToggleSetting.svelte | 40 ++++++++------ 6 files changed, 84 insertions(+), 36 deletions(-) diff --git a/src/lib/i18n/en.json b/src/lib/i18n/en.json index b55800e3..3f8bedff 100644 --- a/src/lib/i18n/en.json +++ b/src/lib/i18n/en.json @@ -473,7 +473,8 @@ }, "message": { "success": "Success", - "error": "Error" + "error": "Error", + "retry": "Retry" }, "toast": { "noComments": "The API returned no comments.", diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte index 0c08a107..05f11688 100644 --- a/src/routes/+error.svelte +++ b/src/routes/+error.svelte @@ -1,6 +1,7 @@ @@ -18,6 +19,6 @@ {$page.error?.message} diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 7f34e614..a2b18d3a 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -12,13 +12,20 @@ import ViewSelect from '$lib/components/lemmy/dropdowns/ViewSelect.svelte' import { searchParam } from '$lib/util.js' import PostFeed from '$lib/components/lemmy/post/PostFeed.svelte' - import { ChartBar, GlobeAmericas, Icon, ServerStack } from 'svelte-hero-icons' + import { + ChartBar, + ExclamationCircle, + ExclamationTriangle, + GlobeAmericas, + Icon, + ServerStack, + } from 'svelte-hero-icons' import { getClient, site } from '$lib/lemmy.js' import Location from '$lib/components/lemmy/dropdowns/Location.svelte' import Header from '$lib/components/ui/layout/pages/Header.svelte' import { t } from '$lib/translations.js' import InfiniteScroll from 'svelte-infinite-scroll' - import { Spinner } from 'mono-svelte' + import { Button, Material, Spinner } from 'mono-svelte' import { writable } from 'svelte/store' import type { GetPostsResponse } from 'lemmy-js-client' import { userSettings } from '$lib/settings.js' @@ -27,24 +34,40 @@ const limit = 20 let hasMore = data.posts.posts.length != 0 + let error: any = undefined + let loading = false async function loadMore() { if (!hasMore) return - const newPosts = await getClient().getPosts({ - limit: limit, - page: data.page, - sort: data.sort, - type_: data.listingType, - page_cursor: data.cursor.next, - }) + try { + loading = true + const newPosts = await getClient() + .getPosts({ + limit: limit, + page: data.page, + sort: data.sort, + type_: data.listingType, + page_cursor: data.cursor.next, + }) + .catch((e) => { + throw new Error(e) + }) - hasMore = newPosts.posts.length != 0 + error = null - data.cursor.next = newPosts.next_page - data.posts.posts = [...data.posts.posts, ...newPosts.posts] + hasMore = newPosts.posts.length != 0 - _posts.update((ps) => ({ data: data.posts, params: ps.params })) + data.cursor.next = newPosts.next_page + data.posts.posts = [...data.posts.posts, ...newPosts.posts] + + _posts.update((ps) => ({ data: data.posts, params: ps.params })) + + loading = false + } catch (e) { + error = e + loading = false + } } @@ -62,7 +85,26 @@ {#if $userSettings.infiniteScroll} - {#if hasMore} + {#if error} +
+
+ +
+
{error}
+ +
+ {:else if hasMore}
diff --git a/src/routes/+page.ts b/src/routes/+page.ts index 5c2b0510..a8f0ddda 100644 --- a/src/routes/+page.ts +++ b/src/routes/+page.ts @@ -20,9 +20,6 @@ export async function load({ url, fetch }) { const cached = get(_posts) - console.log(url.searchParams.toString()) - console.log(cached?.params?.toString()) - const posts = cached && url.searchParams.toString() == cached.params.toString() ? cached.data diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte index 458c1632..96628151 100644 --- a/src/routes/settings/+page.svelte +++ b/src/routes/settings/+page.svelte @@ -215,6 +215,7 @@
- {#if Object.values(supportedPlatforms).some((v) => v == false)} + {#if Object.values(supportedPlatforms).some((v) => v == false) || beta}
- {#if supportedPlatforms.desktop} - - - {$t('settings.desktop')} - + {#if beta} + Beta {/if} - {#if supportedPlatforms.tablet} - - - {$t('settings.tablet')} - - {/if} - {#if supportedPlatforms.mobile} - - - {$t('settings.mobile')} - + {#if Object.values(supportedPlatforms).some((v) => v == false)} + {#if supportedPlatforms.desktop} + + + {$t('settings.desktop')} + + {/if} + {#if supportedPlatforms.tablet} + + + {$t('settings.tablet')} + + {/if} + {#if supportedPlatforms.mobile} + + + {$t('settings.mobile')} + + {/if} {/if}
{/if}