diff --git a/README.md b/README.md index ded60320..d6e72cbe 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,7 @@ -

-
- -
- wanderer -
-

+ +
+ +

The trail catalogue that makes your GPS data searchable

@@ -12,9 +9,11 @@ wanderer is a self-hosted trail database. You can upload your recorded tracks an ## Core Features +![Screenshot of wanderer](web/static/imgs/features.png) + - Manage your trails - Extensive map integration and visualization -- Share trails with other people and explore their's +- Share trails with other people and explore theirs - Advanced filter and search functionality - Create custom lists to organize your trails further @@ -26,6 +25,7 @@ The recommended and quickest way to install wanderer is using docker compose: # clone the git repository git clone https://github.com/Flomp/wanderer cd wanderer +# build and launch via docker compose docker compose up -d --build ``` diff --git a/docker-compose.yml b/docker-compose.yml index cde448d9..c53d7236 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,6 +22,9 @@ services: db: container_name: wanderer-db build: ./db + depends_on: + search: + condition: service_healthy environment: <<: *cenv ports: @@ -34,6 +37,9 @@ services: web: container_name: wanderer-web build: ./web + depends_on: + db: + condition: service_healthy environment: <<: *cenv ORIGIN: http://localhost:3000 diff --git a/web/src/lib/util/file_util.ts b/web/src/lib/util/file_util.ts index b9abe584..e99dce44 100644 --- a/web/src/lib/util/file_util.ts +++ b/web/src/lib/util/file_util.ts @@ -1,11 +1,8 @@ -import { pb } from "$lib/pocketbase"; -import type { FileOptions } from "pocketbase"; export function getFileURL(record: { [key: string]: any; }, filename?: string) { if (!filename) { return ""; } - // return pb.files.getUrl(record, filename); return `/api/v1/files/${record.collectionId}/${record.id}/${filename}` } \ No newline at end of file diff --git a/web/src/routes/api/v1/files/[collection]/[record]/[file]/+server.ts b/web/src/routes/api/v1/files/[collection]/[record]/[file]/+server.ts index 4439ccfd..bbc60032 100644 --- a/web/src/routes/api/v1/files/[collection]/[record]/[file]/+server.ts +++ b/web/src/routes/api/v1/files/[collection]/[record]/[file]/+server.ts @@ -1,5 +1,5 @@ import { pb } from "$lib/pocketbase"; -import { error, text, type RequestEvent } from "@sveltejs/kit"; +import { error, type RequestEvent } from "@sveltejs/kit"; export async function GET(event: RequestEvent) { const parts = []; diff --git a/web/src/routes/map/trail/[id]/+page.svelte b/web/src/routes/map/trail/[id]/+page.svelte index 4289eca7..65b8b098 100644 --- a/web/src/routes/map/trail/[id]/+page.svelte +++ b/web/src/routes/map/trail/[id]/+page.svelte @@ -36,7 +36,7 @@ let activeTab = 0; const thumbnail = $trail.photos.length - ? getFileURL(trail, $trail.photos[$trail.thumbnail]) + ? getFileURL($trail, $trail.photos[$trail.thumbnail]) : "/imgs/default_thumbnail.webp"; onMount(() => { diff --git a/web/src/routes/trail/view/[id]/+page.svelte b/web/src/routes/trail/view/[id]/+page.svelte index c021ef29..62b2bb15 100644 --- a/web/src/routes/trail/view/[id]/+page.svelte +++ b/web/src/routes/trail/view/[id]/+page.svelte @@ -40,7 +40,7 @@ let lightboxDataSource: DataSource; const thumbnail = $trail.photos.length - ? getFileURL(trail, $trail.photos[$trail.thumbnail]) + ? getFileURL($trail, $trail.photos[$trail.thumbnail]) : "/imgs/default_thumbnail.webp"; onMount(async () => { diff --git a/web/static/imgs/features.png b/web/static/imgs/features.png new file mode 100644 index 00000000..a2c3ec18 Binary files /dev/null and b/web/static/imgs/features.png differ diff --git a/web/static/svgs/logo_text_two_line_dark.svg b/web/static/svgs/logo_text_two_line_dark.svg new file mode 100644 index 00000000..77019c98 --- /dev/null +++ b/web/static/svgs/logo_text_two_line_dark.svg @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +