From 8483cdcfcec2076c1b55fb7fe59b2e68721919f4 Mon Sep 17 00:00:00 2001 From: Mladen Macanovic Date: Sat, 26 Aug 2023 10:27:31 +0200 Subject: [PATCH 01/24] Upgrade net8 packages --- Build/Blazorise.Docs.props | 6 +++--- Build/Blazorise.props | 6 +++--- .../Blazorise.Docs.Compiler/Blazorise.Docs.Compiler.csproj | 2 +- .../Blazorise.Docs.Generator.csproj | 2 +- .../Blazorise.Docs.Server/Blazorise.Docs.Server.csproj | 2 +- NuGet.config | 5 +++++ 6 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 NuGet.config diff --git a/Build/Blazorise.Docs.props b/Build/Blazorise.Docs.props index 49c6e41d98..5ed08550d2 100644 --- a/Build/Blazorise.Docs.props +++ b/Build/Blazorise.Docs.props @@ -1,7 +1,7 @@ - net7.0 + net8.0 Library true 10.0 @@ -9,8 +9,8 @@ - - + + diff --git a/Build/Blazorise.props b/Build/Blazorise.props index da35277506..7c73d43c05 100644 --- a/Build/Blazorise.props +++ b/Build/Blazorise.props @@ -57,8 +57,8 @@ - - - + + + diff --git a/Documentation/Blazorise.Docs.Compiler/Blazorise.Docs.Compiler.csproj b/Documentation/Blazorise.Docs.Compiler/Blazorise.Docs.Compiler.csproj index 7d0654bdf6..9393640893 100644 --- a/Documentation/Blazorise.Docs.Compiler/Blazorise.Docs.Compiler.csproj +++ b/Documentation/Blazorise.Docs.Compiler/Blazorise.Docs.Compiler.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 diff --git a/Documentation/Blazorise.Docs.Generator/Blazorise.Docs.Generator.csproj b/Documentation/Blazorise.Docs.Generator/Blazorise.Docs.Generator.csproj index d456ff4dfb..f67f521030 100644 --- a/Documentation/Blazorise.Docs.Generator/Blazorise.Docs.Generator.csproj +++ b/Documentation/Blazorise.Docs.Generator/Blazorise.Docs.Generator.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 enable diff --git a/Documentation/Blazorise.Docs.Server/Blazorise.Docs.Server.csproj b/Documentation/Blazorise.Docs.Server/Blazorise.Docs.Server.csproj index f1c4f569b0..fb16e8c470 100644 --- a/Documentation/Blazorise.Docs.Server/Blazorise.Docs.Server.csproj +++ b/Documentation/Blazorise.Docs.Server/Blazorise.Docs.Server.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 $(MSBuildProjectName) diff --git a/NuGet.config b/NuGet.config new file mode 100644 index 0000000000..5a2e991182 --- /dev/null +++ b/NuGet.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file From b66832e32936a540561d488675cc1a078391ead7 Mon Sep 17 00:00:00 2001 From: Mladen Macanovic Date: Sat, 26 Aug 2023 10:30:00 +0200 Subject: [PATCH 02/24] Fix warning in launchSettings --- .../Blazorise.Docs.Server/Properties/launchSettings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/Blazorise.Docs.Server/Properties/launchSettings.json b/Documentation/Blazorise.Docs.Server/Properties/launchSettings.json index 47ede289ac..680b4850e7 100644 --- a/Documentation/Blazorise.Docs.Server/Properties/launchSettings.json +++ b/Documentation/Blazorise.Docs.Server/Properties/launchSettings.json @@ -17,7 +17,7 @@ }, "Blazorise.Docs.Server": { "commandName": "Project", - "dotnetRunMessages": "true", + "dotnetRunMessages": true, "launchBrowser": true, "applicationUrl": "https://localhost:5001;http://localhost:5000", "environmentVariables": { From 644058649635a369e8aadfe5eb52f0d1aea2b391 Mon Sep 17 00:00:00 2001 From: Mladen Macanovic Date: Sat, 26 Aug 2023 10:30:26 +0200 Subject: [PATCH 03/24] Use App.razor for base component --- .../Blazorise.Docs.Server/Pages/_Host.cshtml | 9 - .../Pages/_Layout.cshtml | 87 -------- .../Blazorise.Docs.Server/_Imports.razor | 9 - Documentation/Blazorise.Docs/App.razor | 190 ++++++++++++------ 4 files changed, 129 insertions(+), 166 deletions(-) delete mode 100644 Documentation/Blazorise.Docs.Server/Pages/_Host.cshtml delete mode 100644 Documentation/Blazorise.Docs.Server/Pages/_Layout.cshtml delete mode 100644 Documentation/Blazorise.Docs.Server/_Imports.razor diff --git a/Documentation/Blazorise.Docs.Server/Pages/_Host.cshtml b/Documentation/Blazorise.Docs.Server/Pages/_Host.cshtml deleted file mode 100644 index d56a0c3771..0000000000 --- a/Documentation/Blazorise.Docs.Server/Pages/_Host.cshtml +++ /dev/null @@ -1,9 +0,0 @@ -@page "/" -@using Blazorise.Docs -@namespace Blazorise.Docs.Server.Pages -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers -@{ - Layout = "_Layout"; -} - - diff --git a/Documentation/Blazorise.Docs.Server/Pages/_Layout.cshtml b/Documentation/Blazorise.Docs.Server/Pages/_Layout.cshtml deleted file mode 100644 index ce5b4cfd16..0000000000 --- a/Documentation/Blazorise.Docs.Server/Pages/_Layout.cshtml +++ /dev/null @@ -1,87 +0,0 @@ -@namespace Blazorise.Docs.Server.Pages -@using Microsoft.AspNetCore.Components.Web -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @RenderBody() - - - - - - - - - - - - - - - - - - diff --git a/Documentation/Blazorise.Docs.Server/_Imports.razor b/Documentation/Blazorise.Docs.Server/_Imports.razor deleted file mode 100644 index 8264e3f4c2..0000000000 --- a/Documentation/Blazorise.Docs.Server/_Imports.razor +++ /dev/null @@ -1,9 +0,0 @@ -@using System.Net.Http -@using Microsoft.AspNetCore.Authorization -@using Microsoft.AspNetCore.Components.Authorization -@using Microsoft.AspNetCore.Components.Forms -@using Microsoft.AspNetCore.Components.Routing -@using Microsoft.AspNetCore.Components.Web -@using Microsoft.AspNetCore.Components.Web.Virtualization -@using Microsoft.JSInterop -@using Blazorise.Docs.Server diff --git a/Documentation/Blazorise.Docs/App.razor b/Documentation/Blazorise.Docs/App.razor index 473188b90e..4c1a8ee46a 100644 --- a/Documentation/Blazorise.Docs/App.razor +++ b/Documentation/Blazorise.Docs/App.razor @@ -1,7 +1,56 @@ - +@using Blazorise.Components +@using System.Reflection; +@using Blazorise.Docs.Layouts; +@attribute [RenderModeServer] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @* *@ + + + @* + + + + *@ @@ -13,66 +62,85 @@ - - - - - -@code{ - private Theme theme = new() - { - LuminanceThreshold = 170, - BarOptions = new() + + + @code { + private Theme theme = new() { - HorizontalHeight = "64px", - VerticalBrandHeight = "64px", - LightColors = new() + LuminanceThreshold = 170, + BarOptions = new() { - ItemColorOptions = new() + HorizontalHeight = "64px", + VerticalBrandHeight = "64px", + LightColors = new() { - ActiveBackgroundColor = "#dedede", - ActiveColor = "#000000", - HoverBackgroundColor = "#dedede", - HoverColor = "#000000", - }, - } - }, - ColorOptions = new() - { - Primary = "#9333ea", - Secondary = "#d7dae7", - Success = "#13a668", - Danger = "#e11d48", - Warning = "#FFA800", - Light = "#dce7ed", - Dark = "#181C32", - Info = "#60A5FA", - }, - BackgroundOptions = new() - { - Primary = "#9333ea", - Secondary = "#d7dae7", - Success = "#13a668", - Danger = "#e11d48", - Warning = "#FFA800", - Light = "#dce7ed", - Dark = "#181C32", - Info = "#60A5FA", - }, - TextColorOptions = new() - { - Primary = "#9333ea", - Secondary = "#d7dae7", - Success = "#13a668", - Danger = "#e11d48", - Warning = "#FFA800", - Light = "#dce7ed", - Dark = "#181C32", - Info = "#60A5FA", - }, - InputOptions = new() - { - CheckColor = "#9333ea", - }, - }; -} + ItemColorOptions = new() + { + ActiveBackgroundColor = "#dedede", + ActiveColor = "#000000", + HoverBackgroundColor = "#dedede", + HoverColor = "#000000", + }, + } + }, + ColorOptions = new() + { + Primary = "#9333ea", + Secondary = "#d7dae7", + Success = "#13a668", + Danger = "#e11d48", + Warning = "#FFA800", + Light = "#dce7ed", + Dark = "#181C32", + Info = "#60A5FA", + }, + BackgroundOptions = new() + { + Primary = "#9333ea", + Secondary = "#d7dae7", + Success = "#13a668", + Danger = "#e11d48", + Warning = "#FFA800", + Light = "#dce7ed", + Dark = "#181C32", + Info = "#60A5FA", + }, + TextColorOptions = new() + { + Primary = "#9333ea", + Secondary = "#d7dae7", + Success = "#13a668", + Danger = "#e11d48", + Warning = "#FFA800", + Light = "#dce7ed", + Dark = "#181C32", + Info = "#60A5FA", + }, + InputOptions = new() + { + CheckColor = "#9333ea", + }, + }; + } + + + + + + + + + + + + + + + + + + + + From 6f722ae11fdf6fe8c8cf50336345770eae0ae638 Mon Sep 17 00:00:00 2001 From: Mladen Macanovic Date: Sat, 26 Aug 2023 10:30:42 +0200 Subject: [PATCH 04/24] Rename Seo class to SeoGenerator --- .../Infrastructure/{Seo.cs => SeoGenerator.cs} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename Documentation/Blazorise.Docs.Server/Infrastructure/{Seo.cs => SeoGenerator.cs} (99%) diff --git a/Documentation/Blazorise.Docs.Server/Infrastructure/Seo.cs b/Documentation/Blazorise.Docs.Server/Infrastructure/SeoGenerator.cs similarity index 99% rename from Documentation/Blazorise.Docs.Server/Infrastructure/Seo.cs rename to Documentation/Blazorise.Docs.Server/Infrastructure/SeoGenerator.cs index 31375df5a0..2ea2409532 100644 --- a/Documentation/Blazorise.Docs.Server/Infrastructure/Seo.cs +++ b/Documentation/Blazorise.Docs.Server/Infrastructure/SeoGenerator.cs @@ -8,7 +8,7 @@ namespace Blazorise.Docs.Server.Infrastructure; -public class Seo +public class SeoGenerator { public static async Task GenerateRobots( HttpContext context ) { From 5a1b1e70218a6c33b64ebd47c765e07498ba0541 Mon Sep 17 00:00:00 2001 From: Mladen Macanovic Date: Sat, 26 Aug 2023 10:31:08 +0200 Subject: [PATCH 05/24] Configure Program and Startup for net8 --- .../Blazorise.Docs.Server/Program.cs | 31 +++++----- .../Blazorise.Docs.Server/Startup.cs | 60 +++++++++---------- 2 files changed, 42 insertions(+), 49 deletions(-) diff --git a/Documentation/Blazorise.Docs.Server/Program.cs b/Documentation/Blazorise.Docs.Server/Program.cs index b013462637..b2e63c12d8 100644 --- a/Documentation/Blazorise.Docs.Server/Program.cs +++ b/Documentation/Blazorise.Docs.Server/Program.cs @@ -1,25 +1,22 @@ -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; +using Blazorise.Docs.Server; +using Microsoft.AspNetCore.Builder; -namespace Blazorise.Docs.Server; +namespace Blazorise.Docs; public class Program { public static void Main( string[] args ) { - CreateHostBuilder( args ).Build().Run(); - } + var builder = WebApplication.CreateBuilder( args ); + + var startup = new Startup( builder.Configuration ); + + startup.ConfigureServices( builder.Services ); - public static IHostBuilder CreateHostBuilder( string[] args ) => - Host.CreateDefaultBuilder( args ) - .ConfigureWebHostDefaults( webBuilder => - { - webBuilder.UseStartup(); - } ); + var app = builder.Build(); + + startup.Configure( app ); + + app.Run(); + } } \ No newline at end of file diff --git a/Documentation/Blazorise.Docs.Server/Startup.cs b/Documentation/Blazorise.Docs.Server/Startup.cs index 8cfbc4a8e4..5070ccc0ee 100644 --- a/Documentation/Blazorise.Docs.Server/Startup.cs +++ b/Documentation/Blazorise.Docs.Server/Startup.cs @@ -17,6 +17,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using Microsoft.AspNetCore.Server.Kestrel.Core; namespace Blazorise.Docs.Server; @@ -33,14 +34,29 @@ public Startup( IConfiguration configuration ) // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 public void ConfigureServices( IServiceCollection services ) { - services.AddRazorPages(); - services.AddServerSideBlazor(); + // Add services to the container. + services + .AddRazorComponents() + .AddServerComponents(); - services.AddServerSideBlazor().AddHubOptions( ( o ) => + services.Configure( options => { - o.MaximumReceiveMessageSize = 1024 * 1024 * 100; + options.AllowSynchronousIO = true; } ); + services.Configure( options => + { + options.AllowSynchronousIO = true; + } ); + + //services.AddRazorPages(); + //services.AddServerSideBlazor(); + + //services.AddServerSideBlazor().AddHubOptions( ( o ) => + //{ + // o.MaximumReceiveMessageSize = 1024 * 1024 * 100; + //} ); + services.AddHttpContextAccessor(); services @@ -99,15 +115,11 @@ public void ConfigureServices( IServiceCollection services ) } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure( IApplicationBuilder app, IWebHostEnvironment env ) + public void Configure( WebApplication app ) { app.UseResponseCompression(); - if ( env.IsDevelopment() ) - { - app.UseDeveloperExceptionPage(); - } - else + if ( !app.Environment.IsDevelopment() ) { app.UseExceptionHandler( "/Error" ); // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. @@ -115,31 +127,15 @@ public void Configure( IApplicationBuilder app, IWebHostEnvironment env ) } app.UseHttpsRedirection(); - app.UseStaticFiles(); - app.UseRouting(); - - app.UseEndpoints( endpoints => - { - endpoints.MapGet( "/robots.txt", async context => - { - await Seo.GenerateRobots( context ); - } ); - - endpoints.MapGet( "/sitemap.txt", async context => - { - await Seo.GenerateSitemap( context ); - } ); + app.UseStaticFiles(); - endpoints.MapGet( "/sitemap.xml", async context => - { - await Seo.GenerateSitemapXml( context ); - } ); + //app.UseRouting(); - endpoints.MapHealthChecks( "/healthcheck" ); + app.MapGet( "/robots.txt", SeoGenerator.GenerateRobots ); + app.MapGet( "/sitemap.txt", SeoGenerator.GenerateSitemap ); + app.MapGet( "/sitemap.xml", SeoGenerator.GenerateSitemapXml ); - endpoints.MapBlazorHub(); - endpoints.MapFallbackToPage( "/_Host" ); - } ); + app.MapRazorComponents(); } } From 0244144ef3fd73fe10efb84e82172ac96989bb8f Mon Sep 17 00:00:00 2001 From: Mladen Macanovic Date: Sat, 26 Aug 2023 10:31:17 +0200 Subject: [PATCH 06/24] Add StreamRendering to pricing page --- Documentation/Blazorise.Docs/Pages/Commercial/PricingPage.razor | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/Blazorise.Docs/Pages/Commercial/PricingPage.razor b/Documentation/Blazorise.Docs/Pages/Commercial/PricingPage.razor index 6402cfb848..008a223085 100644 --- a/Documentation/Blazorise.Docs/Pages/Commercial/PricingPage.razor +++ b/Documentation/Blazorise.Docs/Pages/Commercial/PricingPage.razor @@ -1,4 +1,5 @@ @page "/pricing" +@attribute [StreamRendering( true )] From 84817e43f7113ea1a81631af61bae5bc63c4bc7c Mon Sep 17 00:00:00 2001 From: Mladen Macanovic Date: Sat, 26 Aug 2023 10:54:28 +0200 Subject: [PATCH 07/24] Add more net8 packages --- Build/Blazorise.Docs.props | 2 ++ .../Blazorise.Docs.Server/Blazorise.Docs.Server.csproj | 4 ++++ Documentation/Blazorise.Docs.Server/Startup.cs | 7 +++++-- Documentation/Blazorise.Docs/Blazorise.Docs.csproj | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Build/Blazorise.Docs.props b/Build/Blazorise.Docs.props index 5ed08550d2..ca38d371db 100644 --- a/Build/Blazorise.Docs.props +++ b/Build/Blazorise.Docs.props @@ -11,6 +11,8 @@ + + diff --git a/Documentation/Blazorise.Docs.Server/Blazorise.Docs.Server.csproj b/Documentation/Blazorise.Docs.Server/Blazorise.Docs.Server.csproj index fb16e8c470..33fd9ca2d0 100644 --- a/Documentation/Blazorise.Docs.Server/Blazorise.Docs.Server.csproj +++ b/Documentation/Blazorise.Docs.Server/Blazorise.Docs.Server.csproj @@ -11,4 +11,8 @@ + + + + diff --git a/Documentation/Blazorise.Docs.Server/Startup.cs b/Documentation/Blazorise.Docs.Server/Startup.cs index 5070ccc0ee..24220f9b41 100644 --- a/Documentation/Blazorise.Docs.Server/Startup.cs +++ b/Documentation/Blazorise.Docs.Server/Startup.cs @@ -37,7 +37,8 @@ public void ConfigureServices( IServiceCollection services ) // Add services to the container. services .AddRazorComponents() - .AddServerComponents(); + .AddServerComponents() + .AddWebAssemblyComponents(); services.Configure( options => { @@ -136,6 +137,8 @@ public void Configure( WebApplication app ) app.MapGet( "/sitemap.txt", SeoGenerator.GenerateSitemap ); app.MapGet( "/sitemap.xml", SeoGenerator.GenerateSitemapXml ); - app.MapRazorComponents(); + app.MapRazorComponents() + .AddServerRenderMode() + .AddWebAssemblyRenderMode(); } } diff --git a/Documentation/Blazorise.Docs/Blazorise.Docs.csproj b/Documentation/Blazorise.Docs/Blazorise.Docs.csproj index af456a29c8..976f321252 100644 --- a/Documentation/Blazorise.Docs/Blazorise.Docs.csproj +++ b/Documentation/Blazorise.Docs/Blazorise.Docs.csproj @@ -79,7 +79,7 @@ - + From e62f4475cbfd339cc205115d18b7c42c5a9ec3c1 Mon Sep 17 00:00:00 2001 From: David Moreira Date: Sat, 26 Aug 2023 10:11:52 +0100 Subject: [PATCH 08/24] Add counter page to test interactivity --- .../Blazorise.Docs.Server/Startup.cs | 4 +++- Documentation/Blazorise.Docs/App.razor | 2 +- .../Blazorise.Docs/Pages/Home/Counter.razor | 19 +++++++++++++++++++ .../Blazorise.Docs/Pages/Home/Index.razor | 1 + 4 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 Documentation/Blazorise.Docs/Pages/Home/Counter.razor diff --git a/Documentation/Blazorise.Docs.Server/Startup.cs b/Documentation/Blazorise.Docs.Server/Startup.cs index 5070ccc0ee..e3886ff79b 100644 --- a/Documentation/Blazorise.Docs.Server/Startup.cs +++ b/Documentation/Blazorise.Docs.Server/Startup.cs @@ -130,12 +130,14 @@ public void Configure( WebApplication app ) app.UseStaticFiles(); + app.MapRazorComponents(); + //app.UseRouting(); app.MapGet( "/robots.txt", SeoGenerator.GenerateRobots ); app.MapGet( "/sitemap.txt", SeoGenerator.GenerateSitemap ); app.MapGet( "/sitemap.xml", SeoGenerator.GenerateSitemapXml ); - app.MapRazorComponents(); + //app.MapRazorComponents(); } } diff --git a/Documentation/Blazorise.Docs/App.razor b/Documentation/Blazorise.Docs/App.razor index 4c1a8ee46a..96ede7ebf2 100644 --- a/Documentation/Blazorise.Docs/App.razor +++ b/Documentation/Blazorise.Docs/App.razor @@ -1,7 +1,7 @@ @using Blazorise.Components @using System.Reflection; @using Blazorise.Docs.Layouts; -@attribute [RenderModeServer] + diff --git a/Documentation/Blazorise.Docs/Pages/Home/Counter.razor b/Documentation/Blazorise.Docs/Pages/Home/Counter.razor new file mode 100644 index 0000000000..4f5611cc01 --- /dev/null +++ b/Documentation/Blazorise.Docs/Pages/Home/Counter.razor @@ -0,0 +1,19 @@ +@page "/counter" +@attribute [RenderModeServer] + +Counter + +

Counter

+ +

Current count: @currentCount

+ + + +@code { + private int currentCount = 0; + + private void IncrementCount() + { + currentCount++; + } +} diff --git a/Documentation/Blazorise.Docs/Pages/Home/Index.razor b/Documentation/Blazorise.Docs/Pages/Home/Index.razor index 18ecae8600..cdb2a7bb25 100644 --- a/Documentation/Blazorise.Docs/Pages/Home/Index.razor +++ b/Documentation/Blazorise.Docs/Pages/Home/Index.razor @@ -1,4 +1,5 @@ @page "/" +@attribute [RenderModeServer(false)] From bffb4e14183c2629d1bc47eeaddffb96bb4bf0e1 Mon Sep 17 00:00:00 2001 From: David Moreira Date: Sat, 26 Aug 2023 12:37:33 +0100 Subject: [PATCH 09/24] Make the router take in rendermode Server --- Documentation/Blazorise.Docs/App.razor | 24 ++----------------- .../Blazorise.Docs/BlazoriseRouter.razor | 22 +++++++++++++++++ 2 files changed, 24 insertions(+), 22 deletions(-) create mode 100644 Documentation/Blazorise.Docs/BlazoriseRouter.razor diff --git a/Documentation/Blazorise.Docs/App.razor b/Documentation/Blazorise.Docs/App.razor index 96ede7ebf2..63bea1dedc 100644 --- a/Documentation/Blazorise.Docs/App.razor +++ b/Documentation/Blazorise.Docs/App.razor @@ -40,30 +40,10 @@ - - - @* *@ - - - - @* - - - - *@ - - - - - Sorry, there's nothing at this address. -

- The page you are looking for might have been removed. - - - - + + @code { private Theme theme = new() { diff --git a/Documentation/Blazorise.Docs/BlazoriseRouter.razor b/Documentation/Blazorise.Docs/BlazoriseRouter.razor new file mode 100644 index 0000000000..84690d5298 --- /dev/null +++ b/Documentation/Blazorise.Docs/BlazoriseRouter.razor @@ -0,0 +1,22 @@ + + + @* *@ + + + + @* + + + + *@ + + + + + Sorry, there's nothing at this address. +

+ The page you are looking for might have been removed. + + + + \ No newline at end of file From 4cd60b165acce5fd88747b29445bdb7158343dbc Mon Sep 17 00:00:00 2001 From: Mladen Macanovic Date: Sat, 26 Aug 2023 11:06:10 +0200 Subject: [PATCH 10/24] Separate Routes.razor --- Documentation/Blazorise.Docs/Routes.razor | 80 +++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 Documentation/Blazorise.Docs/Routes.razor diff --git a/Documentation/Blazorise.Docs/Routes.razor b/Documentation/Blazorise.Docs/Routes.razor new file mode 100644 index 0000000000..519ccdc16f --- /dev/null +++ b/Documentation/Blazorise.Docs/Routes.razor @@ -0,0 +1,80 @@ + + + @* *@ + + + + @* + + + + *@ + + + + + Sorry, there's nothing at this address. +

+ The page you are looking for might have been removed. + + + + +@code { + private Theme theme = new() + { + LuminanceThreshold = 170, + BarOptions = new() + { + HorizontalHeight = "64px", + VerticalBrandHeight = "64px", + LightColors = new() + { + ItemColorOptions = new() + { + ActiveBackgroundColor = "#dedede", + ActiveColor = "#000000", + HoverBackgroundColor = "#dedede", + HoverColor = "#000000", + }, + } + }, + ColorOptions = new() + { + Primary = "#9333ea", + Secondary = "#d7dae7", + Success = "#13a668", + Danger = "#e11d48", + Warning = "#FFA800", + Light = "#dce7ed", + Dark = "#181C32", + Info = "#60A5FA", + }, + BackgroundOptions = new() + { + Primary = "#9333ea", + Secondary = "#d7dae7", + Success = "#13a668", + Danger = "#e11d48", + Warning = "#FFA800", + Light = "#dce7ed", + Dark = "#181C32", + Info = "#60A5FA", + }, + TextColorOptions = new() + { + Primary = "#9333ea", + Secondary = "#d7dae7", + Success = "#13a668", + Danger = "#e11d48", + Warning = "#FFA800", + Light = "#dce7ed", + Dark = "#181C32", + Info = "#60A5FA", + }, + InputOptions = new() + { + CheckColor = "#9333ea", + }, + }; +} \ No newline at end of file From 79dcba188588584518c0189604677fdc7144c58a Mon Sep 17 00:00:00 2001 From: Mladen Macanovic Date: Sat, 26 Aug 2023 13:43:49 +0200 Subject: [PATCH 11/24] Use Routes.razor --- Documentation/Blazorise.Docs/App.razor | 65 +------------------ .../Blazorise.Docs/BlazoriseRouter.razor | 22 ------- 2 files changed, 1 insertion(+), 86 deletions(-) delete mode 100644 Documentation/Blazorise.Docs/BlazoriseRouter.razor diff --git a/Documentation/Blazorise.Docs/App.razor b/Documentation/Blazorise.Docs/App.razor index 63bea1dedc..9bfb8876fe 100644 --- a/Documentation/Blazorise.Docs/App.razor +++ b/Documentation/Blazorise.Docs/App.razor @@ -39,70 +39,7 @@ - - - - - - @code { - private Theme theme = new() - { - LuminanceThreshold = 170, - BarOptions = new() - { - HorizontalHeight = "64px", - VerticalBrandHeight = "64px", - LightColors = new() - { - ItemColorOptions = new() - { - ActiveBackgroundColor = "#dedede", - ActiveColor = "#000000", - HoverBackgroundColor = "#dedede", - HoverColor = "#000000", - }, - } - }, - ColorOptions = new() - { - Primary = "#9333ea", - Secondary = "#d7dae7", - Success = "#13a668", - Danger = "#e11d48", - Warning = "#FFA800", - Light = "#dce7ed", - Dark = "#181C32", - Info = "#60A5FA", - }, - BackgroundOptions = new() - { - Primary = "#9333ea", - Secondary = "#d7dae7", - Success = "#13a668", - Danger = "#e11d48", - Warning = "#FFA800", - Light = "#dce7ed", - Dark = "#181C32", - Info = "#60A5FA", - }, - TextColorOptions = new() - { - Primary = "#9333ea", - Secondary = "#d7dae7", - Success = "#13a668", - Danger = "#e11d48", - Warning = "#FFA800", - Light = "#dce7ed", - Dark = "#181C32", - Info = "#60A5FA", - }, - InputOptions = new() - { - CheckColor = "#9333ea", - }, - }; - } - + diff --git a/Documentation/Blazorise.Docs/BlazoriseRouter.razor b/Documentation/Blazorise.Docs/BlazoriseRouter.razor deleted file mode 100644 index 84690d5298..0000000000 --- a/Documentation/Blazorise.Docs/BlazoriseRouter.razor +++ /dev/null @@ -1,22 +0,0 @@ - - - @* *@ - - - - @* - - - - *@ - - - - - Sorry, there's nothing at this address. -

- The page you are looking for might have been removed. - - - - \ No newline at end of file From 2266667257f84380eba17b0832ac45459f9a434b Mon Sep 17 00:00:00 2001 From: Mladen Macanovic Date: Wed, 13 Sep 2023 18:00:06 +0200 Subject: [PATCH 12/24] Use net8.0 for Blazorise.Docs.Compiler --- Documentation/Blazorise.Docs/Blazorise.Docs.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/Blazorise.Docs/Blazorise.Docs.csproj b/Documentation/Blazorise.Docs/Blazorise.Docs.csproj index c53ddb30c4..1df31a1db5 100644 --- a/Documentation/Blazorise.Docs/Blazorise.Docs.csproj +++ b/Documentation/Blazorise.Docs/Blazorise.Docs.csproj @@ -38,7 +38,7 @@ - ..\..\Documentation/Blazorise.Docs.Compiler/bin/Debug/net7.0/Blazorise.Docs.Compiler.dll + ..\..\Documentation/Blazorise.Docs.Compiler/bin/Debug/net8.0/Blazorise.Docs.Compiler.dll From f0246797c642187d2ac535b172245d935da4a47f Mon Sep 17 00:00:00 2001 From: Mladen Macanovic Date: Wed, 13 Sep 2023 18:00:59 +0200 Subject: [PATCH 13/24] ThemeProvider in Routes --- Documentation/Blazorise.Docs/Routes.razor | 43 +++++++++++------------ 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/Documentation/Blazorise.Docs/Routes.razor b/Documentation/Blazorise.Docs/Routes.razor index 519ccdc16f..c50cc3c328 100644 --- a/Documentation/Blazorise.Docs/Routes.razor +++ b/Documentation/Blazorise.Docs/Routes.razor @@ -1,25 +1,24 @@ - - - @* *@ - - - - @* - - - - *@ - - - - - Sorry, there's nothing at this address. -

- The page you are looking for might have been removed. - - - - + + + + + @* *@ + + + + + Sorry, there's nothing at this address. +

+ The page you are looking for might have been removed. + + + + + + + + + @code { private Theme theme = new() { From d569083dd97077d71adb2836b691674de86472c0 Mon Sep 17 00:00:00 2001 From: Mladen Macanovic Date: Wed, 13 Sep 2023 18:01:36 +0200 Subject: [PATCH 14/24] Add missing rewardful JS scripts --- Documentation/Blazorise.Docs/App.razor | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/Blazorise.Docs/App.razor b/Documentation/Blazorise.Docs/App.razor index 9bfb8876fe..2d00aa938b 100644 --- a/Documentation/Blazorise.Docs/App.razor +++ b/Documentation/Blazorise.Docs/App.razor @@ -37,6 +37,9 @@ + + + From ab9b8a60e99dd1d1be12ef92313ddf134dbe99c5 Mon Sep 17 00:00:00 2001 From: Mladen Macanovic Date: Wed, 13 Sep 2023 18:02:11 +0200 Subject: [PATCH 15/24] Formating --- Documentation/Blazorise.Docs/App.razor | 1 - 1 file changed, 1 deletion(-) diff --git a/Documentation/Blazorise.Docs/App.razor b/Documentation/Blazorise.Docs/App.razor index 2d00aa938b..b39d86eba7 100644 --- a/Documentation/Blazorise.Docs/App.razor +++ b/Documentation/Blazorise.Docs/App.razor @@ -2,7 +2,6 @@ @using System.Reflection; @using Blazorise.Docs.Layouts; - From c40d82a1b2d1f8d2f6169526065afee5883b0805 Mon Sep 17 00:00:00 2001 From: Mladen Macanovic Date: Thu, 14 Sep 2023 14:14:14 +0200 Subject: [PATCH 16/24] Remove render mode from home and pricing pages --- Documentation/Blazorise.Docs/Pages/Commercial/PricingPage.razor | 1 - Documentation/Blazorise.Docs/Pages/Home/Index.razor | 1 - 2 files changed, 2 deletions(-) diff --git a/Documentation/Blazorise.Docs/Pages/Commercial/PricingPage.razor b/Documentation/Blazorise.Docs/Pages/Commercial/PricingPage.razor index 008a223085..6402cfb848 100644 --- a/Documentation/Blazorise.Docs/Pages/Commercial/PricingPage.razor +++ b/Documentation/Blazorise.Docs/Pages/Commercial/PricingPage.razor @@ -1,5 +1,4 @@ @page "/pricing" -@attribute [StreamRendering( true )] diff --git a/Documentation/Blazorise.Docs/Pages/Home/Index.razor b/Documentation/Blazorise.Docs/Pages/Home/Index.razor index 07db929110..805bcfc178 100644 --- a/Documentation/Blazorise.Docs/Pages/Home/Index.razor +++ b/Documentation/Blazorise.Docs/Pages/Home/Index.razor @@ -1,5 +1,4 @@ @page "/" -@attribute [RenderModeServer(false)] From 3fccab02c154486d13a849f3a945f0407cc8e5f7 Mon Sep 17 00:00:00 2001 From: Mladen Macanovic Date: Fri, 20 Oct 2023 09:21:54 +0200 Subject: [PATCH 17/24] Update NuGet packages --- Build/Blazorise.Docs.props | 4 ++-- Documentation/Blazorise.Docs/Blazorise.Docs.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Build/Blazorise.Docs.props b/Build/Blazorise.Docs.props index 5ed08550d2..aadbac793f 100644 --- a/Build/Blazorise.Docs.props +++ b/Build/Blazorise.Docs.props @@ -9,8 +9,8 @@ - - + + diff --git a/Documentation/Blazorise.Docs/Blazorise.Docs.csproj b/Documentation/Blazorise.Docs/Blazorise.Docs.csproj index 1df31a1db5..18b27520fa 100644 --- a/Documentation/Blazorise.Docs/Blazorise.Docs.csproj +++ b/Documentation/Blazorise.Docs/Blazorise.Docs.csproj @@ -79,7 +79,7 @@ - + From 3d960e6580d42cffc4fe66c380f018d5bb7bd27d Mon Sep 17 00:00:00 2001 From: Mladen Macanovic Date: Fri, 20 Oct 2023 09:22:18 +0200 Subject: [PATCH 18/24] Update server rendering mode APIs --- Documentation/Blazorise.Docs.Server/Startup.cs | 6 ++++-- Documentation/Blazorise.Docs/App.razor | 2 +- Documentation/Blazorise.Docs/Pages/Home/Counter.razor | 1 - 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Documentation/Blazorise.Docs.Server/Startup.cs b/Documentation/Blazorise.Docs.Server/Startup.cs index 3cdcfdaf3f..c2d8f04701 100644 --- a/Documentation/Blazorise.Docs.Server/Startup.cs +++ b/Documentation/Blazorise.Docs.Server/Startup.cs @@ -37,7 +37,7 @@ public void ConfigureServices( IServiceCollection services ) // Add services to the container. services .AddRazorComponents() - .AddServerComponents(); + .AddInteractiveServerComponents(); services.Configure( options => { @@ -129,8 +129,10 @@ public void Configure( WebApplication app ) app.UseHttpsRedirection(); app.UseStaticFiles(); + app.UseAntiforgery(); - app.MapRazorComponents(); + app.MapRazorComponents() + .AddInteractiveServerRenderMode(); //app.UseRouting(); diff --git a/Documentation/Blazorise.Docs/App.razor b/Documentation/Blazorise.Docs/App.razor index b39d86eba7..44ae0a9d1b 100644 --- a/Documentation/Blazorise.Docs/App.razor +++ b/Documentation/Blazorise.Docs/App.razor @@ -41,7 +41,7 @@ - + diff --git a/Documentation/Blazorise.Docs/Pages/Home/Counter.razor b/Documentation/Blazorise.Docs/Pages/Home/Counter.razor index 4f5611cc01..ef23cb3160 100644 --- a/Documentation/Blazorise.Docs/Pages/Home/Counter.razor +++ b/Documentation/Blazorise.Docs/Pages/Home/Counter.razor @@ -1,5 +1,4 @@ @page "/counter" -@attribute [RenderModeServer] Counter From a1c492c9f79f3139456fdff1bb572915e4b92927 Mon Sep 17 00:00:00 2001 From: Mladen Macanovic Date: Fri, 20 Oct 2023 10:56:09 +0200 Subject: [PATCH 19/24] Convert Blazorise.Docs to WASM client --- Build/Blazorise.Docs.props | 3 +++ .../Blazorise.Docs.Server.csproj | 4 ++++ .../Blazorise.Docs.Server/Startup.cs | 13 ++++++++--- Documentation/Blazorise.Docs/App.razor | 8 +++---- .../Blazorise.Docs/Blazorise.Docs.csproj | 2 +- .../Components/HomeClientLogos.razor | 18 +++++++-------- .../Models/Snippets.generated.cs | 10 ++++----- .../Pages/Commercial/AffiliatesPage.razor | 22 +++++++++---------- .../Image/Code/BasicImageExampleCode.html | 2 +- .../Image/Code/ImageFluidExampleCode.html | 2 +- .../Image/Code/ImageLoadingExampleCode.html | 2 +- .../Image/Code/ImageTextExampleCode.html | 2 +- .../Image/Examples/BasicImageExample.razor | 2 +- .../Image/Examples/ImageFluidExample.razor | 2 +- .../Image/Examples/ImageLoadingExample.razor | 2 +- .../Image/Examples/ImageTextExample.razor | 2 +- .../SplitterBackgroundImageExampleCode.html | 2 +- .../SplitterBackgroundImageExample.razor | 2 +- .../Blazorise.Docs/Pages/Docs/Index.razor | 12 +++++----- .../Blazorise.Docs/Pages/Docs/UsagePage.razor | 12 +++++----- .../Components/HomeCSSFrameworksSection.razor | 12 +++++----- .../Components/HomeCaseStudiesSection.razor | 8 +++---- Documentation/Blazorise.Docs/Program.cs | 14 ++++++++++++ 23 files changed, 93 insertions(+), 65 deletions(-) create mode 100644 Documentation/Blazorise.Docs/Program.cs diff --git a/Build/Blazorise.Docs.props b/Build/Blazorise.Docs.props index aadbac793f..9ad58e2e19 100644 --- a/Build/Blazorise.Docs.props +++ b/Build/Blazorise.Docs.props @@ -6,11 +6,14 @@ true 10.0 true + true + Default + diff --git a/Documentation/Blazorise.Docs.Server/Blazorise.Docs.Server.csproj b/Documentation/Blazorise.Docs.Server/Blazorise.Docs.Server.csproj index dcea0e4438..08251c3dc4 100644 --- a/Documentation/Blazorise.Docs.Server/Blazorise.Docs.Server.csproj +++ b/Documentation/Blazorise.Docs.Server/Blazorise.Docs.Server.csproj @@ -5,6 +5,10 @@ $(MSBuildProjectName) + + + + diff --git a/Documentation/Blazorise.Docs.Server/Startup.cs b/Documentation/Blazorise.Docs.Server/Startup.cs index c2d8f04701..a63bf056eb 100644 --- a/Documentation/Blazorise.Docs.Server/Startup.cs +++ b/Documentation/Blazorise.Docs.Server/Startup.cs @@ -37,7 +37,8 @@ public void ConfigureServices( IServiceCollection services ) // Add services to the container. services .AddRazorComponents() - .AddInteractiveServerComponents(); + .AddInteractiveServerComponents() + .AddInteractiveWebAssemblyComponents(); services.Configure( options => { @@ -119,7 +120,12 @@ public void Configure( WebApplication app ) { app.UseResponseCompression(); - if ( !app.Environment.IsDevelopment() ) + // Configure the HTTP request pipeline. + if ( app.Environment.IsDevelopment() ) + { + app.UseWebAssemblyDebugging(); + } + else { app.UseExceptionHandler( "/Error" ); // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. @@ -132,7 +138,8 @@ public void Configure( WebApplication app ) app.UseAntiforgery(); app.MapRazorComponents() - .AddInteractiveServerRenderMode(); + .AddInteractiveServerRenderMode() + .AddInteractiveWebAssemblyRenderMode(); //app.UseRouting(); diff --git a/Documentation/Blazorise.Docs/App.razor b/Documentation/Blazorise.Docs/App.razor index 44ae0a9d1b..ec3c689a56 100644 --- a/Documentation/Blazorise.Docs/App.razor +++ b/Documentation/Blazorise.Docs/App.razor @@ -31,7 +31,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -58,8 +58,8 @@ - + - + diff --git a/Documentation/Blazorise.Docs/Blazorise.Docs.csproj b/Documentation/Blazorise.Docs/Blazorise.Docs.csproj index 18b27520fa..a4cafc683f 100644 --- a/Documentation/Blazorise.Docs/Blazorise.Docs.csproj +++ b/Documentation/Blazorise.Docs/Blazorise.Docs.csproj @@ -1,4 +1,4 @@ - + diff --git a/Documentation/Blazorise.Docs/Components/HomeClientLogos.razor b/Documentation/Blazorise.Docs/Components/HomeClientLogos.razor index d4c85f955d..ed5b23aae5 100644 --- a/Documentation/Blazorise.Docs/Components/HomeClientLogos.razor +++ b/Documentation/Blazorise.Docs/Components/HomeClientLogos.razor @@ -1,47 +1,47 @@  - + - + - + - + - + - + - + - + - + \ No newline at end of file diff --git a/Documentation/Blazorise.Docs/Models/Snippets.generated.cs b/Documentation/Blazorise.Docs/Models/Snippets.generated.cs index f4804c6341..bfa9a684e5 100644 --- a/Documentation/Blazorise.Docs/Models/Snippets.generated.cs +++ b/Documentation/Blazorise.Docs/Models/Snippets.generated.cs @@ -2496,13 +2496,13 @@ void OnProgressed( FileProgressedEventArgs e ) string sentence = ""\""There will be no foolish wand-waving or silly incantations in this class. As such, I don't expect many of you to appreciate the subtle science and exact art that is potion-making. However, for those select few who possess the predisposition, I can teach you how to bewitch the mind and ensnare the senses. I can tell you how to bottle fame, brew glory, and even put a stopper in death. Then again, maybe some of you have come to Hogwarts in possession of abilities so formidable that you feel confident enough to not pay attention!\"" — Severus Snape""; }"; - public const string BasicImageExample = @""; + public const string BasicImageExample = @""; - public const string ImageFluidExample = @""; + public const string ImageFluidExample = @""; - public const string ImageLoadingExample = @""; + public const string ImageLoadingExample = @""; - public const string ImageTextExample = @""; + public const string ImageTextExample = @""; public const string AliasInputMaskExample = @""; @@ -8833,7 +8833,7 @@ Single line of text directly related to the operation performed public const string SpinKitSizeExample = @""; - public const string SplitterBackgroundImageExample = @" + public const string SplitterBackgroundImageExample = @"
Hello!
 diff --git a/Documentation/Blazorise.Docs/Pages/Commercial/AffiliatesPage.razor b/Documentation/Blazorise.Docs/Pages/Commercial/AffiliatesPage.razor index 9d9504e06a..3a60aeb745 100644 --- a/Documentation/Blazorise.Docs/Pages/Commercial/AffiliatesPage.razor +++ b/Documentation/Blazorise.Docs/Pages/Commercial/AffiliatesPage.razor @@ -258,11 +258,11 @@ List logoExamples = new List { - "_content/Blazorise.Docs/assets/img/brand/logos/blazorise-black-white-rectangle.png", - "_content/Blazorise.Docs/assets/img/brand/logos/blazorise-black-white-circle.png", - "_content/Blazorise.Docs/assets/img/brand/logos/blazorise-black-purple-rectangle.png", - "_content/Blazorise.Docs/assets/img/brand/logos/blazorise-black-purple-circle.png", - "_content/Blazorise.Docs/assets/img/brand/logos/blazorise-purple-circle.png", + "assets/img/brand/logos/blazorise-black-white-rectangle.png", + "assets/img/brand/logos/blazorise-black-white-circle.png", + "assets/img/brand/logos/blazorise-black-purple-rectangle.png", + "assets/img/brand/logos/blazorise-black-purple-circle.png", + "assets/img/brand/logos/blazorise-purple-circle.png", "", "", "", @@ -270,12 +270,12 @@ List imageExamples = new List { - "_content/Blazorise.Docs/assets/img/brand/marketing-image-1.png", - "_content/Blazorise.Docs/assets/img/brand/marketing-image-1-instagram.png", - "_content/Blazorise.Docs/assets/img/brand/marketing-image-2.png", - "_content/Blazorise.Docs/assets/img/brand/marketing-image-2-instagram.png", - "_content/Blazorise.Docs/assets/img/brand/marketing-image-3.png", - "_content/Blazorise.Docs/assets/img/brand/marketing-image-3-instagram.png", + "assets/img/brand/marketing-image-1.png", + "assets/img/brand/marketing-image-1-instagram.png", + "assets/img/brand/marketing-image-2.png", + "assets/img/brand/marketing-image-2-instagram.png", + "assets/img/brand/marketing-image-3.png", + "assets/img/brand/marketing-image-3-instagram.png", }; [Inject] public INotificationService NotificationService { get; set; } diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Code/BasicImageExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Code/BasicImageExampleCode.html index ab62c4ae97..abc0305296 100644 --- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Code/BasicImageExampleCode.html +++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Code/BasicImageExampleCode.html @@ -1,5 +1,5 @@ 
-<Image Source="_content/Blazorise.Docs/assets/img/animals/animal-01.jpg" Text="A lovely animal..." />
+<Image Source="assets/img/animals/animal-01.jpg" Text="A lovely animal..." />
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Code/ImageFluidExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Code/ImageFluidExampleCode.html index ae1f4d3d82..3e270674a4 100644 --- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Code/ImageFluidExampleCode.html +++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Code/ImageFluidExampleCode.html @@ -1,5 +1,5 @@ 
-<Image Source="_content/Blazorise.Docs/assets/img/animals/animal-02-large.jpg" Text="A lovely animal..." Fluid />
+<Image Source="assets/img/animals/animal-02-large.jpg" Text="A lovely animal..." Fluid />
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Code/ImageLoadingExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Code/ImageLoadingExampleCode.html index cd0714b31c..efc3fd43a4 100644 --- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Code/ImageLoadingExampleCode.html +++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Code/ImageLoadingExampleCode.html @@ -1,5 +1,5 @@ 
-<Image Source="_content/Blazorise.Docs/assets/img/animals/animal-06.jpg" Text="A lovely animal..." Loading />
+<Image Source="assets/img/animals/animal-06.jpg" Text="A lovely animal..." Loading />
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Code/ImageTextExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Code/ImageTextExampleCode.html index 821edbddff..e98fba44dc 100644 --- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Code/ImageTextExampleCode.html +++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Code/ImageTextExampleCode.html @@ -1,5 +1,5 @@ 
-<Image Source="_content/Blazorise.Docs/assets/img/animals/animal-05.jpg" Text="A lovely animal..." />
+<Image Source="assets/img/animals/animal-05.jpg" Text="A lovely animal..." />
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Examples/BasicImageExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Examples/BasicImageExample.razor index 9d04755ee6..c5dde756a3 100644 --- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Examples/BasicImageExample.razor +++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Examples/BasicImageExample.razor @@ -1,3 +1,3 @@ @namespace Blazorise.Docs.Docs.Examples - + diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Examples/ImageFluidExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Examples/ImageFluidExample.razor index f6afa29b40..c2da16b1fb 100644 --- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Examples/ImageFluidExample.razor +++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Examples/ImageFluidExample.razor @@ -1,3 +1,3 @@ @namespace Blazorise.Docs.Docs.Examples - + diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Examples/ImageLoadingExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Examples/ImageLoadingExample.razor index 4f834032fe..d8c3cc1634 100644 --- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Examples/ImageLoadingExample.razor +++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Examples/ImageLoadingExample.razor @@ -1,4 +1,4 @@ @namespace Blazorise.Docs.Docs.Examples - + diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Examples/ImageTextExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Examples/ImageTextExample.razor index 02827785cb..a552e6e938 100644 --- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Examples/ImageTextExample.razor +++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Image/Examples/ImageTextExample.razor @@ -1,3 +1,3 @@ @namespace Blazorise.Docs.Docs.Examples - \ No newline at end of file + \ No newline at end of file diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/Splitter/Code/SplitterBackgroundImageExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/Splitter/Code/SplitterBackgroundImageExampleCode.html index 369379ed7c..54f645e437 100644 --- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/Splitter/Code/SplitterBackgroundImageExampleCode.html +++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/Splitter/Code/SplitterBackgroundImageExampleCode.html @@ -1,6 +1,6 @@ 
-<Splitter Style="height: 100px;" GutterSize="32" GutterBackgroundImage="_content/Blazorise.Docs/assets/img/icons/resize-horizontal-30.png">
+<Splitter Style="height: 100px;" GutterSize="32" GutterBackgroundImage="assets/img/icons/resize-horizontal-30.png">
     <SplitterSection>
         <div>Hello!</div>
     </SplitterSection>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/Splitter/Examples/SplitterBackgroundImageExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/Splitter/Examples/SplitterBackgroundImageExample.razor
index 352fe76a53..b27600b408 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/Splitter/Examples/SplitterBackgroundImageExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/Splitter/Examples/SplitterBackgroundImageExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-
+
     
         
Hello!

     
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Index.razor b/Documentation/Blazorise.Docs/Pages/Docs/Index.razor
index c0dab96b72..2661beb68a 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Index.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Index.razor
@@ -59,7 +59,7 @@
     
         
             
-                
+                
                 
                     Bootstrap 4 Demo
                 
@@ -69,7 +69,7 @@
     
         
             
-                
+                
                 
                     Bootstrap 5 Demo
                 
@@ -79,7 +79,7 @@
     
         
             
-                
+                
                 
                     Tailwind Demo
                 
@@ -89,7 +89,7 @@
     
         
             
-                
+                
                 
                     Material Demo
                 
@@ -99,7 +99,7 @@
     
         
             
-                
+                
                 
                     Ant Design Demo
                 
@@ -109,7 +109,7 @@
     
         
             
-                
+                
                 
                     Bulma Demo
                 
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/UsagePage.razor b/Documentation/Blazorise.Docs/Pages/Docs/UsagePage.razor
index e9ea3ec9e3..0e86e827c1 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/UsagePage.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/UsagePage.razor
@@ -26,7 +26,7 @@
     
         
             
-                
+                
                 
                     
                         Bootstrap 4
@@ -38,7 +38,7 @@
     
         
             
-                
+                
                 
                     Bootstrap 5
                 
@@ -48,7 +48,7 @@
     
         
             
-                
+                
                 
                     Tailwind
                 
@@ -58,7 +58,7 @@
     
         
             
-                
+                
                 
                     Material
                 
@@ -68,7 +68,7 @@
     
         
             
-                
+                
                 
                     Ant Design
                 
@@ -78,7 +78,7 @@
     
         
             
-                
+                
                 
                     Bulma
                 
diff --git a/Documentation/Blazorise.Docs/Pages/Home/Components/HomeCSSFrameworksSection.razor b/Documentation/Blazorise.Docs/Pages/Home/Components/HomeCSSFrameworksSection.razor
index 86cac25bfb..c34132d2a7 100644
--- a/Documentation/Blazorise.Docs/Pages/Home/Components/HomeCSSFrameworksSection.razor
+++ b/Documentation/Blazorise.Docs/Pages/Home/Components/HomeCSSFrameworksSection.razor
@@ -13,7 +13,7 @@
         
             
                 

-                    
+                    
                 

                 

                     Tailwind
@@ -26,7 +26,7 @@
         
             
                 

-                    
+                    
                 

                 

                     Bootstrap 5
@@ -39,7 +39,7 @@
         
             
                 

-                    
+                    
                 

                 

                     Bootstrap 4
@@ -52,7 +52,7 @@
         
             
                 

-                    
+                    
                 

                 

                     Bulma
@@ -65,7 +65,7 @@
         
             
                 

-                    
+                    
                 

                 

                     AntDesign
@@ -78,7 +78,7 @@
         
             
                 

-                    
+                    
                 

                 

                     Material
diff --git a/Documentation/Blazorise.Docs/Pages/Home/Components/HomeCaseStudiesSection.razor b/Documentation/Blazorise.Docs/Pages/Home/Components/HomeCaseStudiesSection.razor
index 1d85e42872..975fcced13 100644
--- a/Documentation/Blazorise.Docs/Pages/Home/Components/HomeCaseStudiesSection.razor
+++ b/Documentation/Blazorise.Docs/Pages/Home/Components/HomeCaseStudiesSection.razor
@@ -26,7 +26,7 @@
                 

                     
                         

-                            
+                            
                             
                                 Blazor
                             
@@ -34,7 +34,7 @@
                     
                     
                         

-                            
+                            
                             
                                 .NET
                             
@@ -42,7 +42,7 @@
                     
                     
                         

-                            
+                            
                             
                                 C#
                             
@@ -50,7 +50,7 @@
                     
                     
                         

-                            
+                            
                             
                                 HTML
                             
diff --git a/Documentation/Blazorise.Docs/Program.cs b/Documentation/Blazorise.Docs/Program.cs
new file mode 100644
index 0000000000..e24140e4ae
--- /dev/null
+++ b/Documentation/Blazorise.Docs/Program.cs
@@ -0,0 +1,14 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+
+namespace Blazorise.Docs;
+
+public class Program
+{
+    public static async Task Main( string[] args )
+    {
+        var builder = WebAssemblyHostBuilder.CreateDefault( args );
+
+        await builder.Build().RunAsync();
+    }
+}
\ No newline at end of file

From f0c2aa902ed2b58cdc70aedbb9c7cdcf21d2bd00 Mon Sep 17 00:00:00 2001
From: Mladen Macanovic 
Date: Wed, 24 Jan 2024 17:07:47 +0100
Subject: [PATCH 20/24] Fix CSS and JS paths

---
 Documentation/Blazorise.Docs/App.razor | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Documentation/Blazorise.Docs/App.razor b/Documentation/Blazorise.Docs/App.razor
index fe9b00a7b4..41d349f856 100644
--- a/Documentation/Blazorise.Docs/App.razor
+++ b/Documentation/Blazorise.Docs/App.razor
@@ -31,9 +31,7 @@
     
     
     
-    
-    
-    
+    
 
     
 
@@ -60,8 +58,7 @@
     
 
     
-    
-    
+    
 
     
 

From 1771153a0cb3deaab06b90883796b0eb42cb2c3c Mon Sep 17 00:00:00 2001
From: Mladen Macanovic 
Date: Wed, 24 Jan 2024 17:15:19 +0100
Subject: [PATCH 21/24] Update runtime versions

---
 .../Blazorise.Docs.Server/Blazorise.Docs.Server.csproj          | 2 +-
 Tests/Blazorise.E2E.Tests/Blazorise.E2E.Tests.csproj            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/Blazorise.Docs.Server/Blazorise.Docs.Server.csproj b/Documentation/Blazorise.Docs.Server/Blazorise.Docs.Server.csproj
index 08251c3dc4..875e994319 100644
--- a/Documentation/Blazorise.Docs.Server/Blazorise.Docs.Server.csproj
+++ b/Documentation/Blazorise.Docs.Server/Blazorise.Docs.Server.csproj
@@ -6,7 +6,7 @@
   
 
   
-    
+    
   
 
   
diff --git a/Tests/Blazorise.E2E.Tests/Blazorise.E2E.Tests.csproj b/Tests/Blazorise.E2E.Tests/Blazorise.E2E.Tests.csproj
index 3109bf6c4b..29e2eb6082 100644
--- a/Tests/Blazorise.E2E.Tests/Blazorise.E2E.Tests.csproj
+++ b/Tests/Blazorise.E2E.Tests/Blazorise.E2E.Tests.csproj
@@ -10,7 +10,7 @@
   
 
   
-    
+    
     
     
     

From 00e9a8e466f9f396360bb80fd407f2d897c9d8bd Mon Sep 17 00:00:00 2001
From: Mladen Macanovic 
Date: Wed, 24 Jan 2024 17:27:47 +0100
Subject: [PATCH 22/24] Remove AllowSynchronousIO

---
 Documentation/Blazorise.Docs.Server/Startup.cs | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/Documentation/Blazorise.Docs.Server/Startup.cs b/Documentation/Blazorise.Docs.Server/Startup.cs
index a63bf056eb..be674f3bac 100644
--- a/Documentation/Blazorise.Docs.Server/Startup.cs
+++ b/Documentation/Blazorise.Docs.Server/Startup.cs
@@ -40,24 +40,6 @@ public void ConfigureServices( IServiceCollection services )
             .AddInteractiveServerComponents()
             .AddInteractiveWebAssemblyComponents();
 
-        services.Configure( options =>
-        {
-            options.AllowSynchronousIO = true;
-        } );
-
-        services.Configure( options =>
-        {
-            options.AllowSynchronousIO = true;
-        } );
-
-        //services.AddRazorPages();
-        //services.AddServerSideBlazor();
-
-        //services.AddServerSideBlazor().AddHubOptions( ( o ) =>
-        //{
-        //    o.MaximumReceiveMessageSize = 1024 * 1024 * 100;
-        //} );
-
         services.AddHttpContextAccessor();
 
         services

From e5eb204dec597ca2a6fa5cdb89dcc45a82917131 Mon Sep 17 00:00:00 2001
From: Mladen Macanovic 
Date: Wed, 24 Jan 2024 17:27:56 +0100
Subject: [PATCH 23/24] Remove 

---
 Documentation/Blazorise.Docs/Blazorise.Docs.csproj | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Documentation/Blazorise.Docs/Blazorise.Docs.csproj b/Documentation/Blazorise.Docs/Blazorise.Docs.csproj
index 5865165790..c562fabbe9 100644
--- a/Documentation/Blazorise.Docs/Blazorise.Docs.csproj
+++ b/Documentation/Blazorise.Docs/Blazorise.Docs.csproj
@@ -2,10 +2,6 @@
 
   
 
-  
-    
-  
-
   
     
     

From 1530e73649f0e3d10f1a9873e0fb433fc7d616dc Mon Sep 17 00:00:00 2001
From: David Moreira 
Date: Wed, 31 Jan 2024 00:25:57 +0000
Subject: [PATCH 24/24] Fix Wasm project configuration | Interactive Auto
 Changes

---
 Build/Blazorise.Docs.props                    |   6 -
 .../App.razor                                 |   1 +
 .../Blazorise.Docs.Server.csproj              |   2 -
 .../Blazorise.Docs.Server/Startup.cs          |   6 +-
 .../Blazorise.Docs/Blazorise.Docs.csproj      | 171 +++++++++---------
 .../Models/Snippets.generated.cs              |  14 +-
 .../Code/ThemingColorsExampleCode.html        |   2 +-
 .../Code/ThemingGradientExampleCode.html      |   2 +-
 .../Code/ThemingRoundedExampleCode.html       |   2 +-
 .../Theming/Code/ThemingStartExampleCode.html |   2 +-
 .../Examples/ThemingColorsExample.razor       |   2 +-
 .../Examples/ThemingGradientExample.razor     |   2 +-
 .../Examples/ThemingRoundedExample.razor      |   2 +-
 .../Examples/ThemingStartExample.razor        |   2 +-
 .../Code/MessageServiceUsageExampleCode.html  |   2 +-
 .../Examples/MessageServiceUsageExample.razor |   2 +-
 .../NotificationServiceUsageExampleCode.html  |   2 +-
 .../NotificationServiceUsageExample.razor     |   2 +-
 .../PageProgressServiceUsageExampleCode.html  |   2 +-
 .../PageProgressServiceUsageExample.razor     |   2 +-
 Documentation/Blazorise.Docs/Program.cs       |  25 +++
 Documentation/Blazorise.Docs/Routes.razor     |   2 +-
 22 files changed, 137 insertions(+), 118 deletions(-)
 rename Documentation/{Blazorise.Docs => Blazorise.Docs.Server}/App.razor (98%)

diff --git a/Build/Blazorise.Docs.props b/Build/Blazorise.Docs.props
index be72369463..e81c6030fd 100644
--- a/Build/Blazorise.Docs.props
+++ b/Build/Blazorise.Docs.props
@@ -2,17 +2,11 @@
 
 	
 		net8.0
-		Library
-		true
-		10.0
-    	true
 		true
 		Default
 	
 
 	
-		
-		
 		
 		
 		
diff --git a/Documentation/Blazorise.Docs/App.razor b/Documentation/Blazorise.Docs.Server/App.razor
similarity index 98%
rename from Documentation/Blazorise.Docs/App.razor
rename to Documentation/Blazorise.Docs.Server/App.razor
index 41d349f856..e2a8057f93 100644
--- a/Documentation/Blazorise.Docs/App.razor
+++ b/Documentation/Blazorise.Docs.Server/App.razor
@@ -1,6 +1,7 @@
 @using Blazorise.Components
 @using System.Reflection;
 @using Blazorise.Docs.Layouts;
+@using Microsoft.AspNetCore.Components.Web
 
 
 
diff --git a/Documentation/Blazorise.Docs.Server/Blazorise.Docs.Server.csproj b/Documentation/Blazorise.Docs.Server/Blazorise.Docs.Server.csproj
index 875e994319..6eec7dba7d 100644
--- a/Documentation/Blazorise.Docs.Server/Blazorise.Docs.Server.csproj
+++ b/Documentation/Blazorise.Docs.Server/Blazorise.Docs.Server.csproj
@@ -10,8 +10,6 @@
   
 
   
-    
-    
     
   
 
diff --git a/Documentation/Blazorise.Docs.Server/Startup.cs b/Documentation/Blazorise.Docs.Server/Startup.cs
index be674f3bac..10c2c9896b 100644
--- a/Documentation/Blazorise.Docs.Server/Startup.cs
+++ b/Documentation/Blazorise.Docs.Server/Startup.cs
@@ -17,7 +17,6 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.AspNetCore.Server.Kestrel.Core;
 
 namespace Blazorise.Docs.Server;
 
@@ -53,7 +52,7 @@ public void ConfigureServices( IServiceCollection services )
             .AddBlazoriseRichTextEdit()
             .AddBlazoriseFluentValidation();
 
-        services.AddValidatorsFromAssembly( typeof( App ).Assembly );
+        services.AddValidatorsFromAssembly( typeof( Blazorise.Docs._Imports ).Assembly );
 
         services.AddMemoryCache();
         services.AddScoped();
@@ -121,7 +120,8 @@ public void Configure( WebApplication app )
 
         app.MapRazorComponents()
             .AddInteractiveServerRenderMode()
-            .AddInteractiveWebAssemblyRenderMode();
+            .AddInteractiveWebAssemblyRenderMode()
+            .AddAdditionalAssemblies( typeof( Blazorise.Docs._Imports ).Assembly );
 
         //app.UseRouting();
 
diff --git a/Documentation/Blazorise.Docs/Blazorise.Docs.csproj b/Documentation/Blazorise.Docs/Blazorise.Docs.csproj
index c562fabbe9..cda8cee2ca 100644
--- a/Documentation/Blazorise.Docs/Blazorise.Docs.csproj
+++ b/Documentation/Blazorise.Docs/Blazorise.Docs.csproj
@@ -1,97 +1,98 @@
 
 
-  
+	
 
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
+	
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	
 
-  
-  
-    ..\..\Documentation/Blazorise.Docs.Compiler/bin/Debug/net8.0/Blazorise.Docs.Compiler.dll
-  
+	
+	
+		..\..\Documentation/Blazorise.Docs.Compiler/bin/Debug/net8.0/Blazorise.Docs.Compiler.dll
+	
 
-  
-  
-    dotnet run --configuration release --project "..\..\Documentation/Blazorise.Docs.Compiler/Blazorise.Docs.Compiler.csproj"
-  
+	
+	
+		dotnet run --configuration release --project "..\..\Documentation/Blazorise.Docs.Compiler/Blazorise.Docs.Compiler.csproj"
+	
 
-  
-  
-    
-    
-    
-    
-  
+	
+	
+		
+		
+		
+		
+	
 
-  
-  
-    
-      
-    
-    
-      
-    
-  
+	
+	
+		
+			
+		
+		
+			
+		
+	
 
-  
-  
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-    
-    
-  
+	
+	
+		
+	
+	
+		
+		
+	
+	
+		
+		
+	
+	
+		
+		
+		
+		
+	
 
-  
-  
-    
-      false
-    
-  
+	
+	
+		
+			false
+		
+	
 
-  
-    
-      
-      
-    
-    
-  
+	
+		
+			
+			
+		
+		
+	
 
 
diff --git a/Documentation/Blazorise.Docs/Models/Snippets.generated.cs b/Documentation/Blazorise.Docs/Models/Snippets.generated.cs
index f75b11c372..086f5b6f64 100644
--- a/Documentation/Blazorise.Docs/Models/Snippets.generated.cs
+++ b/Documentation/Blazorise.Docs/Models/Snippets.generated.cs
@@ -4269,7 +4269,7 @@ Task OnNameChanged( string value )
 }";
 
         public const string ThemingColorsExample = @"
-    
+    
         ...
         ...
     
@@ -4288,7 +4288,7 @@ Task OnNameChanged( string value )
 }";
 
         public const string ThemingGradientExample = @"
-    
+    
         ...
         ...
     
@@ -4302,7 +4302,7 @@ Task OnNameChanged( string value )
 }";
 
         public const string ThemingRoundedExample = @"
-    
+    
         ...
         ...
     
@@ -4335,7 +4335,7 @@ Task OnThemeColorChanged( string value )
 }";
 
         public const string ThemingStartExample = @"
-    
+    
         ...
         ...
     
@@ -10278,7 +10278,7 @@ async Task ShowConfirmMessage()
     }
 }";
 
