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

src/components/Project/ProjectPermission.jsx

@@ -101,6 +101,9 @@ const ProjectPermission = () => {
 
   return (
     <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)}>
         <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">
@@ -139,19 +142,18 @@ const ProjectPermission = () => {
                 </div>
               )}
             </div>
-
-            
           </div>
 
           <div className="mt-3 text-end">
-            {isDirty && (  <button
+            {isDirty && (
+              <button
                 type="submit"
                 className="btn btn-sm btn-primary"
                 disabled={isPending || loading}
               >
                 {isPending ? "Please Wait..." : "Save Permission"}
-            </button>)}
-          
+              </button>
+            )}
           </div>
         </div>
 

src/components/Project/ProjectSetting.jsx

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