A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.
feat(ui): unified management welcome
shuai3466da2b0c92
diff --git a/i18n/en_US.yaml b/i18n/en_US.yamlindex f1c6d714..89d480af 100644--- a/i18n/en_US.yaml+++ b/i18n/en_US.yaml@@ -608,7 +608,6 @@ ui:msg:empty: Cannot be empty.login:- page_title: Welcome to {{site_name}}login_to_continue: Log in to continueinfo_sign: Don't have an account? <1>Sign up</1>info_login: Already have an account? <1>Log in</1>@@ -639,7 +638,6 @@ ui:msg:empty: Email cannot be empty.change_email:- page_title: Welcome to Answerbtn_cancel: Cancelbtn_update: Update email addresssend_success: >-@@ -650,7 +648,6 @@ ui:msg:empty: Email cannot be empty.oauth_bind_email:- page_title: Welcome to Answersubtitle: Add a recovery email to your account.btn_update: Update email addressemail:@@ -858,7 +855,6 @@ ui:modal_confirm:title: Error...account_result:- page_title: Welcome to Answersuccess: Your new account is confirmed; you will be redirected to the home page.link: Continue to homepageinvalid: >-@@ -1046,12 +1042,13 @@ ui:login: Loginplugins: Pluginsinstalled_plugins: Installed Plugins+ website_welcome: Welcome to {{site_name}}admin:admin_header:title: Admindashboard:title: Dashboard- welcome: Welcome to Answer Admin!+ welcome: Welcome to {{site_name}} Admin!site_statistics: Site Statisticsquestions: "Questions:"answers: "Answers:"@@ -1383,7 +1380,7 @@ ui:activate: Activatesettings: Settings-+form:empty: cannot be emptyinvalid: is invaliddiff --git a/i18n/zh_CN.yaml b/i18n/zh_CN.yamlindex 126ebefb..08024eac 100644--- a/i18n/zh_CN.yaml+++ b/i18n/zh_CN.yaml@@ -585,7 +585,6 @@ ui:msg:empty: 不能为空login:- page_title: 欢迎来到 Answerinfo_sign: 没有账户?<1>注册</1>info_login: 已经有一个账户?<1>登录</1>agreements: 登录即表示您同意<1>隐私政策</1>和<3>服务条款</3>。@@ -614,7 +613,6 @@ ui:msg:empty: 邮箱不能为空change_email:- page_title: 欢迎来到 Answerbtn_cancel: 取消btn_update: 更新电子邮件地址send_success: >-@@ -803,7 +801,6 @@ ui:modal_confirm:title: 发生错误...account_result:- page_title: 欢迎来到 Answersuccess: 你的账号已通过验证,即将返回首页。link: 返回首页invalid: >-@@ -976,12 +973,13 @@ ui:themes: Themescss-html: CSS/HTMLlogin: Login+ website_welcome: 欢迎来到 {{site_name}}admin:admin_header:title: 后台管理dashboard:title: 后台管理- welcome: 欢迎来到 Answer 后台管理!+ welcome: 欢迎来到 {{site_name}} 后台管理!site_statistics: 站点统计questions: "问题:"answers: "回答:"diff --git a/ui/src/components/Modal/LoginToContinueModal.tsx b/ui/src/components/Modal/LoginToContinueModal.tsxindex e96ad71c..aff4b41a 100644--- a/ui/src/components/Modal/LoginToContinueModal.tsx+++ b/ui/src/components/Modal/LoginToContinueModal.tsx@@ -4,6 +4,7 @@ import { useTranslation } from 'react-i18next';import { Link } from 'react-router-dom';import { loginToContinueStore, siteInfoStore } from '@/stores';+import { WelcomeTitle } from '@/components';interface IProps {visible: boolean;@@ -32,7 +33,7 @@ const Index: React.FC<IProps> = ({ visible = false }) => {</Modal.Header><Modal.Body className="p-5"><div className="d-flex flex-column align-items-center text-center text-body">- <h3>{t('page_title', { site_name: siteInfo.name })}</h3>+ <WelcomeTitle className="mb-2" /><p>{siteInfo.description}</p></div><div className="d-grid gap-2">diff --git a/ui/src/components/WelcomeTitle/index.tsx b/ui/src/components/WelcomeTitle/index.tsxnew file mode 100644index 00000000..47f7771a--- /dev/null+++ b/ui/src/components/WelcomeTitle/index.tsx@@ -0,0 +1,23 @@+import React, { FC, memo } from 'react';+import { useTranslation } from 'react-i18next';++import classnames from 'classnames';++import { siteInfoStore } from '@/stores';++interface Props {+ as?: React.ElementType;+ className?: string;+}++const Index: FC<Props> = ({ as: Component = 'h3', className = 'mb-5' }) => {+ const { t } = useTranslation();+ const { name: siteName } = siteInfoStore((_) => _.siteInfo);+ return (+ <Component className={classnames('text-center', className)}>+ {t('website_welcome', { site_name: siteName })}+ </Component>+ );+};++export default memo(Index);diff --git a/ui/src/components/index.ts b/ui/src/components/index.tsindex 2a475e8b..2696e511 100644--- a/ui/src/components/index.ts+++ b/ui/src/components/index.ts@@ -32,6 +32,7 @@ import CustomizeTheme from './CustomizeTheme';import PageTags from './PageTags';import QuestionListLoader from './QuestionListLoader';import TagsLoader from './TagsLoader';+import WelcomeTitle from './WelcomeTitle';export {Avatar,@@ -70,5 +71,6 @@ export {PageTags,QuestionListLoader,TagsLoader,+ WelcomeTitle,};export type { EditorRef, JSONSchema, UISchema };diff --git a/ui/src/pages/Admin/Dashboard/index.tsx b/ui/src/pages/Admin/Dashboard/index.tsxindex 0b6834f9..e79eaf9f 100644--- a/ui/src/pages/Admin/Dashboard/index.tsx+++ b/ui/src/pages/Admin/Dashboard/index.tsx@@ -2,6 +2,7 @@ import { FC } from 'react';import { Row, Col } from 'react-bootstrap';import { useTranslation } from 'react-i18next';+import { siteInfoStore } from '@/stores';import { useDashBoard } from '@/services';import {@@ -13,6 +14,7 @@ import {const Dashboard: FC = () => {const { t } = useTranslation('translation', { keyPrefix: 'admin.dashboard' });+ const { name: siteName } = siteInfoStore((_) => _.siteInfo);const { data } = useDashBoard();if (!data) {@@ -22,7 +24,7 @@ const Dashboard: FC = () => {return (<><h3 className="text-capitalize">{t('title')}</h3>- <p className="mt-4">{t('welcome')}</p>+ <p className="mt-4">{t('welcome', { site_name: siteName })}</p><Row><Col lg={6}><Statistics data={data.info} />diff --git a/ui/src/pages/Users/ActivationResult/index.tsx b/ui/src/pages/Users/ActivationResult/index.tsxindex 77cdd52b..62f1e8cf 100644--- a/ui/src/pages/Users/ActivationResult/index.tsx+++ b/ui/src/pages/Users/ActivationResult/index.tsx@@ -4,6 +4,7 @@ import { Link, useLocation } from 'react-router-dom';import { useTranslation } from 'react-i18next';import { usePageTags } from '@/hooks';+import { WelcomeTitle } from '@/components';const Index: FC = () => {const { t } = useTranslation('translation', { keyPrefix: 'account_result' });@@ -15,7 +16,7 @@ const Index: FC = () => {<Container className="pt-4 mt-2 mb-5"><Row className="justify-content-center"><Col lg={6}>- <h3 className="text-center mt-3 mb-5">{t('page_title')}</h3>+ <WelcomeTitle className="mt-3 mb-5" />{location.pathname?.includes('success') && (<><p className="text-center">{t('success')}</p>diff --git a/ui/src/pages/Users/ChangeEmail/index.tsx b/ui/src/pages/Users/ChangeEmail/index.tsxindex 33fcd8d3..16235db4 100644--- a/ui/src/pages/Users/ChangeEmail/index.tsx+++ b/ui/src/pages/Users/ChangeEmail/index.tsx@@ -3,6 +3,7 @@ import { Container, Col } from 'react-bootstrap';import { useTranslation } from 'react-i18next';import { usePageTags } from '@/hooks';+import { WelcomeTitle } from '@/components';import SendEmail from './components/sendEmail';@@ -13,7 +14,7 @@ const Index: FC = () => {});return (<Container style={{ paddingTop: '4rem', paddingBottom: '6rem' }}>- <h3 className="text-center mb-5">{t('page_title')}</h3>+ <WelcomeTitle /><Col className="mx-auto" md={3}><SendEmail /></Col>diff --git a/ui/src/pages/Users/Login/index.tsx b/ui/src/pages/Users/Login/index.tsxindex 0b510a3e..4e843bbd 100644--- a/ui/src/pages/Users/Login/index.tsx+++ b/ui/src/pages/Users/Login/index.tsx@@ -11,13 +11,9 @@ import type {ImgCodeRes,FormDataType,} from '@/common/interface';-import { Unactivate } from '@/components';+import { Unactivate, WelcomeTitle } from '@/components';import { PluginOauth } from '@/plugins';-import {- loggedUserInfoStore,- loginSettingStore,- siteInfoStore,-} from '@/stores';+import { loggedUserInfoStore, loginSettingStore } from '@/stores';import { guard, floppyNavigation, handleFormError } from '@/utils';import { login, checkImgCode } from '@/services';import { PicAuthCodeModal } from '@/components/Modal';@@ -28,7 +24,6 @@ const Index: React.FC = () => {const navigate = useNavigate();const [searchParams] = useSearchParams();const [refresh, setRefresh] = useState(0);- const { name: siteName } = siteInfoStore((_) => _.siteInfo);const { user: storeUser, update: updateUser } = loggedUserInfoStore((_) => _);const loginSetting = loginSettingStore((state) => state.login);const [formData, setFormData] = useState<FormDataType>({@@ -175,9 +170,7 @@ const Index: React.FC = () => {});return (<Container style={{ paddingTop: '4rem', paddingBottom: '5rem' }}>- <h3 className="text-center mb-5">- {t('page_title', { site_name: siteName })}- </h3>+ <WelcomeTitle />{step === 1 && (<Col className="mx-auto" md={3}><PluginOauth className="mb-5" />diff --git a/ui/src/pages/Users/OauthBindEmail/index.tsx b/ui/src/pages/Users/OauthBindEmail/index.tsxindex 3a70fd26..dfc113d2 100644--- a/ui/src/pages/Users/OauthBindEmail/index.tsx+++ b/ui/src/pages/Users/OauthBindEmail/index.tsx@@ -3,7 +3,7 @@ import { Container, Col, Form, Button } from 'react-bootstrap';import { useTranslation, Trans } from 'react-i18next';import { useSearchParams, useNavigate } from 'react-router-dom';-import { Modal } from '@/components';+import { Modal, WelcomeTitle } from '@/components';import type { FormDataType } from '@/common/interface';import { usePageTags } from '@/hooks';import { loggedUserInfoStore } from '@/stores';@@ -135,7 +135,7 @@ const Index: FC = () => {}, []);return (<Container style={{ paddingTop: '4rem', paddingBottom: '6rem' }}>- <h3 className="text-center mb-5">{t('page_title')}</h3>+ <WelcomeTitle />{showResult ? (<Col md={6} className="mx-auto text-center"><p>diff --git a/ui/src/pages/Users/Register/index.tsx b/ui/src/pages/Users/Register/index.tsxindex fbf8b861..2dc52388 100644--- a/ui/src/pages/Users/Register/index.tsx+++ b/ui/src/pages/Users/Register/index.tsx@@ -3,15 +3,13 @@ import { Container } from 'react-bootstrap';import { useTranslation } from 'react-i18next';import { usePageTags } from '@/hooks';-import { Unactivate } from '@/components';-import { siteInfoStore } from '@/stores';+import { Unactivate, WelcomeTitle } from '@/components';import SignUpForm from './components/SignUpForm';const Index: React.FC = () => {const [showForm, setShowForm] = useState(true);const { t } = useTranslation('translation', { keyPrefix: 'login' });- const { name: siteName } = siteInfoStore((_) => _.siteInfo);const onStep = () => {setShowForm((bol) => !bol);};@@ -20,9 +18,7 @@ const Index: React.FC = () => {});return (<Container style={{ paddingTop: '4rem', paddingBottom: '5rem' }}>- <h3 className="text-center mb-5">- {t('page_title', { site_name: siteName })}- </h3>+ <WelcomeTitle />{showForm ? (<SignUpForm callback={onStep} />) : (