From c66982c9bc063efcc452cc21e7764d6f2faed9f3 Mon Sep 17 00:00:00 2001 From: sbwalker Date: Wed, 31 Jan 2024 15:43:17 -0500 Subject: [PATCH] fix .NET MAUI integration --- Oqtane.Client/Routes.razor | 5 ++++- Oqtane.Client/UI/SiteRouter.razor | 2 +- Oqtane.Maui/Main.razor | 2 +- Oqtane.Server/Components/App.razor | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Oqtane.Client/Routes.razor b/Oqtane.Client/Routes.razor index 24d19a919..fa1d4e8d9 100644 --- a/Oqtane.Client/Routes.razor +++ b/Oqtane.Client/Routes.razor @@ -16,7 +16,7 @@
- +
@@ -34,6 +34,9 @@ [Parameter] public string AntiForgeryToken { get; set; } + [Parameter] + public string Runtime { get; set; } + [Parameter] public string RenderMode { get; set; } diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor index 8bd12aa27..8f7aa1204 100644 --- a/Oqtane.Client/UI/SiteRouter.razor +++ b/Oqtane.Client/UI/SiteRouter.razor @@ -285,7 +285,7 @@ Action = action, EditMode = editmode, LastSyncDate = lastsyncdate, - Runtime = Shared.Runtime.Hybrid, + Runtime = (Shared.Runtime)Enum.Parse(typeof(Shared.Runtime), Runtime), RenderMode = RenderMode, VisitorId = VisitorId, RemoteIPAddress = SiteState.RemoteIPAddress, diff --git a/Oqtane.Maui/Main.razor b/Oqtane.Maui/Main.razor index f8b8069c7..89ce5c8c3 100644 --- a/Oqtane.Maui/Main.razor +++ b/Oqtane.Maui/Main.razor @@ -11,7 +11,7 @@ else } @code { - Type ComponentType = Type.GetType("Oqtane.App, Oqtane.Client"); + Type ComponentType = Type.GetType("Oqtane.Routes, Oqtane.Client"); private IDictionary Parameters { get; set; } private string message = ""; diff --git a/Oqtane.Server/Components/App.razor b/Oqtane.Server/Components/App.razor index 8bf473cca..77463e782 100644 --- a/Oqtane.Server/Components/App.razor +++ b/Oqtane.Server/Components/App.razor @@ -62,11 +62,11 @@ { @if (_renderMode == RenderModes.StaticServer) { - + } else { - + }