From fb84c6da903939cbd1c962f91b8b1de8645d710e Mon Sep 17 00:00:00 2001
From: Bradley Shellnut <bradleyshellnut@pm.me>
Date: Sun, 4 Dec 2022 21:26:32 -0800
Subject: [PATCH] Fixing return form data.

---
 src/lib/components/pagination/index.svelte    | 35 +++++--------------
 .../search/advancedSearch/index.svelte        |  1 +
 src/lib/util/gameMapper.ts                    |  2 ++
 src/lib/zodValidation.ts                      | 32 ++++++++---------
 src/routes/search/+page.server.ts             |  3 ++
 5 files changed, 30 insertions(+), 43 deletions(-)

diff --git a/src/lib/components/pagination/index.svelte b/src/lib/components/pagination/index.svelte
index 6413515..e87ee5b 100644
--- a/src/lib/components/pagination/index.svelte
+++ b/src/lib/components/pagination/index.svelte
@@ -19,6 +19,7 @@
 	export let pageSize: number; // Reactive, bind
 	export let page: number = 1; // Reactive, bind
 	export let totalItems: number;
+	export let showItemsLeft = false;
 	export let pageSizeInputDisabled: boolean = false;
 	export let pageSizes: ReadonlyArray<Number> = [10];
 	export let forwardText: string;
@@ -74,9 +75,11 @@
 	<p>
 		Page {page || 1} of {totalPages || 1}
 	</p>
-	<p>
-		{itemsLeft} Item{itemsLeft > 1 || itemsLeft === 0 ? 's' : ''} Left
-	</p>
+	{#if showItemsLeft}
+		<p>
+			{itemsLeft} Item{itemsLeft > 1 || itemsLeft === 0 ? 's' : ''} Left
+		</p>
+	{/if}
 	<div style="display: flex; gap: 2rem;">
 		<button
 			type="button"
@@ -107,17 +110,13 @@
 
 <style lang="scss">
 	.container {
-		display: grid;
-		grid-template-columns: repeat(4, 1fr);
+		display: flex;
+		flex: wrap;
+		justify-content: space-between;
 		align-items: center;
 		gap: 1rem;
 		margin: 3rem 0;
 
-		@media (max-width: 640px) {
-			grid-template-columns: repeat(2, 1fr);
-			grid-template-rows: repeat(2, 1fr);
-		}
-
 		.btn {
 			display: flex;
 			gap: 0.5rem;
@@ -131,23 +130,7 @@
 		}
 	}
 
-	/* .list-container :global(.list-box) {
-		height: 100%;
-		position: relative;
-	}
-
-	.list-container :global(.list-options) {
-		position: absolute;
-	}
-
-	.list-container :global(.active) {
-		display: flex;
-		gap: 1rem;
-		padding: 1rem;
-	} */
-
 	button {
-		/* min-width: 50px; */
 		&[aria-current],
 		&.current {
 			color: black; // TODO: Fix these colors
diff --git a/src/lib/components/search/advancedSearch/index.svelte b/src/lib/components/search/advancedSearch/index.svelte
index 3b1b3bb..d26f293 100644
--- a/src/lib/components/search/advancedSearch/index.svelte
+++ b/src/lib/components/search/advancedSearch/index.svelte
@@ -3,6 +3,7 @@
 	import { boredState } from '$lib/stores/boredState';
 
 	export let form: ActionData;
+	console.log('form data', form?.data);
 	const errors = form?.errors;
 	let submitting = $boredState?.loading;
 	let minAge = +form?.data?.minAge || 1;
diff --git a/src/lib/util/gameMapper.ts b/src/lib/util/gameMapper.ts
index b9c0f42..a06afe7 100644
--- a/src/lib/util/gameMapper.ts
+++ b/src/lib/util/gameMapper.ts
@@ -12,6 +12,8 @@ export function convertToSavedGame(game: GameType | SavedGameType): SavedGameTyp
 
 export function mapSavedGameToGame(game: SavedGameType): GameType {
   const { id, name, thumb_url, players, playtime } = game;
+  console.log({ id, name, thumb_url, players, playtime });
+  
   
   return {
     id,
diff --git a/src/lib/zodValidation.ts b/src/lib/zodValidation.ts
index 78b97ec..f5443ff 100644
--- a/src/lib/zodValidation.ts
+++ b/src/lib/zodValidation.ts
@@ -17,26 +17,24 @@ export const saved_game_schema = z.object({
 });
 
 // https://github.com/colinhacks/zod/discussions/330
-// function IntegerString
-//   <schema extends (ZodNumber | ZodOptional<ZodNumber>)>
-//   (schema: schema)
-// {
-//   return (
-//     z.preprocess((value) => (
-//       ( (typeof value === "string") ? parseInt(value, 10)
-//       : (typeof value === "number") ? value
-//       :                               undefined
-//     )), schema)
-//   )
-// }
-
-// minPlayers: IntegerString(z.number().min(1).max(50).optional());
+function IntegerString
+  <schema extends (ZodNumber | ZodOptional<ZodNumber>)>
+  (schema: schema)
+{
+  return (
+    z.preprocess((value) => (
+      ( (typeof value === "string") ? parseInt(value, 10)
+      : (typeof value === "number") ? value
+      :                               undefined
+    )), schema)
+  )
+}
 
 export const search_schema = z.object({
   name: z.string().trim().optional(),
-  minAge: z.preprocess((a) => parseInt(z.string().parse(a), 10), z.number().min(1).max(120).optional()),
-  minPlayers: z.preprocess((a) => parseInt(z.string().parse(a), 10), z.number().min(1).max(50).optional()),
-  maxPlayers: z.preprocess((a) => parseInt(z.string().parse(a), 10), z.number().min(1).max(50).optional()),
+  minAge: IntegerString(z.number().min(1).max(120).optional()),
+  minPlayers: IntegerString(z.number().min(1).max(50).optional()),
+  maxPlayers: IntegerString(z.number().min(1).max(50).optional()),
   exactMinAge: z.preprocess((a) => Boolean(a), z.boolean().optional()),
   exactMinPlayers: z.preprocess((a) => Boolean(a), z.boolean().optional()),
   exactMaxPlayers: z.preprocess((a) => Boolean(a), z.boolean().optional())
diff --git a/src/routes/search/+page.server.ts b/src/routes/search/+page.server.ts
index 5fe027e..b6f2985 100644
--- a/src/routes/search/+page.server.ts
+++ b/src/routes/search/+page.server.ts
@@ -39,6 +39,7 @@ export const actions: Actions = {
     const random = formData?.random === 'on';
 
     if (random) {
+      console.log('Random');
       queryParams.random = random;
     } else {
       try {
@@ -82,6 +83,8 @@ export const actions: Actions = {
         }
       } catch (error: unknown) {
         if (error instanceof ZodError) {
+          console.log(error);
+          
           const { fieldErrors: errors } = error.flatten();
           return invalid(400, { data: formData, errors });
         }