From 0ad8aa440940cb3f2bd82a7eadb4cbdf09338271 Mon Sep 17 00:00:00 2001 From: Collin Barrett Date: Sat, 15 Sep 2018 17:52:50 -0500 Subject: [PATCH] add more software icons ref #470 --- data/Software.json | 8 +------- data/SoftwareSyntax.json | 4 ---- .../ClientApp/imgs/software/6-AdBlock.png | Bin 0 -> 1268 bytes .../ClientApp/imgs/software/7-AdAway.png | Bin 0 -> 658 bytes .../imgs/software/8-Personal-Blocklist.png | Bin 0 -> 1295 bytes .../home/components/listsTable/SoftwareIcon.tsx | 8 +++++++- 6 files changed, 8 insertions(+), 12 deletions(-) create mode 100644 src/FilterLists.Web/ClientApp/imgs/software/6-AdBlock.png create mode 100644 src/FilterLists.Web/ClientApp/imgs/software/7-AdAway.png create mode 100644 src/FilterLists.Web/ClientApp/imgs/software/8-Personal-Blocklist.png diff --git a/data/Software.json b/data/Software.json index 896a37179..15ef1e8a9 100644 --- a/data/Software.json +++ b/data/Software.json @@ -45,13 +45,7 @@ "id": 8, "downloadUrl": "https://chrome.google.com/webstore/detail/personal-blocklist-by-goo/nolijncfnkgaikbjbdaogikpmpbdcdef", "homeUrl": "https://chrome.google.com/webstore/detail/personal-blocklist-by-goo/nolijncfnkgaikbjbdaogikpmpbdcdef", - "name": "Personal Blocklist (Chrome)" - }, - { - "id": 9, - "downloadUrl": "https://addons.mozilla.org/firefox/addon/personal-blocklist/", - "homeUrl": "https://github.com/wildskyf/personal-blocklist", - "name": "Personal Blocklist (Firefox)" + "name": "Personal Blocklist" }, { "id": 10, diff --git a/data/SoftwareSyntax.json b/data/SoftwareSyntax.json index 22f7c69cf..e23e704c1 100644 --- a/data/SoftwareSyntax.json +++ b/data/SoftwareSyntax.json @@ -39,10 +39,6 @@ "softwareId": 8, "syntaxId": 2 }, - { - "softwareId": 9, - "syntaxId": 2 - }, { "softwareId": 14, "syntaxId": 2 diff --git a/src/FilterLists.Web/ClientApp/imgs/software/6-AdBlock.png b/src/FilterLists.Web/ClientApp/imgs/software/6-AdBlock.png new file mode 100644 index 0000000000000000000000000000000000000000..84b1d11950d9635bdc082decb7c346a26d2336db GIT binary patch literal 1268 zcmX|AYfw{X5RDHyHWDNWX=;*DP^gk11M)^h1d)eQ1 zK@6t#iM8k?{-K5tOEhXxp%fLB0ttC5UNk9+* z!ypiw&2BKjCX>@@byzGwgCM4+P@4^!n1Dd5*AuO+L_>o^BEe6cLhI__swyx+YHJ-e zHAG8`qpHf)*a%4^m{yDQ_S(C;;M=#MTel#E0#&JA%jIZK528|`N+kwbg`$7?@BCg&T^4I3G;|~^>@kaFrqNzSMD%gFCOUnB$+XewRtDn@oo){ge-IS~hlfux zm~WU&n9hJ03=^9TF`1)WF3e=!;qxEG#5h zaJdkVcPBB?!Q%1V= z$C9zJ4|8%zKHnpVBL#wKLEQ9)4Ucnkeev;6^73A8+2Tt`m`P0ZCMC^m+<333$eWTf zo0Q~9O?|d~`)qQuCoRpJmgY}MA=A_Ssi}d~G%_P2ke=?#%nW8^OlM^UGc$dgvmJSP zGuhex>}($pd3mmafF4bau|(xCzcQ zrdIpqa&RoWQaPs4Al=<2jYfa}KBiXVYIU%?8`WrnJw3QqYaSSI3=9PN`d*KZL*wI~ zkr7y@Lx9%nfk~WtJ!~*Ij7G?0n%3zcv)QNDBW5$O6JoJ=jYeQC%xcB0))|utvDr7(uvP z3ke7Sce_2HxEDZpJOoLqlCf;?84|u1i;5|3;cac_q*7^nd;9rLfE&SJ@a_Nj z2Vnj`B-j7Iqfiz}3b$=7sWQa0Jr{(05iwxRAheUg-iqHgJs2t&Y#D5l$y~w-FI)dt z{rV^4xv{15A<~CiyLT~^_j2h%UBc|}Rf)C2q6>YP*-TDf5xqE|T)L^c>B}+OgQUGO zXUCcH=2B_%8$7PPx$(ov(?1<9J*#rP)XU#)oGTkl=s0A#G&;%r^%J&$=sX)r(~JJR zbi{ilzAP|LeZuzLc`a?I~s1*RDYIHTlsV>N7W;- y>{}m@>T(_0fC7C7#fHK5j}nyT+mV%P<`%DbWxNqQI`j=VAf+&0w5=<*to~nN)ZktK literal 0 HcmV?d00001 diff --git a/src/FilterLists.Web/ClientApp/imgs/software/7-AdAway.png b/src/FilterLists.Web/ClientApp/imgs/software/7-AdAway.png new file mode 100644 index 0000000000000000000000000000000000000000..0826b747828b5f5c68248b913283ca6b65ba2153 GIT binary patch literal 658 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqMyzU^ETz332twEZi<40z^AuXosjM zVI(5*_Wj3qpT2At7Ty6w;^Mm$6yARL^!DTDoe~l|B_(&s$?cMt->s;)TSeveij~i= z-+1-(`RiA2-n@SM?(^5}0s=ckgm+3w?UIq%t*pF9LvxR&=3Z^>eR_KPjEwdf8y_$? zKVWHjz{cjFt?eO4rz2io$3w%8hlig`NI030crq#ZR7&cp)YQ{y>1T5D&K4G(D=s-# zT6VF%;bLRsx#pHDJ-t^aOu9OG%C#v|ug{oyW6s=LOP1bRy6pP$6?Zpmytirdy)9cG z?AiNZ&%Rp+4?o<0@bQV0k58R`dhWv0^B107x%TYp_2)Nly}0+_)uSh`pS^hU>dosH zuin1@@b2U1cOSpJ`}8$QwV@Cgj)EmYe!&ca!Xl#LQ>M+HyJXGJU%&tSW1eek3zYor z>EaloaX$6p(W1ivJZ_0sGw&SfoBd~!VwuG0Gc$~gjkmx5&k_6N)?1$~f6}&G5EK;5 zWVFzE8qXvJ@8NvEomm@l1t#|I=NCN7JPJ6AeG+4smvkB>L*J$v(_fRjh>iR3g- z$%KTjj~>4JmZp8%ymVJ^QUk+>6J=kIZP{WsG^*%(f3F*Pp_;+{7R z=oLv#h63?{eU8@o%(uyIbEd+<^GE)Ap4`%lb$ b|AW>2pQ_tNE&p&}Ffe$!`njxgN@xNAk|#v| literal 0 HcmV?d00001 diff --git a/src/FilterLists.Web/ClientApp/imgs/software/8-Personal-Blocklist.png b/src/FilterLists.Web/ClientApp/imgs/software/8-Personal-Blocklist.png new file mode 100644 index 0000000000000000000000000000000000000000..9b6888a1b5f1716d987fa850f0aea972f8a17b66 GIT binary patch literal 1295 zcmV+q1@QWbP)xN#00093P)t-sOlfhN z006rs6TBr8xD*Px6$-v36SoHdx)=(%5(2&@6TKx9xe@`rB@?(21G^OjzaVR!PY~GR{>;&sa>uB@@FX6Vqs2&s9m&W?RD~6U|OQ!zB~M zB@@78t711db(kT_xDizf#71S#j*D4p*EEwD?7u_ot z<185DEEwf1809S(=PeoPEEnl580;(;?l2nfFdFeN8SgP0@-Z6oF&p(U8ul?7`7#^o zIVJ2lC;K!W{WKo@H6H9eD*HJi|2QK3IU~+YJ^wl*@k1{8LoMq}I`T_5-c?5VOE=(E zM*2%P@K8SNRYdJrN$p%r{aQx>Of_UzKbNza3@`HEyfpqPLd-{ZU`-FJ#i+}Nth4hYt`HzJ8 zkcRD-kNA{{{ga6EnUC?Bk?)(5{FjXIoRjLGm+POG_nVUToRa^Wko2LL{hpNdqM7)i znDC{Y`lFivqL}ojpZ}zq`lz4xtE2y^p!2S${;HwyvaA2Bqxi3<_Oh${v#kEKto69D z`nIt6xU%oPx9`5W^1Zn9y|?hcx%#`b`MkFGy|?ney7s=e`n|XFz`OCmy!^el`@XpM zz`Ojvxb(xl^2NaV!o2p!!Sl(*`NzWg$HMr?!}iI<@yyBe%*gf4$n?(1_0Y`r(9HGK z()ZTV^xN3?-P-rv+xOnv_~GC9gf9G>ig^I`|Rra?d<#Q>-z5O z`|j=f@9+EX@B8rY`|p>{QUp^{{R2~15NtL0000@bW%=J009IA z2M7ua4ips`8Xq4ePgz=BUteWqYHM{@C|(vH$=9aY;l$R45e%!98!&KpY3)-~I259U40g zgtSSiM1{i3!otA7z{teFXJBGw1lE2VU}a}VhzY5ns#QyDN)!_N?0Y}+JPZI>Q53~X zd}!*X1^@;i9nbdO%?14OxLj@=z<|NQ(eb#C3_Y>GZ_i5&j`ZNcd$OLmaZb^*AF7QU z(|d2C^Vj)gHC?yHKlxrO8tuI@+OU0{QO>;6=Jk9i@_Fp8Q9@Frq)l`oOs_=oyrsL7 z6S@&I(JJdhcyUR2uzo$!Znw{zY>#%VjX6D4(pBc6nx?Z@??3L0R0BF`tyEtYlY~>o zA1$lS%E(8t=dr$j3jn_}`t+|`U93c7HepC#4*{_8*{SIo+fZ$S)&3#^fd8zW4RTFQ zX|#1$e*oayX*61wirbK9VBPOU;(vYISY@iSh9NmzjgS*s2J{sYy}(=a)tQ|tf$002ovPDHLk FV1i*rzcl~= literal 0 HcmV?d00001 diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/SoftwareIcon.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/SoftwareIcon.tsx index 15b175c4f..ae6249a4b 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/SoftwareIcon.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/SoftwareIcon.tsx @@ -4,6 +4,9 @@ import img2 from "../../../../imgs/software/2-Adblock-Plus.svg"; import img3 from "../../../../imgs/software/3-AdGuard.png"; import img4 from "../../../../imgs/software/4-DNS66.png"; import img5 from "../../../../imgs/software/5-Nano-Adblocker.png"; +import img6 from "../../../../imgs/software/6-AdBlock.png"; +import img7 from "../../../../imgs/software/7-AdAway.png"; +import img8 from "../../../../imgs/software/8-Personal-Blocklist.png"; interface IProps { id: number; @@ -28,5 +31,8 @@ const icons: { [id: number]: IIcon; } = { 2: { image: img2, imageTitle: "Adblock Plus" }, 3: { image: img3, imageTitle: "AdGuard" }, 4: { image: img4, imageTitle: "DNS66" }, - 5: { image: img5, imageTitle: "Nano Adblocker" } + 5: { image: img5, imageTitle: "Nano Adblocker" }, + 6: { image: img6, imageTitle: "AdBlock" }, + 7: { image: img7, imageTitle: "AdAway" }, + 8: { image: img8, imageTitle: "Personal Blocklist" } }; \ No newline at end of file