Enhance login page with improved UI and error handling for invalid credentials

Changed the term "Freigabe zum Freischalten" to "Freigabe Freischalten" to ensure consistency with naming conventions. This adjustment clarifies language usage and aligns with the application's terminology standards.

.gitea/workflows/docker-image.yml

@@ -0,0 +1,56 @@
+name: Build And Push Docker Image
+
+on:
+  push:
+    tags:
+      - "image"
+  workflow_dispatch:
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    env:
+      DOTNET_ROLL_FORWARD: Major
+      REGISTRY: git.beging.de
+      BASE_IMAGE: git.beging.de/troogs/fs-onboarding-server
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Setup .NET SDK
+        uses: actions/setup-dotnet@v5
+        with:
+          dotnet-version: "9.0.x"
+
+      - name: Publish server project
+        run: dotnet publish ./FoodsharingSiegen.Server/FoodsharingSiegen.Server.csproj -c Release -o ./Publish/Server
+
+      - name: Login to Gitea registry
+        run: echo "${{ secrets.REGISTRY_TOKEN }}" | docker login "${{ env.REGISTRY }}" -u "${{ secrets.REGISTRY_USERNAME }}" --password-stdin
+
+      - name: Determine next timestamp tag
+        shell: bash
+        run: |
+          TODAY="$(date -u +%Y%m%d)"
+          i=1
+          while docker manifest inspect "${BASE_IMAGE}:${TODAY}-${i}" > /dev/null 2>&1; do
+            i=$((i + 1))
+          done
+
+          DATE_TAG="${TODAY}-${i}"
+          echo "DATE_TAG=${DATE_TAG}" >> "$GITHUB_ENV"
+          echo "Using image tag: ${DATE_TAG}"
+
+      - name: Build docker image
+        run: |
+          docker build \
+            -f ./Docker/dockerfile.server \
+            -t "${{ env.BASE_IMAGE }}:latest" \
+            -t "${{ env.BASE_IMAGE }}:${{ env.DATE_TAG }}" \
+            .
+
+      - name: Push docker images
+        run: |
+          docker push "${{ env.BASE_IMAGE }}:latest"
+          docker push "${{ env.BASE_IMAGE }}:${{ env.DATE_TAG }}"

.gitea/workflows/test.yml

@@ -0,0 +1,50 @@
+name: Build And Release
+
+on:
+  push:
+    tags:
+      - "v*"
+  workflow_dispatch:
+    inputs:
+      tag_name:
+        description: "Tag for the release (for example: v1.0.0)"
+        required: true
+        type: string
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    env:
+      RELEASE_TAG: ${{ github.event.inputs.tag_name || github.ref_name }}
+      DOTNET_ROLL_FORWARD: Major
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Setup .NET SDK
+        uses: actions/setup-dotnet@v5
+        with:
+          dotnet-version: "9.0.x"
+
+      - name: Restore dependencies
+        run: dotnet restore FoodsharingSiegen.sln
+
+      - name: Publish server build
+        run: dotnet publish ./FoodsharingSiegen.Server/FoodsharingSiegen.Server.csproj -c Release -o ./artifacts/publish
+
+      - name: Create zip package
+        run: |
+          cd artifacts
+          zip -r FoodsharingSiegen.Server-${{ env.RELEASE_TAG }}.zip publish
+
+      - name: Create release and upload artifact
+        uses: https://gitea.com/actions/gitea-release-action@v1
+        with:
+          files: artifacts/FoodsharingSiegen.Server-${{ env.RELEASE_TAG }}.zip
+          tag_name: ${{ env.RELEASE_TAG }}
+          name: Release ${{ env.RELEASE_TAG }}
+          target_commitish: ${{ github.sha }}
+          token: ${{ github.token }}

.gitignore

@@ -5,3 +5,6 @@ riderModule.iml
 /_ReSharper.Caches/
 
 Publish/
+app.db
+FoodsharingSiegen.Server/wwwroot/buildinfo.txt
+FoodsharingSiegen.Server/config/appsettings.json

.vscode/launch.json

@@ -0,0 +1,19 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Debug FoodsharingSiegen.Server",
+      "type": "dotnet",
+      "request": "launch",
+      "projectPath": "${workspaceFolder}/FoodsharingSiegen.Server/FoodsharingSiegen.Server.csproj",
+      "env": {
+        "DOTNET_ROLL_FORWARD": "Major"
+      },
+      "launchBrowser": true,
+      "serverReadyAction": {
+        "action": "openExternally",
+        "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
+      }
+    }
+  ]
+}

.vscode/tasks.json

