diff --git a/web/src/lib/components/trail/trail_filter_panel.svelte b/web/src/lib/components/trail/trail_filter_panel.svelte index 54bc289c..cffb97e5 100644 --- a/web/src/lib/components/trail/trail_filter_panel.svelte +++ b/web/src/lib/components/trail/trail_filter_panel.svelte @@ -157,7 +157,7 @@ on:change={() => setCategoryFilter(category)} /> {$_(category.name)} {/each} diff --git a/web/src/lib/i18n/locales/de.json b/web/src/lib/i18n/locales/de.json index 6afd9b1d..80e9b8e3 100644 --- a/web/src/lib/i18n/locales/de.json +++ b/web/src/lib/i18n/locales/de.json @@ -111,7 +111,7 @@ "list": "{n, plural, =1 {Liste} other {Listen}}", "list-not-shared": "", "list-saved-successfully": "", - "list-share-warning": "Sharing a list automatically shares all trails contained in it.", + "list-share-warning": "", "list-share-warning-update": "", "location": "Standort", "login": "Login", diff --git a/web/src/lib/i18n/locales/en.json b/web/src/lib/i18n/locales/en.json index 4045a15e..36b421f3 100644 --- a/web/src/lib/i18n/locales/en.json +++ b/web/src/lib/i18n/locales/en.json @@ -111,7 +111,7 @@ "list": "{n, plural, =1 {List} other {Lists}}", "list-not-shared": "Not shared with anyone", "list-saved-successfully": "List saved successfully", - "list-share-warning": "", + "list-share-warning": "Sharing a list automatically shares all trails contained in it.", "list-share-warning-update": "Added trails will be shared with everyone that has access to this list.", "location": "Location", "login": "Login", diff --git a/web/src/lib/stores/category_store.ts b/web/src/lib/stores/category_store.ts index 2694a9ce..9be48d27 100644 --- a/web/src/lib/stores/category_store.ts +++ b/web/src/lib/stores/category_store.ts @@ -18,5 +18,5 @@ export async function categories_index(f: (url: RequestInfo | URL, config?: Requ categories.set(response); - return response; + return response as Category[]; } \ No newline at end of file diff --git a/web/src/routes/trails/+page.server.ts b/web/src/routes/trails/+page.server.ts index 684d1f55..1163c383 100644 --- a/web/src/routes/trails/+page.server.ts +++ b/web/src/routes/trails/+page.server.ts @@ -29,9 +29,10 @@ export const load: ServerLoad = async ({ params, locals, url, fetch }) => { const page = url.searchParams.get("page") ?? "1"; const response = await trails_search_filter(filter, parseInt(page), fetch); - await categories_index(fetch) - + const categories = await categories_index(fetch) + return { + categories, filter: filter, pagination: { page: response.page, totalPages: response.totalPages } }; }; \ No newline at end of file diff --git a/web/src/routes/trails/+page.svelte b/web/src/routes/trails/+page.svelte index ee0fa9cf..cc15990f 100644 --- a/web/src/routes/trails/+page.svelte +++ b/web/src/routes/trails/+page.svelte @@ -43,7 +43,7 @@ class="grid grid-cols-1 md:grid-cols-[300px_1fr] items-start gap-8 max-w-7xl mx-6 md:mx-auto" > handleFilterUpdate()}