Merge pull request #38 from followynne/fix/serilog-log-level-colors

Fix/serilog log level colors

Author: mo-esmp

src/Serilog.Ui.Web/Serilog.Ui.Web.csproj

@@ -10,24 +10,14 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<EmbeddedResource Include="wwwroot/dist/**/*" />
+		<EmbeddedResource Include="wwwroot/dist/**/*" CopyToOutputDirectory="Always" />
 	</ItemGroup>
 
 	<ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 	</ItemGroup>
 
-	<Target Name="NpmInstall" Inputs="package.json" Outputs="node_modules/.install-stamp">
-		<PropertyGroup>
-          <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
-        </PropertyGroup>
-    
-		<Exec Command="npm ci"      Condition="$(RestorePackagesWithLockFile) == 'true'" />
-		<Exec Command="npm install" Condition="$(RestorePackagesWithLockFile) != 'true'" />
-		<Touch Files="node_modules/.install-stamp" AlwaysCreate="true" />
-	</Target>
-
-	<Target Name="NpmRunBuild" DependsOnTargets="NpmInstall" BeforeTargets="BeforeBuild">
+	<Target Name="NpmRunBuild" BeforeTargets="BeforeBuild">
 		<Exec Command="npm run build" />
 	</Target>
 

src/Serilog.Ui.Web/assets/index.html

@@ -98,7 +98,7 @@ <h5 class="modal-title" id="loginModalLabel">JWT Authorizations</h5>
                                 <option value="Information">Information</option>
                                 <option value="Warning">Warning</option>
                                 <option value="Error">Error</option>
-                                <option value="Critical">Critical (!)</option>
+                                <option value="Fatal">Critical (!)</option>
                             </select>
                         </label>
                     </div>

src/Serilog.Ui.Web/assets/script/util.ts

@@ -48,9 +48,9 @@ export const getBgLogLevel = (logLevel: LogLevel) => {
     case LogLevel.Warning:
       return 'bg-warning';
     case LogLevel.Error:
-    case LogLevel.Critical:
+    case LogLevel.Fatal:
       return 'bg-danger';
     default:
-      return 'bg-light';
+      return 'bg-secondary';
   }
 };

src/Serilog.Ui.Web/assets/types/types.ts

@@ -28,7 +28,7 @@ export enum LogLevel {
     Information = "Information",
     Warning = "Warning",
     Error = "Error",
-    Critical = "Critical"
+    Fatal = "Fatal"
 }
 
 export enum LogType {