-        public const string MessageServiceUsageExample = @"
+        public const string MessageServiceUsageExample = @"
     ...
     ...
 
@@ -10493,7 +10493,7 @@ Task ShowWarningNotification()
 
         public const string NotificationServiceInstallationExample = @"Install-Package Blazorise.Components";
 
-        public const string NotificationServiceUsageExample = @"
+        public const string NotificationServiceUsageExample = @"
     ...
     ...
 
@@ -10544,7 +10544,7 @@ Task SetPageProgressHidden()
     }
 }";
 
-        public const string PageProgressServiceUsageExample = @"
+        public const string PageProgressServiceUsageExample = @"
     ...
     ...
 
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Code/ThemingColorsExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Code/ThemingColorsExampleCode.html
index 4151ef515e..544c73ae29 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Code/ThemingColorsExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Code/ThemingColorsExampleCode.html
@@ -1,7 +1,7 @@
 

 
 <Blazorise.ThemeProvider Theme="@theme">
-    <Router AppAssembly="typeof(App).Assembly">
+    <Router AppAssembly="@typeof(Program).Assembly">
         <Found>...</Found>
         <NotFound>...</NotFound>
     </Router>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Code/ThemingGradientExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Code/ThemingGradientExampleCode.html
index 472ab79767..e7e5246490 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Code/ThemingGradientExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Code/ThemingGradientExampleCode.html
@@ -1,7 +1,7 @@
 

 
 <Blazorise.ThemeProvider Theme="@theme">
