{#each $trail.photos ?? [] as photo, i}
![]()
openGallery(i)}
- src={photo}
+ src={getFileURL($trail, photo)}
alt=""
/>
{/each}
diff --git a/web/src/routes/map/trail/[id]/+page.ts b/web/src/routes/map/trail/[id]/+page.ts
index 83a77063..9afb63bc 100644
--- a/web/src/routes/map/trail/[id]/+page.ts
+++ b/web/src/routes/map/trail/[id]/+page.ts
@@ -1,10 +1,11 @@
-import { trails, trails_show } from "$lib/stores/trail_store";
+import { lists_index } from "$lib/stores/list_store";
+import { trails_show } from "$lib/stores/trail_store";
import { error, type ServerLoad } from "@sveltejs/kit";
import { ClientResponseError } from "pocketbase";
-export const load: ServerLoad = async ({ params, locals }) => {
+export const load: ServerLoad = async ({ params, locals, fetch }) => {
try {
- await trails_show(params.id!, true)
+ await trails_show(params.id!, true, fetch)
} catch (e) {
if (e instanceof ClientResponseError && e.status == 404) {
error(404, {
@@ -13,4 +14,5 @@ export const load: ServerLoad = async ({ params, locals }) => {
}
}
+ await lists_index(undefined, fetch);
};
\ No newline at end of file
diff --git a/web/src/routes/trail/edit/[id]/+page.svelte b/web/src/routes/trail/edit/[id]/+page.svelte
index 5de7c1f4..867c0f7c 100644
--- a/web/src/routes/trail/edit/[id]/+page.svelte
+++ b/web/src/routes/trail/edit/[id]/+page.svelte
@@ -22,6 +22,7 @@
trails_update,
} from "$lib/stores/trail_store";
import { waypoint } from "$lib/stores/waypoint_store";
+ import { getFileURL } from "$lib/util/file_util";
import {
formatDistance,
formatElevation,
@@ -50,6 +51,11 @@
let loading = false;
+ const photoFiles: File[] = [];
+ let photoPreviews: string[] = [];
+
+ let gpxFile: File | null = null;
+
onMount(async () => {
L = (await import("leaflet")).default;
await import("leaflet-gpx");
@@ -86,14 +92,21 @@
"trail-form",
) as HTMLFormElement;
const formData = new FormData(htmlForm);
+ if (!formData.get("public")) {
+ submittedTrail.public = false;
+ }
+ submittedTrail.photos = submittedTrail.photos.filter(
+ (p) => !p.startsWith("data:image/svg+xml;base64"),
+ );
if (!submittedTrail.id) {
const createdTrail = await trails_create(
submittedTrail,
- formData,
+ photoFiles,
+ gpxFile,
);
$form.id = createdTrail.id;
} else {
- await trails_update($trail, submittedTrail, formData);
+ await trails_update($trail, submittedTrail, photoFiles, gpxFile);
}
show_toast({
@@ -199,8 +212,9 @@
return;
}
- $form.gpx = selectedFile?.name;
+ gpxFile = selectedFile;
$form.expand.waypoints = [];
+ $form.waypoints = [];
var reader = new FileReader();
@@ -235,6 +249,7 @@
} else if (e.detail.value === "delete") {
currentWaypoint.marker?.remove();
$form.expand.waypoints.splice(index, 1);
+ $form.waypoints.splice(index, 1);
$form.expand.waypoints = $form.expand.waypoints;
}
}
@@ -278,17 +293,14 @@
}
for (const file of files) {
- $form._photoFiles.push(file);
+ photoFiles.push(file);
(function (file) {
var reader = new FileReader();
reader.onload = function (e) {
if (e.target?.result) {
- if ($form.photos.length == 0) {
- $form.thumbnail = e.target.result as string;
- }
- $form.photos = [
- ...$form.photos,
+ photoPreviews = [
+ ...photoPreviews,
e.target.result as string,
];
}
@@ -299,20 +311,23 @@
}
function makePhotoThumbnail(index: number) {
- $form.thumbnail = $form.photos[index];
+ $form.thumbnail = index;
}
function handlePhotoDelete(index: number) {
- const photoToDelete = $form.photos[index];
- let reassignThumbnail: boolean = false;
- if ($form.thumbnail == photoToDelete) {
- reassignThumbnail = true;
+ if ($form.thumbnail == index) {
+ $form.thumbnail = 0;
+ console.log("huere");
+
}
- $form.photos.splice(index, 1);
- $form._photoFiles.splice(index, 1);
- $form.photos = $form.photos;
- if (reassignThumbnail) {
- $form.thumbnail = $form.photos[0];
+
+ if (index >= $form.photos.length) {
+ const adjustedIndex = index - $form.photos.length;
+ photoFiles.splice(adjustedIndex, 1);
+ photoPreviews.splice(adjustedIndex, 1);
+ } else {
+ $form.photos.splice(index, 1);
+ $form.photos = $form.photos;
}
}
@@ -350,6 +365,7 @@
openSummitLogModal();
} else if (e.detail.value === "delete") {
$form.expand.summit_logs.splice(index, 1);
+ $form.summit_logs.splice(index, 1);
$form.expand.summit_logs = $form.expand.summit_logs;
}
}
@@ -383,7 +399,7 @@
{$_("basic-info")}
-
{$_('distance')}
+
{$_("distance")}
{formatDistance($form.distance)}
@@ -430,7 +446,7 @@
{/if}
@@ -472,19 +488,19 @@
style="display: none;"
on:change={handlePhotoSelection}
/>
- {#each $form.photos ?? [] as photo, i}
+ {#each ($form.photos ?? []).concat(photoPreviews) as photo, i}
= $form.photos.length ? photo : getFileURL($form, photo)}
on:delete={() => handlePhotoDelete(i)}
- isThumbnail={$form.thumbnail === photo}
+ isThumbnail={$form.thumbnail === i}
on:thumbnail={() => makePhotoThumbnail(i)}
>
{/each}
-
{$_('summit-book')}
+
{$_("summit-book")}
{#each $form.expand.summit_logs ?? [] as log, i}
-
diff --git a/web/src/routes/trail/edit/[id]/+page.ts b/web/src/routes/trail/edit/[id]/+page.ts
index 8f0fef1d..45422069 100644
--- a/web/src/routes/trail/edit/[id]/+page.ts
+++ b/web/src/routes/trail/edit/[id]/+page.ts
@@ -3,7 +3,7 @@ import { categories_index } from "$lib/stores/category_store";
import { trails_show } from "$lib/stores/trail_store";
import { error, type Load } from "@sveltejs/kit";
-export const load: Load = async ({ params }) => {
+export const load: Load = async ({ params, fetch }) => {
if (!params.id) {
return error(400, "Bad Request")
}
@@ -11,9 +11,9 @@ export const load: Load = async ({ params }) => {
let trail: Trail;
if (params.id === "new") {
- trail = new Trail("", {category: categories[0]});
+ trail = new Trail("", { category: categories[0] });
} else {
- trail = await trails_show(params.id, true);
+ trail = await trails_show(params.id, true, fetch);
}
return { trail: trail }
diff --git a/web/src/routes/trail/view/[id]/+page.svelte b/web/src/routes/trail/view/[id]/+page.svelte
index dab2e3a8..ca7ecdef 100644
--- a/web/src/routes/trail/view/[id]/+page.svelte
+++ b/web/src/routes/trail/view/[id]/+page.svelte
@@ -84,7 +84,7 @@
}
lightboxDataSource = $trail.photos.map((p) => ({
- src: p,
+ src: getFileURL($trail, p),
}));
lightbox = new PhotoSwipeLightbox({
dataSource: lightboxDataSource,
@@ -134,7 +134,7 @@
openGallery(i)}
- src={photo}
+ src={getFileURL($trail, photo)}
alt=""
/>
{/each}
diff --git a/web/src/routes/trail/view/[id]/+page.ts b/web/src/routes/trail/view/[id]/+page.ts
index 9eaa880d..5bcce1ec 100644
--- a/web/src/routes/trail/view/[id]/+page.ts
+++ b/web/src/routes/trail/view/[id]/+page.ts
@@ -3,9 +3,9 @@ import { trails_show } from "$lib/stores/trail_store";
import { error, type Load } from "@sveltejs/kit";
import { ClientResponseError } from "pocketbase";
-export const load: Load = async ({ params }) => {
+export const load: Load = async ({ params, fetch }) => {
try {
- await trails_show(params.id!, true)
+ await trails_show(params.id!, true, fetch)
} catch (e) {
if (e instanceof ClientResponseError && e.status == 404) {
error(404, {
@@ -13,5 +13,6 @@ export const load: Load = async ({ params }) => {
});
}
- } await lists_index();
+ }
+ await lists_index(undefined, fetch);
};
\ No newline at end of file
diff --git a/web/src/routes/trails/+page.ts b/web/src/routes/trails/+page.ts
index 4de4002f..432b192b 100644
--- a/web/src/routes/trails/+page.ts
+++ b/web/src/routes/trails/+page.ts
@@ -3,7 +3,7 @@ import { categories_index } from "$lib/stores/category_store";
import { trails_search_filter } from "$lib/stores/trail_store";
import type { ServerLoad } from "@sveltejs/kit";
-export const load: ServerLoad = async ({ params, locals, url }) => {
+export const load: ServerLoad = async ({ params, locals, url, fetch }) => {
const filter: TrailFilter = {
q: "",
category: [],
@@ -21,7 +21,7 @@ export const load: ServerLoad = async ({ params, locals, url }) => {
if (paramCategory) {
filter.category.push(paramCategory);
}
- await trails_search_filter(filter);
+ await trails_search_filter(filter, fetch);
await categories_index()
return {filter};