gitea/amati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
Conversation 0 Commits 429 Files Changed 142 +70 -58
3 changed files with 70 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8eacb4e1c9 - Show all commits

BIN
apps/frontend/src/assets/logos/amati-logo-old.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
apps/frontend/src/assets/logos/amati-logo.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.7 KiB

128
apps/frontend/src/components/AppHeader.tsx
View File

@ -62,68 +62,78 @@ export default function AppHeader({ toggle }: Props) {
</Button> </Button>
)} )}
<img src={logo} alt="" className="w-44 h-fit px-8 py-5" /> <img
src={logo}
alt=""
className="w-44 h-fit px-8 py-5 object-cover"
/>
</div> </div>
{/* Conditional Navlinks */} {/* Conditional Navlinks */}
{!isSuperAdmin && ( {!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": assessmentRequestsLinks, // warna aktif "text-blue-600":
"text-gray-700": !assessmentRequestsLinks, // warna default assessmentRequestsLinks, // warna aktif
})} "text-gray-700":
onClick={() => { !assessmentRequestsLinks, // warna default
if (window.opener) { })}
window.close(); onClick={() => {
} if (window.opener) {
}} window.close();
> }
Permohonan Assessment }}
</Link> >
<Link Permohonan Assessment
to="/assessmentResult" </Link>
className={cx("text-sm font-medium", { <Link
"text-blue-600": showAssessmentResultLinks, // warna aktif to="/assessmentResult"
"text-gray-700": !showAssessmentResultLinks, // warna default className={cx("text-sm font-medium", {
})} "text-blue-600":
> showAssessmentResultLinks, // warna aktif
Hasil Assessment "text-gray-700":
</Link> !showAssessmentResultLinks, // warna default
</> })}
)} >
Hasil Assessment
</Link>
</>
)}
{showAssessmentLinks && ( {showAssessmentLinks && (
<> <>
<Link <Link
to="/assessmentRequest" to="/assessmentRequest"
className={cx("text-sm font-medium", { className={cx("text-sm font-medium", {
"text-blue-600": assessmentRequestsLinks, // warna aktif "text-blue-600":
"text-gray-700": !assessmentRequestsLinks, // warna default assessmentRequestsLinks, // warna aktif
})} "text-gray-700":
onClick={() => { !assessmentRequestsLinks, // warna default
if (window.opener) { })}
window.close(); onClick={() => {
} if (window.opener) {
}} window.close();
> }
Permohonan Assessment }}
</Link> >
<Link Permohonan Assessment
to="/assessment" </Link>
className={cx("text-sm font-medium", { <Link
"text-blue-600": showAssessmentLinks, // warna aktif to="/assessment"
"text-gray-700": !showAssessmentLinks, // warna default className={cx("text-sm font-medium", {
})} "text-blue-600": showAssessmentLinks, // warna aktif
> "text-gray-700": !showAssessmentLinks, // warna default
Assessment })}
</Link> >
</> Assessment
)} </Link>
</div> </>
)}
</div>
)} )}
<DropdownMenu <DropdownMenu
@ -142,7 +152,9 @@ export default function AppHeader({ toggle }: Props) {
{user?.photoProfile ? ( {user?.photoProfile ? (
<AvatarImage src={user.photoProfile} /> <AvatarImage src={user.photoProfile} />
) : ( ) : (
<AvatarFallback>{user?.name?.charAt(0) ?? "A"}</AvatarFallback> <AvatarFallback>
{user?.name?.charAt(0) ?? "A"}
</AvatarFallback>
)} )}
</Avatar> </Avatar>
</div> </div>