-    <Router AppAssembly="typeof(App).Assembly">
+    <Router AppAssembly="@typeof(Program).Assembly">
         <Found>...</Found>
         <NotFound>...</NotFound>
     </Router>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Code/ThemingRoundedExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Code/ThemingRoundedExampleCode.html
index 9ce488bf73..0f858cb6b5 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Code/ThemingRoundedExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Code/ThemingRoundedExampleCode.html
@@ -1,7 +1,7 @@
 

 
 <Blazorise.ThemeProvider Theme="@theme">
-    <Router AppAssembly="typeof(App).Assembly">
+    <Router AppAssembly="@typeof(Program).Assembly">
         <Found>...</Found>
         <NotFound>...</NotFound>
     </Router>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Code/ThemingStartExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Code/ThemingStartExampleCode.html
index a19f3d002f..ef91713da8 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Code/ThemingStartExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Code/ThemingStartExampleCode.html
@@ -1,7 +1,7 @@
 

 
 <Blazorise.ThemeProvider Theme="@theme">
-    <Router AppAssembly="typeof(App).Assembly">
+    <Router AppAssembly="@typeof(Program).Assembly">
         <Found>...</Found>
         <NotFound>...</NotFound>
     </Router>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Examples/ThemingColorsExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Examples/ThemingColorsExample.razor
