Skip to content

Commit 3243d55

Browse files
shawon-majidshawon-majid
authored
Merge branch 'main' into domestic
2 parents c6e56c3 + 97dd347 commit 3243d55

File tree

21 files changed

+1333
-93
lines changed

21 files changed

+1333
-93
lines changed

‎client/components/dashboard-componenets/mainContent/mainSectionHeader.tsx‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import { useContext } from "react";
3939
import { NavContext } from "@/hooks/contexts/useNavCtx";
4040
import { eraseCookie, getCookie } from "@/lib/cookieFunctions";
4141
import {
42+
companyName,
4243
curActive,
4344
jwtToken,
4445
landfillName,
@@ -48,7 +49,7 @@ import {
4849
username,
4950
} from "@/data/cookieNames";
5051
import { get } from "http";
51-
import { admin, landfillManager, stsManager } from "@/data/roles";
52+
import { admin, contractorManager, landfillManager, stsManager } from "@/data/roles";
5253
import axios from "axios";
5354
import { message } from "antd";
5455

@@ -128,11 +129,13 @@ export default function MainSectionHeader({
128129
<>{"NO LANDFILL ASSIGNED"}</>
129130
))}
130131

131-
{getCookie(curActive)?.startsWith(admin) &&
132-
<b>
133-
SYSTEM ADMIN OF ECOSYNC
134-
</b>}
132+
{getCookie(curActive)?.startsWith(admin) && (
133+
<b>SYSTEM ADMIN OF ECOSYNC</b>
134+
)}
135135

136+
{getCookie(curActive)?.startsWith(contractorManager) && (
137+
<b>CONTRACTOR MANAGER </b>
138+
)}
136139
</div>
137140

138141
{/* Profile Icon and dropdown menu */}

‎client/components/dashboard-componenets/mainContent/systemAdminContents/Contracts.tsx‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Button } from "@/components/ui/button";
22
import EmptyFillContainer from "../../cards/EmptyFillContainer";
3-
import { Plus, Trash, Truck, Warehouse } from "lucide-react";
3+
import { Plus, Trash, Truck, UserCog, Warehouse } from "lucide-react";
44
import { StsCreateModal } from "../../../modals/stsControl/StsModal";
55
import { VehicleCreateModal } from "@/components/modals/VehicleModal";
66
import { LandfillCreateModal } from "@/components/modals/landfillControl/LandfillModal";
@@ -10,35 +10,37 @@ import LandFillListTable from "@/components/dataTables/LandFillList";
1010
import AllVehicleList from "@/components/dataTables/AllVehicleList";
1111
import ContractLists from "@/components/dataTables/ContractLists";
1212
import ContractorLogTable from "@/components/dataTables/ContractorLogs";
13+
import { AddNewContractor } from "@/components/modals/ContractorControl/AddNewContractor";
14+
import { AddNewContractorManager } from "@/components/modals/ContractorControl/AddNewContractorManager";
1315

1416

