Merge branch 'master' into integration-testing

Dockerfile

@@ -15,11 +15,11 @@ RUN apk --no-cache add git
 COPY package.json .
 COPY yarn.lock .
 COPY styleguide/ ./styleguide
-RUN yarn install --production=false --frozen-lockfile --non-interactive --ignore-engines
+RUN yarn install --production=false --frozen-lockfile --non-interactive
 
 # Install and build Styleguide
 COPY styleguide/ ./styleguide
-RUN cd styleguide && yarn install --production=false --frozen-lockfile --non-interactive --ignore-engines \
+RUN cd styleguide && yarn install --production=false --frozen-lockfile --non-interactive \
     && cd .. \
     && yarn run styleguide:build \
     && rm -Rf styleguide/node_modules

README.md

@@ -7,11 +7,10 @@
 
 ### Install
 ``` bash
-# NOTE: currently we need the --ignore-engines parameter as one package is an idiot and dont like new node versions
 # install all dependencies
-$ cd styleguide && yarn install --ignore-engines && cd ..
+$ cd styleguide && yarn install && cd ..
 $ yarn run styleguide:build
-$ yarn install --ignore-engines
+$ yarn install
 ```
 
 ### Development

package.json

@@ -11,7 +11,7 @@
     "generate": "nuxt generate",
     "lint": "eslint --ext .js,.vue .",
     "styleguide": "cd ./styleguide && yarn dev",
-    "styleguide:build": "cd ./styleguide && yarn build:lib && cd ../ && yarn upgrade vue-cion-design-system --ignore-engines",
+    "styleguide:build": "cd ./styleguide && yarn build:lib && cd ../ && yarn upgrade vue-cion-design-system",
     "test": "jest",
     "precommit": "yarn lint"
   },
@@ -39,6 +39,7 @@
     "cross-env": "^5.2.0",
     "date-fns": "^2.0.0-alpha.24",
     "express": "^4.16.3",
+    "graphql": "^14.0.2",
     "graphql-tag": "^2.10.0",
     "jsonwebtoken": "^8.3.0",
     "nuxt": "^2.0.0",
@@ -46,7 +47,7 @@
     "v-tooltip": "^2.0.0-rc.33",
     "vue-cion-design-system": "file:./styleguide",
     "vue-count-to": "^1.0.13",
-    "vue-izitoast": "^1.1.0"
+    "vue-izitoast": "git://github.com/arthurvasconcelos/vue-izitoast.git"
   },
   "devDependencies": {
     "@vue/eslint-config-prettier": "^4.0.1",

plugins/apollo-config.js

@@ -1,11 +1,12 @@
 export default function({ app }) {
+  const backendUrl = process.BACKEND_URL || 'http://localhost:4000'
   return {
-    httpEndpoint: '/api',
+    httpEndpoint: process.server ? backendUrl : '/api',
     httpLinkOptions: {
       credentials: 'same-origin'
     },
     credentials: true,
-    tokenName: 'apollo-token',
+    tokenName: 'human-connection-token',
     persisting: false,
     websocketsOnly: false
   }

styleguide/package.json

@@ -23,7 +23,7 @@
     "@vue/cli-plugin-eslint": "^3.0.0-rc.12",
     "@vue/cli-plugin-unit-jest": "^3.0.1",
     "@vue/cli-service": "^3.0.0-rc.12",
-    "@vue/eslint-config-prettier": "^3.0.0-rc.12",
+    "@vue/eslint-config-prettier": "^4.0.1",
     "@vue/test-utils": "^1.0.0-beta.20",
     "async-validator": "^1.8.5",
     "babel-core": "7.0.0-bridge.0",