Merge development with master

.babelrc

@@ -1,3 +1,4 @@
 {
-"presets": ["es2015"]
+"presets": ["env"],
+"plugins": ["transform-es2015-destructuring", "transform-object-rest-spread"]
 }

.codeclimate.yml

@@ -0,0 +1,17 @@
+engines:
+  duplication:
+    enabled: false
+    config:
+      languages:
+        javascript:
+          mass_threshold: 20
+ratings:
+  paths:
+  - "**.js"
+exclude_paths:
+- "server/src/api/v1/tests/"
+- "node_modules/"
+- "template/"
+- "server/dist/"
+- "client/node_modules/"
+- "server/src/docs/"

.coveralls.yml

@@ -1 +1 @@
-repo_token: COVERALLS_TOKEN
+repo_token: COVERALLS_REPO_TOKEN

.env.sample

@@ -0,0 +1,24 @@
+COVERALLS_REPO_TOKEN=
+
+TEST_DB_NAME=
+TEST_DB_HOST=
+TEST_DB_PASSWORD=
+TEST_DB_USERNAME=
+
+PRODUCTION_DB_NAME=
+PRODUCTION_DB_HOST=
+PRODUCTION_DB_PASSWORD=
+PRODUCTION_DB_USERNAME=
+
+DEVELOPMENT_DB_NAME=
+DEVELOPMENT_DB_HOST=
+DEVELOPMENT_DB_PASSWORD=
+DEVELOPMENT_DB_USERNAME=
+
+TOKEN_SECRET=
+
+GMAIL_USERNAME=
+GMAIL_PASSWORD=
+
+EMAIL_FROM=
+TIMEZONE=

.eslintignore

@@ -1,6 +1,10 @@
-node_modules/
-client/
 template/
-template/assets/js/**
+template/assets/**
 server/dist/**
 .idea/
+template/**
+coverage/
+.nyc_output/
+node_modules
+.env
+server/src/docs

.eslintrc

@@ -1,33 +1,36 @@
-{
-  "root": true,
-  "extends": "airbnb-base",
-  "env": {
-    "node": true,
-    "es6": true,
-    "mocha": true
-  },
-  "rules": {
-    "one-var": 0,
-    "one-var-declaration-per-line": 0,
-    "new-cap": 0,
-    "consistent-return": 0,
-    "no-param-reassign": 0,
-    "comma-dangle": 0,
-    "curly": ["error", "multi-line"],
-    "import/no-unresolved": [2, { "commonjs": true }],
-    "no-shadow": ["error", { "allow": ["req", "res", "err"] }],
-    "valid-jsdoc": ["error", {
-      "requireReturn": true,
-      "requireReturnType": true,
-      "requireParamDescription": false,
-      "requireReturnDescription": true
-    }],
-    "require-jsdoc": ["error", {
-        "require": {
-            "FunctionDeclaration": true,
-            "MethodDefinition": true,
-            "ClassDeclaration": true
-        }
-    }]
-  }
-}
+{
+  "root": true,
+  "extends": [ "airbnb-base" ],
+  "env": {
+    "node": true,
+    "es6": true,
+    "mocha": true
+  },
+  "rules": {
+    "max-len": ["error", 80],
+    "one-var": 0,
+    "one-var-declaration-per-line": 0,
+    "new-cap": 0,
+    "consistent-return": 0,
+    "no-param-reassign": 0,
+    "comma-dangle": 0,
+    "curly": ["error", "multi-line"],
+    "import/no-unresolved": [2, { "commonjs": true }],
+    "no-shadow": ["error", { "allow": ["req", "res", "err"] }],
+    "valid-jsdoc": ["error", {
+      "requireReturn": true,
+      "requireReturnType": true,
+      "requireParamDescription": false,
+      "requireReturnDescription": true,
+      "matchDescription": ".+" 
+      }],
+      "require-jsdoc": ["error", {
+        "require": {
+          "FunctionDeclaration": true,
+          "MethodDefinition": true,
+          "ClassDeclaration": true,
+          "ArrowFunctionExpression": true
+        }
+        }]
+      }
+    }

.gitignore

@@ -1,6 +1,12 @@
 node_modules/
-server/src/config.json
+**/node_modules/
 .env
 .idea/
-server/dist/**/*.js
-!server/dist/config
+client/src/assets/css/*.css
+server/dist/**
+coverage/
+.nyc_output/
+.DS_STORE
+client/build
+.vscode
+reports

.hound.yml

@@ -1,4 +1,4 @@
-eslint:  
-  enabled: true  
-  config_file: .eslintrc  
+eslint:
+  enabled: true
+  config_file: .eslintrc
   ignore_file: .eslintignore

.istanbul.yml

@@ -0,0 +1,2 @@
+instrumentation:
+    root: src

.sequelizerc

@@ -1,9 +1,9 @@
 
 const path = require('path');
-
+const version = 'v1';
 module.exports = {
-    "config": path.resolve('./server/dist/config', 'config.json'),
-    "models-path": path.resolve('./server/src/models'),
-    "seeders-path": path.resolve('./server/src/seeders'),
-    "migrations-path": path.resolve('./server/src/migrations')
+    "config": path.resolve('./server/dist/config', 'index.js'),
+    "models-path": path.resolve(`./server/dist/api/${version}/models`),
+    "seeders-path": path.resolve(`./server/dist/api/${version}/seeders`),
+    "migrations-path": path.resolve(`./server/dist/api/${version}/migrations`)
 };

.travis.yml

@@ -1,18 +1,35 @@
+env:
+  global:
+    - CC_TEST_REPORTER_ID=$CODECLIMATE_REPO_TOKEN
+    - GIT_COMMITTED_AT=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then git log -1 --pretty=format:%ct; else git log -1 --skip 1 --pretty=format:%ct; fi)
 language: node_js
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+script:
+  - bundle exec rspec
+  # Preferably you will run test-reporter on branch update events. But
+  # if you setup travis to build PR updates only, you don't need to run
+  # the line below
+  - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT; fi
+  # In the case where travis is setup to build PR updates only,
+  # uncomment the line below
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
 node_js:
   - node
 notifications:
-  - email: false
+  email: false
+  webhooks: https://coveralls.io/webhook?repo_token=COVERALLS_REPO_TOKEN
 services:
   - postgresql
 before_script:
-  - npm install -g codeclimate-test-reporter
-  - npm install -g sequelize
+  - npm install -g codeclimate-test-reporter coveralls sequelize jest istanbul-combine
   - psql -c 'drop database if exists travis;' -U postgres
   - psql -c 'create database travis;' -U postgres
   - npm run build
-  - NODE_ENV=test npm run test:db
 script:
-  - npm test
+  - npm run test:coverage
 after_success:
-  - CODECLIMATE_REPO_TOKEN=CODECLIMATE_TOKEN codeclimate-test-reporter < coverage/lcov.info
+  - istanbul-combine -d merged-coverage -p summary -r lcov client/coverage/coverage-*.json coverage/coverage-*.json
+  - codeclimate-test-reporter < merged-coverage/lcov.info
+  - coveralls < merged-coverage/lcov.info

LICENSE.md

@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) 2017 Fadojutimi Temitayo Olusegun
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Procfile

@@ -1 +1,2 @@
-web: npm start
+web: npm run start
+clock: node server/dist/api/v1/cron/index.js