{trail.name}
diff --git a/web/src/lib/i18n/locales/de.json b/web/src/lib/i18n/locales/de.json
index c9a5aca3..dbf9ce22 100644
--- a/web/src/lib/i18n/locales/de.json
+++ b/web/src/lib/i18n/locales/de.json
@@ -28,7 +28,7 @@
"delete-trail-confirm": "Möchtest du diese Route wirklich löschen? Diese Aktion kann nicht rückgängig gemacht werden.",
"describe-your-trail": "Beschreibe deine Route",
"description": "Beschreibung",
- "difficult": "Schwierig",
+ "difficult": "Schwer",
"difficulty": "Schwierigkeit",
"directions": "Wegbeschreibung",
"display-as": "Anzeigen als",
@@ -42,16 +42,21 @@
"elevation-gain": "Höhenunterschied",
"email": "Email",
"english": "Englisch",
+ "error-creating-user": "Fehler beim Erstellen des Nutzers",
+ "error-during-login": "Fehler beim Login",
"est-duration": "Gesch. Dauer",
"explore": "Erkunden",
"explore-some-trails": "Erkunden Sie einige Routen",
"features": "Feature",
"german": "Deutsch",
"hero_section_0_text": "Entdecke spannende Routen, speichere deine Favoriten und erlebe die Schönheit der Natur. Finde dein nächstes Abenteuer!",
+ "hero_section_1_heading": "Hier gibt es noch keine Routen",
"hero_section_1_text": "Hier sind einige Routen, die dir gefallen könnten. Oder du wirfst einen Blick auf die vollständige Liste.",
+ "hero_section_1_text_alternative": "Speichere dein letztes Abenteuer, um loszulegen.",
"hero_section_2_text": "Wusstest du schon? Du kannst nicht nur deine Routen speichern. Es gibt viele Kategorien für alle deine Abenteuer.",
"icon": "Icon",
"imperial": "Amerikanisch",
+ "invalid-username": "Ungültiger Nutzername",
"language": "Sprache",
"latitude": "Breitengrad",
"license": "Lizenz",
@@ -65,6 +70,7 @@
"map": "Karte",
"metric": "Metrisch",
"moderate": "Mittel",
+ "must-be-at-least-8-characters-long": "Muss mindestens 8 Zeichen lang sein",
"name": "Name",
"near": "Nahe",
"new-list": "Neue Liste",
@@ -72,6 +78,7 @@
"no-account": "Du hast noch kein Konto?",
"no-preference": "Keine Präferenz",
"no-results": "Keine Ergebnisse gefunden",
+ "not-a-valid-email-address": "Keine gültige Email-Adresse",
"not-completed": "Nicht abgeschlossen",
"password": "Passwort",
"photos": "Fotos",
@@ -81,6 +88,7 @@
"radius": "Radius",
"register": "Registrieren",
"removed-trail-from": "Route entfernt aus",
+ "required": "Pflichtfeld",
"save": "Speichern",
"save-trail": "Route speichern",
"search-cities": "Städte suchen",
@@ -100,5 +108,6 @@
"upload-gpx": "GPX hochladen",
"username": "Nutzername",
"waypoints": "Wegpunkte",
- "welcome_to": "Willkommen bei"
+ "welcome_to": "Willkommen bei",
+ "wrong-username-or-password": "Falscher Nutzername oder falsches Passwort"
}
diff --git a/web/src/lib/i18n/locales/en.json b/web/src/lib/i18n/locales/en.json
index b66724ab..ce212d28 100644
--- a/web/src/lib/i18n/locales/en.json
+++ b/web/src/lib/i18n/locales/en.json
@@ -42,16 +42,21 @@
"elevation-gain": "Elevation Gain",
"email": "Email",
"english": "English",
+ "error-creating-user": "Error creating user",
+ "error-during-login": "Error during login",
"est-duration": "Est. duration",
"explore": "Explore",
"explore-some-trails": "Explore some trails",
"features": "Features",
"german": "German",
"hero_section_0_text": "Explore exciting trails, save your favorites, and experience the beauty of nature. Find your next adventure!",
+ "hero_section_1_heading": "It seems there are no trails here yet.",
"hero_section_1_text": "Here are some trails you might like. Or you can just go to the full list right now.",
+ "hero_section_1_text_alternative": "Get started by saving your latest adventure.",
"hero_section_2_text": "Did you know? You cannot only save you hiking trails. There are many categories for all your adventures.",
"icon": "Icon",
"imperial": "Imperial",
+ "invalid-username": "Invalid username",
"language": "Language",
"latitude": "Latitude",
"license": "License",
@@ -65,6 +70,7 @@
"map": "Map",
"metric": "Metric",
"moderate": "Moderate",
+ "must-be-at-least-8-characters-long": "Must be at least 8 characters long",
"name": "Name",
"near": "Near",
"new-list": "New List",
@@ -72,6 +78,7 @@
"no-account": "Don't have an account?",
"no-preference": "No preference",
"no-results": "No results found",
+ "not-a-valid-email-address": "Not a valid email address",
"not-completed": "Not completed",
"password": "Password",
"photos": "Photos",
@@ -81,6 +88,7 @@
"radius": "Radius",
"register": "Register",
"removed-trail-from": "Removed trail from",
+ "required": "Required",
"save": "Save",
"save-trail": "Save Trail",
"search-cities": "Search cities",
@@ -100,5 +108,6 @@
"upload-gpx": "Upload GPX",
"username": "Username",
"waypoints": "Waypoints",
- "welcome_to": "Welcome to"
+ "welcome_to": "Welcome to",
+ "wrong-username-or-password": "Wrong username or password"
}
diff --git a/web/src/lib/models/trail.ts b/web/src/lib/models/trail.ts
index 729d166d..771e9781 100644
--- a/web/src/lib/models/trail.ts
+++ b/web/src/lib/models/trail.ts
@@ -1,4 +1,3 @@
-import { array, number, object, string } from "yup";
import type { Category } from "./category";
import type { SummitLog } from "./summit_log";
import type { Waypoint } from "./waypoint";
@@ -11,7 +10,7 @@ class Trail {
distance?: number;
elevation_gain?: number;
duration?: number;
- difficulty?: "easy"|"moderate"|"difficult"
+ difficulty?: "easy" | "moderate" | "difficult"
lat?: number;
lon?: number;
thumbnail: number;
@@ -39,8 +38,8 @@ class Trail {
distance?: number,
elevation_gain?: number,
duration?: number,
- difficulty?: "easy"|"moderate"|"difficult",
- lat?:number,
+ difficulty?: "easy" | "moderate" | "difficult",
+ lat?: number,
lon?: number,
thumbnail?: number,
photos?: string[],
@@ -66,7 +65,7 @@ class Trail {
this.lon = params?.lon;
this.thumbnail = params?.thumbnail ?? 0;
this.photos = params?.photos ?? [];
- this.waypoints = [];
+ this.waypoints = [];
this.summit_logs = [];
this.gpx = params?.gpx;
this.expand = {
@@ -80,19 +79,6 @@ class Trail {
}
}
-const trailSchema = object
({
- id: string().optional(),
- name: string().required("Required"),
- location: string().optional(),
- distance: number().optional(),
- elevation_gain: number().optional(),
- duration: number().optional(),
- thumbnail: string().optional(),
- photos: array(string()).optional(),
- gpx: string().optional(),
- description: string().optional()
-});
-
interface TrailFilter {
q: string,
category: string[],
@@ -108,10 +94,9 @@ interface TrailFilter {
elevationGainMax: number;
completed?: boolean;
sort: "name" | "distance" | "elevation_gain" | "created";
- sortOrder: "+" | "-"
+ sortOrder: "+" | "-"
}
-export { Trail, trailSchema };
-
-export type { TrailFilter };
+export { Trail };
+export type { TrailFilter };
\ No newline at end of file
diff --git a/web/src/lib/stores/trail_store.ts b/web/src/lib/stores/trail_store.ts
index 161e730a..5c287789 100644
--- a/web/src/lib/stores/trail_store.ts
+++ b/web/src/lib/stores/trail_store.ts
@@ -60,7 +60,7 @@ export async function trails_search_filter(filter: TrailFilter, page: number = 1
if (!r.ok) {
throw new ClientResponseError(result)
}
-
+
const trailIds = result.hits.map((h: Record) => h.id);
if (trailIds.length == 0) {
@@ -92,6 +92,8 @@ export async function trails_search_bounding_box(northEast: LatLng, southWest: L
if (filter) {
filterText += `distance >= ${filter.distanceMin} AND distance <= ${filter.distanceMax} AND elevation_gain >= ${filter.elevationGainMin} AND elevation_gain <= ${filter.elevationGainMax}`;
+ filterText += ` AND difficulty IN [${filter.difficulty.join(",")}]`
+
if (filter.category.length > 0) {
filterText += ` AND category IN [${filter.category.join(",")}]`;
}
diff --git a/web/src/lib/util/authorization_util.ts b/web/src/lib/util/authorization_util.ts
index f167c1a9..c22b706f 100644
--- a/web/src/lib/util/authorization_util.ts
+++ b/web/src/lib/util/authorization_util.ts
@@ -1,6 +1,7 @@
const privateRoutes = [
"/profile",
- "/lists"
+ "/lists",
+ "/trail",
]
export function isRouteProtected(path: string) {
diff --git a/web/src/routes/+layout.svelte b/web/src/routes/+layout.svelte
index 674b202c..4590d94b 100644
--- a/web/src/routes/+layout.svelte
+++ b/web/src/routes/+layout.svelte
@@ -13,7 +13,7 @@
beforeNavigate((n) => {
if (!$currentUser && isRouteProtected(n.to?.url?.pathname ?? "")) {
n.cancel();
- goto("/login");
+ goto("/login?r="+n.to?.url?.pathname);
}
});
diff --git a/web/src/routes/+page.svelte b/web/src/routes/+page.svelte
index 040df712..d1502843 100644
--- a/web/src/routes/+page.svelte
+++ b/web/src/routes/+page.svelte
@@ -108,6 +108,16 @@
id="trails"
class="flex flex-wrap justify-items-center gap-8 py-8 order-1 md:order-none"
>
+ {#if $trails.length == 0}
+
+
+
-
- {$currentUser ? $_("trails-for-you") : $_("explore-some-trails")}
-
-
- {$_("hero_section_1_text")}
-
-
{$_("explore")}
+ {#if $trails.length == 0}
+
+ {$_("hero_section_1_heading")}
+
+
{$_("hero_section_1_text_alternative")}
+
{$_("new-trail")}
+ {:else}
+
+ {$currentUser
+ ? $_("trails-for-you")
+ : $_("explore-some-trails")}
+
+
+ {$_("hero_section_1_text")}
+
+
{$_("explore")}
+ {/if}
diff --git a/web/src/lib/components/nav_bar.svelte b/web/src/lib/components/nav_bar.svelte
index 7130ae16..a5c0df6b 100644
--- a/web/src/lib/components/nav_bar.svelte
+++ b/web/src/lib/components/nav_bar.svelte
@@ -78,7 +78,7 @@
function handleDropdownClick(item: { text: string; value: any }) {
if (item.value == "logout") {
logout();
- goto("/");
+ window.location.href = "/";
} else if (item.value == "profile") {
goto("/profile");
}
@@ -117,7 +117,7 @@