diff --git a/BTCPayApp.Desktop/StartupExtensions.cs b/BTCPayApp.Desktop/StartupExtensions.cs index d89e0d4..2e52440 100644 --- a/BTCPayApp.Desktop/StartupExtensions.cs +++ b/BTCPayApp.Desktop/StartupExtensions.cs @@ -1,5 +1,4 @@ -using System.Runtime.InteropServices; -using System.Text.Json; +using System.Text.Json; using BTCPayApp.Core.Contracts; using Microsoft.AspNetCore.DataProtection; using Microsoft.Extensions.Configuration; diff --git a/BTCPayApp.Maui/Platforms/Android/AndroidManifest.xml b/BTCPayApp.Maui/Platforms/Android/AndroidManifest.xml index f661c26..8c26e7a 100644 --- a/BTCPayApp.Maui/Platforms/Android/AndroidManifest.xml +++ b/BTCPayApp.Maui/Platforms/Android/AndroidManifest.xml @@ -2,5 +2,6 @@ + diff --git a/BTCPayApp.Maui/wwwroot/index.html b/BTCPayApp.Maui/wwwroot/index.html index ba03cdd..4519ddc 100644 --- a/BTCPayApp.Maui/wwwroot/index.html +++ b/BTCPayApp.Maui/wwwroot/index.html @@ -1,29 +1,27 @@ - - - BTCPay Server - - - - + + + + BTCPay Server + + + + + + - - -
- -
Loading...
- -
+
+
Loading...
+
An unhandled error has occurred. - Reload + Reload 🗙 -
- - - +
+ + + - diff --git a/BTCPayApp.Photino/Program.cs b/BTCPayApp.Photino/Program.cs index 97dc243..a2c04bf 100644 --- a/BTCPayApp.Photino/Program.cs +++ b/BTCPayApp.Photino/Program.cs @@ -3,7 +3,9 @@ using BTCPayApp.Desktop; using BTCPayApp.UI; using Microsoft.AspNetCore.Components.Web; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection.Extensions; using Photino.Blazor; using PhotinoNET; @@ -15,6 +17,12 @@ public static class Program private static void Main(string[] args) { var builder = PhotinoBlazorAppBuilder.CreateDefault(args); + builder.Services.TryAddSingleton(_ => + { + var configBuilder = new ConfigurationBuilder(); + configBuilder.AddEnvironmentVariables(); + return configBuilder.Build(); + }); builder.Services.AddBTCPayAppUIServices(); builder.Services.ConfigureBTCPayAppCore(); builder.Services.ConfigureBTCPayAppDesktop(); @@ -28,7 +36,6 @@ private static void Main(string[] args) app.MainWindow .SetResizable(true) .SetZoom(0) - // .SetIconFile("favicon.ico") .SetTitle("BTCPay Server"); app.MainWindow.Center(); diff --git a/BTCPayApp.Photino/wwwroot/index.html b/BTCPayApp.Photino/wwwroot/index.html index 57b24dd..a3dc2f3 100644 --- a/BTCPayApp.Photino/wwwroot/index.html +++ b/BTCPayApp.Photino/wwwroot/index.html @@ -1,28 +1,27 @@ - - - BTCPayApp + + + BTCPay Server + + -
- -Loading... - -
- An unhandled error has occurred. - Reload - 🗙 -
- - - +
+
Loading...
+
+ An unhandled error has occurred. + Reload + 🗙 +
+ + + diff --git a/BTCPayApp.Server/Pages/_Host.cshtml b/BTCPayApp.Server/Pages/_Host.cshtml index fbee1a5..0e038d7 100644 --- a/BTCPayApp.Server/Pages/_Host.cshtml +++ b/BTCPayApp.Server/Pages/_Host.cshtml @@ -9,13 +9,11 @@ - - - - + + BTCPay Server - - + + @@ -33,5 +31,8 @@ Reload 🗙 + + + diff --git a/BTCPayApp.UI/Shared/Keypad.razor b/BTCPayApp.UI/Shared/Keypad.razor index 487e6be..a7ead0d 100644 --- a/BTCPayApp.UI/Shared/Keypad.razor +++ b/BTCPayApp.UI/Shared/Keypad.razor @@ -9,8 +9,8 @@ - - + +
@Currency @FormatCurrency(Amount, false) @@ -102,7 +102,6 @@ - @code { private ValidationEditContext _validationEditContext { get; set; } diff --git a/BTCPayApp.UI/Shared/LayoutBase.razor b/BTCPayApp.UI/Shared/LayoutBase.razor index ea7d117..0b65220 100644 --- a/BTCPayApp.UI/Shared/LayoutBase.razor +++ b/BTCPayApp.UI/Shared/LayoutBase.razor @@ -1,6 +1,6 @@ @using BTCPayApp.UI.Features @using BTCPayApp.Core.Contracts -@inherits Fluxor.Blazor.Web.Components.FluxorLayout +@inherits Fluxor.Blazor.Web.Components.FluxorComponent @inject IStateSelection> LoadingStateSelection @inject IStateSelection DarkModeStateSelection @inject IDispatcher Dispatcher diff --git a/BTCPayApp.UI/Shared/MainLayout.razor b/BTCPayApp.UI/Shared/MainLayout.razor index 2a16692..688b65c 100644 --- a/BTCPayApp.UI/Shared/MainLayout.razor +++ b/BTCPayApp.UI/Shared/MainLayout.razor @@ -1,5 +1,5 @@ @using BTCPayApp.UI.Pages -@inherits LayoutComponentBase +@inherits Fluxor.Blazor.Web.Components.FluxorLayout diff --git a/BTCPayApp.UI/Shared/SimpleLayout.razor b/BTCPayApp.UI/Shared/SimpleLayout.razor index 4f53ff4..febb947 100644 --- a/BTCPayApp.UI/Shared/SimpleLayout.razor +++ b/BTCPayApp.UI/Shared/SimpleLayout.razor @@ -1,4 +1,4 @@ -@inherits LayoutComponentBase +@inherits Fluxor.Blazor.Web.Components.FluxorLayout diff --git a/BTCPayApp.UI/wwwroot/index.html b/BTCPayApp.UI/wwwroot/index.html index fb4bd9d..5e84297 100644 --- a/BTCPayApp.UI/wwwroot/index.html +++ b/BTCPayApp.UI/wwwroot/index.html @@ -3,14 +3,12 @@ - + BTCPay Server - - - + @@ -22,5 +20,8 @@ Reload 🗙
+ + +