Compare commits

..

No commits in common. "834ce62e67ab49519c81aaafe4c2facbf8893f39" and "19f8189fc361344b3d52d01621700a6ec3c72dff" have entirely different histories.

2 changed files with 19 additions and 22 deletions

View File

@ -101,9 +101,6 @@ 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">
@ -137,23 +134,24 @@ 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 && ( {isDirty && ( <button
<button type="submit"
type="submit" className="btn btn-sm btn-primary"
className="btn btn-sm btn-primary" disabled={isPending || loading}
disabled={isPending || loading} >
> {isPending ? "Please Wait..." : "Save Permission"}
{isPending ? "Please Wait..." : "Save Permission"} </button>)}
</button>
)}
</div> </div>
</div> </div>

View File

@ -3,10 +3,9 @@ import { ComingSoonPage } from "../../pages/Misc/ComingSoonPage";
import ProjectPermission from "./ProjectPermission"; import ProjectPermission from "./ProjectPermission";
const ProjectSetting = () => { const ProjectSetting = () => {
const [activePill, setActivePill] = useState("Permissions") const [activePill, setActivePill] = useState(() => {
// const [activePill, setActivePill] = useState(() => { return localStorage.getItem("lastActiveProjectSettingTab") || "Permissions";
// 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" },
@ -33,7 +32,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"
@ -64,7 +63,7 @@ const ProjectSetting = () => {
)} )}
</ul> </ul>
</div> </div>
</div> */} </div>
<div className="mt-3">{renderContent()}</div> <div className="mt-3">{renderContent()}</div>
</div> </div>