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
Showing only changes of commit 3aca0aa9dc - Show all commits

View File

@ -58,10 +58,11 @@ export default function AppHeader({ toggle, toggleLeftSidebar }: Props) {
const { pathname } = useLocation(); const { pathname } = useLocation();
const showAssessmentResultLinks = pathname === "/assessmentResult"; const showAssessmentResultLinks = pathname === "/assessmentResult";
const showAssessmentLinks = pathname === "/assessment"; const showAssessmentLinks = pathname === "/assessment";
const showVerifyingAssessmentLinks = pathname === "/verifying";
const assessmentRequestsLinks = pathname === "/assessmentRequest"; const assessmentRequestsLinks = pathname === "/assessmentRequest";
const managementResultsLinks = pathname === "/assessmentResultsManagement"; const managementResultsLinks = pathname === "/assessmentResultsManagement";
const shouldShowButton = !(showAssessmentResultLinks || showAssessmentLinks || assessmentRequestsLinks); const shouldShowButton = !(showAssessmentResultLinks || showAssessmentLinks || assessmentRequestsLinks || showVerifyingAssessmentLinks );
return ( return (
<header className="fixed top-0 left-0 w-full h-16 bg-white z-50 border"> <header className="fixed top-0 left-0 w-full h-16 bg-white z-50 border">
@ -76,8 +77,8 @@ export default function AppHeader({ toggle, toggleLeftSidebar }: Props) {
</Button> </Button>
)} )}
{showAssessmentLinks && ( {(showAssessmentLinks || showVerifyingAssessmentLinks) && (
<TbMenu2 onClick={toggleLeftSidebar} className="md:ml-0 ml-6 mt-8 w-6 h-fit pb-4 mb-4 cursor-pointer" /> <TbMenu2 onClick={toggleLeftSidebar} className="md:ml-0 ml-6 mt-8 w-6 h-fit pb-4 mb-4 cursor-pointer lg:hidden" />
)} )}
<img <img