index cbd138a27b..424a733f7f 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Examples/ThemingColorsExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Examples/ThemingColorsExample.razor
@@ -1,7 +1,7 @@
 @namespace Blazorise.Docs.Docs.Examples
 
 
-    
+    
         ...
         ...
     
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Examples/ThemingGradientExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Examples/ThemingGradientExample.razor
index 0d3fef9392..d840181ede 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Examples/ThemingGradientExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Examples/ThemingGradientExample.razor
@@ -1,7 +1,7 @@
 @namespace Blazorise.Docs.Docs.Examples
 
 
-    
+    
         ...
         ...
     
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Examples/ThemingRoundedExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Examples/ThemingRoundedExample.razor
index 01855dd86b..76da4df8cf 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Examples/ThemingRoundedExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Examples/ThemingRoundedExample.razor
@@ -1,7 +1,7 @@
 @namespace Blazorise.Docs.Docs.Examples
 
 
-    
+    
         ...
         ...
     
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Examples/ThemingStartExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Examples/ThemingStartExample.razor
index 5a8e253c35..b26ba7d02d 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Examples/ThemingStartExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Theming/Examples/ThemingStartExample.razor
@@ -1,7 +1,7 @@
 @namespace Blazorise.Docs.Docs.Examples
 
 
