From 9d22aa974caab25ba591daafdd4f537c84de67db Mon Sep 17 00:00:00 2001 From: BeatriceAl Date: Mon, 11 May 2026 22:41:55 +0200 Subject: [PATCH] Fixed most buttons @onclick -> form --- Guestlist/Components/Pages/Admin.razor | 37 +-- Guestlist/Components/Pages/Admin.razor.cs | 17 ++ Guestlist/Components/Pages/Guests.razor | 46 ++-- Guestlist/Components/Pages/Guests.razor.cs | 20 ++ Guestlist/Components/Pages/Setup.razor | 10 +- Guestlist/Components/Pages/Setup.razor.cs | 13 + Guestlist/Program.cs | 273 ++++++++++++++++++++- 7 files changed, 379 insertions(+), 37 deletions(-) diff --git a/Guestlist/Components/Pages/Admin.razor b/Guestlist/Components/Pages/Admin.razor index 5b6a992..a991763 100644 --- a/Guestlist/Components/Pages/Admin.razor +++ b/Guestlist/Components/Pages/Admin.razor @@ -14,10 +14,10 @@

Guest access

Change the code guests use to view the list.

-
+
- +
+ + + +
} @@ -102,9 +105,11 @@

Setup recovery

Use this after a partial setup if admin access exists but setup is incomplete.

- +
+ +
@if (!string.IsNullOrWhiteSpace(RecoveryMessage)) { @@ -118,9 +123,11 @@

Reset setup

Move existing users to backup and mark setup as incomplete.

- +
+ +
@if (!string.IsNullOrWhiteSpace(Message)) { diff --git a/Guestlist/Components/Pages/Admin.razor.cs b/Guestlist/Components/Pages/Admin.razor.cs index 93f39d0..e1a4bb7 100644 --- a/Guestlist/Components/Pages/Admin.razor.cs +++ b/Guestlist/Components/Pages/Admin.razor.cs @@ -25,8 +25,25 @@ public partial class Admin protected string MaintainerMessage { get; set; } = ""; protected List? Maintainers { get; set; } + [SupplyParameterFromQuery(Name = "message")] + public string? IncomingMessage { get; set; } + + [SupplyParameterFromQuery(Name = "accessCodeMessage")] + public string? IncomingAccessCodeMessage { get; set; } + + [SupplyParameterFromQuery(Name = "maintainerMessage")] + public string? IncomingMaintainerMessage { get; set; } + + [SupplyParameterFromQuery(Name = "recoveryMessage")] + public string? IncomingRecoveryMessage { get; set; } + protected override async Task OnInitializedAsync() { + Message = IncomingMessage ?? ""; + AccessCodeMessage = IncomingAccessCodeMessage ?? ""; + MaintainerMessage = IncomingMaintainerMessage ?? ""; + RecoveryMessage = IncomingRecoveryMessage ?? ""; + try { Maintainers = await UserService.GetMaintainersAsync(); diff --git a/Guestlist/Components/Pages/Guests.razor b/Guestlist/Components/Pages/Guests.razor index b9aeae9..308482e 100644 --- a/Guestlist/Components/Pages/Guests.razor +++ b/Guestlist/Components/Pages/Guests.razor @@ -9,10 +9,19 @@

Add, edit, delete and filter guest entries.

-
+
- -
+
+ + + @if (!string.IsNullOrWhiteSpace(SearchTerm)) + { + Clear + } +
+ @if (!string.IsNullOrWhiteSpace(ErrorMessage)) @@ -24,15 +33,15 @@

Add guest

-
+
- +
- +
- +
} @@ -117,13 +128,16 @@

- + - +
+ + +
} diff --git a/Guestlist/Components/Pages/Guests.razor.cs b/Guestlist/Components/Pages/Guests.razor.cs index d48541e..4ff1a08 100644 --- a/Guestlist/Components/Pages/Guests.razor.cs +++ b/Guestlist/Components/Pages/Guests.razor.cs @@ -23,6 +23,15 @@ public partial class Guests : ComponentBase protected List? GuestEntries { get; set; } + [SupplyParameterFromQuery(Name = "error")] + public string? IncomingError { get; set; } + + [SupplyParameterFromQuery(Name = "search")] + public string? IncomingSearchTerm { get; set; } + + [SupplyParameterFromQuery(Name = "edit")] + public string? IncomingEditingGuestId { get; set; } + protected IEnumerable FilteredGuestEntries { get @@ -48,6 +57,17 @@ public partial class Guests : ComponentBase protected override async Task OnInitializedAsync() { + SearchTerm = IncomingSearchTerm ?? ""; + EditingGuestId = IncomingEditingGuestId; + + ErrorMessage = IncomingError switch + { + "duplicate" => "A guest with this name and note already exists. Use a distinct note if this is a different person.", + "add-failed" => "Guest could not be added.", + null or "" => "", + _ => IncomingError + }; + try { GuestEntries = await GuestEntryService.GetAllAsync(); diff --git a/Guestlist/Components/Pages/Setup.razor b/Guestlist/Components/Pages/Setup.razor index 20bb546..7f330f7 100644 --- a/Guestlist/Components/Pages/Setup.razor +++ b/Guestlist/Components/Pages/Setup.razor @@ -40,24 +40,24 @@ else if (HasAnyUsers == true) } else { -
+

First admin

- +
- +
- +
@@ -69,7 +69,7 @@ else
- +