Compare commits
10 Commits
image
...
3687e573e0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3687e573e0 | ||
|
|
b7a7a8e078 | ||
|
|
15780bccee | ||
|
|
82d2c48ff7 | ||
|
|
41b1f8ae1d | ||
|
|
eda6625e91 | ||
|
|
701388ee34 | ||
|
|
3e099988bc | ||
|
|
ee967cd046 | ||
|
|
76c3e6ddde |
4
.gitignore
vendored
4
.gitignore
vendored
@@ -5,4 +5,6 @@ riderModule.iml
|
|||||||
/_ReSharper.Caches/
|
/_ReSharper.Caches/
|
||||||
|
|
||||||
Publish/
|
Publish/
|
||||||
app.db
|
app.db
|
||||||
|
FoodsharingSiegen.Server/wwwroot/buildinfo.txt
|
||||||
|
FoodsharingSiegen.Server/config/appsettings.json
|
||||||
7
Docker/.env
Normal file
7
Docker/.env
Normal file
@@ -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
|
||||||
@@ -5,6 +5,17 @@ services:
|
|||||||
image: ghcr.io/troogs/fs-onboarding/server:latest
|
image: ghcr.io/troogs/fs-onboarding/server:latest
|
||||||
ports:
|
ports:
|
||||||
- "8100:56000"
|
- "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:
|
volumes:
|
||||||
- /docker/data/fs-onboarding/config:/app/config/
|
- /docker/data/fs-onboarding/config:/app/config/
|
||||||
- /docker/data/fs-onboarding/data:/app/data/
|
- /docker/data/fs-onboarding/data:/app/data/
|
||||||
10
FoodsharingSiegen.Contracts/Enums/ProspectSortOption.cs
Normal file
10
FoodsharingSiegen.Contracts/Enums/ProspectSortOption.cs
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
namespace FoodsharingSiegen.Contracts.Enums
|
||||||
|
{
|
||||||
|
public enum ProspectSortOption
|
||||||
|
{
|
||||||
|
NameAscending,
|
||||||
|
NameDescending,
|
||||||
|
ModifiedAscending,
|
||||||
|
ModifiedDescending
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -6,6 +6,11 @@
|
|||||||
|
|
||||||
public bool DisableStepIn { get; set; }
|
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 TermSettings Terms { get; set; } = new();
|
||||||
|
|
||||||
public bool TestMode { get; set; }
|
public bool TestMode { get; set; }
|
||||||
|
|||||||
38
FoodsharingSiegen.Contracts/Model/MailSettings.cs
Normal file
38
FoodsharingSiegen.Contracts/Model/MailSettings.cs
Normal file
@@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -12,6 +12,26 @@ namespace FoodsharingSiegen.Contracts
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public const string ProspectFilter = "ProspectFilter";
|
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>
|
/// <summary>
|
||||||
/// The token key
|
/// The token key
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -12,8 +12,23 @@
|
|||||||
<div class="@divClass">
|
<div class="@divClass">
|
||||||
<h5 class="mb-2 d-flex">
|
<h5 class="mb-2 d-flex">
|
||||||
<div class="flex-grow-1">
|
<div class="flex-grow-1">
|
||||||
@Prospect?.Name
|
@if(string.IsNullOrWhiteSpace(Prospect?.Name))
|
||||||
<small style="font-size: .9rem;">@Prospect?.FsId</small>
|
{
|
||||||
|
<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>
|
||||||
<div>
|
<div>
|
||||||
@if (CurrentUser.IsInGroup(UserGroup.WelcomeTeam, UserGroup.Ambassador))
|
@if (CurrentUser.IsInGroup(UserGroup.WelcomeTeam, UserGroup.Ambassador))
|
||||||
|
|||||||
17
FoodsharingSiegen.Server/Controls/ProspectSortControl.razor
Normal file
17
FoodsharingSiegen.Server/Controls/ProspectSortControl.razor
Normal file
@@ -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>
|
||||||
@@ -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();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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>
|
||||||
39
FoodsharingSiegen.Server/Dialogs/ProspectSortDialog.razor.cs
Normal file
39
FoodsharingSiegen.Server/Dialogs/ProspectSortDialog.razor.cs
Normal file
@@ -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();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -29,6 +29,7 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="LibSassBuilder" Version="2.0.1" />
|
<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" Version="9.0.3" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.3">
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.3">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
|
|||||||
@@ -4,24 +4,42 @@
|
|||||||
|
|
||||||
@inherits FoodsharingSiegen.Server.BaseClasses.FsBase
|
@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">
|
<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>
|
||||||
|
|
||||||
<Validation Validator="ValidationHelper.ValidatePassword" @bind-Status="@IsValidPassword">
|
<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>
|
</Validation>
|
||||||
|
|
||||||
<div class="d-flex justify-content-center">
|
@if (!string.IsNullOrEmpty(LoginErrorMessage))
|
||||||
<Button Clicked="PerformLogin" Disabled="@(IsValidMail != ValidationStatus.Success || IsValidPassword != ValidationStatus.Success)">Einloggen</Button>
|
{
|
||||||
</div>
|
<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>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -33,6 +33,11 @@ namespace FoodsharingSiegen.Server.Pages
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private string? Password { get; set; }
|
private string? Password { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the login error message
|
||||||
|
/// </summary>
|
||||||
|
private string? LoginErrorMessage { get; set; }
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Private Method PerformLogin
|
#region Private Method PerformLogin
|
||||||
@@ -42,12 +47,14 @@ namespace FoodsharingSiegen.Server.Pages
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private async Task PerformLogin()
|
private async Task PerformLogin()
|
||||||
{
|
{
|
||||||
|
LoginErrorMessage = null;
|
||||||
//Todo Eingaben Validieren [04.04.22 - Andre Beging]
|
//Todo Eingaben Validieren [04.04.22 - Andre Beging]
|
||||||
|
|
||||||
if (string.IsNullOrWhiteSpace(MailAddress) || string.IsNullOrWhiteSpace(Password))
|
if (string.IsNullOrWhiteSpace(MailAddress) || string.IsNullOrWhiteSpace(Password))
|
||||||
{
|
{
|
||||||
MailAddress = string.Empty;
|
MailAddress = string.Empty;
|
||||||
Password = string.Empty;
|
Password = string.Empty;
|
||||||
|
LoginErrorMessage = "E-Mail-Adresse oder Passwort ist ungültig.";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -55,7 +62,7 @@ namespace FoodsharingSiegen.Server.Pages
|
|||||||
if (loginR.Success)
|
if (loginR.Success)
|
||||||
NavigationManager.NavigateTo("/", true);
|
NavigationManager.NavigateTo("/", true);
|
||||||
else
|
else
|
||||||
await Notification.Error(loginR.ErrorMessage)!;
|
LoginErrorMessage = "E-Mail-Adresse oder Passwort ist ungültig.";
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
@page "/prospect"
|
@page "/prospect"
|
||||||
@page "/prospects"
|
@page "/prospects"
|
||||||
|
|
||||||
|
@using FoodsharingSiegen.Contracts
|
||||||
@using FoodsharingSiegen.Contracts.Enums
|
@using FoodsharingSiegen.Contracts.Enums
|
||||||
@using FoodsharingSiegen.Shared.Helper
|
@using FoodsharingSiegen.Shared.Helper
|
||||||
@inherits FsBase
|
@inherits FsBase
|
||||||
@@ -16,20 +17,27 @@
|
|||||||
|
|
||||||
<Button
|
<Button
|
||||||
Color="Color.Primary"
|
Color="Color.Primary"
|
||||||
|
Width="Width.Px(50)"
|
||||||
|
Height="Height.Px(50)"
|
||||||
|
title="Hinzufügen"
|
||||||
|
style="min-width: auto;"
|
||||||
Clicked="@CreateProspectAsync"
|
Clicked="@CreateProspectAsync"
|
||||||
Visibility="@(CurrentUser.IsInGroup(UserGroup.WelcomeTeam, UserGroup.Ambassador) ? Visibility.Default : Visibility.Invisible)"
|
Visibility="@(CurrentUser.IsInGroup(UserGroup.WelcomeTeam, UserGroup.Ambassador) ? Visibility.Default : Visibility.Invisible)"
|
||||||
>Hinzufügen
|
><i class="fa-solid fa-plus"></i>
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
|
<ProspectSortControl @bind-CurrentSort="CurrentSort" StorageKey="@StorageKeys.SortProspects" OnSortChanged="StateHasChanged" />
|
||||||
|
|
||||||
@{
|
@{
|
||||||
var filterList = ProspectList.ApplyFilter(Filter);
|
var filterList = ProspectList.ApplyFilter(Filter);
|
||||||
|
var sortList = filterList.ApplySort(CurrentSort);
|
||||||
}
|
}
|
||||||
|
|
||||||
<hr/>
|
<hr/>
|
||||||
<ProspectFilterControl Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.OnBoarding"></ProspectFilterControl>
|
<ProspectFilterControl Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.OnBoarding"></ProspectFilterControl>
|
||||||
<hr />
|
<hr />
|
||||||
<ProspectGrid
|
<ProspectGrid
|
||||||
Prospects="filterList"
|
Prospects="sortList"
|
||||||
OnDataChanged="@LoadProspects"
|
OnDataChanged="@LoadProspects"
|
||||||
StateFilter="ProspectStateFilter.OnBoarding">
|
StateFilter="ProspectStateFilter.OnBoarding">
|
||||||
</ProspectGrid>
|
</ProspectGrid>
|
||||||
@@ -36,6 +36,8 @@ namespace FoodsharingSiegen.Server.Pages
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private List<Prospect>? ProspectList { get; set; }
|
private List<Prospect>? ProspectList { get; set; }
|
||||||
|
|
||||||
|
private ProspectSortOption CurrentSort { get; set; } = ProspectSortOption.NameAscending;
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Override InitializeDataAsync
|
#region Override InitializeDataAsync
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
@page "/all"
|
@page "/all"
|
||||||
@page "/archive"
|
@page "/archive"
|
||||||
|
|
||||||
|
@using FoodsharingSiegen.Contracts
|
||||||
@using FoodsharingSiegen.Contracts.Enums
|
@using FoodsharingSiegen.Contracts.Enums
|
||||||
@using FoodsharingSiegen.Shared.Helper
|
@using FoodsharingSiegen.Shared.Helper
|
||||||
@inherits FsBase
|
@inherits FsBase
|
||||||
@@ -13,15 +14,18 @@
|
|||||||
<div class="alert alert-danger"><strong>TESTMODUS!</strong> Änderungen werden wieder gelöscht.</div>
|
<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 filterList = ProspectList.ApplyFilter(Filter);
|
||||||
|
var sortList = filterList.ApplySort(CurrentSort);
|
||||||
}
|
}
|
||||||
|
|
||||||
<hr/>
|
<hr/>
|
||||||
<ProspectFilterControl Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.All"></ProspectFilterControl>
|
<ProspectFilterControl Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.All"></ProspectFilterControl>
|
||||||
<hr />
|
<hr />
|
||||||
<ProspectGrid
|
<ProspectGrid
|
||||||
Prospects="filterList"
|
Prospects="sortList"
|
||||||
OnDataChanged="@LoadProspects"
|
OnDataChanged="@LoadProspects"
|
||||||
StateFilter="ProspectStateFilter.All">
|
StateFilter="ProspectStateFilter.All">
|
||||||
</ProspectGrid>
|
</ProspectGrid>
|
||||||
@@ -39,6 +39,8 @@ namespace FoodsharingSiegen.Server.Pages
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private List<Prospect>? ProspectList { get; set; }
|
private List<Prospect>? ProspectList { get; set; }
|
||||||
|
|
||||||
|
private ProspectSortOption CurrentSort { get; set; } = ProspectSortOption.NameAscending;
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Override InitializeDataAsync
|
#region Override InitializeDataAsync
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
@page "/done"
|
@page "/done"
|
||||||
|
|
||||||
|
@using FoodsharingSiegen.Contracts
|
||||||
@using FoodsharingSiegen.Contracts.Enums
|
@using FoodsharingSiegen.Contracts.Enums
|
||||||
@using FoodsharingSiegen.Shared.Helper
|
@using FoodsharingSiegen.Shared.Helper
|
||||||
@inherits FsBase
|
@inherits FsBase
|
||||||
@@ -12,15 +13,18 @@
|
|||||||
<div class="alert alert-danger"><strong>TESTMODUS!</strong> Änderungen werden wieder gelöscht.</div>
|
<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 filterList = ProspectList.ApplyFilter(Filter);
|
||||||
|
var sortList = filterList.ApplySort(CurrentSort);
|
||||||
}
|
}
|
||||||
|
|
||||||
<hr />
|
<hr />
|
||||||
<ProspectFilterControl Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.Completed"></ProspectFilterControl>
|
<ProspectFilterControl Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.Completed"></ProspectFilterControl>
|
||||||
<hr />
|
<hr />
|
||||||
<ProspectGrid
|
<ProspectGrid
|
||||||
Prospects="filterList"
|
Prospects="sortList"
|
||||||
OnDataChanged="@LoadProspects"
|
OnDataChanged="@LoadProspects"
|
||||||
StateFilter="ProspectStateFilter.Completed">
|
StateFilter="ProspectStateFilter.Completed">
|
||||||
</ProspectGrid>
|
</ProspectGrid>
|
||||||
@@ -31,6 +31,8 @@ namespace FoodsharingSiegen.Server.Pages
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private List<Prospect>? ProspectList { get; set; }
|
private List<Prospect>? ProspectList { get; set; }
|
||||||
|
|
||||||
|
private ProspectSortOption CurrentSort { get; set; } = ProspectSortOption.NameAscending;
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Override InitializeDataAsync
|
#region Override InitializeDataAsync
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
@page "/verify"
|
@page "/verify"
|
||||||
|
|
||||||
|
@using FoodsharingSiegen.Contracts
|
||||||
@using FoodsharingSiegen.Contracts.Enums
|
@using FoodsharingSiegen.Contracts.Enums
|
||||||
@using FoodsharingSiegen.Shared.Helper
|
@using FoodsharingSiegen.Shared.Helper
|
||||||
@inherits FsBase
|
@inherits FsBase
|
||||||
@@ -12,15 +13,18 @@
|
|||||||
<div class="alert alert-danger"><strong>TESTMODUS!</strong> Änderungen werden wieder gelöscht.</div>
|
<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 filterList = ProspectList.ApplyFilter(Filter);
|
||||||
|
var sortList = filterList.ApplySort(CurrentSort);
|
||||||
}
|
}
|
||||||
|
|
||||||
<hr/>
|
<hr/>
|
||||||
<ProspectFilterControl Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.Verification"></ProspectFilterControl>
|
<ProspectFilterControl Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.Verification"></ProspectFilterControl>
|
||||||
<hr />
|
<hr />
|
||||||
<ProspectGrid
|
<ProspectGrid
|
||||||
Prospects="filterList"
|
Prospects="sortList"
|
||||||
OnDataChanged="@LoadProspects"
|
OnDataChanged="@LoadProspects"
|
||||||
StateFilter="ProspectStateFilter.Verification">
|
StateFilter="ProspectStateFilter.Verification">
|
||||||
</ProspectGrid>
|
</ProspectGrid>
|
||||||
@@ -37,6 +37,8 @@ namespace FoodsharingSiegen.Server.Pages
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private List<Prospect>? ProspectList { get; set; }
|
private List<Prospect>? ProspectList { get; set; }
|
||||||
|
|
||||||
|
private ProspectSortOption CurrentSort { get; set; } = ProspectSortOption.NameAscending;
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Override InitializeDataAsync
|
#region Override InitializeDataAsync
|
||||||
|
|||||||
30
FoodsharingSiegen.Server/Pages/Settings.razor
Normal file
30
FoodsharingSiegen.Server/Pages/Settings.razor
Normal file
@@ -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>
|
||||||
46
FoodsharingSiegen.Server/Pages/Settings.razor.cs
Normal file
46
FoodsharingSiegen.Server/Pages/Settings.razor.cs
Normal file
@@ -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}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -29,6 +29,7 @@ builder.Services.AddScoped<AuditService>();
|
|||||||
builder.Services.AddScoped<AuthService>();
|
builder.Services.AddScoped<AuthService>();
|
||||||
builder.Services.AddScoped<UserService>();
|
builder.Services.AddScoped<UserService>();
|
||||||
builder.Services.AddScoped<ProspectService>();
|
builder.Services.AddScoped<ProspectService>();
|
||||||
|
builder.Services.AddScoped<IMailService, MailService>();
|
||||||
|
|
||||||
builder.Services
|
builder.Services
|
||||||
.AddBlazorise()
|
.AddBlazorise()
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
"commandName": "Project",
|
"commandName": "Project",
|
||||||
"dotnetRunMessages": true,
|
"dotnetRunMessages": true,
|
||||||
"launchBrowser": true,
|
"launchBrowser": true,
|
||||||
|
"launchUrl": "http://localhost:56000/",
|
||||||
"applicationUrl": "http://localhost:56000",
|
"applicationUrl": "http://localhost:56000",
|
||||||
"environmentVariables": {
|
"environmentVariables": {
|
||||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||||
|
|||||||
19
FoodsharingSiegen.Server/Service/IMailService.cs
Normal file
19
FoodsharingSiegen.Server/Service/IMailService.cs
Normal file
@@ -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);
|
||||||
|
}
|
||||||
|
}
|
||||||
57
FoodsharingSiegen.Server/Service/MailService.cs
Normal file
57
FoodsharingSiegen.Server/Service/MailService.cs
Normal file
@@ -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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -49,13 +49,21 @@
|
|||||||
|
|
||||||
@if (CurrentUser.IsAdmin())
|
@if (CurrentUser.IsAdmin())
|
||||||
{
|
{
|
||||||
<div class="nav-item px-3 pb-0">
|
<div class="nav-item px-3">
|
||||||
<div @onclick="NavLinkClickedAsync">
|
<div @onclick="NavLinkClickedAsync">
|
||||||
<NavLink class="nav-link" href="users" Match="NavLinkMatch.All">
|
<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
|
<span class="fas fa-users mr-2" aria-hidden="true" style="font-size: 1.4em;"></span> Benutzer
|
||||||
</NavLink>
|
</NavLink>
|
||||||
</div>
|
</div>
|
||||||
</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">
|
<div class="nav-item px-3">
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{
|
{
|
||||||
"Kestrel": {
|
"Kestrel": {
|
||||||
"Endpoints": {
|
"Endpoints": {
|
||||||
"Http": {
|
"Http": {
|
||||||
@@ -9,10 +9,18 @@
|
|||||||
"DetailedErrors": true,
|
"DetailedErrors": true,
|
||||||
"Settings": {
|
"Settings": {
|
||||||
"TestMode": true,
|
"TestMode": true,
|
||||||
|
"Mail": {
|
||||||
|
"Host": "mail.example.com",
|
||||||
|
"Port": 587,
|
||||||
|
"Username": "your_username",
|
||||||
|
"Password": "your_password",
|
||||||
|
"FromAddress": "no-reply@example.com",
|
||||||
|
"UseSsl": true
|
||||||
|
},
|
||||||
"Terms": {
|
"Terms": {
|
||||||
"Title": "Foodsharing Musterhausen",
|
"Title": "Foodsharing Musterhausen",
|
||||||
"TitleShort": "Musterhausen",
|
"TitleShort": "Musterhausen",
|
||||||
"StepInName": "Krabbelgruppe2"
|
"StepInName": "Neulingstreffen"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1 +0,0 @@
|
|||||||
20260410
|
|
||||||
@@ -56,6 +56,20 @@ namespace FoodsharingSiegen.Shared.Helper
|
|||||||
return filterListQ.ToList();
|
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
|
#endregion
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user