From f9941698a536a39360cf81bb92d2ecdc023e4b74 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Sat, 15 Sep 2018 17:20:47 -0500
Subject: [PATCH] add nano icon, sort software alpha

ref #470
---
 data/Software.json                                |   2 +-
 .../ListSummaryDtoMappingProfile.cs               |   6 +++++-
 .../ClientApp/imgs/software/4-Nano-Adblocker.png  | Bin 0 -> 752 bytes
 .../home/components/listsTable/SoftwareIcon.tsx   |   4 +++-
 4 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 src/FilterLists.Web/ClientApp/imgs/software/4-Nano-Adblocker.png

diff --git a/data/Software.json b/data/Software.json
index a144e0ee3..896a37179 100644
--- a/data/Software.json
+++ b/data/Software.json
@@ -101,4 +101,4 @@
     "homeUrl": "https://www.jeffersonscher.com/gm/google-hit-hider/",
     "name": "Google Hit Hider by Domain"
   }
-]
+]
\ No newline at end of file
diff --git a/src/FilterLists.Services/FilterList/MappingProfiles/ListSummaryDtoMappingProfile.cs b/src/FilterLists.Services/FilterList/MappingProfiles/ListSummaryDtoMappingProfile.cs
index 198ea51f3..36d566f05 100644
--- a/src/FilterLists.Services/FilterList/MappingProfiles/ListSummaryDtoMappingProfile.cs
+++ b/src/FilterLists.Services/FilterList/MappingProfiles/ListSummaryDtoMappingProfile.cs
@@ -13,7 +13,11 @@ public ListSummaryDtoMappingProfile() =>
                 .ForMember(d => d.Languages, o => o.MapFrom(l => l.FilterListLanguages.Select(la => la.Language)))
                 .ForMember(d => d.SoftwareIds,
                     o => o.MapFrom(l =>
-                        l.Syntax.SoftwareSyntaxes.Select(ss => (int)ss.Software.Id)))
+                        l.Syntax
+                         .SoftwareSyntaxes
+                         .Select(ss => ss.Software)
+                         .OrderBy(s => s.Name)
+                         .Select(s => (int)s.Id)))
                 .ForMember(d => d.Tags, o => o.MapFrom(l => l.FilterListTags.Select(m => m.Tag)))
                 .ForMember(d => d.UpdatedDate,
                     o => o.MapFrom(l =>
diff --git a/src/FilterLists.Web/ClientApp/imgs/software/4-Nano-Adblocker.png b/src/FilterLists.Web/ClientApp/imgs/software/4-Nano-Adblocker.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a5b5dc5d8bd4b656f407c702c486a9b57bb5137
GIT binary patch
literal 752
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqMyzV9X2f332twER+`pNg)GXHg;cA
z3qCe>W=2McxQVhVkO33{l0aFgpb|(>URV^u1uBLpgK*)3eC!-RHbn3L?T7yFJo10X
z;s3ji{@;1@;<Wh}r_S5kF@cSlxji9macRxfnTtNH-}!s%fh=$T-`fr@FR!~ieZli(
z8&chT{%$?6tF?Du$Aq(!X0tFcZLDhr8vADD<~{BGZSkqkm#zP`W&h3DOaE>=_-4iC
znK>mEsv1o(iG~VF3yZ6`SXo~#-}rp#`bimi*JmyMv-QBg9fz+>U%<@7bY{}*S-GWL
ztZZ*rZh5tQ<Bv^yceeDfGBL9<Gh1nBt*ofml~Xu1Vdn2G``rvp_IFI&-!UP`!bX^z
zhl7PxTSi_<RN~3vHUIaVh_-iTXJOga)YX}oJ}1BI+47B|JiI$vdg7hj4s}fih9fg0
z(=*N^zCcH-mIV0)GrXUv=gP|W@87>OTN8drKd8RfzU4>!Tb5~Oe>(AQ(vCZQxA}e>
zOX12)U{vvVx;TbZ+={&rntaGWg!RFLO^L<wlkcdk(LGndR@}aG_wLjC<DE{smCv7~
z&%g7zLg}5jc%zq}cU`<6Aw9QDQ)uFwb78C9#EP4>CDJ4|7i?I1Ge<DZNNP%;n}PhH
zW1`I$TLLDlODVAwuQB3uZEu?>)6aNJ`?jXVT~U33Zg~ZFrXQNsGp6dD{}$G&CUZjU
zfyd>Y?b~m!ek^;a@W`@<N6Q~R{`&M6%d3xnUq5^I@8!oi*B%Exl+1`b_oBe~yJu#d
z{o2Ey!Wc5rY8~5+Kd~LS^=QtoiM!Ob&xJMUoSnX4*Yar@Njj|`uRJjk>`aL*Q&9SS
z;KBZB)243gvs-(9UDW(__uhTG|IGU8v%i0BAN^zYF}GvAXl`;Bl)yY){an^LB{Ts5
Dbc;99

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 b097bb0c5..15b175c4f 100644
--- a/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/SoftwareIcon.tsx
+++ b/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/SoftwareIcon.tsx
@@ -3,6 +3,7 @@ import img1 from "../../../../imgs/software/1-uBlock-Origin.svg";
 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";
 
 interface IProps {
     id: number;
@@ -26,5 +27,6 @@ const icons: { [id: number]: IIcon; } = {
     1: { image: img1, imageTitle: "uBlock Origin" },
     2: { image: img2, imageTitle: "Adblock Plus" },
     3: { image: img3, imageTitle: "AdGuard" },
-    4: { image: img4, imageTitle: "DNS66" }
+    4: { image: img4, imageTitle: "DNS66" },
+    5: { image: img5, imageTitle: "Nano Adblocker" }
 };
\ No newline at end of file