From cd338d39781ecbd34e1c15ed8e8864d8e341cfc1 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 26 Nov 2025 10:59:04 +0100 Subject: [PATCH 1/2] removed stateful --- FruitBank.Common/FruitBankConstClient.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/FruitBank.Common/FruitBankConstClient.cs b/FruitBank.Common/FruitBankConstClient.cs index 47c30ad..ac5971b 100644 --- a/FruitBank.Common/FruitBankConstClient.cs +++ b/FruitBank.Common/FruitBankConstClient.cs @@ -7,16 +7,17 @@ public static class FruitBankConstClient { public static string DefaultLocale = "en-US"; - public static string BaseUrl = "https://localhost:59579"; //FrutiBank nop + //public static string BaseUrl = "https://localhost:59579"; //FrutiBank nop + public static string BaseUrl = "https://shop.fruitbank.hu"; //FrutiBank nop - #if RELEASE - // public static string BaseUrl = "https://shop.fruitbank.hu"; //FrutiBank nop - #endif +#if RELEASE + //public static string BaseUrl = "https://shop.fruitbank.hu"; //FrutiBank nop +#endif //public static string BaseUrl = "http://localhost:5000"; //FrutiBank nop //public static string BaseUrl = "http://10.0.2.2:59579"; //FrutiBank (android) nop //public static string BaseUrl = "https://localhost:7144"; //HybridApp - + public static string DefaultHubName = "fbHub"; public static string LoggerHubName = "loggerHub"; From 01ffd22fcabe598f2a36bde5bc8d16688e483b84 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 11 Dec 2025 18:32:29 +0100 Subject: [PATCH 2/2] Allowed Martin to access edit --- FruitBank.Common/FruitBankConstClient.cs | 3 ++- FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor | 2 +- .../Components/GridDetailOrderItemDto.razor | 2 +- .../Components/GridProductDtoTemplate.razor | 6 +++--- .../Components/Grids/FruitBankGridBase.cs | 2 +- FruitBankHybrid.Shared/Components/MgGridBase.cs | 2 +- .../Components/Toolbars/FruitBankToolbarTemplate.razor | 6 +++--- FruitBankHybrid.Shared/Layout/NavMenu.razor | 2 +- FruitBankHybrid.Shared/Pages/OrdersAdmin.razor | 2 +- FruitBankHybrid.Shared/Pages/ShippingsAdmin.razor | 2 +- 10 files changed, 15 insertions(+), 14 deletions(-) diff --git a/FruitBank.Common/FruitBankConstClient.cs b/FruitBank.Common/FruitBankConstClient.cs index 0f5d7fd..58f73e4 100644 --- a/FruitBank.Common/FruitBankConstClient.cs +++ b/FruitBank.Common/FruitBankConstClient.cs @@ -8,9 +8,10 @@ public static class FruitBankConstClient public static string DefaultLocale = "en-US"; public static string BaseUrl = "https://localhost:59579"; //FrutiBank nop + //public static string BaseUrl = "https://localhost:44372"; //FrutiBank nop //public static string BaseUrl = "https://shop.fruitbank.hu"; //FrutiBank nop #if RELEASE - // public static string BaseUrl = "https://shop.fruitbank.hu"; //FrutiBank nop + // public static string BaseUrl = "https://shop.fruitbank.hu"; //FrutiBank nop #endif //public static string BaseUrl = "http://localhost:5000"; //FrutiBank nop diff --git a/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor b/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor index 804dda9..d476d27 100644 --- a/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor +++ b/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor @@ -36,7 +36,7 @@ - @if (IsMasterGrid && LoggedInModel.IsDeveloper) + @if (IsMasterGrid && LoggedInModel.IsAdministrator) { var orderDto = ((OrderDto)context.DataItem); diff --git a/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor b/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor index 7fbcc63..18d004b 100644 --- a/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor +++ b/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor @@ -53,7 +53,7 @@ - @if (IsMasterGrid && LoggedInModel.IsDeveloper) + @if (IsMasterGrid && LoggedInModel.IsAdministrator) { var orderItemDto = ((OrderItemDto)context.DataItem); diff --git a/FruitBankHybrid.Shared/Components/GridProductDtoTemplate.razor b/FruitBankHybrid.Shared/Components/GridProductDtoTemplate.razor index 6d30316..b28d544 100644 --- a/FruitBankHybrid.Shared/Components/GridProductDtoTemplate.razor +++ b/FruitBankHybrid.Shared/Components/GridProductDtoTemplate.razor @@ -37,14 +37,14 @@ - + @{ //GetOrderDtosFromDbAsync(productId).Forget(); //var orderDtos = _orderDtos?.Where(o => o.OrderItemDtos.Any(oi => oi.ProductId == productId)).ToList() ?? []; } - + @{ //GetOrderItemDtosFromDbAsync(productId).Forget(); //var orderItemDtos = _orderItemDtos?.Where(oi => oi.ProductId == productId).ToList() ?? []; @@ -166,7 +166,7 @@ protected async Task OnFocusedRowChanged(GridFocusedRowChangedEventArgs e) { - if (!LoggedInModel.IsDeveloper) return; + if (!LoggedInModel.IsAdministrator) return; var productDto = (ProductDto)e.DataItem; diff --git a/FruitBankHybrid.Shared/Components/Grids/FruitBankGridBase.cs b/FruitBankHybrid.Shared/Components/Grids/FruitBankGridBase.cs index 6cc8554..8edae39 100644 --- a/FruitBankHybrid.Shared/Components/Grids/FruitBankGridBase.cs +++ b/FruitBankHybrid.Shared/Components/Grids/FruitBankGridBase.cs @@ -40,7 +40,7 @@ public class FruitBankGridBase : MgGridBase - - + + - + diff --git a/FruitBankHybrid.Shared/Layout/NavMenu.razor b/FruitBankHybrid.Shared/Layout/NavMenu.razor index 613268f..f0eaa30 100644 --- a/FruitBankHybrid.Shared/Layout/NavMenu.razor +++ b/FruitBankHybrid.Shared/Layout/NavMenu.razor @@ -45,7 +45,7 @@ } - @if (LoggedInModel.IsDeveloper) + @if (LoggedInModel.IsAdministrator) {