From 2e5de2c73bc3e483adb57f263380ed1a69f2ffbb Mon Sep 17 00:00:00 2001 From: snakex64 Date: Thu, 21 Nov 2024 16:47:11 -0500 Subject: [PATCH] NodeDev.Blazor.Server now using newer .net 8+ layout of Blazor without needing any cshtml files --- src/NodeDev.Blazor.Server/App.razor | 44 ++++++++++++++----- src/NodeDev.Blazor.Server/Pages/_Host.cshtml | 8 ---- .../Pages/_Layout.cshtml | 37 ---------------- src/NodeDev.Blazor.Server/Program.cs | 15 +++---- src/NodeDev.Blazor.Server/Routes.razor | 12 +++++ src/NodeDev.Blazor.Server/_Imports.razor | 1 + 6 files changed, 52 insertions(+), 65 deletions(-) delete mode 100644 src/NodeDev.Blazor.Server/Pages/_Host.cshtml delete mode 100644 src/NodeDev.Blazor.Server/Pages/_Layout.cshtml create mode 100644 src/NodeDev.Blazor.Server/Routes.razor diff --git a/src/NodeDev.Blazor.Server/App.razor b/src/NodeDev.Blazor.Server/App.razor index a3a1b38..f045c2c 100644 --- a/src/NodeDev.Blazor.Server/App.razor +++ b/src/NodeDev.Blazor.Server/App.razor @@ -1,12 +1,32 @@ - - - - - - - Not found - -

Sorry, there's nothing at this address.

- - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/NodeDev.Blazor.Server/Pages/_Host.cshtml b/src/NodeDev.Blazor.Server/Pages/_Host.cshtml deleted file mode 100644 index 2c69c62..0000000 --- a/src/NodeDev.Blazor.Server/Pages/_Host.cshtml +++ /dev/null @@ -1,8 +0,0 @@ -@page "/" -@namespace NodeDev.Blazor.Server.Pages -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers -@{ - Layout = "_Layout"; -} - - diff --git a/src/NodeDev.Blazor.Server/Pages/_Layout.cshtml b/src/NodeDev.Blazor.Server/Pages/_Layout.cshtml deleted file mode 100644 index fee0154..0000000 --- a/src/NodeDev.Blazor.Server/Pages/_Layout.cshtml +++ /dev/null @@ -1,37 +0,0 @@ -@using Microsoft.AspNetCore.Components.Web -@namespace NodeDev.Pages -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers - - - - - - - - - - - - - - - - - - - - - @RenderBody() - - - - - - - - - - - - - diff --git a/src/NodeDev.Blazor.Server/Program.cs b/src/NodeDev.Blazor.Server/Program.cs index 9fc06a0..6dc07cf 100644 --- a/src/NodeDev.Blazor.Server/Program.cs +++ b/src/NodeDev.Blazor.Server/Program.cs @@ -1,12 +1,11 @@ -using Microsoft.AspNetCore.Components; -using Microsoft.AspNetCore.Components.Web; +using NodeDev.Blazor.Server; using NodeDev.Blazor.Services; var builder = WebApplication.CreateBuilder(args); // Add services to the container. -builder.Services.AddRazorPages(); -builder.Services.AddServerSideBlazor(); +builder.Services.AddRazorComponents() + .AddInteractiveServerComponents(); builder.Services.AddNodeDev(); @@ -20,11 +19,11 @@ app.UseHsts(); } -app.UseStaticFiles(); +app.UseAntiforgery(); -app.UseRouting(); +app.UseStaticFiles(); -app.MapBlazorHub(); -app.MapFallbackToPage("/_Host"); +app.MapRazorComponents() + .AddInteractiveServerRenderMode(); app.Run(); diff --git a/src/NodeDev.Blazor.Server/Routes.razor b/src/NodeDev.Blazor.Server/Routes.razor new file mode 100644 index 0000000..a3a1b38 --- /dev/null +++ b/src/NodeDev.Blazor.Server/Routes.razor @@ -0,0 +1,12 @@ + + + + + + + Not found + +

Sorry, there's nothing at this address.

+ + + diff --git a/src/NodeDev.Blazor.Server/_Imports.razor b/src/NodeDev.Blazor.Server/_Imports.razor index ba4e4ec..3ab33a0 100644 --- a/src/NodeDev.Blazor.Server/_Imports.razor +++ b/src/NodeDev.Blazor.Server/_Imports.razor @@ -5,5 +5,6 @@ @using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Web @using Microsoft.AspNetCore.Components.Web.Virtualization +@using static Microsoft.AspNetCore.Components.Web.RenderMode @using Microsoft.JSInterop @using NodeDev.Blazor.Server