done

calblueprint · Apr 22, 2024 · f53a189 · f53a189
2 parents 31dd383 + 0c497ff
commit f53a189
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 27 deletions.
diff --git a/src/app/orderConfirmationDelivery/page.tsx b/src/app/orderConfirmationDelivery/page.tsx
@@ -41,6 +41,7 @@ import {
 
 import { Product, User, Address } from '../../schema/schema';
 import { Body1Bold } from '../orderPage/styles';
+import { BackButtonDiv } from '../orderConfirmationPickUp/styles';
 
 export default function OrderConfirmationDelivery() {
   const [Cart, setCart] = useState<Product[]>([]);

diff --git a/src/app/orderConfirmationPickUp/page.tsx b/src/app/orderConfirmationPickUp/page.tsx
@@ -13,7 +13,6 @@ import {
   Body2Light,
 } from '@/styles/fonts';
 import { useSearchParams } from 'next/navigation';
-import { fetchCartItemsWithQuantityByID } from '../../api/supabase/queries/cart_queries';
 
 import BackButton from '../../components/BackButton/BackButton';
 
@@ -38,6 +37,7 @@ import {
 } 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[]>([]);

diff --git a/src/app/orderConfirmationPickUp/styles.ts b/src/app/orderConfirmationPickUp/styles.ts
@@ -23,6 +23,7 @@ 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: 700px;
   max-height: 100%;
   max-width: 750px;
   margin-top: 20px;
@@ -112,18 +113,9 @@ export const Label = styled.p`
   margin-top: 20px;
 `;
 
-export const LabelBox1 = styled.div`
-  width: 250px;
-  height: 100%;
-  padding: 20px;
-`;
-
 export const LabelBox = styled.div`
   width: 150px;
   height: 100%;
-  padding: 20px;
-  gap: 50px;
-  margin-right: 30px;
 `;
 
 export const HeaderText = styled.h3`
@@ -233,7 +225,10 @@ export const LeftColumnDiv = styled.div`
 export const RightColumnDiv = styled.div`
   display: flex;
   flex-flow: column;
+<<<<<<< HEAD
 
+=======
+>>>>>>> 0c497ffa604d1a861f8fac67277446b2133764a5
   align-items: left;
   width: 475px;
 `;
@@ -243,9 +238,13 @@ export const BackButtonDiv = styled.div`
   flex-direction: row;
   text-align: left;
   width: 800px;
+<<<<<<< HEAD
 
   margin-left: 40px;
 
+=======
+  margin-left: 40px;
+>>>>>>> 0c497ffa604d1a861f8fac67277446b2133764a5
   margin-bottom: 40px;
   margin-top: 20px;
 `;
@@ -281,7 +280,6 @@ export const BottomColumnDiv = styled.div`
 export const TextDiv = styled.div`
   display: flex;
   flex-direction: row;
-
   margin-left: 20px;
   margin-top: 10px;
   margin-bottom: 10px;

diff --git a/src/app/orderPage/page.tsx b/src/app/orderPage/page.tsx
@@ -67,6 +67,15 @@ function formatDate(date: string | undefined): string {
   return `${month} ${day}, ${year}`;
 }
 
+function formatTime(date: string | undefined): string {
+  if (!date) return '';
+
+  const hour = date.substring(11, 13);
+  const minute = date.substring(14, 16);
+
+  return `${hour}:${minute}`;
+}
+
 export default function OrderPage() {
   const [orders, setOrders] = useState<ProductWithQuantity[]>([]);
   const [pickupTime, setPickupTime] = useState<Pickup>();

diff --git a/src/app/profileScreen/page.tsx b/src/app/profileScreen/page.tsx
@@ -39,6 +39,7 @@ import {
   AccountDetailsDeliv,
   AccountDetailsPickUp,
   HeadingBack,
+  Spacing,
   HeadingSpacing,
   TextSpacing,
   OrderHistory,

diff --git a/src/app/profileScreen/styles.ts b/src/app/profileScreen/styles.ts
@@ -147,8 +147,8 @@ export const Hover = styled.div<{ $ishovering?: boolean }>`
 `;
 
 export const BackButtonDiv = styled.div`
-  margin-bottom: 30px;
   margin-top: 50px;
+  margin-bottom: 40px;
 `;
 
 export const HeaderDiv = styled.div`

diff --git a/src/components/BackButton/styles.ts b/src/components/BackButton/styles.ts
@@ -10,13 +10,6 @@ export const BackLink = styled(Link)`
   justify-content: space-between;
   color: ${COLORS.black};
   width: 60px;
-<<<<<<< HEAD
->>>>>>> b287da7 (temp)
-=======
-  width: 60px;
->>>>>>> b287da7 (temp)
-=======
->>>>>>> 46a8b03 (fixed after rebasing)
   &:hover {
     text-decoration: underline;
   }
@@ -25,12 +18,4 @@ export const BackLink = styled(Link)`
 export const ArrowLeftIcon = styled(ArrowLeft)`
   width: 18px;
   height: 18px;
-<<<<<<< HEAD
->>>>>>> b287da7 (temp)
-=======
-  width: 18px;
-  height: 18px;
->>>>>>> b287da7 (temp)
-=======
->>>>>>> 46a8b03 (fixed after rebasing)
 `;
diff --git a/src/components/OrderHistory/styles.ts b/src/components/OrderHistory/styles.ts
@@ -175,7 +175,11 @@ export const RowDiv = styled.div`
 <<<<<<< HEAD
 >>>>>>> b287da7 (temp)
 =======
+<<<<<<< HEAD
 >>>>>>> b287da7 (temp)
+=======
+>>>>>>> b287da70273f0befb5c5c6b437883b203f43b605
+>>>>>>> 0c497ffa604d1a861f8fac67277446b2133764a5
 `;
 
 export const OrderStatusDiv = styled.div`