diff --git a/.vscode/settings.json b/.vscode/settings.json index 83a17ae3..6eb4faad 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,31 +2,30 @@ "dotnet-test-explorer.testProjectPath": "test/**/*Tests.csproj", "cSpell.words": [ - "appsettings", - "asciidoctor", - "ASPNETCORE", - "Avalonia", - "blogspot", - "Configurabilité", - "Cratie", - "DESTDIR", - "dotnet", - "DOTNET", - "ecdsa", - "envsubst", - "Forgejo", - "Hsts", - "Newtonsoft", - "Npgsql", - "Oidc", - "PKCE", - "postit", - "pschneider", - "SLNDIR", - "validable", - "www-data", - "yavsc", - "Yavsc" + "appsettings", + "asciidoctor", + "ASPNETCORE", + "Avalonia", + "Configurabilité", + "Cratie", + "DESTDIR", + "dotnet", + "DOTNET", + "ecdsa", + "envsubst", + "Forgejo", + "Hsts", + "Newtonsoft", + "Npgsql", + "Oidc", + "PKCE", + "postit", + "pschneider", + "SLNDIR", + "validable", + "www-data", + "yavsc", + "Yavsc" ], "cSpell.reportUnknownWords": true, "cSpell.language": "fr,en", diff --git a/CHANGELOG.md b/CHANGELOG.md index 7210a227..0a921f95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ Cette convention est partagée avec le dépôt pour la production des paquets `.deb`. -## [1.0.8-rc6] - unstable +## [1.0.8-rc5] - unstable ### Added diff --git a/src/PostIt/PostIt/App.axaml.cs b/src/PostIt/PostIt/App.axaml.cs index e3735c1e..7caf7bda 100644 --- a/src/PostIt/PostIt/App.axaml.cs +++ b/src/PostIt/PostIt/App.axaml.cs @@ -1,5 +1,4 @@ using System; -using System.Threading; using System.Threading.Tasks; using Avalonia; using Avalonia.Controls; @@ -16,8 +15,6 @@ namespace PostIt; public partial class App : Application { - private int _bootStarted; - /// /// DI container the platform entry points hand to ViewModels so /// they can resolve the canonical singleton @@ -48,6 +45,8 @@ public partial class App : Application { var window = ServiceProvider.GetRequiredService(); desktop.MainWindow = window; + var api = ServiceProvider!.GetRequiredService(); + desktop.MainWindow.Opened += async (_, _) => await BootAsync(this.ServiceProvider!, api); View = window.MainView; this.ConfigureRootView(window.MainView); @@ -76,8 +75,10 @@ public partial class App : Application private void ConfigureRootView(MainView rootView) { - // Déclencher le Boot une seule fois lors du chargement du contrôle à l'écran. - rootView.AttachedToVisualTree += async (_, _) => await BootOnceAsync(); + var api = ServiceProvider!.GetRequiredService(); + + // Déclencher le Boot lors du chargement du contrôle à l'écran + rootView.AttachedToVisualTree += async (_, _) => await BootAsync(this.ServiceProvider!, api); var sessionStatus = ServiceProvider!.GetRequiredService(); sessionStatus.LogoutCompleted += () => @@ -94,17 +95,6 @@ private void ConfigureRootView(MainView rootView) rootView.SessionBanner.DataContext = sessionStatus; } - private async Task BootOnceAsync() - { - if (Interlocked.Exchange(ref _bootStarted, 1) == 1) - { - return; - } - - var api = ServiceProvider!.GetRequiredService(); - await BootAsync(this.ServiceProvider!, api); - } - /// /// Test-only hook: bind a concrete so /// command-driven navigation paths () can diff --git a/src/Yavsc.Api.Client/BlogApiClient.cs b/src/Yavsc.Api.Client/BlogApiClient.cs index 8284c5ed..cbc82358 100644 --- a/src/Yavsc.Api.Client/BlogApiClient.cs +++ b/src/Yavsc.Api.Client/BlogApiClient.cs @@ -33,7 +33,7 @@ namespace Yavsc.Api.Client; /// public sealed class BlogApiClient { - private const string DefaultPathPrefix = "blogspot"; + private const string DefaultPathPrefix = "blog"; private readonly IYavscApiClient _api; private readonly Uri _baseAddress;