Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

[WEB-1920] dev: app sidebar revamp (#5150)

Anmol Singh Bhatiaa7ecfade984d
diff --git a/packages/ui/src/icons/index.ts b/packages/ui/src/icons/index.ts
index 31b6e74869..b186150295 100644
--- a/packages/ui/src/icons/index.ts
+++ b/packages/ui/src/icons/index.ts
@@ -23,3 +23,4 @@ export * from "./transfer-icon";
export * from "./info-icon";
export * from "./dropdown-icon";
export * from "./intake";
+export * from "./user-activity-icon";
diff --git a/packages/ui/src/icons/user-activity-icon.tsx b/packages/ui/src/icons/user-activity-icon.tsx
new file mode 100644
index 0000000000..9a8e691fd1
--- /dev/null
+++ b/packages/ui/src/icons/user-activity-icon.tsx
@@ -0,0 +1,21 @@
+import * as React from "react";
+
+import { ISvgIcons } from "./type";
+
+export const UserActivityIcon: React.FC<ISvgIcons> = ({ className = "text-current", ...rest }) => (
+ <svg
+ viewBox="0 0 24 24"
+ className={`${className} stroke-2`}
+ stroke="currentColor"
+ fill="none"
+ strokeWidth="1.5"
+ xmlns="http://www.w3.org/2000/svg"
+ strokeLinecap="round"
+ strokeLinejoin="round"
+ {...rest}
+ >
+ <path d="M10.5 13C12.9853 13 15 10.9853 15 8.5C15 6.01472 12.9853 4 10.5 4C8.01472 4 6 6.01472 6 8.5C6 10.9853 8.01472 13 10.5 13Z" />
+ <path d="M13.9062 13.5903C12.8368 13.1001 11.661 12.8876 10.4877 12.9725C9.31437 13.0574 8.18144 13.437 7.19379 14.0761C6.20613 14.7152 5.39567 15.5931 4.83744 16.6286C4.2792 17.6641 3.99124 18.8237 4.0002 20" />
+ <path d="M21 16.5H19.6L18.2 20L16.8 13L15.4 16.5H14" />
+ </svg>
+);
diff --git a/web/core/components/sidebar/index.ts b/web/core/components/sidebar/index.ts
new file mode 100644
index 0000000000..b2e6f7602d
--- /dev/null
+++ b/web/core/components/sidebar/index.ts
@@ -0,0 +1 @@
+export * from "./sidebar-navigation";
\ No newline at end of file
diff --git a/web/core/components/sidebar/sidebar-navigation.tsx b/web/core/components/sidebar/sidebar-navigation.tsx
new file mode 100644
index 0000000000..f31a93c9c3
--- /dev/null
+++ b/web/core/components/sidebar/sidebar-navigation.tsx
@@ -0,0 +1,29 @@
+"use client";
+import React, { FC } from "react";
+// helpers
+import { cn } from "@/helpers/common.helper";
+
+type TSidebarNavItem = {
+ className?: string;
+ isActive?: boolean;
+ children?: React.ReactNode;
+};
+
+export const SidebarNavItem: FC<TSidebarNavItem> = (props) => {
+ const { className, isActive, children } = props;
+ return (
+ <div
+ className={cn(
+ "cursor-pointer relative group w-full flex items-center justify-between gap-1.5 rounded px-2 py-1 outline-none",
+ {
+ "text-custom-primary-200 bg-custom-primary-100/10": isActive,
+ "text-custom-sidebar-text-200 hover:bg-custom-sidebar-background-90 active:bg-custom-sidebar-background-90":
+ !isActive,
+ },
+ className
+ )}
+ >
+ {children}
+ </div>
+ );
+};
diff --git a/web/core/components/workspace-notifications/notification-app-sidebar-option.tsx b/web/core/components/workspace-notifications/notification-app-sidebar-option.tsx
index cfffe1265c..443169910f 100644
--- a/web/core/components/workspace-notifications/notification-app-sidebar-option.tsx
+++ b/web/core/components/workspace-notifications/notification-app-sidebar-option.tsx
@@ -34,7 +34,7 @@ export const NotificationAppSidebarOption: FC<TNotificationAppSidebarOption> = o
if (totalNotifications <= 0) return <></>;
if (isSidebarCollapsed)
- return <div className="absolute right-3.5 top-2 h-2 w-2 rounded-full bg-custom-primary-300" />;
+ return <div className="absolute right-2 top-1.5 h-2 w-2 rounded-full bg-custom-primary-300" />;
return (
<div className="ml-auto">
diff --git a/web/core/components/workspace-notifications/sidebar/filters/menu/root.tsx b/web/core/components/workspace-notifications/sidebar/filters/menu/root.tsx
index 09f8427d35..751ef84469 100644
--- a/web/core/components/workspace-notifications/sidebar/filters/menu/root.tsx
+++ b/web/core/components/workspace-notifications/sidebar/filters/menu/root.tsx
@@ -19,7 +19,7 @@ export const NotificationFilter: FC = observer(() => {
<PopoverMenu
data={FILTER_TYPE_OPTIONS}
button={
- <Tooltip tooltipContent="Notification Filters" isMobile={isMobile} position="bottom">
+ <Tooltip tooltipContent="Inbox Filters" isMobile={isMobile} position="bottom">
<div className="flex-shrink-0 w-5 h-5 flex justify-center items-center overflow-hidden cursor-pointer transition-all hover:bg-custom-background-80 rounded-sm outline-none">
<ListFilter className="h-3 w-3" />
</div>
diff --git a/web/core/components/workspace-notifications/sidebar/header/root.tsx b/web/core/components/workspace-notifications/sidebar/header/root.tsx
index 5804c18370..dd6a36cf87 100644
--- a/web/core/components/workspace-notifications/sidebar/header/root.tsx
+++ b/web/core/components/workspace-notifications/sidebar/header/root.tsx
@@ -2,7 +2,7 @@
import { FC } from "react";
import { observer } from "mobx-react";
-import { Bell } from "lucide-react";
+import { Inbox } from "lucide-react";
import { Breadcrumbs } from "@plane/ui";
// components
import { BreadcrumbLink } from "@/components/common";
@@ -27,11 +27,7 @@ export const NotificationSidebarHeader: FC<TNotificationSidebarHeader> = observe
<Breadcrumbs.BreadcrumbItem
type="text"
link={
- <BreadcrumbLink
- label="Notifications"
- icon={<Bell className="h-4 w-4 text-custom-text-300" />}
- disableTooltip
- />
+ <BreadcrumbLink label="Inbox" icon={<Inbox className="h-4 w-4 text-custom-text-300" />} disableTooltip />
}
/>
</Breadcrumbs>
diff --git a/web/core/components/workspace/sidebar/dropdown.tsx b/web/core/components/workspace/sidebar/dropdown.tsx
index 3d4995784c..5319d8500e 100644
--- a/web/core/components/workspace/sidebar/dropdown.tsx
+++ b/web/core/components/workspace/sidebar/dropdown.tsx
@@ -6,7 +6,7 @@ import Link from "next/link";
import { useParams } from "next/navigation";
import { usePopper } from "react-popper";
// icons
-import { Activity, Check, ChevronDown, LogOut, Mails, PlusSquare, Settings } from "lucide-react";
+import { Check, ChevronDown, LogOut, Mails, PlusSquare, Settings } from "lucide-react";
// ui
import { Menu, Transition } from "@headlessui/react";
// types
@@ -34,19 +34,6 @@ const userLinks = (workspaceSlug: string) => [
},
];
-const profileLinks = (workspaceSlug: string, userId: string) => [
- {
- name: "My activity",
- icon: Activity,
- link: `/${workspaceSlug}/profile/${userId}`,
- },
- {
- name: "Settings",
- icon: Settings,
- link: "/profile",
- },
-];
-
export const SidebarDropdown = observer(() => {
// router params
const { workspaceSlug } = useParams();
@@ -285,22 +272,14 @@ export const SidebarDropdown = observer(() => {
>
<div className="flex flex-col gap-2.5 pb-2">
<span className="px-2 text-custom-sidebar-text-200">{currentUser?.email}</span>
- {profileLinks(workspaceSlug?.toString() ?? "", currentUser?.id ?? "").map((link, index) => (
- <Link
- key={index}
- href={link.link}
- onClick={() => {
- if (index == 0) handleItemClick();
- }}
- >
- <Menu.Item key={index} as="div">
- <span className="flex w-full items-center gap-2 rounded px-2 py-1 hover:bg-custom-sidebar-background-80">
- <link.icon className="h-4 w-4 stroke-[1.5]" />
- {link.name}
- </span>
- </Menu.Item>
- </Link>
- ))}
+ <Link href="/profile">
+ <Menu.Item as="div">
+ <span className="flex w-full items-center gap-2 rounded px-2 py-1 hover:bg-custom-sidebar-background-80">
+ <Settings className="h-4 w-4 stroke-[1.5]" />
+ <span>Settings</span>
+ </span>
+ </Menu.Item>
+ </Link>
</div>
<div className={`pt-2 ${isUserInstanceAdmin || false ? "pb-2" : ""}`}>
<Menu.Item
diff --git a/web/core/components/workspace/sidebar/projects-list-item.tsx b/web/core/components/workspace/sidebar/projects-list-item.tsx
index c680b88440..240e51f2d7 100644
--- a/web/core/components/workspace/sidebar/projects-list-item.tsx
+++ b/web/core/components/workspace/sidebar/projects-list-item.tsx
@@ -39,6 +39,7 @@ import {
// components
import { Logo } from "@/components/common";
import { LeaveProjectModal, PublishProjectModal } from "@/components/project";
+import { SidebarNavItem } from "@/components/sidebar";
// constants
import { EUserProjectRoles } from "@/constants/project";
// helpers
@@ -95,11 +96,6 @@ const navigation = (workspaceSlug: string, projectId: string) => [
href: `/${workspaceSlug}/projects/${projectId}/inbox`,
Icon: Intake,
},
- {
- name: "Settings",
- href: `/${workspaceSlug}/projects/${projectId}/settings`,
- Icon: Settings,
- },
];
export const SidebarProjectsListItem: React.FC<Props> = observer((props) => {
@@ -467,7 +463,7 @@ export const SidebarProjectsListItem: React.FC<Props> = observer((props) => {
leaveFrom="transform scale-100 opacity-100"
leaveTo="transform scale-95 opacity-0"
>
- <Disclosure.Panel as="div" className="mt-1 space-y-1">
+ <Disclosure.Panel as="div" className="flex flex-col gap-0.5 mt-1">
{navigation(workspaceSlug?.toString(), project?.id).map((item) => {
if (
(item.name === "Cycles" && !project.cycle_view) ||
@@ -479,31 +475,29 @@ export const SidebarProjectsListItem: React.FC<Props> = observer((props) => {
return;
return (
- <Link key={item.name} href={item.href} onClick={handleProjectClick}>
- <Tooltip
- isMobile={isMobile}
- tooltipContent={`${project?.name}: ${item.name}`}
- position="right"
- className="ml-2"
- disabled={!isSidebarCollapsed}
- >
- <div
- className={cn(
- "flex items-center gap-1.5 rounded-md pl-[18px] pr-2 py-1.5 outline-none text-custom-sidebar-text-300 hover:bg-custom-sidebar-background-90 focus:bg-custom-sidebar-background-90",
- {
- "text-custom-primary-100 bg-custom-primary-100/10 hover:bg-custom-primary-100/10":
- pathname.includes(item.href),
- "p-0 size-7 justify-center mx-auto": isSidebarCollapsed,
- }
- )}
+ <Tooltip
+ key={item.name}
+ isMobile={isMobile}
+ tooltipContent={`${project?.name}: ${item.name}`}
+ position="right"
+ className="ml-2"
+ disabled={!isSidebarCollapsed}
+ >
+ <Link key={item.name} href={item.href} onClick={handleProjectClick}>
+ <SidebarNavItem
+ key={item.name}
+ className={`pl-[18px] ${isSidebarCollapsed ? "p-0 size-7 justify-center mx-auto" : ""}`}
+ isActive={pathname.includes(item.href)}
>
- <item.Icon
- className={`flex-shrink-0 size-4 ${item.name === "Intake" ? "stroke-1" : "stroke-[1.5]"}`}
- />
- {!isSidebarCollapsed && <span className="text-xs font-medium">{item.name}</span>}
- </div>
- </Tooltip>
- </Link>
+ <div className="flex items-center gap-1.5 py-[1px]">
+ <item.Icon
+ className={`flex-shrink-0 size-4 ${item.name === "Intake" ? "stroke-1" : "stroke-[1.5]"}`}
+ />
+ {!isSidebarCollapsed && <span className="text-xs font-medium">{item.name}</span>}
+ </div>
+ </SidebarNavItem>
+ </Link>
+ </Tooltip>
);
})}
</Disclosure.Panel>
diff --git a/web/core/components/workspace/sidebar/projects-list.tsx b/web/core/components/workspace/sidebar/projects-list.tsx
index f1009589a8..578039e2cf 100644
--- a/web/core/components/workspace/sidebar/projects-list.tsx
+++ b/web/core/components/workspace/sidebar/projects-list.tsx
@@ -153,7 +153,7 @@ export const SidebarProjectsList: FC = observer(() => {
{
key: "favorite",
type: "FAVORITES",
- title: "Favorites",
+ title: "FAVORITES",
icon: Star,
projects: favoriteProjects,
isOpen: isFavoriteProjectsListOpen,
@@ -161,7 +161,7 @@ export const SidebarProjectsList: FC = observer(() => {
{
key: "all",
type: "JOINED",
- title: "My projects",
+ title: "MY PROJECTS",
icon: Briefcase,
projects: joinedProjects,
isOpen: isAllProjectsListOpen,
@@ -217,7 +217,13 @@ export const SidebarProjectsList: FC = observer(() => {
position="right"
disabled={!isCollapsed}
>
- <span>{isCollapsed ? <section.icon className="flex-shrink-0 size-3" /> : section.title}</span>
+ <>
+ {isCollapsed ? (
+ <section.icon className="flex-shrink-0 size-3" />
+ ) : (
+ <span className="text-xs font-semibold">{section.title}</span>
+ )}
+ </>
</Tooltip>
</Disclosure.Button>
{!isCollapsed && (
@@ -264,7 +270,7 @@ export const SidebarProjectsList: FC = observer(() => {
{section.isOpen && (
<Disclosure.Panel
as="div"
- className={cn("mt-2 ml-1 space-y-1", {
+ className={cn("space-y-1", {
"space-y-0 ml-0": isCollapsed,
})}
static
diff --git a/web/core/components/workspace/sidebar/user-menu.tsx b/web/core/components/workspace/sidebar/user-menu.tsx
index 4fef08e252..54d67e808c 100644
--- a/web/core/components/workspace/sidebar/user-menu.tsx
+++ b/web/core/components/workspace/sidebar/user-menu.tsx
@@ -4,9 +4,9 @@ import React from "react";
import { observer } from "mobx-react";
import Link from "next/link";
import { useParams, usePathname } from "next/navigation";
-// ui
-import { Tooltip } from "@plane/ui";
// components
+import { Tooltip } from "@plane/ui";
+import { SidebarNavItem } from "@/components/sidebar";
import { NotificationAppSidebarOption } from "@/components/workspace-notifications";
// constants
import { SIDEBAR_USER_MENU_ITEMS } from "@/constants/dashboard";
@@ -25,6 +25,7 @@ export const SidebarUserMenu = observer(() => {
const { isMobile } = usePlatformOS();
const {
membership: { currentWorkspaceRole },
+ data: currentUser,
} = useUser();
// router params
const { workspaceSlug } = useParams();
@@ -42,48 +43,47 @@ export const SidebarUserMenu = observer(() => {
});
};
+ const notificationIndicatorElement = (
+ <NotificationAppSidebarOption
+ workspaceSlug={workspaceSlug.toString()}
+ isSidebarCollapsed={sidebarCollapsed ?? false}
+ />
+ );
+
return (
<div
- className={cn("w-full space-y-1", {
+ className={cn("flex flex-col gap-0.5", {
"space-y-0": sidebarCollapsed,
})}
>
{SIDEBAR_USER_MENU_ITEMS.map(
(link) =>
workspaceMemberInfo >= link.access && (
- <Link key={link.key} href={`/${workspaceSlug}${link.href}`} onClick={() => handleLinkClick(link.key)}>
- <Tooltip
- tooltipContent={link.label}
- position="right"
- className="ml-2"
- disabled={!sidebarCollapsed}
- isMobile={isMobile}
+ <Tooltip
+ key={link.key}
+ tooltipContent={link.label}
+ position="right"
+ className="ml-2"
+ disabled={!sidebarCollapsed}
+ isMobile={isMobile}
+ >
+ <Link
+ href={`/${workspaceSlug}${link.href}${link.key === "my-work" ? `/${currentUser?.id}` : ""}`}
+ onClick={() => handleLinkClick(link.key)}
>
- <div
- className={cn(
- "relative group w-full flex items-center gap-1.5 rounded-md px-2 py-1.5 outline-none text-custom-sidebar-text-200 hover:bg-custom-sidebar-background-90 focus:bg-custom-sidebar-background-90",
- {
- "text-custom-primary-100 bg-custom-primary-100/10 hover:bg-custom-primary-100/10": link.highlight(
- pathname,
- `/${workspaceSlug}`
- ),
- "p-0 size-8 aspect-square justify-center mx-auto": sidebarCollapsed,
- }
- )}
+ <SidebarNavItem
+ key={link.key}
+ className={`${sidebarCollapsed ? "p-0 size-8 aspect-square justify-center mx-auto" : ""}`}
+ isActive={link.highlight(pathname, `/${workspaceSlug}`)}
>
- <span className="flex-shrink-0 size-4 grid place-items-center">
- <link.Icon className="size-4" />
- </span>
- {!sidebarCollapsed && <p className="text-sm leading-5 font-medium">{link.label}</p>}
- {link.key === "notifications" && (
- <NotificationAppSidebarOption
- workspaceSlug={workspaceSlug.toString()}
- isSidebarCollapsed={sidebarCollapsed ?? false}
- />
- )}
- </div>
- </Tooltip>
- </Link>
+ <div className="flex items-center gap-1.5 py-[1px]">
+ <link.Icon className="size-4 flex-shrink-0" />
+ {!sidebarCollapsed && <p className="text-sm leading-5 font-medium">{link.label}</p>}
+ </div>
+ {link.key === "notifications" && notificationIndicatorElement}
+ </SidebarNavItem>
+ </Link>
+ </Tooltip>
)
)}
</div>
diff --git a/web/core/components/workspace/sidebar/workspace-menu.tsx b/web/core/components/workspace/sidebar/workspace-menu.tsx
index 15df1c70a7..edf5617a44 100644
--- a/web/core/components/workspace/sidebar/workspace-menu.tsx
+++ b/web/core/components/workspace/sidebar/workspace-menu.tsx
@@ -8,6 +8,8 @@ import { ChevronRight } from "lucide-react";
import { Disclosure, Transition } from "@headlessui/react";
// ui
import { Tooltip } from "@plane/ui";
+// components
+import { SidebarNavItem } from "@/components/sidebar";
// constants
import { SIDEBAR_WORKSPACE_MENU_ITEMS } from "@/constants/dashboard";
import { SIDEBAR_CLICKED } from "@/constants/event-tracker";
@@ -53,15 +55,21 @@ export const SidebarWorkspaceMenu = observer(() => {
if (sidebarCollapsed) toggleWorkspaceMenu(true);
}, [sidebarCollapsed, toggleWorkspaceMenu]);
+ const indicatorElement = (
+ <div className="flex-shrink-0">
+ <UpgradeBadge />
+ </div>
+ );
+
return (
<Disclosure as="div" defaultOpen>
{!sidebarCollapsed && (
<Disclosure.Button
as="button"
- className="group/workspace-button w-full px-2 py-1.5 flex items-center justify-between gap-1 text-custom-sidebar-text-400 hover:bg-custom-sidebar-background-90 rounded text-sm font-semibold"
+ className="group/workspace-button w-full px-2 py-1.5 flex items-center justify-between gap-1 text-custom-sidebar-text-400 hover:bg-custom-sidebar-background-90 rounded text-xs font-semibold"
onClick={() => toggleWorkspaceMenu(!isWorkspaceMenuOpen)}
>
- <span>Workspace</span>
+ <span>WORKSPACE</span>
<span className="flex-shrink-0 opacity-0 pointer-events-none group-hover/workspace-button:opacity-100 group-hover/workspace-button:pointer-events-auto rounded p-0.5 hover:bg-custom-sidebar-background-80">
<ChevronRight
className={cn("size-4 flex-shrink-0 text-custom-sidebar-text-400 transition-transform", {
@@ -83,7 +91,7 @@ export const SidebarWorkspaceMenu = observer(() => {
{isWorkspaceMenuOpen && (
<Disclosure.Panel
as="div"
- className={cn("mt-2 ml-1 space-y-1", {
+ className={cn("flex flex-col mt-0.5 gap-0.5", {
"space-y-0 mt-0 ml-0": sidebarCollapsed,
})}
static
@@ -91,47 +99,32 @@ export const SidebarWorkspaceMenu = observer(() => {
{SIDEBAR_WORKSPACE_MENU_ITEMS.map(
(link) =>
workspaceMemberInfo >= link.access && (
- <Link
+ <Tooltip
key={link.key}
- href={`/${workspaceSlug}${link.href}`}
- onClick={() => handleLinkClick(link.key)}
- className="block"
+ tooltipContent={link.label}
+ position="right"
+ className="ml-2"
+ disabled={!sidebarCollapsed}
+ isMobile={isMobile}
>
- <Tooltip
- tooltipContent={link.label}
- position="right"
- className="ml-2"
- disabled={!sidebarCollapsed}
- isMobile={isMobile}
- >
- <div
- className={cn(
- "group w-full flex items-center gap-1.5 rounded-md px-2 py-1.5 outline-none text-custom-sidebar-text-200 hover:bg-custom-sidebar-background-90 focus:bg-custom-sidebar-background-90",
- {
- "text-custom-primary-100 bg-custom-primary-100/10 hover:bg-custom-primary-100/10":
- link.highlight(pathname, `/${workspaceSlug}`),
- "p-0 size-8 aspect-square justify-center mx-auto": sidebarCollapsed,
- }
- )}
+ <Link href={`/${workspaceSlug}${link.href}`} onClick={() => handleLinkClick(link.key)}>
+ <SidebarNavItem
+ key={link.key}
+ className={`${sidebarCollapsed ? "p-0 size-8 aspect-square justify-center mx-auto" : ""}`}
+ isActive={link.highlight(pathname, `/${workspaceSlug}`)}
>
- <div className={cn("grow flex items-center gap-1.5", { "justify-center": sidebarCollapsed })}>
- <span className="flex-shrink-0 size-4 grid place-items-center">
- <link.Icon
- className={cn("size-4", {
- "rotate-180": link.key === "active-cycles",
- })}
- />
- </span>
+ <div className="flex items-center gap-1.5 py-[1px]">
+ <link.Icon
+ className={cn("size-4", {
+ "rotate-180": link.key === "active-cycles",
+ })}
+ />
{!sidebarCollapsed && <p className="text-sm leading-5 font-medium">{link.label}</p>}
</div>
- {!sidebarCollapsed && link.key === "active-cycles" && (
- <div className="flex-shrink-0">
- <UpgradeBadge />
- </div>
- )}
- </div>
- </Tooltip>
- </Link>
+ {!sidebarCollapsed && link.key === "active-cycles" && indicatorElement}
+ </SidebarNavItem>
+ </Link>
+ </Tooltip>
)
)}
</Disclosure.Panel>
diff --git a/web/core/constants/dashboard.ts b/web/core/constants/dashboard.ts
index 8ffc6f38e4..907a0ace13 100644
--- a/web/core/constants/dashboard.ts
+++ b/web/core/constants/dashboard.ts
@@ -2,11 +2,11 @@
import { linearGradientDef } from "@nivo/core";
// icons
-import { BarChart2, Bell, Briefcase, CheckCircle, Home, Settings } from "lucide-react";
+import { BarChart2, Briefcase, Home, Inbox, Layers } from "lucide-react";
// types
import { TIssuesListTypes, TStateGroups } from "@plane/types";
// ui
-import { ContrastIcon } from "@plane/ui";
+import { ContrastIcon, UserActivityIcon } from "@plane/ui";
import { Props } from "@/components/icons/types";
// assets
import CompletedIssuesDark from "@/public/empty-state/dashboard/dark/completed-issues.svg";
@@ -259,14 +259,6 @@ export const SIDEBAR_WORKSPACE_MENU_ITEMS: {
highlight: (pathname: string, baseUrl: string) => boolean;
Icon: React.FC<Props>;
}[] = [
- {
- key: "all-issues",
- label: "All Issues",
- href: `/workspace-views/all-issues`,
- access: EUserWorkspaceRoles.GUEST,
- highlight: (pathname: string, baseUrl: string) => pathname.includes(`${baseUrl}/workspace-views/`),
- Icon: CheckCircle,
- },
{
key: "projects",
label: "Projects",
@@ -275,9 +267,17 @@ export const SIDEBAR_WORKSPACE_MENU_ITEMS: {
highlight: (pathname: string, baseUrl: string) => pathname === `${baseUrl}/projects/`,
Icon: Briefcase,
},
+ {
+ key: "all-issues",
+ label: "Views",
+ href: `/workspace-views/all-issues`,
+ access: EUserWorkspaceRoles.GUEST,
+ highlight: (pathname: string, baseUrl: string) => pathname.includes(`${baseUrl}/workspace-views/`),
+ Icon: Layers,
+ },
{
key: "active-cycles",
- label: "Active Cycles",
+ label: "Cycles",
href: `/active-cycles`,
access: EUserWorkspaceRoles.GUEST,
highlight: (pathname: string, baseUrl: string) => pathname === `${baseUrl}/active-cycles/`,
@@ -291,14 +291,6 @@ export const SIDEBAR_WORKSPACE_MENU_ITEMS: {
highlight: (pathname: string, baseUrl: string) => pathname.includes(`${baseUrl}/analytics/`),
Icon: BarChart2,
},
- {
- key: "settings",
- label: "Settings",
- href: `/settings`,
- access: EUserWorkspaceRoles.GUEST,
- highlight: (pathname: string, baseUrl: string) => pathname.includes(`${baseUrl}/settings/`),
- Icon: Settings,
- },
];
export const SIDEBAR_USER_MENU_ITEMS: {
@@ -317,12 +309,20 @@ export const SIDEBAR_USER_MENU_ITEMS: {
highlight: (pathname: string, baseUrl: string) => pathname === `${baseUrl}/`,
Icon: Home,
},
+ {
+ key: "my-work",
+ label: "My Work",
+ href: "/profile",
+ access: EUserWorkspaceRoles.GUEST,
+ highlight: (pathname: string, baseUrl: string) => pathname.includes(`${baseUrl}/profile/`),
+ Icon: UserActivityIcon,
+ },
{
key: "notifications",
- label: "Notifications",
+ label: "Inbox",
href: `/notifications`,
access: EUserWorkspaceRoles.GUEST,
- highlight: (pathname: string, baseUrl: string) => pathname === `${baseUrl}/notifications`,
- Icon: Bell,
+ highlight: (pathname: string, baseUrl: string) => pathname.includes(`${baseUrl}/notifications/`),
+ Icon: Inbox,
},
];