[CHANGE] Added logging

[CHANGE] Updated layouts && configured rendermode
[ADD] Added DotBased to solution & added nuget config
2025-08-04 19:36:12 +02:00 · 2025-08-04 17:53:02 +02:00 · 2025-08-04 17:04:57 +02:00
18 changed files with 239 additions and 239 deletions
--- a/ImportUI/Components/App.razor
+++ b/ImportUI/Components/App.razor
@@ -7,7 +7,6 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
    <base href="/"/>
    <link rel="stylesheet" href="app.css"/>
-    <link rel="stylesheet" href="ImportUI.styles.css"/>
    <link rel="icon" type="image/png" href="favicon.png"/>
    <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" rel="stylesheet"/>
    <link href="_content/MudBlazor/MudBlazor.min.css?v=@Metadata.Version" rel="stylesheet"/>
@@ -15,7 +14,7 @@
 </head>

 <body>
-<Routes/>
+<Routes @rendermode="InteractiveServer"/>
 <script src="_framework/blazor.web.js"></script>
 <script src="_content/MudBlazor/MudBlazor.min.js?v=@Metadata.Version"></script>
 </body>
--- a/ImportUI/Components/Layout/ApplicationLayout.razor
+++ b/ImportUI/Components/Layout/ApplicationLayout.razor
@@ -0,0 +1,20 @@
+@inherits LayoutComponentBase
+@layout BaseLayout
+
+<CascadingValue Value="this">
+    <MudAppBar Color="Color.Primary">
+        <MudIconButton Icon="@Icons.Material.Filled.Menu" Color="Color.Inherit" Edge="Edge.Start" OnClick="@(_ => ToggleDrawerOpen())" />
+        <MudText Typo="Typo.h6">@AppText</MudText>
+        <MudSpacer/>
+        <MudTooltip Text="Gitea source">
+            <MudIconButton Icon="@Icons.Material.Filled.Source" Href="https://git.netzbyte.com/max/Yt-Import" Target="_blank"/>
+        </MudTooltip>
+        @if (BaseLayout != null)
+        {
+            <MudTooltip Text="@(BaseLayout.DarkTheme ? "Toggle to light mode" : "Toggle to dark mode")">
+                <MudToggleIconButton @bind-Toggled="@BaseLayout.DarkTheme" Color="Color.Dark" ToggledColor="Color.Warning" Icon="@Icons.Material.Filled.DarkMode" ToggledIcon="@Icons.Material.Filled.LightMode"/>
+            </MudTooltip>
+        }
+    </MudAppBar>
+    @Body
+</CascadingValue>
--- a/ImportUI/Components/Layout/ApplicationLayout.razor.cs
+++ b/ImportUI/Components/Layout/ApplicationLayout.razor.cs
@@ -0,0 +1,16 @@
+using Microsoft.AspNetCore.Components;
+
+namespace ImportUI.Components.Layout;
+
+public partial class ApplicationLayout
+{
+    [CascadingParameter]
+    public BaseLayout? BaseLayout { get; set; }
+    public bool DrawerOpen { get; set; } = true;
+    public string AppText { get; set; } = "YouTube Import";
+    
+    private void ToggleDrawerOpen()
+    {
+        DrawerOpen = !DrawerOpen;
+    }
+}
--- a/ImportUI/Components/Layout/BaseLayout.razor
+++ b/ImportUI/Components/Layout/BaseLayout.razor
@@ -0,0 +1,20 @@
+@inherits LayoutComponentBase
+
+<MudThemeProvider @ref="@_themeProvider" Theme="@_mudTheme" IsDarkMode="@DarkTheme"/>
+<MudPopoverProvider />
+<MudDialogProvider/>
+<MudSnackbarProvider/>
+
+<CascadingValue Value="this">
+    <MudLayout>
+        <MudMainContent>
+            @Body
+        </MudMainContent>
+    </MudLayout>
+</CascadingValue>
+
+<div id="blazor-error-ui">
+    An unhandled error has occurred.
+    <a href="" class="reload">Reload</a>
+    <a class="dismiss">🗙</a>
+</div>
--- a/ImportUI/Components/Layout/BaseLayout.razor.cs
+++ b/ImportUI/Components/Layout/BaseLayout.razor.cs
@@ -0,0 +1,37 @@
+using Microsoft.AspNetCore.Components;
+using MudBlazor;
+
+namespace ImportUI.Components.Layout;
+
+public partial class BaseLayout
+{
+    private readonly MudTheme _mudTheme = new MudTheme();
+    private MudThemeProvider? _themeProvider;
+    private bool _isDarkTheme = true;
+    
+    public event EventHandler<bool>? OnDarkThemeChanged;
+
+    public bool DarkTheme
+    {
+        get => _isDarkTheme;
+        set
+        {
+            _isDarkTheme = value;
+            ThemeChanged();
+        }
+    }
+
+    private void ThemeChanged()
+    {
+        StateHasChanged();
+    }
+
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        if (firstRender && _themeProvider != null)
+        {
+            DarkTheme = await _themeProvider.GetSystemDarkModeAsync();
+            _themeProvider.IsDarkModeChanged = EventCallback.Factory.Create<bool>(this, x => OnDarkThemeChanged?.Invoke(this, x));
+        }
+    }
+}
--- a/ImportUI/Components/Layout/BaseLayout.razor.css
+++ b/ImportUI/Components/Layout/BaseLayout.razor.css
@@ -0,0 +1,18 @@
+#blazor-error-ui {
+    background: lightyellow;
+    bottom: 0;
+    box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
+    display: none;
+    left: 0;
+    padding: 0.6rem 1.25rem 0.7rem 1.25rem;
+    position: fixed;
+    width: 100%;
+    z-index: 1000;
+}
+
+#blazor-error-ui .dismiss {
+    cursor: pointer;
+    position: absolute;
+    right: 0.75rem;
+    top: 0.5rem;
+}
--- a/ImportUI/Components/Layout/MainLayout.razor
+++ b/ImportUI/Components/Layout/MainLayout.razor
@@ -1,33 +1,16 @@
@inherits LayoutComponentBase
+@layout ApplicationLayout