@@ -0,0 +1,53 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "Watch FoodsharingSiegen.Server",
+      "type": "shell",
+      "command": "dotnet watch --project ./FoodsharingSiegen.Server/FoodsharingSiegen.Server.csproj run",
+      "isBackground": true,
+      "problemMatcher": "$msCompile",
+      "options": {
+        "statusbar": {
+          "hide": false,
+          "label": "Watch Server",
+          "color": "#3a96ff",
+          "icon": {
+            "id": "eye"
+          },
+          "running": {
+            "color": "#f7df06",
+            "icon": {
+              "id": "loading~spin"
+            }
+          }
+        }
+      }
+    },
+    {
+      "label": "Debug FoodsharingSiegen.Server",
+      "type": "shell",
+      "command": "dotnet run --project ./FoodsharingSiegen.Server/FoodsharingSiegen.Server.csproj",
+      "problemMatcher": "$msCompile",
+      "options": {
+        "env": {
+          "DOTNET_ROLL_FORWARD": "Major"
+        },
+        "statusbar": {
+          "hide": false,
+          "label": "Debug Server",
+          "color": "#3a96ff",
+          "icon": {
+            "id": "debug-start"
+          },
+          "running": {
+            "color": "#f7df06",
+            "icon": {
+              "id": "loading~spin"
+            }
+          }
+        }
+      }
+    }
+  ]
+}

Docker/.env

@@ -0,0 +1,7 @@
+MAIL_HOST=smtp.example.com
+MAIL_PORT=587
+MAIL_USERNAME=your_username
+MAIL_PASSWORD=your_password
+MAIL_FROM_ADDRESS=noreply@example.com
+MAIL_FROM_NAME="FS Einarbeitungen Musterhausen"
+MAIL_USE_SSL=true

Docker/docker-compose.yml

@@ -5,6 +5,17 @@ services:
     image: ghcr.io/troogs/fs-onboarding/server:latest
     ports:
       - "8100:56000"
+    env_file:
+      - .env
+    environment:
+      # Mail Configuration Examples. These override options in appsettings.json.
+      # All values below can also be set via the active .env file or appsettings.json.
+      - Settings__Mail__Host=${MAIL_HOST:-smtp.example.com}
+      - Settings__Mail__Port=${MAIL_PORT:-587}
+      - Settings__Mail__Username=${MAIL_USERNAME:-your_username}
+      - Settings__Mail__Password=${MAIL_PASSWORD:-your_password}
+      - Settings__Mail__FromAddress=${MAIL_FROM_ADDRESS:-no-reply@example.com}
+      - Settings__Mail__UseSsl=${MAIL_USE_SSL:-true}
     volumes:
       - /docker/data/fs-onboarding/config:/app/config/
       - /docker/data/fs-onboarding/data:/app/data/

FoodsharingSiegen.Contracts/Enums/ProspectSortOption.cs

@@ -0,0 +1,10 @@
+namespace FoodsharingSiegen.Contracts.Enums
+{
+    public enum ProspectSortOption
+    {
+        NameAscending,
+        NameDescending,
+        ModifiedAscending,
+        ModifiedDescending
+    }
+}

FoodsharingSiegen.Contracts/Model/AppSettings.cs

@@ -6,6 +6,11 @@
 
         public bool DisableStepIn { get; set; }
 
+        /// <summary>
+        /// Gets or sets the mail server settings.
+        /// </summary>
+        public MailSettings Mail { get; set; } = new();
+
         public TermSettings Terms { get; set; } = new();
 
         public bool TestMode { get; set; }

FoodsharingSiegen.Contracts/Model/MailSettings.cs

@@ -0,0 +1,38 @@
+namespace FoodsharingSiegen.Contracts.Model
+{
+    /// <summary>
+    /// Configuration settings for the mail service.
+    /// </summary>
+    public class MailSettings
+    {
+        /// <summary>
+        /// Gets or sets the SMTP server host.
+        /// </summary>
+        public string Host { get; set; } = string.Empty;
+
+        /// <summary>
+        /// Gets or sets the SMTP port.
+        /// </summary>
+        public int Port { get; set; } = 587;
+
+        /// <summary>
+        /// Gets or sets the username for SMTP authentication.
+        /// </summary>
+        public string Username { get; set; } = string.Empty;
+
+        /// <summary>
+        /// Gets or sets the password for SMTP authentication.
+        /// </summary>
+        public string Password { get; set; } = string.Empty;
+
+        /// <summary>
+        /// Gets or sets the sender address.
+        /// </summary>
+        public string FromAddress { get; set; } = string.Empty;
+
+        /// <summary>
+        /// Gets or sets whether to use SSL/TLS connection.
+        /// </summary>
+        public bool UseSsl { get; set; } = true;
+    }
+}

FoodsharingSiegen.Contracts/StorageKeys.cs

@@ -12,6 +12,26 @@ namespace FoodsharingSiegen.Contracts
         /// </summary>
         public const string ProspectFilter = "ProspectFilter";
 
+        /// <summary>
+        ///     Represents the storage key used for prospect sorting preferences.
+        /// </summary>
+        public const string SortProspects = "SortProspects";
+
+        /// <summary>
+        ///     Represents the storage key used for sorting all prospects.
+        /// </summary>
+        public const string SortProspectsAll = "SortProspectsAll";
+
+        /// <summary>
+        ///     Represents the storage key used for sorting completed prospects.
+        /// </summary>
+        public const string SortProspectsDone = "SortProspectsDone";
+
+        /// <summary>
+        ///     Represents the storage key used for sorting prospects pending verification.
+        /// </summary>
+        public const string SortProspectsVerify = "SortProspectsVerify";
+
         /// <summary>
         ///     The token key
         /// </summary>

FoodsharingSiegen.Server/Controls/ProspectContainer.razor

