From 5ec8c4b5f2948cde5f96e5fa59c86295f242dc9f Mon Sep 17 00:00:00 2001 From: kangfenmao Date: Wed, 4 Sep 2024 13:26:51 +0800 Subject: [PATCH] wip --- .../src/assets/fonts/icon-fonts/iconfont.css | 6 +- .../assets/fonts/icon-fonts/iconfont.woff2 | Bin 2740 -> 2836 bytes src/renderer/src/i18n/index.ts | 2 + src/renderer/src/pages/home/Assistants.tsx | 6 +- src/renderer/src/pages/home/HomePage.tsx | 63 ++++++++---------- src/renderer/src/pages/home/Topics.tsx | 5 +- .../src/pages/settings/GeneralSettings.tsx | 7 +- 7 files changed, 40 insertions(+), 49 deletions(-) diff --git a/src/renderer/src/assets/fonts/icon-fonts/iconfont.css b/src/renderer/src/assets/fonts/icon-fonts/iconfont.css index f9b26b3283..6319f34107 100644 --- a/src/renderer/src/assets/fonts/icon-fonts/iconfont.css +++ b/src/renderer/src/assets/fonts/icon-fonts/iconfont.css @@ -1,6 +1,6 @@ @font-face { font-family: 'iconfont'; /* Project id 4563475 */ - src: url('iconfont.woff2?t=1724204739157') format('woff2'); + src: url('iconfont.woff2?t=1725424338696') format('woff2'); } .iconfont { @@ -11,6 +11,10 @@ -moz-osx-font-smoothing: grayscale; } +.icon-inbox:before { + content: '\e869'; +} + .icon-business-smart-assistant:before { content: '\e601'; } diff --git a/src/renderer/src/assets/fonts/icon-fonts/iconfont.woff2 b/src/renderer/src/assets/fonts/icon-fonts/iconfont.woff2 index 8f1731e632cb4378fc4400d3764ceef7119f3b7e..ca971eb62fdec20d687fc5f86737b6c8806c1be5 100644 GIT binary patch literal 2836 zcmV+v3+wcEPew8T0RR9101FfV3jhEB02Ral01C$d0RR9100000000000000000000 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 = ({ onClick={() => onSwitchAssistant(assistant)} className={assistant.id === activeAssistant?.id ? 'active' : ''}> {assistant.name || t('chat.default.name')} - + setShowTopics(true)}> @@ -180,9 +180,6 @@ const AssistantItem = styled.div` opacity: 1; color: var(--color-text-2); } - .name { - font-weight: 500; - } } ` @@ -192,6 +189,7 @@ const AssistantName = styled.div` -webkit-line-clamp: 1; -webkit-box-orient: vertical; overflow: hidden; + font-size: 13px; ` const ArrowRightButton = styled.div` diff --git a/src/renderer/src/pages/home/HomePage.tsx b/src/renderer/src/pages/home/HomePage.tsx index c392aacba3..abde425c53 100644 --- a/src/renderer/src/pages/home/HomePage.tsx +++ b/src/renderer/src/pages/home/HomePage.tsx @@ -1,4 +1,4 @@ -import { ArrowLeftOutlined } from '@ant-design/icons' +import { ArrowLeftOutlined, UnorderedListOutlined } from '@ant-design/icons' import { Navbar, NavbarCenter, NavbarLeft } from '@renderer/components/app/Navbar' import { HStack } from '@renderer/components/Layout' import { isMac, isWindows } from '@renderer/config/constant' @@ -64,17 +64,17 @@ const HomePage: FC = () => { {showAssistants && ( - setShowTopics(false)}> - {showTopics && } - {showTopics ? t('common.back') : t('common.chat')} - + setShowTopics(!showTopics)} className="back-button"> + {showTopics ? : } + {showTopics ? t('common.assistant') : t('chat.topics.title')} + )} + style={{ justifyContent: 'space-between', paddingLeft: isMac ? 16 : 8, paddingRight: isWindows ? 135 : 12 }}> {activeAssistant?.name || t('chat.default.name')} @@ -118,45 +118,20 @@ const ContentContainer = styled.div` background-color: var(--color-background); ` -const NavigtaionBack = styled.div` - display: flex; - flex-direction: row; - align-items: center; - justify-content: flex-start; - gap: 10px; - margin-left: ${isMac ? '10px' : 0}; - -webkit-app-region: none; - transition: all 0.2s ease-in-out; - transition: opacity 0.2s ease-in-out; - padding: 3px 8px; - border-radius: 6px; - &.back { - cursor: pointer; - &:hover { - background-color: var(--color-background-mute); - color: var(--color-text-1); - } - } -` - -const NavigationBackTitle = styled.div` - font-size: 14px; - font-weight: 800; - font-family: Ubuntu; -` - const AssistantName = styled.span` margin-left: 5px; margin-right: 10px; font-family: Ubuntu; - font-weight: 800; + font-size: 13px; + font-weight: 500; ` export const NewButton = styled.div` -webkit-app-region: none; border-radius: 4px; - width: 30px; + padding: 0 5px; height: 30px; + gap: 5px; display: flex; flex-direction: row; justify-content: center; @@ -173,6 +148,19 @@ export const NewButton = styled.div` .icon-hidesidebarhoriz { font-size: 17px; } + &.back-button { + margin-left: ${isMac ? '8px' : 0}; + .anticon { + font-size: 16px; + } + .anticon-arrow-left { + font-size: 14px; + } + &:hover { + background-color: var(--color-background-mute); + color: var(--color-icon-white); + } + } &:hover { background-color: var(--color-background-mute); cursor: pointer; @@ -180,6 +168,11 @@ export const NewButton = styled.div` } ` +const BackText = styled.span` + font-size: 12px; + font-weight: 400; +` + const ThemeSwitch = styled(Switch)` -webkit-app-region: none; margin-right: 10px; diff --git a/src/renderer/src/pages/home/Topics.tsx b/src/renderer/src/pages/home/Topics.tsx index b48b850e48..217ba219e4 100644 --- a/src/renderer/src/pages/home/Topics.tsx +++ b/src/renderer/src/pages/home/Topics.tsx @@ -109,7 +109,7 @@ const Topics: FC = ({ assistant: _assistant, activeTopic, setActiveTopic )} - {assistant.topics.length > 20 && ( + {assistant.topics.length > 10 && (