From e9879caecc2e5c91679e58b2c8e161325be51918 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Thu, 6 Mar 2025 15:07:15 +0100 Subject: [PATCH 01/18] change column name, add symbol for opening all contribution details, add details --- admin/src/components/CollapseIcon.vue | 17 ++++++++ .../ContributionMessagesList.vue | 36 ++++++++-------- .../components/Tables/OpenCreationsTable.vue | 41 ++++++++++--------- admin/src/locales/de.json | 4 +- admin/src/locales/en.json | 4 +- admin/src/pages/CreationConfirm.vue | 10 ++--- 6 files changed, 67 insertions(+), 45 deletions(-) create mode 100644 admin/src/components/CollapseIcon.vue diff --git a/admin/src/components/CollapseIcon.vue b/admin/src/components/CollapseIcon.vue new file mode 100644 index 000000000..240aed498 --- /dev/null +++ b/admin/src/components/CollapseIcon.vue @@ -0,0 +1,17 @@ + + diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue index 14b640066..a465fe5a8 100644 --- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue +++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue @@ -1,17 +1,27 @@ + + diff --git a/admin/src/graphql/adminListContributions.js b/admin/src/graphql/adminListContributions.js index aa6c0c713..b5eca3477 100644 --- a/admin/src/graphql/adminListContributions.js +++ b/admin/src/graphql/adminListContributions.js @@ -26,6 +26,7 @@ export const adminListContributions = gql` id firstName lastName + email amount memo createdAt diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json index b2d72cb91..9e5f3bc0e 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -36,7 +36,7 @@ }, "contributionMessagesForm": { "resubmissionDateInPast": "Wiedervorlage Datum befindet sich in der Vergangenheit!", - "userDetailsRegisteredAt": "{firstName} {lastName} <{email}> hat sich am {createdAt} registriert." + "hasRegisteredAt": "hat sich am {createdAt} registriert." }, "contributions": { "all": "Alle", @@ -143,7 +143,7 @@ "plus": "+" }, "message": { - "request": "Die Anfrage wurde gesendet." + "request": "Die Eingabe wurde gespeichert." }, "moderator": { "history": "Die Daten wurden geändert. Dies sind die alten Daten.", diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json index 0eee027a3..7d71e8bf0 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -36,7 +36,7 @@ }, "contributionMessagesForm": { "resubmissionDateInPast": "Resubmission date is in the past!", - "userDetailsRegisteredAt": "{firstName} {lastName} <{email}> registered on {createdAt}." + "hasRegisteredAt": "registered on {createdAt}." }, "contributions": { "all": "All", @@ -74,8 +74,8 @@ "deleted_user": "All deleted user", "deny": "Reject", "description": "Description", - "e_mail": "E-mail", "details": "Details", + "e_mail": "E-mail", "edit": "edit", "enabled": "enabled", "error": "Error", @@ -143,7 +143,7 @@ "plus": "+" }, "message": { - "request": "Request has been sent." + "request": "The entry has been saved." }, "moderator": { "history": "The data has been changed. This is the old data.", diff --git a/backend/src/graphql/model/Contribution.ts b/backend/src/graphql/model/Contribution.ts index a0e7e4366..87240a47e 100644 --- a/backend/src/graphql/model/Contribution.ts +++ b/backend/src/graphql/model/Contribution.ts @@ -7,8 +7,9 @@ import { ObjectType, Field, Int } from 'type-graphql' export class Contribution { constructor(contribution: dbContribution, user?: User | null) { this.id = contribution.id - this.firstName = user ? user.firstName : null - this.lastName = user ? user.lastName : null + this.firstName = user?.firstName ?? null + this.lastName = user?.lastName ?? null + this.email = user?.emailContact?.email ?? null this.amount = contribution.amount this.memo = contribution.memo this.createdAt = contribution.createdAt @@ -37,6 +38,9 @@ export class Contribution { @Field(() => String, { nullable: true }) lastName: string | null + @Field(() => String, { nullable: true }) + email: string | null + @Field(() => Decimal) amount: Decimal diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index c1ee2d490..64bdd993e 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -51,8 +51,8 @@ "contribution": { "activity": "Tätigkeit", "alert": { - "answerQuestion": "Bitte beantworte diese Rückfrage.", - "answerQuestionToast": "Du hast eine Rückfrage auf einen Beitrag. Bitte antworte auf diese.", + "answerQuestion": "Zu diesem Beitrag liegt eine neue Nachricht vor.", + "answerQuestionToast": "Du hast neue Nachrichten.", "communityNoteList": "Hier findest du alle eingereichten und bestätigten Beiträge von allen Mitgliedern aus dieser Gemeinschaft.", "confirm": "bestätigt", "deleted": "gelöscht", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index ed23c4d27..a40034dff 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -51,8 +51,8 @@ "contribution": { "activity": "Activity", "alert": { - "answerQuestion": "Please answer the question.", - "answerQuestionToast": "You have a question about a post. Please reply to it.", + "answerQuestion": "There is a new message for this article.", + "answerQuestionToast": "You have new messages.", "communityNoteList": "Here you will find all submitted and confirmed contributions from all members of this community.", "confirm": "confirmed", "deleted": "deleted", From bd0c332612b51fd1495da7f61c1fc2361d246631 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Sat, 8 Mar 2025 09:13:24 +0100 Subject: [PATCH 03/18] modificate contribution detail layout --- .../ContributionMessagesList.vue | 22 ++++++++++++------- admin/src/graphql/adminListContributions.js | 1 + admin/src/locales/de.json | 5 +++++ admin/src/locales/en.json | 5 +++++ admin/src/pages/UserSearch.vue | 11 +++++++++- backend/src/graphql/model/Contribution.ts | 4 ++++ 6 files changed, 39 insertions(+), 9 deletions(-) diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue index e62dae7f0..8e1d5fcb7 100644 --- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue +++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue @@ -2,15 +2,17 @@
- - {{ contribution.firstName }} {{ contribution.lastName }} <{{ contribution.email }}> - + + {{ contribution.firstName }} {{ contribution.lastName }} +   - {{ - $t('contributionMessagesForm.hasRegisteredAt', { - createdAt: new Date(contribution.createdAt).toLocaleString(), - }) - }} + {{ contribution.email }} +   + {{ contribution.username }} +   Humhub-Profil + + + {{ $t('registered') }}: {{ new Date(contribution.createdAt).toLocaleString() }} @@ -42,6 +44,7 @@ import { useQuery } from '@vue/apollo-composable' import { adminListContributionMessages } from '../../graphql/adminListContributionMessages.js' import { useAppToast } from '@/composables/useToast' +import { BListGroupItem } from 'bootstrap-vue-next' const props = defineProps({ contribution: { @@ -63,6 +66,9 @@ const { toastError } = useAppToast() const mailtoLink = computed(() => { return `mailto:${props.contribution.email}` }) +const searchLink = computed(() => { + return `/user?search=${props.contribution.email}` +}) const messages = ref([]) diff --git a/admin/src/graphql/adminListContributions.js b/admin/src/graphql/adminListContributions.js index b5eca3477..4329fef05 100644 --- a/admin/src/graphql/adminListContributions.js +++ b/admin/src/graphql/adminListContributions.js @@ -27,6 +27,7 @@ export const adminListContributions = gql` firstName lastName email + username amount memo createdAt diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json index 9e5f3bc0e..0ceb46d8f 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -119,6 +119,10 @@ "describe": "Teilt Koordinaten im Format 'Breitengrad, Längengrad' automatisch auf. Fügen sie hier einfach z.B. ihre Koordinaten von Google Maps, zum Beispiel: 49.28187664243721, 9.740672183943639, ein." } }, + "goTo": { + "userSearch": "Zur Nutzersuche gehen", + "humhubProfile": "Zum Humhub Profil gehen" + }, "help": { "help": "Hilfe", "transactionlist": { @@ -226,6 +230,7 @@ }, "redeemed": "eingelöst", "removeNotSelf": "Als Admin/Moderator kannst du dich nicht selber löschen.", + "registered": "Registriert", "reset": "Zurücksetzen", "save": "Speichern", "statistic": { diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json index 7d71e8bf0..ef626311a 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -119,6 +119,10 @@ "describe": "Automatically splits coordinates in the format 'latitude, longitude'. Simply enter your coordinates from Google Maps here, for example: 49.28187664243721, 9.740672183943639." } }, + "goTo": { + "userSearch": "Go to user search", + "humhubProfile": "Go to Humhub profile" + }, "help": { "help": "Help", "transactionlist": { @@ -226,6 +230,7 @@ }, "redeemed": "redeemed", "removeNotSelf": "As an admin/moderator, you cannot delete yourself.", + "registered": "Registered", "reset": "Reset", "save": "Save", "statistic": { diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue index 72fa15934..78bfc7e90 100644 --- a/admin/src/pages/UserSearch.vue +++ b/admin/src/pages/UserSearch.vue @@ -43,8 +43,9 @@
diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue index 56ff980f0..824c9e141 100644 --- a/admin/src/components/Tables/OpenCreationsTable.vue +++ b/admin/src/components/Tables/OpenCreationsTable.vue @@ -126,6 +126,7 @@ @update-status="updateStatus" @reload-contribution="reloadContribution" @update-contributions="updateContributions" + @search-for-email="$emit('search-for-email', $event)" /> @@ -173,7 +174,13 @@ export default { required: false, }, }, - emits: ['update-contributions', 'reload-contribution', 'update-status', 'show-overlay'], + emits: [ + 'update-contributions', + 'reload-contribution', + 'update-status', + 'show-overlay', + 'search-for-email', + ], data() { return { slotIndex: 0, diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json index bce6fc229..a5c4d2e37 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -99,6 +99,9 @@ "verified": "Verifiziert", "verifiedAt": "Verifiziert am" }, + "filter": { + "byEmail": "Nach E-Mail filtern" + }, "firstname": "Vorname", "footer": { "app_version": "App version {version}", diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json index 52555f12b..b3f500564 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -99,6 +99,9 @@ "verified": "Verified", "verifiedAt": "Verified at" }, + "filter": { + "byEmail": "Filter by email" + }, "firstname": "Firstname", "footer": { "app_version": "App version {version}", diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index 7095d93c6..d9497df7a 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -58,6 +58,7 @@ @update-status="updateStatus" @reload-contribution="reloadContribution" @update-contributions="refetch" + @search-for-email="query = $event" /> Date: Mon, 10 Mar 2025 12:49:33 +0100 Subject: [PATCH 08/18] fix lint --- .../components/ContributionMessages/ContributionMessagesList.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue index 7f365298f..9b6285a21 100644 --- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue +++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue @@ -119,6 +119,7 @@ const searchForEmail = () => { .temp-message { margin-top: 50px; } + .cursor-pointer { cursor: pointer; } From 758e3703492c702beb79e6b1b6686d70d708d680 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Mon, 10 Mar 2025 14:52:25 +0100 Subject: [PATCH 09/18] use bootstrap pointer css class --- .../ContributionMessages/ContributionMessagesList.vue | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue index 9b6285a21..69c9bebfe 100644 --- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue +++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue @@ -7,7 +7,7 @@   {{ contribution.email }} - + {{ $t('filter.byEmail') }} @@ -119,8 +119,4 @@ const searchForEmail = () => { .temp-message { margin-top: 50px; } - -.cursor-pointer { - cursor: pointer; -} From 85409f4a48faaf81a2f90a3a3fc1500506c34de2 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Mon, 10 Mar 2025 15:08:50 +0100 Subject: [PATCH 10/18] add underline for links on auth page --- frontend/src/assets/scss/auth-navbar.scss | 6 ++++++ frontend/src/assets/scss/custom/gradido-custom/_color.scss | 2 +- frontend/src/assets/scss/custom/gradido-custom/_links.scss | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/frontend/src/assets/scss/auth-navbar.scss b/frontend/src/assets/scss/auth-navbar.scss index 7fce0520c..1dcd038d5 100644 --- a/frontend/src/assets/scss/auth-navbar.scss +++ b/frontend/src/assets/scss/auth-navbar.scss @@ -5,3 +5,9 @@ .auth-navbar > a.router-link-exact-active { color: #383838; } + +.auth-template a:hover, +.auth-template .btn:hover, +.auth-template .language-switch .locales:hover { + text-decoration: underline; +} diff --git a/frontend/src/assets/scss/custom/gradido-custom/_color.scss b/frontend/src/assets/scss/custom/gradido-custom/_color.scss index ca57cea6d..b741f6be3 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_color.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_color.scss @@ -19,7 +19,7 @@ $gradido-205: rgb(205 86 86) ; $gradido-197: rgb(197 141 56) ; $gradido-209: rgb(209 209 209) ; $gradido-4: rgb(4 112 6) ; -$gradido-56: rgb(56, 56, 56) ; +$gradido-56: rgb(56 56 56) ; $black: #000 ; $grays: () ; $grays: map.merge( diff --git a/frontend/src/assets/scss/custom/gradido-custom/_links.scss b/frontend/src/assets/scss/custom/gradido-custom/_links.scss index 7a0474cef..d7d5e1a1a 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_links.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_links.scss @@ -4,5 +4,5 @@ $link-color: $gradido-4; $link-decoration: none ; $link-hover-color: $gradido-56; -$link-hover-decoration: none ; +$link-hover-decoration: underline; $link-active-color: $gradido-56; From bf836e721638342b7bba6e5ed8d7d557f34b7e73 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 11 Mar 2025 10:55:24 +0100 Subject: [PATCH 11/18] make auth nav link span if active --- frontend/src/components/Auth/AuthNavbar.vue | 9 +++++++-- .../src/components/Auth/AuthNavbarSmall.vue | 5 +++-- frontend/src/components/Menu/NavItem.vue | 19 +++++++++++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 frontend/src/components/Menu/NavItem.vue diff --git a/frontend/src/components/Auth/AuthNavbar.vue b/frontend/src/components/Auth/AuthNavbar.vue index 456914f2a..710d15b30 100644 --- a/frontend/src/components/Auth/AuthNavbar.vue +++ b/frontend/src/components/Auth/AuthNavbar.vue @@ -8,9 +8,13 @@ - {{ $t('signup') }} + + {{ $t('signup') }} + {{ $t('|') }} - {{ $t('signin') }} + + {{ $t('signin') }} + @@ -19,6 +23,7 @@ diff --git a/frontend/src/components/Menu/NavItem.vue b/frontend/src/components/Menu/NavItem.vue new file mode 100644 index 000000000..af8760dce --- /dev/null +++ b/frontend/src/components/Menu/NavItem.vue @@ -0,0 +1,19 @@ + + + From 5af93fe1f40ee29648dccb627003f5e784003b0e Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 11 Mar 2025 13:22:56 +0100 Subject: [PATCH 12/18] use gear instead of fingerprint for settting icon, replace svg icon with iconify icon --- frontend/package.json | 4 +++ .../scss/custom/gradido-custom/_color.scss | 1 + frontend/src/assets/scss/gradido.scss | 1 + frontend/src/assets/scss/navbar.scss | 4 +++ frontend/src/components/Menu/Sidebar.vue | 22 +++++++-------- frontend/yarn.lock | 28 +++++++++++++++++++ 6 files changed, 49 insertions(+), 11 deletions(-) create mode 100644 frontend/src/assets/scss/navbar.scss diff --git a/frontend/package.json b/frontend/package.json index 48b2100e1..3bcb82bb8 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -72,7 +72,11 @@ }, "devDependencies": { "@apollo/client": "^3.10.8", + "@iconify-json/arcticons": "^1.2.20", "@iconify-json/bi": "^1.1.23", + "@iconify-json/fa": "^1.2.1", + "@iconify-json/ion": "^1.2.2", + "@iconify-json/mdi": "^1.2.3", "@intlify/eslint-plugin-vue-i18n": "^1.4.0", "@vitest/coverage-v8": "^2.0.5", "@vue/eslint-config-prettier": "^4.0.1", diff --git a/frontend/src/assets/scss/custom/gradido-custom/_color.scss b/frontend/src/assets/scss/custom/gradido-custom/_color.scss index b741f6be3..b2d2fe9da 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_color.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_color.scss @@ -20,6 +20,7 @@ $gradido-197: rgb(197 141 56) ; $gradido-209: rgb(209 209 209) ; $gradido-4: rgb(4 112 6) ; $gradido-56: rgb(56 56 56) ; +$gradido-114: rgb(114 119 143) ; $black: #000 ; $grays: () ; $grays: map.merge( diff --git a/frontend/src/assets/scss/gradido.scss b/frontend/src/assets/scss/gradido.scss index 6a872ee37..1a8ef07d6 100644 --- a/frontend/src/assets/scss/gradido.scss +++ b/frontend/src/assets/scss/gradido.scss @@ -53,3 +53,4 @@ @import "auth-navbar"; +@import "navbar"; diff --git a/frontend/src/assets/scss/navbar.scss b/frontend/src/assets/scss/navbar.scss new file mode 100644 index 000000000..a3b144e91 --- /dev/null +++ b/frontend/src/assets/scss/navbar.scss @@ -0,0 +1,4 @@ +.nav-item .nav-link svg.svg-icon { + height: 20px; + color: $gradido-114; +} diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue index 706d0ead5..2411ef0f5 100644 --- a/frontend/src/components/Menu/Sidebar.vue +++ b/frontend/src/components/Menu/Sidebar.vue @@ -10,43 +10,43 @@
- + {{ $t('navigation.overview') }}
- + {{ $t('navigation.send') }}
- - {{ $t('navigation.transactions') }} + + {{ $t('navigation.transactions') }}
- + {{ $t('creation') }}
- - {{ $t('navigation.info') }} + + {{ $t('navigation.info') }}
- + {{ $t('navigation.circles') }}
- + {{ $t('navigation.usersearch') }}
@@ -61,8 +61,8 @@ >
- - {{ $t('navigation.settings') }} + + {{ $t('navigation.settings') }}
{{ $t('settings.newSettings') }} diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 9eb891787..40a8c900a 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1104,6 +1104,13 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3" integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA== +"@iconify-json/arcticons@^1.2.20": + version "1.2.20" + resolved "https://registry.yarnpkg.com/@iconify-json/arcticons/-/arcticons-1.2.20.tgz#11f3dccd50883702ba36f0e87b009e4c1690a1a7" + integrity sha512-OhAmLjf8KAGKX9Uo4ionTp1znYScjb65h8YaPtR8vWIkK0A6acHucld7MkgL0aMLvnQ+Npph6K4NYCDZeL5f1g== + dependencies: + "@iconify/types" "*" + "@iconify-json/bi@^1.1.23": version "1.2.2" resolved "https://registry.yarnpkg.com/@iconify-json/bi/-/bi-1.2.2.tgz#0f64d20323904f11546cadd0dc75f2fd024a46f8" @@ -1111,6 +1118,27 @@ dependencies: "@iconify/types" "*" +"@iconify-json/fa@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@iconify-json/fa/-/fa-1.2.1.tgz#9ccfad18e1ac1011f088d487aadc35bf45fa2807" + integrity sha512-aY2+tQNWq5ch+ShtAz3KKbNrFfwf4BPrXvyN7S4/lcf6Wms+kIxsd7C7KortzHZhoBnbhVN+qo+YUWLW7rLs9Q== + dependencies: + "@iconify/types" "*" + +"@iconify-json/ion@^1.2.2": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@iconify-json/ion/-/ion-1.2.2.tgz#ec1afaa19b82c2856eaa6a0ec976209538cd1bae" + integrity sha512-GysHYDAyy3K4R2Xxsab3I0ZFmQA4oorfIkwX0g6xfZJNVZcFyAlA4pa1jAJC9Bk3cLiWUtnN8ZyWs6cP3nxlnw== + dependencies: + "@iconify/types" "*" + +"@iconify-json/mdi@^1.2.3": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@iconify-json/mdi/-/mdi-1.2.3.tgz#5e4ee9d8c8aaad04381c8cc6c6edbe3327f031b5" + integrity sha512-O3cLwbDOK7NNDf2ihaQOH5F9JglnulNDFV7WprU2dSoZu3h3cWH//h74uQAB87brHmvFVxIOkuBX2sZSzYhScg== + dependencies: + "@iconify/types" "*" + "@iconify/types@*", "@iconify/types@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@iconify/types/-/types-2.0.0.tgz#ab0e9ea681d6c8a1214f30cd741fe3a20cc57f57" From 3e690e5a6c4e68dfb4645fd1b9074d4c411b9a58 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 11 Mar 2025 13:39:23 +0100 Subject: [PATCH 13/18] size and gap adjustments --- frontend/src/assets/scss/navbar.scss | 1 + frontend/src/components/Menu/Sidebar.vue | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/frontend/src/assets/scss/navbar.scss b/frontend/src/assets/scss/navbar.scss index a3b144e91..441da10cb 100644 --- a/frontend/src/assets/scss/navbar.scss +++ b/frontend/src/assets/scss/navbar.scss @@ -1,4 +1,5 @@ .nav-item .nav-link svg.svg-icon { height: 20px; + width:20px; color: $gradido-114; } diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue index 2411ef0f5..8e6d3f107 100644 --- a/frontend/src/components/Menu/Sidebar.vue +++ b/frontend/src/components/Menu/Sidebar.vue @@ -23,7 +23,7 @@
- {{ $t('navigation.transactions') }} + {{ $t('navigation.transactions') }}
@@ -35,7 +35,7 @@
- {{ $t('navigation.info') }} + {{ $t('navigation.info') }}
@@ -62,7 +62,7 @@
- {{ $t('navigation.settings') }} + {{ $t('navigation.settings') }}
{{ $t('settings.newSettings') }} From 60f08c991c4a4df3cdbd27c753b11dac6c83a2c2 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 11 Mar 2025 19:19:17 +0100 Subject: [PATCH 14/18] remove svg files which are now replaced my ioncify icons --- frontend/package.json | 1 + frontend/public/img/loupe.png | Bin 2368 -> 0 bytes frontend/public/img/svg/circles.svg | 7 - frontend/public/img/svg/community.svg | 103 ------- frontend/public/img/svg/home.svg | 29 -- frontend/public/img/svg/info.svg | 22 -- frontend/public/img/svg/logout.svg | 162 ---------- frontend/public/img/svg/my_profil.svg | 94 ------ frontend/public/img/svg/qr-code.svg | 7 - frontend/public/img/svg/send.svg | 114 ------- frontend/public/img/svg/settings.svg | 152 ---------- frontend/public/img/svg/transaction.svg | 128 -------- frontend/public/img/svg/write.svg | 287 ------------------ frontend/src/assets/scss/navbar.scss | 2 +- frontend/src/components/Menu/Sidebar.vue | 5 +- .../Template/ContentHeader/NavCommunity.vue | 4 +- .../TransactionLinks/TransactionLink.vue | 2 +- frontend/yarn.lock | 7 + 18 files changed, 15 insertions(+), 1111 deletions(-) delete mode 100644 frontend/public/img/loupe.png delete mode 100644 frontend/public/img/svg/circles.svg delete mode 100644 frontend/public/img/svg/community.svg delete mode 100644 frontend/public/img/svg/home.svg delete mode 100644 frontend/public/img/svg/info.svg delete mode 100644 frontend/public/img/svg/logout.svg delete mode 100644 frontend/public/img/svg/my_profil.svg delete mode 100644 frontend/public/img/svg/qr-code.svg delete mode 100644 frontend/public/img/svg/send.svg delete mode 100644 frontend/public/img/svg/settings.svg delete mode 100644 frontend/public/img/svg/transaction.svg delete mode 100644 frontend/public/img/svg/write.svg diff --git a/frontend/package.json b/frontend/package.json index 3bcb82bb8..24922b0f4 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -75,6 +75,7 @@ "@iconify-json/arcticons": "^1.2.20", "@iconify-json/bi": "^1.1.23", "@iconify-json/fa": "^1.2.1", + "@iconify-json/humbleicons": "^1.2.6", "@iconify-json/ion": "^1.2.2", "@iconify-json/mdi": "^1.2.3", "@intlify/eslint-plugin-vue-i18n": "^1.4.0", diff --git a/frontend/public/img/loupe.png b/frontend/public/img/loupe.png deleted file mode 100644 index ab289e4ada0669350cd98f0e2097fb3741a10306..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2368 zcmV-G3BUGeetij0qYeSyQo#f688(9zPt!o!)H zovW;_va_|jyuR-5@7LJb$;!*!-rkdxm!hPmr>Lr$oSy6J?AY1b@ug~8000P^NklB@lR%+Q7RdCvK^!3%Q-#;-3A4-XFy4-XHI z&p;g2(^b*TcW9d8cUniW>nY(OoHpeq4V035WQYHi3erv4Ohea`8;x*PwuzKN1h)`E z%A_q0S!fpJ`aW=4r%%9FXR(Kou$MM@Wr3*ye7#E?3>Ym6q z)+wfh{)cRzCRUvU6a;rRHQ&0X*5en!2?7+wQ`nnTM#OKA>$5;@KdALaEuZS)WRzaa6CH zpIi-#)J5x#;by=Lg$%kvzYBHI1w%ZI?3j5SQQ4JHip|QDCPc+X*u_;jicwcqf>MP37^` zHWfp7Lz~7h6IG7*;iW+~B%`s33|pwGQ9oV6YbR!WPVpO_h8(kldn^sV-Jr~V01R7* zVDSvPm~(9+tc7AR{@3FcbQ)}KAKXHbW4Pry0XK1m@bd$(0_|OfUIj&R((0W*7vSAz#jcyf+528b9sg&FM$&#?rOPma)S0xd6U zdQ(GUiYO=$AR$FQ(PSD%2gn~MxF_$CGckoMsl@UW|4~BfPMzx)07Hd+c>-L@74ksW z_|Y$|_(2~DsFMgxldS^~GZKVTP{ElvHVuK8bcTP!Cj7Fh-$Vkdb^>r(K~%{E z>Ol!*jtJy!8O?QxsopgS%Jc##(MTG(0h}+XyMXG5M8oOx3)1TTT+a}%KywLwRFhGb zzANpjlG*Q8zlW4AU!SxQBo;mN_jS-y(Q^O{siF*h1eNhK%-){i`|lyQ9#WRuDm}vu z(Qx{@9;qz_4u7fqp+31F^@mU_Of(#j4dc?^dCU24do8THA20NlEoK2^yw3gc>@eL@d+X@ zDoL>oD76vSylbF1l;YpViu5{9eQp7S8G*vDwn1;ka`cfd0iEjMCs03nl_yI^{{yPF zp%)ZG=&+gk_TCmaKtxYzpvxGF`W!z_^#h|H%>oL~aAgR*BY~T>eFL{mNDFN}psSGr zHCzO*Axrufr7_^9a90<)e<@mqi_nmm1_Cdu0kSj}AvIjxL(DM1tKOt1Yxdz4ma&;b z_pHgPdY6Dw?;UVf7?cvO%la`$5GMeS;5*P%MZIglFPtStcG`iDQx(G<=mUV{`!I*` zw$AX<68R3RX%d8QlfGesjE$8Hn>f~>f@XAwoUs8IP_F4$dW^Cdc97*I!V$1J4Mypr zLHu{w3+tQw!uSsOL5mt2JBASz)d>`pqG+xznJ_xsd-A@^sNH%d%W{i!`@3 z+&^2O%kW{s+cOG&xvrym!X1BgeO{O{_ZhSs)RD-p%;@)S^WTc%wVyadi_EPQO*!j$ zg4g-<;eLi-rr6N6XuY|@_Sf5mTToX-U3Nuq{Uq+B63i5*B(0LgO@VoO8b%Pk(}7T1 z`pG?l+h*5wa<-7%x@c@+^%%jMSTwr41;(w5wiNwN=!yi_g%kE&+@^@%MrdyfJ-1~l zc8XsWQtNV|D{kxRaO{HmHCbR79J$a`>hy(1eu`g3GS>aeT$9ho8|Y{Gdtpc8L{&;% zThI_rwfS{%$8kVkV2EE(>8b(7Z!b6y)ZLO-`2!m%WUlW!Y&cc#|IkHW`lw0o{BDp? zZK1E`SikS$LQwaZl!LmF_j8m<37&L>*2eFyD1Lpd%QUmH6q!s*W9h|kbKywQ*#{Kj z$-K*z1ZWDmufokIw#s;D{fv#fUECwy7Ud>UhtH6TOo-jT!-q&!vZ;#gpt}Dv3+fSZ zy)K%nT<%boRkKVf0iQ+#cq>tg1vQ3DR_x=8X>N={e>mE#lNw6F@Qo1QnAuu*i?^ac?YU1aHJOANCv zl7AhV14co83x-BPWo)HM34@@%yhHqhf#QqDZAU=5Nc_DTP5`>7SXzVgKr5*4;0;gE z2&#Pb)Zz*^6lKfUlb8ijd-3F5Em%AD@}N9DMwa5ObnuADGEp+iq{`u!@vn|(+RW#L m_35~WhlhuUhlhv9lj0w#DruV595(&{0000 - - - - - - diff --git a/frontend/public/img/svg/community.svg b/frontend/public/img/svg/community.svg deleted file mode 100644 index 8f1cdbd61..000000000 --- a/frontend/public/img/svg/community.svg +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/public/img/svg/home.svg b/frontend/public/img/svg/home.svg deleted file mode 100644 index 9122b7e68..000000000 --- a/frontend/public/img/svg/home.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - diff --git a/frontend/public/img/svg/info.svg b/frontend/public/img/svg/info.svg deleted file mode 100644 index 0510a5b60..000000000 --- a/frontend/public/img/svg/info.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - diff --git a/frontend/public/img/svg/logout.svg b/frontend/public/img/svg/logout.svg deleted file mode 100644 index a9826a5dd..000000000 --- a/frontend/public/img/svg/logout.svg +++ /dev/null @@ -1,162 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/public/img/svg/my_profil.svg b/frontend/public/img/svg/my_profil.svg deleted file mode 100644 index ef41c2ef4..000000000 --- a/frontend/public/img/svg/my_profil.svg +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/public/img/svg/qr-code.svg b/frontend/public/img/svg/qr-code.svg deleted file mode 100644 index 3cbd987c4..000000000 --- a/frontend/public/img/svg/qr-code.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/frontend/public/img/svg/send.svg b/frontend/public/img/svg/send.svg deleted file mode 100644 index 6f1d8dafa..000000000 --- a/frontend/public/img/svg/send.svg +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/public/img/svg/settings.svg b/frontend/public/img/svg/settings.svg deleted file mode 100644 index 6966262f3..000000000 --- a/frontend/public/img/svg/settings.svg +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/public/img/svg/transaction.svg b/frontend/public/img/svg/transaction.svg deleted file mode 100644 index f7cb156ff..000000000 --- a/frontend/public/img/svg/transaction.svg +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/public/img/svg/write.svg b/frontend/public/img/svg/write.svg deleted file mode 100644 index 45638e32e..000000000 --- a/frontend/public/img/svg/write.svg +++ /dev/null @@ -1,287 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/src/assets/scss/navbar.scss b/frontend/src/assets/scss/navbar.scss index 441da10cb..a2d948d76 100644 --- a/frontend/src/assets/scss/navbar.scss +++ b/frontend/src/assets/scss/navbar.scss @@ -1,4 +1,4 @@ -.nav-item .nav-link svg.svg-icon { +svg.svg-icon { height: 20px; width:20px; color: $gradido-114; diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue index 8e6d3f107..361681f55 100644 --- a/frontend/src/components/Menu/Sidebar.vue +++ b/frontend/src/components/Menu/Sidebar.vue @@ -89,7 +89,7 @@ @click="$emit('logout')" >
- + {{ $t('navigation.logout') }}
@@ -158,7 +158,8 @@ watch( padding: 0; } -.logout-text { +.logout-text, +.logout-icon { color: #cd5556; } diff --git a/frontend/src/components/Template/ContentHeader/NavCommunity.vue b/frontend/src/components/Template/ContentHeader/NavCommunity.vue index 57405ccb8..ddae5e1d0 100644 --- a/frontend/src/components/Template/ContentHeader/NavCommunity.vue +++ b/frontend/src/components/Template/ContentHeader/NavCommunity.vue @@ -20,7 +20,7 @@ variant="link" class="nav-community__btn" > - + {{ $t('community.myContributions') }} - + {{ $t('community.community') }}
diff --git a/frontend/src/components/TransactionLinks/TransactionLink.vue b/frontend/src/components/TransactionLinks/TransactionLink.vue index 6cc086e0f..2f414f894 100644 --- a/frontend/src/components/TransactionLinks/TransactionLink.vue +++ b/frontend/src/components/TransactionLinks/TransactionLink.vue @@ -35,7 +35,7 @@ class="pt-3 pb-3 test-qr-code" @click.stop="toggleQrModal" > - + {{ $t('qrCode') }} diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 40a8c900a..e85293e88 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1125,6 +1125,13 @@ dependencies: "@iconify/types" "*" +"@iconify-json/humbleicons@^1.2.6": + version "1.2.6" + resolved "https://registry.yarnpkg.com/@iconify-json/humbleicons/-/humbleicons-1.2.6.tgz#00189eaaf590ff80feeba05c1c5793dc7efe4c79" + integrity sha512-B5Ayka2mYbT8BxltoOEebe8XPfq0vpt2vzTGt/WJmapsapaLfAm00KdSEgIJ58VcBPWPtPI94FQ/97Yi/RAtAw== + dependencies: + "@iconify/types" "*" + "@iconify-json/ion@^1.2.2": version "1.2.2" resolved "https://registry.yarnpkg.com/@iconify-json/ion/-/ion-1.2.2.tgz#ec1afaa19b82c2856eaa6a0ec976209538cd1bae" From 08c43b8820b65168a62f4625b5988dede49ce3b7 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 11 Mar 2025 19:57:42 +0100 Subject: [PATCH 15/18] add back quill, because cannot found similar or better icon --- frontend/public/img/svg/write.svg | 287 ++++++++++++++++++++++++++++++ 1 file changed, 287 insertions(+) create mode 100644 frontend/public/img/svg/write.svg diff --git a/frontend/public/img/svg/write.svg b/frontend/public/img/svg/write.svg new file mode 100644 index 000000000..45638e32e --- /dev/null +++ b/frontend/public/img/svg/write.svg @@ -0,0 +1,287 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From c9816e3b74ad6a51f99835a8409f2dba0cf50a52 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Wed, 12 Mar 2025 15:47:45 +0100 Subject: [PATCH 16/18] add all neccessary for showing humhub profile link in admin --- admin/.env.dist | 3 ++- admin/.env.template | 3 +++ .../ContributionMessagesList.vue | 27 +++++++++++++++++-- admin/src/config/index.js | 5 ++++ admin/src/config/schema.js | 9 +++++++ admin/src/graphql/adminListContributions.js | 1 + admin/vite.config.js | 3 ++- backend/src/config/schema.ts | 7 ++--- backend/src/graphql/model/Contribution.ts | 11 ++++++++ config/src/commonSchema.ts | 5 ++++ 10 files changed, 65 insertions(+), 9 deletions(-) diff --git a/admin/.env.dist b/admin/.env.dist index c3d62bfd2..62c2b0ffd 100644 --- a/admin/.env.dist +++ b/admin/.env.dist @@ -3,4 +3,5 @@ GRAPHQL_PATH=/graphql WALLET_URL=http://localhost WALLET_AUTH_PATH=/authenticate?token= WALLET_LOGIN_PATH=/login -DEBUG_DISABLE_AUTH=false \ No newline at end of file +DEBUG_DISABLE_AUTH=false +HUMHUB_ACTIVE=false \ No newline at end of file diff --git a/admin/.env.template b/admin/.env.template index 11e849271..354a684a3 100644 --- a/admin/.env.template +++ b/admin/.env.template @@ -6,3 +6,6 @@ WALLET_AUTH_PATH=$WALLET_AUTH_PATH WALLET_LOGIN_PATH=$WALLET_LOGIN_PATH GRAPHQL_PATH=$GRAPHQL_PATH DEBUG_DISABLE_AUTH=false + +HUMHUB_ACTIVE=$HUMHUB_ACTIVE +HUMHUB_API_URL=$HUMHUB_API_URL \ No newline at end of file diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue index 9b6285a21..dc27b1597 100644 --- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue +++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue @@ -13,7 +13,20 @@   {{ contribution.username }} -   Humhub-Profil +   + + + + + + {{ $t('goTo.humhubProfile') }} + + {{ $t('registered') }}: {{ new Date(contribution.createdAt).toLocaleString() }} @@ -45,10 +58,10 @@