Merge pull request #5685 from oqtane/master

6.2.1 Release

.deployment

@@ -1,2 +0,0 @@
-[config]
-project = Oqtane.Server/Oqtane.Server.csproj

.gitignore

@@ -35,4 +35,4 @@ Oqtane.Server/wwwroot/Themes/*
 !Oqtane.Server/wwwroot/Themes/Oqtane.Themes.*
 !Oqtane.Server/wwwroot/Themes/Templates
 Oqtane.Server/wwwroot/Themes/Templates/*
-Oqtane.Server/wwwroot/Themes/Templates/External
+!Oqtane.Server/wwwroot/Themes/Templates/External

Directory.Build.props

@@ -0,0 +1,17 @@
+<Project>
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <Configurations>Debug;Release</Configurations>
+    <Version>6.2.1</Version>
+    <Product>Oqtane</Product>
+    <Authors>Shaun Walker</Authors>
+    <Company>.NET Foundation</Company>
+    <Description>CMS and Application Framework for Blazor and .NET MAUI</Description>
+    <Copyright>.NET Foundation</Copyright>
+    <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
+    <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.2.1</PackageReleaseNotes>
+    <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
+    <RepositoryType>Git</RepositoryType>
+  </PropertyGroup>
+</Project>

Oqtane.Application/.gitignore

@@ -0,0 +1,9 @@
+.vs/
+bin/
+obj/
+*.user
+artifacts/
+msbuild.binlog
+.vscode/
+*.binlog
+*.nupkg

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

@@ -0,0 +1,86 @@
+{
+  "$schema": "http://json.schemastore.org/template",
+  "author": "Shaun Walker",
+  "classifications": [
+    "Web",
+    "ASP.NET",
+    "Blazor",
+    "Oqtane"
+  ],
+  "name": "Oqtane Application Template",
+  "shortName": "oqtane-app",
+  "defaultName": "MyCompany.MyProject",
+  "identity": "Oqtane.Application.Template",
+  "tags": {
+    "language": "C#",
+    "type": "solution",
+    "editorTreatAs":"solution"
+  },
+  "sourceName": "Oqtane.Application",
+  "preferNameDirectory": true,
+  "guids": [
+    "04B05448-788F-433D-92C0-FED35122D45A",
+    "AA8E58A1-CD09-4208-BF66-A8BB341FD669",
+    "18D73F73-D7BE-4388-85BA-FBD9AC96FCA2"
+  ],
+  "symbols": {
+    "Framework": {
+      "type": "parameter",
+      "description": "The target framework for the project",
+      "datatype": "choice",
+      "choices": [
+        {
+          "choice": "net9.0",
+          "description": "Target net9.0"
+        }
+      ],
+      "replaces": "net9.0",
+      "defaultValue": "net9.0"
+    },
+    "HttpPort": {
+      "type": "parameter",
+      "datatype": "integer",
+      "description": "Port number to use for the HTTP endpoint in launchSettings.json."
+    },
+    "HttpPortGenerated": {
+      "type": "generated",
+      "generator": "port"
+    },
+    "HttpPortReplacer": {
+      "type": "generated",
+      "generator": "coalesce",
+      "parameters": {
+        "sourceVariableName": "HttpPort",
+        "fallbackVariableName": "HttpPortGenerated"
+      },
+      "replaces": "44358"
+    },
+    "HttpsPort": {
+      "type": "parameter",
+      "datatype": "integer",
+      "description": "Port number to use for the HTTPS endpoint in launchSettings.json."
+    },
+    "HttpsPortGenerated": {
+      "type": "generated",
+      "generator": "port",
+      "parameters": {
+        "low": 44300,
+        "high": 44399
+      }
+    },
+    "HttpsPortReplacer": {
+      "type": "generated",
+      "generator": "coalesce",
+      "parameters": {
+        "sourceVariableName": "HttpsPort",
+        "fallbackVariableName": "HttpsPortGenerated"
+      },
+      "replaces": "44359"
+    }
+  },
+  "primaryOutputs": [
+    {
+      "path": "Oqtane.Application.sln"
+    }
+  ]
+}

Oqtane.Application/Client/AssemblyInfo.cs

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

Oqtane.Application/Client/Interop.cs

@@ -0,0 +1,15 @@
+using Microsoft.JSInterop;
+using System.Threading.Tasks;
+
+namespace Oqtane.Application
+{
+    public class Interop
+    {
+        private readonly IJSRuntime _jsRuntime;
+
+        public Interop(IJSRuntime jsRuntime)
+        {
+            _jsRuntime = jsRuntime;
+        }
+    }
+}

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

@@ -0,0 +1,112 @@
+@using Oqtane.Modules.Controls
+@using Oqtane.Application.Services
+@using Oqtane.Application.Models
+
+@namespace Oqtane.Application.MyModule
+@inherits ModuleBase
+@inject IMyModuleService MyModuleService
+@inject NavigationManager NavigationManager
+@inject IStringLocalizer<Edit> Localizer
+
+<form @ref="form" class="@(validated ? " was-validated" : "needs-validation" )" novalidate>
+    <div class="container">
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="name" HelpText="Enter a name" ResourceKey="Name">Name: </Label>
+            <div class="col-sm-9">
+                <input id="name" class="form-control" @bind="@_name" required />
+            </div>
+        </div>
+    </div>
+    <button type="button" class="btn btn-success" @onclick="Save">@Localizer["Save"]</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
+    <br /><br />
+    @if (PageState.Action == "Edit")
+    {
+    <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
+    }
+</form>
+
+@code {
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
+
+    public override string Actions => "Add,Edit";
+
+    public override string Title => "Manage MyModule";
+
+    public override List<Resource> Resources => new List<Resource>()
+    {
+        new Stylesheet(ModulePath() + "Module.css")
+    };
+
+    private ElementReference form;
+    private bool validated = false;
+
+    private int _id;
+    private string _name;
+    private string _createdby;
+    private DateTime _createdon;
+    private string _modifiedby;
+    private DateTime _modifiedon;
+
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            if (PageState.Action == "Edit")
+            {
+                _id = Int32.Parse(PageState.QueryString["id"]);
+                MyModule MyModule = await MyModuleService.GetMyModuleAsync(_id, ModuleState.ModuleId);
+                if (MyModule != null)
+                {
+                    _name = MyModule.Name;
+                    _createdby = MyModule.CreatedBy;
+                    _createdon = MyModule.CreatedOn;
+                    _modifiedby = MyModule.ModifiedBy;
+                    _modifiedon = MyModule.ModifiedOn;
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading MyModule {MyModuleId} {Error}", _id, ex.Message);
+            AddModuleMessage(Localizer["Message.LoadError"], MessageType.Error);
+        }
+    }
+
+    private async Task Save()
+    {
+        try
+        {
+            validated = true;
+            var interop = new Oqtane.UI.Interop(JSRuntime);
+            if (await interop.FormValid(form))
+            {
+                if (PageState.Action == "Add")
+                {
+                    MyModule MyModule = new MyModule();
+                    MyModule.ModuleId = ModuleState.ModuleId;
+                    MyModule.Name = _name;
+                    MyModule = await MyModuleService.AddMyModuleAsync(MyModule);
+                    await logger.LogInformation("MyModule Added {MyModule}", MyModule);
+                }
+                else
+                {
+                    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());
+            }
+            else
+            {
+                AddModuleMessage(Localizer["Message.SaveValidation"], MessageType.Warning);
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Saving MyModule {Error}", ex.Message);
+            AddModuleMessage(Localizer["Message.SaveError"], MessageType.Error);
+        }
+    }
+}

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

@@ -0,0 +1,77 @@
+@using Oqtane.Application.Services
+@using Oqtane.Application.Models
+
+@namespace Oqtane.Application.MyModule
+@inherits ModuleBase
+@inject IMyModuleService MyModuleService
+@inject NavigationManager NavigationManager
+@inject IStringLocalizer<Index> Localizer
+
+@if (_MyModules == null)
+{
+    <p><em>Loading...</em></p>
+}
+else
+{
+    <ActionLink Action="Add" Security="SecurityAccessLevel.Edit" Text="Add MyModule" ResourceKey="Add" />
+    <br />
+    <br />
+    @if (@_MyModules.Count != 0)
+    {
+        <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.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>
+    }
+    else
+    {
+        <p>@Localizer["Message.DisplayNone"]</p>
+    }
+}
+
+@code {
+    public override List<Resource> Resources => new List<Resource>()
+    {
+        new Stylesheet(ModulePath() + "Module.css"),
+        new Script(ModulePath() + "Module.js")
+    };
+
+    List<Models.MyModule> _MyModules;
+
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            _MyModules = await MyModuleService.GetMyModulesAsync(ModuleState.ModuleId);
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading MyModule {Error}", ex.Message);
+            AddModuleMessage(Localizer["Message.LoadError"], MessageType.Error);
+        }
+    }
+
+    private async Task Delete(MyModule MyModule)
+    {
+        try
+        {
+            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 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

@@ -0,0 +1,47 @@
+@namespace Oqtane.Application.MyModule
+@inherits ModuleBase
+@inject ISettingService SettingService
+@inject IStringLocalizer<Settings> Localizer
+
+<div class="container">
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="value" HelpText="Enter a value" ResourceKey="SettingName" ResourceType="@resourceType">Name: </Label>
+            <div class="col-sm-9">
+                <input id="value" type="text" class="form-control" @bind="@_value" />
+            </div>
+    </div>
+</div>
+
+@code {
+    private string resourceType = "Oqtane.Application.MyModule.Settings, Oqtane.Application.Client.Oqtane"; // for localization
+    public override string Title => "MyModdule Settings";
+
+    string _value;
+
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            Dictionary<string, string> settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
+            _value = SettingService.GetSetting(settings, "SettingName", "");
+        }
+        catch (Exception ex)
+        {
+            AddModuleMessage(ex.Message, MessageType.Error);
+        }
+    }
+
+    public async Task UpdateSettings()
+    {
+        try
+        {
+            Dictionary<string, string> settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
+            SettingService.SetSetting(settings, "SettingName", _value);
+            await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
+        }
+        catch (Exception ex)
+        {
+            AddModuleMessage(ex.Message, MessageType.Error);
+        }
+    }
+}

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

@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
+
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <Version>1.0.0</Version>
+    <AssemblyName>Oqtane.Application.Client.Oqtane</AssemblyName>
+    <StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
+    <BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
+    <PublishTrimmed>false</PublishTrimmed>
+    <BlazorEnableCompression>false</BlazorEnableCompression>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.9" />
+    <PackageReference Include="System.Net.Http.Json" Version="9.0.9" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Shared\Oqtane.Application.Shared.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Oqtane.Client" Version="6.2.1" />
+  </ItemGroup>
+
+</Project>

Oqtane.Application/Client/Program.cs

@@ -0,0 +1,13 @@
+using System.Threading.Tasks;
+
+namespace Oqtane.Application.Client
+{
+    internal class Program
+    {
+        static async Task Main(string[] args)
+        {
+            // defer client startup to Oqtane - do not modify
+            await Oqtane.Client.Program.Main(args);
+        }
+    }
+}

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

@@ -0,0 +1,126 @@
+<?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 xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+    <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="SettingName.Text" xml:space="preserve">
+    <value>Name: </value>
+  </data>
+  <data name="SettingName.HelpText" xml:space="preserve">
+    <value>Enter a value</value>
+  </data>
+</root>

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

@@ -0,0 +1,126 @@
+<?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="Title.HelpText" xml:space="preserve">
+    <value>Specify If The Module Title Should Be Displayed</value>
+  </data>
+  <data name="Title.Text" xml:space="preserve">
+    <value>Display Title</value>
+  </data>
+</root>

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

@@ -0,0 +1,138 @@
+<?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="Login.HelpText" xml:space="preserve">
+    <value>Specify if a Login option should be displayed. Note that this option does not prevent the login page from being accessible via a direct url.</value>
+  </data>
+  <data name="Login.Text" xml:space="preserve">
+    <value>Show Login?</value>
+  </data>
+  <data name="Register.HelpText" xml:space="preserve">
+    <value>Specify if a Register option should be displayed. Note that this option is also dependent on the Allow Registration option in Site Settings.</value>
+  </data>
+  <data name="Register.Text" xml:space="preserve">
+    <value>Show Register?</value>
+  </data>
+  <data name="Scope.HelpText" xml:space="preserve">
+    <value>Specify if the settings are applicable to this page or the entire site.</value>
+  </data>
+  <data name="Scope.Text" xml:space="preserve">
+    <value>Setting Scope:</value>
+  </data>
+</root>

Oqtane.Application/Client/Services/MyModuleService.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

@@ -0,0 +1,18 @@
+using Microsoft.Extensions.DependencyInjection;
+using System.Linq;
+using Oqtane.Services;
+using Oqtane.Application.Services;
+
+namespace Oqtane.Application.Startup
+{
+    public class ClientStartup : IClientStartup
+    {
+        public void ConfigureServices(IServiceCollection services)
+        {
+            if (!services.Any(s => s.ServiceType == typeof(IMyModuleService)))
+            {
+                services.AddScoped<IMyModuleService, MyModuleService>();
+            }
+        }
+    }
+}

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

@@ -0,0 +1,46 @@
+@namespace Oqtane.Application.MyTheme
+@inherits ContainerBase
+@inject ISettingService SettingService
+
+<div class="@_classes">
+    @if (_title && ModuleState.Title != "-")
+    {
+    <div class="row px-4">
+        <div class="d-flex flex-nowrap">
+            <ModuleActions /><h2><ModuleTitle /></h2>
+        </div>
+        <hr class="app-rule" />
+    </div>
+    }
+    else
+    {
+    <ModuleActions />
+    }
+    <div class="row px-4">
+        <div class="container-fluid">
+            <ModuleInstance />
+        </div>
+    </div>
+</div>
+
+@code {
+    public override string Name => "Container";
+
+    private bool _title = true;
+    private string _classes = "container-fluid";
+
+    protected override void OnParametersSet()
+    {
+        try
+        {
+
+            _title = bool.Parse(SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Title", "true"));
+
+        }
+        catch
+        {
+            // error loading container settings
+        }
+    }
+
+}

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

@@ -0,0 +1,50 @@
+@namespace Oqtane.Application.MyTheme
+@inherits ModuleBase
+@implements Oqtane.Interfaces.ISettingsControl
+@inject ISettingService SettingService
+@attribute [OqtaneIgnore]
+
+<div class="container">
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="title" ResourceKey="Title" ResourceType="@resourceType" HelpText="Specify If The Module Title Should Be Displayed">Display Title?</Label>
+        <div class="col-sm-9">
+            <select id="title" class="form-select" @bind="@_title">
+                <option value="true">Yes</option>
+                <option value="false">No</option>
+            </select>
+        </div>
+    </div>
+</div>
+
+@code {
+    private string resourceType = "Oqtane.Application.MyTheme.ContainerSettings, Oqtane.Application.Client.Oqtane"; // for localization
+    private string _title = "true";
+
+    protected override void OnInitialized()
+    {
+        try
+        {
+
+            _title = SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Title", "true");
+
+        }
+        catch (Exception ex)
+        {
+            AddModuleMessage(ex.Message, MessageType.Error);
+        }
+    }
+
+    public async Task UpdateSettings()
+    {
+        try
+        {
+			var settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
+            settings = SettingService.SetSetting(settings, GetType().Namespace + ":Title", _title);
+            await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
+        }
+        catch (Exception ex)
+        {
+            AddModuleMessage(ex.Message, MessageType.Error);
+        }
+    }
+}

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 Stylesheet(Constants.BootstrapStylesheetUrl, Constants.BootstrapStylesheetIntegrity, "anonymous"),
+                new Stylesheet("~/Theme.css"),
+                new Script(Constants.BootstrapScriptUrl, Constants.BootstrapScriptIntegrity, "anonymous")
+            }
+        };
+    }
+}

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

@@ -0,0 +1,118 @@
+@namespace Oqtane.Application.MyTheme
+@inherits ThemeBase
+@inject ISettingService SettingService
+
+<main role="main">
+    <nav class="navbar navbar-dark bg-primary fixed-top">
+        <Logo /><Menu Orientation="Horizontal" />
+        <div class="controls ms-auto">
+            <div class="controls-group"><UserProfile ShowRegister="@_register" /> <Login ShowLogin="@_login"  /> <ControlPanel ButtonClass="btn-outline-light" /></div>
+        </div>
+    </nav>
+    <div class="content">
+        <div class="container">
+            <div class="row">
+                <div class="col-md-12">
+                    <Pane Name="@PaneNames.Admin" />
+                </div>
+            </div>
+        </div>
+        <Pane Name="Top Full Width" />
+        <div class="container">
+            <div class="row">
+                <div class="col-md-12">
+                    <Pane Name="Top 100%" />
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-md-6">
+                    <Pane Name="Left 50%" />
+                </div>
+                <div class="col-md-6">
+                    <Pane Name="Right 50%" />
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-md-4">
+                    <Pane Name="Left 33%" />
+                </div>
+                <div class="col-md-4">
+                    <Pane Name="Center 33%" />
+                </div>
+                <div class="col-md-4">
+                    <Pane Name="Right 33%" />
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-md-3">
+                    <Pane Name="Left Outer 25%" />
+                </div>
+                <div class="col-md-3">
+                    <Pane Name="Left Inner 25%" />
+                </div>
+                <div class="col-md-3">
+                    <Pane Name="Right Inner 25%" />
+                </div>
+                <div class="col-md-3">
+                    <Pane Name="Right Outer 25%" />
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-md-3">
+                    <Pane Name="Left 25%" />
+                </div>
+                <div class="col-md-6">
+                    <Pane Name="Center 50%" />
+                </div>
+                <div class="col-md-3">
+                    <Pane Name="Right 25%" />
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-md-8">
+                    <Pane Name="Left Sidebar 66%" />
+                </div>
+                <div class="col-md-4">
+                    <Pane Name="Right Sidebar 33%" />
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-md-4">
+                    <Pane Name="Left Sidebar 33%" />
+                </div>
+                <div class="col-md-8">
+                    <Pane Name="Right Sidebar 66%" />
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-md-12">
+                    <Pane Name="Bottom 100%" />
+                </div>
+            </div>
+        </div>
+        <Pane Name="Bottom Full Width" />
+    </div>
+</main>
+
+@code {
+    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";
+    
+    private bool _login = true;
+    private bool _register = true;
+
+    protected override void OnParametersSet()
+    {
+        try
+        {
+            var settings = SettingService.MergeSettings(PageState.Site.Settings, PageState.Page.Settings);
+            _login = bool.Parse(SettingService.GetSetting(settings, GetType().Namespace + ":Login", "true"));
+            _register = bool.Parse(SettingService.GetSetting(settings, GetType().Namespace + ":Register", "true"));
+        }
+        catch
+        {
+            // error loading theme settings
+        }
+    }
+}

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

@@ -0,0 +1,140 @@
+@namespace Oqtane.Application.MyTheme
+@inherits ModuleBase
+@implements Oqtane.Interfaces.ISettingsControl
+@inject ISettingService SettingService
+@inject IStringLocalizer<ThemeSettings> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+    @attribute [OqtaneIgnore]
+
+    <div class="container">
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="scope" ResourceKey="Scope" ResourceType="@resourceType" HelpText="Specify if the settings are applicable to this page or the entire site.">Setting Scope:</Label>
+            <div class="col-sm-9">
+                <select id="scope" class="form-select" value="@_scope" @onchange="(e => ScopeChanged(e))">
+                    @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
+                    {
+                    <option value="site">@Localizer["Site"]</option>
+                    }
+                    <option value="page">@Localizer["Page"]</option>
+                </select>
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="login" ResourceKey="Login" ResourceType="@resourceType" HelpText="Specify if a Login option should be displayed. Note that this option does not prevent the login page from being accessible via a direct url.">Show Login?</Label>
+            <div class="col-sm-9">
+                <select id="login" class="form-select" @bind="@_login">
+                    <option value="-">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
+                    <option value="true">@SharedLocalizer["Yes"]</option>
+                    <option value="false">@SharedLocalizer["No"]</option>
+                </select>
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="register" ResourceKey="Register" ResourceType="@resourceType" HelpText="Specify if a Register option should be displayed. Note that this option is also dependent on the Allow Registration option in Site Settings.">Show Register?</Label>
+            <div class="col-sm-9">
+                <select id="register" class="form-select" @bind="@_register">
+                    <option value="-">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
+                    <option value="true">@SharedLocalizer["Yes"]</option>
+                    <option value="false">@SharedLocalizer["No"]</option>
+                </select>
+            </div>
+        </div>
+    </div>
+
+    @code {
+        private int pageId = -1;
+        private string resourceType = "Oqtane.Application.MyTheme.ThemeSettings, Oqtane.Application.Client.Oqtane"; // for localization
+        private string _scope = "page";
+        private string _login = "-";
+        private string _register = "-";
+
+        protected override async Task OnInitializedAsync()
+        {
+            if (PageState.QueryString.ContainsKey("id"))
+            {
+                pageId = int.Parse(PageState.QueryString["id"]);
+            }
+
+            try
+            {
+                await LoadSettings();
+            }
+            catch (Exception ex)
+            {
+                await logger.LogError(ex, "Error Loading Settings {Error}", ex.Message);
+                AddModuleMessage("Error Loading Settings", MessageType.Error);
+            }
+        }
+
+        private async Task LoadSettings()
+        {
+            if (_scope == "site")
+            {
+                var settings = PageState.Site.Settings;
+                _login = SettingService.GetSetting(settings, GetType().Namespace + ":Login", "true");
+                _register = SettingService.GetSetting(settings, GetType().Namespace + ":Register", "true");
+            }
+            else
+            {
+                var settings = await SettingService.GetPageSettingsAsync(pageId);
+                settings = SettingService.MergeSettings(PageState.Site.Settings, settings);
+                _login = SettingService.GetSetting(settings, GetType().Namespace + ":Login", "-");
+                _register = SettingService.GetSetting(settings, GetType().Namespace + ":Register", "-");
+            }
+            await Task.Yield();
+        }
+
+        private async Task ScopeChanged(ChangeEventArgs eventArgs)
+        {
+            try
+            {
+                _scope = (string)eventArgs.Value;
+                await LoadSettings();
+                StateHasChanged();
+            }
+            catch (Exception ex)
+            {
+                await logger.LogError(ex, "Error Loading Settings {Error}", ex.Message);
+                AddModuleMessage("Error Loading Settings", MessageType.Error);
+            }
+        }
+
+        public async Task UpdateSettings()
+        {
+            try
+            {
+                if (_scope == "site")
+                {
+                    var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+                    if (_login != "-")
+                    {
+                        settings = SettingService.SetSetting(settings, GetType().Namespace + ":Login", _login);
+                    }
+
+                    if (_register != "-")
+                    {
+                        settings = SettingService.SetSetting(settings, GetType().Namespace + ":Register", _register);
+                    }
+                    await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
+                }
+                else
+                {
+                    var settings = await SettingService.GetPageSettingsAsync(pageId);
+                    if (_login != "-")
+                    {
+                        settings = SettingService.SetSetting(settings, GetType().Namespace + ":Login", _login);
+                    }
+                    if (_register != "-")
+                    {
+                        settings = SettingService.SetSetting(settings, GetType().Namespace + ":Register", _register);
+                    }
+                    await SettingService.UpdatePageSettingsAsync(settings, pageId);
+                }
+            }
+            catch (Exception ex)
+            {
+                await logger.LogError(ex, "Error Saving Settings {Error}", ex.Message);
+                AddModuleMessage("Error Saving Settings", MessageType.Error);
+            }
+        }
+    }

Oqtane.Application/Client/_Imports.razor

@@ -0,0 +1,25 @@
+@using System
+@using System.Linq
+@using System.Collections.Generic
+@using System.Net.Http
+@using System.Net.Http.Json
+
+@using Microsoft.AspNetCore.Components.Authorization
+@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
+@using Microsoft.Extensions.Localization
+@using Microsoft.JSInterop
+
+@using Oqtane
+@using Oqtane.Models
+@using Oqtane.Modules
+@using Oqtane.Modules.Controls
+@using Oqtane.Providers
+@using Oqtane.Security
+@using Oqtane.Services
+@using Oqtane.Shared
+@using Oqtane.Themes
+@using Oqtane.Themes.Controls
+@using Oqtane.UI
+@using Oqtane.Enums
+@using Oqtane.Interfaces 

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.2.1</version>
+    <title>Oqtane Application Template For Blazor</title>
+    <authors>Shaun Walker</authors>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <license type="expression">MIT</license>
+    <licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
+    <icon>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>README.md</readme>
+    <packageTypes>
+      <packageType name="Template" />
+    </packageTypes>
+  </metadata>
+</package>

Oqtane.Application/Oqtane.Application.sln

@@ -0,0 +1,33 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.12.35506.116 d17.12
+MinimumVisualStudioVersion = 10.0.40219.1
+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}") = "Oqtane.Application.Client", "Client\Oqtane.Application.Client.csproj", "{AA8E58A1-CD09-4208-BF66-A8BB341FD669}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Application.Shared", "Shared\Oqtane.Application.Shared.csproj", "{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{04B05448-788F-433D-92C0-FED35122D45A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{04B05448-788F-433D-92C0-FED35122D45A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{04B05448-788F-433D-92C0-FED35122D45A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{04B05448-788F-433D-92C0-FED35122D45A}.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
+		{AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Release|Any CPU.Build.0 = Release|Any CPU
+		{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Oqtane.Application/README.md

@@ -0,0 +1,22 @@
+# Oqtane Application Template
+
+This is a Visual Studio Project Template designed for Oqtane development projects. This 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
+cd MyCompany.MyProject
+dotnet build
+cd Server
+dotnet run
+browse to Url
+```
+
+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 also contains 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" or "Module" in your output name or else you will experience namespace conflicts
+

Oqtane.Application/Server/AssemblyInfo.cs

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

Oqtane.Application/Server/Controllers/MyModuleController.cs

@@ -0,0 +1,114 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Authorization;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Http;
+using Oqtane.Shared;
+using Oqtane.Enums;
+using Oqtane.Infrastructure;
+using Oqtane.Application.Services;
+using Oqtane.Controllers;
+using System.Net;
+using System.Threading.Tasks;
+
+namespace Oqtane.Application.Controllers
+{
+    [Route(ControllerRoutes.ApiRoute)]
+    public class MyModuleController : ModuleControllerBase
+    {
+        private readonly IMyModuleService _MyModuleService;
+
+        public MyModuleController(IMyModuleService MyModuleService, ILogManager logger, IHttpContextAccessor accessor) : base(logger, accessor)
+        {
+            _MyModuleService = MyModuleService;
+        }
+
+        // GET: api/<controller>?moduleid=x
+        [HttpGet]
+        [Authorize(Policy = PolicyNames.ViewModule)]
+        public async Task<IEnumerable<Models.MyModule>> Get(string moduleid)
+        {
+            int ModuleId;
+            if (int.TryParse(moduleid, out ModuleId) && IsAuthorizedEntityId(EntityNames.Module, ModuleId))
+            {
+                return await _MyModuleService.GetMyModulesAsync(ModuleId);
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized MyModule Get Attempt {ModuleId}", moduleid);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                return null;
+            }
+        }
+
+        // GET api/<controller>/5
+        [HttpGet("{id}/{moduleid}")]
+        [Authorize(Policy = PolicyNames.ViewModule)]
+        public async Task<Models.MyModule> Get(int id, int moduleid)
+        {
+            Models.MyModule MyModule = await _MyModuleService.GetMyModuleAsync(id, moduleid);
+            if (MyModule != null && IsAuthorizedEntityId(EntityNames.Module, MyModule.ModuleId))
+            {
+                return MyModule;
+            }
+            else
+            { 
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized MyModule Get Attempt {MyModuleId} {ModuleId}", id, moduleid);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                return null;
+            }
+        }
+
+        // POST api/<controller>
+        [HttpPost]
+        [Authorize(Policy = PolicyNames.EditModule)]
+        public async Task<Models.MyModule> Post([FromBody] Models.MyModule MyModule)
+        {
+            if (ModelState.IsValid && IsAuthorizedEntityId(EntityNames.Module, MyModule.ModuleId))
+            {
+                MyModule = await _MyModuleService.AddMyModuleAsync(MyModule);
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized MyModule Post Attempt {MyModule}", MyModule);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                MyModule = null;
+            }
+            return MyModule;
+        }
+
+        // PUT api/<controller>/5
+        [HttpPut("{id}")]
+        [Authorize(Policy = PolicyNames.EditModule)]
+        public async Task<Models.MyModule> Put(int id, [FromBody] Models.MyModule MyModule)
+        {
+            if (ModelState.IsValid && MyModule.MyModuleId == id && IsAuthorizedEntityId(EntityNames.Module, MyModule.ModuleId))
+            {
+                MyModule = await _MyModuleService.UpdateMyModuleAsync(MyModule);
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized MyModule Put Attempt {MyModule}", MyModule);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                MyModule = null;
+            }
+            return MyModule;
+        }
+
+        // DELETE api/<controller>/5
+        [HttpDelete("{id}/{moduleid}")]
+        [Authorize(Policy = PolicyNames.EditModule)]
+        public async Task Delete(int id, int moduleid)
+        {
+            Models.MyModule MyModule = await _MyModuleService.GetMyModuleAsync(id, moduleid);
+            if (MyModule != null && IsAuthorizedEntityId(EntityNames.Module, MyModule.ModuleId))
+            {
+                await _MyModuleService.DeleteMyModuleAsync(id, MyModule.ModuleId);
+            }
+            else
+            {
+                _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

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

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

@@ -0,0 +1,36 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations.Operations;
+using Microsoft.EntityFrameworkCore.Migrations.Operations.Builders;
+using Oqtane.Databases.Interfaces;
+using Oqtane.Migrations;
+using Oqtane.Migrations.EntityBuilders;
+
+namespace Oqtane.Application.Migrations.EntityBuilders
+{
+    public class MyModuleEntityBuilder : AuditableBaseEntityBuilder<MyModuleEntityBuilder>
+    {
+        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 MyModuleEntityBuilder(MigrationBuilder migrationBuilder, IDatabase database) : base(migrationBuilder, database)
+        {
+            EntityTableName = _entityTableName;
+            PrimaryKey = _primaryKey;
+            ForeignKeys.Add(_moduleForeignKey);
+        }
+
+        protected override MyModuleEntityBuilder BuildTable(ColumnsBuilder table)
+        {
+            MyModuleId = AddAutoIncrementColumn(table, "MyModuleId");
+            ModuleId = AddIntegerColumn(table,"ModuleId");
+            Name = AddMaxStringColumn(table,"Name");
+            AddAuditableColumns(table);
+            return this;
+        }
+
+        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

@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <Version>1.0.0</Version>
+    <AssemblyName>Oqtane.Application.Server.Oqtane</AssemblyName>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+    <SatelliteResourceLanguages>none</SatelliteResourceLanguages>
+    <CompressionEnabled>false</CompressionEnabled>
+    <StaticWebAssetsFingerprintContent>false</StaticWebAssetsFingerprintContent>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.9" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Client\Oqtane.Application.Client.csproj" />
+    <ProjectReference Include="..\Shared\Oqtane.Application.Shared.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Oqtane.Server" Version="6.2.1" />
+  </ItemGroup>
+	
+</Project>

Oqtane.Application/Server/Program.cs

@@ -0,0 +1,42 @@
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+using Oqtane.Infrastructure;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Oqtane.Application.Server
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            // defer server startup to Oqtane - do not modify
+            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.Server.Program.Main] {install.Message}");
+                }
+            }
+            else
+            {
+                host.Run();
+            }
+        }
+
+        public static IWebHost BuildWebHost(string[] args) =>
+            WebHost.CreateDefaultBuilder(args)
+                .UseConfiguration(new ConfigurationBuilder()
+                    .AddCommandLine(args)
+                    .AddEnvironmentVariables()
+                    .Build())
+                .UseStartup<Startup>()
+                .ConfigureLocalizationSettings()
+                .Build();
+    }
+}

Oqtane.Application/Server/Properties/launchSettings.json

@@ -0,0 +1,25 @@
+{
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+    "profiles": {
+      "http": {
+        "commandName": "Project",
+        "dotnetRunMessages": true,
+        "launchBrowser": true,
+        "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+        "applicationUrl": "http://localhost:44358",
+        "environmentVariables": {
+          "ASPNETCORE_ENVIRONMENT": "Development"
+        }
+      },
+      "https": {
+        "commandName": "Project",
+        "dotnetRunMessages": true,
+        "launchBrowser": true,
+        "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+        "applicationUrl": "https://localhost:44359;http://localhost:44358",
+        "environmentVariables": {
+          "ASPNETCORE_ENVIRONMENT": "Development"
+        }
+      }
+    }
+  }

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

@@ -0,0 +1,101 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Oqtane.Enums;
+using Oqtane.Infrastructure;
+using Oqtane.Models;
+using Oqtane.Security;
+using Oqtane.Shared;
+using Oqtane.Application.Repository;
+
+namespace Oqtane.Application.Services
+{
+    public class ServerMyModuleService : IMyModuleService
+    {
+        private readonly IMyModuleRepository _MyModuleRepository;
+        private readonly IUserPermissions _userPermissions;
+        private readonly ILogManager _logger;
+        private readonly IHttpContextAccessor _accessor;
+        private readonly Alias _alias;
+
+        public ServerMyModuleService(IMyModuleRepository MyModuleRepository, IUserPermissions userPermissions, ITenantManager tenantManager, ILogManager logger, IHttpContextAccessor accessor)
+        {
+            _MyModuleRepository = MyModuleRepository;
+            _userPermissions = userPermissions;
+            _logger = logger;
+            _accessor = accessor;
+            _alias = tenantManager.GetAlias();
+        }
+
+        public Task<List<Models.MyModule>> GetMyModulesAsync(int ModuleId)
+        {
+            if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.View))
+            {
+                return Task.FromResult(_MyModuleRepository.GetMyModules(ModuleId).ToList());
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized MyModule Get Attempt {ModuleId}", ModuleId);
+                return null;
+            }
+        }
+
+        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(_MyModuleRepository.GetMyModule(MyModuleId));
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized MyModule Get Attempt {TaskId} {ModuleId}", MyModuleId, ModuleId);
+                return null;
+            }
+        }
+
+        public Task<Models.MyModule> AddMyModuleAsync(Models.MyModule MyModule)
+        {
+            if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, MyModule.ModuleId, PermissionNames.Edit))
+            {
+                MyModule = _MyModuleRepository.AddMyModule(MyModule);
+                _logger.Log(LogLevel.Information, this, LogFunction.Create, "MyModule Added {MyModule}", MyModule);
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized MyModule Add Attempt {MyModule}", MyModule);
+                MyModule = null;
+            }
+            return Task.FromResult(MyModule);
+        }
+
+        public Task<Models.MyModule> UpdateMyModuleAsync(Models.MyModule MyModule)
+        {
+            if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, MyModule.ModuleId, PermissionNames.Edit))
+            {
+                MyModule = _MyModuleRepository.UpdateMyModule(MyModule);
+                _logger.Log(LogLevel.Information, this, LogFunction.Update, "MyModule Updated {MyModule}", MyModule);
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized MyModule Update Attempt {MyModule}", MyModule);
+                MyModule = null;
+            }
+            return Task.FromResult(MyModule);
+        }
+
+        public Task DeleteMyModuleAsync(int MyModuleId, int ModuleId)
+        {
+            if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.Edit))
+            {
+                _MyModuleRepository.DeleteMyModule(MyModuleId);
+                _logger.Log(LogLevel.Information, this, LogFunction.Delete, "MyModule Deleted {MyModuleId}", MyModuleId);
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized MyModule Delete Attempt {MyModuleId} {ModuleId}", MyModuleId, ModuleId);
+            }
+            return Task.CompletedTask;
+        }
+    }
+}

Oqtane.Application/Server/Startup.cs

@@ -0,0 +1,45 @@
+using System;
+using System.IO;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Oqtane.Extensions;
+using Oqtane.Infrastructure;
+using Oqtane.Shared;
+using Microsoft.AspNetCore.Cors.Infrastructure;
+
+namespace Oqtane.Application.Server
+{
+    public class Startup
+    {
+        private readonly IConfigurationRoot _configuration;
+        private readonly IWebHostEnvironment _environment;
+
+        public Startup(IWebHostEnvironment environment)
+        {
+            AppDomain.CurrentDomain.SetData(Constants.DataDirectory, Path.Combine(environment.ContentRootPath, "Data"));
+
+            var builder = new ConfigurationBuilder()
+                .SetBasePath(environment.ContentRootPath)
+                .AddJsonFile("appsettings.json", false, true)
+                .AddJsonFile($"appsettings.{environment.EnvironmentName}.json", true, true)
+                .AddEnvironmentVariables();
+
+            _configuration = builder.Build();
+            _environment = environment;
+        }
+
+        public void ConfigureServices(IServiceCollection services)
+        {
+            // defer server startup to Oqtane - do not modify
+            services.AddOqtane(_configuration, _environment);
+        }
+
+        public void Configure(IApplicationBuilder app, IConfigurationRoot configuration, IWebHostEnvironment environment, ICorsService corsService, ICorsPolicyProvider corsPolicyProvider, ISyncManager sync)
+        {
+            // defer server startup to Oqtane - do not modify
+            app.UseOqtane(configuration, environment, corsService, corsPolicyProvider, sync);
+        }
+    }
+}

Oqtane.Application/Server/Startup/ServerStartup.cs

@@ -0,0 +1,28 @@
+using Microsoft.AspNetCore.Builder; 
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using Oqtane.Infrastructure;
+using Oqtane.Application.Repository;
+using Oqtane.Application.Services;
+
+namespace Oqtane.Application.Startup
+{
+    public class ServerStartup : IServerStartup
+    {
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+        {
+            // not implemented
+        }
+
+        public void ConfigureMvc(IMvcBuilder mvcBuilder)
+        {
+            // not implemented
+        }
+
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services.AddTransient<IMyModuleService, ServerMyModuleService>();
+            services.AddDbContextFactory<Context>(opt => { }, ServiceLifetime.Transient);
+        }
+    }
+}

Oqtane.Application/Server/appsettings.json

@@ -0,0 +1,63 @@
+{
+  "RenderMode": "Static",
+  "Runtime": "Server",
+  "Database": {
+    "DefaultDBType": ""
+  },
+  "ConnectionStrings": {
+    "DefaultConnection": ""
+  },
+  "Installation": {
+    "DefaultAlias": "",
+    "HostPassword": "",
+    "HostEmail": "",
+    "SiteTemplate": "",
+    "DefaultTheme": "",
+    "DefaultContainer": ""
+  },
+  "Localization": {
+    "DefaultCulture": "en"
+  },
+  "AvailableDatabases": [
+    {
+      "Name": "LocalDB",
+      "ControlType": "Oqtane.Installer.Controls.LocalDBConfig, Oqtane.Client",
+      "DBType": "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Server"
+    },
+    {
+      "Name": "SQL Server",
+      "ControlType": "Oqtane.Installer.Controls.SqlServerConfig, Oqtane.Client",
+      "DBType": "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Server"
+    },
+    {
+      "Name": "SQLite",
+      "ControlType": "Oqtane.Installer.Controls.SqliteConfig, Oqtane.Client",
+      "DBType": "Oqtane.Database.Sqlite.SqliteDatabase, Oqtane.Server"
+    },
+    {
+      "Name": "MySQL",
+      "ControlType": "Oqtane.Installer.Controls.MySQLConfig, Oqtane.Client",
+      "DBType": "Oqtane.Database.MySQL.MySQLDatabase, Oqtane.Server"
+    },
+    {
+      "Name": "PostgreSQL",
+      "ControlType": "Oqtane.Installer.Controls.PostgreSQLConfig, Oqtane.Client",
+      "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"
+    }
+  }
+}

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

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

Oqtane.Application/Shared/Models/MyModule.cs

@@ -0,0 +1,19 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Oqtane.Models;
+
+namespace Oqtane.Application.Models
+{
+    public class MyModule : IAuditable
+    {
+        [Key]
+        public int MyModuleId { get; set; }
+        public int ModuleId { get; set; }
+        public string Name { get; set; }
+
+        public string CreatedBy { get; set; }
+        public DateTime CreatedOn { get; set; }
+        public string ModifiedBy { get; set; }
+        public DateTime ModifiedOn { get; set; }
+    }
+}

Oqtane.Application/Shared/Oqtane.Application.Shared.csproj

@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <Version>1.0.0</Version>
+    <AssemblyName>Oqtane.Application.Shared.Oqtane</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Oqtane.Shared" Version="6.2.1" />
+  </ItemGroup>
+
+</Project>

Oqtane.Client/Extensions/OqtaneServiceCollectionExtensions.cs

@@ -1,8 +1,10 @@
 using Microsoft.AspNetCore.Components.Authorization;
+using Microsoft.Extensions.Localization;
 using Oqtane.Interfaces;
 using Oqtane.Providers;
 using Oqtane.Services;
 using Oqtane.Shared;
+using Radzen;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
@@ -23,7 +25,7 @@ namespace Microsoft.Extensions.DependencyInjection
             services.AddScoped<SiteState>();
             services.AddScoped<IInstallationService, InstallationService>();
             services.AddScoped<IModuleDefinitionService, ModuleDefinitionService>();
-            services.AddScoped<IThemeService, ThemeService>();
+            services.AddScoped<IThemeService, Oqtane.Services.ThemeService>();
             services.AddScoped<IAliasService, AliasService>();
             services.AddScoped<ITenantService, TenantService>();
             services.AddScoped<ISiteService, SiteService>();
@@ -39,7 +41,7 @@ namespace Microsoft.Extensions.DependencyInjection
             services.AddScoped<ILogService, LogService>();
             services.AddScoped<IJobService, JobService>();
             services.AddScoped<IJobLogService, JobLogService>();
-            services.AddScoped<INotificationService, NotificationService>();
+            services.AddScoped<INotificationService, Oqtane.Services.NotificationService>();
             services.AddScoped<IFolderService, FolderService>();
             services.AddScoped<IFileService, FileService>();
             services.AddScoped<ISiteTemplateService, SiteTemplateService>();
@@ -53,11 +55,19 @@ namespace Microsoft.Extensions.DependencyInjection
             services.AddScoped<ISyncService, SyncService>();
             services.AddScoped<ILocalizationCookieService, LocalizationCookieService>();
             services.AddScoped<ICookieConsentService, CookieConsentService>();
+            services.AddScoped<ITimeZoneService, TimeZoneService>();
+            services.AddScoped<IMigrationHistoryService, MigrationHistoryService>();
             services.AddScoped<IOutputCacheService, OutputCacheService>();
 
             // providers
             services.AddScoped<ITextEditor, Oqtane.Modules.Controls.QuillJSTextEditor>();
             services.AddScoped<ITextEditor, Oqtane.Modules.Controls.TextAreaTextEditor>();
+            services.AddScoped<ITextEditor, Oqtane.Modules.Controls.RadzenTextEditor>();
+
+            services.AddRadzenComponents();
+
+            var localizer = services.BuildServiceProvider().GetService<IStringLocalizer<Oqtane.Modules.Controls.RadzenTextEditor>>();
+            Oqtane.Modules.Controls.RadzenEditorDefinitions.Localizer = localizer;
 
             return services;
         }

Oqtane.Client/Installer/Controls/AzureSqlConfig.razor

@@ -0,0 +1,119 @@
+@namespace Oqtane.Installer.Controls
+@implements Oqtane.Interfaces.IDatabaseConfigControl
+@inject IStringLocalizer<SqlServerConfig> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+<div class="row mb-1 align-items-center">
+	<Label Class="col-sm-3" For="server" HelpText="Enter the database server name. This might include a port number as well if you are using a cloud service." ResourceKey="Server">Server:</Label>
+    <div class="col-sm-9">
+        <input id="server" type="text" class="form-control" @bind="@_server" />
+    </div>
+</div>
+<div class="row mb-1 align-items-center">
+    <Label Class="col-sm-3" For="database" HelpText="Enter the name of the database" ResourceKey="Database">Database:</Label>
+    <div class="col-sm-9">
+        <input id="database" type="text" class="form-control" @bind="@_database" />
+    </div>
+</div>
+<div class="row mb-1 align-items-center">
+    <Label Class="col-sm-3" For="security" HelpText="Select your security method" ResourceKey="Security">Security:</Label>
+    <div class="col-sm-9">
+        <select id="security" class="form-select custom-select" @bind="@_security">
+            <option value="integrated" selected>@Localizer["Integrated"]</option>
+            <option value="custom">@Localizer["Custom"]</option>
+        </select>
+    </div>
+</div>
+@if (_security == "custom")
+{
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="uid" HelpText="Enter the username to use for the database" ResourceKey="Uid">User Id:</Label>
+        <div class="col-sm-9">
+            <input id="uid" type="text" class="form-control" @bind="@_uid" />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="pwd" HelpText="Enter the password to use for the database" ResourceKey="Pwd">Password:</Label>
+        <div class="col-sm-9">
+             <div class="input-group">
+                <input id="pwd" type="@_passwordType" class="form-control" @bind="@_pwd" autocomplete="new-password" />
+                <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglePassword</button>
+            </div>
+        </div>
+    </div>
+}
+<div class="row mb-1 align-items-center">
+    <Label Class="col-sm-3" For="encryption" HelpText="Specify if you are using an encrypted database connection. It is highly recommended to use encryption in a production environment." ResourceKey="Encryption">Encryption:</Label>
+    <div class="col-sm-9">
+        <select id="encryption" class="form-select custom-select" @bind="@_encryption">
+            <option value="true">@SharedLocalizer["True"]</option>
+            <option value="false">@SharedLocalizer["False"]</option>
+        </select>
+    </div>
+</div>
+@if (_encryption == "true")
+{
+	<div class="row mb-1 align-items-center">
+		<Label Class="col-sm-3" For="trustservercertificate" HelpText="Specify the type of certificate you are using for encryption. Verifiable is equivalent to False. Self Signed is equivalent to True." ResourceKey="TrustServerCertificate">Certificate:</Label>
+		<div class="col-sm-9">
+			<select id="encryption" class="form-select custom-select" @bind="@_trustservercertificate">
+				<option value="true">@Localizer["Self Signed"]</option>
+				<option value="false">@Localizer["Verifiable"]</option>
+			</select>
+		</div>
+	</div>
+}
+
+@code {
+    private string _server = "tcp:{SQL Server Name}.database.windows.net,1433";
+    private string _database = "{SQL Database Name}";
+    private string _security = "custom";
+    private string _uid = "{SQL Administrator Login}";
+    private string _pwd = String.Empty;
+    private string _passwordType = "password";
+    private string _togglePassword = string.Empty;
+    private string _encryption = "true";
+    private string _trustservercertificate = "false";
+
+    protected override void OnInitialized()
+	{
+        _togglePassword = SharedLocalizer["ShowPassword"];
+    }
+
+    public string GetConnectionString()
+    {
+        var connectionString = String.Empty;
+
+        if (!String.IsNullOrEmpty(_server) && !String.IsNullOrEmpty(_database))
+        {
+            connectionString = $"Data Source={_server};Initial Catalog={_database};";
+        }
+
+        if (_security == "integrated")
+        {
+            connectionString += "Integrated Security=SSPI;";
+        }
+        else
+        {
+            connectionString += $"User ID={_uid};Password={_pwd};";
+        }
+		connectionString += $"Encrypt={_encryption};";
+		connectionString += $"TrustServerCertificate={_trustservercertificate};";
+
+        return connectionString;
+    }
+
+    private void TogglePassword()
+    {
+        if (_passwordType == "password")
+        {
+            _passwordType = "text";
+            _togglePassword = SharedLocalizer["HidePassword"];
+        }
+        else
+        {
+            _passwordType = "password";
+            _togglePassword = SharedLocalizer["ShowPassword"];
+        }
+    }
+}

Oqtane.Client/Installer/Controls/SqlServerConfig.razor

@@ -4,7 +4,7 @@
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <div class="row mb-1 align-items-center">
-	<Label Class="col-sm-3" For="server" HelpText="Enter the database server name. This might include a port number as well if you are using a cloud service (ie. servername.database.windows.net,1433) " ResourceKey="Server">Server:</Label>
+	<Label Class="col-sm-3" For="server" HelpText="Enter the database server name. This might include a port number as well if you are using a cloud service." ResourceKey="Server">Server:</Label>
     <div class="col-sm-9">
         <input id="server" type="text" class="form-control" @bind="@_server" />
     </div>

Oqtane.Client/Installer/Installer.razor

@@ -14,8 +14,8 @@
 <div class="container">
     <div class="row">
         <div class="mx-auto text-center">
-            <img src="oqtane-black.png" />
+            <img src="installer-logo.png" />
-            <div style="font-weight: bold">@SharedLocalizer["Version"] @Constants.Version (.NET 9)</div>
+            <div style="font-weight: bold">@SharedLocalizer["Version"] @Constants.Version (.NET @Environment.Version.Major)</div>
         </div>
     </div>
     <hr class="app-rule" />
@@ -182,7 +182,7 @@
         }
         else
         {
-            _databaseName = "LocalDB";
+            _databaseName = Constants.DefaultDBName;
         }
         LoadDatabaseConfigComponent();
 
@@ -269,8 +269,8 @@
                         SiteName = Constants.DefaultSite,
                         Register = _register,
                         SiteTemplate = _template,
-                        RenderMode = RenderModes.Static,
+                        RenderMode = "", // provided by appsettings.json
-                        Runtime = Runtimes.Server
+                        Runtime = "" // provided by appsettings.json
                     };
 
                 var installation = await InstallationService.Install(config);

Oqtane.Client/Modules/Admin/Files/Edit.razor

@@ -15,22 +15,34 @@
                     <div class="row mb-1 align-items-center">
                         <Label Class="col-sm-3" For="parent" HelpText="Select the parent folder" ResourceKey="Parent">Parent: </Label>
                         <div class="col-sm-9">
-                            <select id="parent" class="form-select" @bind="@_parentId" required>
+                            @if (_parentId == -1)
-                                @if (PageState.QueryString.ContainsKey("id"))
                             {
+                                <select id="parent" class="form-select" @bind="@_parentId" required>
                                     <option value="-1">&lt;@Localizer["NoParent"]&gt;</option>
+                                </select>
                             }
+                            else
+                            {
+                                <select id="parent" class="form-select" @bind="@_parentId" required>
                                 @foreach (Folder folder in _folders)
                                 {
                                     <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
                                 }
                                 </select>
+                            }
                         </div>
                     </div>
                     <div class="row mb-1 align-items-center">
                         <Label Class="col-sm-3" For="name" HelpText="Enter the folder name" ResourceKey="Name">Name: </Label>
                         <div class="col-sm-9">
+                            @if (_isSystem)
+                            {
+                                <input id="name" class="form-control" @bind="@_name" readonly />
+                            }
+                            else
+                            {
                                 <input id="name" class="form-control" @bind="@_name" maxlength="256" required />
+                            }
                         </div>
                     </div>
                     <div class="row mb-1 align-items-center">
@@ -229,7 +241,6 @@
 
                 if (folder != null)
                 {
-                    await FolderService.UpdateFolderOrderAsync(folder.SiteId, folder.FolderId, folder.ParentId);
                     await logger.LogInformation("Folder Saved {Folder}", folder);
                     NavigationManager.NavigateTo(NavigateUrl());
                 }
@@ -264,20 +275,12 @@
                 }
             }
             if (!isparent)
-            {
-                var files = await FileService.GetFilesAsync(_folderId);
-                if (files.Count == 0)
             {
                 await FolderService.DeleteFolderAsync(_folderId);
                 await logger.LogInformation("Folder Deleted {Folder}", _folderId);
                 NavigationManager.NavigateTo(NavigateUrl());
             }
             else
-                {
-                    AddModuleMessage(Localizer["Message.Folder.Files.InvalidDelete"], MessageType.Warning);
-                }
-            }
-            else
             {
                 AddModuleMessage(Localizer["Message.Folder.Subfolders.InvalidDelete"], MessageType.Warning);
             }

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

@@ -53,7 +53,7 @@ else
                         <td><ActionLink Action="Details" Text="Edit" Parameters="@($"id=" + context.FileId.ToString())" ResourceKey="Details" /></td>
                         <td><ActionDialog Header="Delete File" Message="@string.Format(Localizer["Confirm.File.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteFile(context))" ResourceKey="DeleteFile" /></td>
                         <td><a href="@context.Url" target="_new">@context.Name</a></td>
-                        <td>@context.ModifiedOn</td>
+                        <td>@UtcToLocal(context.ModifiedOn)</td>
                         <td>@context.Extension.ToUpper() @SharedLocalizer["File"]</td>
                         <td>@string.Format("{0:0.00}", ((decimal)context.Size / 1000)) KB</td>
                     </Row>

Oqtane.Client/Modules/Admin/Jobs/Edit.razor

@@ -45,7 +45,7 @@
         <div class="row mb-1 align-items-center">
             <Label Class="col-sm-3" For="retention" HelpText="Number of log entries to retain for this job" ResourceKey="RetentionLog">Retention Log (Items): </Label>
             <div class="col-sm-9">
-                <input id="retention" type="number" min="0" step ="1" class="form-control" @bind="@_retentionHistory" maxlength="4" required />
+                <input id="retention" type="number" min="0" step ="1" class="form-control" @bind="@_retentionHistory" maxlength="3" required />
             </div>
         </div>
         <div class="row mb-1 align-items-center">
@@ -56,7 +56,7 @@
                         <input id="starting" type="date" class="form-control" @bind="@_startDate" />
                     </div>
                     <div class="col">
-                        <input id="starting" type="time" class="form-control" placeholder="hh:mm" @bind="@_startTime" />
+                        <input id="starting" type="time" class="form-control" @bind="@_startTime" placeholder="hh:mm" required="@(_startDate.HasValue)" />
                     </div>
                 </div>
             </div>
@@ -69,7 +69,7 @@
                         <input id="ending" type="date" class="form-control" @bind="@_endDate" />
                     </div>
                     <div class="col">
-                        <input id="ending" type="time" class="form-control" placeholder="hh:mm" @bind="@_endTime" />
+                        <input id="ending" type="time" class="form-control" placeholder="hh:mm" @bind="@_endTime" required="@(_endDate.HasValue)" />
                     </div>
                 </div>
             </div>
@@ -82,7 +82,7 @@
                         <input id="next" type="date" class="form-control" @bind="@_nextDate" />
                     </div>
                     <div class="col">
-                        <input id="next" type="time" class="form-control" placeholder="hh:mm" @bind="@_nextTime" />
+                        <input id="next" type="time" class="form-control" placeholder="hh:mm" @bind="@_nextTime" required="@(_nextDate.HasValue)" />
                     </div>
                 </div>
             </div>
@@ -132,13 +132,13 @@
 				_isEnabled = job.IsEnabled.ToString();
 				_interval = job.Interval.ToString();
 				_frequency = job.Frequency;
-				_startDate = Utilities.UtcAsLocalDate(job.StartDate);
+				_startDate = UtcToLocal(job.StartDate);
-                _startTime = Utilities.UtcAsLocalDateTime(job.StartDate);
+                _startTime = UtcToLocal(job.StartDate);
-                _endDate = Utilities.UtcAsLocalDate(job.EndDate);
+                _endDate = UtcToLocal(job.EndDate);
-                _endTime = Utilities.UtcAsLocalDateTime(job.EndDate);
+                _endTime = UtcToLocal(job.EndDate);
                 _retentionHistory = job.RetentionHistory.ToString();
-                _nextDate = Utilities.UtcAsLocalDate(job.NextExecution);
+                _nextDate = UtcToLocal(job.NextExecution);
-                _nextTime = Utilities.UtcAsLocalDateTime(job.NextExecution);
+                _nextTime = UtcToLocal(job.NextExecution);
                 createdby = job.CreatedBy;
 				createdon = job.CreatedOn;
 				modifiedby = job.ModifiedBy;
@@ -176,10 +176,18 @@
 			{
 				job.Interval = int.Parse(_interval);
 			}
-			job.StartDate = Utilities.LocalDateAndTimeAsUtc(_startDate, _startTime);
+            job.StartDate = _startDate.HasValue && _startTime.HasValue
-			job.EndDate = Utilities.LocalDateAndTimeAsUtc(_endDate, _endTime);
+                ? LocalToUtc(_startDate.GetValueOrDefault().Date.Add(_startTime.GetValueOrDefault().TimeOfDay))
+                : null;
+
+            job.EndDate = _endDate.HasValue && _endTime.HasValue
+                ? LocalToUtc(_endDate.GetValueOrDefault().Date.Add(_endTime.GetValueOrDefault().TimeOfDay))
+                : null;
+
+            job.NextExecution = _nextDate.HasValue && _nextTime.HasValue
+                ? LocalToUtc(_nextDate.GetValueOrDefault().Date.Add(_nextTime.GetValueOrDefault().TimeOfDay))
+                : null;
             job.RetentionHistory = int.Parse(_retentionHistory);
-			job.NextExecution = Utilities.LocalDateAndTimeAsUtc(_nextDate, _nextTime);
 
 			try
 			{
@@ -198,5 +206,4 @@
 			AddModuleMessage(Localizer["Message.Required.JobInfo"], MessageType.Warning);
 		}
 	}
-
 }

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

@@ -29,7 +29,7 @@ else
             <td>@context.Name</td>
             <td>@DisplayStatus(context.IsEnabled, context.IsExecuting)</td>
             <td>@DisplayFrequency(context.Interval, context.Frequency)</td>
-            <td>@context.NextExecution?.ToLocalTime()</td>
+            <td>@UtcToLocal(context.NextExecution)</td>
             <td>
                 @if (context.IsStarted)
                 {
@@ -115,6 +115,13 @@ else
     private async Task StartJob(int jobId)
     {
         try
+        {
+            Job _job = await JobService.GetJobAsync(jobId);
+            if (!_job.IsEnabled)
+            {
+                AddModuleMessage(Localizer["Message.Job.Disabled"], MessageType.Warning);
+            }
+            else
             {
                 await JobService.StartJobAsync(jobId);
                 await logger.LogInformation("Job Started {JobId}", jobId);
@@ -122,6 +129,7 @@ else
                 _jobs = await JobService.GetJobsAsync();
                 StateHasChanged();
             }
+        }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Starting Job {JobId} {Error}", jobId, ex.Message);

Oqtane.Client/Modules/Admin/Jobs/Log.razor

@@ -23,8 +23,8 @@ else
         <Row>
             <td>@context.Job.Name</td>
             <td>@DisplayStatus(context.Job.IsExecuting, context.Succeeded)</td>
-            <td>@context.StartDate</td>
+            <td>@UtcToLocal(context.StartDate)</td>
-            <td>@context.FinishDate</td>
+            <td>@UtcToLocal(context.FinishDate)</td>
         </Row>
         <Detail>
             <td colspan="4">@((MarkupString)context.Notes)</td>
@@ -44,14 +44,12 @@ else
 
     private async Task GetJobLogs()
     {
-        _jobLogs = await JobLogService.GetJobLogsAsync();
+        var jobId = -1;
-
         if (PageState.QueryString.ContainsKey("id"))
         {
-            _jobLogs = _jobLogs.Where(item => item.JobId == Int32.Parse(PageState.QueryString["id"])).ToList();
+            jobId = int.Parse(PageState.QueryString["id"]);
         }
-
+        _jobLogs = await JobLogService.GetJobLogsAsync(jobId);
-        _jobLogs = _jobLogs.OrderByDescending(item => item.JobLogId).ToList();
     }
 
     private string DisplayStatus(bool isExecuting, bool? succeeded)

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

@@ -21,9 +21,7 @@ else
                 @if (_allowexternallogin)
                 {
                     <button type="button" class="btn btn-primary" @onclick="ExternalLogin">@Localizer["Use"] @PageState.Site.Settings["ExternalLogin:ProviderName"]</button>
-                    <br />
+                    <br /><br />
-
-                    <br />
                 }
                 @if (_allowsitelogin)
                 {
@@ -49,15 +47,11 @@ else
                     </div>
                     <button type="button" class="btn btn-primary" @onclick="Login">@SharedLocalizer["Login"]</button>
                     <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
-                    <br />
+                    <br /><br />
-
-                    <br />
                     <button type="button" class="btn btn-secondary" @onclick="Forgot">@Localizer["ForgotPassword"]</button>
                     @if (PageState.Site.AllowRegistration)
                     {
-                        <br />
+                        <br /><br />
-
-                        <br />
                         <NavLink href="@NavigateUrl("register")">@Localizer["Register"]</NavLink>
                     }
                 }
@@ -100,7 +94,7 @@ else
 
     public override List<Resource> Resources => new List<Resource>()
     {
-        new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" }
+        new Stylesheet(ModulePath() + "Module.css")
     };
 
     protected override async Task OnInitializedAsync()
@@ -144,7 +138,7 @@ else
                     user = await UserService.VerifyEmailAsync(user, PageState.QueryString["token"]);
                     if (user != null)
                     {
-                        await logger.LogInformation(LogFunction.Security, "Email Verified For For Username {Username}", _username);
+                        await logger.LogInformation(LogFunction.Security, "Email Verified For Username {Username}", _username);
                         AddModuleMessage(Localizer["Success.Account.Verified"], MessageType.Info);						
                     }
                     else

Oqtane.Client/Modules/Admin/Logs/Detail.razor

@@ -141,7 +141,7 @@
             var log = await LogService.GetLogAsync(_logId);
             if (log != null)
             {
-                _logDate = log.LogDate.ToString(CultureInfo.CurrentCulture);
+                _logDate = UtcToLocal(log.LogDate).Value.ToString(CultureInfo.CurrentCulture);
                 _level = log.Level;
                 _feature = log.Feature;
                 _function = log.Function;

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

@@ -64,7 +64,7 @@ else
 					</Header>
 					<Row>
                         <td class="@GetClass(context.Function)"><ActionLink Action="Detail" Text="Details" Parameters="@($"/{context.LogId}")" ReturnUrl="@(NavigateUrl(PageState.Page.Path, AddUrlParameters(_level, _function, _rows, _page)))" ResourceKey="LogDetails" /></td>
-						<td class="@GetClass(context.Function)">@context.LogDate</td>
+						<td class="@GetClass(context.Function)">@UtcToLocal(context.LogDate)</td>
 						<td class="@GetClass(context.Function)">@context.Level</td>
 						<td class="@GetClass(context.Function)">@context.Feature</td>
 						<td class="@GetClass(context.Function)">@context.Function</td>

Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor

@@ -101,6 +101,12 @@
                                             <small>@SharedLocalizer["Search.By"]:</small> <strong><a href="@context.OwnerUrl" target="new">@context.Owner</a></strong><br />
                                             @(context.Description.Length > 400 ? (context.Description.Substring(0, 400) + "...") : context.Description)<br />
                                             <br />
+                                            @if (_moduledefinitions.Exists(item => item.PackageName == context.PackageId))
+                                            {
+                                                <button type="button" class="btn btn-info">@SharedLocalizer["Installed"]</button>
+                                            }
+                                            else
+                                            {
                                                 @if (!string.IsNullOrEmpty(context.PackageUrl))
                                                 {
                                                     <button type="button" class="btn btn-primary" @onclick=@(async () => await GetPackage(context.PackageId, context.Version))>@SharedLocalizer["Download"]</button>
@@ -109,6 +115,7 @@
                                                 {
                                                     <a class="btn btn-success ms-2" style="text-decoration: none !important" href="@context.PaymentUrl" target="_new">@SharedLocalizer["Buy"]</a>
                                                 }
+                                            }
                                             <br />
                                         </div>
                                     </div>
@@ -171,6 +178,7 @@
 
 @code {
     private bool _initialized = false;
+    private List<ModuleDefinition> _moduledefinitions;
     private int _page = 1;
     private List<Package> _packages;
     private string _price = "free";
@@ -187,7 +195,8 @@
     {
         try
         {
-            await LoadModuleDefinitions();
+            _moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
+            await LoadPackages();
             _initialized = true;
         }
         catch (Exception ex)
@@ -197,24 +206,10 @@
         }
     }
 
-    private async Task LoadModuleDefinitions()
+    private async Task LoadPackages()
     {
         ShowProgressIndicator();
-
-        var moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
         _packages = await PackageService.GetPackagesAsync("module", _search, _price, "", _sort);
-
-        if (_packages != null)
-        {
-            foreach (Package package in _packages.ToArray())
-            {
-                if (moduledefinitions.Exists(item => item.PackageName == package.PackageId))
-                {
-                    _packages.Remove(package);
-                }
-            }
-        }
-
         HideProgressIndicator();
     }
 
@@ -222,25 +217,25 @@
     {
         _price = price;
         _sort = "popularity";
-        await LoadModuleDefinitions();
+        await LoadPackages();
         StateHasChanged();
     }
 
     private async Task Search()
     {
-        await LoadModuleDefinitions();
+        await LoadPackages();
     }
 
     private async Task Reset()
     {
         _page = 1;
         _search = "";
-        await LoadModuleDefinitions();
+        await LoadPackages();
     }
 
     private async Task Refresh()
     {
-        await LoadModuleDefinitions();
+        await LoadPackages();
     }
 
     private void OnPageChange(int page)
@@ -251,7 +246,7 @@
     private async void SortChanged(ChangeEventArgs e)
     {
         _sort = (string)e.Value;
-        await LoadModuleDefinitions();
+        await LoadPackages();
     }
 
     private void HideModal()
@@ -310,6 +305,6 @@
 
     private void OnUpload()
     {
-        AddModuleMessage(string.Format(Localizer["Success.Module.Download"], NavigateUrl("admin/system")), MessageType.Success);
+        AddModuleMessage(string.Format(Localizer["Success.Module.Upload"], NavigateUrl("admin/system")), MessageType.Success);
     }
 }

Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor

@@ -14,7 +14,7 @@
 @if (_initialized)
 {
 	<TabStrip>
-        <TabPanel Name="Definition" ResourceKey="Definition" Heading="Definition">
+        <TabPanel Name="Module" ResourceKey="Module" Heading="Module">
 			<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
 				<div class="container">
 					<div class="row mb-1 align-items-center">
@@ -73,7 +73,7 @@
 						</div>
 					</div>
 					<div class="row mb-1 align-items-center">
-						<Label Class="col-sm-3" For="url" HelpText="The reference url of the module" ResourceKey="ReferenceUrl">Reference Url: </Label>
+						<Label Class="col-sm-3" For="url" HelpText="The url of the module" ResourceKey="Url">Url: </Label>
 						<div class="col-sm-9">
 							<input id="url" class="form-control" @bind="@_url" disabled />
 						</div>
@@ -236,11 +236,10 @@
     private DateTime _createdon;
     private string _modifiedby;
     private DateTime _modifiedon;
-    private List<Page> _pagesWithModules;
 
-#pragma warning disable 649
     private PermissionGrid _permissionGrid;
-#pragma warning restore 649
+
+    private List<Page> _pagesWithModules;
 
     private List<Package> _packages;
     private List<Language> _languages;

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

@@ -17,8 +17,8 @@ else
         <div class="row mb-3 align-items-center">
             <div class="col-sm-6">
                 <ActionLink Action="Add" Text="Install Module" ResourceKey="InstallModule" />
-				@((MarkupString)"&nbsp;")
+                <ActionLink Action="Create" Text="Create Module" ResourceKey="CreateModule" Class="btn btn-secondary ms-1" />
-				<ActionLink Action="Create" Text="Create Module" ResourceKey="CreateModule" Class="btn btn-secondary" />
+                <button type="button" class="btn btn-secondary ms-1" @onclick="@Synchronize">@Localizer["Synchronize"]</button>
             </div>
             <div class="col-sm-6">
                 <select class="form-select" @onchange="(e => CategoryChanged(e))">
@@ -220,4 +220,27 @@ else
         _category = (string)e.Value;
         await LoadModuleDefinitions();
     }
+
+    private async Task Synchronize()
+    {
+        try
+        {
+            ShowProgressIndicator();
+            foreach (var moduleDefinition in _moduleDefinitions)
+            {
+                if (!string.IsNullOrEmpty(moduleDefinition.PackageName) && !_packages.Any(item => item.PackageId == moduleDefinition.PackageName))
+                {
+                    var package = await PackageService.GetPackageAsync(moduleDefinition.PackageName, moduleDefinition.Version, false);
+                }
+            }
+            HideProgressIndicator();
+            AddModuleMessage(Localizer["Success.Module.Synchronize"], MessageType.Success);
+            NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, true));
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Synchronizing Modules {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.Module.Synchronize"], MessageType.Error);
+        }
+    }
 }

Oqtane.Client/Modules/Admin/Modules/Export.razor

@@ -5,24 +5,57 @@
 @inject IStringLocalizer<Export> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
+<TabStrip>
+    <TabPanel Name="Content" Heading="Content" ResourceKey="Content">
         <div class="container">
             <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="content" HelpText="The Exported Module Content" ResourceKey="Content">Content: </Label>
+                <Label Class="col-sm-3" For="content" HelpText="Select the Export option and you will be able to view the module content" ResourceKey="Content">Content: </Label>
                 <div class="col-sm-9">
                     <textarea id="content" class="form-control" @bind="@_content" rows="5" readonly></textarea>
                 </div>
             </div>
         </div>
-
+        <br />
-<button type="button" class="btn btn-success" @onclick="ExportModule">@Localizer["Export"]</button>
+        <button type="button" class="btn btn-success" @onclick="ExportText">@Localizer["Export"]</button>
         <NavLink class="btn btn-secondary" href="@PageState.ReturnUrl">@SharedLocalizer["Cancel"]</NavLink>
+    </TabPanel>
+    <TabPanel Name="File" Heading="File" ResourceKey="File">
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="folder" HelpText="Select a folder where you wish to save the exported content" ResourceKey="Folder">Folder: </Label>
+                <div class="col-sm-9">
+                    <FileManager ShowFiles="false" ShowUpload="false" @ref="_filemanager" />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="filename" HelpText="Specify a name for the file (without an extension)" ResourceKey="Filename">Filename: </Label>
+                <div class="col-sm-9">
+                    <input id="content" type="text" class="form-control" @bind="@_filename" />
+                </div>
+            </div>
+        </div>
+        <br />
+        <button type="button" class="btn btn-success" @onclick="ExportFile">@Localizer["Export"]</button>
+        <NavLink class="btn btn-secondary" href="@PageState.ReturnUrl">@SharedLocalizer["Cancel"]</NavLink>
+    </TabPanel>
+</TabStrip>
+
+
 
 @code {
     private string _content = string.Empty;
+    private FileManager _filemanager;
+    private string _filename = string.Empty;
+
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
     public override string Title => "Export Content";
 
-    private async Task ExportModule()
+    protected override void OnInitialized()
+    {
+        _filename = Utilities.GetFriendlyUrl(ModuleState.Title);
+    }
+
+    private async Task ExportText()
     {
         try
         {
@@ -35,4 +68,34 @@
             AddModuleMessage(Localizer["Error.Module.Export"], MessageType.Error);
         }
     }
+
+    private async Task ExportFile()
+    {
+        try
+        {
+            var folderid = _filemanager.GetFolderId();
+            if (folderid != -1 && !string.IsNullOrEmpty(_filename))
+            {
+                var fileid = await ModuleService.ExportModuleAsync(ModuleState.ModuleId, PageState.Page.PageId, folderid, _filename);
+                if (fileid != -1)
+                {
+                    AddModuleMessage(Localizer["Success.Content.Export"], MessageType.Success);
+                }
+                else
+                {
+                    AddModuleMessage(Localizer["Error.Module.Export"], MessageType.Error);
+                }
+            }
+            else
+            {
+                AddModuleMessage(Localizer["Message.Content.Export"], MessageType.Warning);
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Exporting Module {ModuleId} {Error}", ModuleState.ModuleId, ex.Message);
+            AddModuleMessage(Localizer["Error.Module.Export"], MessageType.Error);
+        }
+    }
+
 }

Oqtane.Client/Modules/Admin/Modules/Import.razor

@@ -2,20 +2,27 @@
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IModuleService ModuleService
+@inject IFileService FileService
 @inject IStringLocalizer<Import> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
     <div class="container">
         <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="content" HelpText="Enter The Module Content To Import" ResourceKey="Content">Content: </Label>
+            <Label Class="col-sm-3" For="file" HelpText="Optionally upload or select a file to import for this module" ResourceKey="File">File: </Label>
+            <div class="col-sm-9">
+                <FileManager Filter="json" OnSelectFile="OnSelectFile" />
+            </div>
+        </div>
+        <hr />
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="content" HelpText="Provide the module content to import" ResourceKey="Content">Content: </Label>
             <div class="col-sm-9">
                 <textarea id="content" class="form-control" @bind="@_content" rows="5" required></textarea>
-
             </div>
         </div>
     </div>
-
+    <br />
     <button type="button" class="btn btn-success" @onclick="ImportModule">@Localizer["Import"]</button>
     <NavLink class="btn btn-secondary" href="@PageState.ReturnUrl">@SharedLocalizer["Cancel"]</NavLink>
 </form>
@@ -28,6 +35,12 @@
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
     public override string Title => "Import Content";
 
+    private async Task OnSelectFile(int fileId)
+    {
+        var bytes = await FileService.DownloadFileAsync(fileId);
+        _content = System.Text.Encoding.UTF8.GetString(bytes, 0, bytes.Length);
+    }
+
     private async Task ImportModule()
     {
         validated = true;

Oqtane.Client/Modules/Admin/Modules/Settings.razor

@@ -97,6 +97,23 @@
                             </div>
                         </div>
                     </div>
+                    <br />
+                    <Section Name="ModuleContent" Heading="Content" ResourceKey="ModuleContent">
+                        <div class="container">
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="moduleheader" HelpText="Optionally provide content to be injected above the module instance" ResourceKey="Header">Header: </Label>
+                                <div class="col-sm-9">
+                                    <textarea id="moduleheader" class="form-control" @bind="@_header" rows="3" maxlength="4000"></textarea>
+                                </div>
+                            </div>
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="modulefooter" HelpText="Optionally provide content to be injected below the module instance" ResourceKey="Footer">Footer: </Label>
+                                <div class="col-sm-9">
+                                    <textarea id="modulefooter" class="form-control" @bind="@_footer" rows="3" maxlength="4000"></textarea>
+                                </div>
+                            </div>
+                        </div>
+                    </Section>
                 }
             </TabPanel>
             <TabPanel Name="Permissions" Heading="Permissions" ResourceKey="Permissions">
@@ -144,6 +161,8 @@
     private string _pane;
     private string _containerType;
     private string _allPages = "false";
+    private string _header = "";
+    private string _footer = "";
     private string _permissionNames = "";
     private List<Permission> _permissions = null;
     private string _pageId;
@@ -167,37 +186,47 @@
     protected override async Task OnInitializedAsync()
     {
         SetModuleTitle(Localizer["ModuleSettings.Title"]);
-
-        _title = ModuleState.Title;
         _moduleSettingsTitle = Localizer["ModuleSettings.Heading"];
-        _pane = ModuleState.Pane;
+
         _containers = ThemeService.GetContainerControls(PageState.Site.Themes, PageState.Page.ThemeType);
-        _containerType = ModuleState.ContainerType;
-        _allPages = ModuleState.AllPages.ToString();
-        _permissions = ModuleState.PermissionList;
-        _pageId = ModuleState.PageId.ToString();
-        createdby = ModuleState.CreatedBy;
-        createdon = ModuleState.CreatedOn;
-        modifiedby = ModuleState.ModifiedBy;
-        modifiedon = ModuleState.ModifiedOn;
-        _effectivedate = Utilities.UtcAsLocalDate(ModuleState.EffectiveDate);
-        _expirydate = Utilities.UtcAsLocalDate(ModuleState.ExpiryDate);
         _pages = await PageService.GetPagesAsync(PageState.Site.SiteId);
 
-        if (ModuleState.ModuleDefinition != null)
+        var pagemodule = await PageModuleService.GetPageModuleAsync(ModuleState.PageModuleId);
-        {
-            _module = ModuleState.ModuleDefinition.Name;
-            _permissionNames = ModuleState.ModuleDefinition?.PermissionNames;
 
-            if (!string.IsNullOrEmpty(ModuleState.ModuleDefinition.SettingsType))
+        _pageId = pagemodule.PageId.ToString();
+        _title = pagemodule.Title;
+        _pane = pagemodule.Pane;
+        _containerType = pagemodule.ContainerType;
+        if (string.IsNullOrEmpty(_containerType))
+        {
+            _containerType = (!string.IsNullOrEmpty(PageState.Page.DefaultContainerType)) ? PageState.Page.DefaultContainerType : PageState.Site.DefaultContainerType;
+        }
+        _header = pagemodule.Header;
+        _footer = pagemodule.Footer;
+        _effectivedate = Utilities.UtcAsLocalDate(pagemodule.EffectiveDate);
+        _expirydate = Utilities.UtcAsLocalDate(pagemodule.ExpiryDate);
+
+        _allPages = pagemodule.Module.AllPages.ToString();
+        createdby = pagemodule.Module.CreatedBy;
+        createdon = pagemodule.Module.CreatedOn;
+        modifiedby = pagemodule.Module.ModifiedBy;
+        modifiedon = pagemodule.Module.ModifiedOn;
+        _permissions = pagemodule.Module.PermissionList;
+
+        if (pagemodule.Module.ModuleDefinition != null)
+        {
+            _module = pagemodule.Module.ModuleDefinition.Name;
+            _permissionNames = pagemodule.Module.ModuleDefinition?.PermissionNames;
+
+            if (!string.IsNullOrEmpty(pagemodule.Module.ModuleDefinition.SettingsType))
             {
                 // module settings type explicitly declared in IModule interface
-                _moduleSettingsType = Type.GetType(ModuleState.ModuleDefinition.SettingsType);
+                _moduleSettingsType = Type.GetType(pagemodule.Module.ModuleDefinition.SettingsType);
             }
             else
             {
                 // legacy support - module settings type determined by convention ( ie. existence of a "Settings.razor" component in module )
-                _moduleSettingsType = Type.GetType(ModuleState.ModuleDefinition.ControlTypeTemplate.Replace(Constants.ActionToken, PageState.Action), false, true);
+                _moduleSettingsType = Type.GetType(pagemodule.Module.ModuleDefinition.ControlTypeTemplate.Replace(Constants.ActionToken, PageState.Action), false, true);
             }
             if (_moduleSettingsType != null)
             {
@@ -218,7 +247,7 @@
         }
         else
         {
-            AddModuleMessage(string.Format(Localizer["Error.Module.Load"], ModuleState.ModuleDefinitionName), MessageType.Error);
+            AddModuleMessage(string.Format(Localizer["Error.Module.Load"], pagemodule.Module.ModuleDefinitionName), MessageType.Error);
         }
 
         var theme = PageState.Site.Themes.FirstOrDefault(item => item.Containers.Any(themecontrol => themecontrol.TypeName.Equals(_containerType)));
@@ -270,10 +299,12 @@
                 {
                     pagemodule.ContainerType = string.Empty;
                 }
+                pagemodule.Header = _header;
+                pagemodule.Footer = _footer;
                 await PageModuleService.UpdatePageModuleAsync(pagemodule);
                 await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
 
-                var module = ModuleState;
+                var module = await ModuleService.GetModuleAsync(ModuleState.ModuleId);
                 module.AllPages = bool.Parse(_allPages);
                 module.PageModuleId = ModuleState.PageModuleId;
                 module.PermissionList = _permissionGrid.GetPermissionList();

Oqtane.Client/Modules/Admin/Pages/Add.razor

@@ -269,8 +269,16 @@
             if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin) || (_parent != null && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, _parent.PermissionList)))
             {
                 _themetype = PageState.Site.DefaultThemeType;
-                _themes = ThemeService.GetThemeControls(PageState.Site.Themes);
+                var themes = new List<Theme>();
-                _containers = ThemeService.GetContainerControls(PageState.Site.Themes, _themetype);
+                foreach (var theme in PageState.Site.Themes)
+                {
+                    if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Utilize, theme.PermissionList))
+                    {
+                        themes.Add(theme);
+                    }
+                }
+                _themes = ThemeService.GetThemeControls(themes);
+                _containers = ThemeService.GetContainerControls(themes, _themetype);
                 _containertype = PageState.Site.DefaultContainerType;
                 _children = new List<Page>();
                 foreach (Page p in _pages.Where(item => (_parentid == "-1" && item.ParentId == null) || (item.ParentId == int.Parse(_parentid))))

Oqtane.Client/Modules/Admin/Pages/Edit.razor

@@ -217,6 +217,9 @@
                         </div>
                     </Section>
                     <br />
+                    <button type="button" class="btn btn-success" @onclick="SavePage">@SharedLocalizer["Save"]</button>
+                    <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
+                    <br />
                     <br />
                     <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon" DeletedBy="@_deletedby" DeletedOn="@_deletedon"></AuditInfo>
                 </TabPanel>
@@ -225,6 +228,19 @@
                         <div class="row mb-1 align-items-center">
                             <PermissionGrid EntityName="@EntityNames.Page" PermissionList="@_permissions" @ref="_permissionGrid" />
                         </div>
+                        <br /><br />
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="updatemodulepermissions" HelpText="Specify if changes made to page permissions should be propagated to the modules on this page" ResourceKey="UpdateModulePermissions">Update Module Permissions? </Label>
+                            <div class="col-sm-9">
+                                <select id="updatemodulepermissions" class="form-select" @bind="@_updatemodulepermissions" required>
+                                    <option value="True">@SharedLocalizer["Yes"]</option>
+                                    <option value="False">@SharedLocalizer["No"]</option>
+                                </select>
+                            </div>
+                        </div>
+                        <br />
+                        <button type="button" class="btn btn-success" @onclick="SavePage">@SharedLocalizer["Save"]</button>
+                        <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
                     </div>
                 </TabPanel>
                 <TabPanel Name="PageModules" Heading="Modules" ResourceKey="PageModules">
@@ -247,8 +263,10 @@
                 {
                     <TabPanel Name="ThemeSettings" Heading="Theme Settings" ResourceKey="ThemeSettings">
                         @_themeSettingsComponent
-                    </TabPanel>
                         <br />
+                        <button type="button" class="btn btn-success" @onclick="SavePage">@SharedLocalizer["Save"]</button>
+                        <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
+                    </TabPanel>
                 }
             </TabStrip>
         }
@@ -299,19 +317,21 @@
                             </div>
                         </div>
                     </div>
+                    <br />
+                    <button type="button" class="btn btn-success" @onclick="SavePage">@SharedLocalizer["Save"]</button>
+                    <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
                 </TabPanel>
                 @if (_themeSettingsType != null)
                 {
                     <TabPanel Name="ThemeSettings" Heading="Theme Settings" ResourceKey="ThemeSettings">
                         @_themeSettingsComponent
-                    </TabPanel>
-                    <br />
-                }
-            </TabStrip>
-        }
                         <br />
                         <button type="button" class="btn btn-success" @onclick="SavePage">@SharedLocalizer["Save"]</button>
                         <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
+                    </TabPanel>
+                }
+            </TabStrip>
+        }
     </form>
 }
 
@@ -348,6 +368,7 @@
     private string _bodycontent;
     private List<Permission> _permissions = null;
     private PermissionGrid _permissionGrid;
+    private string _updatemodulepermissions;
     private List<Module> _pageModules;
     private string _createdby;
     private DateTime _createdon;
@@ -422,8 +443,16 @@
                 {
                     _themetype = PageState.Site.DefaultThemeType;
                 }
-                _themes = ThemeService.GetThemeControls(PageState.Site.Themes);
+                var themes = new List<Theme>();
-                _containers = ThemeService.GetContainerControls(PageState.Site.Themes, _themetype);
+                foreach (var theme in PageState.Site.Themes)
+                {
+                    if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Utilize, theme.PermissionList))
+                    {
+                        themes.Add(theme);
+                    }
+                }
+                _themes = ThemeService.GetThemeControls(themes);
+                _containers = ThemeService.GetContainerControls(themes, _themetype);
                 _containertype = _page.DefaultContainerType;
                 if (string.IsNullOrEmpty(_containertype))
                 {
@@ -436,6 +465,7 @@
 
                 // permissions
                 _permissions = _page.PermissionList;
+                _updatemodulepermissions = "True";
 
                 // page modules
                 var modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId);
@@ -651,6 +681,7 @@
                     if (_page.UserId == null)
                     {
                         _page.PermissionList = _permissionGrid.GetPermissionList();
+                        _page.UpdateModulePermissions = bool.Parse(_updatemodulepermissions);
                     }
 
                     _page = await PageService.UpdatePageAsync(_page);

Oqtane.Client/Modules/Admin/Profiles/Edit.razor

@@ -2,6 +2,7 @@
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IProfileService ProfileService
+@inject ISettingService SettingService
 @inject IStringLocalizer<Edit> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
@@ -56,9 +57,25 @@
             </div>
         </div>
         <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="options" HelpText="A comma delimited list of options the user can select from" ResourceKey="Options">Options: </Label>
+            <Label Class="col-sm-3" For="options" HelpText="A comma delimited list of options. Options can contain a key and value if they are seperated by a colon (ie. key:value). You can also dynamically load your options from Settings." ResourceKey="Options">Options: </Label>
             <div class="col-sm-9">
+                <div class="input-group">
+                    @if (_optiontype == "Settings")
+                    {
                         <input id="options" class="form-control" @bind="@_options" maxlength="2000" />
+                    }
+                    else
+                    {
+                        <select id="entityName" class="form-select" @bind="@_options">
+                            <option value="">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
+                            @foreach (var entityname in _entitynames)
+                            {
+                                <option value="@entityname">@entityname</option>
+                            }
+                        </select>
+                    }
+                    <button type="button" class="btn btn-secondary" @onclick="ToggleOptionType">@Localizer[_optiontype]</button>
+                </div>
             </div>
         </div>
         <div class="row mb-1 align-items-center">
@@ -116,6 +133,8 @@
     private string _rows = "1";
     private string _defaultvalue = string.Empty;
     private string _options = string.Empty;
+    private string _optiontype = "Settings";
+    private List<string> _entitynames;
     private string _validation = string.Empty;
     private string _autocomplete = string.Empty;
     private string _isrequired = "False";
@@ -133,6 +152,8 @@
     {
         try
         {
+            _entitynames = await SettingService.GetEntityNamesAsync();
+
             if (PageState.QueryString.ContainsKey("id"))
             {
                 _profileid = Int32.Parse(PageState.QueryString["id"]);
@@ -148,6 +169,11 @@
                     _rows = profile.Rows.ToString();
                     _defaultvalue = profile.DefaultValue;
                     _options = profile.Options;
+                    if (_options.StartsWith("EntityName:"))
+                    {
+                        _optiontype = "Options";
+                        _options = _options.Substring(11);
+                    }
                     _validation = profile.Validation;
                     _autocomplete = profile.Autocomplete;
                     _isrequired = profile.IsRequired.ToString();
@@ -166,6 +192,18 @@
         }
     }
 
+    private void ToggleOptionType()
+    {
+        if (_optiontype == "Options")
+        {
+            _optiontype = "Settings";
+        }
+        else
+        {
+            _optiontype = "Options";
+        }
+    }
+
     private async Task SaveProfile()
     {
         validated = true;
@@ -193,7 +231,14 @@
                 profile.MaxLength = int.Parse(_maxlength);
                 profile.Rows = int.Parse(_rows);
                 profile.DefaultValue = _defaultvalue;
+                if (_optiontype == "Options" && !string.IsNullOrEmpty(_options))
+                {
+                    profile.Options = "EntityName:" + _options;
+                }
+                else
+                {
                     profile.Options = _options;
+                }
                 profile.Validation = _validation;
                 profile.Autocomplete = _autocomplete;
                 profile.IsRequired = (_isrequired == null ? false : Boolean.Parse(_isrequired));

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

@@ -6,7 +6,10 @@
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 @inject ISettingService SettingService
+@inject ITimeZoneService TimeZoneService
 
+@if (_initialized)
+{
     @if (PageState.Site.AllowRegistration)
     {
         if (!_userCreated)
@@ -56,6 +59,18 @@
                                 <input id="displayname" class="form-control" @bind="@_displayname" maxlength="50" />
                             </div>
                         </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="timezone" HelpText="Your time zone" ResourceKey="TimeZone">Time Zone:</Label>
+                            <div class="col-sm-9">
+                                <select id="timezone" class="form-select" @bind="@_timezoneid">
+                                    <option value="">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
+                                    @foreach (var timezone in _timezones)
+                                    {
+                                        <option value="@timezone.Id">@timezone.DisplayName</option>
+                                    }
+                                </select>
+                            </div>
+                        </div>
                     </div>
                     <br />
                     <button type="button" class="btn btn-primary" @onclick="Register">@Localizer["Register"]</button>
@@ -75,8 +90,11 @@ else
     {
         <ModuleMessage Message="@Localizer["Info.Registration.Disabled"]" Type="MessageType.Info" />
     }
+}
 
 @code {
+    private bool _initialized = false;
+    private List<Models.TimeZone> _timezones;
     private string _passwordrequirements;
     private string _username = string.Empty;
     private ElementReference form;
@@ -87,6 +105,7 @@ else
     private string _confirm = string.Empty;
     private string _email = string.Empty;
     private string _displayname = string.Empty;
+    private string _timezoneid = string.Empty;
     private bool _userCreated = false;
     private bool _allowsitelogin = true;
 
@@ -96,6 +115,9 @@ else
     {
         _passwordrequirements = await UserService.GetPasswordRequirementsAsync(PageState.Site.SiteId); 
         _allowsitelogin = bool.Parse(SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:AllowSiteLogin", "true"));
+        _timezones = TimeZoneService.GetTimeZones();
+        _timezoneid = PageState.Site.TimeZoneId;
+        _initialized = true;
     }
 
     protected override void OnParametersSet()
@@ -124,6 +146,7 @@ else
                             Password = _password,
                             Email = _email,
                             DisplayName = (_displayname == string.Empty ? _username : _displayname),
+                            TimeZoneId = _timezoneid,
 							PhotoFileId = null
                         };
                         user = await UserService.AddUserAsync(user);

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

@@ -40,13 +40,16 @@
                     {
                         <Pager Items="@_searchResults?.Results"
                                 Format="Grid"
+                                PageSize="@_pageSize"
+                                DisplayPages="@_displayPages"
+                                CurrentPage="@_currentPage"
                                 Columns="1"
                                 Toolbar="Bottom"
                                 Parameters="@($"q={_keywords}")">
                             <Row>
                                 <div class="search-item mb-2">
                                     <h4 class="mb-1"><a href="@context.Url">@context.Title</a></h4>
-                                    <p class="mb-0 text-muted">@((MarkupString)context.Snippet)</p>
+                                    <p class="mb-0 text-body-secondary">@((MarkupString)context.Snippet)</p>
                                 </div>
                             </Row>
                         </Pager>
@@ -66,6 +69,7 @@
 
 @code {
     public override string RenderMode => RenderModes.Static;
+    private const string SearchDefaultPageSize = "10";
 
     private string _includeEntities;
     private string _excludeEntities;
@@ -75,6 +79,8 @@
     private string _sortField;
     private string _sortOrder;
     private string _bodyLength;
+    private string _currentPage = "0";
+    private string _displayPages = "7";
     
     private string _keywords;
     private SearchResults _searchResults;
@@ -89,11 +95,16 @@
         _excludeEntities = SettingService.GetSetting(ModuleState.Settings, "SearchResults_ExcludeEntities", "");
         _fromDate = SettingService.GetSetting(ModuleState.Settings, "SearchResults_FromDate", DateTime.MinValue.ToString());
         _toDate = SettingService.GetSetting(ModuleState.Settings, "SearchResults_ToDate", DateTime.MaxValue.ToString());
-        _pageSize = SettingService.GetSetting(ModuleState.Settings, "SearchResults_PageSize", int.MaxValue.ToString());
+        _pageSize = SettingService.GetSetting(ModuleState.Settings, "SearchResults_PageSize", SearchDefaultPageSize);
         _sortField = SettingService.GetSetting(ModuleState.Settings, "SearchResults_SortField", "Relevance");
         _sortOrder = SettingService.GetSetting(ModuleState.Settings, "SearchResults_SortOrder", "Descending");
         _bodyLength = SettingService.GetSetting(ModuleState.Settings, "SearchResults_BodyLength", "255");
 
+        if (PageState.QueryString.ContainsKey("p"))
+        {
+            _currentPage = PageState.QueryString["p"];
+        }
+
         if (_keywords == null && PageState.QueryString.ContainsKey("q"))
         {
             _keywords = WebUtility.UrlDecode(PageState.QueryString["q"]);
@@ -122,7 +133,7 @@
                 ExcludeEntities = _excludeEntities,
                 FromDate = (!string.IsNullOrEmpty(_fromDate)) ? DateTime.Parse(_fromDate) : DateTime.MinValue,
                 ToDate = (!string.IsNullOrEmpty(_toDate)) ? DateTime.Parse(_toDate) : DateTime.MaxValue,
-                PageSize = (!string.IsNullOrEmpty(_pageSize)) ? int.Parse(_pageSize) : int.MaxValue,
+                PageSize = int.MaxValue,
                 PageIndex = 0,
                 SortField = (!string.IsNullOrEmpty(_sortField)) ? (SearchSortField)Enum.Parse(typeof(SearchSortField), _sortField) : SearchSortField.Relevance,
                 SortOrder = (!string.IsNullOrEmpty(_sortOrder)) ? (SearchSortOrder)Enum.Parse(typeof(SearchSortOrder), _sortOrder) : SearchSortOrder.Descending,

Oqtane.Client/Modules/Admin/Settings/Add.razor

@@ -0,0 +1,226 @@
+@namespace Oqtane.Modules.Admin.Settings
+@inherits ModuleBase
+@inject NavigationManager NavigationManager
+@inject ISettingService SettingService
+@inject IStringLocalizer<Edit> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+    <div class="container">
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="entityName" HelpText="Entity Name" ResourceKey="EntityName">Entity:</Label>
+            <div class="col-sm-9">
+                <div class="input-group">
+                    @if (_entityNameElement == "input")
+                    {
+                        <input id="entityName" class="form-control" @bind="@_entityName" maxlength="256" required />
+                    }
+                    else
+                    {
+                        <select class="form-select custom-select" value="@_entityName" @onchange="(e => EntityNameChanged(e))">
+                            <option value="-">&lt;@Localizer["Select Entity"]&gt;</option>
+                            @foreach (var entityName in _entityNames)
+                            {
+                                <option value="@entityName">@entityName</option>
+                            }
+                        </select>
+                    }
+                    <button type="button" class="btn btn-secondary" @onclick="@EntityNameClicked" tabindex="-1">@_entityNameTitle</button>
+                </div>
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="entityId" HelpText="Entity Id" ResourceKey="EntityId">Id:</Label>
+            <div class="col-sm-9">
+                <div class="input-group">
+                    @if (_entityIdElement == "input")
+                    {
+                        <input id="entityId" class="form-control" @bind="@_entityId" maxlength="256" required />
+                    }
+                    else
+                    {
+                        <select class="form-select custom-select" @bind="@_entityId">
+                            <option value="-">&lt;@Localizer["Select Id"]&gt;</option>
+                            @foreach (var entityId in _entityIds)
+                            {
+                                <option value="@entityId">@entityId</option>
+                            }
+                        </select>
+                    }
+                    <button type="button" class="btn btn-secondary" @onclick="@EntityIdClicked" tabindex="-1">@_entityIdTitle</button>
+                </div>
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="settingName" HelpText="Setting Name" ResourceKey="SettingName">Name:</Label>
+            <div class="col-sm-9">
+                <input id="settingName" class="form-control" @bind="@_settingName" maxlength="256" required />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="settingValue" HelpText="Setting Value" ResourceKey="SettingValue">Value:</Label>
+            <div class="col-sm-9">
+                <input id="SettingValue" class="form-control" @bind="@_settingValue" maxlength="256" />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="isPrivate" HelpText="Private" ResourceKey="IsPrivate">Private?</Label>
+            <div class="col-sm-9">
+                <select id="isPrivate" class="form-select" @bind="@_isPrivate">
+                    <option value="True">@SharedLocalizer["Yes"]</option>
+                    <option value="False">@SharedLocalizer["No"]</option>
+                </select>
+            </div>
+        </div>
+        <br /><br />
+        <button type="button" class="btn btn-success" @onclick="SaveSetting">@SharedLocalizer["Save"]</button>
+        <NavLink class="btn btn-secondary" href="@PageState.ReturnUrl">@SharedLocalizer["Cancel"]</NavLink>
+    </div>
+</form>
+
+@code {
+    private ElementReference form;
+    private bool validated = false;
+
+    private string _entityName = "-";
+    private List<string> _entityNames = new List<string>();
+    private string _entityNameElement = "select";
+    private string _entityNameTitle = "";
+    private string _entityId = "-";
+    private List<int> _entityIds = new List<int>();
+    private string _entityIdElement = "select";
+    private string _entityIdTitle = "";
+    private string _settingName = "";
+    private string _settingValue = "";
+    private string _isPrivate = "True";
+
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            _entityNameTitle = Localizer["Input"];
+            _entityIdTitle = Localizer["Input"];
+
+            // default entity names
+            _entityNames.Add(EntityNames.Host);
+            _entityNames.Add(EntityNames.Job);
+            _entityNames.Add(EntityNames.ModuleDefinition);
+            _entityNames.Add(EntityNames.Theme);
+            _entityNames.Add(EntityNames.Tenant);
+            _entityNames.Add(EntityNames.Site);
+            _entityNames.Add(EntityNames.Role);
+            _entityNames.Add(EntityNames.Page);
+            _entityNames.Add(EntityNames.Module);
+            _entityNames.Add(EntityNames.Folder);
+            _entityNames.Add(EntityNames.User);
+            _entityNames.Add(EntityNames.Visitor);
+
+            // custom entity names
+            var entityNames = await SettingService.GetEntityNamesAsync();
+            foreach (var entityName in entityNames)
+            {
+                if (!_entityNames.Contains(entityName))
+                {
+                    _entityNames.Add(entityName);
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Setting {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.LoadSetting"], MessageType.Error);
+        }
+    }
+
+    private void EntityNameClicked()
+    {
+        if (_entityNameElement == "select")
+        {
+            _entityName = "";
+            _entityNameElement = "input";
+            _entityNameTitle = Localizer["Select"];
+            _entityId = "";
+            _entityIdElement = "input";
+            _entityIdTitle = Localizer["Select"];
+        }
+        else
+        {
+            _entityName = "-";
+            _entityNameElement = "select";
+            _entityNameTitle = Localizer["Input"];
+        }
+    }
+
+    private void EntityIdClicked()
+    {
+        if (_entityIdElement == "select")
+        {
+            _entityId = "";
+            _entityIdElement = "input";
+            _entityIdTitle = Localizer["Select"];
+        }
+        else
+        {
+            _entityId = "-";
+            _entityIdElement = "select";
+            _entityIdTitle = Localizer["Input"];
+        }
+    }
+
+    private async void EntityNameChanged(ChangeEventArgs e)
+    {
+        try
+        {
+            _entityName = e.Value.ToString();
+            _entityId = "-";
+            _entityIdElement = "select";
+            _entityIdTitle = Localizer["Input"];
+            if (_entityName != "-")
+            {
+                _entityIds = await SettingService.GetEntityIdsAsync(_entityName);
+            }
+            else
+            {
+                _entityIds = new List<int>();
+            }
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error On EntityNameChanged");
+        }
+    }
+
+    private async Task SaveSetting()
+    {
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form) && _entityName != "-" && int.TryParse(_entityId, out int entityId))
+        {
+            var setting = new Setting();
+            setting.EntityName = _entityName;
+            setting.EntityId = entityId;
+            setting.SettingName = _settingName;
+            setting.SettingValue = _settingValue;
+            setting.IsPrivate = (bool.Parse(_isPrivate));
+
+            try
+            {
+                setting = await SettingService.AddSettingAsync(setting);
+                await logger.LogInformation("Setting Saved {Setting}", setting);
+                NavigationManager.NavigateTo(PageState.ReturnUrl);
+            }
+            catch (Exception ex)
+            {
+                await logger.LogError(ex, "Error Saving Setting {Setting} {Error}", setting, ex.Message);
+                AddModuleMessage(Localizer["Error.SaveSetting"], MessageType.Error);
+            }
+        }
+        else
+        {
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+        }
+    }
+}

Oqtane.Client/Modules/Admin/Settings/Edit.razor

@@ -0,0 +1,122 @@
+@namespace Oqtane.Modules.Admin.Settings
+@inherits ModuleBase
+@inject NavigationManager NavigationManager
+@inject ISettingService SettingService
+@inject IStringLocalizer<Edit> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+    <div class="container">
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="entityName" HelpText="Entity Name" ResourceKey="EntityName">Entity:</Label>
+            <div class="col-sm-9">
+                <input id="entityName" class="form-control" @bind="@_entityName" maxlength="256" disabled />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="entityId" HelpText="Entity Id" ResourceKey="EntityId">Id:</Label>
+            <div class="col-sm-9">
+                <input id="entityId" class="form-control" @bind="@_entityId" maxlength="256" disabled />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="settingName" HelpText="Setting Name" ResourceKey="SettingName">Name:</Label>
+            <div class="col-sm-9">
+                <input id="settingName" class="form-control" @bind="@_settingName" maxlength="256" disabled />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="settingValue" HelpText="Setting Value" ResourceKey="SettingValue">Value:</Label>
+            <div class="col-sm-9">
+                <input id="SettingValue" class="form-control" @bind="@_settingValue" maxlength="256" />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="isPrivate" HelpText="Private" ResourceKey="IsPrivate">Private?</Label>
+            <div class="col-sm-9">
+                <select id="isPrivate" class="form-select" @bind="@_isPrivate">
+                    <option value="True">@SharedLocalizer["Yes"]</option>
+                    <option value="False">@SharedLocalizer["No"]</option>
+                </select>
+            </div>
+        </div>
+        <br /><br />
+        <button type="button" class="btn btn-success" @onclick="SaveSetting">@SharedLocalizer["Save"]</button>
+        <NavLink class="btn btn-secondary" href="@PageState.ReturnUrl">@SharedLocalizer["Cancel"]</NavLink>
+        <br /><br />
+        <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
+    </div>
+</form>
+
+@code {
+    private ElementReference form;
+    private bool validated = false;
+
+    private int _settingId;
+    private string _entityName;
+    private string _entityId;
+    private string _settingName;
+    private string _settingValue;
+    private string _isPrivate;
+    private string _createdby;
+    private DateTime _createdon;
+    private string _modifiedby;
+    private DateTime _modifiedon;
+
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+
+    protected override async Task OnInitializedAsync()
+    {
+        _settingId = int.Parse(PageState.QueryString["id"]);
+        _entityName = PageState.QueryString["entity"];
+
+        try
+        {
+            var setting = await SettingService.GetSettingAsync(_entityName, _settingId);
+            if (setting != null)
+            {
+                _entityId = setting.EntityId.ToString();
+                _settingName = setting.SettingName;
+                _settingValue = setting.SettingValue;
+                _isPrivate = setting.IsPrivate.ToString();
+                _createdby = setting.CreatedBy;
+                _createdon = setting.CreatedOn;
+                _modifiedby = setting.ModifiedBy;
+                _modifiedon = setting.ModifiedOn;
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Setting {SettingId} {Error}", _settingId, ex.Message);
+            AddModuleMessage(Localizer["Error.LoadSetting"], MessageType.Error);
+        }
+    }
+
+    private async Task SaveSetting()
+    {
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
+        {
+            var setting = await SettingService.GetSettingAsync(_entityName, _settingId);
+            setting.SettingValue = _settingValue;
+            setting.IsPrivate = (_isPrivate != null && Boolean.Parse(_isPrivate));
+
+            try
+            {
+                setting = await SettingService.UpdateSettingAsync(setting);
+                await logger.LogInformation("Setting Saved {Setting}", setting);
+                NavigationManager.NavigateTo(PageState.ReturnUrl);
+            }
+            catch (Exception ex)
+            {
+                await logger.LogError(ex, "Error Saving Setting {Setting} {Error}", setting, ex.Message);
+                AddModuleMessage(Localizer["Error.SaveSetting"], MessageType.Error);
+            }
+        }
+        else
+        {
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+        }
+    }
+}

Oqtane.Client/Modules/Admin/Settings/ImportSettings.razor

@@ -0,0 +1,56 @@
+@namespace Oqtane.Modules.Admin.Settings
+@inherits ModuleBase
+@inject NavigationManager NavigationManager
+@inject ISettingService SettingService
+@inject IStringLocalizer<ImportSettings> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+<div class="container">
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="settings" HelpText="Provide settings in comma delimited format using the column template specified" ResourceKey="Settings">Settings:</Label>
+        <div class="col-sm-9">
+            <textarea id="settings" class="form-control" @bind="@_settings" rows="5" required></textarea>
+        </div>
+    </div>
+</div>
+<br />
+<button type="button" class="btn btn-success" @onclick="Import">@Localizer["Import"]</button>&nbsp;
+<NavLink class="btn btn-secondary" href="@PageState.ReturnUrl">@SharedLocalizer["Cancel"]</NavLink>
+
+@code {
+    private string _settings = "Entity,Id,Name,Value,Private\n";
+
+    public override string Title => "Import Settings";
+
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+
+    private async Task Import()
+    {
+        try
+        {
+            if (!string.IsNullOrEmpty(_settings))
+            {
+                ShowProgressIndicator();
+                var result = await SettingService.ImportSettingsAsync(new Result { Message = _settings });
+                if (result.Success)
+                {
+                    AddModuleMessage(Localizer["Message.Import.Success"], MessageType.Success);
+                }
+                else
+                {
+                    AddModuleMessage(Localizer["Message.Import.Failure"], MessageType.Error);
+                }
+                HideProgressIndicator();
+            }
+            else
+            {
+                AddModuleMessage(Localizer["Message.Import.Validation"], MessageType.Warning);
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Importing Settings {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.Import"], MessageType.Error);
+        }
+    }
+}

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

@@ -0,0 +1,146 @@
+@namespace Oqtane.Modules.Admin.Settings
+@inherits ModuleBase
+@inject ISettingService SettingService
+@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+<div class="container">
+    <div class="row mb-1 align-items-center">
+        <div class="col-sm-4">
+            <ActionLink Action="Add" Text="Add Setting" Security="SecurityAccessLevel.Host" ResourceKey="AddSetting" ReturnUrl="@(NavigateUrl(PageState.Page.Path, AddUrlParameters(_entityName, _entityId)))" />
+            <ActionLink Action="ImportSettings" Text="Import" Class="btn btn-secondary ms-1" Security="SecurityAccessLevel.Host" ResourceKey="ImportSettings" ReturnUrl="@(NavigateUrl(PageState.Page.Path, AddUrlParameters(_entityName, _entityId)))" />
+        </div>
+        <div class="col-sm-4">
+            <select class="form-select custom-select" value="@_entityName" @onchange="(e => EntityNameChanged(e))">
+                <option value="-">&lt;@Localizer["Select Entity"]&gt;</option>
+                @foreach (var entityName in _entityNames)
+                {
+                    <option value="@entityName">@entityName</option>
+                }
+            </select>
+        </div>
+        <div class="col-sm-4">
+            <select class="form-select custom-select" value="@_entityId" @onchange="(e => EntityIdChanged(e))">
+                <option value="-">&lt;@Localizer["Select Id"]&gt;</option>
+                @foreach (var entityId in _entityIds)
+                {
+                    <option value="@entityId">@entityId</option>
+                }
+            </select>
+        </div>
+    </div>
+</div>
+<br />
+
+<Pager Items="@_settings" SearchProperties="SettingName,SettingValue">
+    <Header>
+        <th style="width: 1px;">&nbsp;</th>
+        <th style="width: 1px;">&nbsp;</th>
+        <th>@Localizer["Name"]</th>
+        <th>@Localizer["Value"]</th>
+    </Header>
+    <Row>
+        <td><ActionLink Action="Edit" Text="Edit" Parameters="@($"entity={context.EntityName}&id={context.SettingId}")" Security="SecurityAccessLevel.Host" ResourceKey="EditSetting" ReturnUrl="@(NavigateUrl(PageState.Page.Path, AddUrlParameters(_entityName, _entityId)))" /></td>
+        <td><ActionDialog Header="Delete Setting" Message="@string.Format(Localizer["Confirm.DeleteSetting"], context.SettingName)" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteSetting(context))" ResourceKey="DeleteSetting" /></td>
+        <td>@context.SettingName</td>
+        <td>@context.SettingValue</td>
+    </Row>
+</Pager>
+
+@code {
+    private string _entityName = "-";
+    private List<string> _entityNames = new List<string>();
+    private string _entityId = "-";
+    private List<int> _entityIds = new List<int>();
+    private List<Setting> _settings = new List<Setting>();
+
+    public override string UrlParametersTemplate => "/{entityname}/{entityid}";
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+
+    protected override async Task OnParametersSetAsync()
+    {
+        _entityNames = await SettingService.GetEntityNamesAsync();
+
+        if (UrlParameters.ContainsKey("entityname"))
+        {
+            _entityName = UrlParameters["entityname"];
+            await GetEntityIds();
+        }
+        if (UrlParameters.ContainsKey("entityid"))
+        {
+            _entityId = UrlParameters["entityid"];
+            await GetSettings();
+        }
+    }
+
+    private async Task GetEntityIds()
+    {
+        if (_entityName != "-")
+        {
+            _entityIds = await SettingService.GetEntityIdsAsync(_entityName);
+        }
+        else
+        {
+            _entityIds = new List<int>();
+        }
+    }
+
+    private async Task GetSettings()
+    {
+        if (_entityName != "-" && _entityId != "-")
+        {
+            _settings = await SettingService.GetSettingsAsync(_entityName, int.Parse(_entityId), "");
+            _settings = _settings.OrderBy(item => item.SettingName).ToList();
+        }
+        else
+        {
+            _settings = new List<Setting>();
+        }
+    }
+
+    private async void EntityNameChanged(ChangeEventArgs e)
+    {
+        try
+        {
+            _entityName = e.Value.ToString();
+            _entityId = "-";
+            await GetEntityIds();
+            await GetSettings();
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error On EntityNameChanged");
+        }
+    }
+
+    private async void EntityIdChanged(ChangeEventArgs e)
+    {
+        try
+        {
+            _entityId = e.Value.ToString();
+            await GetSettings();
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+            await logger.LogError(ex, "Error On EntityIdChanged");
+		}
+	}
+    
+    private async Task DeleteSetting(Setting setting)
+    {
+        try
+        {
+            await SettingService.DeleteSettingAsync(setting.EntityName, setting.EntityId, setting.SettingName);
+            await logger.LogInformation("Setting Deleted {Setting}", setting);
+            await GetSettings();
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Deleting Setting {Setting} {Error}", setting, ex.Message);
+            AddModuleMessage(Localizer["Error.DeleteSetting"], MessageType.Error);
+        }
+    }
+}

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

@@ -10,6 +10,7 @@
 @inject IAliasService AliasService
 @inject IThemeService  ThemeService
 @inject ISettingService  SettingService
+@inject ITimeZoneService TimeZoneService
 @inject IServiceProvider ServiceProvider
 @inject IStringLocalizer<Index> Localizer
 @inject INotificationService NotificationService
@@ -41,6 +42,20 @@
                     </select>
                 </div>
             </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="timezone" HelpText="Your time zone" ResourceKey="TimeZone">Time Zone:</Label>
+                <div class="col-sm-9">
+                    <select id="timezone" class="form-select" @bind="@_timezoneid">
+                        <option value="">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
+                        @foreach (var timezone in _timezones)
+                        {
+                            <option value="@timezone.Id">@timezone.DisplayName</option>
+                        }
+                    </select>
+                </div>
+            </div>
+            @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+            {
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="isDeleted" HelpText="Is this site deleted?" ResourceKey="IsDeleted">Deleted? </Label>
                     <div class="col-sm-9">
@@ -50,6 +65,7 @@
                         </select>
                     </div>
                 </div>
+            }
             <div class="row mb-1 align-items-center">
                 <Label Class="col-sm-3" For="sitemap" HelpText="The site map url for this site which can be submitted to search engines for indexing. The sitemap is cached for 5 minutes and the cache can be manually cleared." ResourceKey="SiteMap">Site Map: </Label>
                 <div class="col-sm-9">
@@ -133,7 +149,7 @@
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="logo" HelpText="Specify a logo for the site" ResourceKey="Logo">Logo: </Label>
                     <div class="col-sm-9">
-                        <FileManager FileId="@_logofileid" Filter="@_imageFiles" @ref="_logofilemanager" />
+                        <FileManager FileId="@_logofileid" Filter="@_imagefiles" @ref="_logofilemanager" />
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
@@ -180,6 +196,17 @@
         </Section>
         <Section Name="SMTP" Heading="SMTP Settings" ResourceKey="SMTPSettings">
             <div class="container">
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="smtpenabled" HelpText="Specify if SMTP is enabled for this site" ResourceKey="SmtpEnabled">Enabled? </Label>
+                    <div class="col-sm-9">
+                        <select id="smtpenabled" class="form-select" value="@_smtpenabled" @onchange="(e => SMTPEnabledChanged(e))">
+                            <option value="True">@SharedLocalizer["Yes"]</option>
+                            <option value="False">@SharedLocalizer["No"]</option>
+                        </select>
+                    </div>
+                </div>
+                @if (_smtpenabled == "True" && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+                {
                     <div class="row mb-1 align-items-center">
                         <div class="col-sm-3">
                         </div>
@@ -200,14 +227,28 @@
                         </div>
                     </div>
                     <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="smtpssl" HelpText="Specify if SSL is required for your SMTP server" ResourceKey="UseSsl">SSL Enabled: </Label>
+                        <Label Class="col-sm-3" For="smtpssl" HelpText="Specify the type of SSL connection for your SMTP server" ResourceKey="SmtpSSL">SSL Options: </Label>
                         <div class="col-sm-9">
                             <select id="smtpssl" class="form-select" @bind="@_smtpssl">
-                            <option value="True">@SharedLocalizer["Yes"]</option>
+                                <option value="None">@Localizer["None"]</option>
-                            <option value="False">@SharedLocalizer["No"]</option>
+                                <option value="Auto">@Localizer["Auto"]</option>
+                                <option value="StartTls">@Localizer["StartTls"]</option>
+                                <option value="SslOnConnect">@Localizer["SslOnConnect"]</option>
+                                <option value="StartTlsWhenAvailable">@Localizer["StartTlsWhenAvailable"]</option>
                             </select>
                         </div>
                     </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="smtpauthentication" HelpText="Specify the SMTP authentication type" ResourceKey="SMTPAuthentication">Authentication: </Label>
+                        <div class="col-sm-9">
+                            <select id="smtpauthentication" class="form-select" value="@_smtpauthentication" @onchange="(e => SMTPAuthenticationChanged(e))">
+                                <option value="Basic">@Localizer["Basic"]</option>
+                                <option value="OAuth2">@Localizer["OAuth2"]</option>
+                            </select>
+                        </div>
+                    </div>
+                    @if (_smtpauthentication == "Basic")
+                    {
                         <div class="row mb-1 align-items-center">
                             <Label Class="col-sm-3" For="username" HelpText="Enter the username for your SMTP account" ResourceKey="SmtpUsername">Username: </Label>
                             <div class="col-sm-9">
@@ -224,13 +265,7 @@
                             </div>
                         </div>
                         <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="sender" HelpText="Enter the email which emails will be sent from. Please note that this email address may need to be authorized with the SMTP server." ResourceKey="SmtpSender">Email Sender: </Label>
+                            <Label Class="col-sm-3" For="relay" HelpText="Only specify this option if you have properly configured an SMTP Relay Service to route your outgoing mail. This option will send notifications from the user's email rather than from the Email Sender specified below." ResourceKey="SmtpRelay">Relay Configured? </Label>
-                    <div class="col-sm-9">
-                        <input id="sender" class="form-control" @bind="@_smtpsender" />
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="relay" HelpText="Only specify this option if you have properly configured an SMTP Relay Service to route your outgoing mail. This option will send notifications from the user's email rather than from the Email Sender specified above." ResourceKey="SmtpRelay">Relay Configured? </Label>
                             <div class="col-sm-9">
                                 <select id="relay" class="form-select" @bind="@_smtprelay" required>
                                     <option value="True">@SharedLocalizer["Yes"]</option>
@@ -238,13 +273,41 @@
                                 </select>
                             </div>
                         </div>
+                    }
+                    else
+                    {
                         <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="smtpenabled" HelpText="Specify if SMTP is enabled for this site" ResourceKey="SMTPEnabled">Enabled? </Label>
+                            <Label Class="col-sm-3" For="smtpauthority" HelpText="The Authority Url for the SMTP provider" ResourceKey="SmtpAuthority">Authority Url:</Label>
                             <div class="col-sm-9">
-                        <select id="smtpenabled" class="form-select" @bind="@_smtpenabled">
+                                <input id="smtpauthority" class="form-control" @bind="@_smtpauthority" />
-                            <option value="True">@SharedLocalizer["Yes"]</option>
+                            </div>
-                            <option value="False">@SharedLocalizer["No"]</option>
+                        </div>
-                        </select>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="smtpclientid" HelpText="The Client ID for the SMTP provider" ResourceKey="SmtpClientID">Client ID:</Label>
+                            <div class="col-sm-9">
+                                <input id="smtpclientid" class="form-control" @bind="@_smtpclientid" />
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="smtpclientsecret" HelpText="The Client Secret for the SMTP provider" ResourceKey="SmtpClientSecret">Client Secret:</Label>
+                            <div class="col-sm-9">
+                                <div class="input-group">
+                                    <input type="@_smtpclientsecrettype" id="smtpclientsecret" class="form-control" @bind="@_smtpclientsecret" />
+                                    <button type="button" class="btn btn-secondary" @onclick="@ToggleSmtpClientSecret">@_togglesmtpclientsecret</button>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="smtpscopes" HelpText="A list of Scopes for the SMTP provider (separated by commas)" ResourceKey="SmtpScopes">Scopes:</Label>
+                            <div class="col-sm-9">
+                                <input id="smtpscopes" class="form-control" @bind="@_smtpscopes" />
+                            </div>
+                        </div>
+                    }
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="sender" HelpText="Enter the email address which emails will be sent from. Please note that this email address usually needs to be authorized with the SMTP provider." ResourceKey="SmtpSender">Email Sender: </Label>
+                        <div class="col-sm-9">
+                            <input id="sender" class="form-control" @bind="@_smtpsender" />
                         </div>
                     </div>
                     <div class="row mb-1 align-items-center">
@@ -255,6 +318,7 @@
                     </div>
                     <button type="button" class="btn btn-secondary" @onclick="SendEmail">@Localizer["Smtp.TestConfig"]</button>
                     <br /><br />
+                }
             </div>
         </Section>
         <Section Name="PWA" Heading="Progressive Web Application Settings" ResourceKey="PWASettings">
@@ -416,9 +480,11 @@
     private List<ThemeControl> _themes = new List<ThemeControl>();
     private List<ThemeControl> _containers = new List<ThemeControl>();
     private List<Page> _pages;
+    private List<Models.TimeZone> _timezones;
 
     private string _name = string.Empty;
     private string _homepageid = "-";
+    private string _timezoneid = string.Empty;
     private string _isdeleted;
     private string _sitemap = "";
     private string _siteguid = "";
@@ -435,21 +501,28 @@
 
     private Dictionary<string, string> _textEditors = new Dictionary<string, string>();
     private string _textEditor = "";
-    private string _imageFiles = string.Empty;
+    private string _imagefiles = string.Empty;
 
     private string _headcontent = string.Empty;
     private string _bodycontent = string.Empty;
 
+    private string _smtpenabled = "False";
+    private string _smtpauthentication = "Basic";
     private string _smtphost = string.Empty;
     private string _smtpport = string.Empty;
-    private string _smtpssl = "False";
+    private string _smtpssl = "Auto";
     private string _smtpusername = string.Empty;
     private string _smtppassword = string.Empty;
     private string _smtppasswordtype = "password";
     private string _togglesmtppassword = string.Empty;
+    private string _smtpauthority = string.Empty;
+    private string _smtpclientid = string.Empty;
+    private string _smtpclientsecret = string.Empty;
+    private string _smtpclientsecrettype = "password";
+    private string _togglesmtpclientsecret = string.Empty;
+    private string _smtpscopes = string.Empty;
     private string _smtpsender = string.Empty;
     private string _smtprelay = "False";
-    private string _smtpenabled = "True";
     private int _retention = 30;
 
     private string _pwaisenabled;
@@ -493,11 +566,13 @@
             Site site = await SiteService.GetSiteAsync(PageState.Site.SiteId);
             if (site != null)
             {
+                _timezones = TimeZoneService.GetTimeZones();
                 var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
 
                 _pages = await PageService.GetPagesAsync(PageState.Site.SiteId);
 
                 _name = site.Name;
+                _timezoneid = site.TimeZoneId;
                 if (site.HomePageId != null)
                 {
                     _homepageid = site.HomePageId.Value.ToString();
@@ -517,9 +592,17 @@
                 {
                     _faviconfileid = site.FaviconFileId.Value;
                 }
-                _themes = ThemeService.GetThemeControls(PageState.Site.Themes);
+                var themes = new List<Theme>();
+                foreach (var theme in PageState.Site.Themes)
+                {
+                    if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Utilize, theme.PermissionList))
+                    {
+                        themes.Add(theme);
+                    }
+                }
+                _themes = ThemeService.GetThemeControls(themes);
                 _themetype = (!string.IsNullOrEmpty(site.DefaultThemeType)) ? site.DefaultThemeType : Constants.DefaultTheme;
-                _containers = ThemeService.GetContainerControls(PageState.Site.Themes, _themetype);
+                _containers = ThemeService.GetContainerControls(themes, _themetype);
                 _containertype = (!string.IsNullOrEmpty(site.DefaultContainerType)) ? site.DefaultContainerType : Constants.DefaultContainer;
                 _admincontainertype = (!string.IsNullOrEmpty(site.AdminContainerType)) ? site.AdminContainerType : Constants.DefaultAdminContainer;
                 _cookieconsent = SettingService.GetSetting(settings, "CookieConsent", string.Empty);
@@ -531,24 +614,35 @@
                     _textEditors.Add(textEditor.Name, Utilities.GetFullTypeName(textEditor.GetType().AssemblyQualifiedName));
                 }
                 _textEditor = SettingService.GetSetting(settings, "TextEditor", Constants.DefaultTextEditor);
-                _imageFiles = SettingService.GetSetting(settings, "ImageFiles", Constants.ImageFiles);
+                _imagefiles = SettingService.GetSetting(settings, "ImageFiles", Constants.ImageFiles);
-                _imageFiles = (string.IsNullOrEmpty(_imageFiles)) ? Constants.ImageFiles : _imageFiles;
+                _imagefiles = (string.IsNullOrEmpty(_imagefiles)) ? Constants.ImageFiles : _imagefiles;
 
                 // page content
                 _headcontent = site.HeadContent;
                 _bodycontent = site.BodyContent;
 
                 // SMTP
+                _smtpenabled = SettingService.GetSetting(settings, "SMTPEnabled", "False");
+                if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+                {
                     _smtphost = SettingService.GetSetting(settings, "SMTPHost", string.Empty);
                     _smtpport = SettingService.GetSetting(settings, "SMTPPort", string.Empty);
-                _smtpssl = SettingService.GetSetting(settings, "SMTPSSL", "False");
+                    _smtpssl = SettingService.GetSetting(settings, "SMTPSSL", "Auto");
+                    if (_smtpssl == "True") _smtpssl = "SslOnConnect";
+                    if (_smtpssl == "False") _smtpssl = "StartTlsWhenAvailable";
+                    _smtpauthentication = SettingService.GetSetting(settings, "SMTPAuthentication", "Basic");
                     _smtpusername = SettingService.GetSetting(settings, "SMTPUsername", string.Empty);
                     _smtppassword = SettingService.GetSetting(settings, "SMTPPassword", string.Empty);
                     _togglesmtppassword = SharedLocalizer["ShowPassword"];
+                    _smtpauthority = SettingService.GetSetting(settings, "SMTPAuthority", string.Empty);
+                    _smtpclientid = SettingService.GetSetting(settings, "SMTPClientId", string.Empty);
+                    _smtpclientsecret = SettingService.GetSetting(settings, "SMTPClientSecret", string.Empty);
+                    _togglesmtpclientsecret = SharedLocalizer["ShowPassword"];
+                    _smtpscopes = SettingService.GetSetting(settings, "SMTPScopes", string.Empty);
                     _smtpsender = SettingService.GetSetting(settings, "SMTPSender", string.Empty);
                     _smtprelay = SettingService.GetSetting(settings, "SMTPRelay", "False");
-                _smtpenabled = SettingService.GetSetting(settings, "SMTPEnabled", "True");
                     _retention = int.Parse(SettingService.GetSetting(settings, "NotificationRetention", "30"));
+                }
 
                 // PWA
                 _pwaisenabled = site.PwaIsEnabled.ToString();
@@ -579,7 +673,8 @@
                     if (tenant != null)
                     {
                         _tenant = tenant.Name;
-                        _database = _databases.Find(item => item.DBType == tenant.DBType && item.Name != "LocalDB")?.Name;
+                        // hack - there are 3 providers with SqlServerDatabase DBTypes - so we are choosing the last one in alphabetical order
+                        _database = _databases.Where(item => item.DBType == tenant.DBType).OrderBy(item => item.Name).Last()?.Name;
                         _connectionstring = tenant.DBConnectionString;
                     }
                 }
@@ -650,6 +745,7 @@
                     if (site != null)
                     {
                         site.Name = _name;
+                        site.TimeZoneId = _timezoneid;
                         site.HomePageId = (_homepageid != "-" ? int.Parse(_homepageid) : null);
                         site.IsDeleted = (_isdeleted == null ? true : Boolean.Parse(_isdeleted));
 
@@ -724,16 +820,23 @@
 
                         // SMTP
                         var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
+                        settings = SettingService.SetSetting(settings, "SMTPEnabled", _smtpenabled, true);
+                        if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+                        {
                             settings = SettingService.SetSetting(settings, "SMTPHost", _smtphost, true);
                             settings = SettingService.SetSetting(settings, "SMTPPort", _smtpport, true);
                             settings = SettingService.SetSetting(settings, "SMTPSSL", _smtpssl, true);
+                            settings = SettingService.SetSetting(settings, "SMTPAuthentication", _smtpauthentication, true);
                             settings = SettingService.SetSetting(settings, "SMTPUsername", _smtpusername, true);
                             settings = SettingService.SetSetting(settings, "SMTPPassword", _smtppassword, true);
+                            settings = SettingService.SetSetting(settings, "SMTPAuthority", _smtpauthority, true);
+                            settings = SettingService.SetSetting(settings, "SMTPClientId", _smtpclientid, true);
+                            settings = SettingService.SetSetting(settings, "SMTPClientSecret", _smtpclientsecret, true);
+                            settings = SettingService.SetSetting(settings, "SMTPScopes", _smtpscopes, true);
                             settings = SettingService.SetSetting(settings, "SMTPSender", _smtpsender, true);
                             settings = SettingService.SetSetting(settings, "SMTPRelay", _smtprelay, true);
-                        settings = SettingService.SetSetting(settings, "SMTPEnabled", _smtpenabled, true);
-                        settings = SettingService.SetSetting(settings, "SiteGuid", _siteguid, true);
                             settings = SettingService.SetSetting(settings, "NotificationRetention", _retention.ToString(), true);
+                        }
 
                         //cookie consent
                         settings = SettingService.SetSetting(settings, "CookieConsent", _cookieconsent);
@@ -741,6 +844,7 @@
                         // functionality
                         settings = SettingService.SetSetting(settings, "TextEditor", _textEditor);
 
+                        settings = SettingService.SetSetting(settings, "SiteGuid", _siteguid, true);
                         await SettingService.UpdateSiteSettingsAsync(settings, site.SiteId);
 
                         await logger.LogInformation("Site Settings Saved {Site}", site);
@@ -795,6 +899,46 @@
         }
     }
 
+    private void SMTPAuthenticationChanged(ChangeEventArgs e)
+    {
+        _smtpauthentication = (string)e.Value;
+        StateHasChanged();
+    }
+
+    private void SMTPEnabledChanged(ChangeEventArgs e)
+    {
+        _smtpenabled = (string)e.Value;
+        StateHasChanged();
+    }
+
+    private void ToggleSMTPPassword()
+    {
+        if (_smtppasswordtype == "password")
+        {
+            _smtppasswordtype = "text";
+            _togglesmtppassword = SharedLocalizer["HidePassword"];
+        }
+        else
+        {
+            _smtppasswordtype = "password";
+            _togglesmtppassword = SharedLocalizer["ShowPassword"];
+        }
+    }
+
+    private void ToggleSmtpClientSecret()
+    {
+        if (_smtpclientsecrettype == "password")
+        {
+            _smtpclientsecrettype = "text";
+            _togglesmtpclientsecret = SharedLocalizer["HidePassword"];
+        }
+        else
+        {
+            _smtpclientsecrettype = "password";
+            _togglesmtpclientsecret = SharedLocalizer["ShowPassword"];
+        }
+    }
+
     private async Task SendEmail()
     {
         if (_smtphost != "" && _smtpport != "" && _smtpsender != "")
@@ -805,8 +949,13 @@
                 settings = SettingService.SetSetting(settings, "SMTPHost", _smtphost, true);
                 settings = SettingService.SetSetting(settings, "SMTPPort", _smtpport, true);
                 settings = SettingService.SetSetting(settings, "SMTPSSL", _smtpssl, true);
+                settings = SettingService.SetSetting(settings, "SMTPAuthentication", _smtpauthentication, true);
                 settings = SettingService.SetSetting(settings, "SMTPUsername", _smtpusername, true);
                 settings = SettingService.SetSetting(settings, "SMTPPassword", _smtppassword, true);
+                settings = SettingService.SetSetting(settings, "SMTPAuthority", _smtpauthority, true);
+                settings = SettingService.SetSetting(settings, "SMTPClientId", _smtpclientid, true);
+                settings = SettingService.SetSetting(settings, "SMTPClientSecret", _smtpclientsecret, true);
+                settings = SettingService.SetSetting(settings, "SMTPScopes", _smtpscopes, true);
                 settings = SettingService.SetSetting(settings, "SMTPSender", _smtpsender, true);
                 await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
                 await logger.LogInformation("Site SMTP Settings Saved");
@@ -827,20 +976,6 @@
         }
     }
 
-    private void ToggleSMTPPassword()
-    {
-        if (_smtppasswordtype == "password")
-        {
-            _smtppasswordtype = "text";
-            _togglesmtppassword = SharedLocalizer["HidePassword"];
-        }
-        else
-        {
-            _smtppasswordtype = "password";
-            _togglesmtppassword = SharedLocalizer["ShowPassword"];
-        }
-    }
-
     private async Task GetAliases()
     {
         if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))

Oqtane.Client/Modules/Admin/Sites/Add.razor

@@ -216,7 +216,7 @@ else
             _tenantid = _tenants.First(item => item.Name == TenantNames.Master).TenantId.ToString();
         }
         _urls = PageState.Alias.Name;
-        _themeList = await ThemeService.GetThemesAsync();
+        _themeList = await ThemeService.GetThemesAsync(PageState.Site.SiteId);
         _themes = ThemeService.GetThemeControls(_themeList);
         if (_themes.Any(item => item.TypeName == Constants.DefaultTheme))
         {
@@ -237,7 +237,7 @@ else
         }
         else
         {
-            _databaseName = "LocalDB";
+            _databaseName = Constants.DefaultDBName;
         }
         LoadDatabaseConfigComponent();
     }
@@ -390,6 +390,8 @@ else
                             config.DatabaseType = tenant.DBType;
                             config.ConnectionString = tenant.DBConnectionString;
                             config.IsNewTenant = false;
+                            config.HostEmail = PageState.User.Email;
+                            config.HostName = PageState.User.DisplayName;
                         }
                     }
 
@@ -403,6 +405,7 @@ else
                         config.SiteTemplate = _sitetemplatetype;
                         config.RenderMode = _rendermode;
                         config.Runtime = _runtime;
+                        config.Register = false;
 
                         ShowProgressIndicator();
 

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

@@ -200,7 +200,8 @@ else
 				if (tenant != null)
 				{
 					_tenant = tenant.Name;
-					_databasetype = _databases.FirstOrDefault(item => item.DBType == tenant.DBType && item.Name != "LocalDB").Name;
+                    // hack - there are 3 providers with SqlServerDatabase DBTypes - so we are choosing the last one in alphabetical order
+                    _databasetype = _databases.Where(item => item.DBType == tenant.DBType).OrderBy(item => item.Name).Last()?.Name;
 				}
 			}
 			else
@@ -211,7 +212,7 @@ else
 				}
 				else
 				{
-					_databasetype = "LocalDB";
+                    _databasetype = Constants.DefaultDBName;
 				}
 				_showConnectionString = false;
 				LoadDatabaseConfigComponent();

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

@@ -2,9 +2,13 @@
 @inherits ModuleBase
 @inject ISystemService SystemService
 @inject IInstallationService InstallationService
+@inject IMigrationHistoryService MigrationHistoryService
+@inject ITenantService TenantService
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
+@if (_initialized)
+{
     <TabStrip>
         <TabPanel Name="Info" Heading="Info" ResourceKey="Info">
             <div class="container">
@@ -170,12 +174,38 @@
             <br /><br />
             <button type="button" class="btn btn-danger" @onclick="ClearLog">@Localizer["Clear"]</button>
         </TabPanel>
+        <TabPanel Name="Migrations" Heading="Migrations" ResourceKey="Migrations">
+            <div class="container">
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="tenant" HelpText="The name of the current database. Note that this is not the physical database name but rather the tenant name which is used within the framework to identify a database." ResourceKey="Tenant">Database: </Label>
+                    <div class="col-sm-9">
+                        <input id="tenant" class="form-control" @bind="@_tenant" readonly />
+                    </div>
+                </div>
+            </div>
+            <br />
+            <Pager Items="@_history" SearchProperties="MigrationId">
+                <Header>
+                    <th>@Localizer["Migration"]</th>
+                    <th>@Localizer["Date"]</th>
+                    <th>@Localizer["Version"]</th>
+                </Header>
+                <Row>
+                    <td>@context.MigrationId</td>
+                    <td>@UtcToLocal(context.AppliedDate)</td>
+                    <td>@context.AppliedVersion</td>
+                </Row>
+            </Pager>
+        </TabPanel>
     </TabStrip>
     <br /><br />
+}
 
 @code {
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
+    private bool _initialized = false;
+
     private string _version = string.Empty;
     private string _clrversion = string.Empty;
     private string _osversion = string.Empty;
@@ -199,6 +229,9 @@
 
     private string _log = string.Empty;
 
+    private string _tenant = string.Empty;
+    private List<MigrationHistory> _history;
+
     protected override async Task OnInitializedAsync()
     {
         _version = Constants.Version;
@@ -236,6 +269,12 @@
         {
             _log = systeminfo["Log"].ToString();
         }
+
+        var tenants = await TenantService.GetTenantsAsync();
+        _tenant = tenants.Find(item => item.TenantId == PageState.Site.TenantId).Name;
+        _history = await MigrationHistoryService.GetMigrationHistoryAsync();
+
+        _initialized = true;
     }
 
 	private async Task SaveConfig()

Oqtane.Client/Modules/Admin/Themes/Add.razor

@@ -101,6 +101,12 @@
                                             <small>@SharedLocalizer["Search.By"]:</small> <strong><a href="@context.OwnerUrl" target="new">@context.Owner</a></strong><br />
                                             @(context.Description.Length > 400 ? (context.Description.Substring(0, 400) + "...") : context.Description)<br />
                                             <br />
+                                            @if (_themes.Exists(item => item.PackageName == context.PackageId))
+                                            {
+                                                <button type="button" class="btn btn-info">@SharedLocalizer["Installed"]</button>
+                                            }
+                                            else
+                                            {
                                                 @if (!string.IsNullOrEmpty(context.PackageUrl))
                                                 {
                                                     <button type="button" class="btn btn-primary" @onclick=@(async () => await GetPackage(context.PackageId, context.Version))>@SharedLocalizer["Download"]</button>
@@ -109,6 +115,7 @@
                                                 {
                                                     <a class="btn btn-success ms-2" style="text-decoration: none !important" href="@context.PaymentUrl" target="_new">@SharedLocalizer["Buy"]</a>
                                                 }
+                                            }
                                             <br />
                                         </div>
                                     </div>
@@ -171,6 +178,7 @@
 
 @code {
     private bool _initialized = false;
+    private List<Theme> _themes;
     private int _page = 1;
     private List<Package> _packages;
     private string _price = "free";
@@ -187,7 +195,8 @@
     {
         try
         {
-            await LoadThemes();
+            _themes = await ThemeService.GetThemesAsync(PageState.Site.SiteId);
+            await LoadPackages();
             _initialized = true;
         }
         catch (Exception ex)
@@ -197,24 +206,10 @@
         }
     }
 
-    private async Task LoadThemes()
+    private async Task LoadPackages()
     {
         ShowProgressIndicator(); 
- 
-        var themes = await ThemeService.GetThemesAsync();
         _packages = await PackageService.GetPackagesAsync("theme", _search, _price, "", _sort);
-
-        if (_packages != null)
-        {
-            foreach (Package package in _packages.ToArray())
-            {
-                if (themes.Exists(item => item.PackageName == package.PackageId))
-                {
-                    _packages.Remove(package);
-                }
-            }
-        }
-
         HideProgressIndicator();
     }
 
@@ -222,25 +217,25 @@
     {
         _price = price;
         _sort = "popularity";
-        await LoadThemes();
+        await LoadPackages();
         StateHasChanged();
     }
 
     private async Task Search()
     {
-        await LoadThemes();
+        await LoadPackages();
     }
 
     private async Task Reset()
     {
         _page = 1;
         _search = "";
-        await LoadThemes();
+        await LoadPackages();
     }
 
     private async Task Refresh()
     {
-        await LoadThemes();
+        await LoadPackages();
     }
 
     private void OnPageChange(int page)
@@ -251,7 +246,7 @@
     private async void SortChanged(ChangeEventArgs e)
     {
         _sort = (string)e.Value;
-        await LoadThemes();
+        await LoadPackages();
     }
 
     private void HideModal()
@@ -310,6 +305,6 @@
 
     private void OnUpload()
     {
-        AddModuleMessage(string.Format(Localizer["Success.Theme.Download"], NavigateUrl("admin/system")), MessageType.Success);
+        AddModuleMessage(string.Format(Localizer["Success.Theme.Upload"], NavigateUrl("admin/system")), MessageType.Success);
     }
 }

Oqtane.Client/Modules/Admin/Themes/Edit.razor

@@ -9,10 +9,12 @@
 
 @if (_initialized)
 {
+    <TabStrip>
+        <TabPanel Name="Theme" ResourceKey="Theme" Heading="Theme">
             <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
                 <div class="container">
                     <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="name" HelpText="The name of the module" ResourceKey="Name">Name: </Label>
+                        <Label Class="col-sm-3" For="name" HelpText="The name of the theme" ResourceKey="Name">Name: </Label>
                         <div class="col-sm-9">
                             <input id="name" class="form-control" @bind="@_name" />
                         </div>
@@ -55,7 +57,7 @@
                         </div>
                     </div>
                     <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="url" HelpText="The reference url of the theme" ResourceKey="ReferenceUrl">Reference Url: </Label>
+                        <Label Class="col-sm-3" For="url" HelpText="The url of the theme" ResourceKey="Url">Url: </Label>
                         <div class="col-sm-9">
                             <input id="url" class="form-control" @bind="@_url" disabled />
                         </div>
@@ -87,6 +89,18 @@
             <br />
             <br />
             <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
+        </TabPanel>
+        <TabPanel Name="Permissions" ResourceKey="Permissions" Heading="Permissions">
+            <div class="container">
+                <div class="row mb-1 align-items-center">
+                    <PermissionGrid EntityName="@EntityNames.Theme" PermissionNames="@PermissionNames.Utilize" PermissionList="@_permissions" @ref="_permissionGrid" />
+                </div>
+            </div>
+            <br />
+            <button type="button" class="btn btn-success" @onclick="SaveTheme">@SharedLocalizer["Save"]</button>
+            <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+        </TabPanel>
+    </TabStrip>
 }
 
 @code {
@@ -103,11 +117,14 @@
     private string _url = "";
     private string _contact = "";
     private string _license = "";
+    private List<Permission> _permissions = null;
     private string _createdby;
     private DateTime _createdon;
     private string _modifiedby;
     private DateTime _modifiedon;
 
+    private PermissionGrid _permissionGrid;
+
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnInitializedAsync()
@@ -126,6 +143,7 @@
                 _url = theme.Url;
                 _contact = theme.Contact;
                 _license = theme.License;
+                _permissions = theme.PermissionList;
                 _createdby = theme.CreatedBy;
                 _createdon = theme.CreatedOn;
                 _modifiedby = theme.ModifiedBy;
@@ -152,6 +170,7 @@
                 var theme = await ThemeService.GetThemeAsync(_themeId, ModuleState.SiteId);
                 theme.Name = _name;
                 theme.IsEnabled = (_isenabled == null ? true : bool.Parse(_isenabled));
+                theme.PermissionList = _permissionGrid.GetPermissionList();
                 await ThemeService.UpdateThemeAsync(theme);
                 await logger.LogInformation("Theme Saved {Theme}", theme);
                 NavigationManager.NavigateTo(NavigateUrl());

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

@@ -15,12 +15,11 @@
 else
 {
     <ActionLink Action="Add" Text="Install Theme" ResourceKey="InstallTheme" />
-    @((MarkupString)"&nbsp;")
+    <ActionLink Action="Create" Text="Create Theme" ResourceKey="CreateTheme" Class="btn btn-secondary ms-1" />
-    <ActionLink Action="Create" Text="Create Theme" ResourceKey="CreateTheme" Class="btn btn-secondary" />
+    <button type="button" class="btn btn-secondary ms-1" @onclick="@Synchronize">@Localizer["Synchronize"]</button>
 
     <Pager Items="@_themes">
         <Header>
-            <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
             <th>@SharedLocalizer["Name"]</th>
@@ -38,7 +37,6 @@ else
                     <ActionDialog Header="Delete Theme" Message="@string.Format(Localizer["Confirm.Theme.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteTheme(context))" ResourceKey="DeleteTheme" />
                 }
             </td>
-            <td><NavLink class="btn btn-secondary" href="@NavigateUrl("admin/site")">@Localizer["Assign"]</NavLink></td>
             <td>@context.Name</td>
             <td>@context.Version</td>
             <td>
@@ -80,7 +78,7 @@ else
     {
         try
         {
-            _themes = await ThemeService.GetThemesAsync();
+            _themes = await ThemeService.GetThemesAsync(PageState.Site.SiteId);
             _packages = await PackageService.GetPackageUpdatesAsync("theme");
         }
         catch (Exception ex)
@@ -163,7 +161,7 @@ else
     {
         try
         {
-            await ThemeService.DeleteThemeAsync(Theme.ThemeName);
+            await ThemeService.DeleteThemeAsync(Theme.ThemeId, PageState.Site.SiteId);
             AddModuleMessage(Localizer["Success.Theme.Delete"], MessageType.Success);
             NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, true));
         }
@@ -173,4 +171,27 @@ else
             AddModuleMessage(Localizer["Error.Theme.Delete"], MessageType.Error);
         }
     }
+
+    private async Task Synchronize()
+    {
+        try
+        {
+            ShowProgressIndicator();
+            foreach (var theme in _themes)
+            {
+                if (!string.IsNullOrEmpty(theme.PackageName) && !_packages.Any(item => item.PackageId == theme.PackageName))
+                {
+                    await PackageService.GetPackageAsync(theme.PackageName, theme.Version, false);
+                }
+            }
+            HideProgressIndicator();
+            AddModuleMessage(Localizer["Success.Theme.Synchronize"], MessageType.Success);
+            NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, true));
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Synchronizing Themes {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.Theme.Synchronize"], MessageType.Error);
+        }
+    }
 }

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

@@ -13,17 +13,33 @@
         <TabPanel Name="Download" ResourceKey="Download">
             @if (_package != null && _upgradeavailable)
             {
-                <ModuleMessage Type="MessageType.Info" Message="Select The Download Button To Download The Framework Upgrade Package And Then Select Upgrade"></ModuleMessage>
+                <div class="container">
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" HelpText="Specify if you want to backup files during the upgrade process. Disabling this option will reduce the time required for the upgrade." ResourceKey="Backup">Backup Files? </Label>
+                        <div class="col-sm-9">
+                            <select id="backup" class="form-select" @bind="@_backup">
+                                <option value="True">@SharedLocalizer["Yes"]</option>
+                                <option value="False">@SharedLocalizer["No"]</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+                <br />
+                @if (!_downloaded)
+                {
                     <button type="button" class="btn btn-primary" @onclick=@(async () => await Download(Constants.PackageId, @_package.Version))>@SharedLocalizer["Download"] @_package.Version</button>
+                }
+                else
+                {
                     <button type="button" class="btn btn-success" @onclick="Upgrade">@SharedLocalizer["Upgrade"]</button>
                 }
+            }
             else
             {
                 <ModuleMessage Type="MessageType.Info" Message=@Localizer["Message.Text"]></ModuleMessage>
             }
         </TabPanel>
         <TabPanel Name="Upload" ResourceKey="Upload">
-            <ModuleMessage Type="MessageType.Info" Message=@Localizer["MessageUpgrade.Text"]></ModuleMessage>
             <div class="container">
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" HelpText="Upload A Framework Package And Then Select Upgrade" ResourceKey="Framework">Framework: </Label>
@@ -31,7 +47,17 @@
                         <FileManager Folder="@Constants.PackagesFolder" />
                     </div>
                 </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" HelpText="Specify if you want to backup files during the upgrade process. Disabling this option will reduce the time required for the upgrade." ResourceKey="Backup">Backup Files? </Label>
+                    <div class="col-sm-9">
+                        <select id="backup" class="form-select" @bind="@_backup">
+                            <option value="True">@SharedLocalizer["Yes"]</option>
+                            <option value="False">@SharedLocalizer["No"]</option>
+                        </select>
                     </div>
+                </div>
+            </div>
+            <br />
             <button type="button" class="btn btn-success" @onclick="Upgrade">@SharedLocalizer["Upgrade"]</button>
         </TabPanel>
     </TabStrip>
@@ -39,8 +65,10 @@
 
 @code {
     private bool _initialized = false;
+    private bool _downloaded = false;
     private Package _package;
     private bool _upgradeavailable = false;
+    private string _backup = "True";
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
@@ -86,7 +114,7 @@
             ShowProgressIndicator();
             var interop = new Interop(JSRuntime);
             await interop.RedirectBrowser(NavigateUrl(), 10);
-            await InstallationService.Upgrade();
+            await InstallationService.Upgrade(bool.Parse(_backup));
         }
         catch (Exception ex)
         {
@@ -102,6 +130,7 @@
             ShowProgressIndicator();
             await PackageService.DownloadPackageAsync(packageid, version);
             await PackageService.DownloadPackageAsync(Constants.UpdaterPackageId, version);
+            _downloaded = true;
             HideProgressIndicator();
             AddModuleMessage(Localizer["Success.Framework.Download"], MessageType.Success);
         }

Oqtane.Client/Modules/Admin/UrlMappings/Add.razor

@@ -8,13 +8,16 @@
 <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
     <div class="container">
         <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="url" HelpText="The fully qualified Url for this site" ResourceKey="Url">Url:</Label>
+            <Label Class="col-sm-3" For="url" HelpText="A Url identifying a path to a specific page in the site (absolute or relative)" ResourceKey="Url">Url:</Label>
             <div class="col-sm-9">
+                <div class="input-group">
                     <input id="url" class="form-control" @bind="@_url" maxlength="500" required />
+                    <button type="button" class="btn btn-primary" @onclick="GenerateUrl">@Localizer["Generate"]</button>
+                </div>
             </div>
         </div>
         <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="mappedurl" HelpText="A fully qualified Url where the user will be redirected" ResourceKey="MappedUrl">Redirect To:</Label>
+            <Label Class="col-sm-3" For="mappedurl" HelpText="A Url where the user will be redirected (absolute or relative). Use '/' for site root path." ResourceKey="MappedUrl">Redirect To:</Label>
             <div class="col-sm-9">
                 <input id="mappedurl" class="form-control" @bind="@_mappedurl" maxlength="500" required />
             </div>
@@ -48,13 +51,15 @@
                 _url = (_url.StartsWith("/")) ? _url.Substring(1) : _url;
                 _url = (!_url.StartsWith("http")) ? url + _url : _url;
 
+                _mappedurl = _mappedurl.Replace(url, "");
+                _mappedurl = (_mappedurl.StartsWith("/") && _mappedurl != "/") ? _mappedurl.Substring(1) : _mappedurl;
+
                 if (_url.StartsWith(url))
                 {
                     var urlmapping = new UrlMapping();
                     urlmapping.SiteId = PageState.Site.SiteId;
-					var route = new Route(_url, PageState.Alias.Path);
+                    urlmapping.Url = new Route(_url, PageState.Alias.Path).PagePath;
-					urlmapping.Url = route.PagePath;
+                    urlmapping.MappedUrl = _mappedurl;
-					urlmapping.MappedUrl = _mappedurl.Replace(url, "");
                     urlmapping.Requests = 0;
                     urlmapping.CreatedOn = DateTime.UtcNow;
                     urlmapping.RequestedOn = DateTime.UtcNow;
@@ -86,4 +91,18 @@
             AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
+
+    private void GenerateUrl()
+    {
+        var url = PageState.Uri.Scheme + "://" + PageState.Uri.Authority + "/";
+        url = url + (!string.IsNullOrEmpty(PageState.Alias.Path) ? PageState.Alias.Path + "/" : "");
+
+        var chars = "abcdefghijklmnopqrstuvwxyz";
+        Random rnd = new Random();
+        for (int i = 0; i < 5; i++)
+        {
+            url += chars.Substring(rnd.Next(0, chars.Length - 1), 1);
+        }
+        _url = url;
+    }
 }

Oqtane.Client/Modules/Admin/UrlMappings/Edit.razor

@@ -8,13 +8,13 @@
 <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
     <div class="container">
         <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="url" HelpText="A fully qualified Url for this site" ResourceKey="Url">Url:</Label>
+            <Label Class="col-sm-3" For="url" HelpText="A Url identifying a path to a specific page in the site (absolute or relative)" ResourceKey="Url">Url:</Label>
             <div class="col-sm-9">
                 <input id="url" class="form-control" @bind="@_url" maxlength="500" readonly />
             </div>
         </div>
         <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="mappedurl" HelpText="A fully qualified Url where the user will be redirected" ResourceKey="MappedUrl">Redirect To:</Label>
+            <Label Class="col-sm-3" For="mappedurl" HelpText="A Url where the user will be redirected (absolute or relative). Use '/' for site root path." ResourceKey="MappedUrl">Redirect To:</Label>
             <div class="col-sm-9">
                 <input id="mappedurl" class="form-control" @bind="@_mappedurl" maxlength="500" required />
             </div>
@@ -67,8 +67,11 @@
 					var url = PageState.Uri.Scheme + "://" + PageState.Uri.Authority + "/";
 					url = url + (!string.IsNullOrEmpty(PageState.Alias.Path) ? PageState.Alias.Path + "/" : "");
 
+                    _mappedurl = _mappedurl.Replace(url, "");
+                    _mappedurl = (_mappedurl.StartsWith("/") && _mappedurl != "/") ? _mappedurl.Substring(1) : _mappedurl;
+
 					var urlmapping = await UrlMappingService.GetUrlMappingAsync(_urlmappingid);
-					urlmapping.MappedUrl = _mappedurl.Replace(url, "");
+					urlmapping.MappedUrl = _mappedurl;
 					urlmapping = await UrlMappingService.UpdateUrlMappingAsync(urlmapping);
 					await logger.LogInformation("UrlMapping Saved {UrlMapping}", urlmapping);
 					NavigationManager.NavigateTo(NavigateUrl());

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

@@ -48,7 +48,7 @@ else
 						}
 					</td>
 					<td>@context.Requests</td>
-					<td>@context.RequestedOn</td>
+					<td>@UtcToLocal(context.RequestedOn)</td>
 				</Row>
 			</Pager>
 		</TabPanel>

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

@@ -9,6 +9,7 @@
 @inject INotificationService NotificationService
 @inject IFileService FileService
 @inject IFolderService FolderService
+@inject ITimeZoneService TimeZoneService
 @inject IJSRuntime jsRuntime
 @inject IServiceProvider ServiceProvider
 @inject IStringLocalizer<Index> Localizer
@@ -16,9 +17,9 @@
 
 @if (_initialized)
 {
-    @if (PageState.User != null && photo != null)
+    @if (PageState.User != null && _photo != null)
     {
-        <img src="@ImageUrl(photofileid, 400, 400)" alt="@displayname" style="max-width: 400px" class="rounded-circle mx-auto d-block">
+        <img src="@ImageUrl(_photofileid, 400, 400)" alt="@_displayname" style="max-width: 400px" class="rounded-circle mx-auto d-block">
     }
     else
     {
@@ -31,7 +32,7 @@
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="username" HelpText="Your username. Note that this field can not be modified." ResourceKey="Username"></Label>
                     <div class="col-sm-9">
-                        <input id="username" class="form-control" @bind="@username" readonly />
+                        <input id="username" class="form-control" @bind="@_username" readonly />
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
@@ -47,17 +48,17 @@
                     <Label Class="col-sm-3" For="confirm" HelpText="If you are changing your password you must enter it again to confirm it matches" ResourceKey="Confirm"></Label>
                     <div class="col-sm-9">
                         <div class="input-group">
-                            <input id="confirm" type="@_passwordtype" class="form-control" @bind="@confirm" autocomplete="new-password" />
+                            <input id="confirm" type="@_passwordtype" class="form-control" @bind="@_confirm" autocomplete="new-password" />
                             <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
                         </div>
                     </div>
                 </div>
-                @if (allowtwofactor)
+                @if (_allowtwofactor)
                 {
                     <div class="row mb-1 align-items-center">
                         <Label Class="col-sm-3" For="twofactor" HelpText="Indicates if you are using two factor authentication. Two factor authentication requires you to enter a verification code sent via email after you sign in." ResourceKey="TwoFactor"></Label>
                         <div class="col-sm-9">
-                            <select id="twofactor" class="form-select" @bind="@twofactor" required>
+                            <select id="twofactor" class="form-select" @bind="@_twofactor" required>
                                 <option value="True">@SharedLocalizer["Yes"]</option>
                                 <option value="False">@SharedLocalizer["No"]</option>
                             </select>
@@ -67,19 +68,31 @@
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="email" HelpText="Your email address where you wish to receive notifications" ResourceKey="Email"></Label>
                     <div class="col-sm-9">
-                        <input id="email" class="form-control" @bind="@email" />
+                        <input id="email" class="form-control" @bind="@_email" />
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="displayname" HelpText="Your full name" ResourceKey="DisplayName"></Label>
                     <div class="col-sm-9">
-                        <input id="displayname" class="form-control" @bind="@displayname" />
+                        <input id="displayname" class="form-control" @bind="@_displayname" />
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="@photofileid.ToString()" HelpText="A photo of yourself" ResourceKey="Photo"></Label>
+                    <Label Class="col-sm-3" For="timezone" HelpText="Your time zone" ResourceKey="TimeZone">Time Zone:</Label>
                     <div class="col-sm-9">
-                        <FileManager FileId="@photofileid" Filter="@PageState.Site.ImageFiles" ShowFolders="false" ShowFiles="true" UploadMultiple="false" FolderId="@folderid" @ref="filemanager" />
+                        <select id="timezone" class="form-select" @bind="@_timezoneid">
+                            <option value="">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
+                            @foreach (var timezone in _timezones)
+                            {
+                                <option value="@timezone.Id">@timezone.DisplayName</option>
+                            }
+                        </select>
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="@_photofileid.ToString()" HelpText="A photo of yourself" ResourceKey="Photo"></Label>
+                    <div class="col-sm-9">
+                        <FileManager FileId="@_photofileid" Filter="@PageState.Site.ImageFiles" ShowFolders="false" ShowFiles="true" UploadMultiple="false" FolderId="@_folderid" @ref="_filemanager" />
                     </div>
                 </div>
             </div>
@@ -91,17 +104,17 @@
         <TabPanel Name="Profile" ResourceKey="Profile">
             <div class="container">
                 <div class="row mb-1 align-items-center">
-                    @foreach (Profile profile in profiles)
+                    @foreach (Profile profile in _profiles)
                     {
                         var p = profile;
                         if (!p.IsPrivate || UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
                         {
-                            if (p.Category != category)
+                            if (p.Category != _category)
                             {
                                 <div class="col text-center pb-2">
                                     @p.Category
                                 </div>
-                                category = p.Category;
+                                _category = p.Category;
                             }
                             <div class="row mb-1 align-items-center">
                                 <Label Class="col-sm-3" For="@p.Name" HelpText="@p.Description">@p.Title</Label>
@@ -113,13 +126,16 @@
                                             <select id="@p.Name" class="form-select" @onchange="@(e => ProfileChanged(e, p.Name))" autocomplete="@p.Autocomplete">
                                                 @foreach (var option in p.Options.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
                                                 {
-                                                    @if (GetProfileValue(p.Name, "") == option || (GetProfileValue(p.Name, "") == "" && p.DefaultValue == option))
+                                                    var values = option.Split(':');
+                                                    var name = values[0];
+                                                    var value = values.Length > 1 ? values[1] : values[0];
+                                                    @if (GetProfileValue(p.Name, "") == name || (GetProfileValue(p.Name, "") == "" && p.DefaultValue == name))
                                                     {
-                                                        <option value="@option" selected>@option</option>
+                                                        <option value="@name" selected>@value</option>
                                                     }
                                                     else
                                                     {
-                                                        <option value="@option">@option</option>
+                                                        <option value="@name">@value</option>
                                                     }
                                                 }
                                             </select>
@@ -129,13 +145,16 @@
                                             <select id="@p.Name" class="form-select" @onchange="@(e => ProfileChanged(e, p.Name))">
                                                 @foreach (var option in p.Options.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
                                                 {
-                                                    @if (GetProfileValue(p.Name, "") == option || (GetProfileValue(p.Name, "") == "" && p.DefaultValue == option))
+                                                    var values = option.Split(':');
+                                                    var name = values[0];
+                                                    var value = values.Length > 1 ? values[1] : values[0];
+                                                    @if (GetProfileValue(p.Name, "") == name || (GetProfileValue(p.Name, "") == "" && p.DefaultValue == name))
                                                     {
-                                                        <option value="@option" selected>@option</option>
+                                                        <option value="@name" selected>@value</option>
                                                     }
                                                     else
                                                     {
-                                                        <option value="@option">@option</option>
+                                                        <option value="@name">@value</option>
                                                     }
                                                 }
                                             </select>
@@ -220,11 +239,11 @@
                 <option value="from">@Localizer["Items.Sent"]</option>
             </select>
             <br />
-            @if (filter == "to")
+            @if (_filter == "to")
             {
-                @if (notifications.Any())
+                @if (_notifications.Any())
                 {
-                    <Pager Items="@notifications">
+                    <Pager Items="@_notifications">
                         <Header>
                             <th style="width: 1px;">&nbsp;</th>
                             <th style="width: 1px;">&nbsp;</th>
@@ -260,15 +279,15 @@
                                         context.Body = context.Body.Replace("\n", "");
                                         context.Body = context.Body.Replace("\r", "");
                                     }
-                                    notificationSummary = context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body;
+                                    _notificationSummary = context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body;
                                 }
                                 @if (context.IsRead)
                                 {
-                                    @notificationSummary
+                                    @_notificationSummary
                                 }
                                 else
                                 {
-                                    <b>@notificationSummary</b>
+                                    <b>@_notificationSummary</b>
                                 }
                             </td>
                         </Detail>
@@ -285,9 +304,9 @@
             }
             else
             {
-                @if (notifications.Any())
+                @if (_notifications.Any())
                 {
-                    <Pager Items="@notifications">
+                    <Pager Items="@_notifications">
                         <Header>
                             <th style="width: 1px;"></th>
                             <th style="width: 1px;"></th>
@@ -324,15 +343,15 @@
                                         context.Body = context.Body.Replace("\n", "");
                                         context.Body = context.Body.Replace("\r", "");
                                     }
-                                    notificationSummary = context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body;
+                                    _notificationSummary = context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body;
                                 }
                                 @if (context.IsRead)
                                 {
-                                    @notificationSummary
+                                    @_notificationSummary
                                 }
                                 else
                                 {
-                                    <b>@notificationSummary</b>
+                                    <b>@_notificationSummary</b>
                                 }
                             </td>
                         </Detail>
@@ -356,27 +375,30 @@
 @code {
     private bool _initialized = false;
     private string _passwordrequirements;
-    private string username = string.Empty;
+    private string _username = string.Empty;
     private string _password = string.Empty;
     private string _passwordtype = "password";
     private string _togglepassword = string.Empty;
-    private string confirm = string.Empty;
+    private string _confirm = string.Empty;
-    private bool allowtwofactor = false;
+    private bool _allowtwofactor = false;
-    private string twofactor = "False";
+    private string _twofactor = "False";
-    private string email = string.Empty;
+    private string _email = string.Empty;
-    private string displayname = string.Empty;
+    private string _displayname = string.Empty;
-    private FileManager filemanager;
+    private FileManager _filemanager;
-    private int folderid = -1;
+    private int _folderid = -1;
-    private int photofileid = -1;
+    private List<Models.TimeZone> _timezones;
-    private File photo = null;
+    private string _timezoneid = string.Empty;
-    private string _ImageFiles = string.Empty;
+    private int _photofileid = -1;
-    private List<Profile> profiles;
+    private File _photo = null;
-    private Dictionary<string, string> userSettings;
+    private string _imagefiles = string.Empty;
-    private string category = string.Empty;
 
-    private string filter = "to";
+    private List<Profile> _profiles;
-    private List<Notification> notifications;
+    private Dictionary<string, string> _userSettings;
-    private string notificationSummary = string.Empty;
+    private string _category = string.Empty;
+
+    private string _filter = "to";
+    private List<Notification> _notifications;
+    private string _notificationSummary = string.Empty;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
 
@@ -386,43 +408,49 @@
         {
             _passwordrequirements = await UserService.GetPasswordRequirementsAsync(PageState.Site.SiteId);
             _togglepassword = SharedLocalizer["ShowPassword"];
-            allowtwofactor = (SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:TwoFactor", "false") == "true");
+            _allowtwofactor = (SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:TwoFactor", "false") == "true");
-            profiles = await ProfileService.GetProfilesAsync(ModuleState.SiteId);
+            _profiles = await ProfileService.GetProfilesAsync(ModuleState.SiteId);
+            foreach (var profile in _profiles)
+            {
+                if (profile.Options.ToLower().StartsWith("entityname:"))
+                {
+                    var options = await SettingService.GetSettingsAsync(profile.Options.Substring(11), -1);
+                    options.Add("", $"<{SharedLocalizer["Not Specified"]}>");
+                    profile.Options = string.Join(",", options.OrderBy(item => item.Value).Select(kvp => $"{kvp.Key}:{kvp.Value}"));
+                }
+            }
+            _timezones = TimeZoneService.GetTimeZones();
 
             if (PageState.User != null)
             {
-                username = PageState.User.Username;
+                _username = PageState.User.Username;
-                twofactor = PageState.User.TwoFactorRequired.ToString();
+                _twofactor = PageState.User.TwoFactorRequired.ToString();
-                email = PageState.User.Email;
+                _email = PageState.User.Email;
-                displayname = PageState.User.DisplayName;
+                _displayname = PageState.User.DisplayName;
-
+                _timezoneid = PageState.User.TimeZoneId;
-                if (string.IsNullOrEmpty(email))
-                {
-                    AddModuleMessage(Localizer["Message.User.NoEmail"], MessageType.Warning);
-                }
 
                 // get user folder
                 var folder = await FolderService.GetFolderAsync(ModuleState.SiteId, PageState.User.FolderPath);
                 if (folder != null)
                 {
-                    folderid = folder.FolderId;
+                    _folderid = folder.FolderId;
                 }
 
                 if (PageState.User.PhotoFileId != null)
                 {
-                    photofileid = PageState.User.PhotoFileId.Value;
+                    _photofileid = PageState.User.PhotoFileId.Value;
-                    photo = await FileService.GetFileAsync(photofileid);
+                    _photo = await FileService.GetFileAsync(_photofileid);
                 }
                 else
                 {
-                    photofileid = -1;
+                    _photofileid = -1;
-                    photo = null;
+                    _photo = null;
                 }
 
-                userSettings = PageState.User.Settings;
+                _userSettings = PageState.User.Settings;
                 var sitesettings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
-                _ImageFiles = SettingService.GetSetting(userSettings, "ImageFiles", Constants.ImageFiles);
+                _imagefiles = SettingService.GetSetting(_userSettings, "ImageFiles", Constants.ImageFiles);
-                _ImageFiles = (string.IsNullOrEmpty(_ImageFiles)) ? Constants.ImageFiles : _ImageFiles;
+                _imagefiles = (string.IsNullOrEmpty(_imagefiles)) ? Constants.ImageFiles : _imagefiles;
 
                 await LoadNotificationsAsync();
 
@@ -442,13 +470,13 @@
 
     private async Task LoadNotificationsAsync()
     {
-        notifications = await NotificationService.GetNotificationsAsync(PageState.Site.SiteId, filter, PageState.User.UserId);
+        _notifications = await NotificationService.GetNotificationsAsync(PageState.Site.SiteId, _filter, PageState.User.UserId);
-        notifications = notifications.Where(item => item.DeletedBy != PageState.User.Username).ToList();
+        _notifications = _notifications.Where(item => item.DeletedBy != PageState.User.Username).ToList();
     }
 
     private string GetProfileValue(string SettingName, string DefaultValue)
     {
-        string value = SettingService.GetSetting(userSettings, SettingName, DefaultValue);
+        string value = SettingService.GetSetting(_userSettings, SettingName, DefaultValue);
         if (value.Contains("]"))
         {
             value = value.Substring(value.IndexOf("]") + 1);
@@ -460,38 +488,39 @@
     {
         try
         {
-            if (username != string.Empty && email != string.Empty)
+            if (_username != string.Empty && _email != string.Empty)
             {
-                if (_password == confirm)
+                if (_password == _confirm)
                 {
                     if (ValidateProfiles())
                     {
                         var user = PageState.User;
-                        user.Username = username;
+                        user.Username = _username;
                         user.Password = _password;
-                        user.TwoFactorRequired = bool.Parse(twofactor);
+                        user.TwoFactorRequired = bool.Parse(_twofactor);
-                        user.Email = email;
+                        user.Email = _email;
-                        user.DisplayName = (displayname == string.Empty ? username : displayname);
+                        user.DisplayName = (_displayname == string.Empty ? _username : _displayname);
-                        user.PhotoFileId = filemanager.GetFileId();
+                        user.TimeZoneId = _timezoneid;
+                        user.PhotoFileId = _filemanager.GetFileId();
                         if (user.PhotoFileId == -1)
                         {
                             user.PhotoFileId = null;
                         }
                         if (user.PhotoFileId != null)
                         {
-                            photofileid = user.PhotoFileId.Value;
+                            _photofileid = user.PhotoFileId.Value;
-                            photo = await FileService.GetFileAsync(photofileid);
+                            _photo = await FileService.GetFileAsync(_photofileid);
                         }
                         else
                         {
-                            photofileid = -1;
+                            _photofileid = -1;
-                            photo = null;
+                            _photo = null;
                         }
 
                         user = await UserService.UpdateUserAsync(user);
                         if (user != null)
                         {
-                            await SettingService.UpdateUserSettingsAsync(userSettings, PageState.User.UserId);
+                            await SettingService.UpdateUserSettingsAsync(_userSettings, PageState.User.UserId);
                             await logger.LogInformation("User Profile Saved");
 
                             if (!string.IsNullOrEmpty(PageState.ReturnUrl))
@@ -557,12 +586,12 @@
 
     private bool ValidateProfiles()
     {
-        foreach (Profile profile in profiles)
+        foreach (Profile profile in _profiles)
         {
             var value = GetProfileValue(profile.Name, string.Empty);
             if (string.IsNullOrEmpty(value) && !string.IsNullOrEmpty(profile.DefaultValue))
             {
-                userSettings = SettingService.SetSetting(userSettings, profile.Name, profile.DefaultValue);
+                _userSettings = SettingService.SetSetting(_userSettings, profile.Name, profile.DefaultValue);
             }
             if (!profile.IsPrivate || UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
             {
@@ -594,7 +623,7 @@
     private void ProfileChanged(ChangeEventArgs e, string SettingName)
     {
         var value = (string)e.Value;
-        userSettings = SettingService.SetSetting(userSettings, SettingName, value);
+        _userSettings = SettingService.SetSetting(_userSettings, SettingName, value);
     }
 
     private async Task Delete(Notification Notification)
@@ -624,7 +653,7 @@
 
     private async void FilterChanged(ChangeEventArgs e)
     {
-        filter = (string)e.Value;
+        _filter = (string)e.Value;
         await LoadNotificationsAsync();
         StateHasChanged();
     }
@@ -634,7 +663,7 @@
         try
         {
             ShowProgressIndicator();
-            foreach(var Notification in notifications)
+            foreach(var Notification in _notifications)
             {
                 if (!Notification.IsDeleted)
                 {

Oqtane.Client/Modules/Admin/Users/Add.razor

@@ -5,6 +5,7 @@
 @inject IUserService UserService
 @inject IProfileService ProfileService
 @inject ISettingService SettingService
+@inject ITimeZoneService TimeZoneService
 @inject IStringLocalizer<Add> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
@@ -12,7 +13,7 @@
 {
     <TabStrip>
         <TabPanel Name="Identity" ResourceKey="Identity">
-            @if (profiles != null)
+            @if (_profiles != null)
             {
                 <div class="container">
                     <div class="row mb-1 align-items-center">
@@ -27,12 +28,33 @@
                             <input id="email" class="form-control" @bind="@_email" />
                         </div>
                     </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="confirmed" HelpText="Indicates if the user's email is verified" ResourceKey="Confirmed">Verified?</Label>
+                        <div class="col-sm-9">
+                            <select id="confirmed" class="form-select" @bind="@_confirmed">
+                                <option value="True">@SharedLocalizer["Yes"]</option>
+                                <option value="False">@SharedLocalizer["No"]</option>
+                            </select>
+                        </div>
+                    </div>
                     <div class="row mb-1 align-items-center">
                         <Label Class="col-sm-3" For="displayname" HelpText="The full name of the user" ResourceKey="DisplayName"></Label>
                         <div class="col-sm-9">
                             <input id="displayname" class="form-control" @bind="@_displayname" />
                         </div>
                     </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="timezone" HelpText="Your time zone" ResourceKey="TimeZone">Time Zone:</Label>
+                        <div class="col-sm-9">
+                            <select id="timezone" class="form-select" @bind="@_timezoneid">
+                                <option value="">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
+                                @foreach (var timezone in _timezones)
+                                {
+                                    <option value="@timezone.Id">@timezone.DisplayName</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
                     <div class="row mb-1 align-items-center">
                         <Label Class="col-sm-3" For="notify" HelpText="Indicate if new users should receive an email notification" ResourceKey="Notify">Notify? </Label>
                         <div class="col-sm-9">
@@ -48,15 +70,15 @@
         <TabPanel Name="Profile" ResourceKey="Profile">
             <div class="container">
                 <div class="row mb-1 align-items-center">
-                    @foreach (Profile profile in profiles)
+                    @foreach (Profile profile in _profiles)
                     {
                         var p = profile;
-                        if (p.Category != category)
+                        if (p.Category != _category)
                         {
                             <div class="col text-center pb-2">
                                 <strong>@p.Category</strong>
                             </div>
-                            category = p.Category;
+                            _category = p.Category;
                         }
                         <div class="row mb-1 align-items-center">
                             <Label Class="col-sm-3" For="@p.Name" HelpText="@p.Description">@p.Title</Label>
@@ -66,13 +88,16 @@
                                     <select id="@p.Name" class="form-select" @onchange="@(e => ProfileChanged(e, p.Name))">
                                         @foreach (var option in p.Options.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
                                         {
-                                            @if (GetProfileValue(p.Name, "") == option || (GetProfileValue(p.Name, "") == "" && p.DefaultValue == option))
+                                            var values = option.Split(':');
+                                            var name = values[0];
+                                            var value = values.Length > 1 ? values[1] : values[0];
+                                            @if (GetProfileValue(p.Name, "") == name || (GetProfileValue(p.Name, "") == "" && p.DefaultValue == name))
                                             {
-                                                <option value="@option" selected>@option</option>
+                                                <option value="@name" selected>@value</option>
                                             }
                                             else
                                             {
-                                                <option value="@option">@option</option>
+                                                <option value="@name">@value</option>
                                             }
                                         }
                                     </select>
@@ -103,14 +128,17 @@
 
 
 @code {
+    private List<Models.TimeZone> _timezones;
     private bool _initialized = false;
     private string _username = string.Empty;
     private string _email = string.Empty;
+    private string _confirmed = "True";
     private string _displayname = string.Empty;
+    private string _timezoneid = string.Empty;
     private string _notify = "True";
-    private List<Profile> profiles;
+    private List<Profile> _profiles;
-    private Dictionary<string, string> settings;
+    private Dictionary<string, string> _settings;
-    private string category = string.Empty;
+    private string _category = string.Empty;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
 
@@ -118,8 +146,19 @@
     {
         try
         {
-            profiles = await ProfileService.GetProfilesAsync(ModuleState.SiteId);
+            _timezones = TimeZoneService.GetTimeZones();
-            settings = new Dictionary<string, string>();
+            _profiles = await ProfileService.GetProfilesAsync(ModuleState.SiteId);
+            foreach (var profile in _profiles)
+            {
+                if (profile.Options.ToLower().StartsWith("entityname:"))
+                {
+                    var options = await SettingService.GetSettingsAsync(profile.Options.Substring(11), -1);
+                    options.Add("", $"<{SharedLocalizer["Not Specified"]}>");
+                    profile.Options = string.Join(",", options.OrderBy(item => item.Value).Select(kvp => $"{kvp.Key}:{kvp.Value}"));
+                }
+            }
+            _settings = new Dictionary<string, string>();
+            _timezoneid = PageState.Site.TimeZoneId;
             _initialized = true;
         }
         catch (Exception ex)
@@ -131,7 +170,7 @@
 
     private string GetProfileValue(string SettingName, string DefaultValue)
     {
-        string value = SettingService.GetSetting(settings, SettingName, DefaultValue);
+        string value = SettingService.GetSetting(_settings, SettingName, DefaultValue);
         if (value.Contains("]"))
         {
             value = value.Substring(value.IndexOf("]") + 1);
@@ -152,7 +191,9 @@
                     user.Username = _username;
                     user.Password = ""; // will be auto generated
                     user.Email = _email;
+                    user.EmailConfirmed = bool.Parse(_confirmed);
                     user.DisplayName = string.IsNullOrWhiteSpace(_displayname) ? _username : _displayname;
+                    user.TimeZoneId = _timezoneid;
                     user.PhotoFileId = null;
                     user.SuppressNotification = !bool.Parse(_notify);
 
@@ -160,7 +201,7 @@
 
                     if (user != null)
                     {
-                        await SettingService.UpdateUserSettingsAsync(settings, user.UserId);
+                        await SettingService.UpdateUserSettingsAsync(_settings, user.UserId);
                         await logger.LogInformation("User Created {User}", user);
                         NavigationManager.NavigateTo(NavigateUrl());
                     }
@@ -185,12 +226,12 @@
 
     private bool ValidateProfiles()
     {
-        foreach (Profile profile in profiles)
+        foreach (Profile profile in _profiles)
         {
             var value = GetProfileValue(profile.Name, string.Empty);
             if (string.IsNullOrEmpty(value) && !string.IsNullOrEmpty(profile.DefaultValue))
             {
-                settings = SettingService.SetSetting(settings, profile.Name, profile.DefaultValue);
+                _settings = SettingService.SetSetting(_settings, profile.Name, profile.DefaultValue);
             }
             if (!profile.IsPrivate || UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
             {
@@ -217,6 +258,6 @@
     private void ProfileChanged(ChangeEventArgs e, string SettingName)
     {
         var value = (string)e.Value;
-        settings = SettingService.SetSetting(settings, SettingName, value);
+        _settings = SettingService.SetSetting(_settings, SettingName, value);
     }
 }

Oqtane.Client/Modules/Admin/Users/Edit.razor

@@ -6,6 +6,7 @@
 @inject IProfileService ProfileService
 @inject ISettingService SettingService
 @inject IFileService FileService
+@inject ITimeZoneService TimeZoneService
 @inject IServiceProvider ServiceProvider
 @inject IStringLocalizer<Edit> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
@@ -17,13 +18,13 @@
             <ModuleMessage Message="@_passwordrequirements" Type="MessageType.Info" />
             <div class="container">
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="username" HelpText="The unique username for a user. Note that this field can not be modified." ResourceKey="Username"></Label>
+                    <Label Class="col-sm-3" For="username" HelpText="The unique username for a user. Note that this field can not be modified." ResourceKey="Username">Username:</Label>
                     <div class="col-sm-9">
-                        <input id="username" class="form-control" @bind="@username" readonly />
+                        <input id="username" class="form-control" @bind="@_username" readonly />
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="password" HelpText="The user's password. Please choose a password which is sufficiently secure." ResourceKey="Password"></Label>
+                    <Label Class="col-sm-3" For="password" HelpText="The user's password. Please choose a password which is sufficiently secure." ResourceKey="Password">Password:</Label>
                     <div class="col-sm-9">
                         <div class="input-group">
                             <input id="password" type="@_passwordtype" class="form-control" @bind="@_password" autocomplete="new-password" />
@@ -32,32 +33,53 @@
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="confirm" HelpText="Please enter the password again to confirm it matches with the value above" ResourceKey="Confirm"></Label>
+                    <Label Class="col-sm-3" For="confirm" HelpText="Please enter the password again to confirm it matches with the value above" ResourceKey="Confirm">Confirm Password:</Label>
                     <div class="col-sm-9">
                         <div class="input-group">
-                            <input id="confirm" type="@_passwordtype" class="form-control" @bind="@confirm" autocomplete="new-password" />
+                            <input id="confirm" type="@_passwordtype" class="form-control" @bind="@_confirm" autocomplete="new-password" />
                             <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
                         </div>
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="email" HelpText="The email address where the user will receive notifications" ResourceKey="Email"></Label>
+                    <Label Class="col-sm-3" For="email" HelpText="The email address where the user will receive notifications" ResourceKey="Email">Email:</Label>
                     <div class="col-sm-9">
-                        <input id="email" class="form-control" @bind="@email" />
+                        <input id="email" class="form-control" @bind="@_email" />
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="displayname" HelpText="The full name of the user" ResourceKey="DisplayName"></Label>
+                    <Label Class="col-sm-3" For="confirmed" HelpText="Indicates if the user's email is verified" ResourceKey="Confirmed">Verified?</Label>
                     <div class="col-sm-9">
-                        <input id="displayname" class="form-control" @bind="@displayname" />
+                        <select id="confirmed" class="form-select" @bind="@_confirmed">
+                            <option value="True">@SharedLocalizer["Yes"]</option>
+                            <option value="False">@SharedLocalizer["No"]</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="displayname" HelpText="The full name of the user" ResourceKey="DisplayName">Full Name:</Label>
+                    <div class="col-sm-9">
+                        <input id="displayname" class="form-control" @bind="@_displayname" />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="timezone" HelpText="Your time zone" ResourceKey="TimeZone">Time Zone:</Label>
+                    <div class="col-sm-9">
+                        <select id="timezone" class="form-select" @bind="@_timezoneid">
+                            <option value="">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
+                            @foreach (var timezone in _timezones)
+                            {
+                                <option value="@timezone.Id">@timezone.DisplayName</option>
+                            }
+                        </select>
                     </div>
                 </div>
                 @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
                 {
                     <div class="row mb-1 align-items-center">
-                        <Label Class="col-sm-3" For="isdeleted" HelpText="Indicate if the user is active" ResourceKey="IsDeleted"></Label>
+                        <Label Class="col-sm-3" For="isdeleted" HelpText="Indicate if the user is active" ResourceKey="IsDeleted">Deleted?</Label>
                         <div class="col-sm-9">
-                            <select id="isdeleted" class="form-select" @bind="@isdeleted">
+                            <select id="isdeleted" class="form-select" @bind="@_isdeleted">
                                 <option value="True">@SharedLocalizer["Yes"]</option>
                                 <option value="False">@SharedLocalizer["No"]</option>
                             </select>
@@ -65,15 +87,15 @@
                     </div>
                 }
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="lastlogin" HelpText="The date and time when the user last signed in" ResourceKey="LastLogin"></Label>
+                    <Label Class="col-sm-3" For="lastlogin" HelpText="The date and time when the user last signed in" ResourceKey="LastLogin">Last Login:</Label>
                     <div class="col-sm-9">
-                        <input id="lastlogin" class="form-control" @bind="@lastlogin" readonly />
+                        <input id="lastlogin" class="form-control" @bind="@_lastlogin" readonly />
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="lastipaddress" HelpText="The IP Address of the user recorded during their last login" ResourceKey="LastIPAddress"></Label>
+                    <Label Class="col-sm-3" For="lastipaddress" HelpText="The IP Address of the user recorded during their last login" ResourceKey="LastIPAddress">Last IP Address:</Label>
                     <div class="col-sm-9">
-                        <input id="lastipaddress" class="form-control" @bind="@lastipaddress" readonly />
+                        <input id="lastipaddress" class="form-control" @bind="@_lastipaddress" readonly />
                     </div>
                 </div>
             </div>
@@ -81,15 +103,15 @@
         <TabPanel Name="Profile" ResourceKey="Profile">
             <div class="container">
                 <div class="row mb-1 align-items-center">
-                    @foreach (Profile profile in profiles)
+                    @foreach (Profile profile in _profiles)
                     {
                         var p = profile;
-                        if (p.Category != category)
+                        if (p.Category != _category)
                         {
                             <div class="col text-center pb-2">
                                 <strong>@p.Category</strong>
                             </div>
-                            category = p.Category;
+                            _category = p.Category;
                         }
                         <div class="row mb-1 align-items-center">
                             <Label Class="col-sm-3" For="@p.Name" HelpText="@p.Description">@p.Title</Label>
@@ -99,13 +121,16 @@
                                     <select id="@p.Name" class="form-select" @onchange="@(e => ProfileChanged(e, p.Name))">
                                         @foreach (var option in p.Options.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
                                         {
-                                            @if (GetProfileValue(p.Name, "") == option || (GetProfileValue(p.Name, "") == "" && p.DefaultValue == option))
+                                            var values = option.Split(':');
+                                            var name = values[0];
+                                            var value = values.Length > 1 ? values[1] : values[0];
+                                            @if (GetProfileValue(p.Name, "") == name || (GetProfileValue(p.Name, "") == "" && p.DefaultValue == name))
                                             {
-                                                <option value="@option" selected>@option</option>
+                                                <option value="@name" selected>@value</option>
                                             }
                                             else
                                             {
-                                                <option value="@option">@option</option>
+                                                <option value="@name">@value</option>
                                             }
                                         }
                                     </select>
@@ -128,47 +153,50 @@
             </div>
         </TabPanel>
     </TabStrip>
-
+    <br />
     <button type="button" class="btn btn-success" @onclick="SaveUser">@SharedLocalizer["Save"]</button>
     <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
-    @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin) && PageState.Runtime != Shared.Runtime.Hybrid && !ishost)
+    @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin) && PageState.Runtime != Shared.Runtime.Hybrid && !_ishost && _isdeleted != "True")
     {
         <button type="button" class="btn btn-primary ms-1" @onclick="ImpersonateUser">@Localizer["Impersonate"]</button>
     }
-    @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host) && isdeleted == "True")
+    @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host) && _isdeleted == "True")
     {
-        <ActionDialog Header="Delete User" Message="Are You Sure You Wish To Permanently Delete This User?" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteUser())" ResourceKey="DeleteUser" />
+        <ActionDialog Header="Delete User" Message="Are You Sure You Wish To Permanently Delete This User?" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger ms-1" OnClick="@(async () => await DeleteUser())" ResourceKey="DeleteUser" />
     }
     <br /><br />
-    <AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon" DeletedBy="@deletedby" DeletedOn="@deletedon"></AuditInfo>
+    <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon" DeletedBy="@_deletedby" DeletedOn="@_deletedon"></AuditInfo>
 }
 
 @code {
+    private List<Models.TimeZone> _timezones;
     private bool _initialized = false;
     private string _passwordrequirements;
-    private int userid;
+    private int _userid;
-    private string username = string.Empty;
+    private string _username = string.Empty;
     private string _password = string.Empty;
     private string _passwordtype = "password";
     private string _togglepassword = string.Empty;
-    private string confirm = string.Empty;
+    private string _confirm = string.Empty;
-    private string email = string.Empty;
+    private string _email = string.Empty;
-    private string displayname = string.Empty;
+    private string _confirmed = string.Empty;
-    private string isdeleted;
+    private string _displayname = string.Empty;
-    private string lastlogin;
+    private string _timezoneid = string.Empty;
-    private string lastipaddress;
+    private string _isdeleted;
-    private bool ishost = false;
+    private string _lastlogin;
+    private string _lastipaddress;
+    private bool _ishost = false;
 
-    private List<Profile> profiles;
+    private List<Profile> _profiles;
-    private Dictionary<string, string> userSettings;
+    private Dictionary<string, string> _settings;
-    private string category = string.Empty;
+    private string _category = string.Empty;
 
-    private string createdby;
+    private string _createdby;
-    private DateTime createdon;
+    private DateTime _createdon;
-    private string modifiedby;
+    private string _modifiedby;
-    private DateTime modifiedon;
+    private DateTime _modifiedon;
-    private string deletedby;
+    private string _deletedby;
-    private DateTime? deletedon;
+    private DateTime? _deletedon;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
 
@@ -178,29 +206,41 @@
         {
             _passwordrequirements = await UserService.GetPasswordRequirementsAsync(PageState.Site.SiteId);
             _togglepassword = SharedLocalizer["ShowPassword"];
-            profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId);
+            _profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId);
+            foreach (var profile in _profiles)
+            {
+                if (profile.Options.ToLower().StartsWith("entityname:"))
+                {
+                    var options = await SettingService.GetSettingsAsync(profile.Options.Substring(11), -1);
+                    options.Add("", $"<{SharedLocalizer["Not Specified"]}>");
+                    profile.Options = string.Join(",", options.OrderBy(item => item.Value).Select(kvp => $"{kvp.Key}:{kvp.Value}"));
+                }
+            }
+            _timezones = TimeZoneService.GetTimeZones();
 
             if (PageState.QueryString.ContainsKey("id") && int.TryParse(PageState.QueryString["id"], out int UserId))
             {
-                userid = UserId;
+                _userid = UserId;
-                var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
+                var user = await UserService.GetUserAsync(_userid, PageState.Site.SiteId);
                 if (user != null)
                 {
-                    username = user.Username;
+                    _username = user.Username;
-                    email = user.Email;
+                    _email = user.Email;
-                    displayname = user.DisplayName;
+                    _confirmed = user.EmailConfirmed.ToString();
-                    isdeleted = user.IsDeleted.ToString();
+                    _displayname = user.DisplayName;
-                    lastlogin = string.Format("{0:MMM dd yyyy HH:mm:ss}", user.LastLoginOn);
+                    _timezoneid = PageState.User.TimeZoneId;
-                    lastipaddress = user.LastIPAddress;
+                    _isdeleted = user.IsDeleted.ToString();
-                    ishost = UserSecurity.ContainsRole(user.Roles, RoleNames.Host);
+                    _lastlogin = string.Format("{0:MMM dd yyyy HH:mm:ss}", UtcToLocal(user.LastLoginOn));
+                    _lastipaddress = user.LastIPAddress;
+                    _ishost = UserSecurity.ContainsRole(user.Roles, RoleNames.Host);
 
-                    userSettings = user.Settings;
+                    _settings = user.Settings;
-                    createdby = user.CreatedBy;
+                    _createdby = user.CreatedBy;
-                    createdon = user.CreatedOn;
+                    _createdon = user.CreatedOn;
-                    modifiedby = user.ModifiedBy;
+                    _modifiedby = user.ModifiedBy;
-                    modifiedon = user.ModifiedOn;
+                    _modifiedon = user.ModifiedOn;
-                    deletedby = user.DeletedBy;
+                    _deletedby = user.DeletedBy;
-                    deletedon = user.DeletedOn;
+                    _deletedon = user.DeletedOn;
                 }
             }
 
@@ -208,14 +248,14 @@
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Loading User {UserId} {Error}", userid, ex.Message);
+            await logger.LogError(ex, "Error Loading User {UserId} {Error}", _userid, ex.Message);
             AddModuleMessage(Localizer["Error.User.Load"], MessageType.Error);
         }
     }
 
     private string GetProfileValue(string SettingName, string DefaultValue)
     {
-        string value = SettingService.GetSetting(userSettings, SettingName, DefaultValue);
+        string value = SettingService.GetSetting(_settings, SettingName, DefaultValue);
         if (value.Contains("]"))
         {
             value = value.Substring(value.IndexOf("]") + 1);
@@ -227,27 +267,29 @@
     {
         try
         {
-            if (username != string.Empty && email != string.Empty)
+            if (_username != string.Empty && _email != string.Empty)
             {
-                if (_password == confirm)
+                if (_password == _confirm)
                 {
                     if (ValidateProfiles())
                     {
-                        var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
+                        var user = await UserService.GetUserAsync(_userid, PageState.Site.SiteId);
                         user.SiteId = PageState.Site.SiteId;
-                        user.Username = username;
+                        user.Username = _username;
                         user.Password = _password;
-                        user.Email = email;
+                        user.Email = _email;
-                        user.DisplayName = string.IsNullOrWhiteSpace(displayname) ? username : displayname;
+                        user.EmailConfirmed = bool.Parse(_confirmed);
+                        user.DisplayName = string.IsNullOrWhiteSpace(_displayname) ? _username : _displayname;
+                        user.TimeZoneId = _timezoneid;
                         if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
                         {
-                            user.IsDeleted = (isdeleted == null ? true : Boolean.Parse(isdeleted));
+                            user.IsDeleted = (_isdeleted == null ? true : Boolean.Parse(_isdeleted));
                         }
 
                         user = await UserService.UpdateUserAsync(user);
                         if (user != null)
                         {
-                            await SettingService.UpdateUserSettingsAsync(userSettings, user.UserId);
+                            await SettingService.UpdateUserSettingsAsync(_settings, user.UserId);
                             await logger.LogInformation("User Saved {User}", user);
                             NavigationManager.NavigateTo(NavigateUrl());
                         }
@@ -269,7 +311,7 @@
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Saving User {Username} {Email} {Error}", username, email, ex.Message);
+            await logger.LogError(ex, "Error Saving User {Username} {Email} {Error}", _username, _email, ex.Message);
             AddModuleMessage(Localizer["Error.User.Save"], MessageType.Error);
         }
     }
@@ -278,17 +320,17 @@
     {
         try
         {
-            await logger.LogInformation(LogFunction.Security, "User {Username} Impersonated By Administrator {Administrator}", username, PageState.User.Username);
+            await logger.LogInformation(LogFunction.Security, "User {Username} Impersonated By Administrator {Administrator}", _username, PageState.User.Username);
 
             // post back to the server so that the cookies are set correctly
             var interop = new Interop(JSRuntime);
-            var fields = new { __RequestVerificationToken = SiteState.AntiForgeryToken, username = username, returnurl = PageState.Alias.Path };
+            var fields = new { __RequestVerificationToken = SiteState.AntiForgeryToken, username = _username, returnurl = PageState.Alias.Path };
             string url = Utilities.TenantUrl(PageState.Alias, "/pages/impersonate/");
             await interop.SubmitForm(url, fields);
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Impersonating User {Username} {Error}", username, ex.Message);
+            await logger.LogError(ex, "Error Impersonating User {Username} {Error}", _username, ex.Message);
             AddModuleMessage(Localizer["Error.User.Impersonate"], MessageType.Error);
         }
     }
@@ -297,9 +339,9 @@
     {
         try
         {
-            if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host) && userid != PageState.User.UserId)
+            if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host) && _userid != PageState.User.UserId)
             {
-                var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
+                var user = await UserService.GetUserAsync(_userid, PageState.Site.SiteId);
                 await UserService.DeleteUserAsync(user.UserId, PageState.Site.SiteId);
                 await logger.LogInformation("User Permanently Deleted {User}", user);
                 NavigationManager.NavigateTo(NavigateUrl());
@@ -307,19 +349,19 @@
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Permanently Deleting User {UserId} {Error}", userid, ex.Message);
+            await logger.LogError(ex, "Error Permanently Deleting User {UserId} {Error}", _userid, ex.Message);
             AddModuleMessage(Localizer["Error.DeleteUser"], MessageType.Error);
         }
     }
 
     private bool ValidateProfiles()
     {
-        foreach (Profile profile in profiles)
+        foreach (Profile profile in _profiles)
         {
             var value = GetProfileValue(profile.Name, string.Empty);
             if (string.IsNullOrEmpty(value) && !string.IsNullOrEmpty(profile.DefaultValue))
             {
-                userSettings = SettingService.SetSetting(userSettings, profile.Name, profile.DefaultValue);
+                _settings = SettingService.SetSetting(_settings, profile.Name, profile.DefaultValue);
             }
             if (!profile.IsPrivate || UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
             {
@@ -346,7 +388,7 @@
     private void ProfileChanged(ChangeEventArgs e, string SettingName)
     {
         var value = (string)e.Value;
-        userSettings = SettingService.SetSetting(userSettings, SettingName, value);
+        _settings = SettingService.SetSetting(_settings, SettingName, value);
     }
 
     private void TogglePassword()

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

@@ -17,8 +17,21 @@ else
 {
     <TabStrip>
         <TabPanel Name="Users" Heading="Users" ResourceKey="Users">
+            <div class="container">
+                <div class="row mb-1 align-items-center">
+                    <div class="col-sm-6">
                         <ActionLink Action="Add" Text="Add User" Security="SecurityAccessLevel.Edit" ResourceKey="AddUser" />&nbsp;
                         <ActionLink Text="Import Users" Class="btn btn-secondary ms-2" Action="Users" Security="SecurityAccessLevel.Admin" ResourceKey="ImportUsers" />
+                    </div>
+                    <div class="col-sm-6">
+                        <select id="deleted" class="form-select custom-select" value="@_deleted" @onchange="(e => DeletedChanged(e))">
+                            <option value="false">@Localizer["Active Users"]</option>
+                            <option value="true">@Localizer["Deleted Users"]</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+            <br />
 
             <Pager Items="@users" RowClass="align-middle" SearchProperties="User.Username,User.Email,User.DisplayName">
                 <Header>
@@ -43,7 +56,7 @@ else
                     <td>@context.User.Username</td>
                     <td>@context.User.DisplayName</td>
                     <td>@((MarkupString)string.Format("<a href=\"mailto:{0}\">{1}</a>", @context.User.Email, @context.User.Email))</td>
-                    <td>@((context.User.LastLoginOn != DateTime.MinValue) ? string.Format("{0:dd-MMM-yyyy HH:mm:ss}", context.User.LastLoginOn) : "")</td>
+                    <td>@((context.User.LastLoginOn != DateTime.MinValue) ? string.Format("{0:dd-MMM-yyyy HH:mm:ss}", UtcToLocal(context.User.LastLoginOn)) : "")</td>
                 </Row>
             </Pager>
         </TabPanel>
@@ -59,31 +72,34 @@ else
                             </select>
                         </div>
                     </div>
-                    @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+                    @if (_allowregistration == "true")
-                    {
-                        @if (_providertype != "")
                     {
                         <div class="row mb-1 align-items-center">
-                                <Label Class="col-sm-3" For="allowsitelogin" HelpText="Do you want to allow users to sign in using a username and password that is managed locally on this site? Note that you should only disable this option if you have already sucessfully configured an external login provider, or else you may lock yourself out of the site." ResourceKey="AllowSiteLogin">Allow Login?</Label>
+                            <Label Class="col-sm-3" For="registerurl" HelpText="Optionally provide a custom registration url" ResourceKey="RegisterUrl">Register Url:</Label>
                             <div class="col-sm-9">
-                                    <select id="allowsitelogin" class="form-select" @bind="@_allowsitelogin">
+                                <input id="registerurl" class="form-control" @bind="@_registerurl" />
+                            </div>
+                        </div>
+                    }
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="profileurl" HelpText="Optionally provide a custom profile url" ResourceKey="ProfileUrl">Profile Url:</Label>
+                        <div class="col-sm-9">
+                            <input id="profileurl" class="form-control" @bind="@_profileurl" />
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="requireconfirmedemail" HelpText="Do you want to require registered users to verify their email address before they are allowed to log in?" ResourceKey="RequireConfirmedEmail">Require Verified Email?</Label>
+                        <div class="col-sm-9">
+                            <select id="requireconfirmedemail" class="form-select" @bind="@_requireconfirmedemail">
                                 <option value="true">@SharedLocalizer["Yes"]</option>
                                 <option value="false">@SharedLocalizer["No"]</option>
                             </select>
                         </div>
                     </div>
-                        }
+                    @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-                        else
                     {
                         <div class="row mb-1 align-items-center">
-                                <Label Class="col-sm-3" For="allowsitelogin" HelpText="Do you want to allow users to sign in using a username and password that is managed locally on this site? Note that you should only disable this option if you have already sucessfully configured an external login provider, or else you may lock yourself out of the site." ResourceKey="AllowSiteLogin">Allow Login?</Label>
+                            <Label Class="col-sm-3" For="twofactor" HelpText="Do you want users to use two factor authentication? Note that you should use the Disabled option until you have successfully verified that the Notification Job in Scheduled Jobs is enabled and your SMTP options in Site Settings are configured or else you will lock yourself out." ResourceKey="TwoFactor">Two Factor Authentication?</Label>
-                                <div class="col-sm-9">
-                                    <input id="allowsitelogin" class="form-control" value="@SharedLocalizer["Yes"]" readonly />
-                                </div>
-                            </div>
-                        }
-                        <div class="row mb-1 align-items-center">
-                            <Label Class="col-sm-3" For="twofactor" HelpText="Do you want users to use two factor authentication? Note that you should use the Disabled option until you have successfully verified that the Notification Job in Scheduled Jobs is enabled and your SMTP options in Site Settings are configured or else you will lock yourself out." ResourceKey="TwoFactor">Two Factor?</Label>
                             <div class="col-sm-9">
                                 <select id="twofactor" class="form-select" @bind="@_twofactor">
                                     <option value="false">@Localizer["Disabled"]</option>
@@ -98,6 +114,12 @@ else
                                 <input id="cookiename" class="form-control" @bind="@_cookiename" />
                             </div>
                         </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="cookiedomain" HelpText="If you would like to share cookies across subdomains you will need to specify a root domain with a leading dot (ie. '.example.com')" ResourceKey="CookieDomain">Cookie Domain:</Label>
+                            <div class="col-sm-9">
+                                <input id="cookiedomain" class="form-control" @bind="@_cookiedomain" />
+                            </div>
+                        </div>
                         <div class="row mb-1 align-items-center">
                             <Label Class="col-sm-3" For="cookieexpiration" HelpText="You can choose to use a custom authentication cookie expiration timespan for each site (e.g. '08:00:00' for 8 hours). The default is 14 days if not specified." ResourceKey="CookieExpiration">Cookie Expiration Timespan:</Label>
                             <div class="col-sm-9">
@@ -298,6 +320,24 @@ else
                                         </select>
                                     </div>
                                 </div>
+                                <div class="row mb-1 align-items-center">
+                                    <Label Class="col-sm-3" For="requirenonce" HelpText="Specify if Nonce validation is required for the ID token (the default is true)" ResourceKey="RequireNonce">Require Nonce?</Label>
+                                    <div class="col-sm-9">
+                                        <select id="requirenonce" class="form-select" @bind="@_requirenonce" required>
+                                            <option value="true">@SharedLocalizer["Yes"]</option>
+                                            <option value="false">@SharedLocalizer["No"]</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="row mb-1 align-items-center">
+                                    <Label Class="col-sm-3" For="singlelogout" HelpText="Specify if users should be logged out of both the application and provider (the default is false indicating they will only be logged out of the application)" ResourceKey="SingleLogout">Use Single Logout?</Label>
+                                    <div class="col-sm-9">
+                                        <select id="singlelogout" class="form-select" @bind="@_singlelogout" required>
+                                            <option value="true">@SharedLocalizer["Yes"]</option>
+                                            <option value="false">@SharedLocalizer["No"]</option>
+                                        </select>
+                                    </div>
+                                </div>
                             }
                             <div class="row mb-1 align-items-center">
                                 <Label Class="col-sm-3" For="scopes" HelpText="A list of Scopes to request from the provider (separated by commas). If none are specified, standard Scopes will be used by default." ResourceKey="Scopes">Scopes:</Label>
@@ -421,6 +461,27 @@ else
                                     </select>
                                 </div>
                             </div>
+                            @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+                            {
+                                <div class="row mb-1 align-items-center">
+                                    <Label Class="col-sm-3" For="allowhostrole" HelpText="Indicate if host roles are supported from the identity provider. Please use caution with this option as it allows the host user to administrate every site within your installation." ResourceKey="AllowHostRole">Allow Host Role?</Label>
+                                    <div class="col-sm-9">
+                                        <select id="allowhostrole" class="form-select" @bind="@_allowhostrole" required>
+                                            <option value="true">@SharedLocalizer["Yes"]</option>
+                                            <option value="false">@SharedLocalizer["No"]</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="row mb-1 align-items-center">
+                                    <Label Class="col-sm-3" For="allowsitelogin" HelpText="Do you want to allow users to sign in using a username and password that is managed locally on this site? Note that you should only disable this option if you have already sucessfully configured an external login provider, or else you may lock yourself out of the site." ResourceKey="AllowSiteLogin">Allow Local Login?</Label>
+                                    <div class="col-sm-9">
+                                        <select id="allowsitelogin" class="form-select" @bind="@_allowsitelogin">
+                                            <option value="true">@SharedLocalizer["Yes"]</option>
+                                            <option value="false">@SharedLocalizer["No"]</option>
+                                        </select>
+                                    </div>
+                                </div>
+                            }
                         }
                     </Section>
                     <Section Name="Token" Heading="Token Settings" ResourceKey="TokenSettings">
@@ -471,11 +532,15 @@ else
 
 @code {
     private List<UserRole> users;
+    private string _deleted = "false";
 
     private string _allowregistration;
-    private string _allowsitelogin;
+    private string _registerurl;
+    private string _profileurl;
+    private string _requireconfirmedemail;
     private string _twofactor;
     private string _cookiename;
+    private string _cookiedomain;
     private string _cookieexpiration;
     private string _alwaysremember;
     private string _logouteverywhere;
@@ -503,6 +568,8 @@ else
     private string _clientsecrettype = "password";
     private string _toggleclientsecret = string.Empty;
     private string _authresponsetype;
+    private string _requirenonce;
+    private string _singlelogout;
     private string _scopes;
     private string _parameters;
     private string _pkce;
@@ -520,6 +587,8 @@ else
     private string _domainfilter;
     private string _createusers;
     private string _verifyusers;
+    private string _allowhostrole;
+    private string _allowsitelogin;
 
     private string _secret;
     private string _secrettype = "password";
@@ -536,16 +605,19 @@ else
 
     protected override async Task OnInitializedAsync()
     {
-        await LoadUsersAsync(true);
+        await LoadUsersAsync();
 
         var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
         _allowregistration = PageState.Site.AllowRegistration.ToString().ToLower();
-        _allowsitelogin = SettingService.GetSetting(settings, "LoginOptions:AllowSiteLogin", "true");
+        _registerurl = SettingService.GetSetting(settings, "LoginOptions:RegisterUrl", "");
+        _profileurl = SettingService.GetSetting(settings, "LoginOptions:ProfileUrl", "");
+        _requireconfirmedemail = SettingService.GetSetting(settings, "LoginOptions:RequireConfirmedEmail", "true");
 
         if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
         {
             _twofactor = SettingService.GetSetting(settings, "LoginOptions:TwoFactor", "false");
             _cookiename = SettingService.GetSetting(settings, "LoginOptions:CookieName", ".AspNetCore.Identity.Application");
+            _cookiedomain = SettingService.GetSetting(settings, "LoginOptions:CookieDomain", "");
             _cookieexpiration = SettingService.GetSetting(settings, "LoginOptions:CookieExpiration", "");
             _alwaysremember = SettingService.GetSetting(settings, "LoginOptions:AlwaysRemember", "false");
             _logouteverywhere = SettingService.GetSetting(settings, "LoginOptions:LogoutEverywhere", "false");
@@ -585,6 +657,8 @@ else
         _clientsecret = SettingService.GetSetting(settings, "ExternalLogin:ClientSecret", "");
         _toggleclientsecret = SharedLocalizer["ShowPassword"];
         _authresponsetype = SettingService.GetSetting(settings, "ExternalLogin:AuthResponseType", "code");
+        _requirenonce = SettingService.GetSetting(settings, "ExternalLogin:RequireNonce", "true");
+        _singlelogout = SettingService.GetSetting(settings, "ExternalLogin:SingleLogout", "false");
         _scopes = SettingService.GetSetting(settings, "ExternalLogin:Scopes", "");
         _parameters = SettingService.GetSetting(settings, "ExternalLogin:Parameters", "");
         _pkce = SettingService.GetSetting(settings, "ExternalLogin:PKCE", "false");
@@ -602,11 +676,11 @@ else
         _domainfilter = SettingService.GetSetting(settings, "ExternalLogin:DomainFilter", "");
         _createusers = SettingService.GetSetting(settings, "ExternalLogin:CreateUsers", "true");
         _verifyusers = SettingService.GetSetting(settings, "ExternalLogin:VerifyUsers", "true");
+        _allowhostrole = SettingService.GetSetting(settings, "ExternalLogin:AllowHostRole", "false");
+        _allowsitelogin = SettingService.GetSetting(settings, "LoginOptions:AllowSiteLogin", "true");
     }
 
-    private async Task LoadUsersAsync(bool load)
+    private async Task LoadUsersAsync()
-    {
-        if (load)
     {
         users = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, RoleNames.Registered);
         if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
@@ -615,6 +689,20 @@ else
             users.AddRange(hosts);
             users = users.OrderBy(u => u.User.DisplayName).ToList();
         }
+        users = users.Where(item => item.User.IsDeleted == bool.Parse(_deleted)).ToList();
+    }
+
+    private async void DeletedChanged(ChangeEventArgs e)
+    {
+        try
+        {
+            _deleted = e.Value.ToString();
+            await LoadUsersAsync();
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error On DeletedChanged");
 		}
 	}
     
@@ -640,7 +728,7 @@ else
                 await logger.LogInformation("User {Username} Expired From Role {Role}", userrole.User.Username, userrole.Role.Name);
             }
             AddModuleMessage(Localizer["Success.DeleteUser"], MessageType.Success);
-            await LoadUsersAsync(true);
+            await LoadUsersAsync();
             StateHasChanged();
         }
         catch (Exception ex)
@@ -659,12 +747,15 @@ else
             await SiteService.UpdateSiteAsync(site);
 
             var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
-            settings = SettingService.SetSetting(settings, "LoginOptions:AllowSiteLogin", _allowsitelogin, false);
 
             if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
             {
+                settings = SettingService.SetSetting(settings, "LoginOptions:RegisterUrl", _registerurl, false);
+                settings = SettingService.SetSetting(settings, "LoginOptions:ProfileUrl", _profileurl, false);
+                settings = SettingService.SetSetting(settings, "LoginOptions:RequireConfirmedEmail", _requireconfirmedemail, false);
                 settings = SettingService.SetSetting(settings, "LoginOptions:TwoFactor", _twofactor, false);
                 settings = SettingService.SetSetting(settings, "LoginOptions:CookieName", _cookiename, true);
+                settings = SettingService.SetSetting(settings, "LoginOptions:CookieDomain", _cookiedomain, true);
                 settings = SettingService.SetSetting(settings, "LoginOptions:CookieExpiration", _cookieexpiration, true);
                 settings = SettingService.SetSetting(settings, "LoginOptions:AlwaysRemember", _alwaysremember, false);
                 settings = SettingService.SetSetting(settings, "LoginOptions:LogoutEverywhere", _logouteverywhere, false);
@@ -690,6 +781,8 @@ else
                 settings = SettingService.SetSetting(settings, "ExternalLogin:ClientId", _clientid, true);
                 settings = SettingService.SetSetting(settings, "ExternalLogin:ClientSecret", _clientsecret, true);
                 settings = SettingService.SetSetting(settings, "ExternalLogin:AuthResponseType", _authresponsetype, true);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:RequireNonce", _requirenonce, true);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:SingleLogout", _singlelogout, true);
                 settings = SettingService.SetSetting(settings, "ExternalLogin:Scopes", _scopes, true);
                 settings = SettingService.SetSetting(settings, "ExternalLogin:Parameters", _parameters, true);
                 settings = SettingService.SetSetting(settings, "ExternalLogin:PKCE", _pkce, true);
@@ -705,6 +798,8 @@ else
                 settings = SettingService.SetSetting(settings, "ExternalLogin:DomainFilter", _domainfilter, true);
                 settings = SettingService.SetSetting(settings, "ExternalLogin:CreateUsers", _createusers, true);
                 settings = SettingService.SetSetting(settings, "ExternalLogin:VerifyUsers", _verifyusers, true);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:AllowHostRole", _allowhostrole, true);
+                settings = SettingService.SetSetting(settings, "LoginOptions:AllowSiteLogin", _allowsitelogin, false);
 
                 settings = SettingService.SetSetting(settings, "JwtOptions:Secret", _secret, true);
                 settings = SettingService.SetSetting(settings, "JwtOptions:Issuer", _issuer, true);

Oqtane.Client/Modules/Admin/Visitors/Detail.razor

@@ -101,8 +101,8 @@
 				_url = visitor.Url;
 				_referrer = visitor.Referrer;
 				_visits = visitor.Visits.ToString();
-				_visited = visitor.VisitedOn.ToString(CultureInfo.CurrentCulture);
+				_visited = UtcToLocal(visitor.VisitedOn).Value.ToString(CultureInfo.CurrentCulture);
-				_created = visitor.CreatedOn.ToString(CultureInfo.CurrentCulture);
+				_created = UtcToLocal(visitor.CreatedOn).Value.ToString(CultureInfo.CurrentCulture);
 
 				if (visitor.UserId != null)
 				{

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

@@ -53,8 +53,8 @@ else
 					</td>
 					<td>@context.Language</td>
 					<td>@context.Visits</td>
-					<td>@context.VisitedOn</td>
+					<td>@UtcToLocal(context.VisitedOn)</td>
-					<td>@context.CreatedOn</td>
+					<td>@UtcToLocal(context.CreatedOn)</td>
 				</Row>
 			</Pager>
 		</TabPanel>
@@ -100,6 +100,18 @@ else
 			<br />
 			<button type="button" class="btn btn-success" @onclick="SaveSiteSettings">@SharedLocalizer["Save"]</button>
 		</TabPanel>
+        <TabPanel Name="Robots" Heading="Robots.txt" ResourceKey="Robots">
+			<div class="container">
+				<div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="robots" HelpText="Specify your robots.txt instructions to provide bots with guidance on which parts of your site should be indexed" ResourceKey="Robots">Instructions: </Label>
+					<div class="col-sm-9">
+                        <textarea id="robots" class="form-control" @bind="@_robots" rows="3"></textarea>
+                    </div>
+				</div>
+            </div>
+            <br />
+            <button type="button" class="btn btn-success" @onclick="SaveSiteSettings">@SharedLocalizer["Save"]</button>
+        </TabPanel>
 	</TabStrip>
 }
 
@@ -113,6 +125,7 @@ else
     private string _filter = "";
 	private int _retention = 30;
 	private string _correlation = "true";
+    private string _robots = "";
 
 	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
@@ -139,6 +152,7 @@ else
         _filter = SettingService.GetSetting(settings, "VisitorFilter", Constants.DefaultVisitorFilter);
 		_retention = int.Parse(SettingService.GetSetting(settings, "VisitorRetention", "30"));
 		_correlation = SettingService.GetSetting(settings, "VisitorCorrelation", "true");
+        _robots = SettingService.GetSetting(settings, "Robots", "");
     }
 
 	private async void TypeChanged(ChangeEventArgs e)
@@ -191,6 +205,7 @@ else
             settings = SettingService.SetSetting(settings, "VisitorFilter", _filter, true);
 			settings = SettingService.SetSetting(settings, "VisitorRetention", _retention.ToString(), true);
 			settings = SettingService.SetSetting(settings, "VisitorCorrelation", _correlation, true);
+            settings = SettingService.SetSetting(settings, "Robots", _robots, true);
             await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
 
 			AddModuleMessage(Localizer["Success.SaveSiteSettings"], MessageType.Success);

Oqtane.Client/Modules/Controls/AuditInfo.razor

@@ -52,7 +52,7 @@
 
             if (CreatedOn != null)
             {
-                _text += $" {Localizer["On"]} <b>{CreatedOn.Value.ToString(DateTimeFormat)}</b>";
+                _text += $" {Localizer["On"]} <b>{UtcToLocal(CreatedOn).Value.ToString(DateTimeFormat)}</b>";
             }
 
             _text += "</p>";
@@ -69,7 +69,7 @@
 
             if (ModifiedOn != null)
             {
-                _text += $" {Localizer["On"]} <b>{ModifiedOn.Value.ToString(DateTimeFormat)}</b>";
+                _text += $" {Localizer["On"]} <b>{UtcToLocal(ModifiedOn).Value.ToString(DateTimeFormat)}</b>";
             }
 
             _text += "</p>";
@@ -86,7 +86,7 @@
 
             if (DeletedOn != null)
             {
-                _text += $" {Localizer["On"]} <b>{DeletedOn.Value.ToString(DateTimeFormat)}</b>";
+                _text += $" {Localizer["On"]} <b>{UtcToLocal(DeletedOn).Value.ToString(DateTimeFormat)}</b>";
             }
 
             _text += "</p>";

Oqtane.Client/Modules/Controls/FileManager.razor

@@ -107,7 +107,7 @@
 
 @code {
     private bool _initialized = false;
-    private List<Folder> _folders;
+    private List<Folder> _folders = new List<Folder>();
     private List<File> _files = new List<File>();
     private string _fileinputid = string.Empty;
     private string _progressinfoid = string.Empty;
@@ -157,12 +157,22 @@
     [Parameter]
     public bool UploadMultiple { get; set; } = false; // optional - enable multiple file uploads - default false
 
+    [Parameter]
+    public bool AnonymizeUploadFilenames { get; set; } = false; // optional - indicate if file names should be anonymized on upload - default false
+
     [Parameter]
     public int ChunkSize { get; set; } = 1; // optional - size of file chunks to upload in MB
 
     [Parameter]
     public EventCallback<int> OnUpload { get; set; } // optional - executes a method in the calling component when a file is uploaded
 
+    [Parameter]
+    public EventCallback<int> OnSelectFolder { get; set; } // optional - executes a method in the calling component when a folder is selected
+
+    [Parameter]
+    public EventCallback<int> OnSelectFile { get; set; } // optional - executes a method in the calling component when a file is selected
+
+    [Obsolete("Use OnSelectFile instead.")]
     [Parameter]
     public EventCallback<int> OnSelect { get; set; } // optional - executes a method in the calling component when a file is selected
 
@@ -188,8 +198,10 @@
             Filter = "nupkg";
             ShowSuccess = true;
         }
-
+        else
-        if (!string.IsNullOrEmpty(Folder) && Folder != Constants.PackagesFolder)
+        {
+            // folder path specified rather than folderid
+            if (!string.IsNullOrEmpty(Folder))
             {
                 Folder folder = await FolderService.GetFolderAsync(ModuleState.SiteId, Folder);
                 if (folder != null)
@@ -203,6 +215,7 @@
                     _messagetype = MessageType.Error;
                 }
             }
+        }
 
         if (ShowFolders)
         {
@@ -235,25 +248,24 @@
             }
         }
 
-        await SetImage();
-
         if (!string.IsNullOrEmpty(Filter))
         {
             _filter = "." + Filter.Replace(",", ",.");
         }
 
+        GetFolderPermission();
+        await SetImage();
         await GetFiles();
 
         _initialized = true;
     }
 
-    private async Task GetFiles()
+    private void GetFolderPermission()
     {
         _haseditpermission = false;
         if (Folder == Constants.PackagesFolder)
         {
             _haseditpermission = UserSecurity.IsAuthorized(PageState.User, RoleNames.Host);
-            _files = new List<File>();
         }
         else
         {
@@ -261,62 +273,12 @@
             if (folder != null)
             {
                 _haseditpermission = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, folder.PermissionList);
-                if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Browse, folder.PermissionList))
-                {
-                    _files = await FileService.GetFilesAsync(FolderId);
-                }
-                else
-                {
-                    _files = new List<File>();
-                }
             }
             else
             {
                 _haseditpermission = false;
-                _files = new List<File>();
-            }
-            if (_filter != "*")
-            {
-                List<File> filtered = new List<File>();
-                foreach (File file in _files)
-                {
-                    if (_filter.ToUpper().IndexOf("." + file.Extension.ToUpper()) != -1)
-                    {
-                        filtered.Add(file);
             }
         }
-                _files = filtered;
-            }
-        }
-    }
-
-    private async Task FolderChanged(ChangeEventArgs e)
-    {
-        _message = string.Empty;
-        try
-        {
-            FolderId = int.Parse((string)e.Value);
-            await GetFiles();
-            FileId = -1;
-            _file = null;
-            _image = string.Empty;
-            StateHasChanged();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Files {Error}", ex.Message);
-            _message = Localizer["Error.File.Load"];
-            _messagetype = MessageType.Error;
-        }
-    }
-
-    private async Task FileChanged(ChangeEventArgs e)
-    {
-        _message = string.Empty;
-        FileId = int.Parse((string)e.Value);
-        await SetImage();
-        await OnSelect.InvokeAsync(FileId);
-        StateHasChanged();
     }
 
     private async Task SetImage()
@@ -342,6 +304,74 @@
         }
     }
 
+    private async Task GetFiles()
+    {
+        if (ShowFiles)
+        {
+            Folder folder = _folders.FirstOrDefault(item => item.FolderId == FolderId);
+            if (folder != null)
+            {
+                if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Browse, folder.PermissionList))
+                {
+                    _files = await FileService.GetFilesAsync(FolderId);
+                }
+                else
+                {
+                    _files = new List<File>();
+                }
+            }
+            else
+            {
+                _files = new List<File>();
+            }
+            if (_filter != "*")
+            {
+                List<File> filtered = new List<File>();
+                foreach (File file in _files)
+                {
+                    if (_filter.ToUpper().IndexOf("." + file.Extension.ToUpper()) != -1)
+                    {
+                        filtered.Add(file);
+                    }
+                }
+                _files = filtered;
+            }
+        }
+    }
+
+    private async Task FolderChanged(ChangeEventArgs e)
+    {
+        _message = string.Empty;
+        try
+        {
+            FolderId = int.Parse((string)e.Value);
+            FileId = -1;
+            GetFolderPermission();
+            await SetImage();
+            await GetFiles();
+            await OnSelectFolder.InvokeAsync(FolderId);
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Files {Error}", ex.Message);
+            _message = Localizer["Error.File.Load"];
+            _messagetype = MessageType.Error;
+        }
+    }
+
+    private async Task FileChanged(ChangeEventArgs e)
+    {
+        _message = string.Empty;
+        FileId = int.Parse((string)e.Value);
+        await SetImage();
+    #pragma warning disable CS0618
+        await OnSelect.InvokeAsync(FileId);
+    #pragma warning restore CS0618
+        await OnSelectFile.InvokeAsync(FileId);
+        StateHasChanged();
+    }
+
     private async Task UploadFiles()
     {
         _message = string.Empty;
@@ -396,7 +426,7 @@
                     }
 
                     // upload files
-                    var success = await interop.UploadFiles(posturl, folder, _guid, SiteState.AntiForgeryToken, jwt, chunksize, tokenSource.Token);
+                    var success = await interop.UploadFiles(posturl, folder, _guid, SiteState.AntiForgeryToken, jwt, chunksize, AnonymizeUploadFilenames, tokenSource.Token);
 
                     // reset progress indicators
                     if (ShowProgress)
@@ -418,32 +448,35 @@
                             _message = Localizer["Success.File.Upload"];
                             _messagetype = MessageType.Success;
                         }
-                    }
-                    else
-                    {
-                        await logger.LogError("File Upload Failed {Files}", uploads);
-                        _message = Localizer["Error.File.Upload"];
-                        _messagetype = MessageType.Error;
-                    }
 
-                    if (Folder == Constants.PackagesFolder)
+                        FileId = -1;
-                    {
+                        if (Folder != Constants.PackagesFolder && !AnonymizeUploadFilenames)
-                        await OnUpload.InvokeAsync(-1);
-                    }
-                    else
                         {
                             // set FileId to first file in upload collection
                             var file = await FileService.GetFileAsync(int.Parse(folder), uploads[0].Split(":")[0]);
                             if (file != null)
                             {
                                 FileId = file.FileId;
-                            await SetImage();
-                            await OnSelect.InvokeAsync(FileId);
-                            await OnUpload.InvokeAsync(FileId);
                             }
+                        }
+
+                        await SetImage();
+
+                        await OnUpload.InvokeAsync(FileId);
+#pragma warning disable CS0618
+                        await OnSelect.InvokeAsync(FileId);
+#pragma warning restore CS0618
+                        await OnSelectFile.InvokeAsync(FileId);
+
                         await GetFiles();
                         StateHasChanged();
                     }
+                    else
+                    {
+                        await logger.LogError("File Upload Failed {Files}", uploads);
+                        _message = Localizer["Error.File.Upload"];
+                        _messagetype = MessageType.Error;
+                    }
                 }
                 catch (Exception ex)
                 {
@@ -456,7 +489,6 @@
                 finally {
                     tokenSource.Dispose();
                 }
-
             }
             else
             {
@@ -486,10 +518,15 @@
                 _messagetype = MessageType.Success;
             }
 
-			await GetFiles();
             FileId = -1;
             await SetImage();
+
+#pragma warning disable CS0618
             await OnSelect.InvokeAsync(FileId);
+#pragma warning restore CS0618
+            await OnSelectFile.InvokeAsync(FileId);
+
+            await GetFiles();
             StateHasChanged();
         }
         catch (Exception ex)
@@ -515,15 +552,16 @@
     public async Task Refresh(int fileId)
     {
         await GetFiles();
+        FileId = -1;
         if (fileId != -1)
 		{
 			var file = _files.Where(item => item.FileId == fileId).FirstOrDefault();
 			if (file != null)
 			{
 				FileId = file.FileId;
+			}
+		}
         await SetImage();
-			}
-		}
         StateHasChanged();
 	}
 }

Oqtane.Client/Modules/Controls/ModuleMessage.razor

@@ -3,6 +3,8 @@
 @inject NavigationManager NavigationManager
 
 @if (!string.IsNullOrEmpty(Message))
+{
+    @if (_style == MessageStyle.Alert)
     {
         <div class="@_classname alert-dismissible fade show mb-3" role="alert">
             @((MarkupString)Message)
@@ -10,23 +12,35 @@
             {
                 <NavLink class="ms-2" href="@NavigateUrl("admin/log")">View Details</NavLink>
             }
-        @if (ModuleState != null)
+            <form method="post" class="app-form-inline" @formname="ModuleMessageForm" @onsubmit="CloseMessage" data-enhance>
-        {
+                <input type="hidden" name="@Constants.RequestVerificationToken" value="@SiteState.AntiForgeryToken" />
-            @if (ModuleState.RenderMode == RenderModes.Static)
+                <button type="submit" class="btn-close" data-dismiss="alert" aria-label="close"></button>
-            {
+            </form>
-                <a href="@NavigationManager.Uri" class="btn-close" data-dismiss="alert" aria-label="close"></a>
-            }
-            else
-            {
-                <button type="button" class="btn-close" data-dismiss="alert" aria-label="close" @onclick="CloseMessage"></button>
-            }
-        }
         </div>
     }
 
+    @if (_style == MessageStyle.Toast)
+    {
+        <div class="app-modulemessage-toast bottom-0 end-0">
+            <div class="@_classname alert-dismissible fade show mb-3" role="alert">
+                @((MarkupString)Message)
+                @if (Type == MessageType.Error && PageState != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+                {
+                    <NavLink class="ms-2" href="@NavigateUrl("admin/log")">View Details</NavLink>
+                }
+                <form method="post" class="app-form-inline" @formname="ModuleMessageForm" @onsubmit="CloseMessage" data-enhance>
+                    <input type="hidden" name="@Constants.RequestVerificationToken" value="@SiteState.AntiForgeryToken" />
+                    <button type="submit" class="btn-close" data-dismiss="alert" aria-label="close"></button>
+                </form>
+            </div>
+        </div>
+    }
+}
+
 @code {
     private string _message = string.Empty;
     private string _classname = string.Empty;
+    private MessageStyle _style;
 
     [Parameter]
     public string Message { get; set; }
@@ -34,6 +48,9 @@
     [Parameter]
     public MessageType Type { get; set; }
 
+    [Parameter]
+    public MessageStyle Style { get; set; } = MessageStyle.Alert;
+
     [Parameter]
     public RenderModeBoundary Parent { get; set; }
 
@@ -43,6 +60,11 @@
         if (!string.IsNullOrEmpty(_message))
         {
             _classname = GetMessageType(Type);
+            _style = Style;
+            if (Type == MessageType.Error)
+            {
+                _style = MessageStyle.Alert; // errors should always be displayed as alerts
+            }
         }
     }
 
@@ -67,7 +89,8 @@
 
         return classname;
     }
-    private void CloseMessage(MouseEventArgs e)
+
+    private void CloseMessage()
     {
         if (Parent != null)
         {

Oqtane.Client/Modules/Controls/PermissionGrid.razor

@@ -28,7 +28,7 @@
                                 @foreach (var permissionname in _permissionnames)
                                 {
                                     <td style="text-align: center;">
-									<TriStateCheckBox Value=@GetPermissionValue(permissionname, role.Name, -1) Disabled="@GetPermissionDisabled(permissionname, role.Name)" OnChange="@(e => PermissionChanged(e, permissionname, role.Name, -1))" />
+                                        <TriStateCheckBox Value="@GetPermissionValue(permissionname, role.Name, -1)" Disabled="@GetPermissionDisabled(permissionname, role.Name)" OnChange="@(e => PermissionChanged(e, permissionname, role.Name, -1))" />
                                     </td>
                                 }
                             </tr>
@@ -60,11 +60,11 @@
                             @foreach (User user in _users)
                             {
                                 <tr>
-                                <td>@user.DisplayName</td>
+                                    <td>@user.DisplayName (@user.Username)</td>
                                     @foreach (var permissionname in _permissionnames)
                                     {
                                         <td style="text-align: center; width: 1px;">
-										<TriStateCheckBox Value=@GetPermissionValue(permissionname, "", user.UserId) Disabled="@GetPermissionDisabled(permissionname, "")" OnChange="@(e => PermissionChanged(e, permissionname, "", user.UserId))" />
+                                            <TriStateCheckBox Value="@GetPermissionValue(permissionname, "", user.UserId)" Disabled="@GetPermissionDisabled(permissionname, "")" OnChange="@(e => PermissionChanged(e, permissionname, "", user.UserId))" />
                                         </td>
                                     }
                                 </tr>
@@ -119,10 +119,7 @@
         }
 
         _roles = await RoleService.GetRolesAsync(ModuleState.SiteId, true);
-		if (!UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+        _roles.RemoveAll(item => item.Name == RoleNames.Host); // remove host role
-		{
-			_roles.RemoveAll(item => item.Name == RoleNames.Host);
-		}
 
         // get permission names
         if (string.IsNullOrEmpty(PermissionNames))
@@ -222,24 +219,24 @@
 
     private bool GetPermissionDisabled(string permissionName, string roleName)
     {
+        var disabled = false;
+
+        // administrator role permissions can only be changed by a host
         if (roleName == RoleNames.Admin && !UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
         {
-			return true;
+            disabled = true;
-		}
-		else
-		{
-			if (GetEntityName(permissionName) != EntityName && !UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
-			{
-				return true;
-			}
-			else
-			{
-				return false;
-			}
-		}
         }
 
-	private void PermissionChanged(bool? value, string permissionName, string roleName, int userId)
+        // API permissions can only be changed by an administrator
+        if (GetEntityName(permissionName) != EntityName && !UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
+        {
+            disabled = true;
+        }
+
+        return disabled;
+    }
+
+    private bool? PermissionChanged(bool? value, string permissionName, string roleName, int userId)
     {
         if (roleName != "")
         {
@@ -248,6 +245,14 @@
             {
                 _permissions.Remove(permission);
             }
+
+            // system roles cannot be denied - only custom roles can be denied
+            var role = _roles.FirstOrDefault(item => item.Name == roleName);
+            if (value != null && !value.Value && role.IsSystem)
+            {
+                value = null;
+            }
+
             if (value != null)
             {
                 _permissions.Add(new Permission(ModuleState.SiteId, GetEntityName(permissionName), GetPermissionName(permissionName), roleName, null, value.Value));
@@ -265,13 +270,14 @@
                 _permissions.Add(new Permission(ModuleState.SiteId, GetEntityName(permissionName), GetPermissionName(permissionName), null, userId, value.Value));
             }
         }
+        return value;
     }
 
 	private async Task<Dictionary<string, string>> GetUsers(string filter)
 	{
 		var users = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, RoleNames.Registered);
-		return users.Where(item => item.User.DisplayName.Contains(filter, StringComparison.OrdinalIgnoreCase))
+        return users.Where(item => item.User.DisplayName.Contains(filter, StringComparison.OrdinalIgnoreCase) || item.User.Username.Contains(filter, StringComparison.OrdinalIgnoreCase))
-			.ToDictionary(item => item.UserId.ToString(), item => item.User.DisplayName);
+			.ToDictionary(item => item.UserId.ToString(), item => item.User.DisplayName + " (" + item.User.Username + ")");
 	}
 
 	private async Task AddUser()
@@ -305,29 +311,20 @@
 
 	private void ValidatePermissions()
 	{
-		// remove deny all users, unauthenticated, and registered users
-		var permissions = _permissions.Where(item => !item.IsAuthorized && 
-			(item.RoleName == RoleNames.Everyone || item.RoleName == RoleNames.Unauthenticated || item.RoleName == RoleNames.Registered)).ToList();
-		foreach (var permission in permissions)
-		{
-			_permissions.Remove(permission);
-		}
 		if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
 		{
-			// remove deny administrators and host users
+            // remove host role permissions
-			permissions = _permissions.Where(item => !item.IsAuthorized &&
+            var permissions = _permissions.Where(item => item.RoleName == RoleNames.Host).ToList();
-				(item.RoleName == RoleNames.Admin || item.RoleName == RoleNames.Host)).ToList();
             foreach (var permission in permissions)
             {
             	_permissions.Remove(permission);
             }
+            // add host role permissions if administrator role is not assigned (to prevent lockout)
             foreach (var permissionname in _permissionnames)
 			{
-				// add administrators role if neither host or administrator is assigned
+				if (!_permissions.Any(item => item.EntityName == GetEntityName(permissionname) && item.PermissionName == GetPermissionName(permissionname) && item.RoleName == RoleNames.Admin))
-				if (!_permissions.Any(item => item.EntityName == GetEntityName(permissionname) && item.PermissionName == GetPermissionName(permissionname) &&
-					(item.RoleName == RoleNames.Admin || item.RoleName == RoleNames.Host)))
 				{
-					_permissions.Add(new Permission(ModuleState.SiteId, GetEntityName(permissionname), GetPermissionName(permissionname), RoleNames.Admin, null, true));
+					_permissions.Add(new Permission(ModuleState.SiteId, GetEntityName(permissionname), GetPermissionName(permissionname), RoleNames.Host, null, true));
 				}
 			}
 		}

Oqtane.Client/Modules/Controls/TextEditors/QuillJS/QuillJSTextEditor.razor

@@ -177,14 +177,14 @@
 </div>
 
 @code {
-    public string Name => "QuillJS";
+    public string Name => "QuillJS Text Editor";
 
     private string resourceType = "Oqtane.Modules.Controls.QuillJSTextEditor, Oqtane.Client";
 
     private bool _settingsLoaded;
     private bool _initialized = false;
 
-    private QuillEditorInterop _interop;
+    private QuillJSTextEditorInterop _interop;
     private FileManager _fileManager;
     private string _activetab = "Rich";
     private bool _allowSettings = false;
@@ -246,14 +246,14 @@
 
     public override List<Resource> Resources { get; set; } = new List<Resource>()
     {
-        new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill.min.js", Location = ResourceLocation.Body },
+        new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/texteditors/quilljs/quill.min.js", Location = ResourceLocation.Body },
-        new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill-blot-formatter.min.js", Location = ResourceLocation.Body },
+        new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/texteditors/quilljs/quill-blot-formatter.min.js", Location = ResourceLocation.Body },
-        new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill-interop.js", Location = ResourceLocation.Body }
+        new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/texteditors/quilljs/quill-interop.js", Location = ResourceLocation.Body }
     };
 
     protected override void OnInitialized()
     {
-        _interop = new QuillEditorInterop(JSRuntime);
+        _interop = new QuillJSTextEditorInterop(JSRuntime);
 
         if (string.IsNullOrEmpty(Placeholder))
         {
@@ -277,7 +277,7 @@
 		{
             // include CSS theme
             var interop = new Interop(JSRuntime);
-            await interop.IncludeLink("", "stylesheet", $"{PageState?.Alias.BaseUrl}/css/quill/quill.{_theme}.css", "text/css", "", "", "");
+            await interop.IncludeLink("", "stylesheet", $"{PageState?.Alias.BaseUrl}/css/texteditors/quilljs/quill.{_theme}.css", "text/css", "", "", "");
         }
 
         await base.OnAfterRenderAsync(firstRender);

Oqtane.Client/Modules/Controls/TextEditors/QuillJS/QuillJSTextEditorInterop.cs

@@ -4,11 +4,11 @@ using System.Threading.Tasks;
 
 namespace Oqtane.Modules.Controls
 {
-    public class QuillEditorInterop
+    public class QuillJSTextEditorInterop
     {
         private readonly IJSRuntime _jsRuntime;
 
-        public QuillEditorInterop(IJSRuntime jsRuntime)
+        public QuillJSTextEditorInterop(IJSRuntime jsRuntime)
         {
             _jsRuntime = jsRuntime;
         }

Oqtane.Client/Modules/Controls/TextEditors/Radzen/RadzenFileManagerDialog.razor

@@ -0,0 +1,44 @@
+@namespace Oqtane.Modules.Controls
+@using Radzen
+@using Radzen.Blazor
+@inject DialogService DialogService
+@inject IStringLocalizer<Oqtane.Modules.Controls.RadzenTextEditor> Localizer
+
+@if (!string.IsNullOrEmpty(_message))
+{
+    <div class="rz-html-editor-dialog-item">
+        <div class="alert alert-warning alert-dismissible fade show mb-3" role="alert">
+            @((MarkupString)_message)
+        </div>
+    </div>
+}
+<div class="rz-html-editor-dialog-item">
+    <FileManager @ref="_fileManager" Filter="@Filters" />
+</div>
+<div class="rz-html-editor-dialog-buttons">
+    <RadzenButton Text="@Localizer["InsertImage"]" Click="InsertImage" />
+    <RadzenButton Text="@Localizer["Cancel"]" Click="() => DialogService.Close()" ButtonStyle="ButtonStyle.Secondary" />
+</div>
+@code {
+    private FileManager _fileManager;
+    private string _message = string.Empty;
+
+    [Parameter]
+    public string Filters { get; set; }
+
+    private void InsertImage()
+    {
+        _message = string.Empty;
+        var file = _fileManager.GetFile();
+        if (file != null)
+        {
+            var result = $"<img src=\"{file.Url}\" style=\"max-width: 100%\" alt=\"{file.Name}\" />";
+            DialogService.Close(result);
+        }
+        else
+        {
+            _message = Localizer["Message.Require.Image"];
+            StateHasChanged();
+        }
+    }
+}