Charlotte/new pick up

src/app/orderConfirmationPickUp/page.tsx

@@ -4,45 +4,49 @@ import { useState, useEffect } from 'react';
 
 import { fetchUser } from '@/api/supabase/queries/user_queries';
 import { fetchPickupTimesByID } from '@/api/supabase/queries/pickup_queries';
+import { convertButtonNumberToCategory } from '@/api/supabase/queries/button_queries';
 import {
   fetchCurrentOrdersByUser,
   getOrderById,
 } from '@/api/supabase/queries/order_queries';
 import {
+  Body2Bold,
+  Body2,
+  Heading3Bold,
   Body1,
   Body1Bold,
-  Body2Light,
-  Heading3Bold,
   Heading4Bold,
+  Body2Light,
 } from '@/styles/fonts';
 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,
   LeftColumnDiv,
   RightColumnDiv,
   DetailsHeader,
+  ImageDiv,
   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[]>([]);
@@ -73,7 +77,6 @@ export default function OrderConfirmationPickUp() {
 
   function organizePickupTime() {
     const startTime = pickupTime?.start_time.toLocaleString();
-    const endTime = pickupTime?.end_time.toLocaleString();
     const date =
       startTime == null
         ? ['0', '0', '0']
@@ -97,7 +100,7 @@ export default function OrderConfirmationPickUp() {
               </TextDiv>
               <OutterFavoriteDiv>
                 <TextDiv1>
-                  <Heading4Bold>Order No. {orderIDFromSearch}</Heading4Bold>
+                  <Heading4Bold>Order No. {user?.cart_id}</Heading4Bold>
                 </TextDiv1>
                 <ScrollDiv>
                   {Cart.map(cartItem => (
@@ -112,13 +115,13 @@ export default function OrderConfirmationPickUp() {
                           }}
                         />
                       </ImageDiv>
-                      <LabelBox1>
+                      <LabelBox>
                         <Body1Bold>{cartItem.name}</Body1Bold>
                         <br />
                         <Body2Light style={{ marginTop: '-10px' }}>
                           Category: {cartItem.category}
                         </Body2Light>
-                      </LabelBox1>
+                      </LabelBox>
                       <LabelBox>
                         <div>
                           <span

src/app/orderConfirmationPickUp/styles.ts

@@ -9,10 +9,11 @@ export const FavoriteDiv = styled.div`
   flex-direction: row;
   align-items: center;
   justify-content: space-between;
-  width: 100%;
+  width: 750px;
   margin-bottom: 50px;
   margin-top: 30px;
   margin-right: 20px;
+  gap: 40px;
 `;
 
 export const OutterFavoriteDiv = styled.div`
@@ -22,36 +23,24 @@ export const OutterFavoriteDiv = styled.div`
   border-radius: 10px;
   background: var(--White, #fff);
   box-shadow: 0px 1px 4px 1px rgba(0, 0, 0, 0.2);
-  width: 800px;
+<<<<<<< HEAD
+=======
+  width: 700px;
+>>>>>>> b287da70273f0befb5c5c6b437883b203f43b605
   max-height: 100%;
+  max-width: 750px;
   margin-top: 20px;
   margin-right: 60px;
   margin-left: 60px;
   padding-right: 20px;
-  padding-left: 10px;
+  padding-left: 40px;
   padding-top: 10px;
 `;
 
 export const ScrollDiv = styled.div`
   overflow: scroll;
-  width: 100%;
-`;
-
-export const ImageDiv = styled.div`
-  box-shadow: 1px 1px 4px 1px rgba(0, 0, 0, 0.08);
-  width: 150px;
-  height: 150px;
-  margin-left: 30px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-`;
-
-export const Wrapper = styled.div`
-  padding: 15px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
+  overflow-x: hidden;
+  max-width: 100%;
 `;
 
 export const BackDiv = styled.button`
@@ -110,18 +99,17 @@ export const Label = styled.p`
   margin-top: 20px;
 `;
 
-export const LabelBox1 = styled.div`
-  width: 250px;
-  height: 100%;
-  padding: 20px;
+export const ImageDiv = styled.p`
+  width: 150px;
+  height: 150px;
+  align-items: center;
+  justify-content: center;
+  display: flex;
 `;
 
 export const LabelBox = styled.div`
   width: 150px;
   height: 100%;
-  padding: 20px;
-  gap: 50px;
-  margin-right: 30px;
 `;
 
 export const HeaderText = styled.h3`
@@ -226,23 +214,23 @@ export const LeftColumnDiv = styled.div`
   flex-flow: column;
   justify-content: space-evenly;
   align-items: space-evenly;
-  width: 100%;
+  width: 800px;
 `;
 export const RightColumnDiv = styled.div`
   display: flex;
   flex-flow: column;
-  align-items: start;
-  margin-left: 10px;
-  width: 100%;
+  align-items: left;
+  width: 475px;
 `;
 
 export const BackButtonDiv = styled.div`
   display: flex;
   flex-direction: row;
   text-align: left;
   width: 800px;
-  margin-left: 80px;
-  margin-top: 40px;
+  margin-left: 40px;
+  margin-bottom: 40px;
+  margin-top: 20px;
 `;
 
 export const WhiteBackgroundDiv = styled.div`
@@ -254,31 +242,41 @@ export const WhiteBackgroundDiv = styled.div`
   box-shadow: 0px 4px 7px 0px rgba(0, 0, 0, 0.1);
 `;
 
+export const Wrapper2 = styled.div`
+  display: flex;
+  flex-direction: col;
+  align-items: space-evenly;
+  justify-content: space-around;
+`;
+
 export const BottomColumnDiv = styled.div`
   display: flex;
   flex-direction: row;
   align-items: space-evenly;
   justify-content: space-around;
   width: 100%;
+<<<<<<< HEAD
   margin-left: 20px;
+  margin-right: 20px;
+=======
+  margin-left: 10px;
+>>>>>>> b287da70273f0befb5c5c6b437883b203f43b605
   margin-bottom: 30px;
-  gap: 30px;
+  gap: 10px;
 `;
 
 export const TextDiv = styled.div`
   display: flex;
   flex-direction: row;
-  margin-left: 60px;
-  margin-top: 20px;
-  margin-bottom: 20px;
+  margin-left: 20px;
+  margin-top: 10px;
+  margin-bottom: 10px;
 `;
 
 export const TextDiv1 = styled.div`
   display: flex;
   flex-direction: row;
-  padding: 10px;
-  margin-left: 20px;
-  margin-top: 15px;
+  margin-top: 20px;
 `;
 
 export const PageDiv = styled.div`
@@ -287,22 +285,29 @@ export const PageDiv = styled.div`
   justify-content: flex-start;
   align-items: flex-start;
   width: 100%;
+  position: relative;
+  margin-bottom: 40px;
 `;
 
 export const ShippingDetailsDiv = styled.div`
+
   display: flex;
   flex-direction: column;
   align-items: flex-start;
   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;
   gap: 33px;
   max-height: 100%;
-  margin-top: 205px;
+<<<<<<< HEAD
+  margin-top: 75px;
+=======
+  margin-top: 93px;
+>>>>>>> b287da70273f0befb5c5c6b437883b203f43b605
   margin-bottom: 30px;
   margin-right: 40px;
 `;
@@ -320,6 +325,7 @@ export const CenterDiv = styled.div`
   display: flex;
   align-items: center;
   justify-content: center;
+  position: relative;
   width: 100%;
   padding: 20px;
 `;

src/app/orderHistory/page.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import React, { useEffect, useState } from 'react';
-import { Heading1, Body1 } from '@/styles/fonts';
+import { Heading2, Body1 } from '@/styles/fonts';
 import OrderDetailsWithProducts from '../../components/OrderHistory/OrderHistoryBox';
 import { fetchOrderIdsByUserIdSorted } from '../../api/supabase/queries/order_queries';
 import Footer from '../../components/FooterFolder/Footer';
@@ -10,6 +10,7 @@ import {
   OutterBox,
   NavBarMovedUP,
   Fullscreen,
+  BackButtonDiv,
 } from './styles';
 import BackButton from '../../components/BackButton/BackButton';
 
@@ -29,10 +30,10 @@ function OrderHistory() {
     <Fullscreen>
       <NavBarMovedUP />
       <OutterBox>
-        <BackButton destination="./profileScreen" />
-        <div style={{ marginTop: '40px', marginBottom: '20px' }}>
-          <Heading1>Order History</Heading1>
-        </div>
+        <BackButtonDiv>
+          <BackButton destination="./profileScreen" />
+        </BackButtonDiv>
+        <Heading2>Order History</Heading2>
         <OrderHistoryContainer>
           {orderIds.length > 0 ? (
             orderIds.map((orderId: number) => (

src/app/orderHistory/styles.ts

@@ -13,13 +13,25 @@ export const NavBarMovedUP = styled(NavBar)`
   position: relative;
 `;
 
+export const BackButtonDiv = styled.div`
+  display: flex;
+  flex-direction: row;
+  gap: 200px;
+  margin-bottom: 30px;
+  margin-top: 50px;
+  text-align: left;
+  width: 800px;
+  padding-right: 40px;
+`;
+
 export const OutterBox = styled.div`
   width: 800px;
   margin-top: 40px;
   margin-bottom: 70px;
 `;
 
 export const OrderHistoryContainer = styled.div`
+
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -28,8 +40,8 @@ export const OrderHistoryContainer = styled.div`
   box-shadow: 0px 1px 4px 1px rgba(0, 0, 0, 0.2);
   width: 800px; // Width of the outer box
   height: auto;
-  margin-top: 10px;
-  padding-top: 40px;
+  margin-top: 20px;
+  padding-top: 10px;
 `;
 
 export const OrderHistoryBox = styled.div`