From 535bafaf358fe8a43a4959772d9ed3177d55d0e8 Mon Sep 17 00:00:00 2001
From: Aaryan Khandelwal <aaryankhandu123@gmail.com>
Date: Tue, 1 Aug 2023 12:36:29 +0530
Subject: [PATCH 1/2] chore: profile dropdown in the sidebar

---
 .../components/workspace/sidebar-dropdown.tsx | 280 +++++++++++-------
 1 file changed, 166 insertions(+), 114 deletions(-)

diff --git a/apps/app/components/workspace/sidebar-dropdown.tsx b/apps/app/components/workspace/sidebar-dropdown.tsx
index b8f68cf9a24..36ed26afd70 100644
--- a/apps/app/components/workspace/sidebar-dropdown.tsx
+++ b/apps/app/components/workspace/sidebar-dropdown.tsx
@@ -16,7 +16,7 @@ import useToast from "hooks/use-toast";
 import userService from "services/user.service";
 import authenticationService from "services/authentication.service";
 // components
-import { Avatar, Loader } from "components/ui";
+import { Avatar, Icon, Loader } from "components/ui";
 // icons
 import { CheckIcon, PlusIcon } from "@heroicons/react/24/outline";
 // 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 = () => {
   const router = useRouter();
   const { workspaceSlug } = router.query;
