feat: redo pagination
This commit is contained in:
1 parent
25c440516a
commit
a53d3d9955
6 files changed
+77
-6
No files matched your search
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "photon-lemmy",
|
"name": "photon-lemmy",
|
||||||
"version": "1.7.2",
|
"version": "1.7.3",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite dev",
|
"dev": "vite dev",
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<div
|
||||||
|
class="flex flex-row items-center text-sm text-slate-600 dark:text-zinc-400 gap-2"
|
||||||
|
>
|
||||||
|
<span class="font-medium">
|
||||||
|
<slot />
|
||||||
|
</span>
|
||||||
|
<hr class="border-slate-200 flex-1 dark:border-zinc-800" />
|
||||||
|
<slot name="action" />
|
||||||
|
</div>
|
||||||
@@ -1,20 +1,34 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Button } from 'mono-svelte'
|
import { Button } from 'mono-svelte'
|
||||||
import { createEventDispatcher } from 'svelte'
|
import { createEventDispatcher } from 'svelte'
|
||||||
|
import {
|
||||||
|
ArrowLeft,
|
||||||
|
ArrowRight,
|
||||||
|
ChevronLeft,
|
||||||
|
ChevronRight,
|
||||||
|
Icon,
|
||||||
|
} from 'svelte-hero-icons'
|
||||||
|
|
||||||
export let page: number
|
export let page: number
|
||||||
|
|
||||||
const dispatcher = createEventDispatcher<{ change: number }>()
|
const dispatcher = createEventDispatcher<{ change: number }>()
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class="flex flex-row w-full gap-4">
|
<div class="flex flex-row w-full gap-4 items-center">
|
||||||
|
{#if $$slots.default}
|
||||||
|
<span class="text-sm text-slate-600 dark:text-zinc-400 font-medium">
|
||||||
|
<slot />
|
||||||
|
</span>
|
||||||
|
<hr class="border-slate-200 dark:border-zinc-800 flex-1" />
|
||||||
|
{/if}
|
||||||
<Button
|
<Button
|
||||||
on:click={() => {
|
on:click={() => {
|
||||||
dispatcher('change', --page)
|
dispatcher('change', --page)
|
||||||
}}
|
}}
|
||||||
disabled={page <= 1}
|
disabled={page <= 1}
|
||||||
class="flex-1"
|
class={$$slots.default ? '' : 'flex-1'}
|
||||||
>
|
>
|
||||||
|
<Icon src={ChevronLeft} size="18" mini slot="prefix" />
|
||||||
Back
|
Back
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
@@ -22,8 +36,9 @@
|
|||||||
on:click={() => {
|
on:click={() => {
|
||||||
dispatcher('change', ++page)
|
dispatcher('change', ++page)
|
||||||
}}
|
}}
|
||||||
class="flex-1"
|
class={$$slots.default ? '' : 'flex-1'}
|
||||||
>
|
>
|
||||||
Next
|
Next
|
||||||
|
<Icon src={ChevronRight} size="18" mini slot="suffix" />
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
+16
-1
@@ -76,7 +76,22 @@
|
|||||||
<Pageination
|
<Pageination
|
||||||
page={data.page}
|
page={data.page}
|
||||||
on:change={(p) => searchParam($page.url, 'page', p.detail.toString())}
|
on:change={(p) => searchParam($page.url, 'page', p.detail.toString())}
|
||||||
/>
|
>
|
||||||
|
<span class="max-sm:hidden">
|
||||||
|
You've viewed <span
|
||||||
|
class="text-primary-900 dark:text-primary-100 font-bold"
|
||||||
|
>
|
||||||
|
{data.page * 20}
|
||||||
|
</span>
|
||||||
|
posts.
|
||||||
|
</span>
|
||||||
|
<span class="sm:hidden">
|
||||||
|
<span class="text-primary-900 dark:text-primary-100">
|
||||||
|
{data.page * 20}
|
||||||
|
</span>
|
||||||
|
posts
|
||||||
|
</span>
|
||||||
|
</Pageination>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="hidden xl:block">
|
<div class="hidden xl:block">
|
||||||
|
|||||||
@@ -70,10 +70,26 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<PostFeed posts={data.posts.posts} />
|
<PostFeed posts={data.posts.posts} />
|
||||||
|
|
||||||
<Pageination
|
<Pageination
|
||||||
page={data.page}
|
page={data.page}
|
||||||
on:change={(p) => searchParam($page.url, 'page', p.detail.toString())}
|
on:change={(p) => searchParam($page.url, 'page', p.detail.toString())}
|
||||||
/>
|
>
|
||||||
|
{#if data.posts.posts.length > 0}
|
||||||
|
<span class="max-sm:hidden">
|
||||||
|
You've scrolled <span class="text-primary-900 dark:text-primary-100">
|
||||||
|
{data.page * 20}
|
||||||
|
</span>
|
||||||
|
posts.
|
||||||
|
</span>
|
||||||
|
<span class="sm:hidden">
|
||||||
|
<span class="text-primary-900 dark:text-primary-100">
|
||||||
|
{data.page * 20}
|
||||||
|
</span>
|
||||||
|
posts
|
||||||
|
</span>
|
||||||
|
{/if}
|
||||||
|
</Pageination>
|
||||||
</div>
|
</div>
|
||||||
<div class="hidden xl:block">
|
<div class="hidden xl:block">
|
||||||
<CommunityCard
|
<CommunityCard
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
import {
|
import {
|
||||||
ArrowLeft,
|
ArrowLeft,
|
||||||
ArrowPath,
|
ArrowPath,
|
||||||
|
ChevronDoubleUp,
|
||||||
ExclamationTriangle,
|
ExclamationTriangle,
|
||||||
Icon,
|
Icon,
|
||||||
} from 'svelte-hero-icons'
|
} from 'svelte-hero-icons'
|
||||||
@@ -27,6 +28,7 @@
|
|||||||
import SectionTitle from '$lib/components/ui/SectionTitle.svelte'
|
import SectionTitle from '$lib/components/ui/SectionTitle.svelte'
|
||||||
import FormattedNumber from '$lib/components/util/FormattedNumber.svelte'
|
import FormattedNumber from '$lib/components/util/FormattedNumber.svelte'
|
||||||
import { Button } from 'mono-svelte'
|
import { Button } from 'mono-svelte'
|
||||||
|
import EndPlaceholder from '$lib/components/ui/EndPlaceholder.svelte'
|
||||||
|
|
||||||
export let data
|
export let data
|
||||||
|
|
||||||
@@ -295,6 +297,20 @@
|
|||||||
</div>
|
</div>
|
||||||
{:then comments}
|
{:then comments}
|
||||||
<Comments post={post.post_view.post} nodes={comments} isParent={true} />
|
<Comments post={post.post_view.post} nodes={comments} isParent={true} />
|
||||||
|
{#if comments.length > 5}
|
||||||
|
<EndPlaceholder>
|
||||||
|
You've viewed {post.post_view.counts.comments} comments.
|
||||||
|
|
||||||
|
<Button
|
||||||
|
color="tertiary"
|
||||||
|
on:click={() => window.scrollTo({ top: 0, behavior: 'smooth' })}
|
||||||
|
slot="action"
|
||||||
|
>
|
||||||
|
<Icon src={ChevronDoubleUp} mini size="16" slot="prefix" />
|
||||||
|
Scroll to top
|
||||||
|
</Button>
|
||||||
|
</EndPlaceholder>
|
||||||
|
{/if}
|
||||||
{/await}
|
{/await}
|
||||||
{:catch}
|
{:catch}
|
||||||
<div class="bg-red-500/10 border border-red-500 rounded-md p-4">
|
<div class="bg-red-500/10 border border-red-500 rounded-md p-4">
|
||||||
|
|||||||
Reference in new issue
Block a user