feat:queryExcludesIP

calblueprint · Apr 9, 2024 · 01a6c0e · 01a6c0e
1 parent fd2f841
commit 01a6c0e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/api/supabase/queries/order_queries.ts b/src/api/supabase/queries/order_queries.ts
@@ -67,7 +67,8 @@ export async function fetchOrdersByUser(): Promise<Order[]> {
   const { data, error } = await supabase
     .from('order')
     .select('*')
-    .eq('user_id', userId);
+    .eq('user_id', userId)
+    .neq('status', 'In Progress');
 
   if (error) {
     throw new Error(`Error fetching orders for user: ${error.message}`);

diff --git a/src/api/supabase/queries/user_queries.ts b/src/api/supabase/queries/user_queries.ts
@@ -144,7 +144,6 @@ export async function fetchCurrentUserAddress() {
     if (error) {
       console.error('Error fetching user data:', error);
     }
-
     return address;
   } catch (error) {
     console.error('Error:', error);

diff --git a/src/app/orderHistory/page.tsx b/src/app/orderHistory/page.tsx
@@ -1,7 +1,7 @@
 'use client';
 
 import React, { useEffect, useState } from 'react';
-import { Heading1 } from '@/styles/fonts';
+import { Heading1, Body1 } from '@/styles/fonts';
 import OrderDetailsWithProducts from '../../components/OrderHistory/OrderHistoryBox';
 import { fetchOrderIdsByUserIdSorted } from '../../api/supabase/queries/order_queries';
 import Footer from '../../components/FooterFolder/Footer';
@@ -37,7 +37,7 @@ function OrderHistory() {
               <OrderDetailsWithProducts key={orderId} orderId={orderId} />
             ))
           ) : (
-            <div>Loading...</div>
+            <Body1>No Order</Body1>
           )}
         </OrderHistoryContainer>
       </OutterBox>