From d92b455d206285a8763634006604cb70622cc1ee Mon Sep 17 00:00:00 2001
From: Carter <35710697+cmintey@users.noreply.github.com>
Date: Mon, 23 Oct 2023 16:28:50 -0500
Subject: [PATCH] Add the ability to sort by price (#65)

---
 src/ambient.d.ts                              |  7 ++
 .../wishlists/chips/BaseChip.svelte           | 91 +++++++++++++++++++
 .../wishlists/chips/ClaimFilter.svelte        | 81 ++++-------------
 .../components/wishlists/chips/SortBy.svelte  | 27 ++++++
 .../wishlists/[username]/+page.server.ts      |  8 ++
 src/routes/wishlists/[username]/+page.svelte  | 12 ++-
 6 files changed, 161 insertions(+), 65 deletions(-)
 create mode 100644 src/lib/components/wishlists/chips/BaseChip.svelte
 create mode 100644 src/lib/components/wishlists/chips/SortBy.svelte

diff --git a/src/ambient.d.ts b/src/ambient.d.ts
index 03e612e..ad13e28 100644
--- a/src/ambient.d.ts
+++ b/src/ambient.d.ts
@@ -55,3 +55,10 @@ type Config = {
 	};
 	smtp: SMTPConfig;
 };
+
+type Option = {
+	value: string;
+	direction?: Direction;
+	displayValue: string;
+};
+type Direction = "asc" | "desc";
diff --git a/src/lib/components/wishlists/chips/BaseChip.svelte b/src/lib/components/wishlists/chips/BaseChip.svelte
new file mode 100644
index 0000000..845cbe9
--- /dev/null
+++ b/src/lib/components/wishlists/chips/BaseChip.svelte
@@ -0,0 +1,91 @@
+<script lang="ts">
+	import { goto } from "$app/navigation";
+	import { page } from "$app/stores";
+	import { popup, type PopupSettings } from "@skeletonlabs/skeleton";
+
+	export let options: Option[];
+	export let defaultOption: Option;
+	export let searchParam: string;
+	export let directionParam: string | undefined = undefined;
+	export let prefix: string | undefined = undefined;
+
+	let filter = $page.url.searchParams.get(searchParam);
+	let direction = directionParam ? $page.url.searchParams.get(searchParam) : null;
+	let selectedOption: Option = defaultOption;
+	if (filter) {
+		for (const option of options) {
+			if (filter === option.value) {
+				if (option.direction) {
+					if (direction && option.direction === direction) {
+						selectedOption = option;
+						break;
+					}
+				} else {
+					selectedOption = option;
+					break;
+				}
+			}
+		}
+	}
+
+	const popupKey = `${searchParam}-options`;
+	let menuOpen = false;
+	const menuSettings: PopupSettings = {
+		event: "click",
+		target: popupKey,
+		state: ({ state }) => (menuOpen = state)
+	};
+
+	const handleClick = (option: Option) => {
+		selectedOption = option;
+		const newUrl = new URL($page.url);
+
+		if (option === defaultOption) {
+			newUrl.searchParams.delete(searchParam);
+			if (directionParam) newUrl.searchParams.delete(directionParam);
+		} else {
+			newUrl.searchParams.set(searchParam, option.value);
+			if (directionParam && option.direction)
+				newUrl.searchParams.set(directionParam, option.direction);
+		}
+
+		goto(newUrl, {
+			replaceState: true
+		});
+	};
+</script>
+
+<div class="flex flex-row space-x-4 pb-4">
+	<span class="relative">
+		<button
+			class="variant-ringed-primary chip"
+			class:variant-ghost-primary={selectedOption !== defaultOption}
+			use:popup={menuSettings}
+		>
+			{#if selectedOption.direction === "asc"}
+				<iconify-icon icon="ion:arrow-up" />
+			{:else if selectedOption.direction === "desc"}
+				<iconify-icon icon="ion:arrow-down" />
+			{:else if prefix}
+				<iconify-icon icon={prefix} />
+			{/if}
+			<span>{selectedOption.displayValue}</span>
+			<iconify-icon
+				class="arrow text-xs duration-300 ease-out"
+				class:rotate-180={menuOpen}
+				icon="ion:caret-down"
+			/>
+		</button>
+		<nav class="card list-nav p-4 shadow-xl" data-popup={popupKey}>
+			<ul>
+				{#each options as option}
+					<li>
+						<button class="list-option w-full" on:click={() => handleClick(option)}>
+							{option.displayValue}
+						</button>
+					</li>
+				{/each}
+			</ul>
+		</nav>
+	</span>
+</div>
diff --git a/src/lib/components/wishlists/chips/ClaimFilter.svelte b/src/lib/components/wishlists/chips/ClaimFilter.svelte
index 74bd38a..bd34650 100644
--- a/src/lib/components/wishlists/chips/ClaimFilter.svelte
+++ b/src/lib/components/wishlists/chips/ClaimFilter.svelte
@@ -1,67 +1,24 @@
 <script lang="ts">
-	import { goto } from "$app/navigation";
-	import { page } from "$app/stores";
-	import { popup, type PopupSettings } from "@skeletonlabs/skeleton";
+	import BaseChip from "./BaseChip.svelte";
 
-	const CLAIM_OPTIONS = {
-		all: "All",
-		claimed: "Claimed",
-		unclaimed: "Unclaimed"
-	};
-	type ClaimOption = keyof typeof CLAIM_OPTIONS;
+	const options: Option[] = [
+		{
+			value: "all",
+			displayValue: "All"
+		},
+		{
+			value: "claimed",
+			displayValue: "Claimed"
+		},
+		{
+			value: "unclaimed",
+			displayValue: "Unclaimed"
+		}
+	];
 
-	let menuOpen = false;
-	const menuSettings: PopupSettings = {
-		event: "click",
-		target: "view",
-		state: ({ state }) => (menuOpen = state)
-	};
-
-	let filter = $page.url.searchParams.get("filter");
-	let claimOption: ClaimOption = filter
-		? Object.keys(CLAIM_OPTIONS).includes(filter)
-			? (filter as ClaimOption)
-			: "all"
-		: "all";
-
-	const handleClick = (opt: unknown) => {
-		const option = opt as ClaimOption;
-		claimOption = option;
-		const newUrl = new URL($page.url);
-
-		if (option === "all") newUrl.searchParams.delete("filter");
-		else newUrl.searchParams.set("filter", option);
-
-		goto(newUrl, {
-			replaceState: true
-		});
-	};
+	const defaultOption = options[0];
+	const searchParam = "filter";
+	const prefix = "ion:filter";
 </script>
 
-<div class="flex flex-row space-x-4 pb-4">
-	<span class="relative">
-		<button
-			class="variant-ringed-primary chip"
-			class:variant-ghost-primary={claimOption !== "all"}
-			use:popup={menuSettings}
-		>
-			<span>{CLAIM_OPTIONS[claimOption]}</span>
-			<iconify-icon
-				class="arrow text-xs duration-300 ease-out"
-				class:rotate-180={menuOpen}
-				icon="ion:caret-down"
-			/>
-		</button>
-		<nav class="card list-nav p-4 shadow-xl" data-popup="view">
-			<ul>
-				{#each Object.entries(CLAIM_OPTIONS) as [optionKey, optionValue]}
-					<li>
-						<button class="list-option w-full" on:click={() => handleClick(optionKey)}>
-							{optionValue}
-						</button>
-					</li>
-				{/each}
-			</ul>
-		</nav>
-	</span>
-</div>
+<BaseChip {defaultOption} {options} {prefix} {searchParam} />
diff --git a/src/lib/components/wishlists/chips/SortBy.svelte b/src/lib/components/wishlists/chips/SortBy.svelte
new file mode 100644
index 0000000..4339914
--- /dev/null
+++ b/src/lib/components/wishlists/chips/SortBy.svelte
@@ -0,0 +1,27 @@
+<script lang="ts">
+	import BaseChip from "./BaseChip.svelte";
+
+	const options: Option[] = [
+		{
+			value: "default",
+			displayValue: "Default Sort"
+		},
+		{
+			value: "price",
+			direction: "asc",
+			displayValue: "Price: Low to High"
+		},
+		{
+			value: "price",
+			direction: "desc",
+			displayValue: "Price: High to Low"
+		}
+	];
+
+	const defaultOption = options[0];
+	const searchParam = "sort";
+	const directionParam = "dir";
+	const prefix = "ion:swap-vertical";
+</script>
+
+<BaseChip {defaultOption} {directionParam} {options} {prefix} {searchParam} />
diff --git a/src/routes/wishlists/[username]/+page.server.ts b/src/routes/wishlists/[username]/+page.server.ts
index 2e17fba..eabedc8 100644
--- a/src/routes/wishlists/[username]/+page.server.ts
+++ b/src/routes/wishlists/[username]/+page.server.ts
@@ -58,8 +58,16 @@ export const load: PageServerLoad = async ({ locals, params, depends, url }) =>
 		};
 	}
 
+	const orderBy: Prisma.ItemOrderByWithRelationInput = {};
+	const sort = url.searchParams.get("sort");
+	const direction = url.searchParams.get("dir");
+	if (sort === "price" && direction && (direction === "asc" || direction === "desc")) {
+		orderBy.price = direction;
+	}
+
 	const wishlistItems = await client.item.findMany({
 		where: search,
+		orderBy,
 		include: {
 			addedBy: {
 				select: {
diff --git a/src/routes/wishlists/[username]/+page.svelte b/src/routes/wishlists/[username]/+page.svelte
index acae9a1..b18ffa0 100644
--- a/src/routes/wishlists/[username]/+page.svelte
+++ b/src/routes/wishlists/[username]/+page.svelte
@@ -11,6 +11,7 @@
 	import { crossfade } from "svelte/transition";
 	import { isInstalled } from "$lib/stores/is-installed";
 	import empty from "$lib/assets/no_wishes.svg";
+	import SortBy from "$lib/components/wishlists/chips/SortBy.svelte";
 
 	export let data: PageData;
 
@@ -84,10 +85,15 @@
 		<p class="text-2xl">No wishes yet</p>
 	</div>
 {:else}
-	{#if !data.listOwner.isMe}
-		<ClaimFilterChip />
-	{/if}
+	<!-- chips -->
+	<div class="flex flex-row flex-wrap space-x-4">
+		{#if !data.listOwner.isMe}
+			<ClaimFilterChip />
+		{/if}
+		<SortBy />
+	</div>
 
+	<!-- items -->
 	<div class="flex flex-col space-y-4">
 		{#each data.items as item (item.id)}
 			<div