@@ -12,8 +12,23 @@
 <div class="@divClass">
     <h5 class="mb-2 d-flex">
         <div class="flex-grow-1">
-            @Prospect?.Name
-            <small style="font-size: .9rem;">@Prospect?.FsId</small>
+            @if(string.IsNullOrWhiteSpace(Prospect?.Name))
+            {
+                <i class="fa-solid fa-exclamation-triangle text-warning"></i>
+                <doublearrows></doublearrows>
+                
+                <em>»Name fehlt«</em>
+            }
+            else
+            {
+                @Prospect?.Name
+            }
+
+            @if (Prospect?.FsId != null && Prospect.FsId != 0)
+            {
+                <small style="font-size: .9rem; margin-left: 0.5rem;">@Prospect?.FsId</small>
+            }
+            
         </div>
         <div>
             @if (CurrentUser.IsInGroup(UserGroup.WelcomeTeam, UserGroup.Ambassador))

FoodsharingSiegen.Server/Controls/ProspectSortControl.razor

@@ -0,0 +1,17 @@
+@using FoodsharingSiegen.Contracts.Enums
+
+<Button Color="Color.Primary"
+        Width="Width.Px(50)"
+        Height="Height.Px(50)"
+        title="Sortieren"
+        style="min-width: auto;"
+        Clicked="@OpenSortDialogAsync">
+    <i class="fa-solid fa-sort"></i>
+</Button>
+
+<div class="badge-row mt-2">
+    @if (HasCustomSort)
+    {
+        <Badge Color="Color.Primary" Closable="true" CloseClicked="@EventCallback.Factory.Create(this, ResetSortAsync)">@CurrentSortText</Badge>
+    }
+</div>

FoodsharingSiegen.Server/Controls/ProspectSortControl.razor.cs

@@ -0,0 +1,78 @@
+using Blazorise;
+using FoodsharingSiegen.Contracts.Entity;
+using FoodsharingSiegen.Contracts.Enums;
+using FoodsharingSiegen.Server.Data.Service;
+using FoodsharingSiegen.Server.Dialogs;
+using FoodsharingSiegen.Server.Service;
+using Microsoft.AspNetCore.Components;
+
+namespace FoodsharingSiegen.Server.Controls;
+
+public partial class ProspectSortControl
+{
+    [Inject] private IModalService ModalService { get; set; } = null!;
+    
+    [Inject] private LocalStorageService LocalStorageService { get; set; } = null!;
+
+    [Parameter]
+    public ProspectSortOption CurrentSort { get; set; } = ProspectSortOption.NameAscending;
+
+    [Parameter]
+    public EventCallback<ProspectSortOption> CurrentSortChanged { get; set; }
+
+    [Parameter]
+    public EventCallback OnSortChanged { get; set; }
+
+    [Parameter]
+    public string? StorageKey { get; set; }
+
+    protected override async Task OnInitializedAsync()
+    {
+        if (!string.IsNullOrEmpty(StorageKey))
+        {
+            var savedSort = await LocalStorageService.GetItem<ProspectSortOption?>(StorageKey);
+            if (savedSort.HasValue)
+            {
+                CurrentSort = savedSort.Value;
+                await CurrentSortChanged.InvokeAsync(CurrentSort);
+            }
+        }
+        await base.OnInitializedAsync();
+    }
+
+    private async Task OpenSortDialogAsync()
+    {
+        await ProspectSortDialog.ShowAsync(ModalService, CurrentSort, async option =>
+        {
+            await UpdateSortAsync(option);
+        });
+    }
+
+    private bool HasCustomSort => CurrentSort != ProspectSortOption.NameAscending;
+
+    private string CurrentSortText => CurrentSort switch
+    {
+        ProspectSortOption.NameDescending => "Sortierung: Name (absteigend)",
+        ProspectSortOption.ModifiedAscending => "Sortierung: Zuletzt geändert (aufsteigend)",
+        ProspectSortOption.ModifiedDescending => "Sortierung: Zuletzt geaendert (absteigend)",
+        _ => string.Empty
+    };
+
+    private async Task ResetSortAsync()
+    {
+        await UpdateSortAsync(ProspectSortOption.NameAscending);
+    }
+
+    private async Task UpdateSortAsync(ProspectSortOption option)
+    {
+        CurrentSort = option;
+        
+        if (!string.IsNullOrEmpty(StorageKey))
+        {
+            await LocalStorageService.SetItem(StorageKey, CurrentSort);
+        }
+
+        await CurrentSortChanged.InvokeAsync(CurrentSort);
+        await OnSortChanged.InvokeAsync();
+    }
+}

FoodsharingSiegen.Server/Dialogs/ProspectSortDialog.razor

@@ -0,0 +1,9 @@
+@inherits FsBase
+@using FoodsharingSiegen.Contracts.Enums
+
+<div class="d-grid gap-2">
+    <Button Color="@GetSortButtonColor(ProspectSortOption.NameAscending)" Clicked="() => SelectAsync(ProspectSortOption.NameAscending)">Name (aufsteigend)</Button>
+    <Button Color="@GetSortButtonColor(ProspectSortOption.NameDescending)" Clicked="() => SelectAsync(ProspectSortOption.NameDescending)">Name (absteigend)</Button>
+    <Button Color="@GetSortButtonColor(ProspectSortOption.ModifiedAscending)" Clicked="() => SelectAsync(ProspectSortOption.ModifiedAscending)">Geändert (aufsteigend)</Button>
+    <Button Color="@GetSortButtonColor(ProspectSortOption.ModifiedDescending)" Clicked="() => SelectAsync(ProspectSortOption.ModifiedDescending)">Geändert (absteigend)</Button>
+</div>

