Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category

.codecov.yml

@@ -154,16 +154,4 @@ coverage:
   #fixes:
   #  - "old_path::new_path"
 
-comment:
+comment: off
-  # 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

.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

backend/package.json

@@ -34,7 +34,6 @@
       "!**/src/**/?(*.)+(spec|test).js?(x)"
     ],
     "coverageReporters": [
-      "text",
       "lcov"
     ],
     "testMatch": [
@@ -74,7 +73,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",

backend/yarn.lock

@@ -5795,10 +5795,10 @@ node-releases@^1.1.19:
   dependencies:
     semver "^5.3.0"
 
-nodemailer@^6.2.1:
+nodemailer@^6.3.0:
-  version "6.2.1"
+  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.2.1.tgz#20d773925eb8f7a06166a0b62c751dc8290429f3"
+  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.3.0.tgz#a89b0c62d3937bdcdeecbf55687bd7911b627e12"
-  integrity sha512-TagB7iuIi9uyNgHExo8lUDq3VK5/B0BpbkcjIgNvxbtVrjNqq0DwAOTuzALPVkK76kMhTSzIgHqg8X1uklVs6g==
+  integrity sha512-TEHBNBPHv7Ie/0o3HXnb7xrPSSQmH1dXwQKRaMKDBGt/ZN54lvDVujP6hKkO/vjkIYL9rK8kHSG11+G42Nhxuw==
 
 nodemon@~1.19.1:
   version "1.19.1"

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,

docker-compose.travis.yml

@@ -26,9 +26,4 @@ services:
     ports:
       - 4001:4001
       - 4123:4123
-  neo4j:
+
-    environment:
-      - NEO4J_AUTH=none
-    ports:
-      - 7687:7687
-      - 7474:7474

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"

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",

webapp/.gitignore

@@ -61,6 +61,8 @@ typings/
 
 # nuxt.js build output
 .nuxt
+# also the build output in docker container
+.nuxt-dist
 
 # Nuxt generate
 dist

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,

webapp/package.json

@@ -29,7 +29,6 @@
       "!**/?(*.)+(spec|test).js?(x)"
     ],
     "coverageReporters": [
-      "text",
       "lcov"
     ],
     "transform": {
@@ -64,7 +63,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",

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:
+linkify-it@~2.2.0:
-  version "2.1.0"
+  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.1.0.tgz#c4caf38a6cd7ac2212ef3c7d2bde30a91561f9db"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf"
-  integrity sha512-4REs8/062kV2DSHxNfq5183zrqXMl7WP0WzABH9IeJI+NLm429FgE1PDecltYfnOoFDFlZGh2T8PfZn0r+GTRg==
+  integrity sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==
   dependencies:
     uc.micro "^1.0.1"
 

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:
+cypress-file-upload@^3.3.1:
-  version "3.2.1"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-3.2.1.tgz#12befbd5f685883b2ce39133d675173f60caae5b"
+  resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-3.3.1.tgz#19bb6c296ffc492dbfae8a7511c94d6b4d0ad4d5"
-  integrity sha512-Wx9+DVon1Sc8HhiNpWaCYvjn5q8izYg9+Es0MhwlRj2APRToaihtM0EJgS/om9gA9HeKbU0ReTpv+xk/0VCUjw==
+  integrity sha512-iUtq/a30i73JXx9sUj5HhmuEV9pHMV2/7C06H8/zFDSgFweFSwKL0SSprQu8Ewf7cAEsExBKigwlLQYFdTW8PA==
 
 cypress-plugin-retries@^1.2.2:
   version "1.2.2"