From 7b17b3c49cb8ce09f9e8beded3bfcae8073efa52 Mon Sep 17 00:00:00 2001
From: arauta12 <andreirauta234@gmail.com>
Date: Tue, 22 Jul 2025 15:40:36 -0400
Subject: [PATCH 01/12] Add jwt token and admin login/logout

---
 .gitignore                                    |    1 +
 backend/app.js                                |    5 +-
 backend/controllers/auth.controller.js        |   87 +-
 backend/controllers/message.controller.js     |   10 +-
 backend/controllers/project.controller.js     |   28 +-
 backend/controllers/user.controller.js        |   45 +-
 backend/models/user.model.js                  |    4 +
 backend/package-lock.json                     |   30 +
 backend/package.json                          |    2 +
 backend/routes/auth.route.js                  |    3 +-
 backend/routes/user.route.js                  |   16 +
 frontend/old/data.js                          |   20 -
 frontend/package-lock.json                    | 1239 +++++++++-
 frontend/package.json                         |    9 +-
 frontend/src/Pages/Admin.jsx                  |   37 +
 .../adminComponents/AdminLogin/AdminLogin.css |    2 +
 .../adminComponents/AdminLogin/AdminLogin.jsx |   54 +-
 .../AdminProjectListing.jsx                   |    4 +-
 .../MessageList/MessageList.jsx               |    2 +-
 .../src/adminComponents/Redirect/Redirect.jsx |    0
 frontend/src/components/Contact/Contact.jsx   |   35 +-
 frontend/src/components/Navigation/Navbar.jsx |    3 +
 .../ProjectListing/ProjectListing.jsx         |    6 +-
 frontend/src/index.css                        |    6 +-
 package-lock.json                             | 2123 ++++++++++++++++-
 package.json                                  |    3 +
 26 files changed, 3628 insertions(+), 146 deletions(-)
 create mode 100644 backend/routes/user.route.js
 delete mode 100644 frontend/old/data.js
 create mode 100644 frontend/src/adminComponents/Redirect/Redirect.jsx

diff --git a/.gitignore b/.gitignore
index 4e8870b..f1e85fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,6 @@ node_modules/
 frontend/node_modules/
 frontend/dist/
 frontend/TODO.md
+frontend/coverage
 
 backend/node_modules/
\ No newline at end of file
diff --git a/backend/app.js b/backend/app.js
index 5cbc3a1..b6ac602 100644
--- a/backend/app.js
+++ b/backend/app.js
@@ -1,9 +1,10 @@
 const express = require('express');
 const helmet = require('helmet');
 const cors = require('cors');
-
+const cookieParser = require('cookie-parser');
 
 const authRoute = require('./routes/auth.route');
+const userRoute = require('./routes/user.route');
 const projectRoute = require('./routes/project.route');
 const messageRoute = require('./routes/message.route');
 
