[CHORE] Hide security tab on Settings Sidebar/Refactor SettingsSidebar component (#683)

* hide security setting in settings sidebar when in multiusermode

* refactor sidebar to handle mobile view inside SettingsSidebar component

* forgot eventlogs on sidebar
move footer on settingSidebar to component

---------

Co-authored-by: timothycarambat <rambat1010@gmail.com>

frontend/src/components/SettingsSidebar/index.jsx

@@ -25,11 +25,104 @@ import {
 } from "@phosphor-icons/react";
 import useUser from "@/hooks/useUser";
 import { USER_BACKGROUND_COLOR } from "@/utils/constants";
+import { isMobile } from "react-device-detect";
 
 export default function SettingsSidebar() {
   const { logo } = useLogo();
-  const sidebarRef = useRef(null);
   const { user } = useUser();
+  const sidebarRef = useRef(null);
+  const [showSidebar, setShowSidebar] = useState(false);
+  const [showBgOverlay, setShowBgOverlay] = useState(false);
+
+  useEffect(() => {
+    function handleBg() {
+      if (showSidebar) {
+        setTimeout(() => {
+          setShowBgOverlay(true);
+        }, 300);
+      } else {
+        setShowBgOverlay(false);
+      }
+    }
+    handleBg();
+  }, [showSidebar]);
+
+  if (isMobile) {
+    return (
+      <>
+        <div className="fixed top-0 left-0 right-0 z-10 flex justify-between items-center px-4 py-2 bg-sidebar text-slate-200 shadow-lg h-16">
+          <button
+            onClick={() => setShowSidebar(true)}
+            className="rounded-md p-2 flex items-center justify-center text-slate-200"
+          >
+            <List className="h-6 w-6" />
+          </button>
+          <div className="flex items-center justify-center flex-grow">
+            <img
+              src={logo}
+              alt="Logo"
+              className="block mx-auto h-6 w-auto"
+              style={{ maxHeight: "40px", objectFit: "contain" }}
+            />
+          </div>
+          <div className="w-12"></div>
+        </div>
+        <div
+          style={{
+            transform: showSidebar ? `translateX(0vw)` : `translateX(-100vw)`,
+          }}
+          className={`z-99 fixed top-0 left-0 transition-all duration-500 w-[100vw] h-[100vh]`}
+        >
+          <div
+            className={`${
+              showBgOverlay
+                ? "transition-all opacity-1"
+                : "transition-none opacity-0"
+            }  duration-500 fixed top-0 left-0 ${USER_BACKGROUND_COLOR} bg-opacity-75 w-screen h-screen`}
+            onClick={() => setShowSidebar(false)}
+          />
+          <div
+            ref={sidebarRef}
+            className="h-[100vh] fixed top-0 left-0  rounded-r-[26px] bg-sidebar w-[80%] p-[18px] "
+          >
+            <div className="w-full h-full flex flex-col overflow-x-hidden items-between">
+              {/* Header Information */}
+              <div className="flex w-full items-center justify-between gap-x-4">
+                <div className="flex shrink-1 w-fit items-center justify-start">
+                  <img
+                    src={logo}
+                    alt="Logo"
+                    className="rounded w-full max-h-[40px]"
+                    style={{ objectFit: "contain" }}
+                  />
+                </div>
+                <div className="flex gap-x-2 items-center text-slate-500 shrink-0">
+                  <a
+                    href={paths.home()}
+                    className="transition-all duration-300 p-2 rounded-full text-white bg-sidebar-button hover:bg-menu-item-selected-gradient hover:border-slate-100 hover:border-opacity-50 border-transparent border"
+                  >
+                    <House className="h-4 w-4" />
+                  </a>
+                </div>
+              </div>
+
+              {/* Primary Body */}
+              <div className="h-full flex flex-col w-full justify-between pt-4 overflow-y-hidden ">
+                <div className="h-auto md:sidebar-items md:dark:sidebar-items">
+                  <div className=" flex flex-col gap-y-4 pb-8 overflow-y-scroll no-scroll">
+                    <SidebarOptions user={user} />
+                  </div>
+                </div>
+                <div>
+                  <Footer />
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </>
+    );
+  }
 
   return (
     <>
@@ -62,9 +155,114 @@ export default function SettingsSidebar() {
             Settings
           </div>
           {/* Primary Body */}
-          <div className="h-[100%] flex flex-col w-full justify-between pt-4 overflow-y-hidden">
+          <div className="h-full flex flex-col w-full justify-between pt-4 overflow-y-hidden">
             <div className="h-auto sidebar-items">
-              <div className="flex flex-col gap-y-2 h-[100%] pb-8 overflow-y-scroll no-scroll">
+              {/* Options */}
+              <div className="flex flex-col gap-y-2 h-full pb-8 overflow-y-scroll no-scroll">
+                <SidebarOptions user={user} />
+              </div>
+            </div>
+            <div>
+              <Footer />
+            </div>
+          </div>
+        </div>
+      </div>
+    </>
+  );
+}
+
+const Footer = () => {
+  return (
+    <div className="flex justify-center mt-2">
+      <div className="flex space-x-4">
+        <a
+          href={paths.github()}
+          className="transition-all duration-300 p-2 rounded-full text-white bg-sidebar-button hover:bg-menu-item-selected-gradient hover:border-slate-100 hover:border-opacity-50 border-transparent border"
+        >
+          <GithubLogo weight="fill" className="h-5 w-5 " />
+        </a>
+        <a
+          href={paths.docs()}
+          className="transition-all duration-300 p-2 rounded-full text-white bg-sidebar-button hover:bg-menu-item-selected-gradient hover:border-slate-100 hover:border-opacity-50 border-transparent border"
+        >
+          <BookOpen weight="fill" className="h-5 w-5 " />
+        </a>
+        <a
+          href={paths.discord()}
+          className="transition-all duration-300 p-2 rounded-full text-white bg-sidebar-button hover:bg-menu-item-selected-gradient hover:border-slate-100 hover:border-opacity-50 border-transparent border"
+        >
+          <DiscordLogo
+            weight="fill"
+            className="h-5 w-5 stroke-slate-200 group-hover:stroke-slate-200"
+          />
+        </a>
+        {/* <button className="invisible transition-all duration-300 p-2 rounded-full text-white bg-sidebar-button hover:bg-menu-item-selected-gradient hover:border-slate-100 hover:border-opacity-50 border-transparent border">
+        <DotsThree className="h-5 w-5 group-hover:stroke-slate-200" />
+      </button> */}
+      </div>
+    </div>
+  );
+};
+
+const Option = ({
+  btnText,
+  icon,
+  href,
+  childLinks = [],
+  flex = false,
+  user = null,
+  allowedRole = [],
+  subOptions = null,
+  hidden = false,
+}) => {
+  if (hidden) return null;
+
+  const hasActiveChild = childLinks.includes(window.location.pathname);
+  const isActive = window.location.pathname === href;
+
+  // Option only for multi-user
+  if (!flex && !allowedRole.includes(user?.role)) return null;
+
+  // Option is dual-mode, but user exists, we need to check permissions
+  if (flex && !!user && !allowedRole.includes(user?.role)) return null;
+
+  return (
+    <>
+      <div className="flex gap-x-2 items-center justify-between text-white">
+        <a
+          href={href}
+          className={`
+          transition-all duration-[200ms]
+          flex flex-grow w-[75%] h-[36px] gap-x-2 py-[5px] px-4 rounded justify-start items-center border
+          ${
+            isActive
+              ? "bg-menu-item-selected-gradient border-slate-100 border-opacity-50 font-medium"
+              : "hover:bg-menu-item-selected-gradient hover:border-slate-100 hover:border-opacity-50 border-transparent"
+          }
+        `}
+        >
+          {React.cloneElement(icon, { weight: isActive ? "fill" : "regular" })}
+          <p className="text-sm leading-loose text-opacity-60 whitespace-nowrap overflow-hidden ">
+            {btnText}
+          </p>
+        </a>
+      </div>
+      {!!subOptions && (isActive || hasActiveChild) && (
+        <div
+          className={`ml-4 ${
+            hasActiveChild ? "" : "border-l-2 border-slate-400"
+          } rounded-r-lg`}
+        >
+          {subOptions}
+        </div>
+      )}
+    </>
+  );
+};
+
+const SidebarOptions = ({ user = null }) => (
+  <>
     <Option
       href={paths.settings.system()}
       btnText="System Preferences"
@@ -177,352 +375,15 @@ export default function SettingsSidebar() {
       user={user}
       flex={true}
       allowedRole={["admin", "manager"]}
+      hidden={user?.role}
     />
     <Option
       href={paths.settings.logs()}
-                  btnText="Events Logs"
+      btnText="Event Logs"
       icon={<Notepad className="h-5 w-5 flex-shrink-0" />}
       user={user}
       flex={true}
       allowedRole={["admin"]}
     />
-              </div>
-            </div>
-            <div>
-              {/* Footer */}
-              <div className="flex justify-center mt-2">
-                <div className="flex space-x-4">
-                  <a
-                    href={paths.github()}
-                    className="transition-all duration-300 p-2 rounded-full text-white bg-sidebar-button hover:bg-menu-item-selected-gradient hover:border-slate-100 hover:border-opacity-50 border-transparent border"
-                  >
-                    <GithubLogo weight="fill" className="h-5 w-5 " />
-                  </a>
-                  <a
-                    href={paths.docs()}
-                    className="transition-all duration-300 p-2 rounded-full text-white bg-sidebar-button hover:bg-menu-item-selected-gradient hover:border-slate-100 hover:border-opacity-50 border-transparent border"
-                  >
-                    <BookOpen weight="fill" className="h-5 w-5 " />
-                  </a>
-                  <a
-                    href={paths.discord()}
-                    className="transition-all duration-300 p-2 rounded-full text-white bg-sidebar-button hover:bg-menu-item-selected-gradient hover:border-slate-100 hover:border-opacity-50 border-transparent border"
-                  >
-                    <DiscordLogo
-                      weight="fill"
-                      className="h-5 w-5 stroke-slate-200 group-hover:stroke-slate-200"
-                    />
-                  </a>
-                  {/* <button className="invisible transition-all duration-300 p-2 rounded-full text-white bg-sidebar-button hover:bg-menu-item-selected-gradient hover:border-slate-100 hover:border-opacity-50 border-transparent border">
-                    <DotsThree className="h-5 w-5 group-hover:stroke-slate-200" />
-                  </button> */}
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
   </>
-  );
+);
-}
-
-export function SidebarMobileHeader() {
-  const { logo } = useLogo();
-  const { user } = useUser();
-  const sidebarRef = useRef(null);
-  const [showSidebar, setShowSidebar] = useState(false);
-  const [showBgOverlay, setShowBgOverlay] = useState(false);
-
-  useEffect(() => {
-    function handleBg() {
-      if (showSidebar) {
-        setTimeout(() => {
-          setShowBgOverlay(true);
-        }, 300);
-      } else {
-        setShowBgOverlay(false);
-      }
-    }
-    handleBg();
-  }, [showSidebar]);
-
-  return (
-    <>
-      <div className="fixed top-0 left-0 right-0 z-10 flex justify-between items-center px-4 py-2 bg-sidebar text-slate-200 shadow-lg h-16">
-        <button
-          onClick={() => setShowSidebar(true)}
-          className="rounded-md p-2 flex items-center justify-center text-slate-200"
-        >
-          <List className="h-6 w-6" />
-        </button>
-        <div className="flex items-center justify-center flex-grow">
-          <img
-            src={logo}
-            alt="Logo"
-            className="block mx-auto h-6 w-auto"
-            style={{ maxHeight: "40px", objectFit: "contain" }}
-          />
-        </div>
-        <div className="w-12"></div>
-      </div>
-      <div
-        style={{
-          transform: showSidebar ? `translateX(0vw)` : `translateX(-100vw)`,
-        }}
-        className={`z-99 fixed top-0 left-0 transition-all duration-500 w-[100vw] h-[100vh]`}
-      >
-        <div
-          className={`${
-            showBgOverlay
-              ? "transition-all opacity-1"
-              : "transition-none opacity-0"
-          }  duration-500 fixed top-0 left-0 ${USER_BACKGROUND_COLOR} bg-opacity-75 w-screen h-screen`}
-          onClick={() => setShowSidebar(false)}
-        />
-        <div
-          ref={sidebarRef}
-          className="h-[100vh] fixed top-0 left-0  rounded-r-[26px] bg-sidebar w-[80%] p-[18px] "
-        >
-          <div className="w-full h-full flex flex-col overflow-x-hidden items-between">
-            {/* Header Information */}
-            <div className="flex w-full items-center justify-between gap-x-4">
-              <div className="flex shrink-1 w-fit items-center justify-start">
-                <img
-                  src={logo}
-                  alt="Logo"
-                  className="rounded w-full max-h-[40px]"
-                  style={{ objectFit: "contain" }}
-                />
-              </div>
-              <div className="flex gap-x-2 items-center text-slate-500 shrink-0">
-                <a
-                  href={paths.home()}
-                  className="transition-all duration-300 p-2 rounded-full text-white bg-sidebar-button hover:bg-menu-item-selected-gradient hover:border-slate-100 hover:border-opacity-50 border-transparent border"
-                >
-                  <House className="h-4 w-4" />
-                </a>
-              </div>
-            </div>
-
-            {/* Primary Body */}
-            <div className="h-full flex flex-col w-full justify-between pt-4 overflow-y-hidden ">
-              <div className="h-auto md:sidebar-items md:dark:sidebar-items">
-                <div
-                  style={{ height: "calc(100vw-3rem)" }}
-                  className=" flex flex-col gap-y-4 pb-8 overflow-y-scroll no-scroll"
-                >
-                  <Option
-                    href={paths.settings.system()}
-                    btnText="System Preferences"
-                    icon={<SquaresFour className="h-5 w-5 flex-shrink-0" />}
-                    user={user}
-                    allowedRole={["admin", "manager"]}
-                  />
-                  <Option
-                    href={paths.settings.invites()}
-                    btnText="Invitation"
-                    icon={<EnvelopeSimple className="h-5 w-5 flex-shrink-0" />}
-                    user={user}
-                    allowedRole={["admin", "manager"]}
-                  />
-                  <Option
-                    href={paths.settings.users()}
-                    btnText="Users"
-                    icon={<Users className="h-5 w-5 flex-shrink-0" />}
-                    user={user}
-                    allowedRole={["admin", "manager"]}
-                  />
-                  <Option
-                    href={paths.settings.workspaces()}
-                    btnText="Workspaces"
-                    icon={<BookOpen className="h-5 w-5 flex-shrink-0" />}
-                    user={user}
-                    allowedRole={["admin", "manager"]}
-                  />
-                  <Option
-                    href={paths.settings.chats()}
-                    btnText="Workspace Chat"
-                    icon={
-                      <ChatCenteredText className="h-5 w-5 flex-shrink-0" />
-                    }
-                    user={user}
-                    flex={true}
-                    allowedRole={["admin", "manager"]}
-                  />
-                  <Option
-                    href={paths.settings.appearance()}
-                    btnText="Appearance"
-                    icon={<Eye className="h-5 w-5 flex-shrink-0" />}
-                    user={user}
-                    flex={true}
-                    allowedRole={["admin", "manager"]}
-                  />
-                  <Option
-                    href={paths.settings.apiKeys()}
-                    btnText="API Keys"
-                    icon={<Key className="h-5 w-5 flex-shrink-0" />}
-                    user={user}
-                    flex={true}
-                    allowedRole={["admin"]}
-                  />
-                  <Option
-                    href={paths.settings.llmPreference()}
-                    btnText="LLM Preference"
-                    icon={<ChatText className="h-5 w-5 flex-shrink-0" />}
-                    user={user}
-                    flex={true}
-                    allowedRole={["admin"]}
-                  />
-                  <Option
-                    href={paths.settings.embeddingPreference()}
-                    btnText="Embedding Preference"
-                    icon={<FileCode className="h-5 w-5 flex-shrink-0" />}
-                    user={user}
-                    flex={true}
-                    allowedRole={["admin"]}
-                  />
-                  <Option
-                    href={paths.settings.vectorDatabase()}
-                    btnText="Vector Database"
-                    icon={<Database className="h-5 w-5 flex-shrink-0" />}
-                    user={user}
-                    flex={true}
-                    allowedRole={["admin"]}
-                  />
-                  <Option
-                    href={paths.settings.dataConnectors.list()}
-                    btnText="Data Connectors"
-                    icon={<Plugs className="h-5 w-5 flex-shrink-0" />}
-                    user={user}
-                    flex={true}
-                    allowedRole={["admin", "manager"]}
-                  />
-                  <Option
-                    href={paths.settings.embedSetup()}
-                    childLinks={[paths.settings.embedChats()]}
-                    btnText="Embedded Chat"
-                    icon={<CodeBlock className="h-5 w-5 flex-shrink-0" />}
-                    user={user}
-                    flex={true}
-                    allowedRole={["admin"]}
-                    subOptions={
-                      <>
-                        <Option
-                          href={paths.settings.embedChats()}
-                          btnText="Embedded Chat History"
-                          icon={<Barcode className="h-5 w-5 flex-shrink-0" />}
-                          user={user}
-                          flex={true}
-                          allowedRole={["admin"]}
-                        />
-                      </>
-                    }
-                  />
-                  <Option
-                    href={paths.settings.security()}
-                    btnText="Security"
-                    icon={<Lock className="h-5 w-5 flex-shrink-0" />}
-                    user={user}
-                    flex={true}
-                    allowedRole={["admin", "manager"]}
-                  />
-                  <Option
-                    href={paths.settings.logs()}
-                    btnText="Events Logs"
-                    icon={<Notepad className="h-5 w-5 flex-shrink-0" />}
-                    user={user}
-                    flex={true}
-                    allowedRole={["admin"]}
-                  />
-                </div>
-              </div>
-              <div>
-                {/* Footer */}
-                <div className="flex justify-center mt-2">
-                  <div className="flex space-x-4">
-                    <a
-                      href={paths.github()}
-                      className="transition-all duration-300 p-2 rounded-full text-white bg-sidebar-button hover:bg-menu-item-selected-gradient hover:border-slate-100 hover:border-opacity-50 border-transparent border"
-                    >
-                      <GithubLogo weight="fill" className="h-5 w-5 " />
-                    </a>
-                    <a
-                      href={paths.docs()}
-                      className="transition-all duration-300 p-2 rounded-full text-white bg-sidebar-button hover:bg-menu-item-selected-gradient hover:border-slate-100 hover:border-opacity-50 border-transparent border"
-                    >
-                      <BookOpen weight="fill" className="h-5 w-5 " />
-                    </a>
-                    <a
-                      href={paths.discord()}
-                      className="transition-all duration-300 p-2 rounded-full text-white bg-sidebar-button hover:bg-menu-item-selected-gradient hover:border-slate-100 hover:border-opacity-50 border-transparent border"
-                    >
-                      <DiscordLogo
-                        weight="fill"
-                        className="h-5 w-5 stroke-slate-200 group-hover:stroke-slate-200"
-                      />
-                    </a>
-                    {/* <button className="invisible transition-all duration-300 p-2 rounded-full text-white bg-sidebar-button hover:bg-menu-item-selected-gradient hover:border-slate-100 hover:border-opacity-50 border-transparent border">
-                    <DotsThree className="h-5 w-5 group-hover:stroke-slate-200" />
-                  </button> */}
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </>
-  );
-}
-
-const Option = ({
-  btnText,
-  icon,
-  href,
-  childLinks = [],
-  flex = false,
-  user = null,
-  allowedRole = [],
-  subOptions = null,
-}) => {
-  const hasActiveChild = childLinks.includes(window.location.pathname);
-  const isActive = window.location.pathname === href;
-
-  // Option only for multi-user
-  if (!flex && !allowedRole.includes(user?.role)) return null;
-
-  // Option is dual-mode, but user exists, we need to check permissions
-  if (flex && !!user && !allowedRole.includes(user?.role)) return null;
-  return (
-    <>
-      <div className="flex gap-x-2 items-center justify-between text-white">
-        <a
-          href={href}
-          className={`
-          transition-all duration-[200ms]
-          flex flex-grow w-[75%] h-[36px] gap-x-2 py-[5px] px-4 rounded justify-start items-center border
-          ${
-            isActive
-              ? "bg-menu-item-selected-gradient border-slate-100 border-opacity-50 font-medium"
-              : "hover:bg-menu-item-selected-gradient hover:border-slate-100 hover:border-opacity-50 border-transparent"
-          }
-        `}
-        >
-          {React.cloneElement(icon, { weight: isActive ? "fill" : "regular" })}
-          <p className="text-sm leading-loose text-opacity-60 whitespace-nowrap overflow-hidden ">
-            {btnText}
-          </p>
-        </a>
-      </div>
-      {!!subOptions && (isActive || hasActiveChild) && (
-        <div
-          className={`ml-4 ${
-            hasActiveChild ? "" : "border-l-2 border-slate-400"
-          } rounded-r-lg`}
-        >
-          {subOptions}
-        </div>
-      )}
-    </>
-  );
-};

frontend/src/pages/Admin/Invitations/index.jsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import Sidebar, { SidebarMobileHeader } from "@/components/SettingsSidebar";
+import Sidebar from "@/components/SettingsSidebar";
 import { isMobile } from "react-device-detect";
 import * as Skeleton from "react-loading-skeleton";
 import "react-loading-skeleton/dist/skeleton.css";
@@ -15,12 +15,11 @@ export default function AdminInvites() {
   const { isOpen, openModal, closeModal } = useModal();
   return (
     <div className="w-screen h-screen overflow-hidden bg-sidebar flex">
-      {!isMobile && <Sidebar />}
+      <Sidebar />
       <div
         style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
         className="transition-all duration-500 relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[26px] bg-main-gradient w-full h-full overflow-y-scroll border-4 border-accent"
       >
-        {isMobile && <SidebarMobileHeader />}
         <div className="flex flex-col w-full px-1 md:px-20 md:py-12 py-16">
           <div className="w-full flex flex-col gap-y-1 pb-6 border-white border-b-2 border-opacity-10">
             <div className="items-center flex gap-x-4">

frontend/src/pages/Admin/Logging/index.jsx

@@ -1,4 +1,4 @@
-import Sidebar, { SidebarMobileHeader } from "@/components/SettingsSidebar";
+import Sidebar from "@/components/SettingsSidebar";
 import useQuery from "@/hooks/useQuery";
 import System from "@/models/system";
 import { useEffect, useState } from "react";
@@ -27,12 +27,11 @@ export default function AdminLogs() {
   };
   return (
     <div className="w-screen h-screen overflow-hidden bg-sidebar flex">
-      {!isMobile && <Sidebar />}
+      <Sidebar />
       <div
         style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
         className="transition-all duration-500 relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[26px] bg-main-gradient w-full h-full overflow-y-scroll border-4 border-accent"
       >
-        {isMobile && <SidebarMobileHeader />}
         <div className="flex flex-col w-full px-1 md:px-20 md:py-12 py-16">
           <div className="w-full flex flex-col gap-y-1 pb-6 border-white border-b-2 border-opacity-10">
             <div className="items-center flex gap-x-4">

frontend/src/pages/Admin/System/index.jsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import Sidebar, { SidebarMobileHeader } from "@/components/SettingsSidebar";
+import Sidebar from "@/components/SettingsSidebar";
 import { isMobile } from "react-device-detect";
 import Admin from "@/models/admin";
 import showToast from "@/utils/toast";
@@ -40,12 +40,11 @@ export default function AdminSystem() {
 
   return (
     <div className="w-screen h-screen overflow-hidden bg-sidebar flex">
-      {!isMobile && <Sidebar />}
+      <Sidebar />
       <div
         style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
         className="transition-all duration-500 relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[26px] bg-main-gradient w-full h-full overflow-y-scroll border-4 border-accent"
       >
-        {isMobile && <SidebarMobileHeader />}
         <form
           onSubmit={handleSubmit}
           onChange={() => setHasChanges(true)}

frontend/src/pages/Admin/Users/index.jsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import Sidebar, { SidebarMobileHeader } from "@/components/SettingsSidebar";
+import Sidebar from "@/components/SettingsSidebar";
 import { isMobile } from "react-device-detect";
 import * as Skeleton from "react-loading-skeleton";
 import "react-loading-skeleton/dist/skeleton.css";
@@ -15,12 +15,11 @@ export default function AdminUsers() {
   const { isOpen, openModal, closeModal } = useModal();
   return (
     <div className="w-screen h-screen overflow-hidden bg-sidebar flex">
-      {!isMobile && <Sidebar />}
+      <Sidebar />
       <div
         style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
         className="transition-all duration-500 relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[26px] bg-main-gradient w-full h-full overflow-y-scroll border-4 border-accent"
       >
-        {isMobile && <SidebarMobileHeader />}
         <div className="flex flex-col w-full px-1 md:px-20 md:py-12 py-16">
           <div className="w-full flex flex-col gap-y-1 pb-6 border-white border-b-2 border-opacity-10">
             <div className="items-center flex gap-x-4">

frontend/src/pages/Admin/Workspaces/index.jsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import Sidebar, { SidebarMobileHeader } from "@/components/SettingsSidebar";
+import Sidebar from "@/components/SettingsSidebar";
 import { isMobile } from "react-device-detect";
 import * as Skeleton from "react-loading-skeleton";
 import "react-loading-skeleton/dist/skeleton.css";
@@ -15,12 +15,11 @@ export default function AdminWorkspaces() {
   const { isOpen, openModal, closeModal } = useModal();
   return (
     <div className="w-screen h-screen overflow-hidden bg-sidebar flex">
-      {!isMobile && <Sidebar />}
+      <Sidebar />
       <div
         style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
         className="transition-all duration-500 relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[26px] bg-main-gradient w-full h-full overflow-y-scroll border-4 border-accent"
       >
-        {isMobile && <SidebarMobileHeader />}
         <div className="flex flex-col w-full px-1 md:px-20 md:py-12 py-16">
           <div className="w-full flex flex-col gap-y-1 pb-6 border-white border-b-2 border-opacity-10">
             <div className="items-center flex gap-x-4">

frontend/src/pages/GeneralSettings/ApiKeys/index.jsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import Sidebar, { SidebarMobileHeader } from "@/components/SettingsSidebar";
+import Sidebar from "@/components/SettingsSidebar";
 import { isMobile } from "react-device-detect";
 import * as Skeleton from "react-loading-skeleton";
 import "react-loading-skeleton/dist/skeleton.css";
@@ -17,12 +17,11 @@ export default function AdminApiKeys() {
   const { isOpen, openModal, closeModal } = useModal();
   return (
     <div className="w-screen h-screen overflow-hidden bg-sidebar flex">
-      {!isMobile && <Sidebar />}
+      <Sidebar />
       <div
         style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
         className="transition-all duration-500 relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[26px] bg-main-gradient w-full h-full overflow-y-scroll border-4 border-accent"
       >
-        {isMobile && <SidebarMobileHeader />}
         <div className="flex flex-col w-full px-1 md:px-20 md:py-12 py-16">
           <div className="w-full flex flex-col gap-y-1 pb-6 border-white border-b-2 border-opacity-10">
             <div className="items-center flex gap-x-4">

frontend/src/pages/GeneralSettings/Appearance/index.jsx

@@ -1,7 +1,6 @@
 import React, { useState, useEffect } from "react";
-import Sidebar, { SidebarMobileHeader } from "@/components/SettingsSidebar";
+import Sidebar from "@/components/SettingsSidebar";
 import { isMobile } from "react-device-detect";
-import Admin from "@/models/admin";
 import AnythingLLM from "@/media/logo/anything-llm.png";
 import useLogo from "@/hooks/useLogo";
 import System from "@/models/system";
@@ -114,12 +113,11 @@ export default function Appearance() {
 
   return (
     <div className="w-screen h-screen overflow-hidden bg-sidebar flex">
-      {!isMobile && <Sidebar />}
+      <Sidebar />
       <div
         style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
         className="transition-all duration-500 relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[26px] bg-main-gradient w-full h-full overflow-y-scroll border-4 border-accent"
       >
-        {isMobile && <SidebarMobileHeader />}
         <div className="flex flex-col w-full px-1 md:px-20 md:py-12 py-16">
           <div className="w-full flex flex-col gap-y-1 pb-6 border-white border-b-2 border-opacity-10">
             <div className="items-center flex gap-x-4">

frontend/src/pages/GeneralSettings/Chats/index.jsx

@@ -1,5 +1,5 @@
 import { useEffect, useRef, useState } from "react";
-import Sidebar, { SidebarMobileHeader } from "@/components/SettingsSidebar";
+import Sidebar from "@/components/SettingsSidebar";
 import { isMobile } from "react-device-detect";
 import * as Skeleton from "react-loading-skeleton";
 import "react-loading-skeleton/dist/skeleton.css";
@@ -63,12 +63,11 @@ export default function WorkspaceChats() {
 
   return (
     <div className="w-screen h-screen overflow-hidden bg-sidebar flex">
-      {!isMobile && <Sidebar />}
+      <Sidebar />
       <div
         style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
         className="transition-all duration-500 relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[26px] bg-main-gradient w-full h-full overflow-y-scroll border-4 border-accent"
       >
-        {isMobile && <SidebarMobileHeader />}
         <div className="flex flex-col w-full px-1 md:px-20 md:py-12 py-16">
           <div className="w-full flex flex-col gap-y-1 pb-6 border-white border-b-2 border-opacity-10">
             <div className="items-center flex gap-x-4">

frontend/src/pages/GeneralSettings/DataConnectors/Connectors/Github/index.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-import Sidebar, { SidebarMobileHeader } from "@/components/SettingsSidebar";
+import Sidebar from "@/components/SettingsSidebar";
 import { isMobile } from "react-device-detect";
 import { DATA_CONNECTORS } from "@/components/DataConnectorOption";
 import System from "@/models/system";
@@ -64,12 +64,11 @@ export default function GithubConnectorSetup() {
 
   return (
     <div className="w-screen h-screen overflow-hidden bg-sidebar flex">
-      {!isMobile && <Sidebar />}
+      <Sidebar />
       <div
         style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
         className="relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[26px] bg-main-gradient w-full h-full overflow-y-scroll border-4 border-accent"
       >
-        {isMobile && <SidebarMobileHeader />}
         <div className="flex w-full">
           <div className="flex flex-col w-full px-1 md:px-20 md:py-12 py-16">
             <div className="flex w-full gap-x-4 items-center  pb-6 border-white border-b-2 border-opacity-10">

frontend/src/pages/GeneralSettings/DataConnectors/Connectors/Youtube/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import Sidebar, { SidebarMobileHeader } from "@/components/SettingsSidebar";
+import Sidebar from "@/components/SettingsSidebar";
 import { isMobile } from "react-device-detect";
 import { DATA_CONNECTORS } from "@/components/DataConnectorOption";
 import System from "@/models/system";
@@ -45,12 +45,11 @@ export default function YouTubeTranscriptConnectorSetup() {
 
   return (
     <div className="w-screen h-screen overflow-hidden bg-sidebar flex">
-      {!isMobile && <Sidebar />}
+      <Sidebar />
       <div
         style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
         className="relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[26px] bg-main-gradient w-full h-full overflow-y-scroll border-4 border-accent"
       >
-        {isMobile && <SidebarMobileHeader />}
         <div className="flex w-full">
           <div className="flex flex-col w-full px-1 md:px-20 md:py-12 py-16">
             <div className="flex w-full gap-x-4 items-center  pb-6 border-white border-b-2 border-opacity-10">

frontend/src/pages/GeneralSettings/DataConnectors/index.jsx

@@ -1,17 +1,16 @@
 import React from "react";
-import Sidebar, { SidebarMobileHeader } from "@/components/SettingsSidebar";
+import Sidebar from "@/components/SettingsSidebar";
 import { isMobile } from "react-device-detect";
 import DataConnectorOption from "@/components/DataConnectorOption";
 
 export default function DataConnectors() {
   return (
     <div className="w-screen h-screen overflow-hidden bg-sidebar flex">
-      {!isMobile && <Sidebar />}
+      <Sidebar />
       <div
         style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
         className="relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[26px] bg-main-gradient w-full h-full overflow-y-scroll border-4 border-accent"
       >
-        {isMobile && <SidebarMobileHeader />}
         <div className="flex w-full">
           <div className="flex flex-col w-full px-1 md:px-20 md:py-12 py-16">
             <div className="w-full flex flex-col gap-y-1 pb-6 border-white border-b-2 border-opacity-10">

frontend/src/pages/GeneralSettings/EmbedChats/index.jsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import Sidebar, { SidebarMobileHeader } from "@/components/SettingsSidebar";
+import Sidebar from "@/components/SettingsSidebar";
 import { isMobile } from "react-device-detect";
 import * as Skeleton from "react-loading-skeleton";
 import "react-loading-skeleton/dist/skeleton.css";
@@ -11,12 +11,11 @@ export default function EmbedChats() {
   // TODO [FEAT]: Add export of embed chats
   return (
     <div className="w-screen h-screen overflow-hidden bg-sidebar flex">
-      {!isMobile && <Sidebar />}
+      <Sidebar />
       <div
         style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
         className="transition-all duration-500 relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[26px] bg-main-gradient w-full h-full overflow-y-scroll border-4 border-accent"
       >
-        {isMobile && <SidebarMobileHeader />}
         <div className="flex flex-col w-full px-1 md:px-20 md:py-12 py-16">
           <div className="w-full flex flex-col gap-y-1 pb-6 border-white border-b-2 border-opacity-10">
             <div className="items-center flex gap-x-4">

frontend/src/pages/GeneralSettings/EmbedConfigs/index.jsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import Sidebar, { SidebarMobileHeader } from "@/components/SettingsSidebar";
+import Sidebar from "@/components/SettingsSidebar";
 import { isMobile } from "react-device-detect";
 import * as Skeleton from "react-loading-skeleton";
 import "react-loading-skeleton/dist/skeleton.css";
@@ -14,12 +14,11 @@ export default function EmbedConfigs() {
   const { isOpen, openModal, closeModal } = useModal();
   return (
     <div className="w-screen h-screen overflow-hidden bg-sidebar flex">
-      {!isMobile && <Sidebar />}
+      <Sidebar />
       <div
         style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
         className="transition-all duration-500 relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[26px] bg-main-gradient w-full h-full overflow-y-scroll border-4 border-accent"
       >
-        {isMobile && <SidebarMobileHeader />}
         <div className="flex flex-col w-full px-1 md:px-20 md:py-12 py-16">
           <div className="w-full flex flex-col gap-y-1 pb-6 border-white border-b-2 border-opacity-10">
             <div className="items-center flex gap-x-4">

frontend/src/pages/GeneralSettings/EmbeddingPreference/index.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-import Sidebar, { SidebarMobileHeader } from "@/components/SettingsSidebar";
+import Sidebar from "@/components/SettingsSidebar";
 import { isMobile } from "react-device-detect";
 import System from "@/models/system";
 import showToast from "@/utils/toast";
@@ -126,7 +126,7 @@ export default function GeneralEmbeddingPreference() {
           onConfirm={handleSaveSettings}
         />
       </ModalWrapper>
-      {!isMobile && <Sidebar />}
+      <Sidebar />
       {loading ? (
         <div
           style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
@@ -141,7 +141,6 @@ export default function GeneralEmbeddingPreference() {
           style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
           className="relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[26px] bg-main-gradient w-full h-full overflow-y-scroll border-4 border-accent"
         >
-          {isMobile && <SidebarMobileHeader />}
           <form
             id="embedding-form"
             onSubmit={handleSubmit}

frontend/src/pages/GeneralSettings/LLMPreference/index.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-import Sidebar, { SidebarMobileHeader } from "@/components/SettingsSidebar";
+import Sidebar from "@/components/SettingsSidebar";
 import { isMobile } from "react-device-detect";
 import System from "@/models/system";
 import showToast from "@/utils/toast";
@@ -165,7 +165,7 @@ export default function GeneralLLMPreference() {
 
   return (
     <div className="w-screen h-screen overflow-hidden bg-sidebar flex">
-      {!isMobile && <Sidebar />}
+      <Sidebar />
       {loading ? (
         <div
           style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
@@ -180,7 +180,6 @@ export default function GeneralLLMPreference() {
           style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
           className="relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[26px] bg-main-gradient w-full h-full overflow-y-scroll border-4 border-accent"
         >
-          {isMobile && <SidebarMobileHeader />}
           <form onSubmit={handleSubmit} className="flex w-full">
             <div className="flex flex-col w-full px-1 md:px-20 md:py-12 py-16">
               <div className="w-full flex flex-col gap-y-1 pb-6 border-white border-b-2 border-opacity-10">

frontend/src/pages/GeneralSettings/Security/index.jsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import Sidebar, { SidebarMobileHeader } from "@/components/SettingsSidebar";
+import Sidebar from "@/components/SettingsSidebar";
 import { isMobile } from "react-device-detect";
 import showToast from "@/utils/toast";
 import System from "@/models/system";
@@ -10,12 +10,11 @@ import PreLoader from "@/components/Preloader";
 export default function GeneralSecurity() {
   return (
     <div className="w-screen h-screen overflow-hidden bg-sidebar flex">
-      {!isMobile && <Sidebar />}
+      <Sidebar />
       <div
         style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
         className="transition-all duration-500 relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[26px] bg-main-gradient w-full h-full overflow-y-scroll border-4 border-accent"
       >
-        {isMobile && <SidebarMobileHeader />}
         <MultiUserMode />
         <PasswordProtection />
       </div>

frontend/src/pages/GeneralSettings/VectorDatabase/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from "react";
-import Sidebar, { SidebarMobileHeader } from "@/components/SettingsSidebar";
+import Sidebar from "@/components/SettingsSidebar";
 import { isMobile } from "react-device-detect";
 import System from "@/models/system";
 import showToast from "@/utils/toast";
@@ -161,7 +161,7 @@ export default function GeneralVectorDatabase() {
           onConfirm={handleSaveSettings}
         />
       </ModalWrapper>
-      {!isMobile && <Sidebar />}
+      <Sidebar />
       {loading ? (
         <div
           style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
@@ -176,7 +176,6 @@ export default function GeneralVectorDatabase() {
           style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
           className="transition-all duration-500 relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[26px] bg-main-gradient w-full h-full overflow-y-scroll border-4 border-accent"
         >
-          {isMobile && <SidebarMobileHeader />}
           <form
             id="vectordb-form"
             onSubmit={handleSubmit}