preRebase

calblueprint · Apr 21, 2024 · cf03702 · cf03702
1 parent 2756019
commit cf03702
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 15 deletions.
diff --git a/src/api/supabase/queries/product_queries.ts b/src/api/supabase/queries/product_queries.ts
@@ -64,7 +64,7 @@ export async function fetchProductByID(productId: number): Promise<Product> {
   if (error) {
     throw new Error(`Error fetching product: ${error.message}`);
   }
-
+ 
   return product;
 }
 

diff --git a/src/app/orderConfirmationDelivery/page.tsx b/src/app/orderConfirmationDelivery/page.tsx
@@ -93,7 +93,9 @@ export default function OrderConfirmationDelivery() {
       'November',
       'December',
     ];
-    const dateStr = `${months[parseInt(date[1], 10)]} ${date[2]}, ${date[0]}`;
+    const dateStr = `${months[parseInt(date[1], 10) - 1]} ${date[2]}, ${
+      date[0]
+    }`;
     return `${dateStr}`;
   }
 

diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx
@@ -183,6 +183,7 @@ export default function PickUp() {
               }
               if (selectedPickupIndex === 0) {
                 toast(`You must select a pick-up date!`);
+                toast.clearWaitingQueue();
               }
             }}
           >

diff --git a/src/app/pickup/styles.ts b/src/app/pickup/styles.ts
@@ -269,5 +269,5 @@ export const ToastPopUP = styled(ToastContainer)`
   position: fixed;
   z-index: 100;
   transform: translatey(90px);
-  background-color: ${COLORS.lightRed};
+ 
 `;
diff --git a/src/app/profileScreen/individualItem.tsx b/src/app/profileScreen/individualItem.tsx
@@ -18,19 +18,19 @@ export default function IndividualItem(props: {
   const { favorite, Favorites, setFavorites } = props;
   const [hovering, setHovering] = useState(false);
 
-  useEffect(() => {
-    async function changeCategory() {
-      try {
-        favorite.category = await convertButtonNumberToCategory(
-          favorite.category,
-        );
-      } catch (error) {
-        // console.error(error);
-      }
-    }
+  // useEffect(() => {
+  //   // async function changeCategory() {
+  //   //   try {
+  //   //     favorite.category = await convertButtonNumberToCategory(
+  //   //       favorite.category,
+  //   //     );
+  //   //   } catch (error) {
+  //   //     // console.error(error);
+  //   //   }
+  //   // }
 
-    changeCategory();
-  }, [favorite]);
+  //   // changeCategory();
+  // }, []);
 
   async function clickFunctions(props2: { fav: Product }) {
     const { fav } = props2;

diff --git a/src/app/profileScreen/page.tsx b/src/app/profileScreen/page.tsx
@@ -12,6 +12,7 @@ import {
   Body2Bold,
   Body2,
 } from '@/styles/fonts';
+import { convertButtonNumberToCategory } from '@/api/supabase/queries/button_queries';
 import {
   arrayOfFavorites,
   fetchUser,
@@ -363,6 +364,13 @@ export default function Profile() {
 
   async function fetchProducts() {
     const data = (await arrayOfFavorites()) as Product[];
+    data.forEach(
+      async product =>
+        (product.category = await convertButtonNumberToCategory(
+          product.category,
+        )),
+    );
+    console.log(data);
     setFavorites(data);
   }