Merge branch 'master' into issue#152

.eslintrc.json

@@ -1,8 +1,10 @@
 {
  "env": {
- "node": true
+ "node": true,
+ "mocha": true,
+ "commonjs": true
  },
- "plugins": ["prettier"],
+ "plugins": ["prettier", "simple-import-sort", "eslint-plugin-import"],
  "extends": [
  "airbnb-base",
  "prettier"
@@ -11,5 +13,26 @@
  "ecmaVersion": 12
  },
  "rules": {
- }
+ "simple-import-sort/imports": "error",
+ "no-underscore-dangle": "off",
+ "camelcase":"off",
+ "no-unused-vars":"warn",
+ "func-names": "off",
+ "no-param-reassign": "warn",
+ "consistent-return":"warn",
+ "no-restricted-syntax":"warn",
+ "global-require":"off",
+ "radix":"off",
+ "no-await-in-loop":"off",
+ "class-methods-use-this":"warn",
+ "no-return-await":"warn",
+ "no-new-wrappers": "warn",
+ "prefer-destructuring": "warn",
+ "no-shadow":"warn",
+ "import/order": "warn",
+ "no-unused-expressions": "warn",
+ "import/no-extraneous-dependencies": "warn" ,
+ "import/no-unresolved": "warn",
+ "no-plusplus":"warn",
+ "no-continue":"off" }
 }

.github/workflows/treetracker-wallet-api-pull-request-ci.yml

@@ -8,7 +8,7 @@ on:
  branches:
  - master
 
-env: 
+env:
  project-directory: ./
 
 jobs:
@@ -34,41 +34,42 @@ jobs:
  --health-retries 5
 
  steps:
- - uses: actions/checkout@v2
- - name: Use Node.js 12.x
- uses: actions/setup-node@v1
- with:
- node-version: '12.x'
- - name: npm clean install
- run: npm ci
- working-directory: ${{ env.project-directory }}
- #- name: run ESLint
- # run: npm run lint
- #working-directory: ${{ env.project-directory }}
+ - uses: actions/checkout@v2
+ - name: Use Node.js 12.x
+ uses: actions/setup-node@v1
+ with:
+ node-version: '12.x'
+ - name: npm clean install
+ run: npm ci
+ working-directory: ${{ env.project-directory }}
 
- - name: run db-migrate
- run: npm run db-migrate-ci
- working-directory: ${{ env.project-directory }}
- env: 
- DATABASE_URL: postgresql://postgres:postgres@postgres/postgres
+ - name: run ESLint
+ run: npm run lint
+ working-directory: ${{ env.project-directory }}
 
- - name: run unit tests
- run: npm run test-unit-ci
- working-directory: ${{ env.project-directory }}
- env: 
- DATABASE_URL: postgresql://postgres:postgres@postgres/postgres
- CI: true
-
- - name: run integration tests
- run: npm run test-integration-ci
- working-directory: ${{ env.project-directory }}
- env: 
- DATABASE_URL: postgresql://postgres:postgres@postgres/postgres
- CI: true
+ - name: run db-migrate
+ run: npm run db-migrate-ci
+ working-directory: ${{ env.project-directory }}
+ env:
+ DATABASE_URL: postgresql://postgres:postgres@postgres/postgres
+
+ - name: run unit tests
+ run: npm run test-unit-ci
+ working-directory: ${{ env.project-directory }}
+ env:
+ DATABASE_URL: postgresql://postgres:postgres@postgres/postgres
+ CI: true
 
- - name: run repository tests
- run: npm run test-repository
- working-directory: ${{ env.project-directory }}
- env: 
- DATABASE_URL: postgresql://postgres:postgres@postgres/postgres
- CI: true
+ - name: run integration tests
+ run: npm run test-integration-ci
+ working-directory: ${{ env.project-directory }}
+ env:
+ DATABASE_URL: postgresql://postgres:postgres@postgres/postgres
+ CI: true
+
+ - name: run repository tests
+ run: npm run test-repository
+ working-directory: ${{ env.project-directory }}
+ env:
+ DATABASE_URL: postgresql://postgres:postgres@postgres/postgres
+ CI: true

.gitignore

@@ -7,4 +7,5 @@ jwtRS256.key.pub
 keygen.sh
 database.json
 .env
-.env.test
+.env.test
+.vscode

.huskyrc

@@ -1 +1 @@
-{"hooks":{"commit-msg":"commitlint -E HUSKY_GIT_PARAMS"}}
+{"hooks":{"pre-commit": "npm run lint", "commit-msg":"commitlint -E HUSKY_GIT_PARAMS" }}

CHANGELOG.md

@@ -1,3 +1,38 @@
+## [1.12.5](https://github.com/Greenstand/treetracker-wallet-api/compare/v1.12.4...v1.12.5) (2021-04-16)
+
+
+### Bug Fixes
+
+* downgraded husky version to support node-run env required by IDEs ([e3656f5](https://github.com/Greenstand/treetracker-wallet-api/commit/e3656f55f3bbc2b9f98d44af29e8ac258cffda2f))
+
+## [1.12.4](https://github.com/Greenstand/treetracker-wallet-api/compare/v1.12.3...v1.12.4) (2021-04-03)
+
+
+### Bug Fixes
+
+* remove unnecessary CORS ([1b711a2](https://github.com/Greenstand/treetracker-wallet-api/commit/1b711a250d440a2b6bb0c709512e93ba4dd8ea57))
+
+## [1.12.3](https://github.com/Greenstand/treetracker-wallet-api/compare/v1.12.2...v1.12.3) (2021-04-02)
+
+
+### Bug Fixes
+
+* syntax error ([5036b1e](https://github.com/Greenstand/treetracker-wallet-api/commit/5036b1e20b08b6c1221a4026a63ae4bdf0070b0d))
+
+## [1.12.2](https://github.com/Greenstand/treetracker-wallet-api/compare/v1.12.1...v1.12.2) (2021-04-02)
+
+
+### Bug Fixes
+
+* update CORS ([8793c73](https://github.com/Greenstand/treetracker-wallet-api/commit/8793c732eabca832ced6af7d98a6b0ef884295dc))
+
+## [1.12.1](https://github.com/Greenstand/treetracker-wallet-api/compare/v1.12.0...v1.12.1) (2021-03-28)
+
+
+### Bug Fixes
+
+* broken test ([3399cc9](https://github.com/Greenstand/treetracker-wallet-api/commit/3399cc9a5573a3a80c34aed73cfee1592062b4a6))
+
 # [1.12.0](https://github.com/Greenstand/treetracker-wallet-api/compare/v1.11.2...v1.12.0) (2021-03-26)