From 66612801ce3085451a8775a4b60ff3359e1401cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Fri, 23 Aug 2019 13:35:22 +0200 Subject: [PATCH 01/10] Change text of invite form --- webapp/components/Registration/Signup.vue | 16 ++++++++++------ webapp/locales/de.json | 9 +++++++-- webapp/locales/en.json | 9 +++++++-- webapp/pages/admin/invite.vue | 11 ++++------- 4 files changed, 28 insertions(+), 17 deletions(-) diff --git a/webapp/components/Registration/Signup.vue b/webapp/components/Registration/Signup.vue index 175db1fd6..dcf4f0e88 100644 --- a/webapp/components/Registration/Signup.vue +++ b/webapp/components/Registration/Signup.vue @@ -9,17 +9,21 @@ :schema="formSchema" @submit="handleSubmit" > -

{{ $t('registration.signup.title') }}

+

{{ invitation ? $t('profile.invites.title') : $t('registration.signup.title') }}

- {{ $t('registration.signup.form.description') }} + {{ + invitation + ? $t('profile.invites.description') + : $t('registration.signup.form.description') + }} @@ -73,11 +75,13 @@ export const SignupByInvitationMutation = gql` } ` export default { + name: 'Signup', components: { SweetalertIcon, }, props: { token: { type: String, default: null }, + invitation: { type: Boolean, default: false }, }, data() { return { diff --git a/webapp/locales/de.json b/webapp/locales/de.json index e249ce160..06b90826a 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -124,6 +124,11 @@ "followedByNobody": "wird von niemandem gefolgt.", "and": "und", "more": "weitere" + }, + "invites": { + "title": "Lade jemanden zu Human Connection ein!", + "description": "Für die Einladung trage seine E-Mail-Adresse hier ein.", + "emailPlaceholder": "E-Mail-Adresse für die Einladung" } }, "notifications": { @@ -271,8 +276,8 @@ }, "invites": { "name": "Benutzer einladen", - "title": "Benutzer als Admin anmelden", - "description": "Dieses Anmeldeformular ist zu sehen sobald die Anmeldung öffentlich zugänglich ist." + "title": "Leute einladen", + "description": "Einladungen sind ein wunderbarer Weg, deine Freund in deinem Netzwerk zu haben …" } }, "post": { diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 7f9e7286b..40ce5b6a2 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -124,6 +124,11 @@ "followedByNobody": "is not followed by anyone.", "and": "and", "more": "more" + }, + "invites": { + "title": "Invite somebody to Human Connection!", + "description": "Enter thier email address for invitation.", + "emailPlaceholder": "Email to invite" } }, "notifications": { @@ -271,8 +276,8 @@ }, "invites": { "name": "Invite users", - "title": "Signup users as admin", - "description": "This registration form will be visible as soon as the registration is open to the public." + "title": "Invite people", + "description": "Invitations are a wonderful way to have your friends in your network …" } }, "post": { diff --git a/webapp/pages/admin/invite.vue b/webapp/pages/admin/invite.vue index 36e679112..3f9b4d831 100644 --- a/webapp/pages/admin/invite.vue +++ b/webapp/pages/admin/invite.vue @@ -1,14 +1,11 @@ From a10e2e3a9bc37654113a1646d94271d978b81d90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Fri, 23 Aug 2019 13:51:36 +0200 Subject: [PATCH 02/10] Make user profile follow(ed) lists exceeds 5 users `and X more` better translatable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Slite adjustment of `more` to `more …` --- webapp/locales/de.json | 3 +-- webapp/locales/en.json | 3 +-- webapp/pages/profile/_id/_slug.vue | 14 ++++++++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 06b90826a..99689ec44 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -122,8 +122,7 @@ "followingNobody": "folgt niemandem.", "followedBy": "wird gefolgt von:", "followedByNobody": "wird von niemandem gefolgt.", - "and": "und", - "more": "weitere" + "andMore": "und {number} weitere …" }, "invites": { "title": "Lade jemanden zu Human Connection ein!", diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 40ce5b6a2..9c9d1cd73 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -122,8 +122,7 @@ "followingNobody": "follows nobody.", "followedBy": "is followed by:", "followedByNobody": "is not followed by anyone.", - "and": "and", - "more": "more" + "andMore": "and {number} more …" }, "invites": { "title": "Invite somebody to Human Connection!", diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue index bc712e6e0..e4f99935d 100644 --- a/webapp/pages/profile/_id/_slug.vue +++ b/webapp/pages/profile/_id/_slug.vue @@ -95,8 +95,11 @@ - {{ $t('profile.network.and') }} {{ user.followingCount - user.following.length }} - {{ $t('profile.network.more') }} + {{ + $t('profile.network.andMore', { + number: user.followingCount - user.following.length, + }) + }} @@ -122,8 +125,11 @@ - {{ $t('profile.network.and') }} {{ user.followedByCount - user.followedBy.length }} - {{ $t('profile.network.more') }} + {{ + $t('profile.network.andMore', { + number: user.followedByCount - user.followedBy.length, + }) + }} From 123c30b3015f8a10fcbf3e9b8f7899f7632cf2be Mon Sep 17 00:00:00 2001 From: roschaefer Date: Fri, 23 Aug 2019 13:15:19 +0200 Subject: [PATCH 03/10] Fix "cannot read property id of null" in staging --- backend/src/middleware/sentryMiddleware.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/backend/src/middleware/sentryMiddleware.js b/backend/src/middleware/sentryMiddleware.js index b1130ad37..da8ef32d0 100644 --- a/backend/src/middleware/sentryMiddleware.js +++ b/backend/src/middleware/sentryMiddleware.js @@ -14,13 +14,16 @@ if (sentryConfigs.SENTRY_DSN_BACKEND) { }, withScope: (scope, error, context) => { scope.setUser({ - id: context.user.id, + id: context.user && context.user.id, }) scope.setExtra('body', context.req.body) scope.setExtra('origin', context.req.headers.origin) scope.setExtra('user-agent', context.req.headers['user-agent']) }, }) +} else { + // eslint-disable-next-line no-console + if (process.env.NODE_ENV !== 'test') console.log('Warning: Sentry middleware inactive.') } export default sentryMiddleware From 894a59ecc7700472317c580d19df867c08c57b66 Mon Sep 17 00:00:00 2001 From: roschaefer Date: Fri, 23 Aug 2019 19:57:58 +0200 Subject: [PATCH 04/10] Fix flickering create-button --- webapp/pages/profile/_id/_slug.vue | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue index e4f99935d..b33d88bda 100644 --- a/webapp/pages/profile/_id/_slug.vue +++ b/webapp/pages/profile/_id/_slug.vue @@ -201,16 +201,22 @@ - - + + + +