From a0960298408fd2c61fc0e5278dea2c4fc4f08769 Mon Sep 17 00:00:00 2001 From: Chris Jacobsen Work Date: Mon, 22 Apr 2024 11:40:02 -0400 Subject: [PATCH 1/2] Added background blur filter to session expired dialog --- BLAZAM/BLAZAM.csproj | 2 +- BLAZAM/wwwroot/css/site.css | 3 +++ BLAZAMGui/UI/SessionExpirationWarningProvider.razor | 9 +++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/BLAZAM/BLAZAM.csproj b/BLAZAM/BLAZAM.csproj index 15a46f91..23b7ab9c 100644 --- a/BLAZAM/BLAZAM.csproj +++ b/BLAZAM/BLAZAM.csproj @@ -6,7 +6,7 @@ enable false 0.9.1 - 2024.04.17.1935 + 2024.04.19.1216 false BLAZAM False diff --git a/BLAZAM/wwwroot/css/site.css b/BLAZAM/wwwroot/css/site.css index 856d97dc..24ac9b17 100644 --- a/BLAZAM/wwwroot/css/site.css +++ b/BLAZAM/wwwroot/css/site.css @@ -8,6 +8,9 @@ html, body { h1:focus { outline: none; } +.blur-background { + backdrop-filter: blur(10px); +} .app-icon{ margin-left:0.5rem; max-height:2.5rem; diff --git a/BLAZAMGui/UI/SessionExpirationWarningProvider.razor b/BLAZAMGui/UI/SessionExpirationWarningProvider.razor index 8eccaf98..8ba7f367 100644 --- a/BLAZAMGui/UI/SessionExpirationWarningProvider.razor +++ b/BLAZAMGui/UI/SessionExpirationWarningProvider.razor @@ -52,13 +52,18 @@ + OnYes="@(()=>{Refresh();})" + Options=@(new DialogOptions{ + ClassBackground="blur-background", + CloseButton=false, + CloseOnEscapeKey=false, + DisableBackdropClick=true})> @AppLocalization["Your session has expired."] - + @code { private Timer? sessionTimeoutCheckTimer; AppModal? ExpirationWarningModal; From 28a186b141b6b08b467a49eb55b2d7b09c715f5a Mon Sep 17 00:00:00 2001 From: Chris Jacobsen Work Date: Mon, 22 Apr 2024 15:27:49 -0400 Subject: [PATCH 2/2] Fix for missing application root, which caused breaking of self-updates --- BLAZAM/BLAZAM.csproj | 2 +- BLAZAM/Program.cs | 4 ++++ BLAZAM/ProgramHelpers.cs | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/BLAZAM/BLAZAM.csproj b/BLAZAM/BLAZAM.csproj index a6b21c15..b946a43d 100644 --- a/BLAZAM/BLAZAM.csproj +++ b/BLAZAM/BLAZAM.csproj @@ -6,7 +6,7 @@ enable false 0.9.1 - 2024.04.21.1930 + 2024.04.22.1925 false BLAZAM False diff --git a/BLAZAM/Program.cs b/BLAZAM/Program.cs index 9c074257..310eb11d 100644 --- a/BLAZAM/Program.cs +++ b/BLAZAM/Program.cs @@ -81,8 +81,12 @@ public static void Main(string[] args) builder.IntializeProperties(); + //Create and discard a new instance of Encryption to inject the encryption seed string _ = new Encryption(Configuration?.GetValue("EncryptionKey")); + //Assign installation ID + Loggers.InstallationId = ApplicationInfo.installationId.ToString(); + //Setup host logging so it can catch the earliest logs possible Loggers.SeqServerUri = "http://logs.blazam.org:5341"; if (Debugger.IsAttached) diff --git a/BLAZAM/ProgramHelpers.cs b/BLAZAM/ProgramHelpers.cs index 8aa8df88..07a93165 100644 --- a/BLAZAM/ProgramHelpers.cs +++ b/BLAZAM/ProgramHelpers.cs @@ -38,7 +38,7 @@ public static class ProgramHelpers public static WebApplicationBuilder IntializeProperties(this WebApplicationBuilder builder) { //Set DebugMode flag from configuration - //ApplicationInfo ApplicationInfo = new(builder); + ApplicationInfo ApplicationInfo = new(builder); ApplicationInfo.inDebugMode = builder.Configuration.GetValue("DebugMode"); ApplicationInfo.inDemoMode = builder.Configuration.GetValue("DemoMode");