labring · maslow · Mar 24, 2023 · Mar 20, 2023 · Mar 21, 2023 · Mar 21, 2023
diff --git a/web/src/chakraThemeDark.ts b/web/src/chakraThemeDark.ts
@@ -106,6 +106,16 @@ const Button = defineStyleConfig({
       },
     },
 
+    thirdly: {
+      color: "lafDark.1000",
+      bg: "lafDark.300",
+      _hover: {
+        bg: "lafDark.400",
+      },
+      border: "1px solid",
+      rounded: "md",
+    },
+
     plain: {
       bg: "grayModern.100",
       color: "grayModern.500",

diff --git a/web/src/layouts/Auth/index.module.scss b/web/src/layouts/Auth/index.module.scss
@@ -9,3 +9,27 @@
   background-position: left bottom;
   background-size: 60%;
 }
+
+.welcomeWrap {
+  position: absolute;
+  top: 120px;
+  left: 120px;
+}
+
+.welcomeText {
+  font-family: 'PingFang SC';
+  font-style: normal;
+  font-weight: 500;
+  font-size: 36px;
+  // line-height: 20px;
+  color: #00A99D;
+}
+
+.sloganText {
+  font-family: 'PingFang SC';
+  font-style: normal;
+  font-weight: 400;
+  font-size: 20px;
+  // line-height: 20px;
+  color: #787A90;
+}
diff --git a/web/src/layouts/Auth/index.tsx b/web/src/layouts/Auth/index.tsx
@@ -6,6 +6,10 @@ import styles from "./index.module.scss";
 export default function LoginReg() {
   return (
     <div className={clsx(styles.container)}>
+      <div className={styles.welcomeWrap}>
+        <div className={styles.welcomeText}>Welcome to laf !</div>
+        <div className={styles.sloganText}>life is short, you need laf.</div>
+      </div>
       <Outlet />
     </div>
   );

diff --git a/web/src/layouts/Header/UserSetting/index.tsx b/web/src/layouts/Header/UserSetting/index.tsx
@@ -1,7 +1,7 @@
 import { useTranslation } from "react-i18next";
+import { useNavigate } from "react-router-dom";
 import { Avatar, Menu, MenuButton, MenuItem, MenuList, useColorMode } from "@chakra-ui/react";
 
-import { VITE_SERVER_BASE_URL } from "@/constants";
 import i18n from "@/utils/i18n";
 
 import SettingModal, { TabKeys } from "@/pages/app/setting";
@@ -10,6 +10,7 @@ import UserInfo from "@/pages/app/setting/UserInfo";
 export default function UserSetting(props: { name: string; avatar?: string; width: string }) {
   const { t } = useTranslation();
   const { toggleColorMode } = useColorMode();
+  const navigate = useNavigate();
   return (
     <Menu>
       <MenuButton>
@@ -65,7 +66,7 @@ export default function UserSetting(props: { name: string; avatar?: string; widt
         <MenuItem
           onClick={() => {
             localStorage.clear();
-            (window as any).location.href = (VITE_SERVER_BASE_URL + "/login") as string;
+            navigate("/login", { replace: true });
           }}
         >
           {t("Logout")}

diff --git a/web/src/layouts/LoginReg.tsx b/web/src/layouts/LoginReg.tsx