FoodsharingSiegen.Server/Dialogs/ProspectSortDialog.razor.cs

@@ -0,0 +1,39 @@
+using Blazorise;
+using FoodsharingSiegen.Contracts.Enums;
+using FoodsharingSiegen.Server.BaseClasses;
+using Microsoft.AspNetCore.Components;
+
+namespace FoodsharingSiegen.Server.Dialogs
+{
+    public partial class ProspectSortDialog : FsBase
+    {
+        [Parameter]
+        public ProspectSortOption CurrentSort { get; set; } = ProspectSortOption.NameAscending;
+
+        [Parameter]
+        public Func<ProspectSortOption, Task>? OnSortSelected { get; set; }
+
+        public static async Task ShowAsync(IModalService modalService, ProspectSortOption currentSort, Func<ProspectSortOption, Task> onSortSelected)
+        {
+            await modalService.Show<ProspectSortDialog>("Sortieren", p =>
+            {
+                p.Add(nameof(CurrentSort), currentSort);
+                p.Add(nameof(OnSortSelected), onSortSelected);
+            }, new ModalInstanceOptions
+            {
+                Size = ModalSize.Small,
+            });
+        }
+
+        private Color GetSortButtonColor(ProspectSortOption option)
+        {
+            return CurrentSort == option ? Color.Success : Color.Secondary;
+        }
+
+        private async Task SelectAsync(ProspectSortOption option)
+        {
+            if (OnSortSelected != null) await OnSortSelected(option);
+            await ModalService.Hide();
+        }
+    }
+}

FoodsharingSiegen.Server/FoodsharingSiegen.Server.csproj

@@ -29,6 +29,7 @@
     
     <ItemGroup>
       <PackageReference Include="LibSassBuilder" Version="2.0.1" />
+      <PackageReference Include="MailKit" Version="4.4.0" />
       <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.3" />
       <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.3">
         <PrivateAssets>all</PrivateAssets>

FoodsharingSiegen.Server/Pages/Login.razor

@@ -4,24 +4,42 @@
 
 @inherits FoodsharingSiegen.Server.BaseClasses.FsBase
 
-<PageTitle>@AppSettings.Terms.Title</PageTitle>
+<PageTitle>@AppSettings.Terms.Title - Login</PageTitle>
+
+<div class="d-flex justify-content-center align-items-center" style="min-height: 100vh; background-color: #f4f6f8;">
+    <div class="card shadow border-0" style="width: 100%; max-width: 420px; border-radius: 12px; margin: 1rem;">
+        
+        <div class="card-body p-4 p-md-5">
+            <div class="text-center mb-4">
+                <i class="fa-solid fa-leaf mb-3" style="font-size: 3rem; color: #64ae24;"></i>
+                <h4 class="font-weight-bold" style="color: #533a20;"><small style="font-size: .6em;">Einarbeitungen</small> @AppSettings.Terms.Title</h4>
+                <p class="text-muted">Bitte melde dich an, um fortzufahren.</p>
+            </div>
 
-<div class="d-flex justify-content-center align-items-center" style="height: 100vh;">
-    <div class="card" style="width: 100%; max-width: 380px;">
-        <div class="card-header">@AppSettings.Terms.Title</div>
-        <div class="card-body">
             <Validation Validator="ValidationHelper.ValidateMail" @bind-Status="@IsValidMail">
-                <TextEdit @bind-Text="MailAddress" Role="TextRole.Email" Placeholder="E-Mail" Class="mt-0" KeyUp="TextEdit_KeyUp"></TextEdit>
+                <Field>
+                    <FieldLabel>E-Mail Adresse</FieldLabel>
+                    <TextEdit @bind-Text="MailAddress" Role="TextRole.Email" Placeholder="E-Mail" KeyUp="TextEdit_KeyUp" Size="Size.Large"></TextEdit>
+                </Field>
             </Validation>
 
             <Validation Validator="ValidationHelper.ValidatePassword" @bind-Status="@IsValidPassword">
-                <TextEdit @bind-Text="Password" Role="TextRole.Password" Placeholder="Passwort" Class="my-3" KeyUp="TextEdit_KeyUp"></TextEdit>
+                <Field Class="mt-3">
+                    <FieldLabel>Passwort</FieldLabel>
+                    <TextEdit @bind-Text="Password" Role="TextRole.Password" Placeholder="Passwort" KeyUp="TextEdit_KeyUp" Size="Size.Large"></TextEdit>
+                </Field>
             </Validation>
 
