From 5f0ed256d6b5cbfd62074141986483e625c856e2 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 4 Mar 2021 16:36:22 +0100 Subject: [PATCH 01/16] set expiresIn of JWT to 2 years --- backend/src/jwt/encode.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/jwt/encode.js b/backend/src/jwt/encode.js index 9126f2577..50e439474 100644 --- a/backend/src/jwt/encode.js +++ b/backend/src/jwt/encode.js @@ -5,7 +5,7 @@ import CONFIG from './../config' export default function encode(user) { const { id, name, slug } = user const token = jwt.sign({ id, name, slug }, CONFIG.JWT_SECRET, { - expiresIn: '1d', + expiresIn: '2y', issuer: CONFIG.GRAPHQL_URI, audience: CONFIG.CLIENT_URI, subject: user.id.toString(), From ff50273f94eaaad77caef9dd26197e10906a3b93 Mon Sep 17 00:00:00 2001 From: ashleysylvialee <72893506+ashleysylvialee@users.noreply.github.com> Date: Thu, 18 Mar 2021 22:32:27 -1000 Subject: [PATCH 02/16] =?UTF-8?q?fix:=20=F0=9F=8D=B0=20Suggestion=20List?= =?UTF-8?q?=20Filter=20(#4296)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix suggestion list filter * fix tests after MAPBOX changed their IDs again * Add spacebar selection functionality for mentions * Add tests * Fix linting Co-authored-by: Moriz Wahl Co-authored-by: Wolfgang Huß --- .../schema/resolvers/users/location.spec.js | 42 +++++++++++++++---- webapp/components/Editor/Editor.spec.js | 31 ++++++++++++++ webapp/components/Editor/Editor.vue | 12 +++++- 3 files changed, 74 insertions(+), 11 deletions(-) diff --git a/backend/src/schema/resolvers/users/location.spec.js b/backend/src/schema/resolvers/users/location.spec.js index 41b784249..1ef427034 100644 --- a/backend/src/schema/resolvers/users/location.spec.js +++ b/backend/src/schema/resolvers/users/location.spec.js @@ -114,10 +114,22 @@ describe('Location Service', () => { const result = await query({ query: queryLocations, variables }) expect(result.data.queryLocations).toEqual([ { id: 'place.14094307404564380', place_name: 'Berlin, Germany' }, - { id: 'place.15095411613564380', place_name: 'Berlin, Maryland, United States' }, - { id: 'place.5225018734564380', place_name: 'Berlin, Connecticut, United States' }, - { id: 'place.16922023226564380', place_name: 'Berlin, New Jersey, United States' }, - { id: 'place.4035845612564380', place_name: 'Berlin Township, New Jersey, United States' }, + { + id: expect.stringMatching(/^place\.[0-9]+$/), + place_name: 'Berlin, Maryland, United States', + }, + { + id: expect.stringMatching(/^place\.[0-9]+$/), + place_name: 'Berlin, Connecticut, United States', + }, + { + id: expect.stringMatching(/^place\.[0-9]+$/), + place_name: 'Berlin, New Jersey, United States', + }, + { + id: expect.stringMatching(/^place\.[0-9]+$/), + place_name: 'Berlin Township, New Jersey, United States', + }, ]) }) @@ -128,11 +140,23 @@ describe('Location Service', () => { } const result = await query({ query: queryLocations, variables }) expect(result.data.queryLocations).toEqual([ - { id: 'place.14094307404564380', place_name: 'Berlin, Deutschland' }, - { id: 'place.15095411613564380', place_name: 'Berlin, Maryland, Vereinigte Staaten' }, - { id: 'place.16922023226564380', place_name: 'Berlin, New Jersey, Vereinigte Staaten' }, - { id: 'place.10735893248465990', place_name: 'Berlin Heights, Ohio, Vereinigte Staaten' }, - { id: 'place.1165756679564380', place_name: 'Berlin, Massachusetts, Vereinigte Staaten' }, + { id: expect.stringMatching(/^place\.[0-9]+$/), place_name: 'Berlin, Deutschland' }, + { + id: expect.stringMatching(/^place\.[0-9]+$/), + place_name: 'Berlin, Maryland, Vereinigte Staaten', + }, + { + id: expect.stringMatching(/^place\.[0-9]+$/), + place_name: 'Berlin, New Jersey, Vereinigte Staaten', + }, + { + id: expect.stringMatching(/^place\.[0-9]+$/), + place_name: 'Berlin Heights, Ohio, Vereinigte Staaten', + }, + { + id: expect.stringMatching(/^place\.[0-9]+$/), + place_name: 'Berlin, Massachusetts, Vereinigte Staaten', + }, ]) }) diff --git a/webapp/components/Editor/Editor.spec.js b/webapp/components/Editor/Editor.spec.js index ee762b332..f51c5782f 100644 --- a/webapp/components/Editor/Editor.spec.js +++ b/webapp/components/Editor/Editor.spec.js @@ -99,6 +99,37 @@ describe('Editor.vue', () => { }) }) + it('suggestion list returns results prefixed by query', () => { + const manyUsersList = [] + for (let i = 0; i < 10; i++) { + manyUsersList.push({ id: `user${i}` }) + manyUsersList.push({ id: `admin${i}` }) + manyUsersList.push({ id: `moderator${i}` }) + } + propsData.users = manyUsersList + wrapper = Wrapper() + const suggestionList = wrapper.vm.editor.extensions.options.mention.onFilter( + propsData.users, + 'moderator', + ) + expect(suggestionList).toHaveLength(10) + for (var i = 0; i < suggestionList.length; i++) { + expect(suggestionList[i].id).toMatch(/^moderator.*/) + } + }) + + it('exact match appears at the top of suggestion list', () => { + const manyUsersList = [] + for (let i = 0; i < 25; i++) { + manyUsersList.push({ id: `user${i}` }) + } + propsData.users = manyUsersList + wrapper = Wrapper() + expect( + wrapper.vm.editor.extensions.options.mention.onFilter(propsData.users, 'user7')[0].id, + ).toMatch('user7') + }) + it('sets the Hashtag items to the hashtags', () => { propsData.hashtags = [ { diff --git a/webapp/components/Editor/Editor.vue b/webapp/components/Editor/Editor.vue index 67329a60b..cf0fd710b 100644 --- a/webapp/components/Editor/Editor.vue +++ b/webapp/components/Editor/Editor.vue @@ -185,6 +185,9 @@ export default { if (this.suggestionType === HASHTAG && this.query !== '') { this.selectItem({ id: this.query }) } + if (this.suggestionType === MENTION && item) { + this.selectItem(item) + } return true default: @@ -199,9 +202,14 @@ export default { const filteredList = items.filter((item) => { const itemString = item.slug || item.id - return itemString.toLowerCase().includes(query.toLowerCase()) + return itemString.toLowerCase().startsWith(query.toLowerCase()) }) - return filteredList.slice(0, 15) + const sortedList = filteredList.sort((itemA, itemB) => { + const aString = itemA.slug || itemA.id + const bString = itemB.slug || itemB.id + return aString.length - bString.length + }) + return sortedList.slice(0, 15) }, sanitizeQuery(query) { if (this.suggestionType === HASHTAG) { From e6dc3f42cedaf9953d737cf30cf7ed317b634be7 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 16 Mar 2021 10:36:07 +0100 Subject: [PATCH 03/16] setting up invite button --- .../components/InviteButton/InviteButton.vue | 17 ++ webapp/config/index.js | 2 + webapp/layouts/default.vue | 192 ++++++++++-------- 3 files changed, 122 insertions(+), 89 deletions(-) create mode 100644 webapp/components/InviteButton/InviteButton.vue diff --git a/webapp/components/InviteButton/InviteButton.vue b/webapp/components/InviteButton/InviteButton.vue new file mode 100644 index 000000000..57c60c8e4 --- /dev/null +++ b/webapp/components/InviteButton/InviteButton.vue @@ -0,0 +1,17 @@ + + + diff --git a/webapp/config/index.js b/webapp/config/index.js index fd564f350..678239729 100644 --- a/webapp/config/index.js +++ b/webapp/config/index.js @@ -29,6 +29,8 @@ const sentry = { const options = { VERSION: process.env.VERSION || pkg.version, DESCRIPTION: process.env.DESCRIPTION || pkg.description, + PUBLIC_REGISTRATION: process.env.PUBLIC_REGISTRATION === 'true', + INVITE_REGISTRATION: process.env.INVITE_REGISTRATION === 'true', // Cookies COOKIE_EXPIRE_TIME: process.env.COOKIE_EXPIRE_TIME || 730, // Two years by default COOKIE_HTTPS_ONLY: process.env.COOKIE_HTTPS_ONLY || process.env.NODE_ENV === 'production', // ensure true in production if not set explicitly diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue index 0bf98967e..e666d5e44 100644 --- a/webapp/layouts/default.vue +++ b/webapp/layouts/default.vue @@ -40,9 +40,9 @@
@@ -50,6 +50,10 @@ + XXX {{ showInviteButton }} + + + @@ -74,96 +78,106 @@ From 176c4f0c3726c00e5d88102e117818ebac4db4cc Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 16 Mar 2021 11:10:00 +0100 Subject: [PATCH 04/16] Revert "fix tests after MAPBOX changed their IDs again" This reverts commit eadcddaa5b84944c2cde8aa092726277fe28f9fd. --- .../schema/resolvers/users/location.spec.js | 42 ++++--------------- 1 file changed, 9 insertions(+), 33 deletions(-) diff --git a/backend/src/schema/resolvers/users/location.spec.js b/backend/src/schema/resolvers/users/location.spec.js index 1ef427034..41b784249 100644 --- a/backend/src/schema/resolvers/users/location.spec.js +++ b/backend/src/schema/resolvers/users/location.spec.js @@ -114,22 +114,10 @@ describe('Location Service', () => { const result = await query({ query: queryLocations, variables }) expect(result.data.queryLocations).toEqual([ { id: 'place.14094307404564380', place_name: 'Berlin, Germany' }, - { - id: expect.stringMatching(/^place\.[0-9]+$/), - place_name: 'Berlin, Maryland, United States', - }, - { - id: expect.stringMatching(/^place\.[0-9]+$/), - place_name: 'Berlin, Connecticut, United States', - }, - { - id: expect.stringMatching(/^place\.[0-9]+$/), - place_name: 'Berlin, New Jersey, United States', - }, - { - id: expect.stringMatching(/^place\.[0-9]+$/), - place_name: 'Berlin Township, New Jersey, United States', - }, + { id: 'place.15095411613564380', place_name: 'Berlin, Maryland, United States' }, + { id: 'place.5225018734564380', place_name: 'Berlin, Connecticut, United States' }, + { id: 'place.16922023226564380', place_name: 'Berlin, New Jersey, United States' }, + { id: 'place.4035845612564380', place_name: 'Berlin Township, New Jersey, United States' }, ]) }) @@ -140,23 +128,11 @@ describe('Location Service', () => { } const result = await query({ query: queryLocations, variables }) expect(result.data.queryLocations).toEqual([ - { id: expect.stringMatching(/^place\.[0-9]+$/), place_name: 'Berlin, Deutschland' }, - { - id: expect.stringMatching(/^place\.[0-9]+$/), - place_name: 'Berlin, Maryland, Vereinigte Staaten', - }, - { - id: expect.stringMatching(/^place\.[0-9]+$/), - place_name: 'Berlin, New Jersey, Vereinigte Staaten', - }, - { - id: expect.stringMatching(/^place\.[0-9]+$/), - place_name: 'Berlin Heights, Ohio, Vereinigte Staaten', - }, - { - id: expect.stringMatching(/^place\.[0-9]+$/), - place_name: 'Berlin, Massachusetts, Vereinigte Staaten', - }, + { id: 'place.14094307404564380', place_name: 'Berlin, Deutschland' }, + { id: 'place.15095411613564380', place_name: 'Berlin, Maryland, Vereinigte Staaten' }, + { id: 'place.16922023226564380', place_name: 'Berlin, New Jersey, Vereinigte Staaten' }, + { id: 'place.10735893248465990', place_name: 'Berlin Heights, Ohio, Vereinigte Staaten' }, + { id: 'place.1165756679564380', place_name: 'Berlin, Massachusetts, Vereinigte Staaten' }, ]) }) From 356f02622655a57561fcdecfcc8a735d23cac79f Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 18 Mar 2021 11:15:40 +0100 Subject: [PATCH 05/16] basic invite button in frontend --- webapp/assets/_new/icons/svgs/copy.svg | 5 + .../components/InviteButton/InviteButton.vue | 80 ++++++- webapp/config/index.js | 4 +- webapp/layouts/default.vue | 200 +++++++++--------- webapp/locales/de.json | 6 + webapp/locales/en.json | 6 + webapp/nuxt.config.js | 2 + 7 files changed, 191 insertions(+), 112 deletions(-) create mode 100644 webapp/assets/_new/icons/svgs/copy.svg diff --git a/webapp/assets/_new/icons/svgs/copy.svg b/webapp/assets/_new/icons/svgs/copy.svg new file mode 100644 index 000000000..1792f2002 --- /dev/null +++ b/webapp/assets/_new/icons/svgs/copy.svg @@ -0,0 +1,5 @@ + + +copy + + diff --git a/webapp/components/InviteButton/InviteButton.vue b/webapp/components/InviteButton/InviteButton.vue index 57c60c8e4..15190d9dc 100644 --- a/webapp/components/InviteButton/InviteButton.vue +++ b/webapp/components/InviteButton/InviteButton.vue @@ -1,17 +1,83 @@ + + diff --git a/webapp/config/index.js b/webapp/config/index.js index 678239729..651bab568 100644 --- a/webapp/config/index.js +++ b/webapp/config/index.js @@ -29,8 +29,8 @@ const sentry = { const options = { VERSION: process.env.VERSION || pkg.version, DESCRIPTION: process.env.DESCRIPTION || pkg.description, - PUBLIC_REGISTRATION: process.env.PUBLIC_REGISTRATION === 'true', - INVITE_REGISTRATION: process.env.INVITE_REGISTRATION === 'true', + PUBLIC_REGISTRATION: process.env.PUBLIC_REGISTRATION, + INVITE_REGISTRATION: process.env.INVITE_REGISTRATION, // Cookies COOKIE_EXPIRE_TIME: process.env.COOKIE_EXPIRE_TIME || 730, // Two years by default COOKIE_HTTPS_ONLY: process.env.COOKIE_HTTPS_ONLY || process.env.NODE_ENV === 'production', // ensure true in production if not set explicitly diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue index e666d5e44..db84c1feb 100644 --- a/webapp/layouts/default.vue +++ b/webapp/layouts/default.vue @@ -40,9 +40,9 @@
@@ -50,10 +50,11 @@ - XXX {{ showInviteButton }} - - - +
+ + + +
@@ -78,106 +79,99 @@ diff --git a/webapp/locales/de.json b/webapp/locales/de.json index e02e4f6b0..060068af4 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -336,6 +336,12 @@ "change-filter-settings": "Verändere die Filter-Einstellungen, um mehr Ergebnisse zu erhalten.", "no-results": "Keine Beiträge gefunden." }, + "invite-codes": { + "copy-code": "Einladungscode in die Zwischenablage kopieren", + "copy-success": "Einladungscode erfolgreich in die Zwischenablage kopiert", + "not-available": "Du hast keinen Einladungscode zur Verfügung!", + "your-code": "Das ist dein Einladungscode:" + }, "login": { "email": "Deine E-Mail", "failure": "Fehlerhafte E-Mail-Adresse oder Passwort.", diff --git a/webapp/locales/en.json b/webapp/locales/en.json index e195f542e..3fbacb70c 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -336,6 +336,12 @@ "change-filter-settings": "Change your filter settings to get more results.", "no-results": "No contributions found." }, + "invite-codes": { + "copy-code": "Copy invite code to clipboard", + "copy-success": "Invite code copied to clipboard", + "not-available": "You have no valid invite code available!", + "your-code": "This is your invite code:" + }, "login": { "email": "Your E-mail", "failure": "Incorrect email address or password.", diff --git a/webapp/nuxt.config.js b/webapp/nuxt.config.js index 9f992ee5e..9ca85431d 100644 --- a/webapp/nuxt.config.js +++ b/webapp/nuxt.config.js @@ -28,6 +28,8 @@ export default { env: { release: CONFIG.VERSION, + publicRegistration: String(CONFIG.PUBLIC_REGISTRATION) === 'true', + inviteRegistration: String(CONFIG.INVITE_REGISTRATION) === 'true', // pages which do NOT require a login publicPages: [ 'login', From 53c8b532e51884d9012bcccfe4fe072967db6720 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 18 Mar 2021 11:17:30 +0100 Subject: [PATCH 06/16] temporary invite button in backand. Must be refactored! --- .../src/middleware/permissionsMiddleware.js | 1 + backend/src/schema/resolvers/inviteCodes.js | 46 +++++++++++++++++++ backend/src/schema/types/type/InviteCode.gql | 1 + 3 files changed, 48 insertions(+) diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js index 7aeb7252a..b33d09f7f 100644 --- a/backend/src/middleware/permissionsMiddleware.js +++ b/backend/src/middleware/permissionsMiddleware.js @@ -123,6 +123,7 @@ export default shield( isValidInviteCode: allow, queryLocations: isAuthenticated, availableRoles: isAdmin, + getInviteCode: isAuthenticated, // and inviteRegistration }, Mutation: { '*': deny, diff --git a/backend/src/schema/resolvers/inviteCodes.js b/backend/src/schema/resolvers/inviteCodes.js index 91148a08d..2a0269b54 100644 --- a/backend/src/schema/resolvers/inviteCodes.js +++ b/backend/src/schema/resolvers/inviteCodes.js @@ -12,6 +12,52 @@ const uniqueInviteCode = async (session, code) => { export default { Query: { + getInviteCode: async (_parent, args, context, _resolveInfo) => { + const { + user: { id: userId }, + } = context + const session = context.driver.session() + const readTxResultPromise = session.readTransaction(async (txc) => { + const result = await txc.run( + `MATCH (user:User {id: $userId})-[:GENERATED]->(ic:InviteCode) + WHERE ic.expiresAt IS NULL + OR datetime(ic.expiresAt) >= datetime() + RETURN properties(ic) AS inviteCodes`, + { + userId, + }, + ) + return result.records.map((record) => record.get('inviteCodes')) + }) + try { + const inviteCode = await readTxResultPromise + if (inviteCode && inviteCode.length > 0) return inviteCode[0] + let code = generateInviteCode() + while (!(await uniqueInviteCode(session, code))) { + code = generateInviteCode() + } + const writeTxResultPromise = session.writeTransaction(async (txc) => { + const result = await txc.run( + `MATCH (user:User {id: $userId}) + MERGE (user)-[:GENERATED]->(ic:InviteCode { code: $code }) + ON CREATE SET + ic.createdAt = toString(datetime()), + ic.expiresAt = $expiresAt + RETURN ic AS inviteCode`, + { + userId, + code, + expiresAt: null, + }, + ) + return result.records.map((record) => record.get('inviteCode').properties) + }) + const txResult = await writeTxResultPromise + return txResult[0] + } finally { + session.close() + } + }, MyInviteCodes: async (_parent, args, context, _resolveInfo) => { const { user: { id: userId }, diff --git a/backend/src/schema/types/type/InviteCode.gql b/backend/src/schema/types/type/InviteCode.gql index 8ad7851a2..3293c735b 100644 --- a/backend/src/schema/types/type/InviteCode.gql +++ b/backend/src/schema/types/type/InviteCode.gql @@ -14,4 +14,5 @@ type Mutation { type Query { MyInviteCodes: [InviteCode] isValidInviteCode(code: ID!): Boolean + getInviteCode: InviteCode } From a37a9d05c88f4ad7e585be84a892e70c3e0ed64b Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 18 Mar 2021 12:32:15 +0100 Subject: [PATCH 07/16] .env.template INVITE_REGISTRATION value --- webapp/.env.template | 1 + 1 file changed, 1 insertion(+) diff --git a/webapp/.env.template b/webapp/.env.template index 1acad49b4..7373255a9 100644 --- a/webapp/.env.template +++ b/webapp/.env.template @@ -1,5 +1,6 @@ SENTRY_DSN_WEBAPP= COMMIT= PUBLIC_REGISTRATION=false +INVITE_REGISTRATION=true WEBSOCKETS_URI=ws://localhost:3000/api/graphql GRAPHQL_URI=http://localhost:4000/ From 6584151a39a599c1d02bddba5dcb7c3bcca40635 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 18 Mar 2021 12:33:52 +0100 Subject: [PATCH 08/16] fixed frontend config value evaluation & default values for INVITE_REGISTRATION. Unified the way the config is accessed. --- backend/src/middleware/permissionsMiddleware.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js index b33d09f7f..e1b2feebe 100644 --- a/backend/src/middleware/permissionsMiddleware.js +++ b/backend/src/middleware/permissionsMiddleware.js @@ -87,7 +87,7 @@ const noEmailFilter = rule({ return !('email' in args) }) -const publicRegistration = rule()(() => !!CONFIG.PUBLIC_REGISTRATION) +const publicRegistration = rule()(() => CONFIG.PUBLIC_REGISTRATION) // Permissions export default shield( From 2e65f8df809461795907580e9cbf6eff3554c83c Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 18 Mar 2021 12:34:03 +0100 Subject: [PATCH 09/16] fixed frontend config value evaluation & default values for INVITE_REGISTRATION. Unified the way the config is accessed --- webapp/components/PageFooter/PageFooter.vue | 2 +- webapp/config/index.js | 5 ++--- webapp/layouts/default.vue | 2 +- webapp/nuxt.config.js | 6 +++--- webapp/pages/registration/signup.vue | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/webapp/components/PageFooter/PageFooter.vue b/webapp/components/PageFooter/PageFooter.vue index 9b56e29ee..90d74b137 100644 --- a/webapp/components/PageFooter/PageFooter.vue +++ b/webapp/components/PageFooter/PageFooter.vue @@ -31,7 +31,7 @@ import links from '~/constants/links.js' export default { data() { - return { links, version: `v${process.env.release}` } + return { links, version: `v${this.$env.RELEASE}` } }, } diff --git a/webapp/config/index.js b/webapp/config/index.js index 651bab568..827943ef8 100644 --- a/webapp/config/index.js +++ b/webapp/config/index.js @@ -12,7 +12,6 @@ const environment = { PRODUCTION: process.env.NODE_ENV === 'production' || false, NUXT_BUILD: process.env.NUXT_BUILD || '.nuxt', STYLEGUIDE_DEV: process.env.STYLEGUIDE_DEV || false, - RELEASE: process.env.release, } const server = { @@ -29,8 +28,8 @@ const sentry = { const options = { VERSION: process.env.VERSION || pkg.version, DESCRIPTION: process.env.DESCRIPTION || pkg.description, - PUBLIC_REGISTRATION: process.env.PUBLIC_REGISTRATION, - INVITE_REGISTRATION: process.env.INVITE_REGISTRATION, + PUBLIC_REGISTRATION: process.env.PUBLIC_REGISTRATION === 'true' || false, + INVITE_REGISTRATION: process.env.INVITE_REGISTRATION !== 'false', //default = true // Cookies COOKIE_EXPIRE_TIME: process.env.COOKIE_EXPIRE_TIME || 730, // Two years by default COOKIE_HTTPS_ONLY: process.env.COOKIE_HTTPS_ONLY || process.env.NODE_ENV === 'production', // ensure true in production if not set explicitly diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue index db84c1feb..6ee489367 100644 --- a/webapp/layouts/default.vue +++ b/webapp/layouts/default.vue @@ -108,7 +108,7 @@ export default { return { mobileSearchVisible: false, toggleMobileMenu: false, - inviteRegistration: this.$env.inviteRegistration, + inviteRegistration: this.$env.INVITE_REGISTRATION, } }, computed: { diff --git a/webapp/nuxt.config.js b/webapp/nuxt.config.js index 9ca85431d..6d5247df0 100644 --- a/webapp/nuxt.config.js +++ b/webapp/nuxt.config.js @@ -27,9 +27,9 @@ export default { }, env: { - release: CONFIG.VERSION, - publicRegistration: String(CONFIG.PUBLIC_REGISTRATION) === 'true', - inviteRegistration: String(CONFIG.INVITE_REGISTRATION) === 'true', + RELEASE: CONFIG.VERSION, + PUBLIC_REGISTRATION: CONFIG.PUBLIC_REGISTRATION, + INVITE_REGISTRATION: CONFIG.INVITE_REGISTRATION, // pages which do NOT require a login publicPages: [ 'login', diff --git a/webapp/pages/registration/signup.vue b/webapp/pages/registration/signup.vue index 1265cc013..18f9c9a70 100644 --- a/webapp/pages/registration/signup.vue +++ b/webapp/pages/registration/signup.vue @@ -22,7 +22,7 @@ export default { }, asyncData({ app }) { return { - publicRegistration: app.$env.PUBLIC_REGISTRATION === 'true', + publicRegistration: app.$env.PUBLIC_REGISTRATION, } }, methods: { From e54763cddf97ab25094db799fbc2fe7d6ba68982 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 18 Mar 2021 12:34:28 +0100 Subject: [PATCH 10/16] backend changes for INVITE_REGISTRATION config --- backend/src/config/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/src/config/index.js b/backend/src/config/index.js index 47771029b..b23832eae 100644 --- a/backend/src/config/index.js +++ b/backend/src/config/index.js @@ -82,7 +82,8 @@ const options = { SUPPORT_URL: links.SUPPORT, APPLICATION_NAME: metadata.APPLICATION_NAME, ORGANIZATION_URL: links.ORGANIZATION, - PUBLIC_REGISTRATION: env.PUBLIC_REGISTRATION === 'true', + PUBLIC_REGISTRATION: env.PUBLIC_REGISTRATION === 'true' || false, + INVITE_REGISTRATION: env.INVITE_REGISTRATION !== 'false', //default = true } // Check if all required configs are present From 68c8ab9e3fe9c7b69f5a68ab10481dc5a0cfec8e Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 19 Mar 2021 11:33:39 +0100 Subject: [PATCH 11/16] merga all environment variables into nuxt.env --- webapp/components/PageFooter/PageFooter.vue | 2 +- webapp/config/index.js | 2 +- webapp/nuxt.config.js | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/webapp/components/PageFooter/PageFooter.vue b/webapp/components/PageFooter/PageFooter.vue index 90d74b137..ace0514e1 100644 --- a/webapp/components/PageFooter/PageFooter.vue +++ b/webapp/components/PageFooter/PageFooter.vue @@ -31,7 +31,7 @@ import links from '~/constants/links.js' export default { data() { - return { links, version: `v${this.$env.RELEASE}` } + return { links, version: `v${this.$env.VERSION}` } }, } diff --git a/webapp/config/index.js b/webapp/config/index.js index 827943ef8..dd5a5e04d 100644 --- a/webapp/config/index.js +++ b/webapp/config/index.js @@ -29,7 +29,7 @@ const options = { VERSION: process.env.VERSION || pkg.version, DESCRIPTION: process.env.DESCRIPTION || pkg.description, PUBLIC_REGISTRATION: process.env.PUBLIC_REGISTRATION === 'true' || false, - INVITE_REGISTRATION: process.env.INVITE_REGISTRATION !== 'false', //default = true + INVITE_REGISTRATION: process.env.INVITE_REGISTRATION !== 'false', // default = true // Cookies COOKIE_EXPIRE_TIME: process.env.COOKIE_EXPIRE_TIME || 730, // Two years by default COOKIE_HTTPS_ONLY: process.env.COOKIE_HTTPS_ONLY || process.env.NODE_ENV === 'production', // ensure true in production if not set explicitly diff --git a/webapp/nuxt.config.js b/webapp/nuxt.config.js index 6d5247df0..625710f97 100644 --- a/webapp/nuxt.config.js +++ b/webapp/nuxt.config.js @@ -27,9 +27,7 @@ export default { }, env: { - RELEASE: CONFIG.VERSION, - PUBLIC_REGISTRATION: CONFIG.PUBLIC_REGISTRATION, - INVITE_REGISTRATION: CONFIG.INVITE_REGISTRATION, + ...CONFIG, // pages which do NOT require a login publicPages: [ 'login', From 69c1f584321e9cfe4d73a3b6046f6336e4956156 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 19 Mar 2021 12:33:44 +0100 Subject: [PATCH 12/16] fixed tests for locations --- backend/.env.template | 1 + backend/src/config/index.js | 2 +- .../schema/resolvers/users/location.spec.js | 42 +++++++++++++++---- 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/backend/.env.template b/backend/.env.template index fc9766478..2d2374698 100644 --- a/backend/.env.template +++ b/backend/.env.template @@ -17,6 +17,7 @@ PRIVATE_KEY_PASSPHRASE="a7dsf78sadg87ad87sfagsadg78" SENTRY_DSN_BACKEND= COMMIT= PUBLIC_REGISTRATION=false +INVITE_REGISTRATION=true AWS_ACCESS_KEY_ID= AWS_SECRET_ACCESS_KEY= diff --git a/backend/src/config/index.js b/backend/src/config/index.js index b23832eae..b7d500b8b 100644 --- a/backend/src/config/index.js +++ b/backend/src/config/index.js @@ -83,7 +83,7 @@ const options = { APPLICATION_NAME: metadata.APPLICATION_NAME, ORGANIZATION_URL: links.ORGANIZATION, PUBLIC_REGISTRATION: env.PUBLIC_REGISTRATION === 'true' || false, - INVITE_REGISTRATION: env.INVITE_REGISTRATION !== 'false', //default = true + INVITE_REGISTRATION: env.INVITE_REGISTRATION !== 'false', // default = true } // Check if all required configs are present diff --git a/backend/src/schema/resolvers/users/location.spec.js b/backend/src/schema/resolvers/users/location.spec.js index 41b784249..1ef427034 100644 --- a/backend/src/schema/resolvers/users/location.spec.js +++ b/backend/src/schema/resolvers/users/location.spec.js @@ -114,10 +114,22 @@ describe('Location Service', () => { const result = await query({ query: queryLocations, variables }) expect(result.data.queryLocations).toEqual([ { id: 'place.14094307404564380', place_name: 'Berlin, Germany' }, - { id: 'place.15095411613564380', place_name: 'Berlin, Maryland, United States' }, - { id: 'place.5225018734564380', place_name: 'Berlin, Connecticut, United States' }, - { id: 'place.16922023226564380', place_name: 'Berlin, New Jersey, United States' }, - { id: 'place.4035845612564380', place_name: 'Berlin Township, New Jersey, United States' }, + { + id: expect.stringMatching(/^place\.[0-9]+$/), + place_name: 'Berlin, Maryland, United States', + }, + { + id: expect.stringMatching(/^place\.[0-9]+$/), + place_name: 'Berlin, Connecticut, United States', + }, + { + id: expect.stringMatching(/^place\.[0-9]+$/), + place_name: 'Berlin, New Jersey, United States', + }, + { + id: expect.stringMatching(/^place\.[0-9]+$/), + place_name: 'Berlin Township, New Jersey, United States', + }, ]) }) @@ -128,11 +140,23 @@ describe('Location Service', () => { } const result = await query({ query: queryLocations, variables }) expect(result.data.queryLocations).toEqual([ - { id: 'place.14094307404564380', place_name: 'Berlin, Deutschland' }, - { id: 'place.15095411613564380', place_name: 'Berlin, Maryland, Vereinigte Staaten' }, - { id: 'place.16922023226564380', place_name: 'Berlin, New Jersey, Vereinigte Staaten' }, - { id: 'place.10735893248465990', place_name: 'Berlin Heights, Ohio, Vereinigte Staaten' }, - { id: 'place.1165756679564380', place_name: 'Berlin, Massachusetts, Vereinigte Staaten' }, + { id: expect.stringMatching(/^place\.[0-9]+$/), place_name: 'Berlin, Deutschland' }, + { + id: expect.stringMatching(/^place\.[0-9]+$/), + place_name: 'Berlin, Maryland, Vereinigte Staaten', + }, + { + id: expect.stringMatching(/^place\.[0-9]+$/), + place_name: 'Berlin, New Jersey, Vereinigte Staaten', + }, + { + id: expect.stringMatching(/^place\.[0-9]+$/), + place_name: 'Berlin Heights, Ohio, Vereinigte Staaten', + }, + { + id: expect.stringMatching(/^place\.[0-9]+$/), + place_name: 'Berlin, Massachusetts, Vereinigte Staaten', + }, ]) }) From 8526bc6b1df0f52a87c7c214ff988f334b290288 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 19 Mar 2021 14:11:21 +0100 Subject: [PATCH 13/16] button to copy invite link to clipboard --- .../components/InviteButton/InviteButton.vue | 33 +++++++++++++------ webapp/locales/de.json | 1 + webapp/locales/en.json | 1 + 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/webapp/components/InviteButton/InviteButton.vue b/webapp/components/InviteButton/InviteButton.vue index 15190d9dc..a605c863f 100644 --- a/webapp/components/InviteButton/InviteButton.vue +++ b/webapp/components/InviteButton/InviteButton.vue @@ -7,16 +7,14 @@
{{ $t('invite-codes.your-code') }} - - {{ inviteCode.code }} - - + + + {{ inviteCode.code }} + + + + {{ $t('invite-codes.copy-link') }} +
{{ $t('invite-codes.not-available') }} @@ -51,6 +49,15 @@ export default { await navigator.clipboard.writeText(this.inviteCode.code) this.$toast.success(this.$t('invite-codes.copy-success')) }, + async copyInviteLink() { + await navigator.clipboard.writeText( + 'https://' + + window.location.hostname + + '/registration?method=invite-code&inviteCode=' + + this.inviteCode.code, + ) + this.$toast.success(this.$t('invite-codes.copy-success')) + }, }, apollo: { inviteCode: { @@ -79,5 +86,11 @@ export default { .invite-button-menu-popover { text-align: center; + display: flex; + justify-content: center; + align-items: center; +} +.invite-code { + left: 50%; } diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 060068af4..da9d232f4 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -338,6 +338,7 @@ }, "invite-codes": { "copy-code": "Einladungscode in die Zwischenablage kopieren", + "copy-link": "Einladungslink in die Zwischenablage kopieren", "copy-success": "Einladungscode erfolgreich in die Zwischenablage kopiert", "not-available": "Du hast keinen Einladungscode zur Verfügung!", "your-code": "Das ist dein Einladungscode:" diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 3fbacb70c..6a77f91a9 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -338,6 +338,7 @@ }, "invite-codes": { "copy-code": "Copy invite code to clipboard", + "copy-link": "Copy invite link to clipboard", "copy-success": "Invite code copied to clipboard", "not-available": "You have no valid invite code available!", "your-code": "This is your invite code:" From 7c794012e23aebfb5785f196d7025f525831a5b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 24 Mar 2021 11:51:48 +0100 Subject: [PATCH 14/16] Design invite button --- .../components/InviteButton/InviteButton.vue | 75 +++++++++++++------ webapp/locales/de.json | 6 +- webapp/locales/en.json | 6 +- webapp/plugins/vue-filters.js | 12 +++ 4 files changed, 72 insertions(+), 27 deletions(-) diff --git a/webapp/components/InviteButton/InviteButton.vue b/webapp/components/InviteButton/InviteButton.vue index a605c863f..4493d5e38 100644 --- a/webapp/components/InviteButton/InviteButton.vue +++ b/webapp/components/InviteButton/InviteButton.vue @@ -6,15 +6,32 @@