fix: add category and favorites filters to all recipe pages
- Move categories logic into Search component for centralization - Add isLoggedIn prop to SeasonLayout and IconLayout components - Fix FilterPanel CSS to properly handle hidden favorites filter - Fix FavoritesFilter to trigger onToggle when checkbox changes - Update Search effect to track all filter states (category, tags, icon, season, favorites) - Hide favorites filter on favorites page while maintaining proper grid layout - All filters now work consistently across entire site
This commit is contained in:
@@ -14,13 +14,13 @@
|
||||
|
||||
let checked = $state(enabled);
|
||||
|
||||
// Watch for changes to checked and call onToggle
|
||||
$effect(() => {
|
||||
checked = enabled;
|
||||
// Track checked as dependency
|
||||
const currentChecked = checked;
|
||||
// Call onToggle whenever checked changes
|
||||
onToggle(currentChecked);
|
||||
});
|
||||
|
||||
function handleChange() {
|
||||
onToggle(checked);
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
@@ -69,6 +69,5 @@
|
||||
<Toggle
|
||||
bind:checked={checked}
|
||||
label=""
|
||||
onchange={handleChange}
|
||||
/>
|
||||
</div>
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
selectedFavoritesOnly = false,
|
||||
lang = 'de',
|
||||
isLoggedIn = false,
|
||||
hideFavoritesFilter = false,
|
||||
onCategoryChange = () => {},
|
||||
onTagToggle = () => {},
|
||||
onIconChange = () => {},
|
||||
@@ -133,7 +134,7 @@
|
||||
<span class="arrow" class:open={filtersOpen}>▼</span>
|
||||
</button>
|
||||
|
||||
<div class="filter-panel" class:open={filtersOpen} class:with-favorites={isLoggedIn} class:without-favorites={!isLoggedIn}>
|
||||
<div class="filter-panel" class:open={filtersOpen} class:with-favorites={isLoggedIn && !hideFavoritesFilter} class:without-favorites={!isLoggedIn || hideFavoritesFilter}>
|
||||
<CategoryFilter
|
||||
categories={availableCategories}
|
||||
selected={selectedCategory}
|
||||
@@ -162,7 +163,7 @@
|
||||
{months}
|
||||
/>
|
||||
|
||||
{#if isLoggedIn}
|
||||
{#if isLoggedIn && !hideFavoritesFilter}
|
||||
<FavoritesFilter
|
||||
enabled={selectedFavoritesOnly}
|
||||
onToggle={onFavoritesToggle}
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
routePrefix = '/rezepte',
|
||||
lang = 'de',
|
||||
recipes = [],
|
||||
isLoggedIn = false,
|
||||
onSearchResults = (ids, categories) => {},
|
||||
recipesSlot
|
||||
}: {
|
||||
@@ -18,6 +19,7 @@
|
||||
routePrefix?: string,
|
||||
lang?: string,
|
||||
recipes?: any[],
|
||||
isLoggedIn?: boolean,
|
||||
onSearchResults?: (ids: any[], categories: any[]) => void,
|
||||
recipesSlot?: Snippet
|
||||
} = $props();
|
||||
@@ -89,7 +91,7 @@
|
||||
{/each}
|
||||
</div>
|
||||
<section>
|
||||
<Search icon={active_icon} {lang} {recipes} {onSearchResults}></Search>
|
||||
<Search icon={active_icon} {lang} {recipes} {isLoggedIn} {onSearchResults}></Search>
|
||||
</section>
|
||||
<section>
|
||||
{@render recipesSlot?.()}
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
import { browser } from '$app/environment';
|
||||
import "$lib/css/nordtheme.css";
|
||||
import FilterPanel from './FilterPanel.svelte';
|
||||
import { getCategories } from '$lib/js/categories';
|
||||
|
||||
// Filter props for different contexts
|
||||
let {
|
||||
@@ -13,11 +14,13 @@
|
||||
favoritesOnly = false,
|
||||
lang = 'de',
|
||||
recipes = [],
|
||||
categories = [],
|
||||
onSearchResults = (matchedIds, matchedCategories) => {},
|
||||
isLoggedIn = false
|
||||
} = $props();
|
||||
|
||||
// Generate categories internally based on language
|
||||
const categories = $derived(getCategories(lang));
|
||||
|
||||
const isEnglish = $derived(lang === 'en');
|
||||
const searchResultsUrl = $derived(isEnglish ? '/recipes/search' : '/rezepte/search');
|
||||
const labels = $derived({
|
||||
@@ -158,10 +161,9 @@
|
||||
}
|
||||
}
|
||||
|
||||
// Filter change handlers
|
||||
// Filter change handlers - the effect will automatically trigger search
|
||||
function handleCategoryChange(newCategory) {
|
||||
selectedCategory = newCategory;
|
||||
performSearch(searchQuery);
|
||||
}
|
||||
|
||||
function handleTagToggle(tag) {
|
||||
@@ -170,22 +172,18 @@
|
||||
} else {
|
||||
selectedTags = [...selectedTags, tag];
|
||||
}
|
||||
performSearch(searchQuery);
|
||||
}
|
||||
|
||||
function handleIconChange(newIcon) {
|
||||
selectedIcon = newIcon;
|
||||
performSearch(searchQuery);
|
||||
}
|
||||
|
||||
function handleSeasonChange(newSeasons) {
|
||||
selectedSeasons = newSeasons;
|
||||
performSearch(searchQuery);
|
||||
}
|
||||
|
||||
function handleFavoritesToggle(enabled) {
|
||||
selectedFavoritesOnly = enabled;
|
||||
performSearch(searchQuery);
|
||||
}
|
||||
|
||||
function handleSubmit(event) {
|
||||
@@ -202,11 +200,16 @@
|
||||
performSearch('');
|
||||
}
|
||||
|
||||
// Debounced search effect - only triggers search 100ms after user stops typing
|
||||
// Debounced search effect - triggers search when query or filters change
|
||||
$effect(() => {
|
||||
if (browser && recipes.length > 0) {
|
||||
// Read searchQuery to track it as a dependency
|
||||
// Read all dependencies to track them
|
||||
const query = searchQuery;
|
||||
const cat = selectedCategory;
|
||||
const tags = selectedTags;
|
||||
const icn = selectedIcon;
|
||||
const seasons = selectedSeasons;
|
||||
const favsOnly = selectedFavoritesOnly;
|
||||
|
||||
// Set debounce timer
|
||||
const timer = setTimeout(() => {
|
||||
@@ -357,6 +360,7 @@ scale: 0.8 0.8;
|
||||
{selectedFavoritesOnly}
|
||||
{lang}
|
||||
{isLoggedIn}
|
||||
hideFavoritesFilter={favoritesOnly}
|
||||
onCategoryChange={handleCategoryChange}
|
||||
onTagToggle={handleTagToggle}
|
||||
onIconChange={handleIconChange}
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
routePrefix = '/rezepte',
|
||||
lang = 'de',
|
||||
recipes = [],
|
||||
isLoggedIn = false,
|
||||
onSearchResults = (ids, categories) => {},
|
||||
recipesSlot
|
||||
}: {
|
||||
@@ -18,6 +19,7 @@
|
||||
routePrefix?: string,
|
||||
lang?: string,
|
||||
recipes?: any[],
|
||||
isLoggedIn?: boolean,
|
||||
onSearchResults?: (ids: any[], categories: any[]) => void,
|
||||
recipesSlot?: Snippet
|
||||
} = $props();
|
||||
@@ -58,7 +60,7 @@ a.month:hover,
|
||||
{/each}
|
||||
</div>
|
||||
<section>
|
||||
<Search season={active_index + 1} {lang} {recipes} {onSearchResults}></Search>
|
||||
<Search season={active_index + 1} {lang} {recipes} {isLoggedIn} {onSearchResults}></Search>
|
||||
</section>
|
||||
<section>
|
||||
{@render recipesSlot?.()}
|
||||
|
||||
Reference in New Issue
Block a user