franzz/livetrail
1
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

Add reply-to function
Deploy Livetrail / deploy (push) Successful in 33s
Details

Browse Source
This commit is contained in:
franzz
2026-09-06 14:20:55 +02:00
parent 842bb56fcc
commit 51837ef1ac
13 changed files with 446 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Controller.php
+3 -1
View File
@@ -49,6 +49,8 @@ class Controller extends PhpObject {
$this->setReqVal('t', $asReq['t'] ?? ''); $this->setReqVal('t', $asReq['t'] ?? '');
$this->setReqVal('name', $asReq['name'] ?? ''); $this->setReqVal('name', $asReq['name'] ?? '');
$this->setReqVal('content', $asReq['content'] ?? ''); $this->setReqVal('content', $asReq['content'] ?? '');
$this->setReqVal('ref_type', $asReq['ref_type'] ?? '');
$this->setReqVal('ref_id', $asReq['ref_id'] ?? 0, 'positiveInt');
$this->setReqVal('id_project', $asReq['id_project'] ?? 0, 'positiveInt'); $this->setReqVal('id_project', $asReq['id_project'] ?? 0, 'positiveInt');
$this->setReqVal('id', $asReq['id'] ?? 0); $this->setReqVal('id', $asReq['id'] ?? 0);
$this->setReqVal('id_entity', $asReq['id'] ?? 0, 'positiveInt'); $this->setReqVal('id_entity', $asReq['id'] ?? 0, 'positiveInt');
@@ -133,7 +135,7 @@ class Controller extends PhpObject {
'last_update' => $this->oLivetrail->getLastUpdate(), 'last_update' => $this->oLivetrail->getLastUpdate(),
'next_feed' => $this->oLivetrail->getNextFeed($this->asReq['id']), 'next_feed' => $this->oLivetrail->getNextFeed($this->asReq['id']),
'new_feed' => $this->oLivetrail->getNewFeed($this->asReq['id']), 'new_feed' => $this->oLivetrail->getNewFeed($this->asReq['id']),
'add_post' => $this->oLivetrail->addPost($this->asReq['name'], $this->asReq['content']), 'add_post' => $this->oLivetrail->addPost($this->asReq['name'], $this->asReq['content'], $this->asReq['ref_type'], $this->asReq['ref_id']),
'subscribe' => $this->oLivetrail->subscribe(), 'subscribe' => $this->oLivetrail->subscribe(),
'unsubscribe' => $this->oLivetrail->unsubscribe(), 'unsubscribe' => $this->oLivetrail->unsubscribe(),
'login' => $this->oLivetrail->login($this->asReq['email'], $this->asReq['password'], $this->asReq['name']), 'login' => $this->oLivetrail->login($this->asReq['email'], $this->asReq['password'], $this->asReq['name']),
lib/Livetrail.php
+24 -4
View File
@@ -34,6 +34,7 @@ use \Settings;
class Livetrail extends Main { class Livetrail extends Main {
//Database //Database
public const POST_TABLE = 'posts'; public const POST_TABLE = 'posts';
private const REF_TYPES = ['post', 'media', 'message'];
private const FEED_CHUNK_SIZE = 15; private const FEED_CHUNK_SIZE = 15;
private const MAIL_CHUNK_SIZE = 5; private const MAIL_CHUNK_SIZE = 5;
@@ -87,7 +88,7 @@ class Livetrail extends Main {
Feed::FEED_TABLE => ['ref_feed_id', Db::getId(Feed::SPOT_TABLE), Db::getId(Project::PROJ_TABLE), 'name', 'description', 'status', 'last_update'], Feed::FEED_TABLE => ['ref_feed_id', Db::getId(Feed::SPOT_TABLE), Db::getId(Project::PROJ_TABLE), 'name', 'description', 'status', 'last_update'],
Feed::SPOT_TABLE => ['ref_spot_id', 'name', 'model'], Feed::SPOT_TABLE => ['ref_spot_id', 'name', 'model'],
Project::PROJ_TABLE => ['name', 'codename', 'active_from', 'active_to'], Project::PROJ_TABLE => ['name', 'codename', 'active_from', 'active_to'],
self::POST_TABLE => [Db::getId(Project::PROJ_TABLE), Db::getId(User::USER_TABLE), 'name', 'content', 'site_time', 'timezone'], self::POST_TABLE => [Db::getId(Project::PROJ_TABLE), Db::getId(User::USER_TABLE), 'name', 'content', 'site_time', 'timezone', 'ref_id', 'ref_type'],
Media::MEDIA_TABLE => [Db::getId(Project::PROJ_TABLE), 'filename', 'type', 'taken_on', 'posted_on', 'timezone', 'latitude', 'longitude', 'altitude', 'width', 'height', 'rotate', 'comment'], Media::MEDIA_TABLE => [Db::getId(Project::PROJ_TABLE), 'filename', 'type', 'taken_on', 'posted_on', 'timezone', 'latitude', 'longitude', 'altitude', 'width', 'height', 'rotate', 'comment'],
User::USER_TABLE => ['name', 'email', 'password', 'token', 'token_exp', 'gravatar', 'language', 'timezone', 'subscribed', 'clearance'], User::USER_TABLE => ['name', 'email', 'password', 'token', 'token_exp', 'gravatar', 'language', 'timezone', 'subscribed', 'clearance'],
Map::MAP_TABLE => ['codename', 'pattern', 'token', 'tile_size', 'min_zoom', 'max_zoom', 'attribution'], Map::MAP_TABLE => ['codename', 'pattern', 'token', 'tile_size', 'min_zoom', 'max_zoom', 'attribution'],
@@ -119,6 +120,8 @@ class Livetrail extends Main {
'ref_feed_id' => 'VARCHAR(40)', 'ref_feed_id' => 'VARCHAR(40)',
'ref_msg_id' => 'VARCHAR(15)', 'ref_msg_id' => 'VARCHAR(15)',
'ref_spot_id' => 'VARCHAR(10)', 'ref_spot_id' => 'VARCHAR(10)',
'ref_id' => 'INT UNSIGNED',
'ref_type' => 'VARCHAR(20)',
'rotate' => 'SMALLINT', 'rotate' => 'SMALLINT',
'site_time' => 'TIMESTAMP DEFAULT 0', //DEFAULT 0 removes auto-set to current time 'site_time' => 'TIMESTAMP DEFAULT 0', //DEFAULT 0 removes auto-set to current time
'status' => 'VARCHAR(10)', 'status' => 'VARCHAR(10)',
@@ -469,7 +472,7 @@ class Livetrail extends Main {
return $asMedias; return $asMedias;
} }
private function getPosts($asPostIds=[]) { private function getPosts($asPostIds=[], $bResolveRef=true) {
$asInfo = [ $asInfo = [
'select' => [Db::getFullColumnName(self::POST_TABLE, '*'), 'gravatar'], 'select' => [Db::getFullColumnName(self::POST_TABLE, '*'), 'gravatar'],
'from' => self::POST_TABLE, 'from' => self::POST_TABLE,
@@ -489,6 +492,20 @@ class Livetrail extends Main {
unset($asPost[Db::getId(User::USER_TABLE)]); unset($asPost[Db::getId(User::USER_TABLE)]);
$this->addTimeStamp($asPost, $iUnixTimeStamp, $asPost['timezone']); $this->addTimeStamp($asPost, $iUnixTimeStamp, $asPost['timezone']);
if($bResolveRef && !empty($asPost['ref_type']) && !empty($asPost['ref_id'])) {
switch($asPost['ref_type']) {
case 'post': $asRefs = $this->getPosts([$asPost['ref_id']], false); break;
case 'media': $asRefs = $this->getMedias('posted_on', [$asPost['ref_id']]); break;
case 'message': $asRefs = $this->getSpotMessages([$asPost['ref_id']]); break;
default: $asRefs = [];
}
$asPost['ref_item'] = reset($asRefs);
$asPost['ref_item']['type'] = $asPost['ref_type'];
$asPost['ref_item']['id'] = $asPost['ref_id'];
}
unset($asPost['ref_id']);
unset($asPost['ref_type']);
} }
return $asPosts; return $asPosts;
@@ -658,17 +675,20 @@ class Livetrail extends Main {
return ['ref_id_last'=>$iRefIdLast, 'ref_id_first'=>$iRefIdFirst, 'sort'=>$sSort, 'feed'=>$asItems]; return ['ref_id_last'=>$iRefIdLast, 'ref_id_first'=>$iRefIdFirst, 'sort'=>$sSort, 'feed'=>$asItems];
} }
public function addPost($sName, $sPost) { public function addPost($sName, $sPost, $sRefType='', $iRefId=0) {
$iPostId = 0; $iPostId = 0;
$sLangId = ''; $sLangId = '';
if($this->oProject->isEditable()) { if($this->oProject->isEditable()) {
$bHasRef = ($iRefId > 0) && in_array($sRefType, self::REF_TYPES, true);
$asData = [ $asData = [
Db::getId(Project::PROJ_TABLE) => $this->oProject->getProjectId(), Db::getId(Project::PROJ_TABLE) => $this->oProject->getProjectId(),
'name' => mb_strtolower(trim($sName)), 'name' => mb_strtolower(trim($sName)),
'content' => trim($sPost), 'content' => trim($sPost),
'site_time' => date(Db::TIMESTAMP_FORMAT), //Now in Site Time 'site_time' => date(Db::TIMESTAMP_FORMAT), //Now in Site Time
'timezone' => date_default_timezone_get() //Site Time Zone 'timezone' => date_default_timezone_get(), //Site Time Zone
'ref_id' => $bHasRef?$iRefId:'NULL',
'ref_type' => $bHasRef?$sRefType:'NULL'
]; ];
if($this->oUser->getUserId() > 0) $asData[Db::getId(User::USER_TABLE)] = $this->oUser->getUserId(); if($this->oUser->getUserId() > 0) $asData[Db::getId(User::USER_TABLE)] = $this->oUser->getUserId();
package-lock.json
Generated
+214 -124
View File
@@ -1,12 +1,12 @@
{ {
"name": "livetrail", "name": "livetrail",
"version": "3.0.0", "version": "3.0.1",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "livetrail", "name": "livetrail",
"version": "3.0.0", "version": "3.0.1",
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-svg-core": "^7.2.0", "@fortawesome/fontawesome-svg-core": "^7.2.0",
"@fortawesome/free-solid-svg-icons": "^7.2.0", "@fortawesome/free-solid-svg-icons": "^7.2.0",
@@ -74,6 +74,30 @@
"node": ">=6.9.0" "node": ">=6.9.0"
} }
}, },
"node_modules/@cacheable/memory": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/@cacheable/memory/-/memory-2.2.0.tgz",
"integrity": "sha512-CTLKqLItRCEixEAewD3/j9DB3/o96gpTPD4eJ1v+DGOlxZRZncRQkGYqqnAGCscYd6RNeXfGeiuCphsPtqyIfQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"@cacheable/utils": "^2.5.0",
"@keyv/bigmap": "^1.3.1",
"hookified": "^1.15.1",
"keyv": "^5.6.0"
}
},
"node_modules/@cacheable/utils": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/@cacheable/utils/-/utils-2.5.0.tgz",
"integrity": "sha512-buipgOVDkkPXNR5+xBpDw7Zk2n1EvU7qBJCNUcL7rhQ//kfpOXPAvQ511Os0vpLYJ1pZnvudNytkQt2hst3wqA==",
"dev": true,
"license": "MIT",
"dependencies": {
"hashery": "^1.5.1",
"keyv": "^5.6.0"
}
},
"node_modules/@eslint-community/eslint-utils": { "node_modules/@eslint-community/eslint-utils": {
"version": "4.10.1", "version": "4.10.1",
"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.10.1.tgz", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.10.1.tgz",
@@ -189,9 +213,9 @@
} }
}, },
"node_modules/@eslint/plugin-kit": { "node_modules/@eslint/plugin-kit": {
"version": "0.7.2", "version": "0.7.3",
"resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.7.2.tgz", "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.7.3.tgz",
"integrity": "sha512-+CNAzxglkrpNf/kKywqQfk74QjtceuOE7Qm+AF8miRvPF/wmmK5+OJOgVh3AVTT3RP2mH3+FOaxlE5v72owk0A==", "integrity": "sha512-IkO+/KEUvwbVpiURZg+P7zF74z5Jxe0UgJxVni+RtoHQ6IZieXaO02kmadomap/q+l6bc/jdPGGqTjhuZnuz1Q==",
"dev": true, "dev": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
@@ -312,9 +336,33 @@
} }
}, },
"node_modules/@jridgewell/sourcemap-codec": { "node_modules/@jridgewell/sourcemap-codec": {
"version": "1.5.5", "version": "1.6.0",
"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.6.0.tgz",
"integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", "integrity": "sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==",
"license": "MIT"
},
"node_modules/@keyv/bigmap": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/@keyv/bigmap/-/bigmap-1.3.1.tgz",
"integrity": "sha512-WbzE9sdmQtKy8vrNPa9BRnwZh5UF4s1KTmSK0KUVLo3eff5BlQNNWDnFOouNpKfPKDnms9xynJjsMYjMaT/aFQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"hashery": "^1.4.0",
"hookified": "^1.15.0"
},
"engines": {
"node": ">= 18"
},
"peerDependencies": {
"keyv": "^5.6.0"
}
},
"node_modules/@keyv/serialize": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/@keyv/serialize/-/serialize-1.1.1.tgz",
"integrity": "sha512-dXn3FZhPv0US+7dtJsIi2R+c7qWYiReoEh5zUntWCf4oSpMNib8FDhSoed6m3QyZdx5hK7iLFkYk3rNxwt8vTA==",
"dev": true,
"license": "MIT" "license": "MIT"
}, },
"node_modules/@mapbox/jsonlint-lines-primitives": { "node_modules/@mapbox/jsonlint-lines-primitives": {
@@ -404,13 +452,13 @@
} }
}, },
"node_modules/@oxc-project/types": { "node_modules/@oxc-project/types": {
"version": "0.147.0", "version": "0.148.0",
"resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.147.0.tgz", "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.148.0.tgz",
"integrity": "sha512-IJ3s6ltHLp45S0bh7phkX+gJO7A1Wuz2EaqpAhb8WjqDwbzMiWKHhyyT42tskaWjEYXtHtVCPpnBJVT9+dcRLg==", "integrity": "sha512-Nm4s/jB+4FpFsPhWGEC4h7rzksesmtnMXomo6rCMcg/b8zLQuOziRgkCS1fxDCXOlJB/6Q8oABOZ/OP6RIPj9A==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"funding": { "funding": {
"url": "https://github.com/sponsors/Boshen" "url": "https://github.com/sponsors/oxc-project"
} }
}, },
"node_modules/@parcel/watcher": { "node_modules/@parcel/watcher": {
@@ -707,9 +755,9 @@
} }
}, },
"node_modules/@rolldown/binding-android-arm-eabi": { "node_modules/@rolldown/binding-android-arm-eabi": {
"version": "1.2.6", "version": "1.2.7",
"resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm-eabi/-/binding-android-arm-eabi-1.2.6.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm-eabi/-/binding-android-arm-eabi-1.2.7.tgz",
"integrity": "sha512-b+jTcARdTiFLI6jB4a5XjTm0RWd6KcRfQj/I2356fxUZemiho9zQLxo0RtCuMDAyKcLo6cEltkgbQp6d1+sjjQ==", "integrity": "sha512-EypzgnYCwyVY4NDHKzGmNJT5b+XaQEBniHxsMdeIQLB/tcCzZnhqrzHpZFbX9iaxx+5RiB8caATBtfvZP7zVxQ==",
"cpu": [ "cpu": [
"arm" "arm"
], ],
@@ -724,9 +772,9 @@
} }
}, },
"node_modules/@rolldown/binding-android-arm64": { "node_modules/@rolldown/binding-android-arm64": {
"version": "1.2.6", "version": "1.2.7",
"resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.6.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.7.tgz",
"integrity": "sha512-lkWU8ZJaRk9q3CIEY1Tc7vIFALp3Xw5NfGJo2hQg5oIqNgxWi1zI+IiDEK3r70BF5Dzol1tcXsnzsRc8NLhG+Q==", "integrity": "sha512-l17HE9EweWaqJZhuUuNBN/FzM62xw+DECVnJyvMsxn8vJFAGLy5QfLDoYAcronkAN8VxKZHezDpulHDPx95vFw==",
"cpu": [ "cpu": [
"arm64" "arm64"
], ],
@@ -741,9 +789,9 @@
} }
}, },
"node_modules/@rolldown/binding-darwin-arm64": { "node_modules/@rolldown/binding-darwin-arm64": {
"version": "1.2.6", "version": "1.2.7",
"resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.6.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.7.tgz",
"integrity": "sha512-dgR56NYnvAszm7Ob1B2/Vn0e8bUQYZH2UjVaMMtMVOCKFSfjhfLmuA/9+O+F+ajUdG6B/bSssrKW6JJYASa8jA==", "integrity": "sha512-8ED8ELFvHXc6OCETIn4gXObPiaR6bckM/ipXtbzlPVDRMBfEGjCKgO90F9YtfdpDatVx/ZQw7aZ1vUMf/+T3Mw==",
"cpu": [ "cpu": [
"arm64" "arm64"
], ],
@@ -758,9 +806,9 @@
} }
}, },
"node_modules/@rolldown/binding-darwin-x64": { "node_modules/@rolldown/binding-darwin-x64": {
"version": "1.2.6", "version": "1.2.7",
"resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.6.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.7.tgz",
"integrity": "sha512-vpVxFvUCFioJqug7OTvqptkc4yb8UX0AwfDmJpaR/0sWz+BUmqSVAf7c8JkUgnN8YLspb4a/N6NhTyMAmdyQ7Q==", "integrity": "sha512-/WPripjtiAIZ2tWY7ddijORT0Ujg87wxWW/qcoFVCKAWVDPhtY0xr7Dj0M3GyNGz60jGwTElhro/mkF9dT7dDQ==",
"cpu": [ "cpu": [
"x64" "x64"
], ],
@@ -775,9 +823,9 @@
} }
}, },
"node_modules/@rolldown/binding-freebsd-x64": { "node_modules/@rolldown/binding-freebsd-x64": {
"version": "1.2.6", "version": "1.2.7",
"resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.6.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.7.tgz",
"integrity": "sha512-h1wG6Y6K3JlRswxsI64qQJqBAy4vrLuHgRbc8CZMGSWTOFRY6ghMApM1NKzB2I0n5xV1fjkE18SuVl2QpLeNpA==", "integrity": "sha512-14DI4NcqpvbICxSnGLx3PmtDaWqRP/KGSGb6C+JLLVPeZRl6dKdHba3pGsqT3vpdTqhEYIPG0MMQ8c0xYqoJxA==",
"cpu": [ "cpu": [
"x64" "x64"
], ],
@@ -792,9 +840,9 @@
} }
}, },
"node_modules/@rolldown/binding-linux-arm-gnueabihf": { "node_modules/@rolldown/binding-linux-arm-gnueabihf": {
"version": "1.2.6", "version": "1.2.7",
"resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.6.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.7.tgz",
"integrity": "sha512-tbCiqub0q2MVWJKgF5PoAlNWCtQydiOYSLIkd8sByqK/6MMYLJRcSXSYodqYtd0O+Fw7QaVmKKlS4oL94YRZ0w==", "integrity": "sha512-bxrWIRvHWQvbJwi+VIie/kDJmQxcNE6xxWwZdqF/ExVAigtHkv54WTLQPb+QsZdnFy18fg7JPfWGL0RH6vwIlQ==",
"cpu": [ "cpu": [
"arm" "arm"
], ],
@@ -809,9 +857,9 @@
} }
}, },
"node_modules/@rolldown/binding-linux-arm64-gnu": { "node_modules/@rolldown/binding-linux-arm64-gnu": {
"version": "1.2.6", "version": "1.2.7",
"resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.6.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.7.tgz",
"integrity": "sha512-oxK9+baEBPhZG5HB4URY+uU04zJWeZlH6Tb9rB5DK4DF9XR1uXNLXt5Q5ZsugTKayNCNLhkcwz/ye74hRI98dg==", "integrity": "sha512-toOY2BChBZyuxU7OYX6Tn389di4IzAqPTycVcci0O7FSfBqzRB3RZn+K5Is6ANf4tmgRd/K1yZTsNTXbkXsnLg==",
"cpu": [ "cpu": [
"arm64" "arm64"
], ],
@@ -829,9 +877,9 @@
} }
}, },
"node_modules/@rolldown/binding-linux-arm64-musl": { "node_modules/@rolldown/binding-linux-arm64-musl": {
"version": "1.2.6", "version": "1.2.7",
"resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.6.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.7.tgz",
"integrity": "sha512-muWCk27FVBEZtv0MsK8gnfSmgczA8KQ0uRVJbTABKhkRfQc38aUrcb7fhi3BNiyseFmgcRsoMfQsSNJ+DbZdSw==", "integrity": "sha512-lAIXTH/aiLRLxsTgQvfhjo4K1ydWIp00+V0voOr9beb/9ZmkUFrSIb03dXNFRgMNvkE6oGsF10ioQ6UsI+vS5Q==",
"cpu": [ "cpu": [
"arm64" "arm64"
], ],
@@ -849,9 +897,9 @@
} }
}, },
"node_modules/@rolldown/binding-linux-ppc64-gnu": { "node_modules/@rolldown/binding-linux-ppc64-gnu": {
"version": "1.2.6", "version": "1.2.7",
"resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.6.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.7.tgz",
"integrity": "sha512-eWDoSfU7Co2qj3vgB3Dt4lj1mG6CoWbcJQkRMP3XJplyCMtuaq3LHvPFjS9QIPvMGWVadJC04Xiy0IdcVPtnwQ==", "integrity": "sha512-kdnwS28Pkenp/mZMRwjXXXwxQ7pIsm+bF919LUK93BOyhcLsrVKdP2p9fxpiPNPAbNuch8ypQt0pm2P2LYCAGg==",
"cpu": [ "cpu": [
"ppc64" "ppc64"
], ],
@@ -869,9 +917,9 @@
} }
}, },
"node_modules/@rolldown/binding-linux-s390x-gnu": { "node_modules/@rolldown/binding-linux-s390x-gnu": {
"version": "1.2.6", "version": "1.2.7",
"resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.6.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.7.tgz",
"integrity": "sha512-2bWNjRSIayvupRKxXUY2tWG9fYdoUlTqWywHRvE8Eq3GvuQ+f2HeIkve697fIt+IQs/PV8yFsdWuhp1aJ1PdnA==", "integrity": "sha512-516OdsyLdr5E65paF3yBF55t8mfm9+gmtCsK3xI7XKXIT7EfRlHhxL8K/NR6Hu8BWSgF5+1w74lTL0+nxcc8Qw==",
"cpu": [ "cpu": [
"s390x" "s390x"
], ],
@@ -889,9 +937,9 @@
} }
}, },
"node_modules/@rolldown/binding-linux-x64-gnu": { "node_modules/@rolldown/binding-linux-x64-gnu": {
"version": "1.2.6", "version": "1.2.7",
"resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.6.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.7.tgz",
"integrity": "sha512-KekI0gS0wLxe1UBSQSjenBVwou/JkcQPDzBPICGZjxUv9k3RteHDPBQaiOicZUFKRIH2wKEimGwVpnJsbPzu7w==", "integrity": "sha512-r8/z8n7GFaYRln3xmP1Cxy0HH/HLM0uBUPkEuSVEfKGDA89M0FsZRZJRSwe/tJjRx+fpH/gjorfhB8tmEbSFLA==",
"cpu": [ "cpu": [
"x64" "x64"
], ],
@@ -909,9 +957,9 @@
} }
}, },
"node_modules/@rolldown/binding-linux-x64-musl": { "node_modules/@rolldown/binding-linux-x64-musl": {
"version": "1.2.6", "version": "1.2.7",
"resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.6.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.7.tgz",
"integrity": "sha512-TvtPnfVr+HtyGiDmPK4VWmlNm7QhNNAcK5Q9A7aOXsI8545yCyaoMaicXrFZ72JzeYjaUVk7yT243zT0jzjFKQ==", "integrity": "sha512-pAsE8iiDxUg1xBqdhrTfg45AVDVpirjz00sblEYClGNNcMnDb+e8beQgqIAw6LvauX/APvgxUnwrgun/YYGBhw==",
"cpu": [ "cpu": [
"x64" "x64"
], ],
@@ -929,9 +977,9 @@
} }
}, },
"node_modules/@rolldown/binding-openharmony-arm64": { "node_modules/@rolldown/binding-openharmony-arm64": {
"version": "1.2.6", "version": "1.2.7",
"resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.6.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.7.tgz",
"integrity": "sha512-iOo0VEay2XFhaCcH0sps5XIimkSuOnNaZrf6+ZkoSOQBJPKNU48RkmJv0/lSpipexu5P+ouFgafe5IGr/DiQfg==", "integrity": "sha512-lTcIYmmnQQA8Or/2DatS6oSqcdLHvendjS+zLu+FwgToynWMRSmQdpM65fTANJgIS4mjbMOo5KT2lnT9SAb96w==",
"cpu": [ "cpu": [
"arm64" "arm64"
], ],
@@ -946,9 +994,9 @@
} }
}, },
"node_modules/@rolldown/binding-win32-arm64-msvc": { "node_modules/@rolldown/binding-win32-arm64-msvc": {
"version": "1.2.6", "version": "1.2.7",
"resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.6.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.7.tgz",
"integrity": "sha512-y5NTmmasMS455JlOCO4ZM9krIchv3Mvm1crL1iUPGOPgEzSkves9n0SdC5Sjz6+qWDFhd8/JpfWMH8NSWNHe+A==", "integrity": "sha512-e3Gu3WxbNk/UqQhxqU7YIYO+9ZBvWNz3U+h/qRFosscMFzdRPbXYSaSWgSnklv2fz1TgzBTcti2z35c/7irsHw==",
"cpu": [ "cpu": [
"arm64" "arm64"
], ],
@@ -963,9 +1011,9 @@
} }
}, },
"node_modules/@rolldown/binding-win32-x64-msvc": { "node_modules/@rolldown/binding-win32-x64-msvc": {
"version": "1.2.6", "version": "1.2.7",
"resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.6.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.7.tgz",
"integrity": "sha512-np8iZSLfXlAD4kWhiyq/u0Yt8oZDtRQ8lGhQaCXo2rl37KNjeU0GjJuwr4P3oeZ++ROfofsKNBqR5LTO8aXyWQ==", "integrity": "sha512-W/jg5qoRSqjsEv0+dZi4e687mcHqmVuU0P4fK6qS/xjetW2Gmc1W8j//z5nAeNcC8Ttm0hV46IjcYeuVwYhuiw==",
"cpu": [ "cpu": [
"x64" "x64"
], ],
@@ -1245,6 +1293,20 @@
"node": "20 || >=22" "node": "20 || >=22"
} }
}, },
"node_modules/cacheable": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/cacheable/-/cacheable-2.5.0.tgz",
"integrity": "sha512-60cyAOytib/OzBw1JNSoSV/boK1AtHryDIjvVBk7XbN4ugfkM3+Sry7fEjNgPMGgOjuaZPAp8ruZ0Cxafwyq9g==",
"dev": true,
"license": "MIT",
"dependencies": {
"@cacheable/memory": "^2.2.0",
"@cacheable/utils": "^2.5.0",
"hookified": "^1.15.0",
"keyv": "^5.6.0",
"qified": "^0.10.1"
}
},
"node_modules/chokidar": { "node_modules/chokidar": {
"version": "5.0.0", "version": "5.0.0",
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz",
@@ -1367,9 +1429,9 @@
} }
}, },
"node_modules/eslint": { "node_modules/eslint": {
"version": "10.9.1", "version": "10.10.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-10.9.1.tgz", "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.10.0.tgz",
"integrity": "sha512-9VaAkDURekixUQJy0oJYl2DcN6oKMfxay7XzaGYAWQwsb6qfKf+x76R2k1L8kb1boc+FyCAaTA9GmiKaaiaF+A==", "integrity": "sha512-NPXn6r5zl4uET1DAVPaOwzX3rut4c0wcmw3dWJAfOsTM5+TogXo0DDjz8pwm/hL8cyVNpHqeK4JpN0NjnyFFNw==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"workspaces": [ "workspaces": [
@@ -1381,7 +1443,7 @@
"@eslint/config-array": "^0.23.5", "@eslint/config-array": "^0.23.5",
"@eslint/config-helpers": "^0.7.0", "@eslint/config-helpers": "^0.7.0",
"@eslint/core": "^1.2.1", "@eslint/core": "^1.2.1",
"@eslint/plugin-kit": "^0.7.2", "@eslint/plugin-kit": "^0.7.3",
"@humanfs/node": "^0.16.6", "@humanfs/node": "^0.16.6",
"@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/module-importer": "^1.0.1",
"@humanwhocodes/retry": "^0.4.2", "@humanwhocodes/retry": "^0.4.2",
@@ -1396,7 +1458,7 @@
"esquery": "^1.7.0", "esquery": "^1.7.0",
"esutils": "^2.0.2", "esutils": "^2.0.2",
"fast-deep-equal": "^3.1.3", "fast-deep-equal": "^3.1.3",
"file-entry-cache": "^8.0.0", "file-entry-cache": "11.1.5 || >11.1.6 <12",
"find-up": "^5.0.0", "find-up": "^5.0.0",
"glob-parent": "^6.0.2", "glob-parent": "^6.0.2",
"ignore": "^5.2.0", "ignore": "^5.2.0",
@@ -1605,16 +1667,13 @@
} }
}, },
"node_modules/file-entry-cache": { "node_modules/file-entry-cache": {
"version": "8.0.0", "version": "11.1.5",
"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-11.1.5.tgz",
"integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", "integrity": "sha512-+PFTHITI08JIGhnNpGNI8T8inUpgZfk3GNEqfT9R2zZV2iFXg3CvqzSl/uEhs7TSGujYRELEANyDvS8Fj7+S7Q==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"flat-cache": "^4.0.0" "flat-cache": "^6.1.23"
},
"engines": {
"node": ">=16.0.0"
} }
}, },
"node_modules/find-up": { "node_modules/find-up": {
@@ -1635,17 +1694,15 @@
} }
}, },
"node_modules/flat-cache": { "node_modules/flat-cache": {
"version": "4.0.1", "version": "6.1.23",
"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-6.1.23.tgz",
"integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", "integrity": "sha512-f++BY9pTk+983xK1FLzlLpmM0i0z+jHmx3QESGkURMXujQZz1k5wzwX6hjnQ8goaD0B+sYnDK1yZ6MTyZfUaqA==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"flatted": "^3.2.9", "cacheable": "^2.5.0",
"keyv": "^4.5.4" "flatted": "^3.4.2",
}, "hookified": "^1.15.0"
"engines": {
"node": ">=16"
} }
}, },
"node_modules/flatted": { "node_modules/flatted": {
@@ -1690,9 +1747,9 @@
} }
}, },
"node_modules/globals": { "node_modules/globals": {
"version": "17.11.0", "version": "17.12.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-17.11.0.tgz", "resolved": "https://registry.npmjs.org/globals/-/globals-17.12.0.tgz",
"integrity": "sha512-Z2I8hM+PbJDXQDq3Icgpzv+mPdwr68iZUU9d5WW4FuXfDUQfkZaZuvjMv42/5crNyw154+9+VWXbYrUgDXbxNw==", "integrity": "sha512-cezEd/DTyyht9cvSSURyygXPfy04GtWO/5e6ZPvH7fCtjKz9PYOmuawphw1Ctd1f6C+5JypXfGD7ahNMXvevBA==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"engines": { "engines": {
@@ -1702,6 +1759,26 @@
"url": "https://github.com/sponsors/sindresorhus" "url": "https://github.com/sponsors/sindresorhus"
} }
}, },
"node_modules/hashery": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/hashery/-/hashery-1.5.1.tgz",
"integrity": "sha512-iZyKG96/JwPz1N55vj2Ie2vXbhu440zfUfJvSwEqEbeLluk7NnapfGqa7LH0mOsnDxTF85Mx8/dyR6HfqcbmbQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"hookified": "^1.15.0"
},
"engines": {
"node": ">=20"
}
},
"node_modules/hookified": {
"version": "1.15.1",
"resolved": "https://registry.npmjs.org/hookified/-/hookified-1.15.1.tgz",
"integrity": "sha512-MvG/clsADq1GPM2KGo2nyfaWVyn9naPiXrqIe4jYjXNZQt238kWyOGrsyc/DmRAQ+Re6yeo6yX/yoNCG5KAEVg==",
"dev": true,
"license": "MIT"
},
"node_modules/ignore": { "node_modules/ignore": {
"version": "5.3.2", "version": "5.3.2",
"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
@@ -1770,13 +1847,6 @@
"dev": true, "dev": true,
"license": "ISC" "license": "ISC"
}, },
"node_modules/json-buffer": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
"integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
"dev": true,
"license": "MIT"
},
"node_modules/json-schema-traverse": { "node_modules/json-schema-traverse": {
"version": "0.4.1", "version": "0.4.1",
"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -1804,13 +1874,13 @@
"license": "ISC" "license": "ISC"
}, },
"node_modules/keyv": { "node_modules/keyv": {
"version": "4.5.4", "version": "5.6.0",
"resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.6.0.tgz",
"integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", "integrity": "sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"json-buffer": "3.0.1" "@keyv/serialize": "^1.1.1"
} }
}, },
"node_modules/levn": { "node_modules/levn": {
@@ -2138,9 +2208,9 @@
} }
}, },
"node_modules/maplibre-gl": { "node_modules/maplibre-gl": {
"version": "6.6.0", "version": "6.7.0",
"resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-6.6.0.tgz", "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-6.7.0.tgz",
"integrity": "sha512-EQql6eZYPhbHvJpqY4AwoiuLkUfXFRBHk67S8mDtzNo1F/jAo7xAxunIzO7gJ1vwTcPMgrK9b64dqKHvnkTlDQ==", "integrity": "sha512-Y1Q1+UP9WXou0DUrnaFdDsoMqiMCWy6aS968IBUaQ2eZi6H1/kPCfpfZOWXFJZbeKMkX9Wo6OFzY/k48qqPf3Q==",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"dependencies": { "dependencies": {
"@mapbox/point-geometry": "^1.1.0", "@mapbox/point-geometry": "^1.1.0",
@@ -2148,7 +2218,7 @@
"@mapbox/unitbezier": "^1.0.0", "@mapbox/unitbezier": "^1.0.0",
"@mapbox/vector-tile": "^3.0.0", "@mapbox/vector-tile": "^3.0.0",
"@maplibre/geojson-vt": "^6.1.1", "@maplibre/geojson-vt": "^6.1.1",
"@maplibre/maplibre-gl-style-spec": "^26.3.0", "@maplibre/maplibre-gl-style-spec": "^26.4.1",
"@maplibre/mlt": "^1.2.0", "@maplibre/mlt": "^1.2.0",
"@maplibre/vt-pbf": "^4.3.2", "@maplibre/vt-pbf": "^4.3.2",
"@types/geojson": "^7946.0.16", "@types/geojson": "^7946.0.16",
@@ -2414,9 +2484,9 @@
} }
}, },
"node_modules/postcss": { "node_modules/postcss": {
"version": "8.5.26", "version": "8.5.28",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.26.tgz", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.28.tgz",
"integrity": "sha512-u82N74LFzG8ca+dD8puPnplTXoGH4fTPpVGuIbt36G3qvNlkvfD0lEAZSxaly3KX8TS/L1A1gsCEmvKmBcVbkQ==", "integrity": "sha512-RRuzqDtt5Y9h3quz5hWhK+TPnsmVs6WwSU6LkJMeY4HstUEDuYTG8UJSdawMRzmzAtV+KEoG8N3Qg2qLy5vM/A==",
"funding": [ "funding": [
{ {
"type": "opencollective", "type": "opencollective",
@@ -2433,7 +2503,7 @@
], ],
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"nanoid": "^3.3.17", "nanoid": "^3.3.18",
"picocolors": "^1.1.1", "picocolors": "^1.1.1",
"source-map-js": "^1.2.1" "source-map-js": "^1.2.1"
}, },
@@ -2442,9 +2512,9 @@
} }
}, },
"node_modules/postcss-selector-parser": { "node_modules/postcss-selector-parser": {
"version": "7.1.5", "version": "7.1.6",
"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.5.tgz", "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.6.tgz",
"integrity": "sha512-KvvtD7SrlBP7dlgkBghEE3r84CABm5SmV2aNcG4oCA+qDnJ/tvKonFVvwWAyyWUEwxuNawdfEAZKP9zM3oZ2Uw==", "integrity": "sha512-7qASPzhKF2l2KLboRZux8CCTRMdGiV08vWmyKzPz22qZ7ZjQBOeY7rNzNoCLSUiftJ7HUq0GERHmxw/t0dCdMw==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
@@ -2523,6 +2593,26 @@
"node": ">=6" "node": ">=6"
} }
}, },
"node_modules/qified": {
"version": "0.10.1",
"resolved": "https://registry.npmjs.org/qified/-/qified-0.10.1.tgz",
"integrity": "sha512-+Owyggi9IxT1ePKGafcI87ubSmxol6smwJ+RAHDQlx9+9cPwFWDiKFFCPuWhr9ignlGpZ9vDQLw67N4dcTVFEA==",
"dev": true,
"license": "MIT",
"dependencies": {
"hookified": "^2.1.1"
},
"engines": {
"node": ">=20"
}
},
"node_modules/qified/node_modules/hookified": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/hookified/-/hookified-2.2.0.tgz",
"integrity": "sha512-p/LgFzRN5FeoD3DLS6bkUapeye6E4SI6yJs6KetENd18S+FBthqYq2amJUWpt5z0EQwwHemidjY5OqJGEKm5uA==",
"dev": true,
"license": "MIT"
},
"node_modules/quickselect": { "node_modules/quickselect": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/quickselect/-/quickselect-3.0.0.tgz", "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-3.0.0.tgz",
@@ -2561,13 +2651,13 @@
} }
}, },
"node_modules/rolldown": { "node_modules/rolldown": {
"version": "1.2.6", "version": "1.2.7",
"resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.6.tgz", "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.7.tgz",
"integrity": "sha512-vMM4q3aixf46GiF1Kok8jDPFsEpXgFWGjUHXNkNHNm+Y2adXAG2dbX91jkti3i0ZRsOlcmbuzAz1poObSHCmUA==", "integrity": "sha512-g0EtLvBjTUB7jhyV0S/TCup3v/XSVl45vUIGbOGU4QPiyjTenCe4mKuFvW9fEgYmS2Fo42AUssRmNuMziXdrig==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@oxc-project/types": "=0.147.0", "@oxc-project/types": "=0.148.0",
"@rolldown/pluginutils": "^1.0.0" "@rolldown/pluginutils": "^1.0.0"
}, },
"bin": { "bin": {
@@ -2577,27 +2667,27 @@
"node": "^20.19.0 || >=22.12.0" "node": "^20.19.0 || >=22.12.0"
}, },
"optionalDependencies": { "optionalDependencies": {
"@rolldown/binding-android-arm-eabi": "1.2.6", "@rolldown/binding-android-arm-eabi": "1.2.7",
"@rolldown/binding-android-arm64": "1.2.6", "@rolldown/binding-android-arm64": "1.2.7",
"@rolldown/binding-darwin-arm64": "1.2.6", "@rolldown/binding-darwin-arm64": "1.2.7",
"@rolldown/binding-darwin-x64": "1.2.6", "@rolldown/binding-darwin-x64": "1.2.7",
"@rolldown/binding-freebsd-x64": "1.2.6", "@rolldown/binding-freebsd-x64": "1.2.7",
"@rolldown/binding-linux-arm-gnueabihf": "1.2.6", "@rolldown/binding-linux-arm-gnueabihf": "1.2.7",
"@rolldown/binding-linux-arm64-gnu": "1.2.6", "@rolldown/binding-linux-arm64-gnu": "1.2.7",
"@rolldown/binding-linux-arm64-musl": "1.2.6", "@rolldown/binding-linux-arm64-musl": "1.2.7",
"@rolldown/binding-linux-ppc64-gnu": "1.2.6", "@rolldown/binding-linux-ppc64-gnu": "1.2.7",
"@rolldown/binding-linux-s390x-gnu": "1.2.6", "@rolldown/binding-linux-s390x-gnu": "1.2.7",
"@rolldown/binding-linux-x64-gnu": "1.2.6", "@rolldown/binding-linux-x64-gnu": "1.2.7",
"@rolldown/binding-linux-x64-musl": "1.2.6", "@rolldown/binding-linux-x64-musl": "1.2.7",
"@rolldown/binding-openharmony-arm64": "1.2.6", "@rolldown/binding-openharmony-arm64": "1.2.7",
"@rolldown/binding-win32-arm64-msvc": "1.2.6", "@rolldown/binding-win32-arm64-msvc": "1.2.7",
"@rolldown/binding-win32-x64-msvc": "1.2.6" "@rolldown/binding-win32-x64-msvc": "1.2.7"
} }
}, },
"node_modules/sass": { "node_modules/sass": {
"version": "1.103.1", "version": "1.104.0",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.103.1.tgz", "resolved": "https://registry.npmjs.org/sass/-/sass-1.104.0.tgz",
"integrity": "sha512-9icZURbP51S6S0QGoyaeqk9uB06GNWxsFYWfH5RgpFgqK5FA8tJcM3AdVxrZEVJ7dz+L87nG95gBKf4VuaMHGw==", "integrity": "sha512-btHMApW2bgolvClhRW8AlQJzgI9lUB3pPSofBQQT+E46GWvf9o0TVQ13SYv5riWZVFyPN+JNz3TKW9XhBlc10w==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"chokidar": "^5.0.0", "chokidar": "^5.0.0",
resources/lang/en.json
+2 -1
View File
@@ -120,7 +120,8 @@
"link_copied": "Link copied!", "link_copied": "Link copied!",
"message": "Message", "message": "Message",
"name": "Name", "name": "Name",
"new_message": "New message" "new_message": "New message",
"reply": "Reply to this message"
}, },
"project": { "project": {
"wip": "In progress", "wip": "In progress",
resources/lang/es.json
+2 -1
View File
@@ -120,7 +120,8 @@
"link_copied": "¡Enlace copiado!", "link_copied": "¡Enlace copiado!",
"message": "Mensaje", "message": "Mensaje",
"name": "Nombre", "name": "Nombre",
"new_message": "Mensaje nuevo" "new_message": "Mensaje nuevo",
"reply": "Responder a este mensaje"
}, },
"project": { "project": {
"wip": "En curso", "wip": "En curso",
resources/lang/fr.json
+2 -1
View File
@@ -120,7 +120,8 @@
"link_copied": "Lien copié !", "link_copied": "Lien copié !",
"message": "Message", "message": "Message",
"name": "Nom", "name": "Nom",
"new_message": "Nouveau message" "new_message": "Nouveau message",
"reply": "Répondre à ce message"
}, },
"project": { "project": {
"wip": "En cours", "wip": "En cours",
src/components/ProjectFeed.vue
+8 -3
View File
@@ -35,7 +35,9 @@ export default {
return { return {
feed: { feed: {
checkNewFeed: this.checkNewFeed, checkNewFeed: this.checkNewFeed,
toggle: this.toggle toggle: this.toggle,
reply: this.reply,
findLinkedPost: this.findLinkedPost
} }
}; };
}, },
@@ -90,7 +92,7 @@ export default {
getScrollElement() { getScrollElement() {
return this.$refs.feedSimpleBar?.scrollElement; return this.$refs.feedSimpleBar?.scrollElement;
}, },
async findLinkedPost(sPostType, iPostId, pMapIsReady) { async findLinkedPost(sPostType, iPostId, pMapIsReady=Promise.resolve()) {
let vPost = await this.findPost(sPostType, iPostId, true); let vPost = await this.findPost(sPostType, iPostId, true);
if(vPost) { if(vPost) {
await pMapIsReady; await pMapIsReady;
@@ -206,6 +208,9 @@ export default {
if(aoMarkers.length > 0) this.$emit('new-markers', aoMarkers); if(aoMarkers.length > 0) this.$emit('new-markers', aoMarkers);
this.$emit('request-last-update'); this.$emit('request-last-update');
}, },
reply(oQuote) {
this.$refs.poster?.addQuote(oQuote);
},
toggle(bShow, iAnimDuration=500) { toggle(bShow, iAnimDuration=500) {
this.isOpen = (typeof bShow == 'boolean')?bShow:(!this.isOpen); this.isOpen = (typeof bShow == 'boolean')?bShow:(!this.isOpen);
this.$emit('toggle', this.isOpen, iAnimDuration); this.$emit('toggle', this.isOpen, iAnimDuration);
@@ -223,7 +228,7 @@ export default {
<Simplebar id="feed-panel" class="panel-content" ref="feedSimpleBar" :aria-busy="loading"> <Simplebar id="feed-panel" class="panel-content" ref="feedSimpleBar" :aria-busy="loading">
<div id="feed-header"> <div id="feed-header">
<ProjectPost v-if="modeHisto" :options="{type: 'archived', headerless: true}" /> <ProjectPost v-if="modeHisto" :options="{type: 'archived', headerless: true}" />
<ProjectPost v-else :options="{type: 'poster', relative_time: lang.get('post.new_message')}" /> <ProjectPost v-else :options="{type: 'poster', relative_time: lang.get('post.new_message')}" ref="poster" />
</div> </div>
<div v-if="project" v-show="!loadingPost" id="feed-posts"> <div v-if="project" v-show="!loadingPost" id="feed-posts">
<ProjectPost v-for="post in posts" :key="post.ref" :options="post" ref="posts" /> <ProjectPost v-for="post in posts" :key="post.ref" :options="post" ref="posts" />
src/components/ProjectPost.vue
+68 -8
View File
@@ -5,6 +5,8 @@
import projectMediaLink from '@components/ProjectMediaLink'; import projectMediaLink from '@components/ProjectMediaLink';
import projectMapLink from '@components/ProjectMapLink'; import projectMapLink from '@components/ProjectMapLink';
import projectRelTime from '@components/ProjectRelTime'; import projectRelTime from '@components/ProjectRelTime';
import projectPostQuote from '@components/ProjectPostQuote';
import projectPostSignature from '@components/ProjectPostSignature';
import { LngLat } from 'maplibre-gl'; import { LngLat } from 'maplibre-gl';
import { copyTextToClipboard } from '@scripts/common'; import { copyTextToClipboard } from '@scripts/common';
@@ -17,7 +19,9 @@
appButton, appButton,
projectMediaLink, projectMediaLink,
projectMapLink, projectMapLink,
projectRelTime projectRelTime,
projectPostQuote,
projectPostSignature
}, },
props: { props: {
options: Object options: Object
@@ -31,9 +35,11 @@
anchorVisible: ['message', 'media', 'post'].includes(this.options.type), anchorVisible: ['message', 'media', 'post'].includes(this.options.type),
anchorTitle: this.lang.get('post.copy_to_clipboard'), anchorTitle: this.lang.get('post.copy_to_clipboard'),
anchorIcon: 'link', anchorIcon: 'link',
replyTitle: this.lang.get('post.reply'),
popupRequested: false, popupRequested: false,
mouseOverDrill: false, mouseOverDrill: false,
postMessage: '', postMessage: '',
quote: null,
sending: false, sending: false,
focusZoomLevel: 15 focusZoomLevel: 15
}; };
@@ -65,8 +71,13 @@
modeHisto() { modeHisto() {
return (this.project?.project?.mode == this.consts.modes.histo); return (this.project?.project?.mode == this.consts.modes.histo);
}, },
replyVisible() {
return this.anchorVisible && !this.modeHisto;
},
relTime() { relTime() {
return this.modeHisto?(this.options.formatted_time || '').substr(0, 10):this.options.relative_time; return this.modeHisto?
(this.options.formatted_time || '').substr(0, 10):
this.options.relative_time;
}, },
relatedMarker() { relatedMarker() {
//Find corresponding marker //Find corresponding marker
@@ -88,9 +99,54 @@
}, },
messageLines() { messageLines() {
return (this.options.content || '').split('\n'); return (this.options.content || '').split('\n');
},
quoteRef() {
return this.options.ref_item?this.buildQuote(this.options.ref_item):null;
} }
}, },
methods: { methods: {
buildQuote(oItem) {
let sContent = '', sImage = null;
switch(oItem.type) {
case 'post':
sContent = oItem.content || '';
break;
case 'media':
sContent = oItem.comment || this.lang.get('media.posted_on', oItem.posted_on_formatted_time);
sImage = oItem.thumb_path;
break;
case 'message':
sContent = oItem.lat_dms+' '+oItem.lon_dms;
sImage = oItem.static_img_url;
break;
}
return {
type: oItem.type,
id: oItem.id,
author: oItem.formatted_name || '',
gravatar: oItem.gravatar || null,
content: sContent,
image: sImage
};
},
reply() {
this.feed.reply(this.buildQuote(this.options));
},
goToQuote() {
if(this.quoteRef) this.feed.findLinkedPost(this.quoteRef.type, this.quoteRef.id);
},
addQuote(oQuote) {
this.quote = oQuote;
this.$nextTick(() => {
this.$refs.post.focus();
});
},
formatQuote(oQuote) {
return (oQuote.author?oQuote.author+':\n':'')
+ oQuote.content.split('\n').map((sLine) => '> '+sLine).join('\n');
},
copyAnchor() { copyAnchor() {
copyTextToClipboard(this.consts.server+this.anchorLink); copyTextToClipboard(this.consts.server+this.anchorLink);
this.anchorTitle = this.lang.get('post.link_copied'); this.anchorTitle = this.lang.get('post.link_copied');
@@ -138,11 +194,14 @@
{ {
id_project: this.project.project.id, id_project: this.project.project.id,
name: this.user.name, name: this.user.name,
content: this.postMessage content: this.postMessage,
ref_type: this.quote?.type || '',
ref_id: this.quote?.id || 0
} }
) )
.then(() => { .then(() => {
this.postMessage = ''; this.postMessage = '';
this.quote = null;
this.feed.checkNewFeed(); this.feed.checkNewFeed();
this.sending = false; this.sending = false;
}) })
@@ -176,6 +235,9 @@
<div class="header" v-if="!options.headerless"> <div class="header" v-if="!options.headerless">
<div class="index"> <div class="index">
<appIcon :icon="subType" :text="displayedId" width="auto" /> <appIcon :icon="subType" :text="displayedId" width="auto" />
<a v-if="replyVisible" class="reply clickable" @click="reply" :title="replyTitle">
<appIcon :icon="'reply'" />
</a>
<a v-if="anchorVisible" class="link desktop" @click="copyAnchor" ref="anchor" :href="anchorLink" :title="anchorTitle"> <a v-if="anchorVisible" class="link desktop" @click="copyAnchor" ref="anchor" :href="anchorLink" :title="anchorTitle">
<appIcon :icon="anchorIcon" /> <appIcon :icon="anchorIcon" />
</a> </a>
@@ -210,16 +272,14 @@
<projectMediaLink :options="options" :type="'post'" ref="medialink" @opening-lightbox="panMapToMarker" /> <projectMediaLink :options="options" :type="'post'" ref="medialink" @opening-lightbox="panMapToMarker" />
</div> </div>
<template v-else-if="options.type == 'post'"> <template v-else-if="options.type == 'post'">
<projectPostQuote v-if="quoteRef" :quote="quoteRef" class="clickable" @click="goToQuote" />
<div class="message"> <div class="message">
<p v-for="(sLine, iIndex) in messageLines" :key="iIndex">{{ sLine }}</p> <p v-for="(sLine, iIndex) in messageLines" :key="iIndex">{{ sLine }}</p>
</div> </div>
<div class="signature"> <projectPostSignature :name="options.formatted_name" :gravatar="options.gravatar" />
<img v-if="options.gravatar" :src="'data:image/png;base64, '+options.gravatar" width="24" height="24" alt="--" />
<span v-else>-- </span>
<span>{{ options.formatted_name }}</span>
</div>
</template> </template>
<div v-else-if="options.type == 'poster'" class="poster-form"> <div v-else-if="options.type == 'poster'" class="poster-form">
<projectPostQuote v-if="quote" :quote="quote" />
<textarea ref="post" name="post" :placeholder="lang.get('post.message')" class="autoExpand" rows="1" v-model="postMessage"></textarea> <textarea ref="post" name="post" :placeholder="lang.get('post.message')" class="autoExpand" rows="1" v-model="postMessage"></textarea>
<div class="poster-actions"> <div class="poster-actions">
<input type="text" name="name" :placeholder="lang.get('post.name')" v-model="user.name" /> <input type="text" name="name" :placeholder="lang.get('post.name')" v-model="user.name" />
src/components/ProjectPostQuote.vue
+22
View File
@@ -0,0 +1,22 @@
<script>
import projectPostSignature from '@components/ProjectPostSignature';
export default {
components: {
projectPostSignature
},
props: {
quote: Object
}
};
</script>
<template>
<div :class="'quote '+quote.type">
<img v-if="quote.image" class="image" :src="quote.image" />
<div class="text">
<p class="content">{{ quote.content }}</p>
<projectPostSignature v-if="quote.author" :name="quote.author" :gravatar="quote.gravatar" />
</div>
</div>
</template>
src/components/ProjectPostSignature.vue
+29
View File
@@ -0,0 +1,29 @@
<script>
export default {
props: {
name: String,
gravatar: String
}
};
</script>
<template>
<div class="signature">
<img v-if="gravatar" :src="'data:image/png;base64, '+gravatar" width="24" height="24" alt="--" />
<span v-else>-- </span>
<span>{{ name }}</span>
</div>
</template>
<style scoped>
.signature {
text-align: right;
font-style: italic;
img {
vertical-align: baseline;
margin: 0 0.2em calc((1em - 24px)/2) 0;
position: relative;
}
}
</style>
src/scripts/icons.js
+2
View File
@@ -45,6 +45,7 @@ import {
faPersonHiking, faPersonHiking,
faPhotoFilm, faPhotoFilm,
faPlus, faPlus,
faReply,
faScrewdriverWrench, faScrewdriverWrench,
faShoePrints, faShoePrints,
faSun, faSun,
@@ -134,6 +135,7 @@ const ICONS = {
'image-shot': faCamera, 'image-shot': faCamera,
link: faLink, link: faLink,
copied: faCheck, copied: faCheck,
reply: faReply,
'find-me-spot': findMeSpot, 'find-me-spot': findMeSpot,
/* Feed - Poster */ /* Feed - Poster */
src/styles/_page.project.panel.feed.scss
+65 -14
View File
@@ -4,6 +4,66 @@
#feed { #feed {
#feed-panel { #feed-panel {
.quote {
display: flex;
align-items: center;
gap: var.$elem-spacing;
padding: var.$elem-spacing;
border-radius: var.$block-radius;
border-left-width: var.$border-thick;
border-left-style: solid;
font-size: 0.9em;
box-shadow: var.$elem-shadow;
&.post {
border-left-color: color.$post;
background: color.$post-bg;
color: color.$post;
}
&.message {
border-left-color: color.$message;
background: color.$message-bg;
color: color.$message;
}
&.media {
border-left-color: color.$media;
background: color.$media-bg;
color: color.$media;
}
.image {
flex: 0 0 auto;
width: 3 * var.$block-spacing;
height: 3 * var.$block-spacing;
object-fit: cover;
border-radius: var.$block-radius;
}
.text {
flex: 1 1 auto;
min-width: 0;
display: flex;
flex-direction: column;
gap: var.$text-spacing;
.content {
margin: 0;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 3;
line-clamp: 3;
overflow: hidden;
text-overflow: ellipsis;
}
img {
transform: scaleX(90%) scaleY(90%);
}
}
}
#feed-header { #feed-header {
.poster { .poster {
.poster-form { .poster-form {
@@ -70,7 +130,7 @@
gap: var.$elem-spacing; gap: var.$elem-spacing;
flex: 0 0 auto; flex: 0 0 auto;
.link { .link, .reply {
padding: 0; padding: 0;
line-height: 1; line-height: 1;
} }
@@ -203,7 +263,10 @@
&.post { &.post {
.body { .body {
padding: 0 var.$block-spacing var.$elem-spacing; display: flex;
flex-direction: column;
gap: var.$elem-spacing;
padding-bottom: var.$elem-spacing;
.message p { .message p {
margin: 0; margin: 0;
@@ -212,18 +275,6 @@
margin-top: var.$text-spacing; margin-top: var.$text-spacing;
} }
} }
.signature {
margin-top: var.$elem-spacing;
text-align: right;
font-style: italic;
img {
vertical-align: baseline;
margin: 0 0.2em calc((1em - 24px)/2) 0;
position: relative;
}
}
} }
} }
src/styles/_var.scss
+5 -1
View File
@@ -14,4 +14,8 @@ $elem-shadow: 0px 1px 1px color.$over-img-shadow;
//Transitions //Transitions
$trans-quick: 200ms; $trans-quick: 200ms;
$trans-slow: 500ms; $trans-slow: 500ms;
$zoom-scale: 1.15; $zoom-scale: 1.15;
//Border
$border-thin: 1px;
$border-thick: 3px;