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 000000000..84b1d1195 Binary files /dev/null and b/src/FilterLists.Web/ClientApp/imgs/software/6-AdBlock.png differ 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 000000000..0826b7478 Binary files /dev/null and b/src/FilterLists.Web/ClientApp/imgs/software/7-AdAway.png differ 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 000000000..9b6888a1b Binary files /dev/null and b/src/FilterLists.Web/ClientApp/imgs/software/8-Personal-Blocklist.png differ 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