-            <div class="d-flex justify-content-center">
-                <Button Clicked="PerformLogin" Disabled="@(IsValidMail != ValidationStatus.Success || IsValidPassword != ValidationStatus.Success)">Einloggen</Button>
-            </div>
+            @if (!string.IsNullOrEmpty(LoginErrorMessage))
+            {
+                <div class="text-danger mt-3 text-center">
+                    <i class="fas fa-exclamation-triangle mr-1"></i> @LoginErrorMessage
+                </div>
+            }
 
+            <Button Class="mt-4 w-100" Color="Color.Primary" Size="Size.Large" Clicked="PerformLogin" Disabled="@(IsValidMail != ValidationStatus.Success || IsValidPassword != ValidationStatus.Success)">
+                <i class="fas fa-sign-in-alt mr-2"></i> Einloggen
+            </Button>
         </div>
     </div>
 </div>

FoodsharingSiegen.Server/Pages/Login.razor.cs

@@ -33,6 +33,11 @@ namespace FoodsharingSiegen.Server.Pages
         /// </summary>
         private string? Password { get; set; }
 
+        /// <summary>
+        ///     Gets or sets the login error message
+        /// </summary>
+        private string? LoginErrorMessage { get; set; }
+
         #endregion
 
         #region Private Method PerformLogin
@@ -42,12 +47,14 @@ namespace FoodsharingSiegen.Server.Pages
         /// </summary>
         private async Task PerformLogin()
         {
+            LoginErrorMessage = null;
             //Todo Eingaben Validieren [04.04.22 - Andre Beging]
 
             if (string.IsNullOrWhiteSpace(MailAddress) || string.IsNullOrWhiteSpace(Password))
             {
                 MailAddress = string.Empty;
                 Password = string.Empty;
+                LoginErrorMessage = "E-Mail-Adresse oder Passwort ist ungültig.";
                 return;
             }
 
@@ -55,7 +62,7 @@ namespace FoodsharingSiegen.Server.Pages
             if (loginR.Success)
                 NavigationManager.NavigateTo("/", true);
             else
-                await Notification.Error(loginR.ErrorMessage)!;
+                LoginErrorMessage = "E-Mail-Adresse oder Passwort ist ungültig.";
         }
 
         #endregion

FoodsharingSiegen.Server/Pages/Prospects.razor

@@ -2,6 +2,7 @@
 @page "/prospect"
 @page "/prospects"
 
+@using FoodsharingSiegen.Contracts
 @using FoodsharingSiegen.Contracts.Enums
 @using FoodsharingSiegen.Shared.Helper
 @inherits FsBase
@@ -16,20 +17,27 @@
 
 <Button
     Color="Color.Primary"
+    Width="Width.Px(50)"
+    Height="Height.Px(50)"
+    title="Hinzufügen"
+    style="min-width: auto;"
     Clicked="@CreateProspectAsync"
     Visibility="@(CurrentUser.IsInGroup(UserGroup.WelcomeTeam, UserGroup.Ambassador) ? Visibility.Default : Visibility.Invisible)"
->Hinzufügen
+><i class="fa-solid fa-plus"></i>
 </Button>
 
+<ProspectSortControl @bind-CurrentSort="CurrentSort" StorageKey="@StorageKeys.SortProspects" OnSortChanged="StateHasChanged" />
+
 @{
     var filterList = ProspectList.ApplyFilter(Filter);
+    var sortList = filterList.ApplySort(CurrentSort);
 }
 
 <hr/>
 <ProspectFilterControl Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.OnBoarding"></ProspectFilterControl>
 <hr />
 <ProspectGrid
-    Prospects="filterList"
+    Prospects="sortList"
     OnDataChanged="@LoadProspects"
     StateFilter="ProspectStateFilter.OnBoarding">
 </ProspectGrid>

FoodsharingSiegen.Server/Pages/Prospects.razor.cs

@@ -36,6 +36,8 @@ namespace FoodsharingSiegen.Server.Pages
         /// </summary>
         private List<Prospect>? ProspectList { get; set; }
 
+        private ProspectSortOption CurrentSort { get; set; } = ProspectSortOption.NameAscending;
+
         #endregion
 
         #region Override InitializeDataAsync

FoodsharingSiegen.Server/Pages/ProspectsAll.razor

@@ -1,6 +1,7 @@
 @page "/all"
 @page "/archive"
 
+@using FoodsharingSiegen.Contracts
 @using FoodsharingSiegen.Contracts.Enums
 @using FoodsharingSiegen.Shared.Helper
 @inherits FsBase
@@ -13,15 +14,18 @@
     <div class="alert alert-danger"><strong>TESTMODUS!</strong> Änderungen werden wieder gelöscht.</div>
 }
 
+<ProspectSortControl @bind-CurrentSort="CurrentSort" StorageKey="@StorageKeys.SortProspectsAll" OnSortChanged="StateHasChanged" />
+
 @{
     var filterList = ProspectList.ApplyFilter(Filter);
+    var sortList = filterList.ApplySort(CurrentSort);
 }
 
 <hr/>
 <ProspectFilterControl Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.All"></ProspectFilterControl>
 <hr />
 <ProspectGrid
-    Prospects="filterList"
+    Prospects="sortList"
     OnDataChanged="@LoadProspects"
     StateFilter="ProspectStateFilter.All">
 </ProspectGrid>

FoodsharingSiegen.Server/Pages/ProspectsAll.razor.cs

