Figure out theme problems!

Twain.sln

@@ -12,9 +12,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7C34E548
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Build", "tools\Build\Build.csproj", "{97FFBB7D-C82D-47B2-B110-377B5F6B49C2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Cms.MarkdownImport", "src\OrchardCore.Cms.MarkdownImport\OrchardCore.Cms.MarkdownImport.csproj", "{7B0477DA-BCD5-47ED-8B88-76D046524434}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MarkdownImport", "src\Modules\MarkdownImport\MarkdownImport.csproj", "{7B0477DA-BCD5-47ED-8B88-76D046524434}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.BenRameyTheme", "src\OrchardCore.BenRameyTheme\OrchardCore.BenRameyTheme.csproj", "{A7498019-5941-479B-ADB2-56B6C984C608}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BenRameyTheme", "src\Themes\BenRameyTheme\BenRameyTheme.csproj", "{A7498019-5941-479B-ADB2-56B6C984C608}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/OrchardCore.BenRameyTheme/OrchardCore.BenRameyTheme.csproj

@@ -1,51 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="wwwroot\assets\**" />
-    <Compile Remove="wwwroot\css\**" />
-    <Compile Remove="wwwroot\js\**" />
-    <EmbeddedResource Remove="wwwroot\assets\**" />
-    <EmbeddedResource Remove="wwwroot\css\**" />
-    <EmbeddedResource Remove="wwwroot\js\**" />
-    <None Remove="wwwroot\assets\**" />
-    <None Remove="wwwroot\css\**" />
-    <None Remove="wwwroot\js\**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Assets\package.json" />
-    <EmbeddedResource Include="Assets\src\assets\favicon.ico" />
-    <EmbeddedResource Include="Assets\src\assets\img\android-chrome-192x192.png" />
-    <EmbeddedResource Include="Assets\src\assets\img\android-chrome-512x512.png" />
-    <EmbeddedResource Include="Assets\src\assets\img\apple-touch-icon.png" />
-    <EmbeddedResource Include="Assets\src\assets\img\favicon-16x16.png" />
-    <EmbeddedResource Include="Assets\src\assets\img\favicon-32x32.png" />
-    <EmbeddedResource Include="Assets\src\scss\bootstrap-variables.scss" />
-    <EmbeddedResource Include="Assets\src\scss\variables.scss" />
-    <EmbeddedResource Include="Assets\webpack.config.js" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="OrchardCore.Theme.Targets" Version="1.5.0" />
-    <PackageReference Include="OrchardCore.ContentManagement" Version="1.5.0" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.5.0" />
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.5.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Assets\src\js\" />
-    <Folder Include="Styles\" />
-  </ItemGroup>
-
-</Project>

src/Themes/BenRameyTheme/BenRameyTheme.csproj

@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="benrameytheme\**" />
+    <EmbeddedResource Remove="benrameytheme\**" />
+    <None Remove="benrameytheme\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="OrchardCore.Theme.Targets" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.5.0" />
+  </ItemGroup>
+
+</Project>

src/Themes/BenRameyTheme/ResourceManagementOptionsConfiguration.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.BenRameyTheme;
+namespace BenRameyTheme;
 
 public class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
 {

src/Themes/BenRameyTheme/Startup.cs

@@ -1,6 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
-using OrchardCore.BenRameyTheme;
+using BenRameyTheme;
 using OrchardCore.Modules;
 using OrchardCore.ResourceManagement;
 

src/Themes/BenRameyTheme/benrameytheme/build/404.html

@@ -0,0 +1 @@
+<!doctype html><html lang="en"><head><title>Ben Ramey's Blog</title><script defer="defer" src="/styles.js"></script><link href="/styles.css" rel="stylesheet"></head><body><header><div class="container"><div class="d-flex justify-content-between align-item-center"><a class="d-flex justify-content-start align-items-center me-2 text-decoration-none" href="/" title="Home"><img src="https://en.gravatar.com/userimage/738990/32d8e61848233a67f5e02dcc43be0ff8.jpeg" alt="Gravatar" width="40px" height="40px"><span class="ms-2">Ben Ramey's Blog</span></a><div class="d-none d-sm-flex flex-column justify-content-around ms-2"><small>Scripture, programming problems, solutions and stories.</small></div></div></div></header><nav class="main"><div class="container d-flex justify-content-center"><a href="/archive">archive</a><a href="/tags">tags </a><a href="/categories">categories</a></div></nav><main><div class="container"><article class="page"><h1 class="page-title">404 : Page not found</h1><p>Sorry, we&apos;ve misplaced that URL or it&apos;s pointing to something that doesn&apos;t exist.</p><p><a href="/">Head back home</a><span> to try finding it again.</span></p></article></div></main><footer class="footer"><div class="container"><hr><small>&copy; <time datetime="2023-01-01T00:00:00Z">2023</time>. All rights reserved.</small></div></footer></body></html>

src/Themes/BenRameyTheme/benrameytheme/build/index.html

@@ -0,0 +1 @@
+<!doctype html><html lang="en"><head><title>Ben Ramey's Blog</title><link rel="icon" href="/favicon.ico"><script defer="defer" src="/styles.js"></script><link href="/styles.css" rel="stylesheet"></head><body><header><div class="container"><div class="d-flex justify-content-between align-item-center"><a class="d-flex justify-content-start align-items-center me-2 text-decoration-none" href="/" title="Home"><img src="https://en.gravatar.com/userimage/738990/32d8e61848233a67f5e02dcc43be0ff8.jpeg" alt="Gravatar" width="40px" height="40px"><span class="ms-2">Ben Ramey's Blog</span></a><div class="d-none d-sm-flex flex-column justify-content-around ms-2"><small>Scripture, programming problems, solutions and stories.</small></div></div></div></header><nav class="main"><div class="container d-flex justify-content-center"><a href="/archive">archive</a><a href="/tags">tags </a><a href="/categories">categories</a></div></nav><main><div class="container"><article class="page"><h1 class="page-title">This is a page title</h1></article></div></main><footer class="footer"><div class="container"><hr><small>&copy; <time datetime="2023-01-01T00:00:00Z">2023</time>. All rights reserved.</small></div></footer></body></html>

src/Themes/BenRameyTheme/benrameytheme/build/post.html

@@ -0,0 +1 @@
+<!doctype html><html lang="en"><head><title>Ben Ramey's Blog</title><script defer="defer" src="/styles.js"></script><link href="/styles.css" rel="stylesheet"></head><body><header><div class="container"><div class="d-flex justify-content-between align-item-center"><a class="d-flex justify-content-start align-items-center me-2 text-decoration-none" href="/" title="Home"><img src="https://en.gravatar.com/userimage/738990/32d8e61848233a67f5e02dcc43be0ff8.jpeg" alt="Gravatar" width="40px" height="40px"><span class="ms-2">Ben Ramey's Blog</span></a><div class="d-none d-sm-flex flex-column justify-content-around ms-2"><small>Scripture, programming problems, solutions and stories.</small></div></div></div></header><nav class="main"><div class="container d-flex justify-content-center"><a href="/archive">archive</a><a href="/tags">tags </a><a href="/categories">categories</a></div></nav><main><div class="container"><article class="post"><h1 class="post-title">Sample post title</h1><div class="post-info d-flex justify-content-start"><time class="post-date" datetime="2022/02/10">Thu Feb 10th, 2022, about 1 year ago</time><nav class="post-tags"><a href="/tags/tag1">#tag1</a><a href="/tags/tag2">#tag2</a><a href="/tags/tag3">#tag3</a></nav><nav class="post-categories"><span>posted in: </span><a href="/categories/category1">category1</a><a href="/categories/category2">category2</a><a href="/categories/category3">category3</a></nav></div><div><p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Pellentesque elit eget gravida cum sociis natoque penatibus et magnis. Fames ac turpis egestas integer eget aliquet nibh praesent. At imperdiet dui accumsan sit amet nulla facilisi morbi. Sed viverra tellus in hac. Faucibus vitae aliquet nec ullamcorper sit amet. Pretium viverra suspendisse potenti nullam</p><p>ac tortor vitae. Arcu non sodales neque sodales ut etiam sit amet nisl. In iaculis nunc sed augue lacus. Ultrices vitae auctor eu augue ut. Nibh ipsum consequat nisl vel pretium lectus quam id. Eget gravida cum sociis natoque penatibus et magnis dis parturient. A iaculis at erat pellentesque. Lectus nulla at volutpat diam ut venenatis. Nisl vel pretium lectus quam. Etiam dignissim diam quis enim lobortis scelerisque. Non sodales neque sodales ut etiam sit amet nisl. Feugiat nibh sed pulvinar proin gravida. Nam at lectus urna duis convallis convallis.</p><h1>This is a header 1</h1><h2>This is a header 2</h2><h3>This is a header 3</h3><h4>This is a header 4</h4><h5>This is a header 5</h5><blockquote>this is a very important quote from someone</blockquote><div class="remark-highlight"><pre class="language-csharp"><code class="language-csharp">> become -a "hacker" --with "this code block"</code></pre></div></div></article><section class="comments"><a id="comments-section"><h2>Comments</h2></a></section></div></main><footer class="footer"><div class="container"><hr><small>&copy; <time datetime="2023-01-01T00:00:00Z">2023</time>. All rights reserved.</small></div></footer></body></html>

src/Themes/BenRameyTheme/benrameytheme/webpack.config.js

@@ -5,15 +5,14 @@ const CssMinimizerPlugin = require("css-minimizer-webpack-plugin");
 const CopyPlugin = require("copy-webpack-plugin");
 
 module.exports = (env) => {
-	const outputDir = env.production ? "../wwwroot" : "build";
-
+	const outputDir = path.resolve(__dirname, "build");
 	return {
 		mode: env.production ? "production" : "development",
 		entry: {
 			styles: "./src/scss/styles.scss",
 		},
 		output: {
-			path: path.resolve(__dirname, outputDir),
+			path: outputDir,
 			clean: true,
 			publicPath: "/",
 		},
@@ -34,9 +33,6 @@ module.exports = (env) => {
 			],
 		},
 		plugins: [
-			...(env.production
-				? []
-				: [
 			new HtmlWebpackPlugin({
 				template: "src/index.pug",
 				favicon: "src/assets/favicon.ico",
@@ -49,11 +45,13 @@ module.exports = (env) => {
 				template: "src/404.pug",
 				filename: "404.html",
 			}),
-				  ]),
 			new MiniCssExtractPlugin(),
 			new CopyPlugin({
-				patterns: [{ from: "src/assets/*", to: `${outputDir}/assets` }],
+				patterns: [
+					{ from: "src/assets/*", to: `${outputDir}/assets` },
+				],
 			}),
+			...(env.production ? [] : []),
 		],
 		optimization: {
 			minimizer: [new CssMinimizerPlugin()],
@@ -61,7 +59,7 @@ module.exports = (env) => {
 		devtool: "inline-source-map",
 		devServer: {
 			static: {
-				directory: path.join(__dirname, outputDir),
+				directory: outputDir,
 			},
 		},
 	};

src/Themes/BenRameyTheme/wwwroot/styles.js

@@ -0,0 +1,8 @@
+/******/ (() => { // webpackBootstrap
+/******/ 	"use strict";
+var __webpack_exports__ = {};
+// extracted by mini-css-extract-plugin
+
+/******/ })()
+;
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3R5bGVzLmpzIiwibWFwcGluZ3MiOiI7OztBQUFBIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vb3JjaGFyZGNvcmUuYmVucmFtZXl0aGVtZS8uL3NyYy9zY3NzL3N0eWxlcy5zY3NzPzU3ZWEiXSwic291cmNlc0NvbnRlbnQiOlsiLy8gZXh0cmFjdGVkIGJ5IG1pbmktY3NzLWV4dHJhY3QtcGx1Z2luXG5leHBvcnQge307Il0sIm5hbWVzIjpbXSwic291cmNlUm9vdCI6IiJ9

src/Twain.Web/Twain.Web.csproj

@@ -24,8 +24,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\OrchardCore.BenRameyTheme\OrchardCore.BenRameyTheme.csproj" />
-    <ProjectReference Include="..\OrchardCore.Cms.MarkdownImport\OrchardCore.Cms.MarkdownImport.csproj" />
+    <ProjectReference Include="..\Modules\MarkdownImport\MarkdownImport.csproj" />
+    <ProjectReference Include="..\Themes\BenRameyTheme\BenRameyTheme.csproj" />
   </ItemGroup>
 
 </Project>