Pull Request branch dev-clone to main #1

Merged
gitea merged 429 commits from dev-clone into main 2024-12-23 09:31:34 +00:00
4 changed files with 12 additions and 5 deletions
Showing only changes of commit 85e8e96017 - Show all commits

View File

@ -66,14 +66,15 @@ export default function AppHeader({ toggle }: Props) {
</div> </div>
{/* Conditional Navlinks */} {/* Conditional Navlinks */}
{!isSuperAdmin && (
<div className="flex space-x-4 justify-center w-full"> <div className="flex space-x-4 justify-center w-full">
{showAssessmentResultLinks && ( {showAssessmentResultLinks && (
<> <>
<Link <Link
to="/assessmentRequest" to="/assessmentRequest"
className={cx("text-sm font-medium", { className={cx("text-sm font-medium", {
"text-blue-600": isSuperAdmin ? managementResultsLinks : assessmentRequestsLinks, // warna aktif "text-blue-600": assessmentRequestsLinks, // warna aktif
"text-gray-700": isSuperAdmin ? !managementResultsLinks : !assessmentRequestsLinks, // warna default "text-gray-700": !assessmentRequestsLinks, // warna default
})} })}
onClick={() => { onClick={() => {
if (window.opener) { if (window.opener) {
@ -81,7 +82,7 @@ export default function AppHeader({ toggle }: Props) {
} }
}} }}
> >
{isSuperAdmin ? "Manajemen Hasil" : "Permohonan Assessment"} Permohonan Assessment
</Link> </Link>
<Link <Link
to="/assessmentResult" to="/assessmentResult"
@ -123,6 +124,7 @@ export default function AppHeader({ toggle }: Props) {
</> </>
)} )}
</div> </div>
)}
<DropdownMenu <DropdownMenu
modal={false} modal={false}

View File

@ -21,7 +21,7 @@ export default function AppNavbar() {
// const userRole = JSON.parse(localStorage.getItem('userRole') || '{}'); // const userRole = JSON.parse(localStorage.getItem('userRole') || '{}');
const { pathname } = useLocation(); const { pathname } = useLocation();
const pathsThatCloseSidebar = ["/assessmentResult", "/assessment"]; const pathsThatCloseSidebar = ["/assessmentRequest", "/assessmentResult", "/assessment"];
const [isSidebarOpen, setSidebarOpen] = useState(true); const [isSidebarOpen, setSidebarOpen] = useState(true);
const toggleSidebar = () => { const toggleSidebar = () => {

View File

@ -70,4 +70,9 @@
:root { :root {
--primary-color: #2555FF; --primary-color: #2555FF;
--levelOne-color: #FF2F32;
--levelTwo-color: #FE6939;
--levelThree-color: #EED42D;
--levelFour-color: #17C891;
--levelFive-color: #0C7C59;
} }

View File

@ -72,7 +72,7 @@ export default function UsersPage() {
return; return;
} }
const resultUrl = `/assessmentResult?id=${assessmentId}`; const resultUrl = `/assessmentResult?id=${assessmentId}`;
window.location.href = resultUrl; window.open(resultUrl, "_blank");
}; };