From 38653bf4a6c4d1adcaf08da1d9d890c412de3d0f Mon Sep 17 00:00:00 2001
From: Adam Veldhousen <adamveld12@gmail.com>
Date: Sat, 20 May 2023 01:25:03 -0500
Subject: [PATCH] no idea why shit isn't updating weee

---
 src/catalog/internal/handler.go          |  2 +-
 src/web-client/src/routes/+layout.svelte |  6 +++---
 src/web-client/src/routes/+layout.ts     |  4 ++--
 src/web-client/src/routes/+page.svelte   | 18 +++++++++++++++++-
 src/web-client/src/routes/+page.ts       |  6 ++++--
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/catalog/internal/handler.go b/src/catalog/internal/handler.go
index 2f1c274..44de446 100644
--- a/src/catalog/internal/handler.go
+++ b/src/catalog/internal/handler.go
@@ -29,7 +29,7 @@ type catalogHandler struct {
 }
 
 func (rh *catalogHandler) GetUpcoming(ctx context.Context, cmd *api.AuctionSearchCriteria) (out *api.GetUpcomingResult, err error) {
-	page := int(math.Min(1, float64(cmd.GetPage())))
+	page := int(math.Max(0, float64(cmd.GetPage())))
 	pageSize := int(cmd.GetLimit())
 
 	if pageSize < 32 {
diff --git a/src/web-client/src/routes/+layout.svelte b/src/web-client/src/routes/+layout.svelte
index 6b09097..2408911 100644
--- a/src/web-client/src/routes/+layout.svelte
+++ b/src/web-client/src/routes/+layout.svelte
@@ -1,14 +1,14 @@
 <script lang="ts">
 	import type { LayoutData } from './$types';
-	import { goto } from '$app/navigation';
+	import { goto, invalidateAll } from '$app/navigation';
 	import SearchBox from '$lib/SearchBox.svelte';
 	import '../app.css';
 
 	export let data: LayoutData;
 
 	async function onSubmit(evt: CustomEvent) {
-		const { query, page } = evt.detail;
-		await goto(query ? `/?query=${query}&page=${page || 0}` : '/', {
+		let { query } = evt.detail;
+		await goto(query ? `/?query=${query}` : '/', {
 			invalidateAll: true
 		});
 	}
diff --git a/src/web-client/src/routes/+layout.ts b/src/web-client/src/routes/+layout.ts
index 746eb86..2aa762a 100644
--- a/src/web-client/src/routes/+layout.ts
+++ b/src/web-client/src/routes/+layout.ts
@@ -3,8 +3,8 @@ import type { LayoutLoad } from './$types';
 export const load = (({ url }) => {
 	return {
 		query: url.searchParams.get('query')  || '',
-		page: parseInt(url.searchParams.get('page')  || '1'),
-		limit: parseInt(url.searchParams.get('pageSize') || '32'),
+		page: parseInt(url.searchParams.get('page')  || '0'),
+		limit: parseInt(url.searchParams.get('pageSize') || '64'),
 	};
 
 }) satisfies LayoutLoad;
diff --git a/src/web-client/src/routes/+page.svelte b/src/web-client/src/routes/+page.svelte
index c452b70..d37564b 100644
--- a/src/web-client/src/routes/+page.svelte
+++ b/src/web-client/src/routes/+page.svelte
@@ -1,14 +1,30 @@
 <script lang="ts">
 	import type { PageData } from './$types';
 	import AuctionResult from '$lib/AuctionResult.svelte';
+	import { invalidateAll } from '$app/navigation';
 
 	export let data: PageData;
 
 	$: hasResults = (data?.results || []).length > 0;
+	$: currentPage = data.page + 1;
+	$: pageCount = Math.floor(data.total / 64);
 </script>
 
 {#if hasResults}
-	<h1 class="pb-5 text-lg">{data?.results.length} of {data?.total} Upcoming & Live Auctions</h1>
+	<section>
+		<h1 class="pb-5 text-lg">{data?.results.length} of {data?.total} Upcoming & Live Auctions</h1>
+		<ol class="flex justify-between w-full center" style="padding: 0 10%;">
+			{#if currentPage > 1}
+				<li><a href="/?query={data.query}&page={data.page - 1}">&lt;Previous</a></li>
+			{:else}
+				<li />
+			{/if}
+			<li>Page {currentPage} of {pageCount}</li>
+			{#if currentPage < pageCount}
+				<li><a href="/?query={data.query}&page={data.page + 1}">Next&gt;</a></li>
+			{/if}
+		</ol>
+	</section>
 
 	<ul class="flex flex-col m-0 p-0 justify-between pr-10">
 		{#each data?.results as auction, i}
diff --git a/src/web-client/src/routes/+page.ts b/src/web-client/src/routes/+page.ts
index 5880ec3..f4b9f4d 100644
--- a/src/web-client/src/routes/+page.ts
+++ b/src/web-client/src/routes/+page.ts
@@ -4,9 +4,11 @@ const API_HOST = 'http://localhost:8000/api/v1'
 
 export const load = (async ({ fetch, url }) => {
 	const searchTerm = url.searchParams.get('query') || '';
-	const currentPage = url.searchParams.get('page') || 1;
+	const currentPage = url.searchParams.get('page') || 0;
+	const currentLimit = url.searchParams.get('limit') || 64;
+
 	try {
-		const response = await fetch(API_HOST + `/upcoming?searchTerm=${searchTerm}&page=${currentPage}`);
+		const response = await fetch(API_HOST + `/upcoming?searchTerm=${searchTerm}&page=${currentPage}&limit=${currentLimit}`);
 		const { page, total, results } = await response.json() || {};
 
 		return {