feat: add cursor pagination

This commit is contained in:
Xylight committed 2023-09-29 21:57:07 +00:00
1 parent 24c0c248f3
commit 0239d6cef9
5 files changed
+26 -10

No files matched your search

+1 -1
View File
@@ -21,7 +21,7 @@
bind:value={selected}
on:change={(e) => {
sort = 'TopAll'
if (navigate) searchParam($page.url, 'sort', selected, 'page')
if (navigate) searchParam($page.url, 'sort', selected, 'page', 'cursor')
}}
>
<span slot="label" class="flex items-center gap-1">
+8 -2
View File
@@ -10,8 +10,9 @@
} from 'svelte-hero-icons'
export let page: number
export let next_cursor: string | undefined = undefined
const dispatcher = createEventDispatcher<{ change: number }>()
const dispatcher = createEventDispatcher<{ change: number, cursor: string }>()
</script>
<div class="flex flex-row w-full gap-4 items-center">
@@ -21,6 +22,7 @@
</span>
<hr class="border-slate-200 dark:border-zinc-800 flex-1" />
{/if}
{#if !next_cursor}
<Button
on:click={() => {
dispatcher('change', --page)
@@ -31,10 +33,14 @@
<Icon src={ChevronLeft} size="18" mini slot="prefix" />
Back
</Button>
{/if}
<Button
on:click={() => {
dispatcher('change', ++page)
if (next_cursor)
dispatcher('cursor', next_cursor)
else
dispatcher('change', ++page)
}}
class={$$slots.default ? '' : 'flex-1'}
>
+2
View File
@@ -6,6 +6,8 @@ const FEATURES = {
controversialSort: '0.19.0',
scaledSort: '0.19.0',
unproxiedImageUpload: '0.19.0',
cursorPagination: '0.19.0',
newTotp: '0.19.0'
}
type Feature = keyof typeof FEATURES
+3 -1
View File
@@ -57,7 +57,7 @@
<Select
bind:value={data.listingType}
on:change={() =>
searchParam($page.url, 'type', data.listingType, 'page')}
searchParam($page.url, 'type', data.listingType, 'page', 'cursor')}
>
<span slot="label" class="flex items-center gap-1">
<Icon src={GlobeAmericas} size="16" mini />
@@ -88,7 +88,9 @@
<div class="mt-auto">
<Pageination
page={data.page}
next_cursor={data.next_page}
on:change={(p) => searchParam($page.url, 'page', p.detail.toString())}
on:cursor={(c) => searchParam($page.url, 'cursor', c.detail)}
>
<span class="max-sm:hidden">
You've viewed <span
+12 -6
View File
@@ -4,8 +4,10 @@ import type { ListingType, SortType } from 'lemmy-js-client'
import { get } from 'svelte/store'
import { error } from '@sveltejs/kit'
import { profile } from '$lib/auth.js'
import { feature } from '$lib/version.js'
export async function load({ url, fetch }) {
const cursor = url.searchParams.get('cursor') as string | undefined
const page = Number(url.searchParams.get('page') || 1) || 1
const sort: SortType =
@@ -15,17 +17,21 @@ export async function load({ url, fetch }) {
(url.searchParams.get('type') as ListingType) ||
get(userSettings).defaultSort.feed
const posts = await getClient(undefined, fetch).getPosts({
limit: 20,
page: page,
sort: sort,
type_: listingType,
page_cursor: cursor
})
try {
return {
sort: sort,
listingType: listingType,
page: page,
posts: await getClient(undefined, fetch).getPosts({
limit: 20,
page: page,
sort: sort,
type_: listingType,
}),
posts: posts,
next_page: posts.next_page
}
} catch (err) {
throw error(500, {