Merge branch 'master' of github.com:yalla-coop/rent-check into 18-sup…

…eruser-manage-data

.travis.yml

@@ -1,23 +1,19 @@
 language: node_js
 node_js:
-  - "10.5.0"
+  - "12.13.0"
 cache:
   directories:
     - "node_modules"
 
 env:
   - MONGODB=4.0.0
 
-before_install:
-  - sudo apt-get install libcairo2-dev libjpeg8-dev libpango1.0-dev libgif-dev
-    build-essential g++
-
 install:
   - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz
   - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz
   - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --version
   - mongo --version
-  - npm run init
+  - npm i && npm run init
 
 before_script:
   - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data

package.json

@@ -14,10 +14,12 @@
     "test-coverage:client": "npm run test:coverage --prefix client",
     "test-coverage:server": "npm run test:coverage --prefix server",
     "coverage": "codecov",
-    "start": "run-p start:**",
-    "start:server": "npm start --prefix server",
-    "start:client": "npm start --prefix client",
-    "build": "npm run build --prefix client"
+    "dev": "run-p dev:**",
+    "dev:server": "npm start --prefix server",
+    "dev:client": "npm start --prefix client",
+    "start": "node server/bin/app",
+    "build": "npm run build --prefix client",
+    "heroku-prebuild": "npm i && npm run init && npm run database:build:production --prefix server"
   },
   "repository": {
     "type": "git",

server/bin/app

@@ -3,6 +3,5 @@
 
 // Pass configuration to application
 require('../')({
-  port: 8000,
-  host: 'localhost'
+  port: process.env.PORT || 8000
 })

server/index.js

@@ -92,7 +92,7 @@ module.exports = function main(options, cb) {
     .catch(e => console.error(e));
 
   // Start server
-  server = app.listen(opts.port, opts.host, function(err) {
+  server = app.listen(opts.port, function(err) {
     if (err) {
       return ready(err, app, server);
     }
@@ -104,9 +104,7 @@ module.exports = function main(options, cb) {
 
     serverStarted = true;
     const addr = server.address();
-    logger.info(
-      `Started at ${opts.host || addr.host || "localhost"}:${addr.port}`
-    );
+    logger.info(`Listening on port ${addr.port}`);
     ready(err, app, server);
   });
 };

server/package.json

@@ -9,7 +9,8 @@
   "scripts": {
     "start": "nodemon ./bin/app",
     "database:run:dev": "docker run -d -p 27017-27019:27017-27019 --name rentCheckMongo mongo",
-    "database:build:dev": "babel-node ./database/data",
+    "database:build:dev": "node ./database/data",
+    "database:build:production": "node ./database/data/index.js",
     "database:build:fake": "babel-node ./database/data && npm run fake",
     "fake": "babel-node ./database/data/fakedata",
     "test": "jest --runInBand --detectOpenHandles --forceExit --watch",