@@ -39,6 +39,8 @@ namespace FoodsharingSiegen.Server.Pages
         /// </summary>
         private List<Prospect>? ProspectList { get; set; }
 
+        private ProspectSortOption CurrentSort { get; set; } = ProspectSortOption.NameAscending;
+
         #endregion
 
         #region Override InitializeDataAsync

FoodsharingSiegen.Server/Pages/ProspectsDone.razor

@@ -1,5 +1,6 @@
 @page "/done"
 
+@using FoodsharingSiegen.Contracts
 @using FoodsharingSiegen.Contracts.Enums
 @using FoodsharingSiegen.Shared.Helper
 @inherits FsBase
@@ -12,15 +13,18 @@
     <div class="alert alert-danger"><strong>TESTMODUS!</strong> Änderungen werden wieder gelöscht.</div>
 }
 
+<ProspectSortControl @bind-CurrentSort="CurrentSort" StorageKey="@StorageKeys.SortProspectsDone" OnSortChanged="StateHasChanged" />
+
 @{
     var filterList = ProspectList.ApplyFilter(Filter);
+    var sortList = filterList.ApplySort(CurrentSort);
 }
 
 <hr />
 <ProspectFilterControl Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.Completed"></ProspectFilterControl>
 <hr />
 <ProspectGrid
-    Prospects="filterList"
+    Prospects="sortList"
     OnDataChanged="@LoadProspects"
     StateFilter="ProspectStateFilter.Completed">
 </ProspectGrid>

FoodsharingSiegen.Server/Pages/ProspectsDone.razor.cs

@@ -31,6 +31,8 @@ namespace FoodsharingSiegen.Server.Pages
         /// </summary>
         private List<Prospect>? ProspectList { get; set; }
 
+        private ProspectSortOption CurrentSort { get; set; } = ProspectSortOption.NameAscending;
+
         #endregion
 
         #region Override InitializeDataAsync

FoodsharingSiegen.Server/Pages/ProspectsVerify.razor

@@ -1,5 +1,6 @@
 @page "/verify"
 
+@using FoodsharingSiegen.Contracts
 @using FoodsharingSiegen.Contracts.Enums
 @using FoodsharingSiegen.Shared.Helper
 @inherits FsBase
@@ -12,15 +13,18 @@
     <div class="alert alert-danger"><strong>TESTMODUS!</strong> Änderungen werden wieder gelöscht.</div>
 }
 
+<ProspectSortControl @bind-CurrentSort="CurrentSort" StorageKey="@StorageKeys.SortProspectsVerify" OnSortChanged="StateHasChanged" />
+
 @{
     var filterList = ProspectList.ApplyFilter(Filter);
+    var sortList = filterList.ApplySort(CurrentSort);
 }
 
 <hr/>
 <ProspectFilterControl Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.Verification"></ProspectFilterControl>
 <hr />
 <ProspectGrid
-    Prospects="filterList"
+    Prospects="sortList"
     OnDataChanged="@LoadProspects"
     StateFilter="ProspectStateFilter.Verification">
 </ProspectGrid>

FoodsharingSiegen.Server/Pages/ProspectsVerify.razor.cs

@@ -37,6 +37,8 @@ namespace FoodsharingSiegen.Server.Pages
         /// </summary>
         private List<Prospect>? ProspectList { get; set; }
 
+        private ProspectSortOption CurrentSort { get; set; } = ProspectSortOption.NameAscending;
+
         #endregion
 
         #region Override InitializeDataAsync

FoodsharingSiegen.Server/Pages/Settings.razor

@@ -0,0 +1,30 @@
+@page "/settings"
+
+@inherits FsBase
+
+<PageTitle>Einstellungen - @AppSettings.Terms.Title</PageTitle>
+
+<div style="width: 100%; max-width: 500px;">
+    <h2>Einstellungen</h2>
+
+    <div class="card mt-3">
+        <div class="card-header" style="padding: .5rem 0 0 1rem;"><h5>Mail Service</h5></div>
+        <div class="card-body">
+            <p>
+                <strong>SMTP Server:</strong> @AppSettings.Mail.Host<br />
+                <strong>Port:</strong> @AppSettings.Mail.Port<br />
+                <strong>SSL:</strong> @(AppSettings.Mail.UseSsl ? "Ja" : "Nein")<br />
+            </p>
+            <hr />
+            <Fields Class="my-3">
+                <Field ColumnSize="ColumnSize.Is12">
+                    <FieldLabel>Testmail-Empfänger</FieldLabel>
+                    <FieldBody>
+                        <TextEdit @bind-Text="TestMailReceiver" Placeholder="E-Mail Adresse"></TextEdit>
+                    </FieldBody>
+                </Field>
+            </Fields>
+            <Button Color="Color.Primary" Clicked="SendTestMail">Testmail senden</Button>
+        </div>
+    </div>
+</div>

FoodsharingSiegen.Server/Pages/Settings.razor.cs

