From 8e1473c3d801e01f9180129186285090cfd33c8d Mon Sep 17 00:00:00 2001
From: David <42793498+dncc89@users.noreply.github.com>
Date: Tue, 4 Jul 2023 05:26:00 +0900
Subject: [PATCH] feature: ChatGPT style show/hide panel button, panel state
 saving in local storage (#575)

* Add nav bar state saving to local storage

* Add ChatGPT style hide side panel button
---
 client/src/components/Nav/NewChat.jsx |  2 +-
 client/src/components/Nav/index.jsx   | 56 ++++++++++++++-------------
 client/src/components/svg/Panel.jsx   |  8 ++--
 client/src/mobile.css                 | 14 +++++--
 client/src/routes/Root.jsx            | 25 ++++++++----
 5 files changed, 61 insertions(+), 44 deletions(-)

diff --git a/client/src/components/Nav/NewChat.jsx b/client/src/components/Nav/NewChat.jsx
index 811ff1528c..5effd970a5 100644
--- a/client/src/components/Nav/NewChat.jsx
+++ b/client/src/components/Nav/NewChat.jsx
@@ -13,7 +13,7 @@ export default function NewChat() {
   return (
     <a
       onClick={clickHandler}
-      className="mb-2 flex flex-shrink-0 cursor-pointer items-center gap-3 rounded-md border border-white/20 px-3 py-3 text-sm text-white transition-colors duration-200 hover:bg-gray-500/10"
+      className="mb-2 flex flex-grow flex-shrink-0 cursor-pointer items-center gap-3 rounded-md border border-white/20 px-3 py-3 text-sm text-white transition-colors duration-200 hover:bg-gray-500/10"
     >
       <svg
         stroke="currentColor"
diff --git a/client/src/components/Nav/index.jsx b/client/src/components/Nav/index.jsx
index a5320e2f08..aa78502824 100644
--- a/client/src/components/Nav/index.jsx
+++ b/client/src/components/Nav/index.jsx
@@ -1,18 +1,19 @@
 /* eslint-disable react-hooks/exhaustive-deps */
-import { useState, useEffect, useRef, useContext, useCallback } from 'react';
-import NewChat from './NewChat';
-import Panel from '../svg/Panel';
-import Spinner from '../svg/Spinner';
-import Pages from '../Conversations/Pages';
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { useGetConversationsQuery, useSearchQuery } from '~/data-provider';
+import { useRecoilValue, useSetRecoilState } from 'recoil';
+
 import Conversations from '../Conversations';
 import NavLinks from './NavLinks';
-import { useRecoilValue, useSetRecoilState } from 'recoil';
-import { useGetConversationsQuery, useSearchQuery } from '~/data-provider';
-import useDebounce from '~/hooks/useDebounce';
+import NewChat from './NewChat';
+import Pages from '../Conversations/Pages';
+import Panel from '../svg/Panel';
+import Spinner from '../svg/Spinner';
+// import { ThemeContext } from '~/hooks/ThemeContext';
+import { cn } from '~/utils/';
 import store from '~/store';
 import { useAuthContext } from '~/hooks/AuthContext';
-import { ThemeContext } from '~/hooks/ThemeContext';
-import { cn } from '~/utils/';
+import useDebounce from '~/hooks/useDebounce';
 
 // import resolveConfig from 'tailwindcss/resolveConfig';
 // const tailwindConfig = import('../../../tailwind.config.cjs');
@@ -37,7 +38,7 @@ import { cn } from '~/utils/';
 export default function Nav({ navVisible, setNavVisible }) {
   const [isHovering, setIsHovering] = useState(false);
   const { isAuthenticated } = useAuthContext();
-  const { theme, } = useContext(ThemeContext);
+  // const { theme, } = useContext(ThemeContext);
   const containerRef = useRef(null);
   const scrollPositionRef = useRef(null);
 
@@ -165,8 +166,6 @@ export default function Nav({ navVisible, setNavVisible }) {
   useEffect(() => {
     if (isMobile()) {
       setNavVisible(false);
-    } else {
-      setNavVisible(true);
     }
   }, [conversationId, setNavVisible]);
 
@@ -181,10 +180,19 @@ export default function Nav({ navVisible, setNavVisible }) {
         <div className="flex h-full min-h-0 flex-col ">
           <div className="scrollbar-trigger relative flex h-full w-full flex-1 items-start border-white/20">
             <nav className="relative flex h-full flex-1 flex-col space-y-1 p-2">
-              <NewChat />
+              <div className='flex flex-row'>
+                <NewChat />
+                <button
+                  type='button'
+                  className={cn('nav-close-button inline-flex h-11 w-11 border border-white/20 items-center justify-center rounded-md text-white hover:bg-gray-500/10')}
+                  onClick={toggleNavVisible}
+                >
+                  <span className='sr-only'>Close sidebar</span>
+                  <Panel open={false} />
+                </button>
+              </div>
               <div
-                className={`flex-1 flex-col overflow-y-auto ${
-                  isHovering ? '' : 'scrollbar-transparent'
+                className={`flex-1 flex-col overflow-y-auto ${isHovering ? '' : 'scrollbar-transparent'
                 } border-b border-white/20`}
                 onMouseEnter={() => setIsHovering(true)}
                 onMouseLeave={() => setIsHovering(false)}
@@ -212,23 +220,17 @@ export default function Nav({ navVisible, setNavVisible }) {
             </nav>
           </div>
         </div>
-        <button
-          type="button"
-          className={cn('nav-close-button -ml-0.5 -mt-2.5 inline-flex h-10 w-10 items-center justify-center rounded-md focus:outline-none focus:ring-white md:-ml-1 md:-mt-2.5', theme === 'dark' ? 'text-gray-500 hover:text-gray-400' : 'text-gray-400 hover:text-gray-500')}
-          onClick={toggleNavVisible}
-        >
-          <span className="sr-only">Close sidebar</span>
-          <Panel/>
-        </button>
       </div>
       {!navVisible && (
         <button
           type="button"
-          className="nav-open-button fixed left-2 top-0.5 z-10 inline-flex h-10 w-10 items-center justify-center rounded-md text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-white dark:text-gray-500 dark:hover:text-gray-400"
+          className="nav-open-button mt-1 fixed left-2 top-0.5 z-10 inline-flex h-10 w-10 items-center justify-center rounded-md border text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-white dark:text-gray-500 dark:hover:text-gray-400"
           onClick={toggleNavVisible}
         >
-          <span className="sr-only">Open sidebar</span>
-          <Panel open={true}/>
+          <div className="flex items-center justify-center">
+            <span className="sr-only">Open sidebar</span>
+            <Panel open={true} />
+          </div>
         </button>
       )}
 
diff --git a/client/src/components/svg/Panel.jsx b/client/src/components/svg/Panel.jsx
index c82a2ec461..561ea5ed39 100644
--- a/client/src/components/svg/Panel.jsx
+++ b/client/src/components/svg/Panel.jsx
@@ -4,8 +4,8 @@ export default function Panel({ open = false, className }) {
   const openPanel = (
     <svg
       xmlns="http://www.w3.org/2000/svg"
-      width="24"
-      height="24"
+      width="20"
+      height="20"
       viewBox="0 0 24 24"
       fill="none"
       stroke="currentColor"
@@ -23,8 +23,8 @@ export default function Panel({ open = false, className }) {
   const closePanel = (
     <svg
       xmlns="http://www.w3.org/2000/svg"
-      width="24"
-      height="24"
+      width="20"
+      height="20"
       viewBox="0 0 24 24"
       fill="none"
       stroke="currentColor"
diff --git a/client/src/mobile.css b/client/src/mobile.css
index c1f62da4e6..5786b1a575 100644
--- a/client/src/mobile.css
+++ b/client/src/mobile.css
@@ -3,12 +3,13 @@
   visibility: visible;
 }
 
-.nav-close-button {
+.nav-open-button {
   display: block;
   position: absolute;
-  left: 100%;
-  top: 12px;
-  margin-left: 20px;
+}
+
+.nav-close-button {
+  margin-left: 10px;
 }
 
 .nav {
@@ -107,4 +108,9 @@
 
   .input-panel {
   }
+
+  .nav-open-button
+  {
+    visibility: hidden;
+  }
 }
diff --git a/client/src/routes/Root.jsx b/client/src/routes/Root.jsx
index 717a2b6873..902fd8e2b7 100644
--- a/client/src/routes/Root.jsx
+++ b/client/src/routes/Root.jsx
@@ -1,19 +1,24 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import { useEffect, useState } from 'react';
-import { Outlet } from 'react-router-dom';
-import MessageHandler from '../components/MessageHandler';
-import Nav from '../components/Nav';
-import MobileNav from '../components/Nav/MobileNav';
 import {
-  useGetSearchEnabledQuery,
   useGetEndpointsQuery,
-  useGetPresetsQuery
+  useGetPresetsQuery,
+  useGetSearchEnabledQuery
 } from '~/data-provider';
+
+import MessageHandler from '../components/MessageHandler';
+import MobileNav from '../components/Nav/MobileNav';
+import Nav from '../components/Nav';
+import { Outlet } from 'react-router-dom';
 import store from '~/store';
-import { useSetRecoilState } from 'recoil';
 import { useAuthContext } from '~/hooks/AuthContext';
+import { useSetRecoilState } from 'recoil';
+
 export default function Root() {
-  const [navVisible, setNavVisible] = useState(false);
+  const [navVisible, setNavVisible] = useState(() => {
+    const savedNavVisible = localStorage.getItem('navVisible');
+    return savedNavVisible !== null ? JSON.parse(savedNavVisible) : false;
+  });
 
   const setIsSearchEnabled = useSetRecoilState(store.isSearchEnabled);
   const setEndpointsConfig = useSetRecoilState(store.endpointsConfig);
@@ -24,6 +29,10 @@ export default function Root() {
   const endpointsQuery = useGetEndpointsQuery();
   const presetsQuery = useGetPresetsQuery({ enabled: !!user });
 
+  useEffect(() => {
+    localStorage.setItem('navVisible', JSON.stringify(navVisible));
+  }, [navVisible]);
+
   useEffect(() => {
     if (endpointsQuery.data) {
       setEndpointsConfig(endpointsQuery.data);