Port to .NET 8, re-write, etc.

Directory.Build.props

@@ -1,9 +1,13 @@
 <Project>
-    <PropertyGroup>
-        <AspNetCoreVersion>7.0.0</AspNetCoreVersion>
-        <BlazorVersion>7.0.0</BlazorVersion>
-        <EntityFrameworkVersion>7.0.0</EntityFrameworkVersion>
-        <TargetFrameworkVersion>net7.0</TargetFrameworkVersion>
-        <SystemNetHttpJsonVersion>7.0.0</SystemNetHttpJsonVersion>
-    </PropertyGroup>
+  <PropertyGroup>
+    <AspNetCoreVersion>8.0.8</AspNetCoreVersion>
+    <BlazorVersion>8.0.0</BlazorVersion>
+    <EntityFrameworkVersion>8.0.8</EntityFrameworkVersion>
+    <TargetFrameworkVersion>net8.0</TargetFrameworkVersion>
+    <SystemNetHttpJsonVersion>8.0.0</SystemNetHttpJsonVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
 </Project>

Directory.Packages.props

@@ -0,0 +1,20 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <DefaultTargetFramework>$(TargetFrameworkVersion)</DefaultTargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="$(AspNetCoreVersion)" />
+    <PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="$(AspNetCoreVersion)" />
+    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(AspNetCoreVersion)" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EntityFrameworkVersion)" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="$(EntityFrameworkVersion)" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(AspNetCoreVersion)" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(AspNetCoreVersion)" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="$(SystemNetHttpJsonVersion)" />
+    <PackageVersion Include="System.Net.Http.Json" Version="$(SystemNetHttpJsonVersion)" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components" Version="$(AspNetCoreVersion)" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion)" />
+    <PackageVersion Include="WebPush" Version="1.0.12" />
+  </ItemGroup>
+</Project>

src/BlazingComponents/BlazingComponents.csproj → src/BlazingComponents/BlazingPizza.TemplateComponents.csproj

@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
-	  <Nullable>enable</Nullable>
+    <RootNamespace>BlazingPizza.TemplateComponents</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Components" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" />
   </ItemGroup>
 
 </Project>

src/BlazingComponents/TemplatedDialog.razor

@@ -1,4 +1,5 @@
 @if (Show)
