Merge: + client: Switch places for "Upstream DNS servers" and "DNS servers configuration"

* commit '3b0914715ee0be2a5b6236729b9976193db9bb17':
  + client: Switch places for "Upstream DNS servers" and "DNS servers configuration"
This commit is contained in:
Andrey Meshkov 2020-04-24 18:33:10 +03:00
commit cd15bb5cce
2 changed files with 606 additions and 245 deletions

843
client/package-lock.json generated vendored

File diff suppressed because it is too large Load Diff

View File

@ -33,16 +33,16 @@ class Dns extends Component {
{isDataLoading ?
<Loading /> :
<Fragment>
<Config
dnsConfig={dnsConfig}
setDnsConfig={setDnsConfig}
/>
<Upstream
processingTestUpstream={settings.processingTestUpstream}
testUpstream={testUpstream}
dnsConfig={dnsConfig}
setDnsConfig={setDnsConfig}
/>
<Config
dnsConfig={dnsConfig}
setDnsConfig={setDnsConfig}
/>
<Access access={access} setAccessList={setAccessList} />
</Fragment>}
</Fragment>