feat: re-arranged org project pages

frontend/src/layouts/AdminLayout/Sidebar.tsx

@@ -12,7 +12,6 @@ import {
   MenuItem
 } from "@app/components/v2";
 import { envConfig } from "@app/config/env";
-import { ProjectType } from "@app/hooks/api/workspace/types";
 
 import { INFISICAL_SUPPORT_OPTIONS } from "../OrganizationLayout/components/NavBar/Navbar";
 
@@ -74,7 +73,7 @@ export const AdminSidebar = () => {
     <aside className="dark w-full border-r border-mineshaft-600 bg-gradient-to-tr from-mineshaft-700 via-mineshaft-800 to-mineshaft-900 md:w-60">
       <nav className="items-between flex h-full flex-col justify-between overflow-y-auto dark:[color-scheme:dark]">
         <div className="flex-grow">
-          <Link to={`/organization/${ProjectType.SecretManager}/overview` as const}>
+          <Link to="/organization/projects">
             <div className="my-6 flex cursor-default items-center justify-center pr-2 text-sm text-mineshaft-300 hover:text-mineshaft-100">
               <FontAwesomeIcon icon={faArrowLeft} className="pr-3" />
               Back to organization

frontend/src/layouts/OrganizationLayout/OrganizationLayout.tsx

@@ -2,7 +2,6 @@ import { useTranslation } from "react-i18next";
 import { faMobile } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { Outlet } from "@tanstack/react-router";
-import { twMerge } from "tailwind-merge";
 
 import { CreateOrgModal } from "@app/components/organization/CreateOrgModal";
 import { Banner } from "@app/components/page-frames/Banner";

frontend/src/layouts/OrganizationLayout/ProductsSideBar/ProjectOverviewSideBar.tsx

@@ -13,7 +13,7 @@ export const ProjectOverviewSideBar = ({ type }: TProjectOverviewSideBarProps) =
   const matchRoute = useMatchRoute();
 
   const isOverviewActive = !!matchRoute({
-    to: `/organization/${type}/overview`,
+    to: "/organization/projects",
     fuzzy: false
   });
 

frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx

@@ -140,7 +140,7 @@ export const Navbar = () => {
   return (
     <div className="z-10 flex h-12 items-center gap-1 border-b border-mineshaft-600 bg-mineshaft-800 px-4 py-2">
       <div>
-        <Link to="/organization/secret-manager/overview">
+        <Link to="/organization/projects">
           <img alt="infisical logo" src="/images/logotransparent.png" className="h-4" />
         </Link>
       </div>

frontend/src/layouts/OrganizationLayout/components/OrgSidebar/OrgSidebar.tsx

@@ -38,7 +38,7 @@ export const OrgSidebar = () => {
         <nav className="items-between flex h-full flex-col justify-between overflow-y-auto dark:[color-scheme:dark]">
           <Menu>
             <MenuGroup title="Overview">
-              <Link to="/organization/secret-manager/overview">
+              <Link to="/organization/projects">
                 {({ isActive }) => (
                   <MenuItem isSelected={isActive} icon="notification-bell">
                     Projects

frontend/src/layouts/PersonalSettingsLayout/PersonalSettingsLayout.tsx

@@ -11,10 +11,9 @@ import {
   DropdownMenuTrigger
 } from "@app/components/v2";
 import { envConfig } from "@app/config/env";
-import { ProjectType } from "@app/hooks/api/workspace/types";
 
 import { InsecureConnectionBanner } from "../OrganizationLayout/components/InsecureConnectionBanner";
-import { INFISICAL_SUPPORT_OPTIONS } from "../OrganizationLayout/components/MinimizedOrgSidebar/MinimizedOrgSidebar";
+import { INFISICAL_SUPPORT_OPTIONS } from "../OrganizationLayout/components/NavBar/Navbar";
 
 export const PersonalSettingsLayout = () => {
   const { t } = useTranslation();
@@ -27,7 +26,7 @@ export const PersonalSettingsLayout = () => {
           <aside className="dark w-full border-r border-mineshaft-600 bg-gradient-to-tr from-mineshaft-700 via-mineshaft-800 to-mineshaft-900 md:w-60">
             <nav className="items-between flex h-full flex-col justify-between overflow-y-auto dark:[color-scheme:dark]">
               <div className="flex-grow">
-                <Link to={`/organization/${ProjectType.SecretManager}/overview` as const}>
+                <Link to="/organization/projects">
                   <div className="my-6 flex cursor-default items-center justify-center pr-2 text-sm text-mineshaft-300 hover:text-mineshaft-100">
                     <FontAwesomeIcon icon={faArrowLeft} className="pr-3" />
                     Back to organization

frontend/src/layouts/ProjectLayout/components/ProjectSelect/ProjectSelect.tsx

@@ -22,7 +22,7 @@ import { usePopUp } from "@app/hooks";
 import { useGetUserWorkspaces } from "@app/hooks/api";
 import { useUpdateUserProjectFavorites } from "@app/hooks/api/users/mutation";
 import { useGetUserProjectFavorites } from "@app/hooks/api/users/queries";
-import { ProjectType, Workspace } from "@app/hooks/api/workspace/types";
+import { Workspace } from "@app/hooks/api/workspace/types";
 
 type TWorkspaceWithFaveProp = Workspace & { isFavorite: boolean };
 
@@ -126,7 +126,7 @@ const ProjectOption = ({
 export const ProjectSelect = () => {
   const { currentWorkspace } = useWorkspace();
   const { currentOrg } = useOrganization();
-  const { data: workspaces = [] } = useGetUserWorkspaces({ type: currentWorkspace.type });
+  const { data: workspaces = [] } = useGetUserWorkspaces();
   const { data: projectFavorites } = useGetUserProjectFavorites(currentOrg.id!);
 
   const { subscription } = useSubscription();
@@ -211,7 +211,6 @@ export const ProjectSelect = () => {
       <NewProjectModal
         isOpen={popUp.addNewWs.isOpen}
         onOpenChange={(isOpen) => handlePopUpToggle("addNewWs", isOpen)}
-        projectType={currentWorkspace?.type || ProjectType.SecretManager}
       />
     </div>
   );

frontend/src/layouts/ProjectLayout/components/SidebarHeader/SidebarHeader.tsx

@@ -14,7 +14,7 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger
 } from "@app/components/v2";
-import { useOrganization, useUser, useWorkspace } from "@app/context";
+import { useOrganization, useUser } from "@app/context";
 import { useGetOrganizations, useLogoutUser } from "@app/hooks/api";
 import { AuthMethod } from "@app/hooks/api/users/types";
 
@@ -24,7 +24,6 @@ type Prop = {
 
 export const SidebarHeader = ({ onChangeOrg }: Prop) => {
   const { currentOrg } = useOrganization();
-  const { currentWorkspace } = useWorkspace();
   const { user } = useUser();
   const navigate = useNavigate();
   const { data: orgs } = useGetOrganizations();
@@ -42,7 +41,7 @@ export const SidebarHeader = ({ onChangeOrg }: Prop) => {
 
   return (
     <div className="flex h-12 cursor-default items-center px-3 pt-6">
-      <Link to={`/organization/${currentWorkspace.type}/overview` as const}>
+      <Link to="/organization/projects">
         <div className="pl-1 pr-2 text-mineshaft-400 duration-200 hover:text-mineshaft-100">
           <FontAwesomeIcon icon={faArrowLeft} />
         </div>