new branch

calblueprint · Apr 17, 2024 · 83a7d69 · 83a7d69
1 parent b5b9d5a
commit 83a7d69
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 20 deletions.
diff --git a/src/app/orderConfirmationPickUp/page.tsx b/src/app/orderConfirmationPickUp/page.tsx
@@ -9,41 +9,44 @@ import {
   getOrderById,
 } from '@/api/supabase/queries/order_queries';
 import {
+  Body2Bold,
+  Body2,
+  Heading3Bold,
   Body1,
   Body1Bold,
-  Body2Light,
-  Heading3Bold,
   Heading4Bold,
+  Body2Light,
 } from '@/styles/fonts';
+import { fetchCartItemsWithQuantity } from '../../api/supabase/queries/cart_queries';
 import { useSearchParams } from 'next/navigation';
-import { fetchCartItemsWithQuantityByID } from '../../api/supabase/queries/cart_queries';
-
 import BackButton from '../../components/BackButton/BackButton';
 
 import NavBar from '../../components/NavBarFolder/NavBar';
 
 import {
-  TextDiv,
-  TextDiv1,
-  BackButtonDiv,
   FavoriteDiv,
+  ColDiv,
   OutterFavoriteDiv,
+  TextDiv1,
+  OutterBox,
+  Label,
   LabelBox,
-  LabelBox1,
   ScrollDiv,
   ShippingDetailsDiv,
   ImageDiv,
   BottomColumnDiv,
-  Wrapper,
+  LabelBox1,
   LeftColumnDiv,
   RightColumnDiv,
   DetailsHeader,
   PageDiv,
   CenterDiv,
+  BackButtonDiv,
+  TextDiv,
 } from './styles';
 
 import { Product, User, Pickup } from '../../schema/schema';
-
+import { fetchCartItemsWithQuantityByID } from '../../api/supabase/queries/cart_queries';
 export default function OrderConfirmationPickUp() {
   const [Cart, setCart] = useState<Product[]>([]);
   const [user, setUser] = useState<User>();
@@ -95,10 +98,9 @@ export default function OrderConfirmationPickUp() {
               <TextDiv>
                 <Heading3Bold>Your order has been submitted</Heading3Bold>
               </TextDiv>
-
               <OutterFavoriteDiv>
                 <TextDiv1>
-                  <Heading4Bold>Order No. {orderIDFromSearch}</Heading4Bold>
+                  <Heading4Bold>Order No. {user?.cart_id}</Heading4Bold>
                 </TextDiv1>
                 <ScrollDiv>
                   {Cart.map(cartItem => (

diff --git a/src/app/orderConfirmationPickUp/styles.ts b/src/app/orderConfirmationPickUp/styles.ts
@@ -26,9 +26,8 @@ export const OutterFavoriteDiv = styled.div`
   max-height: 100%;
   margin-top: 20px;
   margin-right: 60px;
-  margin-left: 60px;
-  padding-right: 20px;
-  padding-left: 10px;
+  margin-left: 40px;
+  padding-right: 15px;
   padding-top: 10px;
 `;
 
@@ -232,7 +231,6 @@ export const RightColumnDiv = styled.div`
   display: flex;
   flex-flow: column;
   align-items: start;
-  margin-left: 10px;
   width: 100%;
 `;
 
@@ -241,7 +239,7 @@ export const BackButtonDiv = styled.div`
   flex-direction: row;
   text-align: left;
   width: 800px;
-  margin-left: 80px;
+  margin-left: 60px;
   margin-bottom: 40px;
 `;
 
@@ -261,14 +259,15 @@ export const BottomColumnDiv = styled.div`
   justify-content: space-around;
   width: 100%;
   margin-left: 20px;
+  margin-right: 20px;
   margin-bottom: 30px;
   gap: 30px;
 `;
 
 export const TextDiv = styled.div`
   display: flex;
   flex-direction: row;
-  margin-left: 60px;
+  margin-left: 40px;
   margin-top: 20px;
   margin-bottom: 20px;
 `;
@@ -287,6 +286,7 @@ export const PageDiv = styled.div`
   justify-content: flex-start;
   align-items: flex-start;
   width: 100%;
+  margin-bottom: 40px;
 `;
 
 export const ShippingDetailsDiv = styled.div`
@@ -296,7 +296,7 @@ export const ShippingDetailsDiv = styled.div`
   border-radius: 10px;
   background: var(--White, #fff);
   box-shadow: 0px 1px 4px 1px rgba(0, 0, 0, 0.2);
-  width: 467px;
+  width: 475px;
   height: auto;
   max-height: 100%;
   padding: 36px 34px;
@@ -322,4 +322,4 @@ export const CenterDiv = styled.div`
   justify-content: center;
   width: 100%;
   padding: 20px;
-`;
+`;