Merge pull request #5507 from oqtane/master

6.1.5 Release

.gitea/workflows/build-container.yml

@@ -1,25 +0,0 @@
-name: build-docker-imge
-on:
-  - push
-
-jobs:
-  build:
-    name: Build the docker container
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Git clone"
-        run: git clone ${{ gitea.server_url }}/${{ gitea.repository }}.git .
-      - name: "Git checkout"
-        run: git checkout "${{ gitea.sha }}"
-      - uses: aevea/action-kaniko@master
-        name: Run Kaniko to build our api docker container.
-        with:
-          image: kocoded/oqtane.framework
-          tag: ${{ git.workflow_sha }}
-          tag_with_latest: github.ref == 'refs/heads/master'
-          registry: git.kocoder.xyz
-          username: ${{ secrets.CI_RUNNER_USER }}
-          password: ${{ secrets.CI_RUNNER_TOKEN }}
-          build_file: Dockerfile
-          target: deploy
-

Dockerfile

@@ -1,24 +0,0 @@
-# Build
-FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
-
-WORKDIR /source
-
-COPY --link . .
-
-RUN dotnet restore /source/Oqtane.sln
-
-RUN dotnet build "/source/Oqtane.sln" -c Release -o /source/build/
-
-# Publish
-FROM build AS publish
-
-RUN dotnet publish "Oqtane.Server/Oqtane.Server.csproj" -c Release -o /source/publish/
-
-# Deploy
-FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS deploy
-
-WORKDIR /app
-
-
-COPY --from=publish /source/publish/ /app/
-ENTRYPOINT ["dotnet", "Oqtane.Server.dll"]

Oqtane.Application/.template.config/template.json

@@ -0,0 +1,19 @@
+{
+  "$schema": "http://json.schemastore.org/template",
+  "author": "Shaun Walker",
+  "classifications": [
+    "Web",
+    "ASP.NET",
+    "Blazor",
+    "Oqtane"
+  ],
+  "tags": {
+    "language": "C#",
+    "type": "project"
+  },
+  "identity": "Oqtane.Application.Template",
+  "name": "Oqtane Application Solution For Blazor",
+  "shortName": "oqtane-app",
+  "sourceName": "Oqtane.Application",
+  "preferNameDirectory": true
+}

Oqtane.Application/AppHost/Oqtane.Application.AppHost.csproj

@@ -0,0 +1,47 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <Version>6.1.5</Version>
+    <AssemblyName>Oqtane.Application.AppHost</AssemblyName>
+  </PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.8" />
+		<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.8" />
+		<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.1" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.8" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.8">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.8" />
+		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.8" />
+		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
+		<PackageReference Include="HtmlAgilityPack" Version="1.12.2" />
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.3" />
+		<PackageReference Include="MailKit" Version="4.13.0" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<!-- MySQL Database Provider Dependencies -->
+		<PackageReference Include="MySql.Data" Version="9.4.0" />
+		<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0-preview.3.efcore.9.0.0" />
+		<!-- PostgreSQL Database Provider Dependencies -->
+		<PackageReference Include="EFCore.NamingConventions" Version="9.0.0" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.8" />
+		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
+		<!-- SQLite Database Provider Dependencies -->
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.8" />
+		<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="9.0.8" />
+		<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.1" />
+		<!-- SQL Server Database Provider Dependencies -->
+		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.8" />
+	</ItemGroup>
+	
+	<ItemGroup>
+		<PackageReference Include="Oqtane.Client" Version="6.1.5" />
+		<PackageReference Include="Oqtane.Server" Version="6.1.5" />
+		<PackageReference Include="Oqtane.Shared" Version="6.1.5" />
+	</ItemGroup>
+</Project>

Oqtane.Application/AppHost/Program.cs

@@ -0,0 +1,43 @@
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.AspNetCore;
+using Microsoft.Extensions.DependencyInjection;
+using Oqtane.Infrastructure;
+using Microsoft.Extensions.Logging;
+
+namespace Oqtane.Application.AppHost
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            var host = BuildWebHost(args);
+            var databaseManager = host.Services.GetService<IDatabaseManager>();
+            var install = databaseManager.Install();
+            if (!string.IsNullOrEmpty(install.Message))
+            {
+                var filelogger = host.Services.GetRequiredService<ILogger<Program>>();
+                if (filelogger != null)
+                {
+                    filelogger.LogError($"[Oqtane.Application.AppHost.Program.Main] {install.Message}");
+                }
+            }
+            else
+            {
+                host.Run();
+            }
+        }
+
+        public static IWebHost BuildWebHost(string[] args) =>
+            WebHost.CreateDefaultBuilder(args)
+                .UseConfiguration(new ConfigurationBuilder()
+                    .AddCommandLine(args)
+                    .AddEnvironmentVariables()
+                    .Build())
+                .UseStartup<Oqtane.Startup>()
+                .ConfigureLocalizationSettings()
+                .Build();
+    }
+}
+

Oqtane.Application/AppHost/Properties/launchSettings.json

@@ -0,0 +1,29 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:44358/",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Oqtane.AppHost": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "http://localhost:44358/"
+    }
+  }
+}

Oqtane.Application/AppHost/appsettings.json

@@ -2,7 +2,7 @@
   "RenderMode": "Interactive",
   "Runtime": "Server",
   "Database": {
-    "DefaultDBType": ""
+    "DefaultDBType": "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Server"
   },
   "ConnectionStrings": {
     "DefaultConnection": ""
@@ -22,27 +22,43 @@
     {
       "Name": "LocalDB",
       "ControlType": "Oqtane.Installer.Controls.LocalDBConfig, Oqtane.Client",
-      "DBType": "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer"
+      "DBType": "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Server"
     },
     {
       "Name": "SQL Server",
       "ControlType": "Oqtane.Installer.Controls.SqlServerConfig, Oqtane.Client",
-      "DBType": "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer"
+      "DBType": "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Server"
     },
     {
       "Name": "SQLite",
       "ControlType": "Oqtane.Installer.Controls.SqliteConfig, Oqtane.Client",
-      "DBType": "Oqtane.Database.Sqlite.SqliteDatabase, Oqtane.Database.Sqlite"
+      "DBType": "Oqtane.Database.Sqlite.SqliteDatabase, Oqtane.Server"
     },
     {
       "Name": "MySQL",
       "ControlType": "Oqtane.Installer.Controls.MySQLConfig, Oqtane.Client",
-      "DBType": "Oqtane.Database.MySQL.MySQLDatabase, Oqtane.Database.MySQL"
+      "DBType": "Oqtane.Database.MySQL.MySQLDatabase, Oqtane.Server"
     },
     {
       "Name": "PostgreSQL",
       "ControlType": "Oqtane.Installer.Controls.PostgreSQLConfig, Oqtane.Client",
-      "DBType": "Oqtane.Database.PostgreSQL.PostgreSQLDatabase, Oqtane.Database.PostgreSQL"
+      "DBType": "Oqtane.Database.PostgreSQL.PostgreSQLDatabase, Oqtane.Server"
+    },
+    {
+      "Name": "Azure SQL",
+      "ControlType": "Oqtane.Installer.Controls.AzureSqlConfig, Oqtane.Client",
+      "DBType": "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Server"
     }
-  ]
-}
+  ],
+  "Logging": {
+    "FileLogger": {
+      "LogLevel": {
+        "Default": "Error"
+      }
+    },
+    "LogLevel": {
+      "Default": "Information",
+      "Notify": "Error"
+    }
+  }
+}

Oqtane.Application/AppHost/readme.md

