+
{formatMeters(
trail.distance,
diff --git a/web/src/lib/components/trail/trail_filter_panel.svelte b/web/src/lib/components/trail/trail_filter_panel.svelte
new file mode 100644
index 00000000..df84c141
--- /dev/null
+++ b/web/src/lib/components/trail/trail_filter_panel.svelte
@@ -0,0 +1,204 @@
+
+
+
diff --git a/web/src/lib/components/trail/trail_list_item.svelte b/web/src/lib/components/trail/trail_list_item.svelte
index 83db92db..5430996a 100644
--- a/web/src/lib/components/trail/trail_list_item.svelte
+++ b/web/src/lib/components/trail/trail_list_item.svelte
@@ -1,30 +1,8 @@
-
-
{trail.name}
-
- {#if $currentUser && $currentUser.id == trail.author}
- handleDropdownClick(trail, e.detail)}
- items={dropdownItems}
- >
- {/if}
-
+
{trail.name}
{trail.location}
= writable(new Trail(""));
export const editTrail: Writable = writable(new Trail(""));
-export async function trails_index() {
- const response: Trail[] = (await pb.collection('trails').getList(1, 5, { expand: "category,waypoints,summit_logs" })).items
+export async function trails_index(data: { perPage: number } = { perPage: 5 }) {
+ const response: Trail[] = (await pb.collection('trails').getList(1, data.perPage, { expand: "category,waypoints,summit_logs" })).items
for (const trail of response) {
setFileURLs(trail);
@@ -28,7 +28,7 @@ export async function trails_index() {
}
export async function trails_search_filter(filter: TrailFilter) {
- let filterText: string = `distance >= ${filter.distanceMin} AND distance <= ${filter.distanceMax} AND elevation_gain >= ${filter.eleavationGainMin} AND elevation_gain <= ${filter.elevationGainMax}`;
+ let filterText: string = `distance >= ${filter.distanceMin} AND distance <= ${filter.distanceMax} AND elevation_gain >= ${filter.elevationGainMin} AND elevation_gain <= ${filter.elevationGainMax}`;
if (filter.category.length > 0) {
filterText += ` AND category IN [${filter.category.join(",")}]`;
@@ -63,17 +63,33 @@ export async function trails_search_filter(filter: TrailFilter) {
return dbResponse;
}
-export async function trails_search_bounding_box(northEast: LatLng, southWest: LatLng) {
+export async function trails_search_bounding_box(northEast: LatLng, southWest: LatLng, filter?: TrailFilter) {
+
+ let filterText: string = "";
+
+ if (filter) {
+ filterText += `distance >= ${filter.distanceMin} AND distance <= ${filter.distanceMax} AND elevation_gain >= ${filter.elevationGainMin} AND elevation_gain <= ${filter.elevationGainMax}`;
+
+ if (filter.category.length > 0) {
+ filterText += ` AND category IN [${filter.category.join(",")}]`;
+ }
+ if (filter.completed !== undefined) {
+ filterText += ` AND completed = ${filter.completed}`;
+ }
+ }
+
const response = await ms.index("trails").search("", {
filter: [
`_geoBoundingBox([${northEast.lat}, ${northEast.lng}], [${southWest.lat}, ${southWest.lng}])`,
+ filterText
],
});
const trailIds = response.hits.map((h) => h.id);
if (trailIds.length == 0) {
+ const currentTrails : Trail[] = get(trails);
trails.set([]);
- return compareObjectArrays(get(trails), []);
+ return compareObjectArrays(currentTrails, []);
}
const dbResponse: Trail[] = (
@@ -89,7 +105,7 @@ export async function trails_search_bounding_box(northEast: LatLng, southWest: L
const gpxData: string = await fetchGPX(trail);
trail.expand.gpx_data = gpxData;
}
-
+
const comparison = compareObjectArrays(get(trails), dbResponse)
trails.set(dbResponse);
@@ -175,7 +191,7 @@ export async function trails_update(oldTrail: Trail, newTrail: Trail, formData:
...addedWaypoint,
marker: undefined,
});
- formData.append("waypoints+", model.id!);
+ formData.append("waypoints", model.id!);
}
for (const updatedWaypoint of waypointUpdates.updated) {
@@ -183,27 +199,37 @@ export async function trails_update(oldTrail: Trail, newTrail: Trail, formData:
...updatedWaypoint,
marker: undefined,
});
+ formData.append("waypoints", model.id!);
}
for (const deletedWaypoint of waypointUpdates.deleted) {
const success = await waypoints_delete(deletedWaypoint.id!);
}
- const summitLogUpdates = compareObjectArrays(oldTrail.expand.summit_logs ?? [], newTrail.expand.summit_logs ?? []);
+ for (const unchangedWaypoint of waypointUpdates.unchanged) {
+ formData.append("waypoints", unchangedWaypoint.id!);
+ }
+
+ const summitLogUpdates = compareObjectArrays(oldTrail.expand.summit_logs ?? [], newTrail.expand.summit_logs ?? []);
for (const summitLog of summitLogUpdates.added) {
const model = await summit_logs_create(summitLog);
- formData.append("summit_logs+", model.id!);
+ formData.append("summit_logs", model.id!);
}
for (const updatedSummitLog of summitLogUpdates.updated) {
const model = await summit_logs_update(updatedSummitLog);
+ formData.append("summit_logs", model.id!);
}
for (const deletedSummitLog of summitLogUpdates.deleted) {
const success = await summit_logs_delete(deletedSummitLog.id!);
}
+ for (const unchangedSummitLog of summitLogUpdates.unchanged) {
+ formData.append("summit_logs", unchangedSummitLog.id!);
+ }
+
for (const file of newTrail._photoFiles) {
formData.append("photos", file);
}
@@ -283,15 +309,18 @@ function setFileURLs(trail: Trail) {
}
}
-function compareObjectArrays(oldArray: T[], newArray: T[]) {
+function compareObjectArrays(oldArray: T[], newArray: T[]) {
const newObjects = [];
const updatedObjects = [];
+ const unchangedObjects = [];
for (const newObj of newArray) {
const oldObj = oldArray.find(oldObj => oldObj.id === newObj.id)
if (!oldObj) {
newObjects.push(newObj);
} else if (!util.deepEqual(newObj, oldObj)) {
updatedObjects.push(newObj);
+ } else {
+ unchangedObjects.push(newObj);
}
}
const deletedObjects = oldArray.filter(oldObj => !newArray.find(newObj => newObj.id === oldObj.id));
@@ -299,29 +328,7 @@ function compareObjectArrays(oldArray: T[], newArray:
return {
added: newObjects,
deleted: deletedObjects,
- updated: updatedObjects
+ updated: updatedObjects,
+ unchanged: unchangedObjects,
};
}
-
-function index_trail(trail: Trail) {
- ms.index('trails').addDocuments([
- {
- "id": trail.id,
- "author": trail.author,
- "name": trail.name,
- "description": trail.description,
- "location": trail.location,
- "distance": trail.distance,
- "elevation_gain": trail.elevation_gain,
- "duration": trail.duration,
- "category": trail.expand.category?.id,
- "completed": trail.expand.summit_logs?.length > 0,
- "created": trail.created,
- "public": trail.public,
- "_geo": {
- "lat": trail.lat,
- "lng": trail.lon,
- }
- }]);
-}
-
diff --git a/web/src/lib/util/format_util.ts b/web/src/lib/util/format_util.ts
index 719af8b2..ab28723c 100644
--- a/web/src/lib/util/format_util.ts
+++ b/web/src/lib/util/format_util.ts
@@ -7,7 +7,7 @@ export function formatTimeHHMM(minutes?: number) {
const h = (minutes - m) / 60;
- return (h < 10 ? "0" : "") + h.toString() + "h " + (m < 10 ? "0" : "") + m.toString() + "m";
+ return (h < 10 ? "0" : "") + h.toString() + "h " + (m < 10 ? "0" : "") + Math.round(m).toString() + "m";
}
export function formatMeters(meters?: number) {
@@ -15,9 +15,9 @@ export function formatMeters(meters?: number) {
return "-";
}
if (meters % 1 === 0) {
- return meters >= 1000 ? `${(meters / 1000).toFixed(2)} km` : `${meters} m`;
+ return meters >= 1000 ? `${(meters / 1000)} km` : `${meters} m`;
} else {
- return meters >= 1000 ? `${(meters / 1000).toFixed(2)} km` : `${meters.toFixed(2)} m`
+ return meters >= 1000 ? `${(meters / 1000).toFixed(2)} km` : `${Math.round(meters)} m`
}
}
diff --git a/web/src/routes/+page.svelte b/web/src/routes/+page.svelte
index a06fae03..891ea812 100644
--- a/web/src/routes/+page.svelte
+++ b/web/src/routes/+page.svelte
@@ -60,7 +60,7 @@
-
+
{#each $trails as trail}
-
{/each}
diff --git a/web/src/routes/+page.ts b/web/src/routes/+page.ts
index 04c515e4..d0084cc4 100644
--- a/web/src/routes/+page.ts
+++ b/web/src/routes/+page.ts
@@ -3,6 +3,6 @@ import { trails_index } from "$lib/stores/trail_store";
import type { ServerLoad } from "@sveltejs/kit";
export const load: ServerLoad = async ({ params, locals }) => {
- await trails_index()
+ await trails_index({perPage: 4})
await categories_index()
};
\ No newline at end of file
diff --git a/web/src/routes/login/+page.svelte b/web/src/routes/login/+page.svelte
index 8a5f0740..a4e35aa5 100644
--- a/web/src/routes/login/+page.svelte
+++ b/web/src/routes/login/+page.svelte
@@ -2,12 +2,15 @@
import { goto } from "$app/navigation";
import Button from "$lib/components/base/button.svelte";
import TextField from "$lib/components/base/text_field.svelte";
- import LogoTextTwoLine from "$lib/components/logo/logo_text_two_line.svelte";
+ import LogoTextTwoLineDark from "$lib/components/logo/logo_text_two_line_dark.svelte";
+ import LogoTextTwoLineLight from "$lib/components/logo/logo_text_two_line_light.svelte";
import { show_toast } from "$lib/stores/toast_store";
import { login, type User } from "$lib/stores/user_store";
import { createForm } from "$lib/vendor/svelte-form-lib";
import { ClientResponseError } from "pocketbase";
import { object, string } from "yup";
+ import { theme } from "$lib/stores/theme_store";
+
let loading: boolean = false;
const { form, errors, handleChange, handleSubmit } = createForm
({
@@ -50,10 +53,14 @@