From dc19ddfa10f33193ee827ef4cb2ca1f16688efa9 Mon Sep 17 00:00:00 2001
From: shatfield4 <seanhatfield5@gmail.com>
Date: Tue, 6 Feb 2024 14:31:14 -0800
Subject: [PATCH 1/3] hide security setting in settings sidebar when in
 multiusermode

---
 .../src/components/SettingsSidebar/index.jsx  | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/SettingsSidebar/index.jsx b/frontend/src/components/SettingsSidebar/index.jsx
index 2eba84a9d1d..139c4a7b4a1 100644
--- a/frontend/src/components/SettingsSidebar/index.jsx
+++ b/frontend/src/components/SettingsSidebar/index.jsx
@@ -24,11 +24,21 @@ import {
 } from "@phosphor-icons/react";
 import useUser from "@/hooks/useUser";
 import { USER_BACKGROUND_COLOR } from "@/utils/constants";
+import System from "@/models/system";
 
 export default function SettingsSidebar() {
   const { logo } = useLogo();
   const sidebarRef = useRef(null);
   const { user } = useUser();
+  const [multiUserModeEnabled, setMultiUserModeEnabled] = useState(false);
+
+  useEffect(() => {
+    async function fetchIsMultiUserMode() {
+      const multiUserModeEnabled = await System.isMultiUserMode();
+      setMultiUserModeEnabled(multiUserModeEnabled);
+    }
+    fetchIsMultiUserMode();
+  }, []);
 
   return (
     <>
@@ -169,14 +179,16 @@ export default function SettingsSidebar() {
                     </>
                   }
                 />
-                <Option
-                  href={paths.settings.security()}
-                  btnText="Security"
-                  icon={<Lock className="h-5 w-5 flex-shrink-0" />}
-                  user={user}
-                  flex={true}
-                  allowedRole={["admin", "manager"]}
-                />
+                {!multiUserModeEnabled && (
+                  <Option
+                    href={paths.settings.security()}
+                    btnText="Security"
+                    icon={<Lock className="h-5 w-5 flex-shrink-0" />}
+                    user={user}
+                    flex={true}
+                    allowedRole={["admin", "manager"]}
+                  />
+                )}
               </div>
             </div>
             <div>

From c28eb74ae726c9cc930b70e2fd999c3b7d4e123c Mon Sep 17 00:00:00 2001
From: shatfield4 <seanhatfield5@gmail.com>
Date: Tue, 6 Feb 2024 17:02:06 -0800
Subject: [PATCH 2/3] refactor sidebar to handle mobile view inside
 SettingsSidebar component

---
 .../src/components/SettingsSidebar/index.jsx  | 608 +++++++-----------
 .../src/pages/Admin/Invitations/index.jsx     |   5 +-
 frontend/src/pages/Admin/System/index.jsx     |   5 +-
 frontend/src/pages/Admin/Users/index.jsx      |   5 +-
 frontend/src/pages/Admin/Workspaces/index.jsx |   5 +-
 .../pages/GeneralSettings/ApiKeys/index.jsx   |   5 +-
 .../GeneralSettings/Appearance/index.jsx      |   6 +-
 .../src/pages/GeneralSettings/Chats/index.jsx |   5 +-
 .../Connectors/Github/index.jsx               |   5 +-
 .../Connectors/Youtube/index.jsx              |   5 +-
 .../GeneralSettings/DataConnectors/index.jsx  |   5 +-
 .../GeneralSettings/EmbedChats/index.jsx      |   5 +-
 .../GeneralSettings/EmbedConfigs/index.jsx    |   5 +-
 .../EmbeddingPreference/index.jsx             |   5 +-
 .../GeneralSettings/LLMPreference/index.jsx   |   5 +-
 .../pages/GeneralSettings/Security/index.jsx  |   5 +-
 .../GeneralSettings/VectorDatabase/index.jsx  |   5 +-
 17 files changed, 277 insertions(+), 412 deletions(-)

diff --git a/frontend/src/components/SettingsSidebar/index.jsx b/frontend/src/components/SettingsSidebar/index.jsx
index 139c4a7b4a1..666992cd30d 100644
--- a/frontend/src/components/SettingsSidebar/index.jsx
+++ b/frontend/src/components/SettingsSidebar/index.jsx
@@ -24,21 +24,135 @@ import {
 } from "@phosphor-icons/react";
 import useUser from "@/hooks/useUser";
 import { USER_BACKGROUND_COLOR } from "@/utils/constants";
-import System from "@/models/system";
+import { isMobile } from "react-device-detect";
 
 export default function SettingsSidebar() {
   const { logo } = useLogo();
   const sidebarRef = useRef(null);
   const { user } = useUser();
-  const [multiUserModeEnabled, setMultiUserModeEnabled] = useState(false);
+  const [showSidebar, setShowSidebar] = useState(false);
+  const [showBgOverlay, setShowBgOverlay] = useState(false);
 
   useEffect(() => {
-    async function fetchIsMultiUserMode() {
-      const multiUserModeEnabled = await System.isMultiUserMode();
-      setMultiUserModeEnabled(multiUserModeEnabled);
+    function handleBg() {
+      if (showSidebar) {
+        setTimeout(() => {
+          setShowBgOverlay(true);
+        }, 300);
+      } else {
+        setShowBgOverlay(false);
+      }
     }
-    fetchIsMultiUserMode();
-  }, []);
+    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
+                    style={{ height: "calc(100vw - -3rem)" }}
+                    className=" flex flex-col gap-y-4 pb-8 overflow-y-scroll no-scroll"
+                  >
+                    <SidebarOptions user={user} />
+                  </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>
+      </>
+    );
+  }
 
   return (
     <>
@@ -73,122 +187,9 @@ export default function SettingsSidebar() {
           {/* Primary Body */}
           <div className="h-[100%] flex flex-col w-full justify-between pt-4 overflow-y-hidden">
             <div className="h-auto sidebar-items">
+              {/* Options */}
               <div className="flex flex-col gap-y-2 h-[65vh] 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"]}
-                      />
-                    </>
-                  }
-                />
-                {!multiUserModeEnabled && (
-                  <Option
-                    href={paths.settings.security()}
-                    btnText="Security"
-                    icon={<Lock className="h-5 w-5 flex-shrink-0" />}
-                    user={user}
-                    flex={true}
-                    allowedRole={["admin", "manager"]}
-                  />
-                )}
+                <SidebarOptions user={user} />
               </div>
             </div>
             <div>
@@ -229,247 +230,6 @@ export default function SettingsSidebar() {
   );
 }
 
