diff --git a/Oqtane.Client/Oqtane.Client.csproj b/Oqtane.Client/Oqtane.Client.csproj index 51b8e8b9..a551efc9 100644 --- a/Oqtane.Client/Oqtane.Client.csproj +++ b/Oqtane.Client/Oqtane.Client.csproj @@ -6,7 +6,7 @@ 7.3 3.0 Debug;Release - 0.9.1 + 1.0.0 Oqtane Shaun Walker .NET Foundation diff --git a/Oqtane.Client/UI/Installer.razor b/Oqtane.Client/UI/Installer.razor index 155a5576..90d7dbd9 100644 --- a/Oqtane.Client/UI/Installer.razor +++ b/Oqtane.Client/UI/Installer.razor @@ -8,6 +8,7 @@
+
Version: @Constants.Version

diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor index 669579ae..ee2516c9 100644 --- a/Oqtane.Client/UI/SiteRouter.razor +++ b/Oqtane.Client/UI/SiteRouter.razor @@ -179,7 +179,7 @@ // extract admin route elements from path var segments = path.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries); int result; - // check if path has moduleid and control specification ie. page/moduleid/control/ + // check if path has moduleid and action specification ie. pagename/moduleid/action/ if (segments.Length >= 2 && int.TryParse(segments[segments.Length - 2], out result)) { action = segments[segments.Length - 1]; @@ -188,7 +188,7 @@ } else { - // check if path has only moduleid specification ie. page/moduleid/ + // check if path has moduleid specification ie. pagename/moduleid/ if (segments.Length >= 1 && int.TryParse(segments[segments.Length - 1], out result)) { moduleid = result; @@ -388,7 +388,7 @@ return page; } - private (Page Page, List Modules) ProcessModules(Page page, List modules, int moduleid, string control, string defaultcontainertype) + private (Page Page, List Modules) ProcessModules(Page page, List modules, int moduleid, string action, string defaultcontainertype) { var paneindex = new Dictionary(); foreach (Module module in modules) @@ -405,20 +405,20 @@ typename = Constants.ErrorModule; } - if (module.ModuleId == moduleid && control != "") + if (module.ModuleId == moduleid && action != "") { // check if the module defines custom routes if (module.ModuleDefinition.ControlTypeRoutes != "") { foreach (string route in module.ModuleDefinition.ControlTypeRoutes.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries)) { - if (route.StartsWith(control + "=")) + if (route.StartsWith(action + "=")) { - typename = route.Replace(control + "=", ""); + typename = route.Replace(action + "=", ""); } } } - module.ModuleType = typename.Replace(Constants.ActionToken, control); + module.ModuleType = typename.Replace(Constants.ActionToken, action); } else { @@ -427,10 +427,10 @@ // get additional metadata from IModuleControl interface typename = module.ModuleType; - if (Constants.DefaultModuleActions.Contains(control)) + if (Constants.DefaultModuleActions.Contains(action)) { // core framework module action components - typename = Constants.DefaultModuleActionsTemplate.Replace(Constants.ActionToken, control); + typename = Constants.DefaultModuleActionsTemplate.Replace(Constants.ActionToken, action); } Type moduletype = Type.GetType(typename); @@ -445,7 +445,7 @@ page.Resources = ManagePageResources(page.Resources, moduleobject.Resources); // additional metadata needed for admin components - if (module.ModuleId == moduleid && control != "") + if (module.ModuleId == moduleid && action != "") { module.SecurityAccessLevel = moduleobject.SecurityAccessLevel; module.ControlTitle = moduleobject.Title; diff --git a/Oqtane.Package/Oqtane.Framework.nuspec b/Oqtane.Package/Oqtane.Framework.nuspec index 000bf21e..d20c4cfb 100644 --- a/Oqtane.Package/Oqtane.Framework.nuspec +++ b/Oqtane.Package/Oqtane.Framework.nuspec @@ -2,7 +2,7 @@ Oqtane.Framework - 0.9.1 + 1.0.0 Shaun Walker .NET Foundation Oqtane Framework diff --git a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs index 82898a03..4b56e443 100644 --- a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs +++ b/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 = "

Oqtane is an open source modular application framework that was built natively using modern .NET Core technology. It leverages the revolutionary new Blazor component model to create a fully dynamic web development experience which can be executed on a client or server. Whether you are looking for a platform to accelerate your web development 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.

" + + Content = "

Oqtane is an open source modular application framework that provides advanced functionality for developing web and mobile applications on ASP.NET Core. It leverages the revolutionary new Blazor component model to compose a fully dynamic web development experience which can be hosted either client-side or server-side. Whether you are looking for a platform to accelerate your web development 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.

" + "

Join Our Community  Clone Our Repo

" + - "

Blazor 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.

" + + "

Blazor is an open source and cross-platform web UI framework for building single-page apps using .NET and 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.

" + "

Blazor is a feature of ASP.NET Core 3, the popular cross platform web development framework from Microsoft that extends the .NET developer platform with tools and libraries for building web apps.

" }, new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "MIT License", Pane = "Content", diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj index 629b061f..539c2bce 100644 --- a/Oqtane.Server/Oqtane.Server.csproj +++ b/Oqtane.Server/Oqtane.Server.csproj @@ -4,7 +4,7 @@ netcoreapp3.1 7.3 Debug;Release - 0.9.1 + 1.0.0 Oqtane Shaun Walker .NET Foundation diff --git a/Oqtane.Shared/Oqtane.Shared.csproj b/Oqtane.Shared/Oqtane.Shared.csproj index e8b49edc..81465f1b 100644 --- a/Oqtane.Shared/Oqtane.Shared.csproj +++ b/Oqtane.Shared/Oqtane.Shared.csproj @@ -4,7 +4,7 @@ netstandard2.1 7.3 Debug;Release - 0.9.1 + 1.0.0 Oqtane Shaun Walker .NET Foundation diff --git a/Oqtane.Shared/Shared/Constants.cs b/Oqtane.Shared/Shared/Constants.cs index 11042314..d2c56967 100644 --- a/Oqtane.Shared/Shared/Constants.cs +++ b/Oqtane.Shared/Shared/Constants.cs @@ -5,8 +5,8 @@ namespace Oqtane.Shared public class Constants { public const string PackageId = "Oqtane.Framework"; - public const string Version = "0.9.1"; - public const string ReleaseVersions = "0.9.0,0.9.1"; + public const string Version = "1.0.0"; + public const string ReleaseVersions = "0.9.0,0.9.1,0.9.2,1.0.0"; public const string PageComponent = "Oqtane.UI.ThemeBuilder, Oqtane.Client"; public const string ContainerComponent = "Oqtane.UI.ContainerBuilder, Oqtane.Client"; diff --git a/Oqtane.Upgrade/Oqtane.Upgrade.csproj b/Oqtane.Upgrade/Oqtane.Upgrade.csproj index d9648c07..b4d55166 100644 --- a/Oqtane.Upgrade/Oqtane.Upgrade.csproj +++ b/Oqtane.Upgrade/Oqtane.Upgrade.csproj @@ -4,7 +4,7 @@ netcoreapp3.1 7.3 Exe - 0.9.1 + 1.0.0 Oqtane Shaun Walker .NET Foundation