diff --git a/web/src/lib/i18n/locales/de.json b/web/src/lib/i18n/locales/de.json
index f1aa9866..1202b0d0 100644
--- a/web/src/lib/i18n/locales/de.json
+++ b/web/src/lib/i18n/locales/de.json
@@ -18,6 +18,7 @@
"change": "Ändern",
"changelog": "Changelog",
"chinese": "Chinesisch",
+ "comments": "",
"completed": "Abgeschlossen",
"completion-status": "Abschlussstatus",
"contribute": "Mitwirken",
diff --git a/web/src/lib/i18n/locales/en.json b/web/src/lib/i18n/locales/en.json
index 2a39185f..4af9ddc4 100644
--- a/web/src/lib/i18n/locales/en.json
+++ b/web/src/lib/i18n/locales/en.json
@@ -18,6 +18,7 @@
"change": "Change",
"changelog": "Changelog",
"chinese": "Chinese",
+ "comments": "Comments",
"completed": "Completed",
"completion-status": "Completion Status",
"contribute": "Contribute",
diff --git a/web/src/lib/i18n/locales/fr.json b/web/src/lib/i18n/locales/fr.json
index 4d40a94b..b44f9391 100644
--- a/web/src/lib/i18n/locales/fr.json
+++ b/web/src/lib/i18n/locales/fr.json
@@ -18,6 +18,7 @@
"change": "Changement",
"changelog": "Journal des modifications",
"chinese": "Chinois",
+ "comments": "",
"completed": "Compléter",
"completion-status": "L'état d'achèvement",
"contribute": "Contribuer",
diff --git a/web/src/lib/i18n/locales/hu.json b/web/src/lib/i18n/locales/hu.json
index 0cc02815..dae666e9 100644
--- a/web/src/lib/i18n/locales/hu.json
+++ b/web/src/lib/i18n/locales/hu.json
@@ -18,6 +18,7 @@
"change": "Változás",
"changelog": "Változás napló",
"chinese": "kínai",
+ "comments": "",
"completed": "Teljesítve",
"completion-status": "Befejezés állapota",
"contribute": "Hozzájárulás",
diff --git a/web/src/lib/i18n/locales/nl.json b/web/src/lib/i18n/locales/nl.json
index 21cc88ff..edf09b2f 100644
--- a/web/src/lib/i18n/locales/nl.json
+++ b/web/src/lib/i18n/locales/nl.json
@@ -18,6 +18,7 @@
"change": "Aanpassen",
"changelog": "Changelog",
"chinese": "Chinese",
+ "comments": "",
"completed": "Voltooid",
"completion-status": "Voltooiingsstatus",
"contribute": "Bijdragen",
diff --git a/web/src/lib/i18n/locales/pl.json b/web/src/lib/i18n/locales/pl.json
index 7b5314c2..0ed88b45 100644
--- a/web/src/lib/i18n/locales/pl.json
+++ b/web/src/lib/i18n/locales/pl.json
@@ -18,6 +18,7 @@
"change": "Zmień",
"changelog": "Dziennik zmian",
"chinese": "chiński",
+ "comments": "",
"completed": "Zakończono",
"completion-status": "Stan ukończenia",
"contribute": "Kontrybuuj",
diff --git a/web/src/lib/i18n/locales/pt.json b/web/src/lib/i18n/locales/pt.json
index 8ee0230a..6da1a335 100644
--- a/web/src/lib/i18n/locales/pt.json
+++ b/web/src/lib/i18n/locales/pt.json
@@ -18,6 +18,7 @@
"change": "Alterar",
"changelog": "Registo de alterações",
"chinese": "chinês",
+ "comments": "",
"completed": "Completada",
"completion-status": "Status de conclusão",
"contribute": "Contribuir",
diff --git a/web/src/lib/i18n/locales/zh.json b/web/src/lib/i18n/locales/zh.json
index 91d3e9a4..4d55c62f 100644
--- a/web/src/lib/i18n/locales/zh.json
+++ b/web/src/lib/i18n/locales/zh.json
@@ -18,6 +18,7 @@
"change": "更换",
"changelog": "变更日志",
"chinese": "华人",
+ "comments": "",
"completed": "已完成",
"completion-status": "完成状态",
"contribute": "贡献",
diff --git a/web/src/lib/models/comment.ts b/web/src/lib/models/comment.ts
new file mode 100644
index 00000000..80fb5efc
--- /dev/null
+++ b/web/src/lib/models/comment.ts
@@ -0,0 +1,19 @@
+import type { User } from "$lib/stores/user_store";
+
+export class Comment {
+ id?: string;
+ text: string;
+ rating: number;
+ author: string;
+ trail: string;
+ expand?: {
+ author: User
+ }
+
+ constructor(text: string, rating: number, author: string, trail: string) {
+ this.text = text;
+ this.rating = rating;
+ this.author = author;
+ this.trail = trail;
+ }
+}
\ No newline at end of file
diff --git a/web/src/lib/models/trail.ts b/web/src/lib/models/trail.ts
index 30240771..16485f62 100644
--- a/web/src/lib/models/trail.ts
+++ b/web/src/lib/models/trail.ts
@@ -1,4 +1,5 @@
import type { Category } from "./category";
+import type { Comment } from "./comment";
import type { SummitLog } from "./summit_log";
import type { Waypoint } from "./waypoint";
@@ -24,6 +25,7 @@ class Trail {
category?: Category;
waypoints: Waypoint[]
summit_logs: SummitLog[]
+ comments_via_trail: Comment[]
gpx_data?: string
}
tags?: string[];
@@ -47,6 +49,7 @@ class Trail {
category?: Category,
waypoints?: Waypoint[],
summit_logs?: SummitLog[],
+ comments?: Comment[],
tags?: string[],
description?: string
created?: string
@@ -71,7 +74,8 @@ class Trail {
this.expand = {
category: params?.category,
waypoints: params?.waypoints ?? [],
- summit_logs: params?.summit_logs ?? []
+ summit_logs: params?.summit_logs ?? [],
+ comments_via_trail: params?.comments ?? []
}
this.tags = params?.tags ?? []
this.description = params?.description ?? "";
diff --git a/web/src/lib/stores/comment_store.ts b/web/src/lib/stores/comment_store.ts
new file mode 100644
index 00000000..ae1906fe
--- /dev/null
+++ b/web/src/lib/stores/comment_store.ts
@@ -0,0 +1,53 @@
+import { Comment } from "$lib/models/comment";
+import { pb } from "$lib/pocketbase";
+import { ClientResponseError } from "pocketbase";
+import { writable, type Writable } from "svelte/store";
+
+export const comments: Writable = writable([])
+
+
+export async function comments_create(comment: Comment) {
+ if (!pb.authStore.model) {
+ throw new Error("Unauthenticated");
+ }
+
+ comment.author = pb.authStore.model!.id;
+
+ let r = await fetch('/api/v1/comment', {
+ method: 'PUT',
+ body: JSON.stringify(comment),
+ })
+
+ if (!r.ok) {
+ throw new ClientResponseError(await r.json())
+ }
+
+ const model: Comment = await r.json();
+
+ return model;
+}
+
+export async function comments_update(comment: Comment) {
+ let r = await fetch('/api/v1/comment/' + comment.id, {
+ method: 'POST',
+ body: JSON.stringify(comment),
+ })
+
+ if (!r.ok) {
+ throw new ClientResponseError(await r.json())
+ }
+
+ const model: Comment = await r.json();
+
+ return model;
+}
+
+export async function comments_delete(comment: Comment) {
+ const r = await fetch('/api/v1/comment/' + comment.id, {
+ method: 'DELETE',
+ })
+
+ if (!r.ok) {
+ throw new ClientResponseError(await r.json())
+ }
+}
\ 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 4cdf4589..84917d3f 100644
--- a/web/src/lib/stores/trail_store.ts
+++ b/web/src/lib/stores/trail_store.ts
@@ -167,7 +167,7 @@ export async function trails_search_bounding_box(northEast: LatLng, southWest: L
export async function trails_show(id: string, loadGPX?: boolean, f: (url: RequestInfo | URL, config?: RequestInit) => Promise = fetch) {
const r = await f(`/api/v1/trail/${id}?` + new URLSearchParams({
- expand: "category,waypoints,summit_logs",
+ expand: "category,waypoints,summit_logs,comments_via_trail.author",
}), {
method: 'GET',
})
@@ -245,7 +245,7 @@ export async function trails_create(trail: Trail, photos: File[], gpx: File | Bl
}
}
-export async function trails_update(oldTrail: Trail, newTrail: Trail, photos: File[], gpx: File | Blob | null) {
+export async function trails_update(oldTrail: Trail, newTrail: Trail, photos?: File[], gpx?: File | Blob | null) {
const waypointUpdates = compareObjectArrays(oldTrail.expand.waypoints ?? [], newTrail.expand.waypoints ?? []);
@@ -300,10 +300,13 @@ export async function trails_update(oldTrail: Trail, newTrail: Trail, photos: Fi
formData.append("gpx", gpx);
}
- for (const photo of photos) {
- formData.append("photos", photo)
+ if (photos) {
+ for (const photo of photos) {
+ formData.append("photos", photo)
+ }
}
+
const deletedPhotos = oldTrail.photos.filter(oldPhoto => !newTrail.photos.find(newPhoto => newPhoto === oldPhoto));
for (const deletedPhoto of deletedPhotos) {
diff --git a/web/src/routes/api/v1/comment/+server.ts b/web/src/routes/api/v1/comment/+server.ts
new file mode 100644
index 00000000..cb571fab
--- /dev/null
+++ b/web/src/routes/api/v1/comment/+server.ts
@@ -0,0 +1,26 @@
+import type { Comment } from '$lib/models/comment';
+import { pb } from '$lib/pocketbase';
+import { error, json, type RequestEvent } from '@sveltejs/kit';
+
+export async function GET(event: RequestEvent) {
+ try {
+ const r: Comment[] = await pb.collection('comments').getFullList({
+ expand: "author",
+ sort: "-created",
+ })
+ return json(r)
+ } catch (e: any) {
+ throw error(e.status, e);
+ }
+}
+
+export async function PUT(event: RequestEvent) {
+ const data = await event.request.json();
+
+ try {
+ const r = await pb.collection('comments').create(data)
+ return json(r);
+ } catch (e: any) {
+ throw error(e.status, e)
+ }
+}
\ No newline at end of file
diff --git a/web/src/routes/api/v1/comment/[id]/+server.ts b/web/src/routes/api/v1/comment/[id]/+server.ts
new file mode 100644
index 00000000..0a55d981
--- /dev/null
+++ b/web/src/routes/api/v1/comment/[id]/+server.ts
@@ -0,0 +1,33 @@
+import type { Comment } from "$lib/models/comment";
+import { pb } from "$lib/pocketbase";
+import { error, json, type RequestEvent } from "@sveltejs/kit";
+
+export async function GET(event: RequestEvent) {
+ try {
+ const r = await pb.collection('comments')
+ .getOne(event.params.id as string, { expand: "author" })
+ return json(r)
+ } catch (e: any) {
+ throw error(e.status, e);
+ }
+}
+
+export async function POST(event: RequestEvent) {
+ const data = await event.request.json()
+
+ try {
+ const r = await pb.collection('comments').update(event.params.id as string, data)
+ return json(r);
+ } catch (e: any) {
+ throw error(e.status, e)
+ }
+}
+
+export async function DELETE(event: RequestEvent) {
+ try {
+ const r = await pb.collection('comments').delete(event.params.id as string)
+ return json({ 'acknowledged': r });
+ } catch (e: any) {
+ throw error(e.status, e)
+ }
+}
diff --git a/web/src/routes/api/v1/list/[id]/+server.ts b/web/src/routes/api/v1/list/[id]/+server.ts
index f293010b..793fe23a 100644
--- a/web/src/routes/api/v1/list/[id]/+server.ts
+++ b/web/src/routes/api/v1/list/[id]/+server.ts
@@ -1,6 +1,6 @@
+import type { List } from "$lib/models/list";
import { pb } from "$lib/pocketbase";
import { error, json, type RequestEvent } from "@sveltejs/kit";
-import type { List } from "postcss/lib/list";
export async function GET(event: RequestEvent) {
try {