From 53e5a0ac25b79bacba0f5437b5fd4203c1654563 Mon Sep 17 00:00:00 2001 From: Tea Date: Tue, 16 Apr 2024 18:51:22 +0200 Subject: [PATCH 1/5] closes #7 Global message supports markdown using commonmark notation global message is now input using a TextArea so multiple lines can be used --- PizzaBot/Components/GlobalMessages.razor | 13 +++++++++++-- PizzaBot/Components/Pages/Admin.razor | 2 +- PizzaBot/PizzaBot.csproj | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/PizzaBot/Components/GlobalMessages.razor b/PizzaBot/Components/GlobalMessages.razor index eea9d0c..0e79a2e 100644 --- a/PizzaBot/Components/GlobalMessages.razor +++ b/PizzaBot/Components/GlobalMessages.razor @@ -7,10 +7,19 @@ } @if (GlobalStuffService.Message.Length >= 2) { -

@GlobalStuffService.Message

- +
@((MarkupString)Markdig.Markdown.ToHtml(GlobalStuffService.Message))
} + + @code{ protected override void OnInitialized() { diff --git a/PizzaBot/Components/Pages/Admin.razor b/PizzaBot/Components/Pages/Admin.razor index 88368f3..85498d0 100644 --- a/PizzaBot/Components/Pages/Admin.razor +++ b/PizzaBot/Components/Pages/Admin.razor @@ -25,7 +25,7 @@

Global Message

- + diff --git a/PizzaBot/PizzaBot.csproj b/PizzaBot/PizzaBot.csproj index 56f8723..9e7bfbe 100644 --- a/PizzaBot/PizzaBot.csproj +++ b/PizzaBot/PizzaBot.csproj @@ -15,6 +15,7 @@ + From 4305800e09455d249379cf8a15176da3585ce67d Mon Sep 17 00:00:00 2001 From: Tea Date: Tue, 16 Apr 2024 20:20:06 +0200 Subject: [PATCH 2/5] closes #8 : price per piece displayed on list, order and edit pages --- PizzaBot/Components/Pages/PizzaOrder.razor | 16 +++++++++------- PizzaBot/Components/Pages/PizzaOrderEdit.razor | 3 ++- PizzaBot/Components/Pages/PizzaOrderList.razor | 3 +++ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/PizzaBot/Components/Pages/PizzaOrder.razor b/PizzaBot/Components/Pages/PizzaOrder.razor index 60692af..7f1c5cd 100644 --- a/PizzaBot/Components/Pages/PizzaOrder.razor +++ b/PizzaBot/Components/Pages/PizzaOrder.razor @@ -27,7 +27,8 @@ - One slice = ca. @GlobalStuffService.GetSizeOfSliceInCM2().ToString("F0") cm2 + One slice = ca. @GlobalStuffService.GetSizeOfSliceInCM2().ToString("F0") cm2 +
@@ -49,15 +50,16 @@

The balancing algorithm tries to avoid changes of the corresponding Variable
- E.g. If you want to only get pieces from your chosen category put the slider all the way to the left

- + E.g. If you want to only get pieces from your chosen category put the slider all the way to the left +

+
Category
Total Count
- + From 810a35e646c1e0e7f306d2f73997e895c0e9569a Mon Sep 17 00:00:00 2001 From: Tea Date: Wed, 17 Apr 2024 15:13:55 +0200 Subject: [PATCH 4/5] missed some changes on last commit --- PizzaBot/Components/Pages/Admin.razor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PizzaBot/Components/Pages/Admin.razor b/PizzaBot/Components/Pages/Admin.razor index 737dba3..702e1ac 100644 --- a/PizzaBot/Components/Pages/Admin.razor +++ b/PizzaBot/Components/Pages/Admin.razor @@ -27,8 +27,8 @@ else @if (ShowUnlockConfirmation) { -

Order(s) have already been marked as payed. If you unlock payment information WILL be lost!

- +

Order(s) have already been marked as payed. If you unlock payment information WILL be lost!

+ } From a815a614608599976674a8872b6c7f779c6885af Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 17 May 2024 03:35:54 +0200 Subject: [PATCH 5/5] changed date display in archive to dmy --- PizzaBot/Components/ArchiveListComponent.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PizzaBot/Components/ArchiveListComponent.razor b/PizzaBot/Components/ArchiveListComponent.razor index bf61b5b..579a8b4 100644 --- a/PizzaBot/Components/ArchiveListComponent.razor +++ b/PizzaBot/Components/ArchiveListComponent.razor @@ -18,7 +18,7 @@ @if (ShowDate) { - + } @if (ShowPizzaTotal) {