Merge branch 'dev4.0' into alex-test

Author: atu816

package-lock.json

@@ -14,12 +14,12 @@
     "dev": "concurrently \"vite serve\" \"nodemon --exec 'ts-node' server/server.ts\"",
     "preview": "vite preview",
     "test": "jest --verbose",
-    "cert": "rm -rf .cert && mkdir -p .cert && mkcert -key-file ./.cert/key.pem -cert-file ./.cert/cert.pem 'localhost'"
+    "cert": "rm -rf .cert && mkdir -p .cert && mkcert -key-file ./.cert/key.pem -cert-file ./.cert/cert.pem 'localhost'",
+    "watch": "jest --watch *.[jt]sx?$"
   },
   "author": "Steven Geiger, Michael Costello, Alexander Tu, Yufa Li",
   "license": "MIT",
   "dependencies": {
-    "@testing-library/react": "^13.4.0",
     "@types/node-fetch": "^2.6.2",
     "@types/pino": "^7.0.5",
     "axios": "^0.27.2",
@@ -68,6 +68,7 @@
     "@babel/preset-react": "^7.18.6",
     "@babel/preset-typescript": "^7.18.6",
     "@testing-library/jest-dom": "^5.16.5",
+    "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^14.4.3",
     "@types/bcrypt": "^5.0.0",
     "@types/connect-redis": "^0.0.18",