Merge pull request #70 from FacundoInza/fix/home-deliveries

fix: Fixes in home of dealers with new updates in backend and Error s…

Author: FacundoInza

app/dealer/home/page.tsx

@@ -6,6 +6,7 @@ import { IDelivery, ResponsePaginated } from '@/interfaces';
 
 import DeliveryPendingList from '@/components/ui/lists/DeliveryPendingList';
 import DeliveryCompleteList from '@/components/ui/lists/DeliveryCompleteList';
+import DeliveryOnCourse from '@/components/ui/lists/DeliveryOnCourse';
 
 const Home: FC = async () => {
     const user = await getUserFromServer();
@@ -16,20 +17,32 @@ const Home: FC = async () => {
     });
 
     const pendingTotalItems = res.totalItems;
+
     res = await getDeliveries({ status: 'delivered', userId: user.id });
 
     const deliveredTotalItems = res.totalItems;
 
+    res = await getDeliveries({ status: 'on-course', userId: user.id });
+
+    const deliveriesOnCourse = res.data;
+    const totalItemsOnCourse = res.totalItems;
     return (
         <>
             <nav className='bg-primary'>
                 <div style={{ height: '75vh' }}>
                     <DropdownCard
                         title='Pending deliveries'
-                        subtitle={`${pendingTotalItems} pending`}
+                        subtitle={`${
+                            pendingTotalItems + totalItemsOnCourse
+                        } pending`}
                     >
                         {!user.enabled ? (
-                            <DeliveryPendingList />
+                            <>
+                                <DeliveryOnCourse
+                                    deliveriesOnCourse={deliveriesOnCourse}
+                                />
+                                <DeliveryPendingList />
+                            </>
                         ) : (
                             <div className='text-center text-black'>
                                 You are not enabled to receive packages

components/commons/buttons/CancelInteractiveButtons.tsx

@@ -89,7 +89,10 @@ const CancelInteractiveButtons: FC<{ delivery: IDeliveryResponse }> = ({
                     showModal={showModal}
                     buttonText={isModalSuccess ? 'OK' : 'Try again'}
                     onNotSuccess={() => setShowModal(false)}
-                    onSuccess={() => router.push('/dealer/home')}
+                    onSuccess={() => {
+                        router.push('/dealer/home');
+                        router.refresh();
+                    }}
                 />
             )}
         </div>

components/commons/buttons/StartInteractiveButtons.tsx

@@ -89,7 +89,10 @@ const StartInteractiveButtons: FC<{ delivery: IDeliveryResponse }> = ({
                     showModal={showModal}
                     buttonText={isModalSuccess ? 'OK' : 'Try again'}
                     onNotSuccess={() => setShowModal(false)}
-                    onSuccess={() => router.push('/dealer/home')}
+                    onSuccess={() => {
+                        router.push('/dealer/home');
+                        router.refresh();
+                    }}
                 />
             )}
         </div>

components/ui/cards/DeliveryCard.tsx

@@ -62,7 +62,7 @@ export const DeliveryCard: React.FC<CardProps> = ({
                 </div>
                 <div className='flex flex-col align-bottom absolute top-4 right-1'>
                     <StatusBadge status={status} />
-                    {status !== 'delivered' && (
+                    {status === 'pending' && (
                         <div className='mt-2 flex flex-col justify-end'>
                             <button
                                 className='flex items-center justify-end text-red-500 hover:text-red-700'

components/ui/cards/DeliveryInProgressCard.tsx

@@ -11,7 +11,7 @@ const fetchDelivery = async (id: string) => {
 
 const DeliveryInProgressCard: FC<{ id: string }> = async ({ id }) => {
     const delivery = await fetchDelivery(id);
-    console.log('THIS IS delivery---->', delivery);
+
     const coords = {
         lat: delivery.data.orderId.coords.lat,
         lng: delivery.data.orderId.coords.lng,

components/ui/cards/DropdownCard.tsx

@@ -14,7 +14,7 @@ export const DropdownCard: React.FC<DropdownCardProps> = ({
     subtitle,
     children,
 }) => {
-    const [expanded, setExpanded] = React.useState(false);
+    const [expanded, setExpanded] = React.useState(true);
 
     const onExpand = () => {
         setExpanded(!expanded);

components/ui/lists/DeliveryOnCourse.tsx

@@ -0,0 +1,25 @@
+import { IDelivery } from '@/interfaces';
+import React, { FC } from 'react';
+import { DeliveryList } from '.';
+
+interface Props {
+    deliveriesOnCourse: IDelivery[];
+}
+
+const DeliveryOnCourse: FC<Props> = ({ deliveriesOnCourse }) => {
+    return (
+        <>
+            {!deliveriesOnCourse ? (
+                <div className='flex justify-center'>
+                    <div className='text-center text-red-500'>
+                        You have no deliveries on course
+                    </div>
+                </div>
+            ) : (
+                <DeliveryList deliveries={deliveriesOnCourse} />
+            )}
+        </>
+    );
+};
+
+export default DeliveryOnCourse;

components/ui/statusBadge/StatusBadge.tsx

@@ -17,7 +17,7 @@ const colorMap: ColorMap = {
         text: 'text-green-700',
         ring: 'ring-green-600',
     },
-    'in progress': {
+    'on-course': {
         bg: 'bg-inProgress',
         text: 'text-yellow-700',
         ring: 'ring-yellow-600',