From a86c815ca296f4d16c6ce1ac8f8a81fed4a262dc Mon Sep 17 00:00:00 2001 From: Vikas Nale Date: Tue, 16 Sep 2025 18:33:48 +0530 Subject: [PATCH] Asthetic Changes - Margin on all sides for grid - Margin for card content --- src/components/Dashboard/AttendanceChart.jsx | 14 +- src/components/Tenant/TenantsList.jsx | 12 +- src/pages/Activities/AttendancePage.jsx | 39 ++-- src/pages/Directory/DirectoryPage.jsx | 208 +++++++++---------- src/pages/Home/LandingPage.jsx | 68 ++---- src/pages/Tenant/TenantPage.jsx | 111 +++++----- src/pages/employee/EmployeeList.jsx | 80 ++++--- src/pages/master/MasterPage.jsx | 103 ++++++--- src/pages/master/MasterTable.jsx | 5 +- 9 files changed, 338 insertions(+), 302 deletions(-) diff --git a/src/components/Dashboard/AttendanceChart.jsx b/src/components/Dashboard/AttendanceChart.jsx index 01b62eed..3879c0e4 100644 --- a/src/components/Dashboard/AttendanceChart.jsx +++ b/src/components/Dashboard/AttendanceChart.jsx @@ -99,9 +99,7 @@ const AttendanceOverview = () => { }; return ( -
+
{/* Header */}
@@ -119,18 +117,22 @@ const AttendanceOverview = () => {
diff --git a/src/components/Tenant/TenantsList.jsx b/src/components/Tenant/TenantsList.jsx index 4788d7a2..cc039890 100644 --- a/src/components/Tenant/TenantsList.jsx +++ b/src/components/Tenant/TenantsList.jsx @@ -125,18 +125,18 @@ const TenantsList = ({ ]; if (isInitialLoading) return ; - if (isError) + if (isError) return (
-
- -

{error.message}

-
+
+ +

{error.message}

+
); return ( <> -
+
diff --git a/src/pages/Activities/AttendancePage.jsx b/src/pages/Activities/AttendancePage.jsx index 717af11a..f0e00ad5 100644 --- a/src/pages/Activities/AttendancePage.jsx +++ b/src/pages/Activities/AttendancePage.jsx @@ -95,11 +95,11 @@ const AttendancePage = () => { {(modelConfig?.action === 0 || modelConfig?.action === 1 || modelConfig?.action === 2) && ( - - )} + + )} {/* For view logs */} {modelConfig?.action === 6 && ( @@ -118,19 +118,19 @@ const AttendancePage = () => { ]} > -
+
{/* Tabs */} -
-
+
+
{/* Tabs */}
-
+
{selectedProject ? ( <> {activeTab === "all" && ( -
+
{
)}
-
diff --git a/src/pages/Directory/DirectoryPage.jsx b/src/pages/Directory/DirectoryPage.jsx index 29b60f15..40dc51e3 100644 --- a/src/pages/Directory/DirectoryPage.jsx +++ b/src/pages/Directory/DirectoryPage.jsx @@ -133,119 +133,119 @@ export default function DirectoryPage({ IsPage = true, projectId = null }) { > )}
-
- +
+ -
-
-
- {activeTab === "notes" && ( - setSearchNote(e.target.value)} - /> - )} +
+
+
+ {activeTab === "notes" && ( + setSearchNote(e.target.value)} + /> + )} - {activeTab === "contacts" && ( -
-
- setsearchContact(e.target.value)} - /> - + {activeTab === "contacts" && ( +
+
+ setsearchContact(e.target.value)} + /> + - + +
+ +
+ setShowActive(e.target.checked)} + /> + +
+ )} +
-
- setShowActive(e.target.checked)} - /> -
-
- )} -
- -
-
diff --git a/src/pages/Home/LandingPage.jsx b/src/pages/Home/LandingPage.jsx index 1d441312..0156ae5b 100644 --- a/src/pages/Home/LandingPage.jsx +++ b/src/pages/Home/LandingPage.jsx @@ -13,8 +13,6 @@ import "swiper/css/navigation"; import SwaperSlideContent from "./SwaperSlideContent"; import SwaperBlogContent from "./SwaperBlogContent"; - - const swiperConfig = { spaceBetween: 30, centeredSlides: true, @@ -110,7 +108,7 @@ const LandingPage = () => {
  • - + Blogs
    • @@ -182,7 +180,7 @@ const LandingPage = () => {
    -
    @@ -296,10 +294,7 @@ const LandingPage = () => {
    - laptop charging + laptop charging
    Project & Task Management

    @@ -309,10 +304,7 @@ const LandingPage = () => {

    - transition up + transition up
    Attendance & Leave Tracking

    @@ -332,10 +324,7 @@ const LandingPage = () => {

    - 3d select solid + 3d select solid
    Expense & Budget Tracking

    @@ -355,10 +344,7 @@ const LandingPage = () => {

    - keyboard + keyboard
    Document Management

    @@ -368,10 +354,7 @@ const LandingPage = () => {

    - keyboard + keyboard
    Service Provider & Subcontractor Tracking @@ -383,10 +366,7 @@ const LandingPage = () => {
    {" "}
    - keyboard + keyboard
    Inventory Management

    @@ -396,10 +376,7 @@ const LandingPage = () => {

    - keyboard + keyboard
    Directory

    @@ -411,10 +388,11 @@ const LandingPage = () => { {/* Useful features: End */} - {/* */} + {/* */}

    diff --git a/src/pages/Tenant/TenantPage.jsx b/src/pages/Tenant/TenantPage.jsx index f93163d9..ef33efbf 100644 --- a/src/pages/Tenant/TenantPage.jsx +++ b/src/pages/Tenant/TenantPage.jsx @@ -121,66 +121,67 @@ const TenantPage = () => { { label: "Tenant", link: null }, ]} /> +
    + {/* Super Tenant Actions */} + {isSuperTenant && ( +
    +
    + {/* Search */} +
    + setSearchText(e.target.value)} + className="form-control form-control" + placeholder="Search Tenant" + /> +
    - {/* Super Tenant Actions */} - {isSuperTenant && ( -
    -
    - {/* Search */} -
    - setSearchText(e.target.value)} - className="form-control form-control-sm" - placeholder="Search Tenant" - /> -
    + {/* Actions */} +
    + refetchFn && refetchFn()} + > + Refresh{" "} + + - {/* Actions */} -
    - refetchFn && refetchFn()} - > - Refresh{" "} - - - - + +
    -
    - )} + )} - {/* Tenant List or Access Denied */} - {isSuperTenant ? ( - - ) : !isSelfTenant ? ( -
    - -

    - Access Denied: You don't have permission to perform this action! -

    -
    - ) : null} + {/* Tenant List or Access Denied */} + {isSuperTenant ? ( + + ) : !isSelfTenant ? ( +
    + +

    + Access Denied: You don't have permission to perform this action! +

    +
    + ) : null} +
    ); diff --git a/src/pages/employee/EmployeeList.jsx b/src/pages/employee/EmployeeList.jsx index a7d6b918..648b736b 100644 --- a/src/pages/employee/EmployeeList.jsx +++ b/src/pages/employee/EmployeeList.jsx @@ -176,10 +176,12 @@ const EmployeeList = () => { useEffect(() => { if (!loading && Array.isArray(employees)) { const sorted = [...employees].sort((a, b) => { - const nameA = `${a.firstName || ""}${a.middleName || ""}${a.lastName || "" - }`.toLowerCase(); - const nameB = `${b.firstName || ""}${b.middleName || ""}${b.lastName || "" - }`.toLowerCase(); + const nameA = `${a.firstName || ""}${a.middleName || ""}${ + a.lastName || "" + }`.toLowerCase(); + const nameB = `${b.firstName || ""}${b.middleName || ""}${ + b.lastName || "" + }`.toLowerCase(); return nameA?.localeCompare(nameB); }); @@ -266,8 +268,9 @@ const EmployeeList = () => { ? "Suspend Employee" : "Reactivate Employee" } - message={`Are you sure you want to ${selectedEmpFordelete?.isActive ? "suspend" : "reactivate" - } this employee?`} + message={`Are you sure you want to ${ + selectedEmpFordelete?.isActive ? "suspend" : "reactivate" + } this employee?`} onSubmit={(id) => suspendEmployee({ employeeId: id, @@ -291,11 +294,11 @@ const EmployeeList = () => { {ViewTeamMember ? ( //
    -
    +
    {/* Switches: All Employees + Inactive */} @@ -315,7 +318,7 @@ const EmployeeList = () => { className="form-check-label ms-0" htmlFor="allEmployeesCheckbox" > - All Employees + Show All Employees
    )} @@ -351,7 +354,7 @@ const EmployeeList = () => { value={searchText} onChange={handleSearch} className="form-control form-control-sm" - placeholder="Search User" + placeholder="Search Employee" aria-controls="DataTables_Table_0" /> @@ -499,8 +502,9 @@ const EmployeeList = () => { Status
    ) : null} {!loading && - displayData?.length === 0 && - (!searchText || showAllEmployees) ? ( + displayData?.length === 0 && + (!searchText || showAllEmployees) ? ( @@ -627,7 +631,9 @@ const EmployeeList = () => {
    {/* View always visible */} {/* Suspend only when active */} @@ -649,7 +658,8 @@ const EmployeeList = () => { className="dropdown-item py-1" onClick={() => handleOpenDelete(item)} > - Suspend + {" "} + Suspend )} @@ -658,11 +668,13 @@ const EmployeeList = () => { type="button" data-bs-toggle="modal" data-bs-target="#managerole-modal" - onClick={() => setEmpForManageRole(item.id)} + onClick={() => + setEmpForManageRole(item.id) + } > - Manage Role + {" "} + Manage Role - )} @@ -672,7 +684,8 @@ const EmployeeList = () => { className="dropdown-item py-1" onClick={() => handleOpenDelete(item)} > - Re-activate + {" "} + Re-activate )}
    @@ -691,8 +704,9 @@ const EmployeeList = () => {
    { )} {/* Conditional messages for no data or no search results */} {!loading && - displayData?.length === 0 && - searchText && - !showAllEmployees ? ( + displayData?.length === 0 && + searchText && + !showAllEmployees ? (
    @@ -532,8 +536,8 @@ const EmployeeList = () => {
    { ) : ( - NA + - )}