diff --git a/apps/app/components/core/issues-view.tsx b/apps/app/components/core/issues-view.tsx index 83f149332..2151f0b64 100644 --- a/apps/app/components/core/issues-view.tsx +++ b/apps/app/components/core/issues-view.tsx @@ -21,7 +21,13 @@ import { CreateUpdateViewModal } from "components/views"; // ui import { Avatar, EmptySpace, EmptySpaceItem, PrimaryButton } from "components/ui"; // icons -import { PlusIcon, RectangleStackIcon, TrashIcon, XMarkIcon } from "@heroicons/react/24/outline"; +import { + ListBulletIcon, + PlusIcon, + RectangleStackIcon, + TrashIcon, + XMarkIcon, +} from "@heroicons/react/24/outline"; // helpers import { getStatesList } from "helpers/state.helper"; // types @@ -613,6 +619,14 @@ export const IssuesView: React.FC = ({ type = "issue", openIssuesListModa document.dispatchEvent(e); }} /> + {openIssuesListModal && ( + + )} ) diff --git a/apps/app/components/modules/single-module-card.tsx b/apps/app/components/modules/single-module-card.tsx index 162dcd03d..f35e0571b 100644 --- a/apps/app/components/modules/single-module-card.tsx +++ b/apps/app/components/modules/single-module-card.tsx @@ -153,126 +153,128 @@ export const SingleModuleCard: React.FC = ({ module, handleEditModule }) setIsOpen={setModuleDeleteModal} data={module} /> -
-
-
-
-
- - - -

- {truncateText(module.name, 75)} -

- - - +
+
+
+
+ + + +

+ {truncateText(module.name, 75)} +

