Merge pull request 'Implement Pagination / Limit for the Dashboard' (#18) from issue-6 into main
Commit / ci (push) Waiting to run
Commit / ci (push) Waiting to run
Reviewed-on: #18
This commit was merged in pull request #18.
This commit is contained in:
@@ -2,7 +2,7 @@ import { db } from '$lib/server/db';
|
|||||||
import { aktis, ratings } from '$lib/server/db/schema';
|
import { aktis, ratings } from '$lib/server/db/schema';
|
||||||
import { avg, eq } from 'drizzle-orm';
|
import { avg, eq } from 'drizzle-orm';
|
||||||
|
|
||||||
export async function getAktisWithAvgRating() {
|
export async function getAktisWithAvgRating(limit = 20, offset = 0) {
|
||||||
return await db
|
return await db
|
||||||
.select({
|
.select({
|
||||||
id: aktis.id,
|
id: aktis.id,
|
||||||
@@ -12,5 +12,7 @@ export async function getAktisWithAvgRating() {
|
|||||||
})
|
})
|
||||||
.from(aktis)
|
.from(aktis)
|
||||||
.leftJoin(ratings, eq(aktis.id, ratings.aktiId))
|
.leftJoin(ratings, eq(aktis.id, ratings.aktiId))
|
||||||
.groupBy(aktis.id, aktis.title, aktis.summary);
|
.groupBy(aktis.id, aktis.title, aktis.summary)
|
||||||
|
.limit(limit)
|
||||||
|
.offset(offset);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,11 @@
|
|||||||
import { getAktisWithAvgRating } from '$lib/server/db/queries';
|
import { getAktisWithAvgRating } from '$lib/server/db/queries';
|
||||||
import type { PageServerLoad } from './$types';
|
import type { PageServerLoad } from './$types';
|
||||||
|
|
||||||
export const load: PageServerLoad = async () => {
|
export const load: PageServerLoad = async ({ url }) => {
|
||||||
const a = await getAktisWithAvgRating();
|
const offset = Number(url.searchParams.get('offset')) || 0;
|
||||||
|
const limit = 20;
|
||||||
|
|
||||||
|
const a = await getAktisWithAvgRating(limit, offset);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
aktis: a.map((a) => ({ ...a, rating: a.rating ? parseFloat(a.rating) : undefined }))
|
aktis: a.map((a) => ({ ...a, rating: a.rating ? parseFloat(a.rating) : undefined }))
|
||||||
|
|||||||
+44
-1
@@ -1,12 +1,55 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import AktiCard from '$lib/components/akti/AktiCard.svelte';
|
import AktiCard from '$lib/components/akti/AktiCard.svelte';
|
||||||
import type { PageProps } from './$types';
|
import type { PageProps } from './$types';
|
||||||
|
import { Spinner } from 'flowbite-svelte';
|
||||||
|
|
||||||
let { data }: PageProps = $props();
|
let { data }: PageProps = $props();
|
||||||
|
|
||||||
|
let aktis = $state(data.aktis);
|
||||||
|
let offset = $state(data.aktis.length);
|
||||||
|
let loading = $state(false);
|
||||||
|
let hasMore = $state(data.aktis.length >= 20);
|
||||||
|
|
||||||
|
async function loadMore() {
|
||||||
|
if (loading || !hasMore) return;
|
||||||
|
loading = true;
|
||||||
|
const res = await fetch(`/api/aktis?offset=${offset}`);
|
||||||
|
const newAktis = await res.json();
|
||||||
|
|
||||||
|
if (newAktis.length < 20) {
|
||||||
|
hasMore = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
aktis = [...aktis, ...newAktis];
|
||||||
|
offset += newAktis.length;
|
||||||
|
loading = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
function infiniteScroll(node: HTMLElement) {
|
||||||
|
const observer = new IntersectionObserver((entries) => {
|
||||||
|
if (entries[0].isIntersecting) {
|
||||||
|
loadMore();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
observer.observe(node);
|
||||||
|
return {
|
||||||
|
destroy() {
|
||||||
|
observer.disconnect();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class="grid gap-5 grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 3xl:grid-cols-5">
|
<div class="grid gap-5 grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 3xl:grid-cols-5">
|
||||||
{#each data.aktis as akti (akti.id)}
|
{#each aktis as akti (akti.id)}
|
||||||
<AktiCard {akti}></AktiCard>
|
<AktiCard {akti}></AktiCard>
|
||||||
{/each}
|
{/each}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="mt-10 flex justify-center h-20">
|
||||||
|
{#if loading}
|
||||||
|
<Spinner />
|
||||||
|
{:else if hasMore}
|
||||||
|
<div use:infiniteScroll></div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
import { getAktisWithAvgRating } from '$lib/server/db/queries';
|
||||||
|
import { json, type RequestHandler } from '@sveltejs/kit';
|
||||||
|
|
||||||
|
export const GET: RequestHandler = async ({ url }) => {
|
||||||
|
const offset = Number(url.searchParams.get('offset')) || 0;
|
||||||
|
const limit = 20;
|
||||||
|
|
||||||
|
const a = await getAktisWithAvgRating(limit, offset);
|
||||||
|
|
||||||
|
return json(a.map((a) => ({ ...a, rating: a.rating ? parseFloat(a.rating) : undefined })));
|
||||||
|
};
|
||||||
Reference in New Issue
Block a user