+
+
+ {{ $t('federation.verified') }}
+ {{ $t('federation.url') }}
+ {{ $t('federation.lastAnnouncedAt') }}
+ {{ $t('federation.createdAt') }}
+
+
+
+
+
+
+
diff --git a/admin/src/router/router.test.js b/admin/src/router/router.test.js
index ad1ad1245..886d4eeab 100644
--- a/admin/src/router/router.test.js
+++ b/admin/src/router/router.test.js
@@ -45,7 +45,7 @@ describe('router', () => {
describe('routes', () => {
it('has nine routes defined', () => {
- expect(routes).toHaveLength(8)
+ expect(routes).toHaveLength(9)
})
it('has "/overview" as default', async () => {
@@ -88,6 +88,13 @@ describe('router', () => {
})
})
+ describe('federation', () => {
+ it('loads the "FederationVisualize" page', async () => {
+ const component = await routes.find((r) => r.path === '/federation').component()
+ expect(component.default.name).toBe('FederationVisualize')
+ })
+ })
+
describe('not found page', () => {
it('renders the "NotFound" component', async () => {
const component = await routes.find((r) => r.path === '*').component()
diff --git a/admin/src/router/routes.js b/admin/src/router/routes.js
index b01466cfc..d26fdfd96 100644
--- a/admin/src/router/routes.js
+++ b/admin/src/router/routes.js
@@ -31,6 +31,10 @@ const routes = [
path: '*',
component: () => import('@/components/NotFoundPage.vue'),
},
+ {
+ path: '/federation',
+ component: () => import('@/pages/FederationVisualize.vue'),
+ },
]
export default routes
diff --git a/admin/yarn.lock b/admin/yarn.lock
index ee4d635a6..c270b80bf 100644
--- a/admin/yarn.lock
+++ b/admin/yarn.lock
@@ -5038,6 +5038,11 @@ data-urls@^2.0.0:
whatwg-mimetype "^2.3.0"
whatwg-url "^8.0.0"
+date-fns@^2.29.3:
+ version "2.29.3"
+ resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
+ integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==
+
de-indent@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
diff --git a/backend/package.json b/backend/package.json
index 1457f97e5..c5e0df3c5 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
{
"name": "gradido-backend",
- "version": "1.19.1",
+ "version": "1.20.0",
"description": "Gradido unified backend providing an API-Service for Gradido Transactions",
"main": "src/index.ts",
"repository": "https://github.com/gradido/gradido/backend",
diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index 017d83098..0c36e4d5a 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -76,7 +76,7 @@ const email = {
EMAIL_SENDER: process.env.EMAIL_SENDER || 'info@gradido.net',
EMAIL_PASSWORD: process.env.EMAIL_PASSWORD || '',
EMAIL_SMTP_URL: process.env.EMAIL_SMTP_URL || 'mailserver',
- EMAIL_SMTP_PORT: process.env.EMAIL_SMTP_PORT || '1025',
+ EMAIL_SMTP_PORT: Number(process.env.EMAIL_SMTP_PORT) || 1025,
// eslint-disable-next-line no-unneeded-ternary
EMAIL_TLS: process.env.EMAIL_TLS === 'false' ? false : true,
EMAIL_LINK_VERIFICATION:
diff --git a/backend/src/emails/sendEmailTranslated.test.ts b/backend/src/emails/sendEmailTranslated.test.ts
index 66efb29a9..0e04db732 100644
--- a/backend/src/emails/sendEmailTranslated.test.ts
+++ b/backend/src/emails/sendEmailTranslated.test.ts
@@ -10,7 +10,7 @@ import { sendEmailTranslated } from './sendEmailTranslated'
CONFIG.EMAIL = false
CONFIG.EMAIL_SMTP_URL = 'EMAIL_SMTP_URL'
-CONFIG.EMAIL_SMTP_PORT = '1234'
+CONFIG.EMAIL_SMTP_PORT = 1234
CONFIG.EMAIL_USERNAME = 'user'
CONFIG.EMAIL_PASSWORD = 'pwd'
CONFIG.EMAIL_TLS = true
@@ -31,7 +31,7 @@ jest.mock('nodemailer', () => {
})
describe('sendEmailTranslated', () => {
- let result: Record
+ {{ $t('federation.gradidoInstances') }}
+
+
+
+
+
+
+
{{ $t('form.recipient') }}
@@ -130,6 +130,7 @@ import InputEmail from '@/components/Inputs/InputEmail'
import InputAmount from '@/components/Inputs/InputAmount'
import InputTextarea from '@/components/Inputs/InputTextarea'
import { user as userQuery } from '@/graphql/queries'
+import { isEmpty } from 'lodash'
export default {
name: 'TransactionForm',
@@ -176,7 +177,8 @@ export default {
this.form.amount = ''
this.form.memo = ''
this.$refs.formValidator.validate()
- if (this.$route.query && !this.$route.query === {}) this.$router.replace({ query: undefined })
+ if (this.$route.query && !isEmpty(this.$route.query))
+ this.$router.replace({ query: undefined })
},
},
apollo: {
diff --git a/frontend/src/components/TransactionRows/DurationRow.vue b/frontend/src/components/TransactionRows/DurationRow.vue
index aa20132d7..6f62d9dc5 100644
--- a/frontend/src/components/TransactionRows/DurationRow.vue
+++ b/frontend/src/components/TransactionRows/DurationRow.vue
@@ -5,12 +5,17 @@
- {{ durationText }}
+ {{ duration }}
{{ $t('decay.past_time') }}