Merge branch 'development' into jerry_track_who_changes_permissions

.eslintrc

@@ -1,6 +1,6 @@
 {
   "extends": ["eslint:recommended", "airbnb-base"],
-  "parser": "babel-eslint",
+  "parser": "@babel/eslint-parser",
   "parserOptions": {
     "ecmaVersion": 8,
     "sourceType": "module"

.gitattributes

@@ -1,6 +1,6 @@
 # https://warlord0blog.wordpress.com/2019/09/04/vscode-crlf-vs-lf-battle/
 
- text=lf
+text=lf
  *.css linguist-vendored eol=lf
  *.scss linguist-vendored eol=lf
  *.js linguist-vendored eol=lf

.github/pull_request_template.md

@@ -17,9 +17,10 @@ To test this backend PR you need to checkout the #XXX frontend PR.
 ## How to test:
 1. check into current branch
 2. do `npm install` and `...` to run this PR locally
-3. log as admin user
-4. go to dashboard→ Tasks→ task→…
-5. verify function “A” (feel free to include screenshot here)
+3. Clear site data/cache
+4. log as admin user
+5. go to dashboard→ Tasks→ task→…
+6. verify function “A” (feel free to include screenshot here)
 
 ## Screenshots or videos of changes:
 

.nvmrc

@@ -0,0 +1 @@
+lts/fermium

README.md

@@ -30,11 +30,12 @@ JWT_SECRET=<secret value>
 
 To make the process easy create a .env file and put the above text in the file and replace values with the correct values, which you can get from your teammates. Then do an npm run-script build followed by an npm start. By default, the services will start on port 4500 and you can http://localhost:4500/api/<routename> to access the methods. A tools like Postman will be your best friend here, you will need to have an auth token placed in the 'Authorization' header which you can get through the networking tab of the local frontend when you login.
 
-* `npm run lint` command for fixing lint
-* `npm run build` command for building server
-* `npm run buildw` command for auto rebuild upon change of src
-* `npm run start` command for running the server in dist
-* `npm run serve` command for running server in src without build
+* `npm run lint` -- fix lint
+* `npm run build` -- build src server and save in dist
+* `npm run buildw` -- auto rebuild upon change of src
+* `npm run start` -- run the server in dist
+* `npm run serve` -- run the server in src without build
+* `npm run dev` -- run the server in src and auto restart upon change of src
 
 Note: Once you check in the code in github, the application will be publsihed to the following: 
 Developement : https://hgn-rest-dev.herokuapp.com 

package.json

@@ -9,7 +9,8 @@
     "build": "babel src -d dist",
     "buildw": "babel src -d dist --watch",
     "start": "node dist/server.js",
-    "serve": "node src/server.js"
+    "dev": "nodemon --exec babel-node src/server.js",
+    "serve": "babel-node src/server.js"
   },
   "pre-commit": [
     "lint"
@@ -23,7 +24,6 @@
     "@babel/eslint-parser": "^7.15.0",
     "@types/express": "^4.17.6",
     "@types/node": "^8.10.61",
-    "babel-eslint": "^10.1.0",
     "eslint": "^8.47.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-base": "^13.1.0",
@@ -33,6 +33,7 @@
     "eslint-plugin-react": "^7.33.1",
     "eslint-plugin-react-hooks": "^4.6.0",
     "lint-staged": "^13.0.3",
+    "nodemon": "^3.0.1",
     "pre-commit": "^1.2.2"
   },
   "dependencies": {
@@ -52,6 +53,7 @@
     "cron": "^1.8.2",
     "dotenv": "^5.0.1",
     "express": "^4.17.1",
+    "express-validator": "^7.0.1",
     "googleapis": "^100.0.0",
     "jsonwebtoken": "^9.0.0",
     "lodash": "^4.17.21",
@@ -66,5 +68,10 @@
     "redis": "^4.2.0",
     "uuid": "^3.4.0",
     "ws": "^8.8.1"
+  },
+  "nodemonConfig": {
+    "watch": [
+      "/src/**/*"
+    ]
   }
 }