refact: coderabbitai

ever-co · Nov 5, 2024 · 9f78cac · 9f78cac
1 parent 82596e8
commit 9f78cac
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 17 deletions.
diff --git a/apps/web/app/[locale]/timesheet/[memberId]/components/FilterWithStatus.tsx b/apps/web/app/[locale]/timesheet/[memberId]/components/FilterWithStatus.tsx
@@ -30,8 +30,11 @@ export function FilterWithStatus({
                         activeStatus === label && 'text-primary bg-white shadow-2xl dark:text-primary-light font-bold  border'
                     )}
                     onClick={() => onToggle(label)}>
-                    <span className={clsxm('font-medium ml-1 text-[#7E7991] dark:text-gray-200', `${activeStatus === label ? "text-primary font-bold dark:text-primary-light" : ""}`)}>{label}</span>
-                    <span className='font-medium ml-1 text-[#71717A] dark:text-gray-400'>{count}</span>
+                    <span className={clsxm(
+                        'font-medium ml-1 text-gray-500 dark:text-gray-200',
+                        activeStatus === label && 'text-primary font-bold dark:text-primary-light'
+                    )}>{label}</span>
+                    <span className='font-medium ml-1 text-gray-500 dark:text-gray-400'>{count}</span>
                 </Button>
             ))}
         </div>

diff --git a/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetFilter.tsx b/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetFilter.tsx
@@ -22,7 +22,7 @@ export function TimesheetFilter({ closeModal, isOpen, openModal }: ITimesheetFil
                     <FilterWithStatus
                         activeStatus="Rejected"
                         onToggle={(label) => {
-                            console.log(label);
+                            // If logging is needed, use proper logging service
                         }}
                     />
                 </div>

diff --git a/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetFilterDate.tsx b/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetFilterDate.tsx
@@ -82,6 +82,7 @@ export function TimesheetFilterDate({
         }
     };
 
+    const actionButtonClass = "h-4 border-none dark:bg-dark-theme-light text-primary hover:bg-transparent hover:underline"
 
     return (<>
         <Popover>
@@ -92,7 +93,7 @@ export function TimesheetFilterDate({
                     aria-label="Select date range"
                     aria-expanded="false"
                     className={cn(
-                        "w-44 justify-start dark:dark:bg-dark--theme-light h-[2.2rem]  items-center gap-x-2 text-left font-normal overflow-hidden text-clip dark:bg-dark--theme",
+                        "w-44 justify-start dark:bg-dark-theme h-[2.2rem] items-center gap-x-2 text-left font-normal overflow-hidden text-clip dark:bg-dark-theme-light",
                         !dateRange.from && "text-muted-foreground"
                     )}>
                     <CalendarIcon />
@@ -109,7 +110,7 @@ export function TimesheetFilterDate({
                     )}
                 </Button>
             </PopoverTrigger>
-            <PopoverContent className="w-auto p-0 flex dark:bg-dark--theme-light">
+            <PopoverContent className="w-auto p-0 flex dark:bg-dark-theme-light">
                 {isVisible && (
                     <div className="flex flex-col p-2 gap-2 translate-x-0 justify-between">
                         <div className="flex flex-col gap-2">
@@ -126,8 +127,8 @@ export function TimesheetFilterDate({
                             />
                         </div>
                         <div className="flex w-full justify-end items-end">
-                            <Button variant={'outline'} className="h-4 border-none hover:dark:dark:bg-dark--theme-light dark:dark:bg-dark--theme-light text-primary hover:bg-transparent hover:text-primary hover:underline">Cancel</Button>
-                            <Button variant={'outline'} className="h-4 border-none hover:dark:dark:bg-dark--theme-light dark:dark:bg-dark--theme-light text-primary hover:bg-transparent hover:text-primary hover:underline">Apply</Button>
+                            <Button variant={'outline'} className={`${actionButtonClass} hover:text-gray-500`}>Cancel</Button>
+                            <Button variant={'outline'} className={`${actionButtonClass} hover:text-primary-dark`}>Apply</Button>
                         </div>
                     </div>
                 )
@@ -138,7 +139,7 @@ export function TimesheetFilterDate({
                         <Button
                             key={index}
                             variant="outline"
-                            className="h-7 flex items-center justify-between border-none text-[12px] text-gray-700 dark:dark:bg-dark--theme-light "
+                            className="h-7 flex items-center justify-between border-none text-[12px] text-gray-700 dark:dark:bg-dark--theme-light"
                             onClick={() => {
                                 label === 'Custom Date Range' && setIsVisible((prev) => !prev)
                                 handlePresetClick(label)

diff --git a/apps/web/app/api/timer/timesheet/daily/route.ts b/apps/web/app/api/timer/timesheet/daily/route.ts
@@ -4,13 +4,41 @@ import { NextResponse } from "next/server";
 
 export async function GET(req: Request) {
     const res = new NextResponse();
+    const { searchParams } = new URL(req.url);
+
+    const startDate = searchParams.get('startDate');
+    const endDate = searchParams.get('endDate');
+    if (!startDate || !endDate) {
+        return NextResponse.json(
+            { error: 'startDate and endDate are required' },
+            { status: 400 }
+        );
+    }
     const { $res, user, tenantId, organizationId, access_token } = await authenticatedGuard(req, res);
     if (!user) return $res('Unauthorized');
-    const { data } = await getTaskTimesheetRequest({
-        tenantId,
-        organizationId,
-        employeeIds: []
-    }, access_token)
+    try {
+        const { data } = await getTaskTimesheetRequest({
+            tenantId,
+            organizationId,
+            employeeIds: [],
+            startDate,
+            endDate
+        }, access_token);
+
+        if (!data) {
+            return NextResponse.json(
+                { error: 'No data found' },
+                { status: 404 }
+            );
+        }
+
+        return NextResponse.json(data);
+    } catch (error) {
+        console.error('Error fetching timesheet:', error);
+        return NextResponse.json(
+            { error: 'Failed to fetch timesheet data' },
+            { status: 500 }
+        );
+    }
 
-    return $res(data)
 }
diff --git a/apps/web/lib/features/integrations/calendar/table-time-sheet.tsx b/apps/web/lib/features/integrations/calendar/table-time-sheet.tsx
@@ -207,10 +207,10 @@ export function DataTableTimeSheet({ data }: { data?: IDailyPlan[] }) {
 
 
     return (
-        <div className="w-full dark:dark:bg-dark--theme">
+        <div className="w-full dark:bg-dark--theme">
             <div className="rounded-md">
-                <Table className="border rounded-md dark:bg-dark--theme-light">
-                    <TableBody className="w-full rounded-md h-[400px] overflow-y-auto dark:dark:bg-dark--theme">
+                <Table className="order rounded-md dark:bg-dark--theme-light">
+                    <TableBody className="w-full rounded-md h-[400px] overflow-y-auto dark:bg-dark--theme">
                         {data?.map((plan, index) => (
                             <div key={index}>
                                 <div className="h-10 flex justify-between items-center w-full bg-[#eeeef1cc] dark:bg-dark--theme rounded-md border-1 border-gray-400 px-5 text-[#71717A] font-medium">