adds activity timeline
This commit is contained in:
182
db/migrations/1734186355_created_activities.go
Normal file
182
db/migrations/1734186355_created_activities.go
Normal file
@@ -0,0 +1,182 @@
|
||||
package migrations
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/daos"
|
||||
m "github.com/pocketbase/pocketbase/migrations"
|
||||
"github.com/pocketbase/pocketbase/models"
|
||||
)
|
||||
|
||||
func init() {
|
||||
m.Register(func(db dbx.Builder) error {
|
||||
jsonData := `{
|
||||
"id": "t9lphichi5xwyeu",
|
||||
"created": "2024-12-14 14:25:55.563Z",
|
||||
"updated": "2024-12-14 14:25:55.563Z",
|
||||
"name": "activities",
|
||||
"type": "view",
|
||||
"system": false,
|
||||
"schema": [
|
||||
{
|
||||
"system": false,
|
||||
"id": "zegqj8bt",
|
||||
"name": "date",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
},
|
||||
{
|
||||
"system": false,
|
||||
"id": "mztv5od5",
|
||||
"name": "name",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
},
|
||||
{
|
||||
"system": false,
|
||||
"id": "4hq14mc5",
|
||||
"name": "description",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
},
|
||||
{
|
||||
"system": false,
|
||||
"id": "hbyuxehw",
|
||||
"name": "gpx",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
},
|
||||
{
|
||||
"system": false,
|
||||
"id": "syp8ya96",
|
||||
"name": "author",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
},
|
||||
{
|
||||
"system": false,
|
||||
"id": "rrfp5omm",
|
||||
"name": "photos",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
},
|
||||
{
|
||||
"system": false,
|
||||
"id": "tacveduk",
|
||||
"name": "distance",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
},
|
||||
{
|
||||
"system": false,
|
||||
"id": "ydhldat1",
|
||||
"name": "duration",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
},
|
||||
{
|
||||
"system": false,
|
||||
"id": "9gg24ge8",
|
||||
"name": "elevation_gain",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
},
|
||||
{
|
||||
"system": false,
|
||||
"id": "ujsn6lqc",
|
||||
"name": "elevation_loss",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
},
|
||||
{
|
||||
"system": false,
|
||||
"id": "nvvrulvj",
|
||||
"name": "type",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}
|
||||
],
|
||||
"indexes": [],
|
||||
"listRule": null,
|
||||
"viewRule": null,
|
||||
"createRule": null,
|
||||
"updateRule": null,
|
||||
"deleteRule": null,
|
||||
"options": {
|
||||
"query": "SELECT id,date,name,description,gpx,author,photos,distance,duration,elevation_gain,elevation_loss, type \nFROM (\n SELECT summit_logs.id,summit_logs.date,trails.name,text as description,summit_logs.gpx,summit_logs.author,summit_logs.photos,summit_logs.distance,summit_logs.duration,summit_logs.elevation_gain,summit_logs.elevation_loss,\"summit_log\" as type \n FROM summit_logs\n LEFT JOIN trails ON summit_logs.id IN (\n SELECT value\n FROM json_each(trails.summit_logs)\n )\n UNION\n SELECT id,date,name,description,gpx,author,photos,distance,duration,elevation_gain,elevation_loss, \"trail\" as type \n FROM trails\n) ORDER BY date DESC"
|
||||
}
|
||||
}`
|
||||
|
||||
collection := &models.Collection{}
|
||||
if err := json.Unmarshal([]byte(jsonData), &collection); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return daos.New(db).SaveCollection(collection)
|
||||
}, func(db dbx.Builder) error {
|
||||
dao := daos.New(db);
|
||||
|
||||
collection, err := dao.FindCollectionByNameOrId("t9lphichi5xwyeu")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return dao.DeleteCollection(collection)
|
||||
})
|
||||
}
|
||||
503
db/migrations/1734187284_updated_activities.go
Normal file
503
db/migrations/1734187284_updated_activities.go
Normal file
@@ -0,0 +1,503 @@
|
||||
package migrations
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/daos"
|
||||
m "github.com/pocketbase/pocketbase/migrations"
|
||||
"github.com/pocketbase/pocketbase/models/schema"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
func init() {
|
||||
m.Register(func(db dbx.Builder) error {
|
||||
dao := daos.New(db);
|
||||
|
||||
collection, err := dao.FindCollectionByNameOrId("t9lphichi5xwyeu")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
collection.ListRule = types.Pointer("")
|
||||
|
||||
collection.ViewRule = types.Pointer("")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("zegqj8bt")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("mztv5od5")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("4hq14mc5")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("hbyuxehw")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("syp8ya96")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("rrfp5omm")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("tacveduk")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("ydhldat1")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("9gg24ge8")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("ujsn6lqc")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("nvvrulvj")
|
||||
|
||||
// add
|
||||
new_date := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "qejtfjom",
|
||||
"name": "date",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), new_date); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(new_date)
|
||||
|
||||
// add
|
||||
new_name := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "nskezkjx",
|
||||
"name": "name",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), new_name); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(new_name)
|
||||
|
||||
// add
|
||||
new_description := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "viedej4h",
|
||||
"name": "description",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), new_description); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(new_description)
|
||||
|
||||
// add
|
||||
new_gpx := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "vljhhvdy",
|
||||
"name": "gpx",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), new_gpx); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(new_gpx)
|
||||
|
||||
// add
|
||||
new_author := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "z1uaeqzu",
|
||||
"name": "author",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), new_author); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(new_author)
|
||||
|
||||
// add
|
||||
new_photos := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "9nnpyhlq",
|
||||
"name": "photos",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), new_photos); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(new_photos)
|
||||
|
||||
// add
|
||||
new_distance := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "7kzcclzu",
|
||||
"name": "distance",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), new_distance); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(new_distance)
|
||||
|
||||
// add
|
||||
new_duration := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "gwpsktbu",
|
||||
"name": "duration",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), new_duration); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(new_duration)
|
||||
|
||||
// add
|
||||
new_elevation_gain := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "5tze9ybp",
|
||||
"name": "elevation_gain",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), new_elevation_gain); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(new_elevation_gain)
|
||||
|
||||
// add
|
||||
new_elevation_loss := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "xkuz8ixp",
|
||||
"name": "elevation_loss",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), new_elevation_loss); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(new_elevation_loss)
|
||||
|
||||
// add
|
||||
new_type := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "soylsusn",
|
||||
"name": "type",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), new_type); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(new_type)
|
||||
|
||||
return dao.SaveCollection(collection)
|
||||
}, func(db dbx.Builder) error {
|
||||
dao := daos.New(db);
|
||||
|
||||
collection, err := dao.FindCollectionByNameOrId("t9lphichi5xwyeu")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
collection.ListRule = nil
|
||||
|
||||
collection.ViewRule = nil
|
||||
|
||||
// add
|
||||
del_date := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "zegqj8bt",
|
||||
"name": "date",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), del_date); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(del_date)
|
||||
|
||||
// add
|
||||
del_name := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "mztv5od5",
|
||||
"name": "name",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), del_name); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(del_name)
|
||||
|
||||
// add
|
||||
del_description := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "4hq14mc5",
|
||||
"name": "description",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), del_description); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(del_description)
|
||||
|
||||
// add
|
||||
del_gpx := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "hbyuxehw",
|
||||
"name": "gpx",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), del_gpx); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(del_gpx)
|
||||
|
||||
// add
|
||||
del_author := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "syp8ya96",
|
||||
"name": "author",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), del_author); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(del_author)
|
||||
|
||||
// add
|
||||
del_photos := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "rrfp5omm",
|
||||
"name": "photos",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), del_photos); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(del_photos)
|
||||
|
||||
// add
|
||||
del_distance := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "tacveduk",
|
||||
"name": "distance",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), del_distance); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(del_distance)
|
||||
|
||||
// add
|
||||
del_duration := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "ydhldat1",
|
||||
"name": "duration",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), del_duration); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(del_duration)
|
||||
|
||||
// add
|
||||
del_elevation_gain := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "9gg24ge8",
|
||||
"name": "elevation_gain",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), del_elevation_gain); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(del_elevation_gain)
|
||||
|
||||
// add
|
||||
del_elevation_loss := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "ujsn6lqc",
|
||||
"name": "elevation_loss",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), del_elevation_loss); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(del_elevation_loss)
|
||||
|
||||
// add
|
||||
del_type := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "nvvrulvj",
|
||||
"name": "type",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), del_type); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(del_type)
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("qejtfjom")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("nskezkjx")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("viedej4h")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("vljhhvdy")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("z1uaeqzu")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("9nnpyhlq")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("7kzcclzu")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("gwpsktbu")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("5tze9ybp")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("xkuz8ixp")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("soylsusn")
|
||||
|
||||
return dao.SaveCollection(collection)
|
||||
})
|
||||
}
|
||||
531
db/migrations/1734191497_updated_activities.go
Normal file
531
db/migrations/1734191497_updated_activities.go
Normal file
@@ -0,0 +1,531 @@
|
||||
package migrations
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/daos"
|
||||
m "github.com/pocketbase/pocketbase/migrations"
|
||||
"github.com/pocketbase/pocketbase/models/schema"
|
||||
)
|
||||
|
||||
func init() {
|
||||
m.Register(func(db dbx.Builder) error {
|
||||
dao := daos.New(db);
|
||||
|
||||
collection, err := dao.FindCollectionByNameOrId("t9lphichi5xwyeu")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
options := map[string]any{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"query": "SELECT id,trail_id,date,name,description,gpx,author,photos,distance,duration,elevation_gain,elevation_loss, type \nFROM (\n SELECT summit_logs.id,trails.id as trail_id,summit_logs.date,trails.name,text as description,summit_logs.gpx,summit_logs.author,summit_logs.photos,summit_logs.distance,summit_logs.duration,summit_logs.elevation_gain,summit_logs.elevation_loss,\"summit_log\" as type \n FROM summit_logs\n LEFT JOIN trails ON summit_logs.id IN (\n SELECT value\n FROM json_each(trails.summit_logs)\n )\n UNION\n SELECT id,id as trail_id,date,name,description,gpx,author,photos,distance,duration,elevation_gain,elevation_loss, \"trail\" as type \n FROM trails\n) ORDER BY date DESC"
|
||||
}`), &options); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.SetOptions(options)
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("qejtfjom")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("nskezkjx")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("viedej4h")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("vljhhvdy")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("z1uaeqzu")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("9nnpyhlq")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("7kzcclzu")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("gwpsktbu")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("5tze9ybp")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("xkuz8ixp")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("soylsusn")
|
||||
|
||||
// add
|
||||
new_trail_id := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "xbcmb4ax",
|
||||
"name": "trail_id",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), new_trail_id); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(new_trail_id)
|
||||
|
||||
// add
|
||||
new_date := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "elenpjfu",
|
||||
"name": "date",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), new_date); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(new_date)
|
||||
|
||||
// add
|
||||
new_name := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "gvcm04wv",
|
||||
"name": "name",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), new_name); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(new_name)
|
||||
|
||||
// add
|
||||
new_description := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "lzg9ifgi",
|
||||
"name": "description",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), new_description); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(new_description)
|
||||
|
||||
// add
|
||||
new_gpx := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "rzqpztsp",
|
||||
"name": "gpx",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), new_gpx); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(new_gpx)
|
||||
|
||||
// add
|
||||
new_author := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "oqzupzz2",
|
||||
"name": "author",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), new_author); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(new_author)
|
||||
|
||||
// add
|
||||
new_photos := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "xmzmcgjm",
|
||||
"name": "photos",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), new_photos); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(new_photos)
|
||||
|
||||
// add
|
||||
new_distance := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "rslhnvby",
|
||||
"name": "distance",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), new_distance); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(new_distance)
|
||||
|
||||
// add
|
||||
new_duration := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "xgfy26z9",
|
||||
"name": "duration",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), new_duration); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(new_duration)
|
||||
|
||||
// add
|
||||
new_elevation_gain := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "iuhfh4vo",
|
||||
"name": "elevation_gain",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), new_elevation_gain); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(new_elevation_gain)
|
||||
|
||||
// add
|
||||
new_elevation_loss := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "hoauojgi",
|
||||
"name": "elevation_loss",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), new_elevation_loss); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(new_elevation_loss)
|
||||
|
||||
// add
|
||||
new_type := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "7b25xfwx",
|
||||
"name": "type",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), new_type); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(new_type)
|
||||
|
||||
return dao.SaveCollection(collection)
|
||||
}, func(db dbx.Builder) error {
|
||||
dao := daos.New(db);
|
||||
|
||||
collection, err := dao.FindCollectionByNameOrId("t9lphichi5xwyeu")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
options := map[string]any{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"query": "SELECT id,date,name,description,gpx,author,photos,distance,duration,elevation_gain,elevation_loss, type \nFROM (\n SELECT summit_logs.id,summit_logs.date,trails.name,text as description,summit_logs.gpx,summit_logs.author,summit_logs.photos,summit_logs.distance,summit_logs.duration,summit_logs.elevation_gain,summit_logs.elevation_loss,\"summit_log\" as type \n FROM summit_logs\n LEFT JOIN trails ON summit_logs.id IN (\n SELECT value\n FROM json_each(trails.summit_logs)\n )\n UNION\n SELECT id,date,name,description,gpx,author,photos,distance,duration,elevation_gain,elevation_loss, \"trail\" as type \n FROM trails\n) ORDER BY date DESC"
|
||||
}`), &options); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.SetOptions(options)
|
||||
|
||||
// add
|
||||
del_date := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "qejtfjom",
|
||||
"name": "date",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), del_date); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(del_date)
|
||||
|
||||
// add
|
||||
del_name := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "nskezkjx",
|
||||
"name": "name",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), del_name); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(del_name)
|
||||
|
||||
// add
|
||||
del_description := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "viedej4h",
|
||||
"name": "description",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), del_description); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(del_description)
|
||||
|
||||
// add
|
||||
del_gpx := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "vljhhvdy",
|
||||
"name": "gpx",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), del_gpx); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(del_gpx)
|
||||
|
||||
// add
|
||||
del_author := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "z1uaeqzu",
|
||||
"name": "author",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), del_author); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(del_author)
|
||||
|
||||
// add
|
||||
del_photos := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "9nnpyhlq",
|
||||
"name": "photos",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), del_photos); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(del_photos)
|
||||
|
||||
// add
|
||||
del_distance := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "7kzcclzu",
|
||||
"name": "distance",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), del_distance); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(del_distance)
|
||||
|
||||
// add
|
||||
del_duration := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "gwpsktbu",
|
||||
"name": "duration",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), del_duration); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(del_duration)
|
||||
|
||||
// add
|
||||
del_elevation_gain := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "5tze9ybp",
|
||||
"name": "elevation_gain",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), del_elevation_gain); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(del_elevation_gain)
|
||||
|
||||
// add
|
||||
del_elevation_loss := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "xkuz8ixp",
|
||||
"name": "elevation_loss",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), del_elevation_loss); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(del_elevation_loss)
|
||||
|
||||
// add
|
||||
del_type := &schema.SchemaField{}
|
||||
if err := json.Unmarshal([]byte(`{
|
||||
"system": false,
|
||||
"id": "soylsusn",
|
||||
"name": "type",
|
||||
"type": "json",
|
||||
"required": false,
|
||||
"presentable": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"maxSize": 1
|
||||
}
|
||||
}`), del_type); err != nil {
|
||||
return err
|
||||
}
|
||||
collection.Schema.AddField(del_type)
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("xbcmb4ax")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("elenpjfu")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("gvcm04wv")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("lzg9ifgi")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("rzqpztsp")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("oqzupzz2")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("xmzmcgjm")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("rslhnvby")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("xgfy26z9")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("iuhfh4vo")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("hoauojgi")
|
||||
|
||||
// remove
|
||||
collection.Schema.RemoveField("7b25xfwx")
|
||||
|
||||
return dao.SaveCollection(collection)
|
||||
})
|
||||
}
|
||||
@@ -18,7 +18,7 @@
|
||||
});
|
||||
|
||||
onMount(() => {
|
||||
switchTabs(0);
|
||||
switchTabs(activeTab ?? 0);
|
||||
});
|
||||
|
||||
function switchTabs(index: number) {
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
const childElement = tabs?.children[index + 1] as HTMLElement;
|
||||
const newWidth = childElement?.getBoundingClientRect().width ?? 0;
|
||||
const newPosition = childElement.offsetLeft;
|
||||
const newPosition = childElement?.offsetLeft;
|
||||
indicatorWidth.set(newWidth);
|
||||
indicatorPosition.set(newPosition);
|
||||
|
||||
|
||||
93
web/src/lib/components/profile/activity_card.svelte
Normal file
93
web/src/lib/components/profile/activity_card.svelte
Normal file
@@ -0,0 +1,93 @@
|
||||
<script lang="ts">
|
||||
import type { Activity } from "$lib/models/activity";
|
||||
import type { UserAnonymous } from "$lib/models/user";
|
||||
import { getFileURL } from "$lib/util/file_util";
|
||||
import {
|
||||
formatDistance,
|
||||
formatElevation,
|
||||
formatTimeHHMM,
|
||||
} from "$lib/util/format_util";
|
||||
import { _ } from "svelte-i18n";
|
||||
export let activity: Activity;
|
||||
export let user: UserAnonymous;
|
||||
|
||||
let fullDescription: boolean = false;
|
||||
</script>
|
||||
|
||||
<div class="activity-card p-6 space-y-6 shadow-md rounded-xl">
|
||||
<div class="flex gap-x-4 items-start">
|
||||
<img
|
||||
class="rounded-full w-10 aspect-square overflow-hidden"
|
||||
src={getFileURL(user, user.avatar) ||
|
||||
`https://api.dicebear.com/7.x/initials/svg?seed=${user.username}&backgroundType=gradientLinear`}
|
||||
alt="avatar"
|
||||
/>
|
||||
<div>
|
||||
<a class="underline" href="/profile/{user.id}"> {user.username} </a>
|
||||
{activity.type === "trail" ? "planned" : "completed"}
|
||||
a trail
|
||||
<p class="text-xs text-gray-500 mb-3">
|
||||
{new Date(activity.date).toLocaleDateString(undefined, {
|
||||
month: "long",
|
||||
day: "2-digit",
|
||||
year: "numeric",
|
||||
timeZone: "UTC",
|
||||
})}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<h3 class="text-2xl font-semibold !mt-2">{activity.name}</h3>
|
||||
<div class="flex flex-wrap mt-1 gap-x-4 gap-y-2 text-sm text-gray-500">
|
||||
<span
|
||||
><i class="fa fa-left-right mr-2"></i>{formatDistance(
|
||||
activity.distance,
|
||||
)}</span
|
||||
>
|
||||
<span
|
||||
><i class="fa fa-clock mr-2"></i>{formatTimeHHMM(
|
||||
activity.duration,
|
||||
)}</span
|
||||
>
|
||||
<span
|
||||
><i class="fa fa-arrow-trend-up mr-2"></i>{formatElevation(
|
||||
activity.elevation_gain,
|
||||
)}</span
|
||||
>
|
||||
<span
|
||||
><i class="fa fa-arrow-trend-down mr-2"></i>{formatElevation(
|
||||
activity.elevation_loss,
|
||||
)}</span
|
||||
>
|
||||
</div>
|
||||
{#if activity.photos.length}
|
||||
<div
|
||||
class="grid {activity.photos.length > 1
|
||||
? 'grid-cols-[8fr_5fr]'
|
||||
: 'grid-cols-1'}"
|
||||
>
|
||||
{#each activity.photos as photo, i}
|
||||
<img
|
||||
class="object-cover h-full max-h-80 w-full"
|
||||
class:row-span-2={i == 0 && activity.photos.length > 2}
|
||||
src={getFileURL(
|
||||
{ collectionId: activity.type + "s", id: activity.id },
|
||||
photo,
|
||||
)}
|
||||
alt=""
|
||||
/>
|
||||
{/each}
|
||||
</div>
|
||||
{/if}
|
||||
{#if activity.description.length}
|
||||
<p class="text-sm whitespace-pre-wrap">
|
||||
{!fullDescription
|
||||
? activity.description?.substring(0, 100)
|
||||
: activity.description}
|
||||
{#if (activity.description?.length ?? 0) > 100 && !fullDescription}
|
||||
<button on:click={() => (fullDescription = true)}>
|
||||
... <span class="underline">{$_("read-more")}</span></button
|
||||
>
|
||||
{/if}
|
||||
</p>
|
||||
{/if}
|
||||
</div>
|
||||
@@ -37,6 +37,7 @@
|
||||
export let trail: Trail;
|
||||
export let mode: "overview" | "map" | "list" = "map";
|
||||
export let markers: M.Marker[] = [];
|
||||
export let activeTab = 0;
|
||||
|
||||
const tabs = [
|
||||
$_("description"),
|
||||
@@ -49,7 +50,6 @@
|
||||
const trailIsShared =
|
||||
(trail.expand?.trail_share_via_trail?.length ?? 0) > 0;
|
||||
|
||||
let activeTab = 0;
|
||||
|
||||
let thumbnail = trail.photos.length
|
||||
? getFileURL(trail, trail.photos[trail.thumbnail])
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
</script>
|
||||
|
||||
<div
|
||||
class="table-container w-full border border-input-border rounded-xl overflow-x-scroll"
|
||||
class="table-container w-full border border-input-border rounded-xl overflow-x-scroll overflow-y-clip"
|
||||
>
|
||||
<table class="w-full">
|
||||
<thead>
|
||||
|
||||
17
web/src/lib/models/activity.ts
Normal file
17
web/src/lib/models/activity.ts
Normal file
@@ -0,0 +1,17 @@
|
||||
interface Activity {
|
||||
id: string;
|
||||
trail_id: string;
|
||||
name: string,
|
||||
description: string;
|
||||
date: string;
|
||||
gpx: string;
|
||||
photos: string[];
|
||||
distance: number;
|
||||
duration: number;
|
||||
elevation_gain: number;
|
||||
elevation_loss: number;
|
||||
type: "trail" | "summit_log"
|
||||
author: string;
|
||||
}
|
||||
|
||||
export { type Activity }
|
||||
27
web/src/lib/stores/activity_store.ts
Normal file
27
web/src/lib/stores/activity_store.ts
Normal file
@@ -0,0 +1,27 @@
|
||||
import type { Activity } from "$lib/models/activity";
|
||||
import { ClientResponseError, type ListResult } from "pocketbase";
|
||||
|
||||
let activities: Activity[] = [];
|
||||
|
||||
export async function activities_index(author: string, page: number = 1, perPage: number = 10, f: (url: RequestInfo | URL, config?: RequestInit) => Promise<Response> = fetch) {
|
||||
const r = await f('/api/v1/activity?' + new URLSearchParams({
|
||||
"per-page": perPage.toString(),
|
||||
page: page.toString(),
|
||||
filter: `author="${author}"`
|
||||
}), {
|
||||
method: 'GET',
|
||||
})
|
||||
|
||||
if (!r.ok) {
|
||||
throw new ClientResponseError(await r.json())
|
||||
}
|
||||
|
||||
const fetchedActivities: ListResult<Activity> = await r.json();
|
||||
|
||||
const result = page > 1 ? [...activities, ...fetchedActivities.items] : fetchedActivities.items
|
||||
|
||||
activities = result;
|
||||
|
||||
return { ...fetchedActivities, items: result };
|
||||
|
||||
}
|
||||
18
web/src/routes/api/v1/activity/+server.ts
Normal file
18
web/src/routes/api/v1/activity/+server.ts
Normal file
@@ -0,0 +1,18 @@
|
||||
import type { Activity } from "$lib/models/activity";
|
||||
import { pb } from "$lib/pocketbase";
|
||||
import { error, json, type RequestEvent } from "@sveltejs/kit";
|
||||
|
||||
export async function GET(event: RequestEvent) {
|
||||
const page = event.url.searchParams.get("page") ?? "0";
|
||||
const perPage = event.url.searchParams.get("per-page") ?? "10";
|
||||
const filter = event.url.searchParams.get("filter") ?? "";
|
||||
|
||||
try {
|
||||
const r = await pb.collection('activities')
|
||||
.getList<Activity>(parseInt(page), parseInt(perPage), { filter: filter ?? "" })
|
||||
return json(r)
|
||||
} catch (e: any) {
|
||||
throw error(e.status, e);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -143,7 +143,7 @@
|
||||
mapWithElevation.unHighlightTrail(trail.id!);
|
||||
}
|
||||
|
||||
async function onListScroll(e: any) {
|
||||
async function onListScroll(e: Event) {
|
||||
const container = e.target as HTMLDivElement;
|
||||
const scrollTop = container.scrollTop;
|
||||
const scrollHeight = container.scrollHeight;
|
||||
|
||||
@@ -1,15 +1,26 @@
|
||||
import { users_show } from "$lib/stores/user_store";
|
||||
import { error, type ServerLoad } from "@sveltejs/kit";
|
||||
import { ClientResponseError } from "pocketbase";
|
||||
|
||||
export const load: ServerLoad = async ({ params, locals, fetch }) => {
|
||||
|
||||
if(!params.id) {
|
||||
if (!params.id) {
|
||||
error(404, "Not found")
|
||||
}
|
||||
|
||||
const user = await users_show(params.id, fetch);
|
||||
try {
|
||||
const user = await users_show(params.id, fetch);
|
||||
|
||||
const isOwnProfile = params.id === locals.user?.id;
|
||||
const isOwnProfile = params.id === locals.user?.id;
|
||||
|
||||
return { user, isOwnProfile }
|
||||
} catch (e) {
|
||||
if (e instanceof ClientResponseError && e.status == 404) {
|
||||
error(404, {
|
||||
message: 'Not found'
|
||||
});
|
||||
}
|
||||
throw e
|
||||
}
|
||||
|
||||
return { user, isOwnProfile }
|
||||
};
|
||||
@@ -1,9 +1,43 @@
|
||||
<script lang="ts">
|
||||
import ActivityCard from "$lib/components/profile/activity_card.svelte";
|
||||
import { activities_index } from "$lib/stores/activity_store.js";
|
||||
import { getFileURL } from "$lib/util/file_util.js";
|
||||
import { _ } from "svelte-i18n";
|
||||
|
||||
export let data;
|
||||
|
||||
let loading: boolean = false;
|
||||
|
||||
$: pagination = {
|
||||
page: data.activities.page,
|
||||
totalPages: data.activities.totalPages,
|
||||
};
|
||||
|
||||
async function onListScroll(e: Event) {
|
||||
if (
|
||||
window.innerHeight + window.scrollY >=
|
||||
0.8 * document.body.offsetHeight &&
|
||||
pagination.page !== pagination.totalPages &&
|
||||
!loading
|
||||
) {
|
||||
loading = true;
|
||||
await loadNextPage();
|
||||
loading = false;
|
||||
}
|
||||
}
|
||||
|
||||
async function loadNextPage() {
|
||||
pagination.page += 1;
|
||||
data.activities = await activities_index(data.user.id, pagination.page);
|
||||
}
|
||||
</script>
|
||||
|
||||
<svelte:window on:scroll={onListScroll} />
|
||||
|
||||
<svelte:head>
|
||||
<title>{$_("profile")} | wanderer</title>
|
||||
</svelte:head>
|
||||
|
||||
<div class="mx-8 space-y-6">
|
||||
<div class="space-y-4">
|
||||
<h4 class="text-xl font-semibold">
|
||||
@@ -58,7 +92,18 @@
|
||||
{/each}
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<div class="space-y-4">
|
||||
<h4 class="text-xl font-semibold">Timeline</h4>
|
||||
|
||||
{#each data.activities.items as activity}
|
||||
<a
|
||||
class="block"
|
||||
href={activity.type == "trail"
|
||||
? `/trail/view/${activity.id}`
|
||||
: `/trail/view/${activity.trail_id}?t=3`}
|
||||
>
|
||||
<ActivityCard {activity} user={data.user}></ActivityCard>
|
||||
</a>
|
||||
{/each}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
import { activities_index } from "$lib/stores/activity_store";
|
||||
import { lists_index } from "$lib/stores/list_store";
|
||||
import { type Load } from "@sveltejs/kit";
|
||||
|
||||
export const load: Load = async ({ params, fetch }) => {
|
||||
|
||||
const lists = await lists_index({ q: "", author: params.id, sort: "created", sortOrder: "-" }, 1, -1, fetch)
|
||||
return { lists: lists.items }
|
||||
const activities = await activities_index(params.id!, 1, 10, fetch);
|
||||
return { lists: lists.items, activities: activities }
|
||||
};
|
||||
@@ -1,6 +1,7 @@
|
||||
<script lang="ts">
|
||||
import TrailList from "$lib/components/trail/trail_list.svelte";
|
||||
import { trails_search_filter } from "$lib/stores/trail_store";
|
||||
import { _ } from "svelte-i18n";
|
||||
|
||||
export let data;
|
||||
|
||||
@@ -23,7 +24,9 @@
|
||||
data.trails = await trails_search_filter(data.filter, page);
|
||||
}
|
||||
</script>
|
||||
|
||||
<svelte:head>
|
||||
<title>{$_("profile")} | wanderer</title>
|
||||
</svelte:head>
|
||||
<TrailList
|
||||
{pagination}
|
||||
{loading}
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
type SelectItem,
|
||||
} from "$lib/components/base/select.svelte";
|
||||
import ConfirmModal from "$lib/components/confirm_modal.svelte";
|
||||
import EmailModal from "$lib/components/profile/email_modal.svelte";
|
||||
import PasswordModal from "$lib/components/profile/password_modal.svelte";
|
||||
import EmailModal from "$lib/components/settings/email_modal.svelte";
|
||||
import PasswordModal from "$lib/components/settings/password_modal.svelte";
|
||||
import { show_toast } from "$lib/stores/toast_store";
|
||||
import {
|
||||
currentUser,
|
||||
|
||||
@@ -2,11 +2,16 @@
|
||||
import TrailInfoPanel from "$lib/components/trail/trail_info_panel.svelte";
|
||||
import { trail } from "$lib/stores/trail_store";
|
||||
import { _ } from "svelte-i18n";
|
||||
import { page } from "$app/stores";
|
||||
|
||||
export let data;
|
||||
</script>
|
||||
|
||||
<TrailInfoPanel trail={data.trail} mode="overview"></TrailInfoPanel>
|
||||
<TrailInfoPanel
|
||||
activeTab={parseInt($page.url.searchParams.get("t") ?? 0)}
|
||||
trail={data.trail}
|
||||
mode="overview"
|
||||
></TrailInfoPanel>
|
||||
|
||||
<svelte:head>
|
||||
<title>{$trail.name} | {$_("trail", { values: { n: 1 } })} | wanderer</title
|
||||
|
||||
Reference in New Issue
Block a user