mirror of
https://github.com/makeplane/plane
synced 2024-06-14 14:31:34 +00:00
chore: profile dropdown in the sidebar (#1737)
* chore: profile dropdown in the sidebar * style: update spacing and font sizes
This commit is contained in:
Aaryan Khandelwal
GitHub
parent
92b22dc99e
commit
85a7a7df2b
@ -16,7 +16,7 @@ import useToast from "hooks/use-toast";
|
|||||||
import userService from "services/user.service";
|
import userService from "services/user.service";
|
||||||
import authenticationService from "services/authentication.service";
|
import authenticationService from "services/authentication.service";
|
||||||
// components
|
// components
|
||||||
import { Avatar, Loader } from "components/ui";
|
import { Avatar, Icon, Loader } from "components/ui";
|
||||||
// icons
|
// icons
|
||||||
import { CheckIcon, PlusIcon } from "@heroicons/react/24/outline";
|
import { CheckIcon, PlusIcon } from "@heroicons/react/24/outline";
|
||||||
// helpers
|
// helpers
|
||||||
@ -40,6 +40,19 @@ const userLinks = (workspaceSlug: string, userId: string) => [
|
|||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
|
const profileLinks = (workspaceSlug: string, userId: string) => [
|
||||||
|
{
|
||||||
|
name: "View profile",
|
||||||
|
icon: "account_circle",
|
||||||
|
link: `/${workspaceSlug}/profile/${userId}`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Settings",
|
||||||
|
icon: "settings",
|
||||||
|
link: `/${workspaceSlug}/me/profile`,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
export const WorkspaceSidebarDropdown = () => {
|
export const WorkspaceSidebarDropdown = () => {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const { workspaceSlug } = router.query;
|
const { workspaceSlug } = router.query;
|
||||||
@ -90,8 +103,8 @@ export const WorkspaceSidebarDropdown = () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Menu as="div" className="relative col-span-4 inline-block w-full px-4 pt-4 text-left">
|
<div className="inline-flex items-center gap-2 px-4 pt-4">
|
||||||
<div className="flex items-center justify-between gap-2">
|
<Menu as="div" className="relative col-span-4 inline-block w-full text-left">
|
||||||
<Menu.Button className="text-custom-sidebar-text-200 flex w-full items-center rounded-sm text-sm font-medium focus:outline-none">
|
<Menu.Button className="text-custom-sidebar-text-200 flex w-full items-center rounded-sm text-sm font-medium focus:outline-none">
|
||||||
<div
|
<div
|
||||||
className={`flex w-full items-center gap-x-2 rounded-sm bg-custom-sidebar-background-80 p-1 ${
|
className={`flex w-full items-center gap-x-2 rounded-sm bg-custom-sidebar-background-80 p-1 ${
|
||||||
@ -118,127 +131,166 @@ export const WorkspaceSidebarDropdown = () => {
|
|||||||
</div>
|
</div>
|
||||||
</Menu.Button>
|
</Menu.Button>
|
||||||
|
|
||||||
{!sidebarCollapse && (
|
<Transition
|
||||||
<Link href={`/${workspaceSlug}/profile/${user?.id}`}>
|
as={Fragment}
|
||||||
<a>
|
enter="transition ease-out duration-100"
|
||||||
<div className="flex flex-grow justify-end">
|
enterFrom="transform opacity-0 scale-95"
|
||||||
<Avatar user={user} height="28px" width="28px" fontSize="14px" />
|
enterTo="transform opacity-100 scale-100"
|
||||||
</div>
|
leave="transition ease-in duration-75"
|
||||||
</a>
|
leaveFrom="transform opacity-100 scale-100"
|
||||||
</Link>
|
leaveTo="transform opacity-0 scale-95"
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<Transition
|
|
||||||
as={Fragment}
|
|
||||||
enter="transition ease-out duration-100"
|
|
||||||
enterFrom="transform opacity-0 scale-95"
|
|
||||||
enterTo="transform opacity-100 scale-100"
|
|
||||||
leave="transition ease-in duration-75"
|
|
||||||
leaveFrom="transform opacity-100 scale-100"
|
|
||||||
leaveTo="transform opacity-0 scale-95"
|
|
||||||
>
|
|
||||||
<Menu.Items
|
|
||||||
className="fixed left-4 z-20 mt-1 flex flex-col w-full max-w-[17rem] origin-top-left rounded-md
|
|
||||||
border border-custom-sidebar-border-200 bg-custom-sidebar-background-90 shadow-lg outline-none"
|
|
||||||
>
|
>
|
||||||
<div className="flex flex-col items-start justify-start gap-3 p-3">
|
<Menu.Items
|
||||||
<div className="text-sm text-custom-sidebar-text-200">{user?.email}</div>
|
className="fixed left-4 z-20 mt-1 flex flex-col w-full max-w-[17rem] origin-top-left rounded-md
|
||||||
<span className="text-sm font-semibold text-custom-sidebar-text-200">Workspace</span>
|
border border-custom-sidebar-border-200 bg-custom-sidebar-background-90 shadow-lg outline-none"
|
||||||
{workspaces ? (
|
>
|
||||||
<div className="flex h-full w-full flex-col items-start justify-start gap-3.5">
|
<div className="flex flex-col items-start justify-start gap-3 p-3">
|
||||||
{workspaces.length > 0 ? (
|
<div className="text-sm text-custom-sidebar-text-200">{user?.email}</div>
|
||||||
workspaces.map((workspace) => (
|
<span className="text-sm font-semibold text-custom-sidebar-text-200">Workspace</span>
|
||||||
<Menu.Item key={workspace.id}>
|
{workspaces ? (
|
||||||
{({ active }) => (
|
<div className="flex h-full w-full flex-col items-start justify-start gap-3.5">
|
||||||
<button
|
{workspaces.length > 0 ? (
|
||||||
type="button"
|
workspaces.map((workspace) => (
|
||||||
onClick={() => handleWorkspaceNavigation(workspace)}
|
<Menu.Item key={workspace.id}>
|
||||||
className="flex w-full items-center justify-between gap-1 rounded-md text-sm text-custom-sidebar-text-100"
|
{({ active }) => (
|
||||||
>
|
<button
|
||||||
<div className="flex items-center justify-start gap-2.5">
|
type="button"
|
||||||
<span className="relative flex h-6 w-6 items-center justify-center rounded bg-gray-700 p-2 text-xs uppercase text-white">
|
onClick={() => handleWorkspaceNavigation(workspace)}
|
||||||
{workspace?.logo && workspace.logo !== "" ? (
|
className="flex w-full items-center justify-between gap-1 rounded-md text-sm text-custom-sidebar-text-100"
|
||||||
<img
|
>
|
||||||
src={workspace.logo}
|
<div className="flex items-center justify-start gap-2.5">
|
||||||
className="absolute top-0 left-0 h-full w-full object-cover rounded"
|
<span className="relative flex h-6 w-6 items-center justify-center rounded bg-gray-700 p-2 text-xs uppercase text-white">
|
||||||
alt="Workspace Logo"
|
{workspace?.logo && workspace.logo !== "" ? (
|
||||||
/>
|
<img
|
||||||
) : (
|
src={workspace.logo}
|
||||||
workspace?.name?.charAt(0) ?? "..."
|
className="absolute top-0 left-0 h-full w-full object-cover rounded"
|
||||||
)}
|
alt="Workspace Logo"
|
||||||
</span>
|
/>
|
||||||
|
) : (
|
||||||
|
workspace?.name?.charAt(0) ?? "..."
|
||||||
|
)}
|
||||||
|
</span>
|
||||||
|
|
||||||
<h5
|
<h5
|
||||||
className={`text-sm ${
|
className={`text-sm ${
|
||||||
workspaceSlug === workspace.slug ? "" : "text-custom-text-200"
|
workspaceSlug === workspace.slug ? "" : "text-custom-text-200"
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
{truncateText(workspace.name, 18)}
|
{truncateText(workspace.name, 18)}
|
||||||
</h5>
|
</h5>
|
||||||
</div>
|
</div>
|
||||||
<span className="p-1">
|
<span className="p-1">
|
||||||
<CheckIcon
|
<CheckIcon
|
||||||
className={`h-3 w-3.5 text-custom-sidebar-text-100 ${
|
className={`h-3 w-3.5 text-custom-sidebar-text-100 ${
|
||||||
active || workspace.id === activeWorkspace?.id
|
active || workspace.id === activeWorkspace?.id
|
||||||
? "opacity-100"
|
? "opacity-100"
|
||||||
: "opacity-0"
|
: "opacity-0"
|
||||||
}`}
|
}`}
|
||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
|
</Menu.Item>
|
||||||
|
))
|
||||||
|
) : (
|
||||||
|
<p>No workspace found!</p>
|
||||||
|
)}
|
||||||
|
<Menu.Item
|
||||||
|
as="button"
|
||||||
|
type="button"
|
||||||
|
onClick={() => {
|
||||||
|
router.push("/create-workspace");
|
||||||
|
}}
|
||||||
|
className="flex w-full items-center gap-1 text-sm text-custom-sidebar-text-200"
|
||||||
|
>
|
||||||
|
<PlusIcon className="h-3 w-3" />
|
||||||
|
Create Workspace
|
||||||
|
</Menu.Item>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<div className="w-full">
|
||||||
|
<Loader className="space-y-2">
|
||||||
|
<Loader.Item height="30px" />
|
||||||
|
<Loader.Item height="30px" />
|
||||||
|
</Loader>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<div className="flex w-full flex-col items-start justify-start gap-2 border-t border-custom-sidebar-border-200 px-3 py-2 text-sm">
|
||||||
|
{userLinks(workspaceSlug?.toString() ?? "", user?.id ?? "").map((link, index) => (
|
||||||
|
<Menu.Item
|
||||||
|
key={index}
|
||||||
|
as="div"
|
||||||
|
className="flex w-full items-center justify-start rounded px-2 py-1 text-sm text-custom-sidebar-text-200 hover:bg-custom-sidebar-background-80"
|
||||||
|
>
|
||||||
|
<Link href={link.href}>
|
||||||
|
<a className="w-full">{link.name}</a>
|
||||||
|
</Link>
|
||||||
|
</Menu.Item>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<div className="w-full border-t border-t-custom-sidebar-border-100 px-3 py-2">
|
||||||
|
<Menu.Item
|
||||||
|
as="button"
|
||||||
|
type="button"
|
||||||
|
className="flex w-full items-center justify-start rounded px-2 py-1 text-sm text-red-600 hover:bg-custom-sidebar-background-80"
|
||||||
|
onClick={handleSignOut}
|
||||||
|
>
|
||||||
|
Sign out
|
||||||
|
</Menu.Item>
|
||||||
|
</div>
|
||||||
|
</Menu.Items>
|
||||||
|
</Transition>
|
||||||
|
</Menu>
|
||||||
|
|
||||||
|
{!sidebarCollapse && (
|
||||||
|
<Menu as="div" className="relative flex-shrink-0">
|
||||||
|
<Menu.Button className="grid place-items-center outline-none">
|
||||||
|
<Avatar user={user} height="28px" width="28px" fontSize="14px" />
|
||||||
|
</Menu.Button>
|
||||||
|
|
||||||
|
<Transition
|
||||||
|
as={Fragment}
|
||||||
|
enter="transition ease-out duration-100"
|
||||||
|
enterFrom="transform opacity-0 scale-95"
|
||||||
|
enterTo="transform opacity-100 scale-100"
|
||||||
|
leave="transition ease-in duration-75"
|
||||||
|
leaveFrom="transform opacity-100 scale-100"
|
||||||
|
leaveTo="transform opacity-0 scale-95"
|
||||||
|
>
|
||||||
|
<Menu.Items
|
||||||
|
className="absolute left-0 z-20 mt-1.5 flex flex-col w-52 origin-top-left rounded-md
|
||||||
|
border border-custom-sidebar-border-200 bg-custom-sidebar-background-90 p-2 divide-y divide-custom-sidebar-border-200 shadow-lg text-xs outline-none"
|
||||||
|
>
|
||||||
|
<div className="flex flex-col space-y-2 pb-2">
|
||||||
|
{profileLinks(workspaceSlug?.toString() ?? "", user?.id ?? "").map(
|
||||||
|
(link, index) => (
|
||||||
|
<Menu.Item key={index} as="button" type="button">
|
||||||
|
<Link href={link.link}>
|
||||||
|
<a className="flex w-full items-center gap-2 rounded px-2 py-1 hover:bg-custom-sidebar-background-80">
|
||||||
|
<Icon iconName={link.icon} className="!text-base" />
|
||||||
|
{link.name}
|
||||||
|
</a>
|
||||||
|
</Link>
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
))
|
)
|
||||||
) : (
|
|
||||||
<p>No workspace found!</p>
|
|
||||||
)}
|
)}
|
||||||
|
</div>
|
||||||
|
<div className="pt-2">
|
||||||
<Menu.Item
|
<Menu.Item
|
||||||
as="button"
|
as="button"
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => {
|
className="flex w-full items-center gap-2 rounded px-2 py-1 hover:bg-custom-sidebar-background-80"
|
||||||
router.push("/create-workspace");
|
onClick={handleSignOut}
|
||||||
}}
|
|
||||||
className="flex w-full items-center gap-1 text-sm text-custom-sidebar-text-200"
|
|
||||||
>
|
>
|
||||||
<PlusIcon className="h-3 w-3" />
|
<Icon iconName="logout" className="!text-base" />
|
||||||
Create Workspace
|
Log out
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
</div>
|
</div>
|
||||||
) : (
|
</Menu.Items>
|
||||||
<div className="w-full">
|
</Transition>
|
||||||
<Loader className="space-y-2">
|
</Menu>
|
||||||
<Loader.Item height="30px" />
|
)}
|
||||||
<Loader.Item height="30px" />
|
</div>
|
||||||
</Loader>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
<div className="flex w-full flex-col items-start justify-start gap-2 border-t border-custom-sidebar-border-200 px-3 py-2 text-sm">
|
|
||||||
{userLinks(workspaceSlug?.toString() ?? "", user?.id ?? "").map((link, index) => (
|
|
||||||
<Menu.Item
|
|
||||||
key={index}
|
|
||||||
as="div"
|
|
||||||
className="flex w-full items-center justify-start rounded px-2 py-1 text-sm text-custom-sidebar-text-200 hover:bg-custom-sidebar-background-80"
|
|
||||||
>
|
|
||||||
<Link href={link.href}>
|
|
||||||
<a className="w-full">{link.name}</a>
|
|
||||||
</Link>
|
|
||||||
</Menu.Item>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
<div className="w-full border-t border-t-custom-sidebar-border-100 px-3 py-2">
|
|
||||||
<Menu.Item
|
|
||||||
as="button"
|
|
||||||
type="button"
|
|
||||||
className="flex w-full items-center justify-start rounded px-2 py-1 text-sm text-red-600 hover:bg-custom-sidebar-background-80"
|
|
||||||
onClick={handleSignOut}
|
|
||||||
>
|
|
||||||
Sign out
|
|
||||||
</Menu.Item>
|
|
||||||
</div>
|
|
||||||
</Menu.Items>
|
|
||||||
</Transition>
|
|
||||||
</Menu>
|
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user