Add UI controller, view and asset files.

Author: mo-esmp

src/Serilog.Ui.MsSqlServerProvider/Extensions/DataProviderOptionsBuilderExtensions.cs

@@ -10,7 +10,7 @@ public static void UseSqlServer(
             this DataProviderOptionsBuilder optionsBuilder,
             string connectionString,
             string tableName,
-            string schemaName = null
+            string schemaName = "dbo"
         )
         {
             if (string.IsNullOrEmpty(connectionString))

src/Serilog.Ui.MsSqlServerProvider/SqlServerDataProvider.cs

@@ -20,29 +20,33 @@ public SqlServerDataProvider(RelationalDbOptions options)
         {
             using (IDbConnection connection = new SqlConnection(_options.ConnectionString))
             {
-                var logsTask = GetLogsAsync(connection, page - 1, count);
-                var logCountTask = CountLogsAsync(connection);
+                var logsTask = GetLogsAsync(page - 1, count);
+                var logCountTask = CountLogsAsync();
 
                 await Task.WhenAll(logsTask, logCountTask);
 
                 return (await logsTask, await logCountTask);
             }
         }
 
-        private Task<IEnumerable<LogModel>> GetLogsAsync(IDbConnection connection, int page, int count)
+        private async Task<IEnumerable<LogModel>> GetLogsAsync(int page, int count)
         {
             var query =
                 $"SELECT [Id], [Message],[Level], [TimeStamp], [Exception], [Properties] FROM [{_options.Schema}].[{_options.TableName}] " +
                 "ORDER BY Id DESC OFFSET @Offset ROWS FETCH NEXT @Count ROWS ONLY";
-
-            return connection.QueryAsync<LogModel>(query, new { page, count });
+            using (IDbConnection connection = new SqlConnection(_options.ConnectionString))
+            {
+                return await connection.QueryAsync<LogModel>(query, new { Offset = page, Count = count });
+            }
         }
 
-        public async Task<int> CountLogsAsync(IDbConnection connection)
+        public async Task<int> CountLogsAsync()
         {
             var query = $"SELECT COUNT(Id) FROM [{_options.Schema}].[{_options.TableName}]";
-
-            return await connection.ExecuteScalarAsync<int>(query);
+            using (IDbConnection connection = new SqlConnection(_options.ConnectionString))
+            {
+                return await connection.ExecuteScalarAsync<int>(query);
+            }
         }
     }
 }

src/Serilog.Ui.Web/Extensions/ServiceCollectionExtensions.cs

@@ -1,12 +1,17 @@
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.Extensions.DependencyInjection;
 using Serilog.Ui.Core;
 using System;