@@ -21,10 +22,12 @@ const corsConfig = {
 app.use(cors(corsConfig));
 app.use(helmet());
 app.use(express.json());
+app.use(cookieParser());
 
 app.use('/api/auth', authRoute);
 app.use('/api/projects', projectRoute);
 app.use('/api/messages', messageRoute);
+app.use('/api/users', userRoute);
 
 app.all('{*splat}', (req, res) => {
     res.status(404).send('That resource does not exist!');
diff --git a/backend/controllers/auth.controller.js b/backend/controllers/auth.controller.js
index e187348..14cf93e 100644
--- a/backend/controllers/auth.controller.js
+++ b/backend/controllers/auth.controller.js
@@ -1,15 +1,98 @@
 const User = require('../models/user.model');
-const userControl = require('../controllers/user.controller');
+const bcrypt = require('bcryptjs');
+const jwt = require('jsonwebtoken');
 
 const signup = async (req, res) => {
+    const { data: { username, password, role = 'viewer' } } = req.body;
 
+    try {
+        if (!username || !password)
+            return res.status(400).json({ status: "failed", message: "Missing username or password!" });
+
+        const existingUser = await User.findOne({ username }, '-_id -__v');
+        if (existingUser)
+            return res.status(400).json({ status: "failed", message: "User already exists!" });
+
+        const hashedPassword = bcrypt.hash(password, 10);
+        const newUser = await User.create({ username, hashedPassword, role, loggedIn: true });
+
+        // verification stuff & jwt
+        const token = await jwt.sign({ username, role }, process.env.JWT_SECRET, {
+            expiresIn: '10h'
+        });
+
+        return res.status(201).json({ status: "success", data: { username, role } }).cookie("jwt_token", token);
+    } catch (err) {
+        return res.status(500).json({ status: "failed", message: err.message });
+    }
 };
 
 const login = async (req, res) => {
+    const { data = {} } = req.body;
+    const { username = "", password = "" } = data;
+
+    try {
+        const jwtToken = req.cookies.jwt_token;
+
+        if (jwtToken) {
+            const jwtData = jwt.verify(jwtToken, process.env.JWT_SECRET);
+            if (jwtData.exp < Date.now() && jwtData.username && ([ "admin", "viewer" ].includes(jwtData.role))) {
+                return res.status(200).json({ status: "success", data: { username: jwtData.username, role: jwtData.role } });
+            }
+        }
+
+        if (!data || !username || !password)
+            return res.status(400).json({ status: "failed", message: "Missing username or password!" });
+
+        console.log("BODY EXISTS!");
+
+        const user = await User.findOne({ username });
+        const passwordCompare = await bcrypt.compare(password, user?.password || "");
+
+        if (!user || !passwordCompare)
+            return res.status(401).json({ status: "failed", message: "Invalid credentials!" });
+
+        const token = await jwt.sign({ username, role: user.role }, process.env.JWT_SECRET, {
+            expiresIn: '10h',
+        });
+
+        user.loggedIn = true;
+        await user.save();
+
+        res.cookie("jwt_token", token, {
+            maxAge: 1000 * 60 * 60 * 10, // 10hrs
+            secure: true,
+            httpOnly: true,
+        });
+
+        return res.status(200).json({ status: "success", data: { username, role: user.role } });
+    } catch (err) {
+        return res.status(500).json({ status: "failed", message: err.message });
+    }
+};
+
+const logout = async (req, res) => {
+    try {
+        const jwtString = req.cookies.jwt_token;
+        const jwtData = jwt.verify(jwtString, process.env.JWT_SECRET);
+
+        if (!jwtData.username || !jwtData.role)
+            return res.status(401).json({ status: "failed", message: "Invalid credentials." });
+
+        const user = await User.findOne({ username: jwtData.username, role: jwtData.role });
+        if (!user)
+            return res.status(401).json({ status: "failed", message: "Invalid credentials." });
 
+        user.loggedIn = false;
+        res.clearCookie("jwt_token");
+        return res.status(200).json({ status: "success", data: user.username });
+    } catch (err) {
+        return res.status(500).json({ status: "failed", message: err.message });
+    }
 };
 
 module.exports = {
     signup,
-    login
+    login,
+    logout,
 };
\ No newline at end of file
diff --git a/backend/controllers/message.controller.js b/backend/controllers/message.controller.js
index 1b7b49a..06445cb 100644
--- a/backend/controllers/message.controller.js
+++ b/backend/controllers/message.controller.js
@@ -11,9 +11,10 @@ const getMessages = async (req, res) => {
 
     try {
         const messages = await Message.find({}, '-_id -__v');
-        return res.status(200).json(messages);
+        return res.status(200).json({ status: "success", data: messages });
     } catch (err) {
-        return res.status(500).json({ status: "failed", message: err.message });
+        console.error(chalk.red(`MESSAGE ROUTE ERROR: ${err.message}!`));
+        return res.status(500).json({ status: "failed", message: "Something went wrong. Try again." });
     }
 };
 
@@ -27,9 +28,10 @@ const createMessage = async (req, res) => {
             return res.status(400).json({ status: "failed", message: "Missing required fields!" });
 
         await Message.create({ name, email, contents });
-        return res.status(201).json({ status: "success", data: { name } });
+        return res.status(201).json({ status: "success", data: name });
     } catch (err) {
-        return res.status(500).json({ status: "failed", message: err.message });
+        console.error(chalk.red(`MESSAGE ROUTE ERROR: ${err.message}!`));
+        return res.status(500).json({ status: "failed", message: "Something went wrong. Try again." });
     }
 };
 
diff --git a/backend/controllers/project.controller.js b/backend/controllers/project.controller.js
index 020d513..1e0e35e 100644
--- a/backend/controllers/project.controller.js
+++ b/backend/controllers/project.controller.js
@@ -1,4 +1,5 @@
 const Project = require('../models/project.model');
+const chalk = require('chalk');
 
 /**
  * Get every project that exists
@@ -11,9 +12,10 @@ const getAllProjects = async (req, res) => {
 
     try {
         const projects = await Project.find({}, '-_id -__v');
-        return res.status(200).json(projects);
+        return res.status(200).json({ status: "success", data: projects });
     } catch (err) {
-        return res.status(500).json({ status: "failed", message: err.message });
+        console.error(chalk.red(`PROJECT ROUTE ERROR: ${err.message}!`));
+        return res.status(500).json({ status: "failed", message: "Something went wrong. Try again." });
     }
 };
 
@@ -25,10 +27,11 @@ const getProject = async (req, res) => {
     const { id } = req.params;
 
     try {
-        const project = await Project.findById(id);
-        return res.status(200).json(project);
+        const project = await Project.findById(id, '-_id -__v');
+        return res.status(200).json({ status: "success", data: project });
     } catch (err) {
-        return res.status(500).json({ status: "failed", message: err.message });
+        console.error(chalk.red(`PROJECT ROUTE ERROR: ${err.message}!`));
+        return res.status(500).json({ status: "failed", message: "Something went wrong. Try again." });
     }
 };
 
@@ -47,7 +50,8 @@ const createProject = async (req, res) => {
         await Project.create({ name, image, description, link, show });
         return res.status(201).json({ status: "success", data: { name, show } });
     } catch (err) {
-        return res.status(500).json({ status: "failed", message: err.message });
+        console.error(chalk.red(`PROJECT ROUTE ERROR: ${err.message}!`));
+        return res.status(500).json({ status: "failed", message: "Something went wrong. Try again." });
     }
 };
 
@@ -59,10 +63,11 @@ const deleteProject = async (req, res) => {
     const { id } = req.params;
 
     try {
-        const { name, show } = await Project.findByIdAndDelete(id);
+        const { name, show } = await Project.findByIdAndDelete(id, '-_id -__v');
         return res.status(200).json({ status: "success", data: { name, show } });
     } catch (err) {
-        return res.status(500).json({ status: "failed", message: err.message });
+        console.error(chalk.red(`PROJECT ROUTE ERROR: ${err.message}!`));
+        return res.status(500).json({ status: "failed", message: "Something went wrong. Try again." });
     }
 };
 
@@ -78,11 +83,10 @@ const updateProject = async (req, res) => {
 
     try {
         const project = await Project.findByIdAndUpdate(id, data);
-        console.log(data);
-
-        return res.status(200).json({ status: "success", data });
+        return res.status(200).json({ status: "success", data: { name: project.name, show: project.show } });
     } catch (err) {
-        return res.status(500).json({ status: "failed", message: err.message });
+        console.error(chalk.red(`PROJECT ROUTE ERROR: ${err.message}!`));
+        return res.status(500).json({ status: "failed", message: "Something went wrong. Try again." });
     }
 };
 
diff --git a/backend/controllers/user.controller.js b/backend/controllers/user.controller.js
index e257f3e..282860d 100644
--- a/backend/controllers/user.controller.js
+++ b/backend/controllers/user.controller.js
@@ -1,23 +1,66 @@
 const User = require('../models/user.model');
+const bcrypt = require('bcryptjs');
 
 const getAllUsers = async (req, res) => {
-
+    try {
+        const users = await Users.find({}, '-_id -__v');
+        return res.status(200).json(users);
+    } catch (err) {
+        return res.status(500).json({ status: "failed", message: err.message });
+    }
 };
 
 const getUser = async (req, res) => {
+    const { id } = req.params;
+
+    try {
+        if (!id)
+            return res.status(400).json({ status: "failed", message: "Missing id" });
 
+        const user = await User.findById(id, '-_id -__v');
+        return res.status(200).json(user);
+    } catch (err) {
+        return res.status(500).json({ status: "failed", message: err.message });
+    }
 };
 
 const createUser = async (req, res) => {
+    const { data = {} } = req.body;
+    const { username, password, role = 'viewer' } = data;
+
+    try {
+        if (!username || !password)
+            return res.status(400).json({ status: "failed", message: "Missing required fields" });
 
+        const hashedPassword = await bcrypt.hash(password, 10);
+        await User.create({ username, password: hashedPassword, role });
+        return res.status(201).json({ status: "success", data: { username, role } });
+    } catch (err) {
+        return res.status(500).json({ status: "failed", message: err.message });
+    }
 };
 
 const updateUser = async (req, res) => {
+    const { id } = req.params;
+    const { data = {} } = req.body;
 
+    try {
+        await User.findByIdAndUpdate(id, data);
+        return res.status(200).json({ status: "success", data });
+    } catch (err) {
+        return res.status(500).json({ status: "failed", message: err.message });
+    }
 };
 
 const deleteUser = async (req, res) => {
+    const { id } = req.params;
 
+    try {
+        const { username, role } = await User.findByIdAndDelete(id);
+        return res.status(200).json({ status: "success", data: { username, role } });
+    } catch (err) {
+        return res.status(500).json({ status: "failed", message: err.message });
+    }
 };
 
 
diff --git a/backend/models/user.model.js b/backend/models/user.model.js
index 69ce478..17a4219 100644
--- a/backend/models/user.model.js
+++ b/backend/models/user.model.js
@@ -17,6 +17,10 @@ const userSchema = new mongoose.Schema({
             values: [ 'admin', 'viewer' ],
             message: '{VALUE} is not a valid role!'
         }
+    },
+    loggedIn: {
+        type: Boolean,
+        default: false
     }
 });
 
diff --git a/backend/package-lock.json b/backend/package-lock.json
index 312094c..64565aa 100644
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
@@ -9,7 +9,9 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
+        "bcryptjs": "^3.0.2",
         "chalk": "^4.1.2",
+        "cookie-parser": "^1.4.7",
         "cors": "^2.8.5",
         "dotenv": "^17.2.0",
         "express": "^5.1.0",
@@ -1867,6 +1869,15 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/bcryptjs": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-3.0.2.tgz",
+      "integrity": "sha512-k38b3XOZKv60C4E2hVsXTolJWfkGRMbILBIe2IBITXciy5bOsTKot5kDrf3ZfufQtQOUN5mXceUEpU1rTl9Uog==",
+      "license": "BSD-3-Clause",
+      "bin": {
+        "bcrypt": "bin/bcrypt"
+      }
+    },
     "node_modules/body-parser": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz",
@@ -2334,6 +2345,25 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/cookie-parser": {
+      "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.7.tgz",
+      "integrity": "sha512-nGUvgXnotP3BsjiLX2ypbQnWoGUPIIfHQNZkkC668ntrzGWEZVW70HDEB1qnNGMicPje6EttlIgzo51YSwNQGw==",
+      "license": "MIT",
+      "dependencies": {
+        "cookie": "0.7.2",
+        "cookie-signature": "1.0.6"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/cookie-parser/node_modules/cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
+      "license": "MIT"
+    },
     "node_modules/cookie-signature": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz",
diff --git a/backend/package.json b/backend/package.json
index fe973ad..ea09642 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -12,7 +12,9 @@
   "license": "ISC",
   "description": "",
   "dependencies": {
+    "bcryptjs": "^3.0.2",
     "chalk": "^4.1.2",
+    "cookie-parser": "^1.4.7",
     "cors": "^2.8.5",
     "dotenv": "^17.2.0",
     "express": "^5.1.0",
diff --git a/backend/routes/auth.route.js b/backend/routes/auth.route.js
index 373fe83..9e45e90 100644
--- a/backend/routes/auth.route.js
+++ b/backend/routes/auth.route.js
@@ -5,5 +5,6 @@ const router = express.Router();
 
 router.post('/login', authControl.login);
 router.post('/signup', authControl.signup);
+router.post('/logout', authControl.logout);
 
-module.exports = router;
\ No newline at end of file
+module.exports = router;
diff --git a/backend/routes/user.route.js b/backend/routes/user.route.js
new file mode 100644
index 0000000..6e366b1
--- /dev/null
+++ b/backend/routes/user.route.js
@@ -0,0 +1,16 @@
+const express = require('express');
+const userControl = require('../controllers/user.controller');
+const User = require('../models/user.model');
+
+const router = express.Router();
+
+router.route('/')
+    .get(userControl.getAllUsers)
+    .post(userControl.createUser);
+
+router.route('/:id')
+    .get(userControl.getUser)
+    .patch(userControl.updateUser)
+    .delete(userControl.deleteUser);
+
+module.exports = router;
\ No newline at end of file
diff --git a/frontend/old/data.js b/frontend/old/data.js
deleted file mode 100644
index 154edea..0000000
--- a/frontend/old/data.js
+++ /dev/null
@@ -1,20 +0,0 @@
-let oldProjects = [
-    {
-        name: "Clubfinity",
-        image: "clubfinity.png",
-        description: [
-            "A mobile app for university students to get all the latest information about their favorite clubs. Clubfinity gives students the opportunity to discover and experience new clubs, as well as a way to be continually notified of upcoming events!",
-            "The app is developed on a MERN tech stack, with the frontend developed using React Native, the backend with NodeJS with the ExpressJS framework, and MongoDB NoSQL database. Frontend and backend are connected through a stateless JSON REST API. Code version control managed by Git and Gitlab, with a CI/CD pipeline for automated testing upon merging, improving code quality by 50%. Collaboration is done in teams of 3-4 with sprint meetings every 2 weeks to discuss app progress and new sprint backlog items.",
-        ],
-        link: "https://gitlab.com/ufsec/clubfinity",
-    },
-    {
-        name: "Jonra",
-        image: "jonra.png",
-        description: [
-            "A website for developers and project managers to manage tasks and boards for projects. Students are also able to use Jonra to manage homework and other tasks for classes or daily life!",
-            "The frontend is developed through React for user interaction. The backend is built off of the Django framework with a SQLite database managed with Django's ORM for CRUD operations. Frontend and backend communicate with a stateless JSON REST API along with user authentication. Code version control is handled by Git and Github. Collaboration was done with 2 others utilizing Agile methology with regular scrum meetings and sprint meetings every 3-4 weeks.",
-        ],
-        link: "https://github.com/JonKissil/Jonra",
-    },
-];
\ No newline at end of file
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 44f0cfb..af755f6 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -9,6 +9,7 @@
       "version": "0.0.0",
       "dependencies": {
         "axios": "^1.10.0",
+        "jsonwebtoken": "^9.0.2",
         "react": "^19.1.0",
         "react-dom": "^19.1.0",
         "react-router-dom": "^7.6.3"
@@ -18,11 +19,13 @@
         "@types/react": "^19.1.8",
         "@types/react-dom": "^19.1.6",
         "@vitejs/plugin-react": "^4.6.0",
+        "@vitest/coverage-v8": "^3.2.4",
         "eslint": "^9.30.1",
         "eslint-plugin-react-hooks": "^5.2.0",
         "eslint-plugin-react-refresh": "^0.4.20",
         "globals": "^16.3.0",
-        "vite": "^7.0.3"
+        "vite": "^7.0.3",
+        "vitest": "^3.2.4"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -321,6 +324,16 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@bcoe/v8-coverage": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-1.0.2.tgz",
+      "integrity": "sha512-6zABk/ECA/QYSCQ1NGiVwwbQerUCZ+TQbp64Q3AgmfNvurHH0j8TtXa1qbShXA6qqkpAj4V5W8pP6mLe1mcMqA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@esbuild/aix-ppc64": {
       "version": "0.25.6",
       "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.6.tgz",
@@ -996,6 +1009,34 @@
         "url": "https://github.com/sponsors/nzakas"
       }
     },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.12",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz",
@@ -1035,6 +1076,17 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "node_modules/@rolldown/pluginutils": {
       "version": "1.0.0-beta.19",
       "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.19.tgz",
@@ -1367,6 +1419,23 @@
         "@babel/types": "^7.20.7"
       }
     },
+    "node_modules/@types/chai": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.2.tgz",
+      "integrity": "sha512-8kB30R7Hwqf40JPiKhVzodJs2Qc1ZJ5zuT3uzw5Hq/dhNCl3G3l83jfpdI1e20BP348+fV7VIL/+FxaXkqBmWg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/deep-eql": "*"
+      }
+    },
+    "node_modules/@types/deep-eql": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/deep-eql/-/deep-eql-4.0.2.tgz",
+      "integrity": "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/estree": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
@@ -1422,6 +1491,155 @@
         "vite": "^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0-beta.0"
       }
     },
+    "node_modules/@vitest/coverage-v8": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.2.4.tgz",
+      "integrity": "sha512-EyF9SXU6kS5Ku/U82E259WSnvg6c8KTjppUncuNdm5QHpe17mwREHnjDzozC8x9MZ0xfBUFSaLkRv4TMA75ALQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@ampproject/remapping": "^2.3.0",
+        "@bcoe/v8-coverage": "^1.0.2",
+        "ast-v8-to-istanbul": "^0.3.3",
+        "debug": "^4.4.1",
+        "istanbul-lib-coverage": "^3.2.2",
+        "istanbul-lib-report": "^3.0.1",
+        "istanbul-lib-source-maps": "^5.0.6",
+        "istanbul-reports": "^3.1.7",
+        "magic-string": "^0.30.17",
+        "magicast": "^0.3.5",
+        "std-env": "^3.9.0",
+        "test-exclude": "^7.0.1",
+        "tinyrainbow": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      },
+      "peerDependencies": {
+        "@vitest/browser": "3.2.4",
+        "vitest": "3.2.4"
+      },
+      "peerDependenciesMeta": {
+        "@vitest/browser": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@vitest/expect": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.2.4.tgz",
+      "integrity": "sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/chai": "^5.2.2",
+        "@vitest/spy": "3.2.4",
+        "@vitest/utils": "3.2.4",
+        "chai": "^5.2.0",
+        "tinyrainbow": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/mocker": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.2.4.tgz",
+      "integrity": "sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/spy": "3.2.4",
+        "estree-walker": "^3.0.3",
+        "magic-string": "^0.30.17"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      },
+      "peerDependencies": {
+        "msw": "^2.4.9",
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0"
+      },
+      "peerDependenciesMeta": {
+        "msw": {
+          "optional": true
+        },
+        "vite": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@vitest/pretty-format": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.2.4.tgz",
+      "integrity": "sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tinyrainbow": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/runner": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.2.4.tgz",
+      "integrity": "sha512-oukfKT9Mk41LreEW09vt45f8wx7DordoWUZMYdY/cyAk7w5TWkTRCNZYF7sX7n2wB7jyGAl74OxgwhPgKaqDMQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/utils": "3.2.4",
+        "pathe": "^2.0.3",
+        "strip-literal": "^3.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/snapshot": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.2.4.tgz",
+      "integrity": "sha512-dEYtS7qQP2CjU27QBC5oUOxLE/v5eLkGqPE0ZKEIDGMs4vKWe7IjgLOeauHsR0D5YuuycGRO5oSRXnwnmA78fQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/pretty-format": "3.2.4",
+        "magic-string": "^0.30.17",
+        "pathe": "^2.0.3"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/spy": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.2.4.tgz",
+      "integrity": "sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tinyspy": "^4.0.3"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/utils": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.2.4.tgz",
+      "integrity": "sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/pretty-format": "3.2.4",
+        "loupe": "^3.1.4",
+        "tinyrainbow": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
     "node_modules/acorn": {
       "version": "8.15.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
@@ -1462,6 +1680,19 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
+    "node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
     "node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -1485,6 +1716,35 @@
       "dev": true,
       "license": "Python-2.0"
     },
+    "node_modules/assertion-error": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
+      "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/ast-v8-to-istanbul": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/ast-v8-to-istanbul/-/ast-v8-to-istanbul-0.3.3.tgz",
+      "integrity": "sha512-MuXMrSLVVoA6sYN/6Hke18vMzrT4TZNbZIj/hvh0fnYFpO+/kFXcLIaiPwXXWaQUPg4yJD8fj+lfJ7/1EBconw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "estree-walker": "^3.0.3",
+        "js-tokens": "^9.0.1"
+      }
+    },
+    "node_modules/ast-v8-to-istanbul/node_modules/js-tokens": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.1.tgz",
+      "integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -1553,6 +1813,22 @@
         "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
       }
     },
+    "node_modules/buffer-equal-constant-time": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+      "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/cac": {
+      "version": "6.7.14",
+      "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
+      "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/call-bind-apply-helpers": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
@@ -1597,6 +1873,23 @@
       ],
       "license": "CC-BY-4.0"
     },
+    "node_modules/chai": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-5.2.1.tgz",
+      "integrity": "sha512-5nFxhUrX0PqtyogoYOA8IPswy5sZFTOsBFl/9bNsmDLgsxYTzSZQJDPppDnZPTQbzSEm0hqGjWPzRemQCYbD6A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "assertion-error": "^2.0.1",
+        "check-error": "^2.1.1",
+        "deep-eql": "^5.0.1",
+        "loupe": "^3.1.0",
+        "pathval": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -1614,6 +1907,16 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/check-error": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz",
+      "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 16"
+      }
+    },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -1709,6 +2012,16 @@
         }
       }
     },
+    "node_modules/deep-eql": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz",
+      "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -1739,6 +2052,22 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/ecdsa-sig-formatter": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
+      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
     "node_modules/electron-to-chromium": {
       "version": "1.5.180",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.180.tgz",
@@ -1746,6 +2075,13 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/es-define-property": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
@@ -1764,6 +2100,13 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/es-module-lexer": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz",
+      "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/es-object-atoms": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
@@ -2024,6 +2367,16 @@
         "node": ">=4.0"
       }
     },
+    "node_modules/estree-walker": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
+      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0"
+      }
+    },
     "node_modules/esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
@@ -2034,6 +2387,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/expect-type": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.2.2.tgz",
+      "integrity": "sha512-JhFGDVJ7tmDJItKhYgJCGLOWjuK9vPxiXoUFLwLDc99NlmklilbiQJwoctZtt13+xMw91MCk/REan6MWHqDjyA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -2141,6 +2504,23 @@
         }
       }
     },
+    "node_modules/foreground-child": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "cross-spawn": "^7.0.6",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/form-data": {
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
@@ -2228,6 +2608,27 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/glob": {
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/glob-parent": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -2241,6 +2642,32 @@
         "node": ">=10.13.0"
       }
     },
+    "node_modules/glob/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/glob/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/globals": {
       "version": "16.3.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-16.3.0.tgz",
@@ -2315,6 +2742,13 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/ignore": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
@@ -2362,6 +2796,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/is-glob": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -2382,33 +2826,103 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
       "dev": true,
-      "license": "MIT"
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
       "dev": true,
-      "license": "MIT",
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "argparse": "^2.0.1"
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^4.0.0",
+        "supports-color": "^7.1.0"
       },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/jsesc": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
-      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz",
+      "integrity": "sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==",
       "dev": true,
-      "license": "MIT",
-      "bin": {
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.23",
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-reports": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
+      "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jackspeak": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
         "jsesc": "bin/jsesc"
       },
       "engines": {
@@ -2449,6 +2963,61 @@
         "node": ">=6"
       }
     },
+    "node_modules/jsonwebtoken": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz",
+      "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==",
+      "license": "MIT",
+      "dependencies": {
+        "jws": "^3.2.2",
+        "lodash.includes": "^4.3.0",
+        "lodash.isboolean": "^3.0.3",
+        "lodash.isinteger": "^4.0.4",
+        "lodash.isnumber": "^3.0.3",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.isstring": "^4.0.1",
+        "lodash.once": "^4.0.0",
+        "ms": "^2.1.1",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": ">=12",
+        "npm": ">=6"
+      }
+    },
+    "node_modules/jsonwebtoken/node_modules/semver": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jwa": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.2.tgz",
+      "integrity": "sha512-eeH5JO+21J78qMvTIDdBXidBd6nG2kZjg5Ohz/1fpa28Z4CcsWUzJ1ZZyFq/3z3N17aZy+ZuBoHljASbL1WfOw==",
+      "license": "MIT",
+      "dependencies": {
+        "buffer-equal-constant-time": "^1.0.1",
+        "ecdsa-sig-formatter": "1.0.11",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/jws": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
+      "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
+      "license": "MIT",
+      "dependencies": {
+        "jwa": "^1.4.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
     "node_modules/keyv": {
       "version": "4.5.4",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
@@ -2489,6 +3058,42 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/lodash.includes": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
+      "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.isboolean": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
+      "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.isinteger": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
+      "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.isnumber": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
+      "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.isplainobject": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.isstring": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
+      "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==",
+      "license": "MIT"
+    },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
@@ -2496,6 +3101,19 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/lodash.once": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==",
+      "license": "MIT"
+    },
+    "node_modules/loupe": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.4.tgz",
+      "integrity": "sha512-wJzkKwJrheKtknCOKNEtDK4iqg/MxmZheEMtSTYvnzRdEYaZzmgH976nenp8WdJRdx5Vc1X/9MO0Oszl6ezeXg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -2506,6 +3124,57 @@
         "yallist": "^3.0.2"
       }
     },
+    "node_modules/magic-string": {
+      "version": "0.30.17",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
+      "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.5.0"
+      }
+    },
+    "node_modules/magicast": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.3.5.tgz",
+      "integrity": "sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.25.4",
+        "@babel/types": "^7.25.4",
+        "source-map-js": "^1.2.0"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/make-dir/node_modules/semver": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/math-intrinsics": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@@ -2549,11 +3218,20 @@
         "node": "*"
       }
     },
+    "node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
     "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/nanoid": {
@@ -2639,6 +3317,13 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0"
+    },
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -2672,6 +3357,47 @@
         "node": ">=8"
       }
     },
+    "node_modules/path-scurry": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/path-scurry/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/pathe": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
+      "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/pathval": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.1.tgz",
+      "integrity": "sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14.16"
+      }
+    },
     "node_modules/picocolors": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
@@ -2866,6 +3592,26 @@
         "fsevents": "~2.3.2"
       }
     },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/scheduler": {
       "version": "0.26.0",
       "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.26.0.tgz",
@@ -2911,6 +3657,26 @@
         "node": ">=8"
       }
     },
+    "node_modules/siginfo": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
+      "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/source-map-js": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
@@ -2921,6 +3687,124 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/stackback": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
+      "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/std-env": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.9.0.tgz",
+      "integrity": "sha512-UGvjygr6F6tpH7o2qyqR6QYpwraIjKSdtzyBdyytFOHmPZY917kwdwLG0RbOjWOnKmnm3PeHjaoLLMie7kPLQw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/string-width-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -2934,6 +3818,26 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/strip-literal": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-3.0.0.tgz",
+      "integrity": "sha512-TcccoMhJOM3OebGhSBEmp3UZ2SfDMZUEBdRA/9ynfLi8yYajyWX3JiXArcJt4Umh4vISpspkQIY8ZZoCqjbviA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "js-tokens": "^9.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/strip-literal/node_modules/js-tokens": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.1.tgz",
+      "integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -2947,6 +3851,61 @@
         "node": ">=8"
       }
     },
+    "node_modules/test-exclude": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-7.0.1.tgz",
+      "integrity": "sha512-pFYqmTw68LXVjeWJMST4+borgQP2AyMNbg1BpZh9LbyhUeNkeaPF9gzfPGUAnSMV3qPYdWUwDIjjCLiSDOl7vg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^10.4.1",
+        "minimatch": "^9.0.4"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/test-exclude/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/test-exclude/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/tinybench": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz",
+      "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/tinyexec": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz",
+      "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/tinyglobby": {
       "version": "0.2.14",
       "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
@@ -2964,6 +3923,36 @@
         "url": "https://github.com/sponsors/SuperchupuDev"
       }
     },
+    "node_modules/tinypool": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.1.1.tgz",
+      "integrity": "sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      }
+    },
+    "node_modules/tinyrainbow": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-2.0.0.tgz",
+      "integrity": "sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/tinyspy": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-4.0.3.tgz",
+      "integrity": "sha512-t2T/WLB2WRgZ9EpE4jgPJ9w+i66UZfDc8wHh0xrwiRNN+UwH98GIJkTeZqX9rg0i0ptwzqW+uYeIF0T4F8LR7A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -3093,6 +4082,102 @@
         }
       }
     },
+    "node_modules/vite-node": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.2.4.tgz",
+      "integrity": "sha512-EbKSKh+bh1E1IFxeO0pg1n4dvoOTt0UDiXMd/qn++r98+jPO1xtJilvXldeuQ8giIB5IkpjCgMleHMNEsGH6pg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cac": "^6.7.14",
+        "debug": "^4.4.1",
+        "es-module-lexer": "^1.7.0",
+        "pathe": "^2.0.3",
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0"
+      },
+      "bin": {
+        "vite-node": "vite-node.mjs"
+      },
+      "engines": {
+        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/vitest": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.2.4.tgz",
+      "integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/chai": "^5.2.2",
+        "@vitest/expect": "3.2.4",
+        "@vitest/mocker": "3.2.4",
+        "@vitest/pretty-format": "^3.2.4",
+        "@vitest/runner": "3.2.4",
+        "@vitest/snapshot": "3.2.4",
+        "@vitest/spy": "3.2.4",
+        "@vitest/utils": "3.2.4",
+        "chai": "^5.2.0",
+        "debug": "^4.4.1",
+        "expect-type": "^1.2.1",
+        "magic-string": "^0.30.17",
+        "pathe": "^2.0.3",
+        "picomatch": "^4.0.2",
+        "std-env": "^3.9.0",
+        "tinybench": "^2.9.0",
+        "tinyexec": "^0.3.2",
+        "tinyglobby": "^0.2.14",
+        "tinypool": "^1.1.1",
+        "tinyrainbow": "^2.0.0",
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0",
+        "vite-node": "3.2.4",
+        "why-is-node-running": "^2.3.0"
+      },
+      "bin": {
+        "vitest": "vitest.mjs"
+      },
+      "engines": {
+        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      },
+      "peerDependencies": {
+        "@edge-runtime/vm": "*",
+        "@types/debug": "^4.1.12",
+        "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
+        "@vitest/browser": "3.2.4",
+        "@vitest/ui": "3.2.4",
+        "happy-dom": "*",
+        "jsdom": "*"
+      },
+      "peerDependenciesMeta": {
+        "@edge-runtime/vm": {
+          "optional": true
+        },
+        "@types/debug": {
+          "optional": true
+        },
+        "@types/node": {
+          "optional": true
+        },
+        "@vitest/browser": {
+          "optional": true
+        },
+        "@vitest/ui": {
+          "optional": true
+        },
+        "happy-dom": {
+          "optional": true
+        },
+        "jsdom": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -3109,6 +4194,23 @@
         "node": ">= 8"
       }
     },
+    "node_modules/why-is-node-running": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz",
+      "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "siginfo": "^2.0.0",
+        "stackback": "0.0.2"
+      },
+      "bin": {
+        "why-is-node-running": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/word-wrap": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
@@ -3119,6 +4221,101 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
     "node_modules/yallist": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 6c45648..30de5b4 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -5,7 +5,9 @@
   "type": "module",
   "main": "index.html",
   "scripts": {
-    "dev": "vite . --host",
+    "test": "vitest",
+    "coverage": "vitest run --coverage",
+    "dev": "vite .",
     "build": "vite build",
     "start": "vite dist/. --host",
     "lint": "eslint .",
@@ -13,6 +15,7 @@
   },
   "dependencies": {
     "axios": "^1.10.0",
+    "jsonwebtoken": "^9.0.2",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
     "react-router-dom": "^7.6.3"
@@ -22,10 +25,12 @@
     "@types/react": "^19.1.8",
     "@types/react-dom": "^19.1.6",
     "@vitejs/plugin-react": "^4.6.0",
+    "@vitest/coverage-v8": "^3.2.4",
     "eslint": "^9.30.1",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-react-refresh": "^0.4.20",
     "globals": "^16.3.0",
-    "vite": "^7.0.3"
+    "vite": "^7.0.3",
+    "vitest": "^3.2.4"
   }
 }
diff --git a/frontend/src/Pages/Admin.jsx b/frontend/src/Pages/Admin.jsx
index ac98097..3ae2d0e 100644
--- a/frontend/src/Pages/Admin.jsx
+++ b/frontend/src/Pages/Admin.jsx
@@ -1,14 +1,51 @@
+import { useState } from "react";
+import { useNavigate } from "react-router-dom";
 import AdminHeader from "../adminComponents/AdminHeader";
 import AdminProjectListing from "../adminComponents/AdminProjectListing/AdminProjectListing";
 import MessageList from "../adminComponents/MessageList/MessageList";
+import axios from "axios";
 import "./Admin.css";
 
 function Admin() {
+	axios.defaults.withCredentials = true;
+	const [errorMessage, setErrorMessage] = useState("");
+
+	const navigate = useNavigate();
+
+	const handleLogout = async () => {
+		try {
+			const resp = await axios.post(
+				"http://localhost:3000/api/auth/logout",
+				{}
+			);
+
+			if (resp.data.status === "success") {
+				navigate("/");
+			}
+		} catch (err) {
+			console.log();
+
+			setErrorMessage(
+				err.response?.data?.message || "Failed to logout! Try again."
+			);
+			setTimeout(() => {
+				setErrorMessage("");
+			}, 3000);
+		}
+	};
+
 	return (
 		<AdminHeader>
 			<MessageList />
 			<hr />
 			<AdminProjectListing />
+			<hr />
+			<section id="logout">
+				<button onClick={handleLogout}>Logout</button>
+				<p style={{ color: "var(--complement-color)" }}>
+					{errorMessage}
+				</p>
+			</section>
 		</AdminHeader>
 	);
 }
diff --git a/frontend/src/adminComponents/AdminLogin/AdminLogin.css b/frontend/src/adminComponents/AdminLogin/AdminLogin.css
index d5dafbc..02594e0 100644
--- a/frontend/src/adminComponents/AdminLogin/AdminLogin.css
+++ b/frontend/src/adminComponents/AdminLogin/AdminLogin.css
@@ -11,7 +11,9 @@
 
 #login-section button {
     width: 30%;
+    margin-top: 2rem;
     max-width: 300px;
+    font-weight: bold;
 }
 
 #login-section label {
diff --git a/frontend/src/adminComponents/AdminLogin/AdminLogin.jsx b/frontend/src/adminComponents/AdminLogin/AdminLogin.jsx
index 41d8fb0..af6e784 100644
--- a/frontend/src/adminComponents/AdminLogin/AdminLogin.jsx
+++ b/frontend/src/adminComponents/AdminLogin/AdminLogin.jsx
@@ -1,21 +1,65 @@
-import { useState, useRef } from "react";
+import { useState, useEffect } from "react";
+import { useNavigate } from "react-router-dom";
 import AdminHeader from "../AdminHeader";
 import Loading from "../../components/Loading";
 import axios from "axios";
 import "./AdminLogin.css";
 
 function AdminLogin() {
+	axios.defaults.withCredentials = true;
+
 	const [username, setUsername] = useState("");
 	const [password, setPassword] = useState("");
 	const [errorMessage, setErrorMessage] = useState("");
 
+	const navigate = useNavigate();
+
+	useEffect(() => {
+		const autoLogin = async () => {
+			try {
+				const resp = await axios.post(
+					"http://localhost:3000/api/auth/login",
+					{}
+				);
+				if (resp.data?.status === "success") {
+					navigate("/admin/home");
+				}
+			} catch (err) {
+				console.error(err);
+
+				console.log("FAILED TO AUTO login");
+			}
+		};
+
+		autoLogin();
+	}, []);
+
 	const handleLogin = async (e) => {
 		e.preventDefault();
 
 		try {
-			throw new Error("HI");
-		} catch (error) {
-			setErrorMessage("Login error! Try again.");
+			const res = await axios.post(
+				"http://localhost:3000/api/auth/login",
+				{
+					data: { username, password },
+				}
+			);
+
+			const status = res.data;
+			if (status === "failed") {
+				setErrorMessage(
+					res.data.message || "Unable to login! Try again."
+				);
+			} else {
+				console.log("success!");
+				navigate("/admin/home");
+			}
+		} catch (err) {
+			console.error(err.message);
+
+			setErrorMessage(
+				err.response?.data?.message || "Login error! Try again."
+			);
 
 			setTimeout(() => {
 				setErrorMessage("");
@@ -43,7 +87,7 @@ function AdminLogin() {
 					<p>
 						<label htmlFor="password">Password: </label>
 						<input
-							type="text"
+							type="password"
 							name="password"
 							id="password"
 							placeholder="Enter password..."
diff --git a/frontend/src/adminComponents/AdminProjectListing/AdminProjectListing.jsx b/frontend/src/adminComponents/AdminProjectListing/AdminProjectListing.jsx
index 70a336c..d82c7a5 100644
--- a/frontend/src/adminComponents/AdminProjectListing/AdminProjectListing.jsx
+++ b/frontend/src/adminComponents/AdminProjectListing/AdminProjectListing.jsx
@@ -18,12 +18,12 @@ function AdminProjectListing() {
 				const result = await axios.get(
 					"http://localhost:3000/api/projects",
 					{
-						filter: { show: true },
+						// filter: { show: true },
 						timeout: 5000,
 					}
 				);
 
-				setProjects(result.data);
+				setProjects(result.data.data);
 				setIsLoading(false);
 			} catch (err) {
 				console.error(`ERROR: ${err.message}`);
diff --git a/frontend/src/adminComponents/MessageList/MessageList.jsx b/frontend/src/adminComponents/MessageList/MessageList.jsx
index 9ce61c3..c229d06 100644
--- a/frontend/src/adminComponents/MessageList/MessageList.jsx
+++ b/frontend/src/adminComponents/MessageList/MessageList.jsx
@@ -17,7 +17,7 @@ function MessageList() {
 					"http://localhost:3000/api/messages",
 					{ timeout: 5000 }
 				);
-				setMessageList(res.data);
+				setMessageList(res.data.data);
 			} catch (error) {
 				setErrorMessage(`Could not get messages: ${error.message}`);
 			} finally {
diff --git a/frontend/src/adminComponents/Redirect/Redirect.jsx b/frontend/src/adminComponents/Redirect/Redirect.jsx
new file mode 100644
index 0000000..e69de29
diff --git a/frontend/src/components/Contact/Contact.jsx b/frontend/src/components/Contact/Contact.jsx
index 14e570b..ee34839 100644
--- a/frontend/src/components/Contact/Contact.jsx
+++ b/frontend/src/components/Contact/Contact.jsx
@@ -3,7 +3,11 @@ import axios from "axios";
 import "./Contact.css";
 
 function Contact() {
-	const [messageObj, setMessageObj] = useState({});
+	const [messageObj, setMessageObj] = useState({
+		name: "",
+		email: "",
+		contents: "",
+	});
 	const [submitMessageObj, setSubmitMessageObj] = useState({});
 
 	const handleShowError = (message) => {
@@ -36,11 +40,22 @@ function Contact() {
 		}
 
 		try {
-			await axios.post("http://localhost:3000/api/messages", {
+			const res = await axios.post("http://localhost:3000/api/messages", {
 				data: messageObj,
 			});
-			handleShowSuccess("Sent!");
-			setMessageObj({});
+
+			const status = res.data.status;
+			const name = res.data.data;
+
+			const displayName =
+				name.length > 10 ? name.substr(0, 7) + "..." : name;
+
+			if (status === "failed") {
+				handleShowError(res.data.message || "Failed to send.");
+			} else {
+				handleShowSuccess(`Thanks ${displayName}!`);
+				setMessageObj({ name: "", email: "", contents: "" });
+			}
 		} catch (err) {
 			handleShowError("Submit error! Try again.");
 		}
@@ -59,13 +74,11 @@ function Contact() {
 		}
 	};
 
-	console.log(messageObj);
-
 	return (
 		<section id="contact">
 			<h2>Contact</h2>
 			<div className="contact-section">
-				<form className="section-item">
+				<form className="section-item" onSubmit={handleSubmit}>
 					<div>
 						<input
 							type="text"
@@ -75,6 +88,7 @@ function Contact() {
 							required
 							autoComplete="name"
 							value={messageObj.name}
+							maxLength={200}
 							onChange={handleChangeMessage}
 						/>
 					</div>
@@ -87,6 +101,7 @@ function Contact() {
 							placeholder="Email"
 							autoComplete="email"
 							value={messageObj.email}
+							maxLength={200}
 							onChange={handleChangeMessage}
 							required
 						/>
@@ -100,15 +115,13 @@ function Contact() {
 							rows={5}
 							cols={30}
 							maxLength={1000}
-							value={messageObj.message}
+							value={messageObj.contents}
 							onChange={handleChangeMessage}
 							required
 						></textarea>
 					</div>
 					<div style={{ display: "flex", flexFlow: "row nowrap" }}>
-						<button type="submit" onClick={handleSubmit}>
-							Send message
-						</button>
+						<button type="submit">Send message</button>
 						<div
 							style={{
 								alignSelf: "center",
diff --git a/frontend/src/components/Navigation/Navbar.jsx b/frontend/src/components/Navigation/Navbar.jsx
index 95514a8..c9806f2 100644
--- a/frontend/src/components/Navigation/Navbar.jsx
+++ b/frontend/src/components/Navigation/Navbar.jsx
@@ -16,6 +16,9 @@ function Navbar() {
 			<p className="nav-item">
 				<a href="/#contact">Contact</a>
 			</p>
+			<p className="nav-item">
+				<a href="/admin">Admin</a>
+			</p>
 		</nav>
 	);
 }
diff --git a/frontend/src/components/ProjectListing/ProjectListing.jsx b/frontend/src/components/ProjectListing/ProjectListing.jsx
index fc33986..795812a 100644
--- a/frontend/src/components/ProjectListing/ProjectListing.jsx
+++ b/frontend/src/components/ProjectListing/ProjectListing.jsx
@@ -6,7 +6,7 @@ import "./ProjectListing.css";
 
 // NOTE: remove console.log statements
 
-function ProjectListing({ canEdit }) {
+function ProjectListing() {
 	const [isLoading, setIsLoading] = useState(true);
 	const [errorMessage, setErrorMessage] = useState("");
 	const [projects, setProjects] = useState([]);
@@ -18,12 +18,12 @@ function ProjectListing({ canEdit }) {
 				const result = await axios.get(
 					"http://localhost:3000/api/projects",
 					{
-						filter: { show: true },
+						// filter: { show: true },
 						timeout: 5000,
 					}
 				);
 
-				setProjects(result.data);
+				setProjects(result.data.data);
 				setIsLoading(false);
 			} catch (err) {
 				console.error(`ERROR: ${err.message}`);
diff --git a/frontend/src/index.css b/frontend/src/index.css
index 85485f4..fb1e7f3 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -10,10 +10,10 @@
 }
 
 :root {
-  --text-color: whitesmoke;
-  --section-bg-color: rgba(36, 35, 35, 0.65);
+  --text-color: #f5f5f5;
+  --section-bg-color: #242323a6;
   --nav-hover-color: #94C7B6;
-  --complement-color: rgb(252, 79, 79);
+  --complement-color: #fc4f4f;
 }
 
 html {
diff --git a/package-lock.json b/package-lock.json
index 27d9932..45a49a6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,6 +10,149 @@
       "license": "ISC",
       "dependencies": {
         "concurrently": "^9.2.0"
+      },
+      "devDependencies": {
+        "cypress": "^14.5.2"
+      }
+    },
+    "node_modules/@cypress/request": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.8.tgz",
+      "integrity": "sha512-h0NFgh1mJmm1nr4jCwkGHwKneVYKghUyWe6TMNrk0B9zsjAJxpg8C4/+BAcmLgCPa1vj1V8rNUaILl+zYRUWBQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~4.0.0",
+        "http-signature": "~1.4.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "performance-now": "^2.1.0",
+        "qs": "6.14.0",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "^5.0.0",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^8.3.2"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@cypress/xvfb": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@cypress/xvfb/-/xvfb-1.2.4.tgz",
+      "integrity": "sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^3.1.0",
+        "lodash.once": "^4.1.1"
+      }
+    },
+    "node_modules/@cypress/xvfb/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "24.1.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.1.0.tgz",
+      "integrity": "sha512-ut5FthK5moxFKH2T1CUOC6ctR67rQRvvHdFLCD2Ql6KXmMuCrjsSsRI9UsLCm9M18BMwClv4pn327UvB7eeO1w==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "undici-types": "~7.8.0"
+      }
+    },
+    "node_modules/@types/sinonjs__fake-timers": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz",
+      "integrity": "sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/sizzle": {
+      "version": "2.3.9",
+      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.9.tgz",
+      "integrity": "sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/yauzl": {
+      "version": "2.10.3",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
+      "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/aggregate-error": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-colors": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "type-fest": "^0.21.3"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ansi-escapes/node_modules/type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/ansi-regex": {
@@ -36,6 +179,226 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/arch": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz",
+      "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/asn1": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
+      "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "node_modules/assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/async": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/at-least-node": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/aws4": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz",
+      "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "node_modules/blob-util": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/blob-util/-/blob-util-2.0.2.tgz",
+      "integrity": "sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "node_modules/buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/cachedir": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.4.0.tgz",
+      "integrity": "sha512-9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/call-bound": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
+      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "get-intrinsic": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
     "node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -64,6 +427,88 @@
         "node": ">=8"
       }
     },
+    "node_modules/check-more-types": {
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz",
+      "integrity": "sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/ci-info": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
+      "integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "restore-cursor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cli-table3": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.1.tgz",
+      "integrity": "sha512-w0q/enDHhPLq44ovMGdQeeDLvwxwavsJX7oQGYt/LrBlYsyaxyDnp6z3QzFut/6kLLKnlcUVJLrpB7KBfgG/RA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "string-width": "^4.2.0"
+      },
+      "engines": {
+        "node": "10.* || >= 12.*"
+      },
+      "optionalDependencies": {
+        "colors": "1.4.0"
+      }
+    },
+    "node_modules/cli-truncate": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
+      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "slice-ansi": "^3.0.0",
+        "string-width": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/cliui": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
@@ -78,96 +523,1264 @@
         "node": ">=12"
       }
     },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "license": "MIT"
+    },
+    "node_modules/colorette": {
+      "version": "2.0.20",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/colors": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.1.90"
+      }
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/commander": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+      "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/common-tags": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz",
+      "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/concurrently": {
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-9.2.0.tgz",
+      "integrity": "sha512-IsB/fiXTupmagMW4MNp2lx2cdSN2FfZq78vF90LBB+zZHArbIQZjQtzXCiXnvTxCZSvXanTqFLWBjw2UkLx1SQ==",
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.1.2",
+        "lodash": "^4.17.21",
+        "rxjs": "^7.8.1",
+        "shell-quote": "^1.8.1",
+        "supports-color": "^8.1.1",
+        "tree-kill": "^1.2.2",
+        "yargs": "^17.7.2"
+      },
+      "bin": {
+        "conc": "dist/bin/concurrently.js",
+        "concurrently": "dist/bin/concurrently.js"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/open-cli-tools/concurrently?sponsor=1"
+      }
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/cypress": {
+      "version": "14.5.2",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-14.5.2.tgz",
+      "integrity": "sha512-O4E4CEBqDHLDrJD/dfStHPcM+8qFgVVZ89Li7xDU0yL/JxO/V0PEcfF2I8aGa7uA2MGNLkNUAnghPM83UcHOJw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "@cypress/request": "^3.0.8",
+        "@cypress/xvfb": "^1.2.4",
+        "@types/sinonjs__fake-timers": "8.1.1",
+        "@types/sizzle": "^2.3.2",
+        "arch": "^2.2.0",
+        "blob-util": "^2.0.2",
+        "bluebird": "^3.7.2",
+        "buffer": "^5.7.1",
+        "cachedir": "^2.3.0",
+        "chalk": "^4.1.0",
+        "check-more-types": "^2.24.0",
+        "ci-info": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-table3": "0.6.1",
+        "commander": "^6.2.1",
+        "common-tags": "^1.8.0",
+        "dayjs": "^1.10.4",
+        "debug": "^4.3.4",
+        "enquirer": "^2.3.6",
+        "eventemitter2": "6.4.7",
+        "execa": "4.1.0",
+        "executable": "^4.1.1",
+        "extract-zip": "2.0.1",
+        "figures": "^3.2.0",
+        "fs-extra": "^9.1.0",
+        "getos": "^3.2.1",
+        "hasha": "5.2.2",
+        "is-installed-globally": "~0.4.0",
+        "lazy-ass": "^1.6.0",
+        "listr2": "^3.8.3",
+        "lodash": "^4.17.21",
+        "log-symbols": "^4.0.0",
+        "minimist": "^1.2.8",
+        "ospath": "^1.2.2",
+        "pretty-bytes": "^5.6.0",
+        "process": "^0.11.10",
+        "proxy-from-env": "1.0.0",
+        "request-progress": "^3.0.0",
+        "semver": "^7.7.1",
+        "supports-color": "^8.1.1",
+        "tmp": "~0.2.3",
+        "tree-kill": "1.2.2",
+        "untildify": "^4.0.0",
+        "yauzl": "^2.10.0"
+      },
+      "bin": {
+        "cypress": "bin/cypress"
+      },
+      "engines": {
+        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+      }
+    },
+    "node_modules/dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "assert-plus": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/dayjs": {
+      "version": "1.11.13",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
+      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/debug": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "license": "MIT"
+    },
+    "node_modules/end-of-stream": {
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
+      "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/enquirer": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
+      "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-colors": "^4.1.1",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/eventemitter2": {
+      "version": "6.4.7",
+      "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.7.tgz",
+      "integrity": "sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/execa": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
+      "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cross-spawn": "^7.0.0",
+        "get-stream": "^5.0.0",
+        "human-signals": "^1.1.1",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.0",
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/executable": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz",
+      "integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "pify": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/extract-zip": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
+        "yauzl": "^2.10.0"
+      },
+      "bin": {
+        "extract-zip": "cli.js"
+      },
+      "engines": {
+        "node": ">= 10.17.0"
+      },
+      "optionalDependencies": {
+        "@types/yauzl": "^2.9.1"
+      }
+    },
+    "node_modules/extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
+      "dev": true,
+      "engines": [
+        "node >=0.6.0"
+      ],
+      "license": "MIT"
+    },
+    "node_modules/fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "pend": "~1.2.0"
+      }
+    },
+    "node_modules/figures": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "escape-string-regexp": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/form-data": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
+      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/fs-extra": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "license": "ISC",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "function-bind": "^1.1.2",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/getos": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/getos/-/getos-3.2.1.tgz",
+      "integrity": "sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "async": "^3.2.0"
+      }
+    },
+    "node_modules/getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "node_modules/global-dirs": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz",
+      "integrity": "sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ini": "2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/gopd": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-symbols": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/hasha": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz",
+      "integrity": "sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-stream": "^2.0.0",
+        "type-fest": "^0.8.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/http-signature": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.4.0.tgz",
+      "integrity": "sha512-G5akfn7eKbpDN+8nPS/cb57YeA1jLTVxjpCj7tmm3QKPdyDy7T+qSC40e9ptydSWvkwjSXw1VbkpyEm39ukeAg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^2.0.2",
+        "sshpk": "^1.18.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/human-signals": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
+      "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=8.12.0"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ini": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
+      "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-installed-globally": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
+      "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "global-dirs": "^3.0.0",
+        "is-path-inside": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/json-schema": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
+      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
+      "dev": true,
+      "license": "(AFL-2.1 OR BSD-3-Clause)"
+    },
+    "node_modules/json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/jsprim": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz",
+      "integrity": "sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==",
+      "dev": true,
+      "engines": [
+        "node >=0.6.0"
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.4.0",
+        "verror": "1.10.0"
+      }
+    },
+    "node_modules/lazy-ass": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz",
+      "integrity": "sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "> 0.8"
+      }
+    },
+    "node_modules/listr2": {
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz",
+      "integrity": "sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cli-truncate": "^2.1.0",
+        "colorette": "^2.0.16",
+        "log-update": "^4.0.0",
+        "p-map": "^4.0.0",
+        "rfdc": "^1.3.0",
+        "rxjs": "^7.5.1",
+        "through": "^2.3.8",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "enquirer": ">= 2.3.0 < 3"
+      },
+      "peerDependenciesMeta": {
+        "enquirer": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.once": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/log-symbols": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-update": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
+      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-escapes": "^4.3.0",
+        "cli-cursor": "^3.1.0",
+        "slice-ansi": "^4.0.0",
+        "wrap-ansi": "^6.2.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-update/node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/log-update/node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
+        "mimic-fn": "^2.1.0"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+    "node_modules/ospath": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz",
+      "integrity": "sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/concurrently": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-9.2.0.tgz",
-      "integrity": "sha512-IsB/fiXTupmagMW4MNp2lx2cdSN2FfZq78vF90LBB+zZHArbIQZjQtzXCiXnvTxCZSvXanTqFLWBjw2UkLx1SQ==",
+    "node_modules/p-map": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "chalk": "^4.1.2",
-        "lodash": "^4.17.21",
-        "rxjs": "^7.8.1",
-        "shell-quote": "^1.8.1",
-        "supports-color": "^8.1.1",
-        "tree-kill": "^1.2.2",
-        "yargs": "^17.7.2"
-      },
-      "bin": {
-        "conc": "dist/bin/concurrently.js",
-        "concurrently": "dist/bin/concurrently.js"
+        "aggregate-error": "^3.0.0"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/open-cli-tools/concurrently?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/escalade": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
-      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+    "node_modules/performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+      "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=6"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "license": "ISC",
+    "node_modules/pretty-bytes": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
+      "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": "6.* || 8.* || >= 10.*"
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+      "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.6.0"
       }
     },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+    "node_modules/proxy-from-env": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
+      "integrity": "sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/pump": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz",
+      "integrity": "sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/qs": {
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
+      "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "side-channel": "^1.1.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "license": "MIT"
+    "node_modules/request-progress": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-3.0.0.tgz",
+      "integrity": "sha512-MnWzEHHaxHO2iWiQuHrUPBi/1WeBf5PkxQqNyNvLl9VAYSdXkP8tQ3pBSeCPD+yw0v0Aq1zosWLz0BdeXpWwZg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "throttleit": "^1.0.0"
+      }
     },
     "node_modules/require-directory": {
       "version": "2.1.1",
@@ -178,6 +1791,27 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/rfdc": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/rxjs": {
       "version": "7.8.2",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
@@ -187,6 +1821,70 @@
         "tslib": "^2.1.0"
       }
     },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/semver": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/shell-quote": {
       "version": "1.8.3",
       "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.3.tgz",
@@ -199,6 +1897,130 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/side-channel": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3",
+        "side-channel-list": "^1.0.0",
+        "side-channel-map": "^1.0.1",
+        "side-channel-weakmap": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-list": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-weakmap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3",
+        "side-channel-map": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/slice-ansi": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
+      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/sshpk": {
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
+      "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      },
+      "bin": {
+        "sshpk-conv": "bin/sshpk-conv",
+        "sshpk-sign": "bin/sshpk-sign",
+        "sshpk-verify": "bin/sshpk-verify"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -225,6 +2047,16 @@
         "node": ">=8"
       }
     },
+    "node_modules/strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/supports-color": {
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
@@ -240,6 +2072,66 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
+    "node_modules/throttleit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.1.tgz",
+      "integrity": "sha512-vDZpf9Chs9mAdfY046mcPt8fg5QSZr37hEH4TXYBnDF+izxgrbRGUAAaBvIk/fJm9aOFCGFd1EsNg5AZCbnQCQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/tldts": {
+      "version": "6.1.86",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.86.tgz",
+      "integrity": "sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tldts-core": "^6.1.86"
+      },
+      "bin": {
+        "tldts": "bin/cli.js"
+      }
+    },
+    "node_modules/tldts-core": {
+      "version": "6.1.86",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.86.tgz",
+      "integrity": "sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/tmp": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
+      "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.14"
+      }
+    },
+    "node_modules/tough-cookie": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.2.tgz",
+      "integrity": "sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "tldts": "^6.1.32"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
     "node_modules/tree-kill": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
@@ -255,6 +2147,105 @@
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
       "license": "0BSD"
     },
+    "node_modules/tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
+      "dev": true,
+      "license": "Unlicense"
+    },
+    "node_modules/type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz",
+      "integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/untildify": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
+      "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
+      "dev": true,
+      "engines": [
+        "node >=0.6.0"
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -272,6 +2263,13 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/y18n": {
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
@@ -307,6 +2305,17 @@
       "engines": {
         "node": ">=12"
       }
+    },
+    "node_modules/yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
     }
   }
 }
diff --git a/package.json b/package.json
index f32728e..088c255 100644
--- a/package.json
+++ b/package.json
@@ -15,5 +15,8 @@
   "license": "ISC",
   "dependencies": {
     "concurrently": "^9.2.0"
+  },
+  "devDependencies": {
+    "cypress": "^14.5.2"
   }
 }

From 36c7052afdae91af1e89b2d0e6b6843d56c8608d Mon Sep 17 00:00:00 2001
From: arauta12 <andreirauta234@gmail.com>
Date: Wed, 23 Jul 2025 16:03:14 -0400
Subject: [PATCH 02/12] Add authorization and fix autologin

---
 backend/controllers/auth.controller.js        | 52 ++++++++++++++++---
 backend/controllers/project.controller.js     | 14 ++++-
 backend/models/user.model.js                  |  4 +-
 backend/routes/message.route.js               |  5 +-
 backend/routes/project.route.js               | 21 ++++----
 frontend/src/Pages/Admin.css                  | 28 ++++++++++
 frontend/src/Pages/Admin.jsx                  | 38 +++++++++++---
 frontend/src/adminComponents/AdminHeader.jsx  |  4 +-
 .../adminComponents/AdminLogin/AdminLogin.css |  1 -
 .../adminComponents/AdminLogin/AdminLogin.jsx |  5 +-
 .../AdminProjectListing.jsx                   | 31 ++++++-----
 .../MessageList/MessageList.jsx               |  8 ++-
 .../src/components/ProjectListing/Project.jsx |  1 +
 .../ProjectListing/ProjectListing.jsx         |  3 +-
 14 files changed, 165 insertions(+), 50 deletions(-)
 rename frontend/src/adminComponents/{AdminProjectListing => }/AdminProjectListing.jsx (76%)

diff --git a/backend/controllers/auth.controller.js b/backend/controllers/auth.controller.js
index 14cf93e..cd19af2 100644
--- a/backend/controllers/auth.controller.js
+++ b/backend/controllers/auth.controller.js
@@ -1,6 +1,36 @@
 const User = require('../models/user.model');
 const bcrypt = require('bcryptjs');
 const jwt = require('jsonwebtoken');
+const chalk = require('chalk');
+
+const verifyToken = async (req, res, next) => {
+    const jwtToken = req.cookies.jwt_token;
+
+    if (!jwtToken)
+        return res.status(401).json({ status: "failed", message: "Unauthorized!" });
+
+    try {
+        const { exp, username, role } = jwt.verify(jwtToken, process.env.JWT_SECRET);
+        const existingUser = await User.findOne({ username, role });
+
+        if (!existingUser || !existingUser.loggedIn)
+            return res.status(401).json({ status: "failed", message: "Unauthorized!" });
+
+        req.locals = role;
+        next();
+    } catch (err) {
+        console.error(chalk.red(`ERROR Verify token: ${err.message}`));
+        return res.status(500).json({ status: "failed", message: "Something went wrong! Try again." });
+    }
+};
+
+const verifyAdmin = async (req, res, next) => {
+    if (!req.locals || req.locals !== "Admin")
+        return res.status(403).json({ status: "failed", message: "Unauthorized!" });
+
+    delete req.locals;
+    next();
+};
 
 const signup = async (req, res) => {
     const { data: { username, password, role = 'viewer' } } = req.body;
@@ -36,16 +66,21 @@ const login = async (req, res) => {
 
         if (jwtToken) {
             const jwtData = jwt.verify(jwtToken, process.env.JWT_SECRET);
-            if (jwtData.exp < Date.now() && jwtData.username && ([ "admin", "viewer" ].includes(jwtData.role))) {
-                return res.status(200).json({ status: "success", data: { username: jwtData.username, role: jwtData.role } });
+
+            const { exp, username, role } = jwtData;
+            const existingUser = await User.findOne({ username, role });
+
+            if (existingUser && existingUser.loggedIn) {
+                const expired = (exp <= (Math.ceil(Date.now() / 1000)));
+                if (!expired) {
+                    return res.status(200).json({ status: "success", data: { username: jwtData.username, role: jwtData.role } });
+                }
             }
         }
 
         if (!data || !username || !password)
             return res.status(400).json({ status: "failed", message: "Missing username or password!" });
 
-        console.log("BODY EXISTS!");
-
         const user = await User.findOne({ username });
         const passwordCompare = await bcrypt.compare(password, user?.password || "");
 
@@ -59,6 +94,7 @@ const login = async (req, res) => {
         user.loggedIn = true;
         await user.save();
 
+        res.clearCookie("jwt_token");
         res.cookie("jwt_token", token, {
             maxAge: 1000 * 60 * 60 * 10, // 10hrs
             secure: true,
@@ -67,7 +103,8 @@ const login = async (req, res) => {
 
         return res.status(200).json({ status: "success", data: { username, role: user.role } });
     } catch (err) {
-        return res.status(500).json({ status: "failed", message: err.message });
+        console.error(chalk.red(`ERROR Login: ${err.message}`));
+        return res.status(500).json({ status: "failed", message: "Something went wrong! Try again." });
     }
 };
 
@@ -87,7 +124,8 @@ const logout = async (req, res) => {
         res.clearCookie("jwt_token");
         return res.status(200).json({ status: "success", data: user.username });
     } catch (err) {
-        return res.status(500).json({ status: "failed", message: err.message });
+        console.error(chalk.red(`ERROR Logout: ${err.message}`));
+        return res.status(500).json({ status: "failed", message: "Something went wrong! Try again." });
     }
 };
 
@@ -95,4 +133,6 @@ module.exports = {
     signup,
     login,
     logout,
+    verifyToken,
+    verifyAdmin,
 };
\ No newline at end of file
diff --git a/backend/controllers/project.controller.js b/backend/controllers/project.controller.js
index 1e0e35e..f08bf9a 100644
--- a/backend/controllers/project.controller.js
+++ b/backend/controllers/project.controller.js
@@ -1,6 +1,17 @@
 const Project = require('../models/project.model');
 const chalk = require('chalk');
 
+
+const getDisplayProjects = async (req, res) => {
+    try {
+        const projects = await Project.find({ show: true }, '-_id -__v');
+        return res.status(200).json({ status: "success", data: projects });
+    } catch (err) {
+        console.error(chalk.red(`PROJECT ROUTE ERROR: ${err.message}!`));
+        return res.status(500).json({ status: "failed", message: "Something went wrong. Try again." });
+    }
+};
+
 /**
  * Get every project that exists
  * 
@@ -95,5 +106,6 @@ module.exports = {
     getProject,
     createProject,
     deleteProject,
-    updateProject
+    updateProject,
+    getDisplayProjects
 };
diff --git a/backend/models/user.model.js b/backend/models/user.model.js
index 17a4219..eaeb688 100644
--- a/backend/models/user.model.js
+++ b/backend/models/user.model.js
@@ -12,9 +12,9 @@ const userSchema = new mongoose.Schema({
     },
     role: {
         type: String,
-        default: "viewer",
+        default: "elite",
         enum: {
-            values: [ 'admin', 'viewer' ],
+            values: [ 'Admin', 'Elite' ],
             message: '{VALUE} is not a valid role!'
         }
     },
diff --git a/backend/routes/message.route.js b/backend/routes/message.route.js
index 7c8def6..cc47791 100644
--- a/backend/routes/message.route.js
+++ b/backend/routes/message.route.js
@@ -1,13 +1,16 @@
 const express = require('express');
 const messageControl = require('../controllers/message.controller');
+const { verifyToken, verifyAdmin } = require('../controllers/auth.controller');
 const router = express.Router();
 
 /*
     NOTE: All but GET must be authenticated with admin!
 */
 
-
 router.post('/', messageControl.createMessage);
+
+router.use(verifyToken);
+router.use(verifyAdmin);
 router.get('/', messageControl.getMessages);
 
 module.exports = router;
diff --git a/backend/routes/project.route.js b/backend/routes/project.route.js
index 07f3926..0505912 100644
--- a/backend/routes/project.route.js
+++ b/backend/routes/project.route.js
@@ -1,17 +1,18 @@
 const express = require('express');
 const projectControl = require('../controllers/project.controller');
+const { verifyToken, verifyAdmin } = require('../controllers/auth.controller');
+
 const router = express.Router();
 
-/*
-    NOTE: All but GET must be authenticated with admin!
-*/
+router.get('/public', projectControl.getDisplayProjects);
+
+router.use(verifyToken);
+router.get('/', projectControl.getAllProjects);
+router.get('/:id', projectControl.getProject);
 
-router.route('/')
-    .get(projectControl.getAllProjects)
-    .post(projectControl.createProject);
-router.route('/:id')
-    .get(projectControl.getProject)
-    .patch(projectControl.updateProject)
-    .delete(projectControl.deleteProject);
+router.use(verifyAdmin);
+router.post('/', projectControl.createProject);
+router.patch('/:id', projectControl.updateProject);
+router.delete('/:id', projectControl.deleteProject);
 
 module.exports = router;
\ No newline at end of file
diff --git a/frontend/src/Pages/Admin.css b/frontend/src/Pages/Admin.css
index 3006661..0957d35 100644
--- a/frontend/src/Pages/Admin.css
+++ b/frontend/src/Pages/Admin.css
@@ -2,4 +2,32 @@
     text-align: center;
     padding: 1rem;
     font-size: 4rem;
+}
+
+#logout {
+    display: flex;
+    gap: 1rem;
+    flex-flow: column wrap;
+    justify-content: center;
+    align-items: center;
+}
+
+.logout-button {
+    margin-top: -1rem;
+    padding: 1rem;
+    font-size: 2rem;
+    border: 1px solid var(--complement-color);
+    background-color: var(--complement-color);
+    color: var(--text-color);
+    border-radius: 25px;
+
+    transform: scale(1);
+    transition: transform 0.3s ease-in-out, box-shadow 0.3s ease-in-out;
+}
+
+.logout-button:hover {
+    cursor: pointer;
+    box-shadow: 0 0 20px rgba(252, 79, 79, 0.5);
+    transform: scale(1.05);
+    transition: transform 0.3s ease-in-out, box-shadow 0.3s ease-in-out;
 }
