diff --git a/src/app/orderConfirmationPickUp/page.tsx b/src/app/orderConfirmationPickUp/page.tsx index 37aeb1ac..89bf9295 100644 --- a/src/app/orderConfirmationPickUp/page.tsx +++ b/src/app/orderConfirmationPickUp/page.tsx @@ -5,7 +5,13 @@ import { useState, useEffect } from 'react'; import { fetchUser } from '@/api/supabase/queries/user_queries'; import { fetchPickupTimesByID } from '@/api/supabase/queries/pickup_queries'; import { fetchCurrentOrdersByUser } from '@/api/supabase/queries/order_queries'; -import { Body2Bold, Body2, Heading3Bold } from '@/styles/fonts'; +import { + Body1, + Body1Bold, + Body2Light, + Heading3Bold, + Heading4Bold, +} from '@/styles/fonts'; import { fetchCartItemsWithQuantity } from '../../api/supabase/queries/cart_queries'; import BackButton from '../../components/BackButton/BackButton'; @@ -21,9 +27,15 @@ import { LabelBox, LabelBox1, ScrollDiv, - DateText, - CenterBox, - AddressDiv, + ShippingDetailsDiv, + ImageDiv, + BottomColumnDiv, + Wrapper, + LeftColumnDiv, + RightColumnDiv, + DetailsHeader, + PageDiv, + CenterDiv, } from './styles'; import { Product, User, Pickup } from '../../schema/schema'; @@ -65,49 +77,59 @@ export default function OrderConfirmationPickUp() { return (
- - - - - Thank you, {user?.first_name}. Your order has been submitted. - - - - - {/** change this to order number! */} - Order No. {user?.cart_id} - {/** got the date but please clean up the date format :) */} - - Pick Up: {organizePickupTime()} - - {/** mess w/ the height of the scrollDiv so that the locationn stays constant :) */} + + + + + + + + + Your order has been submitted + - - {Cart.map(cartItem => ( - - {cartItem.name} - - -

Category: {cartItem.category}

-
-
- ))} -
- - Location: 3170 23rd Street, San Francisco, CA 94110 - -
-
-
+ + + Order No. {user?.cart_id} + + + {Cart.map(cartItem => ( + + + {cartItem.name} + + + {cartItem.name} +
+ Category: {cartItem.category} +
+ + Quantity: {cartItem.quantity} + +
+ ))} +
+
+ + + + Delivery Information + Time Slot + {organizePickupTime()} (10:00 am - 12:30 pm) + Location + 3170 23rd Street, San Francisco, CA 94110 + + + + +
); }