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
3 changed files with 70 additions and 58 deletions
Showing only changes of commit 8eacb4e1c9 - Show all commits

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

View File

@ -62,7 +62,11 @@ 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 */}
@ -73,8 +77,10 @@ export default function AppHeader({ toggle }: Props) {
<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":
!assessmentRequestsLinks, // warna default
})} })}
onClick={() => { onClick={() => {
if (window.opener) { if (window.opener) {
@ -87,8 +93,10 @@ export default function AppHeader({ toggle }: Props) {
<Link <Link
to="/assessmentResult" to="/assessmentResult"
className={cx("text-sm font-medium", { className={cx("text-sm font-medium", {
"text-blue-600": showAssessmentResultLinks, // warna aktif "text-blue-600":
"text-gray-700": !showAssessmentResultLinks, // warna default showAssessmentResultLinks, // warna aktif
"text-gray-700":
!showAssessmentResultLinks, // warna default
})} })}
> >
Hasil Assessment Hasil Assessment
@ -101,8 +109,10 @@ export default function AppHeader({ toggle }: Props) {
<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":
!assessmentRequestsLinks, // warna default
})} })}
onClick={() => { onClick={() => {
if (window.opener) { if (window.opener) {
@ -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>