module creator template updates

Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor

@@ -105,11 +105,11 @@
                     string[] path = systeminfo["serverpath"].Split('\\');
                     if (_template == "internal")
                     {
-                        _location = string.Join("\\", path, 0, path.Length - 1) + "\\Oqtane.Client\\Modules\\" + _owner + "." + _module;
+                        _location = string.Join("\\", path, 0, path.Length - 1) + "\\Oqtane.Client\\Modules\\" + _owner + "." + _module + "s";
                     }
                     else
                     {
-                        _location = string.Join("\\", path, 0, path.Length - 2) + "\\" + _owner + "." + _module;
+                        _location = string.Join("\\", path, 0, path.Length - 2) + "\\" + _owner + "." + _module + "s";
                     }
                 }
             }

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/Edit.razor

@@ -28,8 +28,14 @@
 
 @code {
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
+
     public override string Actions => "Add,Edit";
 
+    public override List<Resource> Resources => new List<Resource>()
+    {
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" }
+    };
+
     int _id;
     string _name;
     string _createdby;

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/Index.razor

@@ -62,7 +62,8 @@ else
 - Repository\[Module]Respository.cs - implements repository interface methods for data access using EF Core<br />
 - Repository\[Module]Context.cs - provides a DB Context for data access<br />
 - Scripts\[Owner].[Module]s.1.0.0.sql - database schema definition script<br />
-- Scripts\[Owner].[Module]s.Uninstall.sql - database uninstall script<br /><br />
+- Scripts\[Owner].[Module]s.Uninstall.sql - database uninstall script<br />
+- wwwroot\Module.css - module style sheet<br /><br />
 [RootPath]Shared\<br />
 - [Owner].[Module]s.csproj - shared project<br />
 - Models\[Module].cs - model definition<br /><br />
@@ -70,6 +71,11 @@ else
 <!-- The content above is for informational purposes only and can be safely removed -->
 
 @code {
+    public override List<Resource> Resources => new List<Resource>()
+    {
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" }
+    };
+
     List<[Module]> _[Module]s;
 
     protected override async Task OnInitializedAsync()

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Package/[Owner].[Module]s.nuspec

@@ -26,7 +26,7 @@
     <file src="..\Server\bin\Release\netcoreapp3.1\[Owner].[Module]s.Server.Oqtane.pdb" target="lib" /> 
     <file src="..\Shared\bin\Release\netstandard2.1\[Owner].[Module]s.Shared.Oqtane.dll" target="lib" /> 
     <file src="..\Shared\bin\Release\netstandard2.1\[Owner].[Module]s.Shared.Oqtane.pdb" target="lib" /> 
-    <file src="..\wwwroot\**\*.*" target="wwwroot" /> 
-    <file src="..\content\**\*.*" target="content" /> 
+    <file src="..\Server\wwwroot\**\*.*" target="wwwroot" /> 
+    <file src="..\Server\content\**\*.*" target="content" /> 
   </files>
 </package>

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/wwwroot/Module.css

@@ -0,0 +1 @@
+/* Module Custom Styles */

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/wwwroot/resources.txt

@@ -0,0 +1 @@
+This is the location where static resources such as images, style sheets, or scripts for this module will be located. Static assets can be organized in subfolders. When the module package is deployed the assets will be extracted under the web root in a folder that matches the module namespace.

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/wwwroot/resources.txt

@@ -1 +0,0 @@
-This is the location where static resources such as images or style sheets for this module will be located. Static assets can be organized in subfolders. When the module package is deployed the assets will be extracted under the web root in a folder that matches the module name.

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Owner].[Module]s/Manager/[Module]Manager.cs

@@ -10,25 +10,13 @@ using [Owner].[Module]s.Repository;
 
 namespace [Owner].[Module]s.Manager
 {
-    public class [Module]Manager : IInstallable, IPortable
+    public class [Module]Manager : IPortable
     {
         private I[Module]Repository _[Module]s;
-        private ISqlRepository _sql;
 
-        public [Module]Manager(I[Module]Repository [Module]s, ISqlRepository sql)
+        public [Module]Manager(I[Module]Repository [Module]s)
         {
             _[Module]s = [Module]s;
-            _sql = sql;
-        }
-
-        public bool Install(Tenant tenant, string version)
-        {
-            return _sql.ExecuteScript(tenant, GetType().Assembly, "[Owner].[Module]s." + version + ".sql");
-        }
-
-        public bool Uninstall(Tenant tenant)
-        {
-            return _sql.ExecuteScript(tenant, GetType().Assembly, "[Owner].[Module]s.Uninstall.sql");
         }
 
         public string ExportModule(Module module)

Oqtane.Server/Controllers/ModuleDefinitionController.cs

@@ -196,8 +196,8 @@ namespace Oqtane.Controllers
                 {
                     // add embedded resources to project
                     List<string> resources = new List<string>();
-                    resources.Add(Utilities.PathCombine("Modules", moduleDefinition.Owner + "." + moduleDefinition.Name, "Scripts", moduleDefinition.Owner + "." + moduleDefinition.Name + "s.1.0.0.sql"));
-                    resources.Add(Utilities.PathCombine("Modules", moduleDefinition.Owner + "." + moduleDefinition.Name, "Scripts", moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Uninstall.sql"));
+                    resources.Add(Utilities.PathCombine("Modules", moduleDefinition.Owner + "." + moduleDefinition.Name + "s", "Scripts", moduleDefinition.Owner + "." + moduleDefinition.Name + "s.1.0.0.sql"));
+                    resources.Add(Utilities.PathCombine("Modules", moduleDefinition.Owner + "." + moduleDefinition.Name + "s", "Scripts", moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Uninstall.sql"));
                     EmbedResourceFiles(Utilities.PathCombine(rootPath, "Oqtane.Server", "Oqtane.Server.csproj"), resources);
                 }
 

Oqtane.Server/Infrastructure/InstallationManager.cs

@@ -92,33 +92,19 @@ namespace Oqtane.Infrastructure
 
                                 switch (foldername)
                                 {
-                                    case "":
-                                        if (filename.EndsWith(".nuspec"))
-                                        {
-                                            filename = Path.Combine(sourceFolder, name);
-                                            entry.ExtractToFile(filename, true);
-                                        }
-                                        break;
                                     case "lib":
-                                        if (binFolder != null) entry.ExtractToFile(Path.Combine(binFolder, filename), true);
+                                        filename = Path.Combine(binFolder, filename);
+                                        ExtractFile(entry, filename);
                                         break;
                                     case "wwwroot":
                                         filename = Path.Combine(sourceFolder, Utilities.PathCombine(entry.FullName.Replace("wwwroot", name).Split('/')));
-                                        if (!Directory.Exists(Path.GetDirectoryName(filename)))
-                                        {
-                                            Directory.CreateDirectory(Path.GetDirectoryName(filename));
-                                        }
-                                        entry.ExtractToFile(filename, true);
+                                        ExtractFile(entry, filename);
                                         break;
                                     case "content":
                                         if (Path.GetDirectoryName(entry.FullName) != "content") // assets must be in subfolders
                                         {
                                             filename = Path.Combine(webRootPath, Utilities.PathCombine(entry.FullName.Replace("content", "").Split('/')));
-                                            if (!Directory.Exists(Path.GetDirectoryName(filename)))
-                                            {
-                                                Directory.CreateDirectory(Path.GetDirectoryName(filename));
-                                            }
-                                            entry.ExtractToFile(filename, true);
+                                            ExtractFile(entry, filename);
                                         }
                                         break;
                                 }
@@ -135,6 +121,15 @@ namespace Oqtane.Infrastructure
             return install;
         }
 
+        private static void ExtractFile(ZipArchiveEntry entry, string filename)
+        {
+            if (!Directory.Exists(Path.GetDirectoryName(filename)))
+            {
+                Directory.CreateDirectory(Path.GetDirectoryName(filename));
+            }
+            entry.ExtractToFile(filename, true);
+        }
+
         public void UpgradeFramework()
         {
             string folder = Path.Combine(_environment.WebRootPath, "Framework");

Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs

@@ -55,9 +55,9 @@ namespace Oqtane.SiteTemplates
                             new Permission(PermissionNames.View, Constants.AdminRole, true),
                             new Permission(PermissionNames.Edit, Constants.AdminRole, true)
                         }.EncodePermissions(),
-                        Content = "<p><a href=\"https://www.oqtane.org\" target=\"_new\">Oqtane</a> is an open source <b>modular application framework</b> built from the ground up using modern .NET Core technology. It leverages the revolutionary new Blazor component model to create a <b>fully dynamic</b> web development experience which can be executed on a client or server. Whether you are looking for a platform to <b>accelerate your web development</b> efforts, or simply interested in exploring the anatomy of a large-scale Blazor application, Oqtane provides a solid foundation based on proven enterprise architectural principles.</p>" +
+                        Content = "<p><a href=\"https://www.oqtane.org\" target=\"_new\">Oqtane</a> is an open source <b>modular application framework</b> that was built natively using modern .NET Core technology. It leverages the revolutionary new Blazor component model to create a <b>fully dynamic</b> web development experience which can be executed on a client or server. Whether you are looking for a platform to <b>accelerate your web development</b> efforts, or simply interested in exploring the anatomy of a large-scale Blazor application, Oqtane provides a solid foundation based on proven enterprise architectural principles.</p>" +
                         "<p align=\"center\"><a href=\"https://www.oqtane.org\" target=\"_new\"><img class=\"img-fluid\" src=\"oqtane-white.png\"></a></p><p align=\"center\"><a class=\"btn btn-primary\" href=\"https://www.oqtane.org/Community\" target=\"_new\">Join Our Community</a>&nbsp;&nbsp;<a class=\"btn btn-primary\" href=\"https://github.com/oqtane/oqtane.framework\" target=\"_new\">Clone Our Repo</a></p>" +
-                        "<p><a href=\"https://dotnet.microsoft.com/apps/aspnet/web-apps/blazor\" target=\"_new\">Blazor</a> is a single-page app framework that lets you build interactive web applications using C# instead of JavaScript. Client-side Blazor relies on WebAssembly, an open web standard that does not require plugins or code transpilation in order to run natively in a web browser. Server-side Blazor uses SignalR to host your application on a web server and provide a responsive and robust debugging experience. Blazor applications works in all modern web browsers, including mobile browsers.</p>" +
+                        "<p><a href=\"https://dotnet.microsoft.com/apps/aspnet/web-apps/blazor\" target=\"_new\">Blazor</a> is a single-page app framework that lets you build interactive web applications using C# instead of JavaScript. Blazor WebAssembly relies on Wasm, an open web standard that does not require plugins or code transpilation in order to run natively in a web browser. Blazor Server uses SignalR to host your application on a web server and provide a responsive and robust development experience. Blazor applications work in all modern web browsers, including mobile browsers.</p>" +
                         "<p>Blazor is a feature of <a href=\"https://dotnet.microsoft.com/apps/aspnet\" target=\"_new\">ASP.NET Core 3</a>, the popular cross platform web development framework from Microsoft that extends the <a href=\"https://dotnet.microsoft.com/learn/dotnet/what-is-dotnet\" target=\"_new\" >.NET developer platform</a> with tools and libraries for building web apps.</p>"
                     },
                     new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "MIT License", Pane = "Content",