-    
+    
         ...
         ...
     
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Services/Messages/Code/MessageServiceUsageExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Services/Messages/Code/MessageServiceUsageExampleCode.html
index d6b0026e7d..24b5bd29d0 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Services/Messages/Code/MessageServiceUsageExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Services/Messages/Code/MessageServiceUsageExampleCode.html
@@ -1,6 +1,6 @@
 

 
-<Router AppAssembly="typeof(App).Assembly">
+<Router AppAssembly="@typeof(Program).Assembly">
     <Found>...</Found>
     <NotFound>...</NotFound>
 </Router>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Services/Messages/Examples/MessageServiceUsageExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Services/Messages/Examples/MessageServiceUsageExample.razor
index dae8ed0ec9..e2c3bc33c7 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Services/Messages/Examples/MessageServiceUsageExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Services/Messages/Examples/MessageServiceUsageExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-
+
     ...
     ...
 
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Services/Notifications/Code/NotificationServiceUsageExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Services/Notifications/Code/NotificationServiceUsageExampleCode.html
index 5b22799310..38630fae3d 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Services/Notifications/Code/NotificationServiceUsageExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Services/Notifications/Code/NotificationServiceUsageExampleCode.html
@@ -1,6 +1,6 @@
 

 
-<Router AppAssembly="typeof(App).Assembly">
+<Router AppAssembly="@typeof(Program).Assembly">
     <Found>...</Found>
     <NotFound>...</NotFound>
 </Router>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Services/Notifications/Examples/NotificationServiceUsageExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Services/Notifications/Examples/NotificationServiceUsageExample.razor