-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"]}
-                  />
-                </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,
@@ -479,6 +239,7 @@ const Option = ({
   user = null,
   allowedRole = [],
   subOptions = null,
+  hidden = false,
 }) => {
   const hasActiveChild = childLinks.includes(window.location.pathname);
   const isActive = window.location.pathname === href;
@@ -488,6 +249,8 @@ const Option = ({
 
   // Option is dual-mode, but user exists, we need to check permissions
   if (flex && !!user && !allowedRole.includes(user?.role)) return null;
+
+  if (hidden) return null;
   return (
     <>
       <div className="flex gap-x-2 items-center justify-between text-white">
@@ -521,3 +284,122 @@ const Option = ({
     </>
   );
 };
+
+const SidebarOptions = ({ user = null }) => (
+  <>
+    <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"]}
+      hidden={user?.role}
+    />
+  </>
+);
diff --git a/frontend/src/pages/Admin/Invitations/index.jsx b/frontend/src/pages/Admin/Invitations/index.jsx
index 94b07f33009..a4a99e93be4 100644
--- a/frontend/src/pages/Admin/Invitations/index.jsx
+++ b/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">
diff --git a/frontend/src/pages/Admin/System/index.jsx b/frontend/src/pages/Admin/System/index.jsx
index c4c1b9ebdde..90940886539 100644
--- a/frontend/src/pages/Admin/System/index.jsx
+++ b/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)}
diff --git a/frontend/src/pages/Admin/Users/index.jsx b/frontend/src/pages/Admin/Users/index.jsx
index 7c969948310..a5c6ba9c5cc 100644
--- a/frontend/src/pages/Admin/Users/index.jsx
+++ b/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">
diff --git a/frontend/src/pages/Admin/Workspaces/index.jsx b/frontend/src/pages/Admin/Workspaces/index.jsx
index 8ca7410b0de..62a28094bb4 100644
--- a/frontend/src/pages/Admin/Workspaces/index.jsx
+++ b/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">
diff --git a/frontend/src/pages/GeneralSettings/ApiKeys/index.jsx b/frontend/src/pages/GeneralSettings/ApiKeys/index.jsx
index bf4ac51ef78..9ba3335f56d 100644
--- a/frontend/src/pages/GeneralSettings/ApiKeys/index.jsx
+++ b/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">
diff --git a/frontend/src/pages/GeneralSettings/Appearance/index.jsx b/frontend/src/pages/GeneralSettings/Appearance/index.jsx
index 7a992e916f7..a2a9ec00104 100644
--- a/frontend/src/pages/GeneralSettings/Appearance/index.jsx
+++ b/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">
diff --git a/frontend/src/pages/GeneralSettings/Chats/index.jsx b/frontend/src/pages/GeneralSettings/Chats/index.jsx
index 336aadccea3..f705d18c948 100644
--- a/frontend/src/pages/GeneralSettings/Chats/index.jsx
+++ b/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">
diff --git a/frontend/src/pages/GeneralSettings/DataConnectors/Connectors/Github/index.jsx b/frontend/src/pages/GeneralSettings/DataConnectors/Connectors/Github/index.jsx
index fdcc8cb5746..1385cdb1ed5 100644
--- a/frontend/src/pages/GeneralSettings/DataConnectors/Connectors/Github/index.jsx
+++ b/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">
diff --git a/frontend/src/pages/GeneralSettings/DataConnectors/Connectors/Youtube/index.jsx b/frontend/src/pages/GeneralSettings/DataConnectors/Connectors/Youtube/index.jsx
index 5252e3fd20e..021eeaf98cd 100644
--- a/frontend/src/pages/GeneralSettings/DataConnectors/Connectors/Youtube/index.jsx
+++ b/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">
diff --git a/frontend/src/pages/GeneralSettings/DataConnectors/index.jsx b/frontend/src/pages/GeneralSettings/DataConnectors/index.jsx
index 50f4298ed48..e3bfa642a59 100644
--- a/frontend/src/pages/GeneralSettings/DataConnectors/index.jsx
+++ b/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">
diff --git a/frontend/src/pages/GeneralSettings/EmbedChats/index.jsx b/frontend/src/pages/GeneralSettings/EmbedChats/index.jsx
index 6b84b3fde48..23c5bf189e5 100644
--- a/frontend/src/pages/GeneralSettings/EmbedChats/index.jsx
+++ b/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">
diff --git a/frontend/src/pages/GeneralSettings/EmbedConfigs/index.jsx b/frontend/src/pages/GeneralSettings/EmbedConfigs/index.jsx
index ccd12b7f137..4257b029f8e 100644
--- a/frontend/src/pages/GeneralSettings/EmbedConfigs/index.jsx
+++ b/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">
diff --git a/frontend/src/pages/GeneralSettings/EmbeddingPreference/index.jsx b/frontend/src/pages/GeneralSettings/EmbeddingPreference/index.jsx
index c6c62fef7b0..c4900cf64c7 100644
--- a/frontend/src/pages/GeneralSettings/EmbeddingPreference/index.jsx
+++ b/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}
diff --git a/frontend/src/pages/GeneralSettings/LLMPreference/index.jsx b/frontend/src/pages/GeneralSettings/LLMPreference/index.jsx
index ac9ab71f8b9..45ad5fd70ad 100644
--- a/frontend/src/pages/GeneralSettings/LLMPreference/index.jsx
+++ b/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">
diff --git a/frontend/src/pages/GeneralSettings/Security/index.jsx b/frontend/src/pages/GeneralSettings/Security/index.jsx
index 4c4cfc0a7d5..e09315d16ee 100644
--- a/frontend/src/pages/GeneralSettings/Security/index.jsx
+++ b/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>
diff --git a/frontend/src/pages/GeneralSettings/VectorDatabase/index.jsx b/frontend/src/pages/GeneralSettings/VectorDatabase/index.jsx
index dd43fda5703..32de0709d3e 100644
--- a/frontend/src/pages/GeneralSettings/VectorDatabase/index.jsx
+++ b/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}

