From d51fa2f2d1e52db32b52e10a4e0e9cc11eda6310 Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 10 Nov 2024 00:09:31 -0500
Subject: [PATCH 01/63] https changes

---
 server.js | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/server.js b/server.js
index ebbede3..4b6f67a 100644
--- a/server.js
+++ b/server.js
@@ -4,10 +4,13 @@ const cors = require('cors');
 const crypto = require('crypto'); // Import the crypto module
 const { client, connectDB } = require('./db/connection'); // Import the client and connectDB
 
+const https = require('https'); // Import https module
+const fs = require('fs');       // Import fs module for reading certificate files
+
 const app = express();
 
 // List of allowed origins
-const allowedOrigins = ['http://localhost:3000', 'http://10.11.29.103:3000', 'http://facelect.capping.ecrl.marist.edu:3000'];
+const allowedOrigins = ['http://localhost:3000', 'http://10.11.29.103:3000', 'http://facelect.capping.ecrl.marist.edu:3000','http://localhost:443', 'http://10.11.29.103:443', 'http://facelect.capping.ecrl.marist.edu:443'];
 
 // Configure CORS to allow requests from your React app
 app.use(cors({
@@ -83,7 +86,18 @@ app.get('/faculty', async (req, res) => {
     }
 });
 
-// Start server
-app.listen(3001, () => {
-    console.log('Server is running on port 3001');
+// HTTPS configuration
+const httpsOptions = {
+    key: fs.readFileSync('backend/sp-key.pem'),    
+    cert: fs.readFileSync('backend/sp-cert.pem')   
+};
+
+// Start HTTPS server on port 443
+https.createServer(httpsOptions, app).listen(443, () => {
+    console.log('HTTPS server is running on port 443');
 });
+
+// Start HTTP server on port 3001
+app.listen(3001, () => {
+    console.log('HTTP server is running on port 3001');
+});
\ No newline at end of file

From b64d57984d912461c4859d098ac53d3075ba7d02 Mon Sep 17 00:00:00 2001
From: AaronBonilla <aaron.bonilla1@marist.edu>
Date: Mon, 11 Nov 2024 13:43:13 -0500
Subject: [PATCH 02/63] please work https

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

diff --git a/server.js b/server.js
index 4b6f67a..ec0c45a 100644
--- a/server.js
+++ b/server.js
@@ -10,7 +10,7 @@ const fs = require('fs');       // Import fs module for reading certificate file
 const app = express();
 
 // List of allowed origins
-const allowedOrigins = ['http://localhost:3000', 'http://10.11.29.103:3000', 'http://facelect.capping.ecrl.marist.edu:3000','http://localhost:443', 'http://10.11.29.103:443', 'http://facelect.capping.ecrl.marist.edu:443'];
+const allowedOrigins = ['http://localhost:3000', 'http://10.11.29.103:3000', 'http://facelect.capping.ecrl.marist.edu:3000','https://localhost:443','https://10.11.29.103:443', 'https://facelect.capping.ecrl.marist.edu:443'];
 
 // Configure CORS to allow requests from your React app
 app.use(cors({

From fb0b1d188243772ccbfade95c0ac4b8a4bd62017 Mon Sep 17 00:00:00 2001
From: Kai <Kai.Cottle1@marist.edu>
Date: Mon, 11 Nov 2024 13:59:37 -0500
Subject: [PATCH 03/63] ssl changes, secret, session and morgan

---
 server-ssl.js | 158 +++++++++++++++++++++++++++++++-------------------
 1 file changed, 98 insertions(+), 60 deletions(-)

diff --git a/server-ssl.js b/server-ssl.js
index 68e42b3..998d4ab 100644
--- a/server-ssl.js
+++ b/server-ssl.js
@@ -7,108 +7,146 @@ const https = require('https');
 const fs = require('fs');
 const passport = require('passport');
 const SamlStrategy = require('passport-saml').Strategy;
+const session = require('express-session'); // Import express-session
+const morgan = require('morgan'); // Import morgan for logging
 
 const app = express();
 
 // List of allowed origins
-const allowedOrigins = ['http://localhost:3000', 'http://10.11.29.103:3000', 'http://facelect.capping.ecrl.marist.edu:3000'];
+const allowedOrigins = [
+  'http://localhost:3000',
+  'http://10.11.29.103:3000',
+  'http://facelect.capping.ecrl.marist.edu:3000',
+];
 
 // Configure CORS to allow requests from your React app
-app.use(cors({
+app.use(
+  cors({
     origin: function (origin, callback) {
-        // Allow requests with no origin (like mobile apps or curl requests)
-        if (!origin) return callback(null, true);
-        if (allowedOrigins.indexOf(origin) === -1) {
-            const msg = 'The CORS policy for this site does not allow access from the specified Origin.';
-            return callback(new Error(msg), false);
-        }
-        return callback(null, true);
-    }
-}));
+      // Allow requests with no origin (like mobile apps or curl requests)
+      if (!origin) return callback(null, true);
+      if (allowedOrigins.indexOf(origin) === -1) {
+        const msg =
+          'The CORS policy for this site does not allow access from the specified Origin.';
+        return callback(new Error(msg), false);
+      }
+      return callback(null, true);
+    },
+  })
+);
 
 app.use(express.json()); // Parse incoming JSON data
+app.use(morgan('dev')); // Log requests for debugging
+
+// Configure express-session middleware
+app.use(
+  session({
+    secret: 'c2d6e1f1b4a6e0f3c5d8e7f1a2b3c4d5e6f7081920a1b2c3d4e5f6a7b8c9d0e1',
+    resave: false,
+    saveUninitialized: true,
+    cookie: { secure: true }, // Set secure to true since we're using HTTPS
+  })
+);
+
+// Initialize Passport.js
+app.use(passport.initialize());
+app.use(passport.session());
 
 // Connect to the PostgreSQL database
 connectDB();
 
 // Function to hash passwords using SHA-256
 const hashPassword = (password) => {
-    return crypto.createHash('sha256').update(password).digest('hex');
+  return crypto.createHash('sha256').update(password).digest('hex');
 };
 
 // Passport SAML strategy configuration
-passport.use(new SamlStrategy({
-    path: '/login/callback',
-    entryPoint: 'https://auth.it.marist.edu/idp/profile/SAML2/Redirect/SSO',
-    issuer: 'Marist-SSO',
-    cert: fs.readFileSync('/var/www/html/backend/sp-cert.pem', 'utf-8'),
-    privateCert: fs.readFileSync('/var/www/html/backend/sp-cert.pem', 'utf-8'),
-    identifierFormat: null,
-    decryptionPvk: fs.readFileSync('/var/www/html/backend/sp-cert.pem', 'utf-8'),
-    validateInResponseTo: false,
-    disableRequestedAuthnContext: true
-}, (profile, done) => {
-    return done(null, profile);
-}));
+passport.use(
+  new SamlStrategy(
+    {
+      path: '/login/callback',
+      entryPoint: 'https://auth.it.marist.edu/idp/profile/SAML2/Redirect/SSO',
+      issuer: 'Marist-SSO',
+      cert: fs.readFileSync('/var/www/html/backend/sp-cert.pem', 'utf-8'),
+      privateCert: fs.readFileSync('/var/www/html/backend/sp-key.pem', 'utf-8'), // Use the private key for privateCert
+      identifierFormat: null,
+      decryptionPvk: fs.readFileSync('/var/www/html/backend/sp-key.pem', 'utf-8'), // Use the private key for decryptionPvk
+      validateInResponseTo: false,
+      disableRequestedAuthnContext: true,
+    },
+    (profile, done) => {
+      return done(null, profile);
+    }
+  )
+);
 
 passport.serializeUser((user, done) => {
-    done(null, user);
+  done(null, user);
 });
 
 passport.deserializeUser((user, done) => {
-    done(null, user);
+  done(null, user);
 });
 
-app.use(passport.initialize());
-app.use(passport.session());
-
 // Route to handle admin login
 app.post('/admin-login', async (req, res) => {
-    const { username, password } = req.body; // Capture username and password from request
+  const { username, password } = req.body; // Capture username and password from request
 
-    try {
-        // Query the Admins table to find the admin by username (Uname)
-        const adminResult = await client.query('SELECT * FROM Admins WHERE Uname = $1', [username]);
+  try {
+    // Query the Admins table to find the admin by username (Uname)
+    const adminResult = await client.query(
+      'SELECT * FROM Admins WHERE Uname = $1',
+      [username]
+    );
 
-        if (adminResult.rows.length === 0) {
-            return res.status(400).json({ message: 'Invalid username or password' });
-        }
-
-        const admin = adminResult.rows[0];
+    if (adminResult.rows.length === 0) {
+      return res.status(400).json({ message: 'Invalid username or password' });
+    }
 
-        // Hash the provided password and compare with the stored hash
-        const hashedInputPassword = hashPassword(password); // Hash the input password
-        if (hashedInputPassword !== admin.thepassword) { // Use correct case for ThePassword
-            return res.status(400).json({ message: 'Invalid username or password' });
-        }
+    const admin = adminResult.rows[0];
 
-        res.status(200).json({ message: 'Login successful' });
-    } catch (error) {
-        res.status(500).json({ message: 'Internal server error' });
+    // Hash the provided password and compare with the stored hash
+    const hashedInputPassword = hashPassword(password); // Hash the input password
+    if (hashedInputPassword !== admin.thepassword) {
+      // Use correct case for thepassword
+      return res.status(400).json({ message: 'Invalid username or password' });
     }
+
+    res.status(200).json({ message: 'Login successful' });
+  } catch (error) {
+    console.error(error); // Log the error for debugging
+    res.status(500).json({ message: 'Internal server error' });
+  }
 });
 
 // SSO login route
-app.get('/login', passport.authenticate('saml', {
+app.get(
+  '/login',
+  passport.authenticate('saml', {
     successRedirect: '/',
-    failureRedirect: '/login'
-}));
+    failureRedirect: '/login',
+  })
+);
 
 // SSO callback route
-app.post('/login/callback', passport.authenticate('saml', {
+app.post(
+  '/login/callback',
+  passport.authenticate('saml', {
     failureRedirect: '/login',
-    failureFlash: true
-}), (req, res) => {
+    failureFlash: true,
+  }),
+  (req, res) => {
     res.redirect('/');
-});
+  }
+);
 
 // Read SSL certificate and key
 const options = {
-    key: fs.readFileSync('/var/www/html/backend/sp-key.pem'),
-    cert: fs.readFileSync('/var/www/html/backend/sp-cert.pem')
+  key: fs.readFileSync('/var/www/html/backend/sp-key.pem'),
+  cert: fs.readFileSync('/var/www/html/backend/sp-cert.pem'),
 };
 
-// Create HTTPS server
-https.createServer(options, app).listen(443, () => {
-    console.log('HTTPS Server running on port 443');
-});
\ No newline at end of file
+// Create HTTPS server on a non-privileged port (e.g., 8443)
+https.createServer(options, app).listen(8443, () => {
+  console.log('HTTPS Server running on port 8443');
+});

From d48ba92de7b90edfd6d920ca74f2067e13575fe1 Mon Sep 17 00:00:00 2001
From: AaronBonilla <aaron.bonilla1@marist.edu>
Date: Mon, 11 Nov 2024 14:04:55 -0500
Subject: [PATCH 04/63] changed https port

---
 server.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server.js b/server.js
index ec0c45a..7d17b8c 100644
--- a/server.js
+++ b/server.js
@@ -92,8 +92,8 @@ const httpsOptions = {
     cert: fs.readFileSync('backend/sp-cert.pem')   
 };
 
-// Start HTTPS server on port 443
-https.createServer(httpsOptions, app).listen(443, () => {
+// Start HTTPS server on port 8443
+https.createServer(httpsOptions, app).listen(8443, () => {
     console.log('HTTPS server is running on port 443');
 });
 

From ad668a945c0f61cadc3d3dbab19177544ebe66ee Mon Sep 17 00:00:00 2001
From: AaronBonilla <aaron.bonilla1@marist.edu>
Date: Mon, 11 Nov 2024 14:05:39 -0500
Subject: [PATCH 05/63] changed port again

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

diff --git a/server.js b/server.js
index 7d17b8c..8b03928 100644
--- a/server.js
+++ b/server.js
@@ -10,7 +10,7 @@ const fs = require('fs');       // Import fs module for reading certificate file
 const app = express();
 
 // List of allowed origins
-const allowedOrigins = ['http://localhost:3000', 'http://10.11.29.103:3000', 'http://facelect.capping.ecrl.marist.edu:3000','https://localhost:443','https://10.11.29.103:443', 'https://facelect.capping.ecrl.marist.edu:443'];
+const allowedOrigins = ['http://localhost:3000', 'http://10.11.29.103:3000', 'http://facelect.capping.ecrl.marist.edu:3000','https://localhost:8443','https://10.11.29.103:8443', 'https://facelect.capping.ecrl.marist.edu:8443'];
 
 // Configure CORS to allow requests from your React app
 app.use(cors({

From 30c1258910d72967e50ec0f250ee539720b1ce58 Mon Sep 17 00:00:00 2001
From: Kai <Kai.Cottle1@marist.edu>
Date: Mon, 11 Nov 2024 14:11:43 -0500
Subject: [PATCH 06/63] adding libraries

---
 package-lock.json | 427 ++++++++++++++++++++++++++++++++++++++++++++++
 package.json      |   4 +
 2 files changed, 431 insertions(+)

diff --git a/package-lock.json b/package-lock.json
index f73facc..07a3acb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,6 +22,10 @@
         "cors": "^2.8.5",
         "crypto": "^1.0.1",
         "dotenv": "^16.4.5",
+        "express-session": "^1.18.1",
+        "morgan": "^1.10.0",
+        "passport": "^0.7.0",
+        "passport-saml": "^3.2.4",
         "pg": "^8.13.0",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
@@ -4784,6 +4788,15 @@
         "@xtuc/long": "4.2.2"
       }
     },
+    "node_modules/@xmldom/xmldom": {
+      "version": "0.7.13",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.13.tgz",
+      "integrity": "sha512-lm2GW5PkosIzccsaZIz7tp8cPADSIlIHWDFTR1N0SzfinhhYgeIQjFMz4rYzanCScr3DqQLeomUDArp6MWKm+g==",
+      "deprecated": "this version is no longer supported, please update to at least 0.8.*",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
     "node_modules/@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
@@ -5640,6 +5653,22 @@
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
+    "node_modules/basic-auth": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
+      "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
+      "dependencies": {
+        "safe-buffer": "5.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/basic-auth/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
     "node_modules/batch": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
@@ -8377,6 +8406,50 @@
         "node": ">= 0.10.0"
       }
     },
+    "node_modules/express-session": {
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.18.1.tgz",
+      "integrity": "sha512-a5mtTqEaZvBCL9A9aqkrtfz+3SMDhOVUnjafjo+s7A9Txkq+SVX2DLvSp1Zrv4uCXa3lMSK3viWnh9Gg07PBUA==",
+      "dependencies": {
+        "cookie": "0.7.2",
+        "cookie-signature": "1.0.7",
+        "debug": "2.6.9",
+        "depd": "~2.0.0",
+        "on-headers": "~1.0.2",
+        "parseurl": "~1.3.3",
+        "safe-buffer": "5.2.1",
+        "uid-safe": "~2.1.5"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/express-session/node_modules/cookie": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/express-session/node_modules/cookie-signature": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz",
+      "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA=="
+    },
+    "node_modules/express-session/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/express-session/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
     "node_modules/express/node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -12816,6 +12889,45 @@
         "mkdirp": "bin/cmd.js"
       }
     },
+    "node_modules/morgan": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
+      "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==",
+      "dependencies": {
+        "basic-auth": "~2.0.1",
+        "debug": "2.6.9",
+        "depd": "~2.0.0",
+        "on-finished": "~2.3.0",
+        "on-headers": "~1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/morgan/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/morgan/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/morgan/node_modules/on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -13297,6 +13409,49 @@
         "tslib": "^2.0.3"
       }
     },
+    "node_modules/passport": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/passport/-/passport-0.7.0.tgz",
+      "integrity": "sha512-cPLl+qZpSc+ireUvt+IzqbED1cHHkDoVYMo30jbJIdOOjQ1MQYZBPiNvmi8UM6lJuOpTPXJGZQk0DtC4y61MYQ==",
+      "dependencies": {
+        "passport-strategy": "1.x.x",
+        "pause": "0.0.1",
+        "utils-merge": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/jaredhanson"
+      }
+    },
+    "node_modules/passport-saml": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/passport-saml/-/passport-saml-3.2.4.tgz",
+      "integrity": "sha512-JSgkFXeaexLNQh1RrOvJAgjLnZzH/S3HbX/mWAk+i7aulnjqUe7WKnPl1NPnJWqP7Dqsv0I2Xm6KIFHkftk0HA==",
+      "deprecated": "For versions >= 4, please use scopped package @node-saml/passport-saml",
+      "dependencies": {
+        "@xmldom/xmldom": "^0.7.6",
+        "debug": "^4.3.2",
+        "passport-strategy": "^1.0.0",
+        "xml-crypto": "^2.1.3",
+        "xml-encryption": "^2.0.0",
+        "xml2js": "^0.4.23",
+        "xmlbuilder": "^15.1.1"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/passport-strategy": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz",
+      "integrity": "sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA==",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
     "node_modules/path-exists": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -13359,6 +13514,11 @@
         "node": ">=8"
       }
     },
+    "node_modules/pause": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz",
+      "integrity": "sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg=="
+    },
     "node_modules/performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
@@ -14982,6 +15142,14 @@
         "performance-now": "^2.1.0"
       }
     },
+    "node_modules/random-bytes": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz",
+      "integrity": "sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -17507,6 +17675,17 @@
         "node": ">=4.2.0"
       }
     },
+    "node_modules/uid-safe": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz",
+      "integrity": "sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==",
+      "dependencies": {
+        "random-bytes": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/unbox-primitive": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
@@ -18599,16 +18778,77 @@
         }
       }
     },
+    "node_modules/xml-crypto": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/xml-crypto/-/xml-crypto-2.1.5.tgz",
+      "integrity": "sha512-xOSJmGFm+BTXmaPYk8pPV3duKo6hJuZ5niN4uMzoNcTlwYs0jAu/N3qY+ud9MhE4N7eMRuC1ayC7Yhmb7MmAWg==",
+      "dependencies": {
+        "@xmldom/xmldom": "^0.7.9",
+        "xpath": "0.0.32"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/xml-encryption": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/xml-encryption/-/xml-encryption-2.0.0.tgz",
+      "integrity": "sha512-4Av83DdvAgUQQMfi/w8G01aJshbEZP9ewjmZMpS9t3H+OCZBDvyK4GJPnHGfWiXlArnPbYvR58JB9qF2x9Ds+Q==",
+      "dependencies": {
+        "@xmldom/xmldom": "^0.7.0",
+        "escape-html": "^1.0.3",
+        "xpath": "0.0.32"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/xml-name-validator": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
       "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="
     },
+    "node_modules/xml2js": {
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+      "dependencies": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/xml2js/node_modules/xmlbuilder": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/xmlbuilder": {
+      "version": "15.1.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
+      "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==",
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
     "node_modules/xmlchars": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
       "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
     },
+    "node_modules/xpath": {
+      "version": "0.0.32",
+      "resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.32.tgz",
+      "integrity": "sha512-rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw==",
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
     "node_modules/xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
@@ -21984,6 +22224,11 @@
         "@xtuc/long": "4.2.2"
       }
     },
+    "@xmldom/xmldom": {
+      "version": "0.7.13",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.13.tgz",
+      "integrity": "sha512-lm2GW5PkosIzccsaZIz7tp8cPADSIlIHWDFTR1N0SzfinhhYgeIQjFMz4rYzanCScr3DqQLeomUDArp6MWKm+g=="
+    },
     "@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
@@ -22601,6 +22846,21 @@
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
+    "basic-auth": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
+      "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
+      "requires": {
+        "safe-buffer": "5.1.2"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+        }
+      }
+    },
     "batch": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
@@ -24569,6 +24829,46 @@
         }
       }
     },
+    "express-session": {
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.18.1.tgz",
+      "integrity": "sha512-a5mtTqEaZvBCL9A9aqkrtfz+3SMDhOVUnjafjo+s7A9Txkq+SVX2DLvSp1Zrv4uCXa3lMSK3viWnh9Gg07PBUA==",
+      "requires": {
+        "cookie": "0.7.2",
+        "cookie-signature": "1.0.7",
+        "debug": "2.6.9",
+        "depd": "~2.0.0",
+        "on-headers": "~1.0.2",
+        "parseurl": "~1.3.3",
+        "safe-buffer": "5.2.1",
+        "uid-safe": "~2.1.5"
+      },
+      "dependencies": {
+        "cookie": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+          "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w=="
+        },
+        "cookie-signature": {
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz",
+          "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA=="
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        }
+      }
+    },
     "fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -27728,6 +28028,41 @@
         "minimist": "^1.2.6"
       }
     },
+    "morgan": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
+      "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==",
+      "requires": {
+        "basic-auth": "~2.0.1",
+        "debug": "2.6.9",
+        "depd": "~2.0.0",
+        "on-finished": "~2.3.0",
+        "on-headers": "~1.0.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        },
+        "on-finished": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+          "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
+          "requires": {
+            "ee-first": "1.1.1"
+          }
+        }
+      }
+    },
     "ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -28071,6 +28406,35 @@
         "tslib": "^2.0.3"
       }
     },
+    "passport": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/passport/-/passport-0.7.0.tgz",
+      "integrity": "sha512-cPLl+qZpSc+ireUvt+IzqbED1cHHkDoVYMo30jbJIdOOjQ1MQYZBPiNvmi8UM6lJuOpTPXJGZQk0DtC4y61MYQ==",
+      "requires": {
+        "passport-strategy": "1.x.x",
+        "pause": "0.0.1",
+        "utils-merge": "^1.0.1"
+      }
+    },
+    "passport-saml": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/passport-saml/-/passport-saml-3.2.4.tgz",
+      "integrity": "sha512-JSgkFXeaexLNQh1RrOvJAgjLnZzH/S3HbX/mWAk+i7aulnjqUe7WKnPl1NPnJWqP7Dqsv0I2Xm6KIFHkftk0HA==",
+      "requires": {
+        "@xmldom/xmldom": "^0.7.6",
+        "debug": "^4.3.2",
+        "passport-strategy": "^1.0.0",
+        "xml-crypto": "^2.1.3",
+        "xml-encryption": "^2.0.0",
+        "xml2js": "^0.4.23",
+        "xmlbuilder": "^15.1.1"
+      }
+    },
+    "passport-strategy": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz",
+      "integrity": "sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA=="
+    },
     "path-exists": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -28117,6 +28481,11 @@
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
     },
+    "pause": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz",
+      "integrity": "sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg=="
+    },
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
@@ -29076,6 +29445,11 @@
         "performance-now": "^2.1.0"
       }
     },
+    "random-bytes": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz",
+      "integrity": "sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ=="
+    },
     "randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -30929,6 +31303,14 @@
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
       "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g=="
     },
+    "uid-safe": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz",
+      "integrity": "sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==",
+      "requires": {
+        "random-bytes": "~1.0.0"
+      }
+    },
     "unbox-primitive": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
@@ -31754,16 +32136,61 @@
       "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
       "requires": {}
     },
+    "xml-crypto": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/xml-crypto/-/xml-crypto-2.1.5.tgz",
+      "integrity": "sha512-xOSJmGFm+BTXmaPYk8pPV3duKo6hJuZ5niN4uMzoNcTlwYs0jAu/N3qY+ud9MhE4N7eMRuC1ayC7Yhmb7MmAWg==",
+      "requires": {
+        "@xmldom/xmldom": "^0.7.9",
+        "xpath": "0.0.32"
+      }
+    },
+    "xml-encryption": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/xml-encryption/-/xml-encryption-2.0.0.tgz",
+      "integrity": "sha512-4Av83DdvAgUQQMfi/w8G01aJshbEZP9ewjmZMpS9t3H+OCZBDvyK4GJPnHGfWiXlArnPbYvR58JB9qF2x9Ds+Q==",
+      "requires": {
+        "@xmldom/xmldom": "^0.7.0",
+        "escape-html": "^1.0.3",
+        "xpath": "0.0.32"
+      }
+    },
     "xml-name-validator": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
       "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="
     },
+    "xml2js": {
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+      "requires": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
+      },
+      "dependencies": {
+        "xmlbuilder": {
+          "version": "11.0.1",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+          "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
+        }
+      }
+    },
+    "xmlbuilder": {
+      "version": "15.1.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
+      "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg=="
+    },
     "xmlchars": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
       "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
     },
+    "xpath": {
+      "version": "0.0.32",
+      "resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.32.tgz",
+      "integrity": "sha512-rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw=="
+    },
     "xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
diff --git a/package.json b/package.json
index a23856b..e4627ca 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,10 @@
     "cors": "^2.8.5",
     "crypto": "^1.0.1",
     "dotenv": "^16.4.5",
+    "express-session": "^1.18.1",
+    "morgan": "^1.10.0",
+    "passport": "^0.7.0",
+    "passport-saml": "^3.2.4",
     "pg": "^8.13.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

From be39e5f221f699f3afaee35855089e55bda02480 Mon Sep 17 00:00:00 2001
From: AaronBonilla <aaron.bonilla1@marist.edu>
Date: Mon, 11 Nov 2024 14:24:56 -0500
Subject: [PATCH 07/63] formatting

---
 server.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/server.js b/server.js
index 8b03928..4dfdd71 100644
--- a/server.js
+++ b/server.js
@@ -10,7 +10,12 @@ const fs = require('fs');       // Import fs module for reading certificate file
 const app = express();
 
 // List of allowed origins