\ No newline at end of file
diff --git a/frontend/src/Pages/Admin.jsx b/frontend/src/Pages/Admin.jsx
index 3ae2d0e..36fd2b7 100644
--- a/frontend/src/Pages/Admin.jsx
+++ b/frontend/src/Pages/Admin.jsx
@@ -1,7 +1,7 @@
-import { useState } from "react";
+import { useState, useEffect } from "react";
 import { useNavigate } from "react-router-dom";
 import AdminHeader from "../adminComponents/AdminHeader";
-import AdminProjectListing from "../adminComponents/AdminProjectListing/AdminProjectListing";
+import AdminProjectListing from "../adminComponents/AdminProjectListing";
 import MessageList from "../adminComponents/MessageList/MessageList";
 import axios from "axios";
 import "./Admin.css";
@@ -9,9 +9,32 @@ import "./Admin.css";
 function Admin() {
 	axios.defaults.withCredentials = true;
 	const [errorMessage, setErrorMessage] = useState("");
+	const [userObj, setUserObj] = useState({ username: "", role: "" });
 
 	const navigate = useNavigate();
 
+	useEffect(() => {
+		const autoLogin = async () => {
+			try {
+				const resp = await axios.post(
+					"http://localhost:3000/api/auth/login",
+					{}
+				);
+				if (resp.data?.status === "success") {
+					const { username, role } = resp.data.data;
+					setUserObj({ username, role });
+				}
+			} catch (err) {
+				console.error(err);
+
+				if (err.response?.status <= 403 && err.response.status >= 400)
+					navigate("/admin");
+			}
+		};
+
+		autoLogin();
+	}, []);
+
 	const handleLogout = async () => {
 		try {
 			const resp = await axios.post(
@@ -20,7 +43,7 @@ function Admin() {
 			);
 
 			if (resp.data.status === "success") {
-				navigate("/");
+				navigate("/#");
 			}
 		} catch (err) {
 			console.log();
@@ -35,13 +58,14 @@ function Admin() {
 	};
 
 	return (
-		<AdminHeader>
+		<AdminHeader role={userObj.role}>
 			<MessageList />
 			<hr />
-			<AdminProjectListing />
-			<hr />
+			<AdminProjectListing role={userObj.role} />
 			<section id="logout">
-				<button onClick={handleLogout}>Logout</button>
+				<button onClick={handleLogout} className="logout-button">
+					Logout
+				</button>
 				<p style={{ color: "var(--complement-color)" }}>
 					{errorMessage}
 				</p>
diff --git a/frontend/src/adminComponents/AdminHeader.jsx b/frontend/src/adminComponents/AdminHeader.jsx
index 8026c44..9a7ca4f 100644
--- a/frontend/src/adminComponents/AdminHeader.jsx
+++ b/frontend/src/adminComponents/AdminHeader.jsx
@@ -1,7 +1,7 @@
-function AdminHeader({ children }) {
+function AdminHeader({ role, children }) {
 	return (
 		<div id="admin-page">
-			<h1>Admin</h1>
+			<h1>{role || "Admin"}</h1>
 			<hr />
 			{children}
 		</div>
diff --git a/frontend/src/adminComponents/AdminLogin/AdminLogin.css b/frontend/src/adminComponents/AdminLogin/AdminLogin.css
index 02594e0..c6e36c3 100644
--- a/frontend/src/adminComponents/AdminLogin/AdminLogin.css
+++ b/frontend/src/adminComponents/AdminLogin/AdminLogin.css
@@ -13,7 +13,6 @@
     width: 30%;
     margin-top: 2rem;
     max-width: 300px;
-    font-weight: bold;
 }
 
 #login-section label {
diff --git a/frontend/src/adminComponents/AdminLogin/AdminLogin.jsx b/frontend/src/adminComponents/AdminLogin/AdminLogin.jsx
index af6e784..7dcd604 100644
--- a/frontend/src/adminComponents/AdminLogin/AdminLogin.jsx
+++ b/frontend/src/adminComponents/AdminLogin/AdminLogin.jsx
@@ -22,12 +22,11 @@ function AdminLogin() {
 					{}
 				);
 				if (resp.data?.status === "success") {
+					console.log("Successful auto-login!");
 					navigate("/admin/home");
 				}
 			} catch (err) {
-				console.error(err);
-
-				console.log("FAILED TO AUTO login");
+				console.error(err.message);
 			}
 		};
 
diff --git a/frontend/src/adminComponents/AdminProjectListing/AdminProjectListing.jsx b/frontend/src/adminComponents/AdminProjectListing.jsx
similarity index 76%
rename from frontend/src/adminComponents/AdminProjectListing/AdminProjectListing.jsx
rename to frontend/src/adminComponents/AdminProjectListing.jsx
index d82c7a5..9aeea04 100644
--- a/frontend/src/adminComponents/AdminProjectListing/AdminProjectListing.jsx
+++ b/frontend/src/adminComponents/AdminProjectListing.jsx
@@ -1,11 +1,12 @@
 import { useState, useEffect } from "react";
 import axios from "axios";
-import Loading from "../../components/Loading";
-import CreateProject from "../CreateProject";
-import Project from "../../components/ProjectListing/Project";
-import "../../components/ProjectListing/ProjectListing";
+import Loading from "../components/Loading";
+import CreateProject from "./CreateProject";
+import Project from "../components/ProjectListing/Project";
+import ProjectListing from "../components/ProjectListing/ProjectListing";
+import "../components/ProjectListing/ProjectListing";
 
-function AdminProjectListing() {
+function AdminProjectListing({ role }) {
 	const [isLoading, setIsLoading] = useState(true);
 	const [errorMessage, setErrorMessage] = useState("");
 	const [projects, setProjects] = useState([]);
@@ -27,7 +28,9 @@ function AdminProjectListing() {
 				setIsLoading(false);
 			} catch (err) {
 				console.error(`ERROR: ${err.message}`);
-				setErrorMessage("Could not get project info.");
+				setErrorMessage(
+					err.response?.data?.message || "Could not get projects."
+				);
 			} finally {
 				setIsLoading(false);
 			}
@@ -83,12 +86,14 @@ function AdminProjectListing() {
 				) : (
 					<>
 						<div className="buttons-container">
-							<button
-								className="edit-button add-project-button project-button"
-								onClick={saveProject}
-							>
-								+
-							</button>
+							{role === "Admin" && (
+								<button
+									className="edit-button add-project-button project-button"
+									onClick={saveProject}
+								>
+									+
+								</button>
+							)}
 
 							{projects.map((project, i) => (
 								<button
@@ -102,7 +107,7 @@ function AdminProjectListing() {
 						</div>
 						<Project
 							{...selectedProject}
-							canEdit={true}
+							canEdit={role === "Admin" ? true : false}
 							deleteProject={deleteProject}
 						/>
 					</>
diff --git a/frontend/src/adminComponents/MessageList/MessageList.jsx b/frontend/src/adminComponents/MessageList/MessageList.jsx
index c229d06..a0487e2 100644
--- a/frontend/src/adminComponents/MessageList/MessageList.jsx
+++ b/frontend/src/adminComponents/MessageList/MessageList.jsx
@@ -5,6 +5,7 @@ import axios from "axios";
 import "./MessageList.css";
 
 function MessageList() {
+	axios.defaults.withCredentials = true; // Ensure cookies are sent with requests
 	const [isLoading, setIsLoading] = useState(false);
 	const [messageList, setMessageList] = useState([]);
 	const [errorMessage, setErrorMessage] = useState("");
@@ -18,8 +19,11 @@ function MessageList() {
 					{ timeout: 5000 }
 				);
 				setMessageList(res.data.data);
-			} catch (error) {
-				setErrorMessage(`Could not get messages: ${error.message}`);
+			} catch (err) {
+				console.error(`ERROR: ${err.message}`);
+				setErrorMessage(
+					err.response?.data?.message || "Could not get messages."
+				);
 			} finally {
 				setIsLoading(false);
 			}
diff --git a/frontend/src/components/ProjectListing/Project.jsx b/frontend/src/components/ProjectListing/Project.jsx
index 317a54d..da77e4a 100644
--- a/frontend/src/components/ProjectListing/Project.jsx
+++ b/frontend/src/components/ProjectListing/Project.jsx
@@ -20,6 +20,7 @@ function Project({ name, image, description, link, canEdit, deleteProject }) {
 					src={`/images/projectImages/${image}`}
 					alt={name}
 					height={300}
+					loading="lazy"
 				/>
 				<ul>
 					{description &&
diff --git a/frontend/src/components/ProjectListing/ProjectListing.jsx b/frontend/src/components/ProjectListing/ProjectListing.jsx
index 795812a..9987520 100644
--- a/frontend/src/components/ProjectListing/ProjectListing.jsx
+++ b/frontend/src/components/ProjectListing/ProjectListing.jsx
@@ -16,9 +16,8 @@ function ProjectListing() {
 		const handleGetProjects = async () => {
 			try {
 				const result = await axios.get(
-					"http://localhost:3000/api/projects",
+					"http://localhost:3000/api/projects/public",
 					{
-						// filter: { show: true },
 						timeout: 5000,
 					}
 				);

From a4f407ba19f9a9b51d6864cc2c017d6b57d155c1 Mon Sep 17 00:00:00 2001
From: arauta12 <andreirauta234@gmail.com>
Date: Thu, 24 Jul 2025 15:41:20 -0400
Subject: [PATCH 03/12] Add remove and create project functions

---
 backend/controllers/project.controller.js     |  10 +-
 frontend/public/images/delete.jpg             | Bin 0 -> 40839 bytes
 frontend/public/images/delete.png             | Bin 0 -> 3393 bytes
 frontend/src/Pages/Admin.jsx                  |   2 +-
 .../AdminEditProject/AdminEditProject.css     |  50 ++++
 .../AdminEditProject/AdminEditProject.jsx     | 126 +++++++++++
 .../adminComponents/AdminProjectListing.jsx   | 120 ----------
 .../AdminProjectListing.css                   |  39 ++++
 .../AdminProjectListing.jsx                   | 213 ++++++++++++++++++
 .../src/adminComponents/CreateProject.jsx     |   9 -
 .../src/adminComponents/Redirect/Redirect.jsx |   0
 frontend/src/components/Contact/Contact.jsx   |   1 +
 .../src/components/ProjectListing/Project.css |  26 +--
 .../src/components/ProjectListing/Project.jsx |  14 +-
 .../ProjectListing/ProjectListing.css         |  16 --
 .../ProjectListing/ProjectListing.jsx         |  18 +-
 16 files changed, 451 insertions(+), 193 deletions(-)
 create mode 100644 frontend/public/images/delete.jpg
 create mode 100644 frontend/public/images/delete.png
 create mode 100644 frontend/src/adminComponents/AdminEditProject/AdminEditProject.css
 create mode 100644 frontend/src/adminComponents/AdminEditProject/AdminEditProject.jsx
 delete mode 100644 frontend/src/adminComponents/AdminProjectListing.jsx
 create mode 100644 frontend/src/adminComponents/AdminProjectListing/AdminProjectListing.css
 create mode 100644 frontend/src/adminComponents/AdminProjectListing/AdminProjectListing.jsx
 delete mode 100644 frontend/src/adminComponents/CreateProject.jsx
 delete mode 100644 frontend/src/adminComponents/Redirect/Redirect.jsx

diff --git a/backend/controllers/project.controller.js b/backend/controllers/project.controller.js
index f08bf9a..c749b3c 100644
--- a/backend/controllers/project.controller.js
+++ b/backend/controllers/project.controller.js
@@ -22,7 +22,7 @@ const getAllProjects = async (req, res) => {
     // const { filter = "" } = req.body;
 
     try {
-        const projects = await Project.find({}, '-_id -__v');
+        const projects = await Project.find({});
         return res.status(200).json({ status: "success", data: projects });
     } catch (err) {
         console.error(chalk.red(`PROJECT ROUTE ERROR: ${err.message}!`));
@@ -38,7 +38,7 @@ const getProject = async (req, res) => {
     const { id } = req.params;
 
     try {
-        const project = await Project.findById(id, '-_id -__v');
+        const project = await Project.findById(id);
         return res.status(200).json({ status: "success", data: project });
     } catch (err) {
         console.error(chalk.red(`PROJECT ROUTE ERROR: ${err.message}!`));
@@ -58,8 +58,8 @@ const createProject = async (req, res) => {
         if (!name || !description || !link)
             return res.status(400).json({ status: "failed", message: "Missing required fields!" });
 
-        await Project.create({ name, image, description, link, show });
-        return res.status(201).json({ status: "success", data: { name, show } });
+        const newProject = await Project.create({ name, image, description, link, show });
+        return res.status(201).json({ status: "success", data: { name, show, id: newProject._id } });
     } catch (err) {
         console.error(chalk.red(`PROJECT ROUTE ERROR: ${err.message}!`));
         return res.status(500).json({ status: "failed", message: "Something went wrong. Try again." });
@@ -74,7 +74,7 @@ const deleteProject = async (req, res) => {
     const { id } = req.params;
 
     try {
-        const { name, show } = await Project.findByIdAndDelete(id, '-_id -__v');
+        const { name, show } = await Project.findByIdAndDelete(id);
         return res.status(200).json({ status: "success", data: { name, show } });
     } catch (err) {
         console.error(chalk.red(`PROJECT ROUTE ERROR: ${err.message}!`));
diff --git a/frontend/public/images/delete.jpg b/frontend/public/images/delete.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..219d0c84bca23ff4f907430488fedb76a9c47518
GIT binary patch
literal 40839
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
Y!HN9n$=>4+WYc~5rNjE8+SgbA1&@8?VgLXD

literal 0
HcmV?d00001

diff --git a/frontend/public/images/delete.png b/frontend/public/images/delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7b4484e914a5b91ff44db21d3565dc1e650448f
GIT binary patch
literal 3393
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
K4ZRqGiv9&f<`h=|

literal 0
HcmV?d00001

diff --git a/frontend/src/Pages/Admin.jsx b/frontend/src/Pages/Admin.jsx
index 36fd2b7..77f72d5 100644
--- a/frontend/src/Pages/Admin.jsx
+++ b/frontend/src/Pages/Admin.jsx
@@ -1,7 +1,7 @@
 import { useState, useEffect } from "react";
 import { useNavigate } from "react-router-dom";
 import AdminHeader from "../adminComponents/AdminHeader";
-import AdminProjectListing from "../adminComponents/AdminProjectListing";
+import AdminProjectListing from "../adminComponents/AdminProjectListing/AdminProjectListing";
 import MessageList from "../adminComponents/MessageList/MessageList";
 import axios from "axios";
 import "./Admin.css";
diff --git a/frontend/src/adminComponents/AdminEditProject/AdminEditProject.css b/frontend/src/adminComponents/AdminEditProject/AdminEditProject.css
new file mode 100644
index 0000000..b19d688
--- /dev/null
+++ b/frontend/src/adminComponents/AdminEditProject/AdminEditProject.css
@@ -0,0 +1,50 @@
+
+
+.edit-container form {
+    display: flex;
+    flex-flow: column nowrap;
+    gap: 2rem;
+}
+
+.edit-item {
+    display: flex;
+    flex-flow: row nowrap;
+    gap: 1rem;
+    justify-content: flex-start;
+    align-items: center;
+    padding-bottom: 0;
+    margin-bottom: 0;
+}
+
+.edit-item input {
+    margin: 0;
+    max-width: max-content;
+}
+
+.textarea {
+    flex-flow: column nowrap;
+    align-items: flex-start;
+}
+
+.textarea textarea {
+    margin-bottom: 0;
+}
+
+.radio {
+    display: flex;
+    flex-flow: row nowrap;
+    justify-content: center;
+    padding: 0;
+}
+
+.radio input {
+    margin-left: 5px;
+}
+
+.edit-container button {
+    width: 30%;
+    min-width: fit-content;
+    align-self: center;
+    background-color: rgb(26, 174, 68, 0.3);
+    border-color: rgb(26, 174, 68, 1);
+}
\ No newline at end of file
diff --git a/frontend/src/adminComponents/AdminEditProject/AdminEditProject.jsx b/frontend/src/adminComponents/AdminEditProject/AdminEditProject.jsx
new file mode 100644
index 0000000..0e629e9
--- /dev/null
+++ b/frontend/src/adminComponents/AdminEditProject/AdminEditProject.jsx
@@ -0,0 +1,126 @@
+import { useState } from "react";
+import "./AdminEditProject.css";
+
+function AdminEditProject({ projectObj, saveProject }) {
+	const [editInfo, setEditInfo] = useState(projectObj);
+	const [imageFile, setImageFile] = useState(null);
+
+	const createProject = (e) => {
+		e.preventDefault();
+		console.log("Pressed submit!");
+
+		if (!editInfo?.name || !editInfo.description || !editInfo.link) {
+			return;
+		}
+
+		saveProject({ ...editInfo, file: imageFile });
+		setEditInfo({ show: false });
+	};
+
+	const handleShowToggle = (e) => {
+		const show = e.target.value == "true" ? true : false;
+		setEditInfo({ ...editInfo, show });
+	};
+
+	const handleFileChange = (e) => {
+		console.log(e.target);
+
+		const files = e.target.files;
+		setEditInfo({ ...editInfo, image: e.target.value });
+		setImageFile(files.length ? files[0] : null);
+	};
+
+	return (
+		<section className="project edit-container">
+			<h3>New Project</h3>
+			<form onSubmit={createProject}>
+				<div className="edit-item">
+					<label htmlFor="name">Name: </label>
+					<input
+						type="text"
+						name="name"
+						id="name"
+						value={editInfo?.name || ""}
+						onChange={(e) =>
+							setEditInfo({ ...editInfo, name: e.target.value })
+						}
+						required
+					/>
+				</div>
+
+				<div className="edit-item">
+					<label htmlFor="image">Image: </label>
+					<input
+						type="file"
+						name="image"
+						id="image"
+						accept="image/*"
+						value={editInfo?.image || ""}
+						onChange={handleFileChange}
+					/>
+				</div>
+
+				<div className="edit-item">
+					<label htmlFor="link">Link: </label>
+					<input
+						type="url"
+						name="link"
+						id=""
+						value={editInfo?.link || ""}
+						onChange={(e) =>
+							setEditInfo({ ...editInfo, link: e.target.value })
+						}
+					/>
+				</div>
+
+				<div className="edit-item textarea">
+					<label htmlFor="contents">
+						Description (double new line for new bullet):{" "}
+					</label>
+					<textarea
+						name="contents"
+						id="contents"
+						value={editInfo?.description || ""}
+						onChange={(e) =>
+							setEditInfo({
+								...editInfo,
+								description: e.target.value,
+							})
+						}
+						required
+					/>
+				</div>
+
+				<div className="edit-item radio">
+					<label htmlFor="show">
+						Show
+						<input
+							type="radio"
+							name="show"
+							id="show"
+							value={true}
+							checked={editInfo?.show || false}
+							onChange={handleShowToggle}
+						/>
+					</label>
+
+					<label htmlFor="show">
+						Hide
+						<input
+							type="radio"
+							name="show"
+							id="hide"
+							value={false}
+							checked={!editInfo?.show}
+							onChange={handleShowToggle}
+						/>
+					</label>
+				</div>
+
+				<button type="submit">Create</button>
+			</form>
+		</section>
+	);
+}
+
+export default AdminEditProject;
diff --git a/frontend/src/adminComponents/AdminProjectListing.jsx b/frontend/src/adminComponents/AdminProjectListing.jsx
deleted file mode 100644
index 9aeea04..0000000
--- a/frontend/src/adminComponents/AdminProjectListing.jsx
+++ /dev/null
@@ -1,120 +0,0 @@
-import { useState, useEffect } from "react";
-import axios from "axios";
-import Loading from "../components/Loading";
-import CreateProject from "./CreateProject";
-import Project from "../components/ProjectListing/Project";
-import ProjectListing from "../components/ProjectListing/ProjectListing";
-import "../components/ProjectListing/ProjectListing";
-
-function AdminProjectListing({ role }) {
-	const [isLoading, setIsLoading] = useState(true);
-	const [errorMessage, setErrorMessage] = useState("");
-	const [projects, setProjects] = useState([]);
-	const [projectIndex, setProjectIndex] = useState(0);
-	const [newProjectObj, setNewProjectObj] = useState({});
-
-	useEffect(() => {
-		const handleGetProjects = async () => {
-			try {
-				const result = await axios.get(
-					"http://localhost:3000/api/projects",
-					{
-						// filter: { show: true },
-						timeout: 5000,
-					}
-				);
-
-				setProjects(result.data.data);
-				setIsLoading(false);
-			} catch (err) {
-				console.error(`ERROR: ${err.message}`);
-				setErrorMessage(
-					err.response?.data?.message || "Could not get projects."
-				);
-			} finally {
-				setIsLoading(false);
-			}
-		};
-
-		handleGetProjects();
-	}, []);
-
-	const handleChangeIndex = (newIndex) => {
-		setProjectIndex(newIndex);
-	};
-
-	const saveProject = async () => {
-		try {
-			// const res = await axios.post
-		} catch (err) {
-			console.error(`Save project error: ${err.message}`);
-		}
-	};
-
-	const deleteProject = () => {
-		console.log("Remove project!");
-	};
-
-	const selectedProject = projects.length ? projects[projectIndex] : {};
-
-	return (
-		<section id="projects">
-			<h2>Projects</h2>
-			<div className="project-view">
-				{isLoading ? (
-					<Loading />
-				) : errorMessage ? (
-					<div
-						style={{
-							display: "flex",
-							justifyContent: "center",
-							alignContent: "center",
-							paddingTop: "2rem",
-							paddingBottom: "2rem",
-						}}
-					>
-						<p
-							style={{
-								fontSize: "2rem",
-								color: "var(--complement-color)",
-								textAlign: "center",
-							}}
-						>
-							{errorMessage}
-						</p>
-					</div>
-				) : (
-					<>
-						<div className="buttons-container">
-							{role === "Admin" && (
-								<button
-									className="edit-button add-project-button project-button"
-									onClick={saveProject}
-								>
-									+
-								</button>
-							)}
-
-							{projects.map((project, i) => (
-								<button
-									onClick={() => handleChangeIndex(i)}
-									className="project-button show-button"
-									key={i}
-								>
-									{project.name}
-								</button>
-							))}
-						</div>
-						<Project
-							{...selectedProject}
-							canEdit={role === "Admin" ? true : false}
-							deleteProject={deleteProject}
-						/>
-					</>
-				)}
-			</div>
-		</section>
-	);
-}
-
-export default AdminProjectListing;
diff --git a/frontend/src/adminComponents/AdminProjectListing/AdminProjectListing.css b/frontend/src/adminComponents/AdminProjectListing/AdminProjectListing.css
new file mode 100644
index 0000000..07da681
--- /dev/null
+++ b/frontend/src/adminComponents/AdminProjectListing/AdminProjectListing.css
@@ -0,0 +1,39 @@
+.edit-button {
+    display: flex;
+    flex-flow: row nowrap;
+    align-items: center;
+    justify-content: center;
+    min-width: 50px;
+    padding: 10px;
+    height: 50px;
+    border-radius: 10px;
+    color: var(--text-color);
+    font-size: 1rem;
+
+    transition: background-color 0.3s linear;
+}
+
+.edit-button:hover {
+    cursor: pointer;
+    transition: background-color 0.3s linear;
+}
+
+.delete-button {
+    background-color: rgba(242, 0, 0, 0.3);
+    border: 1px solid rgb(242, 0, 0);
+    /* transition: background-color 0.3s linear; */
+}
+
+.delete-button:hover {
+    background-color: rgba(242, 0, 0, 0.5);
+}
+
+.new-button {
+    background-color: rgba(7, 229, 110, 0.3);
+    border: 1px solid rgb(7, 229, 110);
+    /* transition: background-color 0.3s linear; */
+}
+
+.new-button:hover {
+    background-color: rgba(7, 229, 110, 0.5);
+}
diff --git a/frontend/src/adminComponents/AdminProjectListing/AdminProjectListing.jsx b/frontend/src/adminComponents/AdminProjectListing/AdminProjectListing.jsx
new file mode 100644
index 0000000..db729d4
--- /dev/null
+++ b/frontend/src/adminComponents/AdminProjectListing/AdminProjectListing.jsx
@@ -0,0 +1,213 @@
+import { useState, useEffect } from "react";
+import Loading from "../../components/Loading";
+import AdminEditProject from "../AdminEditProject/AdminEditProject";
+import Project from "../../components/ProjectListing/Project";
+import "./AdminProjectListing.css";
+import axios from "axios";
+
+function AdminProjectListing({ role }) {
+	const [isLoading, setIsLoading] = useState(true);
+	const [errorMessage, setErrorMessage] = useState("");
+	const [projects, setProjects] = useState([]);
+	const [projectIndex, setProjectIndex] = useState(0);
+
+	const [edit, setEdit] = useState(false);
+
+	useEffect(() => {
+		const handleGetProjects = async () => {
+			try {
+				const result = await axios.get(
+					"http://localhost:3000/api/projects",
+					{
+						timeout: 5000,
+					}
+				);
+
+				setProjects(result.data.data);
+				setIsLoading(false);
+			} catch (err) {
+				console.error(`ERROR: ${err.message}`);
+				setErrorMessage(
+					err.response?.data?.message || "Could not get projects."
+				);
+			} finally {
+				setIsLoading(false);
+			}
+		};
+
+		handleGetProjects();
+	}, []);
+
+	const handleChangeIndex = (newIndex) => {
+		setProjectIndex(newIndex);
+		setEdit(false);
+	};
+
+	const saveProject = async (projectObj) => {
+		try {
+			console.log("Inside save proj");
+
+			const file = projectObj.file;
+			const descriptionList =
+				projectObj?.description?.split("\n\n") || [];
+			delete projectObj.file;
+
+			const newProject = {
+				...projectObj,
+				image: file?.name,
+				description: descriptionList,
+			};
+
+			console.log(file);
+
+			console.log(newProject);
+
+			const resp = await axios.post(
+				"http://localhost:3000/api/projects",
+				{
+					data: newProject,
+					timeout: 5000,
+				}
+			);
+
+			if (resp.data.status >= 400) {
+				setErrorMessage("Could not create project!");
+
+				setTimeout(() => {
+					setErrorMessage("");
+				}, 3000);
+			} else {
+				const { data } = resp.data;
+				setProjects([{ ...newProject, _id: data.id }, ...projects]);
+			}
+		} catch (err) {
+			console.error(`Save project error: ${err.message}`);
+			setErrorMessage("Could not create project!");
+
+			setTimeout(() => {
+				setErrorMessage("");
+			}, 3000);
+		}
+	};
+
+	const deleteProject = async () => {
+		if (edit) return;
+
+		if (selectedProject.show == true) {
+			alert(`Can't delete: ${selectedProject.name} is public!`);
+			return;
+		}
+
+		const resp = confirm(`Delete "${selectedProject.name}"? (PERMANENT)`);
+
+		if (resp) {
+			try {
+				console.log(selectedProject);
+
+				const resp = await axios.delete(
+					`http://localhost:3000/api/projects/${selectedProject._id}`
+				);
+
+				const { status, data, message } = resp.data;
+
+				if (status >= 400) {
+					alert(`Error: ${message}`);
+				} else {
+					alert(`Deleted ${data.name}.`);
+					setProjects(
+						projects.filter(
+							(project) => project._id !== selectedProject._id
+						)
+					);
+					setProjectIndex(0);
+				}
+			} catch (err) {
+				console.error(`Delete project error: ${err.message}`);
+
+				alert(`Failed to delete ${selectedProject.name}`);
+			}
+		}
+	};
+
+	const selectedProject = projects.length ? projects[projectIndex] : {};
+
+	return (
+		<section id="projects">
+			<h2>Projects</h2>
+			<div className="project-view">
+				{isLoading ? (
+					<Loading />
+				) : errorMessage ? (
+					<div
+						style={{
+							display: "flex",
+							justifyContent: "center",
+							alignContent: "center",
+							paddingTop: "2rem",
+							paddingBottom: "2rem",
+						}}
+					>
+						<p
+							style={{
+								fontSize: "2rem",
+								color: "var(--complement-color)",
+								textAlign: "center",
+							}}
+						>
+							{errorMessage}
+						</p>
+					</div>
+				) : (
+					<>
+						<div className="buttons-container manager-container">
+							{role === "Admin" && (
+								<>
+									<button
+										className="edit-button delete-button"
+										onClick={deleteProject}
+									>
+										<img
+											src="/images/delete.png"
+											alt=""
+											width={15}
+											height={15}
+											style={{ marginRight: "10px" }}
+										/>
+										{selectedProject.name}
+									</button>
+									<button
+										className="edit-button new-button"
+										onClick={() => setEdit(true)}
+									>
+										New
+									</button>
+								</>
+							)}
+
+							{projects.map((project, i) => (
+								<button
+									onClick={() => handleChangeIndex(i)}
+									className="project-button show-button"
+									key={i}
+								>
+									{project.name}
+								</button>
+							))}
+						</div>
+
+						{edit ? (
+							<AdminEditProject
+								projectObj={{ show: false }}
+								saveProject={saveProject}
+							/>
+						) : (
+							<Project {...selectedProject} />
+						)}
+					</>
+				)}
+			</div>
+		</section>
+	);
+}
+
+export default AdminProjectListing;
diff --git a/frontend/src/adminComponents/CreateProject.jsx b/frontend/src/adminComponents/CreateProject.jsx
deleted file mode 100644
index 250889b..0000000
--- a/frontend/src/adminComponents/CreateProject.jsx
+++ /dev/null
@@ -1,9 +0,0 @@
-function CreateProject({ handleEdit, handleSave }) {
-	return (
-		<div className="edit-project-container">
-			<form></form>
-		</div>
-	);
-}
-
-export default CreateProject;
diff --git a/frontend/src/adminComponents/Redirect/Redirect.jsx b/frontend/src/adminComponents/Redirect/Redirect.jsx
deleted file mode 100644
index e69de29..0000000
diff --git a/frontend/src/components/Contact/Contact.jsx b/frontend/src/components/Contact/Contact.jsx
index ee34839..2fa2111 100644
--- a/frontend/src/components/Contact/Contact.jsx
+++ b/frontend/src/components/Contact/Contact.jsx
@@ -57,6 +57,7 @@ function Contact() {
 				setMessageObj({ name: "", email: "", contents: "" });
 			}
 		} catch (err) {
+			console.error(`ERROR Contact: ${err.message}`);
 			handleShowError("Submit error! Try again.");
 		}
 	};
diff --git a/frontend/src/components/ProjectListing/Project.css b/frontend/src/components/ProjectListing/Project.css
index 30fd830..243aef1 100644
--- a/frontend/src/components/ProjectListing/Project.css
+++ b/frontend/src/components/ProjectListing/Project.css
@@ -13,11 +13,21 @@
 
 .project img {
     max-height: 300px;
-    float: left;
-    margin: 0 2rem 1rem 0;
+    display: block;
+    margin-inline: auto;
+    margin-bottom: 2rem;
     border-radius: 20px;
 }
 
+.project ul {
+    display: flex;
+    flex-flow: column nowrap;
+    gap: 1rem;
+}
+.project li {
+    margin-left: 1rem;
+}
+
 .project ul, .project a {
     flex-grow: 2;
     font-size: 1.25rem;
@@ -26,7 +36,7 @@
 .project a {
     display: block;
     text-align: center;
-    margin-top: 1rem;
+    margin-top: 2rem;
     text-decoration: underline;
 
     color: var(--text-color);
@@ -35,13 +45,3 @@
 .project a:hover {
     color: var(--nav-hover-color);
 }
-
-.del-project-button {
-    float: right;
-    margin-left: -50px;
-    background-color: var(--complement-color);
-}
-
-.del-project-button:hover {
-    background-color: red;
-}
diff --git a/frontend/src/components/ProjectListing/Project.jsx b/frontend/src/components/ProjectListing/Project.jsx
index da77e4a..b806570 100644
--- a/frontend/src/components/ProjectListing/Project.jsx
+++ b/frontend/src/components/ProjectListing/Project.jsx
@@ -1,19 +1,9 @@
 import "./Project.css";
 
-function Project({ name, image, description, link, canEdit, deleteProject }) {
+function Project({ name, image, description, link }) {
 	return (
 		<section className="project">
-			<h3>
-				{name}
-				{canEdit && (
-					<button
-						className="del-project-button edit-button project-button"
-						onClick={deleteProject}
-					>
-						-
-					</button>
-				)}
-			</h3>
+			<h3>{name}</h3>
 
 			<div className="projectInfo">
 				<img
diff --git a/frontend/src/components/ProjectListing/ProjectListing.css b/frontend/src/components/ProjectListing/ProjectListing.css
index 7aa3e68..6bdebc3 100644
--- a/frontend/src/components/ProjectListing/ProjectListing.css
+++ b/frontend/src/components/ProjectListing/ProjectListing.css
@@ -57,19 +57,3 @@
 .show-button:hover {
     background-color: var(--complement-color);
 }
-
-.edit-button {
-    padding: 5px;
-    border-radius: 25px;
-    color: var(--text-color);
-    width: 50px;
-    font-size: 1.5rem;
-}
-
-.add-project-button {
-    background-color: rgb(15, 74, 1);
-} 
-
-.add-project-button:hover {
-    background-color: rgb(35, 173, 1);
-}
\ No newline at end of file
diff --git a/frontend/src/components/ProjectListing/ProjectListing.jsx b/frontend/src/components/ProjectListing/ProjectListing.jsx
index 9987520..f7765dc 100644
--- a/frontend/src/components/ProjectListing/ProjectListing.jsx
+++ b/frontend/src/components/ProjectListing/ProjectListing.jsx
@@ -39,18 +39,6 @@ function ProjectListing() {
 		setProjectIndex(newIndex);
 	};
 
-	const saveProject = async () => {
-		try {
-			// const res = await axios.post
-		} catch (err) {
-			console.error(`Save project error: ${err.message}`);
-		}
-	};
-
-	const deleteProject = () => {
-		console.log("Remove project!");
-	};
-
 	const selectedProject = projects.length ? projects[projectIndex] : {};
 
 	return (
@@ -92,11 +80,7 @@ function ProjectListing() {
 								</button>
 							))}
 						</div>
-						<Project
-							{...selectedProject}
-							canEdit={false}
-							deleteProject={deleteProject}
-						/>
+						<Project {...selectedProject} />
 					</>
 				)}
 			</div>

From 8c0a01934172878d8ad9e1b47af748a99761199a Mon Sep 17 00:00:00 2001
From: arauta12 <andreirauta234@gmail.com>
Date: Mon, 28 Jul 2025 16:14:25 -0400
Subject: [PATCH 04/12] Add small screen capability & logging

---
 .gitignore                                    |   4 +-
 backend/app.js                                |  21 ++
 backend/controllers/project.controller.js     |   9 +-
 backend/index.js                              |   2 +-
 backend/models/project.model.js               |   5 +-
 backend/multer/fileUpload.js                  |  72 ++++++
 backend/multer/multerConfig.js                |  69 ++++++
 backend/package-lock.json                     | 218 +++++++++++++++++-
 backend/package.json                          |   4 +-
 backend/routes/project.route.js               |   4 +-
 backend/routes/uploads.route.js               |  19 ++
 frontend/public/images/noimage.jpg            | Bin 0 -> 10097 bytes
 frontend/public/images/plus.jpg               | Bin 0 -> 10562 bytes
 frontend/src/App.css                          |  11 +
 frontend/src/Pages/Admin.jsx                  |   4 +-
 frontend/src/Pages/Main.jsx                   |   4 -
 .../AdminEditProject/AdminEditProject.css     |   4 +-
 .../AdminEditProject/AdminEditProject.jsx     |  10 +-
 .../AdminProjectListing.css                   |   8 +-
 .../AdminProjectListing.jsx                   |  13 +-
 frontend/src/components/Contact/Contact.css   |  25 +-
 frontend/src/components/Contact/Contact.jsx   |   2 +-
 frontend/src/components/Home/Home.css         |  10 +-
 .../src/components/Listing/TechListing.jsx    | 108 ++++-----
 frontend/src/components/Navigation/Navbar.css |  30 +--
 frontend/src/components/Navigation/Navbar.jsx |   2 +
 .../src/components/ProjectListing/Project.css |  17 +-
 .../src/components/ProjectListing/Project.jsx |  26 ++-
 .../ProjectListing/ProjectListing.jsx         |   3 +-
 29 files changed, 591 insertions(+), 113 deletions(-)
 create mode 100644 backend/multer/fileUpload.js
 create mode 100644 backend/multer/multerConfig.js
 create mode 100644 backend/routes/uploads.route.js
 create mode 100644 frontend/public/images/noimage.jpg
 create mode 100644 frontend/public/images/plus.jpg

diff --git a/.gitignore b/.gitignore
index f1e85fe..73423c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,6 @@ frontend/dist/
 frontend/TODO.md
 frontend/coverage
 
-backend/node_modules/
\ No newline at end of file
+backend/node_modules/
+backend/logs/
+backend/uploads
\ No newline at end of file
diff --git a/backend/app.js b/backend/app.js
index b6ac602..5c4a6fb 100644
--- a/backend/app.js
+++ b/backend/app.js
@@ -2,11 +2,15 @@ const express = require('express');
 const helmet = require('helmet');
 const cors = require('cors');
 const cookieParser = require('cookie-parser');
+const morgan = require('morgan');
+const path = require('path');
+const fs = require('fs');
 
 const authRoute = require('./routes/auth.route');
 const userRoute = require('./routes/user.route');
 const projectRoute = require('./routes/project.route');
 const messageRoute = require('./routes/message.route');
+const uploadRoute = require('./routes/uploads.route');
 
 const app = express();
 
@@ -19,6 +23,22 @@ const corsConfig = {
     optionsSuccessStatus: 200
 };
 
+const createLogName = () => {
+    const logDate = new Date(Date.now());
+    const logName = `${logDate.getUTCMonth()}-${logDate.getUTCDay()}-${logDate.getUTCFullYear()}.log`;
+    console.log(logName);
+
+    return path.join(__dirname, 'logs', logName);
+};
+
+const logStream = fs.createWriteStream(
+    createLogName(),
+    { autoClose: true, emitClose: false, flags: 'a' }
+);
+
+const logger = morgan("combined", { immediate: true, stream: logStream });
+
+app.use(logger);
 app.use(cors(corsConfig));
 app.use(helmet());
 app.use(express.json());
@@ -28,6 +48,7 @@ app.use('/api/auth', authRoute);
 app.use('/api/projects', projectRoute);
 app.use('/api/messages', messageRoute);
 app.use('/api/users', userRoute);
+// app.use('/api/uploads', uploadRoute);
 
 app.all('{*splat}', (req, res) => {
     res.status(404).send('That resource does not exist!');
diff --git a/backend/controllers/project.controller.js b/backend/controllers/project.controller.js
index c749b3c..12a05cb 100644
--- a/backend/controllers/project.controller.js
+++ b/backend/controllers/project.controller.js
@@ -1,7 +1,11 @@
 const Project = require('../models/project.model');
 const chalk = require('chalk');
 
-
+/**
+ * Get projects for public display
+ * 
+ * @returns List of all public project objects
+ */
 const getDisplayProjects = async (req, res) => {
     try {
         const projects = await Project.find({ show: true }, '-_id -__v');
@@ -15,8 +19,7 @@ const getDisplayProjects = async (req, res) => {
 /**
  * Get every project that exists
  * 
- * Filter is passed in the body to select particular ones
- * @returns List of all project objects satisfying the conditions
+ * @returns List of all project objects
  */
 const getAllProjects = async (req, res) => {
     // const { filter = "" } = req.body;
diff --git a/backend/index.js b/backend/index.js
index 1cacf26..7ab6e72 100644
--- a/backend/index.js
+++ b/backend/index.js
@@ -2,10 +2,10 @@ const { config } = require('dotenv');
 const process = require('process');
 const app = require('./app');
 const { mongoose, connect } = require('./db/mongo');
+
 const chalk = require('chalk');
 
 config();
-
 const PORT = process.env.PORT | 3000;
 
 const server = app.listen(PORT, (err) => {
diff --git a/backend/models/project.model.js b/backend/models/project.model.js
index 3056514..cca6aa0 100644
--- a/backend/models/project.model.js
+++ b/backend/models/project.model.js
@@ -6,7 +6,10 @@ const projectSchema = new mongoose.Schema({
         required: true,
         default: "Unnamed"
     },
-    image: String,
+    image: {
+        type: [ String ],
+        default: []
+    },
     description: {
         type: [ String ],
         required: true,
diff --git a/backend/multer/fileUpload.js b/backend/multer/fileUpload.js
new file mode 100644
index 0000000..250372a
--- /dev/null
+++ b/backend/multer/fileUpload.js
@@ -0,0 +1,72 @@
+const multer = require('multer');
+const path = require('path');
+const fs = require('fs');
+const fsPromise = require('fs').promises;
+const { uploadFileFolder, uploadImageFolder } = require('./multerConfig');
+
+const saveImage = (req, res, next) => {
+    if (!req.file) {
+        next('route');
+    } else {
+        console.log(req.file);
+        next();
+    }
+};
+
+
+// TODO: update image attr in project to uid & name
+const uploadImage = (req, res) => {
+    if (!req.locals)
+        return res.status(400).json({ status: "failed", message: "Missing fields!" });
+
+    const { uid = "", name = "" } = req.locals;
+    delete req.locals;
+
+    if (!uid || !name)
+        return res.status(400).json({ status: "failed", message: "Missing fields!" });
+
+    if (!fs.existsSync(path.join(uploadImageFolder, `${uid}-${name}`)))
+        return res.status(400).json({ status: "failed", message: "File failed to tupload!" });
+
+    console.log(`${req.file} w/ uid: ${uid}`);
+
+    res.status(201).json({ status: "success", data: { uid, name } });
+};
+
+const downloadImage = async (req, res) => {
+    const { name } = req.params;
+
+    const fileData = await fsPromise.readFile(path.join(uploadImageFolder, name));
+    const dataArray = new Uint8Array(fileData);
+
+    const blob = new Blob([ dataArray ], { type: `image/${name.split(".")[ 1 ]}` });
+    const imageUrl = URL.createObjectURL(blob);
+
+    console.log(imageUrl);
+    console.log(blob);
+
+    return res.status(200).json({ status: "success", data: imageUrl });
+};
+
+const downloadFile = async (req, res) => {
+    const { name } = req.params;
+
+    const fileData = await fsPromise.readFile(path.join(uploadFileFolder, name));
+    // console.log(fileData);
+
+    console.log(typeof fileData);
+
+    return res.status(200).json({ status: "success", data: fileData });
+};
+
+const uploadFile = (req, res) => {
+
+};
+
+module.exports = {
+    saveImage,
+    uploadImage,
+    downloadImage,
+    downloadFile,
+    uploadFile
+};
\ No newline at end of file
diff --git a/backend/multer/multerConfig.js b/backend/multer/multerConfig.js
new file mode 100644
index 0000000..f044ea1
--- /dev/null
+++ b/backend/multer/multerConfig.js
@@ -0,0 +1,69 @@
+const path = require('path');
+const multer = require('multer');
+const uuid = require('uuid').v6;
+
+const uploadFolder = path.join(__dirname, '..', 'uploads');
+const uploadImageFolder = path.join(uploadFolder, 'images');
+const uploadFileFolder = path.join(uploadFolder, 'pdfs');
+
+const imageStorage = multer.diskStorage({
+    destination: (req, file, cb) => {
+        console.log(`destination: ${file}`);
+        cb(null, uploadImageFolder);
+    },
+    filename: (req, file, cb) => {
+        const { originalname, mimetype } = file;
+        console.log(`CB: ${JSON.stringify(file)}`);
+
+        if (!mimetype.includes("image")) {
+            cb(new Error("File is not an image!"));
+        } else {
+            const uid = uuid();
+            const name = originalname;
+            req.locals = { uid, name };
+            cb(null, `${uid}-${originalname}`);
+        }
+
+    }
+});
+
+const fileStorage = multer.diskStorage({
+    destination: (req, file, cb) => {
+        console.log(`destination: ${file}`);
+
+        cb(null, uploadFileFolder);
+    },
+    filename: (req, file, cb) => {
+        const { originalname } = file;
+        console.log(`CB: ${JSON.stringify(file)}`);
+
+        const uid = uuid();
+        const name = originalname;
+        req.locals = { uid, name };
+        cb(null, `${uuid()}-${originalname}`);
+
+    }
+});
+
+const uploadImageMulter = multer({
+    storage: imageStorage,
+    // limits: {
+    //     fileSize: 1024 * 1024,
+    //     files: 1,
+    //     fields: 10
+    // }
+});
+
+const uploadFileMulter = multer({
+    storage: fileStorage,
+    // limits: {
+    //     fileSize: 1024 * 1024,
+    //     files: 1,
+    //     fields: 10
+    // }
+});
+
+module.exports = {
+    uploadImageMulter, uploadFileMulter,
+    uploadImageFolder, uploadFileFolder
+};
diff --git a/backend/package-lock.json b/backend/package-lock.json
index 64565aa..7f71afd 100644
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
@@ -20,7 +20,9 @@
         "jsonwebtoken": "^9.0.2",
         "mongoose": "^8.16.3",
         "morgan": "^1.10.0",
-        "nginx": "^1.1.0"
+        "multer": "^2.0.2",
+        "nginx": "^1.1.0",
+        "uuid": "^11.1.0"
       },
       "devDependencies": {
         "jest": "^30.0.4"
@@ -1736,6 +1738,12 @@
         "node": ">= 8"
       }
     },
+    "node_modules/append-field": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/append-field/-/append-field-1.0.0.tgz",
+      "integrity": "sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw==",
+      "license": "MIT"
+    },
     "node_modules/argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
@@ -2018,9 +2026,19 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true,
       "license": "MIT"
     },
+    "node_modules/busboy": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz",
+      "integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==",
+      "dependencies": {
+        "streamsearch": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=10.16.0"
+      }
+    },
     "node_modules/bytes": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
@@ -2288,6 +2306,21 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/concat-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
+      "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
+      "engines": [
+        "node >= 6.0"
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.0.2",
+        "typedarray": "^0.0.6"
+      }
+    },
     "node_modules/content-disposition": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.0.tgz",
@@ -4393,6 +4426,15 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/minipass": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
@@ -4403,6 +4445,18 @@
         "node": ">=16 || 14 >=14.17"
       }
     },
+    "node_modules/mkdirp": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+      "license": "MIT",
+      "dependencies": {
+        "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
     "node_modules/mongodb": {
       "version": "6.17.0",
       "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.17.0.tgz",
@@ -4488,16 +4542,16 @@
       "license": "MIT"
     },
     "node_modules/morgan": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
-      "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==",
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.1.tgz",
+      "integrity": "sha512-223dMRJtI/l25dJKWpgij2cMtywuG/WiUKXdvwfbhGKBhy1puASqXwFzmWZ7+K73vUPoR7SS2Qz2cI/g9MKw0A==",
       "license": "MIT",
       "dependencies": {
         "basic-auth": "~2.0.1",
         "debug": "2.6.9",
         "depd": "~2.0.0",
         "on-finished": "~2.3.0",
-        "on-headers": "~1.0.2"
+        "on-headers": "~1.1.0"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -4553,6 +4607,67 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "license": "MIT"
     },
+    "node_modules/multer": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/multer/-/multer-2.0.2.tgz",
+      "integrity": "sha512-u7f2xaZ/UG8oLXHvtF/oWTRvT44p9ecwBBqTwgJVq0+4BW1g8OW01TyMEGWBHbyMOYVHXslaut7qEQ1meATXgw==",
+      "license": "MIT",
+      "dependencies": {
+        "append-field": "^1.0.0",
+        "busboy": "^1.6.0",
+        "concat-stream": "^2.0.0",
+        "mkdirp": "^0.5.6",
+        "object-assign": "^4.1.1",
+        "type-is": "^1.6.18",
+        "xtend": "^4.0.2"
+      },
+      "engines": {
+        "node": ">= 10.16.0"
+      }
+    },
+    "node_modules/multer/node_modules/media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/multer/node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/multer/node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/multer/node_modules/type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "license": "MIT",
+      "dependencies": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/mute-stream": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
@@ -4676,9 +4791,9 @@
       }
     },
     "node_modules/on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.1.0.tgz",
+      "integrity": "sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.8"
@@ -5046,6 +5161,20 @@
         "node": ">=0.8"
       }
     },
+    "node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -5419,6 +5548,43 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/streamsearch": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz",
+      "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string_decoder/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/string-length": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
@@ -5768,6 +5934,12 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
+      "license": "MIT"
+    },
     "node_modules/undici-types": {
       "version": "7.8.0",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz",
@@ -5849,6 +6021,25 @@
         "browserslist": ">= 4.21.0"
       }
     },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "license": "MIT"
+    },
+    "node_modules/uuid": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz",
+      "integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "license": "MIT",
+      "bin": {
+        "uuid": "dist/esm/bin/uuid"
+      }
+    },
     "node_modules/v8-to-istanbul": {
       "version": "9.3.0",
       "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
@@ -6062,6 +6253,15 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
     "node_modules/y18n": {
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
diff --git a/backend/package.json b/backend/package.json
index ea09642..bedbad8 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -23,7 +23,9 @@
     "jsonwebtoken": "^9.0.2",
     "mongoose": "^8.16.3",
     "morgan": "^1.10.0",
-    "nginx": "^1.1.0"
+    "multer": "^2.0.2",
+    "nginx": "^1.1.0",
+    "uuid": "^11.1.0"
   },
   "devDependencies": {
     "jest": "^30.0.4"
diff --git a/backend/routes/project.route.js b/backend/routes/project.route.js
index 0505912..9cb55ef 100644
--- a/backend/routes/project.route.js
+++ b/backend/routes/project.route.js
@@ -11,8 +11,8 @@ router.get('/', projectControl.getAllProjects);
 router.get('/:id', projectControl.getProject);
 
 router.use(verifyAdmin);
+router.delete('/:id', projectControl.deleteProject);
 router.post('/', projectControl.createProject);
 router.patch('/:id', projectControl.updateProject);
-router.delete('/:id', projectControl.deleteProject);
 
-module.exports = router;
\ No newline at end of file
+module.exports = router;
diff --git a/backend/routes/uploads.route.js b/backend/routes/uploads.route.js
new file mode 100644
index 0000000..1388fec
--- /dev/null
+++ b/backend/routes/uploads.route.js
@@ -0,0 +1,19 @@
+const express = require('express');
+const uuid = require('uuid').v6;
+
+const { verifyToken, verifyAdmin } = require('../controllers/auth.controller');
+const { uploadImageMulter, uploadFileMulter } = require('../multer/multerConfig');
+const fileLoader = require('../multer/fileUpload');
+
+const router = express.Router();
+
+router.get('/pdfs/:name', fileLoader.downloadFile);
+router.get('/images/:name', fileLoader.downloadImage);
+
+
+router.use(verifyToken);
+router.use(verifyAdmin);
+router.post('/pdfs', uploadFileMulter.single('file'), fileLoader.uploadFile);
+router.post('/images', uploadImageMulter.single('image'), fileLoader.uploadImage);
+
+module.exports = router;
diff --git a/frontend/public/images/noimage.jpg b/frontend/public/images/noimage.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0ca3bbdd344d7d15a0fbf1225a63afe891c07065
GIT binary patch
literal 10097
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
Z@#Fm){2IR9XMc#(@5}$g9#~KB{SS`E78C#g

literal 0
HcmV?d00001

diff --git a/frontend/public/images/plus.jpg b/frontend/public/images/plus.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..01962c4e895e15f02f51b3f7737b446a2b123791
GIT binary patch
literal 10562
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

literal 0
HcmV?d00001

diff --git a/frontend/src/App.css b/frontend/src/App.css
index 5fe536c..2a200a9 100644
--- a/frontend/src/App.css
+++ b/frontend/src/App.css
@@ -35,3 +35,14 @@ h1 {
     font-size: 2.5rem;
 }
 
+@media (width <= 550px) {
+    html {
+        font-size: 12px;
+    }
+}
+
+@media (width <= 375px) {
+    html {
+        font-size: 10px;
+    }
+}
\ No newline at end of file
diff --git a/frontend/src/Pages/Admin.jsx b/frontend/src/Pages/Admin.jsx
index 77f72d5..08aabbd 100644
--- a/frontend/src/Pages/Admin.jsx
+++ b/frontend/src/Pages/Admin.jsx
@@ -25,7 +25,7 @@ function Admin() {
 					setUserObj({ username, role });
 				}
 			} catch (err) {
-				console.error(err);
+				console.error(err.message);
 
 				if (err.response?.status <= 403 && err.response.status >= 400)
 					navigate("/admin");
@@ -46,8 +46,6 @@ function Admin() {
 				navigate("/#");
 			}
 		} catch (err) {
-			console.log();
-
 			setErrorMessage(
 				err.response?.data?.message || "Failed to logout! Try again."
 			);
diff --git a/frontend/src/Pages/Main.jsx b/frontend/src/Pages/Main.jsx
index 6dca3d9..4cb42ea 100644
--- a/frontend/src/Pages/Main.jsx
+++ b/frontend/src/Pages/Main.jsx
@@ -1,4 +1,3 @@
-// import Layout from "../components/Layout/Layout";
 import EmergeView from "../components/EmergeView";
 import Home from "../components/Home/Home";
 import About from "../components/About/About";
@@ -11,15 +10,12 @@ function Main() {
 			<EmergeView>
 				<Home />
 			</EmergeView>
-			<hr />
 			<EmergeView>
 				<About />
 			</EmergeView>
-			<hr />
 			<EmergeView>
 				<ProjectListing />
 			</EmergeView>
-			<hr />
 			<EmergeView>
 				<Contact />
 			</EmergeView>
diff --git a/frontend/src/adminComponents/AdminEditProject/AdminEditProject.css b/frontend/src/adminComponents/AdminEditProject/AdminEditProject.css
index b19d688..c7bb13a 100644
--- a/frontend/src/adminComponents/AdminEditProject/AdminEditProject.css
+++ b/frontend/src/adminComponents/AdminEditProject/AdminEditProject.css
@@ -42,8 +42,8 @@
 }
 
 .edit-container button {
-    width: 30%;
-    min-width: fit-content;
+    min-width: 150px;
+    width: 33%;
     align-self: center;
     background-color: rgb(26, 174, 68, 0.3);
     border-color: rgb(26, 174, 68, 1);
diff --git a/frontend/src/adminComponents/AdminEditProject/AdminEditProject.jsx b/frontend/src/adminComponents/AdminEditProject/AdminEditProject.jsx
index 0e629e9..b689ba3 100644
--- a/frontend/src/adminComponents/AdminEditProject/AdminEditProject.jsx
+++ b/frontend/src/adminComponents/AdminEditProject/AdminEditProject.jsx
@@ -23,11 +23,17 @@ function AdminEditProject({ projectObj, saveProject }) {
 	};
 
 	const handleFileChange = (e) => {
-		console.log(e.target);
-
 		const files = e.target.files;
+
 		setEditInfo({ ...editInfo, image: e.target.value });
 		setImageFile(files.length ? files[0] : null);
+
+		const reader = new FileReader();
+		reader.onload = () => {
+			console.log(reader.result);
+		};
+
+		reader.readAsArrayBuffer(files[0]);
 	};
 
 	return (
diff --git a/frontend/src/adminComponents/AdminProjectListing/AdminProjectListing.css b/frontend/src/adminComponents/AdminProjectListing/AdminProjectListing.css
index 07da681..fd27c29 100644
--- a/frontend/src/adminComponents/AdminProjectListing/AdminProjectListing.css
+++ b/frontend/src/adminComponents/AdminProjectListing/AdminProjectListing.css
@@ -1,9 +1,15 @@
+.buttons-container {
+    display: flex;
+    flex-flow: row nowrap;
+    overflow-x: auto;
+}
+
 .edit-button {
     display: flex;
     flex-flow: row nowrap;
     align-items: center;
     justify-content: center;
-    min-width: 50px;
+    min-width: fit-content;
     padding: 10px;
     height: 50px;
     border-radius: 10px;
diff --git a/frontend/src/adminComponents/AdminProjectListing/AdminProjectListing.jsx b/frontend/src/adminComponents/AdminProjectListing/AdminProjectListing.jsx
index db729d4..fb4aa0a 100644
--- a/frontend/src/adminComponents/AdminProjectListing/AdminProjectListing.jsx
+++ b/frontend/src/adminComponents/AdminProjectListing/AdminProjectListing.jsx
@@ -43,10 +43,15 @@ function AdminProjectListing({ role }) {
 		setEdit(false);
 	};
 
+	const handleSaveImage = async (file) => {
+		const reader = new FileReader();
+		reader.onload = () => {
+			console.log(reader.result);
+		};
+	};
+
 	const saveProject = async (projectObj) => {
 		try {
-			console.log("Inside save proj");
-
 			const file = projectObj.file;
 			const descriptionList =
 				projectObj?.description?.split("\n\n") || [];
@@ -60,8 +65,6 @@ function AdminProjectListing({ role }) {
 
 			console.log(file);
 
-			console.log(newProject);
-
 			const resp = await axios.post(
 				"http://localhost:3000/api/projects",
 				{
@@ -102,8 +105,6 @@ function AdminProjectListing({ role }) {
 
 		if (resp) {
 			try {
-				console.log(selectedProject);
-
 				const resp = await axios.delete(
 					`http://localhost:3000/api/projects/${selectedProject._id}`
 				);
diff --git a/frontend/src/components/Contact/Contact.css b/frontend/src/components/Contact/Contact.css
index 3a860bd..d8582fe 100644
--- a/frontend/src/components/Contact/Contact.css
+++ b/frontend/src/components/Contact/Contact.css
@@ -1,3 +1,7 @@
+#contact {
+    min-height: 100vh;
+}
+
 #contact > h2 {
     text-decoration: underline;
     font-size: 3rem;
@@ -7,7 +11,7 @@
 
 .contact-section {
     display: flex;
-    flex-direction: row;
+    /* flex-flow: row wrap; */
     justify-content: center;
     gap: 2rem;
 }
@@ -49,6 +53,11 @@ form button {
     transition: transform 0.3s ease-in-out, box-shadow 0.3s ease-in-out;
 }
 
+.contact-button {
+    align-self: center;
+    justify-self: center;
+}
+
 form button:hover {
     cursor: pointer;
     box-shadow: 0 0 20px rgba(252, 79, 79, 0.5);
@@ -87,4 +96,18 @@ input:focus, textarea:focus {
 
 .contact-link:hover {
     text-decoration: underline;
+}
+
+@media (width < 610px) {
+    .contact-section {
+        flex-flow: row wrap;
+    }
+
+    .section-item {
+        flex-basis: 100%;
+    }
+
+    .contact-info {
+        margin-top: 2rem;
+    }
 }
\ No newline at end of file
diff --git a/frontend/src/components/Contact/Contact.jsx b/frontend/src/components/Contact/Contact.jsx
index 2fa2111..2e43059 100644
--- a/frontend/src/components/Contact/Contact.jsx
+++ b/frontend/src/components/Contact/Contact.jsx
@@ -121,7 +121,7 @@ function Contact() {
 							required
 						></textarea>
 					</div>
-					<div style={{ display: "flex", flexFlow: "row nowrap" }}>
+					<div className="contact-button">
 						<button type="submit">Send message</button>
 						<div
 							style={{
diff --git a/frontend/src/components/Home/Home.css b/frontend/src/components/Home/Home.css
index dac43ea..ecffd0a 100644
--- a/frontend/src/components/Home/Home.css
+++ b/frontend/src/components/Home/Home.css
@@ -2,7 +2,7 @@
     background: none;
     border: none;
     width: 100%;
-    min-height: 80vh;
+    min-height: 100vh;
     border-radius: 0;
 
     opacity: 0;
@@ -24,7 +24,7 @@
 }
 
 #home h1 {
-    font-size: 3.5rem;
+    font-size: 3rem;
     margin-bottom: 2rem;
 }
 
@@ -41,7 +41,7 @@
 }
 
 .big-description {
-    font-size: 2.5rem;
+    font-size: 2.25rem;
 }
 
 .highlight {
@@ -51,8 +51,11 @@
 
 .link-container {
     display: flex;
+    margin-top: 3rem;
+    flex-flow: row wrap;
     align-items: center;
     justify-content: flex-start;
+    align-content: center;
     gap: 1rem;
 }
 
@@ -63,7 +66,6 @@
     gap: 1rem;
     max-width: 225px;
     padding: 1rem;
-    margin: 3rem 0;
     text-decoration: none; 
     background-color: var(--complement-color);
     border-radius: 50px;
diff --git a/frontend/src/components/Listing/TechListing.jsx b/frontend/src/components/Listing/TechListing.jsx
index 6fe56ce..5598e9d 100644
--- a/frontend/src/components/Listing/TechListing.jsx
+++ b/frontend/src/components/Listing/TechListing.jsx
@@ -1,58 +1,58 @@
-import ListingItem from './ListingItem';
+import ListingItem from "./ListingItem";
 
 function TechListing() {
-    return (
-        <section className="sectionInfo">
-            <h3>Developer Techs / Skills</h3>
-            <div className="listing">
-                <ListingItem
-                    link={'https://nodejs.org/en/'}
-                    imageName={"node.png"}
-                    name={"Node.js"}
-                />
-                <ListingItem
-                    link={"https://reactjs.org/"}
-                    imageName={"react.svg"}
-                    name={"React & React Native"}
-                />
-                <ListingItem
-                    link={"https://expressjs.com/"}
-                    imageName={"express.png"}
-                    name={"Express"}
-                />
-                <ListingItem
-                    link={"https://github.com/"}
-                    imageName={"github1.png"}
-                    name={"Github"}
-                />
-                <ListingItem
-                    link={"https://gitlab.com/"}
-                    imageName={"gitlab.svg"}
-                    name={"GitLab"}
-                />
-                <ListingItem
-                    link={"https://www.mongodb.com/"}
-                    imageName={"mongoDB.svg"}
-                    name={"MongoDB"}
-                />
-                <ListingItem
-                    link={"https://www.docker.com/"}
-                    imageName={"docker.svg"}
-                    name={"Docker"}
-                />
-                <ListingItem
-                    link={"https://www.linux.org/"}
-                    imageName={"linux.png"}
-                    name={"Linux"}
-                />
-                <ListingItem
-                    link={"https://git-scm.com/"}
-                    imageName={"git.png"}
-                    name={"Git"}
-                />
-            </div>
-        </section>
-    );
+	return (
+		<section className="sectionInfo">
+			<h3>Developer Techs & Skills</h3>
+			<div className="listing">
+				<ListingItem
+					link={"https://nodejs.org/en/"}
+					imageName={"node.png"}
+					name={"Node.js"}
+				/>
+				<ListingItem
+					link={"https://reactjs.org/"}
+					imageName={"react.svg"}
+					name={"React & React Native"}
+				/>
+				<ListingItem
+					link={"https://expressjs.com/"}
+					imageName={"express.png"}
+					name={"Express"}
+				/>
+				<ListingItem
+					link={"https://github.com/"}
+					imageName={"github1.png"}
+					name={"Github"}
+				/>
+				<ListingItem
+					link={"https://gitlab.com/"}
+					imageName={"gitlab.svg"}
+					name={"GitLab"}
+				/>
+				<ListingItem
+					link={"https://www.mongodb.com/"}
+					imageName={"mongoDB.svg"}
+					name={"MongoDB"}
+				/>
+				<ListingItem
+					link={"https://www.docker.com/"}
+					imageName={"docker.svg"}
+					name={"Docker"}
+				/>
+				<ListingItem
+					link={"https://www.linux.org/"}
+					imageName={"linux.png"}
+					name={"Linux"}
+				/>
+				<ListingItem
+					link={"https://git-scm.com/"}
+					imageName={"git.png"}
+					name={"Git"}
+				/>
+			</div>
+		</section>
+	);
 }
 
-export default TechListing;
\ No newline at end of file
+export default TechListing;
diff --git a/frontend/src/components/Navigation/Navbar.css b/frontend/src/components/Navigation/Navbar.css
index 950a1be..5628086 100644
--- a/frontend/src/components/Navigation/Navbar.css
+++ b/frontend/src/components/Navigation/Navbar.css
@@ -1,10 +1,10 @@
 nav {
-    height: 100px;
+    padding: 2rem;
     display: flex;
     gap: 2rem;
     align-items: center;
     justify-content: center;
-    padding-inline: 2rem;
+    /* padding-inline: 2rem; */
 
     animation: emerge 1s ease-out 0s 1 normal forwards;
 }
@@ -18,20 +18,22 @@ nav {
     text-decoration: none;
 }
 
-.nav-item a img {
-    width: 35px;
-    height: 35px;
-    vertical-align: middle;
-    padding: 2px;
-    border-radius: 50%;
-}
-
-.nav-item a img:hover {
-    filter: brightness(0.5);
-}
-
 .nav-item a:hover {
     color: var(--nav-hover-color);
     text-decoration: underline;
     text-shadow: 0 0 2px var(--nav-hover-color);
+}
+
+@media (width <= 550px) {
+    nav {
+        gap: 1.5rem;
+        padding-inline: 1rem;
+    }
+}
+
+@media (width <= 375px) {
+    nav {
+        gap: 1rem;
+        padding-inline: 1rem;
+    }
 }
\ No newline at end of file
diff --git a/frontend/src/components/Navigation/Navbar.jsx b/frontend/src/components/Navigation/Navbar.jsx
index c9806f2..1e419b2 100644
--- a/frontend/src/components/Navigation/Navbar.jsx
+++ b/frontend/src/components/Navigation/Navbar.jsx
@@ -2,6 +2,8 @@ import "./Navbar.css";
 
 // TODO: fix position of LinkendIn icon to end
 function Navbar() {
+	// console.log(window.innerWidth);
+
 	return (
 		<nav>
 			<p className="nav-item">
diff --git a/frontend/src/components/ProjectListing/Project.css b/frontend/src/components/ProjectListing/Project.css
index 243aef1..38a6b9c 100644
--- a/frontend/src/components/ProjectListing/Project.css
+++ b/frontend/src/components/ProjectListing/Project.css
@@ -12,7 +12,8 @@
 }
 
 .project img {
-    max-height: 300px;
+    max-width: 250px;
+    height: auto;
     display: block;
     margin-inline: auto;
     margin-bottom: 2rem;
@@ -45,3 +46,17 @@
 .project a:hover {
     color: var(--nav-hover-color);
 }
+
+@media (width <= 550px) {
+    .project img {
+        max-width: 200px;
+        height: auto;
+    }
+}
+
+@media (width <= 375px) {
+    .project img {
+        max-width: 150px;
+        height: auto;
+    }
+}
\ No newline at end of file
diff --git a/frontend/src/components/ProjectListing/Project.jsx b/frontend/src/components/ProjectListing/Project.jsx
index b806570..698aa05 100644
--- a/frontend/src/components/ProjectListing/Project.jsx
+++ b/frontend/src/components/ProjectListing/Project.jsx
@@ -1,13 +1,37 @@
+// import { useEffect, useState } from "react";
+// import axios from "axios";
 import "./Project.css";
 
 function Project({ name, image, description, link }) {
+	// const [url, setUrl] = useState("/images/noimage.jpg");
+
+	// useEffect(() => {
+	// 	const createUrl = async () => {
+	// 		const name = `${image[0]}-${image[1]}`;
+	// 		try {
+	// 			const resp = await axios.get(
+	// 				`http://localhost:3000/api/uploads/images/${name}`,
+	// 				{ timeout: 5000 }
+	// 			);
+
+	// 			setUrl(resp.data.data);
+	// 		} catch (err) {
+	// 			console.error(err.message);
+	// 		}
+	// 	};
+
+	// 	createUrl();
+	// }, []);
+
+	// console.log(`Image url: ${url}`);
+
 	return (
 		<section className="project">
 			<h3>{name}</h3>
 
 			<div className="projectInfo">
 				<img
-					src={`/images/projectImages/${image}`}
+					src={`/images/projectImages/${image[1]}`}
 					alt={name}
 					height={300}
 					loading="lazy"
diff --git a/frontend/src/components/ProjectListing/ProjectListing.jsx b/frontend/src/components/ProjectListing/ProjectListing.jsx
index f7765dc..72631b6 100644
--- a/frontend/src/components/ProjectListing/ProjectListing.jsx
+++ b/frontend/src/components/ProjectListing/ProjectListing.jsx
@@ -11,6 +11,7 @@ function ProjectListing() {
 	const [errorMessage, setErrorMessage] = useState("");
 	const [projects, setProjects] = useState([]);
 	const [projectIndex, setProjectIndex] = useState(0);
+	// const [imageUrls, setImageUrls] = useState([]);
 
 	useEffect(() => {
 		const handleGetProjects = async () => {
@@ -23,7 +24,7 @@ function ProjectListing() {
 				);
 
 				setProjects(result.data.data);
-				setIsLoading(false);
+				// return result.data.data;
 			} catch (err) {
 				console.error(`ERROR: ${err.message}`);
 				setErrorMessage("Could not get project info.");

From e3dd3e012231b5b56e80fab2b1da16504272b54a Mon Sep 17 00:00:00 2001
From: arauta12 <andreirauta234@gmail.com>
Date: Tue, 29 Jul 2025 17:17:35 -0400
Subject: [PATCH 05/12] Add project controller tests

---
 backend/controllers/project.controller.js |  43 +-
 backend/package.json                      |   1 +
 backend/tests/project.test.js             | 504 +++++++++++++++++++++-
 3 files changed, 520 insertions(+), 28 deletions(-)

diff --git a/backend/controllers/project.controller.js b/backend/controllers/project.controller.js
index 12a05cb..6607a56 100644
--- a/backend/controllers/project.controller.js
+++ b/backend/controllers/project.controller.js
@@ -38,10 +38,16 @@ const getAllProjects = async (req, res) => {
  * @returns All project data
  */
 const getProject = async (req, res) => {
+    if (!req.params?.id)
+        return res.status(400).json({ status: "failed", message: "Missing id!" });
+
     const { id } = req.params;
 
     try {
         const project = await Project.findById(id);
+        if (!project)
+            return res.status(400).json({ status: "failed", message: "No such project!" });
+
         return res.status(200).json({ status: "success", data: project });
     } catch (err) {
         console.error(chalk.red(`PROJECT ROUTE ERROR: ${err.message}!`));
@@ -54,13 +60,17 @@ const getProject = async (req, res) => {
  * @returns New project's name and show in a data object
  */
 const createProject = async (req, res) => {
-    const { data = {} } = req.body;
-    const { name, image, description, link, show } = data;
+    if (!req.body?.data)
+        return res.status(400).json({ status: "failed", message: "Missing required fields!" });
+
+    const { data } = req.body;
 
     try {
-        if (!name || !description || !link)
+        if (!data?.name || !data.description || !data.link)
             return res.status(400).json({ status: "failed", message: "Missing required fields!" });
 
+        const { name, image, description, link, show } = data;
+
         const newProject = await Project.create({ name, image, description, link, show });
         return res.status(201).json({ status: "success", data: { name, show, id: newProject._id } });
     } catch (err) {
@@ -74,11 +84,17 @@ const createProject = async (req, res) => {
  * @returns Deleted project's name and show in a data object
  */
 const deleteProject = async (req, res) => {
+    if (!req.params?.id)
+        return res.status(400).json({ status: "failed", message: "Missing id!" });
+
     const { id } = req.params;
 
     try {
-        const { name, show } = await Project.findByIdAndDelete(id);
-        return res.status(200).json({ status: "success", data: { name, show } });
+        const deletedProject = await Project.findByIdAndDelete(id);
+        if (!deletedProject)
+            return res.status(400).json({ status: "failed", message: "No such project!" });
+
+        return res.status(200).json({ status: "success", data: { name: deletedProject.name, show: deletedProject.show } });
     } catch (err) {
         console.error(chalk.red(`PROJECT ROUTE ERROR: ${err.message}!`));
         return res.status(500).json({ status: "failed", message: "Something went wrong. Try again." });
@@ -92,11 +108,24 @@ const deleteProject = async (req, res) => {
  * @returns Updated project's name and show in a data object
  */
 const updateProject = async (req, res) => {
+    if (!req.params?.id)
+        return res.status(400).json({ status: "failed", message: "Missing id!" });
+
     const { id } = req.params;
-    const { data } = req.body;
+    const { data } = req.body ?? { data: {} };
+
+    const prohibitedFields = [ "_id", "__v", "createdAt", "updatedAt" ];
+
+    prohibitedFields.forEach(key => {
+        if (data && key in data)
+            delete data[ key ];
+    });
 
     try {
-        const project = await Project.findByIdAndUpdate(id, data);
+        const project = await Project.findByIdAndUpdate(id, data, { new: true });
+        if (!project)
+            return res.status(400).json({ status: "failed", message: "No such project!" });
+
         return res.status(200).json({ status: "success", data: { name: project.name, show: project.show } });
     } catch (err) {
         console.error(chalk.red(`PROJECT ROUTE ERROR: ${err.message}!`));
diff --git a/backend/package.json b/backend/package.json
index bedbad8..d06388f 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -3,6 +3,7 @@
   "version": "1.0.0",
   "main": "index.js",
   "scripts": {
+    "coverage": "jest --coverage=true",
     "test": "jest",
     "dev": "nodemon .",
     "start": "node ."
diff --git a/backend/tests/project.test.js b/backend/tests/project.test.js
index 5ec7868..e8e2c9f 100644
--- a/backend/tests/project.test.js
+++ b/backend/tests/project.test.js
@@ -1,33 +1,495 @@
 const Project = require('../models/project.model.js');
 const projectControl = require('../controllers/project.controller.js');
+const mockProjects = require('./mockProjects.js');
+const chalk = require('chalk');
 
-const excludeOutFields = (arr, fields) => {
-    const newArr = arr.map(item => {
-        return Object.fromEntries(
-            Object.entries(item).filter(key => {
-                return !(fields.includes(key));
-            })
-        );
+jest.mock('../models/project.model.js');
+
+// TODO test coverage for display projects
+describe('Get public projects', () => {
+
+    const res = { status: jest.fn().mockReturnThis(), json: jest.fn().mockReturnThis() };
+
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    test('should retrieve public projects and hide internal details', async () => {
+        const req = {};
+        const expectedProjects = mockProjects.map(project => {
+            const { _id, __v, ...filteredProject } = project;
+            if (project.show)
+                return filteredProject;
+        });
+
+        console.log(expectedProjects);
+
+
+        Project.find.mockImplementation(async ({ show }, hideAttributes) => {
+            const hiddenAttributes = hideAttributes.split(" ").map(key => key.substring(1));
+
+            const displayProjects = mockProjects.map(project => {
+                const modifiedProject = { ...project };
+
+                hiddenAttributes.forEach(key => {
+                    if (key in modifiedProject)
+                        delete modifiedProject[ key ];
+                });
+                if (show == modifiedProject.show)
+                    return modifiedProject;
+            });
+
+            return displayProjects;
+        });
+
+        const resp = await projectControl.getDisplayProjects(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(200);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "success", data: expectedProjects });
+    });
+
+    test('should catch error', async () => {
+        const req = {};
+        Project.find.mockRejectedValue(new Error("something")).mockName('projectFind');
+        const consoleSpy = jest.spyOn(console, "error").mockImplementation(() => { });
+
+        const resp = await projectControl.getDisplayProjects(req, res);
+
+        expect(consoleSpy.mock.calls).toHaveLength(1);
+        expect(consoleSpy.mock.calls[ 0 ][ 0 ]).toBe(chalk.red(`PROJECT ROUTE ERROR: something!`));
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(500);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "Something went wrong. Try again." });
+    });
+});
+
+
+describe('Get all projects', () => {
+
+    const res = { status: jest.fn().mockReturnThis(), json: jest.fn().mockReturnThis() };
+
+    afterEach(() => {
+        jest.clearAllMocks();
     });
 
-    return newArr;
-};
+    test('should succeed', async () => {
+        const req = {};
+        Project.find.mockResolvedValue(mockProjects).mockName('projectFind');
+
+        const resp = await projectControl.getAllProjects(req, res);
 
-describe('Project Controllers', () => {
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(200);
 
-    const mockRes = {
-        status: jest.fn().mockReturnThis(),
-        json: jest.fn().mockReturnThis(),
-    };
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "success", data: mockProjects });
+    });
 
-    test('should get all projects', async () => {
-        const rawData = require('./mockProjects.js');
-        const mockReq = {};
-        const projects = await projectControl.getAllProjects(mockReq, mockRes);
+    test('should throw error', async () => {
+        const req = {};
+        Project.find.mockRejectedValue(new Error("something")).mockName('projectFind');
+        const consoleSpy = jest.spyOn(console, "error").mockImplementation(() => { });
 
-        expect(projects).toStrictEqual(rawData);
-        expect(mockRes.status).toHaveBeenCalledWith(200);
-        expect(mockRes.json).toHaveBeenCalledWith(rawData);
+        const resp = await projectControl.getAllProjects(req, res);
+
+        expect(consoleSpy.mock.calls).toHaveLength(1);
+        expect(consoleSpy.mock.calls[ 0 ][ 0 ]).toBe(chalk.red(`PROJECT ROUTE ERROR: something!`));
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(500);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "Something went wrong. Try again." });
     });
 
 });
+
+describe('Get a project', () => {
+
+    const res = { status: jest.fn().mockReturnThis(), json: jest.fn().mockReturnThis() };
+
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    test('should return valid project', async () => {
+        const id = "3828272C06418043D9B5DEF2";
+        const req = { params: { id } };
+        const expectedProject = mockProjects.find(item => item._id == id);
+        Project.findById.mockResolvedValue(expectedProject);
+
+        const resp = await projectControl.getProject(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(200);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "success", data: expectedProject });
+    });
+
+    test('should not find a project', async () => {
+        const id = "10101";
+        const req = { params: { id } };
+        Project.findById.mockResolvedValue(null);
+
+        const resp = await projectControl.getProject(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(400);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "No such project!" });
+    });
+
+    test('should have no params', async () => {
+        const req = {};
+        Project.findById.mockResolvedValue(null);
+
+        const resp = await projectControl.getProject(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(400);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "Missing id!" });
+    });
+
+    test('should check if id is undefined', async () => {
+        const req = { params: {} };
+
+        const resp = await projectControl.getProject(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(400);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "Missing id!" });
+    });
+
+    test('should be an ID cast error', async () => {
+        const req = { params: { id: "stuff" } };
+
+        Project.findById.mockRejectedValue(new Error("unable to cast id")).mockName('projectFindById');
+        const consoleSpy = jest.spyOn(console, "error").mockImplementation(() => { });
+
+        const resp = await projectControl.getProject(req, res);
+
+        expect(consoleSpy.mock.calls).toHaveLength(1);
+        expect(consoleSpy.mock.calls[ 0 ][ 0 ]).toBe(chalk.red(`PROJECT ROUTE ERROR: unable to cast id!`));
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(500);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "Something went wrong. Try again." });
+    });
+});
+
+describe('Create a project', () => {
+
+    const res = { status: jest.fn().mockReturnThis(), json: jest.fn().mockReturnThis() };
+
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    test('should successfully create project', async () => {
+        const newProjectData = { name: "name1", image: "img.png", description: [ "1", "2" ], link: "http://localhost", show: false };
+        const req = {
+            body: {
+                data: newProjectData
+            }
+        };
+        const createdProject = { ...newProjectData, "_id": "6D7B8758EA8E0534304C5BD0", "__v": 0 };
+        Project.create.mockResolvedValue(createdProject);
+
+        const resp = await projectControl.createProject(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(201);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "success", data: { name: createdProject.name, show: createdProject.show, id: createdProject._id } });
+    });
+
+    test('should be required missing fields', async () => {
+        const newProjectData = { image: "img.png", description: [ "1", "2" ], link: "http://localhost", show: false };
+        const req = {
+            body: {
+                data: newProjectData
+            }
+        };
+
+        Project.create.mockRejectedValue(new Error("Missing required fields!"));
+
+        const resp = await projectControl.createProject(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(400);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "Missing required fields!" });
+    });
+
+    test('should have no req body', async () => {
+        const req = {};
+
+        Project.create.mockRejectedValue(new Error("Missing required fields!"));
+
+        const resp = await projectControl.createProject(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(400);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "Missing required fields!" });
+    });
+
+    test('should handle error', async () => {
+        const newProjectData = { name: "name", image: "img.png", description: [ "1", "2" ], link: "http://localhost", show: false };
+        const req = {
+            body: {
+                data: newProjectData
+            }
+        };
+
+        Project.create.mockRejectedValue(new Error("Network error"));
+        const consoleSpy = jest.spyOn(console, "error").mockImplementation(() => { });
+
+        const resp = await projectControl.createProject(req, res);
+
+        expect(consoleSpy.mock.calls).toHaveLength(1);
+        expect(consoleSpy.mock.calls[ 0 ][ 0 ]).toBe(chalk.red(`PROJECT ROUTE ERROR: Network error!`));
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(500);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "Something went wrong. Try again." });
+    });
+
+});
+
+describe('Delete a project', () => {
+    const res = { status: jest.fn().mockReturnThis(), json: jest.fn().mockReturnThis() };
+
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    test('should return deleted project', async () => {
+        const id = "1F2ECE8189710476FB8021DF";
+        const req = { params: { id } };
+        const expectedProject = mockProjects.find(item => item._id == id);
+        Project.findByIdAndDelete.mockResolvedValue(expectedProject);
+
+        const resp = await projectControl.deleteProject(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(200);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "success", data: { name: expectedProject.name, show: expectedProject.show } });
+    });
+
+    test('should not find a project to delete', async () => {
+        const id = "10101";
+        const req = { params: { id } };
+        Project.findByIdAndDelete.mockResolvedValue(null);
+
+        const resp = await projectControl.deleteProject(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(400);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "No such project!" });
+    });
+
+    test('should check if id is undefined', async () => {
+        const req = { params: {} };
+        Project.findByIdAndDelete.mockResolvedValue(null);
+
+        const resp = await projectControl.deleteProject(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(400);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "Missing id!" });
+    });
+
+    test('should be an ID cast error', async () => {
+        const req = { params: { id: "stuff" } };
+
+        Project.findByIdAndDelete.mockRejectedValue(new Error("unable to cast id")).mockName('projectFindByIdAndDelete');
+        const consoleSpy = jest.spyOn(console, "error").mockImplementation(() => { });
+
+        const resp = await projectControl.deleteProject(req, res);
+
+        expect(consoleSpy.mock.calls).toHaveLength(1);
+        expect(consoleSpy.mock.calls[ 0 ][ 0 ]).toBe(chalk.red(`PROJECT ROUTE ERROR: unable to cast id!`));
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(500);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "Something went wrong. Try again." });
+    });
+});
+
+describe('Update a project', () => {
+    const res = { status: jest.fn().mockReturnThis(), json: jest.fn().mockReturnThis() };
+
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    test('should successfully update project', async () => {
+        const req = { params: { id: "6974576B526AC6FB45272692" }, body: { data: { link: "https://www.google.com", image: "noimage.jpg", show: true } } };
+
+        const editedProject = { ...mockProjects.find(item => item._id == req.params.id), ...req.body.data };
+        Project.findByIdAndUpdate.mockResolvedValue(editedProject);
+
+        const resp = await projectControl.updateProject(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(200);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "success", data: { name: editedProject.name, show: editedProject.show } });
+    });
+
+    test('should be missing id', async () => {
+        const req = { params: {}, body: { data: { link: "https://www.google.com", image: "noimage.jpg", show: true } } };
+
+        Project.findByIdAndUpdate.mockResolvedValue(null);
+
+        const resp = await projectControl.updateProject(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(400);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "Missing id!" });
+    });
+
+    test('should keep project when no data', async () => {
+        // data object not present at all
+        const req = { params: { id: "6974576B526AC6FB45272692" }, body: {} };
+        let mockProjectsCopy = mockProjects;
+        let newProject;
+
+        const expectedNewProject = mockProjects.find(item => item._id == req.params.id);
+        Project.findByIdAndUpdate.mockImplementation(async (id, data, options) => {
+            const i = mockProjectsCopy.findIndex(item => item._id == id);
+            newProject = { ...mockProjectsCopy[ i ], ...data };
+            mockProjectsCopy[ i ] = newProject;
+
+            return (options.new) ? newProject : originalProject;
+        });
+
+        const resp = await projectControl.updateProject(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(200);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "success", data: { name: expectedNewProject.name, show: expectedNewProject.show } });
+
+        expect(newProject).toStrictEqual(expectedNewProject);
+    });
+
+    test('should keep project no body', async () => {
+        // data object not present at all
+        const req = { params: { id: "6974576B526AC6FB45272692" } };
+        let mockProjectsCopy = mockProjects;
+        let newProject;
+
+        const expectedNewProject = mockProjects.find(item => item._id == req.params.id);
+        Project.findByIdAndUpdate.mockImplementation(async (id, data, options) => {
+            const i = mockProjectsCopy.findIndex(item => item._id == id);
+            newProject = { ...mockProjectsCopy[ i ], ...data };
+            mockProjectsCopy[ i ] = newProject;
+
+            return (options.new) ? newProject : originalProject;
+        });
+
+        const resp = await projectControl.updateProject(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(200);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "success", data: { name: expectedNewProject.name, show: expectedNewProject.show } });
+
+        expect(newProject).toStrictEqual(expectedNewProject);
+    });
+
+    test('should be unable to find project', async () => {
+        const req = { params: { id: "6974" }, body: { data: { link: "https://www.google.com", image: "noimage.jpg", show: true } } };
+        Project.findByIdAndUpdate.mockResolvedValue(null);
+
+        const resp = await projectControl.updateProject(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(400);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "No such project!" });
+    });
+
+    test('should be unable to modify id or internal version', async () => {
+        const req = { params: { id: "6974576B526AC6FB45272692" }, body: { data: { _id: "123", __v: 1, createdAt: "0", updatedAt: "1" } } };
+        let mockProjectsCopy = mockProjects;
+
+        const index = mockProjectsCopy.findIndex(item => item._id == req.params.id);
+        expect(index).not.toBe(-1);
+
+        const originalProject = mockProjectsCopy[ index ];
+        let newProject;
+        Project.findByIdAndUpdate.mockImplementation(async (id, data, options) => {
+            const i = mockProjectsCopy.findIndex(item => item._id == id);
+            newProject = { ...mockProjectsCopy[ i ], ...data };
+            mockProjectsCopy[ i ] = newProject;
+
+            return (options.new) ? newProject : originalProject;
+        });
+
+        const resp = await projectControl.updateProject(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(200);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "success", data: { name: originalProject.name, show: originalProject.show } });
+
+        expect(newProject).toStrictEqual(originalProject);
+    });
+
+    test('should handle (id) error', async () => {
+        const req = { params: { id: "stuff" }, body: { data: { name: "123" } } };
+
+        Project.findByIdAndUpdate.mockRejectedValue(new Error("unable to cast id")).mockName('projectFindByIdAndUpdate');
+        const consoleSpy = jest.spyOn(console, "error").mockImplementation(() => { });
+
+        const resp = await projectControl.updateProject(req, res);
+
+        expect(consoleSpy.mock.calls).toHaveLength(1);
+        expect(consoleSpy.mock.calls[ 0 ][ 0 ]).toBe(chalk.red(`PROJECT ROUTE ERROR: unable to cast id!`));
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(500);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "Something went wrong. Try again." });
+    });
+})
+
+

From 062998c292240c54b6192c07b4da38414db031a8 Mon Sep 17 00:00:00 2001
From: arauta12 <andreirauta234@gmail.com>
Date: Tue, 29 Jul 2025 17:19:01 -0400
Subject: [PATCH 06/12] Modify gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 73423c7..cb22775 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,5 +6,6 @@ frontend/TODO.md
 frontend/coverage
 
 backend/node_modules/
+backend/coverage
 backend/logs/
 backend/uploads
\ No newline at end of file

From 1f3473a04c19993be61dd53e6b82a96e996c75ea Mon Sep 17 00:00:00 2001
From: arauta12 <andreirauta234@gmail.com>
Date: Thu, 31 Jul 2025 14:56:17 -0400
Subject: [PATCH 07/12] Finish login test & add github CI pipeline

---
 .github/workflows/ci.yml                  |  27 ++
 backend/controllers/auth.controller.js    |  36 ++-
 backend/controllers/message.controller.js |   6 +-
 backend/routes/user.route.js              |   3 +
 backend/tests/auth.test.js                | 299 ++++++++++++++++++++++
 backend/tests/message.test.js             | 167 +++++++++++-
 backend/tests/mockMessages.js             |  58 +++++
 backend/tests/mockUsers.js                |  36 +++
 backend/tests/project.test.js             |   4 -
 frontend/TODO.md                          |  12 -
 package.json                              |   3 +-
 11 files changed, 616 insertions(+), 35 deletions(-)
 create mode 100644 .github/workflows/ci.yml
 create mode 100644 backend/tests/auth.test.js
 create mode 100644 backend/tests/mockMessages.js
 create mode 100644 backend/tests/mockUsers.js
 delete mode 100644 frontend/TODO.md

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..6ab6d2e
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,27 @@
+name: CI Pipeline
+on:
+    push:
+        branches:
+            - staging
+            - main
+    pull_request:
+        branches:
+            - main
+    workflow_dispatch:
+jobs:
+    build:
+        runs-on: ubuntu-latest
+        name: Building
+        steps:
+            - uses: actions/checkout@v4
+
+            - name: Create NodeJS env
+              uses: actions/setup-node@v4
+              with:
+                  node-version: 22.x
+
+            - name: Install packages
+              run: npm ci && npm ci --prefix frontend && npm ci --prefix backend
+
+            - name: Run tests
+              run: npm test
diff --git a/backend/controllers/auth.controller.js b/backend/controllers/auth.controller.js
index cd19af2..a7648bd 100644
--- a/backend/controllers/auth.controller.js
+++ b/backend/controllers/auth.controller.js
@@ -13,7 +13,7 @@ const verifyToken = async (req, res, next) => {
         const { exp, username, role } = jwt.verify(jwtToken, process.env.JWT_SECRET);
         const existingUser = await User.findOne({ username, role });
 
-        if (!existingUser || !existingUser.loggedIn)
+        if (!existingUser || !existingUser.loggedIn || (exp <= (Math.ceil(Date.now() / 1000))))
             return res.status(401).json({ status: "failed", message: "Unauthorized!" });
 
         req.locals = role;
@@ -65,29 +65,32 @@ const login = async (req, res) => {
         const jwtToken = req.cookies.jwt_token;
 
         if (jwtToken) {
+
             const jwtData = jwt.verify(jwtToken, process.env.JWT_SECRET);
 
             const { exp, username, role } = jwtData;
             const existingUser = await User.findOne({ username, role });
 
             if (existingUser && existingUser.loggedIn) {
-                const expired = (exp <= (Math.ceil(Date.now() / 1000)));
-                if (!expired) {
-                    return res.status(200).json({ status: "success", data: { username: jwtData.username, role: jwtData.role } });
-                }
+                return res.status(200).json({ status: "success", data: { username: jwtData.username, role: jwtData.role } });
             }
         }
+    } catch (err) {
+        res.clearCookie("jwt_token");
+    }
 
+    try {
         if (!data || !username || !password)
             return res.status(400).json({ status: "failed", message: "Missing username or password!" });
 
         const user = await User.findOne({ username });
+
         const passwordCompare = await bcrypt.compare(password, user?.password || "");
 
         if (!user || !passwordCompare)
             return res.status(401).json({ status: "failed", message: "Invalid credentials!" });
 
-        const token = await jwt.sign({ username, role: user.role }, process.env.JWT_SECRET, {
+        const token = jwt.sign({ username, role: user.role }, process.env.JWT_SECRET, {
             expiresIn: '10h',
         });
 
@@ -103,25 +106,36 @@ const login = async (req, res) => {
 
         return res.status(200).json({ status: "success", data: { username, role: user.role } });
     } catch (err) {
-        console.error(chalk.red(`ERROR Login: ${err.message}`));
-        return res.status(500).json({ status: "failed", message: "Something went wrong! Try again." });
+        console.error(chalk.red(`LOGIN ERROR: ${err.message}`));
+        return res.status(500).json({ status: "failed", message: "Something went wrong. Try again." });
     }
 };
 
 const logout = async (req, res) => {
+    if (!req.cookies?.jwt_token)
+        return res.status(401).json({ status: "failed", message: "Invalid credentials." });
+
+    const jwtString = req.cookies.jwt_token;
+
+    let jwtData = {};
+
     try {
-        const jwtString = req.cookies.jwt_token;
-        const jwtData = jwt.verify(jwtString, process.env.JWT_SECRET);
+        jwtData = jwt.verify(jwtString, process.env.JWT_SECRET);
 
-        if (!jwtData.username || !jwtData.role)
+        if (!jwtData?.username || !jwtData.role)
             return res.status(401).json({ status: "failed", message: "Invalid credentials." });
+    } catch (err) {
+        return res.status(401).json({ status: "failed", message: "Invalid credentials." });
+    }
 
+    try {
         const user = await User.findOne({ username: jwtData.username, role: jwtData.role });
         if (!user)
             return res.status(401).json({ status: "failed", message: "Invalid credentials." });
 
         user.loggedIn = false;
         res.clearCookie("jwt_token");
+
         return res.status(200).json({ status: "success", data: user.username });
     } catch (err) {
         console.error(chalk.red(`ERROR Logout: ${err.message}`));
diff --git a/backend/controllers/message.controller.js b/backend/controllers/message.controller.js
index 06445cb..00c55ff 100644
--- a/backend/controllers/message.controller.js
+++ b/backend/controllers/message.controller.js
@@ -1,4 +1,5 @@
 const Message = require('../models/message.model');
+const chalk = require('chalk');
 
 /**
  * Get all messages
@@ -20,7 +21,10 @@ const getMessages = async (req, res) => {
 
 
 const createMessage = async (req, res) => {
-    const { data = {} } = req.body;
+    if (!req.body?.data)
+        return res.status(400).json({ status: "failed", message: "Missing required fields!" });
+
+    const { data } = req.body;
     const { name, email, contents } = data;
 
     try {
diff --git a/backend/routes/user.route.js b/backend/routes/user.route.js
index 6e366b1..6e80b97 100644
--- a/backend/routes/user.route.js
+++ b/backend/routes/user.route.js
@@ -1,9 +1,12 @@
 const express = require('express');
 const userControl = require('../controllers/user.controller');
+const { verifyToken, verifyAdmin } = require('../controllers/auth.controller');
 const User = require('../models/user.model');
 
 const router = express.Router();
 
+router.use(verifyToken);
+router.use(verifyAdmin);
 router.route('/')
     .get(userControl.getAllUsers)
     .post(userControl.createUser);
diff --git a/backend/tests/auth.test.js b/backend/tests/auth.test.js
new file mode 100644
index 0000000..f2663e2
--- /dev/null
+++ b/backend/tests/auth.test.js
@@ -0,0 +1,299 @@
+const User = require('../models/user.model');
+const bcrypt = require('bcryptjs');
+const jwt = require('jsonwebtoken');
+const chalk = require('chalk');
+const authControls = require('../controllers/auth.controller');
+const mockUsers = require('./mockUsers');
+
+jest.mock('../models/user.model');
+jest.mock('bcryptjs');
+jest.mock('jsonwebtoken');
+
+beforeAll(() => {
+    bcrypt.compare.mockImplementation(async (pass1, pass2) => {
+        return pass1 === pass2;
+    });
+});
+
+afterAll(() => {
+    jest.resetAllMocks();
+});
+
+describe('login test', () => {
+
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    const res = {
+        status: jest.fn().mockReturnThis(),
+        json: jest.fn().mockReturnThis(),
+        clearCookie: jest.fn(),
+        cookie: jest.fn(),
+    };
+
+    test('should login with name and password', async () => {
+        const username = mockUsers[ 0 ].username;
+        const password = mockUsers[ 0 ].password;
+        const user = { ...mockUsers[ 0 ], save: jest.fn().mockResolvedValue(true) };
+        const req = { body: { data: { username, password } }, cookies: {} };
+
+        User.findOne.mockResolvedValue(user);
+        jwt.sign.mockReturnValue("token testx");
+        const resp = await authControls.login(req, res);
+        expect(bcrypt.compare.mock.calls).toHaveLength(1);
+        expect(bcrypt.compare.mock.calls[ 0 ]).toStrictEqual([ password, user.password ]);
+
+        expect(jwt.sign.mock.calls).toHaveLength(1);
+        expect(jwt.sign.mock.calls[ 0 ]).toStrictEqual([ { username, role: mockUsers[ 0 ].role }, process.env.JWT_SECRET, { expiresIn: '10h' } ]);
+
+        expect(user.save).toHaveBeenCalled();
+
+        expect(res.clearCookie.mock.calls).toHaveLength(1);
+        expect(res.cookie.mock.calls).toHaveLength(1);
+        expect(res.cookie.mock.calls[ 0 ][ 1 ]).toBe("token testx");
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(200);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "success", data: { username, role: mockUsers[ 0 ].role } });
+    });
+
+    test('should fail login without password or username', async () => {
+        const req = { body: { data: { username: "hi" } }, cookies: {} };
+
+        User.findOne.mockRejectedValue(null);
+
+        const resp = await authControls.login(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(400);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "Missing username or password!" });
+    });
+
+    test('should fail with invalid username', async () => {
+        const req = { body: { data: { username: "hi", password: "0eej" } }, cookies: {} };
+
+        User.findOne.mockResolvedValue(null);
+
+        const resp = await authControls.login(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(401);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "Invalid credentials!" });
+    });
+
+    test('should fail with wrong password', async () => {
+        const req = { body: { data: { username: mockUsers[ 0 ].username, password: "wrong" } }, cookies: {} };
+
+        User.findOne.mockResolvedValue(mockUsers[ 0 ].username);
+
+        const resp = await authControls.login(req, res);
+
+        expect(bcrypt.compare.mock.calls).toHaveLength(1);
+        expect(await bcrypt.compare.mock.results[ 0 ].value).toBe(false);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(401);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "Invalid credentials!" });
+
+    });
+
+    test('should fail login without data object', async () => {
+        const req = { body: {}, cookies: { jwt_token: "" } };
+
+        User.findOne.mockResolvedValue(null);
+
+        const resp = await authControls.login(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(400);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "Missing username or password!" });
+    });
+
+    test('should fail login with empty data', async () => {
+        const req = { body: { data: {} }, cookies: { jwt_token: "" } };
+
+        User.findOne.mockResolvedValue(null);
+
+        const resp = await authControls.login(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(400);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "Missing username or password!" });
+    });
+
+    test('should login with valid jwtToken', async () => {
+        const req = { body: {}, cookies: { jwt_token: "tokenxx" } };
+        const user = mockUsers[ 0 ];
+
+        User.findOne.mockResolvedValue(user);
+        jwt.verify.mockReturnValue({ exp: Math.ceil(Date.now() / 1000) + 10, username: user.username, role: user.role });
+
+        const resp = await authControls.login(req, res);
+
+        expect(jwt.verify.mock.calls).toHaveLength(1);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(200);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "success", data: { username: user.username, role: user.role } });
+    });
+
+    test('should login with user & pass with expired token', async () => {
+        const username = mockUsers[ 0 ].username;
+        const password = mockUsers[ 0 ].password;
+        const user = { ...mockUsers[ 0 ], save: jest.fn().mockResolvedValue(true) };
+        const req = { body: { data: { username, password } }, cookies: { jwt_token: "invalidated" } };
+
+        User.findOne.mockResolvedValue(user);
+        jwt.sign.mockReturnValue("token testx");
+        jwt.verify.mockImplementation(() => { throw new Error("Expired token"); });
+        const resp = await authControls.login(req, res);
+
+        expect(jwt.verify.mock.calls).toHaveLength(1);
+
+        expect(res.clearCookie.mock.calls).toHaveLength(2);
+        expect(res.cookie.mock.calls).toHaveLength(1);
+        expect(res.cookie.mock.calls[ 0 ][ 1 ]).toBe("token testx");
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(200);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "success", data: { username, role: mockUsers[ 0 ].role } });
+    });
+
+    test('should fail with invalid user & pass with expired token', async () => {
+        const username = mockUsers[ 0 ].username;
+        const password = "wrong pass";
+        const user = { ...mockUsers[ 0 ], save: jest.fn().mockResolvedValue(true) };
+        const req = { body: { data: { username, password } }, cookies: { jwt_token: "invalidated" } };
+
+        User.findOne.mockResolvedValue(user);
+        jwt.sign.mockReturnValue("token testx");
+        jwt.verify.mockImplementation(() => { throw new Error("Expired token"); });
+        const resp = await authControls.login(req, res);
+
+        expect(jwt.verify.mock.calls).toHaveLength(1);
+
+        expect(bcrypt.compare.mock.calls).toHaveLength(1);
+        expect(bcrypt.compare.mock.calls[ 0 ]).toStrictEqual([ password, user.password ]);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(401);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "Invalid credentials!" });
+    });
+
+    test('should catch the error', async () => {
+        const req = { body: { data: { username: mockUsers[ 0 ].username, password: mockUsers[ 0 ].password } }, cookies: {} };
+
+        User.findOne.mockRejectedValue(new Error("Networking error!"));
+        const consoleSpy = jest.spyOn(console, 'error').mockImplementation(() => { });
+
+        const resp = await authControls.login(req, res);
+
+        expect(consoleSpy.mock.calls).toHaveLength(1);
+        expect(consoleSpy.mock.calls[ 0 ][ 0 ]).toBe(chalk.red(`LOGIN ERROR: Networking error!`));
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(500);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "Something went wrong. Try again." });
+    });
+});
+
+describe('logout test', () => {
+
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    const res = {
+        status: jest.fn().mockReturnThis(),
+        json: jest.fn().mockReturnThis(),
+        clearCookie: jest.fn(),
+        cookie: jest.fn(),
+    };
+
+    test('should successfully logout', async () => {
+        const req = { body: {}, cookies: { jwt_token: "test tokenyyx" } };
+        jwt.verify.mockReturnValue({
+            username: mockUsers[ 0 ].username,
+            role: mockUsers[ 0 ].role,
+            exp: Math.ceil(Date.now() / 1000) + 100
+        });
+        User.findOne.mockResolvedValue(mockUsers[ 0 ]);
+
+        const resp = await authControls.logout(req, res);
+
+        expect(res.clearCookie.mock.calls).toHaveLength(1);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(200);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "success", data: mockUsers[ 0 ].username });
+
+    });
+
+    test('should fail to logout with invalid credentials', async () => {
+        const req = { body: {}, cookies: { jwt_token: "testxx" } };
+        jwt.verify.mockReturnValue({
+            username: "wrong",
+            role: "again",
+            exp: Math.ceil(Date.now() / 1000) + 100
+        });
+
+        User.findOne.mockResolvedValue(null);
+
+        const resp = await authControls.logout(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(401);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "Invalid credentials." });
+    });
+
+    test('should fail with no token', async () => {
+        const req = { body: {}, cookies: {} };
+        jwt.verify.mockReturnValue(new Error("Invalid token!"));
+
+        const resp = await authControls.logout(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(401);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "Invalid credentials." });
+    });
+
+    test('should fail with expired token', async () => {
+        const req = { body: {}, cookies: { jwt_token: "testxx" } };
+        jwt.verify.mockImplementation(() => { throw new Error("Expired token"); });
+
+        const resp = await authControls.logout(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(401);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "Invalid credentials." });
+    });
+});
\ No newline at end of file
diff --git a/backend/tests/message.test.js b/backend/tests/message.test.js
index 0c44334..903a667 100644
--- a/backend/tests/message.test.js
+++ b/backend/tests/message.test.js
@@ -1,14 +1,169 @@
+const Message = require('../models/message.model');
 const messageControl = require('../controllers/message.controller');
+const mockMessages = require('./mockMessages');
+const chalk = require('chalk');
 
-describe('Project Controllers', () => {
+jest.mock("../models/message.model");
+
+describe('Get all messages', () => {
+
+    const res = { status: jest.fn().mockReturnThis(), json: jest.fn().mockReturnThis() };
+
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    test('should test', async () => {
+        const req = {};
+        Message.find.mockImplementation(async (filter, hideAttributes) => {
+            const hiddenAttributes = hideAttributes.split(" ").map(key => key.substring(1));
+            const displayMessages = mockMessages.map(message => {
+                const modifiedMessage = { ...message };
+
+                hiddenAttributes.forEach(key => {
+                    if (key in modifiedMessage)
+                        delete modifiedMessage[ key ];
+                });
+
+                return modifiedMessage;
+            });
+
+            return displayMessages;
+        });
+
+        const expectedMessages = mockMessages.map(message => {
+            const { _id, __v, ...filteredMessage } = message;
+            return filteredMessage;
+        });
+
+        const resp = await messageControl.getMessages(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(200);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "success", data: expectedMessages });
 
-    beforeAll(() => {
-        const list = [ 1 ];
     });
 
-    test('should test', () => {
-        const data = 1;
-        expect(data + 1).toBe(2);
+    test('should catch error', async () => {
+        const req = {};
+        Message.find.mockRejectedValue(new Error("something")).mockName('messageFind');
+        const consoleSpy = jest.spyOn(console, "error").mockImplementation(() => { });
+
+        const resp = await messageControl.getMessages(req, res);
+
+        expect(consoleSpy.mock.calls).toHaveLength(1);
+        expect(consoleSpy.mock.calls[ 0 ][ 0 ]).toBe(chalk.red(`MESSAGE ROUTE ERROR: something!`));
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(500);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "Something went wrong. Try again." });
     });
 
 });
+
+describe('Create a message', () => {
+
+    const res = { status: jest.fn().mockReturnThis(), json: jest.fn().mockReturnThis() };
+
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    test('should successfully create a message', async () => {
+        const name = "newName";
+        const email = "hi@yahoo.com";
+        const contents = "lorem";
+        const newMessage = { _id: "4A85FBC4BA190A870C418649", __v: 0, name, email, contents };
+
+        const req = { body: { data: { name, email, contents } } };
+        Message.create.mockResolvedValue(newMessage);
+
+        const resp = await messageControl.createMessage(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(201);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "success", data: name });
+
+    });
+
+    test('should fail if missing body', async () => {
+        const req = {};
+        Message.create.mockRejectedValue(new Error("Missing required fields!"));
+
+        const resp = await messageControl.createMessage(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(400);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "Missing required fields!" });
+    });
+
+    test('should fail if missing data object', async () => {
+        const req = { body: {} };
+        Message.create.mockRejectedValue(new Error("Missing required fields!"));
+
+        const resp = await messageControl.createMessage(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(400);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "Missing required fields!" });
+    });
+
+    test('should fail if data is empty', async () => {
+        const req = { body: { data: {} } };
+        Message.create.mockRejectedValue(new Error("Missing required fields!"));
+
+        const resp = await messageControl.createMessage(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(400);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "Missing required fields!" });
+    });
+
+    test('should check that message was created', async () => {
+        const name = "newName";
+        const email = "hi@yahoo.com";
+        const contents = "lorem";
+
+        const consoleSpy = jest.spyOn(console, "error").mockImplementation(() => { });
+
+        const req = { body: { data: { name, email, contents } } };
+        Message.create.mockRejectedValue(new Error("Something went wrong"));
+
+        const resp = await messageControl.createMessage(req, res);
+
+        expect(consoleSpy.mock.calls).toHaveLength(1);
+        expect(consoleSpy.mock.calls[ 0 ][ 0 ]).toBe(chalk.red(`MESSAGE ROUTE ERROR: Something went wrong!`));
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(500);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "Something went wrong. Try again." });
+    });
+
+    test('should fail if missing required fields', async () => {
+        const req = { body: { data: { name: "fake name" } } };
+        Message.create.mockRejectedValue(new Error("Missing required fields!"));
+
+        const resp = await messageControl.createMessage(req, res);
+
+        expect(resp.status.mock.calls).toHaveLength(1);
+        expect(resp.status.mock.calls[ 0 ][ 0 ]).toBe(400);
+
+        expect(resp.json.mock.calls).toHaveLength(1);
+        expect(resp.json.mock.calls[ 0 ][ 0 ]).toStrictEqual({ status: "failed", message: "Missing required fields!" });
+    });
+})
+
diff --git a/backend/tests/mockMessages.js b/backend/tests/mockMessages.js
new file mode 100644
index 0000000..e29c0de
--- /dev/null
+++ b/backend/tests/mockMessages.js
@@ -0,0 +1,58 @@
+const mockMessages = [
+    {
+        "_id": "DA18960E35EA77815B580036",
+        "name": "name1",
+        "email": "testing123@me",
+        "contents": "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor."
+    },
+    {
+        "_id": "76CA9E8A538FA208A172A7BB",
+        "name": "name again 2",
+        "email": "hello@you.com",
+        "contents": "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor."
+    },
+    {
+        "_id": "3931FA5E0CB14F2711E32DE8",
+        "name": "message 3",
+        "email": "official@gmail.com",
+        "contents": "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor."
+    },
+    {
+        "_id": "4A85FBC4BA190A870C418646",
+        "name": "Gerald",
+        "email": "me@yahoo.com",
+        "contents": "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor."
+    },
+    {
+        "_id": "1EB9441B9C55963181065F2C",
+        "name": "David",
+        "email": "something@outlook.com",
+        "contents": "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor."
+    },
+    {
+        "_id": "1AFBFD5797998E9ED214E1A3",
+        "name": "Daisy",
+        "email": "my@customEmail.com",
+        "contents": "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor."
+    },
+    {
+        "_id": "6C2935AB0A3BA2A1B07B2C62",
+        "name": "Harold",
+        "email": "email@gmail.com",
+        "contents": "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor."
+    },
+    {
+        "_id": "AA481D5596990FC94FBEA002",
+        "name": "Mary",
+        "email": "mailingEmail@email.com",
+        "contents": "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor."
+    },
+    {
+        "_id": "36C681D7B2615B056A630B13",
+        "name": "Lucas",
+        "email": "yahoo@yahoo.com",
+        "contents": "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor."
+    },
+];
+
+module.exports = mockMessages;
diff --git a/backend/tests/mockUsers.js b/backend/tests/mockUsers.js
new file mode 100644
index 0000000..88361d7
--- /dev/null
+++ b/backend/tests/mockUsers.js
@@ -0,0 +1,36 @@
+const mockUsers = [
+    {
+        "_id": "AD2C28E2ADB48EF4B7F10163",
+        "username": "hi123",
+        "password": "xx11",
+        "role": "Admin",
+        "loggedIn": "true",
+        "__v": 0
+    },
+    {
+        "_id": "AD2C28E2ADB48EF4B7F10168",
+        "username": "hixx123",
+        "password": "xx112223",
+        "role": "Admin",
+        "loggedIn": "false",
+        "__v": 0
+    },
+    {
+        "_id": "6D7B8758EA8E0534304C5BD2",
+        "username": "hi again",
+        "password": "12345123",
+        "role": "Elite",
+        "loggedIn": "false",
+        "__v": 0
+    },
+    {
+        "_id": "3828272C06418043D9B5DEF2",
+        "username": "another username",
+        "password": "1dfs9sf11",
+        "role": "Elite",
+        "loggedIn": "true",
+        "__v": 0
+    },
+];
+
+module.exports = mockUsers;
diff --git a/backend/tests/project.test.js b/backend/tests/project.test.js
index e8e2c9f..d04c3d0 100644
--- a/backend/tests/project.test.js
+++ b/backend/tests/project.test.js
@@ -22,9 +22,6 @@ describe('Get public projects', () => {
                 return filteredProject;
         });
 
-        console.log(expectedProjects);
-
-
         Project.find.mockImplementation(async ({ show }, hideAttributes) => {
             const hiddenAttributes = hideAttributes.split(" ").map(key => key.substring(1));
 
@@ -69,7 +66,6 @@ describe('Get public projects', () => {
     });
 });
 
-
 describe('Get all projects', () => {
 
     const res = { status: jest.fn().mockReturnThis(), json: jest.fn().mockReturnThis() };
diff --git a/frontend/TODO.md b/frontend/TODO.md
deleted file mode 100644
index f4da199..0000000
--- a/frontend/TODO.md
+++ /dev/null
@@ -1,12 +0,0 @@
-### Frontpage
-
--   Intro animations for other sections (intro component?)
--   Reorganize info in about me in friendlier way
--   Logo for favicon?
-
-### Add admin page for metadata
-
--   Able to upload resume and change website info
--   Visit counter?
--   Admin user with authentication (Authentication header?)
--   Ability to add sudo viewer for recruiters
diff --git a/package.json b/package.json
index 088c255..bb3798b 100644
--- a/package.json
+++ b/package.json
@@ -4,9 +4,10 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "test": "concurrently \"cd backend && npm test\"",
     "front": "cd frontend && npm run dev",
     "back": "cd backend && npm run dev",
+    "build": "cd frontend && npm run build",
     "dev": "concurrently \"cd backend && npm run dev\" \"cd frontend && npm run dev\"",
     "start": "concurrently \"cd backend && npm start\" \"cd frontend && npm start\""
   },

From 05e9c760ae21f82fa05e417ab3171ae139ea94be Mon Sep 17 00:00:00 2001
From: arauta12 <andreirauta234@gmail.com>
Date: Thu, 31 Jul 2025 15:01:21 -0400
Subject: [PATCH 08/12] Fix workflow

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6ab6d2e..f62c3da 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ on:
             - main
     workflow_dispatch:
 jobs:
-    build:
+    test:
         runs-on: ubuntu-latest
         name: Building
         steps:

From e58585df53b33996fd2ae4c6bf792a66217c7863 Mon Sep 17 00:00:00 2001
From: arauta12 <andreirauta234@gmail.com>
Date: Thu, 31 Jul 2025 15:10:36 -0400
Subject: [PATCH 09/12] Fix workflow dispatch

---
 .github/workflows/ci.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f62c3da..49fa8d0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,6 +8,12 @@ on:
         branches:
             - main
     workflow_dispatch:
+        inputs:
+            branch_name:
+                description: "Branch to run tests"
+                required: true
+                default: "staging"
+
 jobs:
     test:
         runs-on: ubuntu-latest

From c9cd37ca5a7342a72d3018a11bf8d81e44704088 Mon Sep 17 00:00:00 2001
From: arauta12 <148647858+arauta12@users.noreply.github.com>
Date: Thu, 31 Jul 2025 15:12:44 -0400
Subject: [PATCH 10/12] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index fd03aad..b34df8d 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,2 @@
 # My Portfolio Website
+[![CI Pipeline](https://github.com/arauta12/MyWebsite/actions/workflows/ci.yml/badge.svg)](https://github.com/arauta12/MyWebsite/actions/workflows/ci.yml)

From 56ff1f5ef15bad3105cf61af092693bf8c3ddd45 Mon Sep 17 00:00:00 2001
From: arauta12 <andreirauta234@gmail.com>
Date: Thu, 31 Jul 2025 15:16:11 -0400
Subject: [PATCH 11/12] Fix job name

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 49fa8d0..b80d811 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ on:
 jobs:
     test:
         runs-on: ubuntu-latest
-        name: Building
+        name: Building and Testing
         steps:
             - uses: actions/checkout@v4
 

From dffc45c3a28d87ba6fcada40160b6f505fe6fa2d Mon Sep 17 00:00:00 2001
From: arauta12 <andreirauta234@gmail.com>
Date: Mon, 4 Aug 2025 14:46:26 -0400
Subject: [PATCH 12/12] Add aws pipeline

---
 .aws/fargate-basic-task-revision1.json        | 97 +++++++++++++++++++
 .github/workflows/cd.yml                      | 92 ++++++++++++++++++
 backend/app.js                                | 10 +-
 compose.yaml                                  |  6 +-
 frontend/Dockerfile                           |  2 +-
 .../AdminEditProject/AdminEditProject.jsx     |  6 +-
 frontend/src/components/Contact/Contact.css   |  5 +-
 frontend/src/components/Contact/Contact.jsx   | 11 ++-
 frontend/src/components/Listing/Listing.css   |  4 +-
 9 files changed, 215 insertions(+), 18 deletions(-)
 create mode 100644 .aws/fargate-basic-task-revision1.json
 create mode 100644 .github/workflows/cd.yml

diff --git a/.aws/fargate-basic-task-revision1.json b/.aws/fargate-basic-task-revision1.json
new file mode 100644
index 0000000..a9e05e3
--- /dev/null
+++ b/.aws/fargate-basic-task-revision1.json
@@ -0,0 +1,97 @@
+{
+    "taskDefinitionArn": "arn:aws:ecs:us-east-2:621180867847:task-definition/fargate-basic-task:1",
+    "containerDefinitions": [
+        {
+            "name": "app",
+            "image": "621180867847.dkr.ecr.us-east-2.amazonaws.com/portfolio-web-repo:latest",
+            "cpu": 0,
+            "portMappings": [
+                {
+                    "name": "app-80-tcp",
+                    "containerPort": 80,
+                    "hostPort": 80,
+                    "protocol": "tcp",
+                    "appProtocol": "http"
+                }
+            ],
+            "essential": true,
+            "restartPolicy": {
+                "enabled": true,
+                "restartAttemptPeriod": 300
+            },
+            "environment": [],
+            "environmentFiles": [],
+            "mountPoints": [],
+            "volumesFrom": [],
+            "ulimits": [],
+            "logConfiguration": {
+                "logDriver": "awslogs",
+                "options": {
+                    "awslogs-group": "/ecs/fargate-basic-task",
+                    "awslogs-create-group": "true",
+                    "awslogs-region": "us-east-2",
+                    "awslogs-stream-prefix": "ecs"
+                },
+                "secretOptions": []
+            },
+            "systemControls": []
+        }
+    ],
+    "family": "fargate-basic-task",
+    "taskRoleArn": "arn:aws:iam::621180867847:role/ecsTaskExecutionRole",
+    "executionRoleArn": "arn:aws:iam::621180867847:role/ecsTaskExecutionRole",
+    "networkMode": "awsvpc",
+    "revision": 1,
+    "volumes": [],
+    "status": "ACTIVE",
+    "requiresAttributes": [
+        {
+            "name": "com.amazonaws.ecs.capability.logging-driver.awslogs"
+        },
+        {
+            "name": "ecs.capability.execution-role-awslogs"
+        },
+        {
+            "name": "com.amazonaws.ecs.capability.ecr-auth"
+        },
+        {
+            "name": "com.amazonaws.ecs.capability.docker-remote-api.1.19"
+        },
+        {
+            "name": "ecs.capability.container-restart-policy"
+        },
+        {
+            "name": "com.amazonaws.ecs.capability.task-iam-role"
+        },
+        {
+            "name": "ecs.capability.execution-role-ecr-pull"
+        },
+        {
+            "name": "com.amazonaws.ecs.capability.docker-remote-api.1.18"
+        },
+        {
+            "name": "ecs.capability.task-eni"
+        },
+        {
+            "name": "com.amazonaws.ecs.capability.docker-remote-api.1.29"
+        }
+    ],
+    "placementConstraints": [],
+    "compatibilities": [
+        "EC2",
+        "FARGATE"
+    ],
+    "requiresCompatibilities": [
+        "FARGATE"
+    ],
+    "cpu": "1024",
+    "memory": "3072",
+    "runtimePlatform": {
+        "cpuArchitecture": "X86_64",
+        "operatingSystemFamily": "LINUX"
+    },
+    "registeredAt": "2025-08-04T18:34:06.217Z",
+    "registeredBy": "arn:aws:iam::621180867847:user/and-aws_@856",
+    "enableFaultInjection": false,
+    "tags": []
+}
\ No newline at end of file
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
new file mode 100644
index 0000000..3cb6e50
--- /dev/null
+++ b/.github/workflows/cd.yml
@@ -0,0 +1,92 @@
+# This workflow will build and push a new container image to Amazon ECR,
+# and then will deploy a new task definition to Amazon ECS, when there is a push to the "main" branch.
+#
+# To use this workflow, you will need to complete the following set-up steps:
+#
+# 1. Create an ECR repository to store your images.
+#    For example: `aws ecr create-repository --repository-name my-ecr-repo --region us-east-2`.
+#    Replace the value of the `ECR_REPOSITORY` environment variable in the workflow below with your repository's name.
+#    Replace the value of the `AWS_REGION` environment variable in the workflow below with your repository's region.
+#
+# 2. Create an ECS task definition, an ECS cluster, and an ECS service.
+#    For example, follow the Getting Started guide on the ECS console:
+#      https://us-east-2.console.aws.amazon.com/ecs/home?region=us-east-2#/firstRun
+#    Replace the value of the `ECS_SERVICE` environment variable in the workflow below with the name you set for the Amazon ECS service.
+#    Replace the value of the `ECS_CLUSTER` environment variable in the workflow below with the name you set for the cluster.
+#
+# 3. Store your ECS task definition as a JSON file in your repository.
+#    The format should follow the output of `aws ecs register-task-definition --generate-cli-skeleton`.
+#    Replace the value of the `ECS_TASK_DEFINITION` environment variable in the workflow below with the path to the JSON file.
+#    Replace the value of the `CONTAINER_NAME` environment variable in the workflow below with the name of the container
+#    in the `containerDefinitions` section of the task definition.
+#
+# 4. Store an IAM user access key in GitHub Actions secrets named `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY`.
+#    See the documentation for each action used below for the recommended IAM policies for this IAM user,
+#    and best practices on handling the access key credentials.
+
+name: CD Pipeline Amazon ECS
+
+on:
+    push:
+        branches: ["main"]
+
+env:
+    AWS_REGION: us-east-2
+    ECR_REPOSITORY: portfolio-web-repo
+    ECS_SERVICE: fargate-basic-service-portfolio
+    ECS_CLUSTER: portfolio-web-cluster
+    ECS_TASK_DEFINITION: .aws/fargate-basic-task-revision1.json
+    CONTAINER_NAME: app
+
+permissions:
+    contents: read
+
+jobs:
+    deploy:
+        name: Deploy
+        runs-on: ubuntu-latest
+        environment: production
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Configure AWS credentials
+              uses: aws-actions/configure-aws-credentials@v1
+              with:
+                  aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+                  aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+                  aws-region: ${{ env.AWS_REGION }}
+
+            - name: Login to Amazon ECR
+              id: login-ecr
+              uses: aws-actions/amazon-ecr-login@v1
+
+            - name: Build, tag, and push image to Amazon ECR
+              id: build-image
+              env:
+                  ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+                  IMAGE_TAG: ${{ github.sha }}
+              run: |
+                  # Build a docker container and
+                  # push it to ECR so that it can
+                  # be deployed to ECS.
+                  docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
+                  docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+                  echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT
+
+            - name: Fill in the new image ID in the Amazon ECS task definition
+              id: task-def
+              uses: aws-actions/amazon-ecs-render-task-definition@v1
+              with:
+                  task-definition: ${{ env.ECS_TASK_DEFINITION }}
+                  container-name: ${{ env.CONTAINER_NAME }}
+                  image: ${{ steps.build-image.outputs.image }}
+
+            - name: Deploy Amazon ECS task definition
+              uses: aws-actions/amazon-ecs-deploy-task-definition@v1
+              with:
+                  task-definition: ${{ steps.task-def.outputs.task-definition }}
+                  service: ${{ env.ECS_SERVICE }}
+                  cluster: ${{ env.ECS_CLUSTER }}
+                  wait-for-service-stability: true
diff --git a/backend/app.js b/backend/app.js
index 5c4a6fb..29840ad 100644
--- a/backend/app.js
+++ b/backend/app.js
@@ -14,11 +14,13 @@ const uploadRoute = require('./routes/uploads.route');
 
 const app = express();
 
+const whitelist = [
+    "http://localhost:3000",
+    "http://localhost:5173",
+    "http://localhost:8080",
+];
 const corsConfig = {
-    origin: [
-        "http://localhost:3000",
-        "http://localhost:5173",
-    ],
+    origin: whitelist,
     credentials: true,
     optionsSuccessStatus: 200
 };
diff --git a/compose.yaml b/compose.yaml
index 057f771..fe25a2b 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -6,9 +6,9 @@ services:
         env_file:
             - backend/.env
         restart: on-failure
-        expose:
-            - 3000
+        ports:
+            - "3000:3000"
     frontend:
         build: frontend
         ports:
-            - "3000:5173"
+            - "8080:5173"
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 323a1ee..00a24fe 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -5,4 +5,4 @@ RUN npm ci
 COPY . .
 RUN npm run build
 EXPOSE 5173
-CMD [ "npm", "start", "--host" ]
\ No newline at end of file
+CMD [ "npm", "start"]
\ No newline at end of file
diff --git a/frontend/src/adminComponents/AdminEditProject/AdminEditProject.jsx b/frontend/src/adminComponents/AdminEditProject/AdminEditProject.jsx
index b689ba3..2cbd93e 100644
--- a/frontend/src/adminComponents/AdminEditProject/AdminEditProject.jsx
+++ b/frontend/src/adminComponents/AdminEditProject/AdminEditProject.jsx
@@ -39,7 +39,7 @@ function AdminEditProject({ projectObj, saveProject }) {
 	return (
 		<section className="project edit-container">
 			<h3>New Project</h3>
-			<form onSubmit={createProject}>
+			<form>
 				<div className="edit-item">
 					<label htmlFor="name">Name: </label>
 					<input
@@ -123,7 +123,9 @@ function AdminEditProject({ projectObj, saveProject }) {
 					</label>
 				</div>
 
-				<button type="submit">Create</button>
+				<button type="submit" onClick={createProject}>
+					Create
+				</button>
 			</form>
 		</section>
 	);
diff --git a/frontend/src/components/Contact/Contact.css b/frontend/src/components/Contact/Contact.css
index d8582fe..2dd2276 100644
--- a/frontend/src/components/Contact/Contact.css
+++ b/frontend/src/components/Contact/Contact.css
@@ -54,8 +54,11 @@ form button {
 }
 
 .contact-button {
-    align-self: center;
+    align-items: center;
     justify-self: center;
+    display: flex;
+    flex-direction: column;
+    gap: 1rem;
 }
 
 form button:hover {
diff --git a/frontend/src/components/Contact/Contact.jsx b/frontend/src/components/Contact/Contact.jsx
index 2e43059..b4bf30c 100644
--- a/frontend/src/components/Contact/Contact.jsx
+++ b/frontend/src/components/Contact/Contact.jsx
@@ -79,7 +79,7 @@ function Contact() {
 		<section id="contact">
 			<h2>Contact</h2>
 			<div className="contact-section">
-				<form className="section-item" onSubmit={handleSubmit}>
+				<form className="section-item">
 					<div>
 						<input
 							type="text"
@@ -122,13 +122,14 @@ function Contact() {
 						></textarea>
 					</div>
 					<div className="contact-button">
-						<button type="submit">Send message</button>
+						<button type="submit" onClick={handleSubmit}>
+							Send message
+						</button>
 						<div
 							style={{
-								alignSelf: "center",
-								marginLeft: "1rem",
 								color: submitMessageObj.color,
-								fontSize: "1rem",
+								fontSize: "1.25rem",
+								marginTop: "-0.5rem",
 							}}
 						>
 							<p>{submitMessageObj.message}</p>
diff --git a/frontend/src/components/Listing/Listing.css b/frontend/src/components/Listing/Listing.css
index 824c4fc..e4f53a4 100644
--- a/frontend/src/components/Listing/Listing.css
+++ b/frontend/src/components/Listing/Listing.css
@@ -22,7 +22,7 @@
     text-decoration: none;
     color: inherit;
     display: flex;
-    align-items: center;
+    align-self: flex;
 }
 
 .listingItem img {
@@ -36,7 +36,7 @@
 .listingItem p {
     text-align: left;
     display: inline;
-    align-self: flex-end;
+    align-self: center;
 }
 
 .listingItem:hover {