Merge 069c171 into ee82a90

.eslintrc.json

@@ -24,15 +24,17 @@
     ],
     "rules": {
         "one-var": 0,
-        "arrow-parens": 0,
         "one-var-declaration-per-line": 0,
         "new-cap": 0,
         "consistent-return": 0,
         "linebreak-style": 0,
         "no-param-reassign": 0,
         "no-trailing-spaces": 0,
         "comma-dangle": 0,
+        "camelcase": 0,
         "no-unused-expressions": 0,
+        "arrow-parens": 0,
+        "class-methods-use-this": 0,
         "curly": ["error", "multi-line"],
         "import/no-unresolved": [2, { "commonjs": true }],
         "no-shadow": ["error", { "allow": ["req", "res", "err"] }],

package.json

@@ -1,4 +1,4 @@
-{
+ {
   "name": "barefoot-nomad",
   "version": "1.0.0",
   "description": "Making company travel and accommodation easy and convenient.",
@@ -7,12 +7,10 @@
     "lint": "eslint --fix \"./src/**/*.js\"",
     "pretest": "cross-env NODE_ENV=test npm run db:migrate:all",
     "test": "cross-env NODE_ENV=test nyc mocha --no-timeout './tests/index.js' --exit",
-    "test1": "cross-env NODE_ENV=test nyc mocha --no-timeout './tests/index.js' --exit",
     "test:report": "cross-env NODE_ENV=test npm run db:migrate:all && cross-env NODE_ENV=test nyc mocha --timeout 5000 './tests/*.js' --exit",
     "dev": "nodemon --exec babel-node src/index.js",
-    "start": "npm run build && node build/index.js",
+    "start": "node build/index.js",
     "build": "babel src --out-dir build",
-    "db:migrate:prod": "./node_modules/.bin/sequelize db:migrate && ./node_modules/.bin/sequelize db:seed:all",
     "db:migrate:all": "sequelize db:migrate:undo:all && sequelize db:migrate && sequelize db:seed:all",
     "coverage": "cross-env NODE_ENV=test nyc report --reporter=lcov --reporter=text-lcov | coveralls"
   },
@@ -22,6 +20,7 @@
     "@babel/polyfill": "^7.4.4",
     "@sendgrid/mail": "^6.4.0",
     "bcrypt": "^3.0.6",
+    "cors": "^2.8.5",
     "body-parser": "^1.19.0",
     "dotenv": "^6.2.0",
     "express": "^4.17.1",
@@ -49,7 +48,6 @@
     "babel-eslint": "^10.0.2",
     "chai": "^4.2.0",
     "chai-http": "^4.3.0",
-    "cors": "^2.8.5",
     "coveralls": "^3.0.6",
     "cross-env": "^5.2.0",
     "eslint": "^5.16.0",
@@ -74,9 +72,14 @@
       "node_modules",
       "src/controllers/ExampleUserNotificationController.js"
     ],
-    "reporter": ["lcov", "text"],
+    "reporter": [
+      "lcov",
+      "text"
+    ],
     "cache": false,
-    "require": ["@babel/register"],
+    "require": [
+      "@babel/register"
+    ],
     "report-dir": "tests/report"
   }
 }