-const allowedOrigins = ['http://localhost:3000', 'http://10.11.29.103:3000', 'http://facelect.capping.ecrl.marist.edu:3000','https://localhost:8443','https://10.11.29.103:8443', 'https://facelect.capping.ecrl.marist.edu:8443'];
+const allowedOrigins = ['http://localhost:3000', 
+    'http://10.11.29.103:3000', 
+    'http://facelect.capping.ecrl.marist.edu:3000',
+    'https://localhost:8443',
+    'https://10.11.29.103:8443', 
+    'https://facelect.capping.ecrl.marist.edu:8443'];
 
 // Configure CORS to allow requests from your React app
 app.use(cors({

From 1d8bc73980f43b0e57339e35ea19af51a0e3edc2 Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 17 Nov 2024 17:33:30 -0500
Subject: [PATCH 08/63] merge from brendon-dev

---
 server.js | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/server.js b/server.js
index 39e92c6..601af2b 100644
--- a/server.js
+++ b/server.js
@@ -15,15 +15,11 @@ const fs = require('fs');       // Import fs module for reading certificate file
 const app = express();
 
 // List of allowed origins
-<<<<<<< HEAD
-const allowedOrigins = ['http://localhost:3000', 'http://10.11.29.103:3000', 'http://facelect.capping.ecrl.marist.edu:3000','http://localhost:443', 'http://10.11.29.103:443', 'http://facelect.capping.ecrl.marist.edu:443'];
-=======
 const allowedOrigins = [
     'https://localhost',
     'https://10.11.29.103',
     'https://facelect.capping.ecrl.marist.edu'
 ];
->>>>>>> 61494d1d9f02033965f7f18a6a59af0ace3cd238
 
 // Configure CORS to allow requests from your React app
 app.use(cors({
@@ -137,17 +133,6 @@ app.get('/faculty', async (req, res) => {
     }
 });
 
-<<<<<<< HEAD
-// HTTPS configuration
-const httpsOptions = {
-    key: fs.readFileSync('backend/sp-key.pem'),    
-    cert: fs.readFileSync('backend/sp-cert.pem')   
-};
-
-// Start HTTPS server on port 443
-https.createServer(httpsOptions, app).listen(443, () => {
-    console.log('HTTPS server is running on port 443');
-=======
 // SSO login route
 app.get('/login', passport.authenticate('saml', {
     successRedirect: '/',
@@ -174,7 +159,6 @@ const options = {
 // Create HTTPS server on port 3000
 https.createServer(options, app).listen(3001, () => {
     console.log('HTTPS Server running on port 3001');
->>>>>>> 61494d1d9f02033965f7f18a6a59af0ace3cd238
 });
 
 // Start HTTP server on port 3001

From 10e81fa04a723fe0e457b4ffca9812cb2d039ddb Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 17 Nov 2024 20:01:21 -0500
Subject: [PATCH 09/63] admin-login fix attempt

---
 src/AdminLogin.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AdminLogin.tsx b/src/AdminLogin.tsx
index 9b72a60..d8a1371 100644
--- a/src/AdminLogin.tsx
+++ b/src/AdminLogin.tsx
@@ -17,7 +17,7 @@ const AdminLogin: React.FC = () => {
   const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
     e.preventDefault();
     try {
-      const response = await fetch('http://10.11.29.103:3001/admin-login', {
+      const response = await fetch('https://10.11.29.103:3001/admin-login', {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json',

From dbedb071a99122e50051dfe234faf93c636acfa6 Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 17 Nov 2024 20:11:11 -0500
Subject: [PATCH 10/63] fix attempt 2

---
 server.js          | 5 ++++-
 src/AdminLogin.tsx | 2 +-
 src/AdminView.tsx  | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/server.js b/server.js
index 601af2b..938bc49 100644
--- a/server.js
+++ b/server.js
@@ -18,7 +18,10 @@ const app = express();
 const allowedOrigins = [
     'https://localhost',
     'https://10.11.29.103',
-    'https://facelect.capping.ecrl.marist.edu'
+    'https://facelect.capping.ecrl.marist.edu',
+    'http://localhost',
+    'http://10.11.29.103',
+    'http://facelect.capping.ecrl.marist.edu'
 ];
 
 // Configure CORS to allow requests from your React app
diff --git a/src/AdminLogin.tsx b/src/AdminLogin.tsx
index d8a1371..93cb761 100644
--- a/src/AdminLogin.tsx
+++ b/src/AdminLogin.tsx
@@ -17,7 +17,7 @@ const AdminLogin: React.FC = () => {
   const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
     e.preventDefault();
     try {
-      const response = await fetch('https://10.11.29.103:3001/admin-login', {
+      const response = await fetch('https://facelect.capping.ecrl.marist.edu/admin-login', {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json',
diff --git a/src/AdminView.tsx b/src/AdminView.tsx
index e1ad3b4..e6d6d95 100644
--- a/src/AdminView.tsx
+++ b/src/AdminView.tsx
@@ -87,7 +87,7 @@ const App: React.FC = () => {
   
 
   useEffect(() => {
-    fetch('http://10.11.29.103:3001/faculty')
+    fetch('https://facelect.capping.ecrl.marist.edu/faculty')
       .then(response => response.json())
       .then(data => setRowData(data))
       .catch(error => console.error('Error fetching data:', error));

From 05bf5e6bd276e5b72bad73666df52ca9bb2f370e Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 17 Nov 2024 20:12:17 -0500
Subject: [PATCH 11/63] 3

---
 src/AdminLogin.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AdminLogin.tsx b/src/AdminLogin.tsx
index 93cb761..fb1666a 100644
--- a/src/AdminLogin.tsx
+++ b/src/AdminLogin.tsx
@@ -17,7 +17,7 @@ const AdminLogin: React.FC = () => {
   const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
     e.preventDefault();
     try {
-      const response = await fetch('https://facelect.capping.ecrl.marist.edu/admin-login', {
+      const response = await fetch('https://10.11.29.103/admin-login', {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json',

From 08d55527c4efca89b3784d926481d8a48e9181cd Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 17 Nov 2024 20:17:31 -0500
Subject: [PATCH 12/63] attempt 4

---
 server.js          | 3 ++-
 src/AdminLogin.tsx | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/server.js b/server.js
index 938bc49..f22bb5a 100644
--- a/server.js
+++ b/server.js
@@ -21,7 +21,8 @@ const allowedOrigins = [
     'https://facelect.capping.ecrl.marist.edu',
     'http://localhost',
     'http://10.11.29.103',
-    'http://facelect.capping.ecrl.marist.edu'
+    'http://facelect.capping.ecrl.marist.edu',
+    '0.0.0.0'
 ];
 
 // Configure CORS to allow requests from your React app
diff --git a/src/AdminLogin.tsx b/src/AdminLogin.tsx
index fb1666a..93cb761 100644
--- a/src/AdminLogin.tsx
+++ b/src/AdminLogin.tsx
@@ -17,7 +17,7 @@ const AdminLogin: React.FC = () => {
   const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
     e.preventDefault();
     try {
-      const response = await fetch('https://10.11.29.103/admin-login', {
+      const response = await fetch('https://facelect.capping.ecrl.marist.edu/admin-login', {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json',

From 6c149b421bfbd6a1ee016b49c9ef9b646ced7b6f Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 17 Nov 2024 20:19:27 -0500
Subject: [PATCH 13/63] attempt 5

---
 server.js          | 6 +++---
 src/AdminLogin.tsx | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server.js b/server.js
index f22bb5a..f696953 100644
--- a/server.js
+++ b/server.js
@@ -166,6 +166,6 @@ https.createServer(options, app).listen(3001, () => {
 });
 
 // Start HTTP server on port 3001
-app.listen(3001, () => {
-    console.log('HTTP server is running on port 3001');
-});
\ No newline at end of file
+//app.listen(3001, () => {
+    //console.log('HTTP server is running on port 3001');
+//});
\ No newline at end of file
diff --git a/src/AdminLogin.tsx b/src/AdminLogin.tsx
index 93cb761..a712c04 100644
--- a/src/AdminLogin.tsx
+++ b/src/AdminLogin.tsx
@@ -17,7 +17,7 @@ const AdminLogin: React.FC = () => {
   const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
     e.preventDefault();
     try {
-      const response = await fetch('https://facelect.capping.ecrl.marist.edu/admin-login', {
+      const response = await fetch('https://facelect.capping.ecrl.marist.edu:3001/admin-login', {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json',

From 206b64de97c940c8e1575f08ee0f561b2b045768 Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 17 Nov 2024 20:41:19 -0500
Subject: [PATCH 14/63] attempt 6

---
 package-lock.json |  1 +
 server.js         | 25 +++++++++++--------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 07a3acb..2982c8c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13413,6 +13413,7 @@
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/passport/-/passport-0.7.0.tgz",
       "integrity": "sha512-cPLl+qZpSc+ireUvt+IzqbED1cHHkDoVYMo30jbJIdOOjQ1MQYZBPiNvmi8UM6lJuOpTPXJGZQk0DtC4y61MYQ==",
+      "license": "MIT",
       "dependencies": {
         "passport-strategy": "1.x.x",
         "pause": "0.0.1",
diff --git a/server.js b/server.js
index f696953..90a7d86 100644
--- a/server.js
+++ b/server.js
@@ -9,20 +9,17 @@ const passport = require('passport');
 const SamlStrategy = require('passport-saml').Strategy;
 const session = require('express-session');
 
-const https = require('https'); // Import https module
-const fs = require('fs');       // Import fs module for reading certificate files
-
 const app = express();
 
 // List of allowed origins
 const allowedOrigins = [
-    'https://localhost',
+    'https://localhost:3001',
     'https://10.11.29.103',
-    'https://facelect.capping.ecrl.marist.edu',
-    'http://localhost',
+    'https://facelect.capping.ecrl.marist.edu:3001',
+    'http://localhost:3000',
+    'http://localhost:3001',
     'http://10.11.29.103',
-    'http://facelect.capping.ecrl.marist.edu',
-    '0.0.0.0'
+    'https://facelect.capping.ecrl.marist.edu:3000',
 ];
 
 // Configure CORS to allow requests from your React app
@@ -161,11 +158,11 @@ const options = {
 };
 
 // Create HTTPS server on port 3000
-https.createServer(options, app).listen(3001, () => {
-    console.log('HTTPS Server running on port 3001');
-});
+// https.createServer(options, app).listen(3001, () => {
+//     console.log('HTTPS Server running on port 3001');
+// });
 
 // Start HTTP server on port 3001
-//app.listen(3001, () => {
-    //console.log('HTTP server is running on port 3001');
-//});
\ No newline at end of file
+app.listen(3001, () => {
+    console.log('HTTP server is running on port 3002');
+});
\ No newline at end of file

From 4ed0c3444b4a5611739e7670d4911ac882c889a7 Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 17 Nov 2024 20:50:59 -0500
Subject: [PATCH 15/63] attempt 7

---
 server.js         | 12 ++++++------
 src/AdminView.tsx |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/server.js b/server.js
index 90a7d86..6332207 100644
--- a/server.js
+++ b/server.js
@@ -157,12 +157,12 @@ const options = {
     ]
 };
 
-// Create HTTPS server on port 3000
-// https.createServer(options, app).listen(3001, () => {
-//     console.log('HTTPS Server running on port 3001');
-// });
+// Create HTTPS server on port 3001
+https.createServer(options, app).listen(3001, () => {
+    console.log('HTTPS Server running on port 3001');
+});
 
-// Start HTTP server on port 3001
-app.listen(3001, () => {
+// Start HTTP server on port 3002
+app.listen(3002, () => {
     console.log('HTTP server is running on port 3002');
 });
\ No newline at end of file
diff --git a/src/AdminView.tsx b/src/AdminView.tsx
index e6d6d95..cef7dce 100644
--- a/src/AdminView.tsx
+++ b/src/AdminView.tsx
@@ -87,7 +87,7 @@ const App: React.FC = () => {
   
 
   useEffect(() => {
-    fetch('https://facelect.capping.ecrl.marist.edu/faculty')
+    fetch('http://facelect.capping.ecrl.marist.edu/faculty')
       .then(response => response.json())
       .then(data => setRowData(data))
       .catch(error => console.error('Error fetching data:', error));

From f75eb09b2e0e5b66e8299abe9e90631737d4ae57 Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 17 Nov 2024 23:17:22 -0500
Subject: [PATCH 16/63] a

---
 server.js         | 2 ++
 src/AdminView.tsx | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/server.js b/server.js
index 6332207..defa388 100644
--- a/server.js
+++ b/server.js
@@ -14,8 +14,10 @@ const app = express();
 // List of allowed origins
 const allowedOrigins = [
     'https://localhost:3001',
+    'https://localhost',
     'https://10.11.29.103',
     'https://facelect.capping.ecrl.marist.edu:3001',
+    'https://facelect.capping.ecrl.marist.edu',
     'http://localhost:3000',
     'http://localhost:3001',
     'http://10.11.29.103',
diff --git a/src/AdminView.tsx b/src/AdminView.tsx
index cef7dce..e6d6d95 100644
--- a/src/AdminView.tsx
+++ b/src/AdminView.tsx
@@ -87,7 +87,7 @@ const App: React.FC = () => {
   
 
   useEffect(() => {
-    fetch('http://facelect.capping.ecrl.marist.edu/faculty')
+    fetch('https://facelect.capping.ecrl.marist.edu/faculty')
       .then(response => response.json())
       .then(data => setRowData(data))
       .catch(error => console.error('Error fetching data:', error));

From 15c2a14db9e4b9aa9e7ea585f8f53276ff2e83b7 Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 17 Nov 2024 23:21:32 -0500
Subject: [PATCH 17/63] logging messages for debugging

---
 server.js          | 1 +
 src/AdminLogin.tsx | 1 +
 2 files changed, 2 insertions(+)

diff --git a/server.js b/server.js
index defa388..2d266d5 100644
--- a/server.js
+++ b/server.js
@@ -87,6 +87,7 @@ passport.deserializeUser((user, done) => {
 
 // Route to handle admin login
 app.post('/admin-login', async (req, res) => {
+    console.log('Received admin login request'); // Log request received
     const { username, password } = req.body; // Capture username and password from request
 
     try {
diff --git a/src/AdminLogin.tsx b/src/AdminLogin.tsx
index a712c04..edca632 100644
--- a/src/AdminLogin.tsx
+++ b/src/AdminLogin.tsx
@@ -16,6 +16,7 @@ const AdminLogin: React.FC = () => {
 
   const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
     e.preventDefault();
+    console.log('Submitting login form'); // Log form submission
     try {
       const response = await fetch('https://facelect.capping.ecrl.marist.edu:3001/admin-login', {
         method: 'POST',

From 0458b9931965cdde29d8d23983653d2ea168f95b Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 17 Nov 2024 23:33:26 -0500
Subject: [PATCH 18/63] cors test

---
 server.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/server.js b/server.js
index 2d266d5..1e0e1a4 100644
--- a/server.js
+++ b/server.js
@@ -26,15 +26,17 @@ const allowedOrigins = [
 
 // Configure CORS to allow requests from your React app
 app.use(cors({
-    origin: function (origin, callback) {
-        // Allow requests with no origin (like mobile apps or curl requests)
-        if (!origin) return callback(null, true);
-        if (allowedOrigins.indexOf(origin) === -1) {
-            const msg = 'The CORS policy for this site does not allow access from the specified Origin.';
-            return callback(new Error(msg), false);
-        }
-        return callback(null, true);
-    }
+    origin: '*'
+    
+    // function (origin, callback) {
+    //     // Allow requests with no origin (like mobile apps or curl requests)
+    //     if (!origin) return callback(null, true);
+    //     if (allowedOrigins.indexOf(origin) === -1) {
+    //         const msg = 'The CORS policy for this site does not allow access from the specified Origin.';
+    //         return callback(new Error(msg), false);
+    //     }
+    //     return callback(null, true);
+    // }
 }));
 
 app.use(express.json()); // Parse incoming JSON data

From 72fd9296a63de7f01f14a921571f3f1cf09371e7 Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 17 Nov 2024 23:34:31 -0500
Subject: [PATCH 19/63] reverted cors change

---
 server.js | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/server.js b/server.js
index 1e0e1a4..2d266d5 100644
--- a/server.js
+++ b/server.js
@@ -26,17 +26,15 @@ const allowedOrigins = [
 
 // Configure CORS to allow requests from your React app
 app.use(cors({
-    origin: '*'
-    
-    // function (origin, callback) {
-    //     // Allow requests with no origin (like mobile apps or curl requests)
-    //     if (!origin) return callback(null, true);
-    //     if (allowedOrigins.indexOf(origin) === -1) {
-    //         const msg = 'The CORS policy for this site does not allow access from the specified Origin.';
-    //         return callback(new Error(msg), false);
-    //     }
-    //     return callback(null, true);
-    // }
+    origin: function (origin, callback) {
+        // Allow requests with no origin (like mobile apps or curl requests)
+        if (!origin) return callback(null, true);
+        if (allowedOrigins.indexOf(origin) === -1) {
+            const msg = 'The CORS policy for this site does not allow access from the specified Origin.';
+            return callback(new Error(msg), false);
+        }
+        return callback(null, true);
+    }
 }));
 
 app.use(express.json()); // Parse incoming JSON data

From ee9c499c2c083b193389792aaba2b55c997deda1 Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 17 Nov 2024 23:49:35 -0500
Subject: [PATCH 20/63] cors test 2

---
 server.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/server.js b/server.js
index 2d266d5..3f8d537 100644
--- a/server.js
+++ b/server.js
@@ -29,12 +29,17 @@ app.use(cors({
     origin: function (origin, callback) {
         // Allow requests with no origin (like mobile apps or curl requests)
         if (!origin) return callback(null, true);
-        if (allowedOrigins.indexOf(origin) === -1) {
+
+        if (allowedOrigins.includes(origin)) {
+            return callback(null, true);
+        } else {
             const msg = 'The CORS policy for this site does not allow access from the specified Origin.';
             return callback(new Error(msg), false);
         }
-        return callback(null, true);
-    }
+    },
+    methods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS'], // Allow common methods
+    allowedHeaders: ['Content-Type', 'Authorization'], // Specify headers your API expects
+    credentials: true, // Allow cookies and credentials
 }));
 
 app.use(express.json()); // Parse incoming JSON data

From 5cc5c9aecdace303945601f67d22be94a423da93 Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 17 Nov 2024 23:50:53 -0500
Subject: [PATCH 21/63] revert cors tests 2

---
 server.js | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/server.js b/server.js
index 3f8d537..2d266d5 100644
--- a/server.js
+++ b/server.js
@@ -29,17 +29,12 @@ app.use(cors({
     origin: function (origin, callback) {
         // Allow requests with no origin (like mobile apps or curl requests)
         if (!origin) return callback(null, true);
-
-        if (allowedOrigins.includes(origin)) {
-            return callback(null, true);
-        } else {
+        if (allowedOrigins.indexOf(origin) === -1) {
             const msg = 'The CORS policy for this site does not allow access from the specified Origin.';
             return callback(new Error(msg), false);
         }
-    },
-    methods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS'], // Allow common methods
-    allowedHeaders: ['Content-Type', 'Authorization'], // Specify headers your API expects
-    credentials: true, // Allow cookies and credentials
+        return callback(null, true);
+    }
 }));
 
 app.use(express.json()); // Parse incoming JSON data

From 7f25016d81ceb603728f8ad184a628c1d97f2786 Mon Sep 17 00:00:00 2001
From: Brendon Kupsch <BrendonKupsch1@marist.edu>
Date: Mon, 18 Nov 2024 11:23:22 -0500
Subject: [PATCH 22/63] Https site all errors fixed

---
 package-lock.json                 | 77 ++++++++++++++++---------------
 package.json                      |  3 +-
 server.js                         | 31 +++++++++++--
 src/AdminView.tsx                 |  2 +-
 src/App.tsx                       | 40 ++++++++--------
 src/components/WebSocketClient.js | 36 +++++++++++++++
 src/useWebSocket.js               | 45 ++++++++++++++++++
 7 files changed, 171 insertions(+), 63 deletions(-)
 create mode 100644 src/components/WebSocketClient.js
 create mode 100644 src/useWebSocket.js

diff --git a/package-lock.json b/package-lock.json
index 2982c8c..44ec2c4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -33,7 +33,8 @@
         "react-scripts": "5.0.1",
         "react-select": "^5.8.2",
         "typescript": "^4.9.5",
-        "web-vitals": "^2.1.4"
+        "web-vitals": "^2.1.4",
+        "ws": "^8.18.0"
       }
     },
     "node_modules/@adobe/css-tools": {
@@ -12384,6 +12385,27 @@
         }
       }
     },
+    "node_modules/jsdom/node_modules/ws": {
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -18094,26 +18116,6 @@
         }
       }
     },
-    "node_modules/webpack-dev-server/node_modules/ws": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
-      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/webpack-manifest-plugin": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-4.1.1.tgz",
@@ -18760,15 +18762,16 @@
       }
     },
     "node_modules/ws": {
-      "version": "7.5.10",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
-      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+      "license": "MIT",
       "engines": {
-        "node": ">=8.3.0"
+        "node": ">=10.0.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+        "utf-8-validate": ">=5.0.2"
       },
       "peerDependenciesMeta": {
         "bufferutil": {
@@ -27648,6 +27651,14 @@
         "whatwg-url": "^8.5.0",
         "ws": "^7.4.6",
         "xml-name-validator": "^3.0.0"
+      },
+      "dependencies": {
+        "ws": {
+          "version": "7.5.10",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+          "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+          "requires": {}
+        }
       }
     },
     "jsesc": {
@@ -31619,14 +31630,6 @@
         "spdy": "^4.0.2",
         "webpack-dev-middleware": "^5.3.4",
         "ws": "^8.13.0"
-      },
-      "dependencies": {
-        "ws": {
-          "version": "8.18.0",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
-          "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
-          "requires": {}
-        }
       }
     },
     "webpack-manifest-plugin": {
@@ -32132,9 +32135,9 @@
       }
     },
     "ws": {
-      "version": "7.5.10",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
-      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "requires": {}
     },
     "xml-crypto": {
diff --git a/package.json b/package.json
index e4627ca..708333b 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,8 @@
     "react-scripts": "5.0.1",
     "react-select": "^5.8.2",
     "typescript": "^4.9.5",
-    "web-vitals": "^2.1.4"
+    "web-vitals": "^2.1.4",
+    "ws": "^8.18.0"
   },
   "scripts": {
     "start": "concurrently \"react-scripts start\" \"node server.js\"",
diff --git a/server.js b/server.js
index 2d266d5..cb0ae2b 100644
--- a/server.js
+++ b/server.js
@@ -8,6 +8,7 @@ const fs = require('fs');
 const passport = require('passport');
 const SamlStrategy = require('passport-saml').Strategy;
 const session = require('express-session');
+const WebSocket = require('ws');
 
 const app = express();
 
@@ -22,6 +23,7 @@ const allowedOrigins = [
     'http://localhost:3001',
     'http://10.11.29.103',
     'https://facelect.capping.ecrl.marist.edu:3000',
+    'https://facelect.capping.ecrl.marist.edu/',
 ];
 
 // Configure CORS to allow requests from your React app
@@ -160,12 +162,35 @@ const options = {
     ]
 };
 
-// Create HTTPS server on port 3001
-https.createServer(options, app).listen(3001, () => {
+const httpsServer = https.createServer(options, app);
+httpsServer.listen(3001, () => {
     console.log('HTTPS Server running on port 3001');
 });
 
+// Initialize WebSocket server on the HTTPS server
+const wss = new WebSocket.Server({ server: httpsServer, path: '/ws' });
+
+// Handle WebSocket connections
+wss.on('connection', (ws) => {
+    console.log('New WebSocket connection established');
+
+    ws.on('message', (message) => {
+        console.log(`Received message: ${message}`);
+        ws.send(`Server received: ${message}`);
+    });
+
+    ws.on('close', () => {
+        console.log('WebSocket connection closed');
+    });
+
+    ws.on('error', (error) => {
+        console.error('WebSocket error:', error);
+    });
+});
+
 // Start HTTP server on port 3002
 app.listen(3002, () => {
     console.log('HTTP server is running on port 3002');
-});
\ No newline at end of file
+});
+
+
diff --git a/src/AdminView.tsx b/src/AdminView.tsx
index e6d6d95..898c9e4 100644
--- a/src/AdminView.tsx
+++ b/src/AdminView.tsx
@@ -87,7 +87,7 @@ const App: React.FC = () => {
   
 
   useEffect(() => {
-    fetch('https://facelect.capping.ecrl.marist.edu/faculty')
+    fetch('https://facelect.capping.ecrl.marist.edu:3001/faculty')
       .then(response => response.json())
       .then(data => setRowData(data))
       .catch(error => console.error('Error fetching data:', error));
diff --git a/src/App.tsx b/src/App.tsx
index 17119a0..cdaa01f 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,29 +1,30 @@
-import React from 'react';
+import React, { createContext, useContext, useEffect, useState } from 'react';
 import { BrowserRouter as Router, Routes, Route, Navigate } from 'react-router-dom';
-import Login from './Login';  // Login component
+import Login from './Login'; // Login component
 import AdminLogin from './AdminLogin'; // Admin login component
 import AdminView from './AdminView'; // Admin view component
 import UserProfile from './UserProfile'; // User profile component
 import { AuthProvider, useAuth } from './AuthContext'; // Adjust the path as necessary
+import WebSocketComponent from './components/WebSocketClient';
 
 function App() {
   return (
     <AuthProvider>
-      <Router>
-        <Routes>
-          {/* Default route for the login page */}
-          <Route path="/" element={<Login />} />
+        <Router>
+          <Routes>
+            {/* Default route for the login page */}
+            <Route path="/" element={<Login />} />
 
-          {/* Route for the admin login page */}
-          <Route path="/admin-login" element={<AdminLogin />} />
+            {/* Route for the admin login page */}
+            <Route path="/admin-login" element={<AdminLogin />} />
 
-          {/* Protected route for the admin view page */}
-          <Route path="/admin-view" element={<ProtectedAdminRoute />} />
+            {/* Protected route for the admin view page */}
+            <Route path="/admin-view" element={<ProtectedAdminRoute />} />
 
-          {/* Route for the user profile page */}
-          <Route path='/User-Profile' element={<UserProfile />} />
-        </Routes>
-      </Router>
+            {/* Route for the user profile page */}
+            <Route path="/User-Profile" element={<UserProfile />} />
+          </Routes>
+        </Router>
     </AuthProvider>
   );
 }
@@ -32,13 +33,10 @@ function App() {
 const ProtectedAdminRoute = () => {
   const { isAuthenticated, isAdmin } = useAuth();
 
-  return (
-    isAuthenticated && isAdmin ? (
-      <AdminView />
-    ) : (
-      <Navigate to="/admin-login" replace />
-    )
+  return isAuthenticated && isAdmin ? (
+    <AdminView />
+  ) : (
+    <Navigate to="/admin-login" replace />
   );
 };
-
 export default App;
diff --git a/src/components/WebSocketClient.js b/src/components/WebSocketClient.js
new file mode 100644
index 0000000..2662b8a
--- /dev/null
+++ b/src/components/WebSocketClient.js
@@ -0,0 +1,36 @@
+import React, { useEffect, useState } from 'react';
+import useWebSocket from '../src/useWebSocket.js';
+
+const WebSocketComponent = () => {
+    const { messages, sendMessage } = useWebSocket('wss://facelect.capping.ecrl.marist.edu:3001/ws'); // Use the hook
+    const [inputMessage, setInputMessage] = useState('');
+
+    const handleSendMessage = () => {
+        sendMessage(inputMessage); // Send the message using the hook
+        setInputMessage(''); // Clear the input field
+    };
+
+    return (
+        <div>
+            <h1>WebSocket Example</h1>
+            <input
+                type="text"
+                value={inputMessage}
+                onChange={(e) => setInputMessage(e.target.value)}
+                placeholder="Type a message"
+            />
+            <button onClick={sendMessage}>Send Message</button>
+            <div>
+                <h2>Messages from Server:</h2>
+                <ul>
+                    {messages.map((msg, index) => (
+                        <li key={index}>{msg}</li>
+                    ))}
+                </ul>
+            </div>
+        </div>
+    );
+};
+
+export default WebSocketComponent;
+
diff --git a/src/useWebSocket.js b/src/useWebSocket.js
new file mode 100644
index 0000000..e07aaca
--- /dev/null
+++ b/src/useWebSocket.js
@@ -0,0 +1,45 @@
+import { useEffect, useRef, useState } from 'react';
+
+const useWebSocket = (url) => {
+    const [messages, setMessages] = useState([]);
+    const socketRef = useRef(null);
+
+    useEffect(() => {
+        const ws = new WebSocket(url);
+
+        ws.onopen = () => {
+            console.log('WebSocket connection established');
+        };
+
+        ws.onmessage = (event) => {
+            console.log('Message from server:', event.data);
+            setMessages((prev) => [...prev, event.data]);
+        };
+
+        ws.onerror = (error) => {
+            console.error('WebSocket error:', error);
+        };
+
+        ws.onclose = () => {
+            console.log('WebSocket connection closed');
+        };
+
+        socketRef.current = ws;
+
+        return () => {
+            ws.close();
+        };
+    }, [url]);
+
+    const sendMessage = (message) => {
+        if (socketRef.current && socketRef.current.readyState === WebSocket.OPEN) {
+            socketRef.current.send(message);
+        } else {
+            console.error('WebSocket is not open');
+        }
+    };
+
+    return { messages, sendMessage };
+};
+
+export default useWebSocket;

From 7d3204e106d9bed44870db1be5df34a4b24c7be5 Mon Sep 17 00:00:00 2001
From: Ethan <ethan.ondreicka1@marist.edu>
Date: Mon, 18 Nov 2024 12:43:48 -0500
Subject: [PATCH 23/63] changes to user profile

---
 src/UserProfile.css              |  32 +++++++-
 src/UserProfile.tsx              | 121 +++++++++++++++++--------------
 src/components/navbar/Navbar.css |  11 +++
 src/components/navbar/Navbar.tsx |   5 +-
 4 files changed, 111 insertions(+), 58 deletions(-)

diff --git a/src/UserProfile.css b/src/UserProfile.css
index a68645d..c4cd668 100644
--- a/src/UserProfile.css
+++ b/src/UserProfile.css
@@ -3,9 +3,13 @@
 * {
     font-family: "Inter", serif;
 }
+.container{
+    background-color: white;
+}
+
 
 .profile-form-container {
-    background-color: #f8f8f8;
+    background-color: white;
     border-radius: 20px;
     padding: 50px;
     max-width: 500px;
@@ -14,7 +18,7 @@
 }
 
 h1 {
-    font-size: 24px;
+    font-size: 30px;
     color: #b21e2d;
     text-align: center;
 }
@@ -109,5 +113,29 @@ select,
     width: 30px;
 }
 
+.profile-view{
+    font-size: larger;
+}
+
+.edit-button{
+    background-color: #b21e2d;
+    border: 2px solid #fe6978;
+    cursor: pointer;
+    display: flex;
+    justify-content: flex-end;
+    margin: auto;
+    transition-duration: 0.4s;
+    color: white;
+    padding: 10px;
+    font-size: large;
+    border-radius: 15px;
+    margin-top: 30px;
+    margin-bottom: -10px;
+}
+
+.edit-button:hover {
+    background-color: #831b25;
+}
+
 
   
diff --git a/src/UserProfile.tsx b/src/UserProfile.tsx
index 18ad6ec..a35b24d 100644
--- a/src/UserProfile.tsx
+++ b/src/UserProfile.tsx
@@ -6,6 +6,7 @@ import CreatableSelect from 'react-select/creatable';
 import Select from 'react-select';
 
 const UserProfile: React.FC = () => {
+  const [isEditing, setIsEditing] = useState(false); // State to track if in edit mode
   const [preferredName, setPreferredName] = useState('');
   const [school, setSchool] = useState('');
   const [committees, setCommittees] = useState<string[]>([]);
@@ -27,66 +28,76 @@ const UserProfile: React.FC = () => {
     setCommittees(selectedOptions ? selectedOptions.map((option: any) => option.value) : []);
   };
 
+  const handleSave = () => {
+    setIsEditing(false);
+    // You can also trigger a save to the database here
+  };
+
   return (
-    <div>
+    <div className='container'>
       <Navbar />
-      <h1>Your Election Profile</h1>
+      <h1 className='title'>Your Election Profile</h1>
       <div className="profile-form-container">
-        <form className="profile-form">
-          {/* Preferred Name Input */}
-          <div className="form-group">
-            <label>Enter your preferred name (how it will appear on the ballot)</label>
-            <input
-              type="text"
-              value={preferredName}
-              onChange={(e) => setPreferredName(e.target.value)}
-              placeholder="Your Preferred Name Here"
-            />
-          </div>
-
-          {/* Dropdown for School */}
-          <div className="form-group">
-            <label>Select your School from the dropdown menu</label>
-            <Select
-              options={schoolOptions}
-              value={schoolOptions.find(option => option.value === school)}
-              onChange={(selectedOption) => setSchool(selectedOption?.value || '')}
-              placeholder="Select School"
-            />
-          </div>
-
-          {/* Multi-select Committees */}
-          <div className="form-group">
-            <label>Select the committees you have been a part of (can select multiple)</label>
-            <CreatableSelect
-              className='select-input'
-              isMulti
-              options={committeeOptions}
-              onChange={handleCommitteeChange}
-              placeholder="Select or input committees"
-            />
-          </div>
-
-          {/* Service Statement */}
-          <div className="form-group">
-            <label>Create a Service Statement (Why someone should vote for you)</label>
-            <textarea
-              value={serviceStatement}
-              onChange={(e) => setServiceStatement(e.target.value)}
-              placeholder="Enter your statement here"
-              maxLength={300}
-            />
-            <small>{serviceStatement.length}/300</small>
-          </div>
-
-          {/* Save Button */}
-          <div className="form-group">
-            <button type="submit" className="save-button">
-              <p>Save Profile</p>
-             {/*<img src={saveIcon} alt="Save" />*/}
+        {isEditing ? (
+          // Edit State
+          <form className="profile-form">
+            <div className="form-group">
+              <label>Enter your preferred name (how it will appear on the ballot)</label>
+              <input
+                type="text"
+                value={preferredName}
+                onChange={(e) => setPreferredName(e.target.value)}
+                placeholder="Your Preferred Name Here"
+              />
+            </div>
+            <div className="form-group">
+              <label>Select your School from the dropdown menu</label>
+              <Select
+                options={schoolOptions}
+                value={schoolOptions.find(option => option.value === school)}
+                onChange={(selectedOption) => setSchool(selectedOption?.value || '')}
+                placeholder="Select School"
+              />
+            </div>
+            <div className="form-group">
+              <label>Select the committees you have been a part of (can select multiple)</label>
+              <CreatableSelect
+                className='select-input'
+                isMulti
+                options={committeeOptions}
+                onChange={handleCommitteeChange}
+                placeholder="Select or input committees"
+              />
+            </div>
+            <div className="form-group">
+              <label>Create a Service Statement (Why someone should vote for you)</label>
+              <textarea
+                value={serviceStatement}
+                onChange={(e) => setServiceStatement(e.target.value)}
+                placeholder="Enter your statement here"
+                maxLength={300}
+              />
+              <small>{serviceStatement.length}/300</small>
+            </div>
+            <div className="form-group">
+              <button type="button" className="save-button" onClick={handleSave}>
+                <p>Save Profile</p>
+                {/* <img src={saveIcon} alt="Save" /> */}
+              </button>
+            </div>
+          </form>
+        ) : (
+          // View State
+          <div className="profile-view">
+            <p><strong>Preferred Name:</strong> {preferredName || 'Not provided'}</p>
+            <p><strong>School:</strong> {school || 'Not selected'}</p>
+            <p><strong>Committees:</strong> {committees.length > 0 ? committees.join(', ') : 'None selected'}</p>
+            <p><strong>Service Statement:</strong> {serviceStatement || 'Not provided'}</p>
+            <button type="button" className="edit-button" onClick={() => setIsEditing(true)}>
+              Edit Profile
             </button>
           </div>
-        </form>
+        )}
       </div>
     </div>
   );
diff --git a/src/components/navbar/Navbar.css b/src/components/navbar/Navbar.css
index 5b3cc3d..cba35d9 100644
--- a/src/components/navbar/Navbar.css
+++ b/src/components/navbar/Navbar.css
@@ -11,4 +11,15 @@
     width: 100vw; 
     z-index: 3;
     color: white;
+    box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1);
+}
+
+.navbar-logo {
+    display: flex;
+    align-items: center;
+  }
+  
+.navbar-logo img {
+    height: 65px; /* Adjusted size for better alignment */
+    cursor: pointer;
 }
\ No newline at end of file
diff --git a/src/components/navbar/Navbar.tsx b/src/components/navbar/Navbar.tsx
index c7829b8..9719301 100644
--- a/src/components/navbar/Navbar.tsx
+++ b/src/components/navbar/Navbar.tsx
@@ -1,10 +1,13 @@
 import React from 'react'
 import './Navbar.css'
+import logo from '../../assets/logo.png';
 
 const Navbar = () => {
   return (
     <nav className='Navbar'>
-       Marist Faculty Elections // * NOT FINAL *
+      <div className='navbar-logo'>
+        <img src={logo}/>
+      </div>
     </nav>
   )
 }

From 71b5551c015db9b4e0f766c18b528a9eca7ef41f Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Mon, 2 Dec 2024 09:51:22 -0500
Subject: [PATCH 24/63] implemented changes from ethan -dev and brendon - dev

---
 backend/idp_metadata.xml       | 161 +++++++++++++++++++++++++++++++++
 db/sql/Test_Data_Revised_1.sql |   2 +-
 server.js                      |  42 ++++-----
 src/AdminLogin.tsx             |   5 +-
 src/AdminView.tsx              |   2 +-
 src/App.tsx                    |  12 ++-
 src/Login.tsx                  |  11 ++-
 7 files changed, 202 insertions(+), 33 deletions(-)
 create mode 100644 backend/idp_metadata.xml

diff --git a/backend/idp_metadata.xml b/backend/idp_metadata.xml
new file mode 100644
index 0000000..14f6f4a
--- /dev/null
+++ b/backend/idp_metadata.xml
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor  xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://auth.it.marist.edu/idp">
+
+    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+
+        <Extensions>
+            <shibmd:Scope regexp="false">marist.edu</shibmd:Scope>
+<!--
+            <mdui:UIInfo>
+                <mdui:DisplayName xml:lang="en">Marist.edu</mdui:DisplayName>
+                <mdui:Description xml:lang="en">Marist IdP for single sign on</mdui:Description>
+                <mdui:Logo height="80" width="80">https://www.marist.edu/images/logo.png</mdui:Logo>
+            </mdui:UIInfo>
+-->
+        </Extensions>
+
+        <KeyDescriptor use="signing">
+            <ds:KeyInfo>
+                    <ds:X509Data>
+                        <ds:X509Certificate>
+MIIDZDCCAkygAwIBAgIEWUPr+jANBgkqhkiG9w0BAQsFADB0MQswCQYDVQQGEwJV
+UzELMAkGA1UECAwCTlkxFTATBgNVBAcMDFBvdWdoa2VlcHNpZTEXMBUGA1UECgwO
+TWFyaXN0IENvbGxlZ2UxCzAJBgNVBAsMAklUMRswGQYDVQQDDBJhdXRoLml0Lm1h
+cmlzdC5lZHUwHhcNMTcwNjE2MTQzNDIzWhcNMjcwNjE2MTQzNDIzWjB0MQswCQYD
+VQQGEwJVUzELMAkGA1UECAwCTlkxFTATBgNVBAcMDFBvdWdoa2VlcHNpZTEXMBUG
+A1UECgwOTWFyaXN0IENvbGxlZ2UxCzAJBgNVBAsMAklUMRswGQYDVQQDDBJhdXRo
+Lml0Lm1hcmlzdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDE
+43jyxC++dV0lYffBNFiMiSALRzZQIKRGGybuLobzyN7/ItAex9ABY36IKPQ7OPPt
+sKofjX4VLcVpehiDAUeQpLOUIOWiEJ3+QBR7WPqGRLW2Hen3utApH1a1+iA5nzqE
+uhpu0SMqC1g9Rt5m0ZGAuK+jT4KWfaEe18yphF8szpcVzwfAACr8cbYGSobMbOsz
+DgcQnXS+m1qorsn7fLZOa6R4pve/G9YZunFAJXBdmkHGo8Rmd6s/kIgQJZIksqkZ
+50gpDqzbIlKRYfHGroztjdGWcXkHUL7UXjUCNbQOvIvml4D8s2JtwgFRwkvo8BJ5
+KCKjJZQi9GZ3SRs4zyabAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAC+wiZCUiTlL
+MjNPACIe7f2wz5oit+HYRx3jTVTtWX8t+dWlEMK94LNysPuuU110qy0VeBIPgXXz
+Izka8yTOhxbBkQWG/5t7bAygOHhcyd6/XOv8pcwd1K+XMfu/BwLgyqk3pasERPu3
+hClNTmEyAkH1r09+k2TJpXqwA1UU6UGtHSqEwQz+FmNzCvEsyCI9i+cN4sVR9Lme
+ifZK7NdEDPu3jCiJgrZ0M6ltHkIf6yYm8xOv/6Ujcfvktofqe7oaqLYwAU1gQ2bC
+DkFRqL4im1iI7aKFrOoW9f5NF4Fx4aa9KidDmoSUOUSf42K4qGPZdvGpeRCxz/9q
+0HSCaQodCfM=
+                        </ds:X509Certificate>
+                    </ds:X509Data>
+            </ds:KeyInfo>
+
+        </KeyDescriptor>
+        <KeyDescriptor use="encryption">
+            <ds:KeyInfo>
+                    <ds:X509Data>
+                        <ds:X509Certificate>
+MIIDXzCCAkcCBFlD7pQwDQYJKoZIhvcNAQELBQAwdDELMAkGA1UEBhMCVVMxCzAJ
+BgNVBAgMAk5ZMRUwEwYDVQQHDAxQb3VnaGtlZXBzaWUxFzAVBgNVBAoMDk1hcmlz
+dCBDb2xsZWdlMQswCQYDVQQLDAJJVDEbMBkGA1UEAwwSYXV0aC5pdC5tYXJpc3Qu
+ZWR1MB4XDTE3MDYxNjE0NDQxNloXDTM3MDYxNjE0NDQxNlowdDELMAkGA1UEBhMC
+VVMxCzAJBgNVBAgMAk5ZMRUwEwYDVQQHDAxQb3VnaGtlZXBzaWUxFzAVBgNVBAoM
+Dk1hcmlzdCBDb2xsZWdlMQswCQYDVQQLDAJJVDEbMBkGA1UEAwwSYXV0aC5pdC5t
+YXJpc3QuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtJ2+w3qC
+xfsGp6w1tGj2cGmgrOV4AbUXxSkjtxiN4uM2KlvJPHly8TXVlA/qJ7vB6CmWGAyy
+IEc6OS0NUE/sbU3MM8qRaBgvfarZCmClr0xIl0eLaDBdL9Srbyz56SyReQlvvnvR
+CaHkdngVTOsxkf62G9jDPWRqhvLcVlZs0MqB57KqOeK+N4GK0pUnLudJI3bVYND8
+G8SZKZ6a0VNvVOw57puzBvrRsUsBLhmLw2zeC/8cNN82Yzhgl60b+U6N/9oK4Rfl
+5nFu5yzfotgdK4p1FOJRduX1+2kueL2piqy2WpD9HmRGxVsgYnfVDheyHIvttdz6
+/ZG7Jrrie4ehzwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCHwNrdDPI+r2PWjA5R
+GXNsBTAsEOmA8+lFGQjp4YkCXudmn/FHWT5uBcw+lLKOM6KS8TrDRAWr6UYAKNVU
+SbgAPcY1rR0uCQ8fAvLvM6t5igUZLE1FwzNeLSV6ea5A7e828w5DQSQdoEY79SDG
+TIjzs0V8I+r3AZI9EstmaO345HVU3kHFFVuBTNP5yHzzeXlqrPaCgOnsAWZsd2VV
+tu3y3PgBWSJU1+1XnedtikbmqrQw2VzR0LUSq3CO1Eh5y82YHPVFL5Y6T15I5oyR
+IlEf+60ae5V8mYuV4eXaYIImm3/IbYNchlMgPOOI30YYwGFLHqYS8BX/Ga0YoEOk
+1R/Q
+                        </ds:X509Certificate>
+                    </ds:X509Data>
+            </ds:KeyInfo>
+
+        </KeyDescriptor>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://auth.it.marist.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.it.marist.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+
+        <!--
+                     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.it.marist.edu/idp/profile/SAML2/Redirect/SLO"/>
+        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.it.marist.edu/idp/profile/SAML2/POST/SLO"/>
+        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.it.marist.edu/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.it.marist.edu:8443/idp/profile/SAML2/SOAP/SLO"/>
+        -->
+
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.it.marist.edu/idp/profile/Shibboleth/SSO"/>
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.it.marist.edu/idp/profile/SAML2/POST/SSO"/>
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.it.marist.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.it.marist.edu/idp/profile/SAML2/Redirect/SSO"/>
+
+    </IDPSSODescriptor>
+
+
+    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+
+        <Extensions>
+            <shibmd:Scope regexp="false">marist.edu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor use="signing">
+            <ds:KeyInfo>
+                    <ds:X509Data>
+                        <ds:X509Certificate>
+MIIDZDCCAkygAwIBAgIEWUPr+jANBgkqhkiG9w0BAQsFADB0MQswCQYDVQQGEwJV
+UzELMAkGA1UECAwCTlkxFTATBgNVBAcMDFBvdWdoa2VlcHNpZTEXMBUGA1UECgwO
+TWFyaXN0IENvbGxlZ2UxCzAJBgNVBAsMAklUMRswGQYDVQQDDBJhdXRoLml0Lm1h
+cmlzdC5lZHUwHhcNMTcwNjE2MTQzNDIzWhcNMjcwNjE2MTQzNDIzWjB0MQswCQYD
+VQQGEwJVUzELMAkGA1UECAwCTlkxFTATBgNVBAcMDFBvdWdoa2VlcHNpZTEXMBUG
+A1UECgwOTWFyaXN0IENvbGxlZ2UxCzAJBgNVBAsMAklUMRswGQYDVQQDDBJhdXRo
+Lml0Lm1hcmlzdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDE
+43jyxC++dV0lYffBNFiMiSALRzZQIKRGGybuLobzyN7/ItAex9ABY36IKPQ7OPPt
+sKofjX4VLcVpehiDAUeQpLOUIOWiEJ3+QBR7WPqGRLW2Hen3utApH1a1+iA5nzqE
+uhpu0SMqC1g9Rt5m0ZGAuK+jT4KWfaEe18yphF8szpcVzwfAACr8cbYGSobMbOsz
+DgcQnXS+m1qorsn7fLZOa6R4pve/G9YZunFAJXBdmkHGo8Rmd6s/kIgQJZIksqkZ
+50gpDqzbIlKRYfHGroztjdGWcXkHUL7UXjUCNbQOvIvml4D8s2JtwgFRwkvo8BJ5
+KCKjJZQi9GZ3SRs4zyabAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAC+wiZCUiTlL
+MjNPACIe7f2wz5oit+HYRx3jTVTtWX8t+dWlEMK94LNysPuuU110qy0VeBIPgXXz
+Izka8yTOhxbBkQWG/5t7bAygOHhcyd6/XOv8pcwd1K+XMfu/BwLgyqk3pasERPu3
+hClNTmEyAkH1r09+k2TJpXqwA1UU6UGtHSqEwQz+FmNzCvEsyCI9i+cN4sVR9Lme
+ifZK7NdEDPu3jCiJgrZ0M6ltHkIf6yYm8xOv/6Ujcfvktofqe7oaqLYwAU1gQ2bC
+DkFRqL4im1iI7aKFrOoW9f5NF4Fx4aa9KidDmoSUOUSf42K4qGPZdvGpeRCxz/9q
+0HSCaQodCfM=
+                        </ds:X509Certificate>
+                    </ds:X509Data>
+            </ds:KeyInfo>
+
+        </KeyDescriptor>
+        <KeyDescriptor use="encryption">
+            <ds:KeyInfo>
+                    <ds:X509Data>
+                        <ds:X509Certificate>
+MIIDXzCCAkcCBFlD7pQwDQYJKoZIhvcNAQELBQAwdDELMAkGA1UEBhMCVVMxCzAJ
+BgNVBAgMAk5ZMRUwEwYDVQQHDAxQb3VnaGtlZXBzaWUxFzAVBgNVBAoMDk1hcmlz
+dCBDb2xsZWdlMQswCQYDVQQLDAJJVDEbMBkGA1UEAwwSYXV0aC5pdC5tYXJpc3Qu
+ZWR1MB4XDTE3MDYxNjE0NDQxNloXDTM3MDYxNjE0NDQxNlowdDELMAkGA1UEBhMC
+VVMxCzAJBgNVBAgMAk5ZMRUwEwYDVQQHDAxQb3VnaGtlZXBzaWUxFzAVBgNVBAoM
+Dk1hcmlzdCBDb2xsZWdlMQswCQYDVQQLDAJJVDEbMBkGA1UEAwwSYXV0aC5pdC5t
+YXJpc3QuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtJ2+w3qC
+xfsGp6w1tGj2cGmgrOV4AbUXxSkjtxiN4uM2KlvJPHly8TXVlA/qJ7vB6CmWGAyy
+IEc6OS0NUE/sbU3MM8qRaBgvfarZCmClr0xIl0eLaDBdL9Srbyz56SyReQlvvnvR
+CaHkdngVTOsxkf62G9jDPWRqhvLcVlZs0MqB57KqOeK+N4GK0pUnLudJI3bVYND8
+G8SZKZ6a0VNvVOw57puzBvrRsUsBLhmLw2zeC/8cNN82Yzhgl60b+U6N/9oK4Rfl
+5nFu5yzfotgdK4p1FOJRduX1+2kueL2piqy2WpD9HmRGxVsgYnfVDheyHIvttdz6
+/ZG7Jrrie4ehzwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCHwNrdDPI+r2PWjA5R
+GXNsBTAsEOmA8+lFGQjp4YkCXudmn/FHWT5uBcw+lLKOM6KS8TrDRAWr6UYAKNVU
+SbgAPcY1rR0uCQ8fAvLvM6t5igUZLE1FwzNeLSV6ea5A7e828w5DQSQdoEY79SDG
+TIjzs0V8I+r3AZI9EstmaO345HVU3kHFFVuBTNP5yHzzeXlqrPaCgOnsAWZsd2VV
+tu3y3PgBWSJU1+1XnedtikbmqrQw2VzR0LUSq3CO1Eh5y82YHPVFL5Y6T15I5oyR
+IlEf+60ae5V8mYuV4eXaYIImm3/IbYNchlMgPOOI30YYwGFLHqYS8BX/Ga0YoEOk
+1R/Q
+                        </ds:X509Certificate>
+                    </ds:X509Data>
+            </ds:KeyInfo>
+
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://auth.it.marist.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+        <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.it.marist.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
+        <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
+
+    </AttributeAuthorityDescriptor>
+
+</EntityDescriptor>
\ No newline at end of file
diff --git a/db/sql/Test_Data_Revised_1.sql b/db/sql/Test_Data_Revised_1.sql
index 3be621f..8a74160 100644
--- a/db/sql/Test_Data_Revised_1.sql
+++ b/db/sql/Test_Data_Revised_1.sql
@@ -313,4 +313,4 @@ INSERT INTO Faculty (FID, Email, SchoolID, IsHidden, PrefName, URL, TheStatement
 	 '2024-04-23 13:01:23');
 
 INSERT INTO Admins (aid, uname, thepassword, godmode) VALUES
-	(1, 'admin1', 'cd6357efdd966de8c0cb2f876cc89ec74ce35f0968e11743987084bd42fb8944', TRUE)
+	(1, 'admin1', 'cd6357efdd966de8c0cb2f876cc89ec74ce35f0968e11743987084bd42fb8944', TRUE)
\ No newline at end of file
diff --git a/server.js b/server.js
index 2d266d5..48d57e4 100644
--- a/server.js
+++ b/server.js
@@ -13,15 +13,7 @@ const app = express();
 
 // List of allowed origins
 const allowedOrigins = [
-    'https://localhost:3001',
-    'https://localhost',
-    'https://10.11.29.103',
-    'https://facelect.capping.ecrl.marist.edu:3001',
     'https://facelect.capping.ecrl.marist.edu',
-    'http://localhost:3000',
-    'http://localhost:3001',
-    'http://10.11.29.103',
-    'https://facelect.capping.ecrl.marist.edu:3000',
 ];
 
 // Configure CORS to allow requests from your React app
@@ -60,12 +52,12 @@ const hashPassword = (password) => {
 };
 
 // Passport SAML strategy configuration
-passport.use(new SamlStrategy(
+const samlStrategy = new SamlStrategy(
     {
       path: '/login/callback',
-      entryPoint: 'https://auth.it.marist.edu/idp',
-      issuer: 'Marist-SSO',
-      cert: fs.readFileSync('./backend/2024_facelect.capping.ecrl.marist.edu.crt', 'utf-8'),
+      entryPoint: 'https://auth.it.marist.edu/idp/profile/SAML2/Redirect/SSO',
+      issuer: 'https://facelect.capping.ecrl.marist.edu',
+      cert: fs.readFileSync('./backend/idp_metadata.xml', 'utf-8'),
     },
     function(profile, done) {
       findByEmail(profile.email, function(err, user) {
@@ -74,9 +66,11 @@ passport.use(new SamlStrategy(
         }
         return done(null, user);
       });
-    })
+    }
 );
 
+passport.use(samlStrategy);
+
 passport.serializeUser((user, done) => {
     done(null, user);
 });
@@ -85,9 +79,14 @@ passport.deserializeUser((user, done) => {
     done(null, user);
 });
 
+// Route to serve SP metadata
+app.get('/metadata', (req, res) => {
+    res.type('application/xml');
+    res.status(200).send(samlStrategy.generateServiceProviderMetadata(fs.readFileSync('./backend/2024_facelect.capping.ecrl.marist.edu.crt', 'utf-8')));
+});
+
 // Route to handle admin login
 app.post('/admin-login', async (req, res) => {
-    console.log('Received admin login request'); // Log request received
     const { username, password } = req.body; // Capture username and password from request
 
     try {
@@ -138,8 +137,8 @@ app.get('/faculty', async (req, res) => {
 });
 
 // SSO login route
-app.get('/login', passport.authenticate('saml', {
-    successRedirect: '/',
+app.get('/sso/login', passport.authenticate('saml', {
+    successRedirect: '/user-profile',
     failureRedirect: '/login'
 }));
 
@@ -148,24 +147,17 @@ app.post('/login/callback', passport.authenticate('saml', {
     failureRedirect: '/login',
     failureFlash: true
 }), (req, res) => {
-    res.redirect('/');
+    res.redirect('/user-profile');
 });
 
 // Read SSL certificate and key
 const options = {
     key: fs.readFileSync('./backend/facelect.capping.ecrl.marist.edu.key'),
     cert: fs.readFileSync('./backend/2024_facelect.capping.ecrl.marist.edu.crt'),
-    ca: [
-        fs.readFileSync('./backend/2024_InCommonCA.crt')
-    ]
+    ca: fs.readFileSync('./backend/2024_InCommonCA.crt'),
 };
 
 // Create HTTPS server on port 3001
 https.createServer(options, app).listen(3001, () => {
     console.log('HTTPS Server running on port 3001');
-});
-
-// Start HTTP server on port 3002
-app.listen(3002, () => {
-    console.log('HTTP server is running on port 3002');
 });
\ No newline at end of file
diff --git a/src/AdminLogin.tsx b/src/AdminLogin.tsx
index edca632..0246388 100644
--- a/src/AdminLogin.tsx
+++ b/src/AdminLogin.tsx
@@ -16,9 +16,8 @@ const AdminLogin: React.FC = () => {
 
   const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
     e.preventDefault();
-    console.log('Submitting login form'); // Log form submission
     try {
-      const response = await fetch('https://facelect.capping.ecrl.marist.edu:3001/admin-login', {
+      const response = await fetch('https://facelect.capping.ecrl.marist.edu', {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json',
@@ -84,4 +83,4 @@ const AdminLogin: React.FC = () => {
   );
 }
 
-export default AdminLogin;
+export default AdminLogin;
\ No newline at end of file
diff --git a/src/AdminView.tsx b/src/AdminView.tsx
index e6d6d95..688d6f7 100644
--- a/src/AdminView.tsx
+++ b/src/AdminView.tsx
@@ -125,4 +125,4 @@ const App: React.FC = () => {
   );
 };
 
-export default App;
+export default App;
\ No newline at end of file
diff --git a/src/App.tsx b/src/App.tsx
index 17119a0..c1cee92 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -22,6 +22,9 @@ function App() {
 
           {/* Route for the user profile page */}
           <Route path='/User-Profile' element={<UserProfile />} />
+
+          {/* Route for the SSO redirect */}
+          <Route path="/sso/login" element={<SSORedirect />} />
         </Routes>
       </Router>
     </AuthProvider>
@@ -41,4 +44,11 @@ const ProtectedAdminRoute = () => {
   );
 };
 
-export default App;
+const SSORedirect: React.FC = () => {
+  React.useEffect(() => {
+    window.location.href = '/sso/login'; // Redirect to the server-side SSO login route
+  }, []);
+
+  return <div>Redirecting...</div>;
+};
+export default App;
\ No newline at end of file
diff --git a/src/Login.tsx b/src/Login.tsx
index 07c6197..3090bb8 100644
--- a/src/Login.tsx
+++ b/src/Login.tsx
@@ -4,6 +4,12 @@ import backgroundImage from './assets/background.jpg';
 import logoImage from './assets/logo.png'
 import Footer from './components/footer/footer';
 
+function handleSSOLogin() {
+  console.log('going to the /login')
+  window.location.href = 'https://facelect.capping.ecrl.marist.edu:3001/sso/login';
+}
+
+
 function Login() {
   return (
     <div className='m-login'>
@@ -11,11 +17,12 @@ function Login() {
       <img src={logoImage} className='logo' alt='Marist Election Profile Logo' />
       <div className='login-box'>
         <h2 id='loginText'>Login:</h2>
-        <button className='sso-button'>Marist SSO</button>
+        <button className='sso-button' onClick={handleSSOLogin}>Marist SSO</button>
+
         <a href='/admin-login' className='admin-login'>Admin? Login here</a>
       </div>
     </div>
   );
 }
 
-export default Login;
+export default Login;
\ No newline at end of file

From 27d2b12b7315f08e9d76eeea6e39c1aa1c680db0 Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Mon, 2 Dec 2024 10:44:24 -0500
Subject: [PATCH 25/63] added toekn field, started logic for profile update

---
 db/sql/database_structure.sql |  4 ++++
 server.js                     | 39 +++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/db/sql/database_structure.sql b/db/sql/database_structure.sql
index c9ba8bc..fe32d82 100644
--- a/db/sql/database_structure.sql
+++ b/db/sql/database_structure.sql
@@ -40,6 +40,10 @@ create table Faculty (
 primary key (FID)
 );
 
+-- Add the new column 'token' to the Faculty table
+alter table Faculty
+add token text;
+
 create table Committees (
 	CID   serial not null,
 	Cname text not null,
diff --git a/server.js b/server.js
index 48d57e4..655219e 100644
--- a/server.js
+++ b/server.js
@@ -113,6 +113,45 @@ app.post('/admin-login', async (req, res) => {
     }
 });
 
+// Route to update a faculty member's profile
+app.post('/update-profile', async (req, res) => {
+    const { token, committee, school, preferredName, serviceStatement } = req.body;
+
+    try {
+        // Find the faculty member by token
+        const facultyResult = await client.query('SELECT FID FROM Faculty WHERE token = $1', [token]);
+
+        if (facultyResult.rows.length === 0) {
+            return res.status(400).json({ message: 'Invalid token' });
+        }
+
+        const facultyId = facultyResult.rows[0].fid;
+
+        // Update the faculty member's preferred name and service statement
+        await client.query(
+            'UPDATE Faculty SET PrefName = $1, TheStatement = $2 WHERE FID = $3',
+            [preferredName, serviceStatement, facultyId]
+        );
+
+        // Update the faculty member's school
+        await client.query(
+            'UPDATE Faculty SET SchoolID = (SELECT SID FROM Schools WHERE Sname = $1) WHERE FID = $2',
+            [school, facultyId]
+        );
+
+        // Insert new committee assignment without deleting old ones
+        await client.query(
+            'INSERT INTO CommitteeAssignments (FID, CID) VALUES ($1, (SELECT CID FROM Committees WHERE Cname = $2))',
+            [facultyId, committee]
+        );
+
+        res.json({ message: 'Profile updated successfully' });
+    } catch (err) {
+        console.error('Error updating profile:', err);
+        res.status(500).json({ message: 'Server error' });
+    }
+});
+
 // Example existing route for fetching faculty data (unchanged)
 app.get('/faculty', async (req, res) => {
     try {

From 809e53a438b18c82a5fa9315b962d8e40c195239 Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 8 Dec 2024 01:22:22 -0500
Subject: [PATCH 26/63] pull schools and committees from db

---
 server.js           | 15 ++++++++++++++-
 src/UserProfile.tsx | 37 +++++++++++++++++++++++++++----------
 2 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/server.js b/server.js
index 4ea7ca8..9e87a08 100644
--- a/server.js
+++ b/server.js
@@ -109,7 +109,20 @@ app.get('/committees', async (req, res) => {
       console.error('Error fetching committees:', err);
       res.status(500).json({ message: 'Server error' });
     }
-  });
+  }
+);
+
+// Route to fetch school names
+app.get('/schools', async (req, res) => {
+    try {
+        const result = await client.query('SELECT Sname FROM Schools');
+        res.json(result.rows);
+    } catch (err) {
+        console.error('Error fetching schools:', err);
+        res.status(500).json({ message: 'Server error' });
+    }
+  }
+);
 
 // Route to handle admin login
 app.post('/admin-login', async (req, res) => {
diff --git a/src/UserProfile.tsx b/src/UserProfile.tsx
index c77d68d..542885b 100644
--- a/src/UserProfile.tsx
+++ b/src/UserProfile.tsx
@@ -6,12 +6,13 @@ import CreatableSelect from 'react-select/creatable';
 import Select from 'react-select';
 
 const UserProfile: React.FC = () => {
-  const [isEditing, setIsEditing] = useState(false); // State to track if in edit mode
+  const [isEditing, setIsEditing] = useState(false);
   const [preferredName, setPreferredName] = useState('');
   const [school, setSchool] = useState('');
   const [committees, setCommittees] = useState<string[]>([]);
   const [serviceStatement, setServiceStatement] = useState('');
   const [committeeOptions, setCommitteeOptions] = useState<{ value: string, label: string }[]>([]);
+  const [schoolOptions, setSchoolOptions] = useState<{ value: string, label: string }[]>([]);
 
   useEffect(() => {
     const fetchCommitteeNames = async () => {
@@ -35,22 +36,40 @@ const UserProfile: React.FC = () => {
         console.error('Error fetching committee names:', error);
       }
     };
+
+    const fetchSchoolNames = async () => {
+      try {
+        const response = await fetch('/schools', {
+          method: 'GET',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+        });
+        if (!response.ok) {
+          throw new Error(`Error fetching school names: ${response.statusText}`);
+        }
+        const data = await response.json();
+        const options = data.map((school: { sname: string }) => ({
+          value: school.sname,
+          label: school.sname,
+        }));
+        setSchoolOptions(options);
+      } catch (error) {
+        console.error('Error fetching school names:', error);
+      }
+    };
+
     fetchCommitteeNames();
+    fetchSchoolNames();
   }, []);
 
-  const schoolOptions = [
-    { value: 'School of Business', label: 'School of Business' },
-    { value: 'School of Science', label: 'School of Science' },
-    { value: 'School of Liberal Arts', label: 'School of Liberal Arts' },
-  ];
-
   const handleCommitteeChange = (selectedOptions: any) => {
     setCommittees(selectedOptions ? selectedOptions.map((option: any) => option.value) : []);
   };
 
   const handleSave = () => {
     setIsEditing(false);
-    // You can also trigger a save to the database here
+    // Trigger save to the database here
   };
 
   return (
@@ -59,7 +78,6 @@ const UserProfile: React.FC = () => {
       <h1 className='title'>Your Election Profile</h1>
       <div className="profile-form-container">
         {isEditing ? (
-          // Edit State
           <form className="profile-form">
             <div className="form-group">
               <label>Enter your preferred name (how it will appear on the ballot)</label>
@@ -107,7 +125,6 @@ const UserProfile: React.FC = () => {
             </div>
           </form>
         ) : (
-          // View State
           <div className="profile-view">
             <p><strong>Preferred Name:</strong> {preferredName || 'Not provided'}</p>
             <p><strong>School:</strong> {school || 'Not selected'}</p>

From b65f7f20330793bb95356b371df5252b99f33a6e Mon Sep 17 00:00:00 2001
From: Ethan <ethan.ondreicka1@marist.edu>
Date: Sun, 8 Dec 2024 01:32:08 -0500
Subject: [PATCH 27/63] added fname/lname to user profiles

---
 src/UserProfile.tsx | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/UserProfile.tsx b/src/UserProfile.tsx
index a35b24d..944a1c3 100644
--- a/src/UserProfile.tsx
+++ b/src/UserProfile.tsx
@@ -8,6 +8,8 @@ import Select from 'react-select';
 const UserProfile: React.FC = () => {
   const [isEditing, setIsEditing] = useState(false); // State to track if in edit mode
   const [preferredName, setPreferredName] = useState('');
+  const [firstName, setFirstName] = useState('');
+  const [lastName, setLastName] = useState('');
   const [school, setSchool] = useState('');
   const [committees, setCommittees] = useState<string[]>([]);
   const [serviceStatement, setServiceStatement] = useState('');
@@ -41,6 +43,22 @@ const UserProfile: React.FC = () => {
         {isEditing ? (
           // Edit State
           <form className="profile-form">
+            <div className="form-group">
+              <label>Enter your first name: </label>
+              <input
+                type="text"
+                value={firstName}
+                onChange={(e) => setFirstName(e.target.value)}
+                placeholder="Your First Name Here"
+              />
+              <label>Enter your last name: </label>
+              <input
+                type="text"
+                value={lastName}
+                onChange={(e) => setLastName(e.target.value)}
+                placeholder="Your Last Name Here"
+              />
+            </div>
             <div className="form-group">
               <label>Enter your preferred name (how it will appear on the ballot)</label>
               <input
@@ -89,6 +107,8 @@ const UserProfile: React.FC = () => {
         ) : (
           // View State
           <div className="profile-view">
+            <p><strong>First Name:</strong> {firstName || 'Not Provided'}</p>
+            <p><strong>Last Name:</strong>{lastName || 'Not Provided'}</p>
             <p><strong>Preferred Name:</strong> {preferredName || 'Not provided'}</p>
             <p><strong>School:</strong> {school || 'Not selected'}</p>
             <p><strong>Committees:</strong> {committees.length > 0 ? committees.join(', ') : 'None selected'}</p>

From e755b821099547d68cac2e8393741b1410630db8 Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 8 Dec 2024 03:25:47 -0500
Subject: [PATCH 28/63] testing user updating and creation

---
 server.js           | 181 +++++++++++++++++++++++++++++++++++++++-----
 src/UserProfile.tsx | 120 ++++++++++++++++++++++++++++-
 2 files changed, 280 insertions(+), 21 deletions(-)

diff --git a/server.js b/server.js
index 9e87a08..e0c3782 100644
--- a/server.js
+++ b/server.js
@@ -152,45 +152,192 @@ app.post('/admin-login', async (req, res) => {
     }
 });
 
-// Route to update a faculty member's profile
-app.post('/update-profile', async (req, res) => {
-    const { token, committee, school, preferredName, serviceStatement } = req.body;
+// Route to get current user's email
+app.get('/current-user', ensureAuthenticated, (req, res) => {
+    try {
+      res.json({ email: req.user.email });
+    } catch (err) {
+      console.error('Error fetching current user:', err);
+      res.status(500).json({ message: 'Server error' });
+    }
+  });
+  
+  // New route to fetch faculty by email
+  app.get('/faculty-by-email', async (req, res) => {
+    const { email } = req.query;
+    if (!email) {
+      return res.status(400).json({ message: 'Email query parameter is required' });
+    }
+  
+    try {
+      const result = await client.query('SELECT * FROM Faculty WHERE Email = $1', [email]);
+      res.json(result.rows);
+    } catch (err) {
+      console.error('Error fetching faculty by email:', err);
+      res.status(500).json({ message: 'Server error' });
+    }
+  });
+
+// Route to update user profile
+app.post('/update-user-profile', ensureAuthenticated, async (req, res) => {
+    const email = req.user.email; // Retrieve email from authenticated user
+    const { firstName, lastName, preferredName, school, committees, serviceStatement } = req.body;
 
     try {
-        // Find the faculty member by token
-        const facultyResult = await client.query('SELECT FID FROM Faculty WHERE token = $1', [token]);
+        await client.query('BEGIN');
+
+        // Retrieve FID from Faculty using Email
+        const facultyResult = await client.query(
+            'SELECT FID FROM Faculty WHERE Email = $1',
+            [email]
+        );
 
         if (facultyResult.rows.length === 0) {
-            return res.status(400).json({ message: 'Invalid token' });
+            throw new Error('Faculty member not found');
         }
 
-        const facultyId = facultyResult.rows[0].fid;
+        const fid = facultyResult.rows[0].fid;
 
-        // Update the faculty member's preferred name and service statement
-        await client.query(
-            'UPDATE Faculty SET PrefName = $1, TheStatement = $2 WHERE FID = $3',
-            [preferredName, serviceStatement, facultyId]
+        // Retrieve SID from Schools using school name
+        const schoolResult = await client.query(
+            'SELECT sid FROM Schools WHERE sname = $1',
+            [school]
         );
 
-        // Update the faculty member's school
+        if (schoolResult.rows.length === 0) {
+            throw new Error('School not found');
+        }
+
+        const sid = schoolResult.rows[0].sid;
+
+        // Update People table with firstName and lastName
         await client.query(
-            'UPDATE Faculty SET SchoolID = (SELECT SID FROM Schools WHERE Sname = $1) WHERE FID = $2',
-            [school, facultyId]
+            `UPDATE People
+             SET Fname = $1, Lname = $2
+             WHERE PID = $3`,
+            [firstName, lastName, fid]
         );
 
-        // Insert new committee assignment without deleting old ones
+        // Update Faculty table with other profile details and set lastUpdated to current timestamp
         await client.query(
-            'INSERT INTO CommitteeAssignments (FID, CID) VALUES ($1, (SELECT CID FROM Committees WHERE Cname = $2))',
-            [facultyId, committee]
+            `UPDATE Faculty
+             SET PrefName = $1, SchoolID = $2, ServiceStatement = $3, LastUpdated = NOW()
+             WHERE FID = $4`,
+            [preferredName, sid, serviceStatement, fid]
         );
 
+        // Assign Committees
+        if (Array.isArray(committees) && committees.length > 0) {
+            for (const committeeName of committees) {
+                // Retrieve CID from Committees table
+                const committeeResult = await client.query(
+                    'SELECT CID FROM Committees WHERE Cname = $1',
+                    [committeeName]
+                );
+
+                if (committeeResult.rows.length === 0) {
+                    throw new Error(`Committee not found: ${committeeName}`);
+                }
+
+                const cid = committeeResult.rows[0].cid;
+
+                // Insert into CommitteeAssignments table without deleting existing assignments
+                await client.query(
+                    `INSERT INTO CommitteeAssignments (FID, CID)
+                     VALUES ($1, $2)
+                     ON CONFLICT (FID, CID) DO NOTHING`,
+                    [fid, cid]
+                );
+            }
+        }
+
+        await client.query('COMMIT');
         res.json({ message: 'Profile updated successfully' });
     } catch (err) {
+        await client.query('ROLLBACK');
         console.error('Error updating profile:', err);
         res.status(500).json({ message: 'Server error' });
     }
 });
 
+// Route to create user profile
+app.post('/create-user-profile', ensureAuthenticated, async (req, res) => {
+    const email = req.user.email; // Retrieve email from authenticated user
+    const { firstName, lastName, preferredName, school, committees, serviceStatement } = req.body;
+
+    try {
+        await client.query('BEGIN');
+
+        // Insert into People table
+        const insertPeopleResult = await client.query(
+            `INSERT INTO People (Fname, Lname)
+             VALUES ($1, $2)
+             RETURNING PID`,
+            [firstName, lastName]
+        );
+
+        const pid = insertPeopleResult.rows[0].pid;
+
+        // Retrieve SID from Schools using school name
+        const schoolResult = await client.query(
+            'SELECT sid, sname FROM Schools WHERE sname = $1',
+            [school]
+        );
+
+        if (schoolResult.rows.length === 0) {
+            throw new Error('School not found');
+        }
+
+        const sid = schoolResult.rows[0].sid;
+        const schoolName = schoolResult.rows[0].sname;
+
+        // Hyphenate school name and names for URL
+        const hyphenatedSchool = schoolName.toLowerCase().replace(/\s+/g, '-');
+        const hyphenatedFirstName = firstName.toLowerCase().replace(/\s+/g, '-');
+        const hyphenatedLastName = lastName.toLowerCase().replace(/\s+/g, '-');
+        const url = `https://www.marist.edu/${hyphenatedSchool}/faculty/${hyphenatedFirstName}-${hyphenatedLastName}`;
+
+        // Insert into Faculty table without Committees
+        await client.query(
+            `INSERT INTO Faculty (FID, Email, SchoolID, IsHidden, PrefName, URL, TheStatement, LastUpdated)
+             VALUES ($1, $2, $3, $4, $5, $6, $7, NOW())`,
+            [pid, email, sid, false, preferredName, url, serviceStatement]
+        );
+
+        // Assign Committees
+        if (Array.isArray(committees) && committees.length > 0) {
+            for (const committeeName of committees) {
+                // Retrieve CID from Committees table
+                const committeeResult = await client.query(
+                    'SELECT CID FROM Committees WHERE Cname = $1',
+                    [committeeName]
+                );
+
+                if (committeeResult.rows.length === 0) {
+                    throw new Error(`Committee not found: ${committeeName}`);
+                }
+
+                const cid = committeeResult.rows[0].cid;
+
+                // Insert into CommitteeAssignments table
+                await client.query(
+                    `INSERT INTO CommitteeAssignments (FID, CID)
+                     VALUES ($1, $2)
+                     ON CONFLICT (FID, CID) DO NOTHING`,
+                    [pid, cid]
+                );
+            }
+        }
+
+        await client.query('COMMIT');
+        res.json({ message: 'User profile created successfully' });
+    } catch (err) {
+        await client.query('ROLLBACK');
+        console.error('Error creating profile:', err);
+        res.status(500).json({ message: 'Server error' });
+    }
+});
+
 // Example existing route for fetching faculty data (unchanged)
 app.get('/faculty', async (req, res) => {
     try {
diff --git a/src/UserProfile.tsx b/src/UserProfile.tsx
index 542885b..2af011c 100644
--- a/src/UserProfile.tsx
+++ b/src/UserProfile.tsx
@@ -7,14 +7,37 @@ import Select from 'react-select';
 
 const UserProfile: React.FC = () => {
   const [isEditing, setIsEditing] = useState(false);
+  const [firstName, setFirstName] = useState('');
+  const [lastName, setLastName] = useState('');
   const [preferredName, setPreferredName] = useState('');
   const [school, setSchool] = useState('');
   const [committees, setCommittees] = useState<string[]>([]);
   const [serviceStatement, setServiceStatement] = useState('');
   const [committeeOptions, setCommitteeOptions] = useState<{ value: string, label: string }[]>([]);
   const [schoolOptions, setSchoolOptions] = useState<{ value: string, label: string }[]>([]);
+  const [email, setEmail] = useState(''); // New state to store user email
 
   useEffect(() => {
+    const fetchUserEmail = async () => {
+      try {
+        const response = await fetch('/current-user', { // New endpoint to get current user email
+          method: 'GET',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          credentials: 'include',
+        });
+        if (response.ok) {
+          const data = await response.json();
+          setEmail(data.email);
+        } else {
+          throw new Error('Failed to fetch user email');
+        }
+      } catch (error) {
+        console.error('Error fetching user email:', error);
+      }
+    };
+
     const fetchCommitteeNames = async () => {
       try {
         const response = await fetch('/committees', {
@@ -59,6 +82,7 @@ const UserProfile: React.FC = () => {
       }
     };
 
+    fetchUserEmail(); // Fetch user email on component mount
     fetchCommitteeNames();
     fetchSchoolNames();
   }, []);
@@ -67,9 +91,80 @@ const UserProfile: React.FC = () => {
     setCommittees(selectedOptions ? selectedOptions.map((option: any) => option.value) : []);
   };
 
-  const handleSave = () => {
-    setIsEditing(false);
-    // Trigger save to the database here
+  const handleSave = async () => {
+    try {
+      // Check if user exists
+      const checkResponse = await fetch(`/faculty-by-email?email=${encodeURIComponent(email)}`, {
+        method: 'GET',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+      });
+
+      if (!checkResponse.ok) {
+        throw new Error('Error checking user existence');
+      }
+
+      const facultyData = await checkResponse.json();
+      const userExists = facultyData.length > 0;
+
+      if (userExists) {
+        // Update user profile
+        const response = await fetch('/update-user-profile', {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          credentials: 'include',
+          body: JSON.stringify({
+            firstName,
+            lastName,
+            preferredName,
+            school,
+            committees,
+            serviceStatement,
+          }),
+        });
+
+        const data = await response.json();
+
+        if (response.ok) {
+          alert(data.message);
+          setIsEditing(false);
+        } else {
+          alert(data.message);
+        }
+      } else {
+        // Create user profile
+        const response = await fetch('/create-user-profile', {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          credentials: 'include',
+          body: JSON.stringify({
+            firstName,
+            lastName,
+            preferredName,
+            school,
+            committees,
+            serviceStatement,
+          }),
+        });
+
+        const data = await response.json();
+
+        if (response.ok) {
+          alert(data.message);
+          setIsEditing(false);
+        } else {
+          alert(data.message);
+        }
+      }
+    } catch (error) {
+      console.error('Error saving profile:', error);
+      alert('Failed to save profile. Please try again.');
+    }
   };
 
   return (
@@ -77,8 +172,25 @@ const UserProfile: React.FC = () => {
       <Navbar />
       <h1 className='title'>Your Election Profile</h1>
       <div className="profile-form-container">
-        {isEditing ? (
+      {isEditing ? (
+          // Edit State
           <form className="profile-form">
+            <div className="form-group">
+              <label>Enter your first name: </label>
+              <input
+                type="text"
+                value={firstName}
+                onChange={(e) => setFirstName(e.target.value)}
+                placeholder="Your First Name Here"
+              />
+              <label>Enter your last name: </label>
+              <input
+                type="text"
+                value={lastName}
+                onChange={(e) => setLastName(e.target.value)}
+                placeholder="Your Last Name Here"
+              />
+            </div>
             <div className="form-group">
               <label>Enter your preferred name (how it will appear on the ballot)</label>
               <input

From 65717f2bf7758f717ba6be469566b4ac927cc7e2 Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 8 Dec 2024 03:47:53 -0500
Subject: [PATCH 29/63] Reverted back to current vm status

---
 server.js           | 202 ++------------------------------------------
 src/UserProfile.tsx | 101 +---------------------
 2 files changed, 12 insertions(+), 291 deletions(-)

diff --git a/server.js b/server.js
index e0c3782..e4b36ba 100644
--- a/server.js
+++ b/server.js
@@ -11,7 +11,7 @@ const passport = require('passport');
 const SamlStrategy = require('@node-saml/passport-saml').Strategy;
 const session = require('express-session');
 const bodyParser = require("body-parser");
-const morgan = require('morgan'); 
+const morgan = require('morgan');
 
 const httpPort = 80;
 const httpsPort = 443;
@@ -37,7 +37,7 @@ app.use(session({
     secret: 'your-secret-key',
     resave: false,
     saveUninitialized: true,
-    cookie: { secure: process.env.NODE_ENV === 'production' } // Ensure cookies are only used over HTTPS in production
+    cookie: { secure: process.env.NODE_ENV === 'production' } // Ensure cookies are only used over HTTPS in production 
 }));
 
 // Initialize Passport and restore authentication state, if any, from the session
@@ -50,7 +50,7 @@ const hashPassword = (password) => {
 };
 
 // Passport SAML strategy configuration
-const samlStrategy = new SamlStrategy(
+passport.use(new SamlStrategy(
     {
       callbackUrl: 'https://facelect.capping.ecrl.marist.edu/login/callback',
       entryPoint: 'https://auth.it.marist.edu/idp/profile/SAML2/Redirect/SSO',
@@ -68,7 +68,7 @@ const samlStrategy = new SamlStrategy(
         };
         return done(null, user);
     }
-);
+));
 
 passport.serializeUser((user, done) => {
     done(null, user);
@@ -92,14 +92,14 @@ app.post(
 );
 
 // SSO login route
-app.get('/sso/login', 
+app.get('/sso/login',
     passport.authenticate("saml", { failureRedirect: "/", failureFlash: true }),
     function (req, res) {
         res.redirect("/");
     }
 );
 
-// Correct route handler with both req and res
+// Route to fetch committee names
 app.get('/committees', async (req, res) => {
     try {
       const result = await client.query('SELECT Cname FROM Committees');
@@ -152,197 +152,11 @@ app.post('/admin-login', async (req, res) => {
     }
 });
 
-// Route to get current user's email
-app.get('/current-user', ensureAuthenticated, (req, res) => {
-    try {
-      res.json({ email: req.user.email });
-    } catch (err) {
-      console.error('Error fetching current user:', err);
-      res.status(500).json({ message: 'Server error' });
-    }
-  });
-  
-  // New route to fetch faculty by email
-  app.get('/faculty-by-email', async (req, res) => {
-    const { email } = req.query;
-    if (!email) {
-      return res.status(400).json({ message: 'Email query parameter is required' });
-    }
-  
-    try {
-      const result = await client.query('SELECT * FROM Faculty WHERE Email = $1', [email]);
-      res.json(result.rows);
-    } catch (err) {
-      console.error('Error fetching faculty by email:', err);
-      res.status(500).json({ message: 'Server error' });
-    }
-  });
-
-// Route to update user profile
-app.post('/update-user-profile', ensureAuthenticated, async (req, res) => {
-    const email = req.user.email; // Retrieve email from authenticated user
-    const { firstName, lastName, preferredName, school, committees, serviceStatement } = req.body;
-
-    try {
-        await client.query('BEGIN');
-
-        // Retrieve FID from Faculty using Email
-        const facultyResult = await client.query(
-            'SELECT FID FROM Faculty WHERE Email = $1',
-            [email]
-        );
-
-        if (facultyResult.rows.length === 0) {
-            throw new Error('Faculty member not found');
-        }
-
-        const fid = facultyResult.rows[0].fid;
-
-        // Retrieve SID from Schools using school name
-        const schoolResult = await client.query(
-            'SELECT sid FROM Schools WHERE sname = $1',
-            [school]
-        );
-
-        if (schoolResult.rows.length === 0) {
-            throw new Error('School not found');
-        }
-
-        const sid = schoolResult.rows[0].sid;
-
-        // Update People table with firstName and lastName
-        await client.query(
-            `UPDATE People
-             SET Fname = $1, Lname = $2
-             WHERE PID = $3`,
-            [firstName, lastName, fid]
-        );
-
-        // Update Faculty table with other profile details and set lastUpdated to current timestamp
-        await client.query(
-            `UPDATE Faculty
-             SET PrefName = $1, SchoolID = $2, ServiceStatement = $3, LastUpdated = NOW()
-             WHERE FID = $4`,
-            [preferredName, sid, serviceStatement, fid]
-        );
-
-        // Assign Committees
-        if (Array.isArray(committees) && committees.length > 0) {
-            for (const committeeName of committees) {
-                // Retrieve CID from Committees table
-                const committeeResult = await client.query(
-                    'SELECT CID FROM Committees WHERE Cname = $1',
-                    [committeeName]
-                );
-
-                if (committeeResult.rows.length === 0) {
-                    throw new Error(`Committee not found: ${committeeName}`);
-                }
-
-                const cid = committeeResult.rows[0].cid;
-
-                // Insert into CommitteeAssignments table without deleting existing assignments
-                await client.query(
-                    `INSERT INTO CommitteeAssignments (FID, CID)
-                     VALUES ($1, $2)
-                     ON CONFLICT (FID, CID) DO NOTHING`,
-                    [fid, cid]
-                );
-            }
-        }
-
-        await client.query('COMMIT');
-        res.json({ message: 'Profile updated successfully' });
-    } catch (err) {
-        await client.query('ROLLBACK');
-        console.error('Error updating profile:', err);
-        res.status(500).json({ message: 'Server error' });
-    }
-});
-
-// Route to create user profile
-app.post('/create-user-profile', ensureAuthenticated, async (req, res) => {
-    const email = req.user.email; // Retrieve email from authenticated user
-    const { firstName, lastName, preferredName, school, committees, serviceStatement } = req.body;
-
-    try {
-        await client.query('BEGIN');
-
-        // Insert into People table
-        const insertPeopleResult = await client.query(
-            `INSERT INTO People (Fname, Lname)
-             VALUES ($1, $2)
-             RETURNING PID`,
-            [firstName, lastName]
-        );
-
-        const pid = insertPeopleResult.rows[0].pid;
-
-        // Retrieve SID from Schools using school name
-        const schoolResult = await client.query(
-            'SELECT sid, sname FROM Schools WHERE sname = $1',
-            [school]
-        );
-
-        if (schoolResult.rows.length === 0) {
-            throw new Error('School not found');
-        }
-
-        const sid = schoolResult.rows[0].sid;
-        const schoolName = schoolResult.rows[0].sname;
-
-        // Hyphenate school name and names for URL
-        const hyphenatedSchool = schoolName.toLowerCase().replace(/\s+/g, '-');
-        const hyphenatedFirstName = firstName.toLowerCase().replace(/\s+/g, '-');
-        const hyphenatedLastName = lastName.toLowerCase().replace(/\s+/g, '-');
-        const url = `https://www.marist.edu/${hyphenatedSchool}/faculty/${hyphenatedFirstName}-${hyphenatedLastName}`;
-
-        // Insert into Faculty table without Committees
-        await client.query(
-            `INSERT INTO Faculty (FID, Email, SchoolID, IsHidden, PrefName, URL, TheStatement, LastUpdated)
-             VALUES ($1, $2, $3, $4, $5, $6, $7, NOW())`,
-            [pid, email, sid, false, preferredName, url, serviceStatement]
-        );
-
-        // Assign Committees
-        if (Array.isArray(committees) && committees.length > 0) {
-            for (const committeeName of committees) {
-                // Retrieve CID from Committees table
-                const committeeResult = await client.query(
-                    'SELECT CID FROM Committees WHERE Cname = $1',
-                    [committeeName]
-                );
-
-                if (committeeResult.rows.length === 0) {
-                    throw new Error(`Committee not found: ${committeeName}`);
-                }
-
-                const cid = committeeResult.rows[0].cid;
-
-                // Insert into CommitteeAssignments table
-                await client.query(
-                    `INSERT INTO CommitteeAssignments (FID, CID)
-                     VALUES ($1, $2)
-                     ON CONFLICT (FID, CID) DO NOTHING`,
-                    [pid, cid]
-                );
-            }
-        }
-
-        await client.query('COMMIT');
-        res.json({ message: 'User profile created successfully' });
-    } catch (err) {
-        await client.query('ROLLBACK');
-        console.error('Error creating profile:', err);
-        res.status(500).json({ message: 'Server error' });
-    }
-});
-
 // Example existing route for fetching faculty data (unchanged)
 app.get('/faculty', async (req, res) => {
     try {
-        const result = await client.query(` 
-            SELECT 
+        const result = await client.query(`
+            SELECT
                 faculty.fid,
                 faculty.email,
                 faculty.ishidden,
diff --git a/src/UserProfile.tsx b/src/UserProfile.tsx
index 2af011c..3474235 100644
--- a/src/UserProfile.tsx
+++ b/src/UserProfile.tsx
@@ -15,29 +15,8 @@ const UserProfile: React.FC = () => {
   const [serviceStatement, setServiceStatement] = useState('');
   const [committeeOptions, setCommitteeOptions] = useState<{ value: string, label: string }[]>([]);
   const [schoolOptions, setSchoolOptions] = useState<{ value: string, label: string }[]>([]);
-  const [email, setEmail] = useState(''); // New state to store user email
 
   useEffect(() => {
-    const fetchUserEmail = async () => {
-      try {
-        const response = await fetch('/current-user', { // New endpoint to get current user email
-          method: 'GET',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          credentials: 'include',
-        });
-        if (response.ok) {
-          const data = await response.json();
-          setEmail(data.email);
-        } else {
-          throw new Error('Failed to fetch user email');
-        }
-      } catch (error) {
-        console.error('Error fetching user email:', error);
-      }
-    };
-
     const fetchCommitteeNames = async () => {
       try {
         const response = await fetch('/committees', {
@@ -82,7 +61,6 @@ const UserProfile: React.FC = () => {
       }
     };
 
-    fetchUserEmail(); // Fetch user email on component mount
     fetchCommitteeNames();
     fetchSchoolNames();
   }, []);
@@ -91,80 +69,9 @@ const UserProfile: React.FC = () => {
     setCommittees(selectedOptions ? selectedOptions.map((option: any) => option.value) : []);
   };
 
-  const handleSave = async () => {
-    try {
-      // Check if user exists
-      const checkResponse = await fetch(`/faculty-by-email?email=${encodeURIComponent(email)}`, {
-        method: 'GET',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-      });
-
-      if (!checkResponse.ok) {
-        throw new Error('Error checking user existence');
-      }
-
-      const facultyData = await checkResponse.json();
-      const userExists = facultyData.length > 0;
-
-      if (userExists) {
-        // Update user profile
-        const response = await fetch('/update-user-profile', {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          credentials: 'include',
-          body: JSON.stringify({
-            firstName,
-            lastName,
-            preferredName,
-            school,
-            committees,
-            serviceStatement,
-          }),
-        });
-
-        const data = await response.json();
-
-        if (response.ok) {
-          alert(data.message);
-          setIsEditing(false);
-        } else {
-          alert(data.message);
-        }
-      } else {
-        // Create user profile
-        const response = await fetch('/create-user-profile', {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          credentials: 'include',
-          body: JSON.stringify({
-            firstName,
-            lastName,
-            preferredName,
-            school,
-            committees,
-            serviceStatement,
-          }),
-        });
-
-        const data = await response.json();
-
-        if (response.ok) {
-          alert(data.message);
-          setIsEditing(false);
-        } else {
-          alert(data.message);
-        }
-      }
-    } catch (error) {
-      console.error('Error saving profile:', error);
-      alert('Failed to save profile. Please try again.');
-    }
+  const handleSave = () => {
+    setIsEditing(false);
+    // Trigger save to the database here
   };
 
   return (
@@ -240,7 +147,7 @@ const UserProfile: React.FC = () => {
           <div className="profile-view">
             <p><strong>Preferred Name:</strong> {preferredName || 'Not provided'}</p>
             <p><strong>School:</strong> {school || 'Not selected'}</p>
-            <p><strong>Committees:</strong> {committees.length > 0 ? committees.join(', ') : 'None selected'}</p>
+            <p><strong>Committees:</strong> {committees.length > 0 ? committees.join(', ') : 'None selected'}</p>      
             <p><strong>Service Statement:</strong> {serviceStatement || 'Not provided'}</p>
             <button type="button" className="edit-button" onClick={() => setIsEditing(true)}>
               Edit Profile

From d4fc818fdc90f33317504556ed17435f0c82c2b3 Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 8 Dec 2024 04:05:18 -0500
Subject: [PATCH 30/63] email check test

---
 server.js           | 48 ++++++++++++++++++++++++
 src/UserProfile.tsx | 89 ++++++++++++++++++++++-----------------------
 2 files changed, 91 insertions(+), 46 deletions(-)

diff --git a/server.js b/server.js
index e4b36ba..beae1ba 100644
--- a/server.js
+++ b/server.js
@@ -124,6 +124,54 @@ app.get('/schools', async (req, res) => {
   }
 );
 
+app.post('/check-email', async (req, res) => {
+    const { email } = req.body;
+  
+    if (!email) {
+      return res.status(400).json({ message: 'Email is required.' });
+    }
+  
+    try {
+      const query = `
+        SELECT 
+          f.prefname, 
+          s.sname AS school, 
+          f.thestatement AS serviceStatement,
+          ARRAY_AGG(c.cname) AS committees
+        FROM 
+          Faculty f
+        LEFT JOIN 
+          Schools s ON f.schoolid = s.sid
+        LEFT JOIN 
+          FacultyCommittees fc ON f.fid = fc.fid
+        LEFT JOIN 
+          Committees c ON fc.cid = c.cid
+        WHERE 
+          f.email = $1
+        GROUP BY 
+          f.prefname, s.sname, f.thestatement;
+      `;
+  
+      const result = await client.query(query, [email]);
+  
+      if (result.rows.length === 0) {
+        return res.status(404).json({ message: 'Email not found.' });
+      }
+  
+      const faculty = result.rows[0];
+  
+      res.json({
+        preferredName: faculty.prefname,
+        school: faculty.school,
+        serviceStatement: faculty.serviceStatement,
+        committees: faculty.committees.filter(c => c !== null),
+      });
+    } catch (error) {
+      console.error('Error checking email:', error);
+      res.status(500).json({ message: 'Server error.' });
+    }
+});
+
 // Route to handle admin login
 app.post('/admin-login', async (req, res) => {
     const { username, password } = req.body; // Capture username and password from request
diff --git a/src/UserProfile.tsx b/src/UserProfile.tsx
index 3474235..821b21a 100644
--- a/src/UserProfile.tsx
+++ b/src/UserProfile.tsx
@@ -15,6 +15,8 @@ const UserProfile: React.FC = () => {
   const [serviceStatement, setServiceStatement] = useState('');
   const [committeeOptions, setCommitteeOptions] = useState<{ value: string, label: string }[]>([]);
   const [schoolOptions, setSchoolOptions] = useState<{ value: string, label: string }[]>([]);
+  const [email, setEmail] = useState('');
+  const [error, setError] = useState('');
 
   useEffect(() => {
     const fetchCommitteeNames = async () => {
@@ -74,12 +76,37 @@ const UserProfile: React.FC = () => {
     // Trigger save to the database here
   };
 
+  const handleCheckEmail = async () => {
+    try {
+      const response = await fetch('/check-email', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({ email }),
+      });
+      const data = await response.json();
+      if (response.ok && data.found) {
+        setPreferredName(data.preferredName);
+        setSchool(data.school);
+        setCommittees(data.committees);
+        setServiceStatement(data.serviceStatement);
+        setError('');
+      } else {
+        setError('Email not found.');
+      }
+    } catch (err) {
+      console.error('Error checking email:', err);
+      setError('An error occurred. Please try again.');
+    }
+  };
+
   return (
     <div className='container'>
       <Navbar />
       <h1 className='title'>Your Election Profile</h1>
       <div className="profile-form-container">
-      {isEditing ? (
+        {isEditing ? (
           // Edit State
           <form className="profile-form">
             <div className="form-group">
@@ -90,52 +117,8 @@ const UserProfile: React.FC = () => {
                 onChange={(e) => setFirstName(e.target.value)}
                 placeholder="Your First Name Here"
               />
-              <label>Enter your last name: </label>
-              <input
-                type="text"
-                value={lastName}
-                onChange={(e) => setLastName(e.target.value)}
-                placeholder="Your Last Name Here"
-              />
-            </div>
-            <div className="form-group">
-              <label>Enter your preferred name (how it will appear on the ballot)</label>
-              <input
-                type="text"
-                value={preferredName}
-                onChange={(e) => setPreferredName(e.target.value)}
-                placeholder="Your Preferred Name Here"
-              />
-            </div>
-            <div className="form-group">
-              <label>Select your School from the dropdown menu</label>
-              <Select
-                options={schoolOptions}
-                value={schoolOptions.find(option => option.value === school)}
-                onChange={(selectedOption) => setSchool(selectedOption?.value || '')}
-                placeholder="Select School"
-              />
-            </div>
-            <div className="form-group">
-              <label>Select the committees you have been a part of (can select multiple)</label>
-              <CreatableSelect
-                className='select-input'
-                isMulti
-                options={committeeOptions}
-                onChange={handleCommitteeChange}
-                placeholder="Select or input committees"
-              />
-            </div>
-            <div className="form-group">
-              <label>Create a Service Statement (Why someone should vote for you)</label>
-              <textarea
-                value={serviceStatement}
-                onChange={(e) => setServiceStatement(e.target.value)}
-                placeholder="Enter your statement here"
-                maxLength={300}
-              />
-              <small>{serviceStatement.length}/300</small>
             </div>
+            {/* ... other form fields ... */}
             <div className="form-group">
               <button type="button" className="save-button" onClick={handleSave}>
                 <p>Save Profile</p>
@@ -144,6 +127,7 @@ const UserProfile: React.FC = () => {
             </div>
           </form>
         ) : (
+          // View State
           <div className="profile-view">
             <p><strong>Preferred Name:</strong> {preferredName || 'Not provided'}</p>
             <p><strong>School:</strong> {school || 'Not selected'}</p>
@@ -152,6 +136,19 @@ const UserProfile: React.FC = () => {
             <button type="button" className="edit-button" onClick={() => setIsEditing(true)}>
               Edit Profile
             </button>
+            <div className="email-check">
+              <label>Enter marist email:</label>
+              <input
+                type="email"
+                value={email}
+                onChange={(e) => setEmail(e.target.value)}
+                placeholder="you@marist.edu"
+              />
+              <button type="button" className="check-button" onClick={handleCheckEmail}>
+                Check
+              </button>
+              {error && <p className="error">{error}</p>}
+            </div>
           </div>
         )}
       </div>

From 51bc75d0760bdbd37d0b8e0eb4c96f5f9a8e521f Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 8 Dec 2024 04:12:48 -0500
Subject: [PATCH 31/63] fix to api call

---
 server.js           | 6 +++---
 src/UserProfile.tsx | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server.js b/server.js
index beae1ba..3a00cec 100644
--- a/server.js
+++ b/server.js
@@ -143,9 +143,9 @@ app.post('/check-email', async (req, res) => {
         LEFT JOIN 
           Schools s ON f.schoolid = s.sid
         LEFT JOIN 
-          FacultyCommittees fc ON f.fid = fc.fid
+          CommitteeAssignments ca ON f.fid = ca.fid
         LEFT JOIN 
-          Committees c ON fc.cid = c.cid
+          Committees c ON ca.cid = c.cid
         WHERE 
           f.email = $1
         GROUP BY 
@@ -170,7 +170,7 @@ app.post('/check-email', async (req, res) => {
       console.error('Error checking email:', error);
       res.status(500).json({ message: 'Server error.' });
     }
-});
+  });
 
 // Route to handle admin login
 app.post('/admin-login', async (req, res) => {
diff --git a/src/UserProfile.tsx b/src/UserProfile.tsx
index 821b21a..76fd851 100644
--- a/src/UserProfile.tsx
+++ b/src/UserProfile.tsx
@@ -93,7 +93,7 @@ const UserProfile: React.FC = () => {
         setServiceStatement(data.serviceStatement);
         setError('');
       } else {
-        setError('Email not found.');
+        setError('Email not found. Click "Edit Profile" to create a new profile.');
       }
     } catch (err) {
       console.error('Error checking email:', err);

From cf614f8cd77b46961a60f4ad1d1a8dee8dee7d58 Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 8 Dec 2024 04:20:47 -0500
Subject: [PATCH 32/63] further profile view testing

---
 src/UserProfile.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/UserProfile.tsx b/src/UserProfile.tsx
index 76fd851..8d72a44 100644
--- a/src/UserProfile.tsx
+++ b/src/UserProfile.tsx
@@ -77,13 +77,14 @@ const UserProfile: React.FC = () => {
   };
 
   const handleCheckEmail = async () => {
+    const normalizedEmail = email.trim().toLowerCase(); // Normalize email
     try {
-      const response = await fetch('/check-email', {
+      const response = await fetch('/api/check-email', {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json',
         },
-        body: JSON.stringify({ email }),
+        body: JSON.stringify({ email: normalizedEmail }),
       });
       const data = await response.json();
       if (response.ok && data.found) {

From fd4397141feea6330cf02cf4bb8dd949f7b5ebdb Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 8 Dec 2024 04:21:21 -0500
Subject: [PATCH 33/63] test message

---
 src/UserProfile.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/UserProfile.tsx b/src/UserProfile.tsx
index 8d72a44..6a2aa26 100644
--- a/src/UserProfile.tsx
+++ b/src/UserProfile.tsx
@@ -94,7 +94,7 @@ const UserProfile: React.FC = () => {
         setServiceStatement(data.serviceStatement);
         setError('');
       } else {
-        setError('Email not found. Click "Edit Profile" to create a new profile.');
+        setError('Email not found. Click "Edit Profile" to create a new profile 2.');
       }
     } catch (err) {
       console.error('Error checking email:', err);

From 74df224632fdd8cbad067523cf00a4935f7b0b3c Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 8 Dec 2024 04:57:41 -0500
Subject: [PATCH 34/63] next profile view test

---
 server.js           | 92 +++++++++++++++++++++++++--------------------
 src/UserProfile.tsx |  5 +--
 2 files changed, 54 insertions(+), 43 deletions(-)

diff --git a/server.js b/server.js
index 3a00cec..b8d59b9 100644
--- a/server.js
+++ b/server.js
@@ -126,51 +126,63 @@ app.get('/schools', async (req, res) => {
 
 app.post('/check-email', async (req, res) => {
     const { email } = req.body;
-  
+
     if (!email) {
-      return res.status(400).json({ message: 'Email is required.' });
+        return res.status(400).json({ message: 'Email is required', found: false });
     }
-  
+
     try {
-      const query = `
-        SELECT 
-          f.prefname, 
-          s.sname AS school, 
-          f.thestatement AS serviceStatement,
-          ARRAY_AGG(c.cname) AS committees
-        FROM 
-          Faculty f
-        LEFT JOIN 
-          Schools s ON f.schoolid = s.sid
-        LEFT JOIN 
-          CommitteeAssignments ca ON f.fid = ca.fid
-        LEFT JOIN 
-          Committees c ON ca.cid = c.cid
-        WHERE 
-          f.email = $1
-        GROUP BY 
-          f.prefname, s.sname, f.thestatement;
-      `;
-  
-      const result = await client.query(query, [email]);
-  
-      if (result.rows.length === 0) {
-        return res.status(404).json({ message: 'Email not found.' });
-      }
-  
-      const faculty = result.rows[0];
-  
-      res.json({
-        preferredName: faculty.prefname,
-        school: faculty.school,
-        serviceStatement: faculty.serviceStatement,
-        committees: faculty.committees.filter(c => c !== null),
-      });
+        // Query the Faculty table for the given email
+        const facultyResult = await client.query(
+            'SELECT fid, PrefName, TheStatement, SchoolID FROM Faculty WHERE Email = $1',
+            [email]
+        );
+
+        if (facultyResult.rows.length === 0) {
+            return res.status(404).json({ message: 'Email not found', found: false });
+        }
+
+        const faculty = facultyResult.rows[0];
+
+        // Query the Schools table for the school name
+        const schoolResult = await client.query(
+            'SELECT Sname FROM Schools WHERE SID = $1',
+            [faculty.schoolid]
+        );
+
+        const school = schoolResult.rows.length > 0 ? schoolResult.rows[0].sname : null;
+
+        // Query the CommitteeAssignments table for committee IDs
+        const committeeAssignmentsResult = await client.query(
+            'SELECT CommitteeID FROM CommitteeAssignments WHERE FID = $1',
+            [faculty.fid]
+        );
+
+        const committeeIds = committeeAssignmentsResult.rows.map(row => row.committeeid);
+
+        let committees = [];
+        if (committeeIds.length > 0) {
+            // Query the Committees table for committee names
+            const committeesResult = await client.query(
+                'SELECT Cname FROM Committees WHERE CID = ANY($1)',
+                [committeeIds]
+            );
+            committees = committeesResult.rows.map(row => row.cname);
+        }
+
+        // Respond with the required data
+        res.json({
+            found: true,
+            preferredName: faculty.prefname,
+            theStatement: faculty.thestatement,
+            school: school,
+            committees: committees,
+        });
     } catch (error) {
-      console.error('Error checking email:', error);
-      res.status(500).json({ message: 'Server error.' });
+        console.error('Error in /check-email:', error);
+        res.status(500).json({ message: 'Server error', found: false });
     }
-  });
+});
 
 // Route to handle admin login
 app.post('/admin-login', async (req, res) => {
diff --git a/src/UserProfile.tsx b/src/UserProfile.tsx
index 6a2aa26..c25c979 100644
--- a/src/UserProfile.tsx
+++ b/src/UserProfile.tsx
@@ -77,14 +77,13 @@ const UserProfile: React.FC = () => {
   };
 
   const handleCheckEmail = async () => {
-    const normalizedEmail = email.trim().toLowerCase(); // Normalize email
     try {
-      const response = await fetch('/api/check-email', {
+      const response = await fetch('/check-email', {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json',
         },
-        body: JSON.stringify({ email: normalizedEmail }),
+        body: JSON.stringify({ email }),
       });
       const data = await response.json();
       if (response.ok && data.found) {

From a5bf00cba99ae7a3822a396f0e27eb86d13bae26 Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 8 Dec 2024 05:06:25 -0500
Subject: [PATCH 35/63] last test before sleeping

---
 server.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/server.js b/server.js
index b8d59b9..b905d1c 100644
--- a/server.js
+++ b/server.js
@@ -128,10 +128,12 @@ app.post('/check-email', async (req, res) => {
     const { email } = req.body;
 
     if (!email) {
+        console.error('Email is required');
         return res.status(400).json({ message: 'Email is required', found: false });
     }
 
     try {
+        console.log('Querying Faculty table for email:', email);
         // Query the Faculty table for the given email
         const facultyResult = await client.query(
             'SELECT fid, PrefName, TheStatement, SchoolID FROM Faculty WHERE Email = $1',
@@ -139,35 +141,43 @@ app.post('/check-email', async (req, res) => {
         );
 
         if (facultyResult.rows.length === 0) {
+            console.error('Email not found:', email);
             return res.status(404).json({ message: 'Email not found', found: false });
         }
 
         const faculty = facultyResult.rows[0];
+        console.log('Faculty found:', faculty);
 
         // Query the Schools table for the school name
+        console.log('Querying Schools table for SchoolID:', faculty.schoolid);
         const schoolResult = await client.query(
             'SELECT Sname FROM Schools WHERE SID = $1',
             [faculty.schoolid]
         );
 
         const school = schoolResult.rows.length > 0 ? schoolResult.rows[0].sname : null;
+        console.log('School found:', school);
 
         // Query the CommitteeAssignments table for committee IDs
+        console.log('Querying CommitteeAssignments table for FID:', faculty.fid);
         const committeeAssignmentsResult = await client.query(
             'SELECT CommitteeID FROM CommitteeAssignments WHERE FID = $1',
             [faculty.fid]
         );
 
         const committeeIds = committeeAssignmentsResult.rows.map(row => row.committeeid);
+        console.log('Committee IDs found:', committeeIds);
 
         let committees = [];
         if (committeeIds.length > 0) {
             // Query the Committees table for committee names
+            console.log('Querying Committees table for Committee IDs:', committeeIds);
             const committeesResult = await client.query(
                 'SELECT Cname FROM Committees WHERE CID = ANY($1)',
                 [committeeIds]
             );
             committees = committeesResult.rows.map(row => row.cname);
+            console.log('Committees found:', committees);
         }
 
         // Respond with the required data

From 25484242b046fed1fb4958bf448dbad1705bc99d Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 8 Dec 2024 05:07:06 -0500
Subject: [PATCH 36/63] t

---
 src/UserProfile.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/UserProfile.tsx b/src/UserProfile.tsx
index c25c979..1e099c3 100644
--- a/src/UserProfile.tsx
+++ b/src/UserProfile.tsx
@@ -93,7 +93,7 @@ const UserProfile: React.FC = () => {
         setServiceStatement(data.serviceStatement);
         setError('');
       } else {
-        setError('Email not found. Click "Edit Profile" to create a new profile 2.');
+        setError('Email not found. Click "Edit Profile" to create a new profile 4.');
       }
     } catch (err) {
       console.error('Error checking email:', err);

From 6883d66d074e33304af4a9a306ebdd75d032bf57 Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 8 Dec 2024 11:46:36 -0500
Subject: [PATCH 37/63] user profile fix. check-email endpoint still broken

---
 server.js           |  4 ++++
 src/UserProfile.tsx | 48 +++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/server.js b/server.js
index b905d1c..934984d 100644
--- a/server.js
+++ b/server.js
@@ -125,6 +125,10 @@ app.get('/schools', async (req, res) => {
 );
 
 app.post('/check-email', async (req, res) => {
+    if (!req.body) {
+        console.error('req.body is undefined');
+        return res.status(400).json({ message: 'Invalid request', found: false });
+    }
     const { email } = req.body;
 
     if (!email) {
diff --git a/src/UserProfile.tsx b/src/UserProfile.tsx
index 1e099c3..1cd763e 100644
--- a/src/UserProfile.tsx
+++ b/src/UserProfile.tsx
@@ -78,7 +78,7 @@ const UserProfile: React.FC = () => {
 
   const handleCheckEmail = async () => {
     try {
-      const response = await fetch('/check-email', {
+      const response = await fetch('https://facelect.capping.ecrl.marist.edu/check-email', {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json',
@@ -117,8 +117,52 @@ const UserProfile: React.FC = () => {
                 onChange={(e) => setFirstName(e.target.value)}
                 placeholder="Your First Name Here"
               />
+              <label>Enter your last name: </label>
+              <input
+                type="text"
+                value={lastName}
+                onChange={(e) => setLastName(e.target.value)}
+                placeholder="Your Last Name Here"
+              />
+            </div>
+            <div className="form-group">
+              <label>Enter your preferred name (how it will appear on the ballot)</label>
+              <input
+                type="text"
+                value={preferredName}
+                onChange={(e) => setPreferredName(e.target.value)}
+                placeholder="Your Preferred Name Here"
+              />
+            </div>
+            <div className="form-group">
+              <label>Select your School from the dropdown menu</label>
+              <Select
+                options={schoolOptions}
+                value={schoolOptions.find(option => option.value === school)}
+                onChange={(selectedOption) => setSchool(selectedOption?.value || '')}
+                placeholder="Select School"
+              />
+            </div>
+            <div className="form-group">
+              <label>Select the committees you have been a part of (can select multiple)</label>
+              <CreatableSelect
+                className='select-input'
+                isMulti
+                options={committeeOptions}
+                onChange={handleCommitteeChange}
+                placeholder="Select or input committees"
+              />
+            </div>
+            <div className="form-group">
+              <label>Create a Service Statement (Why someone should vote for you)</label>
+              <textarea
+                value={serviceStatement}
+                onChange={(e) => setServiceStatement(e.target.value)}
+                placeholder="Enter your statement here"
+                maxLength={300}
+              />
+              <small>{serviceStatement.length}/300</small>
             </div>
-            {/* ... other form fields ... */}
             <div className="form-group">
               <button type="button" className="save-button" onClick={handleSave}>
                 <p>Save Profile</p>

From 472604d16a5fa9fe8e33d1629d16b5a0f39bbebd Mon Sep 17 00:00:00 2001
From: Ethan <ethan.ondreicka1@marist.edu>
Date: Sun, 8 Dec 2024 12:56:48 -0500
Subject: [PATCH 38/63] changed user profile

---
 src/UserProfile.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/UserProfile.tsx b/src/UserProfile.tsx
index 1917102..a002dda 100644
--- a/src/UserProfile.tsx
+++ b/src/UserProfile.tsx
@@ -10,8 +10,6 @@ const UserProfile: React.FC = () => {
   const [firstName, setFirstName] = useState('');
   const [lastName, setLastName] = useState('');
   const [preferredName, setPreferredName] = useState('');
-  const [firstName, setFirstName] = useState('');
-  const [lastName, setLastName] = useState('');
   const [school, setSchool] = useState('');
   const [committees, setCommittees] = useState<string[]>([]);
   const [serviceStatement, setServiceStatement] = useState('');

From 5bb756cb436c96ca7888a90ca89c5c5feedb072d Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 8 Dec 2024 12:58:36 -0500
Subject: [PATCH 39/63] fix to view state, more logging in check-email

---
 server.js           | 1 +
 src/UserProfile.tsx | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/server.js b/server.js
index 934984d..ffda124 100644
--- a/server.js
+++ b/server.js
@@ -125,6 +125,7 @@ app.get('/schools', async (req, res) => {
 );
 
 app.post('/check-email', async (req, res) => {
+    console.log('Starting /check-email');
     if (!req.body) {
         console.error('req.body is undefined');
         return res.status(400).json({ message: 'Invalid request', found: false });
diff --git a/src/UserProfile.tsx b/src/UserProfile.tsx
index 1cd763e..a002dda 100644
--- a/src/UserProfile.tsx
+++ b/src/UserProfile.tsx
@@ -173,6 +173,8 @@ const UserProfile: React.FC = () => {
         ) : (
           // View State
           <div className="profile-view">
+            <p><strong>First Name:</strong> {firstName || 'Not Provided'}</p>
+            <p><strong>Last Name:</strong>{lastName || 'Not Provided'}</p>
             <p><strong>Preferred Name:</strong> {preferredName || 'Not provided'}</p>
             <p><strong>School:</strong> {school || 'Not selected'}</p>
             <p><strong>Committees:</strong> {committees.length > 0 ? committees.join(', ') : 'None selected'}</p>      

From 92e56be1d6de5325fc96f8a08bad48bb89b28831 Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 8 Dec 2024 13:09:08 -0500
Subject: [PATCH 40/63] change to check-email

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

diff --git a/server.js b/server.js
index ffda124..b0b30a2 100644
--- a/server.js
+++ b/server.js
@@ -141,7 +141,7 @@ app.post('/check-email', async (req, res) => {
         console.log('Querying Faculty table for email:', email);
         // Query the Faculty table for the given email
         const facultyResult = await client.query(
-            'SELECT fid, PrefName, TheStatement, SchoolID FROM Faculty WHERE Email = $1',
+            'SELECT fid, PrefName AS prefname, TheStatement AS thestatement, SchoolID AS schoolid FROM Faculty WHERE Email = $1',
             [email]
         );
 

From dbb8db68c540fdf4803aea08e9e5687558a4d13d Mon Sep 17 00:00:00 2001
From: Ethan <ethan.ondreicka1@marist.edu>
Date: Sun, 8 Dec 2024 13:28:57 -0500
Subject: [PATCH 41/63] back arrow added

---
 src/UserProfile.css       |  73 ++++++++++++++++++++++++++
 src/UserProfile.tsx       | 105 +++++++++++++++++---------------------
 src/assets/arrow-icon.png | Bin 0 -> 7248 bytes
 3 files changed, 119 insertions(+), 59 deletions(-)
 create mode 100644 src/assets/arrow-icon.png

diff --git a/src/UserProfile.css b/src/UserProfile.css
index c4cd668..1092d35 100644
--- a/src/UserProfile.css
+++ b/src/UserProfile.css
@@ -137,5 +137,78 @@ select,
     background-color: #831b25;
 }
 
+.container {
+    background-color: white;
+  }
+  
+  .profile-form-container {
+    background-color: white;
+    border-radius: 20px;
+    padding: 50px;
+    max-width: 500px;
+    margin: auto;
+    box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1);
+  }
+  
+  .email-check-container {
+    margin-top: 30px;
+    text-align: center;
+  }
+  
+  .email-check-toggle {
+    background-color: #b21e2d;
+    color: white;
+    padding: 10px 20px;
+    border-radius: 10px;
+    border: none;
+    cursor: pointer;
+    font-size: 16px;
+    transition: 0.3s;
+  }
+  
+  .email-check-toggle:hover {
+    background-color: #831b25;
+  }
+  
+  .email-check {
+    margin-top: 20px;
+    text-align: center;
+  }
+  
+  .email-check label {
+    display: block;
+    font-size: 16px;
+    margin-bottom: 10px;
+  }
+  
+  .email-check input {
+    padding: 10px;
+    width: 300px;
+    border: 2px solid #b21e2d;
+    border-radius: 8px;
+    margin-bottom: 10px;
+  }
+  
+  .check-button {
+    background-color: #b21e2d;
+    color: white;
+    padding: 10px 20px;
+    border-radius: 10px;
+    border: none;
+    cursor: pointer;
+    font-size: 16px;
+    transition: 0.3s;
+  }
+  
+  .check-button:hover {
+    background-color: #831b25;
+  }
+  
+  .error {
+    color: red;
+    margin-top: 10px;
+  }
+  
+
 
   
diff --git a/src/UserProfile.tsx b/src/UserProfile.tsx
index a002dda..516f5a9 100644
--- a/src/UserProfile.tsx
+++ b/src/UserProfile.tsx
@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react';
 import './UserProfile.css';
 import Navbar from './components/navbar/Navbar';
 import saveIcon from './assets/save-icon.png';
+import arrowIcon from './assets/arrow-icon.png';
 import CreatableSelect from 'react-select/creatable';
 import Select from 'react-select';
 
@@ -107,7 +108,16 @@ const UserProfile: React.FC = () => {
       <h1 className='title'>Your Election Profile</h1>
       <div className="profile-form-container">
         {isEditing ? (
-          // Edit State
+        // Edit State
+        <div className="editing-header">
+          <button
+            type="button"
+            className="go-back-button"
+            onClick={() => setIsEditing(false)}
+          >
+            <img src={arrowIcon} alt="Back arrow" className="back-arrow" />
+            Go Back
+          </button>
           <form className="profile-form">
             <div className="form-group">
               <label>Enter your first name: </label>
@@ -134,69 +144,46 @@ const UserProfile: React.FC = () => {
                 placeholder="Your Preferred Name Here"
               />
             </div>
-            <div className="form-group">
-              <label>Select your School from the dropdown menu</label>
-              <Select
-                options={schoolOptions}
-                value={schoolOptions.find(option => option.value === school)}
-                onChange={(selectedOption) => setSchool(selectedOption?.value || '')}
-                placeholder="Select School"
-              />
-            </div>
-            <div className="form-group">
-              <label>Select the committees you have been a part of (can select multiple)</label>
-              <CreatableSelect
-                className='select-input'
-                isMulti
-                options={committeeOptions}
-                onChange={handleCommitteeChange}
-                placeholder="Select or input committees"
-              />
-            </div>
-            <div className="form-group">
-              <label>Create a Service Statement (Why someone should vote for you)</label>
-              <textarea
-                value={serviceStatement}
-                onChange={(e) => setServiceStatement(e.target.value)}
-                placeholder="Enter your statement here"
-                maxLength={300}
-              />
-              <small>{serviceStatement.length}/300</small>
-            </div>
-            <div className="form-group">
-              <button type="button" className="save-button" onClick={handleSave}>
-                <p>Save Profile</p>
-                {/* <img src={saveIcon} alt="Save" /> */}
-              </button>
-            </div>
+            {/* Additional form fields */}
           </form>
-        ) : (
+        </div>
+      ) : (
           // View State
-          <div className="profile-view">
-            <p><strong>First Name:</strong> {firstName || 'Not Provided'}</p>
-            <p><strong>Last Name:</strong>{lastName || 'Not Provided'}</p>
-            <p><strong>Preferred Name:</strong> {preferredName || 'Not provided'}</p>
-            <p><strong>School:</strong> {school || 'Not selected'}</p>
-            <p><strong>Committees:</strong> {committees.length > 0 ? committees.join(', ') : 'None selected'}</p>      
-            <p><strong>Service Statement:</strong> {serviceStatement || 'Not provided'}</p>
-            <button type="button" className="edit-button" onClick={() => setIsEditing(true)}>
-              Edit Profile
-            </button>
-            <div className="email-check">
-              <label>Enter marist email:</label>
-              <input
-                type="email"
-                value={email}
-                onChange={(e) => setEmail(e.target.value)}
-                placeholder="you@marist.edu"
-              />
-              <button type="button" className="check-button" onClick={handleCheckEmail}>
-                Check
+          <div>
+            <div className="profile-view">
+              <p><strong>First Name:</strong> {firstName || 'Not Provided'}</p>
+              <p><strong>Last Name:</strong>{lastName || 'Not Provided'}</p>
+              <p><strong>Preferred Name:</strong> {preferredName || 'Not provided'}</p>
+              <p><strong>School:</strong> {school || 'Not selected'}</p>
+              <p><strong>Committees:</strong> {committees.length > 0 ? committees.join(', ') : 'None selected'}</p>      
+              <p><strong>Service Statement:</strong> {serviceStatement || 'Not provided'}</p>
+              <button type="button" className="edit-button" onClick={() => setIsEditing(true)}>
+                Edit Profile
               </button>
-              {error && <p className="error">{error}</p>}
             </div>
-          </div>
+
+            <div className="email-check">
+              <p>Already have a profile? <button className="toggle-button" onClick={() => setIsEditing(!isEditing)}>Click here</button></p>
+              {isEditing && (
+                <div className="email-input-box">
+                  <label htmlFor="email">Enter marist email:</label>
+                  <input
+                    type="email"
+                    id="email"
+                    value={email}
+                    onChange={(e) => setEmail(e.target.value)}
+                    placeholder="you@marist.edu"
+                  />
+                  <button type="button" className="check-button" onClick={handleCheckEmail}>
+                    Check
+                  </button>
+                  {error && <p className="error">{error}</p>}
+                </div>
+              )}
+            </div>
+          </div>   
         )}
+        
       </div>
     </div>
   );
diff --git a/src/assets/arrow-icon.png b/src/assets/arrow-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a9157984c16b2a7032e1c66252d9f2521700065
GIT binary patch
literal 7248
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

literal 0
HcmV?d00001


From de03a3b2dddea4083ea963575b5b967223a2fc3d Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 8 Dec 2024 13:38:48 -0500
Subject: [PATCH 42/63] fix

---
 src/UserProfile.tsx | 107 +++++++++++++++++++++++++-------------------
 1 file changed, 60 insertions(+), 47 deletions(-)

diff --git a/src/UserProfile.tsx b/src/UserProfile.tsx
index 516f5a9..6830581 100644
--- a/src/UserProfile.tsx
+++ b/src/UserProfile.tsx
@@ -2,7 +2,6 @@ import React, { useState, useEffect } from 'react';
 import './UserProfile.css';
 import Navbar from './components/navbar/Navbar';
 import saveIcon from './assets/save-icon.png';
-import arrowIcon from './assets/arrow-icon.png';
 import CreatableSelect from 'react-select/creatable';
 import Select from 'react-select';
 
@@ -94,7 +93,7 @@ const UserProfile: React.FC = () => {
         setServiceStatement(data.serviceStatement);
         setError('');
       } else {
-        setError('Email not found. Click "Edit Profile" to create a new profile 4.');
+        setError('Email not found. Click "Edit Profile" to create a new profile.');
       }
     } catch (err) {
       console.error('Error checking email:', err);
@@ -108,16 +107,7 @@ const UserProfile: React.FC = () => {
       <h1 className='title'>Your Election Profile</h1>
       <div className="profile-form-container">
         {isEditing ? (
-        // Edit State
-        <div className="editing-header">
-          <button
-            type="button"
-            className="go-back-button"
-            onClick={() => setIsEditing(false)}
-          >
-            <img src={arrowIcon} alt="Back arrow" className="back-arrow" />
-            Go Back
-          </button>
+          // Edit State
           <form className="profile-form">
             <div className="form-group">
               <label>Enter your first name: </label>
@@ -144,46 +134,69 @@ const UserProfile: React.FC = () => {
                 placeholder="Your Preferred Name Here"
               />
             </div>
-            {/* Additional form fields */}
-          </form>
-        </div>
-      ) : (
-          // View State
-          <div>
-            <div className="profile-view">
-              <p><strong>First Name:</strong> {firstName || 'Not Provided'}</p>
-              <p><strong>Last Name:</strong>{lastName || 'Not Provided'}</p>
-              <p><strong>Preferred Name:</strong> {preferredName || 'Not provided'}</p>
-              <p><strong>School:</strong> {school || 'Not selected'}</p>
-              <p><strong>Committees:</strong> {committees.length > 0 ? committees.join(', ') : 'None selected'}</p>      
-              <p><strong>Service Statement:</strong> {serviceStatement || 'Not provided'}</p>
-              <button type="button" className="edit-button" onClick={() => setIsEditing(true)}>
-                Edit Profile
+            <div className="form-group">
+              <label>Select your School from the dropdown menu</label>
+              <Select
+                options={schoolOptions}
+                value={schoolOptions.find(option => option.value === school)}
+                onChange={(selectedOption) => setSchool(selectedOption?.value || '')}
+                placeholder="Select School"
+              />
+            </div>
+            <div className="form-group">
+              <label>Select the committees you have been a part of (can select multiple)</label>
+              <CreatableSelect
+                className='select-input'
+                isMulti
+                options={committeeOptions}
+                onChange={handleCommitteeChange}
+                placeholder="Select or input committees"
+              />
+            </div>
+            <div className="form-group">
+              <label>Create a Service Statement (Why someone should vote for you)</label>
+              <textarea
+                value={serviceStatement}
+                onChange={(e) => setServiceStatement(e.target.value)}
+                placeholder="Enter your statement here"
+                maxLength={300}
+              />
+              <small>{serviceStatement.length}/300</small>
+            </div>
+            <div className="form-group">
+              <button type="button" className="save-button" onClick={handleSave}>
+                <p>Save Profile</p>
+                {/* <img src={saveIcon} alt="Save" /> */}
               </button>
             </div>
-
+          </form>
+        ) : (
+          // View State
+          <div className="profile-view">
+            <p><strong>First Name:</strong> {firstName || 'Not Provided'}</p>
+            <p><strong>Last Name:</strong>{lastName || 'Not Provided'}</p>
+            <p><strong>Preferred Name:</strong> {preferredName || 'Not provided'}</p>
+            <p><strong>School:</strong> {school || 'Not selected'}</p>
+            <p><strong>Committees:</strong> {committees.length > 0 ? committees.join(', ') : 'None selected'}</p>      
+            <p><strong>Service Statement:</strong> {serviceStatement || 'Not provided'}</p>
+            <button type="button" className="edit-button" onClick={() => setIsEditing(true)}>
+              Edit Profile
+            </button>
             <div className="email-check">
-              <p>Already have a profile? <button className="toggle-button" onClick={() => setIsEditing(!isEditing)}>Click here</button></p>
-              {isEditing && (
-                <div className="email-input-box">
-                  <label htmlFor="email">Enter marist email:</label>
-                  <input
-                    type="email"
-                    id="email"
-                    value={email}
-                    onChange={(e) => setEmail(e.target.value)}
-                    placeholder="you@marist.edu"
-                  />
-                  <button type="button" className="check-button" onClick={handleCheckEmail}>
-                    Check
-                  </button>
-                  {error && <p className="error">{error}</p>}
-                </div>
-              )}
+              <label>Enter marist email:</label>
+              <input
+                type="email"
+                value={email}
+                onChange={(e) => setEmail(e.target.value)}
+                placeholder="you@marist.edu"
+              />
+              <button type="button" className="check-button" onClick={handleCheckEmail}>
+                Check
+              </button>
+              {error && <p className="error">{error}</p>}
             </div>
-          </div>   
+          </div>
         )}
-        
       </div>
     </div>
   );

From 03bed7a79facae2307679b791c5a3198de87241c Mon Sep 17 00:00:00 2001
From: Ethan <ethan.ondreicka1@marist.edu>
Date: Sun, 8 Dec 2024 13:39:43 -0500
Subject: [PATCH 43/63] reverted

---
 src/UserProfile.tsx | 105 +++++++++++++++++++++++++-------------------
 1 file changed, 59 insertions(+), 46 deletions(-)

diff --git a/src/UserProfile.tsx b/src/UserProfile.tsx
index 516f5a9..a002dda 100644
--- a/src/UserProfile.tsx
+++ b/src/UserProfile.tsx
@@ -2,7 +2,6 @@ import React, { useState, useEffect } from 'react';
 import './UserProfile.css';
 import Navbar from './components/navbar/Navbar';
 import saveIcon from './assets/save-icon.png';
-import arrowIcon from './assets/arrow-icon.png';
 import CreatableSelect from 'react-select/creatable';
 import Select from 'react-select';
 
@@ -108,16 +107,7 @@ const UserProfile: React.FC = () => {
       <h1 className='title'>Your Election Profile</h1>
       <div className="profile-form-container">
         {isEditing ? (
-        // Edit State
-        <div className="editing-header">
-          <button
-            type="button"
-            className="go-back-button"
-            onClick={() => setIsEditing(false)}
-          >
-            <img src={arrowIcon} alt="Back arrow" className="back-arrow" />
-            Go Back
-          </button>
+          // Edit State
           <form className="profile-form">
             <div className="form-group">
               <label>Enter your first name: </label>
@@ -144,46 +134,69 @@ const UserProfile: React.FC = () => {
                 placeholder="Your Preferred Name Here"
               />
             </div>
-            {/* Additional form fields */}
-          </form>
-        </div>
-      ) : (
-          // View State
-          <div>
-            <div className="profile-view">
-              <p><strong>First Name:</strong> {firstName || 'Not Provided'}</p>
-              <p><strong>Last Name:</strong>{lastName || 'Not Provided'}</p>
-              <p><strong>Preferred Name:</strong> {preferredName || 'Not provided'}</p>
-              <p><strong>School:</strong> {school || 'Not selected'}</p>
-              <p><strong>Committees:</strong> {committees.length > 0 ? committees.join(', ') : 'None selected'}</p>      
-              <p><strong>Service Statement:</strong> {serviceStatement || 'Not provided'}</p>
-              <button type="button" className="edit-button" onClick={() => setIsEditing(true)}>
-                Edit Profile
+            <div className="form-group">
+              <label>Select your School from the dropdown menu</label>
+              <Select
+                options={schoolOptions}
+                value={schoolOptions.find(option => option.value === school)}
+                onChange={(selectedOption) => setSchool(selectedOption?.value || '')}
+                placeholder="Select School"
+              />
+            </div>
+            <div className="form-group">
+              <label>Select the committees you have been a part of (can select multiple)</label>
+              <CreatableSelect
+                className='select-input'
+                isMulti
+                options={committeeOptions}
+                onChange={handleCommitteeChange}
+                placeholder="Select or input committees"
+              />
+            </div>
+            <div className="form-group">
+              <label>Create a Service Statement (Why someone should vote for you)</label>
+              <textarea
+                value={serviceStatement}
+                onChange={(e) => setServiceStatement(e.target.value)}
+                placeholder="Enter your statement here"
+                maxLength={300}
+              />
+              <small>{serviceStatement.length}/300</small>
+            </div>
+            <div className="form-group">
+              <button type="button" className="save-button" onClick={handleSave}>
+                <p>Save Profile</p>
+                {/* <img src={saveIcon} alt="Save" /> */}
               </button>
             </div>
-
+          </form>
+        ) : (
+          // View State
+          <div className="profile-view">
+            <p><strong>First Name:</strong> {firstName || 'Not Provided'}</p>
+            <p><strong>Last Name:</strong>{lastName || 'Not Provided'}</p>
+            <p><strong>Preferred Name:</strong> {preferredName || 'Not provided'}</p>
+            <p><strong>School:</strong> {school || 'Not selected'}</p>
+            <p><strong>Committees:</strong> {committees.length > 0 ? committees.join(', ') : 'None selected'}</p>      
+            <p><strong>Service Statement:</strong> {serviceStatement || 'Not provided'}</p>
+            <button type="button" className="edit-button" onClick={() => setIsEditing(true)}>
+              Edit Profile
+            </button>
             <div className="email-check">
-              <p>Already have a profile? <button className="toggle-button" onClick={() => setIsEditing(!isEditing)}>Click here</button></p>
-              {isEditing && (
-                <div className="email-input-box">
-                  <label htmlFor="email">Enter marist email:</label>
-                  <input
-                    type="email"
-                    id="email"
-                    value={email}
-                    onChange={(e) => setEmail(e.target.value)}
-                    placeholder="you@marist.edu"
-                  />
-                  <button type="button" className="check-button" onClick={handleCheckEmail}>
-                    Check
-                  </button>
-                  {error && <p className="error">{error}</p>}
-                </div>
-              )}
+              <label>Enter marist email:</label>
+              <input
+                type="email"
+                value={email}
+                onChange={(e) => setEmail(e.target.value)}
+                placeholder="you@marist.edu"
+              />
+              <button type="button" className="check-button" onClick={handleCheckEmail}>
+                Check
+              </button>
+              {error && <p className="error">{error}</p>}
             </div>
-          </div>   
+          </div>
         )}
-        
       </div>
     </div>
   );

From 670b909b2731600b36ef724e5bae333d0bd73667 Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 8 Dec 2024 13:42:22 -0500
Subject: [PATCH 44/63] query change

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

diff --git a/server.js b/server.js
index b0b30a2..0c11e6d 100644
--- a/server.js
+++ b/server.js
@@ -166,7 +166,7 @@ app.post('/check-email', async (req, res) => {
         // Query the CommitteeAssignments table for committee IDs
         console.log('Querying CommitteeAssignments table for FID:', faculty.fid);
         const committeeAssignmentsResult = await client.query(
-            'SELECT CommitteeID FROM CommitteeAssignments WHERE FID = $1',
+            'SELECT CID FROM CommitteeAssignments WHERE FID = $1',
             [faculty.fid]
         );
 

From 916c7102602803752d3fbf96be4188bb924ad8e1 Mon Sep 17 00:00:00 2001
From: Brendon Kupsch <BrendonKupsch1@marist.edu>
Date: Sun, 8 Dec 2024 13:54:46 -0500
Subject: [PATCH 45/63] email login changes

---
 server.js | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/server.js b/server.js
index 0c11e6d..253f55b 100644
--- a/server.js
+++ b/server.js
@@ -61,14 +61,13 @@ passport.use(new SamlStrategy(
       wantAssertionsSigned: false,
       wantAuthnResponseSigned: false
     },
-    (profile, done) => {
-        // Extract user information from the profile
-        const user = {
-            email: profile.emailAddress,
-        };
-        return done(null, user);
-    }
-));
+    function (profile, done) {
+        return done(null, {
+          email: profile.emailAddress,
+        });
+      }
+    )
+  );
 
 passport.serializeUser((user, done) => {
     done(null, user);
@@ -86,10 +85,13 @@ app.post(
     failureRedirect: "/",
     failureFlash: true,
   }),
-  function (req, res) {
-    res.redirect("/user-profile");
-  }
-);
+    function (req, res) {
+      // Access the authenticated user
+      console.log("req.user");
+      console.log(req.user);
+      res.redirect("/user-profile");
+    }
+  );
 
 // SSO login route
 app.get('/sso/login',
@@ -275,4 +277,4 @@ httpServer.listen(httpPort, () => {
 });
 httpsServer.listen(httpsPort, () => {
     console.log(`HTTPS Server running on port ${httpsPort}`);
-});
\ No newline at end of file
+});

From 2b899af344ce60fc84b8a678b2515de74f9fde85 Mon Sep 17 00:00:00 2001
From: Brendon Kupsch <BrendonKupsch1@marist.edu>
Date: Sun, 8 Dec 2024 14:05:09 -0500
Subject: [PATCH 46/63] removed old server ssl file

---
 server-ssl.js | 152 --------------------------------------------------
 1 file changed, 152 deletions(-)
 delete mode 100644 server-ssl.js

diff --git a/server-ssl.js b/server-ssl.js
deleted file mode 100644
index 998d4ab..0000000
--- a/server-ssl.js
+++ /dev/null
@@ -1,152 +0,0 @@
-require('dotenv').config(); // Load environment variables
-const express = require('express');
-const cors = require('cors');
-const crypto = require('crypto'); // Import the crypto module
-const { client, connectDB } = require('./db/connection'); // Import the client and connectDB
-const https = require('https');
-const fs = require('fs');
-const passport = require('passport');
-const SamlStrategy = require('passport-saml').Strategy;
-const session = require('express-session'); // Import express-session
-const morgan = require('morgan'); // Import morgan for logging
-
-const app = express();
-
-// List of allowed origins
-const allowedOrigins = [
-  'http://localhost:3000',
-  'http://10.11.29.103:3000',
-  'http://facelect.capping.ecrl.marist.edu:3000',
-];
-
-// Configure CORS to allow requests from your React app
-app.use(
-  cors({
-    origin: function (origin, callback) {
-      // Allow requests with no origin (like mobile apps or curl requests)
-      if (!origin) return callback(null, true);
-      if (allowedOrigins.indexOf(origin) === -1) {
-        const msg =
-          'The CORS policy for this site does not allow access from the specified Origin.';
-        return callback(new Error(msg), false);
-      }
-      return callback(null, true);
-    },
-  })
-);
-
-app.use(express.json()); // Parse incoming JSON data
-app.use(morgan('dev')); // Log requests for debugging
-
-// Configure express-session middleware
-app.use(
-  session({
-    secret: 'c2d6e1f1b4a6e0f3c5d8e7f1a2b3c4d5e6f7081920a1b2c3d4e5f6a7b8c9d0e1',
-    resave: false,
-    saveUninitialized: true,
-    cookie: { secure: true }, // Set secure to true since we're using HTTPS
-  })
-);
-
-// Initialize Passport.js
-app.use(passport.initialize());
-app.use(passport.session());
-
-// Connect to the PostgreSQL database
-connectDB();
-
-// Function to hash passwords using SHA-256
-const hashPassword = (password) => {
-  return crypto.createHash('sha256').update(password).digest('hex');
-};
-
-// Passport SAML strategy configuration
-passport.use(
-  new SamlStrategy(
-    {
-      path: '/login/callback',
-      entryPoint: 'https://auth.it.marist.edu/idp/profile/SAML2/Redirect/SSO',
-      issuer: 'Marist-SSO',
-      cert: fs.readFileSync('/var/www/html/backend/sp-cert.pem', 'utf-8'),
-      privateCert: fs.readFileSync('/var/www/html/backend/sp-key.pem', 'utf-8'), // Use the private key for privateCert
-      identifierFormat: null,
-      decryptionPvk: fs.readFileSync('/var/www/html/backend/sp-key.pem', 'utf-8'), // Use the private key for decryptionPvk
-      validateInResponseTo: false,
-      disableRequestedAuthnContext: true,
-    },
-    (profile, done) => {
-      return done(null, profile);
-    }
-  )
-);
-
-passport.serializeUser((user, done) => {
-  done(null, user);
-});
-
-passport.deserializeUser((user, done) => {
-  done(null, user);
-});
-
-// Route to handle admin login
-app.post('/admin-login', async (req, res) => {
-  const { username, password } = req.body; // Capture username and password from request
-
-  try {
-    // Query the Admins table to find the admin by username (Uname)
-    const adminResult = await client.query(
-      'SELECT * FROM Admins WHERE Uname = $1',
-      [username]
-    );
-
-    if (adminResult.rows.length === 0) {
-      return res.status(400).json({ message: 'Invalid username or password' });
-    }
-
-    const admin = adminResult.rows[0];
-
-    // Hash the provided password and compare with the stored hash
-    const hashedInputPassword = hashPassword(password); // Hash the input password
-    if (hashedInputPassword !== admin.thepassword) {
-      // Use correct case for thepassword
-      return res.status(400).json({ message: 'Invalid username or password' });
-    }
-
-    res.status(200).json({ message: 'Login successful' });
-  } catch (error) {
-    console.error(error); // Log the error for debugging
-    res.status(500).json({ message: 'Internal server error' });
-  }
-});
-
-// SSO login route
-app.get(
-  '/login',
-  passport.authenticate('saml', {
-    successRedirect: '/',
-    failureRedirect: '/login',
-  })
-);
-
-// SSO callback route
-app.post(
-  '/login/callback',
-  passport.authenticate('saml', {
-    failureRedirect: '/login',
-    failureFlash: true,
-  }),
-  (req, res) => {
-    res.redirect('/');
-  }
-);
-
-// Read SSL certificate and key
-const options = {
-  key: fs.readFileSync('/var/www/html/backend/sp-key.pem'),
-  cert: fs.readFileSync('/var/www/html/backend/sp-cert.pem'),
-};
-
-// Create HTTPS server on a non-privileged port (e.g., 8443)
-https.createServer(options, app).listen(8443, () => {
-  console.log('HTTPS Server running on port 8443');
-});

From 6b8c75730062594cc0313f64ba2ca5e4ada3ec34 Mon Sep 17 00:00:00 2001
From: Brendon Kupsch <BrendonKupsch1@marist.edu>
Date: Sun, 8 Dec 2024 14:10:19 -0500
Subject: [PATCH 47/63] profiles are being grabbed

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

diff --git a/server.js b/server.js
index 253f55b..fa870fd 100644
--- a/server.js
+++ b/server.js
@@ -63,7 +63,7 @@ passport.use(new SamlStrategy(
     },
     function (profile, done) {
         return done(null, {
-          email: profile.emailAddress,
+          email: profile.email,
         });
       }
     )

From b90549d1e7d1416e1f2286ba49c2cb6190474c15 Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 8 Dec 2024 14:14:53 -0500
Subject: [PATCH 48/63] ethans userProfile changes

---
 src/UserProfile.css | 31 +++++++++++++++++++++++++++++--
 src/UserProfile.tsx | 15 ++++++++++++++-
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/src/UserProfile.css b/src/UserProfile.css
index 1092d35..8d27018 100644
--- a/src/UserProfile.css
+++ b/src/UserProfile.css
@@ -32,6 +32,7 @@ h1 {
 .form-group {
     margin-bottom: 30px;
     width: 95%;
+    padding-top: 10px;
 }
 
 .form-group label {
@@ -97,6 +98,7 @@ select,
 .save-button {
     background-color: #b21e2d;
     border: 2px solid #fe6978;
+    border-radius: 10px;
     cursor: pointer;
     display: flex;
     justify-content: flex-end;
@@ -208,7 +210,32 @@ select,
     color: red;
     margin-top: 10px;
   }
-  
 
+  .editing-header {
+    position: relative;
+    margin-bottom: 20px; /* Adds space between the header and the form content */
+}
 
-  
+.go-back-button {
+    position: absolute; /* Places the button relative to the `editing-header` container */
+    top: -20px; /* Adjusts the button's position above the form content */
+    left: -10px; /* Adjusts the button's position to the left of the container padding */
+    display: flex;
+    align-items: center;
+    background: none;
+    border: none;
+    color: #b21e2d;
+    font-size: 16px;
+    cursor: pointer;
+    transition: color 0.3s;
+}
+
+.go-back-button:hover {
+    color: #831b25;
+}
+
+.back-arrow {
+    width: 16px;
+    height: 16px;
+    margin-right: 8px;
+}
\ No newline at end of file
diff --git a/src/UserProfile.tsx b/src/UserProfile.tsx
index 6830581..0f5ce49 100644
--- a/src/UserProfile.tsx
+++ b/src/UserProfile.tsx
@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react';
 import './UserProfile.css';
 import Navbar from './components/navbar/Navbar';
 import saveIcon from './assets/save-icon.png';
+import arrowIcon from './assets/arrow-icon.png'
 import CreatableSelect from 'react-select/creatable';
 import Select from 'react-select';
 
@@ -108,6 +109,15 @@ const UserProfile: React.FC = () => {
       <div className="profile-form-container">
         {isEditing ? (
           // Edit State
+          <div className="editing-header">
+          <button
+            type="button"
+            className="go-back-button"
+            onClick={() => setIsEditing(false)}
+          >
+            <img src={arrowIcon} alt="Back arrow" className="back-arrow" />
+            <strong>Go Back</strong>
+          </button>
           <form className="profile-form">
             <div className="form-group">
               <label>Enter your first name: </label>
@@ -117,6 +127,8 @@ const UserProfile: React.FC = () => {
                 onChange={(e) => setFirstName(e.target.value)}
                 placeholder="Your First Name Here"
               />
+            </div>
+            <div className='form-group'>
               <label>Enter your last name: </label>
               <input
                 type="text"
@@ -165,11 +177,12 @@ const UserProfile: React.FC = () => {
             </div>
             <div className="form-group">
               <button type="button" className="save-button" onClick={handleSave}>
-                <p>Save Profile</p>
+                <p>Save Profile and Go Back to View</p>
                 {/* <img src={saveIcon} alt="Save" /> */}
               </button>
             </div>
           </form>
+        </div>
         ) : (
           // View State
           <div className="profile-view">

From 0fdd61f700286cd89846b7f0dc924e88191dcbea Mon Sep 17 00:00:00 2001
From: Ethan <ethan.ondreicka1@marist.edu>
Date: Sun, 8 Dec 2024 14:20:25 -0500
Subject: [PATCH 49/63] added go back and removed email check

---
 src/UserProfile.css | 32 +++++++++++++++++++++++++++++++-
 src/UserProfile.tsx | 28 ++++++++++++++--------------
 2 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/src/UserProfile.css b/src/UserProfile.css
index 1092d35..d10d80c 100644
--- a/src/UserProfile.css
+++ b/src/UserProfile.css
@@ -32,6 +32,7 @@ h1 {
 .form-group {
     margin-bottom: 30px;
     width: 95%;
+    padding-top: 10px;
 }
 
 .form-group label {
@@ -97,6 +98,7 @@ select,
 .save-button {
     background-color: #b21e2d;
     border: 2px solid #fe6978;
+    border-radius: 10px;
     cursor: pointer;
     display: flex;
     justify-content: flex-end;
@@ -208,7 +210,35 @@ select,
     color: red;
     margin-top: 10px;
   }
-  
+
+  .editing-header {
+    position: relative;
+    margin-bottom: 20px; /* Adds space between the header and the form content */
+}
+
+.go-back-button {
+    position: absolute; /* Places the button relative to the `editing-header` container */
+    top: -20px; /* Adjusts the button's position above the form content */
+    left: -10px; /* Adjusts the button's position to the left of the container padding */
+    display: flex;
+    align-items: center;
+    background: none;
+    border: none;
+    color: #b21e2d;
+    font-size: 16px;
+    cursor: pointer;
+    transition: color 0.3s;
+}
+
+.go-back-button:hover {
+    color: #831b25;
+}
+
+.back-arrow {
+    width: 16px;
+    height: 16px;
+    margin-right: 8px;
+}
 
 
   
diff --git a/src/UserProfile.tsx b/src/UserProfile.tsx
index 6830581..c9d724a 100644
--- a/src/UserProfile.tsx
+++ b/src/UserProfile.tsx
@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react';
 import './UserProfile.css';
 import Navbar from './components/navbar/Navbar';
 import saveIcon from './assets/save-icon.png';
+import arrowIcon from './assets/arrow-icon.png'
 import CreatableSelect from 'react-select/creatable';
 import Select from 'react-select';
 
@@ -108,6 +109,15 @@ const UserProfile: React.FC = () => {
       <div className="profile-form-container">
         {isEditing ? (
           // Edit State
+          <div className="editing-header">
+          <button
+            type="button"
+            className="go-back-button"
+            onClick={() => setIsEditing(false)}
+          >
+            <img src={arrowIcon} alt="Back arrow" className="back-arrow" />
+            <strong>Go Back</strong>
+          </button>
           <form className="profile-form">
             <div className="form-group">
               <label>Enter your first name: </label>
@@ -117,6 +127,8 @@ const UserProfile: React.FC = () => {
                 onChange={(e) => setFirstName(e.target.value)}
                 placeholder="Your First Name Here"
               />
+            </div>
+            <div className='form-group'>
               <label>Enter your last name: </label>
               <input
                 type="text"
@@ -165,11 +177,12 @@ const UserProfile: React.FC = () => {
             </div>
             <div className="form-group">
               <button type="button" className="save-button" onClick={handleSave}>
-                <p>Save Profile</p>
+                <p>Save Profile and Go Back to View</p>
                 {/* <img src={saveIcon} alt="Save" /> */}
               </button>
             </div>
           </form>
+        </div>
         ) : (
           // View State
           <div className="profile-view">
@@ -182,19 +195,6 @@ const UserProfile: React.FC = () => {
             <button type="button" className="edit-button" onClick={() => setIsEditing(true)}>
               Edit Profile
             </button>
-            <div className="email-check">
-              <label>Enter marist email:</label>
-              <input
-                type="email"
-                value={email}
-                onChange={(e) => setEmail(e.target.value)}
-                placeholder="you@marist.edu"
-              />
-              <button type="button" className="check-button" onClick={handleCheckEmail}>
-                Check
-              </button>
-              {error && <p className="error">{error}</p>}
-            </div>
           </div>
         )}
       </div>

From e867a0d02763826dfa734d866ee052f42fc4d65a Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 8 Dec 2024 14:27:08 -0500
Subject: [PATCH 50/63] comment line 92 with sso email idea

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

diff --git a/server.js b/server.js
index fa870fd..7884b43 100644
--- a/server.js
+++ b/server.js
@@ -89,7 +89,7 @@ app.post(
       // Access the authenticated user
       console.log("req.user");
       console.log(req.user);
-      res.redirect("/user-profile");
+      res.redirect("/user-profile"); // pass email here after quote , user.req.email
     }
   );
 

From cc9dffc4f8c358b4a4df418d089380dae4c8c9de Mon Sep 17 00:00:00 2001
From: Ethan <ethan.ondreicka1@marist.edu>
Date: Sun, 8 Dec 2024 15:19:11 -0500
Subject: [PATCH 51/63] styling to user profile

---
 src/UserProfile.css              | 23 ++++++++++++++++++-----
 src/UserProfile.tsx              | 24 ++++++++++++++++++++++++
 src/components/navbar/Navbar.css |  1 -
 3 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/src/UserProfile.css b/src/UserProfile.css
index d10d80c..10d4efb 100644
--- a/src/UserProfile.css
+++ b/src/UserProfile.css
@@ -33,8 +33,22 @@ h1 {
     margin-bottom: 30px;
     width: 95%;
     padding-top: 10px;
+    transition: border 0.3s, box-shadow 0.3s;
 }
 
+#inputBox {
+    border: 2px solid #5a5a5a;
+    border-radius: 5px;
+    outline: none;
+    margin-top: 10px;
+    transition: border 0.3s, box-shadow 0.3s;
+  }
+
+#inputBox:focus {
+    border-color: #B80E0E;
+    box-shadow: 0 0 8px rgba(184, 14, 14, 0.5);
+  }
+
 .form-group label {
     font-size: 14px;
     color: #333;
@@ -63,7 +77,9 @@ textarea::placeholder {
 
 /*The next 4 are supposed to style the committee dropdown,
    but I don't think it did anything */
-select,
+input[type="text"],
+textarea,
+select, /* Added select to match the styling */
 .css-yk16xz-control {
     width: 100%;
     padding: 10px;
@@ -238,7 +254,4 @@ select,
     width: 16px;
     height: 16px;
     margin-right: 8px;
-}
-
-
-  
+}
\ No newline at end of file
diff --git a/src/UserProfile.tsx b/src/UserProfile.tsx
index c9d724a..e559604 100644
--- a/src/UserProfile.tsx
+++ b/src/UserProfile.tsx
@@ -77,6 +77,24 @@ const UserProfile: React.FC = () => {
     // Trigger save to the database here
   };
 
+  const dropdownStyle = {
+    control: (base: any, state: any) => ({
+      ...base,
+      border: state.isFocused ? '2px solid #B80E0E' : '2px solid #5a5a5a',
+      boxShadow: state.isFocused ? '0 0 8px rgba(184, 14, 14, 0.5)' : 'none',
+      '&:hover': {
+        border: state.isFocused ? '2px solid #B80E0E' : '2px solid #5a5a5a',
+      },
+      borderRadius: '5px',
+      width: '105%',
+    }),
+    menu: (base: any) => ({
+      ...base,
+      zIndex: 5,
+    }),
+  };
+  
+
   const handleCheckEmail = async () => {
     try {
       const response = await fetch('https://facelect.capping.ecrl.marist.edu/check-email', {
@@ -123,6 +141,7 @@ const UserProfile: React.FC = () => {
               <label>Enter your first name: </label>
               <input
                 type="text"
+                id='inputBox'
                 value={firstName}
                 onChange={(e) => setFirstName(e.target.value)}
                 placeholder="Your First Name Here"
@@ -132,6 +151,7 @@ const UserProfile: React.FC = () => {
               <label>Enter your last name: </label>
               <input
                 type="text"
+                id='inputBox'
                 value={lastName}
                 onChange={(e) => setLastName(e.target.value)}
                 placeholder="Your Last Name Here"
@@ -141,6 +161,7 @@ const UserProfile: React.FC = () => {
               <label>Enter your preferred name (how it will appear on the ballot)</label>
               <input
                 type="text"
+                id='inputBox'
                 value={preferredName}
                 onChange={(e) => setPreferredName(e.target.value)}
                 placeholder="Your Preferred Name Here"
@@ -153,6 +174,7 @@ const UserProfile: React.FC = () => {
                 value={schoolOptions.find(option => option.value === school)}
                 onChange={(selectedOption) => setSchool(selectedOption?.value || '')}
                 placeholder="Select School"
+                styles={dropdownStyle}
               />
             </div>
             <div className="form-group">
@@ -163,12 +185,14 @@ const UserProfile: React.FC = () => {
                 options={committeeOptions}
                 onChange={handleCommitteeChange}
                 placeholder="Select or input committees"
+                styles={dropdownStyle}
               />
             </div>
             <div className="form-group">
               <label>Create a Service Statement (Why someone should vote for you)</label>
               <textarea
                 value={serviceStatement}
+                id='inputBox'
                 onChange={(e) => setServiceStatement(e.target.value)}
                 placeholder="Enter your statement here"
                 maxLength={300}
diff --git a/src/components/navbar/Navbar.css b/src/components/navbar/Navbar.css
index cba35d9..e3d5167 100644
--- a/src/components/navbar/Navbar.css
+++ b/src/components/navbar/Navbar.css
@@ -6,7 +6,6 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
-    position: sticky;
     top: 0; 
     width: 100vw; 
     z-index: 3;

From 48a71acade8dec1d997edf5d7433b8f5b28e0dd8 Mon Sep 17 00:00:00 2001
From: Ethan <ethan.ondreicka1@marist.edu>
Date: Sun, 8 Dec 2024 15:53:44 -0500
Subject: [PATCH 52/63] more styling changes

---
 src/App.tsx                      |   4 --
 src/User-Login.css               |  69 ------------------------
 src/User-Login.tsx               |  87 -------------------------------
 src/UserProfile.css              |  14 ++++-
 src/UserProfile.tsx              |   1 +
 src/assets/arrow-icon.png        | Bin 7248 -> 31662 bytes
 src/components/footer/footer.css |  22 ++++----
 src/components/footer/footer.tsx |   5 +-
 8 files changed, 28 insertions(+), 174 deletions(-)
 delete mode 100644 src/User-Login.css
 delete mode 100644 src/User-Login.tsx

diff --git a/src/App.tsx b/src/App.tsx
index c5e28ad..1e18643 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -6,7 +6,6 @@ import AdminView from './AdminView'; // Admin view component
 import UserProfile from './UserProfile'; // User profile component 
 import { AuthProvider, useAuth } from './AuthContext'; // Adjust the path as necessary
 import { useNavigate } from 'react-router-dom';
-import UserLogin from './User-Login';
 
 function App() {
   return (
@@ -28,9 +27,6 @@ function App() {
           {/* Route for the user profile page */}
           <Route path='/user-profile' element={<UserProfile />} />
 
-	  {/* Route for the User Login */}
-          <Route path="/User-Login" element={<UserLogin />} />
-
         </Routes>
       </Router>
     </AuthProvider>
diff --git a/src/User-Login.css b/src/User-Login.css
deleted file mode 100644
index b3f0446..0000000
--- a/src/User-Login.css
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Login.css */
-.login-box {
-    position: relative; 
-    background: rgba(255, 255, 255, 0.15); 
-    padding: 15px 120px; 
-    border-radius: 15px;
-    box-shadow: 0 8px 32px rgba(31, 38, 135, 0.37); 
-    backdrop-filter: blur(4px);
-    z-index: 2; 
-    text-align: center; 
-    border: 2px solid rgba(255, 255, 255, 0.9);
-  }
-    
-    .input-field {
-      margin-bottom: 15px;
-      text-align: left;
-    }
-    
-    .input-field label {
-      font-size: 16px;
-      font-weight: bold;
-      margin-bottom: 5px;
-      display: block;
-    }
-    
-    .input-field input {
-      width: 100%;
-      padding: 10px;
-      border: 1px solid #ccc;
-      border-radius: 10px;
-      font-size: 16px;
-      box-sizing: border-box;
-    }
-  
-    .input:focus{
-      outline: none;
-      background-color: rgb(244, 244, 244);
-    }
-  
-  
-    
-    
-    .submit-button {
-      width: 100%;
-      padding: 10px;
-      background-color: #b80e0e;
-      color: white;
-      font-size: 25px;
-      font-weight: 600;
-      border: 2px solid #b80e0e;
-      border-radius: 15px;
-      cursor: pointer;
-      margin-top: 30px;
-      margin-bottom: 30px;
-      transition-duration: 0.4s;
-    }
-    
-    .submit-button:hover {
-      background-color: #921010;
-      font-size: 25.5px;
-      border: 2px solid rgb(203, 44, 44);
-      color: #dddddd;
-      box-shadow: 0 12px 16px 0 rgba(0,0,0,0.19),0 17px 50px 0 rgba(0,0,0,0.19);
-    }
-    
-    label{
-      color: white;
-    }
-  
diff --git a/src/User-Login.tsx b/src/User-Login.tsx
deleted file mode 100644
index 38877ba..0000000
--- a/src/User-Login.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-import React, { useState, FormEvent } from 'react';
-import { useNavigate } from 'react-router-dom';
-import { useAuth } from './AuthContext'; // Adjust the path as necessary
-import './Login.css';
-import './AdminLogin.css';
-import backgroundImage from './assets/background.jpg';
-import logoImage from './assets/logo.png';
-import Footer from './components/footer/footer';
-
-const UserLogin: React.FC = () => {
-  const [username, setUsername] = useState('');
-  const [password, setPassword] = useState('');
-  const [error, setError] = useState('');
-  const navigate = useNavigate();
-  const { login } = useAuth(); // Get the login function from context
-
-  const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
-    e.preventDefault();
-    console.log('Submitting login form'); // Log form submission
-    try {
-      const response = await fetch('https://facelect.capping.ecrl.marist.edu/admin-login', {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({ username, password }),
-      });
-
-      const data = await response.json();
-
-      if (response.ok) {
-        // Call the login function from the Auth context, marking the user as an admin
-        login(true); // Pass true to indicate admin login
-
-        // Redirect to admin view if login is successful
-        navigate('/admin-view');
-      } else {
-        setError(data.message); // Show error message if login fails
-      }
-    } catch (error) {
-      console.error('Error logging in:', error);
-      setError('Something went wrong. Please try again.');
-    }
-  };
-
-  return (
-    <div className='m-login'>
-      <img src={backgroundImage} className='bg-image' alt='Background' />
-      <img src={logoImage} className='logo' alt='Marist Election Profile Logo' />
-      <div className='login-box'>
-        <h2 id='loginText'>User Login:</h2>
-        {error && <p className='error'>{error}</p>}
-        <form onSubmit={handleSubmit}>
-          <div className='input-field'>
-            <label htmlFor='username'>Username:</label>
-            <input
-              type='text'
-              id='username'
-              name='username'
-              className='input'
-              value={username}
-              onChange={(e) => setUsername(e.target.value)}
-              required
-            />
-          </div>
-          <div className='input-field'>
-            <label htmlFor='password'>Password:</label>
-            <input
-              type='password'
-              id='password'
-              name='password'
-              className='input'
-              value={password}
-              onChange={(e) => setPassword(e.target.value)}
-              required
-            />
-          </div>
-          <button type='submit' className='submit-button'>
-            Submit
-          </button>
-        </form>
-      </div>
-    </div>
-  );
-}
-
-export default UserLogin;
diff --git a/src/UserProfile.css b/src/UserProfile.css
index 10d4efb..6495d5c 100644
--- a/src/UserProfile.css
+++ b/src/UserProfile.css
@@ -251,7 +251,17 @@ select, /* Added select to match the styling */
 }
 
 .back-arrow {
-    width: 16px;
-    height: 16px;
+    width: 18px;
+    height: 18px;
     margin-right: 8px;
+    transition-duration: 0.4s
+}
+
+.back-arrow:hover > .overlay {
+    width:100%;
+    height:100%;
+    position:absolute;
+    background-color:#000;
+    opacity:0.5;
+    border-radius:30px;
 }
\ No newline at end of file
diff --git a/src/UserProfile.tsx b/src/UserProfile.tsx
index e559604..187d409 100644
--- a/src/UserProfile.tsx
+++ b/src/UserProfile.tsx
@@ -5,6 +5,7 @@ import saveIcon from './assets/save-icon.png';
 import arrowIcon from './assets/arrow-icon.png'
 import CreatableSelect from 'react-select/creatable';
 import Select from 'react-select';
+import Footer from './components/footer/footer';
 
 const UserProfile: React.FC = () => {
   const [isEditing, setIsEditing] = useState(false);
diff --git a/src/assets/arrow-icon.png b/src/assets/arrow-icon.png
index 0a9157984c16b2a7032e1c66252d9f2521700065..b48f6861cf06d6f68eb4a9c1a7bb3e8f0d4c209e 100644
GIT binary patch
delta 29137
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%0D!IA8EC}N9gj_7nT{ql2mu}rmame_q
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

delta 4531
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

diff --git a/src/components/footer/footer.css b/src/components/footer/footer.css
index e6739d6..241f73b 100644
--- a/src/components/footer/footer.css
+++ b/src/components/footer/footer.css
@@ -1,10 +1,12 @@
-.footer{
-    width: 100vw;
-    height: 4rem;
-    background: rgb(40,40,40);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-weight: 300;
-    font-size: small;
-}
\ No newline at end of file
+.footer {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    height: 60px; /* Height of the footer */
+    background: rgb(179, 26, 27);
+    color: white;
+    display: flex; /* Use flexbox for centering */
+    justify-content: center; /* Horizontally center */
+    align-items: center; /* Vertically center */
+    text-align: center; /* Maintain existing text alignment */
+}
diff --git a/src/components/footer/footer.tsx b/src/components/footer/footer.tsx
index 4fe3372..5fa8e94 100644
--- a/src/components/footer/footer.tsx
+++ b/src/components/footer/footer.tsx
@@ -4,9 +4,10 @@ import './footer.css'
 const Footer = () => {
   return (
     <footer className='footer'>
-        Copyright © 2024 Marist - All Rights Reserved.
+        Copyright © 2024 Marist - All Rights Reserved.<br />
+        Made by Team Ctrl+Alt+Defeat
     </footer>
   )
 }
 
-export default Footer
\ No newline at end of file
+export default Footer

From f449a1756e8315d66668324abc444e1aa63dc777 Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 8 Dec 2024 15:57:24 -0500
Subject: [PATCH 53/63] fetch user testing

---
 server.js           | 52 +++++++++++++++++++++++++++--------------
 src/UserProfile.tsx | 57 ++++++++++++++++++++++++---------------------
 2 files changed, 65 insertions(+), 44 deletions(-)

diff --git a/server.js b/server.js
index 7884b43..b6e9995 100644
--- a/server.js
+++ b/server.js
@@ -126,24 +126,38 @@ app.get('/schools', async (req, res) => {
   }
 );
 
-app.post('/check-email', async (req, res) => {
-    console.log('Starting /check-email');
-    if (!req.body) {
-        console.error('req.body is undefined');
-        return res.status(400).json({ message: 'Invalid request', found: false });
-    }
-    const { email } = req.body;
-
-    if (!email) {
-        console.error('Email is required');
-        return res.status(400).json({ message: 'Email is required', found: false });
+// Middleware to ensure the user is authenticated
+function ensureAuthenticated(req, res, next) {
+    if (req.isAuthenticated()) {
+        return next();
     }
+    res.status(401).json({ message: 'Unauthorized' });
+}
 
+app.get('/get-user-data', ensureAuthenticated, async (req, res) => {
     try {
+        const email = req.user.email; // Get email from authenticated user
         console.log('Querying Faculty table for email:', email);
-        // Query the Faculty table for the given email
+        
+        // Query the Faculty and People tables for the given email, including first and last names
         const facultyResult = await client.query(
-            'SELECT fid, PrefName AS prefname, TheStatement AS thestatement, SchoolID AS schoolid FROM Faculty WHERE Email = $1',
+            `
+            SELECT 
+                f.fid, 
+                p.Fname AS firstName, 
+                p.Lname AS lastName, 
+                f.PrefName AS preferredName, 
+                f.TheStatement AS serviceStatement, 
+                f.SchoolID AS schoolid 
+            FROM 
+                Faculty f 
+            JOIN 
+                People p 
+            ON 
+                f.fid = p.fid 
+            WHERE 
+                f.Email = $1
+            `,
             [email]
         );
 
@@ -162,7 +176,7 @@ app.post('/check-email', async (req, res) => {
             [faculty.schoolid]
         );
 
-        const school = schoolResult.rows.length > 0 ? schoolResult.rows[0].sname : null;
+        const school = schoolResult.rows.length > 0 ? schoolResult.rows[0].sname : 'Unknown';
         console.log('School found:', school);
 
         // Query the CommitteeAssignments table for committee IDs
@@ -172,7 +186,7 @@ app.post('/check-email', async (req, res) => {
             [faculty.fid]
         );
 
-        const committeeIds = committeeAssignmentsResult.rows.map(row => row.committeeid);
+        const committeeIds = committeeAssignmentsResult.rows.map(row => row.cid);
         console.log('Committee IDs found:', committeeIds);
 
         let committees = [];
@@ -190,13 +204,15 @@ app.post('/check-email', async (req, res) => {
         // Respond with the required data
         res.json({
             found: true,
-            preferredName: faculty.prefname,
-            theStatement: faculty.thestatement,
+            firstName: faculty.firstname,
+            lastName: faculty.lastname,
+            preferredName: faculty.preferredname,
+            serviceStatement: faculty.servicestatement,
             school: school,
             committees: committees,
         });
     } catch (error) {
-        console.error('Error in /check-email:', error);
+        console.error('Error in /get-user-data:', error);
         res.status(500).json({ message: 'Server error', found: false });
     }
 });
diff --git a/src/UserProfile.tsx b/src/UserProfile.tsx
index e559604..161c231 100644
--- a/src/UserProfile.tsx
+++ b/src/UserProfile.tsx
@@ -64,8 +64,39 @@ const UserProfile: React.FC = () => {
       }
     };
 
+    const fetchUserData = async () => {
+      try {
+        const response = await fetch('/get-user-data', {
+          method: 'GET',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+        });
+        if (!response.ok) {
+          throw new Error(`Error fetching user data: ${response.statusText}`);
+        }
+        const data = await response.json();
+    
+        if (data.found) {
+          setFirstName(data.firstName);
+          setLastName(data.lastName);
+          setPreferredName(data.preferredName);
+          setSchool(data.school);
+          setCommittees(data.committees);
+          setServiceStatement(data.theStatement);
+          setError('');
+        } else {
+          setError('Email not found. Click "Edit Profile" to create a new profile.');
+        }
+      } catch (err) {
+        console.error('Error fetching user data:', err);
+        setError('An error occurred. Please try again.');
+      }
+    };
+
     fetchCommitteeNames();
     fetchSchoolNames();
+    fetchUserData();
   }, []);
 
   const handleCommitteeChange = (selectedOptions: any) => {
@@ -93,32 +124,6 @@ const UserProfile: React.FC = () => {
       zIndex: 5,
     }),
   };
-  
-
-  const handleCheckEmail = async () => {
-    try {
-      const response = await fetch('https://facelect.capping.ecrl.marist.edu/check-email', {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({ email }),
-      });
-      const data = await response.json();
-      if (response.ok && data.found) {
-        setPreferredName(data.preferredName);
-        setSchool(data.school);
-        setCommittees(data.committees);
-        setServiceStatement(data.serviceStatement);
-        setError('');
-      } else {
-        setError('Email not found. Click "Edit Profile" to create a new profile.');
-      }
-    } catch (err) {
-      console.error('Error checking email:', err);
-      setError('An error occurred. Please try again.');
-    }
-  };
 
   return (
     <div className='container'>

From 57af0dd719ddf71ab98eda4e14a282614b2d596a Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 8 Dec 2024 16:23:53 -0500
Subject: [PATCH 54/63] added new test data

---
 db/sql/Test_Data_Revised_1.sql | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/db/sql/Test_Data_Revised_1.sql b/db/sql/Test_Data_Revised_1.sql
index 0c2988e..4e0b45f 100644
--- a/db/sql/Test_Data_Revised_1.sql
+++ b/db/sql/Test_Data_Revised_1.sql
@@ -318,4 +318,23 @@ INSERT INTO Faculty (FID, Email, SchoolID, IsHidden, PrefName, URL, TheStatement
 	 '2024-04-23 13:01:23');
 
 INSERT INTO Admins (aid, uname, thepassword, godmode) VALUES
-	(1, 'admin1', 'cd6357efdd966de8c0cb2f876cc89ec74ce35f0968e11743987084bd42fb8944', TRUE)
\ No newline at end of file
+	(1, 'admin1', 'cd6357efdd966de8c0cb2f876cc89ec74ce35f0968e11743987084bd42fb8944', TRUE)
+
+-- Our own test data, comment this out when deploying
+INSERT INTO People (Fname, Lname)
+VALUES ('Aaron', 'Bonilla');
+INSERT INTO Faculty (FID, SchoolID, IsHidden, PrefName, Email, URL, TheStatement, LastUpdated)
+VALUES (51, 3, FALSE, 'Bone', 'Aaron.Bonilla1@marist.edu', 'https://my.marist.edu', 'I love capping', CURRENT_TIMESTAMP());
+INSERT INTO CommitteeAssignments (FID, CID)
+VALUES 
+    (51, 2), -- Assignment to CommitteeID 2
+    (51, 15); -- Assignment to CommitteeID 15
+
+INSERT INTO People (FName, LName)
+VALUES ('Kai', 'Cottle');
+INSERT INTO Faculty (FID, SchoolID, IsHidden, PrefName, Email, URL, theStatement, LastUpdated)
+VALUES (52, 4, FALSE, 'Kai', 'Kai.Cottle1@marist.edu', 'https://my.marist.edu', 'Im so awesome', CURRENT_TIMESTAMP());
+INSERT INTO CommitteeAssignments (FID, CommitteeID)
+VALUES 
+(52, 3), -- Assignment to CommitteeID 2
+(52, 11); -- Assignment to CommitteeID 15
\ No newline at end of file

From f25a32285488d2e40721b904a2ea2e4f8784026b Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 8 Dec 2024 16:31:39 -0500
Subject: [PATCH 55/63] fix to user data endpoint

---
 db/sql/Test_Data_Revised_1.sql | 6 +++---
 server.js                      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/db/sql/Test_Data_Revised_1.sql b/db/sql/Test_Data_Revised_1.sql
index 4e0b45f..e92dd04 100644
--- a/db/sql/Test_Data_Revised_1.sql
+++ b/db/sql/Test_Data_Revised_1.sql
@@ -324,7 +324,7 @@ INSERT INTO Admins (aid, uname, thepassword, godmode) VALUES
 INSERT INTO People (Fname, Lname)
 VALUES ('Aaron', 'Bonilla');
 INSERT INTO Faculty (FID, SchoolID, IsHidden, PrefName, Email, URL, TheStatement, LastUpdated)
-VALUES (51, 3, FALSE, 'Bone', 'Aaron.Bonilla1@marist.edu', 'https://my.marist.edu', 'I love capping', CURRENT_TIMESTAMP());
+VALUES (51, 3, FALSE, 'Bone', 'Aaron.Bonilla1@marist.edu', 'https://my.marist.edu', 'I love capping', CURRENT_TIMESTAMP);
 INSERT INTO CommitteeAssignments (FID, CID)
 VALUES 
     (51, 2), -- Assignment to CommitteeID 2
@@ -333,8 +333,8 @@ VALUES
 INSERT INTO People (FName, LName)
 VALUES ('Kai', 'Cottle');
 INSERT INTO Faculty (FID, SchoolID, IsHidden, PrefName, Email, URL, theStatement, LastUpdated)
-VALUES (52, 4, FALSE, 'Kai', 'Kai.Cottle1@marist.edu', 'https://my.marist.edu', 'Im so awesome', CURRENT_TIMESTAMP());
-INSERT INTO CommitteeAssignments (FID, CommitteeID)
+VALUES (52, 4, FALSE, 'Kai', 'Kai.Cottle1@marist.edu', 'https://my.marist.edu', 'Im so awesome', CURRENT_TIMESTAMP);
+INSERT INTO CommitteeAssignments (FID, CID)
 VALUES 
 (52, 3), -- Assignment to CommitteeID 2
 (52, 11); -- Assignment to CommitteeID 15
\ No newline at end of file
diff --git a/server.js b/server.js
index b6e9995..79530fe 100644
--- a/server.js
+++ b/server.js
@@ -154,7 +154,7 @@ app.get('/get-user-data', ensureAuthenticated, async (req, res) => {
             JOIN 
                 People p 
             ON 
-                f.fid = p.fid 
+                f.fid = p.pid 
             WHERE 
                 f.Email = $1
             `,

From 49cce318b744d742f5d36a82ab7e7413bed9b756 Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 8 Dec 2024 16:35:14 -0500
Subject: [PATCH 56/63] fix for statement

---
 src/UserProfile.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/UserProfile.tsx b/src/UserProfile.tsx
index 52520cc..fedfc43 100644
--- a/src/UserProfile.tsx
+++ b/src/UserProfile.tsx
@@ -84,7 +84,7 @@ const UserProfile: React.FC = () => {
           setPreferredName(data.preferredName);
           setSchool(data.school);
           setCommittees(data.committees);
-          setServiceStatement(data.theStatement);
+          setServiceStatement(data.serviceStatement);
           setError('');
         } else {
           setError('Email not found. Click "Edit Profile" to create a new profile.');

From 58d34d5fefb41dc5a5fdaf8e7e9ed6853a1eddba Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 8 Dec 2024 17:04:04 -0500
Subject: [PATCH 57/63] profile edit/create test

---
 server.js           | 141 ++++++++++++++++++++++++++++++++++++++++++++
 src/UserProfile.tsx |  52 +++++++++++++---
 2 files changed, 185 insertions(+), 8 deletions(-)

diff --git a/server.js b/server.js
index 79530fe..97843cc 100644
--- a/server.js
+++ b/server.js
@@ -217,6 +217,147 @@ app.get('/get-user-data', ensureAuthenticated, async (req, res) => {
     }
 });
 
+// Route to create a new faculty member
+app.post('/create-faculty', ensureAuthenticated, async (req, res) => {
+    try {
+        const { firstName, lastName, preferredName, school, committees, serviceStatement } = req.body;
+        const email = req.user.email; // Get email from authenticated user
+
+        // Insert into People table
+        const peopleResult = await client.query(
+            'INSERT INTO People (Fname, Lname) VALUES ($1, $2) RETURNING PID',
+            [firstName, lastName]
+        );
+        const pid = peopleResult.rows[0].pid;
+
+        // Get School ID and School Name
+        const schoolResult = await client.query(
+            'SELECT SID, Sname FROM Schools WHERE Sname = $1',
+            [school]
+        );
+        const schoolID = schoolResult.rows[0].sid;
+        const schoolName = schoolResult.rows[0].sname;
+
+        // Format the URL
+        const formattedSchoolName = schoolName.toLowerCase().replace(/\s+/g, '-');
+        const formattedFirstName = firstName.toLowerCase().replace(/\s+/g, '-');
+        const formattedLastName = lastName.toLowerCase().replace(/\s+/g, '-');
+        const url = `http://www.marist.edu/${formattedSchoolName}/faculty/${formattedFirstName}-${formattedLastName}`;
+
+        // Insert into Faculty table with the formatted URL
+        await client.query(
+            'INSERT INTO Faculty (FID, Email, SchoolID, IsHidden, PrefName, URL, TheStatement, LastUpdated) VALUES ($1, $2, $3, $4, $5, $6, $7, NOW())',
+            [
+                pid,
+                email,
+                schoolID,
+                false,
+                preferredName,
+                url,
+                serviceStatement
+            ]
+        );
+
+        // Insert into CommitteeAssignments table
+        for (let committeeName of committees) {
+            // Get or create Committee ID
+            let cid;
+            const committeeResult = await client.query(
+                'SELECT CID FROM Committees WHERE Cname = $1',
+                [committeeName]
+            );
+            if (committeeResult.rows.length > 0) {
+                cid = committeeResult.rows[0].cid;
+            } else {
+                const newCommittee = await client.query(
+                    'INSERT INTO Committees (Cname) VALUES ($1) RETURNING CID',
+                    [committeeName]
+                );
+                cid = newCommittee.rows[0].cid;
+            }
+
+            // Insert into CommitteeAssignments
+            await client.query(
+                'INSERT INTO CommitteeAssignments (FID, CID) VALUES ($1, $2)',
+                [pid, cid]
+            );
+        }
+
+        res.status(200).json({ message: 'Profile created successfully' });
+    } catch (error) {
+        console.error('Error in /create-faculty:', error);
+        res.status(500).json({ message: 'Server error' });
+    }
+});
+
+// Route to edit an existing faculty member
+app.put('/edit-faculty', ensureAuthenticated, async (req, res) => {
+    try {
+        const { firstName, lastName, preferredName, school, committees, serviceStatement } = req.body;
+        const email = req.user.email; // Get email from authenticated user
+
+        // Get FID and PID
+        const facultyResult = await client.query(
+            'SELECT FID FROM Faculty WHERE Email = $1',
+            [email]
+        );
+        if (facultyResult.rows.length === 0) {
+            return res.status(404).json({ message: 'Faculty not found' });
+        }
+        const fid = facultyResult.rows[0].fid;
+
+        // Update People table
+        await client.query(
+            'UPDATE People SET Fname = $1, Lname = $2 WHERE PID = $3',
+            [firstName, lastName, fid]
+        );
+
+        // Get School ID
+        const schoolResult = await client.query(
+            'SELECT SID FROM Schools WHERE Sname = $1',
+            [school]
+        );
+        const schoolID = schoolResult.rows[0].sid;
+
+        // Update Faculty table
+        await client.query(
+            'UPDATE Faculty SET PrefName = $1, SchoolID = $2, TheStatement = $3, LastUpdated = NOW() WHERE FID = $4',
+            [preferredName, schoolID, serviceStatement, fid]
+        );
+
+        // Update CommitteeAssignments
+        await client.query('DELETE FROM CommitteeAssignments WHERE FID = $1', [fid]);
+        for (let committeeName of committees) {
+            // Get or create Committee ID
+            let cid;
+            const committeeResult = await client.query(
+                'SELECT CID FROM Committees WHERE Cname = $1',
+                [committeeName]
+            );
+            if (committeeResult.rows.length > 0) {
+                cid = committeeResult.rows[0].cid;
+            } else {
+                const newCommittee = await client.query(
+                    'INSERT INTO Committees (Cname) VALUES ($1) RETURNING CID',
+                    [committeeName]
+                );
+                cid = newCommittee.rows[0].cid;
+            }
+
+            // Insert into CommitteeAssignments
+            await client.query(
+                'INSERT INTO CommitteeAssignments (FID, CID) VALUES ($1, $2)',
+                [fid, cid]
+            );
+        }
+
+        res.status(200).json({ message: 'Profile updated successfully' });
+    } catch (error) {
+        console.error('Error in /edit-faculty:', error);
+        res.status(500).json({ message: 'Server error' });
+    }
+});
+
 // Route to handle admin login
 app.post('/admin-login', async (req, res) => {
     const { username, password } = req.body; // Capture username and password from request
diff --git a/src/UserProfile.tsx b/src/UserProfile.tsx
index fedfc43..108471b 100644
--- a/src/UserProfile.tsx
+++ b/src/UserProfile.tsx
@@ -17,6 +17,7 @@ const UserProfile: React.FC = () => {
   const [serviceStatement, setServiceStatement] = useState('');
   const [committeeOptions, setCommitteeOptions] = useState<{ value: string, label: string }[]>([]);
   const [schoolOptions, setSchoolOptions] = useState<{ value: string, label: string }[]>([]);
+  const [profileExists, setProfileExists] = useState(false);
   const [email, setEmail] = useState('');
   const [error, setError] = useState('');
 
@@ -85,9 +86,11 @@ const UserProfile: React.FC = () => {
           setSchool(data.school);
           setCommittees(data.committees);
           setServiceStatement(data.serviceStatement);
+          setProfileExists(true); // Profile exists
           setError('');
         } else {
-          setError('Email not found. Click "Edit Profile" to create a new profile.');
+          setProfileExists(false); // Profile does not exist
+          setError('Profile not found. Click "Edit Profile" to create a new profile.');
         }
       } catch (err) {
         console.error('Error fetching user data:', err);
@@ -104,9 +107,43 @@ const UserProfile: React.FC = () => {
     setCommittees(selectedOptions ? selectedOptions.map((option: any) => option.value) : []);
   };
 
-  const handleSave = () => {
-    setIsEditing(false);
-    // Trigger save to the database here
+  const handleSave = async () => {
+    // Prepare the data to be sent
+    const payload = {
+      firstName,
+      lastName,
+      preferredName,
+      school,
+      committees,
+      serviceStatement,
+    };
+  
+    // Decide the endpoint and method based on profile existence
+    const endpoint = profileExists ? '/edit-faculty' : '/create-faculty';
+    const method = profileExists ? 'PUT' : 'POST';
+  
+    try {
+      const response = await fetch(endpoint, {
+        method: method,
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(payload),
+      });
+  
+      if (response.ok) {
+        // Handle success
+        setProfileExists(true); // Profile now exists
+        setIsEditing(false); // Exit edit mode
+      } else {
+        // Handle errors
+        const errorData = await response.json();
+        setError(errorData.message || 'An error occurred. Please try again.');
+      }
+    } catch (err) {
+      console.error('Error saving profile:', err);
+      setError('An error occurred. Please try again.');
+    }
   };
 
   const dropdownStyle = {
@@ -206,10 +243,9 @@ const UserProfile: React.FC = () => {
               <small>{serviceStatement.length}/300</small>
             </div>
             <div className="form-group">
-              <button type="button" className="save-button" onClick={handleSave}>
-                <p>Save Profile and Go Back to View</p>
-                {/* <img src={saveIcon} alt="Save" /> */}
-              </button>
+            <button type="button" className="save-button" onClick={handleSave}>
+              {profileExists ? 'Save Changes' : 'Create Profile'}
+            </button>
             </div>
           </form>
         </div>

From 0c43af6f6f363866a605d56b0a9b0268b03eac33 Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 8 Dec 2024 17:17:15 -0500
Subject: [PATCH 58/63] changed instructions for committee selection

---
 src/UserProfile.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/UserProfile.tsx b/src/UserProfile.tsx
index 108471b..7d73018 100644
--- a/src/UserProfile.tsx
+++ b/src/UserProfile.tsx
@@ -221,7 +221,7 @@ const UserProfile: React.FC = () => {
               />
             </div>
             <div className="form-group">
-              <label>Select the committees you have been a part of (can select multiple)</label>
+              <label>Select the committees you have been a part of (can select multiple, replaces old selection)</label>
               <CreatableSelect
                 className='select-input'
                 isMulti

From 1cb7ec2cb9e2730f0fff56e28593355103b48203 Mon Sep 17 00:00:00 2001
From: AaronBonilla <a.bone1203@gmail.com>
Date: Sun, 8 Dec 2024 17:49:47 -0500
Subject: [PATCH 59/63] fix to admin sql

---
 db/sql/Test_Data_Revised_1.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/sql/Test_Data_Revised_1.sql b/db/sql/Test_Data_Revised_1.sql
index e92dd04..ca38c78 100644
--- a/db/sql/Test_Data_Revised_1.sql
+++ b/db/sql/Test_Data_Revised_1.sql
@@ -317,8 +317,8 @@ INSERT INTO Faculty (FID, Email, SchoolID, IsHidden, PrefName, URL, TheStatement
 	 'I will be happy to serve on any committee if elected.', 
 	 '2024-04-23 13:01:23');
 
-INSERT INTO Admins (aid, uname, thepassword, godmode) VALUES
-	(1, 'admin1', 'cd6357efdd966de8c0cb2f876cc89ec74ce35f0968e11743987084bd42fb8944', TRUE)
+INSERT INTO Admins (aid, uname, thepassword, godmode) 
+VALUES (1, 'admin1', 'cd6357efdd966de8c0cb2f876cc89ec74ce35f0968e11743987084bd42fb8944', TRUE);
 
 -- Our own test data, comment this out when deploying
 INSERT INTO People (Fname, Lname)

From 9fb00e7c66be9a53a19913933b72bd9ed3ed5572 Mon Sep 17 00:00:00 2001
From: Nicolas DiPardo <112446116+siezorsalad@users.noreply.github.com>
Date: Mon, 9 Dec 2024 00:34:49 -0500
Subject: [PATCH 60/63] Updated url Test_Data_Revised_1.sql

---
 db/sql/Test_Data_Revised_1.sql | 80 +++++++++++++++++-----------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/db/sql/Test_Data_Revised_1.sql b/db/sql/Test_Data_Revised_1.sql
index ca38c78..bec8cf5 100644
--- a/db/sql/Test_Data_Revised_1.sql
+++ b/db/sql/Test_Data_Revised_1.sql
@@ -117,83 +117,83 @@ INSERT INTO Committees (Cname) VALUES
     ('Any of the Strategic Planning committees');
 
 INSERT INTO Faculty (FID, Email, SchoolID, IsHidden, PrefName, URL, TheStatement, LastUpdated) VALUES 
-    (1, 'Chris.Algozzine@marist.edu', 2, false, 'Chris Algozzine', 'http://www.marist.edu/{school}/faculty/{fn-ln}', 
+    (1, 'Chris.Algozzine@marist.edu', 2, false, 'Chris Algozzine', 'https://www.marist.edu/computer-science-math/faculty/chris-algozzine', 
      'I choose to serve our community any way I can for many reasons. It started when I was a Boy Scout, and was forged forever in my ethos after I arrived here as a Freshman in 1985 to work on my bachelor’s degree, where I also joined service clubs like campus ministry, and was taught about service to our community by the faculty and Marist brothers. I went on to have a career at IBM and took every chance to serve the communities in which IBM did business. I served for a brief time as the Senior Location Executive at the Poughkeepsie IBM Site, which is a position serving as the spokesperson to the community and working with community non-profits. I enjoyed this work, and when I joined the Marist faculty in 1995, was immediately drawn to the Center for Civic Engagement. Granted a fellowship to study community based learning (CBL) practices with Dr. Gaeke and a cohort of our colleagues, I put CBL into practice in my courses, especially the Capping experience course. I’m proud of the service I bring to the Marist community and feel that in 9 short years I’ve embedded myself into opportunities to give back to my colleagues, our students, the college, and the community at large. I would be honored to serve as Chair of the Faculty, and hope you will vote for me.',
      '2024-02-05 16:31:28'),
 
-    (2, 'Joe.Kirtland@marist.edu', 2, false, 'Joseph Kirtland', 'http://www.marist.edu/{school}/faculty/{fn-ln}',
+    (2, 'Joe.Kirtland@marist.edu', 2, false, 'Joseph Kirtland', 'https://www.marist.edu/computer-science-math/faculty/joseph-kirtland',
      'I am a firm believer in faculty-driven shared governance guided by the Faculty Handbook. But for that to work, we need to have a strong faculty voice driven predominantly by dedicated service on faculty and other committees. Through working on elected and appointed faculty committees, the faculty can have a significant and meaningful impact on college academics, college policies, campus environment, and the general direction of the college.',
      '2024-03-19 07:34:25'),
 
-    (3, 'Bowu.Zhang@marist.edu', 2, false, 'Bowu Zhang', 'http://www.marist.edu/{school}/faculty/{fn-ln}',
+    (3, 'Bowu.Zhang@marist.edu', 2, false, 'Bowu Zhang', 'https://www.marist.edu/computer-science-math/faculty/bowu-zhang',
      'I have been the faculty advisor for Women-In-Technology Club at Marist for years. I enjoyed working with colleague and students to promote women''s participation in Computer Science (CS) through various networking activities. I welcome any thoughts to attract more women to CS.',
      '2024-03-19 08:49:36'),
 
-    (4, 'Casimer.DeCusatis@marist.edu', 2, false, 'Casimer Decusatis', 'http://www.marist.edu/{school}/faculty/{fn-ln}',
+    (4, 'Casimer.DeCusatis@marist.edu', 2, false, 'Casimer Decusatis', 'https://www.marist.edu/computer-science-math/faculty/casimer-decusatis.html',
      'Ive found that service is a great way to interact with people from other parts of the college, and get a different perspective on our shared issues and challenges. In addition to my past service on Academic Standards, Core and Liberal Studies, and the Institutional Review Board, I''ve previously served on the President''s Faculty Climate Committee and the Technology Committee Working Group on Data Center Strategy. I feel that these experiences have allowed me to make Marist a better place for students, faculty, and staff alike. I''m always interested in finding new ways to help serve our campus community, and would appreciate the opportunity to stay involved in whatever capacity is needed.',
      '2024-03-19 16:53:35'),
 
-    (5, 'Eitel.Lauria@marist.edu', 5, false, 'Eitel Lauria', 'http://example.com/eitel_lauria',
+    (5, 'Eitel.Lauria@marist.edu', 5, false, 'Eitel Lauria', 'https://www.marist.edu/computer-science-math/faculty/eitel-lauria',
      'I have chaired the AAC and served as the Vice Chair of FAC during the pandemic. I currently chair the faculty search committee in my department. I served on the presidential search committee, the CIO''s search committee, the previous middle-states committee, and co-chaired one of the strategic plan working groups. I have helped hire and mentored most of the faculty in my department through tenure and promotion. I will be on sabbatical in Spring 2025.',
      '2024-03-19 17:12:37'),
 
-    (6, 'Luis.Espinasa@marist.edu', 6, false, 'Luis Espinasa', 'http://www.marist.edu/{school}/faculty/{fn-ln}', 
+    (6, 'Luis.Espinasa@marist.edu', 6, false, 'Luis Espinasa', 'https://www.marist.edu/science/faculty/luis-espinasa', 
      'I have been in Marist for 18 years. Have served in the Rank and Tenure committee once, and in the Grievance Committee as its Chair for two years.', 
      '2024-03-19 18:44:57'),
 
-    (7, 'Tracey.McGrail@marist.edu', 2, false, 'Tracey McGrail', 'http://www.marist.edu/{school}/faculty/{fn-ln}', 
+    (7, 'Tracey.McGrail@marist.edu', 2, false, 'Tracey McGrail', 'https://www.marist.edu/computer-science-math/faculty/tracey-mcgrail', 
      'I believe that faculty service is very important to the function of the college. In particular, while membership on the Rank and Tenure Committee is a heavy commitment (I was on when there were 13 candidates for tenure!), this group plays a critical role in evaluating faculty. If elected I will serve.', 
      '2024-03-21 15:12:53'),
 
-    (8, 'Megan.Dennis@marist.edu', 6, false, 'Megan Dennis', 'http://www.marist.edu/{school}/faculty/{fn-ln}', 
+    (8, 'Megan.Dennis@marist.edu', 6, false, 'Megan Dennis', 'https://www.marist.edu/science/faculty/megan-dennis', 
      'I am not comfortable serving on Rank & Tenure at this point in my career. As a recently-tenured faculty member, I have not yet had the opportunity to serve on a peer committee for tenure evaluation, and feel that I lack the experience necessary to fairly assess candidates from across the college as a member of R&T.', 
      '2024-03-27 13:22:33'),
 
-    (9, 'Jocelyn.Nadeau@marist.edu', 6, false, 'Jocelyn Nadeau', 'http://www.marist.edu/{school}/faculty/{fn-ln}', 
+    (9, 'Jocelyn.Nadeau@marist.edu', 6, false, 'Jocelyn Nadeau', 'https://www.marist.edu/science/faculty/jocelyn-nadeau', 
      'Since I started in 2005, I have served on many campus wide, SoS, and departmental committees and spent considerable time devoted to service that is unique to laboratory science within my department. These service endeavors have all been rewarding and productive in their own way, but they have also negatively impacted my ability to advance my scholarship to where it needs to be to apply for promotion to full professor, especially in the past 5 years due to COVID-related and overall workload issues. So, I am asking for some consideration given that I have already served on two of the major elected committees since 2012. As soon as I was tenured and eligible after my probationary year, I was elected to the Rank and Tenure Committee in 2012 and served as its chair during the third year of my term (in only my 10th year at Marist). Right after my service sabbatical was over, I was elected to FAC where I served a 3-year term that spanned through summer 2020. I will be more than willing to serve on R&T again in the future, but I am asking for some mercy at this current time. Thank you.', 
      '2024-03-29 14:33:05'),
 
-    (10, 'Andrei.Buckareff@marist.edu', 3, false, 'Andrei Buckareff', 'http://www.marist.edu/{school}/faculty/{fn-ln}', 
+    (10, 'Andrei.Buckareff@marist.edu', 3, false, 'Andrei Buckareff', 'https://www.marist.edu/computer-science-math/faculty/robert-cannistra', 
      'I have enjoyed serving on Rank & Tenure, along with other committees. While it''s a lot of work, it is rewarding work. I am presently in my first year serving on the Faculty Research and Sabbaticals (which I have served on previously). I am presently chair of said committee. I am happy to serve on any committee.', 
      '2024-03-29 17:23:01'),
 
-     (11, 'Joshua.Kotzin@marist.edu', 3, false, 'Joshua Kotzin', 'http://www.marist.edu/{school}/faculty/{fn-ln}', 
+     (11, 'Joshua.Kotzin@marist.edu', 3, false, 'Joshua Kotzin', 'https://www.marist.edu/liberal-arts/faculty/joshua-kotzin', 
      'I believe service is an important way for faculty to help the college fulfill its mission. As the Chair of the English Department (in which role I''ve served for more than a year), I have learned a lot about the institution as a whole and the ways faculty work fits into that bigger picture.', 
      '2024-03-29 18:36:28'),
 
-    (12, 'Annamaria.Maciocia@marist.edu', 3, false, 'Annamaria Maciocia', 'http://www.marist.edu/{school}/faculty/{fn-ln}', 
+    (12, 'Annamaria.Maciocia@marist.edu', 3, false, 'Annamaria Maciocia', 'https://www.marist.edu/liberal-arts/faculty/annamaria-maciocia', 
      'I am honored to serve the faculty, School of Liberal Arts, and the Marist community in any capacity. If elected, I will contribute my time and best effort to participate on FAC or AAC. As a term faculty member at Marist College since 1995, I have witnessed the diligent, selfless dedication of tenured faculty in these roles. It is with profound gratitude and respect for their service that I am motivated to serve. Additionally both FAC and AAC are vital to the integrity of shared governance; therefore, service at this responsibility of every eligible faculty member.', 
      '2024-03-29 23:45:04'),
 
-    (13, 'Brian.Loh@marist.edu', 3, false, 'Brian Loh', 'http://www.marist.edu/{school}/faculty/{fn-ln}', 
+    (13, 'Brian.Loh@marist.edu', 3, false, 'Brian Loh', 'https://www.marist.edu/liberal-arts/faculty/brian-loh', 
      'I am currently serving as acting honors director, and I''m a member of the Marist Mindfulness Collective, the Global Studies Committee, and the Interfaith Committee. As of writing (3/30/24) I am not seeking election as I have a kid coming end of May and will be on parental leave in spring ''25. I am open to serving in the future, but please consider someone who will be a little less distracted this time around!', 
      '2024-03-30 07:30:45'),
 
-    (14, 'Melissa.Gaeke@marist.edu', 3, false, 'Melissa Gaeke', 'http://www.marist.edu/{school}/faculty/{fn-ln}', 
+    (14, 'Melissa.Gaeke@marist.edu', 3, false, 'Melissa Gaeke', 'https://www.marist.edu/liberal-arts/faculty/melissa-gaeke', 
      'I believe that service to a community is a vital component to a healthy system of governance and think that committees should reflect diverse and representative voices of the various constituencies that comprise the community. While full representation is not always possible, it is the responsibility of those who serve to make sure they are involved with those they represent so they are able to adequately represent their interests.', 
      '2024-03-30 09:34:53'),
 
-    (15, 'Jennifer.Finn@marist.edu', 1, false, 'Jennifer Finn', 'http://www.marist.edu/{school}/faculty/{fn-ln}', 
+    (15, 'Jennifer.Finn@marist.edu', 1, false, 'Jennifer Finn', 'https://www.marist.edu/communication-arts/faculty/jennifer-finn', 
      'For the last 5 years, I''ve served as Department Chair for the Fashion Design and Merchandising Program, where I''ve collaborated with faculty on several curriculum and assessment initiatives, served in an advisory role with faculty and administration members, and positioned myself as a leader & mentor to our part-time faculty members. I''m interested in serving as a member on the Faculty Affairs Committee because I believe the role of faculty shared governance is an extremely important one, and there are opportunities that exist for further defining roles, responsibilities, and development for Term faculty.', 
      '2024-03-30 10:35:16'),
 
-    (16, 'Jeff.Bass@marist.edu', 1, false, 'Jeff Bass', 'http://www.marist.edu/{school}/faculty/{fn-ln}', 
+    (16, 'Jeff.Bass@marist.edu', 1, false, 'Jeff Bass', 'https://foxweb.marist.edu/users/jeff.bass/?_gl=1*1dxoiwp*_gcl_au*MzIwMDc2ODgxLjE3MzM2OTU3MDk.*FPAU*MzIwMDc2ODgxLjE3MzM2OTU3MDk.*_ga*MTg2OTU2MzA1Ny4xNzMzNjk1NzEw*_ga_6WL3ZSKM4H*MTczMzcyMDQxMC4yLjEuMTczMzcyMTU0Mi4wLjAuMzQyMDI5MzM2*_fplc*bnJJMHNDZE1XbVpnSkVpNDdud212aUNjSVQwM01QcXQ5dm9IOTQ0V09GNHIlMkJ2Y0Jrdk5TS3FJMUhmRWtOSjhhSVdwMkhMMVFJRTJVZTE3d1ZjcCUyQno2SWE5NU80b0g2d2VJcTV5N0lHa0ZBSHJDa3VUcWNtZlVXemlzUVdEQSUzRCUzRA..', 
      'Hello colleagues, besides being eligible, I am ready, willing, and able to serve on the Faculty Affairs Committee. I am one of the longest-serving term faculty, and in 2018-19 I chaired a committee that was instrumental in making term faculty eligible for FAC and AAC. In the past year, I have gone through a series of disciplinary measures designed to make me a better employee, teacher, and human being. I feel more capable than ever to represent your interests on the FAC, and I am eager to work with the new group of dynamic administrators managing the faculty and the college. I hope I can count on your vote, I won''t let you down.', 
      '2024-03-30 17:36:56'),
 
-    (17, 'Joseph.Campisi@marist.edu', 3, false, 'Joseph Campisi', 'http://www.marist.edu/{school}/faculty/{fn-ln}', 
+    (17, 'Joseph.Campisi@marist.edu', 3, false, 'Joseph Campisi', 'https://www.marist.edu/liberal-arts/faculty/joseph-campisi', 
      'I have served on a number of committees during my time here at Marist and am currently the co-chair of CSAC and on the Fellowship Committee (which works with Pat Taylor and students applying for things like Fulbrights, etc.). I view service to students, the college, and my faculty colleagues as important, and would gladly serve on any committee if so elected.', 
      '2024-03-31 11:42:26'),
 
-    (18, 'Elizabeth.Reid@marist.edu', 2, false, 'Elizabeth Reid', 'http://www.marist.edu/{school}/faculty/{fn-ln}', 
+    (18, 'Elizabeth.Reid@marist.edu', 2, false, 'Elizabeth Reid', 'https://www.marist.edu/computer-science-math/faculty/elizabeth-reid', 
      'I enjoy working closely with students and faculty in clubs and committees. While serving on committees, I have formed professional relationships and collaborated with people across campus. Some committees I have been a member of include: the Campus Life Committee, the Celebration of Undergraduate Research, Scholarship & Creative Activity (CURSCA) Committee, and a committee charged with planning academic events around the inauguration of President Weinman. During the Middle States review, I served as a member of the Working Group on Standard VII: Governance, Leadership, and Administration for the reaccreditation of Marist College. I am also currently a Hearing Board Member. This year I have taken on the added responsibility of being a Co-Chair of the CURSCA committee. In this position, I work closely with faculty and staff to organize an event that provides a platform for students to showcase their work to the Marist community. Although I will be on sabbatical next Spring, I am looking forward to additional service opportunities in the future.', 
      '2024-03-31 21:26:07'),
 
-    (19, 'Sally.Dwyer-McNulty@marist.edu', 3, false, 'Sally Dwyer-McNulty', 'http://www.marist.edu/{school}/faculty/{fn-ln}', 
+    (19, 'Sally.Dwyer-McNulty@marist.edu', 3, false, 'Sally Dwyer-McNulty', 'https://www.marist.edu/liberal-arts/faculty/sally-dwyer-mcnulty', 
      'I value shared governance and working with faculty, students, staff, and administrators across campus.', 
      '2024-04-01 10:00:28'),
 
-    (20, 'John.Morrison.Galbraith@marist.edu', 6, false, 'John Morrison Galbraith', 'http://www.marist.edu/{school}/faculty/{fn-ln}', 
+    (20, 'John.Morrison.Galbraith@marist.edu', 6, false, 'John Morrison Galbraith', 'https://www.marist.edu/science/faculty/john-galbraith', 
      'I do not have a strong desire to be on committees. I do not think I am particularly good at it, and I feel my time and effort is better spent with teaching and research. However, I do believe in making Marist a better place, and I recognize the importance and value of faculty committees. Therefore, I have always served and will continue to serve, to the best of my ability on whatever committee I am on.', 
      '2024-04-01 10:00:28'),
 
@@ -237,19 +237,19 @@ INSERT INTO Faculty (FID, Email, SchoolID, IsHidden, PrefName, URL, TheStatement
      'I study the role of self-transcendent emotions in human communication and wish to highlight my value in this line of research, as opposed to serving in FAC. I would advocate for thoughtful consideration of other candidates whose dedication to this role is matched by their enthusiasm and capability for it.', 
      '2024-04-03 15:05:33'),
 
-    (31, 'Marina.Melita@marist.edu', 3, FALSE, 'M. Marina Melita', 'http://www.marist.edu/school/faculty/marina-melita', 
+    (31, 'Marina.Melita@marist.edu', 3, FALSE, 'M. Marina Melita', 'https://www.marist.edu/liberal-arts/faculty/maureen-michele-melita', 
 	 'While I am usually happy to serve Marist in any way that I can, I do not think I can do so at this time, and also do a good job. Right now, I teach 8 courses per year, serve on the Global Studies Advising Committee, as well as the Queer Trans Sub-Committee of the Diversity Council. I run the Italian program at Marist and serve as the Chair of the World Film Program. Beyond Marist, I have a book project in the works, and was recently elected as the President of the academic association for Italian studies; The American Association of Teachers of Italian. I fear that adding one more responsibility will hinder my ability to perform my current duties at the level that my students, colleagues, and community members deserve and expect from me. In the future, when I have wrapped up some of my current duties, I would be happy to serve on one of the standing committees for Marist.', 
 	 '2024-04-04 18:30:08'),
 	
-	(32, 'Sasha.Biro@marist.edu', 3, FALSE, 'Sasha Biro', 'http://www.marist.edu/school/faculty/sasha-biro', 
+	(32, 'Sasha.Biro@marist.edu', 3, FALSE, 'Sasha Biro', 'https://www.marist.edu/liberal-arts/faculty/sasha-biro', 
 	 'I am a Lecturer of Philosophy and Coordinator of the Diversity, Equity, Inclusion Workshop in First Year Seminar. I currently serve on the Retention Committee, and the Interfaith Committee. I am also a faculty advisor/editor to the Marist Undergraduate Philosophy Journal.', 
 	 '2024-04-05 12:10:28'),
 	
-	(33, 'Rebecca.Brown@marist.edu', 1, FALSE, 'Rebecca Brown', 'http://www.marist.edu/school/faculty/rebecca-brown', 
+	(33, 'Rebecca.Brown@marist.edu', 1, FALSE, 'Rebecca Brown', 'https://www.marist.edu/communication-arts/faculty/rebecca-brown', 
 	 'As a senior professional lecturer of Fashion Merchandising and the Faculty Advisor of MPorium at Marist (student run live retail laboratory located in Steel Plant) I collaborate often with other schools and departments across campus on special projects. I work closely with advancement on giving campaigns, worked with middle states committee, the Dean of SCA and SOM bringing product ideas to life from concept to execution. I am on the Marist Bookstore committee, along with many fashion program and school committees. I believe in the importance of service and collaborating with others to be a part of the solution and not the problem.', 
 	 '2024-04-06 08:53:37'),
 	
-	(34, 'Robyn.Rosen@marist.edu', 1, FALSE, 'Robyn L. Rosen', 'http://www.marist.edu/school/faculty/robyn-rosen', 
+	(34, 'Robyn.Rosen@marist.edu', 1, FALSE, 'Robyn L. Rosen', 'https://www.marist.edu/liberal-arts/faculty/robyn-rosen', 
 	 'As a senior professional lecturer of Fashion Merchandising and the Faculty Advisor of MPorium at Marist (student run live retail laboratory located in Steel Plant) I collaborate often with other schools and departments across campus on special projects. I work closely with advancement on giving campaigns, worked with middle states committee, the Dean of SCA and SOM bringing product ideas to life from concept to execution. I am on the Marist Bookstore committee, along with many fashion program and school committees. I believe in the importance of service and collaborating with others to be a part of the solution and not the problem.', 
 	 '2024-04-06 19:58:22'),
 	
@@ -257,63 +257,63 @@ INSERT INTO Faculty (FID, Email, SchoolID, IsHidden, PrefName, URL, TheStatement
 	 'While I would be happy to serve on campus-wide committees in the future as I have done in the past, I have just been appointed as the Academic Theatre Program Director and would like to be able to focus on the needs of the program, including restructuring some theatre processes & policies and mentoring a new hire in the program. I fully expect to continue to contribute to campus through numerous ongoing committees, but I would appreciate being passed over for this round of the major committees. And if you’d still like to vote for me, then thanks for the vote of confidence — I have been chair of English so I know that work intimately and work well (and happily) on logistics and editing. I am ultimately a theatre historian & designer at heart — I much prefer working & collaborating behind the scenes, digging into archives, and challenging audiences through art.', 
 	 '2024-04-06 21:42:02'),
 	
-	(36, 'Lisa.Neilson@marist.edu', 3, FALSE, 'Lisa R. Neilson', 'http://www.marist.edu/school/faculty/lisa-neilson', 
+	(36, 'Lisa.Neilson@marist.edu', 3, FALSE, 'Lisa R. Neilson', 'https://www.marist.edu/liberal-arts/faculty/lisa-neilson', 
 	 'I believe that faculty service is very important to the function of the college. It strengthens our institution initiatives and can help foster a healthy and vibrant community. I have recently transitioned into a Lecturer position in the English Department. I am also the new Internship Director in our department with plans to extensively grow the internship program for English majors and minors. I look forward to settling into these positions in the upcoming academic year. Additionally, I am the Director of the Summer Pre-College Creative Writing Program.', 
 	 '2024-04-07 11:07:19'),
 	
-	(37, 'Thomas.Zurhellen@marist.edu', 3, FALSE, 'Tommy Zurhellen', 'http://www.marist.edu/school/faculty/tommy-zurhellen', 
+	(37, 'Thomas.Zurhellen@marist.edu', 3, FALSE, 'Tommy Zurhellen', 'https://www.marist.edu/liberal-arts/faculty/tommy-zurhellen', 
 	 'Nobody does it better!', 
 	 '2024-04-07 13:51:52'),
 	
-	(38, 'Lea.Graham@marist.edu', 3, FALSE, 'Lea Graham', 'http://www.marist.edu/school/faculty/lea-graham', 
+	(38, 'Lea.Graham@marist.edu', 3, FALSE, 'Lea Graham', 'https://www.marist.edu/liberal-arts/faculty/lea-graham', 
 	 'I do not wish to serve on campus-wide committees at this time. I am in the middle of several book projects and am busy supporting the new hires in the English Department and other department/school annual events. Thank you.', 
 	 '2024-04-08 10:03:36'),
 	
-	(39, 'Jamie.Perillo@marist.edu', 1, FALSE, 'Jamie Perillo', 'http://www.marist.edu/school/faculty/jamie-perillo', 
+	(39, 'Jamie.Perillo@marist.edu', 1, FALSE, 'Jamie Perillo', 'https://www.marist.edu/communication-arts/faculty/jamie-perillo', 
 	 'This is my 15th year at Marist. I welcome the opportunity to serve on the FAC and represent the Fashion Program, School of Communication, and the Arts and all faculty. I have served on the following committees: the Fashion Design Curriculum Committee, the SCA Inventory Committee, the Fashion Gallery & Archive Committee, and the Fashion Department Diversity and Inclusion Committee. I have also served on and chaired several search and peer review committees.', 
 	 '2024-04-09 16:23:57'),
 	
-	(40, 'Stephanie.Conover@marist.edu', 1, FALSE, 'Stephanie Conover', 'http://www.marist.edu/school/faculty/stephanie-conover', 
+	(40, 'Stephanie.Conover@marist.edu', 1, FALSE, 'Stephanie Conover', 'https://www.marist.edu/communication-arts/faculty/stephanie-conover', 
 	 'I would be happy to serve on FAC. After six years at Marist, I am interested in more opportunities to serve the broader college community beyond the Fashion Program and SCA. I enjoy collaborating with others across disciplines and think that the faculty governance committees are essential is moving Marist forward as we approach our 100th year.', 
 	 '2024-04-09 17:51:15'),
 
-    (41, 'daria.hanssen@marist.edu', 7, FALSE, 'Daria Hanssen', 'http://www.marist.edu/school/faculty/daria-hanssen', 
+    (41, 'daria.hanssen@marist.edu', 7, FALSE, 'Daria Hanssen', 'https://www.marist.edu/social-behavioral-science/faculty/daria-hanssen', 
 	 'I have been at Marist since 1996, starting as a part-time faculty in the Social Work/Sociology Department. As a tenured faculty member, I am committed to service and supporting the growth and development of students, in all ways.', 
 	 '2024-04-09 17:51:15'),
 	
-	(42, 'kavous.ardalan@marist.edu', 4, FALSE, 'Kavous Ardalan', 'http://www.marist.edu/school/faculty/kavous-ardalan', 
+	(42, 'kavous.ardalan@marist.edu', 4, FALSE, 'Kavous Ardalan', 'https://www.marist.edu/management/faculty/kavous-ardalan', 
 	 'My experience at Marist College has been on the academic side, in the sense that I have felt most comfortable and most productive when I was a member of the rank and tenure committee. At the School of Management, I have felt most comfortable and most productive when I was a member of the peer review committee, a member of faculty search committee, or the departmental chairperson.', 
 	 '2024-04-09 23:54:59'),
 	
-	(43, 'julie.raines@marist.edu', 7, FALSE, 'Julie Raines', 'http://www.marist.edu/school/faculty/julie-raines', 
+	(43, 'julie.raines@marist.edu', 7, FALSE, 'Julie Raines', 'https://www.marist.edu/social-behavioral-science/faculty/julie-raines', 
 	 'I would like to bring potential changes to the grievance process to a faculty plenary and working with current members will be the best way to develop improvements to our system. I started working on this while Chair of FAC with Beth Quinn so we have a good understanding of the areas of concern. Voting for me will give us the opportunity to make meaningful change to this process.', 
 	 '2024-04-10 09:34:17'),
 	
-	(44, 'jennifer.robinette@marist.edu', 6, FALSE, 'Jennifer Robinette', 'http://www.marist.edu/school/faculty/jennifer-robinette', 
+	(44, 'jennifer.robinette@marist.edu', 6, FALSE, 'Jennifer Robinette', 'http://www.marist.edu/science/faculty/jennifer-robinette', 
 	 'I have been Public Speaking Across the Curriculum Coordinator on campus since 2015. I created and coordinate the Power Presenting Workshops for our First-Year Seminars. I teach COM 101-Public Presentation online during the Summer and COM 420-Advanced Public Presentation in the Fall. I am the faculty advisor for North Road Communications (NRC) - our student-run PR firm, which has grown to include 130 students and 25 Teams serving community clients. I handle the NRC one-credit experiential learning course and teach PR classes including COM 418-Campaign Management, COM 371-PR Cases, COM 333-Applied Research & Analytics, and COM 319-Crisis Communication. I also teach COM 211-Intro. to PR online during the Summer and Winter. Every semester, I teach an overload of courses out of necessity.', 
 	 '2024-04-10 12:20:05'),
 	
-	(45, 'jason.trent@marist.edu', 7, FALSE, 'Jason Trent', 'http://www.marist.edu/school/faculty/jason-trent', 
+	(45, 'jason.trent@marist.edu', 7, FALSE, 'Jason Trent', 'https://www.marist.edu/social-behavioral-science/faculty/jason-trent', 
 	 'I just finished serving as the Secretary of the Faculty last semester (and I was on family leave for a portion of this current semester). I am open to serving on this committee.', 
 	 '2024-04-10 12:54:22'),
 	
-	(46, 'thomas.madden@marist.edu', 4, FALSE, 'Thomas M. Madden', 'http://www.marist.edu/school/faculty/thomas-madden', 
+	(46, 'thomas.madden@marist.edu', 4, FALSE, 'Thomas M. Madden', 'https://www.marist.edu/management/faculty/thomas-madden', 
 	 'Not thrilled to serve on grievance as I already serve as a hearing officer in Title IX, Academic Integrity, and Student Conduct panels....but will if elected.', 
 	 '2024-04-10 18:27:04'),
 	
-	(47, 'kuangnen.cheng@marist.edu', 4, FALSE, 'Kuangnen Cheng', 'http://www.marist.edu/school/faculty/kuangnen-cheng', 
+	(47, 'kuangnen.cheng@marist.edu', 4, FALSE, 'Kuangnen Cheng', 'https://www.marist.edu/management/faculty/kuangnen-hans-cheng', 
 	 'I have discovered that when a committee''s tasks and responsibilities do not align with my interests, my contribution tends to be minimal. My engagement is significantly higher in committees that develop recommendations to directly impact on student learning and life at Marist.', 
 	 '2024-04-11 08:59:00'),
 	
-	(48, 'byunghoon.jin@marist.edu', 4, FALSE, 'Byunghoon Jin', 'http://www.marist.edu/school/faculty/byunghoon-jin', 
+	(48, 'byunghoon.jin@marist.edu', 4, FALSE, 'Byunghoon Jin', 'https://www.marist.edu/management/faculty/byunghoon-jin', 
 	 'I will be on sabbatical this fall (2024).', 
 	 '2024-04-11 08:59:00'),
 	
-	(49, 'ryan.kinlaw@marist.edu', 7, FALSE, 'Ryan Kinlaw', 'http://www.marist.edu/school/faculty/ryan-kinlaw', 
+	(49, 'ryan.kinlaw@marist.edu', 7, FALSE, 'Ryan Kinlaw', 'https://www.marist.edu/social-behavioral-science/faculty/c-ryan-kinlaw', 
 	 'Having last year completed 6.5 years as department chair, I am currently willing to serve if elected to any committee. I feel this is an important element of the faculty role.', 
 	 '2024-04-11 17:21:39'),
 	
-	(50, 'yuwei.wang@marist.edu', 4, FALSE, 'Yuwei Wang', 'http://www.marist.edu/school/faculty/yuwei-wang', 
+	(50, 'yuwei.wang@marist.edu', 4, FALSE, 'Yuwei Wang', 'https://www.marist.edu/management/faculty/yuwei-wang', 
 	 'I will be happy to serve on any committee if elected.', 
 	 '2024-04-23 13:01:23');
 
@@ -337,4 +337,4 @@ VALUES (52, 4, FALSE, 'Kai', 'Kai.Cottle1@marist.edu', 'https://my.marist.edu',
 INSERT INTO CommitteeAssignments (FID, CID)
 VALUES 
 (52, 3), -- Assignment to CommitteeID 2
-(52, 11); -- Assignment to CommitteeID 15
\ No newline at end of file
+(52, 11); -- Assignment to CommitteeID 15

From f02789645cfe87704d7584da14a0512cdbbfc7b0 Mon Sep 17 00:00:00 2001
From: Nicolas DiPardo <112446116+siezorsalad@users.noreply.github.com>
Date: Mon, 9 Dec 2024 00:37:13 -0500
Subject: [PATCH 61/63] Updated grammar in ReadmeVM.md

---
 ReadmeVM.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ReadmeVM.md b/ReadmeVM.md
index 0fb2b42..3d7d6a8 100644
--- a/ReadmeVM.md
+++ b/ReadmeVM.md
@@ -66,16 +66,16 @@ To run this platform, your environment must meet the following prerequisites:
 
 ## Setup Instructions
 
-- **CLone repo**: git clone https://github.com/KaiCottle/electionCapping24.git
+- **Clone repo**: git clone https://github.com/KaiCottle/electionCapping24.git
 
 - **Install Dependencies**: Install any required software dependencies using your package manager like npm install or pip install
 - **Configuration**: Set up necessary environment variables or configuration files for example the Marist SSO credentials.
-- **Starting the application**: Use command npm start to start the application
+- **Starting the application**: Use the command npm start to start the application
 
 ## Support
 
 - **If you encounter issues with the VM or SSO contact Marist IT and Services for help**: Email: HelpDesk@marist.edu, Phone: (845) 575-4357
-- For porject related issues, clone the repo using: git clone https://github.com/KaiCottle/electionCapping24.git
+- For project-related issues, clone the repo using: git clone https://github.com/KaiCottle/electionCapping24.git
 
 ## Contributing
 

From 27c5c0b21ddbfa0f6ab5ea4b84930e30f1bf6e07 Mon Sep 17 00:00:00 2001
From: Nicolas DiPardo <112446116+siezorsalad@users.noreply.github.com>
Date: Mon, 9 Dec 2024 01:10:21 -0500
Subject: [PATCH 62/63] Add files via upload

---
 db/ReadmeDB.md | 258 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 258 insertions(+)
 create mode 100644 db/ReadmeDB.md

diff --git a/db/ReadmeDB.md b/db/ReadmeDB.md
new file mode 100644
index 0000000..439dfda
--- /dev/null
+++ b/db/ReadmeDB.md
@@ -0,0 +1,258 @@
+## ELECTION CAPPING 24
+
+# Manual Database Update Guide
+
+**This guide provides steps to manually update faculty information in the database, such as name changes due to marriage or other profile updates.**
+
+---
+
+## Table of Contents
+
+1. [Overview](#overview)
+2. [Database Access](#database-access)
+3. [Backup the Database](#backup-the-database)
+4. [Update Process](#update-process)
+5. [Verification](#verification)
+6. [Additional Notes](#additional-notes)
+7. [Use Case Examples](#use-case-example:-last-name-change)
+   (#use-case-example:-updating-faculty-table)
+
+---
+
+## Overview
+
+Faculty members log in using their Marist school email, which serves as a primary key. While most updates are automated through the platform, manual updates may be required for cases like:
+
+- Last name changes (e.g., due to marriage).
+- Updating department or role information.
+- Correcting typos in profile data.
+
+This guide ensures manual updates are executed safely and accurately.
+
+---
+
+## Database Access
+
+To access the database, you will need the following:
+
+1. **PostgreSQL client** installed on your system.
+2. **Database credentials** provided during project setup:
+   - **Host**: `localhost` or the server IP: `10.11.29.95`
+   - **Port**: `5432` (default for PostgreSQL)
+   - **Database Name**: `election_capping`
+   - **Username**: root@10.11.29.95
+   - **Password**: MaristDev2024!
+
+### Connect to the Database:
+
+Run the following command in your terminal:
+
+```bash
+psql -h 10.11.29.95 -U <username> -d election_capping
+```
+
+---
+
+### Backup the Database
+
+- Before making any changes make sure you create a backup to avoid any accidental data loss: pg_dump -h 10.11.29.103 -U <username> -d election_capping -f backup.sql
+
+### Update Process
+
+**1.Query User Current Info**
+
+- To view the current profile information, use the following SQL query:
+
+```bash
+SELECT * FROM people WHERE email = 'faculty_email@marist.edu';
+```
+
+**2.Update Fields**
+
+- To update, for example, last name do:
+
+```bash
+UPDATE people
+SET lname = 'NewLastName'
+WHERE email = 'faculty_email@marist.edu';
+```
+
+- To update other information (e.g., department or preferred name):
+
+```bash
+UPDATE faculty
+SET prefname = 'NewPreferredName', schoolid = 2
+WHERE fid = (
+    SELECT pid FROM people WHERE email = 'faculty_email@marist.edu'
+);
+```
+
+**3.Commit Changes**
+
+- PostgreSQL automatically commits changes, but if using a transaction block, use:
+
+```bash
+COMMIT;
+```
+
+---
+
+### Verification
+
+- After updating, verify the changes by re-querying the database:
+
+```bash
+SELECT * FROM people WHERE email = 'faculty_email@marist.edu';
+```
+
+- Check if the updated information appears correctly. Ensure there are no discrepancies in dependent tables
+
+---
+
+### Additional notes
+
+- **Consistency**: Ensure updates are consistent across all related tables, such as people, faculty, and committeeassignments.
+- **Primary Key (Email)**: Since the email is a primary key, it must not change. If it needs to be updated, contact Marist IT for assistance.
+- **Audit Log**: Keep a record of changes made for auditing purposes. Example:
+
+```bash
+echo "Updated lname for faculty_email@marist.edu to NewLastName on $(date)" >> change_log.txt
+```
+
+- **Testing Environment**: Test updates in a staging environment before applying them to production.
+
+---
+
+### Use Case Example: Last Name Change
+
+- If a faculty member get married or wants their name changed here are some steps to follow:
+
+**Step 1**: Query the current information
+
+```bash
+SELECT * FROM people WHERE email = 'jane.doe@marist.edu';
+```
+
+**Step 2**: Update the last name
+
+```bash
+UPDATE people
+SET lname = 'Smith'
+WHERE email = 'jane.doe@marist.edu';
+```
+
+**Step 3**: Update the email
+
+```bash
+UPDATE people
+SET lname = 'Smith'
+WHERE email = 'jane.doe@marist.edu';
+```
+
+**Step 4**: Verify Update
+
+- Re-query the database to ensure the changes were successful:
+
+```bash
+SELECT * FROM people WHERE email = 'jane.smith@marist.edu';
+```
+
+### Use Case Example: Updating faculty table (using FID)
+
+This guide outlines the steps to update records in the database for the `people` and `faculty` tables.
+
+- Use the **`PID`** to update records in the `people` table.
+- Use the **`FID`** to update records in the `faculty` table.
+
+---
+
+## Updating the `people` Table (Using `PID`)
+
+### Steps to Update Information
+
+1. **Query the Current Record**  
+   To confirm the data for a specific `PID`:
+   ```sql
+   SELECT * FROM people WHERE pid = 101;
+   ```
+2. **Update the record**
+   Use the UPDATE statement with the WHERE pid = ... clause.
+
+- **Example: Changing Last Name**
+  Suppose John Doe's last name changes to Smith due to marriage:
+  ```sql
+  UPDATE people
+  SET lname = 'Smith'
+  WHERE pid = 101;
+  ```
+
+3. **Verify Changes**
+   Run the query again to confirm the update:
+
+```sql
+SELECT * FROM people WHERE pid = 101;
+```
+
+**Example Output:**
+
+```sql
+pid | fname  | lname  | email
+----+--------+--------+-------------------
+ 101 | John   | Smith  | john.smith@marist.edu
+```
+
+---
+
+## Updating the `faculty` Table (Using `FID`)
+
+### Steps to Update Information
+
+1. **Query the Current Record**  
+   To confirm the data for a specific `FID`:
+   ```sql
+   SELECT * FROM faculty WHERE fid = 201;
+   ```
+
+- **Example Output:**
+
+```sql
+fid  | department       | role
+-----+------------------+-----------
+ 201 | Computer Science | Chair
+```
+
+2. **Update the Record**
+   Use the UPDATE statement with the WHERE fid = ... clause.
+
+- **Example: Changing Department**
+  If the faculty member's department changes:
+
+```sql
+UPDATE faculty
+SET department = 'Mathematics'
+WHERE fid = 201;
+```
+
+- **Example: Changing Role**
+  If the faculty member steps down as Chair:
+
+```sql
+UPDATE faculty
+SET role = 'Professor'
+WHERE fid = 201;
+```
+
+3. **Verify Changes**
+   Run the query again to confirm the update:
+
+```sql
+SELECT * FROM faculty WHERE fid = 201;
+```
+
+**Example Output**
+
+```sql
+fid  | department   | role
+-----+--------------+-----------
+ 201 | Mathematics  | Professor
+```

From 613639b5ff073e7e6b03db8902cd5494ec183877 Mon Sep 17 00:00:00 2001
From: Brendon Kupsch <BrendonKupsch1@marist.edu>
Date: Mon, 9 Dec 2024 01:23:49 -0500
Subject: [PATCH 63/63] Changes to UserProfile

---
 src/UserProfile.css |  41 +++++++-
 src/UserProfile.tsx | 238 +++++++++++++++++++++++++-------------------
 2 files changed, 175 insertions(+), 104 deletions(-)

diff --git a/src/UserProfile.css b/src/UserProfile.css
index 6495d5c..f228f12 100644
--- a/src/UserProfile.css
+++ b/src/UserProfile.css
@@ -89,6 +89,7 @@ select, /* Added select to match the styling */
     background-color: white;
 }
 
+
 .css-1pahdxg-control {
     border-color: #b21e2d !important;
     box-shadow: none !important;
@@ -114,13 +115,17 @@ select, /* Added select to match the styling */
 .save-button {
     background-color: #b21e2d;
     border: 2px solid #fe6978;
-    border-radius: 10px;
     cursor: pointer;
     display: flex;
     justify-content: flex-end;
     margin: auto;
     transition-duration: 0.4s;
     color: white;
+    padding: 10px;
+    font-size: large;
+    border-radius: 15px;
+    margin-top: 30px;
+    margin-bottom: -10px;
 }
 
 .save-button:hover {
@@ -227,6 +232,14 @@ select, /* Added select to match the styling */
     margin-top: 10px;
   }
 
+  .service-statement {
+  word-wrap: break-word; /* Break long words onto the next line */
+  word-break: break-word; /* Ensure any overly long word breaks */
+  white-space: pre-wrap; /* Keep line breaks and spacing while wrapping text */
+  max-width: 100%; /* Make sure it fits within the container */
+  }
+
+
   .editing-header {
     position: relative;
     margin-bottom: 20px; /* Adds space between the header and the form content */
@@ -250,6 +263,30 @@ select, /* Added select to match the styling */
     color: #831b25;
 }
 
+.go-back-button:hover .tooltip {
+    visibility: visible;
+    opacity: 1;
+  }
+  
+  .tooltip {
+    visibility: hidden;
+    opacity: 0;
+    background-color: rgba(0, 0, 0, 0.7);
+    color: #fff;
+    text-align: center;
+    border-radius: 5px;
+    padding: 5px;
+    position: absolute;
+    top: -40px;
+    left: 50%;
+    transform: translateX(-50%);
+    z-index: 10;
+    transition: opacity 0.3s ease;
+    font-size: 12px;
+    white-space: nowrap;
+    box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
+  }
+
 .back-arrow {
     width: 18px;
     height: 18px;
@@ -264,4 +301,4 @@ select, /* Added select to match the styling */
     background-color:#000;
     opacity:0.5;
     border-radius:30px;
-}
\ No newline at end of file
+}
diff --git a/src/UserProfile.tsx b/src/UserProfile.tsx
index 7d73018..3bad619 100644
--- a/src/UserProfile.tsx
+++ b/src/UserProfile.tsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import './UserProfile.css';
 import Navbar from './components/navbar/Navbar';
 import saveIcon from './assets/save-icon.png';
-import arrowIcon from './assets/arrow-icon.png'
+import arrowIcon from './assets/arrow-icon.png';
 import CreatableSelect from 'react-select/creatable';
 import Select from 'react-select';
 import Footer from './components/footer/footer';
@@ -21,6 +21,16 @@ const UserProfile: React.FC = () => {
   const [email, setEmail] = useState('');
   const [error, setError] = useState('');
 
+  // State to keep track of the original values
+  const [originalState, setOriginalState] = useState({
+    firstName: '',
+    lastName: '',
+    preferredName: '',
+    school: '',
+    committees: [] as string[],
+    serviceStatement: '',
+  });
+
   useEffect(() => {
     const fetchCommitteeNames = async () => {
       try {
@@ -78,7 +88,7 @@ const UserProfile: React.FC = () => {
           throw new Error(`Error fetching user data: ${response.statusText}`);
         }
         const data = await response.json();
-    
+
         if (data.found) {
           setFirstName(data.firstName);
           setLastName(data.lastName);
@@ -86,10 +96,20 @@ const UserProfile: React.FC = () => {
           setSchool(data.school);
           setCommittees(data.committees);
           setServiceStatement(data.serviceStatement);
-          setProfileExists(true); // Profile exists
+          setProfileExists(true);
           setError('');
+
+          // Save original values
+          setOriginalState({
+            firstName: data.firstName,
+            lastName: data.lastName,
+            preferredName: data.preferredName,
+            school: data.school,
+            committees: data.committees,
+            serviceStatement: data.serviceStatement,
+          });
         } else {
-          setProfileExists(false); // Profile does not exist
+          setProfileExists(false);
           setError('Profile not found. Click "Edit Profile" to create a new profile.');
         }
       } catch (err) {
@@ -108,7 +128,6 @@ const UserProfile: React.FC = () => {
   };
 
   const handleSave = async () => {
-    // Prepare the data to be sent
     const payload = {
       firstName,
       lastName,
@@ -117,26 +136,33 @@ const UserProfile: React.FC = () => {
       committees,
       serviceStatement,
     };
-  
-    // Decide the endpoint and method based on profile existence
+
     const endpoint = profileExists ? '/edit-faculty' : '/create-faculty';
     const method = profileExists ? 'PUT' : 'POST';
-  
+
     try {
       const response = await fetch(endpoint, {
-        method: method,
+        method,
         headers: {
           'Content-Type': 'application/json',
         },
         body: JSON.stringify(payload),
       });
-  
+
       if (response.ok) {
-        // Handle success
-        setProfileExists(true); // Profile now exists
-        setIsEditing(false); // Exit edit mode
+        setProfileExists(true);
+        setIsEditing(false);
+
+        // Update original state with the saved values
+        setOriginalState({
+          firstName,
+          lastName,
+          preferredName,
+          school,
+          committees,
+          serviceStatement,
+        });
       } else {
-        // Handle errors
         const errorData = await response.json();
         setError(errorData.message || 'An error occurred. Please try again.');
       }
@@ -146,6 +172,18 @@ const UserProfile: React.FC = () => {
     }
   };
 
+  const handleGoBack = () => {
+    // Discard changes by resetting to the original state
+    setFirstName(originalState.firstName);
+    setLastName(originalState.lastName);
+    setPreferredName(originalState.preferredName);
+    setSchool(originalState.school);
+    setCommittees(originalState.committees);
+    setServiceStatement(originalState.serviceStatement);
+
+    setIsEditing(false);
+  };
+
   const dropdownStyle = {
     control: (base: any, state: any) => ({
       ...base,
@@ -164,100 +202,96 @@ const UserProfile: React.FC = () => {
   };
 
   return (
-    <div className='container'>
+    <div className="container">
       <Navbar />
-      <h1 className='title'>Your Election Profile</h1>
+      <h1 className="title">Your Election Profile</h1>
       <div className="profile-form-container">
         {isEditing ? (
-          // Edit State
           <div className="editing-header">
-          <button
-            type="button"
-            className="go-back-button"
-            onClick={() => setIsEditing(false)}
-          >
-            <img src={arrowIcon} alt="Back arrow" className="back-arrow" />
-            <strong>Go Back</strong>
-          </button>
-          <form className="profile-form">
-            <div className="form-group">
-              <label>Enter your first name: </label>
-              <input
-                type="text"
-                id='inputBox'
-                value={firstName}
-                onChange={(e) => setFirstName(e.target.value)}
-                placeholder="Your First Name Here"
-              />
-            </div>
-            <div className='form-group'>
-              <label>Enter your last name: </label>
-              <input
-                type="text"
-                id='inputBox'
-                value={lastName}
-                onChange={(e) => setLastName(e.target.value)}
-                placeholder="Your Last Name Here"
-              />
-            </div>
-            <div className="form-group">
-              <label>Enter your preferred name (how it will appear on the ballot)</label>
-              <input
-                type="text"
-                id='inputBox'
-                value={preferredName}
-                onChange={(e) => setPreferredName(e.target.value)}
-                placeholder="Your Preferred Name Here"
-              />
-            </div>
-            <div className="form-group">
-              <label>Select your School from the dropdown menu</label>
-              <Select
-                options={schoolOptions}
-                value={schoolOptions.find(option => option.value === school)}
-                onChange={(selectedOption) => setSchool(selectedOption?.value || '')}
-                placeholder="Select School"
-                styles={dropdownStyle}
-              />
-            </div>
-            <div className="form-group">
-              <label>Select the committees you have been a part of (can select multiple, replaces old selection)</label>
-              <CreatableSelect
-                className='select-input'
-                isMulti
-                options={committeeOptions}
-                onChange={handleCommitteeChange}
-                placeholder="Select or input committees"
-                styles={dropdownStyle}
-              />
-            </div>
-            <div className="form-group">
-              <label>Create a Service Statement (Why someone should vote for you)</label>
-              <textarea
-                value={serviceStatement}
-                id='inputBox'
-                onChange={(e) => setServiceStatement(e.target.value)}
-                placeholder="Enter your statement here"
-                maxLength={300}
-              />
-              <small>{serviceStatement.length}/300</small>
-            </div>
-            <div className="form-group">
-            <button type="button" className="save-button" onClick={handleSave}>
-              {profileExists ? 'Save Changes' : 'Create Profile'}
+            <button type="button" className="go-back-button" onClick={handleGoBack}>
+              <img src={arrowIcon} alt="Back arrow" className="back-arrow" />
+              <strong>Go Back</strong>
+              <span className='tooltip'>Going back will remove all unsaved changes</span>
             </button>
-            </div>
-          </form>
-        </div>
+            <form className="profile-form">
+              <div className="form-group">
+                <label>Enter your first name: </label>
+                <input
+                  type="text"
+                  id="inputBox"
+                  value={firstName}
+                  onChange={(e) => setFirstName(e.target.value)}
+                  placeholder="Your First Name Here"
+                />
+              </div>
+              <div className="form-group">
+                <label>Enter your last name: </label>
+                <input
+                  type="text"
+                  id="inputBox"
+                  value={lastName}
+                  onChange={(e) => setLastName(e.target.value)}
+                  placeholder="Your Last Name Here"
+                />
+              </div>
+              <div className="form-group">
+                <label>Enter your preferred name (how it will appear on the ballot):</label>
+                <input
+                  type="text"
+                  id="inputBox"
+                  value={preferredName}
+                  onChange={(e) => setPreferredName(e.target.value)}
+                  placeholder="Your Preferred Name Here"
+                />
+              </div>
+              <div className="form-group">
+                <label>Select your School from the dropdown menu:</label>
+                <Select
+                  options={schoolOptions}
+                  value={schoolOptions.find((option) => option.value === school)}
+                  onChange={(selectedOption) => setSchool(selectedOption?.value || '')}
+                  placeholder="Select School"
+                  styles={dropdownStyle}
+                />
+              </div>
+              <div className="form-group">
+                <label>Select the committees you have been a part of (can select multiple, replaces old selection):</label>
+                <CreatableSelect
+                  className="select-input"
+                  isMulti
+                  options={committeeOptions}
+                  value={committeeOptions.filter((option) => committees.includes(option.value))} // Bind value to the current state
+                  onChange={handleCommitteeChange}
+                  placeholder="Select or input committees"
+                  styles={dropdownStyle}
+                />
+              </div>
+              <div className="form-group">
+                <label>Create a Service Statement (Why someone should vote for you):</label>
+                <textarea
+                  value={serviceStatement}
+                  id="inputBox"
+                  onChange={(e) => setServiceStatement(e.target.value)}
+                  placeholder="Enter your statement here"
+                  maxLength={300}
+                />
+                <small>{serviceStatement.length}/300</small>
+              </div>
+              <div className="form-group">
+                <button type="button" className="save-button" onClick={handleSave}>
+                  {profileExists ? 'Save Changes' : 'Create Profile'}
+                </button>
+              </div>
+            </form>
+          </div>
         ) : (
-          // View State
           <div className="profile-view">
-            <p><strong>First Name:</strong> {firstName || 'Not Provided'}</p>
-            <p><strong>Last Name:</strong>{lastName || 'Not Provided'}</p>
-            <p><strong>Preferred Name:</strong> {preferredName || 'Not provided'}</p>
-            <p><strong>School:</strong> {school || 'Not selected'}</p>
-            <p><strong>Committees:</strong> {committees.length > 0 ? committees.join(', ') : 'None selected'}</p>      
-            <p><strong>Service Statement:</strong> {serviceStatement || 'Not provided'}</p>
+            <p><strong>First Name:</strong> {firstName || 'None Found'}</p>
+            <p><strong>Last Name:</strong> {lastName || 'None Found'}</p>
+            <p><strong>Preferred Name:</strong> {preferredName || 'None Found'}</p>
+            <p><strong>School:</strong> {school || 'None Found'}</p>
+            <p><strong>Committees:</strong> {committees.length > 0 ? committees.join(', ') : 'None Found'}</p>
+            <p className="service-statement"><strong>Service Statement:</strong> {serviceStatement || 'None Found'}</p>
             <button type="button" className="edit-button" onClick={() => setIsEditing(true)}>
               Edit Profile
             </button>
@@ -268,4 +302,4 @@ const UserProfile: React.FC = () => {
   );
 };
 
-export default UserProfile;
\ No newline at end of file
+export default UserProfile;