From 43a2c502c93716346f8d46092d1624918c83fc84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 13 Jul 2019 23:48:24 +0200 Subject: [PATCH 1/8] Fix regression of data import --- .../maintenance-worker/migration/neo4j/users/users.cql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/legacy-migration/maintenance-worker/migration/neo4j/users/users.cql b/deployment/legacy-migration/maintenance-worker/migration/neo4j/users/users.cql index 4d7c9aa9f..84eb7074b 100644 --- a/deployment/legacy-migration/maintenance-worker/migration/neo4j/users/users.cql +++ b/deployment/legacy-migration/maintenance-worker/migration/neo4j/users/users.cql @@ -101,7 +101,7 @@ ON CREATE SET u.name = user.name, u.slug = user.slug, u.email = user.email, -u.password = user.password, +u.encryptedPassword = user.password, u.avatar = replace(user.avatar, 'https://api-alpha.human-connection.org', ''), u.coverImg = replace(user.coverImg, 'https://api-alpha.human-connection.org', ''), u.wasInvited = user.wasInvited, From 5bde0ab03626997ce50b7170d14502a857176acd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sun, 14 Jul 2019 00:48:05 +0200 Subject: [PATCH 2/8] No global codecov install, less verbose CI output --- .travis.yml | 3 +-- backend/package.json | 1 - webapp/package.json | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 593b83e5f..3c1208496 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ addons: before_install: - yarn global add wait-on # Install Codecov - - yarn global add codecov - yarn install - cp cypress.env.template.json cypress.env.json @@ -40,7 +39,7 @@ script: # Fullstack - yarn run cypress:run # Coverage - - codecov + - yarn run codecov after_success: - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh diff --git a/backend/package.json b/backend/package.json index 25b3c8cb0..2b6575176 100644 --- a/backend/package.json +++ b/backend/package.json @@ -34,7 +34,6 @@ "!**/src/**/?(*.)+(spec|test).js?(x)" ], "coverageReporters": [ - "text", "lcov" ], "testMatch": [ diff --git a/webapp/package.json b/webapp/package.json index edad9509d..a65c5f12c 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -29,7 +29,6 @@ "!**/?(*.)+(spec|test).js?(x)" ], "coverageReporters": [ - "text", "lcov" ], "transform": { @@ -111,4 +110,4 @@ "vue-jest": "~3.0.4", "vue-svg-loader": "~0.12.0" } -} \ No newline at end of file +} From 8a167681809c3be76148ecee4f8662053ad76cc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sun, 14 Jul 2019 01:12:04 +0200 Subject: [PATCH 3/8] Disable codecov's PR comments Our fellow @Hardy-Peaceglobal already turned off Github's notifications completely because of codecov's PR comments. I think it's more important not to annoy open-source contributors than to have these comments. --- .codecov.yml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/.codecov.yml b/.codecov.yml index 2767ed675..82b50aba3 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -95,7 +95,7 @@ coverage: # - master #flags: # - integration - paths: + paths: - backend/ # only include coverage in "backend/" folder webapp: # declare a new status context "frontend" against: parent @@ -127,7 +127,7 @@ coverage: # - integration # paths: # - folder - + #changes: # default: # against: parent @@ -150,20 +150,8 @@ coverage: #ignore: # files and folders for processing # - tests/* - + #fixes: # - "old_path::new_path" -comment: - # layout options are quite limited in v4.x - there have been way more options in v1.0 - layout: reach, diff, flags, files # mostly old options: header, diff, uncovered, reach, files, tree, changes, sunburst, flags - behavior: new # default = posts once then update, posts new if delete - # once = post once then updates - # new = delete old, post new - # spammy = post new - require_changes: false # if true: only post the comment if coverage changes - require_base: no # [yes :: must have a base report to post] - require_head: no # [yes :: must have a head report to post] - branches: null # branch names that can post comment - flags: null - paths: null \ No newline at end of file +comment: off From 6eea5924dc8fbaa0ff4d578fd3b556e03efd2b20 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2019 04:26:08 +0000 Subject: [PATCH 4/8] Bump nodemailer from 6.2.1 to 6.3.0 in /backend Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.2.1 to 6.3.0. - [Release notes](https://github.com/nodemailer/nodemailer/releases) - [Changelog](https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md) - [Commits](https://github.com/nodemailer/nodemailer/compare/v6.2.1...v6.3.0) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/package.json b/backend/package.json index 25b3c8cb0..6c15871bf 100644 --- a/backend/package.json +++ b/backend/package.json @@ -74,7 +74,7 @@ "neo4j-graphql-js": "^2.6.3", "neode": "^0.2.16", "node-fetch": "~2.6.0", - "nodemailer": "^6.2.1", + "nodemailer": "^6.3.0", "npm-run-all": "~4.1.5", "request": "~2.88.0", "sanitize-html": "~1.20.1", diff --git a/backend/yarn.lock b/backend/yarn.lock index 110094f3a..1df53a7bb 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -5795,10 +5795,10 @@ node-releases@^1.1.19: dependencies: semver "^5.3.0" -nodemailer@^6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.2.1.tgz#20d773925eb8f7a06166a0b62c751dc8290429f3" - integrity sha512-TagB7iuIi9uyNgHExo8lUDq3VK5/B0BpbkcjIgNvxbtVrjNqq0DwAOTuzALPVkK76kMhTSzIgHqg8X1uklVs6g== +nodemailer@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.3.0.tgz#a89b0c62d3937bdcdeecbf55687bd7911b627e12" + integrity sha512-TEHBNBPHv7Ie/0o3HXnb7xrPSSQmH1dXwQKRaMKDBGt/ZN54lvDVujP6hKkO/vjkIYL9rK8kHSG11+G42Nhxuw== nodemon@~1.19.1: version "1.19.1" From 38ee22d4521cc5430f992298b613c7dd5ab52a7d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2019 04:26:41 +0000 Subject: [PATCH 5/8] Bump cypress-file-upload from 3.2.1 to 3.3.1 Bumps [cypress-file-upload](https://github.com/abramenal/cypress-file-upload) from 3.2.1 to 3.3.1. - [Release notes](https://github.com/abramenal/cypress-file-upload/releases) - [Commits](https://github.com/abramenal/cypress-file-upload/compare/v3.2.1...v3.3.1) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 27baa56f6..b4447bdd2 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "cross-env": "^5.2.0", "cypress": "^3.4.0", "cypress-cucumber-preprocessor": "^1.12.0", - "cypress-file-upload": "^3.2.1", + "cypress-file-upload": "^3.3.1", "cypress-plugin-retries": "^1.2.2", "dotenv": "^8.0.0", "faker": "Marak/faker.js#master", diff --git a/yarn.lock b/yarn.lock index 99c7d61ae..4bd56b6ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1827,10 +1827,10 @@ cypress-cucumber-preprocessor@^1.12.0: glob "^7.1.2" through "^2.3.8" -cypress-file-upload@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-3.2.1.tgz#12befbd5f685883b2ce39133d675173f60caae5b" - integrity sha512-Wx9+DVon1Sc8HhiNpWaCYvjn5q8izYg9+Es0MhwlRj2APRToaihtM0EJgS/om9gA9HeKbU0ReTpv+xk/0VCUjw== +cypress-file-upload@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-3.3.1.tgz#19bb6c296ffc492dbfae8a7511c94d6b4d0ad4d5" + integrity sha512-iUtq/a30i73JXx9sUj5HhmuEV9pHMV2/7C06H8/zFDSgFweFSwKL0SSprQu8Ewf7cAEsExBKigwlLQYFdTW8PA== cypress-plugin-retries@^1.2.2: version "1.2.2" From 5360038ac04b8c6db0ab70873a5c03a702c15f3e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2019 04:26:52 +0000 Subject: [PATCH 6/8] Bump linkify-it from 2.1.0 to 2.2.0 in /webapp Bumps [linkify-it](https://github.com/markdown-it/linkify-it) from 2.1.0 to 2.2.0. - [Release notes](https://github.com/markdown-it/linkify-it/releases) - [Changelog](https://github.com/markdown-it/linkify-it/blob/master/CHANGELOG.md) - [Commits](https://github.com/markdown-it/linkify-it/compare/2.1.0...2.2.0) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index edad9509d..f7ab1a50a 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -64,7 +64,7 @@ "express": "~4.17.1", "graphql": "~14.4.2", "jsonwebtoken": "~8.5.1", - "linkify-it": "~2.1.0", + "linkify-it": "~2.2.0", "nuxt": "~2.8.1", "nuxt-dropzone": "^1.0.2", "nuxt-env": "~0.1.0", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 950449518..27f6dc033 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -6777,10 +6777,10 @@ levn@^0.3.0, levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -linkify-it@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.1.0.tgz#c4caf38a6cd7ac2212ef3c7d2bde30a91561f9db" - integrity sha512-4REs8/062kV2DSHxNfq5183zrqXMl7WP0WzABH9IeJI+NLm429FgE1PDecltYfnOoFDFlZGh2T8PfZn0r+GTRg== +linkify-it@~2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf" + integrity sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw== dependencies: uc.micro "^1.0.1" From fa024ac47a3d608b466b993ecea717cb486419d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Mon, 15 Jul 2019 12:04:13 +0200 Subject: [PATCH 7/8] Sledgehammer the file permission problem on docker NuxtJS wants to write into .nuxt. If the docker container writes into .nuxt it will have the file permissions of the docker container user even on the host system. So on the host system you cannot remove the folder .nuxt anymore. This gets in the way of running NuxtJS on the host system. --- docker-compose.yml | 1 + webapp/.gitignore | 2 ++ webapp/nuxt.config.js | 3 +++ 3 files changed, 6 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index ca66217c2..93e80d9c1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,6 +12,7 @@ services: networks: - hc-network environment: + - NUXT_BUILD=.nuxt-dist - HOST=0.0.0.0 - GRAPHQL_URI=http://backend:4000 - MAPBOX_TOKEN="pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.bZ8KK9l70omjXbEkkbHGsQ" diff --git a/webapp/.gitignore b/webapp/.gitignore index f8c980f7c..bc179d78a 100644 --- a/webapp/.gitignore +++ b/webapp/.gitignore @@ -61,6 +61,8 @@ typings/ # nuxt.js build output .nuxt +# also the build output in docker container +.nuxt-dist # Nuxt generate dist diff --git a/webapp/nuxt.config.js b/webapp/nuxt.config.js index cb3a3c643..7ea1038a9 100644 --- a/webapp/nuxt.config.js +++ b/webapp/nuxt.config.js @@ -10,7 +10,10 @@ const styleguideStyles = process.env.STYLEGUIDE_DEV ] : '@human-connection/styleguide/dist/shared.scss' +const buildDir = process.env.NUXT_BUILD || '.nuxt' + module.exports = { + buildDir, mode: 'universal', dev: dev, From 8de9da0148319b5fad6bcceccfdf565266ffd405 Mon Sep 17 00:00:00 2001 From: senderfm Date: Mon, 15 Jul 2019 13:54:58 +0200 Subject: [PATCH 8/8] duplicate entry removed --- docker-compose.travis.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/docker-compose.travis.yml b/docker-compose.travis.yml index bc627a67a..0c6576ca7 100644 --- a/docker-compose.travis.yml +++ b/docker-compose.travis.yml @@ -26,9 +26,4 @@ services: ports: - 4001:4001 - 4123:4123 - neo4j: - environment: - - NEO4J_AUTH=none - ports: - - 7687:7687 - - 7474:7474 +