From 088d0f110d32ff991711a4e56f13519a308b4449 Mon Sep 17 00:00:00 2001 From: Whitney O'Meara Date: Thu, 12 Sep 2024 12:39:08 +0000 Subject: [PATCH] ran the formatter --- service/src/main/frontend/quasar.config.js | 4 +- service/src/main/frontend/src/App.vue | 6 +- .../src/components/AddContentPanel.vue | 1 - .../frontend/src/components/BasemapItem.vue | 125 ++++---- .../frontend/src/components/BasemapsPanel.vue | 27 +- .../frontend/src/components/CardLoading.vue | 49 ++- .../frontend/src/components/ConfigPanel.vue | 19 +- .../frontend/src/components/ContentPanel.vue | 47 ++- .../src/components/FieldTypeInput.vue | 2 +- .../frontend/src/components/GeoIndexForm.vue | 128 ++++++-- .../main/frontend/src/components/GeoItem.vue | 185 ++++++++++-- .../main/frontend/src/components/GeoNav.vue | 1 - .../src/components/GeoToolboxPanel.vue | 2 - .../frontend/src/components/LeafletMap.vue | 48 +-- .../src/components/LookupQueryForm.vue | 22 +- .../src/components/ManualGeometryForm.vue | 19 +- .../src/components/ManualQueryForm.vue | 30 +- .../main/frontend/src/components/models.ts | 6 +- .../main/frontend/src/layouts/MainLayout.vue | 18 +- .../src/main/frontend/src/pages/IndexPage.vue | 49 +-- .../frontend/src/stores/basemaps-store.ts | 23 +- .../main/frontend/src/stores/content-store.ts | 45 +-- .../frontend/src/stores/feature-info-store.ts | 192 ++++++------ .../frontend/src/stores/geo-features-store.ts | 282 +++++++++++------- .../frontend/src/stores/manual-query-store.ts | 2 +- .../frontend/src/stores/simple-map-store.ts | 3 +- 26 files changed, 847 insertions(+), 488 deletions(-) diff --git a/service/src/main/frontend/quasar.config.js b/service/src/main/frontend/quasar.config.js index 85c306b..7c603b3 100644 --- a/service/src/main/frontend/quasar.config.js +++ b/service/src/main/frontend/quasar.config.js @@ -103,9 +103,7 @@ module.exports = configure(function (ctx) { // directives: [], // Quasar plugins - plugins: [ - 'Notify' - ], + plugins: ['Notify'], }, // animations: 'all', // --- includes all animations diff --git a/service/src/main/frontend/src/App.vue b/service/src/main/frontend/src/App.vue index 3f2e365..9ddc99c 100644 --- a/service/src/main/frontend/src/App.vue +++ b/service/src/main/frontend/src/App.vue @@ -6,7 +6,9 @@ import { onMounted } from 'vue'; onMounted(() => { - const basePath = process.env.BACKEND_BASE_PATH ? process.env.BACKEND_BASE_PATH : '/'; + const basePath = process.env.BACKEND_BASE_PATH + ? process.env.BACKEND_BASE_PATH + : '/'; const link = document.createElement('link'); link.rel = 'stylesheet'; @@ -19,4 +21,4 @@ onMounted(() => { script.src = basePath + 'map/webjars/leaflet/1.8.0/leaflet.js'; document.head.appendChild(script); }); - \ No newline at end of file + diff --git a/service/src/main/frontend/src/components/AddContentPanel.vue b/service/src/main/frontend/src/components/AddContentPanel.vue index f375bd3..d543c9c 100644 --- a/service/src/main/frontend/src/components/AddContentPanel.vue +++ b/service/src/main/frontend/src/components/AddContentPanel.vue @@ -65,4 +65,3 @@ defineProps(); const appState = appStateStore(); - diff --git a/service/src/main/frontend/src/components/BasemapItem.vue b/service/src/main/frontend/src/components/BasemapItem.vue index c6bc5d7..02f2282 100644 --- a/service/src/main/frontend/src/components/BasemapItem.vue +++ b/service/src/main/frontend/src/components/BasemapItem.vue @@ -1,69 +1,80 @@ - - \ No newline at end of file +function itemClick() { + radio.value?.set(); + enableBasemap(); +} + +function enableBasemap() { + // if we aren't currently selected then set the basemap, otherwise do nothing + if (basemaps.getBasemap.title != basemap.title) { + basemaps.setBasemap(basemap); + leafletMap.setBasemap(basemap); + } +} + diff --git a/service/src/main/frontend/src/components/BasemapsPanel.vue b/service/src/main/frontend/src/components/BasemapsPanel.vue index b634420..d79e142 100644 --- a/service/src/main/frontend/src/components/BasemapsPanel.vue +++ b/service/src/main/frontend/src/components/BasemapsPanel.vue @@ -1,5 +1,14 @@