From 08e3dab0e7a8832b7fc66602cd8e23e1b3284fd3 Mon Sep 17 00:00:00 2001 From: Scenery <1507337624@qq.com> Date: Wed, 24 Apr 2024 10:42:55 +0800 Subject: [PATCH 1/2] feat: remove link button --- .../src/components/BlackButton/index.tsx | 4 +- apps/agent/src/components/EmailCode/index.tsx | 14 ++---- .../agent/src/components/LinkButton/index.tsx | 46 ------------------- .../src/page/User/Login/mobile/index.tsx | 13 ++---- apps/agent/src/page/User/Login/pc/index.tsx | 13 +++--- .../src/page/User/Register/mobile/index.tsx | 6 +-- .../agent/src/page/User/Register/pc/index.tsx | 9 ++-- 7 files changed, 23 insertions(+), 82 deletions(-) delete mode 100644 apps/agent/src/components/LinkButton/index.tsx diff --git a/apps/agent/src/components/BlackButton/index.tsx b/apps/agent/src/components/BlackButton/index.tsx index 4389bb73..70327745 100644 --- a/apps/agent/src/components/BlackButton/index.tsx +++ b/apps/agent/src/components/BlackButton/index.tsx @@ -3,10 +3,10 @@ import { FC } from "react" import BlackButtonTheme from "@/config/them/theme-blackButton.json" const BlackButton: FC = (props) => { - const { children, ...antdButtonProps } = props + const { children, type = "primary", ...antdButtonProps } = props return ( - diff --git a/apps/agent/src/components/EmailCode/index.tsx b/apps/agent/src/components/EmailCode/index.tsx index ee7db8c2..63c0cf31 100644 --- a/apps/agent/src/components/EmailCode/index.tsx +++ b/apps/agent/src/components/EmailCode/index.tsx @@ -1,9 +1,8 @@ -import { App, Statistic } from "antd" +import { App, Statistic, Typography } from "antd" import { FC } from "react" import { useFormContext } from "react-hook-form" import { useTranslation } from "react-i18next" import { getColor } from "@illa-public/color-scheme" -import LinkButton from "../LinkButton" import { EmailCodeProps } from "./interface" const { Countdown } = Statistic @@ -49,15 +48,8 @@ export const EmailCode: FC = (props) => { }} /> ) : ( - + {t("page.user.sign_up.actions.send")} - + ) } diff --git a/apps/agent/src/components/LinkButton/index.tsx b/apps/agent/src/components/LinkButton/index.tsx deleted file mode 100644 index c1e360aa..00000000 --- a/apps/agent/src/components/LinkButton/index.tsx +++ /dev/null @@ -1,46 +0,0 @@ -import { Button, ConfigProvider } from "antd" -import { AnchorHTMLAttributes, CSSProperties, FC, ReactNode } from "react" - -interface LinkButtonProps { - children?: string | ReactNode - style?: CSSProperties - onClick?: () => void - href?: string - fontSize?: number - target?: AnchorHTMLAttributes["target"] -} - -const LinkButton: FC = ({ - children, - style, - onClick, - href, - fontSize = 12, - target = "_self", -}) => { - return ( - - - - ) -} - -export default LinkButton diff --git a/apps/agent/src/page/User/Login/mobile/index.tsx b/apps/agent/src/page/User/Login/mobile/index.tsx index fbd527f6..c514be3e 100644 --- a/apps/agent/src/page/User/Login/mobile/index.tsx +++ b/apps/agent/src/page/User/Login/mobile/index.tsx @@ -1,5 +1,5 @@ import Icon from "@ant-design/icons" -import { Button, Input } from "antd" +import { Button, Input, Typography } from "antd" import { FC, useEffect, useState } from "react" import { Controller, useFormContext } from "react-hook-form" import { Trans, useTranslation } from "react-i18next" @@ -7,7 +7,6 @@ import { useNavigate } from "react-router-dom" import { GithubIcon } from "@illa-public/icon" import { TipisTrack } from "@illa-public/track-utils" import ErrorMessage from "@/components/InputErrorMessage" -import LinkButton from "@/components/LinkButton" import { FORGOT_PASSWORD_PATH, REGISTER_PATH } from "@/utils/routeHelper" import { OAuthButton } from "../../components/OAuthButton" import { CAN_SHOW_OAUTH, EMAIL_FORMAT } from "../../constants" @@ -83,11 +82,7 @@ export const MobileLogin: FC = (props) => { i18nKey="page.user.sign_in.description.register" t={t} components={[ - , @@ -178,14 +173,14 @@ export const MobileLogin: FC = (props) => {
- {t("page.user.sign_in.description.forgot_password")} - +