a/badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
* 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

843
client/package-lock.json generated vendored
View File

File diff suppressed because it is too large Load Diff

8
client/src/components/Settings/Dns/index.js
View File

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