@@ -0,0 +1,7 @@
+# Oqtane Application Template
+
+![Oqtane](https://github.com/oqtane/framework/blob/master/oqtane.png?raw=true "Oqtane")
+
+Oqtane is an open source CMS and Application Framework that provides advanced functionality for developing web, mobile, and desktop applications on .NET. It leverages Blazor to compose a fully dynamic digital experience which can be hosted on Static Blazor, Blazor Server, Blazor WebAssembly, or Blazor Hybrid (via .NET MAUI).
+
+More information about Oqtane can be found at: [https://www.oqtane.org](https://www.oqtane.org)

Oqtane.Application/AppHost/wwwroot/css/app.css

@@ -75,6 +75,10 @@ app {
     color: gray;
 }
 
+.app-moduleactions .dropdown-menu {
+    z-index: 9999;
+}
+
 .app-moduleactions .dropdown-submenu {
     position: relative;
 }
@@ -274,11 +278,11 @@ app {
 }
 
 /* cookie consent */
-.gdpr-consent-bar .btn-show{
+.gdpr-consent-bar .btn-show {
     bottom: -3px;
     left: 5px;
 }
-.gdpr-consent-bar .btn-hide{
+.gdpr-consent-bar .btn-hide {
     top: 0;
     right: 5px;
-}
+}

Oqtane.Application/AppHost/wwwroot/js/interop.js

@@ -311,7 +311,7 @@ Oqtane.Interop = {
         }
         return files;
     },
-    uploadFiles: async function (posturl, folder, id, antiforgerytoken, jwt, chunksize) {
+    uploadFiles: async function (posturl, folder, id, antiforgerytoken, jwt, chunksize, anonymizeuploadfilenames) {
         var success = true;
         var fileinput = document.getElementById('FileInput_' + id);
         var progressinfo = document.getElementById('ProgressInfo_' + id);
@@ -344,16 +344,22 @@ Oqtane.Interop = {
             const totalParts = Math.ceil(file.size / chunkSize);
             let partCount = 0;
 
+            let filename = file.name;
+            if (anonymizeuploadfilenames) {
+                filename = crypto.randomUUID() + '.' + filename.split('.').pop();
+            }
+
             const uploadPart = () => {
                 const start = partCount * chunkSize;
                 const end = Math.min(start + chunkSize, file.size);
                 const chunk = file.slice(start, end);
 
                 return new Promise((resolve, reject) => {
+
                     let formdata = new FormData();
                     formdata.append('__RequestVerificationToken', antiforgerytoken);
                     formdata.append('folder', folder);
-                    formdata.append('formfile', chunk, file.name);
+                    formdata.append('formfile', chunk, filename);
 
                     var credentials = 'same-origin';
                     var headers = new Headers();

Oqtane.Application/Build/Oqtane.Application.Build.csproj

@@ -14,14 +14,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Client\[Owner].Theme.[Theme].Client.csproj" />
+    <ProjectReference Include="..\Client\Oqtane.Application.Client.csproj" />
+    <ProjectReference Include="..\Server\Oqtane.Application.Server.csproj" />
+    <ProjectReference Include="..\Shared\Oqtane.Application.Shared.csproj" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Condition="'$(OS)' == 'Windows_NT' And '$(Configuration)' == 'Debug'" Command="debug.cmd $(TargetFramework) $([System.String]::Copy('$(MSBuildProjectName)').Replace('.Package',''))"  />
-    <Exec Condition="'$(OS)' != 'Windows_NT' And '$(Configuration)' == 'Debug'" Command="bash $(ProjectDir)debug.sh $(TargetFramework) $([System.String]::Copy('$(MSBuildProjectName)').Replace('.Package',''))" />
-    <Exec Condition="'$(OS)' == 'Windows_NT' And '$(Configuration)' == 'Release'" Command="release.cmd $(TargetFramework) $([System.String]::Copy('$(MSBuildProjectName)').Replace('.Package',''))" />
-    <Exec Condition="'$(OS)' != 'Windows_NT' And '$(Configuration)' == 'Release'" Command="bash $(ProjectDir)release.sh $(TargetFramework) $([System.String]::Copy('$(MSBuildProjectName)').Replace('.Package',''))" />
+    <Exec Condition="'$(OS)' == 'Windows_NT' And '$(Configuration)' == 'Debug'" Command="debug.cmd $(TargetFramework) $([System.String]::Copy('$(MSBuildProjectName)').Replace('.Build',''))"  />
+    <Exec Condition="'$(OS)' != 'Windows_NT' And '$(Configuration)' == 'Debug'" Command="bash $(ProjectDir)debug.sh $(TargetFramework) $([System.String]::Copy('$(MSBuildProjectName)').Replace('.Build',''))" />
   </Target>
 
-</Project>
+</Project>

Oqtane.Application/Build/Oqtane.Application.nuspec

@@ -3,11 +3,11 @@
     <metadata>
         <id>$projectname$</id>
         <version>1.0.0</version>
-        <authors>[Owner]</authors>
-        <owners>[Owner]</owners>
-        <title>[Module]</title>
-        <description>[Description]</description>
-        <copyright>[Owner]</copyright>
+        <authors>Oqtane.Application</authors>
+        <owners>Oqtane.Application</owners>
+        <title>Oqtane.Application</title>
+        <description>Oqtane.Application</description>
+        <copyright>Oqtane.Application</copyright>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <license type="expression">MIT</license>
         <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
@@ -16,7 +16,7 @@
         <releaseNotes></releaseNotes>
         <summary></summary>
         <dependencies>
-            <dependency id="Oqtane.Framework" version="[FrameworkVersion]" />
+            <dependency id="Oqtane.Framework" version="6.1.4" />
         </dependencies>
     </metadata>
     <files>

Oqtane.Application/Build/debug.cmd

@@ -0,0 +1,11 @@
+@echo off
+set TargetFramework=%1
+set ProjectName=%2
+
+XCOPY "..\Client\bin\Debug\%TargetFramework%\%ProjectName%.Client.Oqtane.dll" "..\AppHost\bin\Debug\%TargetFramework%\" /Y
+XCOPY "..\Client\bin\Debug\%TargetFramework%\%ProjectName%.Client.Oqtane.pdb" "..\AppHost\bin\Debug\%TargetFramework%\" /Y
+XCOPY "..\Server\bin\Debug\%TargetFramework%\%ProjectName%.Server.Oqtane.dll" "..\AppHost\bin\Debug\%TargetFramework%\" /Y
+XCOPY "..\Server\bin\Debug\%TargetFramework%\%ProjectName%.Server.Oqtane.pdb" "..\AppHost\bin\Debug\%TargetFramework%\" /Y
+XCOPY "..\Shared\bin\Debug\%TargetFramework%\%ProjectName%.Shared.Oqtane.dll" "..\AppHost\bin\Debug\%TargetFramework%\" /Y
+XCOPY "..\Shared\bin\Debug\%TargetFramework%\%ProjectName%.Shared.Oqtane.pdb" "..\AppHost\bin\Debug\%TargetFramework%\" /Y
+XCOPY "..\Server\wwwroot\*" "..\AppHost\wwwroot\" /Y /S /I

Oqtane.Application/Build/debug.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+TargetFramework=$1
+ProjectName=$2
+
+cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName$.Client.Oqtane.dll" "../AppHost/bin/Debug/$TargetFramework/"
+cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName$.Client.Oqtane.pdb" "../AppHost/bin/Debug/$TargetFramework/"
+cp -f "../Server/bin/Debug/$TargetFramework/$ProjectName$.Server.Oqtane.dll" "../AppHost/bin/Debug/$TargetFramework/"
+cp -f "../Server/bin/Debug/$TargetFramework/$ProjectName$.Server.Oqtane.pdb" "../AppHost/bin/Debug/$TargetFramework/"
+cp -f "../Shared/bin/Debug/$TargetFramework/$ProjectName$.Shared.Oqtane.dll" "../AppHost/bin/Debug/$TargetFramework/"
+cp -f "../Shared/bin/Debug/$TargetFramework/$ProjectName$.Shared.Oqtane.pdb" "../AppHost/bin/Debug/$TargetFramework/"
+cp -rf "../Server/wwwroot/"* "../AppHost/wwwroot/"

Oqtane.Application/Build/release.cmd

@@ -0,0 +1,2 @@
+del "*.nupkg"
+"nuget.exe" pack Oqtane.Application.nuspec -Properties projectname=Oqtane.Application

Oqtane.Application/Build/release.sh

@@ -0,0 +1 @@
+"nuget.exe" pack Oqtane.Application.nuspec -Properties projectname=Oqtane.Application

Oqtane.Application/Client/AssemblyInfo.cs

@@ -0,0 +1,3 @@
+using Microsoft.Extensions.Localization;
+
+[assembly: RootNamespace("Oqtane.Application.Client")]

Oqtane.Application/Client/Interop.cs

@@ -1,7 +1,7 @@
 using Microsoft.JSInterop;
 using System.Threading.Tasks;
 
-namespace [Owner].Module.[Module]
+namespace Oqtane.Application
 {
     public class Interop
     {

Oqtane.Application/Client/Modules/MyModule/Edit.razor

@@ -1,10 +1,10 @@
 @using Oqtane.Modules.Controls
-@using [Owner].Module.[Module].Services
-@using [Owner].Module.[Module].Models
+@using Oqtane.Application.Services
+@using Oqtane.Application.Models
 
-@namespace [Owner].Module.[Module]
+@namespace Oqtane.Application.MyModule
 @inherits ModuleBase
-@inject I[Module]Service [Module]Service
+@inject IMyModuleService MyModuleService
 @inject NavigationManager NavigationManager
 @inject IStringLocalizer<Edit> Localizer
 
@@ -31,7 +31,7 @@
 
     public override string Actions => "Add,Edit";
 
-    public override string Title => "Manage [Module]";
+    public override string Title => "Manage MyModule";
 
     public override List<Resource> Resources => new List<Resource>()
     {
@@ -55,20 +55,20 @@
             if (PageState.Action == "Edit")
             {
                 _id = Int32.Parse(PageState.QueryString["id"]);
-                [Module] [Module] = await [Module]Service.Get[Module]Async(_id, ModuleState.ModuleId);
-                if ([Module] != null)
+                MyModule MyModule = await MyModuleService.GetMyModuleAsync(_id, ModuleState.ModuleId);
+                if (MyModule != null)
                 {
-                    _name = [Module].Name;
-                    _createdby = [Module].CreatedBy;
-                    _createdon = [Module].CreatedOn;
-                    _modifiedby = [Module].ModifiedBy;
-                    _modifiedon = [Module].ModifiedOn;
+                    _name = MyModule.Name;
+                    _createdby = MyModule.CreatedBy;
+                    _createdon = MyModule.CreatedOn;
+                    _modifiedby = MyModule.ModifiedBy;
+                    _modifiedon = MyModule.ModifiedOn;
                 }
             }
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Loading [Module] {[Module]Id} {Error}", _id, ex.Message);
+            await logger.LogError(ex, "Error Loading MyModule {MyModuleId} {Error}", _id, ex.Message);
             AddModuleMessage(Localizer["Message.LoadError"], MessageType.Error);
         }
     }
@@ -83,18 +83,18 @@
             {
                 if (PageState.Action == "Add")
                 {
-                    [Module] [Module] = new [Module]();
-                    [Module].ModuleId = ModuleState.ModuleId;
-                    [Module].Name = _name;
-                    [Module] = await [Module]Service.Add[Module]Async([Module]);
-                    await logger.LogInformation("[Module] Added {[Module]}", [Module]);
+                    MyModule MyModule = new MyModule();
+                    MyModule.ModuleId = ModuleState.ModuleId;
+                    MyModule.Name = _name;
+                    MyModule = await MyModuleService.AddMyModuleAsync(MyModule);
+                    await logger.LogInformation("MyModule Added {MyModule}", MyModule);
                 }
                 else
                 {
-                    [Module] [Module] = await [Module]Service.Get[Module]Async(_id, ModuleState.ModuleId);
-                    [Module].Name = _name;
-                    await [Module]Service.Update[Module]Async([Module]);
-                    await logger.LogInformation("[Module] Updated {[Module]}", [Module]);
+                    MyModule MyModule = await MyModuleService.GetMyModuleAsync(_id, ModuleState.ModuleId);
+                    MyModule.Name = _name;
+                    await MyModuleService.UpdateMyModuleAsync(MyModule);
+                    await logger.LogInformation("MyModule Updated {MyModule}", MyModule);
                 }
                 NavigationManager.NavigateTo(NavigateUrl());
             }
@@ -105,7 +105,7 @@
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Saving [Module] {Error}", ex.Message);
+            await logger.LogError(ex, "Error Saving MyModule {Error}", ex.Message);
             AddModuleMessage(Localizer["Message.SaveError"], MessageType.Error);
         }
     }

Oqtane.Application/Client/Modules/MyModule/Index.razor

@@ -1,32 +1,32 @@
-@using [Owner].Module.[Module].Services
-@using [Owner].Module.[Module].Models
+@using Oqtane.Application.Services
+@using Oqtane.Application.Models
 
-@namespace [Owner].Module.[Module]
+@namespace Oqtane.Application.MyModule
 @inherits ModuleBase
-@inject I[Module]Service [Module]Service
+@inject IMyModuleService MyModuleService
 @inject NavigationManager NavigationManager
 @inject IStringLocalizer<Index> Localizer
 
-@if (_[Module]s == null)
+@if (_MyModules == null)
 {
     <p><em>Loading...</em></p>
 }
 else
 {
-    <ActionLink Action="Add" Security="SecurityAccessLevel.Edit" Text="Add [Module]" ResourceKey="Add" />
+    <ActionLink Action="Add" Security="SecurityAccessLevel.Edit" Text="Add MyModule" ResourceKey="Add" />
     <br />
     <br />
-    @if (@_[Module]s.Count != 0)
+    @if (@_MyModules.Count != 0)
     {
-        <Pager Items="@_[Module]s">
+        <Pager Items="@_MyModules">
             <Header>
                 <th style="width: 1px;">&nbsp;</th>
                 <th style="width: 1px;">&nbsp;</th>
                 <th>@Localizer["Name"]</th>
             </Header>
             <Row>
-                <td><ActionLink Action="Edit" Parameters="@($"id=" + context.[Module]Id.ToString())" ResourceKey="Edit"  /></td>
-                <td><ActionDialog Header="Delete [Module]" Message="Are You Sure You Wish To Delete This [Module]?" Action="Delete" Security="SecurityAccessLevel.Edit" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" ResourceKey="Delete"  Id="@context.[Module]Id.ToString()" /></td>
+                <td><ActionLink Action="Edit" Parameters="@($"id=" + context.MyModuleId.ToString())" ResourceKey="Edit" /></td>
+                <td><ActionDialog Header="Delete MyModule" Message="Are You Sure You Wish To Delete This MyModule?" Action="Delete" Security="SecurityAccessLevel.Edit" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" ResourceKey="Delete" Id="@context.MyModuleId.ToString()" /></td>
                 <td>@context.Name</td>
             </Row>
         </Pager>
@@ -46,33 +46,33 @@ else
         new Resource { ResourceType = ResourceType.Script, Url = ModulePath() + "Module.js" }
     };
 
-    List<[Module]> _[Module]s;
+    List<Models.MyModule> _MyModules;
 
     protected override async Task OnInitializedAsync()
     {
         try
         {
-            _[Module]s = await [Module]Service.Get[Module]sAsync(ModuleState.ModuleId);
+            _MyModules = await MyModuleService.GetMyModulesAsync(ModuleState.ModuleId);
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Loading [Module] {Error}", ex.Message);
+            await logger.LogError(ex, "Error Loading MyModule {Error}", ex.Message);
             AddModuleMessage(Localizer["Message.LoadError"], MessageType.Error);
         }
     }
 
-    private async Task Delete([Module] [Module])
+    private async Task Delete(MyModule MyModule)
     {
         try
         {
-            await [Module]Service.Delete[Module]Async([Module].[Module]Id, ModuleState.ModuleId);
-            await logger.LogInformation("[Module] Deleted {[Module]}", [Module]);
-            _[Module]s = await [Module]Service.Get[Module]sAsync(ModuleState.ModuleId);
+            await MyModuleService.DeleteMyModuleAsync(MyModule.MyModuleId, ModuleState.ModuleId);
+            await logger.LogInformation("MyModule Deleted {MyModule}", MyModule);
+            _MyModules = await MyModuleService.GetMyModulesAsync(ModuleState.ModuleId);
             StateHasChanged();
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Deleting [Module] {[Module]} {Error}", [Module], ex.Message);
+            await logger.LogError(ex, "Error Deleting MyModule {MyModule} {Error}", MyModule, ex.Message);
             AddModuleMessage(Localizer["Message.DeleteError"], MessageType.Error);
         }
     }

Oqtane.Application/Client/Modules/MyModule/ModuleInfo.cs

@@ -0,0 +1,19 @@
+using Oqtane.Models;
+using Oqtane.Modules;
+
+namespace Oqtane.Application.MyModule
+{
+    public class ModuleInfo : IModule
+    {
+        public ModuleDefinition ModuleDefinition => new ModuleDefinition
+        {
+            Name = "MyModule",
+            Description = "Example module",
+            Version = "1.0.0",
+            ServerManagerType = "Oqtane.Application.Manager.MyModuleManager, Oqtane.Application.Server.Oqtane",
+            ReleaseVersions = "1.0.0",
+            Dependencies = "Oqtane.Application.Shared.Oqtane",
+            PackageName = "Oqtane.Application" 
+        };
+    }
+}

Oqtane.Application/Client/Modules/MyModule/Settings.razor

@@ -1,4 +1,4 @@
-@namespace [Owner].Module.[Module]
+@namespace Oqtane.Application.MyModule
 @inherits ModuleBase
 @inject ISettingService SettingService
 @inject IStringLocalizer<Settings> Localizer
@@ -13,8 +13,8 @@
 </div>
 
 @code {
-    private string resourceType = "[Owner].Module.[Module].Settings, [Owner].Module.[Module].Client.Oqtane"; // for localization
-    public override string Title => "[Module] Settings";
+    private string resourceType = "Oqtane.Application.Settings, Oqtane.Application.Client.Oqtane"; // for localization
+    public override string Title => "MyModdule Settings";
 
     string _value;
 

Oqtane.Application/Client/Oqtane.Application.Client.csproj

@@ -3,30 +3,25 @@
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
     <Version>1.0.0</Version>
-    <Authors>[Owner]</Authors>
-    <Company>[Owner]</Company>
-    <Description>[Description]</Description>
-    <Product>[Owner].Module.[Module]</Product>
-    <Copyright>[Owner]</Copyright>
-    <AssemblyName>[Owner].Module.[Module].Client.Oqtane</AssemblyName>
+    <AssemblyName>Oqtane.Application.Client.Oqtane</AssemblyName>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.5" />
-    <PackageReference Include="System.Net.Http.Json" Version="9.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.8" />
+    <PackageReference Include="System.Net.Http.Json" Version="9.0.8" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Shared\[Owner].Module.[Module].Shared.csproj" />
+    <ProjectReference Include="..\Shared\Oqtane.Application.Shared.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    [ClientReference]
-    [SharedReference]
+    <PackageReference Include="Oqtane.Client" Version="6.1.4" />
+    <PackageReference Include="Oqtane.Shared" Version="6.1.4" />
   </ItemGroup>
 
   <PropertyGroup>

Oqtane.Application/Client/Resources/Oqtane.Application.MyModule/Edit.resx

@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Name.Text" xml:space="preserve">
+    <value>Name: </value>
+  </data>
+  <data name="Name.HelpText" xml:space="preserve">
+    <value>Enter the name</value>
+  </data>
+  <data name="Save" xml:space="preserve">
+    <value>Save</value>
+  </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="Message.SaveValidation" xml:space="preserve">
+    <value>Please Provide All Required Information</value>
+  </data>
+  <data name="Message.SaveError" xml:space="preserve">
+    <value>Error Saving MyModule</value>
+  </data>
+  <data name="Message.LoadError" xml:space="preserve">
+    <value>Error Loading MyModule</value>
+  </data>
+</root>

Oqtane.Application/Client/Resources/Oqtane.Application.MyModule/Index.resx

@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Name" xml:space="preserve">
+    <value>Name</value>
+  </data>
+  <data name="Add.Text" xml:space="preserve">
+    <value>Add MyModule</value>
+  </data>
+  <data name="Edit.Text" xml:space="preserve">
+    <value>Edit</value>
+  </data>
+  <data name="Delete.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="Delete.Header" xml:space="preserve">
+    <value>Delete MyModule</value>
+  </data>
+  <data name="Delete.Message" xml:space="preserve">
+    <value>Are You Sure You Wish To Delete This MyModule?</value>
+  </data>
+  <data name="Message.DisplayNone" xml:space="preserve">
+    <value>No MyModules To Display</value>
+  </data>
+  <data name="Message.LoadError" xml:space="preserve">
+    <value>Error Loading MyModule</value>
+  </data>
+  <data name="Message.DeleteError" xml:space="preserve">
+    <value>Error Deleting MyModule</value>
+  </data>
+</root>

Oqtane.Application/Client/Resources/Oqtane.Application.MyModule/Settings.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
             Microsoft ResX Schema 

Oqtane.Application/Client/Resources/Oqtane.Application.MyTheme/ContainerSettings.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 

Oqtane.Application/Client/Resources/Oqtane.Application.MyTheme/ThemeSettings.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 

Oqtane.Application/Client/Services/ArticleService.cs

@@ -0,0 +1,55 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Oqtane.Services;
+using Oqtane.Shared;
+
+namespace Oqtane.Application.Services
+{
+    public interface IMyModuleService
+    {
+        Task<List<Models.MyModule>> GetMyModulesAsync(int ModuleId);
+
+        Task<Models.MyModule> GetMyModuleAsync(int MyModuleId, int ModuleId);
+
+        Task<Models.MyModule> AddMyModuleAsync(Models.MyModule MyModule);
+
+        Task<Models.MyModule> UpdateMyModuleAsync(Models.MyModule MyModule);
+
+        Task DeleteMyModuleAsync(int MyModuleId, int ModuleId);
+    }
+
+    public class MyModuleService : ServiceBase, IMyModuleService
+    {
+        public MyModuleService(HttpClient http, SiteState siteState) : base(http, siteState) { }
+
+        private string Apiurl => CreateApiUrl("MyModule");
+
+        public async Task<List<Models.MyModule>> GetMyModulesAsync(int ModuleId)
+        {
+            List<Models.MyModule> Tasks = await GetJsonAsync<List<Models.MyModule>>(CreateAuthorizationPolicyUrl($"{Apiurl}?moduleid={ModuleId}", EntityNames.Module, ModuleId), Enumerable.Empty<Models.MyModule>().ToList());
+            return Tasks.OrderBy(item => item.Name).ToList();
+        }
+
+        public async Task<Models.MyModule> GetMyModuleAsync(int MyModuleId, int ModuleId)
+        {
+            return await GetJsonAsync<Models.MyModule>(CreateAuthorizationPolicyUrl($"{Apiurl}/{MyModuleId}/{ModuleId}", EntityNames.Module, ModuleId));
+        }
+
+        public async Task<Models.MyModule> AddMyModuleAsync(Models.MyModule MyModule)
+        {
+            return await PostJsonAsync<Models.MyModule>(CreateAuthorizationPolicyUrl($"{Apiurl}", EntityNames.Module, MyModule.ModuleId), MyModule);
+        }
+
+        public async Task<Models.MyModule> UpdateMyModuleAsync(Models.MyModule MyModule)
+        {
+            return await PutJsonAsync<Models.MyModule>(CreateAuthorizationPolicyUrl($"{Apiurl}/{MyModule.MyModuleId}", EntityNames.Module, MyModule.ModuleId), MyModule);
+        }
+
+        public async Task DeleteMyModuleAsync(int MyModuleId, int ModuleId)
+        {
+            await DeleteAsync(CreateAuthorizationPolicyUrl($"{Apiurl}/{MyModuleId}/{ModuleId}", EntityNames.Module, ModuleId));
+        }
+    }
+}

Oqtane.Application/Client/Startup/ClientStartup.cs

@@ -1,14 +1,14 @@
 using Microsoft.Extensions.DependencyInjection;
 using Oqtane.Services;
-using [Owner].Module.[Module].Services;
+using Oqtane.Application.Services;
 
-namespace [Owner].Module.[Module].Startup
+namespace Oqtane.Application.Startup
 {
     public class ClientStartup : IClientStartup
     {
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddScoped<I[Module]Service, [Module]Service>();
+            services.AddScoped<IMyModuleService, MyModuleService>();
         }
     }
 }

Oqtane.Application/Client/Themes/MyTheme/Containers/Container.razor

@@ -1,4 +1,4 @@
-@namespace [Owner].Theme.[Theme]
+@namespace Oqtane.Application.MyTheme
 @inherits ContainerBase
 @inject ISettingService SettingService
 
@@ -24,7 +24,7 @@
 </div>
 
 @code {
-    public override string Name => "[Owner] [Theme] - Container1";
+    public override string Name => "Container";
 
     private bool _title = true;
     private string _classes = "container-fluid";

Oqtane.Application/Client/Themes/MyTheme/Containers/ContainerSettings.razor

@@ -1,4 +1,4 @@
-@namespace [Owner].Theme.[Theme]
+@namespace Oqtane.Application.MyTheme
 @inherits ModuleBase
 @implements Oqtane.Interfaces.ISettingsControl
 @inject ISettingService SettingService
@@ -17,7 +17,7 @@
 </div>
 
 @code {
-	private string resourceType = "[Owner].Theme.[Theme].ContainerSettings, [Owner].Theme.[Theme].Client.Oqtane"; // for localization
+    private string resourceType = "Oqtane.Application.MyTheme.ContainerSettings, Oqtane.Application.Client.Oqtane"; // for localization
     private string _title = "true";
 
     protected override void OnInitialized()

Oqtane.Application/Client/Themes/MyTheme/ThemeInfo.cs

@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using Oqtane.Models;
+using Oqtane.Themes;
+using Oqtane.Shared;
+
+namespace Oqtane.Application.MyTheme
+{
+    public class ThemeInfo : ITheme
+    {
+        public Oqtane.Models.Theme Theme => new Oqtane.Models.Theme
+        {
+            Name = "MyTheme",
+            Version = "1.0.0",
+            PackageName = "Oqtane.Application",
+            ThemeSettingsType = "Oqtane.Application.MyTheme.ThemeSettings, Oqtane.Application.Client.Oqtane",
+            ContainerSettingsType = "Oqtane.Application.MyTheme.ContainerSettings, Oqtane.Application.Client.Oqtane",
+            Resources = new List<Resource>()
+            {
+                new Script(Constants.BootstrapStylesheetUrl, Constants.BootstrapStylesheetIntegrity, "anonymous"),
+                new Resource { ResourceType = ResourceType.Stylesheet, Url = "~/Theme.css" },
+                new Script(Constants.BootstrapScriptUrl, Constants.BootstrapScriptIntegrity, "anonymous")
+            }
+        };
+    }
+}

Oqtane.Application/Client/Themes/MyTheme/Themes/Theme.razor

@@ -1,4 +1,4 @@
-@namespace [Owner].Theme.[Theme]
+@namespace Oqtane.Application.MyTheme
 @inherits ThemeBase
 @inject ISettingService SettingService
 
@@ -95,7 +95,7 @@
 </main>
 
 @code {
-    public override string Name => "Theme1";
+    public override string Name => "MyTheme";
 
     public override string Panes => PaneNames.Admin + ",Top Full Width,Top 100%,Left 50%,Right 50%,Left 33%,Center 33%,Right 33%,Left Outer 25%,Left Inner 25%,Right Inner 25%,Right Outer 25%,Left 25%,Center 50%,Right 25%,Left Sidebar 66%,Right Sidebar 33%,Left Sidebar 33%,Right Sidebar 66%,Bottom 100%,Bottom Full Width";
     

Oqtane.Application/Client/Themes/MyTheme/Themes/ThemeSettings.razor

@@ -1,4 +1,4 @@
-@namespace [Owner].Theme.[Theme]
+@namespace Oqtane.Application.MyTheme
 @inherits ModuleBase
 @implements Oqtane.Interfaces.ISettingsControl
 @inject ISettingService SettingService
@@ -43,7 +43,7 @@
 
     @code {
         private int pageId = -1;
-        private string resourceType = "[Owner].Theme.[Theme].ThemeSettings, [Owner].Theme.[Theme].Client.Oqtane"; // for localization
+        private string resourceType = "Oqtane.Application.MyTheme.ThemeSettings, Oqtane.Application.Client.Oqtane"; // for localization
         private string _scope = "page";
         private string _login = "-";
         private string _register = "-";

Oqtane.Application/Client/_Imports.razor

@@ -1,4 +1,4 @@
-@using System
+@using System
 @using System.Linq
 @using System.Collections.Generic
 @using System.Net.Http
@@ -10,6 +10,7 @@
 @using Microsoft.Extensions.Localization
 @using Microsoft.JSInterop
 
+@using Oqtane
 @using Oqtane.Models
 @using Oqtane.Modules
 @using Oqtane.Modules.Controls

Oqtane.Application/Oqtane.Application.Template.nuspec

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    <id>Oqtane.Application.Template</id>
+    <version>6.1.5</version>
+    <title>Oqtane Application Solution For Blazor</title>
+    <authors>Shaun Walker</authors>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <license type="expression">MIT</license>
+    <licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
+    <icon>Build/icon.png</icon>
+    <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
+    <description>Oqtane is an open source CMS and Application Framework that provides advanced functionality for developing web, mobile, and desktop applications on .NET. It leverages Blazor to compose a fully dynamic digital experience which can be hosted on Static Blazor, Blazor Server, Blazor WebAssembly, or Blazor Hybrid (via .NET MAUI).</description>
+    <language>en-US</language>
+    <tags>Web ASP.NET Blazor Oqtane Modular Multi-Tenant "Open Source" "SQL Server" MySQL PostgreSQL SQLite</tags>
+    <readme>AppHost/README.md</readme>
+    <packageTypes>
+      <packageType name="Template" />
+    </packageTypes>
+  </metadata>
+</package>

Oqtane.Application/Oqtane.Application.sln

@@ -1,17 +1,16 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28621.142
+# Visual Studio Version 17
+VisualStudioVersion = 17.12.35506.116 d17.12
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Server", "..\[RootFolder]\Oqtane.Server\Oqtane.Server.csproj", "{3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Oqtane.Application.AppHost", "AppHost\Oqtane.Application.AppHost.csproj", "{5BDDA15B-05CF-41B2-BF12-D532D1A561D1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "[Owner].Module.[Module].Client", "Client\[Owner].Module.[Module].Client.csproj", "{AA8E58A1-CD09-4208-BF66-A8BB341FD669}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Application.Client", "Client\Oqtane.Application.Client.csproj", "{AA8E58A1-CD09-4208-BF66-A8BB341FD669}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "[Owner].Module.[Module].Server", "Server\[Owner].Module.[Module].Server.csproj", "{04B05448-788F-433D-92C0-FED35122D45A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Application.Server", "Server\Oqtane.Application.Server.csproj", "{04B05448-788F-433D-92C0-FED35122D45A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "[Owner].Module.[Module].Shared", "Shared\[Owner].Module.[Module].Shared.csproj", "{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Application.Shared", "Shared\Oqtane.Application.Shared.csproj", "{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "[Owner].Module.[Module].Package", "Package\[Owner].Module.[Module].Package.csproj", "{C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Application.Build", "Build\Oqtane.Application.Build.csproj", "{C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,8 +18,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5BDDA15B-05CF-41B2-BF12-D532D1A561D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5BDDA15B-05CF-41B2-BF12-D532D1A561D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5BDDA15B-05CF-41B2-BF12-D532D1A561D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5BDDA15B-05CF-41B2-BF12-D532D1A561D1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Release|Any CPU.ActiveCfg = Release|Any CPU

Oqtane.Application/README.md

@@ -0,0 +1,20 @@
+# Oqtane Application Template
+
+This folder contains content files for a Visual Studio Project Template designed for Oqtane development projects. The template relies on the native templating capabilities of the .NET Command Line Interface (CLI):
+
+```
+dotnet new install Oqtane.Application.Template
+dotnet new oqtane-app -o MyCompany.MyProject
+```
+
+When using this approach you do not need to have a local copy of the oqtane.framework source code - you simply utilize Oqtane as a standard application dependency.
+
+The solution contains an AppHost project which must be identified as the Startup project. It is responsible for loading the development environment and launching the Oqtane framework.
+
+The solution also contains Build, Client, Server, and Shared folders which is where you you would implement your custom functionality. An example module and theme are included for reference, and you can add additional modules and themes within the same projects by following the standard Oqtane folder/namespace conventions. 
+
+*Known Issues*
+
+- do not use the term "Oqtane" in your output name or else you will experience namespace conflicts
+- the application's Build project is missing the *.nuspec file as Nuget is excluding it from the template - not sure why
+- when calling "dotnet new" the PostBuild section in the Oqtane.Application.Build.csproj is being modified incorrectly - not sure why

Oqtane.Application/Server/AssemblyInfo.cs

@@ -0,0 +1,3 @@
+using Microsoft.Extensions.Localization;
+
+[assembly: RootNamespace("Oqtane.Application.Server")]

Oqtane.Application/Server/Controllers/MyModuleController.cs

@@ -5,36 +5,36 @@ using Microsoft.AspNetCore.Http;
 using Oqtane.Shared;
 using Oqtane.Enums;
 using Oqtane.Infrastructure;
-using [Owner].Module.[Module].Services;
+using Oqtane.Application.Services;
 using Oqtane.Controllers;
 using System.Net;
 using System.Threading.Tasks;
 
-namespace [Owner].Module.[Module].Controllers
+namespace Oqtane.Application.Controllers
 {
     [Route(ControllerRoutes.ApiRoute)]
-    public class [Module]Controller : ModuleControllerBase
+    public class MyModuleController : ModuleControllerBase
     {
-        private readonly I[Module]Service _[Module]Service;
+        private readonly IMyModuleService _MyModuleService;
 
-        public [Module]Controller(I[Module]Service [Module]Service, ILogManager logger, IHttpContextAccessor accessor) : base(logger, accessor)
+        public MyModuleController(IMyModuleService MyModuleService, ILogManager logger, IHttpContextAccessor accessor) : base(logger, accessor)
         {
-            _[Module]Service = [Module]Service;
+            _MyModuleService = MyModuleService;
         }
 
         // GET: api/<controller>?moduleid=x
         [HttpGet]
         [Authorize(Policy = PolicyNames.ViewModule)]
-        public async Task<IEnumerable<Models.[Module]>> Get(string moduleid)
+        public async Task<IEnumerable<Models.MyModule>> Get(string moduleid)
         {
             int ModuleId;
             if (int.TryParse(moduleid, out ModuleId) && IsAuthorizedEntityId(EntityNames.Module, ModuleId))
             {
-                return await _[Module]Service.Get[Module]sAsync(ModuleId);
+                return await _MyModuleService.GetMyModulesAsync(ModuleId);
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized [Module] Get Attempt {ModuleId}", moduleid);
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized MyModule Get Attempt {ModuleId}", moduleid);
                 HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 return null;
             }
@@ -43,16 +43,16 @@ namespace [Owner].Module.[Module].Controllers
         // GET api/<controller>/5
         [HttpGet("{id}/{moduleid}")]
         [Authorize(Policy = PolicyNames.ViewModule)]
-        public async Task<Models.[Module]> Get(int id, int moduleid)
+        public async Task<Models.MyModule> Get(int id, int moduleid)
         {
-            Models.[Module] [Module] = await _[Module]Service.Get[Module]Async(id, moduleid);
-            if ([Module] != null && IsAuthorizedEntityId(EntityNames.Module, [Module].ModuleId))
+            Models.MyModule MyModule = await _MyModuleService.GetMyModuleAsync(id, moduleid);
+            if (MyModule != null && IsAuthorizedEntityId(EntityNames.Module, MyModule.ModuleId))
             {
-                return [Module];
+                return MyModule;
             }
             else
             { 
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized [Module] Get Attempt {[Module]Id} {ModuleId}", id, moduleid);
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized MyModule Get Attempt {MyModuleId} {ModuleId}", id, moduleid);
                 HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 return null;
             }
@@ -61,37 +61,37 @@ namespace [Owner].Module.[Module].Controllers
         // POST api/<controller>
         [HttpPost]
         [Authorize(Policy = PolicyNames.EditModule)]
-        public async Task<Models.[Module]> Post([FromBody] Models.[Module] [Module])
+        public async Task<Models.MyModule> Post([FromBody] Models.MyModule MyModule)
         {
-            if (ModelState.IsValid && IsAuthorizedEntityId(EntityNames.Module, [Module].ModuleId))
+            if (ModelState.IsValid && IsAuthorizedEntityId(EntityNames.Module, MyModule.ModuleId))
             {
-                [Module] = await _[Module]Service.Add[Module]Async([Module]);
+                MyModule = await _MyModuleService.AddMyModuleAsync(MyModule);
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized [Module] Post Attempt {[Module]}", [Module]);
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized MyModule Post Attempt {MyModule}", MyModule);
                 HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
-                [Module] = null;
+                MyModule = null;
             }
-            return [Module];
+            return MyModule;
         }
 
         // PUT api/<controller>/5
         [HttpPut("{id}")]
         [Authorize(Policy = PolicyNames.EditModule)]
-        public async Task<Models.[Module]> Put(int id, [FromBody] Models.[Module] [Module])
+        public async Task<Models.MyModule> Put(int id, [FromBody] Models.MyModule MyModule)
         {
-            if (ModelState.IsValid && [Module].[Module]Id == id && IsAuthorizedEntityId(EntityNames.Module, [Module].ModuleId))
+            if (ModelState.IsValid && MyModule.MyModuleId == id && IsAuthorizedEntityId(EntityNames.Module, MyModule.ModuleId))
             {
-                [Module] = await _[Module]Service.Update[Module]Async([Module]);
+                MyModule = await _MyModuleService.UpdateMyModuleAsync(MyModule);
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized [Module] Put Attempt {[Module]}", [Module]);
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized MyModule Put Attempt {MyModule}", MyModule);
                 HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
-                [Module] = null;
+                MyModule = null;
             }
-            return [Module];
+            return MyModule;
         }
 
         // DELETE api/<controller>/5
@@ -99,14 +99,14 @@ namespace [Owner].Module.[Module].Controllers
         [Authorize(Policy = PolicyNames.EditModule)]
         public async Task Delete(int id, int moduleid)
         {
-            Models.[Module] [Module] = await _[Module]Service.Get[Module]Async(id, moduleid);
-            if ([Module] != null && IsAuthorizedEntityId(EntityNames.Module, [Module].ModuleId))
+            Models.MyModule MyModule = await _MyModuleService.GetMyModuleAsync(id, moduleid);
+            if (MyModule != null && IsAuthorizedEntityId(EntityNames.Module, MyModule.ModuleId))
             {
-                await _[Module]Service.Delete[Module]Async(id, [Module].ModuleId);
+                await _MyModuleService.DeleteMyModuleAsync(id, MyModule.ModuleId);
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized [Module] Delete Attempt {[Module]Id} {ModuleId}", id, moduleid);
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized v Delete Attempt {MyModuleId} {ModuleId}", id, moduleid);
                 HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
             }
         }

Oqtane.Application/Server/Manager/MyModuleManager.cs

@@ -0,0 +1,87 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using Oqtane.Modules;
+using Oqtane.Models;
+using Oqtane.Infrastructure;
+using Oqtane.Interfaces;
+using Oqtane.Enums;
+using Oqtane.Repository;
+using Oqtane.Application.Repository;
+using System.Threading.Tasks;
+
+namespace Oqtane.Application.Manager
+{
+    public class MyModuleManager : MigratableModuleBase, IInstallable, IPortable, ISearchable
+    {
+        private readonly IMyModuleRepository _MyModuleRepository;
+        private readonly IDBContextDependencies _DBContextDependencies;
+
+        public MyModuleManager(IMyModuleRepository MyModuleRepository, IDBContextDependencies DBContextDependencies)
+        {
+            _MyModuleRepository = MyModuleRepository;
+            _DBContextDependencies = DBContextDependencies;
+        }
+
+        public bool Install(Tenant tenant, string version)
+        {
+            return Migrate(new Context(_DBContextDependencies), tenant, MigrationType.Up);
+        }
+
+        public bool Uninstall(Tenant tenant)
+        {
+            return Migrate(new Context(_DBContextDependencies), tenant, MigrationType.Down);
+        }
+
+        public string ExportModule(Module module)
+        {
+            string content = "";
+            List<Models.MyModule> MyModules = _MyModuleRepository.GetMyModules(module.ModuleId).ToList();
+            if (MyModules != null)
+            {
+                content = JsonSerializer.Serialize(MyModules);
+            }
+            return content;
+        }
+
+        public void ImportModule(Module module, string content, string version)
+        {
+            List<Models.MyModule> MyModules = null;
+            if (!string.IsNullOrEmpty(content))
+            {
+                MyModules = JsonSerializer.Deserialize<List<Models.MyModule>>(content);
+            }
+            if (MyModules != null)
+            {
+                foreach(var Task in MyModules)
+                {
+                    _MyModuleRepository.AddMyModule(new Models.MyModule { ModuleId = module.ModuleId, Name = Task.Name });
+                }
+            }
+        }
+
+        public Task<List<SearchContent>> GetSearchContentsAsync(PageModule pageModule, DateTime lastIndexedOn)
+        {
+           var searchContentList = new List<SearchContent>();
+
+           foreach (var MyModule in _MyModuleRepository.GetMyModules(pageModule.ModuleId))
+           {
+               if (MyModule.ModifiedOn >= lastIndexedOn)
+               {
+                   searchContentList.Add(new SearchContent
+                   {
+                       EntityName = "MyModule",
+                       EntityId = MyModule.MyModuleId.ToString(),
+                       Title = MyModule.Name,
+                       Body = MyModule.Name,
+                       ContentModifiedBy = MyModule.ModifiedBy,
+                       ContentModifiedOn = MyModule.ModifiedOn
+                   });
+               }
+           }
+
+           return Task.FromResult(searchContentList);
+        }
+    }
+}

Oqtane.Application/Server/Migrations/01000000_InitializeModule.cs

@@ -2,13 +2,13 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Oqtane.Databases.Interfaces;
 using Oqtane.Migrations;
-using [Owner].Module.[Module].Migrations.EntityBuilders;
-using [Owner].Module.[Module].Repository;
+using Oqtane.Application.Migrations.EntityBuilders;
+using Oqtane.Application.Repository;
 
-namespace [Owner].Module.[Module].Migrations
+namespace Oqtane.Application.Migrations
 {
-    [DbContext(typeof([Module]Context))]
-    [Migration("[Owner].Module.[Module].01.00.00.00")]
+    [DbContext(typeof(Context))]
+    [Migration("Oqtane.Application.01.00.00.00")]
     public class InitializeModule : MultiDatabaseMigration
     {
         public InitializeModule(IDatabase database) : base(database)
@@ -17,14 +17,14 @@ namespace [Owner].Module.[Module].Migrations
 
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            var entityBuilder = new [Module]EntityBuilder(migrationBuilder, ActiveDatabase);
-            entityBuilder.Create();
+            var myModuleEntityBuilder = new MyModuleEntityBuilder(migrationBuilder, ActiveDatabase);
+            myModuleEntityBuilder.Create();
         }
 
         protected override void Down(MigrationBuilder migrationBuilder)
         {
-            var entityBuilder = new [Module]EntityBuilder(migrationBuilder, ActiveDatabase);
-            entityBuilder.Drop();
+            var myModuleEntityBuilder = new MyModuleEntityBuilder(migrationBuilder, ActiveDatabase);
+            myModuleEntityBuilder.Drop();
         }
     }
 }

Oqtane.Application/Server/Migrations/EntityBuilders/MyModuleEntityBuilder.cs

@@ -5,31 +5,31 @@ using Oqtane.Databases.Interfaces;
 using Oqtane.Migrations;
 using Oqtane.Migrations.EntityBuilders;
 
-namespace [Owner].Module.[Module].Migrations.EntityBuilders
+namespace Oqtane.Application.Migrations.EntityBuilders
 {
-    public class [Module]EntityBuilder : AuditableBaseEntityBuilder<[Module]EntityBuilder>
+    public class MyModuleEntityBuilder : AuditableBaseEntityBuilder<MyModuleEntityBuilder>
     {
-        private const string _entityTableName = "[Owner][Module]";
-        private readonly PrimaryKey<[Module]EntityBuilder> _primaryKey = new("PK_[Owner][Module]", x => x.[Module]Id);
-        private readonly ForeignKey<[Module]EntityBuilder> _moduleForeignKey = new("FK_[Owner][Module]_Module", x => x.ModuleId, "Module", "ModuleId", ReferentialAction.Cascade);
+        private const string _entityTableName = "MyModule";
+        private readonly PrimaryKey<MyModuleEntityBuilder> _primaryKey = new("PK_MyModule", x => x.MyModuleId);
+        private readonly ForeignKey<MyModuleEntityBuilder> _moduleForeignKey = new("FK_MyModule_Module", x => x.ModuleId, "Module", "ModuleId", ReferentialAction.Cascade);
 
-        public [Module]EntityBuilder(MigrationBuilder migrationBuilder, IDatabase database) : base(migrationBuilder, database)
+        public MyModuleEntityBuilder(MigrationBuilder migrationBuilder, IDatabase database) : base(migrationBuilder, database)
         {
             EntityTableName = _entityTableName;
             PrimaryKey = _primaryKey;
             ForeignKeys.Add(_moduleForeignKey);
         }
 
-        protected override [Module]EntityBuilder BuildTable(ColumnsBuilder table)
+        protected override MyModuleEntityBuilder BuildTable(ColumnsBuilder table)
         {
-            [Module]Id = AddAutoIncrementColumn(table,"[Module]Id");
+            MyModuleId = AddAutoIncrementColumn(table, "MyModuleId");
             ModuleId = AddIntegerColumn(table,"ModuleId");
             Name = AddMaxStringColumn(table,"Name");
             AddAuditableColumns(table);
             return this;
         }
 
-        public OperationBuilder<AddColumnOperation> [Module]Id { get; set; }
+        public OperationBuilder<AddColumnOperation> MyModuleId { get; set; }
         public OperationBuilder<AddColumnOperation> ModuleId { get; set; }
         public OperationBuilder<AddColumnOperation> Name { get; set; }
     }

Oqtane.Application/Server/Oqtane.Application.Server.csproj

@@ -1,15 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <Version>1.0.0</Version>
-    <Product>[Owner].Module.[Module]</Product>
-    <Authors>[Owner]</Authors>
-    <Company>[Owner]</Company>
-    <Description>[Description]</Description>
-    <Copyright>[Owner]</Copyright>
-    <AssemblyName>[Owner].Module.[Module].Server.Oqtane</AssemblyName>
+    <AssemblyName>Oqtane.Application.Server.Oqtane</AssemblyName>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
@@ -19,18 +14,23 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.8" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Shared\[Owner].Module.[Module].Shared.csproj" />
+    <ProjectReference Include="..\Client\Oqtane.Application.Client.csproj" />
+    <ProjectReference Include="..\Shared\Oqtane.Application.Shared.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    [ServerReference]
-    [SharedReference]
+    <PackageReference Include="Oqtane.Server" Version="6.1.4" />
+    <PackageReference Include="Oqtane.Shared" Version="6.1.4" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="wwwroot\Themes\Oqtane.Application.MyTheme\" />
   </ItemGroup>
 </Project>

Oqtane.Application/Server/Repository/Context.cs

@@ -0,0 +1,24 @@
+using Microsoft.EntityFrameworkCore;
+using Oqtane.Modules;
+using Oqtane.Repository;
+using Oqtane.Repository.Databases.Interfaces;
+
+namespace Oqtane.Application.Repository
+{
+    public class Context : DBContextBase, ITransientService, IMultiDatabase
+    {
+        public virtual DbSet<Models.MyModule> MyModule { get; set; }
+
+        public Context(IDBContextDependencies DBContextDependencies) : base(DBContextDependencies)
+        {
+            // ContextBase handles multi-tenant database connections
+        }
+
+        protected override void OnModelCreating(ModelBuilder builder)
+        {
+            base.OnModelCreating(builder);
+
+            builder.Entity<Models.MyModule>().ToTable(ActiveDatabase.RewriteName("MyModule"));
+        }
+    }
+}

Oqtane.Application/Server/Repository/MyModuleRepository.cs

@@ -0,0 +1,75 @@
+using Microsoft.EntityFrameworkCore;
+using System.Linq;
+using System.Collections.Generic;
+using Oqtane.Modules;
+
+namespace Oqtane.Application.Repository
+{
+    public interface IMyModuleRepository
+    {
+        IEnumerable<Models.MyModule> GetMyModules(int ModuleId);
+        Models.MyModule GetMyModule(int MyModuleId);
+        Models.MyModule GetMyModule(int MyModuleId, bool tracking);
+        Models.MyModule AddMyModule(Models.MyModule MyModule);
+        Models.MyModule UpdateMyModule(Models.MyModule MyModule);
+        void DeleteMyModule(int MyModuleId);
+    }
+
+    public class MyModuleRepository : IMyModuleRepository, ITransientService
+    {
+        private readonly IDbContextFactory<Context> _factory;
+
+        public MyModuleRepository(IDbContextFactory<Context> factory)
+        {
+            _factory = factory;
+        }
+
+        public IEnumerable<Models.MyModule> GetMyModules(int ModuleId)
+        {
+            using var db = _factory.CreateDbContext();
+            return db.MyModule.Where(item => item.ModuleId == ModuleId).ToList();
+        }
+
+        public Models.MyModule GetMyModule(int MyModuleId)
+        {
+            return GetMyModule(MyModuleId, true);
+        }
+
+        public Models.MyModule GetMyModule(int MyModuleId, bool tracking)
+        {
+            using var db = _factory.CreateDbContext();
+            if (tracking)
+            {
+                return db.MyModule.Find(MyModuleId);
+            }
+            else
+            {
+                return db.MyModule.AsNoTracking().FirstOrDefault(item => item.MyModuleId == MyModuleId);
+            }
+        }
+
+        public Models.MyModule AddMyModule(Models.MyModule MyModule)
+        {
+            using var db = _factory.CreateDbContext();
+            db.MyModule.Add(MyModule);
+            db.SaveChanges();
+            return MyModule;
+        }
+
+        public Models.MyModule UpdateMyModule(Models.MyModule MyModule)
+        {
+            using var db = _factory.CreateDbContext();
+            db.Entry(MyModule).State = EntityState.Modified;
+            db.SaveChanges();
+            return MyModule;
+        }
+
+        public void DeleteMyModule(int MyModuleId)
+        {
+            using var db = _factory.CreateDbContext();
+            Models.MyModule MyModule = db.MyModule.Find(MyModuleId);
+            db.MyModule.Remove(MyModule);
+            db.SaveChanges();
+        }
+    }
+}

Oqtane.Application/Server/Services/MyModuleService.cs

@@ -7,93 +7,93 @@ using Oqtane.Infrastructure;
 using Oqtane.Models;
 using Oqtane.Security;
 using Oqtane.Shared;
-using [Owner].Module.[Module].Repository;
+using Oqtane.Application.Repository;
 
-namespace [Owner].Module.[Module].Services
+namespace Oqtane.Application.Services
 {
-    public class Server[Module]Service : I[Module]Service
+    public class ServerMyModuleService : IMyModuleService
     {
-        private readonly I[Module]Repository _[Module]Repository;
+        private readonly IMyModuleRepository _MyModuleRepository;
         private readonly IUserPermissions _userPermissions;
         private readonly ILogManager _logger;
         private readonly IHttpContextAccessor _accessor;
         private readonly Alias _alias;
 
-        public Server[Module]Service(I[Module]Repository [Module]Repository, IUserPermissions userPermissions, ITenantManager tenantManager, ILogManager logger, IHttpContextAccessor accessor)
+        public ServerMyModuleService(IMyModuleRepository MyModuleRepository, IUserPermissions userPermissions, ITenantManager tenantManager, ILogManager logger, IHttpContextAccessor accessor)
         {
-            _[Module]Repository = [Module]Repository;
+            _MyModuleRepository = MyModuleRepository;
             _userPermissions = userPermissions;
             _logger = logger;
             _accessor = accessor;
             _alias = tenantManager.GetAlias();
         }
 
-        public Task<List<Models.[Module]>> Get[Module]sAsync(int ModuleId)
+        public Task<List<Models.MyModule>> GetMyModulesAsync(int ModuleId)
         {
             if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.View))
             {
-                return Task.FromResult(_[Module]Repository.Get[Module]s(ModuleId).ToList());
+                return Task.FromResult(_MyModuleRepository.GetMyModules(ModuleId).ToList());
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized [Module] Get Attempt {ModuleId}", ModuleId);
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized MyModule Get Attempt {ModuleId}", ModuleId);
                 return null;
             }
         }
 
-        public Task<Models.[Module]> Get[Module]Async(int [Module]Id, int ModuleId)
+        public Task<Models.MyModule> GetMyModuleAsync(int MyModuleId, int ModuleId)
         {
             if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.View))
             {
-                return Task.FromResult(_[Module]Repository.Get[Module]([Module]Id));
+                return Task.FromResult(_MyModuleRepository.GetMyModule(MyModuleId));
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized [Module] Get Attempt {[Module]Id} {ModuleId}", [Module]Id, ModuleId);
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized MyModule Get Attempt {TaskId} {ModuleId}", MyModuleId, ModuleId);
                 return null;
             }
         }
 
-        public Task<Models.[Module]> Add[Module]Async(Models.[Module] [Module])
+        public Task<Models.MyModule> AddMyModuleAsync(Models.MyModule MyModule)
         {
-            if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, [Module].ModuleId, PermissionNames.Edit))
+            if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, MyModule.ModuleId, PermissionNames.Edit))
             {
-                [Module] = _[Module]Repository.Add[Module]([Module]);
-                _logger.Log(LogLevel.Information, this, LogFunction.Create, "[Module] Added {[Module]}", [Module]);
+                MyModule = _MyModuleRepository.AddMyModule(MyModule);
+                _logger.Log(LogLevel.Information, this, LogFunction.Create, "MyModule Added {MyModule}", MyModule);
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized [Module] Add Attempt {[Module]}", [Module]);
-                [Module] = null;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized MyModule Add Attempt {MyModule}", MyModule);
+                MyModule = null;
             }
-            return Task.FromResult([Module]);
+            return Task.FromResult(MyModule);
         }
 
-        public Task<Models.[Module]> Update[Module]Async(Models.[Module] [Module])
+        public Task<Models.MyModule> UpdateMyModuleAsync(Models.MyModule MyModule)
         {
-            if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, [Module].ModuleId, PermissionNames.Edit))
+            if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, MyModule.ModuleId, PermissionNames.Edit))
             {
-                [Module] = _[Module]Repository.Update[Module]([Module]);
-                _logger.Log(LogLevel.Information, this, LogFunction.Update, "[Module] Updated {[Module]}", [Module]);
+                MyModule = _MyModuleRepository.UpdateMyModule(MyModule);
+                _logger.Log(LogLevel.Information, this, LogFunction.Update, "MyModule Updated {MyModule}", MyModule);
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized [Module] Update Attempt {[Module]}", [Module]);
-                [Module] = null;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized MyModule Update Attempt {MyModule}", MyModule);
+                MyModule = null;
             }
-            return Task.FromResult([Module]);
+            return Task.FromResult(MyModule);
         }
 
-        public Task Delete[Module]Async(int [Module]Id, int ModuleId)
+        public Task DeleteMyModuleAsync(int MyModuleId, int ModuleId)
         {
             if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.Edit))
             {
-                _[Module]Repository.Delete[Module]([Module]Id);
-                _logger.Log(LogLevel.Information, this, LogFunction.Delete, "[Module] Deleted {[Module]Id}", [Module]Id);
+                _MyModuleRepository.DeleteMyModule(MyModuleId);
+                _logger.Log(LogLevel.Information, this, LogFunction.Delete, "MyModule Deleted {MyModuleId}", MyModuleId);
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized [Module] Delete Attempt {[Module]Id} {ModuleId}", [Module]Id, ModuleId);
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized MyModule Delete Attempt {MyModuleId} {ModuleId}", MyModuleId, ModuleId);
             }
             return Task.CompletedTask;
         }

Oqtane.Application/Server/Startup/ServerStartup.cs

@@ -2,10 +2,10 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Oqtane.Infrastructure;
-using [Owner].Module.[Module].Repository;
-using [Owner].Module.[Module].Services;
+using Oqtane.Application.Repository;
+using Oqtane.Application.Services;
 
-namespace [Owner].Module.[Module].Startup
+namespace Oqtane.Application.Startup
 {
     public class ServerStartup : IServerStartup
     {
@@ -21,8 +21,8 @@ namespace [Owner].Module.[Module].Startup
 
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddTransient<I[Module]Service, Server[Module]Service>();
-            services.AddDbContextFactory<[Module]Context>(opt => { }, ServiceLifetime.Transient);
+            services.AddTransient<IMyModuleService, ServerMyModuleService>();
+            services.AddDbContextFactory<Context>(opt => { }, ServiceLifetime.Transient);
         }
     }
 }

Oqtane.Application/Server/wwwroot/Modules/Oqtane.Application.MyModule/Module.js

@@ -0,0 +1,5 @@
+/* Module Script */
+var App = App || {};
+
+App.MyModule = {
+};