diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js index b43ee51c4..e83ab16ac 100644 --- a/frontend/.eslintrc.js +++ b/frontend/.eslintrc.js @@ -4,7 +4,11 @@ module.exports = { 'plugin:vue/vue3-recommended' ], rules: { + "vue/no-v-html": "off", "vue/multi-word-component-names": "off", + "no-unused-vars": ["error", { + "varsIgnorePattern": "^_|props", + }], "vue/html-indent": ["error", 4, { "attribute": 1, "baseIndent": 1, diff --git a/frontend/npm-shrinkwrap.json b/frontend/npm-shrinkwrap.json index 2ad476ac2..5bc3a79e6 100644 --- a/frontend/npm-shrinkwrap.json +++ b/frontend/npm-shrinkwrap.json @@ -52,6 +52,7 @@ "imports-loader": "^4", "jquery": "^3.6.0", "leaflet": "^1.7.1", + "leaflet-defaulticon-compatibility": "^0.1.1", "leaflet.fullscreen": "^2", "lodash": "^4.17.21", "luxon": "^2", @@ -7271,6 +7272,11 @@ "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.9.3.tgz", "integrity": "sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ==" }, + "node_modules/leaflet-defaulticon-compatibility": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/leaflet-defaulticon-compatibility/-/leaflet-defaulticon-compatibility-0.1.1.tgz", + "integrity": "sha512-vDBFdlUAwjSEGep9ih8kfJilf6yN8V9zTbF5NC/1ZwLeGko3RUQepspPnGCRMFV51dY3Lb3hziboicrFz+rxQA==" + }, "node_modules/leaflet.fullscreen": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/leaflet.fullscreen/-/leaflet.fullscreen-2.4.0.tgz", @@ -17324,6 +17330,11 @@ "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.9.3.tgz", "integrity": "sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ==" }, + "leaflet-defaulticon-compatibility": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/leaflet-defaulticon-compatibility/-/leaflet-defaulticon-compatibility-0.1.1.tgz", + "integrity": "sha512-vDBFdlUAwjSEGep9ih8kfJilf6yN8V9zTbF5NC/1ZwLeGko3RUQepspPnGCRMFV51dY3Lb3hziboicrFz+rxQA==" + }, "leaflet.fullscreen": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/leaflet.fullscreen/-/leaflet.fullscreen-2.4.0.tgz", diff --git a/frontend/package.json b/frontend/package.json index 676ccaf9d..69dbcb763 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -53,6 +53,7 @@ "imports-loader": "^4", "jquery": "^3.6.0", "leaflet": "^1.7.1", + "leaflet-defaulticon-compatibility": "^0.1.1", "leaflet.fullscreen": "^2", "lodash": "^4.17.21", "luxon": "^2", diff --git a/frontend/vue/components/Account.vue b/frontend/vue/components/Account.vue index 4bf2ce9d8..559a9281b 100644 --- a/frontend/vue/components/Account.vue +++ b/frontend/vue/components/Account.vue @@ -237,11 +237,28 @@ import {useAxios} from "~/vendor/axios"; import {useSweetAlert} from "~/vendor/sweetalert"; const props = defineProps({ - userUrl: String, - changePasswordUrl: String, - twoFactorUrl: String, - apiKeysApiUrl: String, - supportedLocales: Object + userUrl: { + type: String, + required: true, + }, + changePasswordUrl: { + type: String, + required: true + }, + twoFactorUrl: { + type: String, + required: true + }, + apiKeysApiUrl: { + type: String, + required: true + }, + supportedLocales: { + type: Object, + default: () => { + return {}; + } + } }); const userLoading = ref(true); diff --git a/frontend/vue/components/Account/ApiKeyModal.vue b/frontend/vue/components/Account/ApiKeyModal.vue index ed27335dd..6f339c311 100644 --- a/frontend/vue/components/Account/ApiKeyModal.vue +++ b/frontend/vue/components/Account/ApiKeyModal.vue @@ -8,7 +8,7 @@ no-enforce-focus @hidden="clearContents" > -