merge

FruitBank.Common/FruitBankConstClient.cs

@@ -7,17 +7,15 @@ 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
-#if RELEASE
+        //public static string BaseUrl = "https://shop.fruitbank.hu"; //FrutiBank nop
-    public static string BaseUrl = "https://shop.fruitbank.hu"; //FrutiBank nop
+    #endif
-#endif
 
     //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";

FruitBank.Common/Interfaces/ICustomOrderSignalREndpointCommon.cs

@@ -8,6 +8,7 @@ public interface ICustomOrderSignalREndpointCommon
 {
     Task<List<OrderDto>?> GetAllOrderDtos();
     Task<List<OrderDto>?> GetPendingOrderDtos();
+    Task<List<OrderDto>?> GetPendingOrderDtosForMeasuring();
     Task<List<OrderDto>?> GetAllOrderDtoByIds(int[] orderIds);
     Task<OrderDto?> GetOrderDtoById(int orderId);
     Task<OrderItemPallet?> AddOrUpdateMeasuredOrderItemPallet(OrderItemPallet orderItemPallet);

FruitBank.Common/SignalRs/SignalRTags.cs

@@ -49,8 +49,9 @@ public class SignalRTags : AcSignalRTags
     public const int GetOrderDtoById = 112;
     public const int GetAllOrderDtoByIds = 114;
     public const int GetPendingOrderDtos = 115;
-    public const int StartMeasuring = 116;
+    public const int GetPendingOrderDtosForMeasuring = 116;
-    public const int SetOrderStatusToComplete = 117;
+    public const int StartMeasuring = 117;
+    public const int SetOrderStatusToComplete = 118;
     
     public const int AddOrderItemPallet = 131;
     public const int UpdateOrderItemPallet = 132;

FruitBankHybrid.Shared.Tests/OrderClientTests.cs

@@ -55,7 +55,7 @@ public sealed class OrderClientTests
     [TestMethod]
     public async Task GetPendingOrderDtos()
     {
-        var pendingOrderDtos = await _signalRClient.GetPendingOrderDtos();
+        var pendingOrderDtos = await _signalRClient.GetPendingOrderDtosForMeasuring();
 
         Assert.IsNotNull(pendingOrderDtos);
 

FruitBankHybrid.Shared/Layout/MainLayout.razor

@@ -3,7 +3,7 @@
 
 <div class="page">
 	<div class="sidebar">
-		<NavMenu @ref="_navMenu" />
+		<NavMenu @ref="_navMenu"/>
 	</div>
 
 	<main>

FruitBankHybrid.Shared/Layout/MainLayout.razor.cs

@@ -14,6 +14,7 @@ public partial class MainLayout : LayoutComponentBase
     protected override void OnInitialized()
     {
         var loginUri = NavManager.ToAbsoluteUri("/Login").ToString();
+
         if (!LoggedInModel.IsLoggedIn && NavManager.Uri != loginUri)
         {
             NavManager.NavigateTo("/Login");

FruitBankHybrid.Shared/Layout/NavMenu.razor

@@ -4,7 +4,14 @@
 
 <div class="top-row ps-3 navbar navbar-dark">
 	<div class="container-fluid">
+	@if (LoggedInModel.IsLoggedIn)
+	{
 		<a class="navbar-brand" href="">FruitBank</a>
+	}
+	else
+	{
+		<span class="navbar-brand">FruitBank</span>
+	}
 	</div>
 </div>
 

FruitBankHybrid.Shared/Pages/Home.razor.cs

@@ -13,6 +13,6 @@ public partial class Home : ComponentBase
 
     protected override void OnInitialized()
     {
-        //if (!LoggedInModel.IsLoggedIn) NavManager.NavigateTo("/Login");
+        if (!LoggedInModel.IsLoggedIn) NavManager.NavigateTo("/Login");
     }
 }

FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs

@@ -19,6 +19,7 @@ namespace FruitBankHybrid.Shared.Pages
     {
         [Inject] public required IEnumerable<IAcLogWriterClientBase> LogWriters { get; set; }
         [Inject] public required FruitBankSignalRClient FruitBankSignalRClient { get; set; }
+        [Inject] public required NavigationManager NavManager{ get; set; }
         [Inject] public required LoggedInModel LoggedInModel { get; set; }
 
         private ILogger _logger = null!;
@@ -37,6 +38,8 @@ namespace FruitBankHybrid.Shared.Pages
 
         protected override async Task OnInitializedAsync()
         {
+            if (!LoggedInModel.IsLoggedIn) NavManager.NavigateTo("/Login");
+
             LoadingPanelVisible = true;
 
             _logger = new LoggerClient<MeasuringIn>(LogWriters.ToArray());

FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs

@@ -27,6 +27,7 @@ namespace FruitBankHybrid.Shared.Pages
     {
         [Inject] public required IEnumerable<IAcLogWriterClientBase> LogWriters { get; set; }
         [Inject] public required FruitBankSignalRClient FruitBankSignalRClient { get; set; }
+        [Inject] public required NavigationManager NavManager{ get; set; }
         [Inject] private IDialogService DialogService { get; set; } = null!;
         [Inject] public required LoggedInModel LoggedInModel { get; set; }
 
@@ -45,6 +46,8 @@ namespace FruitBankHybrid.Shared.Pages
 
         protected override async Task OnInitializedAsync()
         {
+            if (!LoggedInModel.IsLoggedIn) NavManager.NavigateTo("/Login");
+
             LoadingPanelVisible = true;
             _logger = new LoggerClient<MeasuringOut>(LogWriters.ToArray());
             _logger.Info("OnInitializedAsync");
@@ -56,7 +59,7 @@ namespace FruitBankHybrid.Shared.Pages
         private async Task RefreshOrdersFromDb(DateTime dateTime)
         {
             LoadingPanelVisible = true;
-            var orders = (await FruitBankSignalRClient.GetPendingOrderDtos() ?? []).Where(o => o.HasMeasuringAccess(LoggedInModel.CustomerDto?.Id, LoggedInModel.IsRevisor)).ToList();
+            var orders = (await FruitBankSignalRClient.GetPendingOrderDtosForMeasuring() ?? []).Where(o => o.HasMeasuringAccess(LoggedInModel.CustomerDto?.Id, LoggedInModel.IsRevisor)).ToList();
 
             _measuringDates = orders.Select(order => new MeasuringDateSelectorModel(order.Id, order.DateOfReceiptOrCreated, order.IsMeasured)).ToList();
 

FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs

@@ -137,6 +137,9 @@ namespace FruitBankHybrid.Shared.Services.SignalRs
         public Task<List<OrderDto>?> GetPendingOrderDtos()
             => GetAllAsync<List<OrderDto>>(SignalRTags.GetPendingOrderDtos);
 
+        public Task<List<OrderDto>?> GetPendingOrderDtosForMeasuring()
+            => GetAllAsync<List<OrderDto>>(SignalRTags.GetPendingOrderDtosForMeasuring);
+
         public Task<List<OrderDto>?> GetAllOrderDtoByIds(int[] orderIds)
             => GetAllAsync<List<OrderDto>>(SignalRTags.GetAllOrderDtoByIds, [orderIds]);