hash
stringlengths 40
40
| date
stringdate 2019-01-09 10:33:03
2025-03-20 13:22:32
| author
stringclasses 20
values | commit_message
stringlengths 16
236
| is_merge
bool 1
class | masked_commit_message
stringlengths 8
226
| type
stringclasses 23
values | git_diff
stringlengths 114
6.6M
⌀ |
|---|---|---|---|---|---|---|---|
65648450a4be9ffbf4f1b4a15f5a4e984daef9e4
|
2019-05-21 15:24:39
|
Michael Mayer
|
frontend: Add global clipboard for photo selection #15
| false
|
Add global clipboard for photo selection #15
|
frontend
|
diff --git a/frontend/src/app.js b/frontend/src/app.js
index 478eb8093a0..f6f0d1423c1 100644
--- a/frontend/src/app.js
+++ b/frontend/src/app.js
@@ -5,6 +5,7 @@ import PhotoPrism from "photoprism.vue";
import Routes from "routes";
import Api from "common/api";
import Config from "common/config";
+import Clipboard from "common/clipboard";
import Components from "component/register";
import Maps from "maps/register";
import Alert from "common/alert";
@@ -16,17 +17,20 @@ import InfiniteScroll from "vue-infinite-scroll";
import VueTruncate from "vue-truncate-filter";
import VueFullscreen from "vue-fullscreen";
-// Initialize client-side session
+// Initialize helpers
const session = new Session(window.localStorage);
const config = new Config(window.localStorage, window.appConfig);
+const viewer = new Viewer();
+const clipboard = new Clipboard(window.localStorage, "photo_clipboard");
-// Set global helpers
+// Assign helpers to VueJS prototype
Vue.prototype.$event = Event;
Vue.prototype.$alert = Alert;
-Vue.prototype.$viewer = new Viewer;
+Vue.prototype.$viewer = viewer;
Vue.prototype.$session = session;
Vue.prototype.$api = Api;
Vue.prototype.$config = config;
+Vue.prototype.$clipboard = clipboard;
// Register Vuetify
Vue.use(Vuetify, {
diff --git a/frontend/src/common/clipboard.js b/frontend/src/common/clipboard.js
new file mode 100644
index 00000000000..3188d8cb65e
--- /dev/null
+++ b/frontend/src/common/clipboard.js
@@ -0,0 +1,105 @@
+class Clipboard {
+ /**
+ * @param {Storage} storage
+ * @param {string} key
+ */
+ constructor(storage, key) {
+ this.storageKey = key ? key : "clipboard";
+
+ this.storage = storage;
+ this.selectionMap = {};
+ this.selection = [];
+
+ this.loadFromStorage();
+ }
+
+ loadFromStorage() {
+ const photosJson = this.storage.getItem(this.storageKey);
+
+ if (photosJson !== null && typeof photosJson !== "undefined") {
+ this.setIds(JSON.parse(photosJson));
+ }
+ }
+
+ saveToStorage() {
+ this.storage.setItem(this.storageKey, JSON.stringify(this.selection));
+ }
+
+ toggle(model) {
+ const id = model.getId();
+ this.toggleId(id);
+ }
+
+ toggleId(id) {
+ const index = this.selection.indexOf(id);
+
+ if (index === -1) {
+ this.selection.push(id);
+ this.selectionMap["id:" + id] = true;
+ } else {
+ this.selection.splice(index, 1);
+ delete this.selectionMap["id:" + id];
+ }
+
+ this.saveToStorage();
+ }
+
+ add(model) {
+ const id = model.getId();
+
+ this.addId(id);
+ }
+
+ addId(id) {
+ if (this.hasId(id)) return;
+
+ this.selection.push(id);
+ this.selectionMap["id:" + id] = true;
+
+ this.saveToStorage();
+ }
+
+ has(model) {
+ return this.hasId(model.getId())
+ }
+
+ hasId(id) {
+ return typeof this.selectionMap["id:" + id] !== "undefined";
+ }
+
+ remove(model) {
+ const id = model.getId();
+
+ if (!this.hasId(id)) return;
+
+ const index = this.selection.indexOf(id);
+
+ this.selection.splice(index, 1);
+ delete this.selectionMap["id:" + id];
+
+ this.saveToStorage();
+ }
+
+ getIds() {
+ return this.selection;
+ }
+
+ setIds(ids) {
+ if (!Array.isArray(ids)) return;
+
+ this.selection = ids;
+ this.selectionMap = {};
+
+ for (let i = 0; i < this.selection.length; i++) {
+ this.selectionMap["id:" + this.selection[i]] = true;
+ }
+ }
+
+ clear() {
+ this.selectionMap = {};
+ this.selection.splice(0, this.selection.length);
+ this.storage.removeItem(this.storageKey);
+ }
+}
+
+export default Clipboard;
diff --git a/frontend/src/component/p-photo-details.vue b/frontend/src/component/p-photo-details.vue
index 8619ad764ad..10f387d0220 100644
--- a/frontend/src/component/p-photo-details.vue
+++ b/frontend/src/component/p-photo-details.vue
@@ -17,12 +17,12 @@
>
<v-hover>
<v-card tile slot-scope="{ hover }"
- :dark="selection.includes(photo.ID)"
- :class="selection.includes(photo.ID) ? 'elevation-15 ma-1' : 'elevation-2 ma-2'">
+ :dark="$clipboard.has(photo)"
+ :class="$clipboard.has(photo) ? 'elevation-15 ma-1' : 'elevation-2 ma-2'">
<v-img
:src="photo.getThumbnailUrl('tile_500')"
aspect-ratio="1"
- v-bind:class="{ selected: selection.includes(photo.ID) }"
+ v-bind:class="{ selected: $clipboard.has(photo) }"
style="cursor: pointer"
class="grey lighten-2"
@click="open(index)"
@@ -38,11 +38,11 @@
<v-progress-circular indeterminate color="grey lighten-5"></v-progress-circular>
</v-layout>
- <v-btn v-if="hover || selection.includes(photo.ID)" :flat="!hover" :ripple="false"
+ <v-btn v-if="hover || $clipboard.has(photo)" :flat="!hover" :ripple="false"
icon large absolute
class="p-photo-select"
@click.stop.prevent="select(photo)">
- <v-icon v-if="selection.length && selection.includes(photo.ID)" color="white">check_circle</v-icon>
+ <v-icon v-if="selection.length && $clipboard.has(photo)" color="white">check_circle</v-icon>
<v-icon v-else color="grey lighten-3">radio_button_off</v-icon>
</v-btn>
diff --git a/frontend/src/component/p-photo-list.vue b/frontend/src/component/p-photo-list.vue
index 1b4e972a1b7..d445526396f 100644
--- a/frontend/src/component/p-photo-list.vue
+++ b/frontend/src/component/p-photo-list.vue
@@ -14,8 +14,8 @@
<v-btn icon small :ripple="false"
class="p-photo-select"
@click.stop.prevent="select(props.item)">
- <v-icon v-if="selection.length && selection.includes(props.item.ID)" color="grey darken-2">check_circle</v-icon>
- <v-icon v-else-if="!selection.includes(props.item.ID)" color="grey lighten-4">radio_button_off</v-icon>
+ <v-icon v-if="selection.length && $clipboard.has(props.item)" color="grey darken-2">check_circle</v-icon>
+ <v-icon v-else-if="!$clipboard.has(props.item)" color="grey lighten-4">radio_button_off</v-icon>
</v-btn>
</td>
<td @click="open(props.index)" class="p-pointer">{{ props.item.PhotoTitle }}</td>
diff --git a/frontend/src/component/p-photo-mosaic.vue b/frontend/src/component/p-photo-mosaic.vue
index 83bab432c57..9711dfd0f42 100644
--- a/frontend/src/component/p-photo-mosaic.vue
+++ b/frontend/src/component/p-photo-mosaic.vue
@@ -12,13 +12,13 @@
<v-flex
v-for="(photo, index) in photos"
:key="index"
- v-bind:class="{ selected: selection.includes(photo.ID) }"
+ v-bind:class="{ selected: $clipboard.has(photo) }"
class="p-photo"
xs4 sm3 md2 lg1 d-flex
>
<v-hover>
<v-card tile slot-scope="{ hover }"
- :class="selection.includes(photo.ID) ? 'elevation-15 ma-1' : hover ? 'elevation-6 ma-2' : 'elevation-2 ma-2'">
+ :class="$clipboard.has(photo) ? 'elevation-15 ma-1' : hover ? 'elevation-6 ma-2' : 'elevation-2 ma-2'">
<v-img :src="photo.getThumbnailUrl('tile_224')"
aspect-ratio="1"
class="grey lighten-2"
@@ -36,11 +36,11 @@
color="grey lighten-5"></v-progress-circular>
</v-layout>
- <v-btn v-if="hover || selection.includes(photo.ID)" :flat="!hover" :ripple="false"
+ <v-btn v-if="hover || $clipboard.has(photo)" :flat="!hover" :ripple="false"
icon small absolute
class="p-photo-select"
@click.stop.prevent="select(photo)">
- <v-icon v-if="selection.length && selection.includes(photo.ID)" color="white">check_circle</v-icon>
+ <v-icon v-if="selection.length && $clipboard.has(photo)" color="white">check_circle</v-icon>
<v-icon v-else color="grey lighten-3">radio_button_off</v-icon>
</v-btn>
diff --git a/frontend/src/component/p-photo-tiles.vue b/frontend/src/component/p-photo-tiles.vue
index 5ca364e7ae4..78bea3b0895 100644
--- a/frontend/src/component/p-photo-tiles.vue
+++ b/frontend/src/component/p-photo-tiles.vue
@@ -12,13 +12,13 @@
<v-flex
v-for="(photo, index) in photos"
:key="index"
- v-bind:class="{ selected: selection.includes(photo.ID) }"
+ v-bind:class="{ selected: $clipboard.has(photo) }"
class="p-photo"
xs12 sm6 md3 lg2 d-flex
>
<v-hover>
<v-card tile slot-scope="{ hover }"
- :class="selection.includes(photo.ID) ? 'elevation-15 ma-1' : hover ? 'elevation-6 ma-2' : 'elevation-2 ma-2'">
+ :class="$clipboard.has(photo) ? 'elevation-15 ma-1' : hover ? 'elevation-6 ma-2' : 'elevation-2 ma-2'">
<v-img :src="photo.getThumbnailUrl('tile_500')"
aspect-ratio="1"
class="grey lighten-2"
@@ -36,12 +36,12 @@
color="grey lighten-5"></v-progress-circular>
</v-layout>
- <v-btn v-if="hover || selection.includes(photo.ID)" :flat="!hover" :ripple="false"
+ <v-btn v-if="hover || $clipboard.has(photo)" :flat="!hover" :ripple="false"
icon large absolute
class="p-photo-select"
@click.stop.prevent="select(photo)">
- <v-icon v-if="selection.length && selection.includes(photo.ID)" color="white">check_circle</v-icon>
- <v-icon v-else-if="!selection.includes(photo.ID)" color="grey lighten-3">radio_button_off</v-icon>
+ <v-icon v-if="selection.length && $clipboard.has(photo)" color="white">check_circle</v-icon>
+ <v-icon v-else-if="!$clipboard.has(photo)" color="grey lighten-3">radio_button_off</v-icon>
</v-btn>
<v-btn v-if="hover || photo.PhotoFavorite" :flat="!hover" :ripple="false"
diff --git a/frontend/src/model/abstract.js b/frontend/src/model/abstract.js
index f1f43432dbc..8b4736c34b3 100644
--- a/frontend/src/model/abstract.js
+++ b/frontend/src/model/abstract.js
@@ -36,7 +36,7 @@ class Abstract {
}
getId() {
- return this.id;
+ return this.ID;
}
hasId() {
diff --git a/frontend/src/model/user.js b/frontend/src/model/user.js
index c675df5a6f0..3f45db7c60c 100644
--- a/frontend/src/model/user.js
+++ b/frontend/src/model/user.js
@@ -8,7 +8,7 @@ class User extends Abstract {
}
getId() {
- return this.userId;
+ return this.ID;
}
getRegisterForm() {
diff --git a/frontend/src/pages/photos.vue b/frontend/src/pages/photos.vue
index a132266d85a..04159c37a81 100644
--- a/frontend/src/pages/photos.vue
+++ b/frontend/src/pages/photos.vue
@@ -189,7 +189,7 @@
'loadMoreDisabled': true,
'menuVisible': false,
'results': [],
- 'selected': [],
+ 'selected': this.$clipboard.selection,
'view': view,
'pageSize': 60,
'offset': 0,
@@ -252,13 +252,7 @@
this.menuVisible = false;
},
selectPhoto(photo) {
- const index = this.selected.indexOf(photo.ID);
-
- if (index === -1) {
- this.selected.push(photo.ID);
- } else {
- this.selected.splice(index, 1);
- }
+ this.$clipboard.toggle(photo);
},
likePhoto(photo) {
photo.PhotoFavorite = !photo.PhotoFavorite;
|
d0cb7c59e1d0d718467c0bbb921df5ae05cabe65
|
2021-01-18 23:51:43
|
Michael Mayer
|
ux: Improve item selection and icons
| false
|
Improve item selection and icons
|
ux
|
diff --git a/frontend/src/app.js b/frontend/src/app.js
index 17fe75e1313..69e90393bda 100644
--- a/frontend/src/app.js
+++ b/frontend/src/app.js
@@ -34,6 +34,7 @@ import Api from "common/api";
import Notify from "common/notify";
import Clipboard from "common/clipboard";
import Components from "component/components";
+import icons from "component/icons";
import Dialogs from "dialog/dialogs";
import Event from "pubsub-js";
import GetTextPlugin from "vue-gettext";
@@ -70,6 +71,9 @@ Settings.defaultLocale = Vue.config.language.substring(0, 2);
const languages = options.Languages();
const rtl = languages.some((lang) => lang.value === Vue.config.language && lang.rtl);
+// Get initial theme colors from config
+const theme = config.theme.colors;
+
// HTTP Live Streaming (video support)
window.Hls = Hls;
@@ -87,7 +91,7 @@ Vue.prototype.$isMobile = isMobile;
Vue.prototype.$rtl = rtl;
// Register Vuetify
-Vue.use(Vuetify, { rtl, theme: config.theme.colors });
+Vue.use(Vuetify, { rtl, icons, theme });
// Register other VueJS plugins
Vue.use(GetTextPlugin, {
diff --git a/frontend/src/component/album/icon.vue b/frontend/src/component/icon/album.vue
similarity index 100%
rename from frontend/src/component/album/icon.vue
rename to frontend/src/component/icon/album.vue
diff --git a/frontend/src/component/icon/live_photo.vue b/frontend/src/component/icon/live_photo.vue
new file mode 100644
index 00000000000..f4b213e3205
--- /dev/null
+++ b/frontend/src/component/icon/live_photo.vue
@@ -0,0 +1,91 @@
+<template>
+ <svg
+ width="24"
+ height="24"
+ viewBox="0 0 24 24"
+ fill="none"
+ xmlns="http://www.w3.org/2000/svg"
+ >
+ <path
+ d="M12.9805 21.9525C12.6579 21.9839 12.3308 22 12 22C11.6692 22 11.3421 21.9839 11.0194 21.9525L11.2132 19.9619C11.4715 19.9871 11.7339 20 12 20C12.2661 20 12.5285 19.9871 12.7868 19.9619L12.9805 21.9525Z"
+ fill="currentColor"
+ />
+ <path
+ d="M9.09617 21.5719L9.67608 19.6578C9.17124 19.5048 8.68725 19.3031 8.22951 19.058L7.28519 20.821C7.8578 21.1277 8.46374 21.3803 9.09617 21.5719Z"
+ fill="currentColor"
+ />
+ <path
+ d="M5.65597 19.7304L6.92562 18.1851C6.5202 17.852 6.14801 17.4798 5.81491 17.0744L4.2696 18.344C4.68539 18.8501 5.1499 19.3146 5.65597 19.7304Z"
+ fill="currentColor"
+ />
+ <path
+ d="M3.17901 16.7148L4.94204 15.7705C4.69686 15.3127 4.49516 14.8288 4.34221 14.3239L2.42813 14.9038C2.61974 15.5363 2.87231 16.1422 3.17901 16.7148Z"
+ fill="currentColor"
+ />
+ <path
+ d="M2.04746 12.9805L4.03806 12.7868C4.01292 12.5285 4 12.2661 4 12C4 11.7339 4.01292 11.4715 4.03806 11.2132L2.04746 11.0195C2.01607 11.3421 2 11.6692 2 12C2 12.3308 2.01607 12.6579 2.04746 12.9805Z"
+ fill="currentColor"
+ />
+ <path
+ d="M2.42813 9.09617L4.34221 9.67608C4.49517 9.17124 4.69686 8.68725 4.94204 8.22951L3.17901 7.28519C2.87231 7.8578 2.61974 8.46374 2.42813 9.09617Z"
+ fill="currentColor"
+ />
+ <path
+ d="M4.2696 5.65597L5.81491 6.92562C6.14801 6.5202 6.5202 6.14801 6.92562 5.81491L5.65597 4.2696C5.14991 4.68539 4.68539 5.1499 4.2696 5.65597Z"
+ fill="currentColor"
+ />
+ <path
+ d="M7.2852 3.17901L8.22951 4.94204C8.68726 4.69686 9.17124 4.49516 9.67608 4.34221L9.09617 2.42813C8.46374 2.61974 7.8578 2.87231 7.2852 3.17901Z"
+ fill="currentColor"
+ />
+ <path
+ d="M11.0195 2.04746C11.3421 2.01607 11.6692 2 12 2C12.3308 2 12.6579 2.01607 12.9805 2.04746L12.7868 4.03806C12.5285 4.01292 12.2661 4 12 4C11.7339 4 11.4715 4.01292 11.2132 4.03806L11.0195 2.04746Z"
+ fill="currentColor"
+ />
+ <path
+ d="M14.9038 2.42813L14.3239 4.34221C14.8288 4.49517 15.3127 4.69686 15.7705 4.94204L16.7148 3.17901C16.1422 2.87231 15.5363 2.61974 14.9038 2.42813Z"
+ fill="currentColor"
+ />
+ <path
+ d="M18.344 4.2696L17.0744 5.81491C17.4798 6.14801 17.852 6.5202 18.1851 6.92562L19.7304 5.65597C19.3146 5.14991 18.8501 4.68539 18.344 4.2696Z"
+ fill="currentColor"
+ />
+ <path
+ d="M20.821 7.2852L19.058 8.22951C19.3031 8.68726 19.5048 9.17124 19.6578 9.67608L21.5719 9.09617C21.3803 8.46374 21.1277 7.8578 20.821 7.2852Z"
+ fill="currentColor"
+ />
+ <path
+ d="M21.9525 11.0195L19.9619 11.2132C19.9871 11.4715 20 11.7339 20 12C20 12.2661 19.9871 12.5285 19.9619 12.7868L21.9525 12.9806C21.9839 12.6579 22 12.3308 22 12C22 11.6692 21.9839 11.3421 21.9525 11.0195Z"
+ fill="currentColor"
+ />
+ <path
+ d="M21.5719 14.9038L19.6578 14.3239C19.5048 14.8288 19.3031 15.3127 19.058 15.7705L20.821 16.7148C21.1277 16.1422 21.3803 15.5363 21.5719 14.9038Z"
+ fill="currentColor"
+ />
+ <path
+ d="M19.7304 18.344L18.1851 17.0744C17.852 17.4798 17.4798 17.852 17.0744 18.1851L18.344 19.7304C18.8501 19.3146 19.3146 18.8501 19.7304 18.344Z"
+ fill="currentColor"
+ />
+ <path
+ d="M16.7148 20.821L15.7705 19.058C15.3127 19.3031 14.8288 19.5048 14.3239 19.6578L14.9038 21.5719C15.5363 21.3803 16.1422 21.1277 16.7148 20.821Z"
+ fill="currentColor"
+ />
+ <path
+ fill-rule="evenodd"
+ clip-rule="evenodd"
+ d="M9 12C9 10.3431 10.3431 9 12 9C13.6569 9 15 10.3431 15 12C15 13.6569 13.6569 15 12 15C10.3431 15 9 13.6569 9 12ZM12 13C11.4477 13 11 12.5523 11 12C11 11.4477 11.4477 11 12 11C12.5523 11 13 11.4477 13 12C13 12.5523 12.5523 13 12 13Z"
+ fill="currentColor"
+ />
+ <path
+ fill-rule="evenodd"
+ clip-rule="evenodd"
+ d="M12 6C8.68629 6 6 8.68629 6 12C6 15.3137 8.68629 18 12 18C15.3137 18 18 15.3137 18 12C18 8.68629 15.3137 6 12 6ZM8 12C8 14.2091 9.79086 16 12 16C14.2091 16 16 14.2091 16 12C16 9.79086 14.2091 8 12 8C9.79086 8 8 9.79086 8 12Z"
+ fill="currentColor"
+ />
+ </svg>
+</template>
+<script>
+export default {
+ name: "IconLivePhoto",
+};
+</script>
diff --git a/frontend/src/component/icons.js b/frontend/src/component/icons.js
new file mode 100644
index 00000000000..6bef08d6269
--- /dev/null
+++ b/frontend/src/component/icons.js
@@ -0,0 +1,42 @@
+/*
+
+Copyright (c) 2018 - 2021 Michael Mayer <[email protected]>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+ PhotoPrism® is a registered trademark of Michael Mayer. You may use it as required
+ to describe our software, run your own server, for educational purposes, but not for
+ offering commercial goods, products, or services without prior written permission.
+ In other words, please ask.
+
+Feel free to send an e-mail to [email protected] if you have questions,
+want to support our work, or just want to say hello.
+
+Additional information can be found in our Developer Guide:
+https://docs.photoprism.org/developer-guide/
+
+*/
+
+import IconLivePhoto from "./icon/live_photo.vue";
+
+const icons = {
+ live_photo: {
+ component: IconLivePhoto,
+ props: {
+ name: "live_photo",
+ },
+ },
+};
+
+export default icons;
diff --git a/frontend/src/component/photo/cards.vue b/frontend/src/component/photo/cards.vue
index 7e82f9d8866..75048b7d38e 100644
--- a/frontend/src/component/photo/cards.vue
+++ b/frontend/src/component/photo/cards.vue
@@ -19,7 +19,7 @@
</div>
</v-card-title>
</v-card>
- <v-layout row wrap class="search-results photo-results cards-view">
+ <v-layout row wrap class="search-results photo-results cards-view" :class="{'select-results': selectMode}">
<v-flex
v-for="(photo, index) in photos"
:key="index"
@@ -60,7 +60,8 @@
@touchend.stop.prevent
@click.stop.prevent="openPhoto(index, true)">
<v-icon color="white" class="default-hidden action-raw" :title="$gettext('RAW')">photo_camera</v-icon>
- <v-icon color="white" class="default-hidden action-live" :title="$gettext('Live')">adjust</v-icon>
+ <v-icon color="white" class="default-hidden action-live" :title="$gettext('Live')">$vuetify.icons.live_photo</v-icon>
+ <v-icon color="white" class="default-hidden action-play" :title="$gettext('Video')">movie</v-icon>
<v-icon color="white" class="default-hidden action-stack" :title="$gettext('Stack')">burst_mode</v-icon>
</v-btn>
@@ -73,7 +74,7 @@
</v-btn>
<v-btn :ripple="false" :depressed="false" color="white" class="input-play"
- outline fab absolute :title="$gettext('Play')"
+ outline fab large absolute :title="$gettext('Play')"
@touchstart.stop.prevent="openPhoto(index, true)"
@touchend.stop.prevent
@click.stop.prevent="openPhoto(index, true)">
@@ -93,7 +94,7 @@
@touchend.stop.prevent
@click.stop.prevent="onSelect($event, index)">
<v-icon color="white" class="select-on">check_circle</v-icon>
- <v-icon color="accent lighten-3" class="select-off">radio_button_off</v-icon>
+ <v-icon color="white" class="select-off">radio_button_off</v-icon>
</v-btn>
<v-btn :ripple="false"
@@ -103,7 +104,7 @@
@touchend.stop.prevent
@click.stop.prevent="photo.toggleLike()">
<v-icon color="white" class="select-on">favorite</v-icon>
- <v-icon color="accent lighten-3" class="select-off">favorite_border</v-icon>
+ <v-icon color="white" class="select-off">favorite_border</v-icon>
</v-btn>
</v-img>
diff --git a/frontend/src/component/photo/list.vue b/frontend/src/component/photo/list.vue
index 2c6de2b0b09..1a6472676df 100644
--- a/frontend/src/component/photo/list.vue
+++ b/frontend/src/component/photo/list.vue
@@ -27,6 +27,7 @@
:items="photos"
hide-actions
class="search-results photo-results list-view"
+ :class="{'select-results': selectMode}"
disable-initial-sort
item-key="ID"
:no-data-text="notFoundMessage"
@@ -50,13 +51,14 @@
flat icon large absolute
class="input-select">
<v-icon color="white" class="select-on">check_circle</v-icon>
- <v-icon color="accent lighten-3" class="select-off">radio_button_off</v-icon>
+ <v-icon color="white" class="select-off">radio_button_off</v-icon>
</v-btn>
<v-btn v-else-if="props.item.Type === 'video' || props.item.Type === 'live'"
:ripple="false"
- flat icon large absolute class="input-play opacity-75"
+ flat icon large absolute class="input-open"
@click.stop.prevent="openPhoto(props.index, true)">
- <v-icon color="white" class="action-play">play_arrow</v-icon>
+ <v-icon color="white" class="default-hidden action-live" :title="$gettext('Live')">$vuetify.icons.live_photo</v-icon>
+ <v-icon color="white" class="default-hidden action-play" :title="$gettext('Video')">movie</v-icon>
</v-btn>
</v-img>
</td>
diff --git a/frontend/src/component/photo/mosaic.vue b/frontend/src/component/photo/mosaic.vue
index 7864ba25edf..1a1a2ea56cd 100644
--- a/frontend/src/component/photo/mosaic.vue
+++ b/frontend/src/component/photo/mosaic.vue
@@ -19,7 +19,7 @@
</div>
</v-card-title>
</v-card>
- <v-layout row wrap class="search-results photo-results mosaic-view">
+ <v-layout row wrap class="search-results photo-results mosaic-view" :class="{'select-results': selectMode}">
<v-flex
v-for="(photo, index) in photos"
:key="index"
@@ -59,7 +59,8 @@
@touchend.stop.prevent
@click.stop.prevent="openPhoto(index, true)">
<v-icon color="white" class="default-hidden action-raw" :title="$gettext('RAW')">photo_camera</v-icon>
- <v-icon color="white" class="default-hidden action-live" :title="$gettext('Live')">adjust</v-icon>
+ <v-icon color="white" class="default-hidden action-live" :title="$gettext('Live')">$vuetify.icons.live_photo</v-icon>
+ <v-icon color="white" class="default-hidden action-play" :title="$gettext('Video')">movie</v-icon>
<v-icon color="white" class="default-hidden action-stack" :title="$gettext('Stack')">burst_mode</v-icon>
</v-btn>
@@ -72,7 +73,7 @@
</v-btn>
<v-btn :ripple="false" :depressed="false" color="white" class="input-play"
- outline fab absolute :title="$gettext('Play')"
+ icon flat small absolute :title="$gettext('Play')"
@touchstart.stop.prevent="openPhoto(index, true)"
@touchend.stop.prevent
@click.stop.prevent="openPhoto(index, true)">
@@ -92,7 +93,7 @@
@touchend.stop.prevent
@click.stop.prevent="onSelect($event, index)">
<v-icon color="white" class="select-on">check_circle</v-icon>
- <v-icon color="accent lighten-3" class="select-off">radio_button_off</v-icon>
+ <v-icon color="white" class="select-off">radio_button_off</v-icon>
</v-btn>
<v-btn :ripple="false"
@@ -102,7 +103,7 @@
@touchend.stop.prevent
@click.stop.prevent="photo.toggleLike()">
<v-icon color="white" class="select-on">favorite</v-icon>
- <v-icon color="accent lighten-3" class="select-off">favorite_border</v-icon>
+ <v-icon color="white" class="select-off">favorite_border</v-icon>
</v-btn>
</v-img>
</v-card>
diff --git a/frontend/src/css/search.css b/frontend/src/css/search.css
index b0695e91b08..a37dc1054bd 100644
--- a/frontend/src/css/search.css
+++ b/frontend/src/css/search.css
@@ -246,15 +246,21 @@
#photoprism .cards-view .input-open,
#photoprism .cards-view .input-view,
#photoprism .mosaic-view .input-open,
-#photoprism .mosaic-view .input-view {
+#photoprism .mosaic-view .input-view,
+#photoprism .mosaic-view .input-play {
display: none;
opacity: 0.75;
top: 4px;
left: 4px;
}
-#photoprism .search-results .type-image:hover .input-view,
+#photoprism .search-results .result .input-play {
+ display: none;
+}
+
+#photoprism .search-results.select-results .type-image .input-view,
#photoprism .search-results .type-raw .input-open,
+#photoprism .search-results .type-video.is-playable .input-open,
#photoprism .search-results .type-live.is-playable .input-open,
#photoprism .search-results .type-image.is-stack .input-open {
display: inline-flex;
@@ -265,6 +271,7 @@
}
#photoprism .search-results .type-raw .input-open .action-raw,
+#photoprism .search-results .type-video.is-playable .input-open .action-play,
#photoprism .search-results .type-live.is-playable .input-open .action-live,
#photoprism .search-results .type-image.is-stack .input-open .action-stack {
display: inline-flex;
@@ -283,11 +290,8 @@
margin: 0 !important;
}
-#photoprism .search-results .result .input-play {
- display: none;
-}
-
-#photoprism .search-results .type-video.is-playable .input-play,
+#photoprism .search-results.cards-view .type-video.is-playable .input-play,
+#photoprism .search-results.list-view .type-video.is-playable .input-play,
#photoprism .search-results.list-view .type-live.is-playable .input-play {
display: inline-flex;
opacity: 0.75;
@@ -333,7 +337,7 @@
}
#photoprism .search-results.list-view .input-select,
-#photoprism .search-results.list-view .input-play {
+#photoprism .search-results.list-view .input-open {
margin-left: auto;
margin-right: auto;
left: 0;
diff --git a/frontend/src/pages/albums.vue b/frontend/src/pages/albums.vue
index 199f06cbb9d..d784b8d12a0 100644
--- a/frontend/src/pages/albums.vue
+++ b/frontend/src/pages/albums.vue
@@ -77,7 +77,7 @@
</div>
</v-card-title>
</v-card>
- <v-layout row wrap class="search-results album-results cards-view">
+ <v-layout row wrap class="search-results album-results cards-view" :class="{'select-results': selection.length > 0}">
<v-flex
v-for="(album, index) in results"
:key="index"
@@ -119,7 +119,7 @@
@touchend.stop.prevent
@click.stop.prevent="onSelect($event, index)">
<v-icon color="white" class="select-on">check_circle</v-icon>
- <v-icon color="accent lighten-3" class="select-off">radio_button_off</v-icon>
+ <v-icon color="white" class="select-off">radio_button_off</v-icon>
</v-btn>
<v-btn :ripple="false"
diff --git a/frontend/src/pages/labels.vue b/frontend/src/pages/labels.vue
index ab9c7337897..e166ca78df2 100644
--- a/frontend/src/pages/labels.vue
+++ b/frontend/src/pages/labels.vue
@@ -54,7 +54,7 @@
</div>
</v-card-title>
</v-card>
- <v-layout row wrap class="search-results label-results cards-view">
+ <v-layout row wrap class="search-results label-results cards-view" :class="{'select-results': selection.length > 0}">
<v-flex
v-for="(label, index) in results"
:key="index"
@@ -87,7 +87,7 @@
@touchend.stop.prevent
@click.stop.prevent="onSelect($event, index)">
<v-icon color="white" class="select-on">check_circle</v-icon>
- <v-icon color="accent lighten-3" class="select-off">radio_button_off</v-icon>
+ <v-icon color="white" class="select-off">radio_button_off</v-icon>
</v-btn>
<v-btn :ripple="false"
diff --git a/frontend/src/pages/library/files.vue b/frontend/src/pages/library/files.vue
index 0686eb5bc54..40b8bf0e476 100644
--- a/frontend/src/pages/library/files.vue
+++ b/frontend/src/pages/library/files.vue
@@ -44,7 +44,7 @@
</div>
</v-card-title>
</v-card>
- <v-layout row wrap class="search-results file-results cards-view">
+ <v-layout row wrap class="search-results file-results cards-view" :class="{'select-results': selection.length > 0}">
<v-flex
v-for="(model, index) in results"
:key="index"
@@ -71,7 +71,7 @@
class="input-select"
@click.stop.prevent="onSelect($event, index)">
<v-icon color="white" class="select-on">check_circle</v-icon>
- <v-icon color="accent lighten-3" class="select-off">radio_button_off</v-icon>
+ <v-icon color="white" class="select-off">radio_button_off</v-icon>
</v-btn>
</v-img>
diff --git a/frontend/src/share.js b/frontend/src/share.js
index d0830c5ab07..fea7981135a 100644
--- a/frontend/src/share.js
+++ b/frontend/src/share.js
@@ -34,6 +34,7 @@ import Api from "common/api";
import Notify from "common/notify";
import Clipboard from "common/clipboard";
import Components from "share/components";
+import icons from "./component/icons";
import Dialogs from "dialog/dialogs";
import Event from "pubsub-js";
import GetTextPlugin from "vue-gettext";
@@ -69,6 +70,9 @@ Settings.defaultLocale = Vue.config.language.substring(0, 2);
const languages = options.Languages();
const rtl = languages.some((lang) => lang.value === Vue.config.language && lang.rtl);
+// Get initial theme colors from config
+const theme = config.theme.colors;
+
// HTTP Live Streaming (video support)
window.Hls = Hls;
@@ -86,7 +90,7 @@ Vue.prototype.$isMobile = isMobile;
Vue.prototype.$rtl = rtl;
// Register Vuetify
-Vue.use(Vuetify, { rtl, theme: config.theme.colors });
+Vue.use(Vuetify, { rtl, icons, theme });
// Register other VueJS plugins
Vue.use(GetTextPlugin, {
diff --git a/frontend/src/share/albums.vue b/frontend/src/share/albums.vue
index 0267db3993f..9c6d86fa325 100644
--- a/frontend/src/share/albums.vue
+++ b/frontend/src/share/albums.vue
@@ -28,7 +28,7 @@
</div>
</v-card-title>
</v-card>
- <v-layout row wrap class="search-results album-results cards-view">
+ <v-layout row wrap class="search-results album-results cards-view" :class="{'select-results': selection.length > 0}">
<v-flex
v-for="(album, index) in results"
:key="index"
@@ -61,7 +61,7 @@
@touchend.stop.prevent
@click.stop.prevent="onSelect($event, index)">
<v-icon color="white" class="select-on">check_circle</v-icon>
- <v-icon color="accent lighten-3" class="select-off">radio_button_off</v-icon>
+ <v-icon color="white" class="select-off">radio_button_off</v-icon>
</v-btn>
</v-img>
diff --git a/frontend/src/share/photo/cards.vue b/frontend/src/share/photo/cards.vue
index b7fbaefb4c2..cc3d121db37 100644
--- a/frontend/src/share/photo/cards.vue
+++ b/frontend/src/share/photo/cards.vue
@@ -15,7 +15,7 @@
</div>
</v-card-title>
</v-card>
- <v-layout row wrap class="search-results photo-results cards-view">
+ <v-layout row wrap class="search-results photo-results cards-view" :class="{'select-results': selectMode}">
<v-flex
v-for="(photo, index) in photos"
:key="index"
@@ -56,7 +56,8 @@
@touchend.stop.prevent
@click.stop.prevent="openPhoto(index, true)">
<v-icon color="white" class="default-hidden action-raw" :title="$gettext('RAW')">photo_camera</v-icon>
- <v-icon color="white" class="default-hidden action-live" :title="$gettext('Live')">adjust</v-icon>
+ <v-icon color="white" class="default-hidden action-live" :title="$gettext('Live')">$vuetify.icons.live_photo</v-icon>
+ <v-icon color="white" class="default-hidden action-play" :title="$gettext('Video')">movie</v-icon>
<v-icon color="white" class="default-hidden action-stack" :title="$gettext('Stack')">burst_mode</v-icon>
</v-btn>
@@ -69,7 +70,7 @@
</v-btn>
<v-btn :ripple="false" :depressed="false" color="white" class="input-play"
- outline fab absolute :title="$gettext('Play')"
+ outline fab large absolute :title="$gettext('Play')"
@touchstart.stop.prevent="openPhoto(index, true)"
@touchend.stop.prevent
@click.stop.prevent="openPhoto(index, true)">
@@ -83,7 +84,7 @@
@touchend.stop.prevent
@click.stop.prevent="onSelect($event, index)">
<v-icon color="white" class="select-on">check_circle</v-icon>
- <v-icon color="accent lighten-3" class="select-off">radio_button_off</v-icon>
+ <v-icon color="white" class="select-off">radio_button_off</v-icon>
</v-btn>
</v-img>
diff --git a/frontend/src/share/photo/list.vue b/frontend/src/share/photo/list.vue
index 0cd53b6393a..82e5b1560c0 100644
--- a/frontend/src/share/photo/list.vue
+++ b/frontend/src/share/photo/list.vue
@@ -23,6 +23,7 @@
:items="photos"
hide-actions
class="search-results photo-results list-view"
+ :class="{'select-results': selectMode}"
disable-initial-sort
item-key="ID"
:no-data-text="notFoundMessage"
@@ -46,13 +47,14 @@
flat icon large absolute
class="input-select">
<v-icon color="white" class="select-on">check_circle</v-icon>
- <v-icon color="accent lighten-3" class="select-off">radio_button_off</v-icon>
+ <v-icon color="white" class="select-off">radio_button_off</v-icon>
</v-btn>
<v-btn v-else-if="props.item.Type === 'video' || props.item.Type === 'live'"
:ripple="false"
- flat icon large absolute class="input-play opacity-75"
+ flat icon large absolute class="input-open"
@click.stop.prevent="openPhoto(props.index, true)">
- <v-icon color="white" class="action-play">play_arrow</v-icon>
+ <v-icon color="white" class="default-hidden action-live" :title="$gettext('Live')">$vuetify.icons.live_photo</v-icon>
+ <v-icon color="white" class="default-hidden action-play" :title="$gettext('Video')">movie</v-icon>
</v-btn>
</v-img>
</td>
diff --git a/frontend/src/share/photo/mosaic.vue b/frontend/src/share/photo/mosaic.vue
index 0b1fd932d56..f81ffcef681 100644
--- a/frontend/src/share/photo/mosaic.vue
+++ b/frontend/src/share/photo/mosaic.vue
@@ -15,7 +15,7 @@
</div>
</v-card-title>
</v-card>
- <v-layout row wrap class="search-results photo-results mosaic-view">
+ <v-layout row wrap class="search-results photo-results mosaic-view" :class="{'select-results': selectMode}">
<v-flex
v-for="(photo, index) in photos"
:key="index"
@@ -55,7 +55,8 @@
@touchend.stop.prevent
@click.stop.prevent="openPhoto(index, true)">
<v-icon color="white" class="default-hidden action-raw" :title="$gettext('RAW')">photo_camera</v-icon>
- <v-icon color="white" class="default-hidden action-live" :title="$gettext('Live')">adjust</v-icon>
+ <v-icon color="white" class="default-hidden action-live" :title="$gettext('Live')">$vuetify.icons.live_photo</v-icon>
+ <v-icon color="white" class="default-hidden action-play" :title="$gettext('Video')">movie</v-icon>
<v-icon color="white" class="default-hidden action-stack" :title="$gettext('Stack')">burst_mode</v-icon>
</v-btn>
@@ -68,7 +69,7 @@
</v-btn>
<v-btn :ripple="false" :depressed="false" color="white" class="input-play"
- outline fab absolute :title="$gettext('Play')"
+ icon flat small absolute :title="$gettext('Play')"
@touchstart.stop.prevent="openPhoto(index, true)"
@touchend.stop.prevent
@click.stop.prevent="openPhoto(index, true)">
@@ -82,7 +83,7 @@
@touchend.stop.prevent
@click.stop.prevent="onSelect($event, index)">
<v-icon color="white" class="select-on">check_circle</v-icon>
- <v-icon color="accent lighten-3" class="select-off">radio_button_off</v-icon>
+ <v-icon color="white" class="select-off">radio_button_off</v-icon>
</v-btn>
</v-img>
</v-card>
|
04609d536de0573a7935fff598ab2067d821ab2f
|
2022-04-12 23:30:06
|
Michael Mayer
|
cli: Show --admin-password flag at the top in command help #2195 #2248
| false
|
Show --admin-password flag at the top in command help #2195 #2248
|
cli
|
diff --git a/internal/config/config_flags.go b/internal/config/config_flags.go
index 3883a8e61c6..11655f7775e 100644
--- a/internal/config/config_flags.go
+++ b/internal/config/config_flags.go
@@ -14,9 +14,14 @@ import (
// GlobalFlags describes global command-line parameters and flags.
var GlobalFlags = []cli.Flag{
+ cli.StringFlag{
+ Name: "admin-password, pw",
+ Usage: fmt.Sprintf("initial admin `PASSWORD`, must have at least %d characters", entity.PasswordLen),
+ EnvVar: "PHOTOPRISM_ADMIN_PASSWORD",
+ },
cli.StringFlag{
Name: "log-level, l",
- Usage: "`VERBOSITY` of log messages: trace, debug, info, warning, error, fatal, or panic",
+ Usage: "log message verbosity `LEVEL` (trace, debug, info, warning, error, fatal, panic)",
Value: "info",
EnvVar: "PHOTOPRISM_LOG_LEVEL",
},
@@ -30,11 +35,6 @@ var GlobalFlags = []cli.Flag{
Usage: "enable trace mode, show all log messages",
EnvVar: "PHOTOPRISM_TRACE",
},
- cli.StringFlag{
- Name: "admin-password, pw",
- Usage: fmt.Sprintf("initial admin `PASSWORD`, must have at least %d characters", entity.PasswordLen),
- EnvVar: "PHOTOPRISM_ADMIN_PASSWORD",
- },
cli.BoolFlag{
Name: "auth, a",
Usage: "always require password authentication, overrides the public flag",
diff --git a/internal/config/config_options.go b/internal/config/config_options.go
index 04799a50cf0..962522bf6bf 100644
--- a/internal/config/config_options.go
+++ b/internal/config/config_options.go
@@ -22,10 +22,10 @@ type Options struct {
Version string `json:"-"`
Copyright string `json:"-"`
PartnerID string `yaml:"-" json:"-" flag:"partner-id"`
+ AdminPassword string `yaml:"AdminPassword" json:"-" flag:"admin-password"`
LogLevel string `yaml:"LogLevel" json:"-" flag:"log-level"`
Debug bool `yaml:"Debug" json:"Debug" flag:"debug"`
Trace bool `yaml:"Trace" json:"Trace" flag:"Trace"`
- AdminPassword string `yaml:"AdminPassword" json:"-" flag:"admin-password"`
Auth bool `yaml:"Auth" json:"-" flag:"auth"`
Public bool `yaml:"Public" json:"-" flag:"public"`
Test bool `yaml:"-" json:"Test,omitempty" flag:"test"`
diff --git a/internal/config/table.go b/internal/config/table.go
index d798787fb9c..733fc4d7f31 100644
--- a/internal/config/table.go
+++ b/internal/config/table.go
@@ -15,10 +15,10 @@ func (c *Config) Table() (rows [][]string, cols []string) {
cols = []string{"Value", "Name"}
rows = [][]string{
+ {"admin-password", strings.Repeat("*", utf8.RuneCountInString(c.AdminPassword()))},
{"log-level", c.LogLevel().String()},
{"debug", fmt.Sprintf("%t", c.Debug())},
{"trace", fmt.Sprintf("%t", c.Trace())},
- {"admin-password", strings.Repeat("*", utf8.RuneCountInString(c.AdminPassword()))},
{"auth", fmt.Sprintf("%t", c.Auth())},
{"public", fmt.Sprintf("%t", c.Public())},
{"read-only", fmt.Sprintf("%t", c.ReadOnly())},
diff --git a/internal/config/test.go b/internal/config/test.go
index 94e3e53bf5b..e9b907a3c5b 100644
--- a/internal/config/test.go
+++ b/internal/config/test.go
@@ -187,6 +187,7 @@ func CliTestContext() *cli.Context {
config := NewTestOptions("config-cli")
globalSet := flag.NewFlagSet("test", 0)
+ globalSet.String("admin-password", config.DarktableBin, "doc")
globalSet.Bool("debug", false, "doc")
globalSet.String("storage-path", config.StoragePath, "doc")
globalSet.String("backup-path", config.StoragePath, "doc")
@@ -199,7 +200,6 @@ func CliTestContext() *cli.Context {
globalSet.String("cache-path", config.OriginalsPath, "doc")
globalSet.String("darktable-cli", config.DarktableBin, "doc")
globalSet.String("darktable-blacklist", config.DarktableBlacklist, "doc")
- globalSet.String("admin-password", config.DarktableBin, "doc")
globalSet.String("wakeup-interval", "1h34m9s", "doc")
globalSet.Bool("detect-nsfw", config.DetectNSFW, "doc")
globalSet.Int("auto-index", config.AutoIndex, "doc")
@@ -210,6 +210,7 @@ func CliTestContext() *cli.Context {
c := cli.NewContext(app, globalSet, nil)
+ LogError(c.Set("admin-password", config.AdminPassword))
LogError(c.Set("storage-path", config.StoragePath))
LogError(c.Set("backup-path", config.BackupPath))
LogError(c.Set("sidecar-path", config.SidecarPath))
@@ -221,7 +222,6 @@ func CliTestContext() *cli.Context {
LogError(c.Set("cache-path", config.CachePath))
LogError(c.Set("darktable-cli", config.DarktableBin))
LogError(c.Set("darktable-blacklist", "raf,cr3"))
- LogError(c.Set("admin-password", config.AdminPassword))
LogError(c.Set("wakeup-interval", "1h34m9s"))
LogError(c.Set("detect-nsfw", "true"))
LogError(c.Set("auto-index", strconv.Itoa(config.AutoIndex)))
|
4931889b5e9626194a2bf250ee3b3086b3642977
|
2023-07-19 03:05:10
|
Michael Mayer
|
auth: Improve privilege level change detection #3512
| false
|
Improve privilege level change detection #3512
|
auth
|
diff --git a/internal/api/users_avatar.go b/internal/api/users_avatar.go
index 72a6d3332a7..96e8694c31d 100644
--- a/internal/api/users_avatar.go
+++ b/internal/api/users_avatar.go
@@ -36,11 +36,11 @@ func UploadUserAvatar(router *gin.RouterGroup) {
}
// Check if the session user is has user management privileges.
- isPrivileged := acl.Resources.AllowAll(acl.ResourceUsers, s.User().AclRole(), acl.Permissions{acl.AccessAll, acl.ActionManage})
+ isAdmin := acl.Resources.AllowAll(acl.ResourceUsers, s.User().AclRole(), acl.Permissions{acl.AccessAll, acl.ActionManage})
uid := clean.UID(c.Param("uid"))
// Users may only change their own avatar.
- if !isPrivileged && s.User().UserUID != uid {
+ if !isAdmin && s.User().UserUID != uid {
event.AuditErr([]string{ClientIP(c), "session %s", "upload avatar", "user does not match"}, s.RefID)
AbortForbidden(c)
return
diff --git a/internal/api/users_password.go b/internal/api/users_password.go
index 776bfc880fa..4c2148dd9e4 100644
--- a/internal/api/users_password.go
+++ b/internal/api/users_password.go
@@ -43,19 +43,19 @@ func UpdateUserPassword(router *gin.RouterGroup) {
}
// Check if the session user is has user management privileges.
- isPrivileged := acl.Resources.AllowAll(acl.ResourceUsers, s.User().AclRole(), acl.Permissions{acl.AccessAll, acl.ActionManage})
- isSuperAdmin := isPrivileged && s.User().IsSuperAdmin()
+ isAdmin := acl.Resources.AllowAll(acl.ResourceUsers, s.User().AclRole(), acl.Permissions{acl.AccessAll, acl.ActionManage})
+ isSuperAdmin := isAdmin && s.User().IsSuperAdmin()
uid := clean.UID(c.Param("uid"))
var u *entity.User
// Users may only change their own password.
- if !isPrivileged && s.User().UserUID != uid {
+ if !isAdmin && s.User().UserUID != uid {
AbortForbidden(c)
return
} else if s.User().UserUID == uid {
u = s.User()
- isPrivileged = false
+ isAdmin = false
isSuperAdmin = false
} else if u = entity.FindUserByUID(uid); u == nil {
Abort(c, http.StatusNotFound, i18n.ErrUserNotFound)
diff --git a/internal/api/users_update.go b/internal/api/users_update.go
index 59694541499..cb79987f99f 100644
--- a/internal/api/users_update.go
+++ b/internal/api/users_update.go
@@ -61,7 +61,8 @@ func UpdateUser(router *gin.RouterGroup) {
}
// Check if the session user is has user management privileges.
- isPrivileged := acl.Resources.AllowAll(acl.ResourceUsers, s.User().AclRole(), acl.Permissions{acl.AccessAll, acl.ActionManage})
+ isAdmin := acl.Resources.AllowAll(acl.ResourceUsers, s.User().AclRole(), acl.Permissions{acl.AccessAll, acl.ActionManage})
+ privilegeLevelChange := isAdmin && m.PrivilegeLevelChange(f)
// Prevent super admins from locking themselves out.
if u := s.User(); u.IsSuperAdmin() && u.Equal(m) && !f.CanLogin {
@@ -69,7 +70,7 @@ func UpdateUser(router *gin.RouterGroup) {
}
// Save model with values from form.
- if err = m.SaveForm(f, isPrivileged); err != nil {
+ if err = m.SaveForm(f, isAdmin); err != nil {
event.AuditErr([]string{ClientIP(c), "session %s", "users", m.UserName, "update", err.Error()}, s.RefID)
AbortSaveFailed(c)
return
@@ -78,9 +79,9 @@ func UpdateUser(router *gin.RouterGroup) {
// Log event.
event.AuditInfo([]string{ClientIP(c), "session %s", "users", m.UserName, "updated"}, s.RefID)
- // Delete user sessions after a permission level change.
+ // Delete user sessions after a privilege level change.
// see https://cheatsheetseries.owasp.org/cheatsheets/Session_Management_Cheat_Sheet.html#renew-the-session-id-after-any-privilege-level-change
- if isPrivileged {
+ if privilegeLevelChange {
// Prevent the current session from being deleted.
deleted := m.DeleteSessions([]string{s.ID})
event.AuditInfo([]string{ClientIP(c), "session %s", "users", m.UserName, "invalidated %s"}, s.RefID,
diff --git a/internal/entity/auth_user.go b/internal/entity/auth_user.go
index 23de7708c54..76c238177ee 100644
--- a/internal/entity/auth_user.go
+++ b/internal/entity/auth_user.go
@@ -1016,8 +1016,20 @@ func (m *User) Form() (form.User, error) {
return frm, nil
}
+// PrivilegeLevelChange checks if saving the form changes the user privileges.
+func (m *User) PrivilegeLevelChange(f form.User) bool {
+ return m.UserRole != f.Role() ||
+ m.SuperAdmin != f.SuperAdmin ||
+ m.CanLogin != f.CanLogin ||
+ m.WebDAV != f.WebDAV ||
+ m.UserAttr != f.Attr() ||
+ m.AuthProvider != f.Provider().String() ||
+ m.BasePath != f.BasePath ||
+ m.UploadPath != f.UploadPath
+}
+
// SaveForm updates the entity using form data and stores it in the database.
-func (m *User) SaveForm(f form.User, updateRights bool) error {
+func (m *User) SaveForm(f form.User, changePrivileges bool) error {
if m.UserName == "" || m.ID <= 0 {
return fmt.Errorf("system users cannot be modified")
} else if (m.ID == 1 || f.SuperAdmin) && acl.RoleAdmin.NotEqual(f.Role()) {
@@ -1055,8 +1067,8 @@ func (m *User) SaveForm(f form.User, updateRights bool) error {
m.VerifyToken = GenerateToken()
}
- // Update user rights only if explicitly requested.
- if updateRights {
+ // Change user privileges only if allowed.
+ if changePrivileges {
m.SetRole(f.Role())
m.SuperAdmin = f.SuperAdmin
diff --git a/internal/entity/auth_user_test.go b/internal/entity/auth_user_test.go
index 50cdbf39b5a..a8395ea69cf 100644
--- a/internal/entity/auth_user_test.go
+++ b/internal/entity/auth_user_test.go
@@ -920,6 +920,41 @@ func TestUser_Form(t *testing.T) {
})
}
+func TestUser_PrivilegeLevelChange(t *testing.T) {
+ t.Run("True", func(t *testing.T) {
+ m := FindUserByName("alice")
+
+ if m == nil {
+ t.Fatal("result should not be nil")
+ }
+
+ frm, err := m.Form()
+
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ frm.UserRole = "guest"
+
+ assert.True(t, m.PrivilegeLevelChange(frm))
+ })
+ t.Run("False", func(t *testing.T) {
+ m := FindUserByName("alice")
+
+ if m == nil {
+ t.Fatal("result should not be nil")
+ }
+
+ frm, err := m.Form()
+
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ assert.False(t, m.PrivilegeLevelChange(frm))
+ })
+}
+
func TestUser_SaveForm(t *testing.T) {
t.Run("UnknownUser", func(t *testing.T) {
frm, err := UnknownUser.Form()
|
390aea553b888815061d758e04487322e0c195b3
|
2022-12-20 02:46:53
|
Weblate
|
weblate: Update frontend translations
| false
|
Update frontend translations
|
weblate
|
diff --git a/frontend/src/locales/es.po b/frontend/src/locales/es.po
index c95f9186a48..744aa4362a8 100644
--- a/frontend/src/locales/es.po
+++ b/frontend/src/locales/es.po
@@ -3,8 +3,8 @@ msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2022-12-17 23:11+0000\n"
-"Last-Translator: Anonymous <[email protected]>\n"
+"PO-Revision-Date: 2022-12-19 21:16+0000\n"
+"Last-Translator: Aleks Clark <[email protected]>\n"
"Language-Team: Spanish <https://translate.photoprism.app/projects/photoprism/"
"frontend/es/>\n"
"Language: es\n"
@@ -87,12 +87,10 @@ msgid "Actions"
msgstr "Acciones"
#: src/page/connect.vue:75 src/page/connect.vue:92
-#, fuzzy
msgid "Activate"
msgstr "Activar"
#: src/page/connect.vue:293 src/page/connect.vue:400
-#, fuzzy
msgid "Activation Code"
msgstr "Código de activación"
@@ -387,7 +385,6 @@ msgid "Busy, please wait…"
msgstr "Ocupado, por favor espera…"
#: src/page/connect.vue:82 src/page/connect.vue:99
-#, fuzzy
msgid "By using the software and services we provide, you agree to our terms of service, privacy policy, and code of conduct."
msgstr ""
"Al utilizar el software y los servicios que ofrecemos, usted acepta nuestras "
@@ -505,7 +502,6 @@ msgid "Common issues can be quickly diagnosed and solved using the troubleshooti
msgstr "Los problemas más comunes pueden diagnosticarse y resolverse rápidamente el cuestionario de resolución de problemas que proporcionamos."
#: src/page/connect.vue:67 src/page/connect.vue:84
-#, fuzzy
msgid "Compare Editions"
msgstr "Comparar ediciones"
@@ -574,9 +570,8 @@ msgid "Country"
msgstr "País"
#: src/page/login.vue:21
-#, fuzzy
msgid "Create Account"
-msgstr "Crear una cuenta"
+msgstr "Crear Cuenta"
#: src/dialog/photo/album.vue:21
msgid "Create album"
@@ -1379,7 +1374,6 @@ msgid "Low"
msgstr "Bajo"
#: src/options/options.js:272
-#, fuzzy
msgid "Low Resolution"
msgstr "Baja resolución"
@@ -1396,7 +1390,6 @@ msgid "Male"
msgstr "Hombre"
#: src/page/connect.vue:56
-#, fuzzy
msgid "Manage account"
msgstr "Gestionar cuenta"
@@ -1488,7 +1481,6 @@ msgid "Move Files"
msgstr "Mover archivos"
#: src/dialog/account/password.vue:156
-#, fuzzy
msgid "Must have at least %{n} characters."
msgstr "Debe tener al menos %{n} caracteres."
@@ -1713,9 +1705,14 @@ msgid "Other"
msgstr "Otro"
#: src/page/connect.vue:123
-#, fuzzy
msgid "Our team decides this on an ongoing basis depending on the support effort required, server and licensing costs, and whether the features are generally needed by everyone or mainly requested by organizations and advanced users. As this allows us to make more features available to the public, we encourage all users to support our mission."
-msgstr "Nuestro equipo lo evalúa de forma continua, en función del esfuerzo de soporte que requieran las funciones, el coste que nos supongan y si, en general, las necesita todo el mundo o las solicitan principalmente organizaciones y usuarios avanzados. Como esto nos permite ofrecer más funciones al público, animamos a todos los usuarios a apoyar nuestra misión."
+msgstr ""
+"Nuestro equipo decide esto de forma continua en función del esfuerzo de "
+"soporte necesario, los costes del servidor y las licencias, y si las "
+"funciones son generalmente necesarias para todo el mundo o las solicitan "
+"principalmente organizaciones y usuarios avanzados. Como esto nos permite "
+"poner más funciones a disposición del público, animamos a todos los usuarios "
+"a apoyar nuestra misión."
#: src/page/about/about.vue:45
msgid "Our User Guide also covers many advanced topics, such as migrating from Google Photos and thumbnail quality settings."
@@ -1775,7 +1772,11 @@ msgstr "PhotoPrism ha sido actualizado…"
#: src/page/connect.vue:117
msgid "PhotoPrism is 100% self-funded. Voluntary donations do not cover the cost of a team working full time to provide you with updates, documentation, and support. It is your decision whether you want to sign up to enjoy additional benefits."
-msgstr "PhotoPrism es autofinanciado al 100%. Las donaciones voluntarias no cubren el coste de un equipo que trabaja a tiempo completo para proporcionarle actualizaciones, documentación y soporte. Es tu decisión si quieres inscribirte para disfrutar de beneficios adicionales."
+msgstr ""
+"PhotoPrism se autofinancia al 100%. Las donaciones voluntarias no cubren el "
+"coste de un equipo que trabaja a tiempo completo para proporcionarle "
+"actualizaciones, documentación y soporte. Es tu decisión si quieres "
+"inscribirte para disfrutar de beneficios adicionales."
#: src/page/about/about.vue:15
msgid "PhotoPrism® is an AI-Powered Photos App for the Decentralized Web."
@@ -1859,9 +1860,8 @@ msgid "Private"
msgstr "Privado"
#: src/page/connect.vue:70 src/page/connect.vue:87
-#, fuzzy
msgid "Proceed"
-msgstr "Proceda"
+msgstr "Proceder"
#: src/page/about/feedback.vue:6 src/options/options.js:408
msgid "Product Feedback"
@@ -2119,7 +2119,7 @@ msgstr "Comparte tus fotos con otras aplicaciones y servicios."
#: src/page/connect.vue:108
msgid "Shouldn't free software be free of costs?"
-msgstr "¿No debería el software libre estar libre de costos?"
+msgstr "¿El software libre no debería estar libre de costes?"
#: src/page/people/new.vue:219 src/page/people/recognized.vue:285
msgid "Show"
@@ -2244,7 +2244,6 @@ msgid "Support for additional services, like Google Drive, will be added over ti
msgstr "El soporte para servicios adicionales, como Google Drive, se añadirá a futuro."
#: src/dialog/sponsor.vue:7 src/page/connect.vue:68
-#, fuzzy
msgid "Support Our Mission"
msgstr "Apoye nuestra misión"
@@ -2283,7 +2282,11 @@ msgstr "Tema"
#: src/page/connect.vue:111
msgid "Think of “free software” as in “free speech,” not as in “free beer.” The Free Software Foundation sometimes calls it “libre software,” borrowing the French or Spanish word for “free” as in freedom, to show they do not mean the software is gratis."
-msgstr "Piense en \"software libre\" como en \"libertad de expresión\", no como en \"cerveza gratis\". En inglés, \"gratis\" y \"libre\" pueden ser ambas traducidas como \"free\". Es por esto que la Free Software Foundation a veces lo llama en este idioma como \"libre software\", tomando prestada la palabra de lenguajes como el francés o el español para \"libre\" como en libertad, para mostrar que no quieren decir que el software sea \"free\" de gratis."
+msgstr ""
+"Piense en \"software libre\" como en \"libertad de expresión\", no como en "
+"\"cerveza gratis\". La Free Software Foundation a veces lo llama \"software "
+"libre\", tomando prestada la palabra francesa o española para \"libre\" como "
+"en libertad, para mostrar que no quieren decir que el software sea gratis."
#: src/page/settings/services.vue:40
msgid ""
@@ -2314,13 +2317,11 @@ msgid "Timeout"
msgstr "Tiempo de espera"
#: src/page/settings/account.vue:113
-#, fuzzy
msgctxt "Account"
msgid "Title"
msgstr "Título"
#: src/dialog/photo/edit/details.vue:96
-#, fuzzy
msgctxt "Photo"
msgid "Title"
msgstr "Título"
@@ -2597,7 +2598,8 @@ msgstr "Blanco"
#: src/page/connect.vue:114
msgid "Why are some features only available to sponsors?"
-msgstr "¿Por qué algunas funciones sólo están disponibles para patrocinadores?"
+msgstr ""
+"¿Por qué algunas funciones sólo están disponibles para los patrocinadores?"
#: src/page/settings/account.vue:90
msgid "Work Details"
|
b97e0e9c3bc98d55cba6d6e9797a3b85ac08db99
|
2022-04-10 18:08:51
|
Michael Mayer
|
albums: Prevent accidental creation of duplicate albums #2233
| false
|
Prevent accidental creation of duplicate albums #2233
|
albums
|
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 678328595aa..00bd8308d89 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -169,24 +169,24 @@
}
},
"node_modules/@babel/core": {
- "version": "7.17.8",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.8.tgz",
- "integrity": "sha512-OdQDV/7cRBtJHLSOBqqbYNkOcydOgnX59TZx4puf41fzcVtN3e/4yqY8lMQsK+5X2lJtAdmA+6OHqsj1hBJ4IQ==",
+ "version": "7.17.9",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.9.tgz",
+ "integrity": "sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw==",
"dependencies": {
"@ampproject/remapping": "^2.1.0",
"@babel/code-frame": "^7.16.7",
- "@babel/generator": "^7.17.7",
+ "@babel/generator": "^7.17.9",
"@babel/helper-compilation-targets": "^7.17.7",
"@babel/helper-module-transforms": "^7.17.7",
- "@babel/helpers": "^7.17.8",
- "@babel/parser": "^7.17.8",
+ "@babel/helpers": "^7.17.9",
+ "@babel/parser": "^7.17.9",
"@babel/template": "^7.16.7",
- "@babel/traverse": "^7.17.3",
+ "@babel/traverse": "^7.17.9",
"@babel/types": "^7.17.0",
"convert-source-map": "^1.7.0",
"debug": "^4.1.0",
"gensync": "^1.0.0-beta.2",
- "json5": "^2.1.2",
+ "json5": "^2.2.1",
"semver": "^6.3.0"
},
"engines": {
@@ -215,9 +215,9 @@
}
},
"node_modules/@babel/generator": {
- "version": "7.17.7",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.7.tgz",
- "integrity": "sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w==",
+ "version": "7.17.9",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.9.tgz",
+ "integrity": "sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ==",
"dependencies": {
"@babel/types": "^7.17.0",
"jsesc": "^2.5.1",
@@ -268,14 +268,14 @@
}
},
"node_modules/@babel/helper-create-class-features-plugin": {
- "version": "7.17.6",
- "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz",
- "integrity": "sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==",
+ "version": "7.17.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.9.tgz",
+ "integrity": "sha512-kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ==",
"dependencies": {
"@babel/helper-annotate-as-pure": "^7.16.7",
"@babel/helper-environment-visitor": "^7.16.7",
- "@babel/helper-function-name": "^7.16.7",
- "@babel/helper-member-expression-to-functions": "^7.16.7",
+ "@babel/helper-function-name": "^7.17.9",
+ "@babel/helper-member-expression-to-functions": "^7.17.7",
"@babel/helper-optimise-call-expression": "^7.16.7",
"@babel/helper-replace-supers": "^7.16.7",
"@babel/helper-split-export-declaration": "^7.16.7"
@@ -343,24 +343,12 @@
}
},
"node_modules/@babel/helper-function-name": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz",
- "integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==",
+ "version": "7.17.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
+ "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
"dependencies": {
- "@babel/helper-get-function-arity": "^7.16.7",
"@babel/template": "^7.16.7",
- "@babel/types": "^7.16.7"
- },
- "engines": {
- "node": ">=6.9.0"
- }
- },
- "node_modules/@babel/helper-get-function-arity": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz",
- "integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==",
- "dependencies": {
- "@babel/types": "^7.16.7"
+ "@babel/types": "^7.17.0"
},
"engines": {
"node": ">=6.9.0"
@@ -528,12 +516,12 @@
}
},
"node_modules/@babel/helpers": {
- "version": "7.17.8",
- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.8.tgz",
- "integrity": "sha512-QcL86FGxpfSJwGtAvv4iG93UL6bmqBdmoVY0CMCU2g+oD2ezQse3PT5Pa+jiD6LJndBQi0EDlpzOWNlLuhz5gw==",
+ "version": "7.17.9",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz",
+ "integrity": "sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==",
"dependencies": {
"@babel/template": "^7.16.7",
- "@babel/traverse": "^7.17.3",
+ "@babel/traverse": "^7.17.9",
"@babel/types": "^7.17.0"
},
"engines": {
@@ -541,9 +529,9 @@
}
},
"node_modules/@babel/highlight": {
- "version": "7.16.10",
- "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz",
- "integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==",
+ "version": "7.17.9",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
+ "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
"dependencies": {
"@babel/helper-validator-identifier": "^7.16.7",
"chalk": "^2.0.0",
@@ -554,9 +542,9 @@
}
},
"node_modules/@babel/parser": {
- "version": "7.17.8",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.8.tgz",
- "integrity": "sha512-BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ==",
+ "version": "7.17.9",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.9.tgz",
+ "integrity": "sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg==",
"bin": {
"parser": "bin/babel-parser.js"
},
@@ -1216,9 +1204,9 @@
}
},
"node_modules/@babel/plugin-transform-modules-commonjs": {
- "version": "7.17.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.7.tgz",
- "integrity": "sha512-ITPmR2V7MqioMJyrxUo2onHNC3e+MvfFiFIR0RP21d3PtlVb6sfzoxNKiphSZUOM9hEIdzCcZe83ieX3yoqjUA==",
+ "version": "7.17.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.9.tgz",
+ "integrity": "sha512-2TBFd/r2I6VlYn0YRTz2JdazS+FoUuQ2rIFHoAxtyP/0G3D82SBLaRq9rnUkpqlLg03Byfl/+M32mpxjO6KaPw==",
"dependencies": {
"@babel/helper-module-transforms": "^7.17.7",
"@babel/helper-plugin-utils": "^7.16.7",
@@ -1337,11 +1325,11 @@
}
},
"node_modules/@babel/plugin-transform-regenerator": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz",
- "integrity": "sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==",
+ "version": "7.17.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.17.9.tgz",
+ "integrity": "sha512-Lc2TfbxR1HOyn/c6b4Y/b6NHoTb67n/IoWLxTu4kC7h4KQnWlhCq2S8Tx0t2SVvv5Uu87Hs+6JEJ5kt2tYGylQ==",
"dependencies": {
- "regenerator-transform": "^0.14.2"
+ "regenerator-transform": "^0.15.0"
},
"engines": {
"node": ">=6.9.0"
@@ -1621,9 +1609,9 @@
}
},
"node_modules/@babel/runtime": {
- "version": "7.17.8",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.8.tgz",
- "integrity": "sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA==",
+ "version": "7.17.9",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.9.tgz",
+ "integrity": "sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==",
"dependencies": {
"regenerator-runtime": "^0.13.4"
},
@@ -1645,17 +1633,17 @@
}
},
"node_modules/@babel/traverse": {
- "version": "7.17.3",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz",
- "integrity": "sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==",
+ "version": "7.17.9",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.9.tgz",
+ "integrity": "sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw==",
"dependencies": {
"@babel/code-frame": "^7.16.7",
- "@babel/generator": "^7.17.3",
+ "@babel/generator": "^7.17.9",
"@babel/helper-environment-visitor": "^7.16.7",
- "@babel/helper-function-name": "^7.16.7",
+ "@babel/helper-function-name": "^7.17.9",
"@babel/helper-hoist-variables": "^7.16.7",
"@babel/helper-split-export-declaration": "^7.16.7",
- "@babel/parser": "^7.17.3",
+ "@babel/parser": "^7.17.9",
"@babel/types": "^7.17.0",
"debug": "^4.1.0",
"globals": "^11.1.0"
@@ -2083,6 +2071,11 @@
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
"integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="
},
+ "node_modules/@types/geojson": {
+ "version": "7946.0.8",
+ "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.8.tgz",
+ "integrity": "sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA=="
+ },
"node_modules/@types/json-schema": {
"version": "7.0.11",
"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
@@ -2093,6 +2086,21 @@
"resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
"integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4="
},
+ "node_modules/@types/mapbox__point-geometry": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/@types/mapbox__point-geometry/-/mapbox__point-geometry-0.1.2.tgz",
+ "integrity": "sha512-D0lgCq+3VWV85ey1MZVkE8ZveyuvW5VAfuahVTQRpXFQTxw03SuIf1/K4UQ87MMIXVKzpFjXFiFMZzLj2kU+iA=="
+ },
+ "node_modules/@types/mapbox__vector-tile": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/@types/mapbox__vector-tile/-/mapbox__vector-tile-1.3.0.tgz",
+ "integrity": "sha512-kDwVreQO5V4c8yAxzZVQLE5tyWF+IPToAanloQaSnwfXmIcJ7cyOrv8z4Ft4y7PsLYmhWXmON8MBV8RX0Rgr8g==",
+ "dependencies": {
+ "@types/geojson": "*",
+ "@types/mapbox__point-geometry": "*",
+ "@types/pbf": "*"
+ }
+ },
"node_modules/@types/node": {
"version": "17.0.23",
"resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz",
@@ -2103,6 +2111,11 @@
"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
},
+ "node_modules/@types/pbf": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/@types/pbf/-/pbf-3.0.2.tgz",
+ "integrity": "sha512-EDrLIPaPXOZqDjrkzxxbX7UlJSeQVgah3i0aA4pOSzmK9zq3BIh7/MZIQxED7slJByvKM4Gc6Hypyu2lJzh3SQ=="
+ },
"node_modules/@ungap/promise-all-settled": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
@@ -3216,9 +3229,9 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001325",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001325.tgz",
- "integrity": "sha512-sB1bZHjseSjDtijV1Hb7PB2Zd58Kyx+n/9EotvZ4Qcz2K3d0lWB8dB4nb8wN/TsOGFq3UuAm0zQZNQ4SoR7TrQ==",
+ "version": "1.0.30001327",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001327.tgz",
+ "integrity": "sha512-1/Cg4jlD9qjZzhbzkzEaAC2JHsP0WrOc8Rd/3a3LuajGzGWR/hD7TVyvq99VqmTy99eVh8Zkmdq213OgvgXx7w==",
"funding": [
{
"type": "opencollective",
@@ -3823,28 +3836,25 @@
}
},
"node_modules/css-loader/node_modules/lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "dependencies": {
- "yallist": "^4.0.0"
- },
+ "version": "7.8.1",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.8.1.tgz",
+ "integrity": "sha512-E1v547OCgJvbvevfjgK9sNKIVXO96NnsTsFPBlg4ZxjhsJSODoH9lk8Bm0OxvHNm6Vm5Yqkl/1fErDxhYL8Skg==",
"engines": {
- "node": ">=10"
+ "node": ">=12"
}
},
"node_modules/css-loader/node_modules/semver": {
- "version": "7.3.5",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
- "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+ "version": "7.3.6",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
+ "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
"dependencies": {
- "lru-cache": "^6.0.0"
+ "lru-cache": "^7.4.0"
},
"bin": {
"semver": "bin/semver.js"
},
"engines": {
- "node": ">=10"
+ "node": "^10.0.0 || ^12.0.0 || ^14.0.0 || >=16.0.0"
}
},
"node_modules/css-prefers-color-scheme": {
@@ -4219,9 +4229,9 @@
}
},
"node_modules/dom-serializer": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
- "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+ "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
"dependencies": {
"domelementtype": "^2.0.1",
"domhandler": "^4.2.0",
@@ -4232,9 +4242,9 @@
}
},
"node_modules/domelementtype": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
- "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+ "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
"funding": [
{
"type": "github",
@@ -4348,9 +4358,9 @@
}
},
"node_modules/electron-to-chromium": {
- "version": "1.4.104",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.104.tgz",
- "integrity": "sha512-2kjoAyiG7uMyGRM9mx25s3HAzmQG2ayuYXxsFmYugHSDcwxREgLtscZvbL1JcW9S/OemeQ3f/SG6JhDwpnCclQ=="
+ "version": "1.4.106",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.106.tgz",
+ "integrity": "sha512-ZYfpVLULm67K7CaaGP7DmjyeMY4naxsbTy+syVVxT6QHI1Ww8XbJjmr9fDckrhq44WzCrcC5kH3zGpdusxwwqg=="
},
"node_modules/emoji-regex": {
"version": "8.0.0",
@@ -4587,9 +4597,9 @@
}
},
"node_modules/eslint": {
- "version": "8.12.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.12.0.tgz",
- "integrity": "sha512-it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q==",
+ "version": "8.13.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.13.0.tgz",
+ "integrity": "sha512-D+Xei61eInqauAyTJ6C0q6x9mx7kTUC1KZ0m0LSEexR0V+e94K12LmWX076ZIsldwfQ2RONdaJe0re0TRGQbRQ==",
"dependencies": {
"@eslint/eslintrc": "^1.2.1",
"@humanwhocodes/config-array": "^0.9.2",
@@ -5173,28 +5183,25 @@
}
},
"node_modules/eslint-plugin-vue/node_modules/lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "dependencies": {
- "yallist": "^4.0.0"
- },
+ "version": "7.8.1",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.8.1.tgz",
+ "integrity": "sha512-E1v547OCgJvbvevfjgK9sNKIVXO96NnsTsFPBlg4ZxjhsJSODoH9lk8Bm0OxvHNm6Vm5Yqkl/1fErDxhYL8Skg==",
"engines": {
- "node": ">=10"
+ "node": ">=12"
}
},
"node_modules/eslint-plugin-vue/node_modules/semver": {
- "version": "7.3.5",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
- "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+ "version": "7.3.6",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
+ "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
"dependencies": {
- "lru-cache": "^6.0.0"
+ "lru-cache": "^7.4.0"
},
"bin": {
"semver": "bin/semver.js"
},
"engines": {
- "node": ">=10"
+ "node": "^10.0.0 || ^12.0.0 || ^14.0.0 || >=16.0.0"
}
},
"node_modules/eslint-rule-docs": {
@@ -7888,9 +7895,9 @@
}
},
"node_modules/maplibre-gl": {
- "version": "2.1.7",
- "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-2.1.7.tgz",
- "integrity": "sha512-NWVIvz3ZHMAdvtieSEkSu9SnVOiQ/Jo/TJszUV3p29tv0dpanJbtbq6L3pHwzwe/rGbOm2MMj0hFVW+GTRoI1Q==",
+ "version": "2.1.9",
+ "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-2.1.9.tgz",
+ "integrity": "sha512-pnWJmILeZpgA5QSI7K7xFK3yrkyYTd9srw3fCi2Ca52Phm78hsznPwUErEQcZLfxXKn/1h9t8IPdj0TH0NBNbg==",
"hasInstallScript": true,
"dependencies": {
"@mapbox/geojson-rewind": "^0.5.1",
@@ -7901,6 +7908,10 @@
"@mapbox/unitbezier": "^0.0.1",
"@mapbox/vector-tile": "^1.3.1",
"@mapbox/whoots-js": "^3.1.0",
+ "@types/geojson": "^7946.0.8",
+ "@types/mapbox__point-geometry": "^0.1.2",
+ "@types/mapbox__vector-tile": "^1.3.0",
+ "@types/pbf": "^3.0.2",
"csscolorparser": "~1.0.3",
"earcut": "^2.2.3",
"geojson-vt": "^3.2.1",
@@ -9028,9 +9039,9 @@
}
},
"node_modules/postcss-custom-properties": {
- "version": "12.1.6",
- "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.6.tgz",
- "integrity": "sha512-QEnQkDkb+J+j2bfJisJJpTAFL+lUFl66rUNvnjPBIvRbZACLG4Eu5bmBCIY4FJCqhwsfbBpmJUyb3FcR/31lAg==",
+ "version": "12.1.7",
+ "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.7.tgz",
+ "integrity": "sha512-N/hYP5gSoFhaqxi2DPCmvto/ZcRDVjE3T1LiAMzc/bg53hvhcHOLpXOHb526LzBBp5ZlAUhkuot/bfpmpgStJg==",
"dependencies": {
"postcss-value-parser": "^4.2.0"
},
@@ -9272,28 +9283,25 @@
}
},
"node_modules/postcss-loader/node_modules/lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "dependencies": {
- "yallist": "^4.0.0"
- },
+ "version": "7.8.1",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.8.1.tgz",
+ "integrity": "sha512-E1v547OCgJvbvevfjgK9sNKIVXO96NnsTsFPBlg4ZxjhsJSODoH9lk8Bm0OxvHNm6Vm5Yqkl/1fErDxhYL8Skg==",
"engines": {
- "node": ">=10"
+ "node": ">=12"
}
},
"node_modules/postcss-loader/node_modules/semver": {
- "version": "7.3.5",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
- "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+ "version": "7.3.6",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
+ "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
"dependencies": {
- "lru-cache": "^6.0.0"
+ "lru-cache": "^7.4.0"
},
"bin": {
"semver": "bin/semver.js"
},
"engines": {
- "node": ">=10"
+ "node": "^10.0.0 || ^12.0.0 || ^14.0.0 || >=16.0.0"
}
},
"node_modules/postcss-logical": {
@@ -10283,9 +10291,9 @@
"integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
},
"node_modules/regenerator-transform": {
- "version": "0.14.5",
- "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz",
- "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==",
+ "version": "0.15.0",
+ "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
+ "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
"dependencies": {
"@babel/runtime": "^7.8.4"
}
@@ -10517,9 +10525,9 @@
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
},
"node_modules/sass": {
- "version": "1.49.11",
- "resolved": "https://registry.npmjs.org/sass/-/sass-1.49.11.tgz",
- "integrity": "sha512-wvS/geXgHUGs6A/4ud5BFIWKO1nKd7wYIGimDk4q4GFkJicILActpv9ueMT4eRGSsp1BdKHuw1WwAHXbhsJELQ==",
+ "version": "1.50.0",
+ "resolved": "https://registry.npmjs.org/sass/-/sass-1.50.0.tgz",
+ "integrity": "sha512-cLsD6MEZ5URXHStxApajEh7gW189kkjn4Rc8DQweMyF+o5HF5nfEz8QYLMlPsTOD88DknatTmBWkOcw5/LnJLQ==",
"dependencies": {
"chokidar": ">=3.0.0 <4.0.0",
"immutable": "^4.0.0",
@@ -11729,9 +11737,9 @@
}
},
"node_modules/uglify-js": {
- "version": "3.15.3",
- "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.3.tgz",
- "integrity": "sha512-6iCVm2omGJbsu3JWac+p6kUiOpg3wFO2f8lIXjfEb8RrmLjzog1wTPMmwKB7swfzzqxj9YM+sGUM++u1qN4qJg==",
+ "version": "3.15.4",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.4.tgz",
+ "integrity": "sha512-vMOPGDuvXecPs34V74qDKk4iJ/SN4vL3Ow/23ixafENYvtrNvtbcgUeugTcUGRGsOF/5fU8/NYSL5Hyb3l1OJA==",
"optional": true,
"bin": {
"uglifyjs": "bin/uglifyjs"
@@ -12016,28 +12024,25 @@
}
},
"node_modules/vue-eslint-parser/node_modules/lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "dependencies": {
- "yallist": "^4.0.0"
- },
+ "version": "7.8.1",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.8.1.tgz",
+ "integrity": "sha512-E1v547OCgJvbvevfjgK9sNKIVXO96NnsTsFPBlg4ZxjhsJSODoH9lk8Bm0OxvHNm6Vm5Yqkl/1fErDxhYL8Skg==",
"engines": {
- "node": ">=10"
+ "node": ">=12"
}
},
"node_modules/vue-eslint-parser/node_modules/semver": {
- "version": "7.3.5",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
- "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+ "version": "7.3.6",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
+ "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
"dependencies": {
- "lru-cache": "^6.0.0"
+ "lru-cache": "^7.4.0"
},
"bin": {
"semver": "bin/semver.js"
},
"engines": {
- "node": ">=10"
+ "node": "^10.0.0 || ^12.0.0 || ^14.0.0 || >=16.0.0"
}
},
"node_modules/vue-fullscreen": {
@@ -12257,9 +12262,9 @@
}
},
"node_modules/webpack": {
- "version": "5.71.0",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.71.0.tgz",
- "integrity": "sha512-g4dFT7CFG8LY0iU5G8nBL6VlkT21Z7dcYDpJAEJV5Q1WLb9UwnFbrem1k7K52ILqEmomN7pnzWFxxE6SlDY56A==",
+ "version": "5.72.0",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.72.0.tgz",
+ "integrity": "sha512-qmSmbspI0Qo5ld49htys8GY9XhS9CGqFoHTsOVAnjBdg0Zn79y135R+k4IR4rKK6+eKaabMhJwiVB7xw0SJu5w==",
"dependencies": {
"@types/eslint-scope": "^3.7.3",
"@types/estree": "^0.0.51",
@@ -12903,24 +12908,24 @@
"integrity": "sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ=="
},
"@babel/core": {
- "version": "7.17.8",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.8.tgz",
- "integrity": "sha512-OdQDV/7cRBtJHLSOBqqbYNkOcydOgnX59TZx4puf41fzcVtN3e/4yqY8lMQsK+5X2lJtAdmA+6OHqsj1hBJ4IQ==",
+ "version": "7.17.9",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.9.tgz",
+ "integrity": "sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw==",
"requires": {
"@ampproject/remapping": "^2.1.0",
"@babel/code-frame": "^7.16.7",
- "@babel/generator": "^7.17.7",
+ "@babel/generator": "^7.17.9",
"@babel/helper-compilation-targets": "^7.17.7",
"@babel/helper-module-transforms": "^7.17.7",
- "@babel/helpers": "^7.17.8",
- "@babel/parser": "^7.17.8",
+ "@babel/helpers": "^7.17.9",
+ "@babel/parser": "^7.17.9",
"@babel/template": "^7.16.7",
- "@babel/traverse": "^7.17.3",
+ "@babel/traverse": "^7.17.9",
"@babel/types": "^7.17.0",
"convert-source-map": "^1.7.0",
"debug": "^4.1.0",
"gensync": "^1.0.0-beta.2",
- "json5": "^2.1.2",
+ "json5": "^2.2.1",
"semver": "^6.3.0"
}
},
@@ -12935,9 +12940,9 @@
}
},
"@babel/generator": {
- "version": "7.17.7",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.7.tgz",
- "integrity": "sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w==",
+ "version": "7.17.9",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.9.tgz",
+ "integrity": "sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ==",
"requires": {
"@babel/types": "^7.17.0",
"jsesc": "^2.5.1",
@@ -12973,14 +12978,14 @@
}
},
"@babel/helper-create-class-features-plugin": {
- "version": "7.17.6",
- "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz",
- "integrity": "sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==",
+ "version": "7.17.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.9.tgz",
+ "integrity": "sha512-kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ==",
"requires": {
"@babel/helper-annotate-as-pure": "^7.16.7",
"@babel/helper-environment-visitor": "^7.16.7",
- "@babel/helper-function-name": "^7.16.7",
- "@babel/helper-member-expression-to-functions": "^7.16.7",
+ "@babel/helper-function-name": "^7.17.9",
+ "@babel/helper-member-expression-to-functions": "^7.17.7",
"@babel/helper-optimise-call-expression": "^7.16.7",
"@babel/helper-replace-supers": "^7.16.7",
"@babel/helper-split-export-declaration": "^7.16.7"
@@ -13027,21 +13032,12 @@
}
},
"@babel/helper-function-name": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz",
- "integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==",
+ "version": "7.17.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
+ "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
"requires": {
- "@babel/helper-get-function-arity": "^7.16.7",
"@babel/template": "^7.16.7",
- "@babel/types": "^7.16.7"
- }
- },
- "@babel/helper-get-function-arity": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz",
- "integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==",
- "requires": {
- "@babel/types": "^7.16.7"
+ "@babel/types": "^7.17.0"
}
},
"@babel/helper-hoist-variables": {
@@ -13164,19 +13160,19 @@
}
},
"@babel/helpers": {
- "version": "7.17.8",
- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.8.tgz",
- "integrity": "sha512-QcL86FGxpfSJwGtAvv4iG93UL6bmqBdmoVY0CMCU2g+oD2ezQse3PT5Pa+jiD6LJndBQi0EDlpzOWNlLuhz5gw==",
+ "version": "7.17.9",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz",
+ "integrity": "sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==",
"requires": {
"@babel/template": "^7.16.7",
- "@babel/traverse": "^7.17.3",
+ "@babel/traverse": "^7.17.9",
"@babel/types": "^7.17.0"
}
},
"@babel/highlight": {
- "version": "7.16.10",
- "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz",
- "integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==",
+ "version": "7.17.9",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
+ "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
"requires": {
"@babel/helper-validator-identifier": "^7.16.7",
"chalk": "^2.0.0",
@@ -13184,9 +13180,9 @@
}
},
"@babel/parser": {
- "version": "7.17.8",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.8.tgz",
- "integrity": "sha512-BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ=="
+ "version": "7.17.9",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.9.tgz",
+ "integrity": "sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg=="
},
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
"version": "7.16.7",
@@ -13597,9 +13593,9 @@
}
},
"@babel/plugin-transform-modules-commonjs": {
- "version": "7.17.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.7.tgz",
- "integrity": "sha512-ITPmR2V7MqioMJyrxUo2onHNC3e+MvfFiFIR0RP21d3PtlVb6sfzoxNKiphSZUOM9hEIdzCcZe83ieX3yoqjUA==",
+ "version": "7.17.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.9.tgz",
+ "integrity": "sha512-2TBFd/r2I6VlYn0YRTz2JdazS+FoUuQ2rIFHoAxtyP/0G3D82SBLaRq9rnUkpqlLg03Byfl/+M32mpxjO6KaPw==",
"requires": {
"@babel/helper-module-transforms": "^7.17.7",
"@babel/helper-plugin-utils": "^7.16.7",
@@ -13670,11 +13666,11 @@
}
},
"@babel/plugin-transform-regenerator": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz",
- "integrity": "sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==",
+ "version": "7.17.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.17.9.tgz",
+ "integrity": "sha512-Lc2TfbxR1HOyn/c6b4Y/b6NHoTb67n/IoWLxTu4kC7h4KQnWlhCq2S8Tx0t2SVvv5Uu87Hs+6JEJ5kt2tYGylQ==",
"requires": {
- "regenerator-transform": "^0.14.2"
+ "regenerator-transform": "^0.15.0"
}
},
"@babel/plugin-transform-reserved-words": {
@@ -13878,9 +13874,9 @@
}
},
"@babel/runtime": {
- "version": "7.17.8",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.8.tgz",
- "integrity": "sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA==",
+ "version": "7.17.9",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.9.tgz",
+ "integrity": "sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==",
"requires": {
"regenerator-runtime": "^0.13.4"
}
@@ -13896,17 +13892,17 @@
}
},
"@babel/traverse": {
- "version": "7.17.3",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz",
- "integrity": "sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==",
+ "version": "7.17.9",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.9.tgz",
+ "integrity": "sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw==",
"requires": {
"@babel/code-frame": "^7.16.7",
- "@babel/generator": "^7.17.3",
+ "@babel/generator": "^7.17.9",
"@babel/helper-environment-visitor": "^7.16.7",
- "@babel/helper-function-name": "^7.16.7",
+ "@babel/helper-function-name": "^7.17.9",
"@babel/helper-hoist-variables": "^7.16.7",
"@babel/helper-split-export-declaration": "^7.16.7",
- "@babel/parser": "^7.17.3",
+ "@babel/parser": "^7.17.9",
"@babel/types": "^7.17.0",
"debug": "^4.1.0",
"globals": "^11.1.0"
@@ -14218,6 +14214,11 @@
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
"integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="
},
+ "@types/geojson": {
+ "version": "7946.0.8",
+ "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.8.tgz",
+ "integrity": "sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA=="
+ },
"@types/json-schema": {
"version": "7.0.11",
"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
@@ -14228,6 +14229,21 @@
"resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
"integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4="
},
+ "@types/mapbox__point-geometry": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/@types/mapbox__point-geometry/-/mapbox__point-geometry-0.1.2.tgz",
+ "integrity": "sha512-D0lgCq+3VWV85ey1MZVkE8ZveyuvW5VAfuahVTQRpXFQTxw03SuIf1/K4UQ87MMIXVKzpFjXFiFMZzLj2kU+iA=="
+ },
+ "@types/mapbox__vector-tile": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/@types/mapbox__vector-tile/-/mapbox__vector-tile-1.3.0.tgz",
+ "integrity": "sha512-kDwVreQO5V4c8yAxzZVQLE5tyWF+IPToAanloQaSnwfXmIcJ7cyOrv8z4Ft4y7PsLYmhWXmON8MBV8RX0Rgr8g==",
+ "requires": {
+ "@types/geojson": "*",
+ "@types/mapbox__point-geometry": "*",
+ "@types/pbf": "*"
+ }
+ },
"@types/node": {
"version": "17.0.23",
"resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz",
@@ -14238,6 +14254,11 @@
"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
},
+ "@types/pbf": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/@types/pbf/-/pbf-3.0.2.tgz",
+ "integrity": "sha512-EDrLIPaPXOZqDjrkzxxbX7UlJSeQVgah3i0aA4pOSzmK9zq3BIh7/MZIQxED7slJByvKM4Gc6Hypyu2lJzh3SQ=="
+ },
"@ungap/promise-all-settled": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
@@ -15101,9 +15122,9 @@
}
},
"caniuse-lite": {
- "version": "1.0.30001325",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001325.tgz",
- "integrity": "sha512-sB1bZHjseSjDtijV1Hb7PB2Zd58Kyx+n/9EotvZ4Qcz2K3d0lWB8dB4nb8wN/TsOGFq3UuAm0zQZNQ4SoR7TrQ=="
+ "version": "1.0.30001327",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001327.tgz",
+ "integrity": "sha512-1/Cg4jlD9qjZzhbzkzEaAC2JHsP0WrOc8Rd/3a3LuajGzGWR/hD7TVyvq99VqmTy99eVh8Zkmdq213OgvgXx7w=="
},
"chai": {
"version": "4.3.6",
@@ -15540,19 +15561,16 @@
},
"dependencies": {
"lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "requires": {
- "yallist": "^4.0.0"
- }
+ "version": "7.8.1",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.8.1.tgz",
+ "integrity": "sha512-E1v547OCgJvbvevfjgK9sNKIVXO96NnsTsFPBlg4ZxjhsJSODoH9lk8Bm0OxvHNm6Vm5Yqkl/1fErDxhYL8Skg=="
},
"semver": {
- "version": "7.3.5",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
- "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+ "version": "7.3.6",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
+ "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
"requires": {
- "lru-cache": "^6.0.0"
+ "lru-cache": "^7.4.0"
}
}
}
@@ -15825,9 +15843,9 @@
}
},
"dom-serializer": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
- "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+ "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
"requires": {
"domelementtype": "^2.0.1",
"domhandler": "^4.2.0",
@@ -15835,9 +15853,9 @@
}
},
"domelementtype": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
- "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+ "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="
},
"domhandler": {
"version": "4.3.1",
@@ -15915,9 +15933,9 @@
}
},
"electron-to-chromium": {
- "version": "1.4.104",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.104.tgz",
- "integrity": "sha512-2kjoAyiG7uMyGRM9mx25s3HAzmQG2ayuYXxsFmYugHSDcwxREgLtscZvbL1JcW9S/OemeQ3f/SG6JhDwpnCclQ=="
+ "version": "1.4.106",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.106.tgz",
+ "integrity": "sha512-ZYfpVLULm67K7CaaGP7DmjyeMY4naxsbTy+syVVxT6QHI1Ww8XbJjmr9fDckrhq44WzCrcC5kH3zGpdusxwwqg=="
},
"emoji-regex": {
"version": "8.0.0",
@@ -16100,9 +16118,9 @@
"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
},
"eslint": {
- "version": "8.12.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.12.0.tgz",
- "integrity": "sha512-it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q==",
+ "version": "8.13.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.13.0.tgz",
+ "integrity": "sha512-D+Xei61eInqauAyTJ6C0q6x9mx7kTUC1KZ0m0LSEexR0V+e94K12LmWX076ZIsldwfQ2RONdaJe0re0TRGQbRQ==",
"requires": {
"@eslint/eslintrc": "^1.2.1",
"@humanwhocodes/config-array": "^0.9.2",
@@ -16619,19 +16637,16 @@
},
"dependencies": {
"lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "requires": {
- "yallist": "^4.0.0"
- }
+ "version": "7.8.1",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.8.1.tgz",
+ "integrity": "sha512-E1v547OCgJvbvevfjgK9sNKIVXO96NnsTsFPBlg4ZxjhsJSODoH9lk8Bm0OxvHNm6Vm5Yqkl/1fErDxhYL8Skg=="
},
"semver": {
- "version": "7.3.5",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
- "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+ "version": "7.3.6",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
+ "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
"requires": {
- "lru-cache": "^6.0.0"
+ "lru-cache": "^7.4.0"
}
}
}
@@ -18460,9 +18475,9 @@
}
},
"maplibre-gl": {
- "version": "2.1.7",
- "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-2.1.7.tgz",
- "integrity": "sha512-NWVIvz3ZHMAdvtieSEkSu9SnVOiQ/Jo/TJszUV3p29tv0dpanJbtbq6L3pHwzwe/rGbOm2MMj0hFVW+GTRoI1Q==",
+ "version": "2.1.9",
+ "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-2.1.9.tgz",
+ "integrity": "sha512-pnWJmILeZpgA5QSI7K7xFK3yrkyYTd9srw3fCi2Ca52Phm78hsznPwUErEQcZLfxXKn/1h9t8IPdj0TH0NBNbg==",
"requires": {
"@mapbox/geojson-rewind": "^0.5.1",
"@mapbox/jsonlint-lines-primitives": "^2.0.2",
@@ -18472,6 +18487,10 @@
"@mapbox/unitbezier": "^0.0.1",
"@mapbox/vector-tile": "^1.3.1",
"@mapbox/whoots-js": "^3.1.0",
+ "@types/geojson": "^7946.0.8",
+ "@types/mapbox__point-geometry": "^0.1.2",
+ "@types/mapbox__vector-tile": "^1.3.0",
+ "@types/pbf": "^3.0.2",
"csscolorparser": "~1.0.3",
"earcut": "^2.2.3",
"geojson-vt": "^3.2.1",
@@ -19267,9 +19286,9 @@
"requires": {}
},
"postcss-custom-properties": {
- "version": "12.1.6",
- "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.6.tgz",
- "integrity": "sha512-QEnQkDkb+J+j2bfJisJJpTAFL+lUFl66rUNvnjPBIvRbZACLG4Eu5bmBCIY4FJCqhwsfbBpmJUyb3FcR/31lAg==",
+ "version": "12.1.7",
+ "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.7.tgz",
+ "integrity": "sha512-N/hYP5gSoFhaqxi2DPCmvto/ZcRDVjE3T1LiAMzc/bg53hvhcHOLpXOHb526LzBBp5ZlAUhkuot/bfpmpgStJg==",
"requires": {
"postcss-value-parser": "^4.2.0"
}
@@ -19403,19 +19422,16 @@
},
"dependencies": {
"lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "requires": {
- "yallist": "^4.0.0"
- }
+ "version": "7.8.1",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.8.1.tgz",
+ "integrity": "sha512-E1v547OCgJvbvevfjgK9sNKIVXO96NnsTsFPBlg4ZxjhsJSODoH9lk8Bm0OxvHNm6Vm5Yqkl/1fErDxhYL8Skg=="
},
"semver": {
- "version": "7.3.5",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
- "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+ "version": "7.3.6",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
+ "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
"requires": {
- "lru-cache": "^6.0.0"
+ "lru-cache": "^7.4.0"
}
}
}
@@ -20103,9 +20119,9 @@
"integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
},
"regenerator-transform": {
- "version": "0.14.5",
- "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz",
- "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==",
+ "version": "0.15.0",
+ "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
+ "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
"requires": {
"@babel/runtime": "^7.8.4"
}
@@ -20283,9 +20299,9 @@
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
},
"sass": {
- "version": "1.49.11",
- "resolved": "https://registry.npmjs.org/sass/-/sass-1.49.11.tgz",
- "integrity": "sha512-wvS/geXgHUGs6A/4ud5BFIWKO1nKd7wYIGimDk4q4GFkJicILActpv9ueMT4eRGSsp1BdKHuw1WwAHXbhsJELQ==",
+ "version": "1.50.0",
+ "resolved": "https://registry.npmjs.org/sass/-/sass-1.50.0.tgz",
+ "integrity": "sha512-cLsD6MEZ5URXHStxApajEh7gW189kkjn4Rc8DQweMyF+o5HF5nfEz8QYLMlPsTOD88DknatTmBWkOcw5/LnJLQ==",
"requires": {
"chokidar": ">=3.0.0 <4.0.0",
"immutable": "^4.0.0",
@@ -21183,9 +21199,9 @@
"integrity": "sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ=="
},
"uglify-js": {
- "version": "3.15.3",
- "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.3.tgz",
- "integrity": "sha512-6iCVm2omGJbsu3JWac+p6kUiOpg3wFO2f8lIXjfEb8RrmLjzog1wTPMmwKB7swfzzqxj9YM+sGUM++u1qN4qJg==",
+ "version": "3.15.4",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.4.tgz",
+ "integrity": "sha512-vMOPGDuvXecPs34V74qDKk4iJ/SN4vL3Ow/23ixafENYvtrNvtbcgUeugTcUGRGsOF/5fU8/NYSL5Hyb3l1OJA==",
"optional": true
},
"uid-safe": {
@@ -21383,19 +21399,16 @@
"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
},
"lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "requires": {
- "yallist": "^4.0.0"
- }
+ "version": "7.8.1",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.8.1.tgz",
+ "integrity": "sha512-E1v547OCgJvbvevfjgK9sNKIVXO96NnsTsFPBlg4ZxjhsJSODoH9lk8Bm0OxvHNm6Vm5Yqkl/1fErDxhYL8Skg=="
},
"semver": {
- "version": "7.3.5",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
- "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+ "version": "7.3.6",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
+ "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
"requires": {
- "lru-cache": "^6.0.0"
+ "lru-cache": "^7.4.0"
}
}
}
@@ -21572,9 +21585,9 @@
}
},
"webpack": {
- "version": "5.71.0",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.71.0.tgz",
- "integrity": "sha512-g4dFT7CFG8LY0iU5G8nBL6VlkT21Z7dcYDpJAEJV5Q1WLb9UwnFbrem1k7K52ILqEmomN7pnzWFxxE6SlDY56A==",
+ "version": "5.72.0",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.72.0.tgz",
+ "integrity": "sha512-qmSmbspI0Qo5ld49htys8GY9XhS9CGqFoHTsOVAnjBdg0Zn79y135R+k4IR4rKK6+eKaabMhJwiVB7xw0SJu5w==",
"requires": {
"@types/eslint-scope": "^3.7.3",
"@types/estree": "^0.0.51",
diff --git a/frontend/src/component/navigation.vue b/frontend/src/component/navigation.vue
index 9f81bcda860..8fbfba391ab 100644
--- a/frontend/src/component/navigation.vue
+++ b/frontend/src/component/navigation.vue
@@ -583,10 +583,10 @@ export default {
this.edit.subscription = Event.subscribe("dialog.edit", (ev, data) => {
if (!this.edit.dialog) {
+ this.edit.dialog = true;
this.edit.index = data.index;
this.edit.selection = data.selection;
this.edit.album = data.album;
- this.edit.dialog = true;
}
});
},
diff --git a/frontend/src/component/photo/clipboard.vue b/frontend/src/component/photo/clipboard.vue
index 9cc310c9ddb..e25f65b6dc0 100644
--- a/frontend/src/component/photo/clipboard.vue
+++ b/frontend/src/component/photo/clipboard.vue
@@ -27,7 +27,7 @@
small
:title="$gettext('Share')"
color="share"
- :disabled="selection.length === 0"
+ :disabled="selection.length === 0 || busy"
class="action-share"
@click.stop="dialog.share = true"
>
@@ -39,7 +39,7 @@
small
:title="$gettext('Approve')"
color="share"
- :disabled="selection.length === 0"
+ :disabled="selection.length === 0 || busy"
class="action-approve"
@click.stop="batchApprove"
>
@@ -50,7 +50,7 @@
small
:title="$gettext('Edit')"
color="edit"
- :disabled="selection.length === 0"
+ :disabled="selection.length === 0 || busy"
class="action-edit"
@click.stop="edit"
>
@@ -61,7 +61,7 @@
small
:title="$gettext('Change private flag')"
color="private"
- :disabled="selection.length === 0"
+ :disabled="selection.length === 0 || busy"
class="action-private"
@click.stop="batchPrivate"
>
@@ -71,6 +71,7 @@
v-if="context !== 'archive' && features.download" fab dark
small
:title="$gettext('Download')"
+ :disabled="busy"
color="download"
class="action-download"
@click.stop="download()"
@@ -82,7 +83,7 @@
small
:title="$gettext('Add to album')"
color="album"
- :disabled="selection.length === 0"
+ :disabled="selection.length === 0 || busy"
class="action-album"
@click.stop="dialog.album = true"
>
@@ -93,7 +94,7 @@
small
color="remove"
:title="$gettext('Archive')"
- :disabled="selection.length === 0"
+ :disabled="selection.length === 0 || busy"
class="action-archive"
@click.stop="archivePhotos"
>
@@ -104,7 +105,7 @@
small
color="restore"
:title="$gettext('Restore')"
- :disabled="selection.length === 0"
+ :disabled="selection.length === 0 || busy"
class="action-restore"
@click.stop="batchRestore"
>
@@ -115,7 +116,7 @@
small
:title="$gettext('Remove from album')"
color="remove"
- :disabled="selection.length === 0"
+ :disabled="selection.length === 0 || busy"
class="action-remove"
@click.stop="removeFromAlbum"
>
@@ -126,7 +127,7 @@
small
:title="$gettext('Delete')"
color="remove"
- :disabled="selection.length === 0"
+ :disabled="selection.length === 0 || busy"
class="action-delete"
@click.stop="deletePhotos"
>
@@ -175,6 +176,7 @@ export default {
},
data() {
return {
+ busy: false,
config: this.$config.values,
features: this.$config.settings().features,
expanded: false,
@@ -194,7 +196,17 @@ export default {
this.expanded = false;
},
batchApprove() {
- Api.post("batch/photos/approve", {"photos": this.selection}).then(() => this.onApproved());
+ if (this.busy) {
+ return;
+ }
+
+ this.busy = true;
+
+ Api.post("batch/photos/approve", {"photos": this.selection})
+ .then(() => this.onApproved())
+ .finally(() => {
+ this.busy = false;
+ });
},
onApproved() {
Notify.success(this.$gettext("Selection approved"));
@@ -208,9 +220,18 @@ export default {
}
},
batchArchive() {
+ if (this.busy) {
+ return;
+ }
+
+ this.busy = true;
this.dialog.archive = false;
- Api.post("batch/photos/archive", {"photos": this.selection}).then(() => this.onArchived());
+ Api.post("batch/photos/archive", {"photos": this.selection})
+ .then(() => this.onArchived())
+ .finally(() => {
+ this.busy = false;
+ });
},
onArchived() {
Notify.success(this.$gettext("Selection archived"));
@@ -242,9 +263,22 @@ export default {
this.clearClipboard();
},
addToAlbum(ppid) {
+ if (!ppid) {
+ return;
+ }
+
+ if (this.busy) {
+ return;
+ }
+
+ this.busy = true;
this.dialog.album = false;
- Api.post(`albums/${ppid}/photos`, {"photos": this.selection}).then(() => this.onAdded());
+ Api.post(`albums/${ppid}/photos`, {"photos": this.selection})
+ .then(() => this.onAdded())
+ .finally(() => {
+ this.busy = false;
+ });
},
onAdded() {
this.clearClipboard();
@@ -255,22 +289,51 @@ export default {
return;
}
+ if (this.busy) {
+ return;
+ }
+
+ this.busy = true;
+
const uid = this.album.UID;
this.dialog.album = false;
- Api.delete(`albums/${uid}/photos`, {"data": {"photos": this.selection}}).then(() => this.onRemoved());
+ Api.delete(`albums/${uid}/photos`, {"data": {"photos": this.selection}})
+ .then(() => this.onRemoved())
+ .finally(() => {
+ this.busy = false;
+ });
},
onRemoved() {
this.clearClipboard();
},
download() {
+ if (this.busy) {
+ return;
+ }
+
+ this.busy = true;
+
switch (this.selection.length) {
- case 0: return;
- case 1: new Photo().find(this.selection[0]).then(p => p.downloadAll()); break;
- default: Api.post("zip", {"photos": this.selection}).then(r => {
- this.onDownload(`${this.$config.apiUri}/zip/${r.data.filename}?t=${this.$config.downloadToken()}`);
- });
+ case 0:
+ this.busy = false;
+ return;
+ case 1:
+ new Photo().find(this.selection[0])
+ .then(p => p.downloadAll())
+ .finally(() => {
+ this.busy = false;
+ });
+ break;
+ default:
+ Api.post("zip", {"photos": this.selection})
+ .then(r => {
+ this.onDownload(`${this.$config.apiUri}/zip/${r.data.filename}?t=${this.$config.downloadToken()}`);
+ })
+ .finally(() => {
+ this.busy = false;
+ });
}
Notify.success(this.$gettext("Downloading…"));
diff --git a/frontend/src/dialog/account/remove.vue b/frontend/src/dialog/account/remove.vue
index e587f388652..9f13df7875a 100644
--- a/frontend/src/dialog/account/remove.vue
+++ b/frontend/src/dialog/account/remove.vue
@@ -1,5 +1,5 @@
<template>
- <v-dialog v-model="show" lazy persistent max-width="350" class="p-account-delete-dialog" @keydown.esc="cancel">
+ <v-dialog :value="show" lazy persistent max-width="350" class="p-account-delete-dialog" @keydown.esc="cancel">
<v-card raised elevation="24">
<v-container fluid class="pb-2 pr-2 pl-2">
<v-layout row wrap>
diff --git a/frontend/src/dialog/album/delete.vue b/frontend/src/dialog/album/delete.vue
index 9a525991ad5..e2a0166af96 100644
--- a/frontend/src/dialog/album/delete.vue
+++ b/frontend/src/dialog/album/delete.vue
@@ -1,5 +1,5 @@
<template>
- <v-dialog v-model="show" lazy persistent max-width="350" class="p-album-delete-dialog" @keydown.esc="cancel">
+ <v-dialog :value="show" lazy persistent max-width="350" class="p-album-delete-dialog" @keydown.esc="cancel">
<v-card raised elevation="24">
<v-container fluid class="pb-2 pr-2 pl-2">
<v-layout row wrap>
diff --git a/frontend/src/dialog/album/edit.vue b/frontend/src/dialog/album/edit.vue
index f4ee133d7e6..98a3c689c82 100644
--- a/frontend/src/dialog/album/edit.vue
+++ b/frontend/src/dialog/album/edit.vue
@@ -1,5 +1,5 @@
<template>
- <v-dialog v-model="show" lazy persistent max-width="500" class="dialog-album-edit" color="application"
+ <v-dialog :value="show" lazy persistent max-width="500" class="dialog-album-edit" color="application"
@keydown.esc="close">
<v-form ref="form" lazy-validation
dense class="form-album-edit" accept-charset="UTF-8"
diff --git a/frontend/src/dialog/file/delete.vue b/frontend/src/dialog/file/delete.vue
index 23ba57cf6c8..4d2cf3e7b80 100644
--- a/frontend/src/dialog/file/delete.vue
+++ b/frontend/src/dialog/file/delete.vue
@@ -1,5 +1,5 @@
<template>
- <v-dialog v-model="show" lazy persistent max-width="350" class="p-file-delete-dialog" @keydown.esc="cancel">
+ <v-dialog :value="show" lazy persistent max-width="350" class="p-file-delete-dialog" @keydown.esc="cancel">
<v-card raised elevation="24">
<v-container fluid class="pb-2 pr-2 pl-2">
<v-layout row wrap>
diff --git a/frontend/src/dialog/label/delete.vue b/frontend/src/dialog/label/delete.vue
index 4da67618098..159d28241ab 100644
--- a/frontend/src/dialog/label/delete.vue
+++ b/frontend/src/dialog/label/delete.vue
@@ -1,5 +1,5 @@
<template>
- <v-dialog v-model="show" lazy persistent max-width="350" class="p-label-delete-dialog" @keydown.esc="cancel">
+ <v-dialog :value="show" lazy persistent max-width="350" class="p-label-delete-dialog" @keydown.esc="cancel">
<v-card raised elevation="24">
<v-container fluid class="pb-2 pr-2 pl-2">
<v-layout row wrap>
diff --git a/frontend/src/dialog/people/merge.vue b/frontend/src/dialog/people/merge.vue
index c05e230dcb1..15f8319c1e1 100644
--- a/frontend/src/dialog/people/merge.vue
+++ b/frontend/src/dialog/people/merge.vue
@@ -1,5 +1,5 @@
<template>
- <v-dialog v-model="show" lazy persistent max-width="350" class="p-people-merge-dialog" @keydown.esc="cancel">
+ <v-dialog :value="show" lazy persistent max-width="350" class="p-people-merge-dialog" @keydown.esc="cancel">
<v-card raised elevation="24">
<v-container fluid class="pb-2 pr-2 pl-2">
<v-layout row wrap>
diff --git a/frontend/src/dialog/photo/album.vue b/frontend/src/dialog/photo/album.vue
index 7108f66cc93..dc07c73ac39 100644
--- a/frontend/src/dialog/photo/album.vue
+++ b/frontend/src/dialog/photo/album.vue
@@ -90,6 +90,10 @@ export default {
this.$emit('cancel');
},
confirm() {
+ if (this.loading) {
+ return;
+ }
+
if (this.album) {
this.$emit('confirm', this.album);
} else if (this.newAlbum) {
@@ -98,6 +102,8 @@ export default {
this.newAlbum.save().then((a) => {
this.loading = false;
this.$emit('confirm', a.UID);
+ }).catch(() => {
+ this.loading = false;
});
}
},
@@ -116,14 +122,14 @@ export default {
};
Album.search(params).then(response => {
- this.loading = false;
this.albums = response.models;
this.items = [...this.albums];
this.$nextTick(() => this.$refs.input.focus());
}).catch(() => {
- this.loading = false;
this.$nextTick(() => this.$refs.input.focus());
- });
+ }).finally(() => {
+ this.loading = false;
+ })
},
},
};
diff --git a/frontend/src/dialog/photo/archive.vue b/frontend/src/dialog/photo/archive.vue
index 0f77811622c..858903eb6e1 100644
--- a/frontend/src/dialog/photo/archive.vue
+++ b/frontend/src/dialog/photo/archive.vue
@@ -1,5 +1,5 @@
<template>
- <v-dialog v-model="show" lazy persistent max-width="350" class="p-photo-archive-dialog" @keydown.esc="cancel">
+ <v-dialog :value="show" lazy persistent max-width="350" class="p-photo-archive-dialog" @keydown.esc="cancel">
<v-card raised elevation="24">
<v-container fluid class="pb-2 pr-2 pl-2">
<v-layout row wrap>
diff --git a/frontend/src/dialog/photo/delete.vue b/frontend/src/dialog/photo/delete.vue
index 408cecb9bb1..fad4ddc63ee 100644
--- a/frontend/src/dialog/photo/delete.vue
+++ b/frontend/src/dialog/photo/delete.vue
@@ -1,5 +1,5 @@
<template>
- <v-dialog v-model="show" lazy persistent max-width="350" class="p-photo-delete-dialog" @keydown.esc="cancel">
+ <v-dialog :value="show" lazy persistent max-width="350" class="p-photo-delete-dialog" @keydown.esc="cancel">
<v-card raised elevation="24">
<v-container fluid class="pb-2 pr-2 pl-2">
<v-layout row wrap>
diff --git a/frontend/src/dialog/photo/edit.vue b/frontend/src/dialog/photo/edit.vue
index d21f85bb271..d244b3ede1e 100644
--- a/frontend/src/dialog/photo/edit.vue
+++ b/frontend/src/dialog/photo/edit.vue
@@ -1,5 +1,5 @@
<template>
- <v-dialog v-model="show" fullscreen hide-overlay scrollable
+ <v-dialog :value="show" fullscreen hide-overlay scrollable
lazy persistent class="p-photo-edit-dialog" @keydown.esc="close">
<v-card color="application">
<v-toolbar dark flat color="navigation" :dense="$vuetify.breakpoint.smAndDown">
diff --git a/frontend/src/dialog/sponsor.vue b/frontend/src/dialog/sponsor.vue
index b7f66ca9607..1f978dc8079 100644
--- a/frontend/src/dialog/sponsor.vue
+++ b/frontend/src/dialog/sponsor.vue
@@ -1,5 +1,5 @@
<template>
- <v-dialog v-model="show" lazy persistent max-width="500" class="modal-dialog sponsor-dialog" @keydown.esc="close">
+ <v-dialog :value="show" lazy persistent max-width="500" class="modal-dialog sponsor-dialog" @keydown.esc="close">
<v-card raised elevation="24">
<v-card-title primary-title class="pb-0">
<v-layout row wrap>
diff --git a/frontend/src/dialog/upload.vue b/frontend/src/dialog/upload.vue
index c90f1d5c84a..1e2871997c0 100644
--- a/frontend/src/dialog/upload.vue
+++ b/frontend/src/dialog/upload.vue
@@ -1,5 +1,5 @@
<template>
- <v-dialog v-model="show" fullscreen hide-overlay scrollable
+ <v-dialog :value="show" fullscreen hide-overlay scrollable
lazy persistent class="p-upload-dialog" @keydown.esc="cancel">
<v-card color="application">
<v-toolbar dark flat color="navigation" :dense="$vuetify.breakpoint.smAndDown">
@@ -177,6 +177,10 @@ export default {
this.started = 0;
},
upload() {
+ if (this.busy) {
+ return;
+ }
+
this.selected = this.$refs.upload.files;
this.total = this.selected.length;
diff --git a/internal/api/album.go b/internal/api/album.go
index fb45013a259..f2f0ba767b8 100644
--- a/internal/api/album.go
+++ b/internal/api/album.go
@@ -5,6 +5,7 @@ import (
"net/http"
"path/filepath"
"strings"
+ "sync"
"time"
"github.com/gin-gonic/gin"
@@ -23,6 +24,8 @@ import (
"github.com/photoprism/photoprism/pkg/sanitize"
)
+var albumMutex = sync.Mutex{}
+
// SaveAlbumAsYaml saves album data as YAML file.
func SaveAlbumAsYaml(a entity.Album) {
c := service.Config()
@@ -84,10 +87,20 @@ func CreateAlbum(router *gin.RouterGroup) {
return
}
+ albumMutex.Lock()
+ defer albumMutex.Unlock()
+
a := entity.NewAlbum(f.AlbumTitle, entity.AlbumDefault)
a.AlbumFavorite = f.AlbumFavorite
- if res := entity.Db().Create(a); res.Error != nil {
+ // Search existing album.
+ if err := a.Find(); err == nil {
+ c.JSON(http.StatusOK, a)
+ return
+ }
+
+ // Create new album.
+ if err := a.Create(); err != nil {
AbortAlreadyExists(c, sanitize.Log(a.AlbumTitle))
return
}
@@ -138,7 +151,10 @@ func UpdateAlbum(router *gin.RouterGroup) {
return
}
- if err := a.SaveForm(f); err != nil {
+ albumMutex.Lock()
+ defer albumMutex.Unlock()
+
+ if err = a.SaveForm(f); err != nil {
log.Error(err)
AbortSaveFailed(c)
return
@@ -177,6 +193,9 @@ func DeleteAlbum(router *gin.RouterGroup) {
return
}
+ albumMutex.Lock()
+ defer albumMutex.Unlock()
+
// Regular, manually created album?
if a.IsDefault() {
// Soft delete manually created albums.
diff --git a/internal/entity/album.go b/internal/entity/album.go
index 752583fbc14..c7ac0c6cef2 100644
--- a/internal/entity/album.go
+++ b/internal/entity/album.go
@@ -247,14 +247,12 @@ func FindMonthAlbum(year, month int) *Album {
}
// FindAlbumBySlug finds a matching album or returns nil.
-func FindAlbumBySlug(albumSlug, albumType string) *Album {
+func FindAlbumBySlug(albumSlug, albumType string) (*Album, error) {
result := Album{}
- if err := UnscopedDb().Where("album_slug = ? AND album_type = ?", albumSlug, albumType).First(&result).Error; err != nil {
- return nil
- }
+ err := UnscopedDb().Where("album_slug = ? AND album_type = ?", albumSlug, albumType).First(&result).Error
- return &result
+ return &result, err
}
// FindAlbumByAttr finds an album by filters and slugs, or returns nil.
@@ -298,7 +296,7 @@ func FindFolderAlbum(albumPath string) *Album {
}
// Find returns an entity from the database.
-func (m *Album) Find() error {
+func (m *Album) Find() (err error) {
if rnd.IsPPID(m.AlbumUID, 'a') {
if err := UnscopedDb().First(m, "album_uid = ?", m.AlbumUID).Error; err != nil {
return err
@@ -318,14 +316,12 @@ func (m *Album) Find() error {
if m.AlbumType != AlbumDefault && m.AlbumFilter != "" {
stmt = stmt.Where("album_slug = ? OR album_filter = ?", m.AlbumSlug, m.AlbumFilter)
} else {
- stmt = stmt.Where("album_slug = ?", m.AlbumSlug)
+ stmt = stmt.Where("album_slug = ? OR album_title LIKE ?", m.AlbumSlug, m.AlbumTitle)
}
- if err := stmt.First(m).Error; err != nil {
- return err
- }
+ err = stmt.First(m).Error
- return nil
+ return err
}
// BeforeCreate creates a random UID if needed before inserting a new row to the database.
@@ -478,17 +474,17 @@ func (m *Album) SaveForm(f form.Album) error {
m.SetTitle(f.AlbumTitle)
}
- return Db().Save(m).Error
+ return m.Save()
}
// Update sets a new value for a database column.
func (m *Album) Update(attr string, value interface{}) error {
- return UnscopedDb().Model(m).UpdateColumn(attr, value).Error
+ return UnscopedDb().Model(m).Update(attr, value).Error
}
// Updates multiple columns in the database.
func (m *Album) Updates(values interface{}) error {
- return UnscopedDb().Model(m).UpdateColumns(values).Error
+ return UnscopedDb().Model(m).Updates(values).Error
}
// UpdateFolder updates the path, filter and slug for a folder album.
diff --git a/internal/entity/album_test.go b/internal/entity/album_test.go
index 08434bd2828..b4e35925b41 100644
--- a/internal/entity/album_test.go
+++ b/internal/entity/album_test.go
@@ -283,31 +283,37 @@ func TestNewMonthAlbum(t *testing.T) {
func TestFindAlbumBySlug(t *testing.T) {
t.Run("1 result", func(t *testing.T) {
- album := FindAlbumBySlug("holiday-2030", AlbumDefault)
+ album, err := FindAlbumBySlug("holiday-2030", AlbumDefault)
+ assert.NoError(t, err)
if album == nil {
- t.Fatal("expected to find an album")
+ t.Fatal("album should not be nil")
}
assert.Equal(t, "Holiday 2030", album.AlbumTitle)
assert.Equal(t, "holiday-2030", album.AlbumSlug)
})
t.Run("state album", func(t *testing.T) {
- album := FindAlbumBySlug("california-usa", AlbumState)
+ album, err := FindAlbumBySlug("california-usa", AlbumState)
+ assert.NoError(t, err)
if album == nil {
- t.Fatal("expected to find an album")
+ t.Fatal("album should not be nil")
}
assert.Equal(t, "California / USA", album.AlbumTitle)
assert.Equal(t, "california-usa", album.AlbumSlug)
})
t.Run("no result", func(t *testing.T) {
- album := FindAlbumBySlug("holiday-2030", AlbumMonth)
+ album, err := FindAlbumBySlug("holiday-2030", AlbumMonth)
+ assert.Error(t, err)
- if album != nil {
- t.Fatal("album should be nil")
+ if album == nil {
+ t.Fatal("album should not be nil")
}
+
+ assert.Equal(t, uint(0), album.ID)
+ assert.Equal(t, "", album.AlbumUID)
})
}
diff --git a/internal/entity/entity_counts.go b/internal/entity/entity_count.go
similarity index 93%
rename from internal/entity/entity_counts.go
rename to internal/entity/entity_count.go
index c5f2e83007a..73dbd325ad4 100644
--- a/internal/entity/entity_counts.go
+++ b/internal/entity/entity_count.go
@@ -11,6 +11,29 @@ import (
"github.com/photoprism/photoprism/internal/mutex"
)
+// Count returns the number of records for a given a model and key values.
+func Count(m interface{}, keys []string, values []interface{}) int {
+ if m == nil || len(keys) != len(values) {
+ log.Debugf("entity: invalid parameters (count records)")
+ return -1
+ }
+
+ var count int
+
+ stmt := Db().Model(m)
+
+ for k := range keys {
+ stmt.Where("? = ?", gorm.Expr(keys[k]), values[k])
+ }
+
+ if err := stmt.Count(&count).Error; err != nil {
+ log.Debugf("entity: %s (count records)", err)
+ return -1
+ }
+
+ return count
+}
+
type LabelPhotoCount struct {
LabelID int
PhotoCount int
diff --git a/internal/entity/entity_counts_test.go b/internal/entity/entity_count_test.go
similarity index 55%
rename from internal/entity/entity_counts_test.go
rename to internal/entity/entity_count_test.go
index 4b9fa481974..7260e157ea1 100644
--- a/internal/entity/entity_counts_test.go
+++ b/internal/entity/entity_count_test.go
@@ -2,8 +2,23 @@ package entity
import (
"testing"
+
+ "github.com/stretchr/testify/assert"
)
+func TestCount(t *testing.T) {
+ m := PhotoFixtures.Pointer("Photo01")
+ _, keys, err := ModelValues(m, "ID", "PhotoUID")
+
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ result := Count(m, []string{"ID", "PhotoUID"}, keys)
+
+ assert.Equal(t, 1, result)
+}
+
func TestLabelCounts(t *testing.T) {
results := LabelCounts()
diff --git a/internal/entity/entity_save.go b/internal/entity/entity_save.go
new file mode 100644
index 00000000000..ec12f415a13
--- /dev/null
+++ b/internal/entity/entity_save.go
@@ -0,0 +1,27 @@
+package entity
+
+import (
+ "fmt"
+ "runtime/debug"
+)
+
+// Save updates a record in the database, or inserts if it doesn't exist.
+func Save(m interface{}, keyNames ...string) (err error) {
+ defer func() {
+ if r := recover(); r != nil {
+ err = fmt.Errorf("entity: save failed (%s)\nstack: %s", r, debug.Stack())
+ log.Error(err)
+ }
+ }()
+
+ // Try updating first, then creating.
+ if err = Update(m, keyNames...); err == nil {
+ return nil
+ } else if err = UnscopedDb().Create(m).Error; err == nil {
+ return nil
+ } else if err = UnscopedDb().Save(m).Error; err != nil {
+ return err
+ }
+
+ return nil
+}
diff --git a/internal/entity/entity_save_test.go b/internal/entity/entity_save_test.go
new file mode 100644
index 00000000000..730ee39d6c4
--- /dev/null
+++ b/internal/entity/entity_save_test.go
@@ -0,0 +1,56 @@
+package entity
+
+import (
+ "math/rand"
+ "testing"
+ "time"
+
+ "github.com/photoprism/photoprism/pkg/rnd"
+)
+
+func TestSave(t *testing.T) {
+ var r = rand.New(rand.NewSource(time.Now().UnixNano()))
+
+ t.Run("HasCreatedUpdatedAt", func(t *testing.T) {
+ id := 99999 + r.Intn(10000)
+ m := Photo{ID: uint(id), PhotoUID: rnd.PPID('p'), UpdatedAt: TimeStamp(), CreatedAt: TimeStamp()}
+
+ if err := m.Save(); err != nil {
+ t.Fatal(err)
+ return
+ }
+
+ if err := m.Find(); err != nil {
+ t.Fatal(err)
+ return
+ }
+ })
+ t.Run("HasCreatedAt", func(t *testing.T) {
+ id := 99999 + r.Intn(10000)
+ m := Photo{ID: uint(id), PhotoUID: rnd.PPID('p'), CreatedAt: TimeStamp()}
+
+ if err := m.Save(); err != nil {
+ t.Fatal(err)
+ return
+ }
+
+ if err := m.Find(); err != nil {
+ t.Fatal(err)
+ return
+ }
+ })
+ t.Run("NoCreatedAt", func(t *testing.T) {
+ id := 99999 + r.Intn(10000)
+ m := Photo{ID: uint(id), PhotoUID: rnd.PPID('p'), CreatedAt: TimeStamp()}
+
+ if err := m.Save(); err != nil {
+ t.Fatal(err)
+ return
+ }
+
+ if err := m.Find(); err != nil {
+ t.Fatal(err)
+ return
+ }
+ })
+}
diff --git a/internal/entity/entity_update.go b/internal/entity/entity_update.go
index 8b21ee13ac0..c319c58c0cb 100644
--- a/internal/entity/entity_update.go
+++ b/internal/entity/entity_update.go
@@ -2,35 +2,8 @@ package entity
import (
"fmt"
- "runtime/debug"
- "strings"
-
- "github.com/jinzhu/gorm"
)
-// Save updates a record in the database, or inserts if it doesn't exist.
-func Save(m interface{}, keyNames ...string) (err error) {
- defer func() {
- if r := recover(); r != nil {
- err = fmt.Errorf("index: save failed (%s)\nstack: %s", r, debug.Stack())
- log.Error(err)
- }
- }()
-
- // Try updating first.
- if err = Update(m, keyNames...); err == nil {
- return nil
- } else if err = UnscopedDb().Save(m).Error; err == nil {
- return nil
- } else if !strings.Contains(strings.ToLower(err.Error()), "lock") {
- return err
- } else if err = UnscopedDb().Save(m).Error; err != nil {
- return err
- }
-
- return nil
-}
-
// Update updates an existing record in the database.
func Update(m interface{}, keyNames ...string) (err error) {
// New entity?
@@ -64,26 +37,3 @@ func Update(m interface{}, keyNames ...string) (err error) {
return err
}
-
-// Count returns the number of records for a given a model and key values.
-func Count(m interface{}, keys []string, values []interface{}) int {
- if m == nil || len(keys) != len(values) {
- log.Debugf("entity: invalid parameters (count records)")
- return -1
- }
-
- var count int
-
- stmt := Db().Model(m)
-
- for k := range keys {
- stmt.Where("? = ?", gorm.Expr(keys[k]), values[k])
- }
-
- if err := stmt.Count(&count).Error; err != nil {
- log.Debugf("entity: %s (count records)", err)
- return -1
- }
-
- return count
-}
diff --git a/internal/entity/entity_update_test.go b/internal/entity/entity_update_test.go
index 4a0544ae684..5175dfef7aa 100644
--- a/internal/entity/entity_update_test.go
+++ b/internal/entity/entity_update_test.go
@@ -5,56 +5,10 @@ import (
"testing"
"time"
- "github.com/photoprism/photoprism/pkg/rnd"
"github.com/stretchr/testify/assert"
-)
-
-func TestSave(t *testing.T) {
- var r = rand.New(rand.NewSource(time.Now().UnixNano()))
-
- t.Run("HasCreatedUpdatedAt", func(t *testing.T) {
- id := 99999 + r.Intn(10000)
- m := Photo{ID: uint(id), PhotoUID: rnd.PPID('p'), UpdatedAt: TimeStamp(), CreatedAt: TimeStamp()}
-
- if err := m.Save(); err != nil {
- t.Fatal(err)
- return
- }
- if err := m.Find(); err != nil {
- t.Fatal(err)
- return
- }
- })
- t.Run("HasCreatedAt", func(t *testing.T) {
- id := 99999 + r.Intn(10000)
- m := Photo{ID: uint(id), PhotoUID: rnd.PPID('p'), CreatedAt: TimeStamp()}
-
- if err := m.Save(); err != nil {
- t.Fatal(err)
- return
- }
-
- if err := m.Find(); err != nil {
- t.Fatal(err)
- return
- }
- })
- t.Run("NoCreatedAt", func(t *testing.T) {
- id := 99999 + r.Intn(10000)
- m := Photo{ID: uint(id), PhotoUID: rnd.PPID('p'), CreatedAt: TimeStamp()}
-
- if err := m.Save(); err != nil {
- t.Fatal(err)
- return
- }
-
- if err := m.Find(); err != nil {
- t.Fatal(err)
- return
- }
- })
-}
+ "github.com/photoprism/photoprism/pkg/rnd"
+)
func TestUpdate(t *testing.T) {
var r = rand.New(rand.NewSource(time.Now().UnixNano()))
diff --git a/internal/photoprism/moments.go b/internal/photoprism/moments.go
index 37a155f6e7b..eaddb8e3b75 100644
--- a/internal/photoprism/moments.go
+++ b/internal/photoprism/moments.go
@@ -36,7 +36,7 @@ func (w *Moments) MigrateSlug(m query.Moment, albumType string) {
return
}
- if a := entity.FindAlbumBySlug(m.TitleSlug(), albumType); a != nil {
+ if a, err := entity.FindAlbumBySlug(m.TitleSlug(), albumType); err == nil {
logWarn("moments", a.Update("album_slug", m.Slug()))
}
}
|
e8ac16ed527b88cd70081c811cbae45a03a4bde9
|
2022-05-30 22:00:53
|
Weblate
|
weblate: Update backend translations
| false
|
Update backend translations
|
weblate
|
diff --git a/assets/locales/ar/default.mo b/assets/locales/ar/default.mo
new file mode 100644
index 00000000000..917b78317f3
Binary files /dev/null and b/assets/locales/ar/default.mo differ
diff --git a/assets/locales/ar/default.po b/assets/locales/ar/default.po
new file mode 100644
index 00000000000..0f92bf0dac9
--- /dev/null
+++ b/assets/locales/ar/default.po
@@ -0,0 +1,328 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-12-09 00:51+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: ar\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: messages.go:83
+msgid "Unexpected error, please try again"
+msgstr ""
+
+#: messages.go:84
+msgid "Invalid request"
+msgstr ""
+
+#: messages.go:85
+msgid "Changes could not be saved"
+msgstr ""
+
+#: messages.go:86
+msgid "Could not be deleted"
+msgstr ""
+
+#: messages.go:87
+#, c-format
+msgid "%s already exists"
+msgstr ""
+
+#: messages.go:88
+msgid "Not found"
+msgstr ""
+
+#: messages.go:89
+msgid "File not found"
+msgstr ""
+
+#: messages.go:90
+msgid "Selection not found"
+msgstr ""
+
+#: messages.go:91
+msgid "Entity not found"
+msgstr ""
+
+#: messages.go:92
+msgid "Account not found"
+msgstr ""
+
+#: messages.go:93
+msgid "User not found"
+msgstr ""
+
+#: messages.go:94
+msgid "Label not found"
+msgstr ""
+
+#: messages.go:95
+msgid "Album not found"
+msgstr ""
+
+#: messages.go:96
+msgid "Subject not found"
+msgstr ""
+
+#: messages.go:97
+msgid "Person not found"
+msgstr ""
+
+#: messages.go:98
+msgid "Face not found"
+msgstr ""
+
+#: messages.go:99
+msgid "Not available in public mode"
+msgstr ""
+
+#: messages.go:100
+msgid "not available in read-only mode"
+msgstr ""
+
+#: messages.go:101
+msgid "Please log in and try again"
+msgstr ""
+
+#: messages.go:102
+msgid "Upload might be offensive"
+msgstr ""
+
+#: messages.go:103
+msgid "No items selected"
+msgstr ""
+
+#: messages.go:104
+msgid "Failed creating file, please check permissions"
+msgstr ""
+
+#: messages.go:105
+msgid "Failed creating folder, please check permissions"
+msgstr ""
+
+#: messages.go:106
+msgid "Could not connect, please try again"
+msgstr ""
+
+#: messages.go:107
+msgid "Invalid password, please try again"
+msgstr ""
+
+#: messages.go:108
+msgid "Feature disabled"
+msgstr ""
+
+#: messages.go:109
+msgid "No labels selected"
+msgstr ""
+
+#: messages.go:110
+msgid "No albums selected"
+msgstr ""
+
+#: messages.go:111
+msgid "No files available for download"
+msgstr ""
+
+#: messages.go:112
+msgid "Failed to create zip file"
+msgstr ""
+
+#: messages.go:113
+msgid "Invalid credentials"
+msgstr ""
+
+#: messages.go:114
+msgid "Invalid link"
+msgstr ""
+
+#: messages.go:115
+msgid "Invalid name"
+msgstr ""
+
+#: messages.go:116
+msgid "Busy, please try again later"
+msgstr ""
+
+#: messages.go:119
+msgid "Changes successfully saved"
+msgstr ""
+
+#: messages.go:120
+msgid "Album created"
+msgstr ""
+
+#: messages.go:121
+msgid "Album saved"
+msgstr ""
+
+#: messages.go:122
+#, c-format
+msgid "Album %s deleted"
+msgstr ""
+
+#: messages.go:123
+msgid "Album contents cloned"
+msgstr ""
+
+#: messages.go:124
+msgid "File removed from stack"
+msgstr ""
+
+#: messages.go:125
+msgid "File deleted"
+msgstr ""
+
+#: messages.go:126
+#, c-format
+msgid "Selection added to %s"
+msgstr ""
+
+#: messages.go:127
+#, c-format
+msgid "One entry added to %s"
+msgstr ""
+
+#: messages.go:128
+#, c-format
+msgid "%d entries added to %s"
+msgstr ""
+
+#: messages.go:129
+#, c-format
+msgid "One entry removed from %s"
+msgstr ""
+
+#: messages.go:130
+#, c-format
+msgid "%d entries removed from %s"
+msgstr ""
+
+#: messages.go:131
+msgid "Account created"
+msgstr ""
+
+#: messages.go:132
+msgid "Account saved"
+msgstr ""
+
+#: messages.go:133
+msgid "Account deleted"
+msgstr ""
+
+#: messages.go:134
+msgid "Settings saved"
+msgstr ""
+
+#: messages.go:135
+msgid "Password changed"
+msgstr ""
+
+#: messages.go:136
+#, c-format
+msgid "Import completed in %d s"
+msgstr ""
+
+#: messages.go:137
+msgid "Import canceled"
+msgstr ""
+
+#: messages.go:138
+#, c-format
+msgid "Indexing completed in %d s"
+msgstr ""
+
+#: messages.go:139
+msgid "Indexing originals..."
+msgstr ""
+
+#: messages.go:140
+#, c-format
+msgid "Indexing files in %s"
+msgstr ""
+
+#: messages.go:141
+msgid "Indexing canceled"
+msgstr ""
+
+#: messages.go:142
+#, c-format
+msgid "Removed %d files and %d photos"
+msgstr ""
+
+#: messages.go:143
+#, c-format
+msgid "Moving files from %s"
+msgstr ""
+
+#: messages.go:144
+#, c-format
+msgid "Copying files from %s"
+msgstr ""
+
+#: messages.go:145
+msgid "Labels deleted"
+msgstr ""
+
+#: messages.go:146
+msgid "Label saved"
+msgstr ""
+
+#: messages.go:147
+msgid "Subject saved"
+msgstr ""
+
+#: messages.go:148
+msgid "Subject deleted"
+msgstr ""
+
+#: messages.go:149
+msgid "Person saved"
+msgstr ""
+
+#: messages.go:150
+msgid "Person deleted"
+msgstr ""
+
+#: messages.go:151
+#, c-format
+msgid "%d files uploaded in %d s"
+msgstr ""
+
+#: messages.go:152
+msgid "Selection approved"
+msgstr ""
+
+#: messages.go:153
+msgid "Selection archived"
+msgstr ""
+
+#: messages.go:154
+msgid "Selection restored"
+msgstr ""
+
+#: messages.go:155
+msgid "Selection marked as private"
+msgstr ""
+
+#: messages.go:156
+msgid "Albums deleted"
+msgstr ""
+
+#: messages.go:157
+#, c-format
+msgid "Zip created in %d s"
+msgstr ""
+
+#: messages.go:158
+msgid "Permanently deleted"
+msgstr ""
|
6b1611424459edc97acaf88be2a72a74eb2f2aad
|
2020-08-26 17:00:26
|
Theresa Gresch
|
frontend: Update german translations
| false
|
Update german translations
|
frontend
| "diff --git a/frontend/src/locales/de.mo b/frontend/src/locales/de.mo\nindex 49e35cecbd4..7c83b72f86(...TRUNCATED)
|
1b27a80ada4b43c67498259f479a838cea2138ce
|
2022-10-24 16:03:03
|
Michael Mayer
|
config: Rename "imprint" option to "legal-info" #2797
| false
|
Rename "imprint" option to "legal-info" #2797
|
config
| "diff --git a/assets/templates/app.gohtml b/assets/templates/app.gohtml\nindex b1262f92050..8bdcd632(...TRUNCATED)
|
ab922041717900aba09b5aef4f5fa6144f978d84
|
2024-11-19 05:13:21
|
Anastasiia
|
frontend: fix styles on recognised people page #3168
| false
|
fix styles on recognised people page #3168
|
frontend
| "diff --git a/frontend/src/page/people/recognized.vue b/frontend/src/page/people/recognized.vue\nind(...TRUNCATED)
|
End of preview. Expand
in Data Studio
No dataset card yet
- Downloads last month
- 17