From 61da21b7db60244be174287eb39b4a368ca30fc6 Mon Sep 17 00:00:00 2001 From: TadiosT Date: Tue, 10 Jun 2025 05:45:29 +0100 Subject: [PATCH] fix: Style and type check changes. Co-Authored By: Caspar Asaam --- src/lib/components/inputs/TagFilter.svelte | 48 +------------------ src/lib/index.ts | 2 +- src/routes/+page.svelte | 55 +++++++++++----------- 3 files changed, 30 insertions(+), 75 deletions(-) diff --git a/src/lib/components/inputs/TagFilter.svelte b/src/lib/components/inputs/TagFilter.svelte index 5d82fc8..4648fd1 100644 --- a/src/lib/components/inputs/TagFilter.svelte +++ b/src/lib/components/inputs/TagFilter.svelte @@ -1,6 +1,6 @@
-
+
{#each selectedTags as tagName (tagName)}
{/if}
-
diff --git a/src/lib/index.ts b/src/lib/index.ts index f209ffe..3264a9e 100644 --- a/src/lib/index.ts +++ b/src/lib/index.ts @@ -25,4 +25,4 @@ export const volumeTags = ["Silent", "Quiet", "Some Noise", "Loud"]; export const wifiTags = ["Good WiFi", "Moderate WiFi", "Bad WiFi", "No WiFi"]; export const powerOutletTags = ["Many Outlets", "Some Outlets", "No Outlets"]; -export const allTags = [...availableStudySpaceTags, ...volumeTags, ...wifiTags, ...powerOutletTags] +export const allTags = [...availableStudySpaceTags, ...volumeTags, ...wifiTags, ...powerOutletTags]; diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 84356a1..3160ef7 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -4,37 +4,36 @@ import crossUrl from "$lib/assets/cross.svg"; import Navbar from "$lib/components/Navbar.svelte"; import TagFilter from "$lib/components/inputs/TagFilter.svelte"; - import {availableStudySpaceTags} from "$lib" - import {allTags} from "$lib" + import { allTags } from "$lib"; const { data } = $props(); - const { studySpaces, supabase } = $derived(data); - - let selectedTags = $state([]) + const { studySpaces, supabase } = $derived(data); + + let selectedTags = $state([]); let tagFilter = $state(""); - let tagFilterElem = $state() + let tagFilterElem = $state(); let filteredTags = $derived( allTags .filter((tag) => tag.toLowerCase().includes(tagFilter.toLowerCase())) .filter((tag) => allTags.includes(tag)) - ) + ); let filteredStudySpaces = $derived(() => selectedTags.length === 0 ? studySpaces - : studySpaces.filter(space => { - const allTags = [ - ...(space.tags || []), - space.volume, - space.wifi, - space.power - ].filter(Boolean); + : studySpaces.filter((space) => { + const allTags = [ + ...(space.tags || []), + space.volume, + space.wifi, + space.power + ].filter(Boolean); - return selectedTags.every(tag => allTags.includes(tag)); - }) + return selectedTags.every((tag) => allTags.includes(tag)); + }) ); - let dropdownVisible = $state(false) + let dropdownVisible = $state(false); function deleteTag(tagName: string) { return () => { @@ -52,24 +51,24 @@ } - + new - +
- - {#each filteredStudySpaces() as studySpace (studySpace.id)} + {#each filteredStudySpaces() as studySpace (studySpace.id)} {@const imgUrl = studySpace.study_space_images.length > 0 ? supabase.storage