diff --git a/web-app/src/routes/(authenticated)/website/[websiteId]/logs/+page.server.ts b/web-app/src/routes/(authenticated)/website/[websiteId]/logs/+page.server.ts index a89f5db..533b4c0 100644 --- a/web-app/src/routes/(authenticated)/website/[websiteId]/logs/+page.server.ts +++ b/web-app/src/routes/(authenticated)/website/[websiteId]/logs/+page.server.ts @@ -6,6 +6,8 @@ export const load: PageServerLoad = async ({ parent, fetch, params, cookies, url const userFilter = url.searchParams.get("logs_filter_user"); const resourceFilter = url.searchParams.get("logs_filter_resource"); const operationFilter = url.searchParams.get("logs_filter_operation"); + const currentPage = Number.parseInt(url.searchParams.get("logs_results_page") ?? "1"); + const resultOffset = currentPage === 1 ? 0 : currentPage * 50; const searchParams = new URLSearchParams(); @@ -23,7 +25,7 @@ export const load: PageServerLoad = async ({ parent, fetch, params, cookies, url searchParams.append("operation", `eq.${operationFilter.toUpperCase()}`); } - const constructedFetchUrl = `${baseFetchUrl}&${searchParams.toString()}`; + const constructedFetchUrl = `${baseFetchUrl}&${searchParams.toString()}&limit=50&offset=${resultOffset}`; const changeLogData = await fetch(constructedFetchUrl, { method: "GET", diff --git a/web-app/src/routes/(authenticated)/website/[websiteId]/logs/+page.svelte b/web-app/src/routes/(authenticated)/website/[websiteId]/logs/+page.svelte index 8cda235..b52db73 100644 --- a/web-app/src/routes/(authenticated)/website/[websiteId]/logs/+page.svelte +++ b/web-app/src/routes/(authenticated)/website/[websiteId]/logs/+page.svelte @@ -42,6 +42,8 @@ const { user, change_log, media, ...restTables } = tables; resources = restTables; } + + let logsSection: HTMLElement; -
+

Logs

- {data.resultChangeLogCount} - results + {data.resultChangeLogCount.toLocaleString("en", { useGrouping: true })} + result(s)

@@ -111,6 +113,7 @@ > +
@@ -155,6 +158,106 @@ {/each} + {#snippet commonFilterInputs()} + + + + {/snippet} +
+ + diff --git a/web-app/src/routes/+layout.svelte b/web-app/src/routes/+layout.svelte index 4843fcc..75a5ce9 100644 --- a/web-app/src/routes/+layout.svelte +++ b/web-app/src/routes/+layout.svelte @@ -16,7 +16,7 @@ ); -{#if $navigating} +{#if $navigating && ["link", "goto"].includes($navigating.type)} {/if}