admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge branch 'Refactor_Directory' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management

Browse Source
This commit is contained in:
pramod mahajan 2025-09-17 14:26:35 +05:30
commit 834ce62e67
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/components/Project/ProjectPermission.jsx
View File

@ -101,6 +101,9 @@ const ProjectPermission = () => {
return ( return (
<div className="w-100 p py-1 "> <div className="w-100 p py-1 ">
<div className="text-start m-0">
<p className="fw-semibold fs-6">Project Permission</p>
</div>
<form className="row" onSubmit={handleSubmit(onSubmit)}> <form className="row" onSubmit={handleSubmit(onSubmit)}>
<div className="d-flex justify-content-between align-items-end gap-2 mb-3"> <div className="d-flex justify-content-between align-items-end gap-2 mb-3">
<div className="text-start d-flex align-items-center gap-2"> <div className="text-start d-flex align-items-center gap-2">
@ -134,24 +137,23 @@ const ProjectPermission = () => {
)} )}
</select> </select>
{errors.employeeId && ( {errors.employeeId && (
<div className="d-block text-danger small"> <div className="d-block text-danger small">
{errors.employeeId.message} {errors.employeeId.message}
</div> </div>
)} )}
</div> </div>
</div> </div>
<div className="mt-3 text-end"> <div className="mt-3 text-end">
{isDirty && ( <button {isDirty && (
type="submit" <button
className="btn btn-sm btn-primary" type="submit"
disabled={isPending || loading} className="btn btn-sm btn-primary"
> disabled={isPending || loading}
{isPending ? "Please Wait..." : "Save Permission"} >
</button>)} {isPending ? "Please Wait..." : "Save Permission"}
</button>
)}
</div> </div>
</div> </div>

11
src/components/Project/ProjectSetting.jsx
View File

@ -3,9 +3,10 @@ import { ComingSoonPage } from "../../pages/Misc/ComingSoonPage";
import ProjectPermission from "./ProjectPermission"; import ProjectPermission from "./ProjectPermission";
const ProjectSetting = () => { const ProjectSetting = () => {
const [activePill, setActivePill] = useState(() => { const [activePill, setActivePill] = useState("Permissions")
return localStorage.getItem("lastActiveProjectSettingTab") || "Permissions"; // const [activePill, setActivePill] = useState(() => {
}); // return localStorage.getItem("lastActiveProjectSettingTab") || "Permissions";
// });
const projectSettingTab = [ const projectSettingTab = [
{ key: "Permissions", label: "Permissions" }, { key: "Permissions", label: "Permissions" },
{ key: "Notification", label: "Notification" }, { key: "Notification", label: "Notification" },
@ -32,7 +33,7 @@ const ProjectSetting = () => {
return ( return (
<div className="w-100"> <div className="w-100">
<div className="card py-2 px-5"> <div className="card py-2 px-5">
<div className="col-12"> {/* <div className="col-12">
<div className="dropdown text-end"> <div className="dropdown text-end">
<button <button
className="btn btn-sm btn-outline-primary dropdown-toggle" className="btn btn-sm btn-outline-primary dropdown-toggle"
@ -63,7 +64,7 @@ const ProjectSetting = () => {
)} )}
</ul> </ul>
</div> </div>
</div> </div> */}
<div className="mt-3">{renderContent()}</div> <div className="mt-3">{renderContent()}</div>
</div> </div>