Merge remote-tracking branch 'origin/master' into admin-tags-and-categories

docker-compose.override.yml

@@ -0,0 +1,13 @@
+version: '3.7'
+
+services:
+  webapp:
+    volumes:
+      - .:/nitro-web
+      - node_modules:/nitro-web/node_modules
+      - node_modules_styleguide:/nitro-web/styleguide/node_modules
+    command: yarn run dev
+
+volumes:
+  node_modules:
+  node_modules_styleguide:

docker-compose.yml

@@ -2,20 +2,16 @@ version: '3.7'
 
 services:
   webapp:
-    build:
-      context: .
+    image: humanconnection/nitro-web:latest
+    build: .
     ports:
       - 3000:3000
       - 8080:8080
     networks:
       - hc-network
-    volumes:
-      - .:/HC-WebApp
-      - node_modules:/HC-WebApp/node_modules
-    command: yarn run dev
     environment:
       - HOST=0.0.0.0
-      - BACKEND_URL=http://backend.127.0.0.1.xip.io:4000
+      - BACKEND_URL=http://backend:4000
 
 networks:
   hc-network:

package.json

@@ -60,7 +60,7 @@
     "eslint-plugin-prettier": "3.0.0",
     "eslint-plugin-vue": "^5.0.0",
     "jest": "^23.6.0",
-    "node-sass": "^4.9.3",
+    "node-sass": "^4.11.0",
     "nodemon": "^1.11.0",
     "nuxt-sass-resources-loader": "^2.0.5",
     "prettier": "1.14.3",

plugins/apollo-config.js

@@ -1,5 +1,5 @@
 export default function({ app }) {
-  const backendUrl = process.BACKEND_URL || 'http://localhost:4000'
+  const backendUrl = process.env.BACKEND_URL || 'http://localhost:4000'
   return {
     httpEndpoint: process.server ? backendUrl : '/api',
     httpLinkOptions: {

styleguide/src/system/components/data-input/Input/Input.vue

@@ -13,7 +13,7 @@
           iconRight && `ds-input-has-icon-right`
         ]"
         :id="id"
-        :name="model"
+        :name="name"
         :type="type"
         :autofocus="autofocus"
         :placeholder="placeholder"

yarn.lock

@@ -7244,10 +7244,10 @@ node-releases@^1.0.1:
   dependencies:
     semver "^5.3.0"
 
-node-sass@^4.9.3:
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.10.0.tgz#dcc2b364c0913630945ccbf7a2bbf1f926effca4"
-  integrity sha512-fDQJfXszw6vek63Fe/ldkYXmRYK/QS6NbvM3i5oEo9ntPDy4XX7BcKZyTKv+/kSSxRtXXc7l+MSwEmYc0CSy6Q==
+node-sass@^4.11.0:
+  version "4.11.0"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.11.0.tgz#183faec398e9cbe93ba43362e2768ca988a6369a"
+  integrity sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"