fix #693 + some bonus stuff (#698)

* Added 3 new softwares

* Added a syntax for DNS servers

* Update SoftwareSyntax.json

* Update SoftwareIcon.tsx

* Update index.ts

* Add files via upload

* Fixing the number issue

data/Software.json

@@ -158,5 +158,26 @@
     "homeUrl": "https://github.com/gorhill/uMatrix",
     "isAbpSubscribable": true,
     "name": "uMatrix"
+  },
+  {
+    "id": 26,
+    "downloadUrl": "https://f-droid.org/packages/org.blokada.alarm/",
+    "homeUrl": "https://blokada.org",
+    "isAbpSubscribable": false,
+    "name": "Blokada"
+  },
+  {
+    "id": 27,
+    "downloadUrl": "https://github.com/henrypp/hostsmgr/releases",
+    "homeUrl": "https://www.henrypp.org/product/hostsmgr",
+    "isAbpSubscribable": false,
+    "name": "hostsmgr"
+  },
+  {
+    "id": 28,
+    "downloadUrl": "https://zenz-solutions.de/personaldnsfilter",
+    "homeUrl": "https://zenz-solutions.de/personaldnsfilter",
+    "isAbpSubscribable": false,
+    "name": "personalDNSfilter"
   }
-]
+]

data/SoftwareSyntax.json

@@ -35,6 +35,18 @@
     "softwareId": 25,
     "syntaxId": 1
   },
+  {
+    "softwareId": 26,
+    "syntaxId": 1
+  },
+  {
+    "softwareId": 27,
+    "syntaxId": 1
+  },
+  {
+    "softwareId": 28,
+    "syntaxId": 1
+  },
   {
     "softwareId": 1,
     "syntaxId": 2
@@ -63,6 +75,14 @@
     "softwareId": 25,
     "syntaxId": 2
   },
+  {
+    "softwareId": 27,
+    "syntaxId": 2
+  },
+  {
+    "softwareId": 28,
+    "syntaxId": 2
+  },
   {
     "softwareId": 1,
     "syntaxId": 3
@@ -222,5 +242,17 @@
   {
     "softwareId": 5,
     "syntaxId": 21
+  },
+  {
+    "softwareId": 4,
+    "syntaxId": 22
+  },
+  {
+    "softwareId": 26,
+    "syntaxId": 22
+  },
+  {
+    "softwareId": 28,
+    "syntaxId": 22
   }
-]
+]

data/Syntax.json

@@ -11,7 +11,7 @@
   {
     "id": 3,
     "definitionUrl": "https://adblockplus.org/filters",
-    "name": "Adblock Plus (Latest/Unspecified Version)"
+    "name": "Adblock Plus"
   },
   {
     "id": 4,
@@ -91,5 +91,9 @@
     "id": 21,
     "definitionUrl": "https://github.com/gorhill/uBlock/wiki/Static-filter-syntax#include-file-name",
     "name": "uBlock Origin !#include-tag compilation"
+  },
+  {
+    "id": 22,
+    "name": "DNS servers"
   }
-]
+]

src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/SoftwareIcon.tsx

@@ -23,7 +23,10 @@ import {
     img22,
     img23,
     img24,
-    img25
+    img25,
+    img26,
+    img27,
+    img28
 } from "./imgs";
 
 interface IProps {
@@ -67,5 +70,8 @@ const icons: { [id: number]: IIcon; } = {
     22: { image: img22, imageTitle: "Diversion" },
     23: { image: img23, imageTitle: "dnsmasq" },
     24: { image: img24, imageTitle: "Slimjet" },
-    25: { image: img25, imageTitle: "uMatrix" }
+    25: { image: img25, imageTitle: "uMatrix" },
+    26: { image: img26, imageTitle: "Blokada" },
+    27: { image: img27, imageTitle: "hostsmgr" },
+    28: { image: img28, imageTitle: "personalDNSfilter" }
 };

src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/index.ts

@@ -22,6 +22,9 @@ import img22 from "./22-Diversion.png";
 import img23 from "./23-dnsmasq.png";
 import img24 from "./24-Slimjet.png";
 import img25 from "./25-uMatrix.png";
+import img26 from "./26-Blokada.png";
+import img27 from "./27-hostsmgr.png";
+import img28 from "./28-personalDNSfilter.png";
 
 export {
     img1,
@@ -47,5 +50,8 @@ export {
     img22,
     img23,
     img24,
-    img25
+    img25,
+    img26,
+    img27,
+    img28
     };