From ccc04dd70682bb90c818b5ec0b07e7e7d0ddd74d Mon Sep 17 00:00:00 2001
From: MateuszMichalowski
<79852198+MateuszMichalowski@users.noreply.github.com>
Date: Sat, 9 Nov 2024 00:11:02 +0100
Subject: [PATCH] fix(frontend): fix postmigration fix (#3382)
* feat(frontend): migration fixes
* feat(admin): post migration fixes
* feat(admin): revert docker change
* feat(admin): update tests
* feat(frontend): add feedback fixes
---
frontend/package.json | 7 +-
.../src/assets/scss/gradido-template.scss | 9 ++
frontend/src/components/AppAvatar.vue | 135 ++++++++++++++++++
frontend/src/components/CommunitySwitch.vue | 1 -
.../ContributionMessagesListItem.vue | 36 ++++-
.../Contributions/ContributionListItem.vue | 18 ++-
.../CollapseLinksList.spec.js | 5 +-
.../components/GddSend/TransactionForm.vue | 26 ++--
frontend/src/components/Menu/Navbar.spec.js | 6 +-
frontend/src/components/Menu/Navbar.vue | 13 +-
.../components/SessionLogoutTimeout.spec.js | 119 ++++++++++-----
.../Template/ContentHeader/NavCommunity.vue | 1 +
.../Template/RightSide/LastTransactions.vue | 16 ++-
.../Transactions/GddTransaction.vue | 4 +-
.../Transactions/TransactionReceive.spec.js | 8 +-
.../Transactions/TransactionReceive.vue | 10 +-
.../Transactions/TransactionSend.spec.js | 8 +-
.../Transactions/TransactionSend.vue | 8 +-
.../components/UserSettings/UserCard.spec.js | 8 +-
.../src/components/UserSettings/UserCard.vue | 12 +-
.../UserSettings/UserNewsletter.spec.js | 43 ++++--
.../UserSettings/UserNewsletter.vue | 8 +-
frontend/vite.config.js | 11 +-
frontend/yarn.lock | 81 ++---------
24 files changed, 379 insertions(+), 214 deletions(-)
create mode 100644 frontend/src/components/AppAvatar.vue
diff --git a/frontend/package.json b/frontend/package.json
index 5756cfc20..5bc403506 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -26,11 +26,10 @@
"@vee-validate/i18n": "^4.13.2",
"@vee-validate/rules": "^4.13.2",
"@vee-validate/yup": "^4.13.2",
- "@vitejs/plugin-vue": "3.2.0",
+ "@vitejs/plugin-vue": "5.1.4",
"@vue-leaflet/vue-leaflet": "^0.10.1",
"@vue/apollo-composable": "^4.0.2",
"@vue/apollo-option": "^4.0.0",
- "@vue/compat": "^3.4.31",
"apollo-boost": "^0.4.9",
"autoprefixer": "^10.4.19",
"babel-core": "^7.0.0-bridge.0",
@@ -59,13 +58,10 @@
"vite-plugin-commonjs": "^0.10.1",
"vue": "3.4.31",
"vue-apollo": "^3.1.2",
- "vue-avatar": "^2.3.3",
"vue-flatpickr-component": "^8.1.2",
"vue-i18n": "^9.13.1",
- "vue-loading-overlay": "^3.4.2",
"vue-router": "^4.4.0",
"vue-timer-hook": "^1.0.84",
- "vue-timers": "^2.0.4",
"vuex": "^4.1.0",
"vuex-persistedstate": "^4.1.0",
"yup": "^1.4.0"
@@ -75,7 +71,6 @@
"@iconify-json/bi": "^1.1.23",
"@intlify/eslint-plugin-vue-i18n": "^1.4.0",
"@vitest/coverage-v8": "^2.0.5",
- "@vue/compiler-sfc": "^3.4.35",
"@vue/eslint-config-prettier": "^4.0.1",
"@vue/test-utils": "^2.4.5",
"babel-plugin-component": "^1.1.0",
diff --git a/frontend/src/assets/scss/gradido-template.scss b/frontend/src/assets/scss/gradido-template.scss
index ca6f8df3a..6c39946f1 100644
--- a/frontend/src/assets/scss/gradido-template.scss
+++ b/frontend/src/assets/scss/gradido-template.scss
@@ -359,3 +359,12 @@ input.rounded-input {
.fs-7 {
font-size: 14px !important;
}
+
+.vue3-avatar.container {
+ padding: 0 !important;
+}
+
+.avatar {
+ font-family: inherit !important;
+ font-weight: normal !important;
+}
diff --git a/frontend/src/components/AppAvatar.vue b/frontend/src/components/AppAvatar.vue
new file mode 100644
index 000000000..fdf1dc28a
--- /dev/null
+++ b/frontend/src/components/AppAvatar.vue
@@ -0,0 +1,135 @@
+
+