diff --git a/FruitBank.Common/FruitBankConstClient.cs b/FruitBank.Common/FruitBankConstClient.cs index 74958298..983f42cc 100644 --- a/FruitBank.Common/FruitBankConstClient.cs +++ b/FruitBank.Common/FruitBankConstClient.cs @@ -7,9 +7,9 @@ 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://localhost:44372"; //FrutiBank nop - //public static string BaseUrl = "https://shop.fruitbank.hu"; //FrutiBank nop + public static string BaseUrl = "https://shop.fruitbank.hu"; //FrutiBank nop //public static string BaseUrl = "https://fruitbank.mangoweb.hu"; //FrutiBank nop test #if RELEASE //public static string BaseUrl = "https://shop.fruitbank.hu"; //FrutiBank nop diff --git a/FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs b/FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs index bf590cd1..451d3e98 100644 --- a/FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs +++ b/FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs @@ -186,8 +186,15 @@ namespace FruitBankHybrid.Shared.Services.SignalRs #region Product - public Task?> GetProductDtoTableItems() - => GetAllAsync>(SignalRTags.GetProductDtos); + public async Task?> GetProductDtoTableItems() + //=> GetAllAsync>(SignalRTags.GetProductDtos); + { + var dtos = await GetProductDtos(); + if (dtos == null) return null; + + var bytes = SignalRSerializationHelper.SerializeToBinary(dtos); + return SignalRSerializationHelper.DeserializeFromBinary>(bytes); + } public Task?> GetProductDtos() => GetAllAsync>(SignalRTags.GetProductDtos); diff --git a/FruitBankHybrid.Shared/appsettings.json b/FruitBankHybrid.Shared/appsettings.json index 82af839e..c36e1ed9 100644 --- a/FruitBankHybrid.Shared/appsettings.json +++ b/FruitBankHybrid.Shared/appsettings.json @@ -7,10 +7,12 @@ }, "AyCode": { "ProjectId": "aad53443-2ee2-4650-8a99-97e907265e4e", - "Urls": { - "BaseUrl": "https://localhost:59579", - "ApiBaseUrl": "https://localhost:59579" - }, + "Urls": { + //"BaseUrl": "https://localhost:59579", + //"ApiBaseUrl": "https://localhost:59579" + "BaseUrl": "https://shop.fruitbank.hu", + "ApiBaseUrl": "https://shop.fruitbank.hu" + }, "Logger": { "AppType": "Server", "LogLevel": "Detail", @@ -24,7 +26,7 @@ }, "AcHubConnection": { - "Url": "https://localhost:59579/fbHub", + "Url": "https://shop.fruitbank.hu/fbHub", "TransportMaxBufferSize": 30000000, "ApplicationMaxBufferSize": 30000000, "CloseTimeout": "00:00:10", diff --git a/FruitBankHybrid.Web.Client/FruitBankHybrid.Web.Client.csproj b/FruitBankHybrid.Web.Client/FruitBankHybrid.Web.Client.csproj index fc083e74..6e6e48c1 100644 --- a/FruitBankHybrid.Web.Client/FruitBankHybrid.Web.Client.csproj +++ b/FruitBankHybrid.Web.Client/FruitBankHybrid.Web.Client.csproj @@ -10,6 +10,13 @@ false true true + + false + false + + Speed + + false diff --git a/FruitBankHybrid.Web.Client/wwwroot/appsettings.json b/FruitBankHybrid.Web.Client/wwwroot/appsettings.json index 82af839e..7e8e1509 100644 --- a/FruitBankHybrid.Web.Client/wwwroot/appsettings.json +++ b/FruitBankHybrid.Web.Client/wwwroot/appsettings.json @@ -7,10 +7,12 @@ }, "AyCode": { "ProjectId": "aad53443-2ee2-4650-8a99-97e907265e4e", - "Urls": { - "BaseUrl": "https://localhost:59579", - "ApiBaseUrl": "https://localhost:59579" - }, + "Urls": { + "BaseUrl": "https://localhost:59579", + "ApiBaseUrl": "https://localhost:59579" + //"BaseUrl": "https://shop.fruitbank.hu", + //"ApiBaseUrl": "https://shop.fruitbank.hu" + }, "Logger": { "AppType": "Server", "LogLevel": "Detail", @@ -23,18 +25,19 @@ } }, - "AcHubConnection": { - "Url": "https://localhost:59579/fbHub", - "TransportMaxBufferSize": 30000000, - "ApplicationMaxBufferSize": 30000000, - "CloseTimeout": "00:00:10", - "KeepAliveInterval": "00:01:00", - "ServerTimeout": "00:03:00", - "SkipNegotiation": true, - "Transports": "WebSockets", - "UseAutomaticReconnect": true, - "UseStatefulReconnect": true - }, + "AcHubConnection": { + "Url": "https://localhost:59579/fbHub", + //"Url": "https://shop.fruitbank.hu/fbHub", + "TransportMaxBufferSize": 30000000, + "ApplicationMaxBufferSize": 30000000, + "CloseTimeout": "00:00:10", + "KeepAliveInterval": "00:01:00", + "ServerTimeout": "00:03:00", + "SkipNegotiation": true, + "Transports": "WebSockets", + "UseAutomaticReconnect": true, + "UseStatefulReconnect": true + }, "AcBinaryHubProtocol": { "ProtocolMode": "AsyncSegment", "BufferSize": 4096, diff --git a/FruitBankHybrid.Web/Components/App.razor b/FruitBankHybrid.Web/Components/App.razor index 65f5e74c..ce740e78 100644 --- a/FruitBankHybrid.Web/Components/App.razor +++ b/FruitBankHybrid.Web/Components/App.razor @@ -33,7 +33,7 @@ pdfjsLib.GlobalWorkerOptions.workerSrc = 'https://cdnjs.cloudflare.com/ajax/libs/pdf.js/3.11.174/pdf.worker.min.js'; - + diff --git a/FruitBankHybrid.Web/FruitBankHybrid.Web.csproj b/FruitBankHybrid.Web/FruitBankHybrid.Web.csproj index 081f717b..c6a7fd7e 100644 --- a/FruitBankHybrid.Web/FruitBankHybrid.Web.csproj +++ b/FruitBankHybrid.Web/FruitBankHybrid.Web.csproj @@ -6,9 +6,11 @@ enable - true + false true true + false + false diff --git a/FruitBankHybrid.Web/appsettings.json b/FruitBankHybrid.Web/appsettings.json index 82af839e..7e8e1509 100644 --- a/FruitBankHybrid.Web/appsettings.json +++ b/FruitBankHybrid.Web/appsettings.json @@ -7,10 +7,12 @@ }, "AyCode": { "ProjectId": "aad53443-2ee2-4650-8a99-97e907265e4e", - "Urls": { - "BaseUrl": "https://localhost:59579", - "ApiBaseUrl": "https://localhost:59579" - }, + "Urls": { + "BaseUrl": "https://localhost:59579", + "ApiBaseUrl": "https://localhost:59579" + //"BaseUrl": "https://shop.fruitbank.hu", + //"ApiBaseUrl": "https://shop.fruitbank.hu" + }, "Logger": { "AppType": "Server", "LogLevel": "Detail", @@ -23,18 +25,19 @@ } }, - "AcHubConnection": { - "Url": "https://localhost:59579/fbHub", - "TransportMaxBufferSize": 30000000, - "ApplicationMaxBufferSize": 30000000, - "CloseTimeout": "00:00:10", - "KeepAliveInterval": "00:01:00", - "ServerTimeout": "00:03:00", - "SkipNegotiation": true, - "Transports": "WebSockets", - "UseAutomaticReconnect": true, - "UseStatefulReconnect": true - }, + "AcHubConnection": { + "Url": "https://localhost:59579/fbHub", + //"Url": "https://shop.fruitbank.hu/fbHub", + "TransportMaxBufferSize": 30000000, + "ApplicationMaxBufferSize": 30000000, + "CloseTimeout": "00:00:10", + "KeepAliveInterval": "00:01:00", + "ServerTimeout": "00:03:00", + "SkipNegotiation": true, + "Transports": "WebSockets", + "UseAutomaticReconnect": true, + "UseStatefulReconnect": true + }, "AcBinaryHubProtocol": { "ProtocolMode": "AsyncSegment", "BufferSize": 4096, diff --git a/FruitBankHybrid/FruitBankHybrid.csproj b/FruitBankHybrid/FruitBankHybrid.csproj index a5bcd727..f56695ec 100644 --- a/FruitBankHybrid/FruitBankHybrid.csproj +++ b/FruitBankHybrid/FruitBankHybrid.csproj @@ -76,7 +76,12 @@ True apk True - True + True + true + fruitbank.keystore + fruitbank + Asdasd123456 + Asdasd123456