-
-@* Required MudBlazor *@
-<MudThemeProvider />
-<MudPopoverProvider />
-@* Needed for dialogs *@
-<MudDialogProvider />
-@* Needed for snackbars *@
-<MudSnackbarProvider />
-
-
-<div class="page">
-    <div class="sidebar">
+@if (ApplicationLayout != null)
+{
+    <MudDrawer @bind-Open="@ApplicationLayout.DrawerOpen" ClipMode="DrawerClipMode.Always">
        <NavMenu/>
-    </div>
+        <MudSpacer/>
+    </MudDrawer>
+}
+else
+{
+    <MudAlert Severity="Severity.Error" Variant="Variant.Outlined">Error getting cascading parameter 'ApplicationLayout'!</MudAlert>
+}

-    <main>
-        <div class="top-row px-4">
-            <a href="https://learn.microsoft.com/aspnet/core/" target="_blank">About</a>
-        </div>
-
-        <article class="content px-4">
-            @Body
-        </article>
-    </main>
-</div>
-
-<div id="blazor-error-ui">
-    An unhandled error has occurred.
-    <a href="" class="reload">Reload</a>
-    <a class="dismiss">🗙</a>
-</div>
+@Body
--- a/ImportUI/Components/Layout/MainLayout.razor.cs
+++ b/ImportUI/Components/Layout/MainLayout.razor.cs
@@ -0,0 +1,9 @@
+using Microsoft.AspNetCore.Components;
+
+namespace ImportUI.Components.Layout;
+
+public partial class MainLayout
+{
+    [CascadingParameter]
+    public ApplicationLayout? ApplicationLayout { get; set; }
+}
--- a/ImportUI/Components/Layout/MainLayout.razor.css
+++ b/ImportUI/Components/Layout/MainLayout.razor.css
@@ -8,89 +8,3 @@ main {
    flex: 1;
 }

