From f63385dc70006e8ba59a1538e3e7ef46d0ba6157 Mon Sep 17 00:00:00 2001
From: leishaaf <152096600+leishaaf@users.noreply.github.com>
Date: Tue, 1 Jul 2025 18:40:42 -1000
Subject: [PATCH 1/5] adding

---
 api/main_endpoints/routes/Advertisement.js    |  4 ++
 src/Pages/Advertisement/AdvertisementAdmin.js | 52 ++++---------------
 2 files changed, 14 insertions(+), 42 deletions(-)

diff --git a/api/main_endpoints/routes/Advertisement.js b/api/main_endpoints/routes/Advertisement.js
index 93a199e4a..55108bd0b 100644
--- a/api/main_endpoints/routes/Advertisement.js
+++ b/api/main_endpoints/routes/Advertisement.js
@@ -20,6 +20,7 @@ router.get('/', async (req, res) => {
     });
 });
 
+
 router.get('/getAllAdvertisements', async (req, res) => {
   if (!checkIfTokenSent(req)) {
     return res.sendStatus(FORBIDDEN);
@@ -43,6 +44,7 @@ router.post('/createAdvertisement', async (req, res) => {
     message: req.body.message,
     expireDate: req.body.expireDate
   });
+      console.log("expire date " + expireDate);
 
   Advertisement.create(newAd)
     .then((post) => {
@@ -59,6 +61,8 @@ router.post('/deleteAdvertisement', async (req, res) => {
   } else if (!await decodeToken(req)) {
     return res.sendStatus(UNAUTHORIZED);
   }
+  console.log("expire date in delete " + expireDate);
+
   Advertisement.deleteOne({ _id: req.body._id })
     .then(result => {
       if (result.n < 1) {
diff --git a/src/Pages/Advertisement/AdvertisementAdmin.js b/src/Pages/Advertisement/AdvertisementAdmin.js
index 854c5b4d8..f0343535b 100644
--- a/src/Pages/Advertisement/AdvertisementAdmin.js
+++ b/src/Pages/Advertisement/AdvertisementAdmin.js
@@ -8,9 +8,7 @@ export default function AdvertisementAdmin() {
 
   const [ads, setAds] = useState([]);
   const [message, setMessage] = useState('');
-  const [year, setYear] = useState();
-  const [month, setMonth] = useState();
-  const [day, setDay] = useState();
+  const [expireDate, setExpireDate] = useState();
 
   async function getAdsFromDB() {
     const adsFromDB = await getAds(user.token);
@@ -20,20 +18,8 @@ export default function AdvertisementAdmin() {
   }
 
   async function createAdHandler() {
-    // make sure empty inputs are properly set as undefined if empty
-    if (year === '') {
-      setYear(undefined);
-    }
-    if (month === '') {
-      setMonth(undefined);
-    }
-    if (day === '') {
-      setDay(undefined);
-    }
-
-    let expireDate = new Date(year, month - 1, day);
-    if (isNaN(expireDate.getTime())) {
-      expireDate = undefined;
+    if(expireDate === null){
+      setExpireDate(undefined);
     }
 
     await createAd({
@@ -48,6 +34,7 @@ export default function AdvertisementAdmin() {
     const adsFromDB = await getAds(user.token);
     if (!adsFromDB.error) {
       const currentDate = new Date();
+      
       const expiredAds = adsFromDB.responseData.filter(ad => {
         if (ad.expireDate === undefined) return false;
         return new Date(ad.expireDate) < currentDate;
@@ -62,10 +49,7 @@ export default function AdvertisementAdmin() {
   useEffect(() => {
     getAdsFromDB();
 
-    const intervalId = setInterval(async () => {
-      await deleteExpiredAds();
-      await getAdsFromDB();
-    }, 20);
+
 
   }, []);
 
@@ -102,28 +86,12 @@ export default function AdvertisementAdmin() {
         </div>
         <div className="flex items-center space-x-4 mb-6">
           <input
-            className="flex-1 text-sm input input-bordered sm:text-base"
-            type="text"
-            placeholder="Year"
-            onChange={event => {
-              setYear(event.target.value);
-            }}
-          />
-          <input
-            className="flex-1 text-sm input input-bordered sm:text-base"
-            type="text"
-            placeholder="Month"
-            onChange={event => {
-              setMonth(event.target.value);
-            }}
-          />
-          <input
-            className="flex-1 text-sm input input-bordered sm:text-base"
-            type="text"
-            placeholder="Day"
-            onChange={event => {
-              setDay(event.target.value);
+            className='flex-1 text-sm input input-bordered sm:text-base'
+            type='datetime-local'
+            onChange={ event => {
+              setExpireDate(event.target.value);
             }}
+            // value={expireDate}
           />
           <button
             className="text-sm btn btn-primary sm:text-base"

From d81d382314f345d496410a5cc12b0b331fb818cb Mon Sep 17 00:00:00 2001
From: leishaaf <152096600+leishaaf@users.noreply.github.com>
Date: Thu, 3 Jul 2025 19:35:52 -1000
Subject: [PATCH 2/5] for help

---
 src/Pages/Advertisement/AdvertisementAdmin.js | 57 +++++++++++++------
 1 file changed, 40 insertions(+), 17 deletions(-)

diff --git a/src/Pages/Advertisement/AdvertisementAdmin.js b/src/Pages/Advertisement/AdvertisementAdmin.js
index f0343535b..09cb4f783 100644
--- a/src/Pages/Advertisement/AdvertisementAdmin.js
+++ b/src/Pages/Advertisement/AdvertisementAdmin.js
@@ -3,9 +3,15 @@ import { createAd, getAds, deleteAd } from '../../APIFunctions/Advertisement.js'
 import { useState, useEffect } from 'react';
 import { useUser } from '../../Components/context/UserContext';
 
+   // createAd returns a value - what is it?
+    // how do we know if createAd() works or not?
+    // is there a field we can check?^
+    
+    // if createAd worked, how can we update the array without calling the backend again?
+    
 export default function AdvertisementAdmin() {
   const { user } = useUser();
-
+  const [errorMesssage, setErrorMessage] = useState('');
   const [ads, setAds] = useState([]);
   const [message, setMessage] = useState('');
   const [expireDate, setExpireDate] = useState();
@@ -21,36 +27,52 @@ export default function AdvertisementAdmin() {
     if(expireDate === null){
       setExpireDate(undefined);
     }
-
+    // expireDate is a string so we need to turn into date object
+  
+    if(isExpired(expireDate)){
+      setErrorMessage("Date is in the past or the present, unable to create ad!!!");
+      return;
+    }else{
+      setErrorMessage("");
+    }
     await createAd({
       message,
       expireDate,
     }, user.token);
 
     await getAdsFromDB();
+    
   }
 
-  async function deleteExpiredAds() {
-    const adsFromDB = await getAds(user.token);
-    if (!adsFromDB.error) {
-      const currentDate = new Date();
-      
-      const expiredAds = adsFromDB.responseData.filter(ad => {
-        if (ad.expireDate === undefined) return false;
-        return new Date(ad.expireDate) < currentDate;
-      });
+  function isExpired(expireDate){
+    const currDate = new Date();
+    console.log("current date" + currDate);
+    const expireDateObject = new Date(expireDate);
+    return expireDateObject < currDate;
+  }
 
-      for (const ad of expiredAds) {
-        await deleteAd(ad, user.token);
-      }
+  async function deleteExpiredAds(){ // called every 10 secs
+    console.log("calling expired");
+    const expiredAds = ads.filter(ad => {
+      console.log("made it here");
+      console.log("is " + ad.expireDate + " expired ?? " + (isExpired(ad.expireDate)));
+      return (isExpired(ad.expireDate));
+    })
+    for (const ad of expiredAds) { // delete the expired ads?help doesn't work
+      await deleteAd(ad, user.token); // chat told me use await
     }
+    await getAdsFromDB();  // bruh
   }
 
   useEffect(() => {
     getAdsFromDB();
+    deleteExpiredAds();
 
-
-
+    // help from web examples for interval https://devtrium.com/posts/set-interval-react
+    const interval = setInterval(() => {
+      deleteExpiredAds();
+    },10000); // check for expired ads every minute
+    return () => clearInterval(interval);
   }, []);
 
   return (
@@ -58,6 +80,7 @@ export default function AdvertisementAdmin() {
       <h1 className="text-4xl font-extrabold leading-none tracking-tight text-gray-900 md:text-5xl lg:text-6xl dark:text-white">
         Welcome to the Advertisement Admin Page!!
       </h1>
+      <h2 style={{fontWeight: 'bold', color: 'red'}} >{errorMesssage}</h2>
       <div className="relative overflow-x-auto">
         <div className='py-6'>
           <label className="w-full form-control">
@@ -109,7 +132,7 @@ export default function AdvertisementAdmin() {
                 Advertisement Message
               </th>
               <th scope="col" className="px-6 py-3">
-                Expiriation Date
+                Expiration Date
               </th>
               <th scope="col" className="px-6 py-3">
                 Delete

From 5419e6b2cda09a5f5ba0f47125294dc3a30038f0 Mon Sep 17 00:00:00 2001
From: leishaaf <152096600+leishaaf@users.noreply.github.com>
Date: Fri, 4 Jul 2025 13:19:51 -1000
Subject: [PATCH 3/5] for help

---
 api/main_endpoints/models/Advertisement.js    |  5 +++++
 api/main_endpoints/routes/Advertisement.js    | 11 ++++++++--
 src/APIFunctions/Advertisement.js             |  9 ++++----
 src/Pages/Advertisement/AdvertisementAdmin.js | 22 +------------------
 4 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/api/main_endpoints/models/Advertisement.js b/api/main_endpoints/models/Advertisement.js
index b35e047f6..509e58ed3 100644
--- a/api/main_endpoints/models/Advertisement.js
+++ b/api/main_endpoints/models/Advertisement.js
@@ -10,6 +10,11 @@ const AdvertisementSchema = new Schema(
     },
     expireDate: {
       type: Date,
+    },
+    expireAt: {
+      type: Date,
+      default: undefined,
+      index: {expireAfterSeconds: 0}, // TTL only kicks in when expireAt is set 
     }
   },
   { collection: 'Advertisements' }
diff --git a/api/main_endpoints/routes/Advertisement.js b/api/main_endpoints/routes/Advertisement.js
index 55108bd0b..1f54d3cd7 100644
--- a/api/main_endpoints/routes/Advertisement.js
+++ b/api/main_endpoints/routes/Advertisement.js
@@ -40,11 +40,18 @@ router.post('/createAdvertisement', async (req, res) => {
   } else if (!await decodeToken(req)) {
     return res.sendStatus(UNAUTHORIZED);
   }
+  const now = new Date();
+  const expireInOneMinute = new Date(now.getTime() + 60 * 1000);
+
   const newAd = new Advertisement({
     message: req.body.message,
-    expireDate: req.body.expireDate
+    expireDate: expireInOneMinute, // testing and it doesn't work
+    expireAt: expireInOneMinute
+    // message: req.body.message,
+    // expireDate: req.body.expireDate,
+    // expireAt: req.body.expireDate
+
   });
-      console.log("expire date " + expireDate);
 
   Advertisement.create(newAd)
     .then((post) => {
diff --git a/src/APIFunctions/Advertisement.js b/src/APIFunctions/Advertisement.js
index e539be9e5..414878b89 100644
--- a/src/APIFunctions/Advertisement.js
+++ b/src/APIFunctions/Advertisement.js
@@ -5,7 +5,7 @@ import { BASE_API_URL } from '../Enums';
 export async function getAd() {
   let status = new ApiResponse();
   try {
-    const res = await fetch (BASE_API_URL + '/api/Advertisement/');
+    const res = await fetch (BASE_API_URL + 'api/Advertisement/');
     if (res.ok) {
       const result = await res.json();
       status.responseData = result;
@@ -22,7 +22,7 @@ export async function getAd() {
 export async function getAds(token) {
   let status = new ApiResponse();
   try {
-    const res = await fetch(BASE_API_URL + '/api/Advertisement/getAllAdvertisements',
+    const res = await fetch(BASE_API_URL + 'api/Advertisement/getAllAdvertisements',
       {
         method: 'GET',
         headers: {
@@ -45,7 +45,7 @@ export async function getAds(token) {
 export async function createAd(newAd, token) {
   let status = new ApiResponse();
   try {
-    const res = await fetch(BASE_API_URL + '/api/Advertisement/createAdvertisement',
+    const res = await fetch(BASE_API_URL + 'api/Advertisement/createAdvertisement',
       {
         method: 'POST',
         headers: {
@@ -66,13 +66,14 @@ export async function createAd(newAd, token) {
     status.responseData = err;
     status.error = true;
   }
+  console.log("STATUS " + JSON.stringify(status.responseData));
   return status;
 }
 
 export async function deleteAd(newAd, token) {
   let status = new ApiResponse();
   try {
-    const res = await fetch(BASE_API_URL + '/api/Advertisement/deleteAdvertisement',
+    const res = await fetch(BASE_API_URL + 'api/Advertisement/deleteAdvertisement',
       {
         method: 'POST',
         headers: {
diff --git a/src/Pages/Advertisement/AdvertisementAdmin.js b/src/Pages/Advertisement/AdvertisementAdmin.js
index 09cb4f783..4f5f54c49 100644
--- a/src/Pages/Advertisement/AdvertisementAdmin.js
+++ b/src/Pages/Advertisement/AdvertisementAdmin.js
@@ -50,29 +50,9 @@ export default function AdvertisementAdmin() {
     const expireDateObject = new Date(expireDate);
     return expireDateObject < currDate;
   }
-
-  async function deleteExpiredAds(){ // called every 10 secs
-    console.log("calling expired");
-    const expiredAds = ads.filter(ad => {
-      console.log("made it here");
-      console.log("is " + ad.expireDate + " expired ?? " + (isExpired(ad.expireDate)));
-      return (isExpired(ad.expireDate));
-    })
-    for (const ad of expiredAds) { // delete the expired ads?help doesn't work
-      await deleteAd(ad, user.token); // chat told me use await
-    }
-    await getAdsFromDB();  // bruh
-  }
-
+  
   useEffect(() => {
     getAdsFromDB();
-    deleteExpiredAds();
-
-    // help from web examples for interval https://devtrium.com/posts/set-interval-react
-    const interval = setInterval(() => {
-      deleteExpiredAds();
-    },10000); // check for expired ads every minute
-    return () => clearInterval(interval);
   }, []);
 
   return (

From 6b670bec5077ad17c6230c60b2640f40abc0c9ed Mon Sep 17 00:00:00 2001
From: leishaaf <152096600+leishaaf@users.noreply.github.com>
Date: Mon, 7 Jul 2025 14:44:59 -1000
Subject: [PATCH 4/5] more help

---
 api/main_endpoints/routes/Advertisement.js    | 15 ++++++++-------
 src/Pages/Advertisement/AdvertisementAdmin.js |  3 +--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/api/main_endpoints/routes/Advertisement.js b/api/main_endpoints/routes/Advertisement.js
index 1f54d3cd7..9caec2857 100644
--- a/api/main_endpoints/routes/Advertisement.js
+++ b/api/main_endpoints/routes/Advertisement.js
@@ -41,15 +41,16 @@ router.post('/createAdvertisement', async (req, res) => {
     return res.sendStatus(UNAUTHORIZED);
   }
   const now = new Date();
-  const expireInOneMinute = new Date(now.getTime() + 60 * 1000);
+  // const expireInOneMinute = new Date(now.getTime() + 60 * 1000);
+  console.log("expire date in delete " + expireDate);
 
   const newAd = new Advertisement({
-    message: req.body.message,
-    expireDate: expireInOneMinute, // testing and it doesn't work
-    expireAt: expireInOneMinute
     // message: req.body.message,
-    // expireDate: req.body.expireDate,
-    // expireAt: req.body.expireDate
+    // expireDate: expireInOneMinute, // testing and it doesn't work
+    // expireAt: expireInOneMinute
+    message: req.body.message,
+    expireDate: req.body.expireDate,
+    expireAt: req.body.expireDate
 
   });
 
@@ -72,7 +73,7 @@ router.post('/deleteAdvertisement', async (req, res) => {
 
   Advertisement.deleteOne({ _id: req.body._id })
     .then(result => {
-      if (result.n < 1) {
+      if (result.deletedCount < 1) { // used to be result.n
         res.sendStatus(NOT_FOUND);
       } else {
         res.sendStatus(OK);
diff --git a/src/Pages/Advertisement/AdvertisementAdmin.js b/src/Pages/Advertisement/AdvertisementAdmin.js
index 4f5f54c49..ea4461e85 100644
--- a/src/Pages/Advertisement/AdvertisementAdmin.js
+++ b/src/Pages/Advertisement/AdvertisementAdmin.js
@@ -50,7 +50,7 @@ export default function AdvertisementAdmin() {
     const expireDateObject = new Date(expireDate);
     return expireDateObject < currDate;
   }
-  
+
   useEffect(() => {
     getAdsFromDB();
   }, []);
@@ -94,7 +94,6 @@ export default function AdvertisementAdmin() {
             onChange={ event => {
               setExpireDate(event.target.value);
             }}
-            // value={expireDate}
           />
           <button
             className="text-sm btn btn-primary sm:text-base"

From 58f15fff0801f58bfe4822706c3b8a9d68cfbf62 Mon Sep 17 00:00:00 2001
From: leishaaf <152096600+leishaaf@users.noreply.github.com>
Date: Mon, 7 Jul 2025 17:29:33 -1000
Subject: [PATCH 5/5] works

---
 api/main_endpoints/routes/Advertisement.js | 4 +---
 src/APIFunctions/Advertisement.js          | 8 ++++----
 src/Enums.js                               | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/api/main_endpoints/routes/Advertisement.js b/api/main_endpoints/routes/Advertisement.js
index 9caec2857..2fe2ee023 100644
--- a/api/main_endpoints/routes/Advertisement.js
+++ b/api/main_endpoints/routes/Advertisement.js
@@ -42,16 +42,14 @@ router.post('/createAdvertisement', async (req, res) => {
   }
   const now = new Date();
   // const expireInOneMinute = new Date(now.getTime() + 60 * 1000);
-  console.log("expire date in delete " + expireDate);
 
   const newAd = new Advertisement({
     // message: req.body.message,
     // expireDate: expireInOneMinute, // testing and it doesn't work
-    // expireAt: expireInOneMinute
+    // expireAt: expireInOneMinute 
     message: req.body.message,
     expireDate: req.body.expireDate,
     expireAt: req.body.expireDate
-
   });
 
   Advertisement.create(newAd)
diff --git a/src/APIFunctions/Advertisement.js b/src/APIFunctions/Advertisement.js
index 414878b89..2e7c3540a 100644
--- a/src/APIFunctions/Advertisement.js
+++ b/src/APIFunctions/Advertisement.js
@@ -5,7 +5,7 @@ import { BASE_API_URL } from '../Enums';
 export async function getAd() {
   let status = new ApiResponse();
   try {
-    const res = await fetch (BASE_API_URL + 'api/Advertisement/');
+    const res = await fetch (BASE_API_URL + '/api/Advertisement/');
     if (res.ok) {
       const result = await res.json();
       status.responseData = result;
@@ -22,7 +22,7 @@ export async function getAd() {
 export async function getAds(token) {
   let status = new ApiResponse();
   try {
-    const res = await fetch(BASE_API_URL + 'api/Advertisement/getAllAdvertisements',
+    const res = await fetch(BASE_API_URL + '/api/Advertisement/getAllAdvertisements',
       {
         method: 'GET',
         headers: {
@@ -45,7 +45,7 @@ export async function getAds(token) {
 export async function createAd(newAd, token) {
   let status = new ApiResponse();
   try {
-    const res = await fetch(BASE_API_URL + 'api/Advertisement/createAdvertisement',
+    const res = await fetch(BASE_API_URL + '/api/Advertisement/createAdvertisement',
       {
         method: 'POST',
         headers: {
@@ -73,7 +73,7 @@ export async function createAd(newAd, token) {
 export async function deleteAd(newAd, token) {
   let status = new ApiResponse();
   try {
-    const res = await fetch(BASE_API_URL + 'api/Advertisement/deleteAdvertisement',
+    const res = await fetch(BASE_API_URL + '/api/Advertisement/deleteAdvertisement',
       {
         method: 'POST',
         headers: {
diff --git a/src/Enums.js b/src/Enums.js
index 71ba63922..f9961fba3 100644
--- a/src/Enums.js
+++ b/src/Enums.js
@@ -48,7 +48,7 @@ function membershipStateToString(accessLevel) {
   return membershipStatusArray[accessLevel + 2];
 }
 
-const BASE_API_URL = process.env.REACT_APP_BASE_API_URL || 'http://localhost:8080/';
+const BASE_API_URL = process.env.REACT_APP_BASE_API_URL || 'http://localhost:8080';
 
 module.exports = {
   memberApplicationState,