index 4d7372f91c..c8524855da 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Services/Notifications/Examples/NotificationServiceUsageExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Services/Notifications/Examples/NotificationServiceUsageExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-
+
     ...
     ...
 
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Services/PageProgresses/Code/PageProgressServiceUsageExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Services/PageProgresses/Code/PageProgressServiceUsageExampleCode.html
index 23b83dcdc5..4713234fe4 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Services/PageProgresses/Code/PageProgressServiceUsageExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Services/PageProgresses/Code/PageProgressServiceUsageExampleCode.html
@@ -1,6 +1,6 @@
 

 
-<Router AppAssembly="typeof(App).Assembly">
+<Router AppAssembly="@typeof(Program).Assembly">
     <Found>...</Found>
     <NotFound>...</NotFound>
 </Router>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Services/PageProgresses/Examples/PageProgressServiceUsageExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Services/PageProgresses/Examples/PageProgressServiceUsageExample.razor
index 62bc99b1ee..36f8c92cf1 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Services/PageProgresses/Examples/PageProgressServiceUsageExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Services/PageProgresses/Examples/PageProgressServiceUsageExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-
+
     ...
     ...
 
diff --git a/Documentation/Blazorise.Docs/Program.cs b/Documentation/Blazorise.Docs/Program.cs
index e24140e4ae..99fad0634c 100644
--- a/Documentation/Blazorise.Docs/Program.cs
+++ b/Documentation/Blazorise.Docs/Program.cs
@@ -1,5 +1,11 @@
 using System.Threading.Tasks;