-.sidebar {
-    background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);
-}
-
-.top-row {
-    background-color: #f7f7f7;
-    border-bottom: 1px solid #d6d5d5;
-    justify-content: flex-end;
-    height: 3.5rem;
-    display: flex;
-    align-items: center;
-}
-
-    .top-row ::deep a, .top-row ::deep .btn-link {
-        white-space: nowrap;
-        margin-left: 1.5rem;
-        text-decoration: none;
-    }
-
-    .top-row ::deep a:hover, .top-row ::deep .btn-link:hover {
-        text-decoration: underline;
-    }
-
-    .top-row ::deep a:first-child {
-        overflow: hidden;
-        text-overflow: ellipsis;
-    }
-
-@media (max-width: 640.98px) {
-    .top-row {
-        justify-content: space-between;
-    }
-
-    .top-row ::deep a, .top-row ::deep .btn-link {
-        margin-left: 0;
-    }
-}
-
-@media (min-width: 641px) {
-    .page {
-        flex-direction: row;
-    }
-
-    .sidebar {
-        width: 250px;
-        height: 100vh;
-        position: sticky;
-        top: 0;
-    }
-
-    .top-row {
-        position: sticky;
-        top: 0;
-        z-index: 1;
-    }
-
-    .top-row.auth ::deep a:first-child {
-        flex: 1;
-        text-align: right;
-        width: 0;
-    }
-
-    .top-row, article {
-        padding-left: 2rem !important;
-        padding-right: 1.5rem !important;
-    }
-}
-
-#blazor-error-ui {
-    background: lightyellow;
-    bottom: 0;
-    box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
-    display: none;
-    left: 0;
-    padding: 0.6rem 1.25rem 0.7rem 1.25rem;
-    position: fixed;
-    width: 100%;
-    z-index: 1000;
-}
-
-    #blazor-error-ui .dismiss {
-        cursor: pointer;
-        position: absolute;
-        right: 0.75rem;
-        top: 0.5rem;
-    }
--- a/ImportUI/Components/Layout/NavMenu.razor
+++ b/ImportUI/Components/Layout/NavMenu.razor
@@ -1,17 +1,9 @@
-<div class="top-row ps-3 navbar navbar-dark">
-    <div class="container-fluid">
-        <a class="navbar-brand" href="">ImportUI</a>
-    </div>
-</div>
-
-<input type="checkbox" title="Navigation menu" class="navbar-toggler"/>
-
-<div class="nav-scrollable" onclick="document.querySelector('.navbar-toggler').click()">
-    <nav class="flex-column">
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="" Match="NavLinkMatch.All">
-                <span class="bi bi-house-door-fill-nav-menu" aria-hidden="true"></span> Home
-            </NavLink>
-        </div>
-    </nav>
-</div>
+
+<MudNavMenu>
+    <MudText Typo="Typo.h6" Class="px-4">YouTube Import</MudText>
+    <MudDivider Class="my-2"/>
+    <MudNavLink Href="/" Match="NavLinkMatch.Prefix">Home</MudNavLink>
+    <MudNavLink Href="/Accounts" Match="NavLinkMatch.All">Accounts</MudNavLink>
+    <MudNavLink Href="/Library" Match="NavLinkMatch.All">Library</MudNavLink>
+    <MudNavLink Href="/Playlists" Match="NavLinkMatch.All">Playlists</MudNavLink>
+</MudNavMenu>
--- a/ImportUI/Components/Layout/NavMenu.razor.css
+++ b/ImportUI/Components/Layout/NavMenu.razor.css
@@ -1,105 +0,0 @@
-.navbar-toggler {
-    appearance: none;
-    cursor: pointer;
-    width: 3.5rem;
-    height: 2.5rem;
-    color: white;
-    position: absolute;
-    top: 0.5rem;
-    right: 1rem;
-    border: 1px solid rgba(255, 255, 255, 0.1);
-    background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e") no-repeat center/1.75rem rgba(255, 255, 255, 0.1);
-}
-
-.navbar-toggler:checked {
-    background-color: rgba(255, 255, 255, 0.5);
-}
-
-.top-row {
-    height: 3.5rem;
-    background-color: rgba(0,0,0,0.4);
-}
-
-.navbar-brand {
-    font-size: 1.1rem;
-}
-
-.bi {
-    display: inline-block;
-    position: relative;
-    width: 1.25rem;
-    height: 1.25rem;
-    margin-right: 0.75rem;
-    top: -1px;
-    background-size: cover;
-}
-
-.bi-house-door-fill-nav-menu {
-    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-house-door-fill' viewBox='0 0 16 16'%3E%3Cpath d='M6.5 14.5v-3.505c0-.245.25-.495.5-.495h2c.25 0 .5.25.5.5v3.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.146-.354L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.354 1.146a.5.5 0 0 0-.708 0l-6 6A.5.5 0 0 0 1.5 7.5v7a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5Z'/%3E%3C/svg%3E");
-}
-
-.bi-plus-square-fill-nav-menu {
-    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-plus-square-fill' viewBox='0 0 16 16'%3E%3Cpath d='M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm6.5 4.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3a.5.5 0 0 1 1 0z'/%3E%3C/svg%3E");
-}
-
-.bi-list-nested-nav-menu {
-    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-list-nested' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M4.5 11.5A.5.5 0 0 1 5 11h10a.5.5 0 0 1 0 1H5a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 1 3h10a.5.5 0 0 1 0 1H1a.5.5 0 0 1-.5-.5z'/%3E%3C/svg%3E");
-}
-
-.nav-item {
-    font-size: 0.9rem;
-    padding-bottom: 0.5rem;
-}
-
-    .nav-item:first-of-type {
-        padding-top: 1rem;
-    }
-
-    .nav-item:last-of-type {
-        padding-bottom: 1rem;
-    }
-
-    .nav-item ::deep .nav-link {
-        color: #d7d7d7;
-        background: none;
-        border: none;
-        border-radius: 4px;
-        height: 3rem;
-        display: flex;
-        align-items: center;
-        line-height: 3rem;
-        width: 100%;
-    }
-
-.nav-item ::deep a.active {
-    background-color: rgba(255,255,255,0.37);
-    color: white;
-}
-
-.nav-item ::deep .nav-link:hover {
-    background-color: rgba(255,255,255,0.1);
-    color: white;
-}
-
-.nav-scrollable {
-    display: none;
-}
-
-.navbar-toggler:checked ~ .nav-scrollable {
-    display: block;
-}
-
-@media (min-width: 641px) {
-    .navbar-toggler {
-        display: none;
-    }
-
-    .nav-scrollable {
-        /* Never collapse the sidebar for wide screens */
-        display: block;
-
-        /* Allow sidebar to scroll for tall menus */
-        height: calc(100vh - 3.5rem);
-        overflow-y: auto;
-    }
-}
--- a/ImportUI/DependencyInjection.cs
+++ b/ImportUI/DependencyInjection.cs
@@ -0,0 +1,54 @@
+using DotBased.Logging;
+using DotBased.Logging.MEL;
+using DotBased.Logging.Serilog;
+using Serilog;
+
+namespace ImportUI;
+
+public static class DependencyInjection
+{
+    public static WebApplicationBuilder InjectDependencies(this WebApplicationBuilder builder)
+    {
+        return builder;
+    }
+
+    public static void SetupLogging(this WebApplicationBuilder builder)
+    {
+        var logSeverity = builder.Environment.IsDevelopment() ? LogSeverity.Debug : LogSeverity.Info;
+        var severityFilters = new Dictionary<string, LogSeverity>();
+        
+        var dotBasedLogSection = builder.Configuration.GetSection("DotBased:Logging");
+        if (dotBasedLogSection.Exists())
+        {
+            logSeverity = dotBasedLogSection.GetValue<LogSeverity>("Severity");
+            severityFilters = dotBasedLogSection.GetSection("SeverityFilters").GetChildren()
+                .ToDictionary(
+                    x => x.Key,
+                    x => x.Get<LogSeverity>()
+                );
+        }
+
+        LogService.Initialize(options =>
+        {
+            options.Severity = logSeverity;
+            foreach (var filter in severityFilters)
+            {
+                options.AddSeverityFilter(filter.Key, filter.Value);
+            }
+        });
+        Log.Logger = new LoggerConfiguration().UseBasedExtension()
+            .MinimumLevel.Verbose()
+            .Enrich.WithProperty("Application", "ImportUI")
+            .WriteTo.Console()
+            .WriteTo.File(path: Path.Combine("Logs", $"{(builder.Environment.IsDevelopment() ? "Debug" : "Release")}", "log_.log"), rollingInterval: RollingInterval.Day, outputTemplate: BasedSerilog.OutputTemplate)
+            .Destructure.ToMaximumDepth(4)
+            .Destructure.ToMaximumStringLength(100)
+            .Destructure.ToMaximumCollectionCount(10).CreateLogger();
+        
+        LogService.AddLogAdapter(new BasedSerilogAdapter(Log.Logger));
+
+        builder.Logging.ClearProviders();
+        builder.Logging.SetMinimumLevel(LogLevel.Trace);
+        builder.Logging.AddDotBasedLoggerProvider(LogService.Options);
+    }
+}
--- a/ImportUI/ImportUI.csproj
+++ b/ImportUI/ImportUI.csproj
@@ -7,7 +7,12 @@
    </PropertyGroup>

    <ItemGroup>
