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/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/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue index 0ae31c905..c8dc2f854 100644 --- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue +++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue @@ -222,6 +222,10 @@ const onSubmit = () => { } } toastSuccess(t('message.request')) + form.value = { + text: '', + memo: props.contributionMemo, + } loading.value = false }) .catch((error) => { diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js index 7d87082d4..bbb2f3806 100644 --- a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js +++ b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js @@ -93,10 +93,12 @@ describe('ContributionMessagesList', () => { wrapper = mount(ContributionMessagesList, { props: { - contributionId: 42, - contributionMemo: 'test memo', - contributionUserId: 108, - contributionStatus: 'PENDING', + contribution: { + id: 42, + memo: 'test memo', + userId: 108, + status: 'PENDING', + }, hideResubmission: true, }, global: { @@ -137,7 +139,7 @@ describe('ContributionMessagesList', () => { }) it('does not render the ContributionMessagesFormular when status is not PENDING or IN_PROGRESS', async () => { - await wrapper.setProps({ contributionStatus: 'COMPLETED' }) + await wrapper.setProps({ contribution: { status: 'COMPLETED' } }) expect(wrapper.find('contribution-messages-formular-stub').exists()).toBe(false) }) diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue index 14b640066..9b0d11cbe 100644 --- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue +++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue @@ -1,17 +1,49 @@ 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 @@ + + + diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue index 50645ed65..958405b45 100644 --- a/frontend/src/components/Menu/Navbar.vue +++ b/frontend/src/components/Menu/Navbar.vue @@ -79,18 +79,10 @@ export default { height: 150px; } -.auth-navbar > .nav-link { - color: #383838 !important; -} - .navbar-toggler { font-size: 2.25rem; } -.auth-navbar > .router-link-exact-active { - color: #0e79bc !important; -} - button.navbar-toggler > span.navbar-toggler-icon { background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba(4, 112, 6, 1)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e"); } diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue index 706d0ead5..361681f55 100644 --- a/frontend/src/components/Menu/Sidebar.vue +++ b/frontend/src/components/Menu/Sidebar.vue @@ -10,43 +10,43 @@ @@ -61,7 +61,7 @@ > 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/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", diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue index a24796d18..82576bbd0 100644 --- a/frontend/src/pages/Login.vue +++ b/frontend/src/pages/Login.vue @@ -38,8 +38,8 @@ - - + + {{ $t('signup') }} @@ -161,8 +161,4 @@ const enterData = computed(() => !showPageMessage.value) padding-right: 0; padding-left: 0; } - -a.register-nav-item { - color: #0e79bc !important; -} diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue index a8044b330..e6c4f0399 100755 --- a/frontend/src/pages/Register.vue +++ b/frontend/src/pages/Register.vue @@ -76,8 +76,8 @@ - -