From be788f461942a90f2e477d8401d59d9daa0b872a Mon Sep 17 00:00:00 2001 From: moonrailgun Date: Thu, 16 Sep 2021 20:19:27 +0800 Subject: [PATCH] =?UTF-8?q?refactor(web):=20=E4=BA=AE=E8=89=B2=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E9=83=A8=E5=88=86=E9=85=8D=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/components/FullModal/index.tsx | 7 +++++-- web/src/components/PillTabs.less | 6 +++--- web/src/components/SidebarView.tsx | 4 ++-- .../components/modals/SettingsView/System.tsx | 18 ++++++++++++++++-- .../Main/Content/Personal/Friends/index.tsx | 12 ++++++++++-- .../routes/Main/Content/Personal/Sidebar.tsx | 14 ++++++++------ web/src/routes/Main/Content/SidebarItem.tsx | 7 +++++-- web/src/routes/Main/Navbar/NavItem.tsx | 2 +- 8 files changed, 50 insertions(+), 20 deletions(-) diff --git a/web/src/components/FullModal/index.tsx b/web/src/components/FullModal/index.tsx index 7087524d..442ddf59 100644 --- a/web/src/components/FullModal/index.tsx +++ b/web/src/components/FullModal/index.tsx @@ -34,7 +34,7 @@ export const FullModal: React.FC = React.memo((props) => { return (
= React.memo((props) => { className="absolute right-8 top-8 cursor-pointer flex flex-col" onClick={handleClose} > - + ESC
)} diff --git a/web/src/components/PillTabs.less b/web/src/components/PillTabs.less index 6e7c4fdf..90fc5991 100644 --- a/web/src/components/PillTabs.less +++ b/web/src/components/PillTabs.less @@ -1,5 +1,5 @@ .pill-tabs.ant-tabs.ant-tabs-card { - @apply text-gray-100; + @apply text-gray-900 dark:text-gray-100; .ant-tabs-nav { @apply px-2 py-3 m-0 text-base; @@ -12,7 +12,7 @@ border: 0; margin: 2px; padding: 2px 8px; - @apply text-gray-200 bg-opacity-0 bg-white; + @apply text-gray-800 dark:text-gray-200 bg-opacity-0 bg-black dark:bg-white; &.ant-tabs-tab-active, &:hover, @@ -20,7 +20,7 @@ @apply rounded bg-opacity-20; .ant-tabs-tab-btn { - @apply text-white; + @apply text-black dark:text-white ; } } } diff --git a/web/src/components/SidebarView.tsx b/web/src/components/SidebarView.tsx index df37e86d..263774ad 100644 --- a/web/src/components/SidebarView.tsx +++ b/web/src/components/SidebarView.tsx @@ -33,9 +33,9 @@ const SidebarViewMenuItemTitle: React.FC<{ }> = (props) => (
{ const { language, setLanguage } = useLanguage(); + const { darkMode, setDarkMode } = useDarkMode(); const handleChangeLanguage = useCallback( (newLang: string) => { @@ -31,6 +33,18 @@ export const SettingsSystem: React.FC = React.memo(() => { } /> + + + setDarkMode(checked)} + /> + } + /> +
); }); diff --git a/web/src/routes/Main/Content/Personal/Friends/index.tsx b/web/src/routes/Main/Content/Personal/Friends/index.tsx index 6413021b..980895db 100644 --- a/web/src/routes/Main/Content/Personal/Friends/index.tsx +++ b/web/src/routes/Main/Content/Personal/Friends/index.tsx @@ -25,7 +25,11 @@ export const FriendPanel: React.FC = React.memo(() => { + {t('已发送')} } @@ -35,7 +39,11 @@ export const FriendPanel: React.FC = React.memo(() => { + {t('待处理')} } diff --git a/web/src/routes/Main/Content/Personal/Sidebar.tsx b/web/src/routes/Main/Content/Personal/Sidebar.tsx index e1d11d63..0920b460 100644 --- a/web/src/routes/Main/Content/Personal/Sidebar.tsx +++ b/web/src/routes/Main/Content/Personal/Sidebar.tsx @@ -1,15 +1,15 @@ import React from 'react'; import { Icon } from '@iconify/react'; import { SidebarItem } from '../SidebarItem'; -import { useDMConverseList } from 'tailchat-shared'; +import { t, useDMConverseList } from 'tailchat-shared'; import { SidebarDMItem } from './SidebarDMItem'; const SidebarSection: React.FC<{ action: React.ReactNode; }> = React.memo((props) => { return ( -
- +
+ {props.children}
@@ -29,17 +29,19 @@ export const Sidebar: React.FC = React.memo(() => { return (
} to="/main/personal/friends" /> } to="/main/personal/plugins" /> - }>私信 + }> + {t('私信')} + {converseList.map((converse) => { return ; diff --git a/web/src/routes/Main/Content/SidebarItem.tsx b/web/src/routes/Main/Content/SidebarItem.tsx index d0ad91de..bf19a50f 100644 --- a/web/src/routes/Main/Content/SidebarItem.tsx +++ b/web/src/routes/Main/Content/SidebarItem.tsx @@ -21,7 +21,7 @@ export const SidebarItem: React.FC = React.memo((props) => {
= React.memo((props) => { )}
- + {name} diff --git a/web/src/routes/Main/Navbar/NavItem.tsx b/web/src/routes/Main/Navbar/NavItem.tsx index 3e32379e..e4ed3791 100644 --- a/web/src/routes/Main/Navbar/NavItem.tsx +++ b/web/src/routes/Main/Navbar/NavItem.tsx @@ -51,7 +51,7 @@ export const NavbarNavItem: React.FC<{ >