pagination and linking improvements

src/web-client/src/routes/+page.svelte

@@ -13,9 +13,11 @@
 		return qs !== '' ? `?${qs}` : qs;
 	}
 
+	const { query, page } = data;
 	$: hasResults = (data.results || []).length > 0;
 	$: currentPage = data.page + 1;
 	$: pageCount = Math.max(1, Math.ceil(data.found / data.limit));
+	$: console.log(`page: ${currentPage}, count: ${pageCount}, `);
 </script>
 
 {#if hasResults}
@@ -24,9 +26,7 @@
 		<ol class="flex justify-between w-full center" style="padding: 0 10%;">
 			{#if currentPage > 1}
 				<li in:fade>
-					<a href="/{buildQueryString({ query: data.query, page: currentPage - 1 })}"
+					<a href="/{buildQueryString({ query, page: currentPage - 1 })}">&lt;Previous</a>
-						>&lt;Previous</a
-					>
 				</li>
 			{:else}
 				<li />
@@ -34,7 +34,7 @@
 			<li>Page {currentPage} of {pageCount}</li>
 			{#if currentPage < pageCount}
 				<li in:fade>
-					<a href="/{buildQueryString({ query: data.query, page: currentPage + 1 })}">Next&gt;</a>
+					<a href="/{buildQueryString({ query, page: currentPage + 1 })}">Next&gt;</a>
 				</li>
 			{/if}
 		</ol>