@@ -90,8 +103,8 @@ export const WorkspaceSidebarDropdown = () => {
   };
 
   return (
-    <Menu as="div" className="relative col-span-4 inline-block w-full px-4 pt-4 text-left">
-      <div className="flex items-center justify-between gap-2">
+    <div className="inline-flex items-center gap-2 px-4 pt-4">
+      <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">
           <div
             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>
         </Menu.Button>
 
-        {!sidebarCollapse && (
-          <Link href={`/${workspaceSlug}/profile/${user?.id}`}>
-            <a>
-              <div className="flex flex-grow justify-end">
-                <Avatar user={user} height="28px" width="28px" fontSize="14px" />
-              </div>
-            </a>
-          </Link>
-        )}
-      </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"
+        <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"
         >
-          <div className="flex flex-col items-start justify-start gap-3 p-3">
-            <div className="text-sm text-custom-sidebar-text-200">{user?.email}</div>
-            <span className="text-sm font-semibold text-custom-sidebar-text-200">Workspace</span>
-            {workspaces ? (
-              <div className="flex h-full w-full flex-col items-start justify-start gap-3.5">
-                {workspaces.length > 0 ? (
-                  workspaces.map((workspace) => (
-                    <Menu.Item key={workspace.id}>
-                      {({ active }) => (
-                        <button
-                          type="button"
-                          onClick={() => handleWorkspaceNavigation(workspace)}
-                          className="flex w-full items-center justify-between gap-1 rounded-md text-sm text-custom-sidebar-text-100"
-                        >
-                          <div className="flex items-center justify-start gap-2.5">
-                            <span className="relative flex h-6 w-6 items-center justify-center rounded bg-gray-700 p-2 text-xs uppercase text-white">
-                              {workspace?.logo && workspace.logo !== "" ? (
-                                <img
-                                  src={workspace.logo}
-                                  className="absolute top-0 left-0 h-full w-full object-cover rounded"
-                                  alt="Workspace Logo"
-                                />
-                              ) : (
-                                workspace?.name?.charAt(0) ?? "..."
-                              )}
+          <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">
+              <div className="text-sm text-custom-sidebar-text-200">{user?.email}</div>
+              <span className="text-sm font-semibold text-custom-sidebar-text-200">Workspace</span>
+              {workspaces ? (
+                <div className="flex h-full w-full flex-col items-start justify-start gap-3.5">
+                  {workspaces.length > 0 ? (
+                    workspaces.map((workspace) => (
+                      <Menu.Item key={workspace.id}>
+                        {({ active }) => (
+                          <button
+                            type="button"
+                            onClick={() => handleWorkspaceNavigation(workspace)}
+                            className="flex w-full items-center justify-between gap-1 rounded-md text-sm text-custom-sidebar-text-100"
+                          >
+                            <div className="flex items-center justify-start gap-2.5">
+                              <span className="relative flex h-6 w-6 items-center justify-center rounded bg-gray-700 p-2 text-xs uppercase text-white">
+                                {workspace?.logo && workspace.logo !== "" ? (
+                                  <img
+                                    src={workspace.logo}
+                                    className="absolute top-0 left-0 h-full w-full object-cover rounded"
+                                    alt="Workspace Logo"
+                                  />
+                                ) : (
+                                  workspace?.name?.charAt(0) ?? "..."
+                                )}
+                              </span>
+
+                              <h5
+                                className={`text-sm ${
+                                  workspaceSlug === workspace.slug ? "" : "text-custom-text-200"
+                                }`}
+                              >
+                                {truncateText(workspace.name, 18)}
+                              </h5>
+                            </div>
+                            <span className="p-1">
+                              <CheckIcon
+                                className={`h-3 w-3.5 text-custom-sidebar-text-100 ${
+                                  active || workspace.id === activeWorkspace?.id
+                                    ? "opacity-100"
+                                    : "opacity-0"
+                                }`}
+                              />
                             </span>
+                          </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>
 
-                            <h5
-                              className={`text-sm ${
-                                workspaceSlug === workspace.slug ? "" : "text-custom-text-200"
-                              }`}
-                            >
-                              {truncateText(workspace.name, 18)}
-                            </h5>
-                          </div>
-                          <span className="p-1">
-                            <CheckIcon
-                              className={`h-3 w-3.5 text-custom-sidebar-text-100 ${
-                                active || workspace.id === activeWorkspace?.id
-                                  ? "opacity-100"
-                                  : "opacity-0"
-                              }`}
-                            />
-                          </span>
-                        </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-sm outline-none"
+            >
+              <div className="flex flex-col space-y-2.5 pb-2.5">
+                {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>
-                  ))
-                ) : (
-                  <p>No workspace found!</p>
+                  )
                 )}
+              </div>
+              <div className="pt-2.5">
                 <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"
+                  className="flex w-full items-center gap-2 rounded px-2 py-1 hover:bg-custom-sidebar-background-80"
+                  onClick={handleSignOut}
                 >
-                  <PlusIcon className="h-3 w-3" />
-                  Create Workspace
+                  <Icon iconName="logout" className="!text-base" />
+                  Log Out
                 </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>
+            </Menu.Items>
+          </Transition>
+        </Menu>
+      )}
+    </div>
   );
 };

From e4eb895eeb0bf07315a836b63f56c20018ece82f Mon Sep 17 00:00:00 2001
From: Aaryan Khandelwal <aaryankhandu123@gmail.com>
Date: Tue, 1 Aug 2023 12:42:08 +0530
Subject: [PATCH 2/2] style: update spacing and font sizes

---
 apps/app/components/workspace/sidebar-dropdown.tsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/app/components/workspace/sidebar-dropdown.tsx b/apps/app/components/workspace/sidebar-dropdown.tsx
index 36ed26afd70..c9addf8db49 100644
--- a/apps/app/components/workspace/sidebar-dropdown.tsx
+++ b/apps/app/components/workspace/sidebar-dropdown.tsx
@@ -42,7 +42,7 @@ const userLinks = (workspaceSlug: string, userId: string) => [
 
 const profileLinks = (workspaceSlug: string, userId: string) => [
   {
-    name: "View Profile",
+    name: "View profile",
     icon: "account_circle",
     link: `/${workspaceSlug}/profile/${userId}`,
   },
@@ -260,9 +260,9 @@ export const WorkspaceSidebarDropdown = () => {
           >
             <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-sm outline-none"
+          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.5 pb-2.5">
+              <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">
@@ -276,7 +276,7 @@ export const WorkspaceSidebarDropdown = () => {
                   )
                 )}
               </div>
-              <div className="pt-2.5">
+              <div className="pt-2">
                 <Menu.Item
                   as="button"
                   type="button"
@@ -284,7 +284,7 @@ export const WorkspaceSidebarDropdown = () => {
                   onClick={handleSignOut}
                 >
                   <Icon iconName="logout" className="!text-base" />
-                  Log Out
+                  Log out
                 </Menu.Item>
               </div>
             </Menu.Items>