1517
export default function AdminContractsPanel() {
1618
return (
1719
<main className="flex flex-1 flex-col gap-4 p-4 lg:gap-6 lg:p-6 max-h-[calc(100vh-60px)] overflow-scroll">
1820
<div className="flex items-center justify-between">
19-
<h1 className="text-lg font-semibold md:text-2xl hidden md:block">SYSTEM DATA</h1>
21+
<h1 className="text-lg font-semibold md:text-2xl hidden md:block">CONTRUCTOR DATA</h1>
2022
<div className="flex-grow-1"></div>
2123
<div className="flex gap-2">
22-
<StsCreateModal>
24+
<AddNewContractor>
2325
<Button
2426
variant="outline"
2527
size="sm"
2628
className={`w-full bg-[#1A4D2E] text-white flex item-center`}
2729
>
28-
<Trash size={14} strokeWidth={3} className="mr-2" />
30+
<Plus size={14} strokeWidth={3} className="mr-2" />
2931
ADD NEW COMPANY
3032
</Button>
31-
</StsCreateModal>
32-
<LandfillCreateModal>
33+
</AddNewContractor>
34+
<AddNewContractorManager>
3335
<Button
3436
variant="outline"
3537
size="sm"
3638
className={`w-full bg-[#1A4D2E] text-white flex item-center`}
3739
>
38-
<Warehouse size={16} className="mr-2" />
40+
<UserCog size={16} className="mr-2" />
3941
ADD NEW CONTRACTOR MANAGER
4042
</Button>
41-
</LandfillCreateModal>
43+
</AddNewContractorManager>
4244
</div>
4345
</div>
4446
<div className="flex flex-1 items-center justify-center rounded-lg border border-dashed shadow-sm">

‎client/components/dashboard-componenets/mainContent/systemAdminContents/Workforce.tsx‎

Lines changed: 23 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,47 @@
11
import { Button } from "@/components/ui/button";
22
import EmptyFillContainer from "../../cards/EmptyFillContainer";
33
import { Plus, Trash, Truck, Warehouse } from "lucide-react";
4-
import { StsCreateModal } from "../../../modals/stsControl/StsModal";
5-
import { VehicleCreateModal } from "@/components/modals/VehicleModal";
6-
import { LandfillCreateModal } from "@/components/modals/landfillControl/LandfillModal";
7-
import UserListTable from "@/components/dataTables/UserList";
8-
import STSListTable from "@/components/dataTables/STSList";
9-
import LandFillListTable from "@/components/dataTables/LandFillList";
10-
import AllVehicleList from "@/components/dataTables/AllVehicleList";
11-
4+
import ContractLists from "@/components/dataTables/ContractLists";
5+
import ContractorLogTable from "@/components/dataTables/ContractorLogs";
6+
import { AddNewContractor } from "@/components/modals/ContractorControl/AddNewContractor";
7+
import { AddNewContractorManager } from "@/components/modals/ContractorControl/AddNewContractorManager";
8+
import CleanerLists from "@/components/dataTables/CleanerList";
9+
import { AddNewCleaner } from "@/components/modals/cleanerControl/AddNewCleaner";
10+
import CleanerLog from "@/components/dataTables/CleanerLog";
1211

1312
export default function AdminWorkforcePanel() {
1413
return (
1514
<main className="flex flex-1 flex-col gap-4 p-4 lg:gap-6 lg:p-6 max-h-[calc(100vh-60px)] overflow-scroll">
1615
<div className="flex items-center justify-between">
17-
<h1 className="text-lg font-semibold md:text-2xl hidden md:block">SYSTEM DATA</h1>
16+
<h1 className="text-lg font-semibold md:text-2xl hidden md:block">
17+
WORKFORCE DATA
18+
</h1>
1819
<div className="flex-grow-1"></div>
1920
<div className="flex gap-2">
20-
<StsCreateModal>
21-
<Button
22-
variant="outline"
23-
size="sm"
24-
className={`w-full bg-[#1A4D2E] text-white flex item-center`}
25-
>
26-
<Trash size={14} strokeWidth={3} className="mr-2" />
27-
ADD NEW STS
28-
</Button>
29-
</StsCreateModal>
30-
<LandfillCreateModal>
21+
<AddNewCleaner>
3122
<Button
3223
variant="outline"
3324
size="sm"
3425
className={`w-full bg-[#1A4D2E] text-white flex item-center`}
3526
>
36-
<Warehouse size={16} className="mr-2" />
37-
ADD NEW LANDFILL
27+
<Plus size={14} strokeWidth={3} className="mr-2" />
28+
ADD NEW CLEANER
3829
</Button>
39-
</LandfillCreateModal>
40-
<VehicleCreateModal>
41-
<Button
42-
variant="outline"
43-
size="sm"
44-
className={`w-full bg-[#1A4D2E] text-white`}
45-
>
46-
<Truck size={16} className="mr-2" />
47-
ADD NEW VEHICLE
48-
</Button>
49-
</VehicleCreateModal>
30+
</AddNewCleaner>
5031
</div>
5132
</div>
5233
<div className="flex flex-1 items-center justify-center rounded-lg border border-dashed shadow-sm">
53-
<div className="grid grid-cols-1 md:grid-cols-2 grid-flow-row gap-2 md:gap-4 w-full md:h-full max-h-max">
54-
<div className="col-span-1 min-h-48">
55-
<EmptyFillContainer className={`bg-[#F5EFE6]`}><STSListTable /></EmptyFillContainer>
34+
<div className="grid grid-cols-1 md:grid-cols-5 grid-flow-row gap-2 md:gap-4 w-full md:h-full max-h-max">
35+
<div className="md:col-span-3 min-h-48">
36+
<EmptyFillContainer className={`bg-[#F5EFE6]`}>
37+
<CleanerLists />
38+
</EmptyFillContainer>
5639
</div>
57-
<div className="col-span-1 min-h-48">
58-
<EmptyFillContainer><LandFillListTable /></EmptyFillContainer>
59-
</div>
6040
<div className="md:col-span-2 min-h-48">
61-
<EmptyFillContainer><AllVehicleList /></EmptyFillContainer>
62-
</div>
41+
<EmptyFillContainer>
42+
<CleanerLog />
43+
</EmptyFillContainer>
44+
</div>
6345
</div>
6446
</div>
6547
</main>

0 commit comments

Comments
 (0)