From dd2ad7ade86bf5512f6d10944a386886c7bc6e2f Mon Sep 17 00:00:00 2001
From: Ben Ramey <benramey@fastmail.com>
Date: Fri, 5 Apr 2024 19:47:02 -0500
Subject: [PATCH] Fix oap theme layout issue

---
 .../BenRamey.Theme/ResourceManagementOptionsConfiguration.cs  | 2 +-
 src/BenRamey/BenRamey.Theme/Startup.cs                        | 3 +--
 src/OAP/Oap.Content/Manifest.cs                               | 1 -
 src/OAP/Oap.Theme/Manifest.cs                                 | 1 -
 src/OAP/Oap.Theme/Oap.Theme.csproj                            | 4 ----
 src/OAP/Oap.Theme/ResourceManagementOptionsConfiguration.cs   | 2 +-
 src/OAP/Oap.Theme/Views/Layout.cshtml                         | 2 +-
 src/OAP/Oap.Theme/webpack.config.js                           | 1 +
 src/OAP/OapApi.v1/Manifest.cs                                 | 1 -
 9 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/BenRamey/BenRamey.Theme/ResourceManagementOptionsConfiguration.cs b/src/BenRamey/BenRamey.Theme/ResourceManagementOptionsConfiguration.cs
index 3b90049..8995eed 100644
--- a/src/BenRamey/BenRamey.Theme/ResourceManagementOptionsConfiguration.cs
+++ b/src/BenRamey/BenRamey.Theme/ResourceManagementOptionsConfiguration.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.ResourceManagement;
 
-namespace BenRameyTheme;
+namespace BenRamey.Theme;
 
 public class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
 {
diff --git a/src/BenRamey/BenRamey.Theme/Startup.cs b/src/BenRamey/BenRamey.Theme/Startup.cs
index daaea2a..83ab28c 100644
--- a/src/BenRamey/BenRamey.Theme/Startup.cs
+++ b/src/BenRamey/BenRamey.Theme/Startup.cs
@@ -1,10 +1,9 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
-using BenRameyTheme;
 using OrchardCore.Modules;
 using OrchardCore.ResourceManagement;
 
-namespace Twain.Web;
+namespace BenRamey.Theme;
 
 public class Startup : StartupBase
 {
diff --git a/src/OAP/Oap.Content/Manifest.cs b/src/OAP/Oap.Content/Manifest.cs
index 06d5705..4121d3e 100644
--- a/src/OAP/Oap.Content/Manifest.cs
+++ b/src/OAP/Oap.Content/Manifest.cs
@@ -1,7 +1,6 @@
 using OrchardCore.Modules.Manifest;
 
 [assembly: Module(
-	Id = "OAP.Content",
 	Name = "Overseas Auto Protection",
 	Author = "Overseas Auto Protection",
 	Website = "https://oaprotection.org/",
diff --git a/src/OAP/Oap.Theme/Manifest.cs b/src/OAP/Oap.Theme/Manifest.cs
index 89788d6..ab53f75 100644
--- a/src/OAP/Oap.Theme/Manifest.cs
+++ b/src/OAP/Oap.Theme/Manifest.cs
@@ -1,7 +1,6 @@
 using OrchardCore.DisplayManagement.Manifest;
 
 [assembly: Theme(
-	Id = "OAP.Theme",
     Name = "OAP Theme",
     Author = "Overseas Auto Protection",
     Website = "https://oaprotection.org/",
diff --git a/src/OAP/Oap.Theme/Oap.Theme.csproj b/src/OAP/Oap.Theme/Oap.Theme.csproj
index 0cd14c6..813bbd4 100644
--- a/src/OAP/Oap.Theme/Oap.Theme.csproj
+++ b/src/OAP/Oap.Theme/Oap.Theme.csproj
@@ -24,10 +24,6 @@
     <PackageReference Include="OrchardCore.ResourceManagement" Version="1.8.2" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="wwwroot\" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Oap\Oap.csproj" />
   </ItemGroup>
diff --git a/src/OAP/Oap.Theme/ResourceManagementOptionsConfiguration.cs b/src/OAP/Oap.Theme/ResourceManagementOptionsConfiguration.cs
index 40a5fc7..4bbc2f2 100644
--- a/src/OAP/Oap.Theme/ResourceManagementOptionsConfiguration.cs
+++ b/src/OAP/Oap.Theme/ResourceManagementOptionsConfiguration.cs
@@ -11,7 +11,7 @@ public class ResourceManagementOptionsConfiguration : IConfigureOptions<Resource
 
 		m_manifest
 			.DefineStyle("OapTheme-styles")
-			.SetUrl("~/OapTheme/site.css")
+			.SetUrl("~/Oap.Theme/site.css")
 			.SetVersion("1.0.0");
 	}
 
diff --git a/src/OAP/Oap.Theme/Views/Layout.cshtml b/src/OAP/Oap.Theme/Views/Layout.cshtml
index 48c3b6d..29d8458 100644
--- a/src/OAP/Oap.Theme/Views/Layout.cshtml
+++ b/src/OAP/Oap.Theme/Views/Layout.cshtml
@@ -14,7 +14,7 @@
 
     <resources type="Meta" />
 
-    <link type="image/x-icon" rel="shortcut icon" href="~/OapTheme/assets/favicon.ico">
+    <link type="image/x-icon" rel="shortcut icon" href="~/Oap.Theme/assets/favicon.ico">
 
     <style asp-name="oaptheme-styles"></style>
 
diff --git a/src/OAP/Oap.Theme/webpack.config.js b/src/OAP/Oap.Theme/webpack.config.js
index 8e6901b..df45082 100644
--- a/src/OAP/Oap.Theme/webpack.config.js
+++ b/src/OAP/Oap.Theme/webpack.config.js
@@ -4,6 +4,7 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 
 module.exports = {
+  mode: 'development',
   entry: {
     site: './Scripts/site.js',
   },
diff --git a/src/OAP/OapApi.v1/Manifest.cs b/src/OAP/OapApi.v1/Manifest.cs
index 43bd5b1..6fd0b6e 100644
--- a/src/OAP/OapApi.v1/Manifest.cs
+++ b/src/OAP/OapApi.v1/Manifest.cs
@@ -1,7 +1,6 @@
 using OrchardCore.Modules.Manifest;
 
 [assembly: Module(
-	Id = "OAP.APIv1",
 	Name = "Overseas Auto Protection API v1",
 	Author = "Overseas Auto Protection",
 	Website = "https://oaprotection.org/api/v1/",