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