V0.1.2 (#80)

Reviewed-on: #80

.gitea/workflows/linux_arm64_docker-release.yaml

@@ -24,13 +24,6 @@ jobs:
           echo "VERSION=$VERSION" >> $GITHUB_ENV
           echo "REPO_LC=${GITHUB_REPOSITORY,,}" >> $GITHUB_ENV
 
-      - name: Login to own image registry
-        uses: docker/login-action@v3
-        with:
-          registry: gitea.penry.de
-          username: ${{ secrets.REGISTRY_USER }}
-          password: ${{ secrets.REGISTRY_PASSWORD }}
-
       - name: Setup .NET10
         uses: actions/setup-dotnet@v3
         with:
@@ -42,8 +35,16 @@ jobs:
             -t gitea.penry.de/${{ env.REPO_LC }}:${{ env.VERSION }} \
             -t gitea.penry.de/${{ env.REPO_LC }}:latest \
             --label "org.opencontainers.image.source=https://gitea.penry.de/${{ github.repository }}" \
+            --build-arg VERSION=${{ env.VERSION }} \
             .
 
+      - name: Login to own image registry
+        uses: docker/login-action@v3
+        with:
+          registry: gitea.penry.de
+          username: ${{ secrets.REGISTRY_USER }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+          
       - name: Push Images
         run: |
           docker push gitea.penry.de/${{ env.REPO_LC }}:${{ env.VERSION }}

.gitea/workflows/linux_arm64_docker.yaml

@@ -14,23 +14,66 @@ jobs:
 
       - name: Checkout
         uses: actions/checkout@v4
-
+        with:
+          fetch-depth: 0
+        
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v3
 
       - name: Get Repository Name
         id: get_repo
         run: |
-          echo "REPO_LC=${GITHUB_REPOSITORY,,}" >> $GITHUB_ENV
-
+          REPO_LC="${GITHUB_REPOSITORY,,}" 
+          echo "REPO_LC=$REPO_LC" >> $GITHUB_ENV
+          echo "Repo: $REPO_LC"
+          
+      - name: Build version
+        shell: bash
+        run: |
+          LAST_TAG=$(git describe --tags --abbrev=0)
+          
+          if [[ -z "${LAST_TAG:-}" ]]; then
+            echo "No tag found"
+            exit 1
+          fi
+          
+          COMMIT_COUNT=$(git rev-list $LAST_TAG..HEAD --count)
+          
+          if [[ "$LAST_TAG" == *-* ]]; then
+            TEMP_LAST_TAG="${LAST_TAG%-*}"
+            VERSION="${TEMP_LAST_TAG}-nightly.${COMMIT_COUNT}"
+          else
+            VERSION="${LAST_TAG}-nightly.${COMMIT_COUNT}"
+          fi
+          
+          echo "LAST_TAG=$LAST_TAG" >> "$GITHUB_ENV"
+          echo "COMMIT_COUNT=$COMMIT_COUNT" >> "$GITHUB_ENV"
+          echo "VERSION=$VERSION" >> "$GITHUB_ENV"
+          
+          echo "Last tag: $LAST_TAG"
+          echo "Commit count: $COMMIT_COUNT"
+          echo "Final version: $VERSION"
+          
       - name: Build Linux ARM64 Docker Image
         run: |
           docker build \
-            -t gitea.penry.de/${{ env.REPO_LC }}:latest \
+            -t gitea.penry.de/${{ env.REPO_LC }}:nightly \
+            --build-arg VERSION=${{ env.VERSION }} \
             .
+      
+      - name: Login to own image registry
+        uses: docker/login-action@v3
+        with:
+          registry: gitea.penry.de
+          username: ${{ secrets.REGISTRY_USER }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+      
+      - name: Push Images
+        run: |
+          docker push gitea.penry.de/${{ env.REPO_LC }}:nightly
 
       - name: Save Docker Image to Tar
-        run: docker save -o CouchLog-Linux-ARM64-Docker-Image.tar gitea.penry.de/${{ env.REPO_LC }}:latest
+        run: docker save -o CouchLog-Linux-ARM64-Docker-Image.tar gitea.penry.de/${{ env.REPO_LC }}:nightly
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v3

CouchLog/Components/Account/Pages/ExternalLogin.razor

@@ -54,7 +54,7 @@
     private HttpContext HttpContext { get; set; } = default!;
 
     [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
+    private InputModel Input { get; set; } = null!;
 
     [SupplyParameterFromQuery]
     private string? RemoteError { get; set; }
@@ -94,6 +94,8 @@
             // the login page if we get here some other way.
             RedirectManager.RedirectTo("Account/Login");
         }
+        
+        Input ??= new InputModel();
     }
 
     private async Task OnLoginCallbackAsync()

CouchLog/Components/Account/Pages/ForgotPassword.razor

@@ -35,7 +35,7 @@
 
 @code {
     [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
+    private InputModel Input { get; set; } = null!;
 
     private async Task OnValidSubmitAsync()
     {

CouchLog/Components/Account/Pages/Login.razor

@@ -31,7 +31,7 @@
                 @* MudTextFields zwingend mit Name-Attribut für SSR *@
                 <MudTextField @bind-Value="Input.Username" 
                               For="@(() => Input.Username)" 
-                              Name="Input.Username"
+                              name="Input.Username"
                               Label="Username" 
                               Variant="Variant.Outlined" 
                               Margin="Margin.Dense"
@@ -40,7 +40,7 @@
 
                 <MudTextField @bind-Value="Input.Password" 
                               For="@(() => Input.Password)" 
-                              Name="Input.Password"
+                              name="Input.Password"
                               Label="Password" 
                               InputType="InputType.Password" 
                               Variant="Variant.Outlined" 
@@ -75,7 +75,7 @@
     private HttpContext HttpContext { get; set; } = default!;
 
     [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
+    private InputModel Input { get; set; } = null!;
 
     [SupplyParameterFromQuery]
     private string? ReturnUrl { get; set; }
@@ -87,6 +87,8 @@
             // Clear the existing external cookie to ensure a clean login process
             await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme);
         }
+        
+        Input ??= new InputModel();
     }
 
     public async Task LoginUser()

CouchLog/Components/Account/Pages/LoginWith2fa.razor

@@ -49,7 +49,7 @@
     private ApplicationUser user = default!;
 
     [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
+    private InputModel Input { get; set; } = null!;
 
     [SupplyParameterFromQuery]
     private string? ReturnUrl { get; set; }
@@ -62,6 +62,8 @@
         // Ensure the user has gone through the username & password screen first
         user = await SignInManager.GetTwoFactorAuthenticationUserAsync() ??
             throw new InvalidOperationException("Unable to load two-factor authentication user.");
+        
+        Input ??= new InputModel();
     }
 
     private async Task OnValidSubmitAsync()

CouchLog/Components/Account/Pages/LoginWithRecoveryCode.razor

@@ -38,7 +38,7 @@
     private ApplicationUser user = default!;
 
     [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
+    private InputModel Input { get; set; } = null!;
 
     [SupplyParameterFromQuery]
     private string? ReturnUrl { get; set; }
@@ -48,6 +48,8 @@
         // Ensure the user has gone through the username & password screen first
         user = await SignInManager.GetTwoFactorAuthenticationUserAsync() ??
             throw new InvalidOperationException("Unable to load two-factor authentication user.");
+        
+        Input ??= new InputModel();
     }
 
     private async Task OnValidSubmitAsync()

CouchLog/Components/Account/Pages/Manage/ChangePassword.razor

@@ -1,4 +1,4 @@
-@page "/Account/Manage/ChangePassword"
+@page "/Account/ChangePassword"
 
 @using System.ComponentModel.DataAnnotations
 @using Microsoft.AspNetCore.Identity
@@ -9,67 +9,81 @@
 @inject IdentityUserAccessor UserAccessor
 @inject IdentityRedirectManager RedirectManager
 @inject ILogger<ChangePassword> Logger
+@inject ISnackbar Snackbar
 
 <PageTitle>Change password</PageTitle>
 
-<h3>Change password</h3>
-<StatusMessage Message="@message" />
-<div class="row">
-    <div class="col-xl-6">
-        <EditForm Model="Input" FormName="change-password" OnValidSubmit="OnValidSubmitAsync" method="post">
-            <DataAnnotationsValidator />
-            <ValidationSummary class="text-danger" role="alert" />
-            <div class="form-floating mb-3">
-                <InputText type="password" @bind-Value="Input.OldPassword" id="Input.OldPassword" class="form-control" autocomplete="current-password" aria-required="true" placeholder="Enter the old password" />
-                <label for="Input.OldPassword" class="form-label">Old password</label>
-                <ValidationMessage For="() => Input.OldPassword" class="text-danger" />
-            </div>
-            <div class="form-floating mb-3">
-                <InputText type="password" @bind-Value="Input.NewPassword" id="Input.NewPassword" class="form-control" autocomplete="new-password" aria-required="true" placeholder="Enter the new password" />
-                <label for="Input.NewPassword" class="form-label">New password</label>
-                <ValidationMessage For="() => Input.NewPassword" class="text-danger" />
-            </div>
-            <div class="form-floating mb-3">
-                <InputText type="password" @bind-Value="Input.ConfirmPassword" id="Input.ConfirmPassword" class="form-control" autocomplete="new-password" aria-required="true" placeholder="Enter the new password" />
-                <label for="Input.ConfirmPassword" class="form-label">Confirm password</label>
-                <ValidationMessage For="() => Input.ConfirmPassword" class="text-danger" />
-            </div>
-            <button type="submit" class="w-100 btn btn-lg btn-primary">Update password</button>
-        </EditForm>
-    </div>
-</div>
+<MudText Typo="Typo.h6">Change password</MudText>
+
+<EditForm Model="Input" FormName="change-password" OnValidSubmit="OnValidSubmitAsync" method="post">
+    
+    <MudTextField
+        T="string"
+        name="Input.OldPassword"
+        Label="OldPassword"
+        @bind-Value="Input.OldPassword"
+        For="@(() => Input.OldPassword)"
+        InputType="InputType.Password"
+        Required="true"
+        Variant="Variant.Outlined"
+        ShrinkLabel="true"/>
+
+    <MudTextField
+        T="string"
+        name="Input.NewPassword"
+        Label="New password"
+        @bind-Value="Input.NewPassword"
+        For="@(() => Input.NewPassword)"
+        InputType="InputType.Password"
+        Required="true"
+        Variant="Variant.Outlined"
+        ShrinkLabel="true"/>
+
+    <MudTextField
+        T="string"
+        name="Input.ConfirmPassword"
+        Label="Confirm password"
+        @bind-Value="Input.ConfirmPassword"
+        For="@(() => Input.ConfirmPassword)"
+        InputType="InputType.Password"
+        Required="true"
+        Variant="Variant.Outlined"
+        ShrinkLabel="true"/>
+
+    <MudButton ButtonType="ButtonType.Submit" Variant="Variant.Filled" Color="Color.Primary">Change password</MudButton>
+</EditForm>
 
 @code {
-    private string? message;
-    private ApplicationUser user = default!;
-    private bool hasPassword;
+    private ApplicationUser _user = null!;
+    private bool _hasPassword;
 
     [CascadingParameter]
-    private HttpContext HttpContext { get; set; } = default!;
+    private HttpContext HttpContext { get; set; } = null!;
 
     [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
+    private InputModel Input { get; set; } = null!;
 
     protected override async Task OnInitializedAsync()
     {
-        user = await UserAccessor.GetRequiredUserAsync(HttpContext);
-        hasPassword = await UserManager.HasPasswordAsync(user);
-        if (!hasPassword)
+        _user = await UserAccessor.GetRequiredUserAsync(HttpContext);
+        _hasPassword = await UserManager.HasPasswordAsync(_user);
+        if (!_hasPassword)
         {
             RedirectManager.RedirectTo("Account/Manage/SetPassword");
         }
+        Input ??= new InputModel();
     }
 
     private async Task OnValidSubmitAsync()
     {
-        var changePasswordResult = await UserManager.ChangePasswordAsync(user, Input.OldPassword, Input.NewPassword);
+        var changePasswordResult = await UserManager.ChangePasswordAsync(_user, Input.OldPassword, Input.NewPassword);
         if (!changePasswordResult.Succeeded)
         {
-            message = $"Error: {string.Join(",", changePasswordResult.Errors.Select(error => error.Description))}";
+            
             return;
         }
 
-        await SignInManager.RefreshSignInAsync(user);
+        await SignInManager.RefreshSignInAsync(_user);
         Logger.LogInformation("User changed their password successfully.");
 
         RedirectManager.RedirectToCurrentPageWithStatus("Your password has been changed", HttpContext);

CouchLog/Components/Account/Pages/Manage/DeletePersonalData.razor

@@ -47,13 +47,15 @@
     private HttpContext HttpContext { get; set; } = default!;
 
     [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
+    private InputModel Input { get; set; } = null!;
 
     protected override async Task OnInitializedAsync()
     {
         Input ??= new();
         user = await UserAccessor.GetRequiredUserAsync(HttpContext);
         requirePassword = await UserManager.HasPasswordAsync(user);
+        
+        Input ??= new InputModel();
     }
 
     private async Task OnValidSubmitAsync()

CouchLog/Components/Account/Pages/Manage/Email.razor

@@ -63,7 +63,7 @@
     private HttpContext HttpContext { get; set; } = default!;
 
     [SupplyParameterFromForm(FormName = "change-email")]
-    private InputModel Input { get; set; } = new();
+    private InputModel Input { get; set; } = null!;
 
     protected override async Task OnInitializedAsync()
     {
@@ -72,6 +72,7 @@
         isEmailConfirmed = await UserManager.IsEmailConfirmedAsync(user);
 
         Input.NewEmail ??= email;
+        Input ??= new InputModel();
     }
 
     private async Task OnValidSubmitAsync()

CouchLog/Components/Account/Pages/Manage/EnableAuthenticator.razor

@@ -79,7 +79,7 @@ else
     private HttpContext HttpContext { get; set; } = default!;
 
     [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
+    private InputModel Input { get; set; } = null!;
 
     protected override async Task OnInitializedAsync()
     {

CouchLog/Components/Account/Pages/Manage/Index.razor

@@ -11,27 +11,14 @@
 
 <PageTitle>Profile</PageTitle>
 
-<h3>Profile</h3>
+<MudText Typo="Typo.h6">Profile</MudText>
 <StatusMessage />
 
-<div class="row">
-    <div class="col-xl-6">
-        <EditForm Model="Input" FormName="profile" OnValidSubmit="OnValidSubmitAsync" method="post">
-            <DataAnnotationsValidator />
-            <ValidationSummary class="text-danger" role="alert" />
-            <div class="form-floating mb-3">
-                <input type="text" value="@username" id="username" class="form-control" placeholder="Choose your username." disabled />
-                <label for="username" class="form-label">Username</label>
-            </div>
-            <!--<div class="form-floating mb-3">
-                <InputText @bind-Value="Input.PhoneNumber" id="Input.PhoneNumber" class="form-control" placeholder="Enter your phone number" />
-                <label for="Input.PhoneNumber" class="form-label">Phone number</label>
-                <ValidationMessage For="() => Input.PhoneNumber" class="text-danger" />
-            </div>
-            <button type="submit" class="w-100 btn btn-lg btn-primary">Save</button>-->
-        </EditForm>
-    </div>
-</div>
+<MudContainer Class="pa-0 ma-0">
+    <MudTextField Value="@username" Variant="Variant.Outlined" Label="Username"/>
+</MudContainer>
+
+
 
 @code {
     private ApplicationUser user = default!;
@@ -42,7 +29,7 @@
     private HttpContext HttpContext { get; set; } = default!;
 
     [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
+    private InputModel Input { get; set; } = null!;
 
     protected override async Task OnInitializedAsync()
     {

CouchLog/Components/Account/Pages/Manage/SetPassword.razor

@@ -45,7 +45,7 @@
     private HttpContext HttpContext { get; set; } = default!;
 
     [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
+    private InputModel Input { get; set; } = null!;
 
     protected override async Task OnInitializedAsync()
     {

CouchLog/Components/Account/Pages/Register.razor

@@ -59,7 +59,7 @@
     private IEnumerable<IdentityError>? identityErrors;
 
     [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
+    private InputModel Input { get; set; } = null!;
 
     [SupplyParameterFromQuery]
     private string? ReturnUrl { get; set; }

CouchLog/Components/Account/Pages/ResendEmailConfirmation.razor

@@ -37,7 +37,7 @@
     private string? message;
 
     [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
+    private InputModel Input { get; set; } = null!;
 
     private async Task OnValidSubmitAsync()
     {

CouchLog/Components/Account/Pages/ResetPassword.razor

@@ -46,7 +46,7 @@
     private IEnumerable<IdentityError>? identityErrors;
 
     [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
+    private InputModel Input { get; set; } = null!;
 
     [SupplyParameterFromQuery]
     private string? Code { get; set; }

CouchLog/Components/Account/Shared/ManageLayout.razor

@@ -1,17 +1,18 @@
 @inherits LayoutComponentBase
 @layout CouchLog.Components.Layout.MainLayout
 
-<h1>Manage your account</h1>
+<MudText Typo="Typo.h2">Manage your account</MudText>
 
-<div>
-    <h2>Change your account settings</h2>
-    <hr />
-    <div class="row">
-        <div class="col-lg-3">
-            <ManageNavMenu />
-        </div>
-        <div class="col-lg-9">
+<MudContainer MaxWidth="MaxWidth.False" Class="pa-4">
+    <MudText Typo="Typo.h4">Change your account settings</MudText>
+    <hr/>
+    <MudGrid>
+        <MudItem xs="12" md="3" lg="2">
+            <ManageNavMenu/>
+        </MudItem>
+        
+        <MudItem xs="12" md="9" lg="10">
             @Body
-        </div>
-    </div>
-</div>
+        </MudItem>
+    </MudGrid>
+</MudContainer>

CouchLog/Components/Account/Shared/ManageNavMenu.razor

@@ -3,33 +3,41 @@
 
 @inject SignInManager<ApplicationUser> SignInManager
 
-<ul class="nav nav-pills flex-column">
-    <li class="nav-item">
-        <NavLink class="nav-link" href="Account/Manage" Match="NavLinkMatch.All">Profile</NavLink>
-    </li>
-    <!-- 
-    <li class="nav-item">
-        <NavLink class="nav-link" href="Account/Manage/Email">Email</NavLink>
-    </li> 
+<MudNavMenu>
+    <MudNavLink Href="Account/Manage"
+                Icon="@Icons.Material.Filled.ManageAccounts">
+        Manage
+    </MudNavLink>
+    <!--
+    <MudNavLink Href="Account/Manage/Email"
+                Icon="@Icons.Material.Filled.Email">
+        Email
+    </MudNavLink>
     -->
-    <li class="nav-item">
-        <NavLink class="nav-link" href="Account/Manage/ChangePassword">Password</NavLink>
-    </li>
+    <MudNavLink Href="Account/ChangePassword"
+                Icon="@Icons.Material.Filled.Password">
+        Password
+    </MudNavLink>
     @if (hasExternalLogins)
     {
-        <li class="nav-item">
-            <NavLink class="nav-link" href="Account/Manage/ExternalLogins">External logins</NavLink>
-        </li>
+        <MudNavLink Href="Account/Manage/ExternalLogins"
+                    Icon="@Icons.Material.Filled.Login">
+            External logins
+        </MudNavLink>
     }
     <!--
-    <li class="nav-item">
-        <NavLink class="nav-link" href="Account/Manage/TwoFactorAuthentication">Two-factor authentication</NavLink>
-    </li>
+    <MudNavLink Href="Account/Manage/TwoFactorAuthentication"
+                Icon="@Icons.Material.Filled.FactCheck">
+        Two-factor authentication
+    </MudNavLink>
     -->
-    <li class="nav-item">
-        <NavLink class="nav-link" href="Account/Manage/PersonalData">Personal data</NavLink>
-    </li>
-</ul>
+    <!--
+    <MudNavLink Href="Account/Manage/PersonalData"
+                Icon="@Icons.Material.Filled.DataObject">
+        Personal data
+    </MudNavLink>
+    -->
+</MudNavMenu>
 
 @code {
     private bool hasExternalLogins;

CouchLog/Components/AdminSettings/Pages/CouchLogSettings.razor

@@ -1,51 +1,38 @@
 @page "/AdminSettings/CouchLogSettings"
 @rendermode InteractiveServer
 
+@using System.Reflection
 @using CouchLog.Data
 @using Microsoft.EntityFrameworkCore
-@using Microsoft.AspNetCore.Components.Forms
 
-@inject ApplicationDbContext CouchLogDB
+@inject ApplicationDbContext CouchLogDb
 
-<h3>CouchLog Settings</h3>
+<MudText Typo="Typo.h3">CouchLog Settings</MudText>
 
-@if (accountsSettings is null)
-{
-    <p>Lade Einstellungen…</p>
-}
-else
-{
-    <EditForm Model="accountsSettings">
-        <div class="form-check form-switch">
-            <InputCheckbox class="form-check-input"
-                           role="switch"
-                           id="IsRegistrationallowedInput"
-                           Value="accountsSettings.IsRegistrationAllowed"
-                           ValueChanged="OnRegistrationChanged"
-                           ValueExpression="() => accountsSettings.IsRegistrationAllowed" />
+<EditForm Model="_accountsSettings">
+    <MudSwitch T="bool"
+               Label="Is Registration allowed"
+               Value="_accountsSettings.IsRegistrationAllowed"
+               ValueChanged="OnRegistrationChanged"
+               Color="Color.Primary" />
+</EditForm>
 
-
-
-            <label class="form-check-label" for="IsRegistrationallowedInput">
-                Is Registration allowed
-            </label>
-        </div>
-    </EditForm>
-}
+@*<MudText>Version: @_version</MudText>*@
 
 @code {
-    private AccountsSettings? accountsSettings;
+    private AccountsSettings _accountsSettings = null!;
+    //private readonly string _version = Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion?.Split('+')[0];
 
     protected override async Task OnInitializedAsync()
     {
-        accountsSettings = await CouchLogDB.AccountsSettings.FirstAsync();
+        _accountsSettings = await CouchLogDb.AccountsSettings.FirstAsync();
     }
 
     private async Task OnRegistrationChanged(bool value)
     {
-        accountsSettings!.IsRegistrationAllowed = value;
+        _accountsSettings!.IsRegistrationAllowed = value;
 
-        CouchLogDB.AccountsSettings.Update(accountsSettings);
-        await CouchLogDB.SaveChangesAsync();
+        CouchLogDb.AccountsSettings.Update(_accountsSettings);
+        await CouchLogDb.SaveChangesAsync();
     }
 }

CouchLog/Components/AdminSettings/Pages/Dialogs/CreateUserDialog.razor

@@ -0,0 +1,68 @@
+@using CouchLog.Data
+@using Microsoft.AspNetCore.Identity
+
+@inject UserManager<ApplicationUser> UserManager
+@inject ISnackbar Snackbar
+
+<MudDialog>
+    <TitleContent>
+        <MudText Typo="Typo.h6">Create New User</MudText>
+    </TitleContent>
+
+    <DialogContent>
+        <MudInput @bind-Value="@_newUsername"></MudInput>
+        <MudSelect @bind-Value="_newUserRole">
+            @foreach (var role in Roles)
+            {
+                <MudSelectItem Value="@role.Name">@role.Name</MudSelectItem>
+            }
+        </MudSelect>
+    </DialogContent>
+
+    <DialogActions>
+        <MudButton OnClick="CreateNewUser" Variant="Variant.Filled" Color="Color.Success">Create user</MudButton>
+        <MudButton OnClick="Cancel" Variant="Variant.Filled" Color="Color.Error">Cancel</MudButton>
+    </DialogActions>
+</MudDialog>
+
+@code
+{
+    [Parameter] public required List<IdentityRole> Roles { get; set; }
+    
+    [CascadingParameter]
+    public IMudDialogInstance MudDialog { get; set; } = null!;
+    
+    private string _newUsername = string.Empty;
+    private string _newUserRole = string.Empty;
+
+    private async Task CreateNewUser()
+    {
+        if (string.IsNullOrWhiteSpace(_newUsername) || string.IsNullOrWhiteSpace(_newUserRole))
+        {
+            Snackbar.Add("Add Username and Role" , Severity.Warning);
+            return;
+        }
+
+        ApplicationUser newUser = new ApplicationUser
+        {
+            UserName = _newUsername,
+            EmailConfirmed = true
+        };
+
+        var result = await UserManager.CreateAsync(newUser, "NewPassword123!");
+
+        if(result.Succeeded)
+        {
+            await UserManager.AddToRoleAsync(newUser, _newUserRole);
+            MudDialog.Close(DialogResult.Ok(newUser));
+            return;
+        }
+
+        //Snackbar.Add("User could not be created", Severity.Error);
+    }
+
+    private async Task Cancel()
+    {
+        MudDialog.Cancel();
+    }
+}

CouchLog/Components/AdminSettings/Pages/Index.razor

@@ -2,10 +2,15 @@
 
 @using Microsoft.AspNetCore.Authorization
 
+@inject NavigationManager NavigationManager
+
 @attribute [Authorize(Roles = "Admin")]
 
 <h3>Index</h3>
 
+<MudLink Href="AdminSettings/CouchLogSettings">CouchLog Settings</MudLink>
+<MudLink Href="AdminSettings/UserManagement">User Management</MudLink>
+
 @code {
 
 }

CouchLog/Components/AdminSettings/Pages/UserManagement.razor

@@ -1,106 +1,84 @@
 @page "/AdminSettings/UserManagement"
 @rendermode InteractiveServer
 
+@using CouchLog.Components.AdminSettings.Pages.Dialogs
 @using CouchLog.Data
 @using Microsoft.AspNetCore.Identity
 @using Microsoft.EntityFrameworkCore
-@using Microsoft.AspNetCore.Components.QuickGrid
 @using Microsoft.AspNetCore.Authorization
 
-@inject ApplicationDbContext CouchLogDB
+@inject ApplicationDbContext CouchLogDb
 @inject UserManager<ApplicationUser> UserManager
 @inject AuthenticationStateProvider AuthenticationStateProvider
 @inject NavigationManager NavigationManager
+@inject IDialogService DialogService
+@inject ISnackbar Snackbar
 
 @attribute [Authorize(Roles = "Admin")]
 
-<div class="d-flex align-items-center justify-content-between">
-    <h3 class="mb-0">UserManagement</h3>
+<MudStack Row="true">
+    <MudText Typo="Typo.h3">UserManagement</MudText>
+    <MudSpacer/>
+    <MudFab StartIcon="@Icons.Material.Filled.Add" Color="Color.Primary" OnClick="OpenCreateUserDialog"/>
+</MudStack>
 
-    <button type="button"
-            class="btn btn-primary"
-            data-bs-toggle="modal"
-            data-bs-target="#exampleModal">
-        Add User
-    </button>
-</div>
+<br/>
 
-<!-- <div>
-    <QuickGrid Items="@gridUsers.AsQueryable()">
-        <PropertyColumn Title="#" Property="@(u => u.Index)" />
-        <PropertyColumn Title="Username" Property="@(u => u.UserName)" />
-        <PropertyColumn Title="Role" Property="@(u => u.Role)" />
-
-        <TemplateColumn Title="">
-            @if(context.UserId != currentUserId)
-            {
-                <button class="btn btn-danger btn-sm" @onclick="() => DeleteUser(context)">Delete</button>
-            }
+<MudDataGrid Items="_gridUsers" Filterable="false" SortMode="@SortMode.Single" Groupable="false">
+    <Columns>
+        <PropertyColumn Property="arg => arg.Index " Title="Index"/>
+        <PropertyColumn Property="arg => arg.UserId" Title="User Id"/>
+        <PropertyColumn Property="arg => arg.UserName" Title="User Name"/>
+        <PropertyColumn Property="arg => arg.Role" Title="Role"/>
+        <TemplateColumn>
+            <CellTemplate>
+                @if (context.Item.UserId != _currentUserId)
+                {
+                    <MudFab Color="Color.Error" StartIcon="@Icons.Material.Filled.Delete" OnClick="@(() => DeleteUser(context.Item))"/>
+                }
+            </CellTemplate>
         </TemplateColumn>
-    </QuickGrid>
-</div> -->
-<!-- #region UserCreate Modal -->
-<div class="modal fade" id="exampleModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true" style="color: black">
-    <div class="modal-dialog modal-dialog-centered">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" style="color: black" id="exampleModalLabel">Create User</h5>
-                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-            </div>
-            <div class="modal-body">
-                <!-- 1. Username Input mit Binding und Bootstrap Klasse -->
-                <div class="mb-3">
-                    <label for="newUsernameInput" class="form-label">Username:</label>
-                    <input type="text" class="form-control" id="newUsernameInput" @bind="newUsername" />
-                </div>
-
-                <!-- 2. Select mit Binding -->
-                <div class="mb-3">
-                    <label class="form-label">Role:</label>
-                    <select class="form-select" @bind="newUserRoleId">
-                        <!-- WICHTIG: Eine leere Option als Standard, damit man weiß, ob etwas gewählt wurde -->
-                        <option value="" selected disabled>Bitte Rolle wählen...</option>
-
-                        @foreach (var role in roles)
-                        {
-                            <option value="@role.Id">@role.Name</option>
-                        }
-                    </select>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-                <button type="button" class="btn btn-primary" @onclick="CreateUserAsync">Create User</button>
-            </div>
-        </div>
-    </div>
-</div>
-<!-- #endregion -->
+    </Columns>
+</MudDataGrid>
 
 @code {
-
-    string newUsername = "";
-    string newUserRoleId = "";
-    List<UserGridItem> gridUsers = new();
-    List<IdentityRole> roles = new();
-    string? currentUserId;
+    private string? _currentUserId;
+    private List<ApplicationUser> _users = new();
+    private List<IdentityRole> _roles = new();
+    private List<UserGridItem> _gridUsers = new();
+    
+    public class UserGridItem
+    {
+        public int Index { get; set; }
+        public string UserId { get; set; } = "";
+        public string UserName { get; set; } = "";
+        public string Role { get; set; } = "";
+    }
 
     protected override async Task OnInitializedAsync()
     {
         var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
-        currentUserId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
+        _currentUserId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
 
-        var users = await CouchLogDB.Users.ToListAsync();
-        roles = await CouchLogDB.Roles.ToListAsync();
+        var users = await CouchLogDb.Users.ToListAsync();
+        _roles = await CouchLogDb.Roles.ToListAsync();
+
+        await CreateGridUserObjects();
+    }
+
+    private async Task CreateGridUserObjects()
+    {
+        _gridUsers.Clear();
+        
+        var users = await CouchLogDb.Users.ToListAsync();
         int index = 1;
-
-        gridUsers.Clear();
-
+        
         foreach (var user in users)
         {
+            
             var role = await UserManager.GetRolesAsync(user);
 
-            gridUsers.Add(new UserGridItem
+            _gridUsers.Add(new UserGridItem
             {
                 Index = index++,
                 UserId = user.Id,
@@ -110,17 +88,26 @@
         }
     }
 
-    public class UserGridItem
+    private async Task OpenCreateUserDialog()
     {
-        public int Index { get; set; }
-        public string UserId { get; set; } = "";
-        public string UserName { get; set; } = "";
-        public string Role { get; set; } = "";
+        var parameters = new DialogParameters<CreateUserDialog>
+        {
+            { x => x.Roles, _roles }
+        };
+        
+        var dialog = await DialogService.ShowAsync<CreateUserDialog>("Create User", parameters);
+        var result = await dialog.Result;
+        if (!result!.Canceled && result.Data is ApplicationUser newUser)
+        {
+            Snackbar.Add("User created", Severity.Success);
+            await CreateGridUserObjects();
+            StateHasChanged();
+        }
     }
 
     async Task DeleteUser(UserGridItem user)
     {
-        if (user.UserId == currentUserId)
+        if (user.UserId == _currentUserId)
             return;
 
         var identityUser = await UserManager.FindByIdAsync(user.UserId);
@@ -132,48 +119,12 @@
 
         if (result.Succeeded)
         {
-            gridUsers.Remove(user);
+            _gridUsers.Remove(user);
             StateHasChanged();
         }
         else
         {
-            // Optional: Fehler anzeigen
+            Snackbar.Add(result.Errors.ToString()!, Severity.Warning);
         }
     }
-
-    private async Task CreateUserAsync()
-    {
-        // Validierung
-        if (string.IsNullOrWhiteSpace(newUsername) || string.IsNullOrWhiteSpace(newUserRoleId))
-        {
-            // Fehlermeldung anzeigen oder abbrechen
-            Console.WriteLine("Bitte Benutzername und Rolle angeben.");
-            return;
-        }
-
-        // Hier deine Logik zum Erstellen des Users
-        var roleIdToUse = newUserRoleId;
-        var usernameToUse = newUsername;
-
-        ApplicationUser newUser = new ApplicationUser
-            {
-                UserName = newUsername,
-                EmailConfirmed = true
-            };
-
-        var result = await UserManager.CreateAsync(newUser, "NewPassword123!");
-
-        IdentityRole roleName = roles.FirstOrDefault(r => r.Id == newUserRoleId);
-
-        if(result.Succeeded)
-        {
-            await UserManager.AddToRoleAsync(newUser, roleName.Name);
-        }
-
-        // Modal schließen oder Formular zurücksetzen
-        newUsername = "";
-        newUserRoleId = "";
-
-        NavigationManager.NavigateTo(NavigationManager.Uri, true);
-    }
 }

CouchLog/Components/AdminSettings/Shared/AdminSettingsLayout.razor

@@ -5,17 +5,27 @@
 
 @attribute [Authorize(Roles = "Admin")]
 
-<h1>Manage CouchLog</h1>
+<MudText Typo="Typo.h1">Manage CouchLog</MudText>
 
-<div>
-    <h2></h2>
-    <hr />
-    <div class="row">
-        <div class="col-lg-3">
-            <AdminSettingsNavMenu />
-        </div>
-        <div class="col-lg-9">
+<MudContainer MaxWidth="MaxWidth.False" Class="pa-4">
+    <MudGrid>
+        <MudItem xs="12" md="3" lg="2">
+            <MudNavMenu>
+                <MudNavLink Href="/AdminSettings/CouchLogSettings"
+                            Icon="@Icons.Material.Filled.Settings">
+                    CouchLog Settings
+                </MudNavLink>
+
+                <MudNavLink Href="/AdminSettings/UserManagement"
+                            Match="NavLinkMatch.All"
+                            Icon="@Icons.Material.Filled.People">
+                    User Management
+                </MudNavLink>
+            </MudNavMenu>
+        </MudItem>
+
+        <MudItem xs="12" md="9" lg="10">
             @Body
-        </div>
-    </div>
-</div>
+        </MudItem>
+    </MudGrid>
+</MudContainer>

CouchLog/Components/AdminSettings/Shared/AdminSettingsNavMenu.razor

@@ -1,18 +0,0 @@
-@using Microsoft.AspNetCore.Identity
-@using CouchLog.Data
-
-@inject SignInManager<ApplicationUser> SignInManager
-
-<ul class="nav nav-pills flex-column">
-    <li class="nav-item">
-        <NavLink class="nav-link" href="/AdminSettings/CouchLogSettings">CouchLog Settings</NavLink>
-    </li>
-    <li class="nav-item">
-        <NavLink class="nav-link" href="/AdminSettings/UserManagement" Match="NavLinkMatch.All">User Management</NavLink>
-    </li>
-    <!--
-    <li class="nav-item">
-        <NavLink class="nav-link" href=""></NavLink>
-    </li>
-    -->
-</ul>

CouchLog/Components/Pages/GlobalList/Components/GlobalEntityCard.razor

@@ -1,11 +1,16 @@
 @using CouchLog.Data
 
 <MudCard>
-    <MudPaper Elevation="0">
-        <MudCardMedia Image="@GlobalEntity.PicturePath" Height="400" Style="object-fit: contain;"/>
+    <MudPaper Elevation="0" Style="position: relative;" @onmouseenter="@(() => _showEditOverlay = true)" @onmouseleave="@(() => _showEditOverlay = false)">
+        <MudCardMedia Image="@($"{GlobalEntity.PicturePath}?v={DateTime.Now.Ticks}")" Height="400" Style="object-fit: contain;"/>
+        <MudOverlay Visible="@_showEditOverlay" DarkBackground="true" Absolute="true">
+            <MudIconButton Icon="@Icons.Material.Rounded.Edit" Color="Color.Primary" OnClick="@(()=> OnEdit.InvokeAsync(GlobalEntity))" />
+        </MudOverlay>
     </MudPaper>
     <MudCardContent>
-        <MudText Typo="Typo.h5">@GlobalEntity.Title</MudText>
+        <MudTooltip Text="@GlobalEntity.Title">
+            <MudText Typo="Typo.h5" Style="display: block; max-width: 250px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">@GlobalEntity.Title</MudText>
+        </MudTooltip>
     </MudCardContent>
     <MudCardActions>
         <MudTooltip Text="Add to shared List">
@@ -34,4 +39,7 @@
     
     [Parameter] public EventCallback<GlobalEntity> OnAddToPrivate { get; set; }
     [Parameter] public EventCallback<GlobalEntity> OnAddToShared { get; set; }
+    [Parameter] public EventCallback<GlobalEntity> OnEdit { get; set; }
+
+    private bool _showEditOverlay;
 }

CouchLog/Components/Pages/GlobalList/Dialogs/AddNewGlobalEntityDialog.razor

@@ -1,29 +1,18 @@
 @using CouchLog.Data
 @using Microsoft.EntityFrameworkCore
-@using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Identity
 @using System.ComponentModel.DataAnnotations
 
-@inject ApplicationDbContext CouchLogDB
+@inject ApplicationDbContext CouchLogDb
 @inject UserManager<ApplicationUser> UserManager
 @inject AuthenticationStateProvider AuthenticationStateProvider
 @inject NavigationManager NavigationManager
 @inject ISnackbar Snackbar
 
 <style>
-    .drop-zone-hover-overlay {
-        position: absolute;
-        inset: 0;
-        background: rgba(0, 0, 0, 0.45);
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        opacity: 0;
-        transition: opacity .2s ease;
-        border-radius: 6px;
-    }
-    .drop-zone-wrapper:hover .drop-zone-hover-overlay {
-        opacity: 1;
+    .mud-file-upload-dragarea {
+        height: 400px;
+        width: 100%;
     }
 </style>
 
@@ -33,60 +22,33 @@
     </TitleContent>
 
     <DialogContent>
-        <EditForm EditContext="_editContext" OnSubmit="HandleSubmit">
+        <EditForm EditContext="_editContext" OnSubmit="HandleSubmit" id="New-Global-Entity-Form">
             <DataAnnotationsValidator />
 
-            <MudGrid Style="min-height: 400px;">
-                <MudItem xs="5" Style="display: flex;">
-                    <MudFileUpload T="IBrowserFile" @ref="_fileUpload" FilesChanged="OnPictureUploaded" Accept="image/*" Style="width: 100%; display: flex;">
-                        <ActivatorContent>
-                            <div @onclick="OpenFilePicker"
-                                 @ondragenter="@(() => _isDragOver = true)"
-                                 @ondragleave="@(() => _isDragOver = false)"
-                                 @ondragover:preventDefault="true"
-                                 @ondrop:preventDefault="true"
-                                 @ondrop="@(() => _isDragOver = false)"
-                                 style="@GetDropZoneStyle()"
-                                 class="d-flex align-center justify-center cursor-pointer drop-zone-wrapper">
-
-                                @if (_imagePreviewUrl is not null)
-                                {
-                                    <div style="position: relative; width: 100%; height: 100%;">
-                                        <img src="@_imagePreviewUrl"
-                                             alt="Preview"
-                                             style="width: 100%; height: 100%; object-fit: cover; border-radius: 6px; display: block;" />
-                                        <div class="drop-zone-hover-overlay">
-                                            <MudStack AlignItems="AlignItems.Center" Spacing="1">
-                                                <MudIcon Icon="@Icons.Material.Filled.Edit"
-                                                         Color="Color.Surface"
-                                                         Size="Size.Large" />
-                                                <MudText Typo="Typo.caption" Style="color: white;">
-                                                    Replace Image
-                                                </MudText>
-                                            </MudStack>
-                                        </div>
-                                    </div>
-                                }
-                                else
-                                {
-                                    <MudStack AlignItems="AlignItems.Center" Spacing="2">
-                                        <MudIcon Icon="@Icons.Material.Filled.CloudUpload"
-                                                 Size="Size.Large"
-                                                 Color="@(_isDragOver ? Color.Primary : Color.Secondary)" />
-                                        <MudText Typo="Typo.body2"
-                                                 Align="Align.Center"
-                                                 Color="@(_isDragOver ? Color.Primary : Color.Secondary)">
-                                            Bild hierher ziehen<br />oder klicken zum Auswählen
-                                        </MudText>
-                                    </MudStack>
-                                }
-
-                            </div>
-                        </ActivatorContent>
-                    </MudFileUpload>
-                </MudItem>
-                
-                <MudItem xs="7">
+            <MudStack Row="true" Spacing="3" AlignItems="AlignItems.Start" Style="min-height: 400px;" Breakpoint="Breakpoint.SmAndDown">
+                <!--<editor-fold desc="Picture-Upload">-->
+                <MudPaper Class="pa-0" Elevation="0" Width="280px" MinWidth="280px">
+                    @if (!string.IsNullOrWhiteSpace(_imagePreview))
+                    {
+                        <MudImage Src="@_imagePreview"
+                                  ObjectFit="ObjectFit.Contain"
+                                  Class="rounded" 
+                                  Style="width: 280px; height: 400px;"/>
+                    }
+                    else
+                    {
+                        <MudFileUpload @bind-Files="_pictureFile"
+                                       DragAndDrop="true"
+                                       OnFilesChanged="OnPictureUploaded"
+                                       Accept="image/*"
+                                       InputClass="null"
+                                       Class="mud-file-upload-dragarea">
+                            <SelectedTemplate Context="selectedTemplateContext"/>
+                        </MudFileUpload>
+                    }
+                </MudPaper>
+                <!--</editor-fold>-->
+                <MudPaper Class="flex-grow-1" Elevation="0" MinWidth="200px">
                     <MudStack Spacing="3">
 
                         <MudTextField @bind-Value="_form.Title"
@@ -115,25 +77,25 @@
                             }
                         </MudSelect>
                         <MudCheckBox @bind-Value="_isPrivate" Label="Is Private" Color="Color.Primary" />
-                        <MudButton ButtonType="ButtonType.Submit" Variant="Variant.Filled" Color="Color.Success" Disabled="_isSaving" Class="mt-3">
-                            @if (_isSaving)
-                            {
-                                <MudProgressCircular Indeterminate="true" Size="Size.Small" Class="mr-2" />
-                                <span>Saving...</span>
-                            }
-                            else
-                            {
-                                <span>Create Global Entity</span>
-                            }
-                        </MudButton>
                     </MudStack>
-                </MudItem>
-            </MudGrid>
+                </MudPaper>
+            </MudStack>
         </EditForm>
     </DialogContent>
 
     <DialogActions>
-        <MudButton OnClick="Cancel" Variant="Variant.Text" Disabled="_isSaving">Cancel</MudButton>
+        <MudButton OnClick="Cancel" Variant="Variant.Filled" Color="Color.Error" Disabled="_isSaving" Class="mt-3">Cancel</MudButton>
+        <MudButton ButtonType="ButtonType.Submit" Variant="Variant.Filled" Color="Color.Success" Disabled="_isSaving" Class="mt-3" form="New-Global-Entity-Form">
+            @if (_isSaving)
+            {
+                <MudProgressCircular Indeterminate="true" Size="Size.Small" Class="mr-2"/>
+                <span>Saving...</span>
+            }
+            else
+            {
+                <span>Create Global Entity</span>
+            }
+        </MudButton>
     </DialogActions>
 </MudDialog>
 
@@ -148,14 +110,17 @@
     private List<Genre> _genres = new();
 
     private GlobalEntityFormModel _form = new();
-    private MudFileUpload<IBrowserFile>? _fileUpload;
-    private IBrowserFile? _picture;
-    private string? _imagePreviewUrl;
-    private bool _isDragOver;
+    private string? _imagePreview;
     private int _selectedMediaTypeId;
     private bool _isPrivate;
     private bool _isSaving;
-    private IEnumerable<int> _selectedGenreIds = new HashSet<int>();
+    private IReadOnlyCollection<int> _selectedGenreIds = Array.Empty<int>();
+    
+    //Picture
+    private IBrowserFile? _pictureFile;
+    private string _pictureBase64 = null!;
+    private string? _pictureContentType;
+    private string? _pictureExtension;
 
     private class GlobalEntityFormModel
     {
@@ -164,15 +129,6 @@
         public string Title { get; set; } = string.Empty;
     }
 
-    private string GetDropZoneStyle() =>
-        "width: 100%; height: 100%; min-height: 380px; border-radius: 6px; " +
-        $"border: 2px dashed {(_isDragOver ? "var(--mud-palette-primary)" : "var(--mud-palette-lines-default)")}; " +
-        $"background-color: {(_isDragOver ? "var(--mud-palette-primary-hover)" : "transparent")}; " +
-        "transition: border-color .2s ease, background-color .2s ease;";
-
-    private Task OpenFilePicker() =>
-        _fileUpload?.OpenFilePickerAsync() ?? Task.CompletedTask;
-
     protected override async Task OnInitializedAsync()
     {
         _editContext = new EditContext(_form);
@@ -187,24 +143,34 @@
             return;
         }
 
-        _mediaTypes = await CouchLogDB.MediaType.OrderBy(t => t.Id).ToListAsync();
-        _genres = await CouchLogDB.Genres.OrderBy(t => t.Id).ToListAsync();
+        _mediaTypes = await CouchLogDb.MediaType.OrderBy(t => t.Id).ToListAsync();
+        _genres = await CouchLogDb.Genres.OrderBy(t => t.Id).ToListAsync();
 
         if (_mediaTypes.Count > 0)
             _selectedMediaTypeId = _mediaTypes.First().Id;
     }
 
-    private async Task OnPictureUploaded(IBrowserFile file)
+    private async Task OnPictureUploaded()
     {
-        _picture = file;
-        
-        const long maxPreviewSize = 5 * 1024 * 1024;
-        await using var stream = file.OpenReadStream(maxPreviewSize);
+        if (_pictureFile == null)
+        {
+            Snackbar.Add("No file selected!", Severity.Warning);
+            return;
+        }
+        if (_pictureFile.Size > 5242880)
+        {
+            Snackbar.Add("File size exceeds 5MB!", Severity.Error);
+            return;
+        }
+        await using var stream = _pictureFile.OpenReadStream(5242880);
         using var ms = new MemoryStream();
         await stream.CopyToAsync(ms);
+        
+        _pictureContentType = _pictureFile.ContentType;
+        _pictureExtension = Path.GetExtension(_pictureFile.Name);
 
-        var base64 = Convert.ToBase64String(ms.ToArray());
-        _imagePreviewUrl = $"data:{file.ContentType};base64,{base64}";
+        _pictureBase64 = Convert.ToBase64String(ms.ToArray());
+        _imagePreview = $"data:{_pictureFile.ContentType};base64,{_pictureBase64}";
     }
 
     private void Cancel() => MudDialog.Cancel();
@@ -213,7 +179,7 @@
     {
         if (!ctx.Validate()) return;
 
-        if (_picture is null)
+        if (_pictureFile is null)
         {
             Snackbar.Add("Please upload a picture.", Severity.Warning);
             return;
@@ -229,14 +195,10 @@
 
         try
         {
-            string safeTitle = _form.Title.Replace(" ", "-");
-            string fileName = $"{safeTitle}-{Guid.NewGuid()}{Path.GetExtension(_picture.Name)}";
+            string fileName = $"{Guid.NewGuid()}{_pictureExtension}";
             string picturePath = Path.Combine("wwwroot", "Pictures", fileName);
-
-            await using (var fs = File.Create(picturePath))
-            {
-                await _picture.OpenReadStream(maxAllowedSize: 10_000_000).CopyToAsync(fs);
-            }
+            
+            await File.WriteAllBytesAsync(picturePath, Convert.FromBase64String(_pictureBase64));
 
             var entity = new GlobalEntity
             {
@@ -248,19 +210,19 @@
                 IsPrivate = _isPrivate
             };
 
-            CouchLogDB.Add(entity);
-            await CouchLogDB.SaveChangesAsync();
+            CouchLogDb.Add(entity);
+            await CouchLogDb.SaveChangesAsync();
 
             foreach (int genreId in _selectedGenreIds)
             {
-                CouchLogDB.Add(new LinkTableGlobalGenre
+                CouchLogDb.Add(new LinkTableGlobalGenre
                 {
                     GenreId = genreId,
                     GlobalEntityId = entity.Id
                 });
             }
 
-            await CouchLogDB.SaveChangesAsync();
+            await CouchLogDb.SaveChangesAsync();
 
             Snackbar.Add("Global Entity created!", Severity.Success);
             MudDialog.Close(DialogResult.Ok(entity));

CouchLog/Components/Pages/GlobalList/GlobalList.razor

@@ -78,11 +78,12 @@
         <MudGrid Spacing="6" Justify="Justify.Center">
             @foreach (var globalEntity in VisibleGlobalEntities)
             {
-                <MudItem xs="12" sm="6" md="4" lg="3" xl="2">
+                <MudItem xs="12" sm="6" md="4" lg="3" xl="2" Style="min-width: 0;">
                     <GlobalEntityCard GlobalEntity="globalEntity"
                                       UserPrivateEntityIds="_userPrivateEntityIds"
                                       OnAddToPrivate="AddGlobalEntityToPrivateList"
-                                      OnAddToShared="AddGlobalEntityToSharedList"/>
+                                      OnAddToShared="AddGlobalEntityToSharedList"
+                                      OnEdit="OpenEditGlobalEntityDialog"/>
                 </MudItem>
             }
         </MudGrid>
@@ -151,7 +152,7 @@
 
     private async Task OnNewEntity(GlobalEntity entity)
     {
-        _globalEntities.Add(entity);
+        _globalEntities.Insert(0, entity);
         await RefreshPage();
     }
     
@@ -165,6 +166,44 @@
             await OnNewEntity(entity);
         }
     }
+
+    private async Task OpenEditGlobalEntityDialog(GlobalEntity globalEntity)
+    {
+        var parameters = new DialogParameters<EditGlobalEntityDialog>
+        {
+            { x => x.GlobalEntity, globalEntity },
+            { x => x.AppUser, _appUser}
+        };
+        
+        var dialog = await DialogService.ShowAsync<EditGlobalEntityDialog>("Edit Global Entity", parameters);
+        var result = await dialog.Result;
+
+        if (!result!.Canceled && result.Data is ValueTuple<GlobalEntity, bool> data)
+        {
+            if (data.Item2)
+            {
+                CouchLogDb.GlobalEntities.Remove(data.Item1);
+                await CouchLogDb.SaveChangesAsync();
+
+                _globalEntities.RemoveAll(x => x.Id == data.Item1.Id);
+
+                if (_currentPage > TotalPages)
+                    _currentPage = Math.Max(1, TotalPages);
+
+                StateHasChanged();
+            }
+
+            if (!data.Item2)
+            {
+                int index = _globalEntities.FindIndex(x => x.Id == data.Item1.Id);
+                if (index >= 0)
+                {
+                    _globalEntities[index] = data.Item1;
+                }
+                StateHasChanged();
+            }
+        }
+    }
     
     public async Task AddGlobalEntityToPrivateList(GlobalEntity globalEntity)
     {
@@ -178,6 +217,8 @@
                 CreationTime = DateTime.Now,
                 GlobalEntityId = globalEntity.Id,
                 UserWatchStatusId = 1,
+                //Season = 0,
+                //Episode = 0
             };
 
             CouchLogDb.PrivateEntities.Add(privateEntity);

CouchLog/Components/Pages/PrivateList/Components/PrivateEntityCard.razor

@@ -1,9 +1,9 @@
 @using CouchLog.Data
 
-<MudCard Style="max-width: 500px; background-color: #2a2a2a; color: white;" Elevation="4">
+<MudCard Elevation="4">
     <MudCardContent Class="pa-0">
         <MudGrid Spacing="0">
-            <!-- Poster Image -->
+            <!--<editor-fold desc="Poster-Image">-->
             <MudItem xs="4">
                 <MudImage 
                     Src="@PrivateEntity.GlobalEntity.PicturePath" 
@@ -11,73 +11,91 @@
                     ObjectFit="ObjectFit.Cover"
                     Style="width: 100%; height: 100%; min-height: 180px; border-radius: 4px 0 0 4px;" />
             </MudItem>
-
-            <!-- Content -->
+            <!--</editor-fold>-->
+            
             <MudItem xs="8">
                 <MudStack Class="pa-3" Spacing="2">
-                    <!-- Title Row with Menu -->
+                    <!--<editor-fold desc="Options">-->
                     <MudStack Row="true" AlignItems="AlignItems.Center" Justify="Justify.SpaceBetween">
-                        <MudText Typo="Typo.h6" Style="color: white; font-weight: 600;">@PrivateEntity.GlobalEntity.Title</MudText>
+                        <MudTooltip Text="@PrivateEntity.GlobalEntity.Title">
+                            <MudText Typo="Typo.h6" Style="display: block; max-width: 250px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">@PrivateEntity.GlobalEntity.Title</MudText>
+                        </MudTooltip>
                         <MudMenu Icon="@Icons.Material.Filled.MoreVert" Color="Color.Default" Dense="true">
-                            <MudMenuItem>Bearbeiten</MudMenuItem>
-                            <MudMenuItem>Entfernen</MudMenuItem>
+                            <MudMenuItem>Edit</MudMenuItem>
+                            <MudMenuItem OnClick="@(() => OnRemove.InvokeAsync())">Remove</MudMenuItem>
                         </MudMenu>
                     </MudStack>
+                    <!--</editor-fold>-->
 
-                    <!-- Date -->
-                    <!-- <MudText Typo="Typo.caption" Style="color: #aaaaaa;">@Date.ToString("MM/dd/yyyy")</MudText> -->
-
-                    <!-- Status Dropdown -->
-                    <MudSelect 
-                        T="string" 
-                        @bind-Value="@PrivateEntity.UserWatchStatus!.Name"
+                    <!--<editor-fold desc="Dropdown-States">-->
+                    <MudSelect
+                        T="int"
+                        Value="PrivateEntity.UserWatchStatus!.Id"
+                        ValueChanged="@(newStatusId => OnWatchStatusChange.InvokeAsync(newStatusId))"
                         Dense="true"
                         Variant="Variant.Outlined"
-                        Style="background-color: #3a3a3a; color: white;"
                         Label="">
-                        <!--@foreach (var status in )
+                        @foreach (var status in UserWatchStatuses)
                         {
-                            <MudSelectItem Value="@status">@status</MudSelectItem>
-                        }-->
+                            <MudSelectItem Value="status.Id">@status.Name</MudSelectItem>
+                        }
                     </MudSelect>
+                    <!--</editor-fold>-->
+                    
+                    <!-- @if (PrivateEntity.GlobalEntity.MediaType.Name == "Series" || PrivateEntity.GlobalEntity.MediaType.Name == "Anime") -->
+                    <!--{-->
+                        <!--<editor-fold desc="Dropdown-Season">-->
+                        <MudSelect
+                            T="int?"
+                            Value="PrivateEntity.Season"
+                            ValueChanged="@(newSeason => OnSeasonChange.InvokeAsync(newSeason))"
+                            Dense="true"
+                            Variant="Variant.Outlined"
+                            Label=""
+                            Class="@(PrivateEntity.GlobalEntity.MediaType.Name == "Series" ? "" : "invisible")">
+                            @{
+                                int? currentSeason = PrivateEntity.Season ?? 1;
+                                int? startOffsetSeason = currentSeason > 1 ? -1 : 0;
+                            }
+                            @for (int? i = startOffsetSeason; i <= 5; i++)
+                            {
+                                int? season = currentSeason + i;
+                                <MudSelectItem Value="@season">Staffel @season</MudSelectItem>
+                            }
+                        </MudSelect>
+                        <!--</editor-fold>-->
 
-                    <!-- Season Dropdown -->
-                    <MudSelect 
-                        T="int?" 
-                        @bind-Value="@PrivateEntity.Season"
-                        Dense="true"
-                        Variant="Variant.Outlined"
-                        Style="background-color: #3a3a3a; color: white;"
-                        Label="">
-                        <!-- @foreach (var season in SeasonOptions)
-                        {
-                            <MudSelectItem Value="@season">@season</MudSelectItem>
-                        }-->
-                    </MudSelect>
+                        <!--<editor-fold desc="Dropdown-Episode">-->
+                        <MudSelect
+                            T="int?"
+                            Value="PrivateEntity.Episode"
+                            ValueChanged="@(newEpisode => OnEpisodeChange.InvokeAsync(newEpisode))"
+                            Dense="true"
+                            Variant="Variant.Outlined"
+                            Label=""
+                            Class="@(PrivateEntity.GlobalEntity.MediaType.Name == "Series" ? "" : "invisible")">
+                            @{
+                                int? currentEpisode = PrivateEntity.Episode ?? 1;
+                                int? startOffsetEpisode = currentEpisode > 1 ? -1 : 0;
+                            }
+                            @for (int? i = startOffsetEpisode; i <= 5; i++)
+                            {
+                                int? episode = currentEpisode + i;
+                                <MudSelectItem Value="@episode">Episode @episode</MudSelectItem>
+                            }
+                        </MudSelect>
+                        <!--</editor-fold>-->
+                    <!--}-->
 
-                    <!-- Episode Dropdown -->
-                    <MudSelect 
-                        T="int?" 
-                        @bind-Value="@PrivateEntity.Episode"
-                        Dense="true"
-                        Variant="Variant.Outlined"
-                        Style="background-color: #3a3a3a; color: white;"
-                        Label="">
-                        <!--@foreach (var episode in EpisodeOptions)
-                        {
-                            <MudSelectItem Value="@episode">@episode</MudSelectItem>
-                        }-->
-                    </MudSelect>
-
-                    <!-- Details Button -->
+                    <!--<editor-fold desc="Details Button">-->
                     <MudStack Row="true" Justify="Justify.FlexEnd">
                         <MudButton 
                             Variant="Variant.Outlined" 
-                            Size="Size.Small"
-                            Style="color: #aaaaaa; border-color: #555555;">
+                            Size="Size.Small">
                             Details
                         </MudButton>
                     </MudStack>
+                    <!--</editor-fold>-->
                 </MudStack>
             </MudItem>
         </MudGrid>
@@ -88,4 +106,10 @@
 {
     [Parameter] public PrivateEntity PrivateEntity { get; set; } = null!;
     [Parameter] public List<UserWatchStatus> UserWatchStatuses { get; set; } = null!;
+    
+    [Parameter] public EventCallback<int> OnWatchStatusChange { get; set; }
+    [Parameter] public EventCallback<int?> OnSeasonChange { get; set; }
+    [Parameter] public EventCallback<int?> OnEpisodeChange { get; set; }
+    
+    [Parameter] public EventCallback OnRemove { get; set; } 
 }

CouchLog/Components/Pages/PrivateList/PrivateList.razor

@@ -53,10 +53,11 @@
                 </MudTooltip>
             </MudStack>
             <MudCollapse Expanded="_showFilters">
-                @*Entity allready added*@
+                No Filters avalible yet!
+                <!--@*Entity allready added*@
                 <MudSwitch @bind-Value="_showAlreadyAddedEntities" Color="Color.Primary">
                     Show already added Entities
-                </MudSwitch>
+                </MudSwitch>-->
                 @*To be exstendet*@
             </MudCollapse>
         </MudPaper>
@@ -72,7 +73,16 @@
         <MudGrid Spacing="6" Justify="Justify.Center">
             @foreach (var privateEntity in VisibleActiveWatchingEntities)
             {
-                <PrivateEntityCard PrivateEntity="privateEntity"/>
+                <MudItem xs="12" sm="8" md="6" lg="4">
+                    <PrivateEntityCard 
+                        PrivateEntity="privateEntity" 
+                        UserWatchStatuses="_userWatchStatuses"
+                        OnWatchStatusChange="@(newStatusId => ChangeWatchStatus(privateEntity, newStatusId))"
+                        OnSeasonChange="@(newSeason => ChangeSeason(privateEntity, newSeason))"
+                        OnEpisodeChange="@(newEpisode => ChangeEpisode(privateEntity, newEpisode))"
+                        OnRemove="() => RemovePrivateEntity(privateEntity)"
+                    />
+                </MudItem>
             }
         </MudGrid>
     </MudContainer>
@@ -85,14 +95,24 @@
     </MudContainer>
     <!--</editor-fold>-->
     
+    <br/>
+    
     <!--<editor-fold desc="Library">-->
     <MudContainer MaxWidth="MaxWidth.False">
         <MudText Typo="Typo.h4">Library</MudText>
-        <br/>
         <MudGrid Spacing="6" Justify="Justify.Center">
             @foreach (var privateEntity in VisibleLibraryEntities)
             {
-                <PrivateEntityCard PrivateEntity="privateEntity"/>
+                <MudItem xs="12" sm="8" md="6" lg="4">
+                    <PrivateEntityCard 
+                        PrivateEntity="privateEntity" 
+                        UserWatchStatuses="_userWatchStatuses"
+                        OnWatchStatusChange="@(newStatusId => ChangeWatchStatus(privateEntity, newStatusId))"
+                        OnSeasonChange="@(newSeason => ChangeSeason(privateEntity, newSeason))"
+                        OnEpisodeChange="@(newEpisode => ChangeEpisode(privateEntity, newEpisode))"
+                        OnRemove="() => RemovePrivateEntity(privateEntity)"
+                    />
+                </MudItem>
             }
         </MudGrid>
     </MudContainer>
@@ -112,20 +132,20 @@
     //Filter
     private string? _searchString;
     private bool _showFilters;
-    private bool _showAlreadyAddedEntities = false;
+    //private bool _showAlreadyAddedEntities = false;
     private IEnumerable<PrivateEntity> FiltertGlobalEntities => _privateEntities.Where(entity =>
             (string.IsNullOrWhiteSpace(_searchString) || entity.GlobalEntity.Title.Contains(_searchString, StringComparison.OrdinalIgnoreCase)) //Search bar
     );
     
     //Paging Active Watching
     private int _currentActiveWatchingPage = 1;
-    private int _pageSizeActiveWatching = 12;
+    private readonly int _pageSizeActiveWatching = 12;
     private int TotalPagesActiveWatching => (int)Math.Ceiling(ActiveWatchingEntities.Count() / (double)_pageSizeActiveWatching);
     private IEnumerable<PrivateEntity> VisibleActiveWatchingEntities => ActiveWatchingEntities.Skip((_currentActiveWatchingPage - 1) * _pageSizeActiveWatching).Take(_pageSizeActiveWatching);
     
     //Paging Library
     private int _currentLibraryPage = 1;
-    private int _pageSizeLibrary = 12;
+    private readonly int _pageSizeLibrary = 12;
     private int TotalPagesLibrary => (int)Math.Ceiling(LibraryEntities.Count() / (double)_pageSizeLibrary);
     private IEnumerable<PrivateEntity> VisibleLibraryEntities => LibraryEntities.Skip((_currentLibraryPage - 1) * _pageSizeLibrary).Take(_pageSizeLibrary);
     
@@ -140,6 +160,13 @@
     private IEnumerable<PrivateEntity> LibraryEntities => FiltertGlobalEntities.Where(x => x.UserWatchStatus?.Name != "Watching").ToList();
 
     protected override async Task OnInitializedAsync()
+    {
+        await GetPrivateEntities();
+
+        _userWatchStatuses = await CouchLogDb.UserWatchStatuses.OrderBy(entity => entity.Id).ToListAsync();
+    }
+
+    private async Task GetPrivateEntities()
     {
         var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
         _appUser = await UserManager.GetUserAsync(authState.User);
@@ -153,8 +180,38 @@
                 .Include(x => x.GlobalEntity.MediaType)
                 .OrderByDescending(entity => entity.LastChange ?? entity.CreationTime)
                 .ToListAsync();
-
-            _userWatchStatuses = await CouchLogDb.UserWatchStatuses.OrderByDescending(entity => entity.Id).ToListAsync();
         }
     }
+
+    private async Task RefreshPages()
+    {
+        _currentLibraryPage = 1;
+        _currentActiveWatchingPage = 1;
+        StateHasChanged();
+    }
+
+    private async Task ChangeWatchStatus(PrivateEntity privateEntity, int newUserWatchStatusId)
+    {
+        privateEntity.UserWatchStatus = _userWatchStatuses.FirstOrDefault(s => s.Id == newUserWatchStatusId);
+        await CouchLogDb.SaveChangesAsync();
+    }
+
+    private async Task ChangeSeason(PrivateEntity privateEntity, int? newSeason)
+    {
+        privateEntity.Season = newSeason;
+        await CouchLogDb.SaveChangesAsync();
+    }
+
+    private async Task ChangeEpisode(PrivateEntity privateEntity, int? newEpisode)
+    {
+        privateEntity.Episode = newEpisode;
+        await CouchLogDb.SaveChangesAsync();
+    }
+
+    private async Task RemovePrivateEntity(PrivateEntity privateEntity)
+    {
+        CouchLogDb.PrivateEntities.Remove(privateEntity);
+        await CouchLogDb.SaveChangesAsync();
+        await GetPrivateEntities();
+    }
 }

CouchLog/CouchLog.csproj

@@ -7,6 +7,10 @@
     <OutputType>Exe</OutputType>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackAsTool>True</PackAsTool>
+    <Version>0.1.0-nightly.10</Version>
+    <Authors>Penry</Authors>
+    <IsPackable>false</IsPackable>
+    <WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -58,26 +62,23 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.QuickGrid" Version="10.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="10.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.1" />
-    <PackageReference Include="Microsoft.Build" Version="18.0.2" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="5.0.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0" />
-    <PackageReference Include="Microsoft.DotNet.Scaffolding.Shared" Version="10.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.1">
+    <PackageReference Include="Microsoft.AspNetCore.Components.QuickGrid" Version="10.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="10.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Build" Version="18.7.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.9">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.1">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.9">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="MudBlazor" Version="8.15.0" />
+    <PackageReference Include="MudBlazor" Version="9.6.0" />
   </ItemGroup>
 
   <ItemGroup>

CouchLog/Data/DatabaseModels/Global/GlobalEntity.cs

@@ -4,8 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 
 namespace CouchLog.Data
 {
-    [method: SetsRequiredMembers]
-    public class GlobalEntity()
+    public class GlobalEntity
     {
         [Key]
         public int Id { get; set; }

CouchLog/OnStartUp.cs

@@ -140,7 +140,7 @@ namespace CouchLog
                 new() { Name = "Not watched", CreationTime = DateTime.Now },
                 new() { Name = "Watching", CreationTime = DateTime.Now },
                 new() { Name = "Finished", CreationTime = DateTime.Now },
-                new() { Name = "Paused", CreationTime = DateTime.Now },
+                new() { Name = "Waiting for next Season", CreationTime = DateTime.Now },
                 new() { Name = "Aborted", CreationTime= DateTime.Now },
             ];
 

README.md

@@ -1,2 +1,10 @@
 # Watchlog
-## Work in Progress
+## Information
+- This Repo has a Mirror on Codeberg, but the Releases a only available on [Gitea](https://gitea.penry.de/Penry/CouchLog) for now
+
+## About docker image Releases
+There are two options:
+- latest: Is the latest release Version
+- nightly: Is the latest commit on the main branch
+
+Test-Commit