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

+ client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master

Browse Source 
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
This commit is contained in:
Artem Baskal
2020-05-22 17:06:05 +03:00
parent 8b25a4886e
commit 6f3cd4e7eb
131 changed files with 7454 additions and 8907 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/install/Setup/Auth.js
View File

@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Field, reduxForm } from 'redux-form';
import { withNamespaces, Trans } from 'react-i18next';
import { withTranslation, Trans } from 'react-i18next';
import flow from 'lodash/flow';
import i18n from '../../i18n';
@@ -98,7 +98,7 @@ Auth.propTypes = {
};
export default flow([
withNamespaces(),
withTranslation(),
reduxForm({
form: 'install',
destroyOnUnmount: false,

3
client/src/install/Setup/Controls.js
View File

@@ -77,8 +77,7 @@ class Controls extends Component {
<button
type="button"
className="btn btn-success btn-lg setup__button"
onClick={() =>
this.props.openDashboard(ip, port)}
onClick={() => this.props.openDashboard(ip, port)}
>
<Trans>open_dashboard</Trans>
</button>

6
client/src/install/Setup/Devices.js
View File

@@ -2,14 +2,14 @@ import React from 'react';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { reduxForm, formValueSelector } from 'redux-form';
import { Trans, withNamespaces } from 'react-i18next';
import { Trans, withTranslation } from 'react-i18next';
import flow from 'lodash/flow';
import Guide from '../../components/ui/Guide';
import Controls from './Controls';
import AddressList from './AddressList';
let Devices = props => (
let Devices = (props) => (
<div className="setup__step">
<div className="setup__group">
<div className="setup__subtitle">
@@ -54,7 +54,7 @@ Devices = connect((state) => {
})(Devices);
export default flow([
withNamespaces(),
withTranslation(),
reduxForm({
form: 'install',
destroyOnUnmount: false,

4
client/src/install/Setup/Greeting.js
View File

@@ -1,5 +1,5 @@
import React from 'react';
import { Trans, withNamespaces } from 'react-i18next';
import { Trans, withTranslation } from 'react-i18next';
import Controls from './Controls';
const Greeting = () => (
@@ -16,4 +16,4 @@ const Greeting = () => (
</div>
);
export default withNamespaces()(Greeting);
export default withTranslation()(Greeting);

8
client/src/install/Setup/Progress.js
View File

@@ -1,12 +1,12 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Trans, withNamespaces } from 'react-i18next';
import { Trans, withTranslation } from 'react-i18next';
import { INSTALL_TOTAL_STEPS } from '../../helpers/constants';
const getProgressPercent = step => (step / INSTALL_TOTAL_STEPS) * 100;
const getProgressPercent = (step) => (step / INSTALL_TOTAL_STEPS) * 100;
const Progress = props => (
const Progress = (props) => (
<div className="setup__progress">
<Trans>install_step</Trans> {props.step}/{INSTALL_TOTAL_STEPS}
<div className="setup__progress-wrap">
@@ -22,4 +22,4 @@ Progress.propTypes = {
step: PropTypes.number.isRequired,
};
export default withNamespaces()(Progress);
export default withTranslation()(Progress);

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

@@ -2,7 +2,7 @@ import React, { Component, Fragment } from 'react';
import { connect } from 'react-redux';
import PropTypes from 'prop-types';
import { Field, reduxForm, formValueSelector } from 'redux-form';
import { Trans, withNamespaces } from 'react-i18next';
import { Trans, withTranslation } from 'react-i18next';
import flow from 'lodash/flow';
import Controls from './Controls';
@@ -10,7 +10,9 @@ import AddressList from './AddressList';
import { getInterfaceIp } from '../../helpers/helpers';
import { ALL_INTERFACES_IP } from '../../helpers/constants';
import { renderInputField, required, validInstallPort, toNumber } from '../../helpers/form';
import {
renderInputField, required, validInstallPort, toNumber,
} from '../../helpers/form';
const STATIC_STATUS = {
ENABLED: 'yes',
@@ -18,7 +20,7 @@ const STATIC_STATUS = {
ERROR: 'error',
};
const renderInterfaces = (interfaces => (
const renderInterfaces = ((interfaces) => (
Object.keys(interfaces).map((item) => {
const option = interfaces[item];
const {
@@ -162,6 +164,7 @@ class Settings extends Component {
interfaces,
invalid,
config,
t,
} = this.props;
const {
status: webStatus,
@@ -192,7 +195,7 @@ class Settings extends Component {
onChange={handleChange}
>
<option value={ALL_INTERFACES_IP}>
<Trans>install_settings_all_interfaces</Trans>
{t('install_settings_all_interfaces')}
</option>
{renderInterfaces(interfaces)}
</Field>
@@ -216,11 +219,11 @@ class Settings extends Component {
</div>
</div>
<div className="col-12">
{webStatus &&
<div className="setup__error text-danger">
{webStatus
&& <div className="setup__error text-danger">
{webStatus}
{isWebFixAvailable &&
<button
{isWebFixAvailable
&& <button
type="button"
className="btn btn-secondary btn-sm ml-2"
onClick={() => this.handleAutofix('web')}
@@ -262,7 +265,7 @@ class Settings extends Component {
onChange={handleChange}
>
<option value={ALL_INTERFACES_IP}>
<Trans>install_settings_all_interfaces</Trans>
{t('install_settings_all_interfaces')}
</option>
{renderInterfaces(interfaces)}
</Field>
@@ -286,12 +289,12 @@ class Settings extends Component {
</div>
</div>
<div className="col-12">
{dnsStatus &&
<Fragment>
{dnsStatus
&& <Fragment>
<div className="setup__error text-danger">
{dnsStatus}
{isDnsFixAvailable &&
<button
{isDnsFixAvailable
&& <button
type="button"
className="btn btn-secondary btn-sm ml-2"
onClick={() => this.handleAutofix('dns')}
@@ -300,8 +303,8 @@ class Settings extends Component {
</button>
}
</div>
{isDnsFixAvailable &&
<div className="text-muted mb-2">
{isDnsFixAvailable
&& <div className="text-muted mb-2">
<p className="mb-1">
<Trans>autofix_warning_text</Trans>
</p>
@@ -387,7 +390,7 @@ const SettingsForm = connect((state) => {
})(Settings);
export default flow([
withNamespaces(),
withTranslation(),
reduxForm({
form: 'install',
destroyOnUnmount: false,

6
client/src/install/Setup/Submit.js
View File

@@ -2,12 +2,12 @@ import React from 'react';
import { connect } from 'react-redux';
import PropTypes from 'prop-types';
import { reduxForm, formValueSelector } from 'redux-form';
import { Trans, withNamespaces } from 'react-i18next';
import { Trans, withTranslation } from 'react-i18next';
import flow from 'lodash/flow';
import Controls from './Controls';
let Submit = props => (
let Submit = (props) => (
<div className="setup__step">
<div className="setup__group">
<h1 className="setup__title">
@@ -48,7 +48,7 @@ Submit = connect((state) => {
export default flow([
withNamespaces(),
withTranslation(),
reduxForm({
form: 'install',
destroyOnUnmount: false,

4
client/src/install/Setup/index.js
View File

@@ -112,8 +112,8 @@ class Setup extends Component {
return (
<Fragment>
{processingDefault && <Loading />}
{!processingDefault &&
<Fragment>
{!processingDefault
&& <Fragment>
<div className="setup">
<div className="setup__container">
<img src={logo} className="setup__logo" alt="logo" />