diff --git a/CHANGELOG.md b/CHANGELOG.md index ba23c239..d74b173d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# v0.6.0 +## Features +- You can now share trails with other users by selecting "Share" from the trail contextmenu. You can set the permission level as "View" or "Edit". +- Adds missing translations + +## Bug fixes +- Fixed a bug that prevented comments from showing up +- GPX files without a name in the metadata section will now receive a generic name when uploaded through the API + # v0.5.1 ## Features - You can now export trails as GPX or GEOJson files. Optionally you can include photos and summit book entries of the trail. This replaces the "Download GPX" function in previous versions. diff --git a/db/migrations/1717766881_updated_trails.go b/db/migrations/1717766881_updated_trails.go new file mode 100644 index 00000000..45b877f1 --- /dev/null +++ b/db/migrations/1717766881_updated_trails.go @@ -0,0 +1,42 @@ +package migrations + +import ( + "github.com/pocketbase/dbx" + "github.com/pocketbase/pocketbase/daos" + m "github.com/pocketbase/pocketbase/migrations" + "github.com/pocketbase/pocketbase/tools/types" +) + +func init() { + m.Register(func(db dbx.Builder) error { + dao := daos.New(db); + + collection, err := dao.FindCollectionByNameOrId("e864strfxo14pm4") + if err != nil { + return err + } + + collection.ListRule = types.Pointer("author = @request.auth.id || public = true || (@request.auth.id != \"\" && trail_share_via_trail.user ?= @request.auth.id)") + + collection.ViewRule = types.Pointer("author = @request.auth.id || public = true || (@request.auth.id != \"\" && trail_share_via_trail.user ?= @request.auth.id)") + + collection.UpdateRule = types.Pointer("author = @request.auth.id || (@request.auth.id != \"\" && trail_share_via_trail.trail = id && trail_share_via_trail.user ?= @request.auth.id && trail_share_via_trail.permission = \"edit\")") + + return dao.SaveCollection(collection) + }, func(db dbx.Builder) error { + dao := daos.New(db); + + collection, err := dao.FindCollectionByNameOrId("e864strfxo14pm4") + if err != nil { + return err + } + + collection.ListRule = types.Pointer("author = @request.auth.id || public = true || (trail_share_via_trail.user ?= @request.auth.id)") + + collection.ViewRule = types.Pointer("author = @request.auth.id || public = true || (trail_share_via_trail.user ?= @request.auth.id)") + + collection.UpdateRule = types.Pointer("author = @request.auth.id || (trail_share_via_trail.trail = id && trail_share_via_trail.user ?= @request.auth.id && trail_share_via_trail.permission = \"edit\")") + + return dao.SaveCollection(collection) + }) +} diff --git a/web/package-lock.json b/web/package-lock.json index 46d0565a..64cfe614 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -1,12 +1,12 @@ { "name": "wanderer", - "version": "0.5.1", + "version": "0.6.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "wanderer", - "version": "0.5.1", + "version": "0.6.0", "dependencies": { "@fortawesome/fontawesome-free": "^6.5.1", "@sveltejs/adapter-node": "^4.0.1", diff --git a/web/package.json b/web/package.json index 9951756a..92ed3e2a 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "wanderer", - "version": "0.5.1", + "version": "0.6.0", "private": true, "scripts": { "dev": "vite dev", diff --git a/web/src/lib/components/category_card.svelte b/web/src/lib/components/category_card.svelte index e4c63550..3dbabbd7 100644 --- a/web/src/lib/components/category_card.svelte +++ b/web/src/lib/components/category_card.svelte @@ -1,7 +1,7 @@ @@ -17,7 +17,7 @@ class="absolute bottom-0 w-full h-1/2 bg-gradient-to-b from-transparent to-black opacity-50" >
- {category.name} + {$_(category.name)}
diff --git a/web/src/lib/components/logo/logo_text_light_with_version.svelte b/web/src/lib/components/logo/logo_text_light_with_version.svelte index c028ae5a..4426e66a 100644 --- a/web/src/lib/components/logo/logo_text_light_with_version.svelte +++ b/web/src/lib/components/logo/logo_text_light_with_version.svelte @@ -95,5 +95,5 @@ d="M43.857 43.3045C44.0569 43.0652 44.4246 43.0652 44.6245 43.3045L46.6259 45.7008C46.8978 46.0263 46.6663 46.5213 46.2421 46.5213H42.2394C41.8152 46.5213 41.5837 46.0263 41.8556 45.7008L43.857 43.3045Z" fill="#242734" /> - v0.5.1 + v0.6.0 diff --git a/web/src/lib/components/trail/trail_card.svelte b/web/src/lib/components/trail/trail_card.svelte index 269b548a..ae8b8ab4 100644 --- a/web/src/lib/components/trail/trail_card.svelte +++ b/web/src/lib/components/trail/trail_card.svelte @@ -1,5 +1,4 @@