mirror of https://gitee.com/answerdev/answer.git
Merge remote-tracking branch 'origin/feat/1.1.2/ui' into test
This commit is contained in:
commit
fe621eadf2
|
@ -1263,6 +1263,9 @@ ui:
|
||||||
msg:
|
msg:
|
||||||
empty: Contact Email cannot be empty.
|
empty: Contact Email cannot be empty.
|
||||||
incorrect: Contact Email incorrect format.
|
incorrect: Contact Email incorrect format.
|
||||||
|
login_required:
|
||||||
|
label: Private
|
||||||
|
switch: Login required
|
||||||
admin_name:
|
admin_name:
|
||||||
label: Name
|
label: Name
|
||||||
msg: Name cannot be empty.
|
msg: Name cannot be empty.
|
||||||
|
@ -1434,7 +1437,7 @@ ui:
|
||||||
fields:
|
fields:
|
||||||
users:
|
users:
|
||||||
label: Bulk add user
|
label: Bulk add user
|
||||||
placeholder: "John Smith, john@example.com, BUSYopr2 \nAlice, alice@example.com, fpDntV8q"
|
placeholder: "John Smith, john@example.com, BUSYopr2\nAlice, alice@example.com, fpDntV8q"
|
||||||
text: Separate “name, email, password” with commas. One user per line.
|
text: Separate “name, email, password” with commas. One user per line.
|
||||||
msg: "Please enter the user's email, one per line."
|
msg: "Please enter the user's email, one per line."
|
||||||
display_name:
|
display_name:
|
||||||
|
|
|
@ -192,6 +192,26 @@ const Index: FC<Props> = ({ visible, data, changeCallback, nextCallback }) => {
|
||||||
</Form.Control.Feedback>
|
</Form.Control.Feedback>
|
||||||
</Form.Group>
|
</Form.Group>
|
||||||
|
|
||||||
|
<Form.Group controlId="login_required" className="mb-3">
|
||||||
|
<Form.Label>{t('login_required.label')}</Form.Label>
|
||||||
|
<Form.Check
|
||||||
|
type="switch"
|
||||||
|
id="login_required"
|
||||||
|
label={t('login_required.switch')}
|
||||||
|
checked={data.login_required.value}
|
||||||
|
onChange={(e) => {
|
||||||
|
console.log(e.target.checked);
|
||||||
|
changeCallback({
|
||||||
|
login_required: {
|
||||||
|
value: e.target.checked,
|
||||||
|
isInvalid: false,
|
||||||
|
errorMsg: '',
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Form.Group>
|
||||||
|
|
||||||
<h5>{t('admin_account')}</h5>
|
<h5>{t('admin_account')}</h5>
|
||||||
<Form.Group controlId="name" className="mb-3">
|
<Form.Group controlId="name" className="mb-3">
|
||||||
<Form.Label>{t('admin_name.label')}</Form.Label>
|
<Form.Label>{t('admin_name.label')}</Form.Label>
|
||||||
|
|
|
@ -84,6 +84,11 @@ const Index: FC = () => {
|
||||||
isInvalid: false,
|
isInvalid: false,
|
||||||
errorMsg: '',
|
errorMsg: '',
|
||||||
},
|
},
|
||||||
|
login_required: {
|
||||||
|
value: false,
|
||||||
|
isInvalid: false,
|
||||||
|
errorMsg: '',
|
||||||
|
},
|
||||||
name: {
|
name: {
|
||||||
value: '',
|
value: '',
|
||||||
isInvalid: false,
|
isInvalid: false,
|
||||||
|
@ -164,6 +169,7 @@ const Index: FC = () => {
|
||||||
site_name: formData.site_name.value,
|
site_name: formData.site_name.value,
|
||||||
site_url: formData.site_url.value,
|
site_url: formData.site_url.value,
|
||||||
contact_email: formData.contact_email.value,
|
contact_email: formData.contact_email.value,
|
||||||
|
login_required: formData.login_required.value,
|
||||||
name: formData.name.value,
|
name: formData.name.value,
|
||||||
password: formData.password.value,
|
password: formData.password.value,
|
||||||
email: formData.email.value,
|
email: formData.email.value,
|
||||||
|
|
|
@ -22,10 +22,14 @@ const Index: FC = () => {
|
||||||
if (!data?.icon) return null;
|
if (!data?.icon) return null;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="d-flex align-items-center">
|
<a
|
||||||
|
className="d-flex align-items-center"
|
||||||
|
href="https://www.algolia.com/"
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer">
|
||||||
<span className="small text-secondary me-2">{t('search_by')}</span>
|
<span className="small text-secondary me-2">{t('search_by')}</span>
|
||||||
<SvgIcon base64={data?.icon} />
|
<SvgIcon base64={data?.icon} />
|
||||||
</div>
|
</a>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue