diff --git a/FruitBank.Common/FruitBankConstClient.cs b/FruitBank.Common/FruitBankConstClient.cs index 8b7528b..eddf615 100644 --- a/FruitBank.Common/FruitBankConstClient.cs +++ b/FruitBank.Common/FruitBankConstClient.cs @@ -7,8 +7,8 @@ public static class FruitBankConstClient { public static string DefaultLocale = "en-US"; - public static string BaseUrl = "https://localhost:59579"; //FrutiBank nop - //public static string BaseUrl = "https://shop.fruitbank.hu"; //FrutiBank nop + //public static string BaseUrl = "https://localhost:59579"; //FrutiBank nop + public static string BaseUrl = "https://shop.fruitbank.hu"; //FrutiBank nop //public static string BaseUrl = "http://10.0.2.2:59579"; //FrutiBank (android) nop //public static string BaseUrl = "https://localhost:7144"; //HybridApp diff --git a/FruitBankHybrid.Shared/Layout/MainLayout.razor.css b/FruitBankHybrid.Shared/Layout/MainLayout.razor.css index ed63914..4dda54e 100644 --- a/FruitBankHybrid.Shared/Layout/MainLayout.razor.css +++ b/FruitBankHybrid.Shared/Layout/MainLayout.razor.css @@ -46,7 +46,7 @@ main { } } -@media (min-width: 641px) { +@media (min-width: 2641px) { .page { flex-direction: row; } diff --git a/FruitBankHybrid.Shared/Layout/NavMenu.razor.css b/FruitBankHybrid.Shared/Layout/NavMenu.razor.css index 6b5e9f2..939f06d 100644 --- a/FruitBankHybrid.Shared/Layout/NavMenu.razor.css +++ b/FruitBankHybrid.Shared/Layout/NavMenu.razor.css @@ -85,7 +85,7 @@ display: block; } -@media (min-width: 641px) { +@media (min-width: 2641px) { .navbar-toggler { display: none; } diff --git a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor index 79e8e03..b2ba1fb 100644 --- a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor +++ b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor @@ -28,7 +28,8 @@ Date="@(SelectedShipping?.ShippingDate.Date ?? DateTime.Now.Date)" CustomDisabledDate="@OnCustomDisabledMeasuringDate" DateChanged="@((DateTime newValue) => OnMeasuringDateChanged(newValue))" - InputId="deDisabledDates"> + InputId="deDisabledDates" + PickerDisplayMode="DatePickerDisplayMode.Calendar"> @{ var cssClass = GetMeasuringDateCssClassNames(ctxShippingDate); diff --git a/FruitBankHybrid.Shared/Pages/MeasuringOut.razor b/FruitBankHybrid.Shared/Pages/MeasuringOut.razor index ed7ae38..7ae0157 100644 --- a/FruitBankHybrid.Shared/Pages/MeasuringOut.razor +++ b/FruitBankHybrid.Shared/Pages/MeasuringOut.razor @@ -31,7 +31,8 @@ Date="@(SelectedOrder?.DateOfReceiptOrCreated.Date ?? DateTime.Now.Date)" CustomDisabledDate="@OnCustomDisabledMeasuringDate" DateChanged="@((DateTime newValue) => OnMeasuringDateChanged(newValue))" - InputId="deDisabledDates"> + InputId="deDisabledDates" + PickerDisplayMode="DatePickerDisplayMode.Calendar"> @{ var cssClass = GetMeasuringDateCssClassNames(ctxOrderDate); @@ -73,11 +74,11 @@ @switch (SelectedOrder) { case null: - + break; case { MeasurementOwnerId: 0, IsComplete: false } when HasMeasuringAccess: - + @@ -85,7 +86,7 @@ break; default: - + break; @@ -96,7 +97,7 @@ { var isCompleteOrder = SelectedOrder.IsComplete; - + @@ -180,7 +181,7 @@ - + diff --git a/FruitBankHybrid.Web/Program.cs b/FruitBankHybrid.Web/Program.cs index 85791d4..21db277 100644 --- a/FruitBankHybrid.Web/Program.cs +++ b/FruitBankHybrid.Web/Program.cs @@ -4,13 +4,14 @@ using FruitBank.Common.Models; using FruitBank.Common.Server.Services.Loggers; using FruitBank.Common.Server.Services.SignalRs; using FruitBankHybrid.Shared.Services; +using FruitBankHybrid.Shared.Services.SignalRs; using FruitBankHybrid.Web.Components; using FruitBankHybrid.Web.Services; var builder = WebApplication.CreateBuilder(args); builder.Services.AddRazorComponents().AddInteractiveServerComponents().AddInteractiveWebAssemblyComponents(); -builder.Services.AddDevExpressBlazor(configure => configure.SizeMode = DevExpress.Blazor.SizeMode.Large); +builder.Services.AddDevExpressBlazor(configure => configure.SizeMode = DevExpress.Blazor.SizeMode.Medium); builder.Services.AddMvc(); builder.Services.AddSingleton(); @@ -22,6 +23,7 @@ builder.Services.AddScoped(); //builder.Services.AddScoped(); builder.Services.AddSignalR(options => options.MaximumReceiveMessageSize = 256 * 1024); +builder.Services.AddScoped(); var app = builder.Build(); // Configure the HTTP request pipeline.