From 4a59d5a1160b25f8cf3cdee8918ef76b8770a7c3 Mon Sep 17 00:00:00 2001
From: ArchiveBase <46082456+ArchiveBase@users.noreply.github.com>
Date: Tue, 5 Nov 2019 16:36:06 +0700
Subject: [PATCH 1/4] + blocked_services: add amazon
---
home/blocked_services.go | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/home/blocked_services.go b/home/blocked_services.go
index 4c9f4f93..91f32bd0 100644
--- a/home/blocked_services.go
+++ b/home/blocked_services.go
@@ -36,6 +36,26 @@ var serviceRulesArray = []svc{
{"steam", []string{"||steam.com^"}},
{"epic_games", []string{"||epicgames.com^"}},
{"mail_ru", []string{"||mail.ru^"}},
+ {"amazon", []string{
+ "||amazon.com^",
+ "||media-amazon.com^",
+ "||images-amazon.com^",
+ "||a2z.com^",
+ "||amazon.ae^",
+ "||amazon.ca^",
+ "||amazon.cn^",
+ "||amazon.de^",
+ "||amazon.es^",
+ "||amazon.fr^",
+ "||amazon.in^",
+ "||amazon.it^",
+ "||amazon.nl^",
+ "||amazon.com.au^",
+ "||amazon.com.br^",
+ "||amazon.co.jp^",
+ "||amazon.com.mx^",
+ "||amazon.co.uk^",
+ }},
{"tiktok", []string{
"||tiktok.com^",
"||snssdk.com^",
From d468daac76e1a0d5d4d453c35cd0fe136bde327e Mon Sep 17 00:00:00 2001
From: ArchiveBase <46082456+ArchiveBase@users.noreply.github.com>
Date: Tue, 5 Nov 2019 16:40:06 +0700
Subject: [PATCH 2/4] + client: add amazon icon
---
client/src/components/ui/Icons.js | 4 ++++
client/src/helpers/constants.js | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/client/src/components/ui/Icons.js b/client/src/components/ui/Icons.js
index 5ce84c65..52d07ac2 100644
--- a/client/src/components/ui/Icons.js
+++ b/client/src/components/ui/Icons.js
@@ -64,6 +64,10 @@ const Icons = () => (
+
+
+
+
diff --git a/client/src/helpers/constants.js b/client/src/helpers/constants.js
index ca19818e..430355a1 100644
--- a/client/src/helpers/constants.js
+++ b/client/src/helpers/constants.js
@@ -233,6 +233,10 @@ export const CLIENT_ID = {
export const SETTINGS_URLS = ['/encryption', '/dhcp', '/dns', '/settings', '/clients'];
export const SERVICES = [
+ {
+ id: 'amazon',
+ name: 'Amazon',
+ },
{
id: 'facebook',
name: 'Facebook',
From c49f62cfe674360fa04adf80bcd325a7ff55fab3 Mon Sep 17 00:00:00 2001
From: ArchiveBase <46082456+ArchiveBase@users.noreply.github.com>
Date: Wed, 6 Nov 2019 16:00:05 +0700
Subject: [PATCH 3/4] + blocked_services: add ebay
---
home/blocked_services.go | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/home/blocked_services.go b/home/blocked_services.go
index 91f32bd0..7740fadd 100644
--- a/home/blocked_services.go
+++ b/home/blocked_services.go
@@ -56,6 +56,33 @@ var serviceRulesArray = []svc{
"||amazon.com.mx^",
"||amazon.co.uk^",
}},
+ {"ebay", []string{
+ "||ebay.com^",
+ "||ebayimg.com^",
+ "||ebaystatic.com^",
+ "||ebaycdn.net^",
+ "||ebayinc.com^",
+ "||ebay.at^",
+ "||ebay.be^",
+ "||ebay.ca^",
+ "||ebay.ch^",
+ "||ebay.cn^",
+ "||ebay.de^",
+ "||ebay.es^",
+ "||ebay.fr^",
+ "||ebay.ie^",
+ "||ebay.in^",
+ "||ebay.it^",
+ "||ebay.ph^",
+ "||ebay.pl^",
+ "||ebay.nl^",
+ "||ebay.com.au^",
+ "||ebay.com.cn^",
+ "||ebay.com.hk^",
+ "||ebay.com.my^",
+ "||ebay.com.sg^",
+ "||ebay.co.uk^",
+ }},
{"tiktok", []string{
"||tiktok.com^",
"||snssdk.com^",
From b1c7497d0552b4abd796e82a166d55faa90a030f Mon Sep 17 00:00:00 2001
From: ArchiveBase <46082456+ArchiveBase@users.noreply.github.com>
Date: Wed, 6 Nov 2019 16:00:12 +0700
Subject: [PATCH 4/4] + client: add ebay icon
---
client/src/components/ui/Icons.js | 4 ++++
client/src/helpers/constants.js | 12 ++++++++----
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/client/src/components/ui/Icons.js b/client/src/components/ui/Icons.js
index 52d07ac2..aaf8afc5 100644
--- a/client/src/components/ui/Icons.js
+++ b/client/src/components/ui/Icons.js
@@ -68,6 +68,10 @@ const Icons = () => (
+
+
+
+
diff --git a/client/src/helpers/constants.js b/client/src/helpers/constants.js
index 430355a1..cd30e1bd 100644
--- a/client/src/helpers/constants.js
+++ b/client/src/helpers/constants.js
@@ -233,10 +233,6 @@ export const CLIENT_ID = {
export const SETTINGS_URLS = ['/encryption', '/dhcp', '/dns', '/settings', '/clients'];
export const SERVICES = [
- {
- id: 'amazon',
- name: 'Amazon',
- },
{
id: 'facebook',
name: 'Facebook',
@@ -281,6 +277,14 @@ export const SERVICES = [
id: 'skype',
name: 'Skype',
},
+ {
+ id: 'amazon',
+ name: 'Amazon',
+ },
+ {
+ id: 'ebay',
+ name: 'eBay',
+ },
{
id: 'steam',
name: 'Steam',