feat: Added filtering by optional tags in the main page. Created TagFilter... #40

Merged
tt2022 merged 8 commits from feat/filter-by-tags into master 2025-06-11 02:45:24 +00:00
19 changed files with 229 additions and 437 deletions
Showing only changes of commit 61da21b7db - Show all commits

View File

@@ -8,12 +8,10 @@
export let dropdownVisible: boolean; export let dropdownVisible: boolean;
export let deleteTag; export let deleteTag;
export let addTag; export let addTag;
</script> </script>
<form> <form>
<div class="tagDisplay"> <div class="tagDisplay">
{#each selectedTags as tagName (tagName)} {#each selectedTags as tagName (tagName)}
<button class="tag" onclick={deleteTag(tagName)} type="button"> <button class="tag" onclick={deleteTag(tagName)} type="button">
{tagName} {tagName}
@@ -59,7 +57,6 @@
</div> </div>
{/if} {/if}
</div> </div>
</form> </form>
<style> <style>
@@ -72,11 +69,6 @@
margin: 0 auto; margin: 0 auto;
} }
label {
color: #ffffff;
margin-top: 0.5rem;
}
.tagDisplay { .tagDisplay {
display: flex; display: flex;
gap: 0.4rem; gap: 0.4rem;
@@ -155,40 +147,4 @@
.avaliableTag:last-child { .avaliableTag:last-child {
padding-bottom: 0.6rem; padding-bottom: 0.6rem;
} }
.compulsoryTags {
display: grid;
gap: 0.4rem;
border-radius: 0.5rem;
background-color: none;
width: 100%;
font-size: 1rem;
grid-template-columns: repeat(3, 1fr);
}
.compulsoryContainer {
display: flex;
flex-direction: column;
align-items: left;
justify-content: top;
border-radius: 0.5rem;
background-color: none;
}
.compulsoryTagSelect {
width: 100%;
height: 100%;
padding: 0.5rem;
border-radius: 0.5rem;
border: 2px solid #eaffeb;
background: none;
color: #eaffeb;
font-size: 0.9rem;
text-align: left;
}
.compulsoryTagSelect option {
background-color: #2e4653;
color: #eaffeb;
}
</style> </style>

View File

@@ -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 wifiTags = ["Good WiFi", "Moderate WiFi", "Bad WiFi", "No WiFi"];
export const powerOutletTags = ["Many Outlets", "Some Outlets", "No Outlets"]; export const powerOutletTags = ["Many Outlets", "Some Outlets", "No Outlets"];
export const allTags = [...availableStudySpaceTags, ...volumeTags, ...wifiTags, ...powerOutletTags] export const allTags = [...availableStudySpaceTags, ...volumeTags, ...wifiTags, ...powerOutletTags];

View File

@@ -4,37 +4,36 @@
import crossUrl from "$lib/assets/cross.svg"; import crossUrl from "$lib/assets/cross.svg";
import Navbar from "$lib/components/Navbar.svelte"; import Navbar from "$lib/components/Navbar.svelte";
import TagFilter from "$lib/components/inputs/TagFilter.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 { data } = $props();
const { studySpaces, supabase } = $derived(data); const { studySpaces, supabase } = $derived(data);
let selectedTags = $state<string[]>([]) let selectedTags = $state<string[]>([]);
let tagFilter = $state(""); let tagFilter = $state("");
let tagFilterElem = $state<HTMLInputElement>() let tagFilterElem = $state<HTMLInputElement>();
let filteredTags = $derived( let filteredTags = $derived(
allTags allTags
.filter((tag) => tag.toLowerCase().includes(tagFilter.toLowerCase())) .filter((tag) => tag.toLowerCase().includes(tagFilter.toLowerCase()))
.filter((tag) => allTags.includes(tag)) .filter((tag) => allTags.includes(tag))
) );
let filteredStudySpaces = $derived(() => let filteredStudySpaces = $derived(() =>
selectedTags.length === 0 selectedTags.length === 0
? studySpaces ? studySpaces
: studySpaces.filter(space => { : studySpaces.filter((space) => {
const allTags = [ const allTags = [
...(space.tags || []), ...(space.tags || []),
space.volume, space.volume,
space.wifi, space.wifi,
space.power space.power
].filter(Boolean); ].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) { function deleteTag(tagName: string) {
return () => { return () => {
@@ -60,16 +59,16 @@
<main> <main>
<TagFilter <TagFilter
selectedTags={selectedTags} {selectedTags}
tagFilter={tagFilter} {tagFilter}
tagFilterElem={tagFilterElem} {tagFilterElem}
filteredTags={filteredTags} {filteredTags}
dropdownVisible={dropdownVisible} {dropdownVisible}
deleteTag={deleteTag} {deleteTag}
addTag={addTag} {addTag}
/> />
{#each filteredStudySpaces() as studySpace (studySpace.id)} {#each filteredStudySpaces() as studySpace (studySpace.id)}
{@const imgUrl = {@const imgUrl =
studySpace.study_space_images.length > 0 studySpace.study_space_images.length > 0
? supabase.storage ? supabase.storage