+using System.Linq;
 
 namespace Serilog.Ui.Web
 {
     public static class ServiceCollectionExtensions
     {
-        public static IServiceCollection AddSerilogUi(this IServiceCollection services, Action<DataProviderOptionsBuilder> optionsBuilder)
+        public static IServiceCollection AddSerilogUi(
+            this IServiceCollection services,
+            IMvcBuilder mvcBuilder,
+            Action<DataProviderOptionsBuilder> optionsBuilder)
         {
             if (services == null)
                 throw new ArgumentNullException(nameof(services));
@@ -17,7 +22,29 @@ public static IServiceCollection AddSerilogUi(this IServiceCollection services,
             var builder = new DataProviderOptionsBuilder(services);
             optionsBuilder.Invoke(builder);
 
+            //var assembly = typeof(ServiceCollectionExtensions).Assembly;
+            // var location = assembly.Location;
+            //var embeddedFileProvider = new EmbeddedFileProvider(assembly);
+            //mvcBuilder.AddRazorRuntimeCompilation(options => options.FileProviders.Add(embeddedFileProvider));
+
+            var assemblies = AppDomain.CurrentDomain.GetAssemblies().Where(a => a.FullName.StartsWith("Serilog.Ui.Web")).ToList();
+            foreach (var assembly in assemblies)
+            {
+                if (assembly.FullName.Contains("Views"))
+                    mvcBuilder.PartManager.ApplicationParts.Add(new CompiledRazorAssemblyPart(assembly));
+                else
+                {
+                    mvcBuilder.PartManager.ApplicationParts.Add(new AssemblyPart(assembly));
+                    var manifestResourceNames = assembly.GetManifestResourceNames();
+                }
+            }
+
             return services;
         }
+
+        private static void ConfigureApplicationParts(ApplicationPartManager apm)
+        {
+            apm.ApplicationParts.Add(new AssemblyPart(typeof(ServiceCollectionExtensions).Assembly));
+        }
     }
 }

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

@@ -1,13 +1,19 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+    <RazorCompileOnBuild>true</RazorCompileOnBuild>
   </PropertyGroup>
 
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.3" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Serilog.Ui.Core\Serilog.Ui.Core.csproj" />
   </ItemGroup>

src/Serilog.Ui.Web/Views/Logs/Index.cshtml

@@ -0,0 +1,9 @@
+@using Microsoft.AspNetCore.Http
+@model LogViewModel
+@{
+    ViewData["Title"] = "Log List";
+    Layout = "~/Views/Shared/_LogLayout.cshtml";
+}
+<h1>Log List</h1>
+
+<p>Use this page to detail your site's privacy policy.</p>

src/Serilog.Ui.Web/Views/Shared/_LogLayout.cshtml

@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>@ViewData["Title"] - SampleWebApplication</title>
+    <link rel="stylesheet" href="~/css/bootstrap.min.css" />
+    <link rel="stylesheet" href="~/css/log.css" />
+</head>
+<body>
+    <header>
+    </header>
+    <div class="container">
+        <main role="main" class="pb-3">
+            @RenderBody()
+        </main>
+    </div>
+
+    <footer class="border-top footer text-muted">
+        <div class="container">
+            &copy; @DateTime.Now.Year - <a href="https://github.com/mo-esmp/serilog-ui" target="_blank">Serilog UI</a>
+        </div>
+    </footer>
+    <script src="~/js/jquery.min.js"></script>
+    <script src="~/js/bootstrap.bundle.min.js"></script>
+    <script src="~/js/log.js" asp-append-version="true"></script>
+    @RenderSection("Scripts", required: false)
+</body>
+</html>

src/Serilog.Ui.Web/Views/_ViewImports.cshtml

@@ -0,0 +1,3 @@
+@using Serilog.Ui.Web
+@using Serilog.Ui.Web.ViewModel
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

src/Serilog.Ui.Web/wwwroot/css/bootstrap.min.css

@@ -0,0 +1,74 @@
+/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification
+for details on configuring this project to bundle and minify static web assets. */
+
+a.navbar-brand {
+    white-space: normal;
+    text-align: center;
+    word-break: break-all;
+}
+
+/* Provide sufficient contrast against white background */
+a {
+    color: #0366d6;
+}
+
+.btn-primary {
+    color: #fff;
+    background-color: #1b6ec2;
+    border-color: #1861ac;
+}
+
+.nav-pills .nav-link.active, .nav-pills .show > .nav-link {
+    color: #fff;
+    background-color: #1b6ec2;
+    border-color: #1861ac;
+}
+
+/* Sticky footer styles
+-------------------------------------------------- */
+html {
+    font-size: 14px;
+}
+
+@media (min-width: 768px) {
+    html {
+        font-size: 16px;
+    }
+}
+
+.border-top {
+    border-top: 1px solid #e5e5e5;
+}
+
+.border-bottom {
+    border-bottom: 1px solid #e5e5e5;
+}
+
+.box-shadow {
+    box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05);
+}
+
+button.accept-policy {
+    font-size: 1rem;
+    line-height: inherit;
+}
+
+/* Sticky footer styles
+-------------------------------------------------- */
+html {
+    position: relative;
+    min-height: 100%;
+}
+
+body {
+    /* Margin bottom by footer height */
+    margin-bottom: 60px;
+}
+
+.footer {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    white-space: nowrap;
+    line-height: 60px; /* Vertically center the text there */
+}