From 91c583ce1ecd6d83747db9103e65151f6bcce720 Mon Sep 17 00:00:00 2001
From: Aaryan Khandelwal <aaryankhandu123@gmail.com>
Date: Fri, 3 Nov 2023 18:24:17 +0530
Subject: [PATCH] chore: update all layout selections

---
 web/components/headers/modules-list.tsx       | 50 ++++++++++--------
 web/components/project/priority-select.tsx    |  2 +-
 web/constants/cycle.tsx                       |  5 +-
 web/constants/page.ts                         | 37 +++++++++++++
 web/layouts/auth-layout/user-wrapper.tsx      |  2 +-
 .../projects/[projectId]/cycles/index.tsx     | 40 +++++++-------
 .../projects/[projectId]/pages/index.tsx      | 52 +++++++++----------
 7 files changed, 116 insertions(+), 72 deletions(-)
 create mode 100644 web/constants/page.ts

diff --git a/web/components/headers/modules-list.tsx b/web/components/headers/modules-list.tsx
index ec6e88ebd35..1ad827d225e 100644
--- a/web/components/headers/modules-list.tsx
+++ b/web/components/headers/modules-list.tsx
@@ -9,20 +9,23 @@ import useLocalStorage from "hooks/use-local-storage";
 // ui
 import { Breadcrumbs, BreadcrumbItem, Button, Tooltip } from "@plane/ui";
 // helper
-import { replaceUnderscoreIfSnakeCase, truncateText } from "helpers/string.helper";
+import { truncateText } from "helpers/string.helper";
 
