From e0bf8f77bf9cc0966786f3f76ea789cecec910a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Fri, 16 Apr 2021 17:19:34 +0200 Subject: [PATCH] [pricelist][fix] real fix for loading pictures in cordova --- src/config.ts | 8 ++++++++ src/plugins/pricelist/components/CalculationTable.vue | 5 +++-- src/plugins/pricelist/components/DrinkModify.vue | 4 ++-- src/plugins/pricelist/pages/Receipts.vue | 4 ++-- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/config.ts b/src/config.ts index e690b1c..b38b794 100644 --- a/src/config.ts +++ b/src/config.ts @@ -1,6 +1,14 @@ +import {computed} from 'vue'; +import { LocalStorage } from 'quasar'; + const config = { baseURL: '/api', pollingInterval: 30000, }; +const baseURL = computed(() => +LocalStorage.getItem('baseURL') || config.baseURL +); + +export {baseURL} export default config; diff --git a/src/plugins/pricelist/components/CalculationTable.vue b/src/plugins/pricelist/components/CalculationTable.vue index 0b720e8..7254725 100644 --- a/src/plugins/pricelist/components/CalculationTable.vue +++ b/src/plugins/pricelist/components/CalculationTable.vue @@ -156,7 +156,7 @@ import { sort } from '../utils/sort'; import { DeleteObjects } from 'src/plugins/pricelist/utils/utils'; import { hasPermission } from 'src/utils/permission'; import { PERMISSIONS } from 'src/plugins/pricelist/permissions'; -import config from 'src/config'; +import { baseURL } from 'src/config'; export default defineComponent({ name: 'CalculationTable', @@ -477,7 +477,8 @@ export default defineComponent({ function image(uuid: string | undefined) { if (uuid) { - return `${config.baseURL}/pricelist/picture/${uuid}?size=256`; + console.log(baseURL.value) + return `${baseURL.value}/pricelist/picture/${uuid}?size=256`; } return 'no-image.svg'; } diff --git a/src/plugins/pricelist/components/DrinkModify.vue b/src/plugins/pricelist/components/DrinkModify.vue index c2b0969..d5c1bc2 100644 --- a/src/plugins/pricelist/components/DrinkModify.vue +++ b/src/plugins/pricelist/components/DrinkModify.vue @@ -149,7 +149,7 @@ import { Drink, DrinkPriceVolume, usePricelistStore } from '../store'; import DrinkPriceVolumes from './CalculationTable/DrinkPriceVolumes.vue'; import { clone, calc_min_prices, DeleteObjects, calc_cost_per_volume } from '../utils/utils'; import BuildManual from 'src/plugins/pricelist/components/CalculationTable/BuildManual.vue'; -import config from 'src/config'; +import { baseURL } from 'src/config'; import { hasPermission } from 'src/utils/permission'; import { PERMISSIONS } from 'src/plugins/pricelist/permissions'; @@ -273,7 +273,7 @@ export default defineComponent({ return imgsrc.value; } if (edit_drink.value?.uuid) { - return `${config.baseURL}/pricelist/picture/${edit_drink.value.uuid}?size=256`; + return `${baseURL.value}/pricelist/picture/${edit_drink.value.uuid}?size=256`; } return 'no-image.svg'; }); diff --git a/src/plugins/pricelist/pages/Receipts.vue b/src/plugins/pricelist/pages/Receipts.vue index ad2abf5..bb7232c 100644 --- a/src/plugins/pricelist/pages/Receipts.vue +++ b/src/plugins/pricelist/pages/Receipts.vue @@ -60,7 +60,7 @@ import BuildManualVolume from '../components/BuildManual/BuildManualVolume.vue'; import SearchInput from '../components/SearchInput.vue'; import { filter, Search } from '../utils/filter'; import { sort } from '../utils/sort'; -import config from 'src/config'; +import { baseURL } from 'src/config'; export default defineComponent({ name: 'Reciepts', components: { BuildManual, BuildManualVolume, SearchInput }, @@ -156,7 +156,7 @@ export default defineComponent({ const search_keys = computed(() => columns_drinks.filter((column) => column.filterable)); function image(uuid: string | undefined) { if (uuid) { - return `${config.baseURL}/pricelist/picture/${uuid}?size=256`; + return `${baseURL.value}/pricelist/picture/${uuid}?size=256`; } return 'no-image.svg'; }