diff --git a/web/public/locales/zh-CN/translation.json b/web/public/locales/zh-CN/translation.json
index fe7211b334..de17c9f77b 100644
--- a/web/public/locales/zh-CN/translation.json
+++ b/web/public/locales/zh-CN/translation.json
@@ -168,5 +168,6 @@
"Total": "总数",
"Page": "页",
"NoData": "当前无数据",
- "Logout": "退出登录"
-}
\ No newline at end of file
+ "Logout": "退出登录",
+ "SaveAndRestart": "保存并重启"
+}
diff --git a/web/public/logo.png b/web/public/logo.png
index 523a73cfaa..834e9d9f11 100644
Binary files a/web/public/logo.png and b/web/public/logo.png differ
diff --git a/web/src/apis/typing.d.ts b/web/src/apis/typing.d.ts
index 29c703087a..e839a57f28 100644
--- a/web/src/apis/typing.d.ts
+++ b/web/src/apis/typing.d.ts
@@ -220,3 +220,25 @@ export interface TLogItem {
data: string;
created_at: string;
}
+
+// user data
+export interface TUserInfo {
+ id: string;
+ username: string;
+ email: any;
+ phone: any;
+ createdAt: string;
+ updatedAt: string;
+ profile: TProfile;
+}
+
+export interface TProfile {
+ id: string;
+ uid: string;
+ openid: string;
+ from: string;
+ avatar: string;
+ name: string;
+ createdAt: string;
+ updatedAt: string;
+}
diff --git a/web/src/chakraTheme.ts b/web/src/chakraTheme.ts
index a903755615..d0fbf11a87 100644
--- a/web/src/chakraTheme.ts
+++ b/web/src/chakraTheme.ts
@@ -63,15 +63,7 @@ const Button = defineStyleConfig({
},
variants: {
- plain: {
- bg: "gray.200",
- color: "gray.500",
- _hover: {
- bg: "gray.300",
- },
- },
-
- solid: {
+ primary: {
bg: "primary.500",
color: "white",
_hover: {
@@ -79,24 +71,33 @@ const Button = defineStyleConfig({
},
},
- ghost: {
+ secondary: {
color: "primary.500",
- borderRadius: 2,
+ bg: "primary.100",
+ _hover: {
+ bg: "primary.200",
+ },
+ },
+
+ plain: {
+ bg: "gray.200",
+ color: "gray.500",
_hover: {
- bg: "primary.500",
- color: "white",
- borderRadius: 2,
+ bg: "gray.300",
},
},
- grayGhost: {
- color: "#000",
+ text: {
+ color: "primary.500",
+ _hover: {
+ bg: "primary.100",
+ },
},
},
// The default size and variant values
defaultProps: {
size: "md",
- variant: "solid",
+ variant: "primary",
},
});
diff --git a/web/src/components/EditableTable/index.tsx b/web/src/components/EditableTable/index.tsx
index 3d1ccd7f4d..464a7e34a0 100644
--- a/web/src/components/EditableTable/index.tsx
+++ b/web/src/components/EditableTable/index.tsx
@@ -133,7 +133,6 @@ const EditableTable = function (props: {
}
style={{ borderTopLeftRadius: 0, borderTopRightRadius: 0 }}
- size="m"
px="6"
className="h-10"
onClick={handleAdd}
diff --git a/web/src/components/Panel/index.module.scss b/web/src/components/Panel/index.module.scss
index 101260a7d2..807d6a4c25 100644
--- a/web/src/components/Panel/index.module.scss
+++ b/web/src/components/Panel/index.module.scss
@@ -1,22 +1,21 @@
.sectionHeader {
- min-height: 36px;
+ min-height: 50px;
display: flex;
align-items: center;
h4 {
- padding-left: 16px;
+ padding-left: 14px;
font-weight: 500;
font-size: 14px;
position: relative;
&::before {
content: " ";
- height: 10px;
+ height: 15px;
position: absolute;
left: 0;
- top: 2px;
+ top: 3px;
width: 3px;
- height: 16px;
background: #00a99d;
border-radius: 24px;
}
diff --git a/web/src/layouts/Header/UserSetting/index.tsx b/web/src/layouts/Header/UserSetting/index.tsx
index 65ff51e2aa..682ddbc763 100644
--- a/web/src/layouts/Header/UserSetting/index.tsx
+++ b/web/src/layouts/Header/UserSetting/index.tsx
@@ -1,15 +1,22 @@
-import { Menu, MenuButton, MenuItem, MenuList } from "@chakra-ui/react";
+import { Avatar, Menu, MenuButton, MenuItem, MenuList } from "@chakra-ui/react";
import { t } from "i18next";
import SettingModal from "@/pages/app/setting";
import PATList from "@/pages/app/setting/PATList";
-export default function UserSetting(props: { avatar: string; width: number }) {
+export default function UserSetting(props: { name: string; avatar?: string; width: string }) {
return (