- {((pathName.includes("/view") && props.state === "view") ||
- params.usersId ||
- params.rolesId) && (
+ {props.requiredButtons.includes("back") && (
router.back()}>
@@ -38,35 +42,39 @@ const TopHeader = (props) => {
{props.topbarTitle}
- {(pathName === "/projects/view" || !props.state) && (
+ {props.requiredButtons.includes("search") && (
)}
- {pathName === "/credentials" ? (
+ {props.requiredButtons.includes("env") && (
- ) : (
- ""
)}
- {pathName === "/projects/view" && (
-
}
+ text={props.buttonText}
onClick={() => props.trigger(!props.triggerState)}
- >
-
-
{props.buttonText}
-
+ />
)}
- {!props.state && (
-
+ {props.requiredButtons.includes("edit") && (
+
}
+ text="Edit"
+ onClick={() => props.trigger(!props.triggerState)}
+ />
)}
- {props.state === "add" ? (
+ {props.requiredButtons.includes("add") && (
+
}
+ text={props.buttonText}
+ onClick={handleNavigateToAdd}
+ />
+ )}
+ {props.requiredButtons.includes("save") && (
<>
{
{props.cancelButtonText}
>
- ) : (
- ""
)}
- {/* Projects 3 dots menu */}
- {pathName === "/projects/view" && (
+ {props.requiredButtons.includes("update") && (
+ <>
+
}
+ text="Update"
+ />
+
router.back()}
+ >
+
{props.cancelButtonText}
+
+ >
+ )}
+ {props?.requiredButtons?.includes("services-drop-down") && (
setTriggerDropDownMenu(!triggerDropDownMenu)}
@@ -124,6 +143,39 @@ const TopHeader = (props) => {
)}
)}
+
+ {props.requiredButtons.includes("download") && (
+
setTriggerDropDownMenu(!triggerDropDownMenu)}
+ >
+
+
+
+ {triggerDropDownMenu && (
+
+ )}
+
+ )}
>
diff --git a/frontend/src/app/components/topHeader/styles.module.css b/frontend/src/app/components/topHeader/styles.module.css
index ffdcd7b..07d0f2b 100644
--- a/frontend/src/app/components/topHeader/styles.module.css
+++ b/frontend/src/app/components/topHeader/styles.module.css
@@ -63,6 +63,7 @@
border-radius: 6px;
border: 0.5px solid #8187ff;
background: rgba(83, 89, 242, 0.25);
+ color: white;
cursor: pointer;
}
.button:hover {
@@ -126,7 +127,7 @@
}
.dotMenu {
display: flex;
- padding: 8px;
+ padding: 7px;
align-items: center;
gap: 12px;
border-radius: 6px;
@@ -167,7 +168,6 @@
.dropDown > div:hover {
border-radius: 4px;
background: #3c4159;
- background: color(display-p3 0.2392 0.2549 0.3412);
color: white;
}
.dropDown > div:hover p {
diff --git a/frontend/src/app/credentials/add/page.jsx b/frontend/src/app/credentials/add/page.jsx
index 4d76d97..1ac4d3b 100644
--- a/frontend/src/app/credentials/add/page.jsx
+++ b/frontend/src/app/credentials/add/page.jsx
@@ -38,6 +38,7 @@ const Page = () => {
cancelButtonText="Cancel"
topbarTitle="Create Credential"
state="add"
+ requiredButtons={["title", "save"]}
/>
{/* Create Crediantial Container */}
diff --git a/frontend/src/app/credentials/page.jsx b/frontend/src/app/credentials/page.jsx
index 15558e5..ab7bc33 100644
--- a/frontend/src/app/credentials/page.jsx
+++ b/frontend/src/app/credentials/page.jsx
@@ -60,7 +60,11 @@ const CredentialsPage = () => {
-
+
diff --git a/frontend/src/app/organization/page.jsx b/frontend/src/app/organization/page.jsx
index b5e3367..2affdad 100644
--- a/frontend/src/app/organization/page.jsx
+++ b/frontend/src/app/organization/page.jsx
@@ -58,7 +58,11 @@ const OrganizationPage = () => {
-
+
diff --git a/frontend/src/app/projects/page.jsx b/frontend/src/app/projects/page.jsx
index 79484d3..f6fd662 100644
--- a/frontend/src/app/projects/page.jsx
+++ b/frontend/src/app/projects/page.jsx
@@ -171,7 +171,11 @@ const ProjectsPage = () => {
-
+
diff --git a/frontend/src/app/projects/view/[servicesId]/page.jsx b/frontend/src/app/projects/view/[servicesId]/page.jsx
index 809b5ab..07f46d2 100644
--- a/frontend/src/app/projects/view/[servicesId]/page.jsx
+++ b/frontend/src/app/projects/view/[servicesId]/page.jsx
@@ -42,6 +42,7 @@ const AddServices = () => {
cancelButtonText="Cancel"
state="view"
topbarTitle="View Services"
+ requiredButtons={["back", "title", "edit", "download"]}
/>
diff --git a/frontend/src/app/projects/view/add-from-scratch/page.jsx b/frontend/src/app/projects/view/add-from-scratch/page.jsx
index 83355f2..ad9d51e 100644
--- a/frontend/src/app/projects/view/add-from-scratch/page.jsx
+++ b/frontend/src/app/projects/view/add-from-scratch/page.jsx
@@ -34,6 +34,7 @@ const AddServices = () => {
cancelButtonText="Cancel"
state="add"
topbarTitle="Create New Services"
+ requiredButtons={["title", "save"]}
/>
diff --git a/frontend/src/app/projects/view/page.jsx b/frontend/src/app/projects/view/page.jsx
index 871e0d8..2587121 100644
--- a/frontend/src/app/projects/view/page.jsx
+++ b/frontend/src/app/projects/view/page.jsx
@@ -99,6 +99,13 @@ const AddProject = () => {
topbarTitle="Services"
trigger={setTriggerAddServicesModal}
triggerState={triggerAddServicesModal}
+ requiredButtons={[
+ "title",
+ "back",
+ "add-services",
+ "search",
+ "services-drop-down",
+ ]}
/>
diff --git a/frontend/src/app/roles/[rolesId]/page.jsx b/frontend/src/app/roles/[rolesId]/page.jsx
index 2ee9a55..892ef68 100644
--- a/frontend/src/app/roles/[rolesId]/page.jsx
+++ b/frontend/src/app/roles/[rolesId]/page.jsx
@@ -25,7 +25,12 @@ const page = () => {
-
+
{/* Input fields Container */}
diff --git a/frontend/src/app/roles/add/page.jsx b/frontend/src/app/roles/add/page.jsx
index b6aaf95..27e5530 100644
--- a/frontend/src/app/roles/add/page.jsx
+++ b/frontend/src/app/roles/add/page.jsx
@@ -14,6 +14,7 @@ const page = () => {
cancelButtonText="Cancel"
topbarTitle="Add Role"
state="add"
+ requiredButtons={["title", "save"]}
/>
{/* Input fields Container */}
diff --git a/frontend/src/app/roles/page.jsx b/frontend/src/app/roles/page.jsx
index 3a40686..6f40df1 100644
--- a/frontend/src/app/roles/page.jsx
+++ b/frontend/src/app/roles/page.jsx
@@ -49,7 +49,11 @@ const RolesPage = () => {
-
+
{/* Users Table */}
diff --git a/frontend/src/app/users/[usersId]/page.jsx b/frontend/src/app/users/[usersId]/page.jsx
index e02e17c..72f1a51 100644
--- a/frontend/src/app/users/[usersId]/page.jsx
+++ b/frontend/src/app/users/[usersId]/page.jsx
@@ -28,7 +28,12 @@ const Page = () => {
-
+
{/* Input fields Container */}
diff --git a/frontend/src/app/users/add/page.jsx b/frontend/src/app/users/add/page.jsx
index e3b27b6..9549814 100644
--- a/frontend/src/app/users/add/page.jsx
+++ b/frontend/src/app/users/add/page.jsx
@@ -14,6 +14,7 @@ const page = () => {
cancelButtonText="Cancel"
topbarTitle="Add User"
state="add"
+ requiredButtons={["title", "save"]}
/>
{/* Input fields Container */}
diff --git a/frontend/src/app/users/page.jsx b/frontend/src/app/users/page.jsx
index 1aa6756..a1ac40f 100644
--- a/frontend/src/app/users/page.jsx
+++ b/frontend/src/app/users/page.jsx
@@ -36,8 +36,11 @@ const UsersPage = () => {
-
- {/* Users Table */}
+