fixed merge issues

.babelrc

@@ -1 +1 @@
-{ "presets": ["env"] }
+{ "presets": ["@babel/preset-env"] }

.gitignore

@@ -1,3 +1,4 @@
 node_modules/
 .env
 .vscode
+yarn-error.log

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "hc-prototype-api-",
+  "name": "human-connection-backend",
   "version": "0.0.1",
-  "description": "Graph API Protype for Human Connection",
+  "description": "GraphQL Backend for Human Connection",
   "main": "src/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -9,9 +9,14 @@
     "start:debug": "./node_modules/.bin/nodemon --exec babel-node --inspect=0.0.0.0:9229 src/index.js",
     "db:seed": "concurrently --kill-others --success first 'cross-env GRAPHQL_URI=http://localhost:4001 PERMISSIONS=disabled GRAPHQL_PORT=4001 yarn run start' 'wait-on tcp:4001 && cross-env GRAPHQL_URI=http://localhost:4001 ./node_modules/.bin/babel-node src/seed/seed-db.js'"
   },
-  "author": "Grzegorz Leoniec",
+  "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-boost": "^0.1.10",
     "apollo-cache-inmemory": "^1.2.5",
     "apollo-client": "^2.3.2",
@@ -41,8 +46,6 @@
     "trunc-html": "^1.1.2"
   },
   "devDependencies": {
-    "babel-cli": "^6.26.0",
-    "babel-preset-env": "^1.7.0",
     "concurrently": "^4.1.0",
     "cross-env": "^5.2.0",
     "faker": "^4.1.0",

src/index.js

@@ -61,7 +61,7 @@ server.express.use(passport.initialize())
 server.express.post('/graphql', passport.authenticate(['jwt'], { session: false }))
 
 const serverConfig = {
-  port: process.env.GRAPHQL_PORT
+  port: process.env.GRAPHQL_PORT || 4000
   // cors: {
   //   credentials: true,
   //   origin: [process.env.CLIENT_URI] // your frontend url.