merged master in

.travis.yml

@@ -40,3 +40,19 @@ after_failure:
   - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh
   - chmod +x send.sh
   - ./send.sh failure $WEBHOOK_URL
+
+deploy:
+  - provider: script
+    script: scripts/deploy.sh nitro.human-connection.org
+    on:
+      branch: master
+      tags: true
+  - provider: script
+    script: scripts/deploy.sh nitro-staging.human-connection.org
+    on:
+      branch: master
+  - provider: script
+    script: scripts/deploy.sh "nitro-$(git rev-parse --short HEAD).human-connection.org"
+    on:
+      tags: true
+      all_branches: true

Dockerfile.neo4j

@@ -1,2 +1,2 @@
-FROM neo4j:3.4
-RUN wget https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/3.4.0.3/apoc-3.4.0.3-all.jar -P plugins/
+FROM neo4j:3.5.0
+RUN wget https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/3.5.0.1/apoc-3.5.0.1-all.jar -P plugins/

README.md

@@ -21,6 +21,9 @@
 > We still need to evaluate the drawbacks and estimate the development 
 > cost of such an approach
 
+## How to get in touch 
+Connect with other developers over [Discord](https://discord.gg/6ub73U3)
+
 ## Quick Start
 
 ### Installation with Docker
@@ -30,7 +33,7 @@ Run:
 docker-compose up
 # if you want seed data
 # open another terminal and run
-docker-compose exec backend yarn run seedDb
+docker-compose exec backend yarn run db:seed
 ```
 
 App is [running on port 4000](http://localhost:4000/)

package.json

@@ -19,50 +19,51 @@
   "author": "Human Connection gGmbH",
   "license": "MIT",
   "dependencies": {
-    "@babel/cli": "^7.1.5",
-    "@babel/core": "^7.1.6",
-    "@babel/node": "^7.0.0",
-    "@babel/preset-env": "^7.1.6",
-    "@babel/register": "^7.0.0",
-    "apollo-cache-inmemory": "^1.2.5",
-    "apollo-client": "^2.3.2",
-    "apollo-link-http": "^1.5.4",
-    "apollo-server": "^2.0.4",
-    "bcryptjs": "^2.4.3",
-    "cheerio": "^1.0.0-rc.2",
-    "date-fns": "^2.0.0-alpha.24",
-    "dotenv": "^6.2.0",
-    "graphql-custom-directives": "^0.2.13",
-    "graphql-iso-date": "^3.6.1",
-    "graphql-middleware": "1.7.6",
-    "graphql-shield": "^4.0.1",
-    "graphql-tag": "^2.9.2",
-    "graphql-yoga": "1.16.2",
-    "jsonwebtoken": "^8.3.0",
-    "linkifyjs": "^2.1.7",
-    "lodash": "^4.17.11",
-    "ms": "^2.1.1",
-    "neo4j-driver": "^1.6.1",
-    "neo4j-graphql-js": "1.0.5",
-    "node-fetch": "^2.1.2",
-    "passport": "^0.4.0",
-    "passport-jwt": "^4.0.0",
-    "sanitize-html": "^1.19.2",
-    "slug": "^0.9.1",
-    "trunc-html": "^1.1.2"
+    "@babel/cli": "~7.2.0",
+    "@babel/core": "~7.2.0",
+    "@babel/node": "~7.2.0",
+    "@babel/preset-env": "~7.2.0",
+    "@babel/register": "~7.0.0",
+    "apollo-cache-inmemory": "~1.3.11",
+    "apollo-client": "~2.4.7",
+    "apollo-link-http": "~1.5.7",
+    "apollo-server": "~2.2.6",
+    "bcryptjs": "~2.4.3",
+    "cheerio": "~1.0.0-rc.2",
+    "date-fns": "^2.0.0-alpha.25",
+    "dotenv": "~6.2.0",
+    "graphql": "~0.13.0",
+    "graphql-custom-directives": "~0.2.14",
+    "graphql-iso-date": "~3.6.1",
+    "graphql-middleware": "2.0.2",
+    "graphql-shield": "~4.1.0",
+    "graphql-tag": "~2.10.0",
+    "graphql-yoga": "~1.16.7",
+    "jsonwebtoken": "~8.4.0",
+    "linkifyjs": "~2.1.7",
+    "lodash": "~4.17.11",
+    "ms": "~2.1.1",
+    "neo4j-driver": "~1.7.2",
+    "neo4j-graphql-js": "2.0.1",
+    "node-fetch": "~2.3.0",
+    "passport": "~0.4.0",
+    "passport-jwt": "~4.0.0",
+    "sanitize-html": "~1.19.3",
+    "slug": "~0.9.2",
+    "trunc-html": "~1.1.2"
   },
   "devDependencies": {
-    "babel-eslint": "^10.0.1",
-    "cross-env": "^5.2.0",
-    "eslint": "^5.9.0",
-    "eslint-config-standard": "^12.0.0",
-    "eslint-plugin-import": "^2.14.0",
-    "eslint-plugin-node": "^8.0.0",
-    "eslint-plugin-promise": "^4.0.1",
-    "eslint-plugin-standard": "^4.0.0",
-    "faker": "^4.1.0",
-    "nodemon": "^1.18.7",
-    "npm-run-all": "^4.1.5",
-    "wait-on": "^3.2.0"
+    "babel-eslint": "~10.0.1",
+    "cross-env": "~5.2.0",
+    "eslint": "~5.9.0",
+    "eslint-config-standard": "~12.0.0",
+    "eslint-plugin-import": "~2.14.0",
+    "eslint-plugin-node": "~8.0.0",
+    "eslint-plugin-promise": "~4.0.1",
+    "eslint-plugin-standard": "~4.0.0",
+    "faker": "~4.1.0",
+    "nodemon": "~1.18.7",
+    "npm-run-all": "~4.1.5",
+    "wait-on": "~3.2.0"
   }
 }

scripts/deploy.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo "See me deployed at $1 :)"
+