Merge pull request #229 from agiledev-students-fall2023/Event_main

Event main
agiledev-students-fall2023 · Dec 7, 2023 · 26d704e · 26d704e
2 parents c3be6e3 + 30db521
commit 26d704e
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 52 deletions.
diff --git a/front-end/src/components/AddEvent.jsx b/front-end/src/components/AddEvent.jsx
@@ -110,12 +110,11 @@ function AddEvent({ addEvent, onClose }) {
     if (decodedUser && decodedUser.id) {
       friendsCL(decodedUser.id);
       setselectedMember((prevMembers) => {
-        // Check if the current user's ID is already in the selected members
-        if (prevMembers.some((member) => member.id === decodedUser.id)) {
-          return prevMembers;
+        // Correctly check if the user ID is already in the array
+        if (!prevMembers.includes(decodedUser.id)) {
+          return [...prevMembers, decodedUser.id];
         }
-        // Add the current user's ID to the selected members
-        return [...prevMembers, decodedUser.id];
+        return prevMembers;
       });
     } else {
     }

diff --git a/front-end/src/components/Event.js b/front-end/src/components/Event.js
@@ -11,29 +11,27 @@ const Event = (props) => {
   const isDarkMode = props.isDarkMode;
   const { eventId } = useParams();
 
+
   function reformatDate(dateStr) {
+
     const months = [
-      "Jan",
-      "Feb",
-      "Mar",
-      "Apr",
-      "May",
-      "Jun",
-      "Jul",
-      "Aug",
-      "Sep",
-      "Oct",
-      "Nov",
-      "Dec",
+      "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+      "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
     ];
+
+    // Create a new Date object in local time zone
     const date = new Date(dateStr);
-
-    const monthName = months[date.getMonth()];
-    const day = date.getDate();
+
+    // Convert it back to UTC
+    date.setMinutes(date.getMinutes() + date.getTimezoneOffset());
+
+    const monthName = months[date.getUTCMonth()];
+    const day = date.getUTCDate();
 
     return `${monthName} ${day}`;
   }
 
+
   // This effect runs when the `isDarkMode` value changes
   useEffect(() => {
     if (isDarkMode) {

diff --git a/front-end/src/components/Events.jsx b/front-end/src/components/Events.jsx
@@ -15,29 +15,26 @@ function Events({ isDarkMode }) {
   const [searchTerm, setSearchTerm] = useState("");
 
   function reformatDate(dateStr) {
+
     const months = [
-      "Jan",
-      "Feb",
-      "Mar",
-      "Apr",
-      "May",
-      "Jun",
-      "Jul",
-      "Aug",
-      "Sep",
-      "Oct",
-      "Nov",
-      "Dec",
+      "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+      "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
     ];
+
+    // Create a new Date object in local time zone
     const date = new Date(dateStr);
-
-    const monthName = months[date.getMonth()];
-    const day = date.getDate();
-    const year = date.getFullYear();
+
+    // Convert it back to UTC
+    date.setMinutes(date.getMinutes() + date.getTimezoneOffset());
+
+    const monthName = months[date.getUTCMonth()];
+    const day = date.getUTCDate();
+    const year = date.getUTCFullYear();
 
     return `${monthName} ${day} ${year}`;
   }
 
+
   // Toggle the 'body-dark-mode' class on the body element
   useEffect(() => {
     if (isDarkMode) {

diff --git a/front-end/src/components/Expense.jsx b/front-end/src/components/Expense.jsx
@@ -13,30 +13,28 @@ function Expense({ isDarkMode }) {
   const navigate = useNavigate();
   const { expenseId } = useParams();
 
+
   function reformatDate(dateStr) {
+
     const months = [
-      "Jan",
-      "Feb",
-      "Mar",
-      "Apr",
-      "May",
-      "Jun",
-      "Jul",
-      "Aug",
-      "Sep",
-      "Oct",
-      "Nov",
-      "Dec",
+      "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+      "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
     ];
+
+    // Create a new Date object in local time zone
     const date = new Date(dateStr);
-
-    const monthName = months[date.getMonth()];
-    const day = date.getDate();
-    const year = date.getFullYear();
+
+    // Convert it back to UTC
+    date.setMinutes(date.getMinutes() + date.getTimezoneOffset());
+
+    const monthName = months[date.getUTCMonth()];
+    const day = date.getUTCDate();
+    const year = date.getUTCFullYear();
 
     return `${monthName} ${day} ${year}`;
   }
 
+
   const fetchData = async () => {
     try {
       const response = await axios.get(