+
diff --git a/admin/src/config/index.js b/admin/src/config/index.js
index b73657219..684b568ef 100644
--- a/admin/src/config/index.js
+++ b/admin/src/config/index.js
@@ -50,12 +50,17 @@ const endpoints = {
const debug = {
DEBUG_DISABLE_AUTH: process.env.DEBUG_DISABLE_AUTH === 'true' ?? false,
}
+const humhub = {
+ HUMHUB_ACTIVE: process.env.HUMHUB_ACTIVE === 'true' || false,
+ HUMHUB_API_URL: process.env.HUMHUB_API_URL ?? COMMUNITY_URL + '/community/',
+}
const CONFIG = {
...version,
...environment,
...endpoints,
...debug,
+ ...humhub,
ADMIN_MODULE_URL,
COMMUNITY_URL,
}
diff --git a/admin/src/config/schema.js b/admin/src/config/schema.js
index 7aee8136f..88847f347 100644
--- a/admin/src/config/schema.js
+++ b/admin/src/config/schema.js
@@ -5,6 +5,8 @@ const {
COMMUNITY_URL,
DEBUG,
GRAPHQL_URI,
+ HUMHUB_ACTIVE,
+ HUMHUB_API_URL,
NODE_ENV,
PRODUCTION,
} = require('gradido-config/build/src/commonSchema.js')
@@ -17,6 +19,8 @@ module.exports = Joi.object({
COMMUNITY_URL,
DEBUG,
GRAPHQL_URI,
+ HUMHUB_ACTIVE,
+ HUMHUB_API_URL,
NODE_ENV,
PRODUCTION,
diff --git a/admin/src/graphql/adminListContributions.js b/admin/src/graphql/adminListContributions.js
index aa6c0c713..b37988233 100644
--- a/admin/src/graphql/adminListContributions.js
+++ b/admin/src/graphql/adminListContributions.js
@@ -26,6 +26,9 @@ export const adminListContributions = gql`
id
firstName
lastName
+ email
+ username
+ humhubUsername
amount
memo
createdAt
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 237705ec2..a5c4d2e37 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -35,7 +35,8 @@
"validTo": "Enddatum"
},
"contributionMessagesForm": {
- "resubmissionDateInPast": "Wiedervorlage Datum befindet sich in der Vergangenheit!"
+ "resubmissionDateInPast": "Wiedervorlage Datum befindet sich in der Vergangenheit!",
+ "hasRegisteredAt": "hat sich am {createdAt} registriert."
},
"contributions": {
"all": "Alle",
@@ -73,6 +74,7 @@
"deleted_user": "Alle gelöschten Nutzer",
"deny": "Ablehnen",
"description": "Beschreibung",
+ "details": "Details",
"e_mail": "E-Mail",
"edit": "bearbeiten",
"enabled": "aktiviert",
@@ -97,6 +99,9 @@
"verified": "Verifiziert",
"verifiedAt": "Verifiziert am"
},
+ "filter": {
+ "byEmail": "Nach E-Mail filtern"
+ },
"firstname": "Vorname",
"footer": {
"app_version": "App version {version}",
@@ -117,6 +122,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": {
@@ -141,7 +150,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.",
@@ -223,6 +232,7 @@
"newUserToSpaceTooltip": "Neue Benutzer automatisch zum Space hinzufügen, falls Space vorhanden"
},
"redeemed": "eingelöst",
+ "registered": "Registriert",
"removeNotSelf": "Als Admin/Moderator kannst du dich nicht selber löschen.",
"reset": "Zurücksetzen",
"save": "Speichern",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index cb1f24477..b3f500564 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -35,7 +35,8 @@
"validTo": "End-Date"
},
"contributionMessagesForm": {
- "resubmissionDateInPast": "Resubmission date is in the past!"
+ "resubmissionDateInPast": "Resubmission date is in the past!",
+ "hasRegisteredAt": "registered on {createdAt}."
},
"contributions": {
"all": "All",
@@ -73,6 +74,7 @@
"deleted_user": "All deleted user",
"deny": "Reject",
"description": "Description",
+ "details": "Details",
"e_mail": "E-mail",
"edit": "edit",
"enabled": "enabled",
@@ -97,6 +99,9 @@
"verified": "Verified",
"verifiedAt": "Verified at"
},
+ "filter": {
+ "byEmail": "Filter by email"
+ },
"firstname": "Firstname",
"footer": {
"app_version": "App version {version}",
@@ -117,6 +122,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": {
@@ -141,7 +150,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.",
@@ -223,6 +232,7 @@
"newUserToSpaceTooltip": "The hours should contain a maximum of two decimal places"
},
"redeemed": "redeemed",
+ "registered": "Registered",
"removeNotSelf": "As an admin/moderator, you cannot delete yourself.",
"reset": "Reset",
"save": "Save",
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 4fe2f80af..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"
/>
formatDateOrDash(value),
},
{ key: 'moderatorId', label: t('moderator.moderator') },
- { key: 'editCreation', label: t('chat') },
+ { key: 'editCreation', label: t('details') },
{ key: 'confirm', label: t('save') },
],
// confirmed contributions
@@ -181,7 +182,7 @@ const fields = computed(
formatter: (value) => formatDateOrDash(value),
},
{ key: 'confirmedBy', label: t('moderator.moderator') },
- { key: 'chatCreation', label: t('chat') },
+ { key: 'chatCreation', label: t('details') },
],
// denied contributions
[
@@ -209,7 +210,7 @@ const fields = computed(
formatter: (value) => formatDateOrDash(value),
},
{ key: 'deniedBy', label: t('moderator.moderator') },
- { key: 'chatCreation', label: t('chat') },
+ { key: 'chatCreation', label: t('details') },
],
// deleted contributions
[
@@ -237,7 +238,7 @@ const fields = computed(
formatter: (value) => formatDateOrDash(value),
},
{ key: 'deletedBy', label: t('moderator.moderator') },
- { key: 'chatCreation', label: t('chat') },
+ { key: 'chatCreation', label: t('details') },
],
// all contributions
[
@@ -266,7 +267,7 @@ const fields = computed(
formatter: (value) => formatDateOrDash(value),
},
{ key: 'confirmedBy', label: t('moderator.moderator') },
- { key: 'chatCreation', label: t('chat') },
+ { key: 'chatCreation', label: t('details') },
],
][tabIndex.value],
)
diff --git a/admin/src/pages/UserSearch.spec.js b/admin/src/pages/UserSearch.spec.js
index c363eaf1c..6a1de70a8 100644
--- a/admin/src/pages/UserSearch.spec.js
+++ b/admin/src/pages/UserSearch.spec.js
@@ -15,6 +15,11 @@ vi.mock('@/composables/useToast', () => ({
toastSuccess: vi.fn(),
}),
}))
+vi.mock('vue-router', () => ({
+ useRoute: () => ({
+ query: {},
+ }),
+}))
// Mock icon components
const mockIconComponent = {
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 @@