misc: update cursor pagination

This commit is contained in:
Xyphyn committed 2023-10-02 15:45:54 -07:00
1 parent c3926efff0
commit c843d8bb45
4 files changed
+19 -13

No files matched your search

+7 -8
View File
@@ -10,9 +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 export let cursor: { next?: string; back?: string } | undefined = undefined
const dispatcher = createEventDispatcher<{ change: number, cursor: string }>() 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">
@@ -22,10 +22,11 @@
</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} {#if cursor?.back}
<Button <Button
on:click={() => { on:click={() => {
dispatcher('change', --page) if (cursor?.back) dispatcher('cursor', cursor.back)
else dispatcher('change', --page)
}} }}
disabled={page <= 1} disabled={page <= 1}
class={$$slots.default ? '' : 'flex-1'} class={$$slots.default ? '' : 'flex-1'}
@@ -37,10 +38,8 @@
<Button <Button
on:click={() => { on:click={() => {
if (next_cursor) if (cursor?.next) dispatcher('cursor', cursor?.next)
dispatcher('cursor', next_cursor) else dispatcher('change', ++page)
else
dispatcher('change', ++page)
}} }}
class={$$slots.default ? '' : 'flex-1'} class={$$slots.default ? '' : 'flex-1'}
> >
+4 -2
View File
@@ -88,9 +88,11 @@
<div class="mt-auto"> <div class="mt-auto">
<Pageination <Pageination
page={data.page} page={data.page}
next_cursor={data.next_page} cursor={{ next: data.cursor.next, back: data.cursor.back }}
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)} 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
+7 -2
View File
@@ -8,6 +8,7 @@ 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 cursor = url.searchParams.get('cursor') as string | undefined
const prevCursor = url.searchParams.get('prevCursor') as string | undefined
const page = Number(url.searchParams.get('page')) || undefined const page = Number(url.searchParams.get('page')) || undefined
const sort: SortType = const sort: SortType =
@@ -22,7 +23,7 @@ export async function load({ url, fetch }) {
page: page, page: page,
sort: sort, sort: sort,
type_: listingType, type_: listingType,
page_cursor: cursor page_cursor: cursor,
}) })
try { try {
@@ -31,7 +32,11 @@ export async function load({ url, fetch }) {
listingType: listingType, listingType: listingType,
page: page || 1, page: page || 1,
posts: posts, posts: posts,
next_page: posts.next_page cursor: {
next: posts.next_page,
back: prevCursor,
current: cursor,
},
} }
} catch (err) { } catch (err) {
throw error(500, { throw error(500, {
+1 -1
View File
@@ -89,7 +89,7 @@
<Pageination <Pageination
page={data.page} page={data.page}
next_cursor={data.posts.next_page} cursor={{ next: data.posts.next_page }}
on:cursor={(c) => searchParam($page.url, 'cursor', c.detail)} on:cursor={(c) => searchParam($page.url, 'cursor', c.detail)}
on:change={(p) => searchParam($page.url, 'page', p.detail.toString())} on:change={(p) => searchParam($page.url, 'page', p.detail.toString())}
> >