From e45cc28f5b55b588ec471cf43166aa0438b1c2d6 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sun, 17 Feb 2019 03:35:06 +0100 Subject: [PATCH] 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 | 23 +++++++++++- data/SoftwareSyntax.json | 34 +++++++++++++++++- data/Syntax.json | 8 +++-- .../components/softwareIcon/SoftwareIcon.tsx | 10 ++++-- .../softwareIcon/imgs/26-Blokada.png | Bin 0 -> 1059 bytes .../softwareIcon/imgs/27-hostsmgr.png | Bin 0 -> 752 bytes .../imgs/28-personalDNSfilter.png | Bin 0 -> 885 bytes .../components/softwareIcon/imgs/index.ts | 8 ++++- 8 files changed, 76 insertions(+), 7 deletions(-) create mode 100644 src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/26-Blokada.png create mode 100644 src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/27-hostsmgr.png create mode 100644 src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/28-personalDNSfilter.png diff --git a/data/Software.json b/data/Software.json index 3c9a7e31d..8b8e81c15 100644 --- a/data/Software.json +++ b/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" } -] \ No newline at end of file +] diff --git a/data/SoftwareSyntax.json b/data/SoftwareSyntax.json index 1633b70c8..7738c3233 100644 --- a/data/SoftwareSyntax.json +++ b/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 } -] \ No newline at end of file +] diff --git a/data/Syntax.json b/data/Syntax.json index 88fe706d9..9f3245058 100644 --- a/data/Syntax.json +++ b/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" } -] \ No newline at end of file +] diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/SoftwareIcon.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/SoftwareIcon.tsx index a137cc3bf..0b5fe5633 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/SoftwareIcon.tsx +++ b/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" } }; diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/26-Blokada.png b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/26-Blokada.png new file mode 100644 index 0000000000000000000000000000000000000000..cb969fd0fea707d7cffef3fd4eabc004cfba1070 GIT binary patch literal 1059 zcmV+;1l;?HP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y9E;VFFSW*B01C&WbK~y+Tos?@#)ny#VKQyunYBeoft2H-V zjV*2Uh7H#_pd9|dxlo;h5V%$wZPkm`b-k|5Y0Ne2Rc*HAX0=MRwMaT3iqb{yLU_29 z7%DN%%Lq9tJbj;Y9#gE=<-0vQ`~9Bh`TT#k=U~+r;qF9`r77bYortph)H=4Dsbu3+ zjAhO}Po|2czg2UWGhv{d+QD)X!x8*L9*f7q-1&2q=O$+K1L zn5yQ9sTx+DuOVlqn&`zE29oQkb+}Z7TMn0Fh91F;Jc{}0G0f2@W;}*D9%HUI#0PyL zw*FGVIYG_2$1#GMX|0(W%!T!sWDRdS9Q1@}=nFI386+`y6?Du(wFGS%4Ut{Boa_T7 z)FvW)q7U|*h%u<&Hl;f)_-==Tjvzf@@R-0BdMwJgBFuMJ ztTMG0XkDj>hXm|Rd9A)LWvIQ3F=u9M&1bbf&_8??R5dlnVq8>{UNJi3&ZeZg9ujoK znea^s{Rhi9+YzFo!Q%$&E6OITxtNV=R?!YU!GMp?da1FaebQRwA0V4Eyb9<9vhsCck}S6wi6cG z>!9`l*jfD{!lartXJ=I(e9>LGqGxki_|+Q5S^^~Z74x8Tv*`g=s2qK&sZl*``ZhhI z?i)L+iE@Tt$m1q=e7?5j6H@APf{w)3u*A7}?mm|63DBt7OhNUkZ2Cqo=8}R~>yG`U zGCuY5PE!D*&bO)KSuekVfls+y76tPTN-V`u2x;D<>!Y d$MN@q-vMSZ%JQ_Q%U}Qi002ovPDHLkV1oW9`nmuB literal 0 HcmV?d00001 diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/27-hostsmgr.png b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/27-hostsmgr.png new file mode 100644 index 0000000000000000000000000000000000000000..197c87bc803a2ebb9cf469035f4c3a93515360f5 GIT binary patch literal 752 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y9E;VFFSW*B00%1u+K~y+Tos!LK8bK7m`zHlKy!4P$4?X14 zQz_KkdXs{BXjBYHFbGYJSSc2f93Qt5PhXUD^F567{-{$OryZnn&_EOeIgTCHZc+bJqR5N4lG zCxzRsk;!B;-7Xd6pKY^DS|4M3eH8a4ETJT z4D*yAUUG?A41`6iu(E{7>-B6iPYYv zFF<_W+1}cI|A|b{Y4WW`K!Tav)>O7xm>2$Iy-4JPIB4Y(GPxz(0;iP iPkw>&!y$}B5V`_jvk6qtbCA9O0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y9E;VFFSW*B00_I6XK~y+Tm6S3iFLiC_FqlrsAX^3$N7ZY3{rUxjC6*VkQ2MR?h%F@y)h0qqT zQd!E<7D}O|&-Ze*|nfHF*`~L4uxkO6uu;nUr@>yQ8l<<<=!0TkEpp#v^ z&LZ-X^|2ty=T(w*CreK(?;DuN*|1mVe;2XYOA1YE~3F|7v}ujANp%0Tpr7Cao8hAXyl zc8dlUh*N z<$!Fx4Q>rjP~e$VfTWvigKpT}ISlimFzoBHgT)_&J$UW5xdo`7_R#~91I7LaQDF6? z7cR&y+Q}69N1pv$4#9!14j907As&)WiH`P+fI>8D7$zp6q33!OcpE()@7zJ*|q;WKTKXz0%<)y=^nwY0UaRip> zd$QR5I5?88tT$d}n3xL7%9MO#uO|vUf>&_`SD?}32P+ouMIVp#j?%TML^#n691PcN z3TLPrw=&G1QoQ^8ED9t+cClo18VtB9#Qd8Guw#crWH+@pA! zjmFwf@2brWTvJ~pUENT`$`dQCO1jI5mZU%}`bq|*sA(x@Wl40uHBG41>;DB5XZ(=S zIsm-ZV9P00XR@l~%6zHG;cN7!c%T!#Bmaj=$qJm-FuJiqyNji#rmPBWwouvp5q+XS z3TifipwSuAU#Rm~+PcLnU)P)yDn+B9k<7}9x5Zp_wSv7%AddS5Sn(O$(yiau00000 LNkvXXu0mjfb9Ig8 literal 0 HcmV?d00001 diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/index.ts b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/index.ts index 255c55884..deea895cd 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/index.ts +++ b/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 };