daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge: + DNS Rewrites: support wildcard domain name

Browse Source 
Closes #922

* commit '5ba45b91c9cfde84fc0866e6b3fca679504975e7':
  * client: fix render field for DNS settings
  + client: handle wildcard domains
  + DNS Rewrites: support wildcard domain name
This commit is contained in:
Ildar Kamalov
2019-12-23 14:02:21 +03:00
parent 482e9fd6f3 5ba45b91c9
commit c5537968b1
7 changed files with 100 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/components/Settings/Dns/Config/Form.js
View File

@@ -6,7 +6,7 @@ import { Trans, withNamespaces } from 'react-i18next';
import flow from 'lodash/flow';
import {
renderField,
renderInputField,
renderRadioField,
renderSelectField,
required,
@@ -45,7 +45,7 @@ let Form = ({
<Field
name="ratelimit"
type="number"
component={renderField}
component={renderInputField}
className="form-control"
placeholder={t('form_enter_rate_limit')}
normalize={toNumber}
@@ -90,7 +90,7 @@ let Form = ({
</div>
<Field
name="blocking_ipv4"
component={renderField}
component={renderInputField}
className="form-control"
placeholder={t('form_enter_ip')}
validate={[ipv4, required]}
@@ -107,7 +107,7 @@ let Form = ({
</div>
<Field
name="blocking_ipv6"
component={renderField}
component={renderInputField}
className="form-control"
placeholder={t('form_enter_ip')}
validate={[ipv6, required]}

19
client/src/components/Settings/Dns/Rewrites/Form.js
View File

@@ -20,6 +20,9 @@ const Form = (props) => {
return (
<form onSubmit={handleSubmit}>
<div className="modal-body">
<div className="form__desc form__desc--top">
<Trans>domain_desc</Trans>
</div>
<div className="form__group">
<Field
id="domain"
@@ -31,6 +34,22 @@ const Form = (props) => {
validate={[required, domain]}
/>
</div>
<Trans>examples_title</Trans>:
<ol className="leading-loose">
<li>
<code>example.org</code> – <Trans>example_rewrite_domain</Trans>
</li>
<li>
<code>*.example.org</code> –&nbsp;
<span>
<Trans components={[<code key="0">text</code>]}>
example_rewrite_wildcard
</Trans>
</span>
</li>
</ol>
<div className="form__group">
<Field
id="answer"