mirror of
https://github.com/gosticks/web.git
synced 2026-08-12 12:10:20 +00:00
Merge pull request #421 from pi-hole/new/whitelist_regex_support
Review comments missed in #413
This commit is contained in:
@@ -4,10 +4,14 @@
|
||||
"Blacklist": "Blacklist",
|
||||
"Dashboard": "Dashboard",
|
||||
"Exact": "Exact",
|
||||
"Regex": "Regex",
|
||||
"Wildcard": "Wildcard",
|
||||
"Login": "Login",
|
||||
"Logout": "Logout",
|
||||
"Regex": "Regex",
|
||||
"Exact whitelist": "Exact whitelist",
|
||||
"Exact blacklist": "Exact blacklist",
|
||||
"Regex whitelist": "Regex whitelist",
|
||||
"Regex blacklist": "Regex blacklist",
|
||||
"Settings": "Settings",
|
||||
"Networking": "Networking",
|
||||
"Versions": "Versions",
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* Network-wide ad blocking via your own hardware.
|
||||
*
|
||||
* Web Interface
|
||||
* Regexlist page
|
||||
* RegexBlacklist page
|
||||
*
|
||||
* This file is copyright under the latest version of the EUPL.
|
||||
* Please see LICENSE file for your rights under this license. */
|
||||
@@ -14,7 +14,7 @@ import ListPage from "../components/list/ListPage";
|
||||
import api from "../util/api";
|
||||
import { isValidRegex } from "../util/validate";
|
||||
|
||||
const Regexlist: FunctionComponent<WithTranslation> = props => {
|
||||
const RegexBlacklist: FunctionComponent<WithTranslation> = props => {
|
||||
const { t } = props;
|
||||
|
||||
return (
|
||||
@@ -31,4 +31,4 @@ const Regexlist: FunctionComponent<WithTranslation> = props => {
|
||||
);
|
||||
};
|
||||
|
||||
export default withTranslation(["location", "lists"])(Regexlist);
|
||||
export default withTranslation(["location", "lists"])(RegexBlacklist);
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* Network-wide ad blocking via your own hardware.
|
||||
*
|
||||
* Web Interface
|
||||
* Regexlist page
|
||||
* RegexWhitelist page
|
||||
*
|
||||
* This file is copyright under the latest version of the EUPL.
|
||||
* Please see LICENSE file for your rights under this license. */
|
||||
@@ -14,7 +14,7 @@ import ListPage from "../components/list/ListPage";
|
||||
import api from "../util/api";
|
||||
import { isValidRegex } from "../util/validate";
|
||||
|
||||
const Regexlist: FunctionComponent<WithTranslation> = props => {
|
||||
const RegexWhitelist: FunctionComponent<WithTranslation> = props => {
|
||||
const { t } = props;
|
||||
|
||||
return (
|
||||
@@ -31,4 +31,4 @@ const Regexlist: FunctionComponent<WithTranslation> = props => {
|
||||
);
|
||||
};
|
||||
|
||||
export default withTranslation(["location", "lists"])(Regexlist);
|
||||
export default withTranslation(["location", "lists"])(RegexWhitelist);
|
||||
|
||||
Reference in New Issue
Block a user