-const moduleViewOptions: { type: "list" | "grid" | "gantt_chart"; icon: any }[] = [
+const MODULE_VIEW_LAYOUTS: { key: "list" | "grid" | "gantt_chart"; icon: any; title: string }[] = [
   {
-    type: "list",
+    key: "list",
     icon: List,
+    title: "List layout",
   },
   {
-    type: "grid",
+    key: "grid",
     icon: LayoutGrid,
+    title: "Grid layout",
   },
   {
-    type: "gantt_chart",
+    key: "gantt_chart",
     icon: GanttChartSquare,
+    title: "Gantt layout",
   },
 ];
 
@@ -57,23 +60,26 @@ export const ModulesListHeader: React.FC = observer(() => {
         </div>
       </div>
       <div className="flex items-center gap-2">
-        {moduleViewOptions.map((option) => (
-          <Tooltip
-            key={option.type}
-            tooltipContent={<span className="capitalize">{replaceUnderscoreIfSnakeCase(option.type)} Layout</span>}
-            position="bottom"
-          >
-            <button
-              type="button"
-              className={`grid h-7 w-7 place-items-center rounded p-1 outline-none duration-300 hover:bg-custom-sidebar-background-80 ${
-                modulesView === option.type ? "bg-custom-sidebar-background-80" : "text-custom-sidebar-text-200"
-              }`}
-              onClick={() => setModulesView(option.type)}
-            >
-              <option.icon className="h-3.5 w-3.5" />
-            </button>
-          </Tooltip>
-        ))}
+        <div className="flex items-center gap-1 p-1 rounded bg-custom-background-80">
+          {MODULE_VIEW_LAYOUTS.map((layout) => (
+            <Tooltip key={layout.key} tooltipContent={layout.title}>
+              <button
+                type="button"
+                className={`w-7 h-[22px] rounded grid place-items-center transition-all hover:bg-custom-background-100 overflow-hidden group ${
+                  modulesView == layout.key ? "bg-custom-background-100 shadow-custom-shadow-2xs" : ""
+                }`}
+                onClick={() => setModulesView(layout.key)}
+              >
+                <layout.icon
+                  strokeWidth={2}
+                  className={`h-3.5 w-3.5 ${
+                    modulesView == layout.key ? "text-custom-text-100" : "text-custom-text-200"
+                  }`}
+                />
+              </button>
+            </Tooltip>
+          ))}
+        </div>
         <Button
           variant="primary"
           prependIcon={<Plus />}
diff --git a/web/components/project/priority-select.tsx b/web/components/project/priority-select.tsx
index 38a51ff6e34..7a9d1fe8a13 100644
--- a/web/components/project/priority-select.tsx
+++ b/web/components/project/priority-select.tsx
@@ -84,7 +84,7 @@ export const PrioritySelect: React.FC<Props> = ({
               : value === "low"
               ? "text-green-500"
               : "text-custom-text-200"
-          } ${value === "urgent" && highlightUrgentPriority ? "text-white" : "text-red-500"}`}
+          } ${value === "urgent" ? (highlightUrgentPriority ? "text-white" : "text-red-500") : ""}`}
         />
         {showTitle && <span className="capitalize text-xs">{value}</span>}
       </div>
diff --git a/web/constants/cycle.tsx b/web/constants/cycle.tsx
index aa0063067aa..697dc36608c 100644
--- a/web/constants/cycle.tsx
+++ b/web/constants/cycle.tsx
@@ -23,18 +23,21 @@ export const CYCLE_TAB_LIST = [
   },
 ];
 
-export const CYCLE_VIEWS = [
+export const CYCLE_VIEW_LAYOUTS = [
   {
     key: "list",
     icon: List,
+    title: "List layout",
   },
   {
     key: "board",
     icon: LayoutGrid,
+    title: "Grid layout",
   },
   {
     key: "gantt",
     icon: GanttChartSquare,
+    title: "Gantt layout",
   },
 ];
 
diff --git a/web/constants/page.ts b/web/constants/page.ts
new file mode 100644
index 00000000000..424f1b59c67
--- /dev/null
+++ b/web/constants/page.ts
@@ -0,0 +1,37 @@
+import { LayoutGrid, List } from "lucide-react";
+
+export const PAGE_VIEW_LAYOUTS = [
+  {
+    key: "list",
+    icon: List,
+    title: "List layout",
+  },
+  {
+    key: "detailed",
+    icon: LayoutGrid,
+    title: "Detailed layout",
+  },
+];
+
+export const PAGE_TABS_LIST: { key: string; title: string }[] = [
+  {
+    key: "recent",
+    title: "Recent",
+  },
+  {
+    key: "all",
+    title: "All",
+  },
+  {
+    key: "favorites",
+    title: "Favorites",
+  },
+  {
+    key: "created-by-me",
+    title: "Created by me",
+  },
+  {
+    key: "created-by-others",
+    title: "Created by others",
+  },
+];
diff --git a/web/layouts/auth-layout/user-wrapper.tsx b/web/layouts/auth-layout/user-wrapper.tsx
index 7e4f51fb7ca..83cf9e99580 100644
--- a/web/layouts/auth-layout/user-wrapper.tsx
+++ b/web/layouts/auth-layout/user-wrapper.tsx
@@ -25,7 +25,7 @@ export const UserAuthWrapper: FC<IUserAuthWrapper> = (props) => {
 
   if (!currentUser && !error) {
     return (
-      <div className="h-screen grid place-items-center p-4">
+      <div className="h-screen grid place-items-center p-4 bg-custom-background-100">
         <div className="flex flex-col items-center gap-3 text-center">
           <Spinner />
         </div>
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/cycles/index.tsx b/web/pages/[workspaceSlug]/projects/[projectId]/cycles/index.tsx
index 095cad0e762..21fd5fe8b49 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/cycles/index.tsx
+++ b/web/pages/[workspaceSlug]/projects/[projectId]/cycles/index.tsx
@@ -20,11 +20,9 @@ import emptyCycle from "public/empty-state/cycle.svg";
 import { TCycleView, TCycleLayout } from "types";
 import { NextPageWithLayout } from "types/app";
 // constants
-import { CYCLE_TAB_LIST, CYCLE_VIEWS } from "constants/cycle";
+import { CYCLE_TAB_LIST, CYCLE_VIEW_LAYOUTS } from "constants/cycle";
 // lib cookie
 import { setLocalStorage, getLocalStorage } from "lib/local-storage";
-// helpers
-import { replaceUnderscoreIfSnakeCase } from "helpers/string.helper";
 
 const ProjectCyclesPage: NextPageWithLayout = observer(() => {
   const [createModal, setCreateModal] = useState(false);
@@ -118,7 +116,7 @@ const ProjectCyclesPage: NextPageWithLayout = observer(() => {
             handleCurrentView(CYCLE_TAB_LIST[i].key as TCycleView);
           }}
         >
-          <div className="flex flex-col sm:flex-row gap-4 justify-between border-b border-custom-border-300 px-4 sm:px-5 pb-4 sm:pb-0">
+          <div className="flex flex-col sm:flex-row gap-4 justify-between items-end sm:items-center border-b border-custom-border-200 px-4 sm:px-5 pb-4 sm:pb-0">
             <Tab.List as="div" className="flex items-center overflow-x-scroll">
               {CYCLE_TAB_LIST.map((tab) => (
                 <Tab
@@ -133,28 +131,28 @@ const ProjectCyclesPage: NextPageWithLayout = observer(() => {
                 </Tab>
               ))}
             </Tab.List>
-            {CYCLE_VIEWS && CYCLE_VIEWS.length > 0 && cycleStore?.cycleView != "active" && (
-              <div className="justify-end sm:justify-start flex items-center gap-x-1">
-                {CYCLE_VIEWS.map((view) => {
-                  if (view.key === "gantt" && cycleStore?.cycleView === "draft") return null;
+            {cycleStore?.cycleView != "active" && (
+              <div className="flex items-center gap-1 p-1 rounded bg-custom-background-80">
+                {CYCLE_VIEW_LAYOUTS.map((layout) => {
+                  if (layout.key === "gantt" && cycleStore?.cycleView === "draft") return null;
+
                   return (
-                    <Tooltip
-                      key={view.key}
-                      tooltipContent={
-                        <span className="capitalize">{replaceUnderscoreIfSnakeCase(view.key)} Layout</span>
-                      }
-                      position="bottom"
-                    >
+                    <Tooltip key={layout.key} tooltipContent={layout.title}>
                       <button
                         type="button"
-                        className={`grid h-7 w-7 place-items-center rounded p-1 outline-none duration-300 hover:bg-custom-sidebar-background-80 ${
-                          cycleStore?.cycleLayout === view.key
-                            ? "bg-custom-sidebar-background-80"
-                            : "text-custom-sidebar-text-200"
+                        className={`w-7 h-[22px] rounded grid place-items-center transition-all hover:bg-custom-background-100 overflow-hidden group ${
+                          cycleStore?.cycleLayout == layout.key
+                            ? "bg-custom-background-100 shadow-custom-shadow-2xs"
+                            : ""
                         }`}
-                        onClick={() => handleCurrentLayout(view.key as TCycleLayout)}
+                        onClick={() => handleCurrentLayout(layout.key as TCycleLayout)}
                       >
-                        <view.icon className="h-3.5 w-3.5" />
+                        <layout.icon
+                          strokeWidth={2}
+                          className={`h-3.5 w-3.5 ${
+                            cycleStore?.cycleLayout == layout.key ? "text-custom-text-100" : "text-custom-text-200"
+                          }`}
+                        />
                       </button>
                     </Tooltip>
                   );
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/pages/index.tsx b/web/pages/[workspaceSlug]/projects/[projectId]/pages/index.tsx
index 6d821ce6541..5ad969fde41 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/pages/index.tsx
+++ b/web/pages/[workspaceSlug]/projects/[projectId]/pages/index.tsx
@@ -5,16 +5,18 @@ import { Tab } from "@headlessui/react";
 // hooks
 import useLocalStorage from "hooks/use-local-storage";
 import useUserAuth from "hooks/use-user-auth";
-// icons
-import { LayoutGrid, List } from "lucide-react";
 // layouts
 import { AppLayout } from "layouts/app-layout";
 // components
 import { RecentPagesList, CreateUpdatePageModal, TPagesListProps } from "components/pages";
 import { PagesHeader } from "components/headers";
+// ui
+import { Tooltip } from "@plane/ui";
 // types
 import { TPageViewProps } from "types";
 import { NextPageWithLayout } from "types/app";
+// constants
+import { PAGE_TABS_LIST, PAGE_VIEW_LAYOUTS } from "constants/page";
 
 const AllPagesList = dynamic<TPagesListProps>(() => import("components/pages").then((a) => a.AllPagesList), {
   ssr: false,
@@ -32,8 +34,6 @@ const OtherPagesList = dynamic<TPagesListProps>(() => import("components/pages")
   ssr: false,
 });
 
-const tabsList = ["Recent", "All", "Favorites", "Created by me", "Created by others"];
-
 const ProjectPagesPage: NextPageWithLayout = () => {
   const router = useRouter();
   const { workspaceSlug, projectId } = router.query;
@@ -77,25 +77,25 @@ const ProjectPagesPage: NextPageWithLayout = () => {
       <div className="space-y-5 p-8 h-full overflow-hidden flex flex-col">
         <div className="flex gap-4 justify-between">
           <h3 className="text-2xl font-semibold text-custom-text-100">Pages</h3>
-          <div className="flex gap-x-1">
-            <button
-              type="button"
-              className={`grid h-7 w-7 place-items-center rounded p-1 outline-none duration-300 hover:bg-custom-background-80 ${
-                viewType === "list" ? "bg-custom-background-80" : ""
-              }`}
-              onClick={() => setViewType("list")}
-            >
-              <List className="h-4 w-4" />
-            </button>
-            <button
-              type="button"
-              className={`grid h-7 w-7 place-items-center rounded p-1 outline-none duration-300 hover:bg-custom-background-80 ${
-                viewType === "detailed" ? "bg-custom-background-80" : ""
-              }`}
-              onClick={() => setViewType("detailed")}
-            >
-              <LayoutGrid className="h-4 w-4" />
-            </button>
+          <div className="flex items-center gap-1 p-1 rounded bg-custom-background-80">
+            {PAGE_VIEW_LAYOUTS.map((layout) => (
+              <Tooltip key={layout.key} tooltipContent={layout.title}>
+                <button
+                  type="button"
+                  className={`w-7 h-[22px] rounded grid place-items-center transition-all hover:bg-custom-background-100 overflow-hidden group ${
+                    viewType == layout.key ? "bg-custom-background-100 shadow-custom-shadow-2xs" : ""
+                  }`}
+                  onClick={() => setViewType(layout.key as TPageViewProps)}
+                >
+                  <layout.icon
+                    strokeWidth={2}
+                    className={`h-3.5 w-3.5 ${
+                      viewType == layout.key ? "text-custom-text-100" : "text-custom-text-200"
+                    }`}
+                  />
+                </button>
+              </Tooltip>
+            ))}
           </div>
         </div>
         <Tab.Group
@@ -121,9 +121,9 @@ const ProjectPagesPage: NextPageWithLayout = () => {
         >
           <Tab.List as="div" className="mb-6 flex items-center justify-between">
             <div className="flex gap-4 items-center flex-wrap">
-              {tabsList.map((tab, index) => (
+              {PAGE_TABS_LIST.map((tab) => (
                 <Tab
-                  key={`${tab}-${index}`}
+                  key={tab.key}
                   className={({ selected }) =>
                     `rounded-full border px-5 py-1.5 text-sm outline-none ${
                       selected
@@ -132,7 +132,7 @@ const ProjectPagesPage: NextPageWithLayout = () => {
                     }`
                   }
                 >
-                  {tab}
+                  {tab.title}
                 </Tab>
               ))}
             </div>