From 25de4326d2a6553553559b22c08fa2da74f8d31f Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Mon, 7 Oct 2024 21:11:21 +0200 Subject: [PATCH] fixed some things but page param still broken --- .../components/dialogs/MessageListDialog.vue | 62 ++++++++----- .../components/dialogs/ModelEditDialog.vue | 3 +- .../components/display/VSnackbarQueued.vue | 48 +++++----- vue3/src/locales/ar.json | 1 + vue3/src/locales/bg.json | 1 + vue3/src/locales/ca.json | 1 + vue3/src/locales/cs.json | 1 + vue3/src/locales/da.json | 1 + vue3/src/locales/de.json | 1 + vue3/src/locales/el.json | 1 + vue3/src/locales/en.json | 1 + vue3/src/locales/es.json | 1 + vue3/src/locales/fi.json | 1 + vue3/src/locales/fr.json | 1 + vue3/src/locales/he.json | 1 + vue3/src/locales/hu.json | 1 + vue3/src/locales/hy.json | 1 + vue3/src/locales/id.json | 1 + vue3/src/locales/is.json | 1 + vue3/src/locales/it.json | 1 + vue3/src/locales/lt.json | 1 + vue3/src/locales/nb_NO.json | 1 + vue3/src/locales/nl.json | 1 + vue3/src/locales/pl.json | 1 + vue3/src/locales/pt.json | 1 + vue3/src/locales/pt_BR.json | 1 + vue3/src/locales/ro.json | 1 + vue3/src/locales/ru.json | 1 + vue3/src/locales/sl.json | 1 + vue3/src/locales/sv.json | 1 + vue3/src/locales/tr.json | 1 + vue3/src/locales/uk.json | 1 + vue3/src/locales/zh_Hans.json | 1 + vue3/src/locales/zh_Hant.json | 1 + vue3/src/pages/ModelListPage.vue | 79 ++++++++++++----- vue3/src/stores/MessageStore.ts | 88 +++++++++++++++---- vue3/src/types/Models.ts | 19 +--- 37 files changed, 232 insertions(+), 98 deletions(-) diff --git a/vue3/src/components/dialogs/MessageListDialog.vue b/vue3/src/components/dialogs/MessageListDialog.vue index 85509c270..201b1816c 100644 --- a/vue3/src/components/dialogs/MessageListDialog.vue +++ b/vue3/src/components/dialogs/MessageListDialog.vue @@ -1,9 +1,9 @@ @@ -84,19 +90,21 @@ - Nachricht Details {{ DateTime.fromSeconds(detailItem.createdAt).toLocaleString(DateTime.DATETIME_MED) }} + {{$t('Created')}} {{ DateTime.fromSeconds(detailItem.createdAt).toLocaleString(DateTime.DATETIME_MED) }} - Typ + {{ $t('Type')}}
{{ detailItem.type }}
- Nachricht -

{{ detailItem.msg }}

+ {{$t('Messages')}} +
+ {{ detailItem.msg.title }}
+ {{ detailItem.msg.text }} - Data + {{ $t('Information')}}
{{ detailItem.data }}
@@ -118,8 +126,14 @@ import {computed, ref} from 'vue' import {Message, MessageType, useMessageStore} from "@/stores/MessageStore"; import {DateTime} from "luxon"; import {useClipboard} from "@vueuse/core"; +import {useI18n} from "vue-i18n"; const {copy} = useClipboard() +const {t} = useI18n() + +const props = defineProps({ + activator: {default: 'parent'} +}) /** * loads messages from store and filters them according to selected message types @@ -137,10 +151,10 @@ const displayItems = computed(() => { const sortBy = ref([{key: 'createdAt', order: 'desc'}]) const search = ref('') const tableHeaders = ref([ - {title: 'Typ', key: 'type'}, - {title: 'Erstellt', key: 'createdAt'}, - {title: 'Nachricht', key: 'msg'}, - {title: 'Actions', key: 'actions', align: 'end'}, + {title: t('Type'), key: 'type'}, + {title: t('Created'), key: 'createdAt'}, + {title: t('Message'), key: 'msg'}, + {title: t('Actions'), key: 'actions', align: 'end'}, ]) const typeFilter = ref([MessageType.SUCCESS, MessageType.INFO, MessageType.WARNING, MessageType.ERROR]) const detailItem = ref({} as Message) @@ -151,7 +165,7 @@ const showDetailDialog = ref(false) */ function addTestMessage() { let types = [MessageType.SUCCESS, MessageType.ERROR, MessageType.INFO, MessageType.WARNING] - useMessageStore().addMessage(types[Math.floor(Math.random() * types.length)], `Lorem Ipsum ${Math.random() * 1000}`, 5000, {json: "data", 'msg': 'whatever', data: 1}) + useMessageStore().addMessage(types[Math.floor(Math.random() * types.length)], {title: 'Test', text: `Lorem Ipsum ${Math.random() * 1000}`}, 5000, {json: "data", 'msg': 'whatever', data: 1}) } diff --git a/vue3/src/components/dialogs/ModelEditDialog.vue b/vue3/src/components/dialogs/ModelEditDialog.vue index cb6b89663..9f476582a 100644 --- a/vue3/src/components/dialogs/ModelEditDialog.vue +++ b/vue3/src/components/dialogs/ModelEditDialog.vue @@ -30,12 +30,13 @@ import SupermarketEditor from "@/components/model_editors/SupermarketEditor.vue" import SupermarketCategoryEditor from "@/components/model_editors/SupermarketCategoryEditor.vue"; import PropertyTypeEditor from "@/components/model_editors/PropertyTypeEditor.vue"; import AutomationEditor from "@/components/model_editors/AutomationEditor.vue"; +import {EditorSupportedModels} from "@/types/Models"; const emit = defineEmits(['create', 'save', 'delete']) const props = defineProps({ model: { - type: String as PropType<'UnitConversion' | 'AccessToken'| 'InviteLink' | 'UserSpace' | 'MealType' | 'Property' | 'Food' | 'Supermarket' | 'SupermarketCategory' | 'PropertyType' | 'Automation'>, + type: String as PropType, required: true, }, item: {default: null}, diff --git a/vue3/src/components/display/VSnackbarQueued.vue b/vue3/src/components/display/VSnackbarQueued.vue index d9a046d52..e019a80fb 100644 --- a/vue3/src/components/display/VSnackbarQueued.vue +++ b/vue3/src/components/display/VSnackbarQueued.vue @@ -1,29 +1,35 @@