Revert "Fix put back sidebar trigger"

This reverts commit 4123db21c5.

apps/console/src/components/AppSidebarShell.tsx

@@ -21,14 +21,12 @@ export function AppSidebarShell({
 }: AppSidebarShellProps) {
   return (
     <Sidebar variant="sidebar" {...props}>
-      <div className="p-4">
+      <SidebarHeader>{organizationSwitcher}</SidebarHeader>
-        <SidebarHeader>{organizationSwitcher}</SidebarHeader>
+      <SidebarContent>
-        <SidebarContent>
+        {navMain}
-          {navMain}
+        <NavSecondary className="mt-auto" />
-          <NavSecondary className="mt-auto" />
+      </SidebarContent>
-        </SidebarContent>
+      <SidebarFooter>{navUser}</SidebarFooter>
-        <SidebarFooter>{navUser}</SidebarFooter>
-      </div>
     </Sidebar>
   );
 }

apps/console/src/components/ui/sidebar.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { Slot } from "@radix-ui/react-slot";
 import { VariantProps, cva } from "class-variance-authority";
-import { PanelLeft, PanelLeftClose } from "lucide-react";
+import { PanelLeft } from "lucide-react";
 
 import { useIsMobile } from "@/hooks/use-mobile";
 import { cn } from "@/lib/utils";
@@ -261,7 +261,7 @@ const SidebarTrigger = React.forwardRef<
   React.ElementRef<typeof Button>,
   React.ComponentProps<typeof Button>
 >(({ className, onClick, ...props }, ref) => {
-  const { toggleSidebar, open } = useSidebar();
+  const { toggleSidebar } = useSidebar();
 
   return (
     <Button
@@ -276,11 +276,7 @@ const SidebarTrigger = React.forwardRef<
       }}
       {...props}
     >
-      {open ? (
+      <PanelLeft />
-        <PanelLeftClose fontWeight={400} className="text-gray-500" />
-      ) : (
-        <PanelLeft fontWeight={400} className="text-gray-500" />
-      )}
       <span className="sr-only">Toggle Sidebar</span>
     </Button>
   );

apps/console/src/layouts/ConsoleLayout.tsx

@@ -9,11 +9,7 @@ import {
   BreadcrumbPage,
   BreadcrumbSeparator,
 } from "@/components/ui/breadcrumb";
-import {
+import { SidebarInset, SidebarProvider } from "@/components/ui/sidebar";
-  SidebarInset,
-  SidebarProvider,
-  SidebarTrigger,
-} from "@/components/ui/sidebar";
 import { Toaster } from "@/components/ui/toaster";
 import { graphql, useLazyLoadQuery } from "react-relay";
 import { ConsoleLayoutBreadcrumbFrameworkOverviewQuery } from "./__generated__/ConsoleLayoutBreadcrumbFrameworkOverviewQuery.graphql";
@@ -383,11 +379,10 @@ export default function ConsoleLayout() {
   return (
     <SidebarProvider>
       <Suspense>
-        <AppSidebar />
+        <AppSidebar className="p-4" />
       </Suspense>
-      <SidebarInset className="relative">
+      <SidebarInset>
-        <SidebarTrigger className="absolute top-7 left-1" />
+        <div className="mx-auto w-lg md:w-xl lg:w-3xl xl:w-4xl 2xl:w-5xl p-8">
-        <div className="mx-auto w-lg md:w-xl lg:w-3xl xl:w-4xl 2xl:w-5xl py-8 px-10">
           <header className="flex shrink-0 items-center gap-2">
             <Routes>
               <Route

apps/console/src/pages/FrameworkListPage.tsx

@@ -201,7 +201,7 @@ function FrameworkListPageContent({
                 <DialogTrigger asChild>
                   <Button variant="outline">
                     <Upload className="mr-2 h-4 w-4" />
-                    Import
+                    Import Framework
                   </Button>
                 </DialogTrigger>
                 <DialogContent>
@@ -231,7 +231,7 @@ function FrameworkListPageContent({
               <Button asChild>
                 <Link to={`/organizations/${organizationId}/frameworks/create`}>
                   <Plus className="mr-2 h-4 w-4" />
-                  Create
+                  Create Framework
                 </Link>
               </Button>
             </div>