From 73d23f9b4719a3d8e1f745d84d73b8b50a42f588 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 14 May 2019 21:23:57 +0200 Subject: [PATCH] Adding AdNauseam as a software tool (#788) * Update Software.json * Update SoftwareSyntax.json * Add files via upload * Update index.ts * Update SoftwareIcon.tsx --- data/Software.json | 9 ++- data/SoftwareSyntax.json | 54 +++++++++++++++++- .../components/softwareIcon/SoftwareIcon.tsx | 4 +- .../softwareIcon/imgs/32-AdNauseam.png | Bin 0 -> 713 bytes .../components/softwareIcon/imgs/index.ts | 4 +- 5 files changed, 67 insertions(+), 4 deletions(-) create mode 100644 src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/32-AdNauseam.png diff --git a/data/Software.json b/data/Software.json index 9f0e9d27e..fe99957b8 100644 --- a/data/Software.json +++ b/data/Software.json @@ -200,5 +200,12 @@ "homeUrl": "https://github.com/AdguardTeam/AdGuardHome", "isAbpSubscribable": false, "name": "AdGuard Home" + }, + { + "id": 32, + "downloadUrl": "https://adnauseam.io/", + "homeUrl": "https://adnauseam.io/", + "isAbpSubscribable": true, + "name": "AdNauseam" } -] \ No newline at end of file +] diff --git a/data/SoftwareSyntax.json b/data/SoftwareSyntax.json index 9bcfa6046..e04a29e49 100644 --- a/data/SoftwareSyntax.json +++ b/data/SoftwareSyntax.json @@ -51,6 +51,10 @@ "softwareId": 31, "syntaxId": 1 }, + { + "softwareId": 32, + "syntaxId": 1 + }, { "softwareId": 1, "syntaxId": 2 @@ -91,6 +95,10 @@ "softwareId": 31, "syntaxId": 2 }, + { + "softwareId": 32, + "syntaxId": 2 + }, { "softwareId": 1, "syntaxId": 3 @@ -115,6 +123,10 @@ "softwareId": 24, "syntaxId": 3 }, + { + "softwareId": 32, + "syntaxId": 3 + }, { "softwareId": 1, "syntaxId": 4 @@ -127,6 +139,10 @@ "softwareId": 5, "syntaxId": 4 }, + { + "softwareId": 32, + "syntaxId": 4 + }, { "softwareId": 1, "syntaxId": 6 @@ -139,6 +155,10 @@ "softwareId": 5, "syntaxId": 6 }, + { + "softwareId": 32, + "syntaxId": 6 + }, { "softwareId": 1, "syntaxId": 7 @@ -151,6 +171,10 @@ "softwareId": 25, "syntaxId": 7 }, + { + "softwareId": 32, + "syntaxId": 7 + }, { "softwareId": 1, "syntaxId": 8 @@ -159,6 +183,10 @@ "softwareId": 5, "syntaxId": 8 }, + { + "softwareId": 32, + "syntaxId": 8 + }, { "softwareId": 1, "syntaxId": 9 @@ -183,6 +211,10 @@ "softwareId": 5, "syntaxId": 12 }, + { + "softwareId": 32, + "syntaxId": 9 + }, { "softwareId": 1, "syntaxId": 13 @@ -195,6 +227,10 @@ "softwareId": 13, "syntaxId": 13 }, + { + "softwareId": 32, + "syntaxId": 13 + }, { "softwareId": 7, "syntaxId": 14 @@ -231,6 +267,10 @@ "softwareId": 31, "syntaxId": 16 }, + { + "softwareId": 32, + "syntaxId": 16 + }, { "softwareId": 1, "syntaxId": 17 @@ -251,6 +291,10 @@ "softwareId": 23, "syntaxId": 20 }, + { + "softwareId": 32, + "syntaxId": 17 + }, { "softwareId": 1, "syntaxId": 21 @@ -259,6 +303,10 @@ "softwareId": 5, "syntaxId": 21 }, + { + "softwareId": 32, + "syntaxId": 21 + }, { "softwareId": 4, "syntaxId": 22 @@ -310,5 +358,9 @@ { "softwareId": 31, "syntaxId": 28 + }, + { + "softwareId": 32, + "syntaxId": 28 } -] \ 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 a8e93655c..aea450f0a 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/SoftwareIcon.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/SoftwareIcon.tsx @@ -29,7 +29,8 @@ import { img28, img29, img30, - img31 + img31, + img32 } from "./imgs"; interface IProps { @@ -80,4 +81,5 @@ const icons: { [id: number]: IIcon; } = { 29: { image: img29, imageTitle: "Unbound" }, 30: { image: img30, imageTitle: "BIND" }, 31: { image: img31, imageTitle: "AdGuard Home" }, + 32: { image: img32, imageTitle: "AdNauseam" }, }; diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/32-AdNauseam.png b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/32-AdNauseam.png new file mode 100644 index 0000000000000000000000000000000000000000..773f3c556bcda75b5576d8af06e9211ae2b203fb GIT binary patch literal 713 zcmV;)0yh1LP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0$xc(K~y+TwNy!H z6hRa%y(r>A!3D&lh~Pm4K?J3lu4)|@6f_=OE&&zB1(zf!XdH8h2u3Ad^q}H)3OZd~ zlZ-?U5pxqf3L*%4P!EAjEfWP1+E+b2LyuF3QS`&7KkvPM_3O{?A^$aE63^nk?kWem zD}`Dj^r{OuRefT|=XojQj!IrHhVXgBbR1FLpTaE>`DUr*Iny6Flj~BrHO2$81fq9| zQ3qy;A=S0e*PBwR9>roj8y&rD8g*!9lQT8N+0?R>CImotR*+fGjD$v zG|Zmnrq`g}73He_gcr|snMG9ntmJ2w6R}yZY9kYY?vI%2$zr&{8>gA&0&|RTY7RI_ zrY_^ekv7hgE7~xdRNo_ln$u2_smFNU&0_eGz6qwiEY?h_M=>vX+(n|Zk35)JkLULW zCaAiCVV}?H8VOy9YpU%o(x&|q#;96}E>D$NZQF~1h6An$1=xk@Q8YrH)1b>iUEBW_x60<00R%3t<|2hM+w{FDrZcgQeh?)U( zcn1S63Z{B7>j7zwGwa_Z|C>BBHW@`gL6>3lLxBff|f_brAm+MSBSNS6CJB>K5_~u?2u~(+sCV6rvtRJq~;b zMg`P;&|X3}L+HGlGjp=et3l|Wft$qA>Z1V8r28|B7muLZ{dT8HY}!M80^I!&*8%?k v^