Revert "Merge branch 'dev' into FE/filters"

This reverts commit 22eb299, reversing changes made to 797cf1a.
Nintails-TF · Feb 2, 2024 · c872167 · c872167
1 parent 22eb299
commit c872167
Show file tree

Hide file tree

Showing 19 changed files with 136 additions and 2,355 deletions.
diff --git a/.github/ISSUE_TEMPLATE/pull-request-template.md b/.github/ISSUE_TEMPLATE/pull-request-template.md
@@ -1,6 +1,5 @@
 ---
 name: TITLE HERE
-about: ABOUT HERE
 ---
 
 ## Pull Request Overview

diff --git a/.github/workflows/workflows.yaml b/.github/workflows/workflows.yaml
@@ -16,6 +16,8 @@ jobs:
       uses: actions/setup-node@v2
       with:
         node-version: '19.9.0'
+    - name: Change to BE directory
+      run: cd be
     - name: Install BE dependencies
       run: npm install
       working-directory: be
@@ -25,3 +27,6 @@ jobs:
     - name: Run Tests in BE
       run: npm test
       working-directory: be
+    - name: Build BE
+      run: npm run build
+      working-directory: be
diff --git a/.husky/commit-msg b/.husky/commit-msg
diff --git a/.husky/pre-push b/.husky/pre-push
diff --git a/api/api_server.js b/api/api_server.js
@@ -45,12 +45,12 @@ app.get("/", (req, res) => {
 });
 
 // 404 Error Handler (for any unhandled routes)
-app.use((req, res) => {
+app.use((req, res, next) => {
     res.status(404).send("Resource not found");
 });
 
 // Generic Error Handler
-app.use((error, req, res) => {
+app.use((error, req, res, next) => {
     console.error(error.stack);
     res.status(500).send('Something broke!');
 });
diff --git a/api/atmRoutes.js b/api/atmRoutes.js
@@ -24,8 +24,6 @@ router.get("/api/atms", async (req, res) => {
 
 router.post("/api/atms/filter", async (req, res) => {
   try {
-
-
     const atms = await db
       .collection("ATMs")
       .find({

diff --git a/api/package.json b/api/package.json
@@ -5,8 +5,7 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "node api_server.js",
-    "lint": "eslint ."
+    "start": "node api_server.js"
   },
   "author": "",
   "license": "ISC",

diff --git a/be/cacheUtil.js b/be/cacheUtil.js
diff --git a/be/package-lock.json b/be/package-lock.json
diff --git a/be/package.json b/be/package.json
@@ -12,7 +12,6 @@
   "license": "ISC",
   "devDependencies": {
     "eslint": "^8.56.0",
-    "husky": "^9.0.10",
     "jest": "^29.7.0",
     "supertest": "^6.3.4"
   },
@@ -22,7 +21,6 @@
     "cors": "^2.8.5",
     "dotenv": "^16.4.1",
     "express": "^4.18.2",
-    "mongoose": "^8.1.0",
-    "node-cache": "^5.1.2"
+    "mongoose": "^8.1.0"
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,8 +24,6 @@ router.get("/api/atms", async (req, res) => { @@
     router.post("/api/atms/filter", async (req, res) => {
       try {
         const atms = await db
           .collection("ATMs")
           .find({
@@ Expand Down @@