p90524618
/
answer
mirror of https://gitee.com/answerdev/answer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'ui-v0.3' into test

This commit is contained in:
shuai 2022-11-11 11:24:28 +08:00
parent 0646c9f177 ca317c9e48
commit a1f687e871
4 changed files with 50 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/src/pages/Admin/Dashboard/components/HealthStatus/index.tsx
View File

@ -49,10 +49,13 @@ const HealthStatus: FC<IProps> = ({ data }) => {
</Col>
<Col xs={6}>
<span className="text-secondary me-1">{t('smtp')}</span>
<strong>{data.smtp ? t('enabled') : t('disabled')}</strong>
<Link to="/admin/smtp" className="ms-2">
{t('config')}
</Link>
{data.smtp ? (
<strong>{t('enabled')}</strong>
) : (
<Link to="/admin/smtp" className="ms-2">
{t('config')}
</Link>
)}
</Col>
<Col xs={6}>
<span className="text-secondary me-1">{t('timezone')}</span>

9
ui/src/pages/Admin/Dashboard/components/Statistics/index.tsx
View File

@ -38,10 +38,11 @@ const Statistics: FC<IProps> = ({ data }) => {
</Col>
<Col xs={6}>
<span className="text-secondary me-1">{t('flags')}</span>
<strong>{data.report_count}</strong>
<Link to="/admin/flags" className="ms-2">
{t('review')}
</Link>
<strong>
<Link to="/admin/flags" className="ms-2">
{data.report_count}
</Link>
</strong>
</Col>
</Row>
</Card.Body>

61
ui/src/pages/Install/components/FourthStep/index.tsx
View File

@ -16,14 +16,7 @@ const Index: FC<Props> = ({ visible, data, changeCallback, nextCallback }) => {
const checkValidated = (): boolean => {
let bol = true;
const {
site_name,
site_url,
contact_email,
admin_name,
admin_password,
admin_email,
} = data;
const { site_name, site_url, contact_email, name, password, email } = data;
if (!site_name.value) {
bol = false;
@ -71,37 +64,37 @@ const Index: FC<Props> = ({ visible, data, changeCallback, nextCallback }) => {
};
}
if (!admin_name.value) {
if (!name.value) {
bol = false;
data.admin_name = {
data.name = {
value: '',
isInvalid: true,
errorMsg: t('admin_name.msg'),
};
}
if (!admin_password.value) {
if (!password.value) {
bol = false;
data.admin_password = {
data.password = {
value: '',
isInvalid: true,
errorMsg: t('admin_password.msg'),
};
}
if (!admin_email.value) {
if (!email.value) {
bol = false;
data.admin_email = {
data.email = {
value: '',
isInvalid: true,
errorMsg: t('admin_email.msg.empty'),
};
}
if (admin_email.value && !admin_email.value.match(mailReg)) {
if (email.value && !email.value.match(mailReg)) {
bol = false;
data.admin_email = {
value: admin_email.value,
data.email = {
value: email.value,
isInvalid: true,
errorMsg: t('admin_email.msg.incorrect'),
};
@ -132,6 +125,7 @@ const Index: FC<Props> = ({ visible, data, changeCallback, nextCallback }) => {
required
value={data.site_name.value}
isInvalid={data.site_name.isInvalid}
maxLength={30}
onChange={(e) => {
changeCallback({
site_name: {
@ -152,6 +146,7 @@ const Index: FC<Props> = ({ visible, data, changeCallback, nextCallback }) => {
required
value={data.site_url.value}
isInvalid={data.site_url.isInvalid}
maxLength={512}
onChange={(e) => {
changeCallback({
site_url: {
@ -191,15 +186,16 @@ const Index: FC<Props> = ({ visible, data, changeCallback, nextCallback }) => {
</Form.Group>
<h5>{t('admin_account')}</h5>
<Form.Group controlId="admin_name" className="mb-3">
<Form.Group controlId="name" className="mb-3">
<Form.Label>{t('admin_name.label')}</Form.Label>
<Form.Control
required
value={data.admin_name.value}
isInvalid={data.admin_name.isInvalid}
value={data.name.value}
isInvalid={data.name.isInvalid}
maxLength={30}
onChange={(e) => {
changeCallback({
admin_name: {
name: {
value: e.target.value,
isInvalid: false,
errorMsg: '',
@ -208,20 +204,21 @@ const Index: FC<Props> = ({ visible, data, changeCallback, nextCallback }) => {
}}
/>
<Form.Control.Feedback type="invalid">
{data.admin_name.errorMsg}
{data.name.errorMsg}
</Form.Control.Feedback>
</Form.Group>
<Form.Group controlId="admin_password" className="mb-3">
<Form.Group controlId="password" className="mb-3">
<Form.Label>{t('admin_password.label')}</Form.Label>
<Form.Control
required
type="password"
value={data.admin_password.value}
isInvalid={data.admin_password.isInvalid}
maxLength={32}
value={data.password.value}
isInvalid={data.password.isInvalid}
onChange={(e) => {
changeCallback({
admin_password: {
password: {
value: e.target.value,
isInvalid: false,
errorMsg: '',
@ -231,19 +228,19 @@ const Index: FC<Props> = ({ visible, data, changeCallback, nextCallback }) => {
/>
<Form.Text>{t('admin_password.text')}</Form.Text>
<Form.Control.Feedback type="invalid">
{data.admin_password.errorMsg}
{data.password.errorMsg}
</Form.Control.Feedback>
</Form.Group>
<Form.Group controlId="admin_email" className="mb-3">
<Form.Group controlId="email" className="mb-3">
<Form.Label>{t('admin_email.label')}</Form.Label>
<Form.Control
required
value={data.admin_email.value}
isInvalid={data.admin_email.isInvalid}
value={data.email.value}
isInvalid={data.email.isInvalid}
onChange={(e) => {
changeCallback({
admin_email: {
email: {
value: e.target.value,
isInvalid: false,
errorMsg: '',
@ -253,7 +250,7 @@ const Index: FC<Props> = ({ visible, data, changeCallback, nextCallback }) => {
/>
<Form.Text>{t('admin_email.text')}</Form.Text>
<Form.Control.Feedback type="invalid">
{data.admin_email.errorMsg}
{data.email.errorMsg}
</Form.Control.Feedback>
</Form.Group>

18
ui/src/pages/Install/index.tsx
View File

@ -36,7 +36,7 @@ const Index: FC = () => {
const [formData, setFormData] = useState<FormDataType>({
lang: {
value: '',
value: 'en_US',
isInvalid: false,
errorMsg: '',
},
@ -85,17 +85,17 @@ const Index: FC = () => {
isInvalid: false,
errorMsg: '',
},
admin_name: {
name: {
value: '',
isInvalid: false,
errorMsg: '',
},
admin_password: {
password: {
value: '',
isInvalid: false,
errorMsg: '',
},
admin_email: {
email: {
value: '',
isInvalid: false,
errorMsg: '',
@ -166,9 +166,9 @@ const Index: FC = () => {
site_name: formData.site_name.value,
site_url: formData.site_url.value,
contact_email: formData.contact_email.value,
admin_name: formData.admin_name.value,
admin_password: formData.admin_password.value,
admin_email: formData.admin_email.value,
name: formData.name.value,
password: formData.password.value,
email: formData.email.value,
};
installBaseInfo(params)
.then(() => {
@ -246,9 +246,9 @@ const Index: FC = () => {
}
return (
<div className="page-wrap2">
<div className="page-wrap2 py-5">
<PageTitle title={t('install', { keyPrefix: 'page_title' })} />
<Container style={{ paddingTop: '74px' }}>
<Container className='py-3'>
<Row className="justify-content-center">
<Col lg={6}>
<h2 className="mb-4 text-center">{t('title')}</h2>