+      <PackageReference Include="DotBased" Version="1.0.0" />
+      <PackageReference Include="DotBased.Logging.MEL" Version="1.0.0" />
+      <PackageReference Include="DotBased.Logging.Serilog" Version="1.0.0" />
      <PackageReference Include="MudBlazor" Version="8.10.0" />
+      <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
+      <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
    </ItemGroup>

    <ItemGroup>
--- a/ImportUI/Program.cs
+++ b/ImportUI/Program.cs
@@ -1,3 +1,4 @@
+using ImportUI;
 using ImportUI.Components;
 using MudBlazor.Services;

@@ -7,6 +8,8 @@ var builder = WebApplication.CreateBuilder(args);
 builder.Services.AddRazorComponents()
    .AddInteractiveServerComponents();

+builder.SetupLogging();
+
 /* MudBlazor */
 builder.Services.AddMudServices();

--- a/ImportUI/appsettings.Development.json
+++ b/ImportUI/appsettings.Development.json
@@ -1,4 +1,16 @@
 {
+  "DotBased": {
+    "Logging": {
+      "Severity": "Debug",
+      "SeverityFilters":{
+        "Microsoft": "Info",
+        "Microsoft.Hosting.Lifetime": "Info",
+        "Microsoft.AspNetCore": "Warning",
+        "Microsoft.AspNetCore.Authentication": "Info",
+        "MudBlazor": "Info"
+      }
+    }
+  },
  "Logging": {
    "LogLevel": {
      "Default": "Information",
--- a/ImportUI/appsettings.json
+++ b/ImportUI/appsettings.json
@@ -1,4 +1,16 @@
 {
+  "DotBased": {
+    "Logging": {
+      "Severity": "Info",
+      "SeverityFilters":{
+        "Microsoft": "Info",
+        "Microsoft.Hosting.Lifetime": "Info",
+        "Microsoft.AspNetCore": "Warning",
+        "Microsoft.AspNetCore.Authentication": "Info",
+        "MudBlazor": "Info"
+      }
+    }
+  },
  "Logging": {
    "LogLevel": {
      "Default": "Information",
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+    <add key="NetzByte Gitea" value="https://git.netzbyte.com/api/packages/max/nuget/index.json" />
+  </packageSources>
+</configuration>
--- a/YtMiner/YtMiner.csproj
+++ b/YtMiner/YtMiner.csproj
@@ -6,4 +6,8 @@
        <Nullable>enable</Nullable>
    </PropertyGroup>

+    <ItemGroup>
+      <PackageReference Include="DotBased" Version="1.0.0" />
+    </ItemGroup>
+
 </Project>
Author	SHA1	Message	Date
max	18077ca58c	[CHANGE] Added logging	2025-08-04 19:36:12 +02:00
max	0f8530b9c0	[CHANGE] Updated layouts && configured rendermode	2025-08-04 17:53:02 +02:00
max	9489742a95	[ADD] Added DotBased to solution & added nuget config	2025-08-04 17:04:57 +02:00