From 3740f5247fb1e391d43ca8b834fd1f388ccc0a88 Mon Sep 17 00:00:00 2001
From: AKILIMAILI CIZUNGU Innocent
 <51681130+Innocent-Akim@users.noreply.github.com>
Date: Thu, 7 Nov 2024 09:06:11 +0200
Subject: [PATCH 1/6] [Feat]:Implement EditTaskModal component with enhanced
 task editing UI  (#3238)

* feat:Implement EditTaskModal component with enhanced task editing UI and state management

* refact: coderabbitai[bot]

* refact: coderabbitai[bot]
---
 .../[memberId]/components/EditTaskModal.tsx   | 231 ++++++++++++++++++
 .../[memberId]/components/TimesheetAction.tsx |   6 +
 .../components/TimesheetFilterDate.tsx        |   2 +-
 .../timesheet/[memberId]/components/index.tsx |   3 +-
 .../calendar/table-time-sheet.tsx             |  60 +++--
 .../lib/features/multiple-select/index.tsx    |  73 ++++++
 6 files changed, 350 insertions(+), 25 deletions(-)
 create mode 100644 apps/web/app/[locale]/timesheet/[memberId]/components/EditTaskModal.tsx

diff --git a/apps/web/app/[locale]/timesheet/[memberId]/components/EditTaskModal.tsx b/apps/web/app/[locale]/timesheet/[memberId]/components/EditTaskModal.tsx
new file mode 100644
index 000000000..5f90f720b
--- /dev/null
+++ b/apps/web/app/[locale]/timesheet/[memberId]/components/EditTaskModal.tsx
@@ -0,0 +1,231 @@
+import { Button, Modal, statusColor } from "@/lib/components";
+import { IoMdArrowDropdown } from "react-icons/io";
+import { FaRegClock } from "react-icons/fa";
+import { DatePickerFilter } from "./TimesheetFilterDate";
+import { useState } from "react";
+import { useTranslations } from "next-intl";
+import { clsxm } from "@/app/utils";
+import { Item, ManageOrMemberComponent, getNestedValue } from "@/lib/features/manual-time/manage-member-component";
+import { useTeamTasks } from "@/app/hooks";
+import { CustomSelect } from "@/lib/features";
+import { statusTable } from "./TimesheetAction";
+
+export interface IEditTaskModalProps {
+    isOpen: boolean;
+    closeModal: () => void;
+
+}
+export function EditTaskModal({ isOpen, closeModal }: IEditTaskModalProps) {
+    const { activeTeam } = useTeamTasks();
+    const t = useTranslations();
+    const [dateRange, setDateRange] = useState<{ from: Date | null }>({
+        from: new Date(),
+    });
+    const [endTime, setEndTime] = useState<string>('');
+    const [startTime, setStartTime] = useState<string>('');
+    const [isBillable, setIsBillable] = useState<boolean>(false);
+    const [notes, setNotes] = useState('');
+    const memberItemsLists = {
+        Project: activeTeam?.projects as [],
+    };
+    const handleSelectedValuesChange = (values: { [key: string]: Item | null }) => {
+        // Handle value changes
+    };
+    const selectedValues = {
+        Teams: null,
+    };
+
+    const handleChange = (field: string, selectedItem: Item | null) => {
+        // Handle field changes
+    };
+
+    const fields = [
+        {
+            label: 'Project',
+            placeholder: 'Select a project',
+            isRequired: true,
+            valueKey: 'id',
+            displayKey: 'name',
+            element: 'Project'
+        },
+    ];
+
+    const handleFromChange = (fromDate: Date | null) => {
+        setDateRange((prev) => ({ ...prev, from: fromDate }));
+    };
+    return (
+        <Modal
+            closeModal={closeModal}
+            isOpen={isOpen}
+            showCloseIcon
+            title={'Edit Task'}
+            className="bg-light--theme-light dark:bg-dark--theme-light p-5 rounded-xl w-full md:w-40 md:min-w-[30rem] justify-start h-[auto]"
+            titleClass="font-bold">
+            <div className="flex flex-col w-full">
+                <div className="flex flex-col border-b border-b-slate-100 dark:border-b-gray-700">
+                    <span> #321 Spike for creating calendar views on mobile</span>
+                    <div className="flex items-center gap-x-1 ">
+                        <span className="text-gray-400">for</span>
+                        <span className="text-primary dark:text-primary-light">Savannah Nguyen </span>
+                        <IoMdArrowDropdown className="cursor-pointer" />
+                    </div>
+                </div>
+                <div className="flex items-start flex-col justify-center gap-4">
+                    <div>
+                        <span>Task Time</span>
+                        <div className="flex items-center gap-x-2 ">
+                            <FaRegClock className="text-[#30B366]" />
+                            <span>08:10h</span>
+                        </div>
+                    </div>
+                    <div className="flex items-center w-full">
+                        <div className=" w-[48%] mr-[4%]">
+                            <label className="block text-gray-500 mb-1">
+                                {t('manualTime.START_TIME')}
+                                <span className="text-[#de5505e1] ml-1">*</span>
+                            </label>
+                            <input
+                                aria-label="Start time"
+                                aria-describedby="start-time-error"
+                                type="time"
+                                value={startTime}
+                                onChange={(e) => setStartTime(e.target.value)}
+                                className="w-full p-1 border font-normal border-slate-300 dark:border-slate-600 dark:bg-dark--theme-light rounded-md"
+                                required
+                            />
+                        </div>
+
+                        <div className=" w-[48%]">
+                            <label className="block text-gray-500 mb-1">
+                                {t('manualTime.END_TIME')}
+                                <span className="text-[#de5505e1] ml-1">*</span>
+                            </label>
+
+                            <input
+                                aria-label="End time"
+                                aria-describedby="end-time-error"
+                                type="time"
+                                value={endTime}
+                                onChange={(e) => setEndTime(e.target.value)}
+                                className="w-full p-1 border font-normal border-slate-300 dark:border-slate-600 dark:bg-dark--theme-light rounded-md"
+                                required
+                            />
+                        </div>
+
+                    </div>
+                    <div>
+                        <span className="block text-gray-500 mr-2">Date</span>
+                        <DatePickerFilter
+                            date={dateRange.from}
+                            setDate={handleFromChange}
+                            label="Oct 01 2024"
+                        />
+                    </div>
+                    <div className="w-full flex flex-col">
+                        <ManageOrMemberComponent
+                            fields={fields}
+                            itemsLists={memberItemsLists}
+                            selectedValues={selectedValues}
+                            onSelectedValuesChange={handleSelectedValuesChange}
+                            handleChange={handleChange}
+                            itemToString={(item, displayKey) => getNestedValue(item, displayKey) || ''}
+                            itemToValue={(item, valueKey) => getNestedValue(item, valueKey) || ''}
+                        />
+                    </div>
+                    <div className=" flex flex-col items-center">
+                        <label className="text-gray-500 mr-6 ">Billable</label>
+                        <div className="flex items-center gap-3">
+                            <ToggleButton
+                                isActive={isBillable}
+                                onClick={() => setIsBillable(!isBillable)}
+                                label={t('pages.timesheet.BILLABLE.YES')}
+                            />
+                            <ToggleButton
+                                isActive={!isBillable}
+                                onClick={() => setIsBillable(!isBillable)}
+                                label={t('pages.timesheet.BILLABLE.NO')}
+                            />
+                        </div>
+                    </div>
+                    <div className="w-full flex flex-col">
+                        <span>Notes</span>
+                        <textarea
+                            value={notes}
+                            onChange={(e) => setNotes(e.target.value)}
+                            placeholder="Insert notes here..."
+                            className={clsxm(
+                                "bg-transparent focus:border-transparent focus:ring-2 focus:ring-transparent",
+                                "placeholder-gray-300 placeholder:font-normal resize-none p-2 grow w-full",
+                                "border border-gray-200 dark:border-slate-600 dark:bg-dark--theme-light rounded-md h-40",
+                                notes.trim().length === 0 && "border-red-500"
+                            )}
+                            maxLength={120}
+                            minLength={0}
+                            aria-label="Insert notes here"
+                            required
+                        />
+                        <div className="text-sm text-gray-500 text-right">
+                            {notes.length}/{120}
+                        </div>
+                    </div>
+                    <div className="border-t border-t-gray-200 dark:border-t-gray-700 w-full"></div>
+                    <div className="flex items-center justify-between gap-2 ">
+                        <div className="flex flex-col items-start justify-center">
+                            <CustomSelect
+                                options={statusTable?.flatMap((status) => status.label)}
+                                renderOption={(option) => (
+                                    <div className="flex items-center gap-x-2">
+                                        <div className={clsxm("p-2 rounded-full", statusColor(option).bg)}></div>
+                                        <span className={clsxm("ml-1", statusColor(option).text,)}>{option}</span>
+                                    </div>
+                                )}
+                            />
+                        </div>
+                        <div className="flex items-center gap-x-2">
+                            <Button
+                                variant="outline"
+                                type="button"
+                                className={clsxm("dark:text-primary h-[2.3rem] border-gray-300 dark:border-slate-600 font-normal dark:bg-dark--theme-light")}>
+                                Cancel
+                            </Button>
+
+                            <Button
+                                type="submit"
+                                className={clsxm(
+                                    'bg-[#3826A6] h-[2.3rem] font-normal flex items-center text-white',
+                                )}
+                            >
+                                Save
+                            </Button>
+                        </div>
+
+                    </div>
+                </div>
+            </div>
+
+        </Modal>
+    )
+}
+
+interface ToggleButtonProps {
+    isActive: boolean;
+    onClick: () => void;
+    label: string;
+}
+
+const ToggleButton = ({ isActive, onClick, label }: ToggleButtonProps) => (
+    <div className="flex items-center gap-x-2">
+        <div
+            className="w-6 h-6 flex items-center bg-[#6c57f4b7] rounded-full p-1 cursor-pointer"
+            onClick={onClick}
+            style={{
+                background: isActive
+                    ? 'linear-gradient(to right, #9d91efb7, #8a7bedb7)'
+                    : '#6c57f4b7'
+            }}
+        >
+            <div className="bg-[#3826A6] w-4 h-4 rounded-full shadow-md transform transition-transform translate-x-0" />
+        </div>
+        <span>{label}</span>
+    </div>
+);
diff --git a/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetAction.tsx b/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetAction.tsx
index 1509c71e8..2bad95b8a 100644
--- a/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetAction.tsx
+++ b/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetAction.tsx
@@ -54,3 +54,9 @@ export const getTimesheetButtons = (status: StatusType, t: TranslationHooks, onC
         />
     ));
 };
+
+export const statusTable: { label: StatusType; description: string }[] = [
+    { label: "Pending", description: "Awaiting approval or review" },
+    { label: "Approved", description: "The item has been approved" },
+    { label: "Rejected", description: "The item has been rejected" },
+];
diff --git a/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetFilterDate.tsx b/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetFilterDate.tsx
index fd089310f..bcb45c8ea 100644
--- a/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetFilterDate.tsx
+++ b/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetFilterDate.tsx
@@ -177,7 +177,7 @@ const DatePickerInput: React.FC<DatePickerInputProps> = ({ date, label }) => (
         <Button
             variant="outline"
             className={cn(
-                "w-[150px] justify-start text-left font-normal bg-transparent hover:bg-transparent text-black h-8 border border-transparent dark:border-transparent",
+                "w-[150px] justify-start text-left font-normal bg-transparent hover:bg-transparent text-black dark:text-gray-100 h-8 border border-transparent dark:border-transparent",
                 !date && "text-muted-foreground"
             )}
         >
diff --git a/apps/web/app/[locale]/timesheet/[memberId]/components/index.tsx b/apps/web/app/[locale]/timesheet/[memberId]/components/index.tsx
index f220eb5e9..5c0dea0a2 100644
--- a/apps/web/app/[locale]/timesheet/[memberId]/components/index.tsx
+++ b/apps/web/app/[locale]/timesheet/[memberId]/components/index.tsx
@@ -7,4 +7,5 @@ export * from './FilterWithStatus';
 export * from './TimesheetFilterDate';
 export * from './TimeSheetFilterPopover'
 export * from './TimesheetAction';
-export * from './RejectSelectedModal'
+export * from './RejectSelectedModal';
+export * from './EditTaskModal';
diff --git a/apps/web/lib/features/integrations/calendar/table-time-sheet.tsx b/apps/web/lib/features/integrations/calendar/table-time-sheet.tsx
index 0e3decc24..a6cb33f44 100644
--- a/apps/web/lib/features/integrations/calendar/table-time-sheet.tsx
+++ b/apps/web/lib/features/integrations/calendar/table-time-sheet.tsx
@@ -56,7 +56,7 @@ import { clsxm } from "@/app/utils"
 import { statusColor } from "@/lib/components"
 import { Badge } from '@components/ui/badge'
 import { IDailyPlan } from "@/app/interfaces"
-import { RejectSelectedModal, StatusType, getTimesheetButtons } from "@/app/[locale]/timesheet/[memberId]/components"
+import { EditTaskModal, RejectSelectedModal, StatusType, getTimesheetButtons } from "@/app/[locale]/timesheet/[memberId]/components"
 import { useTranslations } from "next-intl"
 import { formatDate } from "@/app/helpers"
 import { TaskNameInfoDisplay } from "../../task/task-displays"
@@ -225,18 +225,19 @@ export function DataTableTimeSheet({ data }: { data?: IDailyPlan[] }) {
                 console.error(`Unsupported action: ${action}`);
         }
     };
-
+    console.log("================>", data)
 
     return (
         <div className="w-full dark:bg-dark--theme">
-            {<RejectSelectedModal
+            <RejectSelectedModal
                 onReject={() => {
                     // Pending implementation
                 }}
                 maxReasonLength={120}
                 minReasonLength={0}
                 closeModal={closeModal}
-                isOpen={isOpen} />}
+                isOpen={isOpen}
+            />
             <div className="rounded-md">
                 <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">
@@ -425,26 +426,39 @@ export function SelectFilter({ selectedStatus }: { selectedStatus?: string }) {
     );
 }
 
