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

Use external links 

Squashed commit of the following:

commit 5617cde490beea6f09e1beef1ff8b8e151e26244
Merge: 0a6500e75 7f9a3a73b
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Tue Dec 8 18:34:19 2020 +0300

    Merge branch 'master' into use-external-links

commit 0a6500e75fbaa354a938c818f02f0b2419bd0d8e
Merge: 9d2ff3bb5 73c30590e
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Tue Dec 8 18:15:57 2020 +0300

    Merge branch 'master' into use-external-links

commit 9d2ff3bb5b3f5d5f08f26f54552ac07dd1724de5
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Tue Dec 8 18:04:09 2020 +0300

    client: open external links in new tab

commit 57d0ed09a8d90282b9dcad1c4943dd6d15a13cc8
Author: Zhijie He <hezhijie0327@hotmail.com>
Date:   Tue Nov 24 09:53:37 2020 +0800

    Encryption: use rel="noopener noreferrer"

commit 0554590059a3e9d5a9c1b576af2b409cff8c77e8
Author: Zhijie He <hezhijie0327@hotmail.com>
Date:   Tue Nov 24 09:51:19 2020 +0800

    Clients: use rel="noopener noreferrer"
This commit is contained in:
Artem Baskal 2020-12-08 18:47:47 +03:00
parent 7f9a3a73b4
commit 5c7b6bbf5c
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/Settings/Clients/Form.js
View File

@ -259,7 +259,7 @@ let Form = (props) => {
</div> </div>
<div className="form__desc mt-0 mb-2"> <div className="form__desc mt-0 mb-2">
<Trans components={[ <Trans components={[
<a href="https://github.com/AdguardTeam/AdGuardHome/wiki/Hosts-Blocklists#ctag" <a target="_blank" rel="noopener noreferrer" href="https://github.com/AdguardTeam/AdGuardHome/wiki/Hosts-Blocklists#ctag"
key="0">link</a>, key="0">link</a>,
]}> ]}>
tags_desc tags_desc

2
client/src/components/Settings/Encryption/Form.js
View File

@ -232,7 +232,7 @@ let Form = (props) => {
<Trans <Trans
values={{ link: 'letsencrypt.org' }} values={{ link: 'letsencrypt.org' }}
components={[ components={[
<a href="https://letsencrypt.org/" key="0"> <a target="_blank" rel="noopener noreferrer" href="https://letsencrypt.org/" key="0">
link link
</a>, </a>,
]} ]}

4
client/src/components/Settings/FiltersConfig/Form.js
View File

@ -7,7 +7,7 @@ import flow from 'lodash/flow';
import { CheckboxField, toNumber } from '../../../helpers/form'; import { CheckboxField, toNumber } from '../../../helpers/form';
import { import {
FILTERS_INTERVALS_HOURS, FILTERS_INTERVALS_HOURS,
FILTERS_LINK, FILTERS_RELATIVE_LINK,
FORM_NAME, FORM_NAME,
} from '../../../helpers/constants'; } from '../../../helpers/constants';
@ -45,7 +45,7 @@ const Form = (props) => {
} = props; } = props;
const components = { const components = {
a: <a href={FILTERS_LINK} rel="noopener noreferrer" />, a: <a href={FILTERS_RELATIVE_LINK} rel="noopener noreferrer" />,
}; };
return ( return (

4
client/src/helpers/constants.js
View File

@ -53,10 +53,10 @@ export const REPOSITORY = {
export const PRIVACY_POLICY_LINK = 'https://adguard.com/privacy/home.html'; export const PRIVACY_POLICY_LINK = 'https://adguard.com/privacy/home.html';
export const PORT_53_FAQ_LINK = 'https://github.com/AdguardTeam/AdGuardHome/wiki/FAQ#bindinuse'; export const PORT_53_FAQ_LINK = 'https://github.com/AdguardTeam/AdGuardHome/wiki/FAQ#bindinuse';
export const UPSTREAM_CONFIGURATION_WIKI_LINK = 'https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration#upstreams'; export const UPSTREAM_CONFIGURATION_WIKI_LINK = 'https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration#upstreams';
export const FILTERS_LINK = '#filters';
export const GETTING_STARTED_LINK = 'https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'; export const GETTING_STARTED_LINK = 'https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update';
export const FILTERS_RELATIVE_LINK = '#filters';
export const ADDRESS_IN_USE_TEXT = 'address already in use'; export const ADDRESS_IN_USE_TEXT = 'address already in use';
export const INSTALL_FIRST_STEP = 1; export const INSTALL_FIRST_STEP = 1;

2
client/src/install/Setup/AddressList.js
View File

@ -12,7 +12,7 @@ const renderItem = ({
return <li key={ip}>{isDns return <li key={ip}>{isDns
? <strong>{dnsAddress}</strong> ? <strong>{dnsAddress}</strong>
: <a href={webAddress}>{webAddress}</a> : <a href={webAddress} target="_blank" rel="noopener noreferrer">{webAddress}</a>
} }
</li>; </li>;
}; };