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/components/ui/Accordion.js
View File

@@ -6,10 +6,10 @@ import './Accordion.css';
class Accordion extends Component {
state = {
isOpen: false,
}
};
handleClick = () => {
this.setState(prevState => ({ isOpen: !prevState.isOpen }));
this.setState((prevState) => ({ isOpen: !prevState.isOpen }));
};
render() {

4
client/src/components/ui/Checkbox.js
View File

@@ -1,6 +1,6 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { withNamespaces } from 'react-i18next';
import { withTranslation } from 'react-i18next';
import './Checkbox.css';
@@ -38,4 +38,4 @@ Checkbox.propTypes = {
t: PropTypes.func,
};
export default withNamespaces()(Checkbox);
export default withTranslation()(Checkbox);

6
client/src/components/ui/Dropdown.js
View File

@@ -1,7 +1,7 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import { withNamespaces } from 'react-i18next';
import { withTranslation } from 'react-i18next';
import enhanceWithClickOutside from 'react-click-outside';
import './Dropdown.css';
@@ -12,7 +12,7 @@ class Dropdown extends Component {
};
toggleDropdown = () => {
this.setState(prevState => ({ isOpen: !prevState.isOpen }));
this.setState((prevState) => ({ isOpen: !prevState.isOpen }));
};
hideDropdown = () => {
@@ -86,4 +86,4 @@ Dropdown.propTypes = {
icon: PropTypes.string,
};
export default withNamespaces()(enhanceWithClickOutside(Dropdown));
export default withTranslation()(enhanceWithClickOutside(Dropdown));

6
client/src/components/ui/EncryptionTopline.js
View File

@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Trans, withNamespaces } from 'react-i18next';
import { Trans, withTranslation } from 'react-i18next';
import isAfter from 'date-fns/is_after';
import addDays from 'date-fns/add_days';
@@ -23,7 +23,7 @@ const EncryptionTopline = (props) => {
</Trans>
</Topline>
);
} else if (isAboutExpire) {
} if (isAboutExpire) {
return (
<Topline type="warning">
<Trans components={[<a href="#encryption" key="0">link</a>]}>
@@ -40,4 +40,4 @@ EncryptionTopline.propTypes = {
notAfter: PropTypes.string.isRequired,
};
export default withNamespaces()(EncryptionTopline);
export default withTranslation()(EncryptionTopline);

6
client/src/components/ui/Footer.js
View File

@@ -1,6 +1,6 @@
import React, { Component, Fragment } from 'react';
import PropTypes from 'prop-types';
import { Trans, withNamespaces } from 'react-i18next';
import { Trans, withTranslation } from 'react-i18next';
import { REPOSITORY, PRIVACY_POLICY_LINK } from '../../helpers/constants';
import { LANGUAGES } from '../../helpers/twosky';
@@ -70,7 +70,7 @@ class Footer extends Component {
value={i18n.language}
onChange={this.changeLanguage}
>
{Object.keys(LANGUAGES).map(lang => (
{Object.keys(LANGUAGES).map((lang) => (
<option key={lang} value={lang}>
{LANGUAGES[lang]}
</option>
@@ -112,4 +112,4 @@ Footer.propTypes = {
getVersion: PropTypes.func,
};
export default withNamespaces()(Footer);
export default withTranslation()(Footer);

13
client/src/components/ui/Guide.js
View File

@@ -1,15 +1,14 @@
import React, { Fragment } from 'react';
import PropTypes from 'prop-types';
import { Trans, withNamespaces } from 'react-i18next';
import { Trans, withTranslation } from 'react-i18next';
import Tabs from '../ui/Tabs';
import Icons from '../ui/Icons';
import Tabs from './Tabs';
import Icons from './Icons';
const Guide = (props) => {
const { dnsAddresses } = props;
const tlsAddress = (dnsAddresses && dnsAddresses.filter(item => item.includes('tls://'))) || '';
const httpsAddress =
(dnsAddresses && dnsAddresses.filter(item => item.includes('https://'))) || '';
const tlsAddress = (dnsAddresses && dnsAddresses.filter((item) => item.includes('tls://'))) || '';
const httpsAddress = (dnsAddresses && dnsAddresses.filter((item) => item.includes('https://'))) || '';
const showDnsPrivacyNotice = httpsAddress.length < 1 && tlsAddress.length < 1;
return (
@@ -373,4 +372,4 @@ Guide.propTypes = {
t: PropTypes.func.isRequired,
};
export default withNamespaces()(Guide);
export default withTranslation()(Guide);

78
client/src/components/ui/Line.js
View File

@@ -4,51 +4,49 @@ import { ResponsiveLine } from '@nivo/line';
import './Line.css';
const Line = ({ data, color }) => (
data &&
<ResponsiveLine
data={data}
margin={{
top: 15,
right: 0,
bottom: 1,
left: 20,
}}
minY="auto"
stacked={false}
curve='linear'
axisBottom={null}
axisLeft={null}
enableGridX={false}
enableGridY={false}
enableDots={false}
enableArea={true}
animate={false}
colorBy={() => (color)}
tooltip={slice => (
<div>
{slice.data.map(d => (
<div key={d.serie.id} className="line__tooltip">
const Line = ({ data, color }) => data
&& <ResponsiveLine
data={data}
margin={{
top: 15,
right: 0,
bottom: 1,
left: 20,
}}
minY="auto"
stacked={false}
curve='linear'
axisBottom={null}
axisLeft={null}
enableGridX={false}
enableGridY={false}
enableDots={false}
enableArea={true}
animate={false}
colorBy={() => (color)}
tooltip={(slice) => (
<div>
{slice.data.map((d) => (
<div key={d.serie.id} className="line__tooltip">
<span className="line__tooltip-text">
<strong>{d.data.y}</strong>
<br/>
<br />
<small>{d.data.x}</small>
</span>
</div>
))}
</div>
)}
theme={{
tooltip: {
container: {
padding: '0',
background: '#333',
borderRadius: '4px',
},
</div>
))}
</div>
)}
theme={{
tooltip: {
container: {
padding: '0',
background: '#333',
borderRadius: '4px',
},
}}
/>
);
},
}}
/>;
Line.propTypes = {
data: PropTypes.array.isRequired,

2
client/src/components/ui/PageTitle.js
View File

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import './PageTitle.css';
const PageTitle = props => (
const PageTitle = (props) => (
<div className="page-header">
<h1 className="page-title">
{props.title}

4
client/src/components/ui/Popover.js
View File

@@ -1,6 +1,6 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { Trans, withNamespaces } from 'react-i18next';
import { Trans, withTranslation } from 'react-i18next';
import { getSourceData } from '../../helpers/trackers/trackers';
import { captitalizeWords } from '../../helpers/helpers';
@@ -53,4 +53,4 @@ Popover.propTypes = {
data: PropTypes.object.isRequired,
};
export default withNamespaces()(Popover);
export default withTranslation()(Popover);

4
client/src/components/ui/PopoverFilter.js
View File

@@ -1,6 +1,6 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { Trans, withNamespaces } from 'react-i18next';
import { Trans, withTranslation } from 'react-i18next';
import './Popover.css';
@@ -49,4 +49,4 @@ PopoverFilter.propTypes = {
service: PropTypes.string,
};
export default withNamespaces()(PopoverFilter);
export default withTranslation()(PopoverFilter);

10
client/src/components/ui/Status.js
View File

@@ -1,8 +1,8 @@
import React from 'react';
import PropTypes from 'prop-types';
import { withNamespaces, Trans } from 'react-i18next';
import { withTranslation, Trans } from 'react-i18next';
import Card from '../ui/Card';
import Card from './Card';
const Status = ({ message, buttonMessage, reloadPage }) => (
<div className="status">
@@ -10,8 +10,8 @@ const Status = ({ message, buttonMessage, reloadPage }) => (
<div className="h4 font-weight-light mb-4">
<Trans>{message}</Trans>
</div>
{buttonMessage &&
<button className="btn btn-success" onClick={reloadPage}>
{buttonMessage
&& <button className="btn btn-success" onClick={reloadPage}>
<Trans>{buttonMessage}</Trans>
</button>}
</Card>
@@ -24,4 +24,4 @@ Status.propTypes = {
reloadPage: PropTypes.func,
};
export default withNamespaces()(Status);
export default withTranslation()(Status);

8
client/src/components/ui/Tabler.css
View File

@@ -187,7 +187,7 @@ a {
color: #467fcf;
text-decoration: none;
background-color: transparent;
-webkit-text-decoration-skip: objects;
-webkittext-decoration-skip-ink: objects
}
a:hover {
@@ -9863,8 +9863,8 @@ body *:hover::-webkit-scrollbar-thumb {
}
a {
-webkit-text-decoration-skip: ink;
text-decoration-skip: ink;
-webkit-text-decoration-skip: auto;
text-decoration-skip-ink: auto
}
h1 a,
@@ -16243,4 +16243,4 @@ svg {
.fe-trash-2:before {
background-image: url('./svg/trash-2.svg');
}
/* stylelint-enable */
/* stylelint-enable */

2
client/src/components/ui/Tooltip.js
View File

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import './Tooltip.css';
const Tooltip = props => (
const Tooltip = (props) => (
<div data-tooltip={props.text} className={`tooltip-custom ${props.type || ''}`}></div>
);

2
client/src/components/ui/Topline.js
View File

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import './Topline.css';
const Topline = props => (
const Topline = (props) => (
<div className={`alert alert-${props.type} topline`}>
<div className="container">
{props.children}

4
client/src/components/ui/UpdateOverlay.js
View File

@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Trans, withNamespaces } from 'react-i18next';
import { Trans, withTranslation } from 'react-i18next';
import classnames from 'classnames';
import './Overlay.css';
@@ -23,4 +23,4 @@ UpdateOverlay.propTypes = {
processingUpdate: PropTypes.bool,
};
export default withNamespaces()(UpdateOverlay);
export default withTranslation()(UpdateOverlay);

10
client/src/components/ui/UpdateTopline.js
View File

@@ -1,10 +1,10 @@
import React, { Fragment } from 'react';
import PropTypes from 'prop-types';
import { Trans, withNamespaces } from 'react-i18next';
import { Trans, withTranslation } from 'react-i18next';
import Topline from './Topline';
const UpdateTopline = props => (
const UpdateTopline = (props) => (
<Topline type="info">
<Fragment>
<Trans
@@ -17,8 +17,8 @@ const UpdateTopline = props => (
>
update_announcement
</Trans>
{props.canAutoUpdate &&
<button
{props.canAutoUpdate
&& <button
type="button"
className="btn btn-sm btn-primary ml-3"
onClick={props.getUpdate}
@@ -39,4 +39,4 @@ UpdateTopline.propTypes = {
processingUpdate: PropTypes.bool,
};
export default withNamespaces()(UpdateTopline);
export default withTranslation()(UpdateTopline);

4
client/src/components/ui/Version.js
View File

@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Trans, withNamespaces } from 'react-i18next';
import { Trans, withTranslation } from 'react-i18next';
import './Version.css';
@@ -36,4 +36,4 @@ Version.propTypes = {
t: PropTypes.func.isRequired,
};
export default withNamespaces()(Version);
export default withTranslation()(Version);