-const TaskActionMenu = ({ idTasks }: { idTasks: any }) => {
-    const handleCopyPaymentId = () => navigator.clipboard.writeText(idTasks);
-
+const TaskActionMenu = ({ idTasks }: { idTasks: string | number }) => {
+    const {
+        isOpen: isEditTask,
+        openModal: isOpenModalEditTask,
+        closeModal: isCloseModalEditTask
+    } = useModal();
     return (
-        <DropdownMenu>
-            <DropdownMenuTrigger asChild>
-                <Button variant="ghost" className="h-8 w-8 p-0  text-sm sm:text-base">
-                    <span className="sr-only">Open menu</span>
-                    <MoreHorizontal className="h-4 w-4" />
-                </Button>
-            </DropdownMenuTrigger>
-            <DropdownMenuContent align="end">
-                <DropdownMenuItem className="cursor-pointer" onClick={handleCopyPaymentId}>
-                    Edit
-                </DropdownMenuItem>
-                <DropdownMenuSeparator />
-                <StatusTask />
-                <DropdownMenuItem className="text-red-600 hover:!text-red-600 cursor-pointer">Delete</DropdownMenuItem>
-            </DropdownMenuContent>
-        </DropdownMenu>
+        <>
+            {
+                <EditTaskModal
+                    closeModal={isCloseModalEditTask}
+                    isOpen={isEditTask}
+                />
+            }
+            <DropdownMenu>
+                <DropdownMenuTrigger asChild>
+                    <Button variant="ghost" className="h-8 w-8 p-0  text-sm sm:text-base">
+                        <span className="sr-only">Open menu</span>
+                        <MoreHorizontal className="h-4 w-4" />
+                    </Button>
+                </DropdownMenuTrigger>
+                <DropdownMenuContent align="end">
+                    <DropdownMenuItem className="cursor-pointer" onClick={isOpenModalEditTask}>
+                        Edit
+                    </DropdownMenuItem>
+                    <DropdownMenuSeparator />
+                    <StatusTask />
+                    <DropdownMenuItem className="text-red-600 hover:!text-red-600 cursor-pointer">Delete</DropdownMenuItem>
+                </DropdownMenuContent>
+            </DropdownMenu>
+
+        </>
+
     );
 };
 
diff --git a/apps/web/lib/features/multiple-select/index.tsx b/apps/web/lib/features/multiple-select/index.tsx
index 4e5b9f587..6eaafea70 100644
--- a/apps/web/lib/features/multiple-select/index.tsx
+++ b/apps/web/lib/features/multiple-select/index.tsx
@@ -82,3 +82,76 @@ export function MultipleSelect({
         </div>
     );
 }
+
+
+
+
+type CustomSelectProps = {
+
+
+    className?: string,
+    ariaLabel?: string
+    /**
+     * Array of string options to be displayed in the dropdown.
+     * Each string represents a selectable , such as "daily" or "weekly".
+     */
+    options: string[];
+
+    /**
+     * Optional render function that customizes the display of each option.
+     * Receives the option string as an argument and returns a ReactNode to render.
+     * If not provided, options will display with the first letter capitalized.
+     */
+    renderOption?: (option: string) => React.ReactNode;
+};
+
+/**
+ * CustomSelect Component
+ *
+ * This component renders a customizable dropdown select menu for choosing a .
+ * It allows passing an array of options and optionally customizes the appearance of each option.
+ *
+ * @component
+ * @param {CustomSelectProps} props - Props for configuring the select component.
+ * @param {string[]} props.options - Array of selectable options to be displayed in the dropdown.
+ * @param {(option: string) => React.ReactNode} [props.renderOption] - Optional function for custom rendering of each option.
+ *
+ * @example
+ * <CustomSelect
+ *    options={['daily', 'weekly', 'monthly']}
+ *    renderOption={(option) => (
+ *       <div className="flex items-center">
+ *          <span className="text-blue-500">{option.charAt(0).toUpperCase()}</span>
+ *          <span className="ml-1">{option.slice(1)}</span>
+ *       </div>
+ *    )}
+ * />
+ */
+export function CustomSelect({ options, renderOption, ariaLabel, className }: CustomSelectProps) {
+    // State to store the currently selected value in the dropdown.
+    const [selectedValue, setSelectedValue] = React.useState<string>();
+
+    // Render the select component with dynamic options and optional custom rendering.
+    return (
+        <Select
+            value={selectedValue}
+            onValueChange={setSelectedValue}
+            aria-label={ariaLabel || "Select an option"} >
+
+            <SelectTrigger
+                className={`overflow-hidden text-clip border border-gray-200 dark:border-gray-700 bg-white dark:bg-dark--theme-light focus:ring-2 focus:ring-transparent ${className}`}
+            >
+                <SelectValue placeholder="Select an option" />
+            </SelectTrigger>
+            <SelectContent className='z-[10000] dark:bg-dark--theme-light'>
+                <SelectGroup>
+                    {options.map((value) => (
+                        <SelectItem key={value} value={value}>
+                            {renderOption ? renderOption(value) : value.charAt(0).toUpperCase() + value.slice(1)}
+                        </SelectItem>
+                    ))}
+                </SelectGroup>
+            </SelectContent>
+        </Select>
+    );
+}

From 728f961cd62c9cd74147d5c0795984494776e601 Mon Sep 17 00:00:00 2001
From: "Thierry CH." <thierrybakera12@gmail.com>
Date: Fri, 8 Nov 2024 21:39:10 +0200
Subject: [PATCH 2/6] we should not plan the same task twice (#3244)

* we should not plan the same task twice

* fix : fix build errors
---
 apps/web/app/hooks/features/useDailyPlan.ts   | 13 ++++++++---
 apps/web/app/utils/remove-duplicate-item.ts   | 22 +++++++++++++++++++
 apps/web/components/ui/dropdown-menu.tsx      | 14 ++++++++----
 .../create-daily-plan-form-modal.tsx          | 14 ++++++++++--
 4 files changed, 54 insertions(+), 9 deletions(-)
 create mode 100644 apps/web/app/utils/remove-duplicate-item.ts

diff --git a/apps/web/app/hooks/features/useDailyPlan.ts b/apps/web/app/hooks/features/useDailyPlan.ts
index f7b1d4d7d..6d1a52a31 100644
--- a/apps/web/app/hooks/features/useDailyPlan.ts
+++ b/apps/web/app/hooks/features/useDailyPlan.ts
@@ -27,6 +27,7 @@ import {
 import { ICreateDailyPlan, IDailyPlanTasksUpdate, IRemoveTaskFromManyPlans, IUpdateDailyPlan } from '@app/interfaces';
 import { useFirstLoad } from '../useFirstLoad';
 import { useAuthenticateUser } from './useAuthenticateUser';
+import { removeDuplicateItems } from '@/app/utils/remove-duplicate-item';
 
 export type FilterTabs = 'Today Tasks' | 'Future Tasks' | 'Past Tasks' | 'All Tasks' | 'Outstanding';
 
@@ -120,7 +121,7 @@ export function useDailyPlan() {
 				if (isPlanExist) {
 					const updatedPlans = [...(profileDailyPlans.items ? profileDailyPlans.items : [])].map((plan) => {
 						if (plan.date?.toString()?.startsWith(new Date(data.date)?.toISOString().split('T')[0])) {
-							return res.data;
+							return { ...res.data, tasks: removeDuplicateItems(res.data.tasks) };
 						}
 
 						return plan;
@@ -133,11 +134,17 @@ export function useDailyPlan() {
 				} else {
 					setProfileDailyPlans({
 						total: profileDailyPlans.total + 1,
-						items: [...(profileDailyPlans.items ? profileDailyPlans.items : []), res.data]
+						items: [
+							...(profileDailyPlans.items ? profileDailyPlans.items : []),
+							{ ...res.data, tasks: removeDuplicateItems(res.data.tasks) }
+						]
 					});
 				}
 
-				setEmployeePlans([...(employeePlans ? employeePlans : []), res.data]);
+				setEmployeePlans([
+					...(employeePlans ? employeePlans : []),
+					{ ...res.data, tasks: removeDuplicateItems(res.data.tasks) }
+				]);
 				getMyDailyPlans();
 				return res;
 			}
diff --git a/apps/web/app/utils/remove-duplicate-item.ts b/apps/web/app/utils/remove-duplicate-item.ts
new file mode 100644
index 000000000..e4dcad84b
--- /dev/null
+++ b/apps/web/app/utils/remove-duplicate-item.ts
@@ -0,0 +1,22 @@
+/**
+ * A dynamic function that removes duplicates from an array of items.
+ *
+ * @param {any[]} items - The items to check against.
+ *
+ * @returns {any[]} - The array of items without duplicates.
+ */
+
+export const removeDuplicateItems = <TItem extends { id: string }>(items?: TItem[]): TItem[] => {
+	const seenIds = new Set<string>();
+
+	return items
+		? items.filter((item) => {
+				if (seenIds.has(item.id)) {
+					return false;
+				} else {
+					seenIds.add(item.id);
+					return true;
+				}
+			})
+		: [];
+};
diff --git a/apps/web/components/ui/dropdown-menu.tsx b/apps/web/components/ui/dropdown-menu.tsx
index 3c35f65e9..37d828a57 100644
--- a/apps/web/components/ui/dropdown-menu.tsx
+++ b/apps/web/components/ui/dropdown-menu.tsx
@@ -39,7 +39,10 @@ DropdownMenuSubTrigger.displayName =
 
 const DropdownMenuSubContent = React.forwardRef<
   React.ElementRef<typeof DropdownMenuPrimitive.SubContent>,
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubContent>
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubContent>  & {
+	className?: string;
+	children?: React.ReactNode
+  }
 >(({ className, ...props }, ref) => (
   <DropdownMenuPrimitive.SubContent
     ref={ref}
@@ -47,7 +50,7 @@ const DropdownMenuSubContent = React.forwardRef<
       "z-50 min-w-[8rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-lg data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
       className
     )}
-    {...props}
+    {...(props as any)}
   />
 ))
 DropdownMenuSubContent.displayName =
@@ -55,7 +58,10 @@ DropdownMenuSubContent.displayName =
 
 const DropdownMenuContent = React.forwardRef<
   React.ElementRef<typeof DropdownMenuPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Content>
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Content>  & {
+	className?: string;
+	children?: React.ReactNode
+  }
 >(({ className, sideOffset = 4, ...props }, ref) => (
   <DropdownMenuPrimitive.Portal>
     <DropdownMenuPrimitive.Content
@@ -65,7 +71,7 @@ const DropdownMenuContent = React.forwardRef<
         "z-50 min-w-[8rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
         className
       )}
-      {...props}
+      {...(props as any)}
     />
   </DropdownMenuPrimitive.Portal>
 ))
diff --git a/apps/web/lib/features/daily-plan/create-daily-plan-form-modal.tsx b/apps/web/lib/features/daily-plan/create-daily-plan-form-modal.tsx
index ee5dc11c9..2baacd152 100644
--- a/apps/web/lib/features/daily-plan/create-daily-plan-form-modal.tsx
+++ b/apps/web/lib/features/daily-plan/create-daily-plan-form-modal.tsx
@@ -45,6 +45,13 @@ export function CreateDailyPlanFormModal({
 		() => profileDailyPlans?.items?.map((plan) => new Date(plan.date)),
 		[profileDailyPlans.items]
 	);
+	const existingTaskPlanDates = useMemo(
+		() =>
+			profileDailyPlans?.items
+				?.filter((plan) => plan.tasks?.some((task) => task.id === taskId))
+				.map((plan) => new Date(plan.date)),
+		[profileDailyPlans.items, taskId]
+	);
 
 	const isManagerConnectedUser = useMemo(
 		() => activeTeamManagers.find((member) => member.employee?.user?.id === user?.id),
@@ -143,6 +150,7 @@ export function CreateDailyPlanFormModal({
 										date={date}
 										setDate={setDate}
 										existingPlanDates={existingPlanDates}
+										existingTaskPlanDates={existingTaskPlanDates}
 									/>
 								</div>
 							)}
@@ -227,11 +235,13 @@ export function CreateDailyPlanFormModal({
 const CustomCalendar = memo(function CustomCalendar({
 	date,
 	setDate,
-	existingPlanDates
+	existingPlanDates,
+	existingTaskPlanDates
 }: {
 	date: Date;
 	setDate: Dispatch<SetStateAction<Date>>;
 	existingPlanDates: Date[];
+	existingTaskPlanDates: Date[];
 }) {
 	return (
 		<Calendar
@@ -240,7 +250,7 @@ const CustomCalendar = memo(function CustomCalendar({
 			selected={date}
 			onSelect={(day) => setDate(day ? day : new Date(tomorrowDate))}
 			initialFocus
-			disabled={[{ from: new Date(1970, 1, 1), to: yesterdayDate }]}
+			disabled={[{ from: new Date(1970, 1, 1), to: yesterdayDate }, ...existingTaskPlanDates]}
 			modifiers={{
 				booked: existingPlanDates
 			}}

From 0b5b01db38c5a7f24c76dee485baf6cf3c2be220 Mon Sep 17 00:00:00 2001
From: AKILIMAILI CIZUNGU Innocent
 <51681130+Innocent-Akim@users.noreply.github.com>
Date: Fri, 8 Nov 2024 21:44:30 +0200
Subject: [PATCH 3/6] [Feat]: Implement Timesheet logs API integration with
 State management and query handling (#3254)

* feat:Implement timesheet logs API integration with state management and query handling

* fix: coderabbitai

* Update page.tsx

---------

Co-authored-by: Ruslan Konviser <evereq@gmail.com>
---
 .../[memberId]/components/TimesheetFilter.tsx |  7 +--
 .../components/TimesheetFilterDate.tsx        |  9 +++-
 .../[locale]/timesheet/[memberId]/page.tsx    | 28 +++++++++--
 .../app/api/timer/timesheet/daily/route.ts    |  6 +--
 apps/web/app/hooks/features/useTimesheet.ts   | 50 +++++++++++++++++++
 .../services/client/api/timer/timer-log.ts    | 44 +++++++++++++++-
 .../app/services/server/requests/timesheet.ts | 19 ++++++-
 apps/web/app/stores/time-logs.ts              |  3 ++
 8 files changed, 151 insertions(+), 15 deletions(-)
 create mode 100644 apps/web/app/hooks/features/useTimesheet.ts

diff --git a/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetFilter.tsx b/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetFilter.tsx
index 1c4418ea1..a53934536 100644
--- a/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetFilter.tsx
+++ b/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetFilter.tsx
@@ -1,13 +1,14 @@
 import { FilterWithStatus } from './FilterWithStatus';
-import { FrequencySelect, TimeSheetFilterPopover, TimesheetFilterDate } from '.';
+import { FrequencySelect, TimeSheetFilterPopover, TimesheetFilterDate, TimesheetFilterDateProps } from '.';
 import { Button } from 'lib/components';
 import { AddManualTimeModal } from '@/lib/features/manual-time/add-manual-time-modal';
 interface ITimesheetFilter {
     isOpen: boolean,
     openModal: () => void,
     closeModal: () => void
+    initDate?: TimesheetFilterDateProps
 }
-export function TimesheetFilter({ closeModal, isOpen, openModal }: ITimesheetFilter) {
+export function TimesheetFilter({ closeModal, isOpen, openModal, initDate }: ITimesheetFilter,) {
     return (
         <>
             {
@@ -29,7 +30,7 @@ export function TimesheetFilter({ closeModal, isOpen, openModal }: ITimesheetFil
 
                 <div className="flex gap-2">
                     <FrequencySelect />
-                    <TimesheetFilterDate />
+                    <TimesheetFilterDate {...initDate} />
                     <TimeSheetFilterPopover />
                     <Button
                         onClick={openModal}
diff --git a/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetFilterDate.tsx b/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetFilterDate.tsx
index bcb45c8ea..d98f8a189 100644
--- a/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetFilterDate.tsx
+++ b/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetFilterDate.tsx
@@ -8,7 +8,7 @@ import {
 } from "@components/ui/popover"
 import { CalendarIcon } from "@radix-ui/react-icons"
 import { format } from "date-fns"
-import React, { useState } from "react"
+import React, { useEffect, useState } from "react"
 import { MdKeyboardArrowRight } from "react-icons/md"
 import { PiCalendarDotsThin } from "react-icons/pi"
 
@@ -16,7 +16,7 @@ interface DatePickerInputProps {
     date: Date | null;
     label: string;
 }
-interface TimesheetFilterDateProps {
+export interface TimesheetFilterDateProps {
     onChange?: (range: { from: Date | null; to: Date | null }) => void;
     initialRange?: { from: Date | null; to: Date | null };
     minDate?: Date;
@@ -81,6 +81,11 @@ export function TimesheetFilterDate({
                 break;
         }
     };
+    useEffect(() => {
+        if (dateRange.from && dateRange.to) {
+            onChange?.(dateRange);
+        }
+    }, [dateRange, onChange]);
 
     const actionButtonClass = "h-4 border-none dark:bg-dark--theme-light text-primary hover:bg-transparent hover:underline"
 
diff --git a/apps/web/app/[locale]/timesheet/[memberId]/page.tsx b/apps/web/app/[locale]/timesheet/[memberId]/page.tsx
index cfc5a5f05..4fa61ad1f 100644
--- a/apps/web/app/[locale]/timesheet/[memberId]/page.tsx
+++ b/apps/web/app/[locale]/timesheet/[memberId]/page.tsx
@@ -2,20 +2,26 @@
 import React, { useMemo } from 'react';
 import { useParams } from 'next/navigation';
 import { useTranslations } from 'next-intl';
+import { TranslationHooks } from 'next-intl';
+
 import { withAuthentication } from 'lib/app/authenticator';
 import { Breadcrumb, Container } from 'lib/components';
 import { MainLayout } from 'lib/layout';
+
 import { useAuthenticateUser, useDailyPlan, useLocalStorageState, useModal, useOrganizationTeams } from '@app/hooks';
 import { clsxm } from '@app/utils';
 import { fullWidthState } from '@app/stores/fullWidth';
 import { useAtomValue } from 'jotai';
+
 import { ArrowLeftIcon } from 'assets/svg';
 import { CalendarView, TimesheetCard, TimesheetFilter, TimesheetView } from './components';
 import { CalendarDaysIcon, Clock, User2 } from 'lucide-react';
-import { GrTask } from "react-icons/gr";
-import { GoSearch } from "react-icons/go";
+import { GrTask } from 'react-icons/gr';
+import { GoSearch } from 'react-icons/go';
+
 import { getGreeting } from '@/app/helpers';
-import { TranslationHooks } from 'next-intl';
+import { useTimesheet } from '@/app/hooks/features/useTimesheet';
+import { endOfDay, startOfDay } from 'date-fns';
 
 type TimesheetViewMode = "ListView" | "CalendarView";
 
@@ -31,7 +37,16 @@ const TimeSheet = React.memo(function TimeSheetPage({ params }: { params: { memb
     const t = useTranslations();
     const { user } = useAuthenticateUser();
 
+    const [dateRange, setDateRange] = React.useState<{ from: Date | null; to: Date | null }>({
+        from: startOfDay(new Date()),
+        to: endOfDay(new Date()),
+    });
+
     const { sortedPlans } = useDailyPlan();
+    const { timesheet } = useTimesheet({
+        startDate: dateRange.from ?? "",
+        endDate: dateRange.to ?? ""
+    });
     const {
         isOpen: isManualTimeModalOpen,
         openModal: openManualTimeModal,
@@ -134,6 +149,12 @@ const TimeSheet = React.memo(function TimeSheetPage({ params }: { params: { memb
                         {/* <DropdownMenuDemo /> */}
                         <div className='flex flex-col overflow-y-auto  w-full border-1 rounded-lg bg-[#FFFFFF]  dark:bg-dark--theme p-4 mt-4'>
                             <TimesheetFilter
+                                initDate={{
+                                    initialRange: dateRange,
+                                    onChange(range) {
+                                        setDateRange(range)
+                                    },
+                                }}
                                 closeModal={closeManualTimeModal}
                                 openModal={openManualTimeModal}
                                 isOpen={isManualTimeModalOpen}
@@ -172,4 +193,3 @@ const ViewToggleButton: React.FC<ViewToggleButtonProps> = ({
         <span>{mode === 'ListView' ? t('pages.timesheet.VIEWS.LIST') : t('pages.timesheet.VIEWS.CALENDAR')}</span>
     </button>
 );
-// https://demo.gauzy.co/#/pages/employees/timesheets/daily?organizationId=e4a6eeb6-3f13-4712-b880-34aa9ef1dd2f&date=2024-11-02&date_end=2024-11-02&unit_of_time=day&is_custom_date=false
diff --git a/apps/web/app/api/timer/timesheet/daily/route.ts b/apps/web/app/api/timer/timesheet/daily/route.ts
index dc84bf6aa..759139c47 100644
--- a/apps/web/app/api/timer/timesheet/daily/route.ts
+++ b/apps/web/app/api/timer/timesheet/daily/route.ts
@@ -14,15 +14,15 @@ export async function GET(req: Request) {
             { status: 400 }
         );
     }
-    const { $res, user, tenantId, organizationId, access_token } = await authenticatedGuard(req, res);
+    const { $res, user, tenantId, organizationId, access_token, } = await authenticatedGuard(req, res);
     if (!user) return $res('Unauthorized');
     try {
         const { data } = await getTaskTimesheetRequest({
             tenantId,
             organizationId,
-            employeeIds: [],
             startDate,
-            endDate
+            endDate,
+
         }, access_token);
 
         if (!data) {
diff --git a/apps/web/app/hooks/features/useTimesheet.ts b/apps/web/app/hooks/features/useTimesheet.ts
new file mode 100644
index 000000000..91a8b473a
--- /dev/null
+++ b/apps/web/app/hooks/features/useTimesheet.ts
@@ -0,0 +1,50 @@
+import { useAuthenticateUser } from './useAuthenticateUser';
+import { useAtom } from 'jotai';
+import { timesheetRapportState } from '@/app/stores/time-logs';
+import { useQuery } from '../useQuery';
+import { useCallback, useEffect } from 'react';
+import { getTaskTimesheetLogsApi } from '@/app/services/client/api/timer/timer-log';
+import moment from 'moment';
+
+interface TimesheetParams {
+    startDate: Date | string;
+    endDate: Date | string;
+}
+
+export function useTimesheet({
+    startDate,
+    endDate,
+}: TimesheetParams) {
+    const { user } = useAuthenticateUser();
+    const [timesheet, setTimesheet] = useAtom(timesheetRapportState);
+
+    const { loading: loadingTimesheet, queryCall: queryTimesheet } = useQuery(getTaskTimesheetLogsApi);
+
+    const getTaskTimesheet = useCallback(
+        ({ startDate, endDate }: TimesheetParams) => {
+            if (!user) return;
+            const from = moment(startDate).format('YYYY-MM-DD');
+            const to = moment(endDate).format('YYYY-MM-DD')
+            queryTimesheet({
+                startDate: from,
+                endDate: to,
+                organizationId: user.employee?.organizationId,
+                tenantId: user.tenantId ?? '',
+                timeZone: user.timeZone?.split('(')[0].trim(),
+            }).then((response) => {
+                setTimesheet(response.data);
+            }).catch((error) => {
+                console.error('Error fetching timesheet:', error);
+            });
+        },
+        [user, queryTimesheet, setTimesheet]
+    );
+    useEffect(() => {
+        getTaskTimesheet({ startDate, endDate });
+    }, [getTaskTimesheet, startDate, endDate]);
+    return {
+        loadingTimesheet,
+        timesheet,
+        getTaskTimesheet,
+    };
+}
diff --git a/apps/web/app/services/client/api/timer/timer-log.ts b/apps/web/app/services/client/api/timer/timer-log.ts
index f8a88bbb8..237e840e1 100644
--- a/apps/web/app/services/client/api/timer/timer-log.ts
+++ b/apps/web/app/services/client/api/timer/timer-log.ts
@@ -1,4 +1,4 @@
-import { ITimerStatus } from '@app/interfaces';
+import { ITimeSheet, ITimerStatus } from '@app/interfaces';
 import { get } from '../../axios';
 
 export async function getTimerLogs(
@@ -13,3 +13,45 @@ export async function getTimerLogs(
 }
 
 // todayStart, todayEnd;
+
+
+export async function getTaskTimesheetLogsApi({
+	organizationId,
+	tenantId,
+	startDate,
+	endDate,
+	timeZone
+}: {
+	organizationId: string,
+	tenantId: string,
+	startDate: string | Date,
+	endDate: string | Date,
+	timeZone?: string
+}) {
+
+	if (!organizationId || !tenantId || !startDate || !endDate) {
+		throw new Error('Required parameters missing: organizationId, tenantId, startDate, and endDate are required');
+	}
+	const start = typeof startDate === 'string' ? new Date(startDate).toISOString() : startDate.toISOString();
+	const end = typeof endDate === 'string' ? new Date(endDate).toISOString() : endDate.toISOString();
+	if (isNaN(new Date(start).getTime()) || isNaN(new Date(end).getTime())) {
+		throw new Error('Invalid date format provided');
+	}
+
+	const params = new URLSearchParams({
+		'activityLevel[start]': '0',
+		'activityLevel[end]': '100',
+		organizationId,
+		tenantId,
+		startDate: start,
+		endDate: end,
+		timeZone: timeZone || '',
+		'relations[0]': 'project',
+		'relations[1]': 'task',
+		'relations[2]': 'organizationContact',
+		'relations[3]': 'employee.user'
+	});
+
+	const endpoint = `/timesheet/time-log?${params.toString()}`;
+	return get<ITimeSheet[]>(endpoint, { tenantId });
+}
diff --git a/apps/web/app/services/server/requests/timesheet.ts b/apps/web/app/services/server/requests/timesheet.ts
index be7662ec1..a7a254880 100644
--- a/apps/web/app/services/server/requests/timesheet.ts
+++ b/apps/web/app/services/server/requests/timesheet.ts
@@ -54,11 +54,26 @@ export function taskActivityRequest(params: TTaskActivityParams, bearer_token: s
 	});
 }
 
+/**
+ * Parameters for timesheet API requests
+ * @property organizationId - Organization identifier
+ * @property tenantId - Tenant identifier
+ * @property startDate - Start date for timesheet period
+ * @property endDate - End date for timesheet period
+ * @property timeZone - Optional timezone for date calculations (defaults to UTC)
+ */
+type ITimesheetProps = {
+	organizationId: string;
+	tenantId: string;
+	startDate: string;
+	endDate: string;
+	timeZone?: string;
+}
 
-export function getTaskTimesheetRequest(params: TTasksTimesheetStatisticsParams, bearer_token: string) {
+export function getTaskTimesheetRequest(params: ITimesheetProps, bearer_token: string) {
 	const queries = qs.stringify(params);
 	return serverFetch<ITimeSheet[]>({
-		path: `/timesheet/time-log/report/daily?${queries.toString()}`,
+		path: `/timesheet/time-log?activityLevel?${queries.toString()}`,
 		method: 'GET',
 		bearer_token,
 		tenantId: params.tenantId
diff --git a/apps/web/app/stores/time-logs.ts b/apps/web/app/stores/time-logs.ts
index 6d7c5f9b4..3cf5395ea 100644
--- a/apps/web/app/stores/time-logs.ts
+++ b/apps/web/app/stores/time-logs.ts
@@ -1,4 +1,7 @@
 import { ITimerLogsDailyReport } from '@app/interfaces/timer/ITimerLogs';
 import { atom } from 'jotai';
+import { ITimeSheet } from '../interfaces';
 
 export const timerLogsDailyReportState = atom<ITimerLogsDailyReport[]>([]);
+
+export const timesheetRapportState = atom<ITimeSheet[]>([])

From d5a4eeb4094825acb0b8daafb51fb0715f123a10 Mon Sep 17 00:00:00 2001
From: AKILIMAILI CIZUNGU Innocent
 <51681130+Innocent-Akim@users.noreply.github.com>
Date: Fri, 8 Nov 2024 21:49:26 +0200
Subject: [PATCH 4/6] [Feat]: Added Translations For The UI  In Multiple
 Languages (#3265)

* feat: Added translations for the UI

* fix: coderabbitai

---------

Co-authored-by: Ruslan Konviser <evereq@gmail.com>
---
 .../app/[locale]/permissions/component.tsx    | 15 +++----
 .../[memberId]/components/EditTaskModal.tsx   | 12 +++---
 .../components/RejectSelectedModal.tsx        | 10 ++---
 .../components/TimeSheetFilterPopover.tsx     | 14 ++++---
 .../[memberId]/components/TimesheetFilter.tsx | 13 +++---
 .../components/TimesheetFilterDate.tsx        | 40 ++++++++++++-------
 .../[locale]/timesheet/[memberId]/page.tsx    |  1 +
 .../manual-time/add-manual-time-modal.tsx     |  8 ++--
 apps/web/lib/features/task/task-filters.tsx   |  2 +-
 apps/web/locales/ar.json                      | 22 +++++++---
 apps/web/locales/bg.json                      | 28 ++++++++-----
 apps/web/locales/de.json                      | 16 ++++++--
 apps/web/locales/en.json                      | 16 ++++++--
 apps/web/locales/es.json                      | 16 ++++++--
 apps/web/locales/fr.json                      | 16 ++++++--
 apps/web/locales/he.json                      | 16 ++++++--
 apps/web/locales/it.json                      | 16 ++++++--
 apps/web/locales/nl.json                      | 16 ++++++--
 apps/web/locales/pl.json                      | 16 ++++++--
 apps/web/locales/pt.json                      | 16 ++++++--
 apps/web/locales/ru.json                      | 16 ++++++--
 apps/web/locales/zh.json                      | 18 +++++++--
 22 files changed, 246 insertions(+), 97 deletions(-)

diff --git a/apps/web/app/[locale]/permissions/component.tsx b/apps/web/app/[locale]/permissions/component.tsx
index 42810dfe6..f4f72d8b2 100644
--- a/apps/web/app/[locale]/permissions/component.tsx
+++ b/apps/web/app/[locale]/permissions/component.tsx
@@ -66,11 +66,10 @@ const Permissions = () => {
 					<div className="flex flex-col w-[35%] overflow-auto gap-2 mt-5">
 						{roles.map((role) => (
 							<div
-								className={`flex items-center justify-between w-full py-2 px-5 rounded-xl cursor-pointer ${
-									selectedRole && selectedRole.id === role.id
-										? 'bg-primary dark:bg-primary-light text-white'
-										: ''
-								}`}
+								className={`flex items-center justify-between w-full py-2 px-5 rounded-xl cursor-pointer ${selectedRole && selectedRole.id === role.id
+									? 'bg-primary dark:bg-primary-light text-white'
+									: ''
+									}`}
 								key={role?.id}
 								onClick={() => {
 									setSelectedRole(role);
@@ -103,7 +102,7 @@ const Permissions = () => {
 								</div>
 								<div className="flex w-full items-center justify-between gap-[2rem]">
 									<Text className="flex-none flex-grow-0 w-1/2 text-base font-normal text-gray-400 md-2">
-										Estimate issue
+										{t('pages.settingsTeam.ESTIMATE_ISSUE')}
 									</Text>
 									<div className="flex flex-row items-center justify-between flex-grow-0 w-full">
 										<CommonToggle
@@ -275,6 +274,8 @@ const Permissions = () => {
 };
 
 function SelectRole() {
+	const t = useTranslations();
+
 	return (
 		<div className="mt-28">
 			<div className="m-auto w-[218px] h-[218px] rounded-full relative flex justify-center items-center text-center p-5 bg-[#6755c933] dark:bg-light--theme-light">
@@ -282,7 +283,7 @@ function SelectRole() {
 			</div>
 
 			<Text className="text-2xl font-normal text-center mt-10 text-[#282048] dark:text-light--theme">
-				Please Select any Role
+				{t("common.SELECT_ROLE")}
 			</Text>
 		</div>
 	);
diff --git a/apps/web/app/[locale]/timesheet/[memberId]/components/EditTaskModal.tsx b/apps/web/app/[locale]/timesheet/[memberId]/components/EditTaskModal.tsx
index 5f90f720b..3dffdc1b5 100644
--- a/apps/web/app/[locale]/timesheet/[memberId]/components/EditTaskModal.tsx
+++ b/apps/web/app/[locale]/timesheet/[memberId]/components/EditTaskModal.tsx
@@ -114,7 +114,7 @@ export function EditTaskModal({ isOpen, closeModal }: IEditTaskModalProps) {
 
                     </div>
                     <div>
-                        <span className="block text-gray-500 mr-2">Date</span>
+                        <span className="block text-gray-500 mr-2">{t("manualTime.DATE")}</span>
                         <DatePickerFilter
                             date={dateRange.from}
                             setDate={handleFromChange}
@@ -133,7 +133,7 @@ export function EditTaskModal({ isOpen, closeModal }: IEditTaskModalProps) {
                         />
                     </div>
                     <div className=" flex flex-col items-center">
-                        <label className="text-gray-500 mr-6 ">Billable</label>
+                        <label className="text-gray-500 mr-6 capitalize">{t('pages.timesheet.BILLABLE.BILLABLE')}</label>
                         <div className="flex items-center gap-3">
                             <ToggleButton
                                 isActive={isBillable}
@@ -186,7 +186,7 @@ export function EditTaskModal({ isOpen, closeModal }: IEditTaskModalProps) {
                                 variant="outline"
                                 type="button"
                                 className={clsxm("dark:text-primary h-[2.3rem] border-gray-300 dark:border-slate-600 font-normal dark:bg-dark--theme-light")}>
-                                Cancel
+                                {t('common.CANCEL')}
                             </Button>
 
                             <Button
@@ -195,7 +195,7 @@ export function EditTaskModal({ isOpen, closeModal }: IEditTaskModalProps) {
                                     'bg-[#3826A6] h-[2.3rem] font-normal flex items-center text-white',
                                 )}
                             >
-                                Save
+                                {t('common.SAVE')}
                             </Button>
                         </div>
 
@@ -221,10 +221,10 @@ const ToggleButton = ({ isActive, onClick, label }: ToggleButtonProps) => (
             style={{
                 background: isActive
                     ? 'linear-gradient(to right, #9d91efb7, #8a7bedb7)'
-                    : '#6c57f4b7'
+                    : '#1f2937'
             }}
         >
-            <div className="bg-[#3826A6] w-4 h-4 rounded-full shadow-md transform transition-transform translate-x-0" />
+            <div className={clsxm("bg-[#3826A6] w-4 h-4 rounded-full shadow-md transform transition-transform translate-x-0", isActive && "bg-white")} />
         </div>
         <span>{label}</span>
     </div>
diff --git a/apps/web/app/[locale]/timesheet/[memberId]/components/RejectSelectedModal.tsx b/apps/web/app/[locale]/timesheet/[memberId]/components/RejectSelectedModal.tsx
index 954cb59b4..b1b4f9904 100644
--- a/apps/web/app/[locale]/timesheet/[memberId]/components/RejectSelectedModal.tsx
+++ b/apps/web/app/[locale]/timesheet/[memberId]/components/RejectSelectedModal.tsx
@@ -1,5 +1,6 @@
 import { clsxm } from "@/app/utils";
 import { Modal } from "@/lib/components";
+import { useTranslations } from "next-intl";
 import { useState } from "react";
 export interface IRejectSelectedModalProps {
     isOpen: boolean;
@@ -11,7 +12,7 @@ export interface IRejectSelectedModalProps {
 export function RejectSelectedModal({ isOpen, closeModal, maxReasonLength, onReject, minReasonLength }: IRejectSelectedModalProps) {
     const [isSubmitting, setIsSubmitting] = useState(false);
     const [reason, setReason] = useState('');
-
+    const t = useTranslations();
     const handleSubmit = async (e: React.FormEvent) => {
         e.preventDefault();
         setIsSubmitting(true);
@@ -33,7 +34,7 @@ export function RejectSelectedModal({ isOpen, closeModal, maxReasonLength, onRej
             <form onSubmit={handleSubmit}>
                 <div className="flex flex-col gap-4">
                     <span className="text-[#71717A] text-center">
-                        You are about to reject the selected entry, would you like to proceed?
+                        {t('pages.timesheet.YOU_ARE_ABOUT_TO_REJECT_ENTRY')}
                     </span>
                     <textarea
                         value={reason}
@@ -59,9 +60,8 @@ export function RejectSelectedModal({ isOpen, closeModal, maxReasonLength, onRej
                             type="button"
                             disabled={isSubmitting}
                             aria-label="Cancel rejection"
-                            className="dark:text-primary border-[#E2E8F0] dark:border-slate-600 font-normal dark:bg-dark--theme-light h-[2.2rem] text-gray-700 border px-2 rounded-lg"
-                        >
-                            Cancel
+                            className="dark:text-primary border-[#E2E8F0] dark:border-slate-600 font-normal dark:bg-dark--theme-light h-[2.2rem] text-gray-700 border px-2 rounded-lg">
+                            {t('common.CANCEL')}
                         </button>
                         <button
                             type="submit"
diff --git a/apps/web/app/[locale]/timesheet/[memberId]/components/TimeSheetFilterPopover.tsx b/apps/web/app/[locale]/timesheet/[memberId]/components/TimeSheetFilterPopover.tsx
index 99217f2a2..364542878 100644
--- a/apps/web/app/[locale]/timesheet/[memberId]/components/TimeSheetFilterPopover.tsx
+++ b/apps/web/app/[locale]/timesheet/[memberId]/components/TimeSheetFilterPopover.tsx
@@ -8,12 +8,14 @@ import {
     PopoverTrigger,
 } from "@components/ui/popover";
 import { SettingFilterIcon } from "@/assets/svg";
+import { useTranslations } from "next-intl";
 
 
 
 export function TimeSheetFilterPopover() {
     const { activeTeam } = useOrganizationTeams();
     const { tasks } = useTeamTasks();
+    const t = useTranslations();
     return (
         <>
             <Popover>
@@ -21,19 +23,19 @@ export function TimeSheetFilterPopover() {
                     <Button variant="outline"
                         className='flex items-center justify-center  h-[2.2rem] rounded-lg bg-white dark:bg-dark--theme-light border dark:border-gray-700 hover:bg-white p-3 gap-2'>
                         <SettingFilterIcon className="text-gray-700 dark:text-white w-3.5" strokeWidth="1.8" />
-                        <span className="text-gray-700 dark:text-white">Filter</span>
+                        <span className="text-gray-700 dark:text-white">{t('common.FILTER')}</span>
                     </Button>
                 </PopoverTrigger>
                 <PopoverContent className="w-96">
                     <div className="w-full flex flex-col">
                         <div className="flex mb-3 text-xl font-bold gap-2">
                             <SettingFilterIcon className="text-gray-700 dark:text-white w-4" strokeWidth="1.8" />
-                            <span className="text-gray-700 dark:text-white">Filters</span>
+                            <span className="text-gray-700 dark:text-white">{t('common.FILTER')}</span>
                         </div>
                         <div className="grid gap-5">
                             <div className="">
                                 <label className="flex justify-between text-gray-600 mb-1 text-sm">
-                                    <span className="text-[12px]">Employee</span>
+                                    <span className="text-[12px]">{t('manualTime.EMPLOYEE')}</span>
                                     <span className="text-primary/10">Clear</span>
                                 </label>
                                 <MultiSelect
@@ -47,7 +49,7 @@ export function TimeSheetFilterPopover() {
                             </div>
                             <div className="">
                                 <label className="flex justify-between text-gray-600 mb-1 text-sm">
-                                    <span className="text-[12px]">Project</span>
+                                    <span className="text-[12px]">{t('sidebar.PROJECTS')}</span>
                                     <span className="text-primary/10">Clear</span>
                                 </label>
                                 <MultiSelect
@@ -61,7 +63,7 @@ export function TimeSheetFilterPopover() {
                             </div>
                             <div className="">
                                 <label className="flex justify-between text-gray-600 mb-1 text-sm">
-                                    <span className="text-[12px]">Task</span>
+                                    <span className="text-[12px]">{t('hotkeys.TASK')}</span>
                                     <span className="text-primary/10">Clear</span>
                                 </label>
                                 <MultiSelect
@@ -75,7 +77,7 @@ export function TimeSheetFilterPopover() {
                             </div>
                             <div className="">
                                 <label className="flex justify-between text-gray-600 mb-1 text-sm">
-                                    <span className="text-[12px]">Status</span>
+                                    <span className="text-[12px]">{t('common.STATUS')}</span>
                                     <span className="text-primary/10">Clear</span>
                                 </label>
                                 <MultiSelect
diff --git a/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetFilter.tsx b/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetFilter.tsx
index a53934536..0a1f8ed0d 100644
--- a/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetFilter.tsx
+++ b/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetFilter.tsx
@@ -2,13 +2,17 @@ import { FilterWithStatus } from './FilterWithStatus';
 import { FrequencySelect, TimeSheetFilterPopover, TimesheetFilterDate, TimesheetFilterDateProps } from '.';
 import { Button } from 'lib/components';
 import { AddManualTimeModal } from '@/lib/features/manual-time/add-manual-time-modal';
+import { TranslationHooks } from 'next-intl';
+
 interface ITimesheetFilter {
     isOpen: boolean,
     openModal: () => void,
-    closeModal: () => void
+    closeModal: () => void,
+    t: TranslationHooks,
     initDate?: TimesheetFilterDateProps
 }
-export function TimesheetFilter({ closeModal, isOpen, openModal, initDate }: ITimesheetFilter,) {
+    
+export function TimesheetFilter({ closeModal, isOpen, openModal, t, initDate }: ITimesheetFilter,) {
     return (
         <>
             {
@@ -30,17 +34,16 @@ export function TimesheetFilter({ closeModal, isOpen, openModal, initDate }: ITi
 
                 <div className="flex gap-2">
                     <FrequencySelect />
-                    <TimesheetFilterDate {...initDate} />
+                    <TimesheetFilterDate t={t} {...initDate} />
                     <TimeSheetFilterPopover />
                     <Button
                         onClick={openModal}
                         variant="outline"
                         className="bg-primary/5 dark:bg-primary-light dark:border-transparent  !h-[2.2rem] font-medium">
-                        Add Time
+                        {t('common.ADD_TIME')}
                     </Button>
                 </div>
             </div>
-
         </>
     )
 }
diff --git a/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetFilterDate.tsx b/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetFilterDate.tsx
index d98f8a189..5c0229e8e 100644
--- a/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetFilterDate.tsx
+++ b/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetFilterDate.tsx
@@ -8,6 +8,7 @@ import {
 } from "@components/ui/popover"
 import { CalendarIcon } from "@radix-ui/react-icons"
 import { format } from "date-fns"
+import { TranslationHooks } from "next-intl"
 import React, { useEffect, useState } from "react"
 import { MdKeyboardArrowRight } from "react-icons/md"
 import { PiCalendarDotsThin } from "react-icons/pi"
@@ -16,25 +17,29 @@ interface DatePickerInputProps {
     date: Date | null;
     label: string;
 }
+
 export interface TimesheetFilterDateProps {
     onChange?: (range: { from: Date | null; to: Date | null }) => void;
     initialRange?: { from: Date | null; to: Date | null };
     minDate?: Date;
     maxDate?: Date;
+    t: TranslationHooks
 }
 
 export function TimesheetFilterDate({
     onChange,
     initialRange,
     minDate,
-    maxDate
+    maxDate,
+    t
 }: TimesheetFilterDateProps) {
-
     const [dateRange, setDateRange] = React.useState<{ from: Date | null; to: Date | null }>({
         from: initialRange?.from ?? new Date(),
         to: initialRange?.to ?? new Date(),
     });
-    const [isVisible, setIsVisible] = useState(false)
+  
+    const [isVisible, setIsVisible] = useState(false);
+    
     const handleFromChange = (fromDate: Date | null) => {
         if (maxDate && fromDate && fromDate > maxDate) {
             return;
@@ -53,34 +58,35 @@ export function TimesheetFilterDate({
     const handlePresetClick = (preset: string) => {
         const today = new Date();
         switch (preset) {
-            case 'Today':
+            case t('common.FILTER_TODAY'):
                 setDateRange({ from: today, to: today });
                 break;
-            case 'Last 7 days':
+            case t('common.FILTER_LAST_7_DAYS'):
                 setDateRange({
                     from: new Date(today.getFullYear(), today.getMonth(), today.getDate() - 7),
                     to: today
                 });
                 break;
-            case 'Last 30 days':
+            case t('common.FILTER_LAST_30_DAYS'):
                 setDateRange({
                     from: new Date(today.getFullYear(), today.getMonth(), today.getDate() - 30),
                     to: today
                 });
                 break;
-            case `This year (${today.getFullYear()})`:
+            case t('common.FILTER_THIS_YEAR', { year: new Date().getFullYear() }):
                 setDateRange({
                     from: new Date(today.getFullYear(), 0, 1),
                     to: today
                 });
                 break;
-            case 'Custom Date Range':
+            case t('common.FILTER_CUSTOM_RANGE'):
                 setDateRange({ from: null, to: null });
                 break;
             default:
                 break;
         }
     };
+  
     useEffect(() => {
         if (dateRange.from && dateRange.to) {
             onChange?.(dateRange);
@@ -111,7 +117,7 @@ export function TimesheetFilterDate({
                             format(dateRange.from, "LLL d, yyyy")
                         )
                     ) : (
-                        <span>Pick a date</span>
+                        <span>{t('manualTime.PICK_A_DATE')}</span>
                     )}
                 </Button>
             </PopoverTrigger>
@@ -139,7 +145,7 @@ export function TimesheetFilterDate({
                                     setDateRange(initialRange ?? { from: new Date(), to: new Date() });
                                     setIsVisible(false);
                                 }}>
-                                Cancel
+                                {t('common.CANCEL')}
                             </Button>
                             <Button
                                 variant={'outline'}
@@ -148,7 +154,7 @@ export function TimesheetFilterDate({
                                     onChange?.(dateRange);
                                     setIsVisible(false);
                                 }} >
-                                Apply
+                                {t('common.APPLY')}
                             </Button>
                         </div>
                     </div>
@@ -156,17 +162,23 @@ export function TimesheetFilterDate({
                 }
                 <div className="border border-slate-100 dark:border-gray-800 my-1"></div>
                 <div className="flex flex-col p-2">
-                    {["Today", "Last 7 days", "Last 30 days", `This year (${new Date().getFullYear()})`, "Custom Date Range"].map((label, index) => (
+                    {[
+                        t('common.FILTER_TODAY'),
+                        t('common.FILTER_LAST_7_DAYS'),
+                        t('common.FILTER_LAST_30_DAYS'),
+                        t('common.FILTER_THIS_YEAR', ({ year: new Date().getFullYear() })),
+                        t('common.FILTER_CUSTOM_RANGE')
+                    ].map((label, index) => (
                         <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"
                             onClick={() => {
-                                label === 'Custom Date Range' && setIsVisible((prev) => !prev)
+                                label === t('common.FILTER_CUSTOM_RANGE') && setIsVisible((prev) => !prev)
                                 handlePresetClick(label)
                             }}>
                             <span> {label}</span>
-                            {label === 'Custom Date Range' && <MdKeyboardArrowRight />}
+                            {label === t('common.FILTER_CUSTOM_RANGE') && <MdKeyboardArrowRight />}
                         </Button>
                     ))}
                 </div>
diff --git a/apps/web/app/[locale]/timesheet/[memberId]/page.tsx b/apps/web/app/[locale]/timesheet/[memberId]/page.tsx
index 4fa61ad1f..06a6441ff 100644
--- a/apps/web/app/[locale]/timesheet/[memberId]/page.tsx
+++ b/apps/web/app/[locale]/timesheet/[memberId]/page.tsx
@@ -158,6 +158,7 @@ const TimeSheet = React.memo(function TimeSheetPage({ params }: { params: { memb
                                 closeModal={closeManualTimeModal}
                                 openModal={openManualTimeModal}
                                 isOpen={isManualTimeModalOpen}
+                                t={t}
                             />
                             <div className='h-[calc(100vh-_291px)] mt-3 overflow-y-auto border border-gray-200 rounded-lg dark:border-gray-800'>
                                 {timesheetNavigator === 'ListView' ?
diff --git a/apps/web/lib/features/manual-time/add-manual-time-modal.tsx b/apps/web/lib/features/manual-time/add-manual-time-modal.tsx
index b7501369d..97151553c 100644
--- a/apps/web/lib/features/manual-time/add-manual-time-modal.tsx
+++ b/apps/web/lib/features/manual-time/add-manual-time-modal.tsx
@@ -200,7 +200,7 @@ export function AddManualTimeModal(props: Readonly<IAddManualTimeModalProps>) {
 		<Modal
 			isOpen={isOpen}
 			closeModal={closeModal}
-			title={'Add Time'}
+			title={t('common.ADD_TIME')}
 			className="bg-light--theme-light dark:bg-dark--theme-light p-5 rounded-xl w-full md:w-40 md:min-w-[24rem] h-[auto] justify-start"
 			titleClass="font-bold"
 		>
@@ -239,7 +239,7 @@ export function AddManualTimeModal(props: Readonly<IAddManualTimeModalProps>) {
 				</div>
 
 				<div className=" flex items-center">
-					<label className="block text-gray-500 mr-2">Billable</label>
+					<label className="block text-gray-500 mr-2">{t('pages.timesheet.BILLABLE.BILLABLE')}</label>
 					<div
 						className={`w-12 h-6 flex items-center bg-[#6c57f4b7] rounded-full p-1 cursor-pointer `}
 						onClick={() => setIsBillable(!isBillable)}
@@ -411,7 +411,7 @@ export function AddManualTimeModal(props: Readonly<IAddManualTimeModalProps>) {
 								type="button"
 								className="dark:text-primary border-gray-300 dark:border-slate-600 font-bold dark:bg-dark--theme-light"
 							>
-								View timesheet
+								{t('common.VIEW_TIMESHEET')}
 							</Button>
 						)}
 						<Button
@@ -423,7 +423,7 @@ export function AddManualTimeModal(props: Readonly<IAddManualTimeModalProps>) {
 								`${params === 'AddManuelTime' && 'w-full'}`
 							)}
 						>
-							Add Time
+							{t('common.ADD_TIME')}
 						</Button>
 					</>
 				</div>
diff --git a/apps/web/lib/features/task/task-filters.tsx b/apps/web/lib/features/task/task-filters.tsx
index 4bb960e9f..3b4125323 100644
--- a/apps/web/lib/features/task/task-filters.tsx
+++ b/apps/web/lib/features/task/task-filters.tsx
@@ -357,7 +357,7 @@ function InputFilters({ hook, profile }: Props) {
 				)}
 			>
 				<span className="text-xl">+</span>
-				Add time
+				{t('common.ADD_TIME')}
 			</Button>
 
 			{/* Assign task combobox */}
diff --git a/apps/web/locales/ar.json b/apps/web/locales/ar.json
index 83d083624..d977cdb04 100644
--- a/apps/web/locales/ar.json
+++ b/apps/web/locales/ar.json
@@ -236,7 +236,15 @@
 		"SET_AS_NEXT": "تعيين كالتالي",
 		"MOVE_TO": "نقل إلى",
 		"SELECT_DATE": "اختر التاريخ",
-		"SELECT_AND_CLOSE": "اختر وأغلق"
+		"SELECT_AND_CLOSE": "اختر وأغلق",
+		"SELECT_ROLE": "يرجى اختيار أي دور",
+		"ADD_TIME": "إضافة وقت",
+		"VIEW_TIMESHEET": "عرض جدول الزمن",
+		"FILTER_TODAY": "اليوم",
+		"FILTER_LAST_7_DAYS": "آخر 7 أيام",
+		"FILTER_LAST_30_DAYS": "آخر 30 يومًا",
+		"FILTER_THIS_YEAR": "هذا العام {year}",
+		"FILTER_CUSTOM_RANGE": "نطاق مخصص"
 	},
 	"sidebar": {
 		"DASHBOARD": "لوحة التحكم",
@@ -551,12 +559,12 @@
 			"HEADING_DESCRIPTION": "نقوم حاليًا بتحديث موقعنا الإلكتروني لخدمتك بشكل أفضل. يرجى التحقق مرة أخرى في وقت لاحق."
 		},
 		"timesheet": {
-			"TIMESHEET_TITLE": "سجل الساعات",
+			"TIMESHEET_TITLE": "جدول العمل",
 			"TIMESHEET_VIEW_DETAILS": "عرض التفاصيل",
 			"TIMESHEET_ACTION_APPROVE_SELECTED": "الموافقة على المحدد",
 			"TIMESHEET_ACTION_REJECT_SELECTED": "رفض المحدد",
 			"TIMESHEET_ACTION_DELETE_SELECTED": "حذف المحدد",
-			"HEADING_DESCRIPTION": "هذا هو لوحة المعلومات الشخصية الخاصة بك، تظهر لك ما يحتاج إلى انتباهك الآن.",
+			"HEADING_DESCRIPTION": "هذه لوحة التحكم الخاصة بجداولك الزمنية، تعرض ما يحتاج إلى اهتمامك الآن.",
 			"GREETINGS": {
 				"GOOD_MORNING": "صباح الخير",
 				"GOOD_AFTERNOON": "مساء الخير",
@@ -568,10 +576,12 @@
 			},
 			"BILLABLE": {
 				"YES": "نعم",
-				"NO": "لا"
+				"NO": "لا",
+				"BILLABLE": "قابل للفوترة"
 			},
-			"LOADING": "جارٍ تحميل بيانات سجل الزمن...",
-			"NO_ENTRIES_FOUND": "لم يتم العثور على إدخالات سجل الزمن"
+			"LOADING": "جار تحميل بيانات الجدول الزمني...",
+			"NO_ENTRIES_FOUND": "لم يتم العثور على مدخلات في الجدول الزمني",
+			"YOU_ARE_ABOUT_TO_REJECT_ENTRY": "أنت على وشك رفض الإدخال المحدد، هل ترغب في المتابعة؟"
 		}
 	},
 	"timer": {
diff --git a/apps/web/locales/bg.json b/apps/web/locales/bg.json
index 691dedbf5..8042b15b4 100644
--- a/apps/web/locales/bg.json
+++ b/apps/web/locales/bg.json
@@ -254,7 +254,15 @@
 		"SET_AS_NEXT": "Задайте като следващо",
 		"MOVE_TO": "Преместете в",
 		"SELECT_DATE": "Изберете дата",
-		"SELECT_AND_CLOSE": "Изберете и затворете"
+		"SELECT_AND_CLOSE": "Изберете и затворете",
+		"SELECT_ROLE": "Моля, изберете роля",
+		"ADD_TIME": "Добавете време",
+		"VIEW_TIMESHEET": "Преглед на работния час",
+		"FILTER_TODAY": "Днес",
+		"FILTER_LAST_7_DAYS": "Последните 7 дни",
+		"FILTER_LAST_30_DAYS": "Последните 30 дни",
+		"FILTER_THIS_YEAR": "Тази година {year}",
+		"FILTER_CUSTOM_RANGE": "Потребителски диапазон"
 	},
 	"hotkeys": {
 		"HELP": "Помощ",
@@ -551,27 +559,29 @@
 			"HEADING_DESCRIPTION": "В момента актуализираме нашия уебсайт, за да ви служим по-добре. Моля, проверете отново по-късно."
 		},
 		"timesheet": {
-			"TIMESHEET_TITLE": "Таблица на часовете",
-			"TIMESHEET_VIEW_DETAILS": "Преглед на детайлите",
+			"TIMESHEET_TITLE": "Таблица за работно време",
+			"TIMESHEET_VIEW_DETAILS": "Виж подробности",
 			"TIMESHEET_ACTION_APPROVE_SELECTED": "Одобрете избраното",
 			"TIMESHEET_ACTION_REJECT_SELECTED": "Отхвърлете избраното",
 			"TIMESHEET_ACTION_DELETE_SELECTED": "Изтрийте избраното",
-			"HEADING_DESCRIPTION": "Това е вашата лична табло на часовете, показваща какво изисква вашето внимание сега.",
+			"HEADING_DESCRIPTION": "Това е вашето лично табло за работно време, показващо какво изисква вашето внимание сега.",
 			"GREETINGS": {
 				"GOOD_MORNING": "Добро утро",
 				"GOOD_AFTERNOON": "Добър следобед",
 				"GOOD_EVENING": "Добър вечер"
 			},
 			"VIEWS": {
-				"LIST": "Списъчен изглед",
-				"CALENDAR": "Календарен изглед"
+				"LIST": "Изглед на списък",
+				"CALENDAR": "Изглед на календар"
 			},
 			"BILLABLE": {
 				"YES": "Да",
-				"NO": "Не"
+				"NO": "Не",
+				"BILLABLE": "Фактурируемо"
 			},
-			"LOADING": "Зареждане на данни за таблицата на работното време...",
-			"NO_ENTRIES_FOUND": "Няма намерени записи за таблицата на работното време"
+			"LOADING": "Зареждане на данни за таблицата за работно време...",
+			"NO_ENTRIES_FOUND": "Няма намерени записи в таблицата за работно време",
+			"YOU_ARE_ABOUT_TO_REJECT_ENTRY": "Вие ще отхвърлите избрания запис, искате ли да продължите?"
 		}
 	},
 	"timer": {
diff --git a/apps/web/locales/de.json b/apps/web/locales/de.json
index a0e5e703a..43c1d47a4 100644
--- a/apps/web/locales/de.json
+++ b/apps/web/locales/de.json
@@ -254,7 +254,15 @@
 		"SET_AS_NEXT": "Als nächstes festlegen",
 		"MOVE_TO": "Verschieben nach",
 		"SELECT_DATE": "Datum auswählen",
-		"SELECT_AND_CLOSE": "Auswählen und schließen"
+		"SELECT_AND_CLOSE": "Auswählen und schließen",
+		"SELECT_ROLE": "Bitte wählen Sie eine Rolle",
+		"ADD_TIME": "Zeit hinzufügen",
+		"VIEW_TIMESHEET": "Zeiterfassung anzeigen",
+		"FILTER_TODAY": "Heute",
+		"FILTER_LAST_7_DAYS": "Letzte 7 Tage",
+		"FILTER_LAST_30_DAYS": "Letzte 30 Tage",
+		"FILTER_THIS_YEAR": "Dieses Jahr {year}",
+		"FILTER_CUSTOM_RANGE": "Benutzerdefinierter Bereich"
 	},
 	"hotkeys": {
 		"HELP": "Hilfe",
@@ -568,10 +576,12 @@
 			},
 			"BILLABLE": {
 				"YES": "Ja",
-				"NO": "Nein"
+				"NO": "Nein",
+				"BILLABLE": "ABRECHNUNGSFÄHIG"
 			},
 			"LOADING": "Lade Zeiterfassungsdaten...",
-			"NO_ENTRIES_FOUND": "Keine Zeiterfassungseinträge gefunden"
+			"NO_ENTRIES_FOUND": "Keine Zeiterfassungseinträge gefunden",
+			"YOU_ARE_ABOUT_TO_REJECT_ENTRY": "Sie sind dabei, den ausgewählten Eintrag abzulehnen. Möchten Sie fortfahren?"
 		}
 	},
 	"timer": {
diff --git a/apps/web/locales/en.json b/apps/web/locales/en.json
index 7c8fef2f2..52974d479 100644
--- a/apps/web/locales/en.json
+++ b/apps/web/locales/en.json
@@ -254,7 +254,15 @@
 		"SET_AS_NEXT": "Set as next",
 		"MOVE_TO": "Move to",
 		"SELECT_DATE": "Select date",
-		"SELECT_AND_CLOSE": "Select & Close"
+		"SELECT_AND_CLOSE": "Select & Close",
+		"SELECT_ROLE": "Please Select any Role",
+		"ADD_TIME": "Add Time",
+		"VIEW_TIMESHEET": "View timesheet",
+		"FILTER_TODAY": "Today",
+		"FILTER_LAST_7_DAYS": "Last 7 Days",
+		"FILTER_LAST_30_DAYS": "Last 30 Days",
+		"FILTER_THIS_YEAR": "This year {year}",
+		"FILTER_CUSTOM_RANGE": "Custom Range"
 	},
 	"hotkeys": {
 		"HELP": "Help",
@@ -568,10 +576,12 @@
 			},
 			"BILLABLE": {
 				"YES": "Yes",
-				"NO": "No"
+				"NO": "No",
+				"BILLABLE": "BILLABLE"
 			},
 			"LOADING": "Loading timesheet data...",
-			"NO_ENTRIES_FOUND": "No timesheet entries found"
+			"NO_ENTRIES_FOUND": "No timesheet entries found",
+			"YOU_ARE_ABOUT_TO_REJECT_ENTRY": "You are about to reject the selected entry, would you like to proceed?"
 		}
 	},
 	"timer": {
diff --git a/apps/web/locales/es.json b/apps/web/locales/es.json
index 5502d47b5..98ed6351d 100644
--- a/apps/web/locales/es.json
+++ b/apps/web/locales/es.json
@@ -254,7 +254,15 @@
 		"SET_AS_NEXT": "Establecer como siguiente",
 		"MOVE_TO": "Mover a",
 		"SELECT_DATE": "Seleccionar fecha",
-		"SELECT_AND_CLOSE": "Seleccionar y cerrar"
+		"SELECT_AND_CLOSE": "Seleccionar y cerrar",
+		"SELECT_ROLE": "Por favor, selecciona un rol",
+		"ADD_TIME": "Agregar tiempo",
+		"VIEW_TIMESHEET": "Ver hoja de tiempo",
+		"FILTER_TODAY": "Hoy",
+		"FILTER_LAST_7_DAYS": "Últimos 7 días",
+		"FILTER_LAST_30_DAYS": "Últimos 30 días",
+		"FILTER_THIS_YEAR": "Este año {year}",
+		"FILTER_CUSTOM_RANGE": "Rango personalizado"
 	},
 	"hotkeys": {
 		"HELP": "Ayuda",
@@ -568,10 +576,12 @@
 			},
 			"BILLABLE": {
 				"YES": "Sí",
-				"NO": "No"
+				"NO": "No",
+				"BILLABLE": "FACTURABLE"
 			},
 			"LOADING": "Cargando datos del registro de horas...",
-			"NO_ENTRIES_FOUND": "No se encontraron entradas en el registro de horas"
+			"NO_ENTRIES_FOUND": "No se encontraron entradas en el registro de horas",
+			"YOU_ARE_ABOUT_TO_REJECT_ENTRY": "Estás a punto de rechazar la entrada seleccionada, ¿te gustaría continuar?"
 		}
 	},
 	"timer": {
diff --git a/apps/web/locales/fr.json b/apps/web/locales/fr.json
index ffbd13c0a..e0ce01e92 100644
--- a/apps/web/locales/fr.json
+++ b/apps/web/locales/fr.json
@@ -254,7 +254,15 @@
 		"SET_AS_NEXT": "Définir comme suivant",
 		"MOVE_TO": "Déplacer vers",
 		"SELECT_DATE": "Sélectionner la date",
-		"SELECT_AND_CLOSE": "Sélectionner et fermer"
+		"SELECT_AND_CLOSE": "Sélectionner et fermer",
+		"SELECT_ROLE": "Veuillez sélectionner un rôle",
+		"ADD_TIME": "Ajouter du temps",
+		"VIEW_TIMESHEET": "Voir la feuille de temps",
+		"FILTER_TODAY": "Aujourd'hui",
+		"FILTER_LAST_7_DAYS": "Derniers 7 jours",
+		"FILTER_LAST_30_DAYS": "Derniers 30 jours",
+		"FILTER_THIS_YEAR": "Cette année {year}",
+		"FILTER_CUSTOM_RANGE": "Plage personnalisée"
 	},
 	"hotkeys": {
 		"HELP": "Aide",
@@ -568,10 +576,12 @@
 			},
 			"BILLABLE": {
 				"YES": "Oui",
-				"NO": "Non"
+				"NO": "Non",
+				"BILLABLE": "Facturable"
 			},
 			"LOADING": "Chargement des données de la feuille de temps...",
-			"NO_ENTRIES_FOUND": "Aucune entrée de feuille de temps trouvée"
+			"NO_ENTRIES_FOUND": "Aucune entrée de feuille de temps trouvée",
+			"YOU_ARE_ABOUT_TO_REJECT_ENTRY": "Vous êtes sur le point de rejeter l'entrée sélectionnée, souhaitez-vous continuer ?"
 		}
 	},
 	"timer": {
diff --git a/apps/web/locales/he.json b/apps/web/locales/he.json
index c66276ce6..2762188c2 100644
--- a/apps/web/locales/he.json
+++ b/apps/web/locales/he.json
@@ -254,7 +254,15 @@
 		"SET_AS_NEXT": "הגדר כהבא",
 		"MOVE_TO": "העבר אל",
 		"SELECT_DATE": "בחר תאריך",
-		"SELECT_AND_CLOSE": "בחר וסגור"
+		"SELECT_AND_CLOSE": "בחר וסגור",
+		"SELECT_ROLE": "אנא בחר תפקיד",
+		"ADD_TIME": "הוסף זמן",
+		"VIEW_TIMESHEET": "הצג גיליון זמן",
+		"FILTER_TODAY": "היום",
+		"FILTER_LAST_7_DAYS": "ה-7 ימים האחרונים",
+		"FILTER_LAST_30_DAYS": "ה-30 ימים האחרונים",
+		"FILTER_THIS_YEAR": "שנה זו {year}",
+		"FILTER_CUSTOM_RANGE": "טווח מותאם אישית"
 	},
 	"hotkeys": {
 		"HELP": "עזרה",
@@ -568,10 +576,12 @@
 			},
 			"BILLABLE": {
 				"YES": "כן",
-				"NO": "לא"
+				"NO": "לא",
+				"BILLABLE": "חיוב"
 			},
 			"LOADING": "טוען נתוני רשומת זמן...",
-			"NO_ENTRIES_FOUND": "לא נמצאו רשומות זמן"
+			"NO_ENTRIES_FOUND": "לא נמצאו רשומות זמן",
+			"YOU_ARE_ABOUT_TO_REJECT_ENTRY": "אתה עומד לדחות את הרשומה הנבחרת, האם ברצונך להמשיך?"
 		}
 	},
 	"timer": {
diff --git a/apps/web/locales/it.json b/apps/web/locales/it.json
index f33c63449..79e55f0d3 100644
--- a/apps/web/locales/it.json
+++ b/apps/web/locales/it.json
@@ -254,7 +254,15 @@
 		"SET_AS_NEXT": "Imposta come successivo",
 		"MOVE_TO": "Sposta a",
 		"SELECT_DATE": "Seleziona data",
-		"SELECT_AND_CLOSE": "Seleziona e chiudi"
+		"SELECT_AND_CLOSE": "Seleziona e chiudi",
+		"SELECT_ROLE": "Seleziona un ruolo",
+		"ADD_TIME": "Aggiungi tempo",
+		"VIEW_TIMESHEET": "Vedi foglio ore",
+		"FILTER_TODAY": "Oggi",
+		"FILTER_LAST_7_DAYS": "Ultimi 7 giorni",
+		"FILTER_LAST_30_DAYS": "Ultimi 30 giorni",
+		"FILTER_THIS_YEAR": "Quest'anno {year}",
+		"FILTER_CUSTOM_RANGE": "Intervallo personalizzato"
 	},
 	"hotkeys": {
 		"HELP": "Aiuto",
@@ -568,10 +576,12 @@
 			},
 			"BILLABLE": {
 				"YES": "Sì",
-				"NO": "No"
+				"NO": "No",
+				"BILLABLE": "FATTURABILE"
 			},
 			"LOADING": "Caricamento dati della registrazione ore...",
-			"NO_ENTRIES_FOUND": "Nessuna voce di registrazione ore trovata"
+			"NO_ENTRIES_FOUND": "Nessuna voce di registrazione ore trovata",
+			"YOU_ARE_ABOUT_TO_REJECT_ENTRY": "Stai per rifiutare l'elemento selezionato, vuoi procedere?"
 		}
 	},
 	"timer": {
diff --git a/apps/web/locales/nl.json b/apps/web/locales/nl.json
index 8ea73e7ce..8919befc3 100644
--- a/apps/web/locales/nl.json
+++ b/apps/web/locales/nl.json
@@ -254,7 +254,15 @@
 		"SET_AS_NEXT": "Instellen als volgende",
 		"MOVE_TO": "Verplaatsen naar",
 		"SELECT_DATE": "Selecteer datum",
-		"SELECT_AND_CLOSE": "Selecteren en sluiten"
+		"SELECT_AND_CLOSE": "Selecteren en sluiten",
+		"SELECT_ROLE": "Selecteer een rol",
+		"ADD_TIME": "Tijd toevoegen",
+		"VIEW_TIMESHEET": "Bekijk tijdregistratie",
+		"FILTER_TODAY": "Vandaag",
+		"FILTER_LAST_7_DAYS": "Laatste 7 dagen",
+		"FILTER_LAST_30_DAYS": "Laatste 30 dagen",
+		"FILTER_THIS_YEAR": "Dit jaar {year}",
+		"FILTER_CUSTOM_RANGE": "Aangepast bereik"
 	},
 	"hotkeys": {
 		"HELP": "Help",
@@ -568,10 +576,12 @@
 			},
 			"BILLABLE": {
 				"YES": "Ja",
-				"NO": "Nee"
+				"NO": "Nee",
+				"BILLABLE": "Factureerbaar"
 			},
 			"LOADING": "Tijdregistratiegegevens laden...",
-			"NO_ENTRIES_FOUND": "Geen tijdregistratie-invoeren gevonden"
+			"NO_ENTRIES_FOUND": "Geen tijdregistratie-invoeren gevonden",
+			"YOU_ARE_ABOUT_TO_REJECT_ENTRY": "Je staat op het punt de geselecteerde invoer te weigeren, wil je doorgaan?"
 		}
 	},
 	"timer": {
diff --git a/apps/web/locales/pl.json b/apps/web/locales/pl.json
index 4dbbaa5a1..fb9a1170a 100644
--- a/apps/web/locales/pl.json
+++ b/apps/web/locales/pl.json
@@ -254,7 +254,15 @@
 		"SET_AS_NEXT": "Ustaw jako następny",
 		"MOVE_TO": "Przenieś do",
 		"SELECT_DATE": "Wybierz datę",
-		"SELECT_AND_CLOSE": "Wybierz i zamknij"
+		"SELECT_AND_CLOSE": "Wybierz i zamknij",
+		"SELECT_ROLE": "Proszę wybrać rolę",
+		"ADD_TIME": "Dodaj czas",
+		"VIEW_TIMESHEET": "Zobacz Ewidencję czasu",
+		"FILTER_TODAY": "Dziś",
+		"FILTER_LAST_7_DAYS": "Ostatnie 7 dni",
+		"FILTER_LAST_30_DAYS": "Ostatnie 30 dni",
+		"FILTER_THIS_YEAR": "Ten rok {year}",
+		"FILTER_CUSTOM_RANGE": "Zakres niestandardowy"
 	},
 	"hotkeys": {
 		"HELP": "Pomoc",
@@ -568,10 +576,12 @@
 			},
 			"BILLABLE": {
 				"YES": "Tak",
-				"NO": "Nie"
+				"NO": "Nie",
+				"BILLABLE": "Do fakturowania"
 			},
 			"LOADING": "Ładowanie danych rejestru czasu...",
-			"NO_ENTRIES_FOUND": "Nie znaleziono żadnych wpisów w rejestrze czasu"
+			"NO_ENTRIES_FOUND": "Nie znaleziono żadnych wpisów w rejestrze czasu",
+			"YOU_ARE_ABOUT_TO_REJECT_ENTRY": "Zaraz odrzucisz wybraną pozycję, czy chcesz kontynuować?"
 		}
 	},
 	"timer": {
diff --git a/apps/web/locales/pt.json b/apps/web/locales/pt.json
index 504c398d7..f1a2201b2 100644
--- a/apps/web/locales/pt.json
+++ b/apps/web/locales/pt.json
@@ -254,7 +254,15 @@
 		"SET_AS_NEXT": "Definir como o próximo",
 		"MOVE_TO": "Mover para",
 		"SELECT_DATE": "Selecionar data",
-		"SELECT_AND_CLOSE": "Selecionar e fechar"
+		"SELECT_AND_CLOSE": "Selecionar e fechar",
+		"SELECT_ROLE": "Por favor, selecione um cargo",
+		"ADD_TIME": "Adicionar tempo",
+		"VIEW_TIMESHEET": "Ver folha de ponto",
+		"FILTER_TODAY": "Hoje",
+		"FILTER_LAST_7_DAYS": "Últimos 7 dias",
+		"FILTER_LAST_30_DAYS": "Últimos 30 dias",
+		"FILTER_THIS_YEAR": "Este ano {year}",
+		"FILTER_CUSTOM_RANGE": "Faixa personalizada"
 	},
 	"hotkeys": {
 		"HELP": "Ajuda",
@@ -568,10 +576,12 @@
 			},
 			"BILLABLE": {
 				"YES": "Sim",
-				"NO": "Não"
+				"NO": "Não",
+				"BILLABLE": "Faturável"
 			},
 			"LOADING": "Загрузка данных учета рабочего времени...",
-			"NO_ENTRIES_FOUND": "Записи учета рабочего времени не найдены"
+			"NO_ENTRIES_FOUND": "Записи учета рабочего времени не найдены",
+			"YOU_ARE_ABOUT_TO_REJECT_ENTRY": "Você está prestes a rejeitar a entrada selecionada, deseja continuar?"
 		}
 	},
 	"timer": {
diff --git a/apps/web/locales/ru.json b/apps/web/locales/ru.json
index a4f68ed9f..f0afd994e 100644
--- a/apps/web/locales/ru.json
+++ b/apps/web/locales/ru.json
@@ -254,7 +254,15 @@
 		"SET_AS_NEXT": "Установить следующим",
 		"MOVE_TO": "Переместить в",
 		"SELECT_DATE": "Выберите дату",
-		"SELECT_AND_CLOSE": "Выбрать и закрыть"
+		"SELECT_AND_CLOSE": "Выбрать и закрыть",
+		"SELECT_ROLE": "Пожалуйста, выберите роль",
+		"ADD_TIME": "Добавить время",
+		"VIEW_TIMESHEET": "Просмотреть табель",
+		"FILTER_TODAY": "Сегодня",
+		"FILTER_LAST_7_DAYS": "Последние 7 дней",
+		"FILTER_LAST_30_DAYS": "Последние 30 дней",
+		"FILTER_THIS_YEAR": "Этот год {year}",
+		"FILTER_CUSTOM_RANGE": "Пользовательский диапазон"
 	},
 	"hotkeys": {
 		"HELP": "Помощь",
@@ -568,10 +576,12 @@
 			},
 			"BILLABLE": {
 				"YES": "Да",
-				"NO": "Нет"
+				"NO": "Нет",
+				"BILLABLE": "Подлежащий оплате"
 			},
 			"LOADING": "Загрузка данных учета времени...",
-			"NO_ENTRIES_FOUND": "Записи учета времени не найдены"
+			"NO_ENTRIES_FOUND": "Записи учета времени не найдены",
+			"YOU_ARE_ABOUT_TO_REJECT_ENTRY": "Вы собираетесь отклонить выбранную запись, хотите продолжить?"
 		}
 	},
 	"timer": {
diff --git a/apps/web/locales/zh.json b/apps/web/locales/zh.json
index b3e8d1cdc..1b63a666f 100644
--- a/apps/web/locales/zh.json
+++ b/apps/web/locales/zh.json
@@ -254,7 +254,15 @@
 		"SET_AS_NEXT": "设置为下一个",
 		"MOVE_TO": "移动到",
 		"SELECT_DATE": "选择日期",
-		"SELECT_AND_CLOSE": "选择并关闭"
+		"SELECT_AND_CLOSE": "选择并关闭",
+		"SELECT_ROLE": "请选择角色",
+		"ADD_TIME": "添加时间",
+		"VIEW_TIMESHEET": "查看工时表",
+		"FILTER_TODAY": "今天",
+		"FILTER_LAST_7_DAYS": "过去7天",
+		"FILTER_LAST_30_DAYS": "过去30天",
+		"FILTER_THIS_YEAR": "今年 {year}",
+		"FILTER_CUSTOM_RANGE": "自定义范围"
 	},
 	"hotkeys": {
 		"HELP": "帮助",
@@ -568,10 +576,12 @@
 			},
 			"BILLABLE": {
 				"YES": "是",
-				"NO": "否"
+				"NO": "否",
+				"BILLABLE": "可计费"
 			},
-			"LOADING": "Cargando datos de registro de horas...",
-			"NO_ENTRIES_FOUND": "No se encontraron entradas de registro de horas"
+			"LOADING": "加载时间表数据...",
+			"NO_ENTRIES_FOUND": "未找到时间表记录",
+			"YOU_ARE_ABOUT_TO_REJECT_ENTRY": "你即将拒绝选定的条目，是否继续？"
 		}
 	},
 	"timer": {

From 7876fcc90bf2400d23df2a2422196a3f4c5a9575 Mon Sep 17 00:00:00 2001
From: Innocent-akim <gentilakili98@gmail.com>
Date: Fri, 8 Nov 2024 23:19:32 +0200
Subject: [PATCH 5/6] feat: add grouped display for timesheet data by date

---
 .../[memberId]/components/TimesheetFilter.tsx |  4 ++--
 .../[locale]/timesheet/[memberId]/page.tsx    |  7 +++---
 apps/web/app/hooks/features/useTimesheet.ts   | 22 ++++++++++++++++++-
 .../calendar/table-time-sheet.tsx             |  1 -
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetFilter.tsx b/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetFilter.tsx
index 0a1f8ed0d..b669fa3b7 100644
--- a/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetFilter.tsx
+++ b/apps/web/app/[locale]/timesheet/[memberId]/components/TimesheetFilter.tsx
@@ -9,9 +9,9 @@ interface ITimesheetFilter {
     openModal: () => void,
     closeModal: () => void,
     t: TranslationHooks,
-    initDate?: TimesheetFilterDateProps
+    initDate?: Pick<TimesheetFilterDateProps, 'initialRange' | 'onChange' | 'maxDate' | 'minDate'>
 }
-    
+
 export function TimesheetFilter({ closeModal, isOpen, openModal, t, initDate }: ITimesheetFilter,) {
     return (
         <>
diff --git a/apps/web/app/[locale]/timesheet/[memberId]/page.tsx b/apps/web/app/[locale]/timesheet/[memberId]/page.tsx
index 06a6441ff..f002a4942 100644
--- a/apps/web/app/[locale]/timesheet/[memberId]/page.tsx
+++ b/apps/web/app/[locale]/timesheet/[memberId]/page.tsx
@@ -8,7 +8,7 @@ import { withAuthentication } from 'lib/app/authenticator';
 import { Breadcrumb, Container } from 'lib/components';
 import { MainLayout } from 'lib/layout';
 
-import { useAuthenticateUser, useDailyPlan, useLocalStorageState, useModal, useOrganizationTeams } from '@app/hooks';
+import { useAuthenticateUser, useLocalStorageState, useModal, useOrganizationTeams } from '@app/hooks';
 import { clsxm } from '@app/utils';
 import { fullWidthState } from '@app/stores/fullWidth';
 import { useAtomValue } from 'jotai';
@@ -42,11 +42,12 @@ const TimeSheet = React.memo(function TimeSheetPage({ params }: { params: { memb
         to: endOfDay(new Date()),
     });
 
-    const { sortedPlans } = useDailyPlan();
     const { timesheet } = useTimesheet({
         startDate: dateRange.from ?? "",
         endDate: dateRange.to ?? ""
     });
+
+
     const {
         isOpen: isManualTimeModalOpen,
         openModal: openManualTimeModal,
@@ -162,7 +163,7 @@ const TimeSheet = React.memo(function TimeSheetPage({ params }: { params: { memb
                             />
                             <div className='h-[calc(100vh-_291px)] mt-3 overflow-y-auto border border-gray-200 rounded-lg dark:border-gray-800'>
                                 {timesheetNavigator === 'ListView' ?
-                                    <TimesheetView data={sortedPlans} />
+                                    <TimesheetView data={timesheet} />
                                     : <CalendarView />
                                 }
                             </div>
diff --git a/apps/web/app/hooks/features/useTimesheet.ts b/apps/web/app/hooks/features/useTimesheet.ts
index 91a8b473a..c67616373 100644
--- a/apps/web/app/hooks/features/useTimesheet.ts
+++ b/apps/web/app/hooks/features/useTimesheet.ts
@@ -5,12 +5,15 @@ import { useQuery } from '../useQuery';
 import { useCallback, useEffect } from 'react';
 import { getTaskTimesheetLogsApi } from '@/app/services/client/api/timer/timer-log';
 import moment from 'moment';
+import { ITimeSheet } from '@/app/interfaces';
 
 interface TimesheetParams {
     startDate: Date | string;
     endDate: Date | string;
 }
 
+
+
 export function useTimesheet({
     startDate,
     endDate,
@@ -42,9 +45,26 @@ export function useTimesheet({
     useEffect(() => {
         getTaskTimesheet({ startDate, endDate });
     }, [getTaskTimesheet, startDate, endDate]);
+
+
+    const groupByDate = (items: ITimeSheet[]) => {
+        const groupedByDate = items.reduce((acc: Record<string, ITimeSheet[]>, item) => {
+            const date = new Date(item.createdAt).toISOString().split('T')[0];
+            if (!acc[date]) {
+                acc[date] = [];
+            }
+            acc[date].push(item);
+            return acc;
+        }, {});
+        return Object.keys(groupedByDate).map((date) => ({
+            date,
+            tasks: groupedByDate[date]
+        })) as [];
+    }
+
     return {
         loadingTimesheet,
-        timesheet,
+        timesheet: groupByDate(timesheet),
         getTaskTimesheet,
     };
 }
diff --git a/apps/web/lib/features/integrations/calendar/table-time-sheet.tsx b/apps/web/lib/features/integrations/calendar/table-time-sheet.tsx
index a6cb33f44..25ed36ef3 100644
--- a/apps/web/lib/features/integrations/calendar/table-time-sheet.tsx
+++ b/apps/web/lib/features/integrations/calendar/table-time-sheet.tsx
@@ -225,7 +225,6 @@ export function DataTableTimeSheet({ data }: { data?: IDailyPlan[] }) {
                 console.error(`Unsupported action: ${action}`);
         }
     };
-    console.log("================>", data)
 
     return (
         <div className="w-full dark:bg-dark--theme">

From 85f65278d1e7643c113b363b2239fac565394a71 Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Sat, 9 Nov 2024 08:00:42 +0100
Subject: [PATCH 6/6] chore: desktop apps

---
 .circleci/config.yml                          |  90 +++++-----
 .github/workflows/desktop-server-api.apps.yml | 155 +----------------
 .github/workflows/desktop-server-web.apps.yml | 158 +-----------------
 .github/workflows/desktop.apps.yml            | 158 +-----------------
 4 files changed, 60 insertions(+), 501 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6728f669a..2ae992d15 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,53 +1,53 @@
 version: 2.1
 
 orbs:
-    node: circleci/node@4.9.0
-    pulumi: pulumi/pulumi@2.0.0
+  node: circleci/node@4.9.0
+  pulumi: pulumi/pulumi@2.0.0
 
 aliases:
-    - &install-node
-      name: Install Node with NPM using NVM
-      command: |
-          echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
-          echo ' [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
-          nvm install v16
-          nvm alias default v16
-          echo 'export NODE_OPTIONS=--max_old_space_size=7000' >> $BASH_ENV
-          echo 'export NG_CLI_ANALYTICS=false' >> $BASH_ENV
-          source $BASH_ENV
-          node --version
-    - &install-chrome
-      name: Install Chrome
-      command: |
-          sudo apt install -y libappindicator3-1
-          curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-          sudo dpkg -i google-chrome.deb
-          sudo sed -i 's|HERE/chrome\"|HERE/chrome\" --disable-setuid-sandbox|g' /opt/google/chrome/google-chrome
-          rm google-chrome.deb
-    - &install-deps
-      name: Install Global Dependencies
-      command: |
-          sudo rm -rf /etc/apt/sources.list.d/heroku.list
-          sudo apt-get update
-          sudo apt install npm
-          sudo apt install build-essential
-          sudo npm install --quiet node-gyp@9.3.1 -g
-          sudo npm config set python /usr/bin/python
-    - &install-yarn
-      name: Install Latest Yarn
-      command: |
-          # remove default yarn
-          sudo rm -rf $(dirname $(which yarn))/yarn*
-          # download latest
-          rm -rf ~/.yarn
-          curl -o- -L https://yarnpkg.com/install.sh | bash
-          echo 'export PATH="${PATH}:${HOME}/.yarn/bin:${HOME}/.config/yarn/global/node_modules/.bin"' >> $BASH_ENV
-          source $BASH_ENV
+  - &install-node
+    name: Install Node with NPM using NVM
+    command: |
+      echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
+      echo ' [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
+      nvm install v16
+      nvm alias default v16
+      echo 'export NODE_OPTIONS=--max_old_space_size=7000' >> $BASH_ENV
+      echo 'export NG_CLI_ANALYTICS=false' >> $BASH_ENV
+      source $BASH_ENV
+      node --version
+  - &install-chrome
+    name: Install Chrome
+    command: |
+      sudo apt install -y libappindicator3-1
+      curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+      sudo dpkg -i google-chrome.deb
+      sudo sed -i 's|HERE/chrome\"|HERE/chrome\" --disable-setuid-sandbox|g' /opt/google/chrome/google-chrome
+      rm google-chrome.deb
+  - &install-deps
+    name: Install Global Dependencies
+    command: |
+      sudo rm -rf /etc/apt/sources.list.d/heroku.list
+      sudo apt-get update
+      sudo apt install npm
+      sudo apt install build-essential
+      sudo npm install --quiet node-gyp@10.2.0 -g
+      sudo npm config set python /usr/bin/python
+  - &install-yarn
+    name: Install Latest Yarn
+    command: |
+      # remove default yarn
+      sudo rm -rf $(dirname $(which yarn))/yarn*
+      # download latest
+      rm -rf ~/.yarn
+      curl -o- -L https://yarnpkg.com/install.sh | bash
+      echo 'export PATH="${PATH}:${HOME}/.yarn/bin:${HOME}/.config/yarn/global/node_modules/.bin"' >> $BASH_ENV
+      source $BASH_ENV
 
 defaults: &defaults
-    # put here anything which is common between all jobs
-    # we define default work dir, however almost every job redefine it
-    working_directory: /tmp/workspace
+  # put here anything which is common between all jobs
+  # we define default work dir, however almost every job redefine it
+  working_directory: /tmp/workspace
 
 jobs:
   say-hello:
@@ -60,8 +60,8 @@ jobs:
     steps:
       - checkout
       - run:
-          name: "Say hello"
-          command: "echo Hello, World!"
+          name: 'Say hello'
+          command: 'echo Hello, World!'
 
 # Orchestrate jobs using workflows
 # See: https://circleci.com/docs/configuration-reference/#workflows
diff --git a/.github/workflows/desktop-server-api.apps.yml b/.github/workflows/desktop-server-api.apps.yml
index f90c82507..4b9146c42 100644
--- a/.github/workflows/desktop-server-api.apps.yml
+++ b/.github/workflows/desktop-server-api.apps.yml
@@ -45,7 +45,7 @@ jobs:
         run: 'sudo npm install -g npm@9'
 
       - name: Install latest node-gyp package
-        run: 'sudo npm install --quiet -g node-gyp@9.3.1'
+        run: 'sudo npm install --quiet -g node-gyp@10.2.0'
 
       - name: Install Yarn dependencies
         run: 'yarn install --network-timeout 1000000 --frozen-lockfile'
@@ -123,7 +123,7 @@ jobs:
         run: 'sudo npm install -g npm@9'
 
       - name: Install latest node-gyp package
-        run: 'sudo npm install --quiet -g node-gyp@9.3.1'
+        run: 'sudo npm install --quiet -g node-gyp@10.2.0'
 
       - name: Install Yarn dependencies
         run: 'yarn install --network-timeout 1000000 --frozen-lockfile'
@@ -201,7 +201,7 @@ jobs:
         run: 'npm install -g npm@9'
 
       - name: Install latest node-gyp package
-        run: 'npm install --quiet -g node-gyp@9.3.1'
+        run: 'npm install --quiet -g node-gyp@10.2.0'
 
       - name: Install Yarn dependencies
         run: 'yarn install --network-timeout 1000000 --frozen-lockfile'
@@ -256,152 +256,3 @@ jobs:
           I18N_FILES_URL: 'https://raw.githubusercontent.com/ever-co/ever-teams/develop/apps/server-api/i18n'
           PLATFORM_LOGO: 'https://app.ever.team/assets/ever-teams.png'
           GAUZY_DESKTOP_LOGO_512X512: 'https://raw.githubusercontent.com/ever-co/ever-gauzy/develop/apps/desktop-timer/src/assets/icons/icon_512x512.png'
-          # Override unwanted environment variables
-          ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE: ''
-          ANT_HOME: ''
-          AZURE_CONFIG_DIR: ''
-          AZURE_DEVOPS_CACHE_DIR: ''
-          AZURE_EXTENSION_DIR: ''
-          AZ_DEVOPS_GLOBAL_CONFIG_DIR: ''
-          CABAL_DIR: ''
-          ChocolateyInstall: ''
-          ChromeWebDriver: ''
-          COBERTURA_HOME: ''
-          # COMPUTERNAME: ''
-          # COMSPEC: ''
-          # CONDA: ''
-          # DEPLOYMENT_BASEPATH: ''
-          SBT_HOME: ''
-          SELENIUM_JAR_PATH: ''
-          STATS_BLT: ''
-          STATS_D: ''
-          STATS_D_D: ''
-          STATS_EXT: ''
-          STATS_EXTP: ''
-          STATS_RDCL: ''
-          STATS_TIS: ''
-          STATS_TRP: ''
-          STATS_UE: ''
-          STATS_V3PS: ''
-          STATS_VMD: ''
-          STATS_VMFE: ''
-          ANDROID_HOME: ''
-          ANDROID_NDK: ''
-          ANDROID_NDK_HOME: ''
-          ANDROID_NDK_LATEST_HOME: ''
-          ANDROID_NDK_ROOT: ''
-          ANDROID_SDK_ROOT: ''
-          # GITHUB_ACTION: ''
-          # GITHUB_ACTIONS: ''
-          # GITHUB_ACTION_REF: ''
-          # GITHUB_ACTION_REPOSITORY: ''
-          # GITHUB_ACTOR: ''
-          # GITHUB_ACTOR_ID: ''
-          # GITHUB_API_URL: ''
-          # GITHUB_BASE_REF: ''
-          # GITHUB_ENV: ''
-          # GITHUB_EVENT_NAME: ''
-          # GITHUB_EVENT_PATH: ''
-          # GITHUB_GRAPHQL_URL: ''
-          # GITHUB_HEAD_REF: ''
-          # GITHUB_JOB: ''
-          # GITHUB_OUTPUT: ''
-          # GITHUB_PATH: ''
-          # GITHUB_REF: ''
-          # GITHUB_REF_NAME: ''
-          # GITHUB_REF_PROTECTED: ''
-          # GITHUB_REF_TYPE: ''
-          # GITHUB_REPOSITORY: ''
-          # GITHUB_REPOSITORY_ID: ''
-          # GITHUB_REPOSITORY_OWNER: ''
-          # GITHUB_REPOSITORY_OWNER_ID: ''
-          # GITHUB_RETENTION_DAYS: ''
-          # GITHUB_RUN_ATTEMPT: ''
-          # GITHUB_RUN_ID: ''
-          # GITHUB_RUN_NUMBER: ''
-          # GITHUB_SERVER_URL: ''
-          # GITHUB_SHA: ''
-          # GITHUB_STATE: ''
-          # GITHUB_STEP_SUMMARY: ''
-          # GITHUB_TRIGGERING_ACTOR: ''
-          # GITHUB_WORKFLOW: ''
-          # GITHUB_WORKFLOW_REF: ''
-          # GITHUB_WORKFLOW_SHA: ''
-          # GITHUB_WORKSPACE: ''
-          GOROOT_1_20_X64: ''
-          GOROOT_1_21_X64: ''
-          GOROOT_1_22_X64: ''
-          GRADLE_HOME: ''
-          # HOMEDRIVE: ''
-          # HOMEPATH: ''
-          IEWebDriver: ''
-          ImageOS: ''
-          ImageVersion: ''
-          JAVA_HOME: ''
-          JAVA_HOME_11_X64: ''
-          JAVA_HOME_17_X64: ''
-          JAVA_HOME_21_X64: ''
-          JAVA_HOME_8_X64: ''
-          # LOCALAPPDATA: ''
-          # LOGONSERVER: ''
-          M2: ''
-          M2_REPO: ''
-          MAVEN_OPTS: ''
-          MonAgentClientLocation: ''
-          # npm_config_prefix: ''
-          # NUMBER_OF_PROCESSORS: ''
-          # OS: ''
-          # PATHEXT: ''
-          # PERFLOG_LOCATION_SETTING: ''
-          PGBIN: ''
-          PGDATA: ''
-          PGPASSWORD: ''
-          PGROOT: ''
-          PGUSER: ''
-          PHPROOT: ''
-          PIPX_BIN_DIR: ''
-          PIPX_HOME: ''
-          POWERSHELL_DISTRIBUTION_CHANNEL: ''
-          POWERSHELL_UPDATECHECK: ''
-          PROCESSOR_ARCHITECTURE: ''
-          PROCESSOR_IDENTIFIER: ''
-          PROCESSOR_LEVEL: ''
-          PROCESSOR_REVISION: ''
-          PSModuleAnalysisCachePath: ''
-          PSModulePath: ''
-          Path: 'C:\hostedtoolcache\windows\node\20.11.1\x64;C:\Program Files\Git\bin;C:\npm\prefix;C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts;C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\Program Files\OpenSSL\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\OpenSSH\;C:\Program Files\dotnet\;C:\Program Files\PowerShell\7\;C:\Program Files\CMake\bin;C:\Program Files\nodejs\;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\Amazon\AWSCLIV2\'
-          DOTNET_MULTILEVEL_LOOKUP: ''
-          DOTNET_NOLOGO: ''
-          DOTNET_SKIP_FIRST_TIME_EXPERIENCE: ''
-          DriverData: ''
-          EdgeWebDriver: ''
-          GCM_INTERACTIVE: ''
-          GeckoWebDriver: ''
-          GHCUP_INSTALL_BASE_PREFIX: ''
-          GHCUP_MSYS2: ''
-          # RTOOLS44_HOME: ''
-          RUNNER_ARCH: ''
-          RUNNER_ENVIRONMENT: ''
-          RUNNER_NAME: ''
-          RUNNER_OS: ''
-          RUNNER_PERFLOG: ''
-          RUNNER_TEMP: ''
-          RUNNER_TOOL_CACHE: ''
-          RUNNER_TRACKING_ID: ''
-          RUNNER_WORKSPACE: ''
-          # USERDOMAIN: ''
-          # USERDOMAIN_ROAMINGPROFILE: ''
-          # USERNAME: ''
-          # USERPROFILE: ''
-          # VCPKG_INSTALLATION_ROOT: ''
-          # WIX: ''
-          # TERM: ''
-          # HOME: ''
-          # WINDIR: ''
-          # ProgramData: ''
-          # PROGRAMFILES: ''
-          # ProgramW6432: ''
-          # ALLUSERSPROFILE: ''
-          # APPDATA: ''
-          # COMMONPROGRAMFILES: ''
-          # CommonProgramFiles(x86)
diff --git a/.github/workflows/desktop-server-web.apps.yml b/.github/workflows/desktop-server-web.apps.yml
index 9523f72f8..82e212d4f 100644
--- a/.github/workflows/desktop-server-web.apps.yml
+++ b/.github/workflows/desktop-server-web.apps.yml
@@ -42,7 +42,7 @@ jobs:
         run: 'sudo npm install -g npm@9'
 
       - name: Install latest node-gyp package
-        run: 'sudo npm install --quiet -g node-gyp@9.3.1'
+        run: 'sudo npm install --quiet -g node-gyp@10.2.0'
 
       - name: Install Yarn dependencies
         run: 'yarn install --network-timeout 1000000 --frozen-lockfile'
@@ -73,6 +73,7 @@ jobs:
           SENTRY_TRACES_SAMPLE_RATE: '${{ secrets.SENTRY_TRACES_SAMPLE_RATE }}'
           SENTRY_HTTP_TRACING_ENABLED: '${{ secrets.SENTRY_HTTP_TRACING_ENABLED }}'
           SENTRY_POSTGRES_TRACKING_ENABLED: '${{ secrets.SENTRY_POSTGRES_TRACKING_ENABLED }}'
+          SENTRY_PROFILING_ENABLED: '${{ secrets.SENTRY_PROFILING_ENABLED }}'
           DO_KEY_ID: ${{ secrets.DO_KEY_ID }}
           DO_SECRET_KEY: ${{ secrets.DO_SECRET_KEY }}
           NX_NO_CLOUD: true
@@ -117,7 +118,7 @@ jobs:
         run: 'sudo npm install -g npm@9'
 
       - name: Install latest node-gyp package
-        run: 'sudo npm install --quiet -g node-gyp@9.3.1'
+        run: 'sudo npm install --quiet -g node-gyp@10.2.0'
 
       - name: Install Yarn dependencies
         run: 'yarn install --network-timeout 1000000 --frozen-lockfile'
@@ -148,6 +149,7 @@ jobs:
           SENTRY_TRACES_SAMPLE_RATE: '${{ secrets.SENTRY_TRACES_SAMPLE_RATE }}'
           SENTRY_HTTP_TRACING_ENABLED: '${{ secrets.SENTRY_HTTP_TRACING_ENABLED }}'
           SENTRY_POSTGRES_TRACKING_ENABLED: '${{ secrets.SENTRY_POSTGRES_TRACKING_ENABLED }}'
+          SENTRY_PROFILING_ENABLED: '${{ secrets.SENTRY_PROFILING_ENABLED }}'
           DO_KEY_ID: ${{ secrets.DO_KEY_ID }}
           DO_SECRET_KEY: ${{ secrets.DO_SECRET_KEY }}
           NX_NO_CLOUD: true
@@ -192,7 +194,7 @@ jobs:
         run: 'npm install -g npm@9'
 
       - name: Install latest node-gyp package
-        run: 'npm install --quiet -g node-gyp@9.3.1'
+        run: 'npm install --quiet -g node-gyp@10.2.0'
 
       - name: Install Yarn dependencies
         run: 'yarn install --network-timeout 1000000 --frozen-lockfile'
@@ -228,6 +230,7 @@ jobs:
           SENTRY_TRACES_SAMPLE_RATE: '${{ secrets.SENTRY_TRACES_SAMPLE_RATE }}'
           SENTRY_HTTP_TRACING_ENABLED: '${{ secrets.SENTRY_HTTP_TRACING_ENABLED }}'
           SENTRY_POSTGRES_TRACKING_ENABLED: '${{ secrets.SENTRY_POSTGRES_TRACKING_ENABLED }}'
+          SENTRY_PROFILING_ENABLED: '${{ secrets.SENTRY_PROFILING_ENABLED }}'
           DO_KEY_ID: ${{ secrets.DO_KEY_ID }}
           DO_SECRET_KEY: ${{ secrets.DO_SECRET_KEY }}
           NX_NO_CLOUD: true
@@ -247,152 +250,3 @@ jobs:
           I18N_FILES_URL: 'https://raw.githubusercontent.com/ever-co/ever-teams/develop/apps/server-web/i18n'
           PLATFORM_LOGO: 'https://app.ever.team/assets/ever-teams.png'
           GAUZY_DESKTOP_LOGO_512X512: 'https://raw.githubusercontent.com/ever-co/ever-teams/develop/apps/server-web/src/assets/icons/icon_512x512.png'
-          # Override unwanted environment variables
-          ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE: ''
-          ANT_HOME: ''
-          AZURE_CONFIG_DIR: ''
-          AZURE_DEVOPS_CACHE_DIR: ''
-          AZURE_EXTENSION_DIR: ''
-          AZ_DEVOPS_GLOBAL_CONFIG_DIR: ''
-          CABAL_DIR: ''
-          ChocolateyInstall: ''
-          ChromeWebDriver: ''
-          COBERTURA_HOME: ''
-          # COMPUTERNAME: ''
-          # COMSPEC: ''
-          # CONDA: ''
-          # DEPLOYMENT_BASEPATH: ''
-          SBT_HOME: ''
-          SELENIUM_JAR_PATH: ''
-          STATS_BLT: ''
-          STATS_D: ''
-          STATS_D_D: ''
-          STATS_EXT: ''
-          STATS_EXTP: ''
-          STATS_RDCL: ''
-          STATS_TIS: ''
-          STATS_TRP: ''
-          STATS_UE: ''
-          STATS_V3PS: ''
-          STATS_VMD: ''
-          STATS_VMFE: ''
-          ANDROID_HOME: ''
-          ANDROID_NDK: ''
-          ANDROID_NDK_HOME: ''
-          ANDROID_NDK_LATEST_HOME: ''
-          ANDROID_NDK_ROOT: ''
-          ANDROID_SDK_ROOT: ''
-          # GITHUB_ACTION: ''
-          # GITHUB_ACTIONS: ''
-          # GITHUB_ACTION_REF: ''
-          # GITHUB_ACTION_REPOSITORY: ''
-          # GITHUB_ACTOR: ''
-          # GITHUB_ACTOR_ID: ''
-          # GITHUB_API_URL: ''
-          # GITHUB_BASE_REF: ''
-          # GITHUB_ENV: ''
-          # GITHUB_EVENT_NAME: ''
-          # GITHUB_EVENT_PATH: ''
-          # GITHUB_GRAPHQL_URL: ''
-          # GITHUB_HEAD_REF: ''
-          # GITHUB_JOB: ''
-          # GITHUB_OUTPUT: ''
-          # GITHUB_PATH: ''
-          # GITHUB_REF: ''
-          # GITHUB_REF_NAME: ''
-          # GITHUB_REF_PROTECTED: ''
-          # GITHUB_REF_TYPE: ''
-          # GITHUB_REPOSITORY: ''
-          # GITHUB_REPOSITORY_ID: ''
-          # GITHUB_REPOSITORY_OWNER: ''
-          # GITHUB_REPOSITORY_OWNER_ID: ''
-          # GITHUB_RETENTION_DAYS: ''
-          # GITHUB_RUN_ATTEMPT: ''
-          # GITHUB_RUN_ID: ''
-          # GITHUB_RUN_NUMBER: ''
-          # GITHUB_SERVER_URL: ''
-          # GITHUB_SHA: ''
-          # GITHUB_STATE: ''
-          # GITHUB_STEP_SUMMARY: ''
-          # GITHUB_TRIGGERING_ACTOR: ''
-          # GITHUB_WORKFLOW: ''
-          # GITHUB_WORKFLOW_REF: ''
-          # GITHUB_WORKFLOW_SHA: ''
-          # GITHUB_WORKSPACE: ''
-          GOROOT_1_20_X64: ''
-          GOROOT_1_21_X64: ''
-          GOROOT_1_22_X64: ''
-          GRADLE_HOME: ''
-          # HOMEDRIVE: ''
-          # HOMEPATH: ''
-          IEWebDriver: ''
-          ImageOS: ''
-          ImageVersion: ''
-          JAVA_HOME: ''
-          JAVA_HOME_11_X64: ''
-          JAVA_HOME_17_X64: ''
-          JAVA_HOME_21_X64: ''
-          JAVA_HOME_8_X64: ''
-          # LOCALAPPDATA: ''
-          # LOGONSERVER: ''
-          M2: ''
-          M2_REPO: ''
-          MAVEN_OPTS: ''
-          MonAgentClientLocation: ''
-          # npm_config_prefix: ''
-          # NUMBER_OF_PROCESSORS: ''
-          # OS: ''
-          # PATHEXT: ''
-          # PERFLOG_LOCATION_SETTING: ''
-          PGBIN: ''
-          PGDATA: ''
-          PGPASSWORD: ''
-          PGROOT: ''
-          PGUSER: ''
-          PHPROOT: ''
-          PIPX_BIN_DIR: ''
-          PIPX_HOME: ''
-          POWERSHELL_DISTRIBUTION_CHANNEL: ''
-          POWERSHELL_UPDATECHECK: ''
-          PROCESSOR_ARCHITECTURE: ''
-          PROCESSOR_IDENTIFIER: ''
-          PROCESSOR_LEVEL: ''
-          PROCESSOR_REVISION: ''
-          PSModuleAnalysisCachePath: ''
-          PSModulePath: ''
-          Path: 'C:\hostedtoolcache\windows\node\20.11.1\x64;C:\Program Files\Git\bin;C:\npm\prefix;C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts;C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\Program Files\OpenSSL\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\OpenSSH\;C:\Program Files\dotnet\;C:\Program Files\PowerShell\7\;C:\Program Files\CMake\bin;C:\Program Files\nodejs\;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\Amazon\AWSCLIV2\'
-          DOTNET_MULTILEVEL_LOOKUP: ''
-          DOTNET_NOLOGO: ''
-          DOTNET_SKIP_FIRST_TIME_EXPERIENCE: ''
-          DriverData: ''
-          EdgeWebDriver: ''
-          GCM_INTERACTIVE: ''
-          GeckoWebDriver: ''
-          GHCUP_INSTALL_BASE_PREFIX: ''
-          GHCUP_MSYS2: ''
-          # RTOOLS44_HOME: ''
-          RUNNER_ARCH: ''
-          RUNNER_ENVIRONMENT: ''
-          RUNNER_NAME: ''
-          RUNNER_OS: ''
-          RUNNER_PERFLOG: ''
-          RUNNER_TEMP: ''
-          RUNNER_TOOL_CACHE: ''
-          RUNNER_TRACKING_ID: ''
-          RUNNER_WORKSPACE: ''
-          # USERDOMAIN: ''
-          # USERDOMAIN_ROAMINGPROFILE: ''
-          # USERNAME: ''
-          # USERPROFILE: ''
-          # VCPKG_INSTALLATION_ROOT: ''
-          # WIX: ''
-          # TERM: ''
-          # HOME: ''
-          # WINDIR: ''
-          # ProgramData: ''
-          # PROGRAMFILES: ''
-          # ProgramW6432: ''
-          # ALLUSERSPROFILE: ''
-          # APPDATA: ''
-          # COMMONPROGRAMFILES: ''
-          # CommonProgramFiles(x86)
diff --git a/.github/workflows/desktop.apps.yml b/.github/workflows/desktop.apps.yml
index c0ff59ba8..1c84e825f 100644
--- a/.github/workflows/desktop.apps.yml
+++ b/.github/workflows/desktop.apps.yml
@@ -45,7 +45,7 @@ jobs:
         run: 'sudo npm install -g npm@9'
 
       - name: Install latest node-gyp package
-        run: 'sudo npm install --quiet -g node-gyp@9.3.1'
+        run: 'sudo npm install --quiet -g node-gyp@10.2.0'
 
       - name: Install Yarn dependencies
         run: 'yarn install --network-timeout 1000000 --frozen-lockfile'
@@ -76,6 +76,7 @@ jobs:
           SENTRY_TRACES_SAMPLE_RATE: '${{ secrets.SENTRY_TRACES_SAMPLE_RATE }}'
           SENTRY_HTTP_TRACING_ENABLED: '${{ secrets.SENTRY_HTTP_TRACING_ENABLED }}'
           SENTRY_POSTGRES_TRACKING_ENABLED: '${{ secrets.SENTRY_POSTGRES_TRACKING_ENABLED }}'
+          SENTRY_PROFILING_ENABLED: '${{ secrets.SENTRY_PROFILING_ENABLED }}'
           DO_KEY_ID: ${{ secrets.DO_KEY_ID }}
           DO_SECRET_KEY: ${{ secrets.DO_SECRET_KEY }}
           NX_NO_CLOUD: true
@@ -123,7 +124,7 @@ jobs:
         run: 'sudo npm install -g npm@9'
 
       - name: Install latest node-gyp package
-        run: 'sudo npm install --quiet -g node-gyp@9.3.1'
+        run: 'sudo npm install --quiet -g node-gyp@10.2.0'
 
       - name: Install Yarn dependencies
         run: 'yarn install --network-timeout 1000000 --frozen-lockfile'
@@ -154,6 +155,7 @@ jobs:
           SENTRY_TRACES_SAMPLE_RATE: '${{ secrets.SENTRY_TRACES_SAMPLE_RATE }}'
           SENTRY_HTTP_TRACING_ENABLED: '${{ secrets.SENTRY_HTTP_TRACING_ENABLED }}'
           SENTRY_POSTGRES_TRACKING_ENABLED: '${{ secrets.SENTRY_POSTGRES_TRACKING_ENABLED }}'
+          SENTRY_PROFILING_ENABLED: '${{ secrets.SENTRY_PROFILING_ENABLED }}'
           DO_KEY_ID: ${{ secrets.DO_KEY_ID }}
           DO_SECRET_KEY: ${{ secrets.DO_SECRET_KEY }}
           NX_NO_CLOUD: true
@@ -201,7 +203,7 @@ jobs:
         run: 'npm install -g npm@9'
 
       - name: Install latest node-gyp package
-        run: 'npm install --quiet -g node-gyp@9.3.1'
+        run: 'npm install --quiet -g node-gyp@10.2.0'
 
       - name: Install Yarn dependencies
         run: 'yarn install --network-timeout 1000000 --frozen-lockfile'
@@ -237,6 +239,7 @@ jobs:
           SENTRY_TRACES_SAMPLE_RATE: '${{ secrets.SENTRY_TRACES_SAMPLE_RATE }}'
           SENTRY_HTTP_TRACING_ENABLED: '${{ secrets.SENTRY_HTTP_TRACING_ENABLED }}'
           SENTRY_POSTGRES_TRACKING_ENABLED: '${{ secrets.SENTRY_POSTGRES_TRACKING_ENABLED }}'
+          SENTRY_PROFILING_ENABLED: '${{ secrets.SENTRY_PROFILING_ENABLED }}'
           DO_KEY_ID: ${{ secrets.DO_KEY_ID }}
           DO_SECRET_KEY: ${{ secrets.DO_SECRET_KEY }}
           NX_NO_CLOUD: true
@@ -256,152 +259,3 @@ jobs:
           I18N_FILES_URL: 'https://raw.githubusercontent.com/ever-co/ever-teams/develop/apps/desktop/i18n'
           PLATFORM_LOGO: 'https://app.ever.team/assets/ever-teams.png'
           GAUZY_DESKTOP_LOGO_512X512: 'https://raw.githubusercontent.com/ever-co/ever-gauzy/develop/apps/desktop-timer/src/assets/icons/icon_512x512.png'
-          # Override unwanted environment variables
-          ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE: ''
-          ANT_HOME: ''
-          AZURE_CONFIG_DIR: ''
-          AZURE_DEVOPS_CACHE_DIR: ''
-          AZURE_EXTENSION_DIR: ''
-          AZ_DEVOPS_GLOBAL_CONFIG_DIR: ''
-          CABAL_DIR: ''
-          ChocolateyInstall: ''
-          ChromeWebDriver: ''
-          COBERTURA_HOME: ''
-          # COMPUTERNAME: ''
-          # COMSPEC: ''
-          # CONDA: ''
-          # DEPLOYMENT_BASEPATH: ''
-          SBT_HOME: ''
-          SELENIUM_JAR_PATH: ''
-          STATS_BLT: ''
-          STATS_D: ''
-          STATS_D_D: ''
-          STATS_EXT: ''
-          STATS_EXTP: ''
-          STATS_RDCL: ''
-          STATS_TIS: ''
-          STATS_TRP: ''
-          STATS_UE: ''
-          STATS_V3PS: ''
-          STATS_VMD: ''
-          STATS_VMFE: ''
-          ANDROID_HOME: ''
-          ANDROID_NDK: ''
-          ANDROID_NDK_HOME: ''
-          ANDROID_NDK_LATEST_HOME: ''
-          ANDROID_NDK_ROOT: ''
-          ANDROID_SDK_ROOT: ''
-          # GITHUB_ACTION: ''
-          # GITHUB_ACTIONS: ''
-          # GITHUB_ACTION_REF: ''
-          # GITHUB_ACTION_REPOSITORY: ''
-          # GITHUB_ACTOR: ''
-          # GITHUB_ACTOR_ID: ''
-          # GITHUB_API_URL: ''
-          # GITHUB_BASE_REF: ''
-          # GITHUB_ENV: ''
-          # GITHUB_EVENT_NAME: ''
-          # GITHUB_EVENT_PATH: ''
-          # GITHUB_GRAPHQL_URL: ''
-          # GITHUB_HEAD_REF: ''
-          # GITHUB_JOB: ''
-          # GITHUB_OUTPUT: ''
-          # GITHUB_PATH: ''
-          # GITHUB_REF: ''
-          # GITHUB_REF_NAME: ''
-          # GITHUB_REF_PROTECTED: ''
-          # GITHUB_REF_TYPE: ''
-          # GITHUB_REPOSITORY: ''
-          # GITHUB_REPOSITORY_ID: ''
-          # GITHUB_REPOSITORY_OWNER: ''
-          # GITHUB_REPOSITORY_OWNER_ID: ''
-          # GITHUB_RETENTION_DAYS: ''
-          # GITHUB_RUN_ATTEMPT: ''
-          # GITHUB_RUN_ID: ''
-          # GITHUB_RUN_NUMBER: ''
-          # GITHUB_SERVER_URL: ''
-          # GITHUB_SHA: ''
-          # GITHUB_STATE: ''
-          # GITHUB_STEP_SUMMARY: ''
-          # GITHUB_TRIGGERING_ACTOR: ''
-          # GITHUB_WORKFLOW: ''
-          # GITHUB_WORKFLOW_REF: ''
-          # GITHUB_WORKFLOW_SHA: ''
-          # GITHUB_WORKSPACE: ''
-          GOROOT_1_20_X64: ''
-          GOROOT_1_21_X64: ''
-          GOROOT_1_22_X64: ''
-          GRADLE_HOME: ''
-          # HOMEDRIVE: ''
-          # HOMEPATH: ''
-          IEWebDriver: ''
-          ImageOS: ''
-          ImageVersion: ''
-          JAVA_HOME: ''
-          JAVA_HOME_11_X64: ''
-          JAVA_HOME_17_X64: ''
-          JAVA_HOME_21_X64: ''
-          JAVA_HOME_8_X64: ''
-          # LOCALAPPDATA: ''
-          # LOGONSERVER: ''
-          M2: ''
-          M2_REPO: ''
-          MAVEN_OPTS: ''
-          MonAgentClientLocation: ''
-          # npm_config_prefix: ''
-          # NUMBER_OF_PROCESSORS: ''
-          # OS: ''
-          # PATHEXT: ''
-          # PERFLOG_LOCATION_SETTING: ''
-          PGBIN: ''
-          PGDATA: ''
-          PGPASSWORD: ''
-          PGROOT: ''
-          PGUSER: ''
-          PHPROOT: ''
-          PIPX_BIN_DIR: ''
-          PIPX_HOME: ''
-          POWERSHELL_DISTRIBUTION_CHANNEL: ''
-          POWERSHELL_UPDATECHECK: ''
-          PROCESSOR_ARCHITECTURE: ''
-          PROCESSOR_IDENTIFIER: ''
-          PROCESSOR_LEVEL: ''
-          PROCESSOR_REVISION: ''
-          PSModuleAnalysisCachePath: ''
-          PSModulePath: ''
-          Path: 'C:\hostedtoolcache\windows\node\20.11.1\x64;C:\Program Files\Git\bin;C:\npm\prefix;C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts;C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\Program Files\OpenSSL\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\OpenSSH\;C:\Program Files\dotnet\;C:\Program Files\PowerShell\7\;C:\Program Files\CMake\bin;C:\Program Files\nodejs\;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\Amazon\AWSCLIV2\'
-          DOTNET_MULTILEVEL_LOOKUP: ''
-          DOTNET_NOLOGO: ''
-          DOTNET_SKIP_FIRST_TIME_EXPERIENCE: ''
-          DriverData: ''
-          EdgeWebDriver: ''
-          GCM_INTERACTIVE: ''
-          GeckoWebDriver: ''
-          GHCUP_INSTALL_BASE_PREFIX: ''
-          GHCUP_MSYS2: ''
-          # RTOOLS44_HOME: ''
-          RUNNER_ARCH: ''
-          RUNNER_ENVIRONMENT: ''
-          RUNNER_NAME: ''
-          RUNNER_OS: ''
-          RUNNER_PERFLOG: ''
-          RUNNER_TEMP: ''
-          RUNNER_TOOL_CACHE: ''
-          RUNNER_TRACKING_ID: ''
-          RUNNER_WORKSPACE: ''
-          # USERDOMAIN: ''
-          # USERDOMAIN_ROAMINGPROFILE: ''
-          # USERNAME: ''
-          # USERPROFILE: ''
-          # VCPKG_INSTALLATION_ROOT: ''
-          # WIX: ''
-          # TERM: ''
-          # HOME: ''
-          # WINDIR: ''
-          # ProgramData: ''
-          # PROGRAMFILES: ''
-          # ProgramW6432: ''
-          # ALLUSERSPROFILE: ''
-          # APPDATA: ''
-          # COMMONPROGRAMFILES: ''
-          # CommonProgramFiles(x86)