+
 {
     <div class="dialog-container">
         <div class="dialog">
@@ -9,5 +10,6 @@
 
 @code {
     [Parameter, EditorRequired] public RenderFragment? ChildContent { get; set; }
+
     [Parameter] public bool Show { get; set; }
 }

src/BlazingComponents/TemplatedList.razor

@@ -1,17 +1,17 @@
 @typeparam TItem
 
-@if (items is null)
+@if (_items is null)
 {
     @Loading
 }
-else if (!items.Any())
+else if (_items.Any() is false)
 {
     @Empty
 }
 else
 {
     <div class="list-group @ListGroupClass">
-        @foreach (var item in items)
+        @foreach (var item in _items)
         {
             <div class="list-group-item">
                 @if (Item is not null)
@@ -24,7 +24,7 @@ else
 }
 
 @code {
-    IEnumerable<TItem>? items;
+    IEnumerable<TItem>? _items;
 
     [Parameter, EditorRequired] public Func<Task<IEnumerable<TItem>>>? Loader { get; set; }
     [Parameter] public RenderFragment? Loading { get; set; }
@@ -36,7 +36,7 @@ else
     {
         if (Loader is not null)
         {
-            items = await Loader();
+            _items = await Loader();
         }
     }
 }

src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj

@@ -2,17 +2,21 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
-    <ImplicitUsings>true</ImplicitUsings>
-	  <Nullable>enable</Nullable>
+    <RootNamespace>BlazingPizza.ComponentsLibrary</RootNamespace>
+    <NoWarn>IDE0130</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Components" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" />
   </ItemGroup>
 
   <ItemGroup>
     <SupportedPlatform Include="browser" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\BlazingPizza.Shared\BlazingPizza.Shared.csproj" />
+  </ItemGroup>
+
 </Project>

src/BlazingPizza.ComponentsLibrary/LocalStorage/LocalStorageJSInterop.cs

@@ -0,0 +1,45 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.JSInterop;
+
+namespace BlazingPizza.ComponentsLibrary;
+
+public sealed class LocalStorageJSInterop(IJSRuntime jsRuntime) : IAsyncDisposable
+{
+    private readonly Lazy<Task<IJSObjectReference>> _moduleTask =
+        new(valueFactory: () => jsRuntime.InvokeAsync<IJSObjectReference>(
+            identifier: "import", 
+            args: "./_content/BlazingPizza.ComponentsLibrary/localStorage.js").AsTask());
+
+    public async ValueTask<T> GetLocalStorageItemAsync<T>(string key)
+    {
+        var module = await _moduleTask.Value;
+
+        return await module.InvokeAsync<T>("getLocalStorageItem", key);
+    }
+
+    public async ValueTask SetLocalStorageItemAsync<T>(string key, T value)
+    {
+        var module = await _moduleTask.Value;
+
+        await module.InvokeVoidAsync("setLocalStorageItem", key, value);
+    }
+
+    public async ValueTask DeleteLocalStorageItemAsync(string key)
+    {
+        var module = await _moduleTask.Value;
+
+        await module.InvokeVoidAsync("deleteLocalStorageItem", key);
+    }
+
+    public async ValueTask DisposeAsync()
+    {
+        if (_moduleTask.IsValueCreated)
+        {
+            var module = await _moduleTask.Value;
+
+            await module.DisposeAsync();
+        }
+    }
+}

src/BlazingPizza.ComponentsLibrary/LocalStorage/LocalStorageServiceCollectionExtensions.cs

@@ -0,0 +1,22 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using BlazingPizza.ComponentsLibrary;
+
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class LocalStorageServiceCollectionExtensions
+{
+    /// <summary>
+    /// Adds the <see cref="LocalStorageJSInterop"/> as a scoped-lifetime service
+    /// to the given <paramref name="services"/> collection.
+    /// </summary>
+    /// <param name="services">The service collection to add services to.</param>
+    /// <returns>The same service instance given, with the added service.</returns>
+    public static IServiceCollection AddLocalStorageJSInterop(this IServiceCollection services)
+    {
+        services.AddScoped<LocalStorageJSInterop>();
+
+        return services;
+    }
+}

src/BlazingPizza.ComponentsLibrary/Map/Map.razor

@@ -7,10 +7,13 @@
     string elementId = $"map-{Guid.NewGuid().ToString("D")}";
 
     [Parameter] public double Zoom { get; set; }
-    [Parameter, EditorRequired] public List<Marker> Markers { get; set; } = new();
+    [Parameter, EditorRequired] public List<Marker> Markers { get; set; } = [];
 
     protected async override Task OnAfterRenderAsync(bool firstRender)
     {
+        // First render bit isn't needed, so let's discard it.
+        _ = firstRender;
+
         await JSRuntime.InvokeVoidAsync(
             "deliveryMap.showOrUpdate",
             elementId,

src/BlazingPizza.ComponentsLibrary/wwwroot/deliveryMap.js

@@ -1,6 +1,6 @@
 (function () {
-    var tileUrl = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
-    var tileAttribution = 'Map data &copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>';
+    var tileUrl = 'https://tile.openstreetmap.org/{z}/{x}/{y}.png';
+    var tileAttribution = '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors';
 
     // Global export
     window.deliveryMap = {

src/BlazingPizza.ComponentsLibrary/wwwroot/localStorage.js

@@ -1,7 +1,11 @@
-(function () {
-    window.blazorLocalStorage = {
-        get: key => key in localStorage ? JSON.parse(localStorage[key]) : null,
-        set: (key, value) => { localStorage[key] = JSON.stringify(value); },
-        delete: key => { delete localStorage[key]; }
-    };
-})();
+export function getLocalStorageItem(key) {
+    return key in localStorage ? JSON.parse(localStorage[key]) : null;
+}
+
+export function setLocalStorageItem(key, value) {
+    localStorage[key] = JSON.stringify(value);
+}
+
+export function deleteLocalStorageItem(key) {
+    delete localStorage[key];
+}