Compare commits
15 Commits
update2025
...
82d2c48ff7
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
82d2c48ff7 | ||
|
|
41b1f8ae1d | ||
|
|
eda6625e91 | ||
|
|
701388ee34 | ||
|
|
3e099988bc | ||
|
|
ee967cd046 | ||
|
|
76c3e6ddde | ||
|
|
aea858a1ef | ||
|
|
85c90e4657 | ||
|
|
840ecedbd0 | ||
|
|
916c3142d4 | ||
|
|
f9426679ea | ||
|
|
a68994d00b | ||
|
|
fcda568905 | ||
|
|
ac178e60e0 |
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 }}"
|
||||||
50
.gitea/workflows/test.yml
Normal file
50
.gitea/workflows/test.yml
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
name: Build And Release
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- "v*"
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
tag_name:
|
||||||
|
description: "Tag for the release (for example: v1.0.0)"
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
release:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
env:
|
||||||
|
RELEASE_TAG: ${{ github.event.inputs.tag_name || github.ref_name }}
|
||||||
|
DOTNET_ROLL_FORWARD: Major
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: actions/checkout@v6
|
||||||
|
|
||||||
|
- name: Setup .NET SDK
|
||||||
|
uses: actions/setup-dotnet@v5
|
||||||
|
with:
|
||||||
|
dotnet-version: "9.0.x"
|
||||||
|
|
||||||
|
- name: Restore dependencies
|
||||||
|
run: dotnet restore FoodsharingSiegen.sln
|
||||||
|
|
||||||
|
- name: Publish server build
|
||||||
|
run: dotnet publish ./FoodsharingSiegen.Server/FoodsharingSiegen.Server.csproj -c Release -o ./artifacts/publish
|
||||||
|
|
||||||
|
- name: Create zip package
|
||||||
|
run: |
|
||||||
|
cd artifacts
|
||||||
|
zip -r FoodsharingSiegen.Server-${{ env.RELEASE_TAG }}.zip publish
|
||||||
|
|
||||||
|
- name: Create release and upload artifact
|
||||||
|
uses: https://gitea.com/actions/gitea-release-action@v1
|
||||||
|
with:
|
||||||
|
files: artifacts/FoodsharingSiegen.Server-${{ env.RELEASE_TAG }}.zip
|
||||||
|
tag_name: ${{ env.RELEASE_TAG }}
|
||||||
|
name: Release ${{ env.RELEASE_TAG }}
|
||||||
|
target_commitish: ${{ github.sha }}
|
||||||
|
token: ${{ github.token }}
|
||||||
4
.gitignore
vendored
4
.gitignore
vendored
@@ -4,4 +4,6 @@ obj/
|
|||||||
riderModule.iml
|
riderModule.iml
|
||||||
/_ReSharper.Caches/
|
/_ReSharper.Caches/
|
||||||
|
|
||||||
Publish/
|
Publish/
|
||||||
|
app.db
|
||||||
|
FoodsharingSiegen.Server/wwwroot/buildinfo.txt
|
||||||
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"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
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
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -12,6 +12,26 @@ namespace FoodsharingSiegen.Contracts
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public const string ProspectFilter = "ProspectFilter";
|
public const string ProspectFilter = "ProspectFilter";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Represents the storage key used for prospect sorting preferences.
|
||||||
|
/// </summary>
|
||||||
|
public const string SortProspects = "SortProspects";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Represents the storage key used for sorting all prospects.
|
||||||
|
/// </summary>
|
||||||
|
public const string SortProspectsAll = "SortProspectsAll";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Represents the storage key used for sorting completed prospects.
|
||||||
|
/// </summary>
|
||||||
|
public const string SortProspectsDone = "SortProspectsDone";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Represents the storage key used for sorting prospects pending verification.
|
||||||
|
/// </summary>
|
||||||
|
public const string SortProspectsVerify = "SortProspectsVerify";
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The token key
|
/// The token key
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -12,8 +12,23 @@
|
|||||||
<div class="@divClass">
|
<div class="@divClass">
|
||||||
<h5 class="mb-2 d-flex">
|
<h5 class="mb-2 d-flex">
|
||||||
<div class="flex-grow-1">
|
<div class="flex-grow-1">
|
||||||
@Prospect?.Name
|
@if(string.IsNullOrWhiteSpace(Prospect?.Name))
|
||||||
<small style="font-size: .9rem;">@Prospect?.FsId</small>
|
{
|
||||||
|
<i class="fa-solid fa-exclamation-triangle text-warning"></i>
|
||||||
|
<doublearrows></doublearrows>
|
||||||
|
|
||||||
|
<em>»Name fehlt«</em>
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
@Prospect?.Name
|
||||||
|
}
|
||||||
|
|
||||||
|
@if (Prospect?.FsId != null && Prospect.FsId != 0)
|
||||||
|
{
|
||||||
|
<small style="font-size: .9rem; margin-left: 0.5rem;">@Prospect?.FsId</small>
|
||||||
|
}
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
@if (CurrentUser.IsInGroup(UserGroup.WelcomeTeam, UserGroup.Ambassador))
|
@if (CurrentUser.IsInGroup(UserGroup.WelcomeTeam, UserGroup.Ambassador))
|
||||||
|
|||||||
17
FoodsharingSiegen.Server/Controls/ProspectSortControl.razor
Normal file
17
FoodsharingSiegen.Server/Controls/ProspectSortControl.razor
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
@using FoodsharingSiegen.Contracts.Enums
|
||||||
|
|
||||||
|
<Button Color="Color.Primary"
|
||||||
|
Width="Width.Px(50)"
|
||||||
|
Height="Height.Px(50)"
|
||||||
|
title="Sortieren"
|
||||||
|
style="min-width: auto;"
|
||||||
|
Clicked="@OpenSortDialogAsync">
|
||||||
|
<i class="fa-solid fa-sort"></i>
|
||||||
|
</Button>
|
||||||
|
|
||||||
|
<div class="badge-row mt-2">
|
||||||
|
@if (HasCustomSort)
|
||||||
|
{
|
||||||
|
<Badge Color="Color.Primary" Closable="true" CloseClicked="@EventCallback.Factory.Create(this, ResetSortAsync)">@CurrentSortText</Badge>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,78 @@
|
|||||||
|
using Blazorise;
|
||||||
|
using FoodsharingSiegen.Contracts.Entity;
|
||||||
|
using FoodsharingSiegen.Contracts.Enums;
|
||||||
|
using FoodsharingSiegen.Server.Data.Service;
|
||||||
|
using FoodsharingSiegen.Server.Dialogs;
|
||||||
|
using FoodsharingSiegen.Server.Service;
|
||||||
|
using Microsoft.AspNetCore.Components;
|
||||||
|
|
||||||
|
namespace FoodsharingSiegen.Server.Controls;
|
||||||
|
|
||||||
|
public partial class ProspectSortControl
|
||||||
|
{
|
||||||
|
[Inject] private IModalService ModalService { get; set; } = null!;
|
||||||
|
|
||||||
|
[Inject] private LocalStorageService LocalStorageService { get; set; } = null!;
|
||||||
|
|
||||||
|
[Parameter]
|
||||||
|
public ProspectSortOption CurrentSort { get; set; } = ProspectSortOption.NameAscending;
|
||||||
|
|
||||||
|
[Parameter]
|
||||||
|
public EventCallback<ProspectSortOption> CurrentSortChanged { get; set; }
|
||||||
|
|
||||||
|
[Parameter]
|
||||||
|
public EventCallback OnSortChanged { get; set; }
|
||||||
|
|
||||||
|
[Parameter]
|
||||||
|
public string? StorageKey { get; set; }
|
||||||
|
|
||||||
|
protected override async Task OnInitializedAsync()
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrEmpty(StorageKey))
|
||||||
|
{
|
||||||
|
var savedSort = await LocalStorageService.GetItem<ProspectSortOption?>(StorageKey);
|
||||||
|
if (savedSort.HasValue)
|
||||||
|
{
|
||||||
|
CurrentSort = savedSort.Value;
|
||||||
|
await CurrentSortChanged.InvokeAsync(CurrentSort);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
await base.OnInitializedAsync();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task OpenSortDialogAsync()
|
||||||
|
{
|
||||||
|
await ProspectSortDialog.ShowAsync(ModalService, CurrentSort, async option =>
|
||||||
|
{
|
||||||
|
await UpdateSortAsync(option);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private bool HasCustomSort => CurrentSort != ProspectSortOption.NameAscending;
|
||||||
|
|
||||||
|
private string CurrentSortText => CurrentSort switch
|
||||||
|
{
|
||||||
|
ProspectSortOption.NameDescending => "Sortierung: Name (absteigend)",
|
||||||
|
ProspectSortOption.ModifiedAscending => "Sortierung: Zuletzt geändert (aufsteigend)",
|
||||||
|
ProspectSortOption.ModifiedDescending => "Sortierung: Zuletzt geaendert (absteigend)",
|
||||||
|
_ => string.Empty
|
||||||
|
};
|
||||||
|
|
||||||
|
private async Task ResetSortAsync()
|
||||||
|
{
|
||||||
|
await UpdateSortAsync(ProspectSortOption.NameAscending);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task UpdateSortAsync(ProspectSortOption option)
|
||||||
|
{
|
||||||
|
CurrentSort = option;
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(StorageKey))
|
||||||
|
{
|
||||||
|
await LocalStorageService.SetItem(StorageKey, CurrentSort);
|
||||||
|
}
|
||||||
|
|
||||||
|
await CurrentSortChanged.InvokeAsync(CurrentSort);
|
||||||
|
await OnSortChanged.InvokeAsync();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
@inherits FsBase
|
||||||
|
@using FoodsharingSiegen.Contracts.Enums
|
||||||
|
|
||||||
|
<div class="d-grid gap-2">
|
||||||
|
<Button Color="@GetSortButtonColor(ProspectSortOption.NameAscending)" Clicked="() => SelectAsync(ProspectSortOption.NameAscending)">Name (aufsteigend)</Button>
|
||||||
|
<Button Color="@GetSortButtonColor(ProspectSortOption.NameDescending)" Clicked="() => SelectAsync(ProspectSortOption.NameDescending)">Name (absteigend)</Button>
|
||||||
|
<Button Color="@GetSortButtonColor(ProspectSortOption.ModifiedAscending)" Clicked="() => SelectAsync(ProspectSortOption.ModifiedAscending)">Geändert (aufsteigend)</Button>
|
||||||
|
<Button Color="@GetSortButtonColor(ProspectSortOption.ModifiedDescending)" Clicked="() => SelectAsync(ProspectSortOption.ModifiedDescending)">Geändert (absteigend)</Button>
|
||||||
|
</div>
|
||||||
39
FoodsharingSiegen.Server/Dialogs/ProspectSortDialog.razor.cs
Normal file
39
FoodsharingSiegen.Server/Dialogs/ProspectSortDialog.razor.cs
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
using Blazorise;
|
||||||
|
using FoodsharingSiegen.Contracts.Enums;
|
||||||
|
using FoodsharingSiegen.Server.BaseClasses;
|
||||||
|
using Microsoft.AspNetCore.Components;
|
||||||
|
|
||||||
|
namespace FoodsharingSiegen.Server.Dialogs
|
||||||
|
{
|
||||||
|
public partial class ProspectSortDialog : FsBase
|
||||||
|
{
|
||||||
|
[Parameter]
|
||||||
|
public ProspectSortOption CurrentSort { get; set; } = ProspectSortOption.NameAscending;
|
||||||
|
|
||||||
|
[Parameter]
|
||||||
|
public Func<ProspectSortOption, Task>? OnSortSelected { get; set; }
|
||||||
|
|
||||||
|
public static async Task ShowAsync(IModalService modalService, ProspectSortOption currentSort, Func<ProspectSortOption, Task> onSortSelected)
|
||||||
|
{
|
||||||
|
await modalService.Show<ProspectSortDialog>("Sortieren", p =>
|
||||||
|
{
|
||||||
|
p.Add(nameof(CurrentSort), currentSort);
|
||||||
|
p.Add(nameof(OnSortSelected), onSortSelected);
|
||||||
|
}, new ModalInstanceOptions
|
||||||
|
{
|
||||||
|
Size = ModalSize.Small,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private Color GetSortButtonColor(ProspectSortOption option)
|
||||||
|
{
|
||||||
|
return CurrentSort == option ? Color.Success : Color.Secondary;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task SelectAsync(ProspectSortOption option)
|
||||||
|
{
|
||||||
|
if (OnSortSelected != null) await OnSortSelected(option);
|
||||||
|
await ModalService.Hide();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
@page "/prospect"
|
@page "/prospect"
|
||||||
@page "/prospects"
|
@page "/prospects"
|
||||||
|
|
||||||
|
@using FoodsharingSiegen.Contracts
|
||||||
@using FoodsharingSiegen.Contracts.Enums
|
@using FoodsharingSiegen.Contracts.Enums
|
||||||
@using FoodsharingSiegen.Shared.Helper
|
@using FoodsharingSiegen.Shared.Helper
|
||||||
@inherits FsBase
|
@inherits FsBase
|
||||||
@@ -16,20 +17,27 @@
|
|||||||
|
|
||||||
<Button
|
<Button
|
||||||
Color="Color.Primary"
|
Color="Color.Primary"
|
||||||
|
Width="Width.Px(50)"
|
||||||
|
Height="Height.Px(50)"
|
||||||
|
title="Hinzufügen"
|
||||||
|
style="min-width: auto;"
|
||||||
Clicked="@CreateProspectAsync"
|
Clicked="@CreateProspectAsync"
|
||||||
Visibility="@(CurrentUser.IsInGroup(UserGroup.WelcomeTeam, UserGroup.Ambassador) ? Visibility.Default : Visibility.Invisible)"
|
Visibility="@(CurrentUser.IsInGroup(UserGroup.WelcomeTeam, UserGroup.Ambassador) ? Visibility.Default : Visibility.Invisible)"
|
||||||
>Hinzufügen
|
><i class="fa-solid fa-plus"></i>
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
|
<ProspectSortControl @bind-CurrentSort="CurrentSort" StorageKey="@StorageKeys.SortProspects" OnSortChanged="StateHasChanged" />
|
||||||
|
|
||||||
@{
|
@{
|
||||||
var filterList = ProspectList.ApplyFilter(Filter);
|
var filterList = ProspectList.ApplyFilter(Filter);
|
||||||
|
var sortList = filterList.ApplySort(CurrentSort);
|
||||||
}
|
}
|
||||||
|
|
||||||
<hr/>
|
<hr/>
|
||||||
<ProspectFilterControl Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.OnBoarding"></ProspectFilterControl>
|
<ProspectFilterControl Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.OnBoarding"></ProspectFilterControl>
|
||||||
<hr />
|
<hr />
|
||||||
<ProspectGrid
|
<ProspectGrid
|
||||||
Prospects="filterList"
|
Prospects="sortList"
|
||||||
OnDataChanged="@LoadProspects"
|
OnDataChanged="@LoadProspects"
|
||||||
StateFilter="ProspectStateFilter.OnBoarding">
|
StateFilter="ProspectStateFilter.OnBoarding">
|
||||||
</ProspectGrid>
|
</ProspectGrid>
|
||||||
@@ -36,6 +36,8 @@ namespace FoodsharingSiegen.Server.Pages
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private List<Prospect>? ProspectList { get; set; }
|
private List<Prospect>? ProspectList { get; set; }
|
||||||
|
|
||||||
|
private ProspectSortOption CurrentSort { get; set; } = ProspectSortOption.NameAscending;
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Override InitializeDataAsync
|
#region Override InitializeDataAsync
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
@page "/all"
|
@page "/all"
|
||||||
@page "/archive"
|
@page "/archive"
|
||||||
|
|
||||||
|
@using FoodsharingSiegen.Contracts
|
||||||
@using FoodsharingSiegen.Contracts.Enums
|
@using FoodsharingSiegen.Contracts.Enums
|
||||||
@using FoodsharingSiegen.Shared.Helper
|
@using FoodsharingSiegen.Shared.Helper
|
||||||
@inherits FsBase
|
@inherits FsBase
|
||||||
@@ -13,15 +14,18 @@
|
|||||||
<div class="alert alert-danger"><strong>TESTMODUS!</strong> Änderungen werden wieder gelöscht.</div>
|
<div class="alert alert-danger"><strong>TESTMODUS!</strong> Änderungen werden wieder gelöscht.</div>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
<ProspectSortControl @bind-CurrentSort="CurrentSort" StorageKey="@StorageKeys.SortProspectsAll" OnSortChanged="StateHasChanged" />
|
||||||
|
|
||||||
@{
|
@{
|
||||||
var filterList = ProspectList.ApplyFilter(Filter);
|
var filterList = ProspectList.ApplyFilter(Filter);
|
||||||
|
var sortList = filterList.ApplySort(CurrentSort);
|
||||||
}
|
}
|
||||||
|
|
||||||
<hr/>
|
<hr/>
|
||||||
<ProspectFilterControl Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.All"></ProspectFilterControl>
|
<ProspectFilterControl Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.All"></ProspectFilterControl>
|
||||||
<hr />
|
<hr />
|
||||||
<ProspectGrid
|
<ProspectGrid
|
||||||
Prospects="filterList"
|
Prospects="sortList"
|
||||||
OnDataChanged="@LoadProspects"
|
OnDataChanged="@LoadProspects"
|
||||||
StateFilter="ProspectStateFilter.All">
|
StateFilter="ProspectStateFilter.All">
|
||||||
</ProspectGrid>
|
</ProspectGrid>
|
||||||
@@ -39,6 +39,8 @@ namespace FoodsharingSiegen.Server.Pages
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private List<Prospect>? ProspectList { get; set; }
|
private List<Prospect>? ProspectList { get; set; }
|
||||||
|
|
||||||
|
private ProspectSortOption CurrentSort { get; set; } = ProspectSortOption.NameAscending;
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Override InitializeDataAsync
|
#region Override InitializeDataAsync
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
@page "/done"
|
@page "/done"
|
||||||
|
|
||||||
|
@using FoodsharingSiegen.Contracts
|
||||||
@using FoodsharingSiegen.Contracts.Enums
|
@using FoodsharingSiegen.Contracts.Enums
|
||||||
@using FoodsharingSiegen.Shared.Helper
|
@using FoodsharingSiegen.Shared.Helper
|
||||||
@inherits FsBase
|
@inherits FsBase
|
||||||
@@ -12,15 +13,18 @@
|
|||||||
<div class="alert alert-danger"><strong>TESTMODUS!</strong> Änderungen werden wieder gelöscht.</div>
|
<div class="alert alert-danger"><strong>TESTMODUS!</strong> Änderungen werden wieder gelöscht.</div>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
<ProspectSortControl @bind-CurrentSort="CurrentSort" StorageKey="@StorageKeys.SortProspectsDone" OnSortChanged="StateHasChanged" />
|
||||||
|
|
||||||
@{
|
@{
|
||||||
var filterList = ProspectList.ApplyFilter(Filter);
|
var filterList = ProspectList.ApplyFilter(Filter);
|
||||||
|
var sortList = filterList.ApplySort(CurrentSort);
|
||||||
}
|
}
|
||||||
|
|
||||||
<hr />
|
<hr />
|
||||||
<ProspectFilterControl Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.Completed"></ProspectFilterControl>
|
<ProspectFilterControl Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.Completed"></ProspectFilterControl>
|
||||||
<hr />
|
<hr />
|
||||||
<ProspectGrid
|
<ProspectGrid
|
||||||
Prospects="filterList"
|
Prospects="sortList"
|
||||||
OnDataChanged="@LoadProspects"
|
OnDataChanged="@LoadProspects"
|
||||||
StateFilter="ProspectStateFilter.Completed">
|
StateFilter="ProspectStateFilter.Completed">
|
||||||
</ProspectGrid>
|
</ProspectGrid>
|
||||||
@@ -31,6 +31,8 @@ namespace FoodsharingSiegen.Server.Pages
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private List<Prospect>? ProspectList { get; set; }
|
private List<Prospect>? ProspectList { get; set; }
|
||||||
|
|
||||||
|
private ProspectSortOption CurrentSort { get; set; } = ProspectSortOption.NameAscending;
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Override InitializeDataAsync
|
#region Override InitializeDataAsync
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
@page "/verify"
|
@page "/verify"
|
||||||
|
|
||||||
|
@using FoodsharingSiegen.Contracts
|
||||||
@using FoodsharingSiegen.Contracts.Enums
|
@using FoodsharingSiegen.Contracts.Enums
|
||||||
@using FoodsharingSiegen.Shared.Helper
|
@using FoodsharingSiegen.Shared.Helper
|
||||||
@inherits FsBase
|
@inherits FsBase
|
||||||
@@ -12,15 +13,18 @@
|
|||||||
<div class="alert alert-danger"><strong>TESTMODUS!</strong> Änderungen werden wieder gelöscht.</div>
|
<div class="alert alert-danger"><strong>TESTMODUS!</strong> Änderungen werden wieder gelöscht.</div>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
<ProspectSortControl @bind-CurrentSort="CurrentSort" StorageKey="@StorageKeys.SortProspectsVerify" OnSortChanged="StateHasChanged" />
|
||||||
|
|
||||||
@{
|
@{
|
||||||
var filterList = ProspectList.ApplyFilter(Filter);
|
var filterList = ProspectList.ApplyFilter(Filter);
|
||||||
|
var sortList = filterList.ApplySort(CurrentSort);
|
||||||
}
|
}
|
||||||
|
|
||||||
<hr/>
|
<hr/>
|
||||||
<ProspectFilterControl Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.Verification"></ProspectFilterControl>
|
<ProspectFilterControl Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.Verification"></ProspectFilterControl>
|
||||||
<hr />
|
<hr />
|
||||||
<ProspectGrid
|
<ProspectGrid
|
||||||
Prospects="filterList"
|
Prospects="sortList"
|
||||||
OnDataChanged="@LoadProspects"
|
OnDataChanged="@LoadProspects"
|
||||||
StateFilter="ProspectStateFilter.Verification">
|
StateFilter="ProspectStateFilter.Verification">
|
||||||
</ProspectGrid>
|
</ProspectGrid>
|
||||||
@@ -37,6 +37,8 @@ namespace FoodsharingSiegen.Server.Pages
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private List<Prospect>? ProspectList { get; set; }
|
private List<Prospect>? ProspectList { get; set; }
|
||||||
|
|
||||||
|
private ProspectSortOption CurrentSort { get; set; } = ProspectSortOption.NameAscending;
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Override InitializeDataAsync
|
#region Override InitializeDataAsync
|
||||||
|
|||||||
@@ -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>
|
||||||
@@ -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"
|
||||||
|
|||||||
@@ -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()
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
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