From 0be2ff8911dd31aae612c878844fe477ebdb0f8c Mon Sep 17 00:00:00 2001
From: Nulo <git@nulo.in>
Date: Sun, 22 Sep 2024 18:54:22 -0300
Subject: [PATCH] loading state

fixes #60
---
 sepa/sitio2/src/lib/components/Loading.svelte | 17 +++++++
 .../src/lib/components/SearchBar.svelte       | 14 ++++--
 .../lib/components/ui/button/button.svelte    |  8 +++-
 .../src/lib/components/ui/button/index.ts     |  1 +
 sepa/sitio2/src/lib/sepa-utils.ts             | 11 +++++
 .../src/routes/search/[query]/+page.svelte    | 33 +-------------
 .../routes/search/[query]/ProductCard.svelte  | 44 +++++++++++++++++++
 7 files changed, 92 insertions(+), 36 deletions(-)
 create mode 100644 sepa/sitio2/src/lib/components/Loading.svelte
 create mode 100644 sepa/sitio2/src/routes/search/[query]/ProductCard.svelte

diff --git a/sepa/sitio2/src/lib/components/Loading.svelte b/sepa/sitio2/src/lib/components/Loading.svelte
new file mode 100644
index 0000000..dfffb4b
--- /dev/null
+++ b/sepa/sitio2/src/lib/components/Loading.svelte
@@ -0,0 +1,17 @@
+<script lang="ts">
+	// Parent has to be position relative
+	import { LoaderCircle } from 'lucide-svelte';
+
+	export let loading = false;
+</script>
+
+{#if loading}
+	<div class="absolute inset-0 flex items-center justify-center">
+		<LoaderCircle class="h-4 w-4 animate-spin" />
+	</div>
+	<div class="invisible">
+		<slot />
+	</div>
+{:else}
+	<slot />
+{/if}
diff --git a/sepa/sitio2/src/lib/components/SearchBar.svelte b/sepa/sitio2/src/lib/components/SearchBar.svelte
index a58ca8b..b16aec4 100644
--- a/sepa/sitio2/src/lib/components/SearchBar.svelte
+++ b/sepa/sitio2/src/lib/components/SearchBar.svelte
@@ -1,17 +1,25 @@
 <script lang="ts">
 	import { Input } from '$lib/components/ui/input';
 	import { Button } from '$lib/components/ui/button';
-	import { goto } from '$app/navigation';
+	import { afterNavigate, beforeNavigate, goto } from '$app/navigation';
 	import { page } from '$app/stores';
 
 	let search = $page.params.query ?? '';
 
+	let loading = false;
+	beforeNavigate(() => {
+		loading = true;
+	});
+	afterNavigate(() => {
+		loading = false;
+	});
+
 	function handleSubmit() {
 		goto(`/search/${encodeURIComponent(search)}`);
 	}
 </script>
 
 <form class="flex gap-2" on:submit|preventDefault={handleSubmit}>
-	<Input placeholder="Buscar productos" bind:value={search} />
-	<Button type="submit">Buscar</Button>
+	<Input placeholder="Buscar productos" bind:value={search} disabled={loading} />
+	<Button type="submit" {loading}>Buscar</Button>
 </form>
diff --git a/sepa/sitio2/src/lib/components/ui/button/button.svelte b/sepa/sitio2/src/lib/components/ui/button/button.svelte
index f578a57..60cee5d 100644
--- a/sepa/sitio2/src/lib/components/ui/button/button.svelte
+++ b/sepa/sitio2/src/lib/components/ui/button/button.svelte
@@ -2,6 +2,7 @@
 	import { Button as ButtonPrimitive } from 'bits-ui';
 	import { type Events, type Props, buttonVariants } from './index.js';
 	import { cn } from '$lib/utils.js';
+	import Loading from '$lib/components/Loading.svelte';
 
 	type $$Props = Props;
 	type $$Events = Events;
@@ -10,16 +11,19 @@
 	export let variant: $$Props['variant'] = 'default';
 	export let size: $$Props['size'] = 'default';
 	export let builders: $$Props['builders'] = [];
+	export let loading = false;
 	export { className as class };
 </script>
 
 <ButtonPrimitive.Root
 	{builders}
-	class={cn(buttonVariants({ variant, size, className }))}
+	class={cn(buttonVariants({ variant, size, className }), 'relative')}
 	type="button"
 	{...$$restProps}
 	on:click
 	on:keydown
 >
-	<slot />
+	<Loading {loading}>
+		<slot />
+	</Loading>
 </ButtonPrimitive.Root>
diff --git a/sepa/sitio2/src/lib/components/ui/button/index.ts b/sepa/sitio2/src/lib/components/ui/button/index.ts
index d376139..d6431f3 100644
--- a/sepa/sitio2/src/lib/components/ui/button/index.ts
+++ b/sepa/sitio2/src/lib/components/ui/button/index.ts
@@ -32,6 +32,7 @@ type Size = VariantProps<typeof buttonVariants>['size'];
 type Props = ButtonPrimitive.Props & {
 	variant?: Variant;
 	size?: Size;
+	loading?: boolean;
 };
 
 type Events = ButtonPrimitive.Events;
diff --git a/sepa/sitio2/src/lib/sepa-utils.ts b/sepa/sitio2/src/lib/sepa-utils.ts
index f6a7ba9..40f1a79 100644
--- a/sepa/sitio2/src/lib/sepa-utils.ts
+++ b/sepa/sitio2/src/lib/sepa-utils.ts
@@ -28,3 +28,14 @@ export const pesosFormatter = new Intl.NumberFormat('es-AR', {
 	style: 'currency',
 	currency: 'ARS'
 });
+
+export function parseMarcas(marcas: readonly string[]) {
+	const x = marcas
+		.map((m) => m.trim().replaceAll(/['`´]/g, ''))
+		.filter((m) => !['sin marca', 'VARIOS'].includes(m))
+		.filter((m) => m.length > 0);
+	if (x.length === 0) {
+		return ['n/a'];
+	}
+	return Array.from(new Set(x));
+}
diff --git a/sepa/sitio2/src/routes/search/[query]/+page.svelte b/sepa/sitio2/src/routes/search/[query]/+page.svelte
index 786345b..1ee7ae4 100644
--- a/sepa/sitio2/src/routes/search/[query]/+page.svelte
+++ b/sepa/sitio2/src/routes/search/[query]/+page.svelte
@@ -6,19 +6,9 @@
 	import { ArrowLeft } from 'lucide-svelte';
 	import type { PageData } from './$types';
 	import { goto } from '$app/navigation';
+	import ProductCard from './ProductCard.svelte';
 
 	export let data: PageData;
-
-	function parseMarcas(marcas: readonly string[]) {
-		const x = marcas
-			.map((m) => m.trim().replaceAll(/['`´]/g, ''))
-			.filter((m) => !['sin marca', 'VARIOS'].includes(m))
-			.filter((m) => m.length > 0);
-		if (x.length === 0) {
-			return ['n/a'];
-		}
-		return Array.from(new Set(x));
-	}
 </script>
 
 <svelte:head>
@@ -39,26 +29,7 @@
 		</p>
 	{:else}
 		{#each data.collapsedProductos as producto}
-			<a href={`/id_producto/${producto.id_producto}`} class="my-2 block">
-				<Card.Root class="transition-colors duration-200 hover:bg-gray-100">
-					<Card.Header class="block px-3 py-2 pb-0">
-						<Badge>{parseMarcas(Array.from(producto.marcas)).join('/')}</Badge>
-						<Badge variant="outline"
-							>en
-							{producto.in_datasets_count} cadena{#if producto.in_datasets_count > 1}s{/if}
-						</Badge>
-						<Badge variant="outline">EAN {producto.id_producto}</Badge>
-					</Card.Header>
-					<Card.Content class="px-3 py-2">
-						{#each producto.descriptions as description}
-							<span>{description}</span>
-							{#if description !== producto.descriptions[producto.descriptions.length - 1]}
-								<span class="text-gray-500">⋅</span>{' '}
-							{/if}
-						{/each}
-					</Card.Content>
-				</Card.Root>
-			</a>
+			<ProductCard {producto} />
 		{/each}
 	{/if}
 </div>
diff --git a/sepa/sitio2/src/routes/search/[query]/ProductCard.svelte b/sepa/sitio2/src/routes/search/[query]/ProductCard.svelte
new file mode 100644
index 0000000..b57883a
--- /dev/null
+++ b/sepa/sitio2/src/routes/search/[query]/ProductCard.svelte
@@ -0,0 +1,44 @@
+<script lang="ts">
+	import * as Card from '$lib/components/ui/card';
+	import { Badge } from '$lib/components/ui/badge';
+	import { parseMarcas } from '$lib/sepa-utils';
+	import { beforeNavigate } from '$app/navigation';
+	import Loading from '$lib/components/Loading.svelte';
+
+	export let producto: {
+		id_producto: string;
+		marcas: string[];
+		in_datasets_count: number;
+		descriptions: string[];
+	};
+
+	let loading = false;
+	beforeNavigate((x) => {
+		if (x.to?.params?.id === producto.id_producto) {
+			loading = true;
+		}
+	});
+</script>
+
+<a href={`/id_producto/${producto.id_producto}`} class="my-2 block">
+	<Card.Root class="relative transition-colors duration-200 hover:bg-gray-100">
+		<Loading {loading}>
+			<Card.Header class="block px-3 py-2 pb-0">
+				<Badge>{parseMarcas(Array.from(producto.marcas)).join('/')}</Badge>
+				<Badge variant="outline"
+					>en
+					{producto.in_datasets_count} cadena{#if producto.in_datasets_count > 1}s{/if}
+				</Badge>
+				<Badge variant="outline">EAN {producto.id_producto}</Badge>
+			</Card.Header>
+			<Card.Content class="px-3 py-2">
+				{#each producto.descriptions as description}
+					<span>{description}</span>
+					{#if description !== producto.descriptions[producto.descriptions.length - 1]}
+						<span class="text-gray-500">⋅</span>{' '}
+					{/if}
+				{/each}
+			</Card.Content>
+		</Loading>
+	</Card.Root>
+</a>