+ + + -
-
- {module?.status?.replace("-", " ")} -
- {module.is_favorite ? ( - +
+
+ {module?.status?.replace("-", " ")} +
+ {module.is_favorite ? ( + + ) : ( + + )} + + + + + + Edit Module + + + + + + Delete Module + + + + + + Copy Module Link + + + +
+
+
+
+ + Start: + {renderShortDateWithYearFormat(startDate)} +
+
+ + End: + {renderShortDateWithYearFormat(endDate)} +
+
+ + Lead: +
+ {module.lead_detail ? ( +
+ + {module.lead_detail.first_name} +
) : ( - +
+ N/A + N/A +
)} - - - - - - Edit Module - - - - - - Delete Module - - - - - - Copy Module Link - - -
-
-
- - Start: - {renderShortDateWithYearFormat(startDate)} -
-
- - End: - {renderShortDateWithYearFormat(endDate)} -
-
- - Lead: -
- {module.lead_detail ? ( -
- - {module.lead_detail.first_name} -
- ) : ( -
- N/A - N/A -
- )} -
-
-
- - Members: -
- {module.members && module.members.length > 0 ? ( - - ) : ( -
- N/A - N/A -
- )} -
+
+ + Members: +
+ {module.members && module.members.length > 0 ? ( + + ) : ( +
+ N/A + N/A +
+ )}
-
- - Progress -
- {isNaN(completionPercentage) ? 0 : completionPercentage.toFixed(0)}% - -
-
-
+
+
+
+ Progress + +
+
+
+
diff --git a/apps/app/components/project/sidebar-list.tsx b/apps/app/components/project/sidebar-list.tsx index c57254d88..aa3a78975 100644 --- a/apps/app/components/project/sidebar-list.tsx +++ b/apps/app/components/project/sidebar-list.tsx @@ -144,7 +144,7 @@ export const ProjectSidebarList: FC = () => { />
{favoriteProjects && favoriteProjects.length > 0 && ( -
+
{!sidebarCollapse &&
Favorites
} {favoriteProjects.map((favoriteProject) => { const project = favoriteProject.project_detail; diff --git a/apps/app/components/project/single-sidebar-project.tsx b/apps/app/components/project/single-sidebar-project.tsx index ab5940fe3..60a03b14d 100644 --- a/apps/app/components/project/single-sidebar-project.tsx +++ b/apps/app/components/project/single-sidebar-project.tsx @@ -146,7 +146,7 @@ export const SingleSidebarProject: React.FC = ({ return ( = ({ }; return ( -
+
{getStateGroupIcon(state.group, "20", "20", state.color)}
diff --git a/apps/app/components/ui/empty-state.tsx b/apps/app/components/ui/empty-state.tsx index ade972982..36ae330a0 100644 --- a/apps/app/components/ui/empty-state.tsx +++ b/apps/app/components/ui/empty-state.tsx @@ -1,6 +1,8 @@ import React from "react"; import Image from "next/image"; +// ui +import { PrimaryButton } from "components/ui"; // icon import { PlusIcon } from "@heroicons/react/24/outline"; // helper @@ -47,9 +49,8 @@ export const EmptyState: React.FC = ({ type, title, description, imgURL, )}

{description}

- +
); }; diff --git a/apps/app/components/ui/multi-level-dropdown.tsx b/apps/app/components/ui/multi-level-dropdown.tsx index b4fa897b0..fac674d14 100644 --- a/apps/app/components/ui/multi-level-dropdown.tsx +++ b/apps/app/components/ui/multi-level-dropdown.tsx @@ -66,15 +66,11 @@ export const MultiLevelDropdown: React.FC = ({ as="button" onClick={(e: any) => { if (option.children) { - if (openChildFor === option.id) { - e.stopPropagation(); - e.preventDefault(); - setOpenChildFor(null); - } else { - e.stopPropagation(); - e.preventDefault(); - setOpenChildFor(option.id); - } + e.stopPropagation(); + e.preventDefault(); + + if (openChildFor === option.id) setOpenChildFor(null); + else setOpenChildFor(option.id); } else { onSelect(option.value); } diff --git a/apps/app/components/workspace/sidebar-dropdown.tsx b/apps/app/components/workspace/sidebar-dropdown.tsx index 956483042..d8953ea89 100644 --- a/apps/app/components/workspace/sidebar-dropdown.tsx +++ b/apps/app/components/workspace/sidebar-dropdown.tsx @@ -74,13 +74,15 @@ export const WorkspaceSidebarDropdown = () => { return (
- -
- -
-
+ +
+ +
+
{activeWorkspace?.logo && activeWorkspace.logo !== "" ? ( {
{!sidebarCollapse && ( -

- {activeWorkspace?.name - ? activeWorkspace.name.length > 17 - ? `${activeWorkspace.name.substring(0, 15)}...` - : activeWorkspace.name - : "Loading..."} +

+ {activeWorkspace?.name ? truncateText(activeWorkspace.name, 14) : "Loading..."}

)}
@@ -130,12 +128,9 @@ export const WorkspaceSidebarDropdown = () => { className="fixed left-2 z-20 mt-1 flex w-full max-w-[17rem] origin-top-left flex-col rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none" > -
- - {user?.email} - +
+
{user?.email}
Workspace - {workspaces ? (
{workspaces.length > 0 ? ( diff --git a/apps/app/components/workspace/sidebar-menu.tsx b/apps/app/components/workspace/sidebar-menu.tsx index b5de896b7..ea4397637 100644 --- a/apps/app/components/workspace/sidebar-menu.tsx +++ b/apps/app/components/workspace/sidebar-menu.tsx @@ -37,7 +37,7 @@ export const WorkspaceSidebarMenu: React.FC = () => { const { collapsed: sidebarCollapse } = useTheme(); return ( -
+
{workspaceLinks(workspaceSlug as string).map((link, index) => ( { sidebarCollapse ? "justify-center" : "" }`} > - diff --git a/apps/app/layouts/app-layout/app-sidebar.tsx b/apps/app/layouts/app-layout/app-sidebar.tsx index 1c5f0b2b0..8659daa15 100644 --- a/apps/app/layouts/app-layout/app-sidebar.tsx +++ b/apps/app/layouts/app-layout/app-sidebar.tsx @@ -20,8 +20,8 @@ const Sidebar: React.FC = ({ toggleSidebar, setToggleSidebar }) => return (