Merged in feature-displayRole (pull request #6)
Show User type in the navbar Approved-by: Tiago Ribeiro
This commit is contained in:
@@ -8,6 +8,7 @@ import clsx from "clsx";
|
|||||||
import moment from "moment";
|
import moment from "moment";
|
||||||
import MobileMenu from "./MobileMenu";
|
import MobileMenu from "./MobileMenu";
|
||||||
import {useState} from "react";
|
import {useState} from "react";
|
||||||
|
import {Type} from "@/interfaces/user";
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
user: User;
|
user: User;
|
||||||
@@ -42,6 +43,8 @@ export default function Navbar({user, path, navDisabled = false, focusMode = fal
|
|||||||
return today.add(7, "days").isAfter(momentDate);
|
return today.add(7, "days").isAfter(momentDate);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const uppercaseFirstLetter = (string: Type) => string.charAt(0).toUpperCase() + string.slice(1);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{user && <MobileMenu path={path} isOpen={isMenuOpen} onClose={() => setIsMenuOpen(false)} user={user} />}
|
{user && <MobileMenu path={path} isOpen={isMenuOpen} onClose={() => setIsMenuOpen(false)} user={user} />}
|
||||||
@@ -69,7 +72,7 @@ export default function Navbar({user, path, navDisabled = false, focusMode = fal
|
|||||||
)}
|
)}
|
||||||
<Link href={disableNavigation ? "" : "/profile"} className="flex gap-6 items-center justify-end -md:hidden">
|
<Link href={disableNavigation ? "" : "/profile"} className="flex gap-6 items-center justify-end -md:hidden">
|
||||||
<img src={user.profilePicture} alt={user.name} className="w-10 h-10 rounded-full object-cover" />
|
<img src={user.profilePicture} alt={user.name} className="w-10 h-10 rounded-full object-cover" />
|
||||||
<span className="text-right -md:hidden">{user.name}</span>
|
<span className="text-right -md:hidden">{user.name} | {uppercaseFirstLetter(user.type)}</span>
|
||||||
</Link>
|
</Link>
|
||||||
<div className="cursor-pointer md:hidden" onClick={() => setIsMenuOpen(true)}>
|
<div className="cursor-pointer md:hidden" onClick={() => setIsMenuOpen(true)}>
|
||||||
<BsList className="text-mti-purple-light w-8 h-8" />
|
<BsList className="text-mti-purple-light w-8 h-8" />
|
||||||
|
|||||||
Reference in New Issue
Block a user