From 51f2385b75fe9d013e15e70a18f41455eb0cddbd Mon Sep 17 00:00:00 2001
From: Jing Hua <tohjinghua123@gmail.com>
Date: Fri, 7 Apr 2023 17:52:03 +0800
Subject: [PATCH] style: compact new folder

---
 src/components/Menu/ChatHistoryList.tsx | 2 --
 src/components/Menu/Menu.tsx            | 6 +++++-
 src/components/Menu/NewChat.tsx         | 2 +-
 src/components/Menu/NewFolder.tsx       | 5 +----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/components/Menu/ChatHistoryList.tsx b/src/components/Menu/ChatHistoryList.tsx
index 4502cd0..42a9757 100644
--- a/src/components/Menu/ChatHistoryList.tsx
+++ b/src/components/Menu/ChatHistoryList.tsx
@@ -2,7 +2,6 @@ import React, { useEffect, useRef, useState } from 'react';
 import useStore from '@store/store';
 import { shallow } from 'zustand/shallow';
 
-import NewFolder from './NewFolder';
 import ChatFolder from './ChatFolder';
 import ChatHistory from './ChatHistory';
 import ChatSearch from './ChatSearch';
@@ -164,7 +163,6 @@ const ChatHistoryList = () => {
       onDragLeave={handleDragLeave}
       onDragEnd={handleDragEnd}
     >
-      <NewFolder />
       <ChatSearch filter={filter} setFilter={setFilter} />
       <div className='flex flex-col gap-2 text-gray-100 text-sm'>
         {Object.keys(chatFolders).map((folderId) => (
diff --git a/src/components/Menu/Menu.tsx b/src/components/Menu/Menu.tsx
index 70ceb5d..d808368 100644
--- a/src/components/Menu/Menu.tsx
+++ b/src/components/Menu/Menu.tsx
@@ -3,6 +3,7 @@ import React, { useEffect, useRef } from 'react';
 import useStore from '@store/store';
 
 import NewChat from './NewChat';
+import NewFolder from './NewFolder';
 import ChatHistoryList from './ChatHistoryList';
 import MenuOptions from './MenuOptions';
 
@@ -38,7 +39,10 @@ const Menu = () => {
         <div className='flex h-full min-h-0 flex-col'>
           <div className='flex h-full w-full flex-1 items-start border-white/20'>
             <nav className='flex h-full flex-1 flex-col space-y-1 px-2 pt-2'>
-              <NewChat />
+              <div className='flex gap-2'>
+                <NewChat />
+                <NewFolder />
+              </div>
               <ChatHistoryList />
               <MenuOptions />
             </nav>
diff --git a/src/components/Menu/NewChat.tsx b/src/components/Menu/NewChat.tsx
index 4d1b2ef..6b903d8 100644
--- a/src/components/Menu/NewChat.tsx
+++ b/src/components/Menu/NewChat.tsx
@@ -13,7 +13,7 @@ const NewChat = ({ folder }: { folder?: string }) => {
 
   return (
     <a
-      className={`flex items-center max-md:hidden rounded-md hover:bg-gray-500/10 transition-all duration-200 text-white text-sm flex-shrink-0 ${
+      className={`flex flex-1 items-center max-md:hidden rounded-md hover:bg-gray-500/10 transition-all duration-200 text-white text-sm flex-shrink-0 ${
         generating
           ? 'cursor-not-allowed opacity-40'
           : 'cursor-pointer opacity-100'
diff --git a/src/components/Menu/NewFolder.tsx b/src/components/Menu/NewFolder.tsx
index c23be96..748ce07 100644
--- a/src/components/Menu/NewFolder.tsx
+++ b/src/components/Menu/NewFolder.tsx
@@ -52,10 +52,7 @@ const NewFolder = () => {
         if (!generating) addFolder();
       }}
     >
-      <NewFolderIcon />{' '}
-      <span className='hidden md:inline-flex text-white text-sm'>
-        {t('newFolder')}
-      </span>
+      <NewFolderIcon />
     </a>
   );
 };