Adam
/
FruitBankHybridApp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Login hack fix; improvements

This commit is contained in:
Loretta 2025-10-24 08:11:50 +02:00
parent 2018056921
commit 81edcfff07
11 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FruitBank.Common/FruitBankConstClient.cs
View File

@ -10,7 +10,7 @@ public static class FruitBankConstClient
public static string BaseUrl = "https://localhost:59579"; //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://10.0.2.2:59579"; //FrutiBank (android) nop

1
FruitBank.Common/Interfaces/ICustomOrderSignalREndpointCommon.cs
View File

@ -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);

5
FruitBank.Common/SignalRs/SignalRTags.cs
View File

@ -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 SetOrderStatusToComplete = 117;
public const int GetPendingOrderDtosForMeasuring = 116;
public const int StartMeasuring = 117;
public const int SetOrderStatusToComplete = 118;
public const int AddOrderItemPallet = 131;
public const int UpdateOrderItemPallet = 132;

2
FruitBankHybrid.Shared.Tests/OrderClientTests.cs
View File

@ -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);

2
FruitBankHybrid.Shared/Layout/MainLayout.razor
View File

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

1
FruitBankHybrid.Shared/Layout/MainLayout.razor.cs
View File

@ -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");

7
FruitBankHybrid.Shared/Layout/NavMenu.razor
View File

@ -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>

2
FruitBankHybrid.Shared/Pages/Home.razor.cs
View File

@ -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");
}
}

3
FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs
View File

@ -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());

5
FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs
View File

@ -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();

3
FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs
View File

@ -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]);