From 85e8e96017ff997d8a39fef713eb80d30f462c8c Mon Sep 17 00:00:00 2001
From: Sukma Gladys <sukmagladysv@gmail.com>
Date: Mon, 4 Nov 2024 20:33:00 +0700
Subject: [PATCH] feat: add color, header and navbar condition

---
 apps/frontend/src/components/AppHeader.tsx                | 8 +++++---
 apps/frontend/src/components/AppNavbar.tsx                | 2 +-
 apps/frontend/src/index.css                               | 5 +++++
 .../_dashboardLayout/assessmentRequest/index.lazy.tsx     | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/apps/frontend/src/components/AppHeader.tsx b/apps/frontend/src/components/AppHeader.tsx
index 600beb0..4f4f701 100644
--- a/apps/frontend/src/components/AppHeader.tsx
+++ b/apps/frontend/src/components/AppHeader.tsx
@@ -66,14 +66,15 @@ export default function AppHeader({ toggle }: Props) {
 				</div>
 
 				{/* Conditional Navlinks */}
+				{!isSuperAdmin && (
 				<div className="flex space-x-4 justify-center w-full">
 					{showAssessmentResultLinks && (
 						<>
 							<Link
 								to="/assessmentRequest"
 								className={cx("text-sm font-medium", {
-									"text-blue-600": isSuperAdmin ? managementResultsLinks : assessmentRequestsLinks, // warna aktif
-									"text-gray-700": isSuperAdmin ? !managementResultsLinks : !assessmentRequestsLinks, // warna default
+									"text-blue-600": assessmentRequestsLinks, // warna aktif
+									"text-gray-700": !assessmentRequestsLinks, // warna default
 								})}
 								onClick={() => {
 									if (window.opener) {
@@ -81,7 +82,7 @@ export default function AppHeader({ toggle }: Props) {
 									}
 								}}
 							>
-								{isSuperAdmin ? "Manajemen Hasil" : "Permohonan Assessment"}
+								Permohonan Assessment
 							</Link>
 							<Link
 								to="/assessmentResult"
@@ -123,6 +124,7 @@ export default function AppHeader({ toggle }: Props) {
 						</>
 					)}
 				</div>
+				)}
 
 				<DropdownMenu
 					modal={false}
diff --git a/apps/frontend/src/components/AppNavbar.tsx b/apps/frontend/src/components/AppNavbar.tsx
index d1c2e79..2c4a59e 100644
--- a/apps/frontend/src/components/AppNavbar.tsx
+++ b/apps/frontend/src/components/AppNavbar.tsx
@@ -21,7 +21,7 @@ export default function AppNavbar() {
 	// const userRole = JSON.parse(localStorage.getItem('userRole') || '{}');
 
 	const { pathname } = useLocation();
-	const pathsThatCloseSidebar = ["/assessmentResult", "/assessment"];
+	const pathsThatCloseSidebar = ["/assessmentRequest", "/assessmentResult", "/assessment"];
 
 	const [isSidebarOpen, setSidebarOpen] = useState(true);
 	const toggleSidebar = () => {
diff --git a/apps/frontend/src/index.css b/apps/frontend/src/index.css
index c6f68d5..54eba2f 100644
--- a/apps/frontend/src/index.css
+++ b/apps/frontend/src/index.css
@@ -70,4 +70,9 @@
 
 :root {
   --primary-color: #2555FF;
+  --levelOne-color: #FF2F32;
+  --levelTwo-color: #FE6939;
+  --levelThree-color: #EED42D;
+  --levelFour-color: #17C891;
+  --levelFive-color: #0C7C59;
 }
\ No newline at end of file
diff --git a/apps/frontend/src/routes/_dashboardLayout/assessmentRequest/index.lazy.tsx b/apps/frontend/src/routes/_dashboardLayout/assessmentRequest/index.lazy.tsx
index 0a64fd4..fdf0e04 100644
--- a/apps/frontend/src/routes/_dashboardLayout/assessmentRequest/index.lazy.tsx
+++ b/apps/frontend/src/routes/_dashboardLayout/assessmentRequest/index.lazy.tsx
@@ -72,7 +72,7 @@ export default function UsersPage() {
 			return;
 		}
 		const resultUrl = `/assessmentResult?id=${assessmentId}`;
-		window.location.href = resultUrl;
+		window.open(resultUrl, "_blank");
 	  };