@@ -0,0 +1,46 @@
+using FoodsharingSiegen.Contracts.Helper;
+using FoodsharingSiegen.Server.Service;
+using Microsoft.AspNetCore.Components;
+using System;
+using System.Threading.Tasks;
+
+namespace FoodsharingSiegen.Server.Pages
+{
+    public partial class Settings
+    {
+        [Inject]
+        public IMailService MailService { get; set; } = null!;
+
+        private string TestMailReceiver { get; set; } = string.Empty;
+
+        protected override async Task InitializeDataAsync()
+        {
+            if (!CurrentUser.IsAdmin())
+            {
+                NavigationManager.NavigateTo("/");
+                return;
+            }
+            TestMailReceiver = CurrentUser.Mail ?? string.Empty;
+            await Task.CompletedTask;
+        }
+
+        private async Task SendTestMail()
+        {
+            if (string.IsNullOrWhiteSpace(TestMailReceiver))
+            {
+                await Notification.Error("Bitte eine Empfänger-Adresse angeben.");
+                return;
+            }
+
+            try
+            {
+                await MailService.SendEmailAsync(TestMailReceiver, "Testmail", "Dies ist eine Testmail.");
+                await Notification.Success("Testmail versendet.");
+            }
+            catch (Exception ex)
+            {
+                await Notification.Error($"Fehler beim Senden: {ex.Message}");
+            }
+        }
+    }
+}

FoodsharingSiegen.Server/Pages/_Layout.cshtml

@@ -43,7 +43,6 @@
 </div>
 
 <script src="_framework/blazor.server.js"></script>
-<script src="_content/Blazorise/blazorise.js"></script>
 <script src="_content/Blazorise.Material/blazorise.material.js?v=1.7.5.0"></script>
 </body>
 </html>

FoodsharingSiegen.Server/Program.cs

@@ -29,6 +29,7 @@ builder.Services.AddScoped<AuditService>();
 builder.Services.AddScoped<AuthService>();
 builder.Services.AddScoped<UserService>();
 builder.Services.AddScoped<ProspectService>();
+builder.Services.AddScoped<IMailService, MailService>();
 
 builder.Services
     .AddBlazorise()

FoodsharingSiegen.Server/Properties/launchSettings.json

@@ -12,6 +12,7 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
+      "launchUrl": "http://localhost:56000/",
       "applicationUrl": "http://localhost:56000",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"

FoodsharingSiegen.Server/Service/IMailService.cs

@@ -0,0 +1,19 @@
+using System.Threading.Tasks;
+
+namespace FoodsharingSiegen.Server.Service
+{
+    /// <summary>
+    /// Service interface for sending emails.
+    /// </summary>
+    public interface IMailService
+    {
+        /// <summary>
+        /// Sends an email asynchronously.
+        /// </summary>
+        /// <param name="toEmail">The recipient's email address.</param>
+        /// <param name="subject">The subject of the email.</param>
+        /// <param name="htmlBody">The HTML content of the email body.</param>
+        /// <returns>A task that represents the asynchronous email sending operation.</returns>
+        Task SendEmailAsync(string toEmail, string subject, string htmlBody);
+    }
+}

FoodsharingSiegen.Server/Service/MailService.cs

@@ -0,0 +1,57 @@
+using System.Threading.Tasks;
+using FoodsharingSiegen.Contracts.Model;
+using MailKit.Net.Smtp;
+using MailKit.Security;
+using Microsoft.Extensions.Options;
+using MimeKit;
+using MimeKit.Text;
+
+namespace FoodsharingSiegen.Server.Service
+{
+    /// <summary>
+    /// Default implementation of <see cref="IMailService"/> which sends emails via SMTP using MailKit.
+    /// </summary>
+    public class MailService : IMailService
+    {
+        private readonly MailSettings _mailSettings;
+        private readonly TermSettings _termSettings;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MailService"/> class.
+        /// </summary>
+        /// <param name="appSettings">The configured application settings injected by DI, containing the <see cref="MailSettings"/>.</param>
+        public MailService(IOptions<AppSettings> appSettings)
+        {
+            _mailSettings = appSettings.Value.Mail;
+            _termSettings = appSettings.Value.Terms;
+        }
+
+        /// <inheritdoc/>
+        public async Task SendEmailAsync(string toEmail, string subject, string htmlBody)
+        {
+            var email = new MimeMessage();
+            email.From.Add(new MailboxAddress(_termSettings.Title, _mailSettings.FromAddress));
+            email.To.Add(MailboxAddress.Parse(toEmail));
+            email.Subject = subject;
+            
+            var textPart = new TextPart(TextFormat.Html) 
+            { 
+                Text = htmlBody 
+            };
+            email.Body = textPart;
+
+            using var smtp = new SmtpClient();
+            var secureOptions = _mailSettings.UseSsl ? SecureSocketOptions.StartTls : SecureSocketOptions.Auto;
+            
+            await smtp.ConnectAsync(_mailSettings.Host, _mailSettings.Port, secureOptions);
+            
+            if (!string.IsNullOrWhiteSpace(_mailSettings.Username))
+            {
+                await smtp.AuthenticateAsync(_mailSettings.Username, _mailSettings.Password);
+            }
+            
+            await smtp.SendAsync(email);
+            await smtp.DisconnectAsync(true);
+        }
+    }
+}

FoodsharingSiegen.Server/Shared/NavMenu.razor

