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

- client: fix static ip description

This commit is contained in:
Ildar Kamalov 2020-02-07 18:08:56 +03:00
parent cb12babc46
commit 26c47e59dd
2 changed files with 47 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/src/__locales/en.json
View File

@ -463,7 +463,10 @@
"client_confirm_unblock": "Are you sure you want to unblock the client \"{{ip}}\"?", "client_confirm_unblock": "Are you sure you want to unblock the client \"{{ip}}\"?",
"client_blocked": "Client \"{{ip}}\" successfully blocked", "client_blocked": "Client \"{{ip}}\" successfully blocked",
"client_unblocked": "Client \"{{ip}}\" successfully unblocked", "client_unblocked": "Client \"{{ip}}\" successfully unblocked",
"static_ip": "Static IP Address",
"static_ip_desc": "AdGuard Home is a server so it needs a static IP address to function properly. Otherwise, at some point, your router may assign a different IP address to this device.",
"set_static_ip": "Set a static IP address", "set_static_ip": "Set a static IP address",
"install_static_error": "We failed to determine if this network interface is configured by using a static IP address. Please set the static IP address manually.", "install_static_ok": "Good news, Static IP already configured",
"install_static_configure": "We have detected that a dynamic IP address is used — {{ip}}. We suggest you to set this IP address as static." "install_static_error": "AdGuard Home cannot configure it automatically for your OS. Please look for an instruction on how to do this manually",
"install_static_configure": "We have detected that a dynamic IP address is used — <0>{{ip}}</0>. Do you want to use your it as a static address?"
} }

75
client/src/install/Setup/Settings.js
View File

@ -7,7 +7,6 @@ import flow from 'lodash/flow';
import Controls from './Controls'; import Controls from './Controls';
import AddressList from './AddressList'; import AddressList from './AddressList';
import Accordion from '../../components/ui/Accordion';
import { getInterfaceIp } from '../../helpers/helpers'; import { getInterfaceIp } from '../../helpers/helpers';
import { ALL_INTERFACES_IP } from '../../helpers/constants'; import { ALL_INTERFACES_IP } from '../../helpers/constants';
@ -72,44 +71,41 @@ class Settings extends Component {
} }
getStaticIpMessage = (staticIp, handleStaticIp) => { getStaticIpMessage = (staticIp, handleStaticIp) => {
const { static: status, ip, error } = staticIp; const { static: status, ip } = staticIp;
if (!status || status === STATIC_STATUS.ENABLED) { if (!status) {
return ''; return '';
} }
return ( return (
<div className="col-12"> <Fragment>
<Fragment> {status === STATIC_STATUS.DISABLED && (
<Fragment>
<Trans values={{ ip }} components={[<strong key="0">text</strong>]}>
install_static_configure
</Trans>
<button
type="button"
className="btn btn-secondary btn-sm ml-2"
onClick={() => handleStaticIp()}
>
<Trans>set_static_ip</Trans>
</button>
</Fragment>
)}
{status === STATIC_STATUS.ERROR && (
<div className="text-danger"> <div className="text-danger">
{status === STATIC_STATUS.DISABLED && ( <Trans>install_static_error</Trans>
<Fragment>
<Trans values={{ ip }}>
install_static_configure
</Trans>
<button
type="button"
className="btn btn-secondary btn-sm ml-2"
onClick={() => handleStaticIp()}
>
<Trans>set_static_ip</Trans>
</button>
</Fragment>
)}
{status === STATIC_STATUS.ERROR && (
<Fragment>
<Trans>install_static_error</Trans>
<div className="mt-2 mb-2">
<Accordion label={this.props.t('error_details')}>
<span>{error}</span>
</Accordion>
</div>
</Fragment>
)}
<hr className="divider divider--small" />
</div> </div>
</Fragment> )}
</div> {status === STATIC_STATUS.ENABLED && (
<div className="text-success">
<Trans>
install_static_ok
</Trans>
</div>
)}
</Fragment>
); );
}; };
@ -208,6 +204,7 @@ class Settings extends Component {
</div> </div>
</div> </div>
</div> </div>
<div className="setup__group"> <div className="setup__group">
<div className="setup__subtitle"> <div className="setup__subtitle">
<Trans>install_settings_dns</Trans> <Trans>install_settings_dns</Trans>
@ -248,7 +245,6 @@ class Settings extends Component {
/> />
</div> </div>
</div> </div>
{this.getStaticIpMessage(staticIp, handleStaticIp)}
<div className="col-12"> <div className="col-12">
{dnsStatus && {dnsStatus &&
<Fragment> <Fragment>
@ -292,6 +288,19 @@ class Settings extends Component {
</div> </div>
</div> </div>
</div> </div>
<div className="setup__group">
<div className="setup__subtitle">
<Trans>static_ip</Trans>
</div>
<div className="mb-2">
<Trans>static_ip_desc</Trans>
</div>
{this.getStaticIpMessage(staticIp, handleStaticIp)}
</div>
<Controls invalid={invalid} /> <Controls invalid={invalid} />
</form> </form>
); );