badguardhome/client/src/install/Setup/Devices.js

65 lines
1.8 KiB
JavaScript
Raw Normal View History

2019-01-18 17:17:48 +00:00
import React from 'react';
2019-02-01 16:52:42 +00:00
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { reduxForm, formValueSelector } from 'redux-form';
+ client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master Close #1597 Squashed commit of the following: commit 1eb89586dd71260e561420fe669abc8b56a506a1 Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed May 20 14:54:10 2020 +0300 Fix translation in install options commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed May 20 13:11:34 2020 +0300 Remove commented code commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 19:02:49 2020 +0300 Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version commit 3fcf73fb14cd9da508522d1a300b66af24da95e5 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 17:30:37 2020 +0300 Remove all unused dependencies commit e761810e3e54e188ada41245bdce7414cd0f03e8 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 16:35:24 2020 +0300 Remove unused dependencies commit d89d27da6befcaabcdc12bf5e7e94cbb24140010 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 16:14:09 2020 +0300 Update regular dependencies commit d2dfd01233d059870d5173ffd748cf61a477936f Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 15:34:10 2020 +0300 Update all dev dependancies commit 02b6fb480e9d310039fbe9b7aae062a41128f070 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 14:14:44 2020 +0300 Update all postcss packages commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 12:45:02 2020 +0300 Prevent git from converting linebreaks in .js files commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 12:43:01 2020 +0300 Prevent git from converting linebreaks in .js files commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 12:24:47 2020 +0300 Remove linebreak-style eslint rule commit df893dec53adebb1d662fe805fab508fd4ed5e06 Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon May 18 20:55:47 2020 +0300 Add prop types commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40 Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon May 18 18:52:07 2020 +0300 Update eslint and babel, fix eslint warnings commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230 Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon May 18 16:45:49 2020 +0300 Update css loading webpack rules commit 247fa1ed548ef0706a03fdada8309c1454d191f8 Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 16:13:49 2020 +0300 Suppress linebreak-style eslint error for Windows commit d6499aac507100d6918c849c06d739d80f2229f0 Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 14:55:07 2020 +0300 Suppress eslint exit code commit ae2d6c614ea23a90d515168f8752e959298894ef Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 14:05:18 2020 +0300 Edit css file warnings commit 60675050f2a5baebc679fc05da7e033e5c740d90 Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 13:10:26 2020 +0300 Remove uglifyjs plugin commit a27806434dd8672e71a26c7a2e810d77e5e229fa Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 01:29:17 2020 +0300 Fix DefinePlugin value commit 8f2966ca59195c2f70bca5072d20515d536f42a6 Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 01:05:03 2020 +0300 Update webpack
2020-05-22 14:06:05 +00:00
import { Trans, withTranslation } from 'react-i18next';
2019-02-01 16:52:42 +00:00
import flow from 'lodash/flow';
2019-01-18 17:17:48 +00:00
import Guide from '../../components/ui/Guide';
2019-01-18 17:17:48 +00:00
import Controls from './Controls';
2019-02-04 14:13:59 +00:00
import AddressList from './AddressList';
- client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master Close #1770 Squashed commit of the following: commit c1f75ea643623af78de020bd1bc49aa5b66e25c4 Merge: a5df78ad a869ec4c Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Jun 10 18:56:24 2020 +0300 Merge branch 'master' into fix/1770 commit a5df78ad303305efcafcfa2a170ff567a3a06db5 Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Jun 10 12:50:50 2020 +0300 Revert "Update locales" This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6. commit 4b2b4499dea12949c53bce4ceeed595c17df84c6 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Jun 9 19:56:34 2020 +0300 Update locales commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0 Author: ArtemBaskal <a.baskal@adguard.com> Date: Fri Jun 5 17:56:01 2020 +0300 Update Upstream component with new api, extract reduxForm HOC names in constant commit 72de3d5a92cc33d5b234c837879fc6990291e07b Merge: 92a4a6ae 501a4e06 Author: ArtemBaskal <a.baskal@adguard.com> Date: Fri Jun 5 15:55:39 2020 +0300 Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770 commit 501a4e06ab350e46ff78656141d925de9f2e4996 Author: Simon Zolin <s.zolin@adguard.com> Date: Fri Jun 5 12:47:13 2020 +0300 openapi commit 3930bd196572924f164ed011629356a0ac0ec631 Author: Simon Zolin <s.zolin@adguard.com> Date: Fri Jun 5 12:21:32 2020 +0300 * DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests" * use dnsproxy v0.29.0 commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059 Author: ArtemBaskal <a.baskal@adguard.com> Date: Thu Jun 4 18:53:42 2020 +0300 - client: Add default mode in the DNS settings
2020-06-10 16:04:19 +00:00
import { FORM_NAME } from '../../helpers/constants';
2019-01-18 17:17:48 +00:00
+ client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master Close #1597 Squashed commit of the following: commit 1eb89586dd71260e561420fe669abc8b56a506a1 Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed May 20 14:54:10 2020 +0300 Fix translation in install options commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed May 20 13:11:34 2020 +0300 Remove commented code commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 19:02:49 2020 +0300 Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version commit 3fcf73fb14cd9da508522d1a300b66af24da95e5 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 17:30:37 2020 +0300 Remove all unused dependencies commit e761810e3e54e188ada41245bdce7414cd0f03e8 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 16:35:24 2020 +0300 Remove unused dependencies commit d89d27da6befcaabcdc12bf5e7e94cbb24140010 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 16:14:09 2020 +0300 Update regular dependencies commit d2dfd01233d059870d5173ffd748cf61a477936f Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 15:34:10 2020 +0300 Update all dev dependancies commit 02b6fb480e9d310039fbe9b7aae062a41128f070 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 14:14:44 2020 +0300 Update all postcss packages commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 12:45:02 2020 +0300 Prevent git from converting linebreaks in .js files commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 12:43:01 2020 +0300 Prevent git from converting linebreaks in .js files commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 12:24:47 2020 +0300 Remove linebreak-style eslint rule commit df893dec53adebb1d662fe805fab508fd4ed5e06 Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon May 18 20:55:47 2020 +0300 Add prop types commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40 Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon May 18 18:52:07 2020 +0300 Update eslint and babel, fix eslint warnings commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230 Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon May 18 16:45:49 2020 +0300 Update css loading webpack rules commit 247fa1ed548ef0706a03fdada8309c1454d191f8 Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 16:13:49 2020 +0300 Suppress linebreak-style eslint error for Windows commit d6499aac507100d6918c849c06d739d80f2229f0 Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 14:55:07 2020 +0300 Suppress eslint exit code commit ae2d6c614ea23a90d515168f8752e959298894ef Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 14:05:18 2020 +0300 Edit css file warnings commit 60675050f2a5baebc679fc05da7e033e5c740d90 Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 13:10:26 2020 +0300 Remove uglifyjs plugin commit a27806434dd8672e71a26c7a2e810d77e5e229fa Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 01:29:17 2020 +0300 Fix DefinePlugin value commit 8f2966ca59195c2f70bca5072d20515d536f42a6 Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 01:05:03 2020 +0300 Update webpack
2020-05-22 14:06:05 +00:00
let Devices = (props) => (
2019-01-18 17:17:48 +00:00
<div className="setup__step">
<div className="setup__group">
<div className="setup__subtitle">
<Trans>install_devices_title</Trans>
</div>
2019-02-01 16:52:42 +00:00
<div className="setup__desc">
2019-01-18 17:17:48 +00:00
<Trans>install_devices_desc</Trans>
2019-02-01 16:52:42 +00:00
<div className="mt-1">
<Trans>install_devices_address</Trans>:
</div>
2019-02-04 14:13:59 +00:00
<div className="mt-1">
<AddressList
interfaces={props.interfaces}
address={props.dnsIp}
port={props.dnsPort}
isDns={true}
/>
2019-02-01 16:52:42 +00:00
</div>
</div>
<Guide />
2019-01-18 17:17:48 +00:00
</div>
<Controls />
</div>
);
2019-02-01 16:52:42 +00:00
Devices.propTypes = {
2019-02-04 14:13:59 +00:00
interfaces: PropTypes.object.isRequired,
2019-02-01 16:52:42 +00:00
dnsIp: PropTypes.string.isRequired,
dnsPort: PropTypes.number.isRequired,
};
const selector = formValueSelector('install');
Devices = connect((state) => {
const dnsIp = selector(state, 'dns.ip');
const dnsPort = selector(state, 'dns.port');
return {
dnsIp,
dnsPort,
};
})(Devices);
export default flow([
+ client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master Close #1597 Squashed commit of the following: commit 1eb89586dd71260e561420fe669abc8b56a506a1 Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed May 20 14:54:10 2020 +0300 Fix translation in install options commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed May 20 13:11:34 2020 +0300 Remove commented code commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 19:02:49 2020 +0300 Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version commit 3fcf73fb14cd9da508522d1a300b66af24da95e5 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 17:30:37 2020 +0300 Remove all unused dependencies commit e761810e3e54e188ada41245bdce7414cd0f03e8 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 16:35:24 2020 +0300 Remove unused dependencies commit d89d27da6befcaabcdc12bf5e7e94cbb24140010 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 16:14:09 2020 +0300 Update regular dependencies commit d2dfd01233d059870d5173ffd748cf61a477936f Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 15:34:10 2020 +0300 Update all dev dependancies commit 02b6fb480e9d310039fbe9b7aae062a41128f070 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 14:14:44 2020 +0300 Update all postcss packages commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 12:45:02 2020 +0300 Prevent git from converting linebreaks in .js files commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 12:43:01 2020 +0300 Prevent git from converting linebreaks in .js files commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 12:24:47 2020 +0300 Remove linebreak-style eslint rule commit df893dec53adebb1d662fe805fab508fd4ed5e06 Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon May 18 20:55:47 2020 +0300 Add prop types commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40 Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon May 18 18:52:07 2020 +0300 Update eslint and babel, fix eslint warnings commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230 Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon May 18 16:45:49 2020 +0300 Update css loading webpack rules commit 247fa1ed548ef0706a03fdada8309c1454d191f8 Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 16:13:49 2020 +0300 Suppress linebreak-style eslint error for Windows commit d6499aac507100d6918c849c06d739d80f2229f0 Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 14:55:07 2020 +0300 Suppress eslint exit code commit ae2d6c614ea23a90d515168f8752e959298894ef Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 14:05:18 2020 +0300 Edit css file warnings commit 60675050f2a5baebc679fc05da7e033e5c740d90 Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 13:10:26 2020 +0300 Remove uglifyjs plugin commit a27806434dd8672e71a26c7a2e810d77e5e229fa Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 01:29:17 2020 +0300 Fix DefinePlugin value commit 8f2966ca59195c2f70bca5072d20515d536f42a6 Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 01:05:03 2020 +0300 Update webpack
2020-05-22 14:06:05 +00:00
withTranslation(),
2019-02-01 16:52:42 +00:00
reduxForm({
- client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master Close #1770 Squashed commit of the following: commit c1f75ea643623af78de020bd1bc49aa5b66e25c4 Merge: a5df78ad a869ec4c Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Jun 10 18:56:24 2020 +0300 Merge branch 'master' into fix/1770 commit a5df78ad303305efcafcfa2a170ff567a3a06db5 Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Jun 10 12:50:50 2020 +0300 Revert "Update locales" This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6. commit 4b2b4499dea12949c53bce4ceeed595c17df84c6 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Jun 9 19:56:34 2020 +0300 Update locales commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0 Author: ArtemBaskal <a.baskal@adguard.com> Date: Fri Jun 5 17:56:01 2020 +0300 Update Upstream component with new api, extract reduxForm HOC names in constant commit 72de3d5a92cc33d5b234c837879fc6990291e07b Merge: 92a4a6ae 501a4e06 Author: ArtemBaskal <a.baskal@adguard.com> Date: Fri Jun 5 15:55:39 2020 +0300 Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770 commit 501a4e06ab350e46ff78656141d925de9f2e4996 Author: Simon Zolin <s.zolin@adguard.com> Date: Fri Jun 5 12:47:13 2020 +0300 openapi commit 3930bd196572924f164ed011629356a0ac0ec631 Author: Simon Zolin <s.zolin@adguard.com> Date: Fri Jun 5 12:21:32 2020 +0300 * DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests" * use dnsproxy v0.29.0 commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059 Author: ArtemBaskal <a.baskal@adguard.com> Date: Thu Jun 4 18:53:42 2020 +0300 - client: Add default mode in the DNS settings
2020-06-10 16:04:19 +00:00
form: FORM_NAME.INSTALL,
2019-02-01 16:52:42 +00:00
destroyOnUnmount: false,
forceUnregisterOnUnmount: true,
}),
])(Devices);