public/assets/css/core-extend.css

@@ -280,7 +280,3 @@
   .w-8-xl{ width: 2rem; }
   .w-10-xl{ width: 2.5rem; }
 }
-
-.cursor-not-allowed{
-  cursor: not-allowed;
-}

src/components/Activities/Attendance.jsx

@@ -126,7 +126,7 @@ const Attendance = ({ getRole, handleModalData, searchTerm, projectId, organizat
               checked={ShowPending}
               onChange={(e) => setShowPending(e.target.checked)}
             />
-            <label className="form-check-label ms-0">Pending Attendance</label>
+            <label className="form-check-label ms-0">Show Pending</label>
           </div>
         </div>
         {attLoading ? (

src/components/Activities/AttendcesLogs.jsx

@@ -190,7 +190,7 @@ useEffect(() => {
               checked={showPending}
               onChange={(e) => setShowPending(e.target.checked)}
             />
-            <label className="form-check-label ms-0">Pending Attendance</label>
+            <label className="form-check-label ms-0">Show Pending</label>
           </div>
         </div>
       </div>

src/components/Charts/HorizontalBarChart.jsx

@@ -23,7 +23,7 @@ const HorizontalBarChart = ({
   if (loading) {
     return (
       <div className="w-full h-[380px] flex items-center justify-center bg-gray-100 rounded-xl">
-        <span className="text-gray-500">Loading chart...</span>
+        <span className="text-gray-500 text-sm">Loading chart...</span>
         {/* Replace this with a skeleton or spinner if you prefer */}
       </div>
     );

src/components/Dashboard/ProjectCompletionChart.jsx

@@ -3,8 +3,7 @@ import HorizontalBarChart from "../Charts/HorizontalBarChart";
 import { useProjects } from "../../hooks/useProjects";
 
 const ProjectCompletionChart = () => {
-  const { data: projects = [], isLoading: loading, isError, error } = useProjects();
-
+  const { projects, loading } = useProjects();
 
   // Bar chart logic
   const projectNames = projects?.map((p) => p.name) || [];
@@ -12,7 +11,7 @@ const ProjectCompletionChart = () => {
     projects?.map((p) => {
       const completed = p.completedWork || 0;
       const planned = p.plannedWork || 1;
-      const percent = planned ? (completed / planned) * 100 : 0;
+      const percent = (completed / planned) * 100;
       return Math.min(Math.round(percent), 100);
     }) || [];
 

src/components/Documents/DocumentFilterPanel.jsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from "react";
+import React, { useState } from "react";
 import { useDocumentFilterEntities } from "../../hooks/useDocument";
 import { FormProvider, useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
@@ -9,11 +9,9 @@ import {
 import { DateRangePicker1 } from "../common/DateRangePicker";
 import SelectMultiple from "../common/SelectMultiple";
 import moment from "moment";
-import { useLocation } from "react-router-dom";
 
 const DocumentFilterPanel = ({ entityTypeId, onApply }) => {
   const [resetKey, setResetKey] = useState(0);
-  const location = useLocation();
 
   const { data, isError, isLoading, error } =
     useDocumentFilterEntities(entityTypeId);
@@ -54,13 +52,6 @@ const DocumentFilterPanel = ({ entityTypeId, onApply }) => {
     closePanel();
   };
 
-  //  Close popup when navigating to another component
-  useEffect(() => {
-    return () => {
-      closePanel();
-    };
-  }, []);
-
   if (isLoading) return <div>Loading...</div>;
   if (isError)
     return <div>Error: {error?.message || "Something went wrong!"}</div>;
@@ -72,8 +63,6 @@ const DocumentFilterPanel = ({ entityTypeId, onApply }) => {
     documentTag = [],
   } = data?.data || {};
 
-
-
   return (
     <FormProvider {...methods}>
       <form onSubmit={handleSubmit(onSubmit)}>
@@ -84,7 +73,8 @@ const DocumentFilterPanel = ({ entityTypeId, onApply }) => {
             <div className="d-inline-flex border rounded-pill overflow-hidden shadow-none">
               <button
                 type="button"
-                className={`btn px-2 py-1 rounded-0 text-tiny ${isUploadedAt ? "active btn-secondary text-white" : ""
+                className={`btn px-2 py-1 rounded-0 text-tiny ${
+                  isUploadedAt ? "active btn-secondary text-white" : ""
                 }`}
                 onClick={() => setValue("isUploadedAt", true)}
               >
@@ -92,7 +82,8 @@ const DocumentFilterPanel = ({ entityTypeId, onApply }) => {
               </button>
               <button
                 type="button"
-                className={`btn px-2 py-1 rounded-0 text-tiny ${!isUploadedAt ? "active btn-secondary text-white" : ""
+                className={`btn px-2 py-1 rounded-0 text-tiny ${
+                  !isUploadedAt ? "active btn-secondary text-white" : ""
                 }`}
                 onClick={() => setValue("isUploadedAt", false)}
               >

src/components/Documents/Documents.jsx

@@ -144,12 +144,12 @@ const Documents = ({ Document_Entity, Entity }) => {
                   <span className="switch-off"></span>
                 </span>
                 <span className="switch-label">
-                  {isActive ? "Active Document" : "In-Active Document"}
+                  {isActive ? "Active" : "In-Active"}
                 </span>
               </label>
             </div>
 
-            <div className="col-12 col-md-6 col-lg-8 text-end">
+            <div className="col-6 col-md-6 col-lg-8 text-end">
               {(isSelf || canUploadDocument) && (
                 <button
                   className="btn btn-sm btn-primary me-3"

src/components/Employee/EmpAttendance.jsx

@@ -51,6 +51,7 @@ const EmpAttendance = () => {
       new Date(b?.checkInTime).getTime() - new Date(a?.checkInTime).getTime()
   );
 
+  console.log(sorted);
 
   const { currentPage, totalPages, currentItems, paginate } = usePagination(
     sorted,

src/components/Organization/ManagOrg.jsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect } from "react";
 import { FormProvider, useForm } from "react-hook-form";
 import {
   useCreateOrganization,
@@ -14,7 +14,6 @@ import Label from "../common/Label";
 import { useGlobalServices } from "../../hooks/masterHook/useMaster";
 import { zodResolver } from "@hookform/resolvers/zod";
 import SelectMultiple from "../common/SelectMultiple";
-import { LogoUpload } from "../Tenant/LogoUpload";
 
 const ManagOrg = () => {
   const { data: service, isLoading } = useGlobalServices();
@@ -32,14 +31,10 @@ const ManagOrg = () => {
     defaultValues: defaultOrganizationValues,
   });
 
-  const [logoPreview, setLogoPreview] = useState(null);
-  const [logoName, setLogoName] = useState("");
-
   const {
     handleSubmit,
     register,
     reset,
-    getValues,
     formState: { errors },
   } = method;
 
@@ -67,7 +62,6 @@ const ManagOrg = () => {
         email: organization.email || "",
         serviceIds: organization.services?.map((s) => s.id) || [],
         address: organization.address || "",
-        logoImage: organization.logoImage || "",
       });
     }
   }, [organization, reset, service?.data]);
@@ -99,14 +93,6 @@ const ManagOrg = () => {
     }
     onOpen({ startStep: 2 });
   };
-
-  useEffect(() => {
-    const logoImage = getValues("logoImage");
-    if (logoImage) {
-      setLogoPreview(logoImage);
-      setLogoName("Uploaded Logo");
-    }
-  }, [getValues]);
   return (
     <FormProvider {...method}>
       <form className="form" onSubmit={handleSubmit(onSubmit)}>
@@ -190,17 +176,6 @@ const ManagOrg = () => {
           )}
         </div>
 
-        <div className="col-sm-12 text-start mt-2">
-          <Label htmlFor="logoImage" required>Logo Image</Label>
-
-          <LogoUpload
-            preview={logoPreview}
-            setPreview={setLogoPreview}
-            fileName={logoName}
-            setFileName={setLogoName}
-          />
-        </div>
-
         <div className="d-flex justify-content-between gap-2 my-2">
           <button
             type="button"

src/components/Organization/OrganizationSchema.js

@@ -13,7 +13,6 @@ export const organizationSchema = z.object({
     .regex(phoneRegex, { message: "Invalid phone number" }),
   contactPerson: z.string().min(1, { message: "Person name required" }),
   address: z.string().min(1, { message: "Address is required!" }),
-  logoImage: z.string().min(1, { message: "Logo is required!" }),
   email: z
     .string().trim()
     .min(1, { message: "Email is required" })
@@ -29,7 +28,6 @@ export const defaultOrganizationValues = {
   contactPerson: "",
   address: "",
   email: "",
-  logoImage:"",
   serviceIds: [],
 };
 

src/components/Organization/OrganizationsList.jsx

@@ -131,7 +131,7 @@ const OrganizationsList = ({searchText}) => {
                       <div className="d-flex justify-content-center gap-2">
                         <i className="bx bx-show text-primary cursor-pointer"  onClick={()=>onOpen({startStep:5,orgData:org.id,flowType:"view"})}></i>
                         <i className="bx bx-edit text-secondary cursor-pointer" onClick={()=>onOpen({startStep:4,orgData:org,flowType:"edit"})}></i>
-                        <i className="bx bx-trash text-danger cursor-not-allowed"></i>
+                        <i className="bx bx-trash text-danger cursor-pointer"></i>
                       </div>
                     </td>
                   </tr>

src/components/Organization/ViewOrganization.jsx

@@ -22,7 +22,8 @@ const VieworgDataanization = ({ orgId }) => {
           </div>
           <div className="text-end">
             <span
-              className={`badge bg-label-${data?.isActive ? "primary" : "secondary"
+              className={`badge bg-label-${
+                data?.isActive ? "primary" : "secondary"
               } `}
             >
               {data?.isActive ? "Active" : "In-Active"}{" "}
@@ -104,101 +105,9 @@ const VieworgDataanization = ({ orgId }) => {
           <div className="text-muted text-start">{data?.address}</div>
         </div>
       </div>
-      <div className="col-12 mb-3">
-        <div
-          className="d-flex justify-content-between align-items-center text-secondary mb-2 cursor-pointer"
-          data-bs-toggle="collapse"
-          data-bs-target="#collapse-projects-services"
-          aria-expanded="false"
-        >
-          <div>
-            <i className="bx bx-sm bx-briefcase me-1" /> Projects
-          </div>
-          <i className="bx bx-chevron-down me-2"></i>
-        </div>
-
-        {/* remove "show" from className */}
-        <div id="collapse-projects-services" className="collapse">
-          {data?.projects && data.projects.length > 0 ? (
-            data.projects
-              .reduce((acc, curr) => {
-                const projectId = curr.project.id;
-                if (!acc.find((p) => p.id === projectId)) {
-                  acc.push(curr.project);
-                }
-                return acc;
-              }, [])
-              .map((project) => (
-                <div key={project.id} className="mb-2 rounded p-2">
-                  <div
-                    className="d-flex justify-content-between align-items-center cursor-pointer"
-                    data-bs-toggle="collapse"
-                    data-bs-target={`#collapse-${project.id}`}
-                    aria-expanded="false"
-                  >
-                    <label className="form-label fw-semibold">
-                      <i className="bx bx-buildings me-2"></i>
-                      {project.name}
-                    </label>
-                    <i className="bx bx-chevron-down"></i>
-                  </div>
-
-                  <div id={`collapse-${project.id}`} className="collapse mt-2 ps-5">
-                    {data.projects
-                      .filter((p) => p.project.id === project.id)
-                      .map((p) => (
-                        <div key={p.service.id} className="mb-1 text-muted">
-                          <i className="bx bx-wrench me-2"></i>
-                          {p.service.name}
-                        </div>
-                      ))}
-                  </div>
-                </div>
-              ))
-          ) : (
-            <div className="text-muted fst-italic ps-2">No projects available</div>
-          )}
-        </div>
-      </div>
-
-      {/* Services Section */}
-      <div className="col-12 mb-3">
-        <div
-          className="d-flex justify-content-between align-items-center text-secondary mb-2 cursor-pointer"
-          data-bs-toggle="collapse"
-          data-bs-target="#collapse-services"
-          aria-expanded="false"
-        >
-          <div>
-            <i className="bx bx-sm bx-cog me-1" /> Services
-          </div>
-          <i className="bx bx-chevron-down me-2"></i>
-        </div>
-
-        {/* collapse is closed initially */}
-        <div id="collapse-services" className="collapse">
-          {data?.services && data.services.length > 0 ? (
-            <div className="row">
-              {data.services.map((service) => (
-                <div key={service.id} className="col-md-12 mb-3">
-                  <div className="card h-100 shadow-sm border-0">
-                    <div className="card-body">
-                      <h6 className="fw-semibold mb-1">
-                        <i className="bx bx-wrench me-1"></i>
-                        {service.name}
-                      </h6>
-                      <p className="text-muted small mb-0">
-                        {service.description || "No description available."}
-                      </p>
-                    </div>
-                  </div>
-                </div>
-              ))}
-            </div>
-          ) : (
-            <div className="text-muted fst-italic ps-2">No services available</div>
-          )}
-        </div>
+      <div className="d-flex text-secondary mb-2">
+        {" "}
+        <i className="bx bx-sm bx-briefcase me-1" /> Projects And Services
       </div>
     </div>
   );

src/components/Project/Team/Teams.jsx

@@ -201,7 +201,7 @@ const Teams = () => {
                     className="form-check-label ms-2"
                     htmlFor="activeEmployeeSwitch"
                   >
-                    {activeEmployee ? "Active Employees" : "In-active Employees"}
+                    {activeEmployee ? "Active Employees" : "Include Inactive Employees"}
                   </label>
                 </div>
               </div>

src/components/Tenant/LogoUpload.jsx

@@ -45,7 +45,7 @@ export const LogoUpload = ({ preview, setPreview, fileName, setFileName }) => {
   return (
     <div className="col-sm-12 mb-3">
       <div
-        className="border border-secondary text-black border-dashed rounded p-2 text-center  position-relative"
+        className="border border-secondary border-dashed rounded p-2 text-center  position-relative"
         style={{ cursor: "pointer" }}
         onClick={() => document.getElementById("logoImageInput")?.click()}
       >

src/pages/Directory/ContactFilterPanel.jsx

@@ -1,5 +1,5 @@
 import { zodResolver } from "@hookform/resolvers/zod";
-import React, { useEffect } from "react";
+import React from "react";
 import { FormProvider, useForm } from "react-hook-form";
 import {
   contactsFilter,
@@ -8,14 +8,11 @@ import {
 import { useContactFilter } from "../../hooks/useDirectory";
 import { ExpenseFilterSkeleton } from "../../components/Expenses/ExpenseSkeleton";
 import SelectMultiple from "../../components/common/SelectMultiple";
-import { useLocation } from "react-router-dom";
 
 const ContactFilterPanel = ({ onApply, clearFilter }) => {
   const { data, isError, isLoading, error, isFetched, isFetching } =
     useContactFilter();
 
-  const location = useLocation();
-
   const methods = useForm({
     resolver: zodResolver(contactsFilter),
     defaultValues: defaultContactFilter,
@@ -38,19 +35,9 @@ const ContactFilterPanel = ({ onApply, clearFilter }) => {
     closePanel();
   };
 
-
-  useEffect(() => {
-    return () => {
-      closePanel();
-    };
-  }, []);
-
   if (isLoading || isFetching) return <ExpenseFilterSkeleton />;
   if (isError && isFetched)
     return <div>Something went wrong Here- {error.message} </div>;
-
-
-
   return (
     <FormProvider {...methods}>
       <form onSubmit={handleSubmit(onSubmit)} className="p-2 text-start">

src/pages/Directory/DirectoryPage.jsx

@@ -139,7 +139,8 @@ export default function DirectoryPage({ IsPage = true, projectId = null }) {
                 <ul className="nav nav-tabs">
                   <li className="nav-item cursor-pointer">
                     <a
-                      className={`nav-link ${activeTab === "notes" ? "active" : ""
+                      className={`nav-link ${
+                        activeTab === "notes" ? "active" : ""
                       } fs-6`}
                       onClick={(e) => handleTabClick("notes", e)}
                     >
@@ -149,7 +150,8 @@ export default function DirectoryPage({ IsPage = true, projectId = null }) {
                   </li>
                   <li className="nav-item cursor-pointer">
                     <a
-                      className={`nav-link ${activeTab === "contacts" ? "active" : ""
+                      className={`nav-link ${
+                        activeTab === "contacts" ? "active" : ""
                       } fs-6`}
                       onClick={(e) => handleTabClick("contacts", e)}
                     >
@@ -188,21 +190,23 @@ export default function DirectoryPage({ IsPage = true, projectId = null }) {
                           />
                          </div>
                           <button
-                            className={`btn btn-sm p-1 ${gridView ? " btn-primary" : " btn-outline-primary"
-                              }`}
-                            onClick={() => setGridView(true)}
-                          >
-                            <i className="bx bx-grid-alt"></i>
-                          </button>
-                          <button
-                            className={`btn btn-sm p-1 ${!gridView ? "btn-primary" : "btn-outline-primary"
+                            className={`btn btn-sm p-1 ${
+                              !gridView ? "btn-primary" : "btn-outline-primary"
                             }`}
                             onClick={() => setGridView(false)}
                           >
                             <i className="bx bx-list-ul"></i>
                           </button>
 
-                          <div className="form-check form-switch d-flex align-items-end d-none d-md-flex">
+                          <button
+                            className={`btn btn-sm p-1 ${
+                              gridView ? " btn-primary" : " btn-outline-primary"
+                            }`}
+                            onClick={() => setGridView(true)}
+                          >
+                            <i className="bx bx-grid-alt"></i>
+                          </button>
+                          <div className="form-check form-switch d-flex align-items-center d-none d-md-flex">
                           <input
                             type="checkbox"
                             className="form-check-input"
@@ -215,14 +219,32 @@ export default function DirectoryPage({ IsPage = true, projectId = null }) {
                             className="form-check-label ms-2"
                             htmlFor="inactiveEmployeesCheckbox"
                           >
-                              {showActive ? "Active" : "In-active"} Contacts
+                            {showActive ? "Active" : "Inactive"} Contacts
                           </label>
                         </div>
                         </div>
+
+                        
                       </div>
                     )}
                   </div>
                    <div className="col-12 col-md-2 d-flex justify-content-end align-items-center gap-2">
+                    <div className={`form-check form-switch d-flex align-items-center  ${activeTab === "contacts" ? " d-flex d-md-none m-0":"d-none" }`}>
+                          <input
+                            type="checkbox"
+                            className="form-check-input"
+                            role="switch"
+                            id="inactiveEmployeesCheckbox"
+                            checked={showActive}
+                            onChange={(e) => setShowActive(e.target.checked)}
+                          />
+                          <label
+                            className="form-check-label ms-2"
+                            htmlFor="inactiveEmployeesCheckbox"
+                          >
+                            {showActive ? "Active" : "Inactive"} Contacts
+                          </label>
+                        </div>
                         <div className="  btn-group">
                     <button
                       className="btn btn-sm btn-label-secondary dropdown-toggle"
@@ -244,6 +266,7 @@ export default function DirectoryPage({ IsPage = true, projectId = null }) {
                     </ul>
                   </div>
                    </div>
+                  
                 </div>
               </div>
             </div>

src/pages/Directory/NoteFilterPanel.jsx

@@ -1,5 +1,5 @@
 import { zodResolver } from "@hookform/resolvers/zod";
-import React, { useEffect } from "react";
+import React from "react";
 import { FormProvider, useForm } from "react-hook-form";
 import {
   defaultNotesFilter,
@@ -8,18 +8,11 @@ import {
 import { useContactFilter, useNoteFilter } from "../../hooks/useDirectory";
 import { ExpenseFilterSkeleton } from "../../components/Expenses/ExpenseSkeleton";
 import SelectMultiple from "../../components/common/SelectMultiple";
-import { useLocation } from "react-router-dom";
 
 const NoteFilterPanel = ({ onApply, clearFilter }) => {
   const { data, isError, isLoading, error, isFetched, isFetching } =
     useNoteFilter();
 
-  useEffect(() => {
-    return () => {
-      closePanel();
-    };
-  }, []);
-
   const methods = useForm({
     resolver: zodResolver(notesFilter),
     defaultValues: defaultNotesFilter,

src/pages/employee/EmployeeList.jsx

@@ -176,9 +176,11 @@ const EmployeeList = () => {
   useEffect(() => {
     if (!loading && Array.isArray(employees)) {
       const sorted = [...employees].sort((a, b) => {
-        const nameA = `${a.firstName || ""}${a.middleName || ""}${a.lastName || ""
+        const nameA = `${a.firstName || ""}${a.middleName || ""}${
+          a.lastName || ""
         }`.toLowerCase();
-        const nameB = `${b.firstName || ""}${b.middleName || ""}${b.lastName || ""
+        const nameB = `${b.firstName || ""}${b.middleName || ""}${
+          b.lastName || ""
         }`.toLowerCase();
         return nameA?.localeCompare(nameB);
       });
@@ -256,7 +258,8 @@ const EmployeeList = () => {
               ? "Suspend Employee"
               : "Reactivate Employee"
           }
-          message={`Are you sure you want to ${selectedEmpFordelete?.isActive ? "suspend" : "reactivate"
+          message={`Are you sure you want to ${
+            selectedEmpFordelete?.isActive ? "suspend" : "reactivate"
           } this employee?`}
           onSubmit={(id) =>
             suspendEmployee({
@@ -306,7 +309,7 @@ const EmployeeList = () => {
                         className="form-check-label ms-0"
                         htmlFor="inactiveEmployeesCheckbox"
                       >
-                        In-active Employees
+                        Show Inactive Employees
                       </label>
                     </div>
                   </div>
@@ -468,7 +471,8 @@ const EmployeeList = () => {
                         Status
                       </th>
                       <th
-                        className={`sorting_disabled  ${!Manage_Employee && "d-none"
+                        className={`sorting_disabled  ${
+                          !Manage_Employee && "d-none"
                         }`}
                         rowSpan="1"
                         colSpan="1"
@@ -545,10 +549,11 @@ const EmployeeList = () => {
                                 {item.email}
                               </span>
                             ) : (
-                              <span className="d-block text-start text-muted fst-italic">NA</span>
+                              <span className="text-truncate text-italic">
+                                -
+                              </span>
                             )}
                           </td>
-
                           <td className="text-start  d-none  d-sm-table-cell">
                             <span className="text-truncate">
                               <i className="bx bxs-phone-call text-primary me-2"></i>
@@ -563,13 +568,8 @@ const EmployeeList = () => {
                           </td>
 
                           <td className=" d-none  d-md-table-cell">
-                            {item.joiningDate ? (
-                              moment(item.joiningDate).format("DD-MMM-YYYY")
-                            ) : (
-                              <span className="d-block text-center text-muted fst-italic">NA</span>
-                            )}
+                            {moment(item.joiningDate)?.format("DD-MMM-YYYY")}
                           </td>
-
                           <td>
                             {showInactive ? (
                               <span

src/pages/project/ProjectDetails.jsx

@@ -77,7 +77,7 @@ const ProjectDetails = () => {
               <AboutProject />
               <ProjectOverview project={projectId} />
             </div>
-            <div className="col-lg-8 col-md-7 mt-2">
+            <div className="col-lg-8 col-md-7 mt-5">
               <ProjectProgressChart ShowAllProject="false" DefaultRange="1M" />
               <div className="mt-5">
                 <AttendanceOverview />