From 63a789b7252c1830c23eb81cb2e9ff3525499559 Mon Sep 17 00:00:00 2001 From: carlossa Date: Thu, 30 Jan 2025 13:39:34 +0100 Subject: [PATCH] fix: refs #7408 fix zone and quasarConfig --- quasar.config.js | 11 ++++++++++- src/boot/global-components.js | 13 +++++++++++++ src/pages/Zone/Card/ZoneBasicData.vue | 4 ---- src/pages/Zone/Card/ZoneCreateWarehouse.vue | 2 -- src/pages/Zone/Card/ZoneDescriptor.vue | 1 - src/pages/Zone/Card/ZoneDescriptorMenuItems.vue | 3 --- src/pages/Zone/Card/ZoneEventExclusionForm.vue | 3 --- src/pages/Zone/Card/ZoneEventInclusionForm.vue | 11 +++-------- src/pages/Zone/Card/ZoneLocationsTree.vue | 6 ++---- src/pages/Zone/Card/ZoneSummary.vue | 3 --- src/pages/Zone/Card/ZoneWarehouses.vue | 1 - src/pages/Zone/Delivery/ZoneDeliveryList.vue | 1 - src/pages/Zone/Upcoming/ZoneUpcomingList.vue | 1 - src/pages/Zone/ZoneCreate.vue | 5 ----- src/pages/Zone/ZoneDeliveryPanel.vue | 1 - src/pages/Zone/ZoneFilterPanel.vue | 3 --- src/pages/Zone/ZoneList.vue | 8 ++------ src/pages/Zone/ZoneUpcoming.vue | 2 -- 18 files changed, 30 insertions(+), 49 deletions(-) create mode 100644 src/boot/global-components.js diff --git a/quasar.config.js b/quasar.config.js index 6d545c026..b83c70bad 100644 --- a/quasar.config.js +++ b/quasar.config.js @@ -29,7 +29,16 @@ export default configure(function (/* ctx */) { // app boot file (/src/boot) // --> boot files are part of "main.js" // https://v2.quasar.dev/quasar-cli/boot-files - boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar', 'quasar.defaults'], + boot: [ + 'i18n', + 'axios', + 'vnDate', + 'validations', + 'quasar', + 'quasar.defaults', + 'global-components', + ], + importStrategy: 'auto', // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css css: ['app.scss'], diff --git a/src/boot/global-components.js b/src/boot/global-components.js new file mode 100644 index 000000000..f83a0975b --- /dev/null +++ b/src/boot/global-components.js @@ -0,0 +1,13 @@ +// src/boot/vn-components.js +import { defineAsyncComponent } from 'vue'; + +const components = import.meta.glob('src/components/**/*.vue'); +export default ({ app }) => { + for (const path in components) { + const componentName = path + .split('/') + .pop() + .replace(/\.\w+$/, ''); + app.component(componentName, defineAsyncComponent(components[path])); + } +}; diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue index c38da614c..16895ae7f 100644 --- a/src/pages/Zone/Card/ZoneBasicData.vue +++ b/src/pages/Zone/Card/ZoneBasicData.vue @@ -4,11 +4,7 @@ import { useI18n } from 'vue-i18n'; import { ref } from 'vue'; import FetchData from 'components/FetchData.vue'; import FormModel from 'src/components/FormModel.vue'; -import VnRow from 'components/ui/VnRow.vue'; -import VnInput from 'src/components/common/VnInput.vue'; import { QCheckbox } from 'quasar'; -import VnInputTime from 'src/components/common/VnInputTime.vue'; -import VnSelect from 'src/components/common/VnSelect.vue'; const route = useRoute(); const { t } = useI18n(); diff --git a/src/pages/Zone/Card/ZoneCreateWarehouse.vue b/src/pages/Zone/Card/ZoneCreateWarehouse.vue index 88f6a7701..e3881965f 100644 --- a/src/pages/Zone/Card/ZoneCreateWarehouse.vue +++ b/src/pages/Zone/Card/ZoneCreateWarehouse.vue @@ -2,9 +2,7 @@ import { reactive, ref } from 'vue'; import { useI18n } from 'vue-i18n'; -import VnSelect from 'src/components/common/VnSelect.vue'; import FetchData from 'components/FetchData.vue'; -import VnRow from 'components/ui/VnRow.vue'; import FormPopup from 'components/FormPopup.vue'; const emit = defineEmits(['onSubmitCreateWarehouse']); diff --git a/src/pages/Zone/Card/ZoneDescriptor.vue b/src/pages/Zone/Card/ZoneDescriptor.vue index 8355c219e..73cb4ee9e 100644 --- a/src/pages/Zone/Card/ZoneDescriptor.vue +++ b/src/pages/Zone/Card/ZoneDescriptor.vue @@ -4,7 +4,6 @@ import { useRoute } from 'vue-router'; import { useI18n } from 'vue-i18n'; import CardDescriptor from 'components/ui/CardDescriptor.vue'; -import VnLv from 'src/components/ui/VnLv.vue'; import { toTimeFormat } from 'src/filters/date'; import { toCurrency } from 'filters/index'; diff --git a/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue b/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue index 3c45700cb..1fcf80477 100644 --- a/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue +++ b/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue @@ -3,9 +3,6 @@ import { useQuasar } from 'quasar'; import { useRouter } from 'vue-router'; import { useI18n } from 'vue-i18n'; const { dialog, notify } = useQuasar(); - -import VnConfirm from 'components/ui/VnConfirm.vue'; - import axios from 'axios'; const { t } = useI18n(); diff --git a/src/pages/Zone/Card/ZoneEventExclusionForm.vue b/src/pages/Zone/Card/ZoneEventExclusionForm.vue index 4b6aa52bd..12c683774 100644 --- a/src/pages/Zone/Card/ZoneEventExclusionForm.vue +++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue @@ -2,11 +2,8 @@ import { ref, computed, onMounted, reactive } from 'vue'; import { useI18n } from 'vue-i18n'; import { useRoute } from 'vue-router'; - -import VnRow from 'components/ui/VnRow.vue'; import FormPopup from 'components/FormPopup.vue'; import ZoneLocationsTree from './ZoneLocationsTree.vue'; -import VnInputDate from 'src/components/common/VnInputDate.vue'; import { useArrayData } from 'src/composables/useArrayData'; import { useVnConfirm } from 'composables/useVnConfirm'; diff --git a/src/pages/Zone/Card/ZoneEventInclusionForm.vue b/src/pages/Zone/Card/ZoneEventInclusionForm.vue index 805d03b27..d5af6496e 100644 --- a/src/pages/Zone/Card/ZoneEventInclusionForm.vue +++ b/src/pages/Zone/Card/ZoneEventInclusionForm.vue @@ -3,12 +3,7 @@ import { ref, computed, onMounted } from 'vue'; import { useI18n } from 'vue-i18n'; import { useRoute } from 'vue-router'; -import VnRow from 'components/ui/VnRow.vue'; import FormPopup from 'components/FormPopup.vue'; -import VnInputDate from 'src/components/common/VnInputDate.vue'; -import VnWeekdayPicker from 'src/components/common/VnWeekdayPicker.vue'; -import VnInputTime from 'components/common/VnInputTime.vue'; -import VnInput from 'src/components/common/VnInput.vue'; import { useArrayData } from 'src/composables/useArrayData'; import { useWeekdayStore } from 'src/stores/useWeekdayStore'; @@ -58,7 +53,7 @@ const arrayData = useArrayData('ZoneEvents'); const createEvent = async () => { eventInclusionFormData.value.weekDays = weekdayStore.toSet( - eventInclusionFormData.value.wdays + eventInclusionFormData.value.wdays, ); if (inclusionType.value == 'day') eventInclusionFormData.value.weekDays = ''; @@ -74,7 +69,7 @@ const createEvent = async () => { else await axios.put( `Zones/${route.params.id}/events/${props.event?.id}`, - eventInclusionFormData.value + eventInclusionFormData.value, ); await refetchEvents(); @@ -221,7 +216,7 @@ onMounted(() => { openConfirmationModal( t('zone.deleteTitle'), t('zone.deleteSubtitle'), - () => deleteEvent() + () => deleteEvent(), ) " /> diff --git a/src/pages/Zone/Card/ZoneLocationsTree.vue b/src/pages/Zone/Card/ZoneLocationsTree.vue index 5c87faf99..a5de18b32 100644 --- a/src/pages/Zone/Card/ZoneLocationsTree.vue +++ b/src/pages/Zone/Card/ZoneLocationsTree.vue @@ -1,11 +1,9 @@