done

calblueprint · Apr 8, 2024 · d8e7177 · d8e7177
1 parent ebd3dea
commit d8e7177
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 11 deletions.
diff --git a/src/app/orderHistory/page.tsx b/src/app/orderHistory/page.tsx
@@ -30,7 +30,7 @@ function OrderHistory() {
       <NavBarMovedUP />
       <OutterBox>
         <BackButton destination="./profileScreen" />
-        <h1>Order History</h1>
+        <Heading1>Order History</Heading1>
         <OrderHistoryContainer>
           {orderIds.length > 0 ? (
             orderIds.map((orderId: number) => (

diff --git a/src/app/orderPage/page.tsx b/src/app/orderPage/page.tsx
@@ -84,7 +84,6 @@ export default function OrderPage() {
       <OutterBox>
         <BackButtonDiv>
           <BackButton destination="./orderHistory" />
-          <BackButton destination="./orderHistory" />
         </BackButtonDiv>
         <OutterDiv>
           <Heading>{formatDate(order?.created_at)}</Heading>
@@ -93,7 +92,6 @@ export default function OrderPage() {
             <Body1Bold>{order?.status}</Body1Bold>{' '}
           </StatusButton>
         </OutterDiv>
-
         <OutterFavoriteDiv>
           {orders.map(product => (
             <FavoriteDiv key={product.id}>

diff --git a/src/app/profileScreen/page.tsx b/src/app/profileScreen/page.tsx
@@ -11,6 +11,7 @@ import {
   Body2Bold,
   Body1,
   Body2,
+  Heading4,
 } from '@/styles/fonts';
 import {
   addOrRemoveProductFromFavorite,
@@ -154,15 +155,15 @@ function OrderHistorySection(props: { Orders: Order[] }) {
       backgroundColor = '#CEE8BE';
     } else if (Orders[0].status === 'Rejected') {
       backgroundColor = '#FFDDDD';
-    } else if (Orders[0].status === 'Completed') {
+    } else if (Orders[0].status === 'Confirmed') {
       backgroundColor = '#C7DDFF';
     }
     let icon;
     if (Orders[0].status === 'Submitted') {
       icon = <CheckCircle />;
     } else if (Orders[0].status === 'Rejected') {
       icon = <X />;
-    } else if (Orders[0].status === 'Completed') {
+    } else if (Orders[0].status === 'Confirmed') {
       icon = <Check />;
     } else {
       icon = null;
@@ -172,7 +173,7 @@ function OrderHistorySection(props: { Orders: Order[] }) {
         <OrderHistory>
           <HeaderDiv>
             <Heading2>Order History</Heading2>
-            <ViewAllButton destination="./orderPage" />
+            <ViewAllButton destination="./orderHistory" />
           </HeaderDiv>
           <div
             style={{
@@ -241,7 +242,24 @@ function OrderHistorySection(props: { Orders: Order[] }) {
       </main>
     );
   }
-  return null;
+  return (
+    <main>
+      <OrderHistory>
+        <HeaderDiv>
+          <Heading2>Order History</Heading2>
+          <ViewAllButton destination="./orderHistory" />
+        </HeaderDiv>
+        <div
+          style={{
+            marginTop: '20px',
+            width: '100%',
+          }}
+        >
+          <Heading4>No Current Orders to Display</Heading4>
+        </div>
+      </OrderHistory>
+    </main>
+  );
 }
 function AccountDetailSectionDelivery(props: { user: User }) {
   const { user } = props;

diff --git a/src/components/OrderHistory/OrderHistoryText.tsx b/src/components/OrderHistory/OrderHistoryText.tsx
@@ -40,7 +40,7 @@ export default function OrderDetails(props: OrderDetailsProps) {
     const queryString = querystring.stringify({ orderID });
     router.push(`/orderPage?${queryString}`);
   };
-  if (order.status === OrderStatus.OrderRejected) {
+  if (order.status === OrderStatus.Rejected) {
     return (
       <div
         style={{
@@ -81,7 +81,7 @@ export default function OrderDetails(props: OrderDetailsProps) {
       </div>
     );
   }
-  if (order.status === OrderStatus.OrderReady) {
+  if (order.status === OrderStatus.Complete) {
     return (
       <div
         style={{
@@ -122,7 +122,7 @@ export default function OrderDetails(props: OrderDetailsProps) {
       </div>
     );
   }
-  if (order.status === OrderStatus.OrderSubmitted) {
+  if (order.status === OrderStatus.Submitted) {
     return (
       <div
         style={{

diff --git a/src/schema/schema.ts b/src/schema/schema.ts
@@ -17,7 +17,7 @@ export type User = {
 
 export enum OrderStatus {
   Submitted = 'Submitted',
-  Complete = 'Completed',
+  Complete = 'Confirmed',
   Rejected = 'Rejected',
 }