From 91f89406a155d54fefdafbe5292c818e492424ae Mon Sep 17 00:00:00 2001
From: timothycarambat <rambat1010@gmail.com>
Date: Tue, 6 Feb 2024 17:22:51 -0800
Subject: [PATCH 3/3] forgot eventlogs on sidebar move footer on settingSidebar
 to component

---
 .../src/components/SettingsSidebar/index.jsx  | 115 ++++++++----------
 frontend/src/pages/Admin/Logging/index.jsx    |   5 +-
 2 files changed, 51 insertions(+), 69 deletions(-)

diff --git a/frontend/src/components/SettingsSidebar/index.jsx b/frontend/src/components/SettingsSidebar/index.jsx
index 33b5fb5cdbc..13c4abeabe9 100644
--- a/frontend/src/components/SettingsSidebar/index.jsx
+++ b/frontend/src/components/SettingsSidebar/index.jsx
@@ -29,8 +29,8 @@ 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);
 
@@ -109,43 +109,12 @@ export default function SettingsSidebar() {
               {/* 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"
-                  >
+                  <div className=" flex flex-col gap-y-4 pb-8 overflow-y-scroll no-scroll">
                     <SidebarOptions user={user} />
                   </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>
+                  <Footer />
                 </div>
               </div>
             </div>
@@ -186,43 +155,15 @@ 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">
               {/* Options */}
-              <div className="flex flex-col gap-y-2 h-[65vh] pb-8 overflow-y-scroll no-scroll">
+              <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 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>
+              <Footer />
             </div>
           </div>
         </div>
@@ -231,6 +172,39 @@ export default function SettingsSidebar() {
   );
 }
 
