From 0d9708bce16116589624777cf524daa836bb29f4 Mon Sep 17 00:00:00 2001
From: kai dubauskas <kaidubauskas@gmail.com>
Date: Sat, 8 Jul 2023 15:42:39 -0500
Subject: [PATCH 01/24] onboard staff bug

---
 controllers/users.controllers.js | 9 ++++-----
 firebase.js                      | 4 ++--
 middleware/verifyAdmin.js        | 1 +
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/controllers/users.controllers.js b/controllers/users.controllers.js
index ab10f3a..f86c81e 100644
--- a/controllers/users.controllers.js
+++ b/controllers/users.controllers.js
@@ -1,5 +1,5 @@
 const { ObjectId } = require("mongoose").Types;
-const admin = require("../firebase");
+const auth = require("../firebase");
 
 const User = require("../models/User.js");
 
@@ -7,7 +7,7 @@ const createUser = async (req, res) => {
     try {
         //needed in case we need to add validation stuff in the future
         const { firebaseUID, firstName, lastName, joinDate, level } = req.body;
-
+        console.log("ADDING USER")
         const newUser = await User.create(req.body);
         await newUser.save();
 
@@ -139,8 +139,7 @@ const deleteUser = async (req, res) => {
 const createFirebaseUser = (req, res) => {
     // TODO: encrypt this bro
     const { email, pass } = req.body;
-    admin
-        .auth()
+    auth
         .createUser({
             email: email,
             password: pass,
@@ -151,7 +150,7 @@ const createFirebaseUser = (req, res) => {
             res.send(userRecord);
         })
         .catch((error) => {
-            console.log("Error, error");
+            console.log(error);
         });
 };
 
diff --git a/firebase.js b/firebase.js
index c968ac3..a59376d 100644
--- a/firebase.js
+++ b/firebase.js
@@ -1,6 +1,6 @@
 // const admin = require("firebase-admin");
 // const serviceAccount = require("./ServiceAccount.json");
-// const {getAuth} = require('firebase-admin/auth')
+// const { getAuth } = require('firebase-admin/auth')
 
 // admin.initializeApp({
 //     credential: admin.credential.cert(serviceAccount),
@@ -10,7 +10,7 @@
 // TODO: figure out the difference between above and below
 const { initializeApp, cert } = require("firebase-admin/app");
 const { getAuth } = require("firebase-admin/auth");
-
+//const admin = require("firebase-admin");
 const serviceAccount = require("./ServiceAccount.json");
 
 const app = initializeApp({
diff --git a/middleware/verifyAdmin.js b/middleware/verifyAdmin.js
index f8d0949..c0f3e55 100644
--- a/middleware/verifyAdmin.js
+++ b/middleware/verifyAdmin.js
@@ -33,6 +33,7 @@ const verifyAdmin = async (req, res, next) => {
 };
 
 const checkAdminStatus = async (uid, token) => {
+    console.log("checkAdmin function starting");
     try {
         const res = await fetch(
             `http://localhost:3000/users?firebaseUID=${uid}`,

From ce1c8ac143d1ff0755677785f0a33084e23d954b Mon Sep 17 00:00:00 2001
From: KaiDubauskas <KaiDubauskas@users.noreply.github.com>
Date: Wed, 19 Jul 2023 00:58:06 +0000
Subject: [PATCH 02/24] Apply Prettier formatting

---
 controllers/users.controllers.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/controllers/users.controllers.js b/controllers/users.controllers.js
index f86c81e..83a70e2 100644
--- a/controllers/users.controllers.js
+++ b/controllers/users.controllers.js
@@ -7,7 +7,7 @@ const createUser = async (req, res) => {
     try {
         //needed in case we need to add validation stuff in the future
         const { firebaseUID, firstName, lastName, joinDate, level } = req.body;
-        console.log("ADDING USER")
+        console.log("ADDING USER");
         const newUser = await User.create(req.body);
         await newUser.save();
 
@@ -139,11 +139,10 @@ const deleteUser = async (req, res) => {
 const createFirebaseUser = (req, res) => {
     // TODO: encrypt this bro
     const { email, pass } = req.body;
-    auth
-        .createUser({
-            email: email,
-            password: pass,
-        })
+    auth.createUser({
+        email: email,
+        password: pass,
+    })
         .then((userRecord) => {
             console.log("Successfully created user");
             console.log(userRecord);

From 97947fe15d061e5125e5d1e92e4adcab6f238aa2 Mon Sep 17 00:00:00 2001
From: kai dubauskas <kaidubauskas@gmail.com>
Date: Tue, 18 Jul 2023 21:20:48 -0500
Subject: [PATCH 03/24] add vercel

---
 app.js      |  2 +-
 vercel.json | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 vercel.json

diff --git a/app.js b/app.js
index 2d11c5a..4beeb93 100644
--- a/app.js
+++ b/app.js
@@ -3,7 +3,7 @@ const cors = require("cors");
 const helmet = require("helmet");
 const connectDB = require("./config/database.js");
 
-const PORT = 3000;
+const PORT = process.env.PORT || 3000;
 
 const app = express();
 
diff --git a/vercel.json b/vercel.json
new file mode 100644
index 0000000..bba0732
--- /dev/null
+++ b/vercel.json
@@ -0,0 +1,15 @@
+{
+    "version": 2,
+    "builds": [
+        {
+            "src": "index.js",
+            "use": "@now/node"
+        }
+    ],
+    "routes": [
+        {
+            "src": "/(.*)",
+            "dest": "index.js"
+        }
+    ]
+}

From 61a1a1231e36e37d8065fe07b790efdecfc54dc3 Mon Sep 17 00:00:00 2001
From: kai dubauskas <kaidubauskas@gmail.com>
Date: Wed, 19 Jul 2023 13:24:49 -0500
Subject: [PATCH 04/24] modify start script

---
 .gitignore        |  1 +
 package-lock.json | 14 ++++++++++++++
 package.json      |  3 ++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index eda0de0..4b37ae0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ node_modules
 .env
 
 ServiceAccount.json
+.vercel
diff --git a/package-lock.json b/package-lock.json
index 3bc2396..86dedcf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,6 +14,7 @@
                 "express": "^4.18.2",
                 "firebase-admin": "^11.5.0",
                 "helmet": "^6.0.1",
+                "i": "^0.3.7",
                 "mongoose": "^6.7.2"
             },
             "devDependencies": {
@@ -2815,6 +2816,14 @@
                 "url": "https://github.com/sponsors/typicode"
             }
         },
+        "node_modules/i": {
+            "version": "0.3.7",
+            "resolved": "https://registry.npmjs.org/i/-/i-0.3.7.tgz",
+            "integrity": "sha512-FYz4wlXgkQwIPqhzC5TdNMLSE5+GS1IIDJZY/1ZiEPCT2S3COUVZeT5OW4BmW4r5LHLQuOosSwsvnroG9GR59Q==",
+            "engines": {
+                "node": ">=0.4"
+            }
+        },
         "node_modules/iconv-lite": {
             "version": "0.4.24",
             "license": "MIT",
@@ -7199,6 +7208,11 @@
             "version": "8.0.2",
             "dev": true
         },
+        "i": {
+            "version": "0.3.7",
+            "resolved": "https://registry.npmjs.org/i/-/i-0.3.7.tgz",
+            "integrity": "sha512-FYz4wlXgkQwIPqhzC5TdNMLSE5+GS1IIDJZY/1ZiEPCT2S3COUVZeT5OW4BmW4r5LHLQuOosSwsvnroG9GR59Q=="
+        },
         "iconv-lite": {
             "version": "0.4.24",
             "requires": {
diff --git a/package.json b/package.json
index 7d7606c..063991b 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
     "main": "app.js",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
-        "start": "nodemon app.js",
+        "start": "node app.js",
         "format": "prettier --write \"**/*.{js,jsx,json,css,md}\""
     },
     "lint-staged": {
@@ -32,6 +32,7 @@
         "express": "^4.18.2",
         "firebase-admin": "^11.5.0",
         "helmet": "^6.0.1",
+        "i": "^0.3.7",
         "mongoose": "^6.7.2"
     },
     "devDependencies": {

From bfedb8d4192c529fae28238e4f0d9f84196cc938 Mon Sep 17 00:00:00 2001
From: kai dubauskas <kaidubauskas@gmail.com>
Date: Wed, 19 Jul 2023 13:34:15 -0500
Subject: [PATCH 05/24] add build script

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 063991b..38e5e8a 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
         "start": "node app.js",
+        "build": "node app.js",
         "format": "prettier --write \"**/*.{js,jsx,json,css,md}\""
     },
     "lint-staged": {

From 6226eed55eec485d745aab71ee2054c002c5332c Mon Sep 17 00:00:00 2001
From: kai dubauskas <kaidubauskas@gmail.com>
Date: Wed, 19 Jul 2023 13:37:30 -0500
Subject: [PATCH 06/24] change vercel.json

---
 vercel.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vercel.json b/vercel.json
index bba0732..dabceea 100644
--- a/vercel.json
+++ b/vercel.json
@@ -2,14 +2,14 @@
     "version": 2,
     "builds": [
         {
-            "src": "index.js",
+            "src": "app.js",
             "use": "@now/node"
         }
     ],
     "routes": [
         {
             "src": "/(.*)",
-            "dest": "index.js"
+            "dest": "app.js"
         }
     ]
 }

From 2f7c3012333a6294e2a887ac7845c9f16fd4f0c9 Mon Sep 17 00:00:00 2001
From: kai dubauskas <kaidubauskas@gmail.com>
Date: Wed, 19 Jul 2023 13:47:24 -0500
Subject: [PATCH 07/24] delete build command

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index 38e5e8a..063991b 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,6 @@
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
         "start": "node app.js",
-        "build": "node app.js",
         "format": "prettier --write \"**/*.{js,jsx,json,css,md}\""
     },
     "lint-staged": {

From a5d128b043f4eef3d32db8749018d33dc3d10e1c Mon Sep 17 00:00:00 2001
From: kai dubauskas <kaidubauskas@gmail.com>
Date: Wed, 19 Jul 2023 13:54:56 -0500
Subject: [PATCH 08/24] retry app

---
 app.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app.js b/app.js
index 4beeb93..d587387 100644
--- a/app.js
+++ b/app.js
@@ -21,10 +21,15 @@ app.use("/programs", require("./routes/programs.router.js"));
 app.use("/users", require("./routes/users.router.js"));
 app.use("/workshops", require("./routes/workshops.router.js"));
 
-app.get("/", (req, res) => {
-    res.send("boo! 👻");
+app.get('/', (req, res) => {
+    res.send('boo!');
 });
 
-app.listen(PORT, () => {
-    console.log(`App listening on port ${PORT}`);
+app.listen(PORT, (err, res) => {
+    if (err) {
+        console.log(err)
+        return res.status(500).send(err.message)
+    } else {
+        console.log('[INFO] Server Running on port:', PORT)
+    }
 });

From ee3c1f5b7d542d8fe9bd7ada829f45c3ad96d2be Mon Sep 17 00:00:00 2001
From: KaiDubauskas <KaiDubauskas@users.noreply.github.com>
Date: Wed, 19 Jul 2023 18:55:23 +0000
Subject: [PATCH 09/24] Apply Prettier formatting

---
 app.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app.js b/app.js
index d587387..be8491c 100644
--- a/app.js
+++ b/app.js
@@ -21,15 +21,15 @@ app.use("/programs", require("./routes/programs.router.js"));
 app.use("/users", require("./routes/users.router.js"));
 app.use("/workshops", require("./routes/workshops.router.js"));
 
-app.get('/', (req, res) => {
-    res.send('boo!');
+app.get("/", (req, res) => {
+    res.send("boo!");
 });
 
 app.listen(PORT, (err, res) => {
     if (err) {
-        console.log(err)
-        return res.status(500).send(err.message)
+        console.log(err);
+        return res.status(500).send(err.message);
     } else {
-        console.log('[INFO] Server Running on port:', PORT)
+        console.log("[INFO] Server Running on port:", PORT);
     }
 });

From 671150822fcf8b990b4e3d03d621b5c407d43d7f Mon Sep 17 00:00:00 2001
From: kai dubauskas <kaidubauskas@gmail.com>
Date: Wed, 19 Jul 2023 13:56:26 -0500
Subject: [PATCH 10/24] test2

---
 app.js | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/app.js b/app.js
index d587387..df5aa5c 100644
--- a/app.js
+++ b/app.js
@@ -1,25 +1,25 @@
-const express = require("express");
-const cors = require("cors");
-const helmet = require("helmet");
-const connectDB = require("./config/database.js");
+// const express = require("express");
+// const cors = require("cors");
+// const helmet = require("helmet");
+// const connectDB = require("./config/database.js");
 
 const PORT = process.env.PORT || 3000;
 
 const app = express();
 
-connectDB(); // Connect to MongoDB
+// connectDB(); // Connect to MongoDB
 
 // Middleware
-app.use(express.json());
-app.use(cors());
-app.use(helmet());
+// app.use(express.json());
+// app.use(cors());
+// app.use(helmet());
 
-// Routers
-app.use("/assessments", require("./routes/assessments.router.js"));
-app.use("/beneficiaries", require("./routes/beneficiaries.router.js"));
-app.use("/programs", require("./routes/programs.router.js"));
-app.use("/users", require("./routes/users.router.js"));
-app.use("/workshops", require("./routes/workshops.router.js"));
+// // Routers
+// app.use("/assessments", require("./routes/assessments.router.js"));
+// app.use("/beneficiaries", require("./routes/beneficiaries.router.js"));
+// app.use("/programs", require("./routes/programs.router.js"));
+// app.use("/users", require("./routes/users.router.js"));
+// app.use("/workshops", require("./routes/workshops.router.js"));
 
 app.get('/', (req, res) => {
     res.send('boo!');

From d078cc65b7161f6ff1560a6efb2dd65ff4fdb453 Mon Sep 17 00:00:00 2001
From: kai dubauskas <kaidubauskas@gmail.com>
Date: Wed, 19 Jul 2023 14:02:03 -0500
Subject: [PATCH 11/24] idk

---
 app.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app.js b/app.js
index 657ca19..c9f9f59 100644
--- a/app.js
+++ b/app.js
@@ -13,6 +13,7 @@ const app = express();
 // app.use(express.json());
 // app.use(cors());
 // app.use(helmet());
+app.use(express.static('public'))
 
 // // Routers
 // app.use("/assessments", require("./routes/assessments.router.js"));
@@ -21,15 +22,15 @@ const app = express();
 // app.use("/users", require("./routes/users.router.js"));
 // app.use("/workshops", require("./routes/workshops.router.js"));
 
-app.get("/", (req, res) => {
-    res.send("boo!");
+app.get('/', (req, res) => {
+    res.send('boo!');
 });
 
 app.listen(PORT, (err, res) => {
     if (err) {
-        console.log(err);
-        return res.status(500).send(err.message);
+        console.log(err)
+        return res.status(500).send(err.message)
     } else {
-        console.log("[INFO] Server Running on port:", PORT);
+        console.log('[INFO] Server Running on port:', PORT)
     }
 });

From 6e64b26cc5dfb7f7f141bb2b796067bfa0a25017 Mon Sep 17 00:00:00 2001
From: kai dubauskas <kaidubauskas@gmail.com>
Date: Wed, 19 Jul 2023 14:04:32 -0500
Subject: [PATCH 12/24] rename to indx

---
 app.js => index.js | 0
 package.json       | 2 +-
 vercel.json        | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename app.js => index.js (100%)

diff --git a/app.js b/index.js
similarity index 100%
rename from app.js
rename to index.js
diff --git a/package.json b/package.json
index 063991b..3aa228b 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
     "main": "app.js",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
-        "start": "node app.js",
+        "start": "node index.js",
         "format": "prettier --write \"**/*.{js,jsx,json,css,md}\""
     },
     "lint-staged": {
diff --git a/vercel.json b/vercel.json
index dabceea..bba0732 100644
--- a/vercel.json
+++ b/vercel.json
@@ -2,14 +2,14 @@
     "version": 2,
     "builds": [
         {
-            "src": "app.js",
+            "src": "index.js",
             "use": "@now/node"
         }
     ],
     "routes": [
         {
             "src": "/(.*)",
-            "dest": "app.js"
+            "dest": "index.js"
         }
     ]
 }

From fcb81f5deb22000619692bfb0e7d7fdd770ff2b5 Mon Sep 17 00:00:00 2001
From: kai dubauskas <kaidubauskas@gmail.com>
Date: Wed, 19 Jul 2023 14:10:56 -0500
Subject: [PATCH 13/24] kmdf

---
 index.js => app.js | 0
 package.json       | 2 +-
 vercel.json        | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename index.js => app.js (100%)

diff --git a/index.js b/app.js
similarity index 100%
rename from index.js
rename to app.js
diff --git a/package.json b/package.json
index 3aa228b..063991b 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
     "main": "app.js",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
-        "start": "node index.js",
+        "start": "node app.js",
         "format": "prettier --write \"**/*.{js,jsx,json,css,md}\""
     },
     "lint-staged": {
diff --git a/vercel.json b/vercel.json
index bba0732..dabceea 100644
--- a/vercel.json
+++ b/vercel.json
@@ -2,14 +2,14 @@
     "version": 2,
     "builds": [
         {
-            "src": "index.js",
+            "src": "app.js",
             "use": "@now/node"
         }
     ],
     "routes": [
         {
             "src": "/(.*)",
-            "dest": "index.js"
+            "dest": "app.js"
         }
     ]
 }

From 405a1632212d9fac1d2e06f0f04910849add8546 Mon Sep 17 00:00:00 2001
From: kai dubauskas <kaidubauskas@gmail.com>
Date: Wed, 19 Jul 2023 14:14:04 -0500
Subject: [PATCH 14/24] reverse

---
 app.js | 42 ++++++++++++++++++------------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/app.js b/app.js
index c9f9f59..4beeb93 100644
--- a/app.js
+++ b/app.js
@@ -1,36 +1,30 @@
-// const express = require("express");
-// const cors = require("cors");
-// const helmet = require("helmet");
-// const connectDB = require("./config/database.js");
+const express = require("express");
+const cors = require("cors");
+const helmet = require("helmet");
+const connectDB = require("./config/database.js");
 
 const PORT = process.env.PORT || 3000;
 
 const app = express();
 
-// connectDB(); // Connect to MongoDB
+connectDB(); // Connect to MongoDB
 
 // Middleware
-// app.use(express.json());
-// app.use(cors());
-// app.use(helmet());
-app.use(express.static('public'))
+app.use(express.json());
+app.use(cors());
+app.use(helmet());
 
-// // Routers
-// app.use("/assessments", require("./routes/assessments.router.js"));
-// app.use("/beneficiaries", require("./routes/beneficiaries.router.js"));
-// app.use("/programs", require("./routes/programs.router.js"));
-// app.use("/users", require("./routes/users.router.js"));
-// app.use("/workshops", require("./routes/workshops.router.js"));
+// Routers
+app.use("/assessments", require("./routes/assessments.router.js"));
+app.use("/beneficiaries", require("./routes/beneficiaries.router.js"));
+app.use("/programs", require("./routes/programs.router.js"));
+app.use("/users", require("./routes/users.router.js"));
+app.use("/workshops", require("./routes/workshops.router.js"));
 
-app.get('/', (req, res) => {
-    res.send('boo!');
+app.get("/", (req, res) => {
+    res.send("boo! 👻");
 });
 
-app.listen(PORT, (err, res) => {
-    if (err) {
-        console.log(err)
-        return res.status(500).send(err.message)
-    } else {
-        console.log('[INFO] Server Running on port:', PORT)
-    }
+app.listen(PORT, () => {
+    console.log(`App listening on port ${PORT}`);
 });

From a639802f258af02c6397e2ff82d4cad3ad8bcb98 Mon Sep 17 00:00:00 2001
From: kai dubauskas <kaidubauskas@gmail.com>
Date: Wed, 19 Jul 2023 14:23:55 -0500
Subject: [PATCH 15/24] change vercel.json

---
 vercel.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vercel.json b/vercel.json
index dabceea..d4b03f7 100644
--- a/vercel.json
+++ b/vercel.json
@@ -2,7 +2,7 @@
     "version": 2,
     "builds": [
         {
-            "src": "app.js",
+            "src": "index.js",
             "use": "@now/node"
         }
     ],

From 581fd46ab07bcf2d4e963e4c26b84904f1d3bce9 Mon Sep 17 00:00:00 2001
From: kai dubauskas <kaidubauskas@gmail.com>
Date: Wed, 19 Jul 2023 14:27:55 -0500
Subject: [PATCH 16/24] jkdf

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 4beeb93..a6f7fcd 100644
--- a/app.js
+++ b/app.js
@@ -3,7 +3,7 @@ const cors = require("cors");
 const helmet = require("helmet");
 const connectDB = require("./config/database.js");
 
-const PORT = process.env.PORT || 3000;
+const PORT = process.env.VERCEL_URL || 3000;
 
 const app = express();
 

From eeffb9aae449750665c06b50456054a0e19a2eff Mon Sep 17 00:00:00 2001
From: kai dubauskas <kaidubauskas@gmail.com>
Date: Wed, 19 Jul 2023 15:41:11 -0500
Subject: [PATCH 17/24] configure for backend deployment

---
 app.js => index.js | 1 +
 package.json       | 4 ++--
 vercel.json        | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename app.js => index.js (95%)

diff --git a/app.js b/index.js
similarity index 95%
rename from app.js
rename to index.js
index a6f7fcd..9261e2c 100644
--- a/app.js
+++ b/index.js
@@ -13,6 +13,7 @@ connectDB(); // Connect to MongoDB
 app.use(express.json());
 app.use(cors());
 app.use(helmet());
+// app.use(express.static('public'))
 
 // Routers
 app.use("/assessments", require("./routes/assessments.router.js"));
diff --git a/package.json b/package.json
index 063991b..6bd82fa 100644
--- a/package.json
+++ b/package.json
@@ -2,10 +2,10 @@
     "name": "hfc-backend",
     "version": "1.0.0",
     "description": "",
-    "main": "app.js",
+    "main": "index.js",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
-        "start": "node app.js",
+        "start": "node index.js",
         "format": "prettier --write \"**/*.{js,jsx,json,css,md}\""
     },
     "lint-staged": {
diff --git a/vercel.json b/vercel.json
index d4b03f7..64fa037 100644
--- a/vercel.json
+++ b/vercel.json
@@ -2,14 +2,14 @@
     "version": 2,
     "builds": [
         {
-            "src": "index.js",
-            "use": "@now/node"
+            "src": "*.js",
+            "use": "@vercel/node"
         }
     ],
     "routes": [
         {
             "src": "/(.*)",
-            "dest": "app.js"
+            "dest": "/"
         }
     ]
 }

From 8cc60015e899749969bb1dd1dbfd38ca33f470a3 Mon Sep 17 00:00:00 2001
From: kai dubauskas <kaidubauskas@gmail.com>
Date: Fri, 4 Aug 2023 16:52:31 -0500
Subject: [PATCH 18/24] start filtering

---
 controllers/beneficiaries.controllers.js |  2 ++
 models/Beneficiary.js                    | 39 ++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/controllers/beneficiaries.controllers.js b/controllers/beneficiaries.controllers.js
index dbfcd1a..3f92890 100644
--- a/controllers/beneficiaries.controllers.js
+++ b/controllers/beneficiaries.controllers.js
@@ -68,6 +68,8 @@ const editBeneficiary = async (req, res) => {
     try {
         const beneficiaryId = req.params?.beneficiaryId;
         console.log(req.body);
+
+
         if (beneficiaryId) {
             const beneficiary = Beneficiary.findByIdAndUpdate(
                 beneficiaryId,
diff --git a/models/Beneficiary.js b/models/Beneficiary.js
index fc5a777..1dc797d 100644
--- a/models/Beneficiary.js
+++ b/models/Beneficiary.js
@@ -83,6 +83,45 @@ const BeneficiarySchema = new Schema({
     photo: {
         type: String, // change this when we know how to store photos
     },
+    bankAccountIntake: {
+        type: Boolean
+    },
+    bankAccountCompletion: {
+        type: Boolean
+    },
+    englishLvlIntake: {
+        type: Number
+    },
+    englishLvlCompletion: {
+        type: Number
+    },
+    computerSkillsIntake: {
+        type: Number
+    },
+    computerSkillsCompletion: {
+        type: Number
+    },
+    emotionalWellnessIntake: {
+        type: Number
+    },
+    emotionalWellnessCompletion: {
+        type: Number
+    },
+    incomeIntake: {
+        type: Number
+    },
+    incomeCompletion: {
+        type: Number
+    },
+    savingsIntake: {
+        type: Number
+    },
+    savingsCompletion: {
+        type: Number
+    },
+    workFoundCompletion: {
+        type: Boolean
+    },
 });
 
 module.exports = Beneficiary = mongoose.model(

From feee3936189aca498242f0abf8ab5fd08cd536af Mon Sep 17 00:00:00 2001
From: kai dubauskas <kaidubauskas@gmail.com>
Date: Tue, 5 Sep 2023 12:40:30 -0500
Subject: [PATCH 19/24] change beneficiary model

---
 models/Beneficiary.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/models/Beneficiary.js b/models/Beneficiary.js
index 1dc797d..d6e9356 100644
--- a/models/Beneficiary.js
+++ b/models/Beneficiary.js
@@ -83,10 +83,10 @@ const BeneficiarySchema = new Schema({
     photo: {
         type: String, // change this when we know how to store photos
     },
-    bankAccountIntake: {
+    hasBankAccountIntake: {
         type: Boolean
     },
-    bankAccountCompletion: {
+    hasBankAccountCompletion: {
         type: Boolean
     },
     englishLvlIntake: {
@@ -119,7 +119,7 @@ const BeneficiarySchema = new Schema({
     savingsCompletion: {
         type: Number
     },
-    workFoundCompletion: {
+    hasFoundWorkCompletion: {
         type: Boolean
     },
 });

From 0e1908e38f1d75702c50dfc887f1f542cc7eb062 Mon Sep 17 00:00:00 2001
From: kai dubauskas <kaidubauskas@gmail.com>
Date: Tue, 5 Sep 2023 14:41:18 -0500
Subject: [PATCH 20/24] vercelURL

---
 firebase.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/firebase.js b/firebase.js
index a59376d..e078ee5 100644
--- a/firebase.js
+++ b/firebase.js
@@ -14,7 +14,7 @@ const { getAuth } = require("firebase-admin/auth");
 const serviceAccount = require("./ServiceAccount.json");
 
 const app = initializeApp({
-    credential: cert(serviceAccount),
+    credential: cert(process.env.VERCEL_URI),
 });
 
 const auth = getAuth(app);

From 59c5375003afe9ff814bd3da6b35e9a32456deaa Mon Sep 17 00:00:00 2001
From: kai dubauskas <kaidubauskas@gmail.com>
Date: Tue, 5 Sep 2023 14:43:09 -0500
Subject: [PATCH 21/24] try2

---
 firebase.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/firebase.js b/firebase.js
index e078ee5..a6961d2 100644
--- a/firebase.js
+++ b/firebase.js
@@ -11,7 +11,7 @@
 const { initializeApp, cert } = require("firebase-admin/app");
 const { getAuth } = require("firebase-admin/auth");
 //const admin = require("firebase-admin");
-const serviceAccount = require("./ServiceAccount.json");
+// const serviceAccount = require("./ServiceAccount.json");
 
 const app = initializeApp({
     credential: cert(process.env.VERCEL_URI),

From e8d5ef4e5ecc5dd8fb8a429ed8c7a4380325bb1f Mon Sep 17 00:00:00 2001
From: kai dubauskas <kaidubauskas@gmail.com>
Date: Tue, 5 Sep 2023 16:09:59 -0500
Subject: [PATCH 22/24] fix deployment issue

---
 firebase.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/firebase.js b/firebase.js
index a6961d2..b60f610 100644
--- a/firebase.js
+++ b/firebase.js
@@ -8,13 +8,17 @@
 
 // module.exports = admin;
 // TODO: figure out the difference between above and below
+
+
+
+
 const { initializeApp, cert } = require("firebase-admin/app");
 const { getAuth } = require("firebase-admin/auth");
 //const admin = require("firebase-admin");
 // const serviceAccount = require("./ServiceAccount.json");
 
 const app = initializeApp({
-    credential: cert(process.env.VERCEL_URI),
+    credential: cert(JSON.parse(process.env.VERCEL_URI)),
 });
 
 const auth = getAuth(app);

From 523d2b5959c771a8c3c474cbbe57ac507727ee1c Mon Sep 17 00:00:00 2001
From: kai dubauskas <kaidubauskas@gmail.com>
Date: Tue, 5 Sep 2023 16:19:59 -0500
Subject: [PATCH 23/24] fix verifyAdmin localhost domain

---
 firebase.js               | 2 --
 middleware/verifyAdmin.js | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/firebase.js b/firebase.js
index b60f610..906ecc2 100644
--- a/firebase.js
+++ b/firebase.js
@@ -10,8 +10,6 @@
 // TODO: figure out the difference between above and below
 
 
-
-
 const { initializeApp, cert } = require("firebase-admin/app");
 const { getAuth } = require("firebase-admin/auth");
 //const admin = require("firebase-admin");
diff --git a/middleware/verifyAdmin.js b/middleware/verifyAdmin.js
index c0f3e55..a0bd833 100644
--- a/middleware/verifyAdmin.js
+++ b/middleware/verifyAdmin.js
@@ -36,7 +36,7 @@ const checkAdminStatus = async (uid, token) => {
     console.log("checkAdmin function starting");
     try {
         const res = await fetch(
-            `http://localhost:3000/users?firebaseUID=${uid}`,
+            `https://hfc-backend-delta.vercel.app/users?firebaseUID=${uid}`,
             {
                 headers: {
                     "Content-Type": "application/json",

From 8d7a895d90fe47b00d7c8e48d0367e4dd5b467f0 Mon Sep 17 00:00:00 2001
From: KaiDubauskas <KaiDubauskas@users.noreply.github.com>
Date: Tue, 5 Sep 2023 21:20:30 +0000
Subject: [PATCH 24/24] Apply Prettier formatting

---
 controllers/beneficiaries.controllers.js |  1 -
 firebase.js                              |  1 -
 models/Beneficiary.js                    | 26 ++++++++++++------------
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/controllers/beneficiaries.controllers.js b/controllers/beneficiaries.controllers.js
index 3f92890..c6bcb70 100644
--- a/controllers/beneficiaries.controllers.js
+++ b/controllers/beneficiaries.controllers.js
@@ -69,7 +69,6 @@ const editBeneficiary = async (req, res) => {
         const beneficiaryId = req.params?.beneficiaryId;
         console.log(req.body);
 
-
         if (beneficiaryId) {
             const beneficiary = Beneficiary.findByIdAndUpdate(
                 beneficiaryId,
diff --git a/firebase.js b/firebase.js
index 906ecc2..d200659 100644
--- a/firebase.js
+++ b/firebase.js
@@ -9,7 +9,6 @@
 // module.exports = admin;
 // TODO: figure out the difference between above and below
 
-
 const { initializeApp, cert } = require("firebase-admin/app");
 const { getAuth } = require("firebase-admin/auth");
 //const admin = require("firebase-admin");
diff --git a/models/Beneficiary.js b/models/Beneficiary.js
index d6e9356..bba11a1 100644
--- a/models/Beneficiary.js
+++ b/models/Beneficiary.js
@@ -84,43 +84,43 @@ const BeneficiarySchema = new Schema({
         type: String, // change this when we know how to store photos
     },
     hasBankAccountIntake: {
-        type: Boolean
+        type: Boolean,
     },
     hasBankAccountCompletion: {
-        type: Boolean
+        type: Boolean,
     },
     englishLvlIntake: {
-        type: Number
+        type: Number,
     },
     englishLvlCompletion: {
-        type: Number
+        type: Number,
     },
     computerSkillsIntake: {
-        type: Number
+        type: Number,
     },
     computerSkillsCompletion: {
-        type: Number
+        type: Number,
     },
     emotionalWellnessIntake: {
-        type: Number
+        type: Number,
     },
     emotionalWellnessCompletion: {
-        type: Number
+        type: Number,
     },
     incomeIntake: {
-        type: Number
+        type: Number,
     },
     incomeCompletion: {
-        type: Number
+        type: Number,
     },
     savingsIntake: {
-        type: Number
+        type: Number,
     },
     savingsCompletion: {
-        type: Number
+        type: Number,
     },
     hasFoundWorkCompletion: {
-        type: Boolean
+        type: Boolean,
     },
 });