From 38357b2a3126aa8aa7dd9201b7bcbe4597937ea5 Mon Sep 17 00:00:00 2001
From: Collin Barrett <collinbarrett@users.noreply.github.com>
Date: Wed, 22 Aug 2018 16:41:09 -0500
Subject: [PATCH] wip

---
 src/FilterLists.Services/FilterList/Models/ListTagDto.cs | 2 +-
 src/FilterLists.Web/ClientApp/components/Home.tsx        | 5 ++---
 src/FilterLists.Web/FilterLists.Web.csproj               | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/FilterLists.Services/FilterList/Models/ListTagDto.cs b/src/FilterLists.Services/FilterList/Models/ListTagDto.cs
index 4b8ba581c..f2f1843be 100644
--- a/src/FilterLists.Services/FilterList/Models/ListTagDto.cs
+++ b/src/FilterLists.Services/FilterList/Models/ListTagDto.cs
@@ -6,7 +6,7 @@ namespace FilterLists.Services.FilterList.Models
     public class ListTagDto
     {
         public string Name { get; set; }
-        public string Description { get; set; }
         public string ColorHex { get; set; }
+        public string Description { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/FilterLists.Web/ClientApp/components/Home.tsx b/src/FilterLists.Web/ClientApp/components/Home.tsx
index 9d620a5ba..70744b6c2 100644
--- a/src/FilterLists.Web/ClientApp/components/Home.tsx
+++ b/src/FilterLists.Web/ClientApp/components/Home.tsx
@@ -99,9 +99,7 @@ export class Home extends React.Component<RouteComponentProps<{}>, IHomeState> {
                            filterMethod: (filter: any, row: any) => row[filter.id].map((e: any) => e.name).join()
                                .toUpperCase().includes(filter.value.toUpperCase()),
                            sortMethod: (a: any, b: any) => a.join().toUpperCase() > b.join().toUpperCase() ? 1 : -1,
-                           Cell: (cell: any) => <div>{cell.value.map(
-                               (e: any) => <span className="badge" style={{ color: "#{e.colorHex}" }} title={e
-                                   .description}>{e.name}</span>)}</div>,
+                           Cell: (cell: any) => <div>{cell.value.map((e: any) => <span className="badge" style={{ backgroundColor: `#${e.colorHex}` }} title={e.description}>{e.name}</span>)}</div>,
                            width: 100,
                            headerClassName: "d-none d-lg-block",
                            className: "d-none d-lg-block"
@@ -193,6 +191,7 @@ interface IListLanguageDto {
 
 interface IListTagDto {
     name: string;
+    colorHex: string;
     description: string;
 }
 
diff --git a/src/FilterLists.Web/FilterLists.Web.csproj b/src/FilterLists.Web/FilterLists.Web.csproj
index 36cfe24c2..94d80fc74 100644
--- a/src/FilterLists.Web/FilterLists.Web.csproj
+++ b/src/FilterLists.Web/FilterLists.Web.csproj
@@ -70,7 +70,7 @@
   </Target>
 
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-    <!--<Exec Command="if $(ConfigurationName) == Debug call &quot;$(SolutionDir)scripts\npm_webpack_win.bat&quot;" />-->
+    <Exec Command="if $(ConfigurationName) == Debug call &quot;$(SolutionDir)scripts\npm_webpack_win.bat&quot;" />
   </Target>
 
 </Project>
\ No newline at end of file