Merge branch 'development' into jerry_email_verification_admin_accounts

OneCommunityGlobal · Jan 13, 2024 · 497800e · 497800e
2 parents e93f61a + 0e0b411
commit 497800e
Show file tree

Hide file tree

Showing 78 changed files with 5,060 additions and 2,942 deletions.
diff --git a/.gitattributes b/.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

diff --git a/.github/pull_request_template.md b/.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:
 

diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+lts/fermium
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -53,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",

diff --git a/src/controllers/REAL_TIME_timerController.js b/src/controllers/REAL_TIME_timerController.js