From 5237c9cab50425d524c99fd385f7e5db55dc8828 Mon Sep 17 00:00:00 2001 From: MateuszMichalowski <79852198+MateuszMichalowski@users.noreply.github.com> Date: Fri, 6 Dec 2024 20:58:36 +0100 Subject: [PATCH] feat(frontend): add feedback fixes + map feature fixes (#3400) --- admin/package.json | 4 +- .../ContributionLink/ContributionLinkForm.vue | 8 +- .../ContributionMessagesFormular.vue | 36 +- admin/src/components/input/TimePicker.vue | 19 +- admin/src/composables/useDateFormatter.js | 10 + admin/src/composables/useToast.js | 4 +- admin/yarn.lock | 312 ++++++----- frontend/package.json | 6 +- .../scss/custom/gradido-custom/_fonts.scss | 2 +- .../DecayInformations/CollapseLinksList.vue | 6 +- .../src/components/Inputs/InputUsername.vue | 19 +- .../Transactions/GddTransaction.vue | 10 +- .../UserSettings/UserGMSLocationFormat.vue | 3 +- .../UserSettings/UserGmsLocationCapturing.vue | 10 +- .../UserSettings/UserLocationMap.vue | 27 +- .../src/components/UserSettings/UserName.vue | 17 +- .../UserSettings/UserNamingFormat.vue | 3 +- frontend/src/composables/useToast.js | 4 +- frontend/src/pages/Settings.vue | 8 +- frontend/yarn.lock | 483 +++++------------- 20 files changed, 380 insertions(+), 611 deletions(-) create mode 100644 admin/src/composables/useDateFormatter.js diff --git a/admin/package.json b/admin/package.json index 0899fe83c..b395ce5f6 100644 --- a/admin/package.json +++ b/admin/package.json @@ -36,7 +36,7 @@ "babel-preset-env": "^1.7.0", "babel-preset-vue": "^2.0.2", "bootstrap": "^5.3.3", - "bootstrap-vue-next": "^0.23.2", + "bootstrap-vue-next": "0.26.8", "date-fns": "^2.29.3", "dotenv-webpack": "^7.0.3", "express": "^4.17.1", @@ -49,7 +49,7 @@ "sass": "^1.77.8", "vite": "3.2.10", "vite-plugin-commonjs": "^0.10.1", - "vue": "3.4.31", + "vue": "3.5.13", "vue-apollo": "3.1.2", "vue-i18n": "9.13.1", "vue-router": "4.4.0", diff --git a/admin/src/components/ContributionLink/ContributionLinkForm.vue b/admin/src/components/ContributionLink/ContributionLinkForm.vue index 20d78dc99..f67383aa4 100644 --- a/admin/src/components/ContributionLink/ContributionLinkForm.vue +++ b/admin/src/components/ContributionLink/ContributionLinkForm.vue @@ -125,6 +125,7 @@ import { createContributionLink } from '@/graphql/createContributionLink.js' import { updateContributionLink } from '@/graphql/updateContributionLink.js' import { useAppToast } from '@/composables/useToast' import { useI18n } from 'vue-i18n' +import { useDateFormatter } from '@/composables/useDateFormatter' const props = defineProps({ contributionLinkData: { @@ -138,6 +139,8 @@ const emit = defineEmits(['get-contribution-links', 'close-contribution-form']) const { t } = useI18n() +const { formatDateFromDateTime } = useDateFormatter() + const contributionLinkForm = ref(null) const form = ref({ @@ -201,11 +204,6 @@ const onSubmit = async () => { } } -const formatDateFromDateTime = (datetimeString) => { - if (!datetimeString || !datetimeString?.includes('T')) return datetimeString - return datetimeString.split('T')[0] -} - const onReset = () => { form.value = { validFrom: null, validTo: null } } diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue index af946fd56..34faf3f85 100644 --- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue +++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue @@ -8,8 +8,10 @@ - - +
+ + +
@@ -24,7 +26,7 @@ v-model="form.text" :placeholder="$t('contributionLink.memo')" rows="3" - > + />