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

Merge branch 'master' into i18n

Browse Source
This commit is contained in:
Hoàng Rio
2018-10-30 13:07:54 +07:00
parent 9863c1f1ac 30f3eb446c
commit 21b8b233f8
16 changed files with 254 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/components/Dashboard/BlockedDomains.js
View File

@@ -21,8 +21,8 @@ class BlockedDomains extends Component {
const trackerData = getTrackerData(value);
return (
<div className="logs__row" title={value}>
<div className="logs__text">
<div className="logs__row">
<div className="logs__text" title={value}>
{value}
</div>
{trackerData && <Popover data={trackerData} />}

1
client/src/components/Dashboard/Clients.js
View File

@@ -24,6 +24,7 @@ class Clients extends Component {
Header: 'IP',
accessor: 'ip',
Cell: ({ value }) => (<div className="logs__row logs__row--overflow"><span className="logs__text" title={value}>{value}</span></div>),
sortMethod: (a, b) => parseInt(a.replace(/\./g, ''), 10) - parseInt(b.replace(/\./g, ''), 10),
}, {
Header: <Trans>Requests count</Trans>,
accessor: 'count',

4
client/src/components/Dashboard/QueriedDomains.js
View File

@@ -30,8 +30,8 @@ class QueriedDomains extends Component {
const trackerData = getTrackerData(value);
return (
<div className="logs__row" title={value}>
<div className="logs__text">
<div className="logs__row">
<div className="logs__text" title={value}>
{value}
</div>
{trackerData && <Popover data={trackerData} />}