diff --git a/Template.Maui/MauiProgram.cs b/Template.Maui/MauiProgram.cs index 9f066ce..7941d12 100644 --- a/Template.Maui/MauiProgram.cs +++ b/Template.Maui/MauiProgram.cs @@ -1,5 +1,6 @@ using IntegryApiClient.MAUI; using Microsoft.Extensions.Logging; +using MudBlazor.Services; using Template.Maui.Services; using Template.Shared; using Template.Shared.Interfaces; @@ -29,7 +30,7 @@ namespace Template.Maui }); builder.Services.AddMauiBlazorWebView(); - builder.Services.AddBlazorBootstrap(); + builder.Services.AddMudServices(); #if DEBUG builder.Services.AddBlazorWebViewDeveloperTools(); diff --git a/Template.Maui/Template.Maui.csproj b/Template.Maui/Template.Maui.csproj index 968a0f3..e2b0494 100644 --- a/Template.Maui/Template.Maui.csproj +++ b/Template.Maui/Template.Maui.csproj @@ -1,10 +1,8 @@  - $(TargetFrameworks);net8.0-android - $(TargetFrameworks);net8.0-ios - $(TargetFrameworks);net8.0-maccatalyst - $(TargetFrameworks);net8.0-windows10.0.19041.0 + net9.0-ios;net9.0-android + @@ -34,12 +32,12 @@ 1 14.2 - + 24.0 - 10.0.17763.0 - 10.0.17763.0 + + @@ -47,7 +45,7 @@ $(DefineConstants);PLATFORM 26.0 - 34 + 35 - + diff --git a/Template.Shared/Components/Layout/MainLayout.razor b/Template.Shared/Components/Layout/MainLayout.razor index 3da63fd..6753006 100644 --- a/Template.Shared/Components/Layout/MainLayout.razor +++ b/Template.Shared/Components/Layout/MainLayout.razor @@ -1,5 +1,10 @@ @inherits LayoutComponentBase + + + + +
@*
diff --git a/Template.Shared/Components/Pages/Home.razor b/Template.Shared/Components/Pages/Home.razor index 190c626..73d0d8b 100644 --- a/Template.Shared/Components/Pages/Home.razor +++ b/Template.Shared/Components/Pages/Home.razor @@ -2,14 +2,4 @@

Hello, world!

-Welcome to your new app. - - - ... - - - - -@code { - private Modal modal = default!; -} \ No newline at end of file +Welcome to your new app. \ No newline at end of file diff --git a/Template.Shared/Template.Shared.csproj b/Template.Shared/Template.Shared.csproj index 96bbb52..ec14ec8 100644 --- a/Template.Shared/Template.Shared.csproj +++ b/Template.Shared/Template.Shared.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 enable enable @@ -11,9 +11,9 @@ - - - + + + diff --git a/Template.Shared/_Imports.razor b/Template.Shared/_Imports.razor index 62c3cc9..19f6f73 100644 --- a/Template.Shared/_Imports.razor +++ b/Template.Shared/_Imports.razor @@ -6,5 +6,5 @@ @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.JSInterop @using Template.Shared.Components -@using BlazorBootstrap; +@using MudBlazor @using static InteractiveRenderSettings diff --git a/Template.Web/Components/Pages/Error.razor b/Template.Web/Components/Pages/Error.razor index 576cc2d..5204328 100644 --- a/Template.Web/Components/Pages/Error.razor +++ b/Template.Web/Components/Pages/Error.razor @@ -24,13 +24,12 @@ and restarting the app.

-@code{ - [CascadingParameter] - private HttpContext? HttpContext { get; set; } - +@code { private string? RequestId { get; set; } private bool ShowRequestId => !string.IsNullOrEmpty(RequestId); - protected override void OnInitialized() => - RequestId = Activity.Current?.Id ?? HttpContext?.TraceIdentifier; + protected override void OnInitialized() + { + RequestId = Guid.NewGuid().ToString(); + } } diff --git a/Template.Web/Program.cs b/Template.Web/Program.cs index 18ab6ae..db0eb37 100644 --- a/Template.Web/Program.cs +++ b/Template.Web/Program.cs @@ -1,5 +1,8 @@ using IntegryApiClient.Blazor; -using Template.Web.Components; +using Microsoft.AspNetCore.Components.Web; +using Microsoft.AspNetCore.Components.WebAssembly.Hosting; +using MudBlazor.Services; +using Template.Shared.Components; using Template.Shared.Interfaces; using Template.Web.Services; @@ -10,34 +13,16 @@ const string BaseRestServicesEndpoint = "https://devservices.studioml.it/ems-api const string BaseRestServicesEndpoint = "https://services.studioml.it/ems-api/"; #endif -var builder = WebApplication.CreateBuilder(args); +var builder = WebAssemblyHostBuilder.CreateDefault(args); -// Add services to the container. -builder.Services.AddRazorComponents() - .AddInteractiveServerComponents(); - -builder.Services.AddBlazorBootstrap(); +builder.Services.AddMudServices(); +builder.Services.AddAuthorizationCore(); builder.Services.UseIntegry(BaseRestServicesEndpoint); builder.Services.AddScoped(); -var app = builder.Build(); +builder.RootComponents.Add("#app"); +builder.RootComponents.Add("head::after"); +builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) }); -// Configure the HTTP request pipeline. -if (!app.Environment.IsDevelopment()) -{ - app.UseExceptionHandler("/Error", createScopeForErrors: true); - // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. - app.UseHsts(); -} - -app.UseHttpsRedirection(); - -app.UseStaticFiles(); -app.UseAntiforgery(); - -app.MapRazorComponents() - .AddInteractiveServerRenderMode() - .AddAdditionalAssemblies(typeof(Template.Shared._Imports).Assembly); - -app.Run(); +await builder.Build().RunAsync(); diff --git a/Template.Web/Template.Web.csproj b/Template.Web/Template.Web.csproj index fd1e962..067f05e 100644 --- a/Template.Web/Template.Web.csproj +++ b/Template.Web/Template.Web.csproj @@ -1,17 +1,24 @@ - + - net8.0 + net9.0 enable enable - + + + + + + + + diff --git a/Template.Web/wwwroot/favicon.png b/Template.Web/wwwroot/favicon.png new file mode 100644 index 0000000..8422b59 Binary files /dev/null and b/Template.Web/wwwroot/favicon.png differ diff --git a/Template.Web/Components/App.razor b/Template.Web/wwwroot/index.html similarity index 61% rename from Template.Web/Components/App.razor rename to Template.Web/wwwroot/index.html index a568c09..e2bc347 100644 --- a/Template.Web/Components/App.razor +++ b/Template.Web/wwwroot/index.html @@ -8,32 +8,34 @@ - - - + + + - + - - - +
+ +
- - + + - + - + - - + + - + \ No newline at end of file