Compare commits
27 Commits
update2025
...
c7e0bfd8da
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c7e0bfd8da | ||
|
|
5f5690e84d | ||
|
|
05b74b929e | ||
|
|
328e194611 | ||
|
|
8a65c03c2c | ||
|
|
297a7c60bd | ||
|
|
8e5a37a0c9 | ||
|
|
ad6f28023e | ||
|
|
c5c24d44c9 | ||
|
|
3687e573e0 | ||
|
|
b7a7a8e078 | ||
|
|
15780bccee | ||
|
|
82d2c48ff7 | ||
|
|
41b1f8ae1d | ||
|
|
eda6625e91 | ||
|
|
701388ee34 | ||
|
|
3e099988bc | ||
|
|
ee967cd046 | ||
|
|
76c3e6ddde | ||
|
|
aea858a1ef | ||
|
|
85c90e4657 | ||
|
|
840ecedbd0 | ||
|
|
916c3142d4 | ||
|
|
f9426679ea | ||
|
|
a68994d00b | ||
|
|
fcda568905 | ||
|
|
ac178e60e0 |
41
.gitea/workflows/docker-image-dev.yml
Normal file
41
.gitea/workflows/docker-image-dev.yml
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
name: Build And Push Dev Docker Image
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
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: Build docker image
|
||||||
|
run: |
|
||||||
|
docker build \
|
||||||
|
-f ./Docker/dockerfile.server \
|
||||||
|
-t "${{ env.BASE_IMAGE }}:dev" \
|
||||||
|
.
|
||||||
|
|
||||||
|
- name: Push docker images
|
||||||
|
run: |
|
||||||
|
docker push "${{ env.BASE_IMAGE }}:dev"
|
||||||
56
.gitea/workflows/docker-image.yml
Normal file
56
.gitea/workflows/docker-image.yml
Normal file
@@ -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 }}"
|
||||||
8
.gitignore
vendored
8
.gitignore
vendored
@@ -5,3 +5,11 @@ riderModule.iml
|
|||||||
/_ReSharper.Caches/
|
/_ReSharper.Caches/
|
||||||
|
|
||||||
Publish/
|
Publish/
|
||||||
|
app.db
|
||||||
|
FoodsharingSiegen.Server/wwwroot/buildinfo.txt
|
||||||
|
FoodsharingSiegen.Server/config/appsettings.json
|
||||||
|
|
||||||
|
# Generated CSS files from SCSS
|
||||||
|
FoodsharingSiegen.Server/Pages/AuditView.razor.css
|
||||||
|
FoodsharingSiegen.Server/Shared/DefaultLayout.razor.css
|
||||||
|
FoodsharingSiegen.Server/Shared/NavMenu.razor.css
|
||||||
19
.vscode/launch.json
vendored
Normal file
19
.vscode/launch.json
vendored
Normal file
@@ -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+)"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
53
.vscode/tasks.json
vendored
Normal file
53
.vscode/tasks.json
vendored
Normal file
@@ -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"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
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/
|
||||||
@@ -95,6 +95,16 @@ namespace FoodsharingSiegen.Contracts.Entity
|
|||||||
set => EncryptedPassword = Cryptor.Encrypt(value);
|
set => EncryptedPassword = Cryptor.Encrypt(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the reset token for password recovery (ab)
|
||||||
|
/// </summary>
|
||||||
|
public string? ResetToken { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the expiry date for the reset token (ab)
|
||||||
|
/// </summary>
|
||||||
|
public DateTime? ResetTokenExpiry { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the value of the type (ab)
|
/// Gets or sets the value of the type (ab)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
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>
|
||||||
|
|||||||
@@ -50,6 +50,11 @@ namespace FoodsharingSiegen.Server.Auth
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private User? _user;
|
private User? _user;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The mail service
|
||||||
|
/// </summary>
|
||||||
|
private readonly IMailService _mailService;
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Setup/Teardown
|
#region Setup/Teardown
|
||||||
@@ -60,14 +65,17 @@ namespace FoodsharingSiegen.Server.Auth
|
|||||||
/// <param name="context">The context</param>
|
/// <param name="context">The context</param>
|
||||||
/// <param name="localStorageService">The local storage service</param>
|
/// <param name="localStorageService">The local storage service</param>
|
||||||
/// <param name="authenticationStateProvider">The authentication state provider</param>
|
/// <param name="authenticationStateProvider">The authentication state provider</param>
|
||||||
|
/// <param name="mailService">The mail service</param>
|
||||||
public AuthService(
|
public AuthService(
|
||||||
FsContext context,
|
FsContext context,
|
||||||
LocalStorageService localStorageService,
|
LocalStorageService localStorageService,
|
||||||
AuthenticationStateProvider authenticationStateProvider)
|
AuthenticationStateProvider authenticationStateProvider,
|
||||||
|
IMailService mailService)
|
||||||
{
|
{
|
||||||
Context = context;
|
Context = context;
|
||||||
_localStorageService = localStorageService;
|
_localStorageService = localStorageService;
|
||||||
_authenticationStateProvider = authenticationStateProvider;
|
_authenticationStateProvider = authenticationStateProvider;
|
||||||
|
_mailService = mailService;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
@@ -186,5 +194,52 @@ namespace FoodsharingSiegen.Server.Auth
|
|||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
#region Password Recovery
|
||||||
|
|
||||||
|
public async Task InitiatePasswordReset(string email, string baseUri)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(email)) return;
|
||||||
|
|
||||||
|
var user = await Context.Users!.FirstOrDefaultAsync(x => x.Mail.ToLower() == email.ToLower());
|
||||||
|
if (user == null) return; // Do not leak existence
|
||||||
|
|
||||||
|
var resetToken = Guid.NewGuid().ToString("N");
|
||||||
|
user.ResetToken = resetToken;
|
||||||
|
user.ResetTokenExpiry = DateTime.UtcNow.AddMinutes(30);
|
||||||
|
|
||||||
|
await Context.SaveChangesAsync();
|
||||||
|
|
||||||
|
var resetLink = $"{baseUri.TrimEnd('/')}/reset-password/{resetToken}";
|
||||||
|
var mailBody = $"Hallo {user.Name},<br><br>Um dein Passwort zurückzusetzen, klicke bitte auf den folgenden Link (dieser ist 30 Minuten gültig):<br><a href='{resetLink}'>{resetLink}</a><br><br>Viele Grüße<br>Dein Foodsharing Team";
|
||||||
|
|
||||||
|
await _mailService.SendEmailAsync(user.Mail, "Passwort zurücksetzen", mailBody);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<OperationResult> ResetPassword(string token, string newPassword)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(token)) return new OperationResult(new Exception("Ungültiges Token."));
|
||||||
|
if (string.IsNullOrWhiteSpace(newPassword)) return new OperationResult(new Exception("Passwort darf nicht leer sein."));
|
||||||
|
|
||||||
|
var user = await Context.Users!.FirstOrDefaultAsync(x => x.ResetToken == token && x.ResetTokenExpiry > DateTime.UtcNow);
|
||||||
|
if (user == null) return new OperationResult(new Exception("Token ist ungültig oder abgelaufen."));
|
||||||
|
|
||||||
|
user.Password = newPassword;
|
||||||
|
user.ResetToken = null;
|
||||||
|
user.ResetTokenExpiry = null;
|
||||||
|
|
||||||
|
await Context.SaveChangesAsync();
|
||||||
|
|
||||||
|
return new OperationResult();
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<bool> IsResetTokenValid(string token)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(token)) return false;
|
||||||
|
var user = await Context.Users!.FirstOrDefaultAsync(x => x.ResetToken == token && x.ResetTokenExpiry > DateTime.UtcNow);
|
||||||
|
return user != null;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,9 +1,10 @@
|
|||||||
@using FoodsharingSiegen.Contracts.Enums
|
@using FoodsharingSiegen.Contracts.Enums
|
||||||
@using FoodsharingSiegen.Shared.Helper
|
@using FoodsharingSiegen.Shared.Helper
|
||||||
|
@using System.ComponentModel
|
||||||
@inherits FsBase
|
@inherits FsBase
|
||||||
|
|
||||||
@{
|
@{
|
||||||
var divClass = $"{CssClass} pc-main";
|
var divClass = $"{CssClass} pc-main shadow border-0";
|
||||||
if (Prospect is { Complete: true }) divClass += " complete";
|
if (Prospect is { Complete: true }) divClass += " complete";
|
||||||
if (Prospect is { Warning: true }) divClass += " warning";
|
if (Prospect is { Warning: true }) divClass += " warning";
|
||||||
if (Prospect is { RecordState: RecordState.Archived }) divClass += " deleted";
|
if (Prospect is { RecordState: RecordState.Archived }) divClass += " deleted";
|
||||||
@@ -11,28 +12,32 @@
|
|||||||
|
|
||||||
<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 d-flex">
|
||||||
@Prospect?.Name
|
<div>
|
||||||
<small style="font-size: .9rem;">@Prospect?.FsId</small>
|
@if(string.IsNullOrWhiteSpace(Prospect?.Name))
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
@if (CurrentUser.IsInGroup(UserGroup.WelcomeTeam, UserGroup.Ambassador))
|
|
||||||
{
|
|
||||||
<i class="fa-solid fa-pen-to-square link mr-2" @onclick="EditProspectAsync" @onclick:preventDefault></i>
|
|
||||||
}
|
|
||||||
<a href="@(CurrentUser.NetworkLink)/profile/@Prospect?.FsId" target="_blank"><i class="fa-solid fa-eye"></i></a>
|
|
||||||
@if (CurrentUser.IsInGroup(UserGroup.WelcomeTeam, UserGroup.Ambassador))
|
|
||||||
{
|
|
||||||
if (Prospect?.RecordState != RecordState.Archived)
|
|
||||||
{
|
{
|
||||||
<i class="fa-solid fa-box-archive link ml-2" @onclick="ArchiveProspectAsync" title="Archivieren" @onclick:preventDefault></i>
|
<i class="fa-solid fa-exclamation-triangle text-warning"></i>
|
||||||
|
<doublearrows></doublearrows>
|
||||||
|
|
||||||
|
<em>»Name fehlt«</em>
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
<i class="fa-solid fa-recycle link ml-2" @onclick="RestoreProspectAsync" title="Wiederherstellen" @onclick:preventDefault></i>
|
@Prospect?.Name
|
||||||
}
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div style="flex-grow: 1;"></div>
|
||||||
|
|
||||||
|
@if (Prospect?.FsId != null && Prospect.FsId != 0)
|
||||||
|
{
|
||||||
|
<a href="@(CurrentUser.NetworkLink)/profile/@Prospect?.FsId" target="_blank">
|
||||||
|
<small style="font-size: .9rem;">
|
||||||
|
<i class="fa-solid fa-eye"></i> @Prospect?.FsId
|
||||||
|
</small>
|
||||||
|
</a>
|
||||||
}
|
}
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</h5>
|
</h5>
|
||||||
|
|
||||||
@@ -58,6 +63,12 @@
|
|||||||
IconClass="fa-solid fa-handshake-simple">
|
IconClass="fa-solid fa-handshake-simple">
|
||||||
</InteractionRow>
|
</InteractionRow>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<td colspan="3">
|
||||||
|
<hr style="margin: 10px 0;">
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
@if (!AppSettings.DisableStepIn)
|
@if (!AppSettings.DisableStepIn)
|
||||||
{
|
{
|
||||||
<InteractionRow
|
<InteractionRow
|
||||||
@@ -133,27 +144,74 @@
|
|||||||
ButtonIconClass="fa-solid fa-check"
|
ButtonIconClass="fa-solid fa-check"
|
||||||
IconClass="fa-solid fa-user-check">
|
IconClass="fa-solid fa-user-check">
|
||||||
</InteractionRow>
|
</InteractionRow>
|
||||||
|
|
||||||
<tr>
|
|
||||||
<td colspan="3">
|
|
||||||
<hr style="margin: 10px 0;">
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
|
|
||||||
<InteractionRow
|
|
||||||
Prospect="Prospect"
|
|
||||||
AllowInteraction="@CurrentUser.IsInGroup(UserGroup.Ambassador)"
|
|
||||||
Type="InteractionType.Complete"
|
|
||||||
AddClick="AddInteraction"
|
|
||||||
RemoveClick="@RemoveInteraction"
|
|
||||||
ButtonIconClass="fa-solid fa-check"
|
|
||||||
IconClass="fa-solid fa-flag-checkered">
|
|
||||||
</InteractionRow>
|
|
||||||
}
|
}
|
||||||
|
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
<div class="flex-grow-1"></div>
|
<div class="flex-grow-1"></div>
|
||||||
|
|
||||||
<small class="text-center" style="margin-top: .5rem;">Zuletzt geändert: @Prospect?.Modified?.ToLocalTime()</small>
|
<div class="text-center d-flex justify-content-center gap-2 mt-1">
|
||||||
|
|
||||||
|
<Button
|
||||||
|
Color="Color.Secondary"
|
||||||
|
Height="Height.Px(35)"
|
||||||
|
title="Bearbeiten"
|
||||||
|
Clicked="EditProspectAsync"
|
||||||
|
Visibility="@(CurrentUser.IsInGroup(UserGroup.WelcomeTeam, UserGroup.Ambassador) ? Visibility.Default : Visibility.Invisible)"
|
||||||
|
><i class="fa-solid fa-pen-to-square"></i>
|
||||||
|
</Button>
|
||||||
|
|
||||||
|
|
||||||
|
@if(StateFilter > ProspectStateFilter.OnBoarding)
|
||||||
|
{
|
||||||
|
@if(Prospect?.Complete != true)
|
||||||
|
{
|
||||||
|
<Button
|
||||||
|
Color="Color.Primary"
|
||||||
|
Height="Height.Px(35)"
|
||||||
|
title="Fertigstellen"
|
||||||
|
Clicked="@(() => AddInteraction(InteractionType.Complete))"
|
||||||
|
Visibility="@(CurrentUser.IsInGroup(UserGroup.Ambassador) ? Visibility.Default : Visibility.Invisible)"
|
||||||
|
><i class="fa-solid fa-flag-checkered"></i>
|
||||||
|
</Button>
|
||||||
|
} else {
|
||||||
|
<Button
|
||||||
|
Color="Color.Primary"
|
||||||
|
Height="Height.Px(35)"
|
||||||
|
title="Fertigstellen rückgängig"
|
||||||
|
Clicked="@(() => AddInteraction(InteractionType.Complete))"
|
||||||
|
Visibility="@(CurrentUser.IsInGroup(UserGroup.Ambassador) ? Visibility.Default : Visibility.Invisible)"
|
||||||
|
><i class="fa-solid fa-flag"></i>
|
||||||
|
</Button>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@if (Prospect?.RecordState != RecordState.Archived)
|
||||||
|
{
|
||||||
|
<Button
|
||||||
|
Color="Color.Danger"
|
||||||
|
Height="Height.Px(35)"
|
||||||
|
title="Archivieren"
|
||||||
|
Clicked="ArchiveProspectAsync"
|
||||||
|
Visibility="@(CurrentUser.IsInGroup(UserGroup.WelcomeTeam, UserGroup.Ambassador) ? Visibility.Default : Visibility.Invisible)"
|
||||||
|
><i class="fa-solid fa-box-archive"></i>
|
||||||
|
</Button>
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
<Button
|
||||||
|
Color="Color.Success"
|
||||||
|
Height="Height.Px(35)"
|
||||||
|
title="Wiederherstellen"
|
||||||
|
Clicked="RestoreProspectAsync"
|
||||||
|
Visibility="@(CurrentUser.IsInGroup(UserGroup.WelcomeTeam, UserGroup.Ambassador) ? Visibility.Default : Visibility.Invisible)"
|
||||||
|
><i class="fa-solid fa-recycle"></i>
|
||||||
|
</Button>
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<small class="text-center" style="margin-top: .5rem;">Geändert: @Prospect?.Modified?.ToLocalTime()</small>
|
||||||
</div>
|
</div>
|
||||||
@@ -106,6 +106,27 @@ namespace FoodsharingSiegen.Server.Controls
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async Task RemoveInteraction(InteractionType type)
|
||||||
|
{
|
||||||
|
var typeName = type.Translate(AppSettings);
|
||||||
|
await ConfirmDialog.ShowAsync(ModalService, "Bestätigen", $"Alle {typeName}-Interaktionen wirklich entfernen?", async () =>
|
||||||
|
{
|
||||||
|
var interactions = Prospect?.Interactions.Where(x => x.Type == type);
|
||||||
|
|
||||||
|
var dataChanged = false;
|
||||||
|
|
||||||
|
foreach (var interaction in interactions ?? [])
|
||||||
|
{
|
||||||
|
var removeR = await ProspectService.RemoveInteraction(interaction.Id);
|
||||||
|
if (!removeR.Success) continue;
|
||||||
|
|
||||||
|
dataChanged = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(dataChanged && OnDataChanged != null) await OnDataChanged();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Private Method RestoreProspectAsync
|
#region Private Method RestoreProspectAsync
|
||||||
|
|||||||
@@ -19,10 +19,17 @@
|
|||||||
flex-basis: 0;
|
flex-basis: 0;
|
||||||
flex-grow: 1;
|
flex-grow: 1;
|
||||||
max-width: 480px;
|
max-width: 480px;
|
||||||
border: 1px solid #533a20;
|
border-radius: 12px;
|
||||||
border-radius: 3px;
|
margin: 15px;
|
||||||
margin: 5px;
|
padding: 1rem 1rem 0 1rem;
|
||||||
padding: .5rem .5rem 0 .5rem;
|
}
|
||||||
|
|
||||||
|
@media (max-width: 576px) {
|
||||||
|
.pc-main {
|
||||||
|
margin-left: 0;
|
||||||
|
margin-right: 0;
|
||||||
|
padding: .5rem .5rem 0 .5rem;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.pc-main.warning {
|
.pc-main.warning {
|
||||||
|
|||||||
@@ -1,102 +0,0 @@
|
|||||||
@using FoodsharingSiegen.Contracts.Enums
|
|
||||||
@using FoodsharingSiegen.Contracts.Model
|
|
||||||
@inherits FsBase
|
|
||||||
@code {
|
|
||||||
|
|
||||||
[Parameter] public ProspectFilter Filter { get; set; } = new();
|
|
||||||
|
|
||||||
[Parameter] public EventCallback<ProspectFilter> FilterChanged { get; set; }
|
|
||||||
|
|
||||||
[Parameter] public ProspectStateFilter StateFilter { get; set; }
|
|
||||||
|
|
||||||
|
|
||||||
private async Task WithoutStepInBriefingChangedAsync(bool arg)
|
|
||||||
{
|
|
||||||
Filter.WithoutStepInBriefing = arg;
|
|
||||||
await FilterChanged.InvokeAsync(Filter);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task TextChanged(string arg)
|
|
||||||
{
|
|
||||||
Filter.Text = arg;
|
|
||||||
await FilterChanged.InvokeAsync(Filter);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task WithoutIdCheckChangedAsync(bool arg)
|
|
||||||
{
|
|
||||||
Filter.WithoutIdCheck = arg;
|
|
||||||
await FilterChanged.InvokeAsync(Filter);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task NoActivityChangedAsync(bool arg)
|
|
||||||
{
|
|
||||||
Filter.NoActivity = arg;
|
|
||||||
await FilterChanged.InvokeAsync(Filter);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task DeletedOnlyChangedAsync(bool arg)
|
|
||||||
{
|
|
||||||
Filter.DeletedOnly = arg;
|
|
||||||
await FilterChanged.InvokeAsync(Filter);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task RecentActivityChangedAsync(bool arg)
|
|
||||||
{
|
|
||||||
Filter.RecentActivity = arg;
|
|
||||||
await FilterChanged.InvokeAsync(Filter);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
<div class="card">
|
|
||||||
<div class="card-header" style="padding: .5rem;">
|
|
||||||
<i class="fa-solid fa-filter"></i> Suchfilter
|
|
||||||
</div>
|
|
||||||
<div class="card-body" style="padding: .5rem;">
|
|
||||||
|
|
||||||
@if (!AppSettings.DisableStepIn)
|
|
||||||
{
|
|
||||||
@* WITHOUT STEP IN BRIEFING *@
|
|
||||||
@if (new[] { ProspectStateFilter.All, ProspectStateFilter.OnBoarding, ProspectStateFilter.Completed }.Contains(StateFilter))
|
|
||||||
{
|
|
||||||
<div style="margin-left: 1rem;">
|
|
||||||
<Switch TValue="bool" Checked="Filter.WithoutStepInBriefing" CheckedChanged="WithoutStepInBriefingChangedAsync" Color="Color.Primary">Ohne @AppSettings.Terms.StepInName</Switch>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@* WITHOUT ID CHECK *@
|
|
||||||
@if (new[] { ProspectStateFilter.All, ProspectStateFilter.Verification, ProspectStateFilter.Completed }.Contains(StateFilter))
|
|
||||||
{
|
|
||||||
<div style="margin-left: 1rem;">
|
|
||||||
<Switch TValue="bool" Checked="Filter.WithoutIdCheck" CheckedChanged="WithoutIdCheckChangedAsync" Color="Color.Primary">Perso noch nicht geprüft</Switch>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
|
|
||||||
@* RECENT ACTIVITY *@
|
|
||||||
@if (new[] { ProspectStateFilter.All, ProspectStateFilter.OnBoarding, ProspectStateFilter.Verification }.Contains(StateFilter))
|
|
||||||
{
|
|
||||||
<div style="margin-left: 1rem;">
|
|
||||||
<Switch TValue="bool" Checked="Filter.RecentActivity" CheckedChanged="RecentActivityChangedAsync" Color="Color.Primary">Kürzlich geändert (< 6 Monate)</Switch>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
|
|
||||||
@* NO ACTIVITY *@
|
|
||||||
@if (new[] { ProspectStateFilter.All, ProspectStateFilter.OnBoarding, ProspectStateFilter.Verification }.Contains(StateFilter))
|
|
||||||
{
|
|
||||||
<div style="margin-left: 1rem;">
|
|
||||||
<Switch TValue="bool" Checked="Filter.NoActivity" CheckedChanged="NoActivityChangedAsync" Color="Color.Primary">Lange keine Aktivität (> 6 Monate)</Switch>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
|
|
||||||
@* DELETED ONLY *@
|
|
||||||
@if (new[] { ProspectStateFilter.All }.Contains(StateFilter))
|
|
||||||
{
|
|
||||||
<div style="margin-left: 1rem;">
|
|
||||||
<Switch TValue="bool" Checked="Filter.DeletedOnly" CheckedChanged="DeletedOnlyChangedAsync" Color="Color.Primary">Gelöschte</Switch>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
|
|
||||||
<TextEdit Text="@Filter.Text" TextChanged="TextChanged" Placeholder="Suchen..." Debounce="true" DebounceInterval="200"/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
[Parameter] public Func<Task>? OnDataChanged { get; set; }
|
[Parameter] public Func<Task>? OnDataChanged { get; set; }
|
||||||
|
|
||||||
}
|
}
|
||||||
<h5>@(Prospects?.Count ?? 0) Einträge</h5>
|
<h6>@(Prospects?.Count ?? 0) Ergebnisse</h6>
|
||||||
|
|
||||||
@if (Prospects?.Any() == true)
|
@if (Prospects?.Any() == true)
|
||||||
{
|
{
|
||||||
|
|||||||
52
FoodsharingSiegen.Server/Controls/ProspectSortControl.razor
Normal file
52
FoodsharingSiegen.Server/Controls/ProspectSortControl.razor
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
@using FoodsharingSiegen.Contracts.Enums
|
||||||
|
@inherits FoodsharingSiegen.Server.BaseClasses.FsBase
|
||||||
|
|
||||||
|
<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>
|
||||||
|
|
||||||
|
<Button Color="Color.Primary"
|
||||||
|
Width="Width.Px(50)"
|
||||||
|
Height="Height.Px(50)"
|
||||||
|
title="Filtern"
|
||||||
|
style="min-width: auto;"
|
||||||
|
Clicked="@OpenFilterDialogAsync">
|
||||||
|
<i class="fa-solid fa-filter"></i>
|
||||||
|
</Button>
|
||||||
|
|
||||||
|
<div style="flex-grow: 1;" class="mt-3">
|
||||||
|
<TextEdit Text="@Filter.Text" TextChanged="TextChangedAsync" Placeholder="Suchen..." Debounce="true" DebounceInterval="200" />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="badge-row mt-1 mb-3">
|
||||||
|
@if (HasCustomSort)
|
||||||
|
{
|
||||||
|
<Badge class="mr-1" Color="Color.Primary" Closable="true" CloseClicked="@EventCallback.Factory.Create(this, ResetSortAsync)">@CurrentSortText</Badge>
|
||||||
|
}
|
||||||
|
|
||||||
|
@if (Filter.WithoutStepInBriefing)
|
||||||
|
{
|
||||||
|
<Badge class="mr-1 mb-1" Color="Color.Info" Closable="true" CloseClicked="@EventCallback.Factory.Create(this, () => DisableFilterAsync(nameof(Filter.WithoutStepInBriefing)))">Ohne @AppSettings.Terms.StepInName</Badge>
|
||||||
|
}
|
||||||
|
@if (Filter.WithoutIdCheck)
|
||||||
|
{
|
||||||
|
<Badge class="mr-1 mb-1" Color="Color.Info" Closable="true" CloseClicked="@EventCallback.Factory.Create(this, () => DisableFilterAsync(nameof(Filter.WithoutIdCheck)))">Perso noch nicht geprüft</Badge>
|
||||||
|
}
|
||||||
|
@if (Filter.RecentActivity)
|
||||||
|
{
|
||||||
|
<Badge class="mr-1 mb-1" Color="Color.Info" Closable="true" CloseClicked="@EventCallback.Factory.Create(this, () => DisableFilterAsync(nameof(Filter.RecentActivity)))">Kürzlich geändert</Badge>
|
||||||
|
}
|
||||||
|
@if (Filter.NoActivity)
|
||||||
|
{
|
||||||
|
<Badge class="mr-1 mb-1" Color="Color.Info" Closable="true" CloseClicked="@EventCallback.Factory.Create(this, () => DisableFilterAsync(nameof(Filter.NoActivity)))">Lange keine Aktivität</Badge>
|
||||||
|
}
|
||||||
|
@if (Filter.DeletedOnly)
|
||||||
|
{
|
||||||
|
<Badge class="mr-1 mb-1" Color="Color.Info" Closable="true" CloseClicked="@EventCallback.Factory.Create(this, () => DisableFilterAsync(nameof(Filter.DeletedOnly)))">Gelöschte</Badge>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
112
FoodsharingSiegen.Server/Controls/ProspectSortControl.razor.cs
Normal file
112
FoodsharingSiegen.Server/Controls/ProspectSortControl.razor.cs
Normal file
@@ -0,0 +1,112 @@
|
|||||||
|
using Blazorise;
|
||||||
|
using FoodsharingSiegen.Contracts.Entity;
|
||||||
|
using FoodsharingSiegen.Contracts.Enums;
|
||||||
|
using FoodsharingSiegen.Contracts.Model;
|
||||||
|
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; }
|
||||||
|
|
||||||
|
[Parameter] public ProspectFilter Filter { get; set; } = new();
|
||||||
|
[Parameter] public EventCallback<ProspectFilter> FilterChanged { get; set; }
|
||||||
|
[Parameter] public ProspectStateFilter StateFilter { get; set; } = ProspectStateFilter.All;
|
||||||
|
|
||||||
|
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 async Task OpenFilterDialogAsync()
|
||||||
|
{
|
||||||
|
await ProspectFilterDialog.ShowAsync(ModalService, Filter, StateFilter, async (f) =>
|
||||||
|
{
|
||||||
|
Filter = f;
|
||||||
|
await FilterChanged.InvokeAsync(Filter);
|
||||||
|
await InvokeAsync(StateHasChanged);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task TextChangedAsync(string text)
|
||||||
|
{
|
||||||
|
Filter.Text = text;
|
||||||
|
await FilterChanged.InvokeAsync(Filter);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task DisableFilterAsync(string filterPropName)
|
||||||
|
{
|
||||||
|
switch (filterPropName)
|
||||||
|
{
|
||||||
|
case nameof(Filter.WithoutStepInBriefing): Filter.WithoutStepInBriefing = false; break;
|
||||||
|
case nameof(Filter.WithoutIdCheck): Filter.WithoutIdCheck = false; break;
|
||||||
|
case nameof(Filter.RecentActivity): Filter.RecentActivity = false; break;
|
||||||
|
case nameof(Filter.NoActivity): Filter.NoActivity = false; break;
|
||||||
|
case nameof(Filter.DeletedOnly): Filter.DeletedOnly = false; break;
|
||||||
|
}
|
||||||
|
await FilterChanged.InvokeAsync(Filter);
|
||||||
|
}
|
||||||
|
|
||||||
|
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();
|
||||||
|
}
|
||||||
|
}
|
||||||
49
FoodsharingSiegen.Server/Dialogs/ProspectFilterDialog.razor
Normal file
49
FoodsharingSiegen.Server/Dialogs/ProspectFilterDialog.razor
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
@inherits FsBase
|
||||||
|
@using FoodsharingSiegen.Contracts.Enums
|
||||||
|
|
||||||
|
<div class="d-grid gap-2">
|
||||||
|
@if (!AppSettings.DisableStepIn && new[] { ProspectStateFilter.All, ProspectStateFilter.OnBoarding, ProspectStateFilter.Completed }.Contains(StateFilter))
|
||||||
|
{
|
||||||
|
<div style="margin-left: 1rem;">
|
||||||
|
<Switch TValue="bool" Checked="ModalFilter.WithoutStepInBriefing" CheckedChanged="(v) => { ModalFilter.WithoutStepInBriefing = v; StateHasChanged(); }" Color="Color.Primary">
|
||||||
|
Ohne @AppSettings.Terms.StepInName
|
||||||
|
</Switch>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
@if (new[] { ProspectStateFilter.All, ProspectStateFilter.Verification, ProspectStateFilter.Completed }.Contains(StateFilter))
|
||||||
|
{
|
||||||
|
<div style="margin-left: 1rem;">
|
||||||
|
<Switch TValue="bool" Checked="ModalFilter.WithoutIdCheck" CheckedChanged="(v) => { ModalFilter.WithoutIdCheck = v; StateHasChanged(); }" Color="Color.Primary">
|
||||||
|
Perso noch nicht geprüft
|
||||||
|
</Switch>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
@if (new[] { ProspectStateFilter.All, ProspectStateFilter.OnBoarding, ProspectStateFilter.Verification }.Contains(StateFilter))
|
||||||
|
{
|
||||||
|
<div style="margin-left: 1rem;">
|
||||||
|
<Switch TValue="bool" Checked="ModalFilter.RecentActivity" CheckedChanged="(v) => { ModalFilter.RecentActivity = v; StateHasChanged(); }" Color="Color.Primary">
|
||||||
|
Kürzlich geändert (< 6 Monate)
|
||||||
|
</Switch>
|
||||||
|
</div>
|
||||||
|
<div style="margin-left: 1rem;">
|
||||||
|
<Switch TValue="bool" Checked="ModalFilter.NoActivity" CheckedChanged="(v) => { ModalFilter.NoActivity = v; StateHasChanged(); }" Color="Color.Primary">
|
||||||
|
Lange keine Aktivität (> 6 Monate)
|
||||||
|
</Switch>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
@if (StateFilter == ProspectStateFilter.All)
|
||||||
|
{
|
||||||
|
<div style="margin-left: 1rem;">
|
||||||
|
<Switch TValue="bool" Checked="ModalFilter.DeletedOnly" CheckedChanged="(v) => { ModalFilter.DeletedOnly = v; StateHasChanged(); }" Color="Color.Primary">
|
||||||
|
Gelöschte
|
||||||
|
</Switch>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
<div class="d-flex justify-content-end mt-3">
|
||||||
|
<Button Color="Color.Primary" Clicked="ApplyAsync" Block="true">Anwenden</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
using Blazorise;
|
||||||
|
using FoodsharingSiegen.Contracts.Enums;
|
||||||
|
using FoodsharingSiegen.Contracts.Model;
|
||||||
|
using FoodsharingSiegen.Server.BaseClasses;
|
||||||
|
using Microsoft.AspNetCore.Components;
|
||||||
|
|
||||||
|
namespace FoodsharingSiegen.Server.Dialogs
|
||||||
|
{
|
||||||
|
public partial class ProspectFilterDialog : FsBase
|
||||||
|
{
|
||||||
|
[Parameter] public ProspectFilter CurrentFilter { get; set; } = new();
|
||||||
|
[Parameter] public ProspectStateFilter StateFilter { get; set; } = ProspectStateFilter.All;
|
||||||
|
[Parameter] public Func<ProspectFilter, Task>? OnFilterApplied { get; set; }
|
||||||
|
|
||||||
|
public ProspectFilter ModalFilter { get; set; } = new();
|
||||||
|
|
||||||
|
protected override void OnInitialized()
|
||||||
|
{
|
||||||
|
// Clone the filter so changes are not immediately mapped to the parent until "Anwenden" is pressed
|
||||||
|
ModalFilter = new ProspectFilter
|
||||||
|
{
|
||||||
|
Text = CurrentFilter.Text,
|
||||||
|
WithoutStepInBriefing = CurrentFilter.WithoutStepInBriefing,
|
||||||
|
WithoutIdCheck = CurrentFilter.WithoutIdCheck,
|
||||||
|
NoActivity = CurrentFilter.NoActivity,
|
||||||
|
RecentActivity = CurrentFilter.RecentActivity,
|
||||||
|
DeletedOnly = CurrentFilter.DeletedOnly
|
||||||
|
};
|
||||||
|
base.OnInitialized();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static async Task ShowAsync(IModalService modalService, ProspectFilter currentFilter, ProspectStateFilter stateFilter, Func<ProspectFilter, Task> onFilterApplied)
|
||||||
|
{
|
||||||
|
await modalService.Show<ProspectFilterDialog>("Filtern", p =>
|
||||||
|
{
|
||||||
|
p.Add(nameof(CurrentFilter), currentFilter);
|
||||||
|
p.Add(nameof(StateFilter), stateFilter);
|
||||||
|
p.Add(nameof(OnFilterApplied), onFilterApplied);
|
||||||
|
}, new ModalInstanceOptions
|
||||||
|
{
|
||||||
|
Size = ModalSize.Small,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task ApplyAsync()
|
||||||
|
{
|
||||||
|
if (OnFilterApplied != null) await OnFilterApplied(ModalFilter);
|
||||||
|
await ModalService.Hide();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -22,13 +22,14 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<LibSassOutputStyle>expanded</LibSassOutputStyle>
|
<DartSassOutputStyle>expanded</DartSassOutputStyle>
|
||||||
<LibSassOutputLevel>verbose</LibSassOutputLevel>
|
<DartSassOutputLevel>verbose</DartSassOutputLevel>
|
||||||
<LibSassMessageLevel>High</LibSassMessageLevel>
|
<DartSassMessageLevel>High</DartSassMessageLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="LibSassBuilder" Version="2.0.1" />
|
<PackageReference Include="DartSassBuilder" Version="1.1.0" />
|
||||||
|
<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>
|
||||||
|
|||||||
223
FoodsharingSiegen.Server/Migrations/20260418111848_PasswordRecovery.Designer.cs
generated
Normal file
223
FoodsharingSiegen.Server/Migrations/20260418111848_PasswordRecovery.Designer.cs
generated
Normal file
@@ -0,0 +1,223 @@
|
|||||||
|
// <auto-generated />
|
||||||
|
using System;
|
||||||
|
using FoodsharingSiegen.Server.Data;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace FoodsharingSiegen.Server.Migrations
|
||||||
|
{
|
||||||
|
[DbContext(typeof(FsContext))]
|
||||||
|
[Migration("20260418111848_PasswordRecovery")]
|
||||||
|
partial class PasswordRecovery
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
||||||
|
{
|
||||||
|
#pragma warning disable 612, 618
|
||||||
|
modelBuilder.HasAnnotation("ProductVersion", "9.0.3");
|
||||||
|
|
||||||
|
modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.Audit", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<DateTime>("Created")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("Data1")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("Data2")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<int>("Type")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<Guid?>("UserID")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("UserID");
|
||||||
|
|
||||||
|
b.ToTable("Audits");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.Interaction", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<bool>("Alert")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<DateTime>("Created")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<DateTime>("Date")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<int>("Feedback")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<string>("FeedbackInfo")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("Info1")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("Info2")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<bool>("NotNeeded")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<Guid>("ProspectID")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<int>("Type")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<Guid>("UserID")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("ProspectID");
|
||||||
|
|
||||||
|
b.HasIndex("UserID");
|
||||||
|
|
||||||
|
b.ToTable("Interactions");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.Prospect", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<DateTime>("Created")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<int>("FsId")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<string>("Memo")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<DateTime?>("Modified")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("Name")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<int>("RecordState")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<bool>("Warning")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.ToTable("Prospects");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.User", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<DateTime>("Created")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("EncryptedPassword")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<bool>("ForceLogout")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<string>("Groups")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("Mail")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("Memo")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("Name")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<int>("Network")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<string>("ResetToken")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<DateTime?>("ResetTokenExpiry")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<int>("Type")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<bool>("Verified")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.ToTable("Users");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.Audit", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("FoodsharingSiegen.Contracts.Entity.User", "User")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("UserID");
|
||||||
|
|
||||||
|
b.Navigation("User");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.Interaction", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("FoodsharingSiegen.Contracts.Entity.Prospect", "Prospect")
|
||||||
|
.WithMany("Interactions")
|
||||||
|
.HasForeignKey("ProspectID")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.HasOne("FoodsharingSiegen.Contracts.Entity.User", "User")
|
||||||
|
.WithMany("Interactions")
|
||||||
|
.HasForeignKey("UserID")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.Navigation("Prospect");
|
||||||
|
|
||||||
|
b.Navigation("User");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.Prospect", b =>
|
||||||
|
{
|
||||||
|
b.Navigation("Interactions");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.User", b =>
|
||||||
|
{
|
||||||
|
b.Navigation("Interactions");
|
||||||
|
});
|
||||||
|
#pragma warning restore 612, 618
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
using System;
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace FoodsharingSiegen.Server.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class PasswordRecovery : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.AddColumn<string>(
|
||||||
|
name: "ResetToken",
|
||||||
|
table: "Users",
|
||||||
|
type: "TEXT",
|
||||||
|
nullable: true);
|
||||||
|
|
||||||
|
migrationBuilder.AddColumn<DateTime>(
|
||||||
|
name: "ResetTokenExpiry",
|
||||||
|
table: "Users",
|
||||||
|
type: "TEXT",
|
||||||
|
nullable: true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "ResetToken",
|
||||||
|
table: "Users");
|
||||||
|
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "ResetTokenExpiry",
|
||||||
|
table: "Users");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -160,6 +160,12 @@ namespace FoodsharingSiegen.Server.Migrations
|
|||||||
b.Property<int>("Network")
|
b.Property<int>("Network")
|
||||||
.HasColumnType("INTEGER");
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<string>("ResetToken")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<DateTime?>("ResetTokenExpiry")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
b.Property<int>("Type")
|
b.Property<int>("Type")
|
||||||
.HasColumnType("INTEGER");
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
|||||||
54
FoodsharingSiegen.Server/Pages/ForgotPassword.razor
Normal file
54
FoodsharingSiegen.Server/Pages/ForgotPassword.razor
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
@page "/forgot-password"
|
||||||
|
@using FoodsharingSiegen.Shared.Helper
|
||||||
|
@layout LoginLayout
|
||||||
|
|
||||||
|
@inherits FoodsharingSiegen.Server.BaseClasses.FsBase
|
||||||
|
|
||||||
|
<PageTitle>@AppSettings.Terms.Title - Passwort vergessen</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">Passwort zurücksetzen</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@if (IsSubmitted)
|
||||||
|
{
|
||||||
|
<div class="alert alert-success text-center">
|
||||||
|
Wenn ein Benutzerkonto mit dieser E-Mail-Adresse existiert, wurde eine E-Mail mit weiteren Anweisungen versendet.
|
||||||
|
</div>
|
||||||
|
<div class="text-center mt-4">
|
||||||
|
<a href="/login" class="btn btn-outline-primary"><i class="fas fa-arrow-left mr-2"></i> Zurück zum Login</a>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
<Validation Validator="ValidationHelper.ValidateMail" @bind-Status="@IsValidMail">
|
||||||
|
<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>
|
||||||
|
|
||||||
|
<Button Class="mt-4 w-100" Color="Color.Primary" Size="Size.Large" Clicked="SubmitRequest" Disabled="@(IsValidMail != ValidationStatus.Success || IsLoading)">
|
||||||
|
@if (IsLoading)
|
||||||
|
{
|
||||||
|
<i class="fas fa-spinner fa-spin mr-2"></i> <span>Wird gesendet...</span>
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
<i class="fas fa-paper-plane mr-2"></i> <span>Passwort zurücksetzen</span>
|
||||||
|
}
|
||||||
|
</Button>
|
||||||
|
|
||||||
|
<div class="text-center mt-3">
|
||||||
|
<a href="/login" style="font-size: 0.85rem; color: #64ae24; text-decoration: none;"><i class="fas fa-arrow-left mr-1"></i> Zurück zum Login</a>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
41
FoodsharingSiegen.Server/Pages/ForgotPassword.razor.cs
Normal file
41
FoodsharingSiegen.Server/Pages/ForgotPassword.razor.cs
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
using Blazorise;
|
||||||
|
using FoodsharingSiegen.Server.BaseClasses;
|
||||||
|
using FoodsharingSiegen.Server.Auth;
|
||||||
|
using FoodsharingSiegen.Shared.Helper;
|
||||||
|
using Microsoft.AspNetCore.Components;
|
||||||
|
using Microsoft.AspNetCore.Components.Web;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace FoodsharingSiegen.Server.Pages
|
||||||
|
{
|
||||||
|
public partial class ForgotPassword : FsBase
|
||||||
|
{
|
||||||
|
public string MailAddress { get; set; } = string.Empty;
|
||||||
|
public ValidationStatus IsValidMail { get; set; } = ValidationStatus.None;
|
||||||
|
|
||||||
|
public bool IsSubmitted { get; set; }
|
||||||
|
public bool IsLoading { get; set; }
|
||||||
|
|
||||||
|
public async Task SubmitRequest()
|
||||||
|
{
|
||||||
|
if (IsValidMail != ValidationStatus.Success) return;
|
||||||
|
|
||||||
|
IsLoading = true;
|
||||||
|
await InvokeAsync(StateHasChanged);
|
||||||
|
|
||||||
|
await AuthService.InitiatePasswordReset(MailAddress, NavigationManager.BaseUri);
|
||||||
|
|
||||||
|
IsSubmitted = true;
|
||||||
|
IsLoading = false;
|
||||||
|
await InvokeAsync(StateHasChanged);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task TextEdit_KeyUp(KeyboardEventArgs e)
|
||||||
|
{
|
||||||
|
if (e.Key == "Enter" && IsValidMail == ValidationStatus.Success)
|
||||||
|
{
|
||||||
|
await SubmitRequest();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,24 +4,45 @@
|
|||||||
|
|
||||||
@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 class="d-flex justify-content-center align-items-center mt-2">
|
||||||
|
<a href="/forgot-password" tabindex="-1" style="font-size: 0.85rem; color: #64ae24; text-decoration: none;">Passwort vergessen?</a>
|
||||||
|
</div>
|
||||||
</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,25 @@
|
|||||||
|
|
||||||
<Button
|
<Button
|
||||||
Color="Color.Primary"
|
Color="Color.Primary"
|
||||||
|
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> Neu
|
||||||
</Button>
|
</Button>
|
||||||
|
|
|
||||||
|
|
||||||
|
<ProspectSortControl @bind-CurrentSort="CurrentSort" StorageKey="@StorageKeys.SortProspects" OnSortChanged="StateHasChanged" Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.OnBoarding" />
|
||||||
|
|
||||||
@{
|
@{
|
||||||
var filterList = ProspectList.ApplyFilter(Filter);
|
var filterList = ProspectList.ApplyFilter(Filter);
|
||||||
|
var sortList = filterList.ApplySort(CurrentSort);
|
||||||
}
|
}
|
||||||
|
|
||||||
<hr/>
|
|
||||||
<ProspectFilterControl Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.OnBoarding"></ProspectFilterControl>
|
|
||||||
<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,15 @@
|
|||||||
<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" Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.All" />
|
||||||
|
|
||||||
@{
|
@{
|
||||||
var filterList = ProspectList.ApplyFilter(Filter);
|
var filterList = ProspectList.ApplyFilter(Filter);
|
||||||
|
var sortList = filterList.ApplySort(CurrentSort);
|
||||||
}
|
}
|
||||||
|
|
||||||
<hr/>
|
|
||||||
<ProspectFilterControl Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.All"></ProspectFilterControl>
|
|
||||||
<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,15 @@
|
|||||||
<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" Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.Completed" />
|
||||||
|
|
||||||
@{
|
@{
|
||||||
var filterList = ProspectList.ApplyFilter(Filter);
|
var filterList = ProspectList.ApplyFilter(Filter);
|
||||||
|
var sortList = filterList.ApplySort(CurrentSort);
|
||||||
}
|
}
|
||||||
|
|
||||||
<hr />
|
|
||||||
<ProspectFilterControl Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.Completed"></ProspectFilterControl>
|
|
||||||
<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,16 @@
|
|||||||
<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" Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.Verification" />
|
||||||
|
|
||||||
@{
|
@{
|
||||||
var filterList = ProspectList.ApplyFilter(Filter);
|
var filterList = ProspectList.ApplyFilter(Filter);
|
||||||
|
var sortList = filterList.ApplySort(CurrentSort);
|
||||||
}
|
}
|
||||||
|
|
||||||
<hr/>
|
|
||||||
<ProspectFilterControl Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.Verification"></ProspectFilterControl>
|
|
||||||
<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
|
||||||
|
|||||||
86
FoodsharingSiegen.Server/Pages/ResetPassword.razor
Normal file
86
FoodsharingSiegen.Server/Pages/ResetPassword.razor
Normal file
@@ -0,0 +1,86 @@
|
|||||||
|
@page "/reset-password/{Token}"
|
||||||
|
@using FoodsharingSiegen.Shared.Helper
|
||||||
|
@layout LoginLayout
|
||||||
|
|
||||||
|
@inherits FoodsharingSiegen.Server.BaseClasses.FsBase
|
||||||
|
|
||||||
|
<PageTitle>@AppSettings.Terms.Title - Neues Passwort setzen</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">Neues Passwort festlegen</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@if (IsInitializing)
|
||||||
|
{
|
||||||
|
<div class="text-center mt-4">
|
||||||
|
<i class="fas fa-spinner fa-spin fa-2x mb-3" style="color: #64ae24;"></i>
|
||||||
|
<p>Token wird überprüft...</p>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
else if (!IsTokenValid)
|
||||||
|
{
|
||||||
|
<div class="alert alert-danger text-center">
|
||||||
|
<i class="fas fa-exclamation-triangle fa-2x mb-2 d-block"></i>
|
||||||
|
Der Link zum Zurücksetzen des Passworts ist ungültig oder abgelaufen. Bitte fordere einen neuen an.
|
||||||
|
</div>
|
||||||
|
<div class="text-center mt-4">
|
||||||
|
<a href="/forgot-password" class="btn btn-outline-primary w-100 mb-2"><i class="fas fa-redo mr-2"></i> Neuen Link anfordern</a>
|
||||||
|
<a href="/login" class="btn btn-link w-100" style="color: #64ae24;">Zurück zum Login</a>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
else if (IsSuccess)
|
||||||
|
{
|
||||||
|
<div class="alert alert-success text-center">
|
||||||
|
Passwort erfolgreich aktualisiert. Du kannst dich jetzt anmelden.
|
||||||
|
</div>
|
||||||
|
<div class="text-center mt-4">
|
||||||
|
<a href="/login" class="btn btn-outline-primary"><i class="fas fa-sign-in-alt mr-2"></i> Zum Login</a>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
<div class="alert alert-info" style="font-size: 0.85rem;">
|
||||||
|
<i class="fas fa-info-circle mr-1"></i> Dein Passwort muss mindestens 8 Zeichen lang sein und eine Zahl enthalten.
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<Validation Validator="ValidationHelper.ValidatePassword" @bind-Status="@IsValidPassword">
|
||||||
|
<Field>
|
||||||
|
<FieldLabel>Neues Passwort</FieldLabel>
|
||||||
|
<TextEdit @bind-Text="NewPassword" Role="TextRole.Password" Placeholder="Passwort (min. 8 Zeichen, min. 1 Zahl)" KeyUp="TextEdit_KeyUp" Size="Size.Large"></TextEdit>
|
||||||
|
</Field>
|
||||||
|
</Validation>
|
||||||
|
|
||||||
|
<Validation Validator="ValidatePasswordConfirmation" @bind-Status="@IsValidPasswordConfirmation">
|
||||||
|
<Field Class="mt-3">
|
||||||
|
<FieldLabel>Passwort bestätigen</FieldLabel>
|
||||||
|
<TextEdit @bind-Text="ConfirmPassword" Role="TextRole.Password" Placeholder="Passwort bestätigen" KeyUp="TextEdit_KeyUp" Size="Size.Large"></TextEdit>
|
||||||
|
</Field>
|
||||||
|
</Validation>
|
||||||
|
|
||||||
|
@if (!string.IsNullOrEmpty(ErrorMessage))
|
||||||
|
{
|
||||||
|
<div class="text-danger mt-3 text-center">
|
||||||
|
<i class="fas fa-exclamation-triangle mr-1"></i> @ErrorMessage
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
<Button Class="mt-4 w-100" Color="Color.Primary" Size="Size.Large" Clicked="SubmitReset" Disabled="@(IsValidPassword != ValidationStatus.Success || IsValidPasswordConfirmation != ValidationStatus.Success || IsLoading)">
|
||||||
|
@if (IsLoading)
|
||||||
|
{
|
||||||
|
<i class="fas fa-spinner fa-spin mr-2"></i> <span>Speichern...</span>
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
<i class="fas fa-save mr-2"></i> <span>Passwort speichern</span>
|
||||||
|
}
|
||||||
|
</Button>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
77
FoodsharingSiegen.Server/Pages/ResetPassword.razor.cs
Normal file
77
FoodsharingSiegen.Server/Pages/ResetPassword.razor.cs
Normal file
@@ -0,0 +1,77 @@
|
|||||||
|
using Blazorise;
|
||||||
|
using FoodsharingSiegen.Server.BaseClasses;
|
||||||
|
using FoodsharingSiegen.Server.Auth;
|
||||||
|
using FoodsharingSiegen.Shared.Helper;
|
||||||
|
using Microsoft.AspNetCore.Components;
|
||||||
|
using Microsoft.AspNetCore.Components.Web;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace FoodsharingSiegen.Server.Pages
|
||||||
|
{
|
||||||
|
public partial class ResetPassword : FsBase
|
||||||
|
{
|
||||||
|
[Parameter]
|
||||||
|
public string Token { get; set; } = string.Empty;
|
||||||
|
|
||||||
|
public string NewPassword { get; set; } = string.Empty;
|
||||||
|
public string ConfirmPassword { get; set; } = string.Empty;
|
||||||
|
|
||||||
|
public ValidationStatus IsValidPassword { get; set; } = ValidationStatus.None;
|
||||||
|
public ValidationStatus IsValidPasswordConfirmation { get; set; } = ValidationStatus.None;
|
||||||
|
|
||||||
|
public string ErrorMessage { get; set; } = string.Empty;
|
||||||
|
public bool IsSuccess { get; set; }
|
||||||
|
public bool IsLoading { get; set; }
|
||||||
|
public bool IsInitializing { get; set; } = true;
|
||||||
|
public bool IsTokenValid { get; set; }
|
||||||
|
|
||||||
|
protected override async Task OnInitializedAsync()
|
||||||
|
{
|
||||||
|
IsTokenValid = await AuthService.IsResetTokenValid(Token);
|
||||||
|
IsInitializing = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ValidatePasswordConfirmation(ValidatorEventArgs args)
|
||||||
|
{
|
||||||
|
var confirmPassword = System.Convert.ToString(args.Value);
|
||||||
|
if (string.IsNullOrWhiteSpace(confirmPassword))
|
||||||
|
{
|
||||||
|
args.Status = ValidationStatus.None;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
args.Status = confirmPassword == NewPassword ? ValidationStatus.Success : ValidationStatus.Error;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task SubmitReset()
|
||||||
|
{
|
||||||
|
if (IsValidPassword != ValidationStatus.Success || IsValidPasswordConfirmation != ValidationStatus.Success) return;
|
||||||
|
|
||||||
|
IsLoading = true;
|
||||||
|
ErrorMessage = string.Empty;
|
||||||
|
await InvokeAsync(StateHasChanged);
|
||||||
|
|
||||||
|
var result = await AuthService.ResetPassword(Token, NewPassword);
|
||||||
|
|
||||||
|
if (result.Success)
|
||||||
|
{
|
||||||
|
IsSuccess = true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ErrorMessage = result.Exception?.Message ?? "Ein Fehler ist aufgetreten.";
|
||||||
|
}
|
||||||
|
|
||||||
|
IsLoading = false;
|
||||||
|
await InvokeAsync(StateHasChanged);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task TextEdit_KeyUp(KeyboardEventArgs e)
|
||||||
|
{
|
||||||
|
if (e.Key == "Enter" && IsValidPassword == ValidationStatus.Success && IsValidPasswordConfirmation == ValidationStatus.Success)
|
||||||
|
{
|
||||||
|
await SubmitReset();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
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}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -43,7 +43,6 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script src="_framework/blazor.server.js"></script>
|
<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>
|
<script src="_content/Blazorise.Material/blazorise.material.js?v=1.7.5.0"></script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
@@ -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"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -28,7 +28,7 @@ namespace FoodsharingSiegen.Shared.Helper
|
|||||||
InteractionType.Verify => "Verifizierung",
|
InteractionType.Verify => "Verifizierung",
|
||||||
InteractionType.Complete => "Fertig",
|
InteractionType.Complete => "Fertig",
|
||||||
InteractionType.StepInBriefing => appSettings.Terms.StepInName ?? "StepIn",
|
InteractionType.StepInBriefing => appSettings.Terms.StepInName ?? "StepIn",
|
||||||
InteractionType.ReleasedForVerification => "Freigabe zum Freischalten",
|
InteractionType.ReleasedForVerification => "Freigabe Freischalten",
|
||||||
_ => type.ToString()
|
_ => type.ToString()
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ namespace FoodsharingSiegen.Shared.Helper
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var isValid = password.Length > 3;
|
var isValid = password.Length >= 8 && password.Any(char.IsDigit);
|
||||||
|
|
||||||
args.Status = isValid ? ValidationStatus.Success : ValidationStatus.Error;
|
args.Status = isValid ? ValidationStatus.Success : ValidationStatus.Error;
|
||||||
}
|
}
|
||||||
|
|||||||
53
Scripts/kill-port-56000.ps1
Normal file
53
Scripts/kill-port-56000.ps1
Normal file
@@ -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."
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user