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 | Bin 31498 -> 32583 bytes
 client/src/helpers/constants.js   |   4 ++++
 2 files changed, 4 insertions(+)

diff --git a/client/src/components/ui/Icons.js b/client/src/components/ui/Icons.js
index 5ce84c6597b06645ccaa858ec7ba192f69a8ae61..52d07ac25e363fac1823432dffd7b51c73fdc689 100644
GIT binary patch
delta 957
zcmX|=J&qJH5QVilCm<SaY+H8OZnq^!=!k$|k1(<bKr9;|4QP_d3E?70M4W&d5hA|l
zo<Z8_vg_y7t5@Eyf9`(&z5DTyo*y5N=ckYNhts>apI<$Fd3hfX@sN$b@5l1~l9phu
z44*@G(J!I96wJ5KTn%|!Lvfw+$}dGnFn*YsA&;mE7sKM`Y1&0zpQuWqdJD-}SY`1y
zvhh-pu^rn-yi5n7S+ZLT^%O%L-f){QVNn=vRormHm|`fm2`^hi8_{J_4fqOLB?~)1
zqj81?RFy}4g^obGyXYgnrow$DSnpw3m8DY@{|R7Br?!Hb`FMApvxZwAO4NZ=iLp$Z
zgPptxMOA{V$;yRT^~+{-aok;M5W>v0oDXlfCzr~N+s=$H`XSQF&@|yLrK=h<Y7+y*
z0$Yn%XgKW<5w^@ee41ZF|1Fs`kY4oRR8)Iw3k6#=F&KiSFDTlcfuM!0a^ED7Et3uw
z(K@mH5y+1QihaU~;)uik8{Q-csXfD3O*Azcl83D`h8DigaZ0ewRuUjpoi%M;BmO4}
z>G?Q#d{=VdPt0qdGW3eGYZqz@9MGWXfFJs<@!pbz*O=mmo>z#3)l`KaLKD;mc%72C
p`!4bH2Bc#2D-THjP{JoSZ<+zJU2Ed-jO&f+`P+-~^CA6u{SRnO$GHFi

delta 14
VcmX^9kFo0;<Ay-P&3&djJpnjl2J!#^

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 | Bin 32583 -> 33177 bytes
 client/src/helpers/constants.js   |  12 ++++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/client/src/components/ui/Icons.js b/client/src/components/ui/Icons.js
index 52d07ac25e363fac1823432dffd7b51c73fdc689..aaf8afc509c81743a624fe5a9cd308c6a3be75fa 100644
GIT binary patch
delta 465
zcmZutyGjI63`HwjTP+OJ8*h^P1a}IzSqt0kcX44976oP0X{NB>W-9-|La_1+to<P|
z^AZ;<F1g{HoO6=T@12+D-M5W9SS=S%8I)J6hqIf<NoK$Racp1nm0#D%p%(!g(ULEO
zFtRV5!)SQcV^wyNpWZI+3%HzQ7v6%IS{<_b0WlaT09i~N#!dt|N)a%Kor(%O21-cD
zf=!r+po2iALfw+?*rBtUiO_l&ny#clC52XU^ofk(yxO;6s<jujNYLAs<d8&WDoFDo
z39(n(Sgj2NgGt<6x9=EbeawO(axrqYmTg7;KTV5lA4W8k4}aLY?|8@_+vaO(=lSq=
WfYAgR2Rg9XKf>lU-+SM<kMkdOnr@o_

delta 14
WcmbQ)%yj%8<Ay%d%@53XdIA77tOq0j

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',