+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,
@@ -242,6 +216,8 @@ const Option = ({
   subOptions = null,
   hidden = false,
 }) => {
+  if (hidden) return null;
+
   const hasActiveChild = childLinks.includes(window.location.pathname);
   const isActive = window.location.pathname === href;
 
@@ -251,7 +227,6 @@ const Option = ({
   // Option is dual-mode, but user exists, we need to check permissions
   if (flex && !!user && !allowedRole.includes(user?.role)) return null;
 
-  if (hidden) return null;
   return (
     <>
       <div className="flex gap-x-2 items-center justify-between text-white">
@@ -402,5 +377,13 @@ const SidebarOptions = ({ user = null }) => (
       allowedRole={["admin", "manager"]}
       hidden={user?.role}
     />
+    <Option
+      href={paths.settings.logs()}
+      btnText="Event Logs"
+      icon={<Notepad className="h-5 w-5 flex-shrink-0" />}
+      user={user}
+      flex={true}
+      allowedRole={["admin"]}
+    />
   </>
 );
diff --git a/frontend/src/pages/Admin/Logging/index.jsx b/frontend/src/pages/Admin/Logging/index.jsx
index 0219b54a391..246cf211016 100644
--- a/frontend/src/pages/Admin/Logging/index.jsx
+++ b/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">