diff --git a/Twain.sln b/Twain.sln
index 814cc75..78aed92 100644
--- a/Twain.sln
+++ b/Twain.sln
@@ -14,22 +14,24 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Build", "tools\Build\Build.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MarkdownImport", "src\Modules\MarkdownImport\MarkdownImport.csproj", "{7B0477DA-BCD5-47ED-8B88-76D046524434}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BenRameyTheme", "src\BenRamey\BenRameyTheme\BenRameyTheme.csproj", "{A7498019-5941-479B-ADB2-56B6C984C608}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BenRamey.Theme", "src\BenRamey\BenRameyTheme\BenRamey.Theme.csproj", "{A7498019-5941-479B-ADB2-56B6C984C608}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{3DA05917-02EA-4B04-9C48-B86C77A73584}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OapTheme", "src\OAP\OapTheme\OapTheme.csproj", "{4BB167BD-2BC4-4DFB-B1E2-813EC2E2D8FF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oap.Theme", "src\OAP\OapTheme\Oap.Theme.csproj", "{4BB167BD-2BC4-4DFB-B1E2-813EC2E2D8FF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OapApi.v1.Client", "src\OAP\OapApi.v1.Client\OapApi.v1.Client.csproj", "{5C30AB89-B3D4-468F-A029-3D26FECD0083}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OapApi.v1", "src\OAP\OapApi.v1\OapApi.v1.csproj", "{D414342C-EA8D-4115-BF22-DC8B62FB3CBF}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OverseasAutoProtection", "src\OAP\OverseasAutoProtection\OverseasAutoProtection.csproj", "{D2827FDB-33A0-45E9-9F75-EB81BCE3833F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oap.Content", "src\OAP\OverseasAutoProtection\Oap.Content.csproj", "{D2827FDB-33A0-45E9-9F75-EB81BCE3833F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OAP", "OAP", "{E6EDFA50-6BFE-44C5-BEEB-18108A20F625}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BenRamey", "BenRamey", "{03C1520E-5ABF-4AF7-858B-8BE234ACE0FB}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Oap", "src\OAP\Oap\Oap.csproj", "{E6BF474A-1186-496E-899E-2B7AA6180E30}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -68,6 +70,10 @@ Global
{D2827FDB-33A0-45E9-9F75-EB81BCE3833F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D2827FDB-33A0-45E9-9F75-EB81BCE3833F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D2827FDB-33A0-45E9-9F75-EB81BCE3833F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E6BF474A-1186-496E-899E-2B7AA6180E30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E6BF474A-1186-496E-899E-2B7AA6180E30}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E6BF474A-1186-496E-899E-2B7AA6180E30}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E6BF474A-1186-496E-899E-2B7AA6180E30}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -80,6 +86,7 @@ Global
{5C30AB89-B3D4-468F-A029-3D26FECD0083} = {E6EDFA50-6BFE-44C5-BEEB-18108A20F625}
{D414342C-EA8D-4115-BF22-DC8B62FB3CBF} = {E6EDFA50-6BFE-44C5-BEEB-18108A20F625}
{D2827FDB-33A0-45E9-9F75-EB81BCE3833F} = {E6EDFA50-6BFE-44C5-BEEB-18108A20F625}
+ {E6BF474A-1186-496E-899E-2B7AA6180E30} = {E6EDFA50-6BFE-44C5-BEEB-18108A20F625}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0F7F9D4C-DF95-43AF-9E9A-DA09B5EE03C7}
diff --git a/src/BenRamey/BenRameyTheme/BenRameyTheme.csproj b/src/BenRamey/BenRameyTheme/BenRamey.Theme.csproj
similarity index 100%
rename from src/BenRamey/BenRameyTheme/BenRameyTheme.csproj
rename to src/BenRamey/BenRameyTheme/BenRamey.Theme.csproj
diff --git a/src/OAP/Oap/Oap.csproj b/src/OAP/Oap/Oap.csproj
new file mode 100644
index 0000000..642cf9f
--- /dev/null
+++ b/src/OAP/Oap/Oap.csproj
@@ -0,0 +1,14 @@
+
+
+
+ net8.0
+ enable
+ enable
+
+
+
+
+
+
+
+
diff --git a/src/OAP/OverseasAutoProtection/OapApplication/OapApplicationPart.cs b/src/OAP/Oap/OapApplication/OapApplicationPart.cs
similarity index 84%
rename from src/OAP/OverseasAutoProtection/OapApplication/OapApplicationPart.cs
rename to src/OAP/Oap/OapApplication/OapApplicationPart.cs
index c51f783..c009cb3 100644
--- a/src/OAP/OverseasAutoProtection/OapApplication/OapApplicationPart.cs
+++ b/src/OAP/Oap/OapApplication/OapApplicationPart.cs
@@ -1,7 +1,7 @@
using OrchardCore.ContentFields.Fields;
using OrchardCore.ContentManagement;
-namespace OverseasAutoProtection.OapApplication;
+namespace Oap.OapApplication;
public class OapApplicationPart : ContentPart
{
public TextField ApplicationId { get; set; } = new();
diff --git a/src/OAP/OverseasAutoProtection/OapApplication/OapApplicationStatuses.cs b/src/OAP/Oap/OapApplication/OapApplicationStatuses.cs
similarity index 74%
rename from src/OAP/OverseasAutoProtection/OapApplication/OapApplicationStatuses.cs
rename to src/OAP/Oap/OapApplication/OapApplicationStatuses.cs
index 61aa492..6ade2e5 100644
--- a/src/OAP/OverseasAutoProtection/OapApplication/OapApplicationStatuses.cs
+++ b/src/OAP/Oap/OapApplication/OapApplicationStatuses.cs
@@ -1,4 +1,4 @@
-namespace OverseasAutoProtection.OapApplication;
+namespace Oap.OapApplication;
public static class OapApplicationStatuses
{
diff --git a/src/OAP/OapApi.v1/OapApi.v1.csproj b/src/OAP/OapApi.v1/OapApi.v1.csproj
index d67b5cf..5fefd7b 100644
--- a/src/OAP/OapApi.v1/OapApi.v1.csproj
+++ b/src/OAP/OapApi.v1/OapApi.v1.csproj
@@ -18,7 +18,7 @@
-
+
diff --git a/src/OAP/OapTheme/OapTheme.csproj b/src/OAP/OapTheme/Oap.Theme.csproj
similarity index 80%
rename from src/OAP/OapTheme/OapTheme.csproj
rename to src/OAP/OapTheme/Oap.Theme.csproj
index b00ab9a..0cd14c6 100644
--- a/src/OAP/OapTheme/OapTheme.csproj
+++ b/src/OAP/OapTheme/Oap.Theme.csproj
@@ -7,12 +7,6 @@
enable
-
-
-
-
-
-
@@ -35,7 +29,7 @@
-
+
diff --git a/src/OAP/OapTheme/ResourceManagementOptionsConfiguration.cs b/src/OAP/OapTheme/ResourceManagementOptionsConfiguration.cs
index eac3c88..40a5fc7 100644
--- a/src/OAP/OapTheme/ResourceManagementOptionsConfiguration.cs
+++ b/src/OAP/OapTheme/ResourceManagementOptionsConfiguration.cs
@@ -1,7 +1,7 @@
using Microsoft.Extensions.Options;
using OrchardCore.ResourceManagement;
-namespace OapTheme;
+namespace Oap.Theme;
public class ResourceManagementOptionsConfiguration : IConfigureOptions
{
diff --git a/src/OAP/OapTheme/Startup.cs b/src/OAP/OapTheme/Startup.cs
index 5d43678..d6abb10 100644
--- a/src/OAP/OapTheme/Startup.cs
+++ b/src/OAP/OapTheme/Startup.cs
@@ -3,7 +3,7 @@ using Microsoft.Extensions.Options;
using OrchardCore.Modules;
using OrchardCore.ResourceManagement;
-namespace OapTheme;
+namespace Oap.Theme;
public class Startup : StartupBase
{
diff --git a/src/OAP/OverseasAutoProtection/ContentTypes.cs b/src/OAP/OverseasAutoProtection/ContentTypes.cs
index 3164a3d..218c1c5 100644
--- a/src/OAP/OverseasAutoProtection/ContentTypes.cs
+++ b/src/OAP/OverseasAutoProtection/ContentTypes.cs
@@ -1,4 +1,4 @@
-namespace OverseasAutoProtection;
+namespace Oap.Content;
public static class ContentTypes
{
public const string OapApplication = nameof(OapApplication);
diff --git a/src/OAP/OverseasAutoProtection/Migrations.cs b/src/OAP/OverseasAutoProtection/Migrations.cs
index 164d1bb..61807ad 100644
--- a/src/OAP/OverseasAutoProtection/Migrations.cs
+++ b/src/OAP/OverseasAutoProtection/Migrations.cs
@@ -1,4 +1,5 @@
-using OrchardCore.Autoroute.Models;
+using Oap.OapApplication;
+using OrchardCore.Autoroute.Models;
using OrchardCore.ContentFields.Fields;
using OrchardCore.ContentFields.Settings;
using OrchardCore.ContentManagement.Metadata;
@@ -10,9 +11,8 @@ using OrchardCore.Html.Settings;
using OrchardCore.Lists.Models;
using OrchardCore.Mvc.Utilities;
using OrchardCore.Title.Models;
-using OverseasAutoProtection.OapApplication;
-namespace OverseasAutoProtection;
+namespace Oap.Content;
public class Migrations : DataMigration
{
@@ -44,7 +44,7 @@ public class Migrations : DataMigration
.AlterTypeDefinitionAsync(ContentTypes.OapApplicationForm, type => type
.Creatable()
.Listable()
- .Securable()
+ .Securable()
.Draftable()
.Versionable()
.WithPart(nameof(AutoroutePart), part => part
diff --git a/src/OAP/OverseasAutoProtection/OverseasAutoProtection.csproj b/src/OAP/OverseasAutoProtection/Oap.Content.csproj
similarity index 92%
rename from src/OAP/OverseasAutoProtection/OverseasAutoProtection.csproj
rename to src/OAP/OverseasAutoProtection/Oap.Content.csproj
index a33ce3b..f7e58c9 100644
--- a/src/OAP/OverseasAutoProtection/OverseasAutoProtection.csproj
+++ b/src/OAP/OverseasAutoProtection/Oap.Content.csproj
@@ -20,4 +20,8 @@
+
+
+
+
diff --git a/src/OAP/OverseasAutoProtection/Startup.cs b/src/OAP/OverseasAutoProtection/Startup.cs
index 92d3f13..a163d2e 100644
--- a/src/OAP/OverseasAutoProtection/Startup.cs
+++ b/src/OAP/OverseasAutoProtection/Startup.cs
@@ -1,10 +1,10 @@
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.DependencyInjection;
+using Oap.OapApplication;
using OrchardCore.Data.Migration;
-using OverseasAutoProtection.OapApplication;
-namespace OverseasAutoProtection;
+namespace Oap.Content;
public class Startup : OrchardCore.Modules.StartupBase
{
diff --git a/src/Twain.Web/Twain.Web.csproj b/src/Twain.Web/Twain.Web.csproj
index 5288654..3226e0f 100644
--- a/src/Twain.Web/Twain.Web.csproj
+++ b/src/Twain.Web/Twain.Web.csproj
@@ -24,12 +24,12 @@
-
+
-
-
+
+