@@ -49,13 +49,21 @@
 
     @if (CurrentUser.IsAdmin())
     {
-        <div class="nav-item px-3 pb-0">
+        <div class="nav-item px-3">
             <div @onclick="NavLinkClickedAsync">
                 <NavLink class="nav-link" href="users" Match="NavLinkMatch.All">
                     <span class="fas fa-users mr-2" aria-hidden="true" style="font-size: 1.4em;"></span> Benutzer
                 </NavLink>
             </div>
         </div>
+
+        <div class="nav-item px-3 pb-0">
+            <div @onclick="NavLinkClickedAsync">
+                <NavLink class="nav-link" href="settings" Match="NavLinkMatch.All">
+                    <span class="fas fa-cog mr-2" aria-hidden="true" style="font-size: 1.4em;"></span> Einstellungen
+                </NavLink>
+            </div>
+        </div>
     }
 
     <div class="nav-item px-3">

FoodsharingSiegen.Server/config/appsettings.example.json

@@ -1,4 +1,4 @@
-{
+{
   "Kestrel": {
     "Endpoints": {
       "Http": {
@@ -9,10 +9,18 @@
   "DetailedErrors": true,
   "Settings": {
     "TestMode": true,
+    "Mail": {
+      "Host": "mail.example.com",
+      "Port": 587,
+      "Username": "your_username",
+      "Password": "your_password",
+      "FromAddress": "no-reply@example.com",
+      "UseSsl": true
+    },
     "Terms": {
       "Title": "Foodsharing Musterhausen",
       "TitleShort": "Musterhausen",
-      "StepInName": "Krabbelgruppe2"
+      "StepInName": "Neulingstreffen"
     }
   }
 }

FoodsharingSiegen.Shared/Helper/FilterHelper.cs

@@ -56,6 +56,20 @@ namespace FoodsharingSiegen.Shared.Helper
             return filterListQ.ToList();
         }
 
+        public static List<Prospect> ApplySort(this List<Prospect>? prospectList, ProspectSortOption sortOption)
+        {
+            if (prospectList == null) return [];
+
+            return sortOption switch
+            {
+                ProspectSortOption.NameAscending => prospectList.OrderBy(x => x.Name, StringComparer.OrdinalIgnoreCase).ToList(),
+                ProspectSortOption.NameDescending => prospectList.OrderByDescending(x => x.Name, StringComparer.OrdinalIgnoreCase).ToList(),
+                ProspectSortOption.ModifiedAscending => prospectList.OrderBy(x => x.Modified ?? x.Created).ToList(),
+                ProspectSortOption.ModifiedDescending => prospectList.OrderByDescending(x => x.Modified ?? x.Created).ToList(),
+                _ => prospectList
+            };
+        }
+
         #endregion
     }
 }

FoodsharingSiegen.Shared/Helper/TermHelper.cs

@@ -28,7 +28,7 @@ namespace FoodsharingSiegen.Shared.Helper
                 InteractionType.Verify => "Verifizierung",
                 InteractionType.Complete => "Fertig",
                 InteractionType.StepInBriefing => appSettings.Terms.StepInName ?? "StepIn",
-                InteractionType.ReleasedForVerification => "Freigabe zum Freischalten",
+                InteractionType.ReleasedForVerification => "Freigabe Freischalten",
                 _ => type.ToString()
             };
         }

Scripts/kill-port-56000.ps1

@@ -0,0 +1,53 @@
+param(
+    [int]$Port = 56000
+)
+
+$killedAny = $false
+
+# Try modern cmdlet first.
+$connections = Get-NetTCPConnection -LocalPort $Port -State Listen -ErrorAction SilentlyContinue
+if ($connections) {
+    $pids = $connections | Select-Object -ExpandProperty OwningProcess -Unique
+    foreach ($procId in $pids) {
+        try {
+            Stop-Process -Id $procId -Force -ErrorAction Stop
+            Write-Host "Stopped process $procId listening on port $Port."
+            $killedAny = $true
+        }
+        catch {
+            Write-Warning "Failed to stop process ${procId}: $($_.Exception.Message)"
+        }
+    }
+}
+
+# Fallback for environments where Get-NetTCPConnection is unavailable.
+if (-not $killedAny) {
+    $netstatLines = netstat -ano | Select-String ":$Port\s"
+    $listenLines = $netstatLines | Where-Object { $_.Line -match "LISTENING" }
+
+    $fallbackPids = @()
+    foreach ($line in $listenLines) {
+        $parts = ($line.Line -replace "\s+", " ").Trim().Split(" ")
+        if ($parts.Length -ge 5) {
+            $fallbackPids += $parts[-1]
+        }
+    }
+
+    $fallbackPids = $fallbackPids | Sort-Object -Unique
+    foreach ($pidText in $fallbackPids) {
+        if ($pidText -match "^\d+$") {
+            try {
+                Stop-Process -Id ([int]$pidText) -Force -ErrorAction Stop
+                Write-Host "Stopped process $pidText listening on port $Port."
+                $killedAny = $true
+            }
+            catch {
+                Write-Warning "Failed to stop process ${pidText}: $($_.Exception.Message)"
+            }
+        }
+    }
+}
+
+if (-not $killedAny) {
+    Write-Host "No listening process found on port $Port."
+}