brian/wanderer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes date timezone bug

Browse Source
This commit is contained in:
Christian Beutel
2024-04-05 19:42:03 +02:00
parent 50ffd35307
commit bbbc4f38b6
8 changed files with 94 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
db/migrations/1712334451_updated_summit_logs.go Normal file
View File

@@ -0,0 +1,38 @@
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("dd2l9a4vxpy2ni8")
if err != nil {
return err
}
collection.ListRule = types.Pointer("(@request.auth.id != \"\" && @collection.trails.summit_logs.id ?= id && @collection.trails.author ?= @request.auth.id) || (@collection.trails.summit_logs.id ?= id && @collection.trails.public = true)")
collection.ViewRule = types.Pointer("(@request.auth.id != \"\" && @collection.trails.summit_logs.id ?= id && @collection.trails.author ?= @request.auth.id) || (@collection.trails.summit_logs.id ?= id && @collection.trails.public = true)")
return dao.SaveCollection(collection)
}, func(db dbx.Builder) error {
dao := daos.New(db);
collection, err := dao.FindCollectionByNameOrId("dd2l9a4vxpy2ni8")
if err != nil {
return err
}
collection.ListRule = types.Pointer("(@request.auth.id != \"\" && @collection.trails.summit_logs.id ?= id && @collection.trails.author ?= @request.auth.id) || @collection.trails.summit_logs.id ?= id && @collection.trails.public = true")
collection.ViewRule = types.Pointer("(@request.auth.id != \"\" && @collection.trails.summit_logs.id ?= id && @collection.trails.author ?= @request.auth.id) || @collection.trails.summit_logs.id ?= id && @collection.trails.public = true")
return dao.SaveCollection(collection)
})
}

38
db/migrations/1712335100_updated_summit_logs.go Normal file
View File

@@ -0,0 +1,38 @@
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("dd2l9a4vxpy2ni8")
if err != nil {
return err
}
collection.UpdateRule = types.Pointer("@request.auth.id != \"\" && @collection.trails.summit_logs.id ?= id && (@collection.trails.author ?= @request.auth.id)")
collection.DeleteRule = types.Pointer("@request.auth.id != \"\" && @collection.trails.summit_logs.id ?= id && (@collection.trails.author ?= @request.auth.id)")
return dao.SaveCollection(collection)
}, func(db dbx.Builder) error {
dao := daos.New(db);
collection, err := dao.FindCollectionByNameOrId("dd2l9a4vxpy2ni8")
if err != nil {
return err
}
collection.UpdateRule = types.Pointer("@request.auth.id != \"\" && @collection.trails.summit_logs.id ?= id && (@collection.trails.author = @request.auth.id)")
collection.DeleteRule = types.Pointer("@request.auth.id != \"\" && @collection.trails.summit_logs.id ?= id && (@collection.trails.author = @request.auth.id)")
return dao.SaveCollection(collection)
})
}

1
web/src/lib/components/summit_log/summit_log_card.svelte
View File

@@ -19,6 +19,7 @@
month: "2-digit",
day: "2-digit",
year: "numeric",
timeZone: "UTC",
})}
</h5>

1
web/src/lib/components/trail/trail_card.svelte
View File

@@ -44,6 +44,7 @@
month: "long",
day: "2-digit",
year: "numeric",
timeZone: 'UTC'
})}
</p>
{/if}

1
web/src/lib/components/trail/trail_list_item.svelte
View File

@@ -35,6 +35,7 @@
month: "long",
day: "2-digit",
year: "numeric",
timeZone: 'UTC'
})}
</p>
{/if}

2
web/src/lib/i18n/locales/de.json
View File

@@ -18,7 +18,7 @@
"change": "Ändern",
"changelog": "Changelog",
"chinese": "Chinesisch (vereinfacht)",
"comment": "{n, Plural, =1 {Kommentar} other {Kommentare}}",
"comment": "{n, plural, =1 {Kommentar} other {Kommentare}}",
"completed": "Abgeschlossen",
"completion-status": "Abschlussstatus",
"contribute": "Mitwirken",

8
web/src/routes/api/v1/trail/[id]/+server.ts
View File

@@ -8,9 +8,15 @@ export async function GET(event: RequestEvent) {
try {
const r = await pb.collection('trails')
.getOne<Trail>(event.params.id as string, { expand: expand ?? "" })
// remove time from dates
r.date = r.date?.substring(0, 10) ?? ""
for (const log of r.expand?.summit_logs ?? []) {
log.date = log.date.substring(0, 10)
}
return json(r)
} catch (e: any) {
throw error(e.status, e);
throw error(e.status || 500, e);
}
}

9
web/src/routes/trail/edit/[id]/+page.svelte
View File

@@ -263,12 +263,12 @@
$form.duration = Math.round(
e.target.get_total_time() / 1000 / 60,
);
if ($form.duration) {
if ($form.duration && !$form.date) {
$form.date = e.target
.get_start_time()
.toISOString()
.substring(0, 10);
} else {
} else if(!$form.date) {
$form.date = new Date().toISOString().substring(0, 10);
}
@@ -475,11 +475,12 @@
on:change={handleFileSelection}
/>
<hr class="border-separator" />
<div class="flex gap-x-4">
<div class="flex gap-x-2">
<h3 class="text-xl font-semibold">{$_("basic-info")}</h3>
<button
type="button"
class="btn-icon"
style="font-size: 0.9rem"
on:click={() => (editingBasicInfo = !editingBasicInfo)}
><i class="fa fa-{editingBasicInfo ? 'check' : 'pen'}"
></i></button
@@ -554,7 +555,7 @@
error={$errors.location}
bind:value={$form.location}
></TextField>
<Datepicker label="Date" bind:value={$form.date}></Datepicker>
<Datepicker label={$_("date")} bind:value={$form.date}></Datepicker>
<Textarea
name="description"
label={$_("describe-your-trail")}