Skip to content

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: page title and meta tags done

haitao(lj)19180b6133b0
diff --git a/ui/public/index.html b/ui/public/index.html
index 304d295f..3c2b1841 100644
--- a/ui/public/index.html
+++ b/ui/public/index.html
@@ -4,22 +4,7 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
-<!-- <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />-->
- <!--
- manifest.json provides metadata used when your web app is installed on a
- user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
- -->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
- <!--
- Notice the use of %PUBLIC_URL% in the tags above.
- It will be replaced with the URL of the `public` folder during the build.
- Only files inside the `public` folder can be referenced from the HTML.
-
- Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
- work correctly both with client-side routing and a non-root public URL.
- Learn how to configure a non-root public URL by running `npm run build`.
- -->
- <title>Answer</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
@@ -51,15 +36,5 @@
<div class="spinner"></div>
</div>
</div>
- <!--
- This HTML file is a template.
- If you open it directly in the browser, you will see an empty page.
-
- You can add webfonts, meta tags, or analytics to this file.
- The build step will place the bundled scripts into the <body> tag.
-
- To begin the development, run `npm start` or `yarn start`.
- To create a production bundle, use `npm run build` or `yarn build`.
- -->
</body>
</html>
diff --git a/ui/src/common/interface.ts b/ui/src/common/interface.ts
index 2e479879..c6aa42a5 100644
--- a/ui/src/common/interface.ts
+++ b/ui/src/common/interface.ts
@@ -287,11 +287,15 @@ export interface AdminSettingsGeneral {
permalink: number;
}
-export interface HeadInfo {
- title?: string;
+export interface HelmetBase {
+ pageTitle?: string;
description?: string;
keywords?: string;
- ldJSON?;
+}
+
+export interface HelmetUpdate extends Omit<HelmetBase, 'pageTitle'> {
+ title?: string;
+ subtitle?: string;
}
export interface AdminSettingsInterface {
@@ -313,12 +317,12 @@ export interface AdminSettingsSmtp {
}
export interface SiteSettings {
- branding: AdmingSettingBranding;
+ branding: AdminSettingBranding;
general: AdminSettingsGeneral;
interface: AdminSettingsInterface;
}
-export interface AdmingSettingBranding {
+export interface AdminSettingBranding {
logo: string;
square_icon: string;
mobile_logo?: string;
diff --git a/ui/src/components/Footer/index.tsx b/ui/src/components/Footer/index.tsx
index 65ac6f33..eb31feec 100644
--- a/ui/src/components/Footer/index.tsx
+++ b/ui/src/components/Footer/index.tsx
@@ -9,7 +9,8 @@ import { DEFAULT_SITE_NAME } from '@/common/constants';
const Index = () => {
const fullYear = dayjs().format('YYYY');
- const siteName = siteInfoStore.getState().siteInfo.name || DEFAULT_SITE_NAME;
+ const siteName =
+ siteInfoStore((state) => state.siteInfo.name) || DEFAULT_SITE_NAME;
const cc = `${fullYear} ${siteName}`;
return (
<footer className="bg-light py-3">
diff --git a/ui/src/components/PageTitle/index.tsx b/ui/src/components/PageTitle/index.tsx
deleted file mode 100644
index a581af2e..00000000
--- a/ui/src/components/PageTitle/index.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { FC } from 'react';
-
-import { siteInfoStore } from '@/stores';
-
-interface IProp {
- title?: string;
- suffix?: string;
-}
-const setPageTitle = (title) => {
- if (document) {
- document.title = title;
- }
- return null;
-};
-// TODO: use Helmet for static response
-const PageTitle: FC<IProp> = ({ title = '', suffix = '' }) => {
- const { siteInfo } = siteInfoStore();
- if (!suffix) {
- suffix = `${siteInfo.name}`;
- }
- title = title ? `${title}${suffix ? ` - ${suffix}` : ''}` : suffix;
- return <>{setPageTitle(title)}</>;
-};
-
-export default PageTitle;
diff --git a/ui/src/components/UploadImg/index.tsx b/ui/src/components/UploadImg/index.tsx
index 0d3ee519..f28a9ecc 100644
--- a/ui/src/components/UploadImg/index.tsx
+++ b/ui/src/components/UploadImg/index.tsx
@@ -23,7 +23,6 @@ const Index: React.FC<IProps> = ({
const [status, setStatus] = useState(false);
const onChange = (e: any) => {
- console.log('uploading', e);
if (status) {
return;
}
@@ -37,7 +36,6 @@ const Index: React.FC<IProps> = ({
// return;
// }
setStatus(true);
- console.log('uploading', e.target.files);
uploadImage({ file: e.target.files[0], type })
.then((res) => {
uploadCallback(res);
diff --git a/ui/src/components/index.ts b/ui/src/components/index.ts
index ff371c61..f8fa4181 100644
--- a/ui/src/components/index.ts
+++ b/ui/src/components/index.ts
@@ -19,7 +19,6 @@ import Mentions from './Mentions';
import FormatTime from './FormatTime';
import Toast from './Toast';
import AccordionNav from './AccordionNav';
-import PageTitle from './PageTitle';
import Empty from './Empty';
import BaseUserCard from './BaseUserCard';
import FollowingTags from './FollowingTags';
@@ -51,7 +50,6 @@ export {
FormatTime,
Toast,
AccordionNav,
- PageTitle,
Empty,
BaseUserCard,
FollowingTags,
diff --git a/ui/src/hooks/index.ts b/ui/src/hooks/index.ts
index 511f8012..68232ad5 100644
--- a/ui/src/hooks/index.ts
+++ b/ui/src/hooks/index.ts
@@ -5,7 +5,7 @@ import usePageUsers from './usePageUsers';
import useChangeModal from './useChangeModal';
import useEditStatusModal from './useEditStatusModal';
import useChangeUserRoleModal from './useChangeUserRoleModal';
-import useHeadInfo from './useHeadInfo';
+import usePageTags from './usePageTags';
export {
useTagModal,
@@ -15,5 +15,5 @@ export {
useChangeModal,
useEditStatusModal,
useChangeUserRoleModal,
- useHeadInfo,
+ usePageTags,
};
diff --git a/ui/src/hooks/useHeadInfo/index.tsx b/ui/src/hooks/useHeadInfo/index.tsx
deleted file mode 100644
index 28887a01..00000000
--- a/ui/src/hooks/useHeadInfo/index.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import { useEffect } from 'react';
-
-import { HeadInfo } from '@/common/interface';
-import { headInfoStore } from '@/stores';
-
-export default function useHeadInfo(info: HeadInfo) {
- const { update } = headInfoStore.getState();
-
- useEffect(() => {
- update(info);
- }, [info]);
-}
diff --git a/ui/src/hooks/usePageTags/index.tsx b/ui/src/hooks/usePageTags/index.tsx
new file mode 100644
index 00000000..27914381
--- /dev/null
+++ b/ui/src/hooks/usePageTags/index.tsx
@@ -0,0 +1,11 @@
+import { useEffect } from 'react';
+
+import { HelmetUpdate } from '@/common/interface';
+import { pageTagStore } from '@/stores';
+
+export default function usePageTags(info: HelmetUpdate) {
+ const { update } = pageTagStore.getState();
+ useEffect(() => {
+ update(info);
+ }, [info.title, info.subtitle, info.description, info.keywords]);
+}
diff --git a/ui/src/pages/Admin/Branding/index.tsx b/ui/src/pages/Admin/Branding/index.tsx
index 1b376525..85aae3a0 100644
--- a/ui/src/pages/Admin/Branding/index.tsx
+++ b/ui/src/pages/Admin/Branding/index.tsx
@@ -105,8 +105,7 @@ const Index: FC = () => {
favicon: formData.favicon.value,
};
brandSetting(params)
- .then((res) => {
- console.log(res);
+ .then(() => {
update(params);
Toast.onShow({
msg: t('update', { keyPrefix: 'toast' }),
diff --git a/ui/src/pages/Admin/index.tsx b/ui/src/pages/Admin/index.tsx
index 7ae60655..5841235f 100644
--- a/ui/src/pages/Admin/index.tsx
+++ b/ui/src/pages/Admin/index.tsx
@@ -3,7 +3,8 @@ import { Container, Row, Col } from 'react-bootstrap';
import { useTranslation } from 'react-i18next';
import { Outlet, useLocation } from 'react-router-dom';
-import { AccordionNav, PageTitle } from '@/components';
+import { usePageTags } from '@/hooks';
+import { AccordionNav } from '@/components';
import { ADMIN_NAV_MENUS } from '@/common/constants';
import './index.scss';
@@ -20,10 +21,11 @@ const formPaths = [
const Index: FC = () => {
const { t } = useTranslation('translation', { keyPrefix: 'page_title' });
const { pathname } = useLocation();
-
+ usePageTags({
+ title: t('admin'),
+ });
return (
<>
- <PageTitle title={t('admin')} />
<div className="bg-light py-2">
<Container className="py-1">
<h6 className="mb-0 fw-bold lh-base">
diff --git a/ui/src/pages/Install/index.tsx b/ui/src/pages/Install/index.tsx
index 73341c49..a06b3892 100644
--- a/ui/src/pages/Install/index.tsx
+++ b/ui/src/pages/Install/index.tsx
@@ -3,8 +3,8 @@ import { FC, useState, useEffect } from 'react';
import { Container, Row, Col, Card, Alert } from 'react-bootstrap';
import { useTranslation, Trans } from 'react-i18next';
+import { usePageTags } from '@/hooks';
import type { FormDataType } from '@/common/interface';
-import { PageTitle } from '@/components';
import {
dbCheck,
installInit,
@@ -103,7 +103,6 @@ const Index: FC = () => {
});
const handleChange = (params: FormDataType) => {
- // console.log(params);
setErrorData({
msg: '',
});
@@ -240,13 +239,15 @@ const Index: FC = () => {
configYmlCheck();
}, []);
+ usePageTags({
+ title: t('install', { keyPrefix: 'page_title' })
+ });
if (loading) {
return <div />;
}
return (
<div className="bg-f5 py-5 flex-grow-1">
- <PageTitle title={t('install', { keyPrefix: 'page_title' })} />
<Container className='py-3'>
<Row className="justify-content-center">
<Col lg={6}>
diff --git a/ui/src/pages/Layout/index.tsx b/ui/src/pages/Layout/index.tsx
index 13cb5d00..7726574d 100644
--- a/ui/src/pages/Layout/index.tsx
+++ b/ui/src/pages/Layout/index.tsx
@@ -4,29 +4,18 @@ import { Helmet, HelmetProvider } from 'react-helmet-async';
import { SWRConfig } from 'swr';
-import {
- siteInfoStore,
- toastStore,
- brandingStore,
- headInfoStore,
-} from '@/stores';
+import { toastStore, brandingStore, pageTagStore } from '@/stores';
import { Header, Footer, Toast } from '@/components';
const Layout: FC = () => {
const { msg: toastMsg, variant, clear: toastClear } = toastStore();
- const siteInfo = siteInfoStore((state) => state.siteInfo);
- const headInfo = headInfoStore((state) => state.headInfo);
- const { favicon, square_icon } = brandingStore((state) => state.branding);
-
const closeToast = () => {
toastClear();
};
- const {
- title,
- keywords,
- description = siteInfo.description,
- ldJSON,
- } = headInfo;
+ const { favicon, square_icon } = brandingStore((state) => state.branding);
+ const { pageTitle, keywords, description } = pageTagStore(
+ (state) => state.items,
+ );
return (
<HelmetProvider>
@@ -38,10 +27,9 @@ const Layout: FC = () => {
/>
<link rel="icon" type="image/png" sizes="192x192" href={square_icon} />
<link rel="apple-touch-icon" type="image/png" href={square_icon} />
- {title && <title>{title}</title>}
+ <title>{pageTitle}</title>
{keywords && <meta name="keywords" content={keywords} />}
{description && <meta name="description" content={description} />}
- {ldJSON && <script type="application/ld+json">{ldJSON}</script>}
</Helmet>
<SWRConfig
value={{
diff --git a/ui/src/pages/Legal/Privacy/index.tsx b/ui/src/pages/Legal/Privacy/index.tsx
index aef8572f..f8fc2ace 100644
--- a/ui/src/pages/Legal/Privacy/index.tsx
+++ b/ui/src/pages/Legal/Privacy/index.tsx
@@ -1,11 +1,14 @@
import { FC } from 'react';
import { useTranslation } from 'react-i18next';
+import { usePageTags } from '@/hooks';
import { useLegalPrivacy } from '@/services';
-import { PageTitle } from '@/components';
const Index: FC = () => {
const { t } = useTranslation('translation', { keyPrefix: 'nav_menus' });
+ usePageTags({
+ title: t('privacy'),
+ });
const { data: privacy } = useLegalPrivacy();
const contentText = privacy?.privacy_policy_original_text;
let matchUrl: URL | undefined;
@@ -19,10 +22,8 @@ const Index: FC = () => {
window.location.replace(matchUrl.toString());
return null;
}
-
return (
<>
- <PageTitle title={t('privacy')} />
<h3 className="mb-4">{t('privacy')}</h3>
<div
className="fmt"
diff --git a/ui/src/pages/Legal/Tos/index.tsx b/ui/src/pages/Legal/Tos/index.tsx
index a48536b9..bbac2b50 100644
--- a/ui/src/pages/Legal/Tos/index.tsx
+++ b/ui/src/pages/Legal/Tos/index.tsx
@@ -1,11 +1,14 @@
import { FC } from 'react';
import { useTranslation } from 'react-i18next';
+import { usePageTags } from '@/hooks';
import { useLegalTos } from '@/services';
-import { PageTitle } from '@/components';
const Index: FC = () => {
const { t } = useTranslation('translation', { keyPrefix: 'nav_menus' });
+ usePageTags({
+ title: t('tos'),
+ });
const { data: tos } = useLegalTos();
const contentText = tos?.terms_of_service_original_text;
let matchUrl: URL | undefined;
@@ -21,7 +24,6 @@ const Index: FC = () => {
}
return (
<>
- <PageTitle title={t('tos')} />
<h3 className="mb-4">{t('tos')}</h3>
<div
className="fmt"
diff --git a/ui/src/pages/Maintenance/index.tsx b/ui/src/pages/Maintenance/index.tsx
index d216e6e1..6d232d09 100644
--- a/ui/src/pages/Maintenance/index.tsx
+++ b/ui/src/pages/Maintenance/index.tsx
@@ -1,18 +1,20 @@
import { Container } from 'react-bootstrap';
import { useTranslation } from 'react-i18next';
-import { PageTitle } from '@/components';
+import { usePageTags } from '@/hooks';
const Index = () => {
const { t } = useTranslation('translation', {
keyPrefix: 'page_maintenance',
});
+ usePageTags({
+ title: t('maintenance', { keyPrefix: 'page_title' }),
+ });
return (
<div className="bg-f5">
<Container
className="d-flex flex-column justify-content-center align-items-center"
style={{ minHeight: '100vh' }}>
- <PageTitle title={t('maintenance', { keyPrefix: 'page_title' })} />
<div
className="mb-4 text-secondary"
style={{ fontSize: '120px', lineHeight: 1.2 }}>
diff --git a/ui/src/pages/Questions/Ask/index.tsx b/ui/src/pages/Questions/Ask/index.tsx
index 84673764..dbcbc8cb 100644
--- a/ui/src/pages/Questions/Ask/index.tsx
+++ b/ui/src/pages/Questions/Ask/index.tsx
@@ -6,7 +6,8 @@ import { useTranslation } from 'react-i18next';
import dayjs from 'dayjs';
import classNames from 'classnames';
-import { Editor, EditorRef, TagSelector, PageTitle } from '@/components';
+import { usePageTags } from '@/hooks';
+import { Editor, EditorRef, TagSelector } from '@/components';
import type * as Type from '@/common/interface';
import {
saveQuestion,
@@ -292,189 +293,185 @@ const Ask = () => {
if (isEdit) {
pageTitle = t('edit_question', { keyPrefix: 'page_title' });
}
+ usePageTags({
+ title: pageTitle,
+ });
return (
- <>
- <PageTitle title={pageTitle} />
- <Container className="pt-4 mt-2 mb-5">
- <Row className="justify-content-center">
- <Col xxl={10} md={12}>
- <h3 className="mb-4">{isEdit ? t('edit_title') : t('title')}</h3>
- </Col>
- </Row>
- <Row className="justify-content-center">
- <Col xxl={7} lg={8} sm={12} className="mb-4 mb-md-0">
- <Form noValidate onSubmit={handleSubmit}>
- {isEdit && (
- <Form.Group controlId="revision" className="mb-3">
- <Form.Label>{t('form.fields.revision.label')}</Form.Label>
- <Form.Select onChange={handleSelectedRevision}>
- {revisions.map(
- ({ reason, create_at, user_info }, index) => {
- const date = dayjs(create_at * 1000)
- .tz()
- .format(
- t('long_date_with_time', { keyPrefix: 'dates' }),
- );
- return (
- <option key={`${create_at}`} value={index}>
- {`${date} - ${user_info.display_name} - ${
- reason || t('default_reason')
- }`}
- </option>
- );
- },
- )}
- </Form.Select>
- </Form.Group>
- )}
+ <Container className="pt-4 mt-2 mb-5">
+ <Row className="justify-content-center">
+ <Col xxl={10} md={12}>
+ <h3 className="mb-4">{isEdit ? t('edit_title') : t('title')}</h3>
+ </Col>
+ </Row>
+ <Row className="justify-content-center">
+ <Col xxl={7} lg={8} sm={12} className="mb-4 mb-md-0">
+ <Form noValidate onSubmit={handleSubmit}>
+ {isEdit && (
+ <Form.Group controlId="revision" className="mb-3">
+ <Form.Label>{t('form.fields.revision.label')}</Form.Label>
+ <Form.Select onChange={handleSelectedRevision}>
+ {revisions.map(({ reason, create_at, user_info }, index) => {
+ const date = dayjs(create_at * 1000)
+ .tz()
+ .format(t('long_date_with_time', { keyPrefix: 'dates' }));
+ return (
+ <option key={`${create_at}`} value={index}>
+ {`${date} - ${user_info.display_name} - ${
+ reason || t('default_reason')
+ }`}
+ </option>
+ );
+ })}
+ </Form.Select>
+ </Form.Group>
+ )}
- <Form.Group controlId="title" className="mb-3">
- <Form.Label>{t('form.fields.title.label')}</Form.Label>
- <Form.Control
- value={formData.title.value}
- isInvalid={formData.title.isInvalid}
- onChange={handleTitleChange}
- placeholder={t('form.fields.title.placeholder')}
- autoFocus
- />
+ <Form.Group controlId="title" className="mb-3">
+ <Form.Label>{t('form.fields.title.label')}</Form.Label>
+ <Form.Control
+ value={formData.title.value}
+ isInvalid={formData.title.isInvalid}
+ onChange={handleTitleChange}
+ placeholder={t('form.fields.title.placeholder')}
+ autoFocus
+ />
- <Form.Control.Feedback type="invalid">
- {formData.title.errorMsg}
- </Form.Control.Feedback>
- {bool && <SearchQuestion similarQuestions={similarQuestions} />}
- </Form.Group>
- <Form.Group controlId="body">
- <Form.Label>{t('form.fields.body.label')}</Form.Label>
- <Form.Control
- defaultValue={formData.content.value}
- isInvalid={formData.content.isInvalid}
- hidden
- />
- <Editor
- value={formData.content.value}
- onChange={handleContentChange}
- className={classNames(
- 'form-control p-0',
- focusType === 'content' && 'focus',
- )}
- onFocus={() => {
- setForceType('content');
- }}
- onBlur={() => {
- setForceType('');
- }}
- ref={editorRef}
- />
- <Form.Control.Feedback type="invalid">
- {formData.content.errorMsg}
- </Form.Control.Feedback>
- </Form.Group>
- <Form.Group controlId="tags" className="my-3">
- <Form.Label>{t('form.fields.tags.label')}</Form.Label>
+ <Form.Control.Feedback type="invalid">
+ {formData.title.errorMsg}
+ </Form.Control.Feedback>
+ {bool && <SearchQuestion similarQuestions={similarQuestions} />}
+ </Form.Group>
+ <Form.Group controlId="body">
+ <Form.Label>{t('form.fields.body.label')}</Form.Label>
+ <Form.Control
+ defaultValue={formData.content.value}
+ isInvalid={formData.content.isInvalid}
+ hidden
+ />
+ <Editor
+ value={formData.content.value}
+ onChange={handleContentChange}
+ className={classNames(
+ 'form-control p-0',
+ focusType === 'content' && 'focus',
+ )}
+ onFocus={() => {
+ setForceType('content');
+ }}
+ onBlur={() => {
+ setForceType('');
+ }}
+ ref={editorRef}
+ />
+ <Form.Control.Feedback type="invalid">
+ {formData.content.errorMsg}
+ </Form.Control.Feedback>
+ </Form.Group>
+ <Form.Group controlId="tags" className="my-3">
+ <Form.Label>{t('form.fields.tags.label')}</Form.Label>
+ <Form.Control
+ defaultValue={JSON.stringify(formData.tags.value)}
+ isInvalid={formData.tags.isInvalid}
+ hidden
+ />
+ <TagSelector
+ value={formData.tags.value}
+ onChange={handleTagsChange}
+ showRequiredTagText
+ />
+ <Form.Control.Feedback type="invalid">
+ {formData.tags.errorMsg}
+ </Form.Control.Feedback>
+ </Form.Group>
+ {isEdit && (
+ <Form.Group controlId="edit_summary" className="my-3">
+ <Form.Label>{t('form.fields.edit_summary.label')}</Form.Label>
<Form.Control
- defaultValue={JSON.stringify(formData.tags.value)}
- isInvalid={formData.tags.isInvalid}
- hidden
- />
- <TagSelector
- value={formData.tags.value}
- onChange={handleTagsChange}
- showRequiredTagText
+ type="text"
+ defaultValue={formData.edit_summary.value}
+ isInvalid={formData.edit_summary.isInvalid}
+ placeholder={t('form.fields.edit_summary.placeholder')}
+ onChange={handleSummaryChange}
/>
<Form.Control.Feedback type="invalid">
- {formData.tags.errorMsg}
+ {formData.edit_summary.errorMsg}
</Form.Control.Feedback>
</Form.Group>
- {isEdit && (
- <Form.Group controlId="edit_summary" className="my-3">
- <Form.Label>{t('form.fields.edit_summary.label')}</Form.Label>
- <Form.Control
- type="text"
- defaultValue={formData.edit_summary.value}
- isInvalid={formData.edit_summary.isInvalid}
- placeholder={t('form.fields.edit_summary.placeholder')}
- onChange={handleSummaryChange}
- />
- <Form.Control.Feedback type="invalid">
- {formData.edit_summary.errorMsg}
- </Form.Control.Feedback>
- </Form.Group>
- )}
- {!checked && (
- <div className="mt-3">
- <Button type="submit" className="me-2">
- {isEdit ? t('btn_save_edits') : t('btn_post_question')}
- </Button>
+ )}
+ {!checked && (
+ <div className="mt-3">
+ <Button type="submit" className="me-2">
+ {isEdit ? t('btn_save_edits') : t('btn_post_question')}
+ </Button>
- <Button variant="link" onClick={backPage}>
- {t('cancel', { keyPrefix: 'btns' })}
- </Button>
- </div>
- )}
- {!isEdit && (
- <>
- <Form.Check
- className="mt-5"
- checked={checked}
- type="checkbox"
- label={t('answer_question')}
- onChange={(e) => setCheckState(e.target.checked)}
- id="radio-answer"
- />
- {checked && (
- <Form.Group controlId="answer" className="mt-4">
- <Form.Label>{t('form.fields.answer.label')}</Form.Label>
- <Editor
- value={formData.answer.value}
- onChange={handleAnswerChange}
- ref={editorRef2}
- className={classNames(
- 'form-control p-0',
- focusType === 'answer' && 'focus',
- )}
- onFocus={() => {
- setForceType('answer');
- }}
- onBlur={() => {
- setForceType('');
- }}
- />
- <Form.Control
- value={formData.answer.value}
- type="text"
- isInvalid={formData.answer.isInvalid}
- hidden
- />
- <Form.Control.Feedback type="invalid">
- {formData.answer.errorMsg}
- </Form.Control.Feedback>
- </Form.Group>
- )}
- </>
- )}
- {checked && (
- <Button type="submit" className="mt-3">
- {t('post_question&answer')}
+ <Button variant="link" onClick={backPage}>
+ {t('cancel', { keyPrefix: 'btns' })}
</Button>
- )}
- </Form>
- </Col>
- <Col xxl={3} lg={4} sm={12} className="mt-5 mt-lg-0">
- <Card className="mb-4">
- <Card.Header>
- {t('title', { keyPrefix: 'how_to_format' })}
- </Card.Header>
- <Card.Body
- className="fmt small"
- dangerouslySetInnerHTML={{
- __html: t('desc', { keyPrefix: 'how_to_format' }),
- }}
- />
- </Card>
- </Col>
- </Row>
- </Container>
- </>
+ </div>
+ )}
+ {!isEdit && (
+ <>
+ <Form.Check
+ className="mt-5"
+ checked={checked}
+ type="checkbox"
+ label={t('answer_question')}
+ onChange={(e) => setCheckState(e.target.checked)}
+ id="radio-answer"
+ />
+ {checked && (
+ <Form.Group controlId="answer" className="mt-4">
+ <Form.Label>{t('form.fields.answer.label')}</Form.Label>
+ <Editor
+ value={formData.answer.value}
+ onChange={handleAnswerChange}
+ ref={editorRef2}
+ className={classNames(
+ 'form-control p-0',
+ focusType === 'answer' && 'focus',
+ )}
+ onFocus={() => {
+ setForceType('answer');
+ }}
+ onBlur={() => {
+ setForceType('');
+ }}
+ />
+ <Form.Control
+ value={formData.answer.value}
+ type="text"
+ isInvalid={formData.answer.isInvalid}
+ hidden
+ />
+ <Form.Control.Feedback type="invalid">
+ {formData.answer.errorMsg}
+ </Form.Control.Feedback>
+ </Form.Group>
+ )}
+ </>
+ )}
+ {checked && (
+ <Button type="submit" className="mt-3">
+ {t('post_question&answer')}
+ </Button>
+ )}
+ </Form>
+ </Col>
+ <Col xxl={3} lg={4} sm={12} className="mt-5 mt-lg-0">
+ <Card className="mb-4">
+ <Card.Header>
+ {t('title', { keyPrefix: 'how_to_format' })}
+ </Card.Header>
+ <Card.Body
+ className="fmt small"
+ dangerouslySetInnerHTML={{
+ __html: t('desc', { keyPrefix: 'how_to_format' }),
+ }}
+ />
+ </Card>
+ </Col>
+ </Row>
+ </Container>
);
};
diff --git a/ui/src/pages/Questions/Detail/index.tsx b/ui/src/pages/Questions/Detail/index.tsx
index 62eb3640..249f1f39 100644
--- a/ui/src/pages/Questions/Detail/index.tsx
+++ b/ui/src/pages/Questions/Detail/index.tsx
@@ -9,10 +9,10 @@ import {
import { useTranslation } from 'react-i18next';
import Pattern from '@/common/pattern';
-import { Pagination, PageTitle } from '@/components';
+import { Pagination } from '@/components';
import { loggedUserInfoStore, toastStore } from '@/stores';
import { scrollTop } from '@/utils';
-import { usePageUsers } from '@/hooks';
+import { usePageTags, usePageUsers } from '@/hooks';
import type {
ListResult,
QuestionDetailRes,
@@ -143,68 +143,69 @@ const Index = () => {
requestAnswers();
}
}, [page, order]);
-
+ usePageTags({
+ title: question?.title,
+ description: question?.description,
+ keywords: question?.tags.map((_) => _.slug_name).join(','),
+ });
return (
- <>
- <PageTitle title={question?.title} />
- <Container className="pt-4 mt-2 mb-5 questionDetailPage">
- <Row className="justify-content-center">
- <Col xxl={7} lg={8} sm={12} className="mb-5 mb-md-0">
- {question?.operation?.operation_type && (
- <Alert data={question.operation} />
- )}
- <Question
- data={question}
- initPage={initPage}
- hasAnswer={answers.count > 0}
- isLogged={isLogged}
- />
- {answers.count > 0 && (
- <>
- <AnswerHead count={answers.count} order={order} />
- {answers?.list?.map((item) => {
- return (
- <Answer
- aid={aid}
- key={item?.id}
- data={item}
- questionTitle={question?.title || ''}
- isAuthor={isAuthor}
- callback={initPage}
- isLogged={isLogged}
- />
- );
- })}
- </>
- )}
-
- {Math.ceil(answers.count / 15) > 1 && (
- <div className="d-flex justify-content-center answer-item pt-4">
- <Pagination
- currentPage={Number(page || 1)}
- pageSize={15}
- totalSize={answers?.count || 0}
- />
- </div>
- )}
-
- {!question?.operation?.operation_type && (
- <WriteAnswer
- visible={answers.count === 0}
- data={{
- qid,
- answered: question?.answered,
- }}
- callback={writeAnswerCallback}
+ <Container className="pt-4 mt-2 mb-5 questionDetailPage">
+ <Row className="justify-content-center">
+ <Col xxl={7} lg={8} sm={12} className="mb-5 mb-md-0">
+ {question?.operation?.operation_type && (
+ <Alert data={question.operation} />
+ )}
+ <Question
+ data={question}
+ initPage={initPage}
+ hasAnswer={answers.count > 0}
+ isLogged={isLogged}
+ />
+ {answers.count > 0 && (
+ <>
+ <AnswerHead count={answers.count} order={order} />
+ {answers?.list?.map((item) => {
+ return (
+ <Answer
+ aid={aid}
+ key={item?.id}
+ data={item}
+ questionTitle={question?.title || ''}
+ isAuthor={isAuthor}
+ callback={initPage}
+ isLogged={isLogged}
+ />
+ );
+ })}
+ </>
+ )}
+
+ {Math.ceil(answers.count / 15) > 1 && (
+ <div className="d-flex justify-content-center answer-item pt-4">
+ <Pagination
+ currentPage={Number(page || 1)}
+ pageSize={15}
+ totalSize={answers?.count || 0}
/>
- )}
- </Col>
- <Col xxl={3} lg={4} sm={12} className="mt-5 mt-lg-0">
- <RelatedQuestions id={question?.id || ''} />
- </Col>
- </Row>
- </Container>
- </>
+ </div>
+ )}
+
+ {!question?.operation?.operation_type && (
+ <WriteAnswer
+ visible={answers.count === 0}
+ data={{
+ qid,
+ answered: question?.answered,
+ }}
+ callback={writeAnswerCallback}
+ />
+ )}
+ </Col>
+ <Col xxl={3} lg={4} sm={12} className="mt-5 mt-lg-0">
+ <RelatedQuestions id={question?.id || ''} />
+ </Col>
+ </Row>
+ </Container>
);
};
diff --git a/ui/src/pages/Questions/EditAnswer/index.tsx b/ui/src/pages/Questions/EditAnswer/index.tsx
index fd731cbd..f1a7a0a7 100644
--- a/ui/src/pages/Questions/EditAnswer/index.tsx
+++ b/ui/src/pages/Questions/EditAnswer/index.tsx
@@ -6,8 +6,9 @@ import { useTranslation } from 'react-i18next';
import dayjs from 'dayjs';
import classNames from 'classnames';
+import { usePageTags } from '@/hooks';
import { pathFactory } from '@/router/pathFactory';
-import { Editor, EditorRef, Icon, PageTitle } from '@/components';
+import { Editor, EditorRef, Icon } from '@/components';
import type * as Type from '@/common/interface';
import {
useQueryAnswerInfo,
@@ -133,127 +134,126 @@ const Ask = () => {
const backPage = () => {
navigate(-1);
};
-
+ usePageTags({
+ title: t('edit_answer', { keyPrefix: 'page_title' }),
+ });
return (
- <>
- <PageTitle title={t('edit_answer', { keyPrefix: 'page_title' })} />
- <Container className="pt-4 mt-2 mb-5 edit-answer-wrap">
- <Row className="justify-content-center">
- <Col xxl={10} md={12}>
- <h3 className="mb-4">{t('title')}</h3>
- </Col>
- </Row>
- <Row className="justify-content-center">
- <Col xxl={7} lg={8} sm={12} className="mb-4 mb-md-0">
- <a
- href={pathFactory.questionLanding(qid, data?.question.title)}
- target="_blank"
- rel="noreferrer">
- <h5 className="mb-3">{data?.question.title}</h5>
- </a>
+ <Container className="pt-4 mt-2 mb-5 edit-answer-wrap">
+ <Row className="justify-content-center">
+ <Col xxl={10} md={12}>
+ <h3 className="mb-4">{t('title')}</h3>
+ </Col>
+ </Row>
+ <Row className="justify-content-center">
+ <Col xxl={7} lg={8} sm={12} className="mb-4 mb-md-0">
+ <a
+ href={pathFactory.questionLanding(qid, data?.question.title)}
+ target="_blank"
+ rel="noreferrer">
+ <h5 className="mb-3">{data?.question.title}</h5>
+ </a>
- <div className="question-content-wrap">
- <div
- ref={questionContentRef}
- className="content position-absolute top-0 w-100"
- dangerouslySetInnerHTML={{ __html: data?.question.html }}
- />
- <div
- className="resize-bottom"
- style={{ maxHeight: questionContentRef?.current?.scrollHeight }}
- />
- <div className="line bg-light d-flex justify-content-center align-items-center">
- <Icon name="three-dots" />
- </div>
+ <div className="question-content-wrap">
+ <div
+ ref={questionContentRef}
+ className="content position-absolute top-0 w-100"
+ dangerouslySetInnerHTML={{ __html: data?.question.html }}
+ />
+ <div
+ className="resize-bottom"
+ style={{ maxHeight: questionContentRef?.current?.scrollHeight }}
+ />
+ <div className="line bg-light d-flex justify-content-center align-items-center">
+ <Icon name="three-dots" />
</div>
+ </div>
- <Form noValidate onSubmit={handleSubmit}>
- <Form.Group controlId="revision" className="mb-3">
- <Form.Label>{t('form.fields.revision.label')}</Form.Label>
- <Form.Select onChange={handleSelectedRevision}>
- {revisions.map(({ create_at, reason, user_info }, index) => {
- const date = dayjs(create_at * 1000)
- .tz()
- .format(t('long_date_with_time', { keyPrefix: 'dates' }));
- return (
- <option key={`${create_at}`} value={index}>
- {`${date} - ${user_info.display_name} - ${
- reason || t('default_reason')
- }`}
- </option>
- );
- })}
- </Form.Select>
- </Form.Group>
-
- <Form.Group controlId="answer" className="mt-3">
- <Form.Label>{t('form.fields.answer.label')}</Form.Label>
- <Editor
- value={formData.answer.value}
- onChange={handleAnswerChange}
- className={classNames(
- 'form-control p-0',
- focusType === 'answer' && 'focus',
- )}
- onFocus={() => {
- setForceType('answer');
- }}
- onBlur={() => {
- setForceType('');
- }}
- ref={editorRef}
- />
- <Form.Control
- value={formData.answer.value}
- type="text"
- isInvalid={formData.answer.isInvalid}
- readOnly
- hidden
- />
- <Form.Control.Feedback type="invalid">
- {formData.answer.errorMsg}
- </Form.Control.Feedback>
- </Form.Group>
- <Form.Group controlId="edit_summary" className="my-3">
- <Form.Label>{t('form.fields.edit_summary.label')}</Form.Label>
- <Form.Control
- type="text"
- onChange={handleSummaryChange}
- defaultValue={formData.description.value}
- isInvalid={formData.description.isInvalid}
- placeholder={t('form.fields.edit_summary.placeholder')}
- />
- <Form.Control.Feedback type="invalid">
- {formData.description.errorMsg}
- </Form.Control.Feedback>
- </Form.Group>
+ <Form noValidate onSubmit={handleSubmit}>
+ <Form.Group controlId="revision" className="mb-3">
+ <Form.Label>{t('form.fields.revision.label')}</Form.Label>
+ <Form.Select onChange={handleSelectedRevision}>
+ {revisions.map(({ create_at, reason, user_info }, index) => {
+ const date = dayjs(create_at * 1000)
+ .tz()
+ .format(t('long_date_with_time', { keyPrefix: 'dates' }));
+ return (
+ <option key={`${create_at}`} value={index}>
+ {`${date} - ${user_info.display_name} - ${
+ reason || t('default_reason')
+ }`}
+ </option>
+ );
+ })}
+ </Form.Select>
+ </Form.Group>
- <div className="mt-3">
- <Button type="submit" className="me-2">
- {t('btn_save_edits')}
- </Button>
- <Button variant="link" onClick={backPage}>
- {t('btn_cancel')}
- </Button>
- </div>
- </Form>
- </Col>
- <Col xxl={3} lg={4} sm={12} className="mt-5 mt-lg-0">
- <Card>
- <Card.Header>
- {t('title', { keyPrefix: 'how_to_format' })}
- </Card.Header>
- <Card.Body
- className="fmt small"
- dangerouslySetInnerHTML={{
- __html: t('description', { keyPrefix: 'how_to_format' }),
+ <Form.Group controlId="answer" className="mt-3">
+ <Form.Label>{t('form.fields.answer.label')}</Form.Label>
+ <Editor
+ value={formData.answer.value}
+ onChange={handleAnswerChange}
+ className={classNames(
+ 'form-control p-0',
+ focusType === 'answer' && 'focus',
+ )}
+ onFocus={() => {
+ setForceType('answer');
}}
+ onBlur={() => {
+ setForceType('');
+ }}
+ ref={editorRef}
+ />
+ <Form.Control
+ value={formData.answer.value}
+ type="text"
+ isInvalid={formData.answer.isInvalid}
+ readOnly
+ hidden
+ />
+ <Form.Control.Feedback type="invalid">
+ {formData.answer.errorMsg}
+ </Form.Control.Feedback>
+ </Form.Group>
+ <Form.Group controlId="edit_summary" className="my-3">
+ <Form.Label>{t('form.fields.edit_summary.label')}</Form.Label>
+ <Form.Control
+ type="text"
+ onChange={handleSummaryChange}
+ defaultValue={formData.description.value}
+ isInvalid={formData.description.isInvalid}
+ placeholder={t('form.fields.edit_summary.placeholder')}
/>
- </Card>
- </Col>
- </Row>
- </Container>
- </>
+ <Form.Control.Feedback type="invalid">
+ {formData.description.errorMsg}
+ </Form.Control.Feedback>
+ </Form.Group>
+
+ <div className="mt-3">
+ <Button type="submit" className="me-2">
+ {t('btn_save_edits')}
+ </Button>
+ <Button variant="link" onClick={backPage}>
+ {t('btn_cancel')}
+ </Button>
+ </div>
+ </Form>
+ </Col>
+ <Col xxl={3} lg={4} sm={12} className="mt-5 mt-lg-0">
+ <Card>
+ <Card.Header>
+ {t('title', { keyPrefix: 'how_to_format' })}
+ </Card.Header>
+ <Card.Body
+ className="fmt small"
+ dangerouslySetInnerHTML={{
+ __html: t('description', { keyPrefix: 'how_to_format' }),
+ }}
+ />
+ </Card>
+ </Col>
+ </Row>
+ </Container>
);
};
diff --git a/ui/src/pages/Questions/index.tsx b/ui/src/pages/Questions/index.tsx
index ea10ec15..6320ca05 100644
--- a/ui/src/pages/Questions/index.tsx
+++ b/ui/src/pages/Questions/index.tsx
@@ -3,7 +3,8 @@ import { Container, Row, Col } from 'react-bootstrap';
import { useMatch } from 'react-router-dom';
import { useTranslation } from 'react-i18next';
-import { PageTitle, FollowingTags } from '@/components';
+import { usePageTags } from '@/hooks';
+import { FollowingTags } from '@/components';
import QuestionList from '@/components/QuestionList';
import HotQuestions from '@/components/HotQuestions';
import { siteInfoStore } from '@/stores';
@@ -20,21 +21,19 @@ const Questions: FC = () => {
slogan = `${siteInfo.short_description}`;
}
+ usePageTags({ title: pageTitle, subtitle: slogan });
return (
- <>
- <PageTitle title={pageTitle} suffix={slogan} />
- <Container className="pt-4 mt-2 mb-5">
- <Row className="justify-content-center">
- <Col xxl={7} lg={8} sm={12}>
- <QuestionList source="questions" />
- </Col>
- <Col xxl={3} lg={4} sm={12} className="mt-5 mt-lg-0">
- <FollowingTags />
- <HotQuestions />
- </Col>
- </Row>
- </Container>
- </>
+ <Container className="pt-4 mt-2 mb-5">
+ <Row className="justify-content-center">
+ <Col xxl={7} lg={8} sm={12}>
+ <QuestionList source="questions" />
+ </Col>
+ <Col xxl={3} lg={4} sm={12} className="mt-5 mt-lg-0">
+ <FollowingTags />
+ <HotQuestions />
+ </Col>
+ </Row>
+ </Container>
);
};
diff --git a/ui/src/pages/Review/index.tsx b/ui/src/pages/Review/index.tsx
index cbe4006a..b92d8bbf 100644
--- a/ui/src/pages/Review/index.tsx
+++ b/ui/src/pages/Review/index.tsx
@@ -3,13 +3,8 @@ import { Container, Row, Col, Alert, Stack, Button } from 'react-bootstrap';
import { Link } from 'react-router-dom';
import { useTranslation } from 'react-i18next';
-import {
- BaseUserCard,
- FormatTime,
- Empty,
- DiffContent,
- PageTitle,
-} from '@/components';
+import { usePageTags } from '@/hooks';
+import { BaseUserCard, FormatTime, Empty, DiffContent } from '@/components';
import { getReviewList, revisionAudit } from '@/services';
import { pathFactory } from '@/router/pathFactory';
import type * as Type from '@/common/interface';
@@ -124,9 +119,11 @@ const Index: FC = () => {
useEffect(() => {
queryNextOne(page);
}, []);
+ usePageTags({
+ title: t('review'),
+ });
return (
<Container className="pt-2 mt-4 mb-5">
- <PageTitle title={t('review')} />
<Row>
<Col lg={{ span: 7, offset: 1 }}>
<h3 className="mb-4">{t('review')}</h3>
diff --git a/ui/src/pages/Search/index.tsx b/ui/src/pages/Search/index.tsx
index f22dc3ce..5efca86c 100644
--- a/ui/src/pages/Search/index.tsx
+++ b/ui/src/pages/Search/index.tsx
@@ -3,7 +3,8 @@ import { Container, Row, Col, ListGroup } from 'react-bootstrap';
import { useTranslation } from 'react-i18next';
import { useSearchParams } from 'react-router-dom';
-import { Pagination, PageTitle } from '@/components';
+import { usePageTags } from '@/hooks';
+import { Pagination } from '@/components';
import { useSearch } from '@/services';
import { Head, SearchHead, SearchItem, Tips, Empty } from './components';
@@ -27,38 +28,38 @@ const Index = () => {
if (q) {
pageTitle = `${t('posts_containing', { keyPrefix: 'page_title' })} '${q}'`;
}
+ usePageTags({
+ title: pageTitle,
+ });
return (
- <>
- <PageTitle title={pageTitle} />
- <Container className="pt-4 mt-2 mb-5">
- <Row className="justify-content-center">
- <Col xxl={7} lg={8} sm={12} className="mb-3">
- <Head data={extra} />
+ <Container className="pt-4 mt-2 mb-5">
+ <Row className="justify-content-center">
+ <Col xxl={7} lg={8} sm={12} className="mb-3">
+ <Head data={extra} />
- <ListGroup variant="flush" className="mb-5">
- <SearchHead sort={order} count={count} />
+ <ListGroup variant="flush" className="mb-5">
+ <SearchHead sort={order} count={count} />
- {list?.map((item) => {
- return <SearchItem key={item.object.id} data={item} />;
- })}
- </ListGroup>
+ {list?.map((item) => {
+ return <SearchItem key={item.object.id} data={item} />;
+ })}
+ </ListGroup>
- {!isLoading && !list?.length && <Empty />}
+ {!isLoading && !list?.length && <Empty />}
- <div className="d-flex justify-content-center">
- <Pagination
- currentPage={Number(page)}
- pageSize={20}
- totalSize={count}
- />
- </div>
- </Col>
- <Col xxl={3} lg={4} sm={12} className="mt-5 mt-lg-0">
- <Tips />
- </Col>
- </Row>
- </Container>
- </>
+ <div className="d-flex justify-content-center">
+ <Pagination
+ currentPage={Number(page)}
+ pageSize={20}
+ totalSize={count}
+ />
+ </div>
+ </Col>
+ <Col xxl={3} lg={4} sm={12} className="mt-5 mt-lg-0">
+ <Tips />
+ </Col>
+ </Row>
+ </Container>
);
};
diff --git a/ui/src/pages/Tags/Detail/index.tsx b/ui/src/pages/Tags/Detail/index.tsx
index ea9a04e3..e7be003e 100644
--- a/ui/src/pages/Tags/Detail/index.tsx
+++ b/ui/src/pages/Tags/Detail/index.tsx
@@ -3,9 +3,10 @@ import { Container, Row, Col, Button } from 'react-bootstrap';
import { useParams, Link, useNavigate } from 'react-router-dom';
import { useTranslation } from 'react-i18next';
+import { usePageTags } from '@/hooks';
import * as Type from '@/common/interface';
-import { PageTitle, FollowingTags } from '@/components';
-import { useTagInfo, useFollow } from '@/services';
+import { FollowingTags } from '@/components';
+import { useTagInfo, useFollow, useQuerySynonymsTags } from '@/services';
import QuestionList from '@/components/QuestionList';
import HotQuestions from '@/components/HotQuestions';
import { escapeRemove } from '@/utils';
@@ -20,7 +21,7 @@ const Questions: FC = () => {
const [tagFollow, setTagFollow] = useState<Type.FollowParams>();
const { data: tagResp } = useTagInfo({ name: curTagName });
const { data: followResp } = useFollow(tagFollow);
-
+ const { data: synonymsRes } = useQuerySynonymsTags(tagInfo?.tag_id);
const toggleFollow = () => {
setTagFollow({
is_cancel: tagInfo.is_follower,
@@ -51,57 +52,66 @@ const Questions: FC = () => {
}
}, [tagResp, followResp]);
let pageTitle = '';
- if (tagInfo) {
+ if (tagInfo?.display_name) {
pageTitle = `'${tagInfo.display_name}' ${t('questions', {
keyPrefix: 'page_title',
})}`;
}
+ const keywords: string[] = [];
+ if (tagInfo?.slug_name) {
+ keywords.push(tagInfo.slug_name);
+ }
+ synonymsRes?.synonyms.forEach((o) => {
+ keywords.push(o.slug_name);
+ });
+ usePageTags({
+ title: pageTitle,
+ description: tagInfo?.description,
+ keywords: keywords.join(','),
+ });
return (
- <>
- <PageTitle title={pageTitle} />
- <Container className="pt-4 mt-2 mb-5">
- <Row className="justify-content-center">
- <Col xxl={7} lg={8} sm={12}>
- <div className="tag-box mb-5">
- <h3 className="mb-3">
- <Link
- to={pathFactory.tagLanding(tagInfo.slug_name)}
- replace
- className="link-dark">
- {tagInfo.display_name}
- </Link>
- </h3>
+ <Container className="pt-4 mt-2 mb-5">
+ <Row className="justify-content-center">
+ <Col xxl={7} lg={8} sm={12}>
+ <div className="tag-box mb-5">
+ <h3 className="mb-3">
+ <Link
+ to={pathFactory.tagLanding(tagInfo.slug_name)}
+ replace
+ className="link-dark">
+ {tagInfo.display_name}
+ </Link>
+ </h3>
- <p className="text-break">
- {escapeRemove(tagInfo.excerpt) || t('no_desc')}
- <Link to={pathFactory.tagInfo(curTagName)} className="ms-1">
- [{t('more')}]
- </Link>
- </p>
+ <p className="text-break">
+ {escapeRemove(tagInfo.excerpt) || t('no_desc')}
+ <Link to={pathFactory.tagInfo(curTagName)} className="ms-1">
+ [{t('more')}]
+ </Link>
+ </p>
- <div className="box-ft">
- {tagInfo.is_follower ? (
- <Button variant="primary" onClick={() => toggleFollow()}>
- {t('button_following')}
- </Button>
- ) : (
- <Button
- variant="outline-primary"
- onClick={() => toggleFollow()}>
- {t('button_follow')}
- </Button>
- )}
- </div>
+ <div className="box-ft">
+ {tagInfo.is_follower ? (
+ <Button variant="primary" onClick={() => toggleFollow()}>
+ {t('button_following')}
+ </Button>
+ ) : (
+ <Button
+ variant="outline-primary"
+ onClick={() => toggleFollow()}>
+ {t('button_follow')}
+ </Button>
+ )}
</div>
- <QuestionList source="tag" />
- </Col>
- <Col xxl={3} lg={4} sm={12} className="mt-5 mt-lg-0">
- <FollowingTags />
- <HotQuestions />
- </Col>
- </Row>
- </Container>
- </>
+ </div>
+ <QuestionList source="tag" />
+ </Col>
+ <Col xxl={3} lg={4} sm={12} className="mt-5 mt-lg-0">
+ <FollowingTags />
+ <HotQuestions />
+ </Col>
+ </Row>
+ </Container>
);
};
diff --git a/ui/src/pages/Tags/Edit/index.tsx b/ui/src/pages/Tags/Edit/index.tsx
index 01f91e6d..109b5373 100644
--- a/ui/src/pages/Tags/Edit/index.tsx
+++ b/ui/src/pages/Tags/Edit/index.tsx
@@ -6,7 +6,8 @@ import { useTranslation } from 'react-i18next';
import dayjs from 'dayjs';
import classNames from 'classnames';
-import { Editor, EditorRef, PageTitle } from '@/components';
+import { usePageTags } from '@/hooks';
+import { Editor, EditorRef } from '@/components';
import { loggedUserInfoStore } from '@/stores';
import type * as Type from '@/common/interface';
import { useTagInfo, modifyTag, useQueryRevisions } from '@/services';
@@ -143,131 +144,128 @@ const Ask = () => {
const backPage = () => {
navigate(-1);
};
-
+ usePageTags({
+ title: t('edit_tag', { keyPrefix: 'page_title' }),
+ });
return (
- <>
- <PageTitle title={t('edit_tag', { keyPrefix: 'page_title' })} />
- <Container className="pt-4 mt-2 mb-5 edit-answer-wrap">
- <Row className="justify-content-center">
- <Col xxl={10} md={12}>
- <h3 className="mb-4">{t('title')}</h3>
- </Col>
- </Row>
- <Row className="justify-content-center">
- <Col xxl={7} lg={8} sm={12} className="mb-4 mb-md-0">
- <Form noValidate onSubmit={handleSubmit}>
- <Form.Group controlId="revision" className="mb-3">
- <Form.Label>{t('form.fields.revision.label')}</Form.Label>
- <Form.Select onChange={handleSelectedRevision}>
- {revisions.map(({ create_at, reason, user_info }, index) => {
- const date = dayjs(create_at * 1000)
- .tz()
- .format(t('long_date_with_time', { keyPrefix: 'dates' }));
- return (
- <option key={`${create_at}`} value={index}>
- {`${date} - ${user_info.display_name} - ${
- reason || t('default_reason')
- }`}
- </option>
- );
- })}
- </Form.Select>
- </Form.Group>
- <Form.Group controlId="display_name" className="mb-3">
- <Form.Label>{t('form.fields.display_name.label')}</Form.Label>
- <Form.Control
- value={formData.displayName.value}
- isInvalid={formData.displayName.isInvalid}
- disabled={!is_admin}
- onChange={handleDisplayNameChange}
- />
-
- <Form.Control.Feedback type="invalid">
- {formData.displayName.errorMsg}
- </Form.Control.Feedback>
- </Form.Group>
- <Form.Group controlId="slug_name" className="mb-3">
- <Form.Label>{t('form.fields.slug_name.label')}</Form.Label>
- <Form.Control
- value={formData.slugName.value}
- isInvalid={formData.slugName.isInvalid}
- disabled={!is_admin}
- onChange={handleSlugNameChange}
- />
- <Form.Text as="div">
- {t('form.fields.slug_name.info')}
- </Form.Text>
- <Form.Control.Feedback type="invalid">
- {formData.slugName.errorMsg}
- </Form.Control.Feedback>
- </Form.Group>
+ <Container className="pt-4 mt-2 mb-5 edit-answer-wrap">
+ <Row className="justify-content-center">
+ <Col xxl={10} md={12}>
+ <h3 className="mb-4">{t('title')}</h3>
+ </Col>
+ </Row>
+ <Row className="justify-content-center">
+ <Col xxl={7} lg={8} sm={12} className="mb-4 mb-md-0">
+ <Form noValidate onSubmit={handleSubmit}>
+ <Form.Group controlId="revision" className="mb-3">
+ <Form.Label>{t('form.fields.revision.label')}</Form.Label>
+ <Form.Select onChange={handleSelectedRevision}>
+ {revisions.map(({ create_at, reason, user_info }, index) => {
+ const date = dayjs(create_at * 1000)
+ .tz()
+ .format(t('long_date_with_time', { keyPrefix: 'dates' }));
+ return (
+ <option key={`${create_at}`} value={index}>
+ {`${date} - ${user_info.display_name} - ${
+ reason || t('default_reason')
+ }`}
+ </option>
+ );
+ })}
+ </Form.Select>
+ </Form.Group>
+ <Form.Group controlId="display_name" className="mb-3">
+ <Form.Label>{t('form.fields.display_name.label')}</Form.Label>
+ <Form.Control
+ value={formData.displayName.value}
+ isInvalid={formData.displayName.isInvalid}
+ disabled={!is_admin}
+ onChange={handleDisplayNameChange}
+ />
- <Form.Group controlId="description" className="mt-4">
- <Form.Label>{t('form.fields.desc.label')}</Form.Label>
- <Editor
- value={formData.description.value}
- onChange={handleDescriptionChange}
- className={classNames(
- 'form-control p-0',
- focusType === 'description' && 'focus',
- )}
- onFocus={() => {
- setForceType('description');
- }}
- onBlur={() => {
- setForceType('');
- }}
- ref={editorRef}
- />
- <Form.Control
- value={formData.description.value}
- type="text"
- isInvalid={formData.description.isInvalid}
- readOnly
- hidden
- />
- <Form.Control.Feedback type="invalid">
- {formData.description.errorMsg}
- </Form.Control.Feedback>
- </Form.Group>
- <Form.Group controlId="edit_summary" className="my-3">
- <Form.Label>{t('form.fields.edit_summary.label')}</Form.Label>
- <Form.Control
- type="text"
- defaultValue={formData.editSummary.value}
- isInvalid={formData.editSummary.isInvalid}
- onChange={handleEditSummaryChange}
- placeholder={t('form.fields.edit_summary.placeholder')}
- />
- <Form.Control.Feedback type="invalid">
- {formData.editSummary.errorMsg}
- </Form.Control.Feedback>
- </Form.Group>
+ <Form.Control.Feedback type="invalid">
+ {formData.displayName.errorMsg}
+ </Form.Control.Feedback>
+ </Form.Group>
+ <Form.Group controlId="slug_name" className="mb-3">
+ <Form.Label>{t('form.fields.slug_name.label')}</Form.Label>
+ <Form.Control
+ value={formData.slugName.value}
+ isInvalid={formData.slugName.isInvalid}
+ disabled={!is_admin}
+ onChange={handleSlugNameChange}
+ />
+ <Form.Text as="div">{t('form.fields.slug_name.info')}</Form.Text>
+ <Form.Control.Feedback type="invalid">
+ {formData.slugName.errorMsg}
+ </Form.Control.Feedback>
+ </Form.Group>
- <div className="mt-3">
- <Button type="submit">{t('btn_save_edits')}</Button>
- <Button variant="link" className="ms-2" onClick={backPage}>
- {t('btn_cancel')}
- </Button>
- </div>
- </Form>
- </Col>
- <Col xxl={3} lg={4} sm={12} className="mt-5 mt-lg-0">
- <Card>
- <Card.Header>
- {t('title', { keyPrefix: 'how_to_format' })}
- </Card.Header>
- <Card.Body
- className="fmt small"
- dangerouslySetInnerHTML={{
- __html: t('desc', { keyPrefix: 'how_to_format' }),
+ <Form.Group controlId="description" className="mt-4">
+ <Form.Label>{t('form.fields.desc.label')}</Form.Label>
+ <Editor
+ value={formData.description.value}
+ onChange={handleDescriptionChange}
+ className={classNames(
+ 'form-control p-0',
+ focusType === 'description' && 'focus',
+ )}
+ onFocus={() => {
+ setForceType('description');
}}
+ onBlur={() => {
+ setForceType('');
+ }}
+ ref={editorRef}
+ />
+ <Form.Control
+ value={formData.description.value}
+ type="text"
+ isInvalid={formData.description.isInvalid}
+ readOnly
+ hidden
/>
- </Card>
- </Col>
- </Row>
- </Container>
- </>
+ <Form.Control.Feedback type="invalid">
+ {formData.description.errorMsg}
+ </Form.Control.Feedback>
+ </Form.Group>
+ <Form.Group controlId="edit_summary" className="my-3">
+ <Form.Label>{t('form.fields.edit_summary.label')}</Form.Label>
+ <Form.Control
+ type="text"
+ defaultValue={formData.editSummary.value}
+ isInvalid={formData.editSummary.isInvalid}
+ onChange={handleEditSummaryChange}
+ placeholder={t('form.fields.edit_summary.placeholder')}
+ />
+ <Form.Control.Feedback type="invalid">
+ {formData.editSummary.errorMsg}
+ </Form.Control.Feedback>
+ </Form.Group>
+
+ <div className="mt-3">
+ <Button type="submit">{t('btn_save_edits')}</Button>
+ <Button variant="link" className="ms-2" onClick={backPage}>
+ {t('btn_cancel')}
+ </Button>
+ </div>
+ </Form>
+ </Col>
+ <Col xxl={3} lg={4} sm={12} className="mt-5 mt-lg-0">
+ <Card>
+ <Card.Header>
+ {t('title', { keyPrefix: 'how_to_format' })}
+ </Card.Header>
+ <Card.Body
+ className="fmt small"
+ dangerouslySetInnerHTML={{
+ __html: t('desc', { keyPrefix: 'how_to_format' }),
+ }}
+ />
+ </Card>
+ </Col>
+ </Row>
+ </Container>
);
};
diff --git a/ui/src/pages/Tags/Info/index.tsx b/ui/src/pages/Tags/Info/index.tsx
index 74834325..c28600e7 100644
--- a/ui/src/pages/Tags/Info/index.tsx
+++ b/ui/src/pages/Tags/Info/index.tsx
@@ -5,7 +5,8 @@ import { useTranslation } from 'react-i18next';
import classNames from 'classnames';
-import { Tag, TagSelector, FormatTime, Modal, PageTitle } from '@/components';
+import { usePageTags } from '@/hooks';
+import { Tag, TagSelector, FormatTime, Modal } from '@/components';
import {
useTagInfo,
useQuerySynonymsTags,
@@ -26,7 +27,15 @@ const TagIntroduction = () => {
const { t } = useTranslation('translation', { keyPrefix: 'tag_info' });
const navigate = useNavigate();
const { data: synonymsData, mutate } = useQuerySynonymsTags(tagInfo?.tag_id);
-
+ let pageTitle = '';
+ if (tagInfo) {
+ pageTitle = `'${tagInfo.display_name}' ${t('tag_wiki', {
+ keyPrefix: 'page_title',
+ })}`;
+ }
+ usePageTags({
+ title: pageTitle,
+ });
useEffect(() => {
if (locationState?.isReview) {
toastStore.getState().show({
@@ -35,7 +44,6 @@ const TagIntroduction = () => {
});
}
}, [locationState]);
-
if (!tagInfo) {
return null;
}
@@ -100,145 +108,132 @@ const TagIntroduction = () => {
}
};
- let pageTitle = '';
- if (tagInfo) {
- pageTitle = `'${tagInfo.display_name}' ${t('tag_wiki', {
- keyPrefix: 'page_title',
- })}`;
- }
-
return (
- <>
- <PageTitle title={pageTitle} />
- <Container className="pt-4 mt-2 mb-5">
- <Row className="justify-content-center">
- <Col xxl={7} lg={8} sm={12}>
- <h3 className="mb-3">
- <Link
- to={pathFactory.tagLanding(tagInfo.slug_name)}
- replace
- className="link-dark">
- {tagInfo.display_name}
- </Link>
- </h3>
-
- <div className="text-secondary mb-4 fs-14">
- <FormatTime preFix={t('created_at')} time={tagInfo.created_at} />
- <FormatTime
- preFix={t('edited_at')}
- className="ms-3"
- time={tagInfo.updated_at}
- />
- </div>
+ <Container className="pt-4 mt-2 mb-5">
+ <Row className="justify-content-center">
+ <Col xxl={7} lg={8} sm={12}>
+ <h3 className="mb-3">
+ <Link
+ to={pathFactory.tagLanding(tagInfo.slug_name)}
+ replace
+ className="link-dark">
+ {tagInfo.display_name}
+ </Link>
+ </h3>
- <div
- className="content text-break"
- dangerouslySetInnerHTML={{ __html: tagInfo?.parsed_text }}
+ <div className="text-secondary mb-4 fs-14">
+ <FormatTime preFix={t('created_at')} time={tagInfo.created_at} />
+ <FormatTime
+ preFix={t('edited_at')}
+ className="ms-3"
+ time={tagInfo.updated_at}
/>
- <div className="mt-4">
- {tagInfo?.member_actions.map((action, index) => {
- return (
- <Button
- key={action.name}
- variant="link"
- className={classNames(
- 'link-secondary btn-no-border p-0 fs-14',
- index > 0 && 'ms-3',
- )}
- onClick={() => onAction(action)}>
- {action.name}
- </Button>
- );
- })}
- {isLogged && (
- <Link
- to={`/tags/${tagInfo?.tag_id}/timeline`}
+ </div>
+
+ <div
+ className="content text-break"
+ dangerouslySetInnerHTML={{ __html: tagInfo?.parsed_text }}
+ />
+ <div className="mt-4">
+ {tagInfo?.member_actions.map((action, index) => {
+ return (
+ <Button
+ key={action.name}
+ variant="link"
className={classNames(
'link-secondary btn-no-border p-0 fs-14',
- tagInfo?.member_actions?.length > 0 && 'ms-3',
- )}>
- {t('history')}
- </Link>
+ index > 0 && 'ms-3',
+ )}
+ onClick={() => onAction(action)}>
+ {action.name}
+ </Button>
+ );
+ })}
+ {isLogged && (
+ <Link
+ to={`/tags/${tagInfo?.tag_id}/timeline`}
+ className={classNames(
+ 'link-secondary btn-no-border p-0 fs-14',
+ tagInfo?.member_actions?.length > 0 && 'ms-3',
+ )}>
+ {t('history')}
+ </Link>
+ )}
+ </div>
+ </Col>
+ <Col xxl={3} lg={4} sm={12} className="mt-5 mt-lg-0">
+ <Card>
+ <Card.Header className="d-flex justify-content-between">
+ <span>{t('synonyms.title')}</span>
+ {isEdit ? (
+ <Button
+ variant="link"
+ className="p-0 btn-no-border"
+ onClick={handleSave}>
+ {t('synonyms.btn_save')}
+ </Button>
+ ) : synonymsData?.member_actions?.find(
+ (v) => v.action === 'edit',
+ ) ? (
+ <Button
+ variant="link"
+ className="p-0 btn-no-border"
+ onClick={handleEdit}>
+ {t('synonyms.btn_edit')}
+ </Button>
+ ) : null}
+ </Card.Header>
+ <Card.Body>
+ {isEdit && (
+ <>
+ <div className="mb-3">
+ {t('synonyms.text')}{' '}
+ <Tag
+ data={{
+ slug_name: tagName || '',
+ main_tag_slug_name: '',
+ display_name: '',
+ recommend: false,
+ reserved: false,
+ }}
+ />
+ </div>
+ <TagSelector
+ value={synonymsData?.synonyms}
+ onChange={handleTagsChange}
+ hiddenDescription
+ />
+ </>
)}
- </div>
- </Col>
- <Col xxl={3} lg={4} sm={12} className="mt-5 mt-lg-0">
- <Card>
- <Card.Header className="d-flex justify-content-between">
- <span>{t('synonyms.title')}</span>
- {isEdit ? (
- <Button
- variant="link"
- className="p-0 btn-no-border"
- onClick={handleSave}>
- {t('synonyms.btn_save')}
- </Button>
- ) : synonymsData?.member_actions?.find(
- (v) => v.action === 'edit',
- ) ? (
- <Button
- variant="link"
- className="p-0 btn-no-border"
- onClick={handleEdit}>
- {t('synonyms.btn_edit')}
- </Button>
- ) : null}
- </Card.Header>
- <Card.Body>
- {isEdit && (
+ {!isEdit &&
+ (synonymsData?.synonyms && synonymsData.synonyms.length > 0 ? (
+ <div className="m-n1">
+ {synonymsData.synonyms.map((item) => {
+ return (
+ <Tag key={item.tag_id} className="m-1" data={item} />
+ );
+ })}
+ </div>
+ ) : (
<>
- <div className="mb-3">
- {t('synonyms.text')}{' '}
- <Tag
- data={{
- slug_name: tagName || '',
- main_tag_slug_name: '',
- display_name: '',
- recommend: false,
- reserved: false,
- }}
- />
- </div>
- <TagSelector
- value={synonymsData?.synonyms}
- onChange={handleTagsChange}
- hiddenDescription
- />
+ <div className="text-muted mb-3">{t('synonyms.empty')}</div>
+ {synonymsData?.member_actions?.find(
+ (v) => v.action === 'edit',
+ ) && (
+ <Button
+ variant="outline-primary"
+ size="sm"
+ onClick={handleEdit}>
+ {t('synonyms.btn_add')}
+ </Button>
+ )}
</>
- )}
- {!isEdit &&
- (synonymsData?.synonyms &&
- synonymsData.synonyms.length > 0 ? (
- <div className="m-n1">
- {synonymsData.synonyms.map((item) => {
- return (
- <Tag key={item.tag_id} className="m-1" data={item} />
- );
- })}
- </div>
- ) : (
- <>
- <div className="text-muted mb-3">
- {t('synonyms.empty')}
- </div>
- {synonymsData?.member_actions?.find(
- (v) => v.action === 'edit',
- ) && (
- <Button
- variant="outline-primary"
- size="sm"
- onClick={handleEdit}>
- {t('synonyms.btn_add')}
- </Button>
- )}
- </>
- ))}
- </Card.Body>
- </Card>
- </Col>
- </Row>
- </Container>
- </>
+ ))}
+ </Card.Body>
+ </Card>
+ </Col>
+ </Row>
+ </Container>
);
};
diff --git a/ui/src/pages/Tags/index.tsx b/ui/src/pages/Tags/index.tsx
index bbd55a99..0042252b 100644
--- a/ui/src/pages/Tags/index.tsx
+++ b/ui/src/pages/Tags/index.tsx
@@ -3,7 +3,8 @@ import { Container, Row, Col, Card, Button, Form } from 'react-bootstrap';
import { useSearchParams } from 'react-router-dom';
import { useTranslation } from 'react-i18next';
-import { Tag, Pagination, PageTitle, QueryGroup } from '@/components';
+import { usePageTags } from '@/hooks';
+import { Tag, Pagination, QueryGroup } from '@/components';
import { formatCount } from '@/utils';
import { useQueryTags, following } from '@/services';
@@ -37,81 +38,81 @@ const Tags = () => {
mutate();
});
};
+ usePageTags({
+ title: t('tags', { keyPrefix: 'page_title' }),
+ });
return (
- <>
- <PageTitle title={t('tags', { keyPrefix: 'page_title' })} />
- <Container className="py-3 my-3">
- <Row className="mb-4 d-flex justify-content-center">
- <Col xxl={10} sm={12}>
- <h3 className="mb-4">{t('title')}</h3>
- <div className="d-flex justify-content-between align-items-center flex-wrap">
- <Form>
- <Form.Group controlId="formBasicEmail">
- <Form.Control
- value={searchTag}
- placeholder={t('search_placeholder')}
- type="text"
- onChange={handleChange}
- size="sm"
- />
- </Form.Group>
- </Form>
- <QueryGroup
- data={sortBtns}
- currentSort={sort || 'popular'}
- sortKey="sort"
- i18nKeyPrefix="tags.sort_buttons"
- />
- </div>
- </Col>
+ <Container className="py-3 my-3">
+ <Row className="mb-4 d-flex justify-content-center">
+ <Col xxl={10} sm={12}>
+ <h3 className="mb-4">{t('title')}</h3>
+ <div className="d-flex justify-content-between align-items-center flex-wrap">
+ <Form>
+ <Form.Group controlId="formBasicEmail">
+ <Form.Control
+ value={searchTag}
+ placeholder={t('search_placeholder')}
+ type="text"
+ onChange={handleChange}
+ size="sm"
+ />
+ </Form.Group>
+ </Form>
+ <QueryGroup
+ data={sortBtns}
+ currentSort={sort || 'popular'}
+ sortKey="sort"
+ i18nKeyPrefix="tags.sort_buttons"
+ />
+ </div>
+ </Col>
- <Col className="mt-4" xxl={10} sm={12}>
- <Row>
- {tags?.list?.map((tag) => (
- <Col
- key={tag.slug_name}
- xs={12}
- lg={3}
- md={4}
- sm={6}
- className="mb-4">
- <Card className="h-100">
- <Card.Body className="d-flex flex-column align-items-start">
- <Tag className="mb-3" data={tag} />
+ <Col className="mt-4" xxl={10} sm={12}>
+ <Row>
+ {tags?.list?.map((tag) => (
+ <Col
+ key={tag.slug_name}
+ xs={12}
+ lg={3}
+ md={4}
+ sm={6}
+ className="mb-4">
+ <Card className="h-100">
+ <Card.Body className="d-flex flex-column align-items-start">
+ <Tag className="mb-3" data={tag} />
- <p className="fs-14 flex-fill text-break text-wrap text-truncate-4">
- {tag.original_text}
- </p>
- <div className="d-flex align-items-center">
- <Button
- className={`me-2 ${tag.is_follower ? 'active' : ''}`}
- variant="outline-primary"
- size="sm"
- onClick={() => handleFollow(tag)}>
- {tag.is_follower
- ? t('button_following')
- : t('button_follow')}
- </Button>
- <span className="text-secondary fs-14 text-nowrap">
- {formatCount(tag.question_count)} {t('tag_label')}
- </span>
- </div>
- </Card.Body>
- </Card>
- </Col>
- ))}
- </Row>
- <div className="d-flex justify-content-center">
- <Pagination
- currentPage={page}
- totalSize={tags?.count || 0}
- pageSize={pageSize}
- />
- </div>
- </Col>
- </Row>
- </Container>
- </>
+ <p className="fs-14 flex-fill text-break text-wrap text-truncate-4">
+ {tag.original_text}
+ </p>
+ <div className="d-flex align-items-center">
+ <Button
+ className={`me-2 ${tag.is_follower ? 'active' : ''}`}
+ variant="outline-primary"
+ size="sm"
+ onClick={() => handleFollow(tag)}>
+ {tag.is_follower
+ ? t('button_following')
+ : t('button_follow')}
+ </Button>
+ <span className="text-secondary fs-14 text-nowrap">
+ {formatCount(tag.question_count)} {t('tag_label')}
+ </span>
+ </div>
+ </Card.Body>
+ </Card>
+ </Col>
+ ))}
+ </Row>
+ <div className="d-flex justify-content-center">
+ <Pagination
+ currentPage={page}
+ totalSize={tags?.count || 0}
+ pageSize={pageSize}
+ />
+ </div>
+ </Col>
+ </Row>
+ </Container>
);
};
diff --git a/ui/src/pages/Timeline/index.tsx b/ui/src/pages/Timeline/index.tsx
index dfab48d5..40f593a2 100644
--- a/ui/src/pages/Timeline/index.tsx
+++ b/ui/src/pages/Timeline/index.tsx
@@ -3,10 +3,11 @@ import { Container, Row, Col, Form, Table } from 'react-bootstrap';
import { Link, useParams } from 'react-router-dom';
import { useTranslation } from 'react-i18next';
+import { usePageTags } from '@/hooks';
import { pathFactory } from '@/router/pathFactory';
import { loggedUserInfoStore } from '@/stores';
import { getTimelineData } from '@/services';
-import { PageTitle, Empty } from '@/components';
+import { Empty } from '@/components';
import * as Type from '@/common/interface';
import HistoryItem from './components/Item';
@@ -74,10 +75,11 @@ const Index: FC = () => {
const revisionList =
timelineData?.timeline?.filter((item) => item.revision_id > 0) || [];
-
+ usePageTags({
+ title: pageTitle,
+ });
return (
<Container className="py-3">
- <PageTitle title={pageTitle} />
<Row className="py-3 justify-content-center">
<Col xxl={10}>
<h5 className="mb-4">
diff --git a/ui/src/pages/Users/AccountForgot/index.tsx b/ui/src/pages/Users/AccountForgot/index.tsx
index 7af609cc..9ec0d4a7 100644
--- a/ui/src/pages/Users/AccountForgot/index.tsx
+++ b/ui/src/pages/Users/AccountForgot/index.tsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
import { Container, Col } from 'react-bootstrap';
import { Trans, useTranslation } from 'react-i18next';
-import { PageTitle } from '@/components';
+import { usePageTags } from '@/hooks';
import SendEmail from './components/sendEmail';
@@ -15,32 +15,31 @@ const Index: React.FC = () => {
setStep(param);
setEmail(mail);
};
-
+ usePageTags({
+ title: t('account_recovery', { keyPrefix: 'page_title' }),
+ });
return (
- <>
- <PageTitle title={t('account_recovery', { keyPrefix: 'page_title' })} />
- <Container style={{ paddingTop: '4rem', paddingBottom: '6rem' }}>
- <h3 className="text-center mb-5">{t('page_title')}</h3>
- {step === 1 && (
- <Col className="mx-auto" md={3}>
- <SendEmail visible={step === 1} callback={callback} />
- </Col>
- )}
- {step === 2 && (
- <Col className="mx-auto px-4" md={6}>
- <div className="text-center">
- <p>
- <Trans
- i18nKey="account_forgot.send_success"
- values={{ mail: email }}
- components={{ bold: <strong /> }}
- />
- </p>
- </div>
- </Col>
- )}
- </Container>
- </>
+ <Container style={{ paddingTop: '4rem', paddingBottom: '6rem' }}>
+ <h3 className="text-center mb-5">{t('page_title')}</h3>
+ {step === 1 && (
+ <Col className="mx-auto" md={3}>
+ <SendEmail visible={step === 1} callback={callback} />
+ </Col>
+ )}
+ {step === 2 && (
+ <Col className="mx-auto px-4" md={6}>
+ <div className="text-center">
+ <p>
+ <Trans
+ i18nKey="account_forgot.send_success"
+ values={{ mail: email }}
+ components={{ bold: <strong /> }}
+ />
+ </p>
+ </div>
+ </Col>
+ )}
+ </Container>
);
};
diff --git a/ui/src/pages/Users/ActivationResult/index.tsx b/ui/src/pages/Users/ActivationResult/index.tsx
index c0b33aab..77cdd52b 100644
--- a/ui/src/pages/Users/ActivationResult/index.tsx
+++ b/ui/src/pages/Users/ActivationResult/index.tsx
@@ -3,34 +3,34 @@ import { Container, Row, Col } from 'react-bootstrap';
import { Link, useLocation } from 'react-router-dom';
import { useTranslation } from 'react-i18next';
-import { PageTitle } from '@/components';
+import { usePageTags } from '@/hooks';
const Index: FC = () => {
const { t } = useTranslation('translation', { keyPrefix: 'account_result' });
const location = useLocation();
+ usePageTags({
+ title: t('account_activation', { keyPrefix: 'page_title' }),
+ });
return (
- <>
- <PageTitle title={t('account_activation', { keyPrefix: 'page_title' })} />
- <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>
- {location.pathname?.includes('success') && (
- <>
- <p className="text-center">{t('success')}</p>
- <div className="text-center">
- <Link to="/">{t('link')}</Link>
- </div>
- </>
- )}
+ <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>
+ {location.pathname?.includes('success') && (
+ <>
+ <p className="text-center">{t('success')}</p>
+ <div className="text-center">
+ <Link to="/">{t('link')}</Link>
+ </div>
+ </>
+ )}
- {location.pathname?.includes('failed') && (
- <p className="text-center">{t('invalid')}</p>
- )}
- </Col>
- </Row>
- </Container>
- </>
+ {location.pathname?.includes('failed') && (
+ <p className="text-center">{t('invalid')}</p>
+ )}
+ </Col>
+ </Row>
+ </Container>
);
};
diff --git a/ui/src/pages/Users/ActiveEmail/index.tsx b/ui/src/pages/Users/ActiveEmail/index.tsx
index 77a5afdf..e2da46fa 100644
--- a/ui/src/pages/Users/ActiveEmail/index.tsx
+++ b/ui/src/pages/Users/ActiveEmail/index.tsx
@@ -2,9 +2,9 @@ import { FC, memo, useEffect } from 'react';
import { useTranslation } from 'react-i18next';
import { useSearchParams, useNavigate } from 'react-router-dom';
+import { usePageTags } from '@/hooks';
import { loggedUserInfoStore } from '@/stores';
import { activateAccount } from '@/services';
-import { PageTitle } from '@/components';
const Index: FC = () => {
const { t } = useTranslation('translation', { keyPrefix: 'page_title' });
@@ -25,7 +25,10 @@ const Index: FC = () => {
navigate('/', { replace: true });
}
}, []);
- return <PageTitle title={t('account_activation')} />;
+ usePageTags({
+ title: t('account_activation'),
+ });
+ return null;
};
export default memo(Index);
diff --git a/ui/src/pages/Users/ChangeEmail/index.tsx b/ui/src/pages/Users/ChangeEmail/index.tsx
index cabc5e5f..33fcd8d3 100644
--- a/ui/src/pages/Users/ChangeEmail/index.tsx
+++ b/ui/src/pages/Users/ChangeEmail/index.tsx
@@ -2,23 +2,22 @@ import { FC, memo } from 'react';
import { Container, Col } from 'react-bootstrap';
import { useTranslation } from 'react-i18next';
-import { PageTitle } from '@/components';
+import { usePageTags } from '@/hooks';
import SendEmail from './components/sendEmail';
const Index: FC = () => {
const { t } = useTranslation('translation', { keyPrefix: 'change_email' });
-
+ usePageTags({
+ title: t('change_email', { keyPrefix: 'page_title' }),
+ });
return (
- <>
- <PageTitle title={t('change_email', { keyPrefix: 'page_title' })} />
- <Container style={{ paddingTop: '4rem', paddingBottom: '6rem' }}>
- <h3 className="text-center mb-5">{t('page_title')}</h3>
- <Col className="mx-auto" md={3}>
- <SendEmail />
- </Col>
- </Container>
- </>
+ <Container style={{ paddingTop: '4rem', paddingBottom: '6rem' }}>
+ <h3 className="text-center mb-5">{t('page_title')}</h3>
+ <Col className="mx-auto" md={3}>
+ <SendEmail />
+ </Col>
+ </Container>
);
};
diff --git a/ui/src/pages/Users/ConfirmNewEmail/index.tsx b/ui/src/pages/Users/ConfirmNewEmail/index.tsx
index 79b55ee7..c30cd801 100644
--- a/ui/src/pages/Users/ConfirmNewEmail/index.tsx
+++ b/ui/src/pages/Users/ConfirmNewEmail/index.tsx
@@ -3,9 +3,9 @@ import { Container, Row, Col } from 'react-bootstrap';
import { Link, useSearchParams } from 'react-router-dom';
import { useTranslation } from 'react-i18next';
+import { usePageTags } from '@/hooks';
import { loggedUserInfoStore } from '@/stores';
import { changeEmailVerify, getLoggedUserInfo } from '@/services';
-import { PageTitle } from '@/components';
const Index: FC = () => {
const { t } = useTranslation('translation', { keyPrefix: 'account_result' });
@@ -31,30 +31,29 @@ const Index: FC = () => {
});
}
}, []);
-
+ usePageTags({
+ title: t('confirm_email', { keyPrefix: 'page_title' }),
+ });
return (
- <>
- <PageTitle title={t('confirm_email', { keyPrefix: 'page_title' })} />
- <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>
- {step === 'success' && (
- <>
- <p className="text-center">{t('confirm_new_email')}</p>
- <div className="text-center">
- <Link to="/">{t('link')}</Link>
- </div>
- </>
- )}
+ <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>
+ {step === 'success' && (
+ <>
+ <p className="text-center">{t('confirm_new_email')}</p>
+ <div className="text-center">
+ <Link to="/">{t('link')}</Link>
+ </div>
+ </>
+ )}
- {step === 'invalid' && (
- <p className="text-center">{t('confirm_new_email_invalid')}</p>
- )}
- </Col>
- </Row>
- </Container>
- </>
+ {step === 'invalid' && (
+ <p className="text-center">{t('confirm_new_email_invalid')}</p>
+ )}
+ </Col>
+ </Row>
+ </Container>
);
};
diff --git a/ui/src/pages/Users/Login/index.tsx b/ui/src/pages/Users/Login/index.tsx
index 6b9b233e..ef2cf903 100644
--- a/ui/src/pages/Users/Login/index.tsx
+++ b/ui/src/pages/Users/Login/index.tsx
@@ -3,12 +3,13 @@ import { Container, Form, Button, Col } from 'react-bootstrap';
import { Link, useNavigate, useSearchParams } from 'react-router-dom';
import { Trans, useTranslation } from 'react-i18next';
+import { usePageTags } from '@/hooks';
import type {
LoginReqParams,
ImgCodeRes,
FormDataType,
} from '@/common/interface';
-import { PageTitle, Unactivate } from '@/components';
+import { Unactivate } from '@/components';
import { loggedUserInfoStore } from '@/stores';
import { guard, floppyNavigation, handleFormError } from '@/utils';
import { login, checkImgCode } from '@/services';
@@ -167,11 +168,12 @@ const Index: React.FC = () => {
setStep(2);
}
}, []);
-
+ usePageTags({
+ title: t('login', { keyPrefix: 'page_title' }),
+ });
return (
<Container style={{ paddingTop: '4rem', paddingBottom: '5rem' }}>
<h3 className="text-center mb-5">{t('page_title')}</h3>
- <PageTitle title={t('login', { keyPrefix: 'page_title' })} />
{step === 1 && (
<Col className="mx-auto" md={3}>
<Form noValidate onSubmit={handleSubmit}>
diff --git a/ui/src/pages/Users/Notifications/index.tsx b/ui/src/pages/Users/Notifications/index.tsx
index 1ee7158c..c96ead98 100644
--- a/ui/src/pages/Users/Notifications/index.tsx
+++ b/ui/src/pages/Users/Notifications/index.tsx
@@ -3,7 +3,7 @@ import { Container, Row, Col, ButtonGroup, Button } from 'react-bootstrap';
import { useTranslation } from 'react-i18next';
import { useParams, useNavigate } from 'react-router-dom';
-import { PageTitle } from '@/components';
+import { usePageTags } from '@/hooks';
import {
useQueryNotifications,
clearUnreadNotification,
@@ -66,67 +66,66 @@ const Notifications = () => {
const handleReadNotification = (id) => {
readNotification(id);
};
-
+ usePageTags({
+ title: t('notifications', { keyPrefix: 'page_title' }),
+ });
return (
- <>
- <PageTitle title={t('notifications', { keyPrefix: 'page_title' })} />
- <Container className="pt-4 mt-2 mb-5">
- <Row className="justify-content-center">
- <Col xxl={7} lg={8} sm={12}>
- <h3 className="mb-4">{t('title')}</h3>
- <div className="d-flex justify-content-between mb-3">
- <ButtonGroup size="sm">
- <Button
- as="a"
- href="/users/notifications/inbox"
- variant="outline-secondary"
- active={type === 'inbox'}
- onClick={(evt) => handleTypeChange(evt, 'inbox')}>
- {t('inbox')}
- </Button>
- <Button
- as="a"
- href="/users/notifications/achievement"
- variant="outline-secondary"
- active={type === 'achievement'}
- onClick={(evt) => handleTypeChange(evt, 'achievement')}>
- {t('achievement')}
- </Button>
- </ButtonGroup>
+ <Container className="pt-4 mt-2 mb-5">
+ <Row className="justify-content-center">
+ <Col xxl={7} lg={8} sm={12}>
+ <h3 className="mb-4">{t('title')}</h3>
+ <div className="d-flex justify-content-between mb-3">
+ <ButtonGroup size="sm">
<Button
- size="sm"
+ as="a"
+ href="/users/notifications/inbox"
variant="outline-secondary"
- onClick={handleUnreadNotification}>
- {t('all_read')}
+ active={type === 'inbox'}
+ onClick={(evt) => handleTypeChange(evt, 'inbox')}>
+ {t('inbox')}
+ </Button>
+ <Button
+ as="a"
+ href="/users/notifications/achievement"
+ variant="outline-secondary"
+ active={type === 'achievement'}
+ onClick={(evt) => handleTypeChange(evt, 'achievement')}>
+ {t('achievement')}
+ </Button>
+ </ButtonGroup>
+ <Button
+ size="sm"
+ variant="outline-secondary"
+ onClick={handleUnreadNotification}>
+ {t('all_read')}
+ </Button>
+ </div>
+ {type === 'inbox' && (
+ <Inbox
+ data={notificationData}
+ handleReadNotification={handleReadNotification}
+ />
+ )}
+ {type === 'achievement' && (
+ <Achievements
+ data={notificationData}
+ handleReadNotification={handleReadNotification}
+ />
+ )}
+ {(data?.count || 0) > PAGE_SIZE * page && (
+ <div className="d-flex justify-content-center align-items-center py-3">
+ <Button
+ variant="link"
+ className="btn-no-border"
+ onClick={handleLoadMore}>
+ {t('show_more')}
</Button>
</div>
- {type === 'inbox' && (
- <Inbox
- data={notificationData}
- handleReadNotification={handleReadNotification}
- />
- )}
- {type === 'achievement' && (
- <Achievements
- data={notificationData}
- handleReadNotification={handleReadNotification}
- />
- )}
- {(data?.count || 0) > PAGE_SIZE * page && (
- <div className="d-flex justify-content-center align-items-center py-3">
- <Button
- variant="link"
- className="btn-no-border"
- onClick={handleLoadMore}>
- {t('show_more')}
- </Button>
- </div>
- )}
- </Col>
- <Col xxl={3} lg={4} sm={12} className="mt-5 mt-lg-0" />
- </Row>
- </Container>
- </>
+ )}
+ </Col>
+ <Col xxl={3} lg={4} sm={12} className="mt-5 mt-lg-0" />
+ </Row>
+ </Container>
);
};
diff --git a/ui/src/pages/Users/PasswordReset/index.tsx b/ui/src/pages/Users/PasswordReset/index.tsx
index 7b262801..704e367f 100644
--- a/ui/src/pages/Users/PasswordReset/index.tsx
+++ b/ui/src/pages/Users/PasswordReset/index.tsx
@@ -3,10 +3,10 @@ import { Container, Col, Form, Button } from 'react-bootstrap';
import { Link, useSearchParams } from 'react-router-dom';
import { useTranslation } from 'react-i18next';
+import { usePageTags } from '@/hooks';
import { loggedUserInfoStore } from '@/stores';
import type { FormDataType } from '@/common/interface';
import { replacementPassword } from '@/services';
-import { PageTitle } from '@/components';
import { handleFormError } from '@/utils';
const Index: React.FC = () => {
@@ -112,89 +112,88 @@ const Index: React.FC = () => {
}
});
};
-
+ usePageTags({
+ title: t('account_recovery', { keyPrefix: 'page_title' }),
+ });
return (
- <>
- <PageTitle title={t('account_recovery', { keyPrefix: 'page_title' })} />
- <Container style={{ paddingTop: '4rem', paddingBottom: '6rem' }}>
- <h3 className="text-center mb-5">{t('page_title')}</h3>
- {step === 1 && (
- <Col className="mx-auto" md={3}>
- <Form noValidate onSubmit={handleSubmit} autoComplete="off">
- <Form.Group controlId="email" className="mb-3">
- <Form.Label>{t('password.label')}</Form.Label>
- <Form.Control
- autoComplete="off"
- required
- type="password"
- maxLength={32}
- isInvalid={formData.pass.isInvalid}
- onChange={(e) => {
- handleChange({
- pass: {
- value: e.target.value,
- isInvalid: false,
- errorMsg: '',
- },
- });
- }}
- />
- <Form.Control.Feedback type="invalid">
- {formData.pass.errorMsg}
- </Form.Control.Feedback>
- </Form.Group>
-
- <Form.Group controlId="password" className="mb-3">
- <Form.Label>{t('password_confirm.label')}</Form.Label>
- <Form.Control
- autoComplete="off"
- required
- type="password"
- maxLength={32}
- isInvalid={formData.passSecond.isInvalid}
- onChange={(e) => {
- handleChange({
- passSecond: {
- value: e.target.value,
- isInvalid: false,
- errorMsg: '',
- },
- });
- }}
- />
- <Form.Control.Feedback type="invalid">
- {formData.passSecond.errorMsg}
- </Form.Control.Feedback>
- </Form.Group>
-
- <div className="d-grid mb-3">
- <Button variant="primary" type="submit">
- {t('btn_name')}
- </Button>
- </div>
- </Form>
- </Col>
- )}
-
- {step === 2 && (
- <Col className="mx-auto px-4" md={6}>
- <div className="text-center">
- <p>{t('reset_success')}</p>
- <Link to="/users/login">{t('to_login')}</Link>
- </div>
- </Col>
- )}
-
- {step === 3 && (
- <Col className="mx-auto px-4" md={6}>
- <div className="text-center">
- <p>{t('link_invalid')}</p>
- <Link to="/users/login">{t('to_login')}</Link>
+ <Container style={{ paddingTop: '4rem', paddingBottom: '6rem' }}>
+ <h3 className="text-center mb-5">{t('page_title')}</h3>
+ {step === 1 && (
+ <Col className="mx-auto" md={3}>
+ <Form noValidate onSubmit={handleSubmit} autoComplete="off">
+ <Form.Group controlId="email" className="mb-3">
+ <Form.Label>{t('password.label')}</Form.Label>
+ <Form.Control
+ autoComplete="off"
+ required
+ type="password"
+ maxLength={32}
+ isInvalid={formData.pass.isInvalid}
+ onChange={(e) => {
+ handleChange({
+ pass: {
+ value: e.target.value,
+ isInvalid: false,
+ errorMsg: '',
+ },
+ });
+ }}
+ />
+ <Form.Control.Feedback type="invalid">
+ {formData.pass.errorMsg}
+ </Form.Control.Feedback>
+ </Form.Group>
+
+ <Form.Group controlId="password" className="mb-3">
+ <Form.Label>{t('password_confirm.label')}</Form.Label>
+ <Form.Control
+ autoComplete="off"
+ required
+ type="password"
+ maxLength={32}
+ isInvalid={formData.passSecond.isInvalid}
+ onChange={(e) => {
+ handleChange({
+ passSecond: {
+ value: e.target.value,
+ isInvalid: false,
+ errorMsg: '',
+ },
+ });
+ }}
+ />
+ <Form.Control.Feedback type="invalid">
+ {formData.passSecond.errorMsg}
+ </Form.Control.Feedback>
+ </Form.Group>
+
+ <div className="d-grid mb-3">
+ <Button variant="primary" type="submit">
+ {t('btn_name')}
+ </Button>
</div>
- </Col>
- )}
- </Container>
- </>
+ </Form>
+ </Col>
+ )}
+
+ {step === 2 && (
+ <Col className="mx-auto px-4" md={6}>
+ <div className="text-center">
+ <p>{t('reset_success')}</p>
+ <Link to="/users/login">{t('to_login')}</Link>
+ </div>
+ </Col>
+ )}
+
+ {step === 3 && (
+ <Col className="mx-auto px-4" md={6}>
+ <div className="text-center">
+ <p>{t('link_invalid')}</p>
+ <Link to="/users/login">{t('to_login')}</Link>
+ </div>
+ </Col>
+ )}
+ </Container>
);
};
diff --git a/ui/src/pages/Users/Personal/index.tsx b/ui/src/pages/Users/Personal/index.tsx
index 2eaceaf7..d14a3e38 100644
--- a/ui/src/pages/Users/Personal/index.tsx
+++ b/ui/src/pages/Users/Personal/index.tsx
@@ -3,7 +3,8 @@ import { Container, Row, Col, Button } from 'react-bootstrap';
import { useTranslation } from 'react-i18next';
import { useParams, useSearchParams } from 'react-router-dom';
-import { Pagination, FormatTime, PageTitle, Empty } from '@/components';
+import { usePageTags } from '@/hooks';
+import { Pagination, FormatTime, Empty } from '@/components';
import { loggedUserInfoStore } from '@/stores';
import {
usePersonalInfoByName,
@@ -50,9 +51,11 @@ const Personal: FC = () => {
pageTitle = `${userInfo.info.display_name} (${userInfo.info.username})`;
}
const { count = 0, list = [] } = listData?.[tabName] || {};
+ usePageTags({
+ title: pageTitle,
+ });
return (
<Container className="pt-4 mt-2 mb-5">
- <PageTitle title={pageTitle} />
<Row className="justify-content-center">
{userInfo?.info?.status !== 'normal' && userInfo?.info?.status_msg && (
<Alert data={userInfo?.info.status_msg} />
diff --git a/ui/src/pages/Users/Register/index.tsx b/ui/src/pages/Users/Register/index.tsx
index 811de77d..2fb0d03c 100644
--- a/ui/src/pages/Users/Register/index.tsx
+++ b/ui/src/pages/Users/Register/index.tsx
@@ -2,7 +2,8 @@ import React, { useState } from 'react';
import { Container } from 'react-bootstrap';
import { useTranslation } from 'react-i18next';
-import { PageTitle, Unactivate } from '@/components';
+import { usePageTags } from '@/hooks';
+import { Unactivate } from '@/components';
import SignUpForm from './components/SignUpForm';
@@ -13,11 +14,12 @@ const Index: React.FC = () => {
const onStep = () => {
setShowForm((bol) => !bol);
};
-
+ usePageTags({
+ title: t('sign_up', { keyPrefix: 'page_title' }),
+ });
return (
<Container style={{ paddingTop: '4rem', paddingBottom: '5rem' }}>
<h3 className="text-center mb-5">{t('page_title')}</h3>
- <PageTitle title={t('sign_up', { keyPrefix: 'page_title' })} />
{showForm ? (
<SignUpForm callback={onStep} />
) : (
diff --git a/ui/src/pages/Users/Settings/index.tsx b/ui/src/pages/Users/Settings/index.tsx
index dc591323..3c7cf204 100644
--- a/ui/src/pages/Users/Settings/index.tsx
+++ b/ui/src/pages/Users/Settings/index.tsx
@@ -3,9 +3,9 @@ import { Container, Row, Col } from 'react-bootstrap';
import { useTranslation } from 'react-i18next';
import { Outlet } from 'react-router-dom';
+import { usePageTags } from '@/hooks';
import type { FormDataType } from '@/common/interface';
import { getLoggedUserInfo } from '@/services';
-import { PageTitle } from '@/components';
import Nav from './components/Nav';
@@ -55,29 +55,27 @@ const Index: React.FC = () => {
useEffect(() => {
getProfile();
}, []);
+ usePageTags({
+ title: t('settings', { keyPrefix: 'page_title' }),
+ });
return (
- <>
- <PageTitle title={t('settings', { keyPrefix: 'page_title' })} />
- <Container className="mt-4 mb-5 pb-5">
- <Row className="justify-content-center">
- <Col xxl={10} md={12}>
- <h3 className="mb-4">
- {t('page_title', { keyPrefix: 'settings' })}
- </h3>
- </Col>
- </Row>
+ <Container className="mt-4 mb-5 pb-5">
+ <Row className="justify-content-center">
+ <Col xxl={10} md={12}>
+ <h3 className="mb-4">{t('page_title', { keyPrefix: 'settings' })}</h3>
+ </Col>
+ </Row>
- <Row>
- <Col xxl={1} />
- <Col md={3} lg={2} className="mb-3">
- <Nav />
- </Col>
- <Col md={9} lg={6}>
- <Outlet />
- </Col>
- </Row>
- </Container>
- </>
+ <Row>
+ <Col xxl={1} />
+ <Col md={3} lg={2} className="mb-3">
+ <Nav />
+ </Col>
+ <Col md={9} lg={6}>
+ <Outlet />
+ </Col>
+ </Row>
+ </Container>
);
};
diff --git a/ui/src/pages/Users/Suspended/index.tsx b/ui/src/pages/Users/Suspended/index.tsx
index 403595a9..c26071b1 100644
--- a/ui/src/pages/Users/Suspended/index.tsx
+++ b/ui/src/pages/Users/Suspended/index.tsx
@@ -1,29 +1,27 @@
import { useTranslation } from 'react-i18next';
+import { usePageTags } from '@/hooks';
import { loggedUserInfoStore } from '@/stores';
-import { PageTitle } from '@/components';
const Suspended = () => {
const { t } = useTranslation('translation', { keyPrefix: 'suspended' });
const userInfo = loggedUserInfoStore((state) => state.user);
-
+ usePageTags({
+ title: t('account_suspended', { keyPrefix: 'page_title' }),
+ });
if (userInfo.status !== 'forbidden') {
window.location.replace('/');
return null;
}
-
return (
- <>
- <PageTitle title={t('account_suspended', { keyPrefix: 'page_title' })} />
- <div className="d-flex flex-column align-items-center mt-5 pt-3">
- <h3 className="mb-5">{t('title')}</h3>
- <p className="text-center">
- {t('forever')}
- <br />
- {t('end')}
- </p>
- </div>
- </>
+ <div className="d-flex flex-column align-items-center mt-5 pt-3">
+ <h3 className="mb-5">{t('title')}</h3>
+ <p className="text-center">
+ {t('forever')}
+ <br />
+ {t('end')}
+ </p>
+ </div>
);
};
diff --git a/ui/src/services/admin/settings.ts b/ui/src/services/admin/settings.ts
index 6e0028c1..d4b366bb 100644
--- a/ui/src/services/admin/settings.ts
+++ b/ui/src/services/admin/settings.ts
@@ -80,7 +80,7 @@ export const getBrandSetting = () => {
return request.get('/answer/admin/api/siteinfo/branding');
};
-export const brandSetting = (params: Type.AdmingSettingBranding) => {
+export const brandSetting = (params: Type.AdminSettingBranding) => {
return request.put('/answer/admin/api/siteinfo/branding', params);
};
diff --git a/ui/src/services/client/tag.ts b/ui/src/services/client/tag.ts
index b13b9b52..87b62d39 100644
--- a/ui/src/services/client/tag.ts
+++ b/ui/src/services/client/tag.ts
@@ -42,10 +42,10 @@ export const useFollowingTags = () => {
export const useTagInfo = ({ id = '', name = '' }) => {
let apiUrl;
if (id) {
- apiUrl = `/answer/api/v1/tag/?id=${id}`;
+ apiUrl = `/answer/api/v1/tag?id=${id}`;
} else if (name) {
name = encodeURIComponent(name);
- apiUrl = `/answer/api/v1/tag/?name=${name}`;
+ apiUrl = `/answer/api/v1/tag?name=${name}`;
}
const { data, error } = useSWR<Type.TagInfo>(apiUrl, request.instance.get);
return {
diff --git a/ui/src/stores/branding.ts b/ui/src/stores/branding.ts
index 343c2423..ca21f930 100644
--- a/ui/src/stores/branding.ts
+++ b/ui/src/stores/branding.ts
@@ -1,11 +1,11 @@
import create from 'zustand';
-import { AdmingSettingBranding } from '@/common/interface';
+import { AdminSettingBranding } from '@/common/interface';
import { DEFAULT_LANG } from '@/common/constants';
interface InterfaceType {
- branding: AdmingSettingBranding;
- update: (params: AdmingSettingBranding) => void;
+ branding: AdminSettingBranding;
+ update: (params: AdminSettingBranding) => void;
}
const interfaceSetting = create<InterfaceType>((set) => ({
diff --git a/ui/src/stores/headInfo.ts b/ui/src/stores/headInfo.ts
deleted file mode 100644
index d01e0e61..00000000
--- a/ui/src/stores/headInfo.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import create from 'zustand';
-
-import { HeadInfo } from '@/common/interface';
-
-interface HeadInfoType {
- headInfo: HeadInfo;
- update: (params: HeadInfo) => void;
-}
-
-const headInfo = create<HeadInfoType>((set) => ({
- headInfo: {
- title: '',
- description: '',
- keywords: '',
- },
- update: (params) =>
- set((state) => {
- return {
- headInfo: {
- ...state.headInfo,
- ...params,
- },
- };
- }),
-}));
-
-export default headInfo;
diff --git a/ui/src/stores/index.ts b/ui/src/stores/index.ts
index bb5f8226..55f03a7d 100644
--- a/ui/src/stores/index.ts
+++ b/ui/src/stores/index.ts
@@ -4,7 +4,7 @@ import globalStore from './global';
import siteInfoStore from './siteInfo';
import interfaceStore from './interface';
import brandingStore from './branding';
-import headInfoStore from './headInfo';
+import pageTagStore from './pageTags';
export {
toastStore,
@@ -13,5 +13,5 @@ export {
siteInfoStore,
interfaceStore,
brandingStore,
- headInfoStore,
+ pageTagStore,
};
diff --git a/ui/src/stores/pageTags.ts b/ui/src/stores/pageTags.ts
new file mode 100644
index 00000000..6455f937
--- /dev/null
+++ b/ui/src/stores/pageTags.ts
@@ -0,0 +1,45 @@
+import create from 'zustand';
+
+import { HelmetBase, HelmetUpdate } from '@/common/interface';
+
+import siteInfoStore from './siteInfo';
+
+interface HelmetStore {
+ items: HelmetBase;
+ update: (params: HelmetUpdate) => void;
+}
+
+const makePageTitle = (title = '', subtitle = '') => {
+ const { siteInfo } = siteInfoStore.getState();
+ if (!subtitle) {
+ subtitle = `${siteInfo.name}`;
+ }
+ let pageTitle = subtitle;
+ if (title && title !== subtitle) {
+ pageTitle = `${title}${subtitle ? ` - ${subtitle}` : ''}`;
+ }
+ return pageTitle;
+};
+
+const pageTags = create<HelmetStore>((set) => ({
+ items: {
+ pageTitle: '',
+ description: '',
+ keywords: '',
+ },
+ update: (params) => {
+ const o: HelmetBase = {};
+ if (params.title || params.subtitle) {
+ o.pageTitle = makePageTitle(params.title, params.subtitle);
+ }
+ o.description =
+ params.description || siteInfoStore.getState().siteInfo.description;
+ o.keywords = params.keywords || '';
+
+ set({
+ items: o,
+ });
+ },
+}));
+
+export default pageTags;
diff --git a/ui/src/utils/common.ts b/ui/src/utils/common.ts
index 32ad2159..cb6aea15 100644
--- a/ui/src/utils/common.ts
+++ b/ui/src/utils/common.ts
@@ -179,7 +179,6 @@ function diffText(newText: string, oldText: string): string {
?.replace(/<input/gi, '&lt;input');
}
const diff = Diff.diffChars(oldText, newText);
- // console.log(diff);
const result = diff.map((part) => {
if (part.added) {
if (part.value.replace(/\n/g, '').length <= 0) {