Merge pull request #10 from codemonkey85/revert-to-wasm

Revert back to WASM

.github/workflows/main.yml

@@ -0,0 +1,49 @@
+name: Deploy to GitHub Pages
+
+# Run workflow on every push to the main branch
+on:
+  push:
+    branches: [main]
+
+jobs:
+  deploy-to-github-pages:
+    # use ubuntu-latest image to run steps on
+    runs-on: ubuntu-latest
+    steps:
+      # uses GitHub's checkout action to checkout code form the main branch
+      - uses: actions/[email protected]
+
+      # sets up .NET SDK
+      - name: Setup .NET Core SDK
+        uses: actions/[email protected]
+        with:
+          dotnet-version: "8.x"
+
+      - name: Install WASM workload
+        run: dotnet workload install wasm-tools
+
+      - name: Test
+        run: dotnet test
+
+      # publishes Blazor project to the release-folder
+      - name: Publish .NET Core Project
+        run: dotnet publish PKMDS-Blazor/Wasm/PKMDS-Blazor.Wasm.csproj -c Release -o release --nologo
+
+      # changes the base-tag in index.html from '/' to 'PKMDS-Blazor' to match GitHub Pages repository subdirectory
+      - name: Change base-tag in index.html from / to PKMDS-Blazor
+        run: sed -i 's/<base href="\/" \/>/<base href="\/PKMDS-Blazor\/" \/>/g' release/wwwroot/index.html
+
+      # copy index.html to 404.html to serve the same file when a file is not found
+      - name: copy index.html to 404.html
+        run: cp release/wwwroot/index.html release/wwwroot/404.html
+
+      # add .nojekyll file to tell GitHub pages to not treat this as a Jekyll project. (Allow files and folders starting with an underscore)
+      - name: Add .nojekyll file
+        run: touch release/wwwroot/.nojekyll
+
+      - name: Commit wwwroot to GitHub Pages
+        uses: JamesIves/[email protected]
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          branch: gh-pages
+          folder: release/wwwroot

Pkmds.Web/App.razor

@@ -0,0 +1,16 @@
+<Router AppAssembly="@typeof(App).Assembly">
+    <Found Context="routeData">
+        <RouteView RouteData="@routeData"
+                   DefaultLayout="@typeof(MainLayout)" />
+        <FocusOnNavigate RouteData="@routeData"
+                         Selector="h1" />
+    </Found>
+    <NotFound>
+        <PageTitle>Not found</PageTitle>
+        <LayoutView Layout="@typeof(MainLayout)">
+            <p role="alert">
+                Sorry, there's nothing at this address.
+            </p>
+        </LayoutView>
+    </NotFound>
+</Router>

Pkmds.Web/GlobalUsings.cs

@@ -1,9 +1,10 @@
-global using System.Diagnostics;
-global using System.Reflection;
+global using System.Reflection;
 global using System.Text;
 global using KristofferStrube.Blazor.FileSystemAccess;
 global using Microsoft.AspNetCore.Components;
 global using Microsoft.AspNetCore.Components.Forms;
+global using Microsoft.AspNetCore.Components.Web;
+global using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 global using Microsoft.JSInterop;
 global using MudBlazor;
 global using MudBlazor.Services;

Pkmds.Web/Components/Layout/MainLayout.razor.cs → Pkmds.Web/Layout/MainLayout.razor.cs

@@ -1,4 +1,4 @@
-namespace Pkmds.Web.Components.Layout;
+namespace Pkmds.Web.Layout;
 
 public partial class MainLayout
 {

Pkmds.Web/Components/Pages/Home.razor.cs → Pkmds.Web/Pages/Home.razor.cs

@@ -1,4 +1,4 @@
-namespace Pkmds.Web.Components.Pages;
+namespace Pkmds.Web.Pages;
 
 public partial class Home : IDisposable
 {

Pkmds.Web/Pkmds.Web.csproj

@@ -1,15 +1,28 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
+		<ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
 	</PropertyGroup>
 
 	<ItemGroup>
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
 		<PackageReference Include="MudBlazor" Version="6.11.2" />
 		<PackageReference Include="PKHeX.Core" Version="23.10.12" />
 		<PackageReference Include="KristofferStrube.Blazor.FileSystemAccess" Version="3.2.2" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<ServiceWorker Include="wwwroot\service-worker.js" PublishedContent="wwwroot\service-worker.published.js" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <Folder Include="Components\EditForms\Tabs\" />
+	  <Folder Include="Extensions\" />
+	  <Folder Include="Services\" />
+	</ItemGroup>
+
 </Project>

Pkmds.Web/Program.cs

@@ -1,9 +1,9 @@
-var builder = WebApplication.CreateBuilder(args);
-var services = builder.Services;
+var builder = WebAssemblyHostBuilder.CreateDefault(args);
 
-services
-    .AddRazorComponents()
-    .AddInteractiveServerComponents();
+builder.RootComponents.Add<App>("#app");
+builder.RootComponents.Add<HeadOutlet>("head::after");
+
+var services = builder.Services;
 
 services
     .AddMudServices()
@@ -14,20 +14,4 @@
 
 var app = builder.Build();
 
-if (!app.Environment.IsDevelopment())
-{
-    app.UseExceptionHandler("/Error", createScopeForErrors: true);
-    app.UseHsts();
-}
-
-app.UseHttpsRedirection();
-
-app
-    .UseStaticFiles()
-    .UseAntiforgery();
-
-app
-    .MapRazorComponents<App>()
-    .AddInteractiveServerRenderMode();
-
-app.Run();
+await app.RunAsync();

Pkmds.Web/Properties/launchSettings.json

@@ -4,16 +4,17 @@
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:43934",
-      "sslPort": 44339
+      "applicationUrl": "http://localhost:64000",
+      "sslPort": 44359
     }
   },
   "profiles": {
     "http": {
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "applicationUrl": "http://localhost:5266",
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+      "applicationUrl": "http://localhost:5079",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
@@ -22,14 +23,16 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:7182;http://localhost:5266",
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+      "applicationUrl": "https://localhost:7051;http://localhost:5079",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
     "IIS Express": {
       "commandName": "IISExpress",
       "launchBrowser": true,
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

Pkmds.Web/_Imports.razor

@@ -12,6 +12,7 @@
 @using Pkmds.Web.Components
 @using Pkmds.Web.Components.EditForms
 @using Pkmds.Web.Components.EditForms.Tabs
+@using Pkmds.Web.Layout
 @using Pkmds.Web.Services
 @using PKHeX.Core
 @using System.Diagnostics