+using Blazorise.Bootstrap5;
+using Blazorise.FluentValidation;
+using Blazorise.Icons.FontAwesome;
+using Blazorise.RichTextEdit;
+using FluentValidation;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Blazorise.Docs;
 
@@ -9,6 +15,25 @@ public static async Task Main( string[] args )
     {
         var builder = WebAssemblyHostBuilder.CreateDefault( args );
 
+        builder.Services
+            .AddBlazorise( options =>
+            {
+                options.ProductToken = "";
+                options.Immediate = true; // optional
+            } )
+            .AddBootstrap5Providers()
+            .AddFontAwesomeIcons()
+            .AddBlazoriseRichTextEdit()
+            .AddBlazoriseFluentValidation();
+
+        builder.Services.AddValidatorsFromAssembly( typeof( Program ).Assembly );
+
+        //The WASM SDK does not seem to have this. Need to figure out a way...
+        //builder.Services.AddMemoryCache();
+        builder.Services.AddScoped();
+        builder.Services.AddScoped();
+        builder.Services.AddScoped();
+
         await builder.Build().RunAsync();
     }
 }
\ No newline at end of file
diff --git a/Documentation/Blazorise.Docs/Routes.razor b/Documentation/Blazorise.Docs/Routes.razor
index c50cc3c328..0833dd9c27 100644
--- a/Documentation/Blazorise.Docs/Routes.razor
+++ b/Documentation/Blazorise.Docs/Routes.razor
@@ -1,5 +1,5 @@
 
-    
+    
         
             
             @*  *@