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 000000000..2a5b5dc5d Binary files /dev/null and b/src/FilterLists.Web/ClientApp/imgs/software/4-Nano-Adblocker.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 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