Merge pull request #5929 from oqtane/master

10.0.3 Release

.deployment

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

.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,26 @@
+---
+name: Bug Report
+about: Create a bug report to help us improve the product
+title: "[BUG] "
+labels: ''
+assignees: ''
+
+---
+
+### Oqtane Info
+
+Version - #.#.#
+Render Mode - Static 
+Interactivity - Server
+Database - SQL Server
+
+### Describe the bug
+
+
+### Expected Behavior
+
+
+### Steps To Reproduce
+
+
+### Anything else?

.github/ISSUE_TEMPLATE/enhancement-request.md

@@ -0,0 +1,20 @@
+---
+name: Enhancement Request
+about: 'Suggest a product enhancement '
+title: "[ENH] "
+labels: ''
+assignees: ''
+
+---
+
+### Oqtane Info
+
+Version - #.#.#
+Render Mode - Static 
+Interactivity - Server
+Database - SQL Server
+
+### Describe the enhancement
+
+
+### Anything else?

.gitignore

@@ -22,10 +22,17 @@ Oqtane.Server/Packages
 Oqtane.Server/wwwroot/Content
 Oqtane.Server/wwwroot/Packages/*.log
 
-Oqtane.Server/wwwroot/Modules
+Oqtane.Server/wwwroot/_content/*
+!Oqtane.Server/wwwroot/_content/Placeholder.txt
+
+Oqtane.Server/wwwroot/Modules/*
 !Oqtane.Server/wwwroot/Modules/Oqtane.Modules.*
 !Oqtane.Server/wwwroot/Modules/Templates
+Oqtane.Server/wwwroot/Modules/Templates/*
+!Oqtane.Server/wwwroot/Modules/Templates/External
 
-Oqtane.Server/wwwroot/Themes
+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

CONTRIBUTING.md

@@ -0,0 +1,24 @@
+# Contributing to Oqtane
+
+## How to Contribute
+
+We track all of our issues on Github. If you want to contribute, everything starts with an issue. If you don't have an issue yet, you can add one. Then a core contributor will tag it as either an enhancement [ENH] or a bug [BUG].  Tagged issues are open for contribution.
+
+## Use GitHub-flow process
+- Make a comment on the issue that you intend to work on it and read all the comments to gain a full understanding.
+- Fork the repository
+- Create a new branch and update your comment on the issue with a llink to the branch
+- Make your changes and commit them
+- Push to the branch
+- Create a pull request
+
+## Reporting Bugs
+
+- Check if the issue has already been reported.
+- Open a new issue if it hasn’t been reported.
+
+## Requesting Features
+
+- Use the feature request template in the Issues tab.
+
+Thank you for contributing!

Directory.Build.props

@@ -0,0 +1,17 @@
+<Project>
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <Configurations>Debug;Release</Configurations>
+    <Version>10.0.3</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/v10.0.3</PackageReleaseNotes>
+    <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
+    <RepositoryType>Git</RepositoryType>
+  </PropertyGroup>
+</Project>

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2023 .NET Foundation
+Copyright (c) 2018-2025 .NET Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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,81 @@
+{
+  "$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,
+  "symbols": {
+    "Framework": {
+      "type": "parameter",
+      "description": "The target framework for the project",
+      "datatype": "choice",
+      "choices": [
+        {
+          "choice": "net10.0",
+          "description": "Target net10.0"
+        }
+      ],
+      "replaces": "net10.0",
+      "defaultValue": "net10.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.slnx"
+    }
+  ]
+}

Oqtane.Application/Client/AssemblyInfo.cs

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

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

@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <Version>1.0.0</Version>
+    <AssemblyName>Oqtane.Application.Client.Oqtane</AssemblyName>
+    <StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
+    <BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
+    <PublishTrimmed>false</PublishTrimmed>
+    <BlazorEnableCompression>false</BlazorEnableCompression>
+    <BlazorDisableThrowNavigationException>true</BlazorDisableThrowNavigationException>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="10.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="10.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Shared\Oqtane.Application.Shared.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Oqtane.Client" Version="10.0.3" />
+  </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/_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>10.0.3</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.slnx

@@ -0,0 +1,5 @@
+<Solution>
+  <Project Path="Server\Oqtane.Application.Server.csproj" DefaultStartup="true" />
+  <Project Path="Client\Oqtane.Application.Client.csproj" />
+  <Project Path="Shared\Oqtane.Application.Shared.csproj" />
+</Solution>

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/Oqtane.Application.Server.csproj

@@ -0,0 +1,39 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net10.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>
+    <BlazorDisableThrowNavigationException>true</BlazorDisableThrowNavigationException>
+    <RequiresAspNetWebAssets>true</RequiresAspNetWebAssets>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="wwwroot\Modules\Templates\**" />
+    <Compile Remove="wwwroot\Themes\Templates\**" />
+    <Content Remove="wwwroot\Modules\Templates\**" />
+    <Content Remove="wwwroot\Themes\Templates\**" />
+    <EmbeddedResource Remove="wwwroot\Modules\Templates\**" />
+    <EmbeddedResource Remove="wwwroot\Themes\Templates\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Client\Oqtane.Application.Client.csproj" />
+    <ProjectReference Include="..\Shared\Oqtane.Application.Shared.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Oqtane.Server" Version="10.0.3" />
+  </ItemGroup>
+	
+</Project>

Oqtane.Application/Server/Program.cs

@@ -0,0 +1,55 @@
+using System;
+using System.IO;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Cors.Infrastructure;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Oqtane.Extensions;
+using Oqtane.Infrastructure;
+using Oqtane.Shared;
+
+namespace Oqtane.Application.Server
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            var builder = WebApplication.CreateBuilder(args);
+
+            AppDomain.CurrentDomain.SetData(Constants.DataDirectory, Path.Combine(builder.Environment.ContentRootPath, "Data"));
+
+            var configurationBuilder = new ConfigurationBuilder()
+                .SetBasePath(builder.Environment.ContentRootPath)
+                .AddJsonFile("appsettings.json", false, true)
+                .AddJsonFile($"appsettings.{builder.Environment.EnvironmentName}.json", true, true)
+                .AddEnvironmentVariables();
+            var configuration = configurationBuilder.Build();
+
+            builder.Services.AddOqtane(configuration, builder.Environment);
+
+            var app = builder.Build();
+
+            var corsService = app.Services.GetRequiredService<ICorsService>();
+            var corsPolicyProvider = app.Services.GetRequiredService<ICorsPolicyProvider>();
+            var syncManager = app.Services.GetRequiredService<ISyncManager>();
+
+            app.UseOqtane(configuration, builder.Environment, corsService, corsPolicyProvider, syncManager);
+
+            var databaseManager = app.Services.GetService<IDatabaseManager>();
+            var install = databaseManager.Install();
+            if (!string.IsNullOrEmpty(install.Message))
+            {
+                var filelogger = app.Services.GetRequiredService<ILogger<Program>>();
+                if (filelogger != null)
+                {
+                    filelogger.LogError($"[Oqtane.Server.Program.Main] {install.Message}");
+                }
+            }
+            else
+            {
+                app.Run();
+            }
+        }
+    }
+}

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/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/Templates/Internal/Client/Modules/[Owner].Module.[Module]/Edit.razor

@@ -0,0 +1,107 @@
+@using Oqtane.Modules.Controls
+@using [Owner].Module.[Module].Services
+@using [Owner].Module.[Module].Models
+
+@namespace [Owner].Module.[Module]
+@inherits ModuleBase
+@inject I[Module]Service [Module]Service
+@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 [Module]";
+
+    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"]);
+                [Module] [Module] = await [Module]Service.Get[Module]Async(_id, ModuleState.ModuleId);
+                if ([Module] != null)
+                {
+                    _name = [Module].Name;
+                    _createdby = [Module].CreatedBy;
+                    _createdon = [Module].CreatedOn;
+                    _modifiedby = [Module].ModifiedBy;
+                    _modifiedon = [Module].ModifiedOn;
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading [Module] {[Module]Id} {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")
+                {
+                    [Module] [Module] = new [Module]();
+                    [Module].ModuleId = ModuleState.ModuleId;
+                    [Module].Name = _name;
+                    [Module] = await [Module]Service.Add[Module]Async([Module]);
+                    await logger.LogInformation("[Module] Added {[Module]}", [Module]);
+                }
+                else
+                {
+                    [Module] [Module] = await [Module]Service.Get[Module]Async(_id, ModuleState.ModuleId);
+                    [Module].Name = _name;
+                    await [Module]Service.Update[Module]Async([Module]);
+                    await logger.LogInformation("[Module] Updated {[Module]}", [Module]);
+                }
+                NavigationManager.NavigateTo(NavigateUrl());
+            }
+            else
+            {
+                AddModuleMessage(Localizer["Message.SaveValidation"], MessageType.Warning);
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Saving [Module] {Error}", ex.Message);
+            AddModuleMessage(Localizer["Message.SaveError"], MessageType.Error);
+        }
+    }
+}

Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Owner].Module.[Module]/Index.razor

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

Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Owner].Module.[Module]/Interop.cs

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

Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Owner].Module.[Module]/ModuleInfo.cs

@@ -0,0 +1,16 @@
+using Oqtane.Models;
+using Oqtane.Modules;
+
+namespace [Owner].Module.[Module]
+{
+    public class ModuleInfo : IModule
+    {
+        public ModuleDefinition ModuleDefinition => new ModuleDefinition
+        {
+            Name = "[Module]",
+            Description = "[Description]",
+            Version = "1.0.0",
+            ServerManagerType = "[ServerManagerType]"
+        };
+    }
+}

Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Owner].Module.[Module]/Settings.razor

@@ -0,0 +1,47 @@
+@namespace [Owner].Module.[Module]
+@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 = "[Owner].Module.[Module].Settings, [Owner].Module.[Module].Client.Oqtane"; // for localization
+    public override string Title => "[Module] 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
+        {
+            var settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
+            settings = SettingService.SetSetting(settings, "SettingName", _value);
+            await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
+        }
+        catch (Exception ex)
+        {
+            AddModuleMessage(ex.Message, MessageType.Error);
+        }
+    }
+}

Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Resources/[Owner].Module.[Module]/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 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="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.LoadError" xml:space="preserve">
+    <value>Error Loading [Module]</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 [Module]</value>
+  </data>
+</root>

Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Resources/[Owner].Module.[Module]/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 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="Name" xml:space="preserve">
+    <value>Name</value>
+  </data>
+  <data name="Add.Text" xml:space="preserve">
+    <value>Add [Module]</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 [Module]</value>
+  </data>
+  <data name="Delete.Message" xml:space="preserve">
+    <value>Are You Sure You Wish To Delete This [Module]?</value>
+  </data>
+  <data name="Message.DisplayNone" xml:space="preserve">
+    <value>No [Module]s To Display</value>
+  </data>
+  <data name="Message.LoadError" xml:space="preserve">
+    <value>Error Loading [Module]</value>
+  </data>
+  <data name="Message.DeleteError" xml:space="preserve">
+    <value>Error Deleting [Module]</value>
+  </data>
+</root>

Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Resources/[Owner].Module.[Module]/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/Server/wwwroot/Modules/Templates/Internal/Client/Services/[Module]Service.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 [Owner].Module.[Module].Services
+{
+    public interface I[Module]Service 
+    {
+        Task<List<Models.[Module]>> Get[Module]sAsync(int ModuleId);
+
+        Task<Models.[Module]> Get[Module]Async(int [Module]Id, int ModuleId);
+
+        Task<Models.[Module]> Add[Module]Async(Models.[Module] [Module]);
+
+        Task<Models.[Module]> Update[Module]Async(Models.[Module] [Module]);
+
+        Task Delete[Module]Async(int [Module]Id, int ModuleId);
+    }
+
+    public class [Module]Service : ServiceBase, I[Module]Service
+    {
+        public [Module]Service(HttpClient http, SiteState siteState) : base(http, siteState) { }
+
+        private string Apiurl => CreateApiUrl("[Module]");
+
+        public async Task<List<Models.[Module]>> Get[Module]sAsync(int ModuleId)
+        {
+            List<Models.[Module]> [Module]s = await GetJsonAsync<List<Models.[Module]>>(CreateAuthorizationPolicyUrl($"{Apiurl}?moduleid={ModuleId}", EntityNames.Module, ModuleId), Enumerable.Empty<Models.[Module]>().ToList());
+            return [Module]s.OrderBy(item => item.Name).ToList();
+        }
+
+        public async Task<Models.[Module]> Get[Module]Async(int [Module]Id, int ModuleId)
+        {
+            return await GetJsonAsync<Models.[Module]>(CreateAuthorizationPolicyUrl($"{Apiurl}/{[Module]Id}/{ModuleId}", EntityNames.Module, ModuleId));
+        }
+
+        public async Task<Models.[Module]> Add[Module]Async(Models.[Module] [Module])
+        {
+            return await PostJsonAsync<Models.[Module]>(CreateAuthorizationPolicyUrl($"{Apiurl}", EntityNames.Module, [Module].ModuleId), [Module]);
+        }
+
+        public async Task<Models.[Module]> Update[Module]Async(Models.[Module] [Module])
+        {
+            return await PutJsonAsync<Models.[Module]>(CreateAuthorizationPolicyUrl($"{Apiurl}/{[Module].[Module]Id}", EntityNames.Module, [Module].ModuleId), [Module]);
+        }
+
+        public async Task Delete[Module]Async(int [Module]Id, int ModuleId)
+        {
+            await DeleteAsync(CreateAuthorizationPolicyUrl($"{Apiurl}/{[Module]Id}/{ModuleId}", EntityNames.Module, ModuleId));
+        }
+    }
+}

Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Startup/ClientStartup.cs

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

Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Server/Controllers/[Module]Controller.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 [Owner].Module.[Module].Services;
+using Oqtane.Controllers;
+using System.Net;
+using System.Threading.Tasks;
+
+namespace [Owner].Module.[Module].Controllers
+{
+    [Route(ControllerRoutes.ApiRoute)]
+    public class [Module]Controller : ModuleControllerBase
+    {
+        private readonly I[Module]Service _[Module]Service;
+
+        public [Module]Controller(I[Module]Service [Module]Service, ILogManager logger, IHttpContextAccessor accessor) : base(logger, accessor)
+        {
+            _[Module]Service = [Module]Service;
+        }
+
+        // GET: api/<controller>?moduleid=x
+        [HttpGet]
+        [Authorize(Policy = PolicyNames.ViewModule)]
+        public async Task<IEnumerable<Models.[Module]>> Get(string moduleid)
+        {
+            int ModuleId;
+            if (int.TryParse(moduleid, out ModuleId) && IsAuthorizedEntityId(EntityNames.Module, ModuleId))
+            {
+                return await _[Module]Service.Get[Module]sAsync(ModuleId);
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized [Module] 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.[Module]> Get(int id, int moduleid)
+        {
+            Models.[Module] [Module] = await _[Module]Service.Get[Module]Async(id, moduleid);
+            if ([Module] != null && IsAuthorizedEntityId(EntityNames.Module, [Module].ModuleId))
+            {
+                return [Module];
+            }
+            else
+            { 
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized [Module] Get Attempt {[Module]Id} {ModuleId}", id, moduleid);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                return null;
+            }
+        }
+
+        // POST api/<controller>
+        [HttpPost]
+        [Authorize(Policy = PolicyNames.EditModule)]
+        public async Task<Models.[Module]> Post([FromBody] Models.[Module] [Module])
+        {
+            if (ModelState.IsValid && IsAuthorizedEntityId(EntityNames.Module, [Module].ModuleId))
+            {
+                [Module] = await _[Module]Service.Add[Module]Async([Module]);
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized [Module] Post Attempt {[Module]}", [Module]);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                [Module] = null;
+            }
+            return [Module];
+        }
+
+        // PUT api/<controller>/5
+        [HttpPut("{id}")]
+        [Authorize(Policy = PolicyNames.EditModule)]
+        public async Task<Models.[Module]> Put(int id, [FromBody] Models.[Module] [Module])
+        {
+            if (ModelState.IsValid && [Module].[Module]Id == id && IsAuthorizedEntityId(EntityNames.Module, [Module].ModuleId))
+            {
+                [Module] = await _[Module]Service.Update[Module]Async([Module]);
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized [Module] Put Attempt {[Module]}", [Module]);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                [Module] = null;
+            }
+            return [Module];
+        }
+
+        // DELETE api/<controller>/5
+        [HttpDelete("{id}/{moduleid}")]
+        [Authorize(Policy = PolicyNames.EditModule)]
+        public async Task Delete(int id, int moduleid)
+        {
+            Models.[Module] [Module] = await _[Module]Service.Get[Module]Async(id, moduleid);
+            if ([Module] != null && IsAuthorizedEntityId(EntityNames.Module, [Module].ModuleId))
+            {
+                await _[Module]Service.Delete[Module]Async(id, [Module].ModuleId);
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized [Module] Delete Attempt {[Module]Id} {ModuleId}", id, moduleid);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+            }
+        }
+    }
+}

Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Server/Manager/[Module]Manager.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 [Owner].Module.[Module].Repository;
+using System.Threading.Tasks;
+
+namespace [Owner].Module.[Module].Manager
+{
+    public class [Module]Manager : MigratableModuleBase, IInstallable, IPortable, ISearchable
+    {
+        private readonly I[Module]Repository _[Module]Repository;
+        private readonly IDBContextDependencies _DBContextDependencies;
+
+        public [Module]Manager(I[Module]Repository [Module]Repository, IDBContextDependencies DBContextDependencies)
+        {
+            _[Module]Repository = [Module]Repository;
+            _DBContextDependencies = DBContextDependencies;
+        }
+
+        public bool Install(Tenant tenant, string version)
+        {
+            return Migrate(new [Module]Context(_DBContextDependencies), tenant, MigrationType.Up);
+        }
+
+        public bool Uninstall(Tenant tenant)
+        {
+            return Migrate(new [Module]Context(_DBContextDependencies), tenant, MigrationType.Down);
+        }
+
+        public string ExportModule(Oqtane.Models.Module module)
+        {
+            string content = "";
+            List<Models.[Module]> [Module]s = _[Module]Repository.Get[Module]s(module.ModuleId).ToList();
+            if ([Module]s != null)
+            {
+                content = JsonSerializer.Serialize([Module]s);
+            }
+            return content;
+        }
+
+        public void ImportModule(Oqtane.Models.Module module, string content, string version)
+        {
+            List<Models.[Module]> [Module]s = null;
+            if (!string.IsNullOrEmpty(content))
+            {
+                [Module]s = JsonSerializer.Deserialize<List<Models.[Module]>>(content);
+            }
+            if ([Module]s != null)
+            {
+                foreach(var [Module] in [Module]s)
+                {
+                    _[Module]Repository.Add[Module](new Models.[Module] { ModuleId = module.ModuleId, Name = [Module].Name });
+                }
+            }
+        }
+
+        public Task<List<SearchContent>> GetSearchContentsAsync(PageModule pageModule, DateTime lastIndexedOn)
+        {
+           var searchContentList = new List<SearchContent>();
+
+           foreach (var [Module] in _[Module]Repository.Get[Module]s(pageModule.ModuleId))
+           {
+               if ([Module].ModifiedOn >= lastIndexedOn)
+               {
+                   searchContentList.Add(new SearchContent
+                   {
+                       EntityName = "[Owner][Module]",
+                       EntityId = [Module].[Module]Id.ToString(),
+                       Title = [Module].Name,
+                       Body = [Module].Name,
+                       ContentModifiedBy = [Module].ModifiedBy,
+                       ContentModifiedOn = [Module].ModifiedOn
+                   });
+               }
+           }
+
+           return Task.FromResult(searchContentList);
+        }
+    }
+}

Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Server/Migrations/01000000_[Module]Initialize.cs

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

Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Server/Migrations/EntityBuilders/[Module]EntityBuilder.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 [Owner].Module.[Module].Migrations.EntityBuilders
+{
+    public class [Module]EntityBuilder : AuditableBaseEntityBuilder<[Module]EntityBuilder>
+    {
+        private const string _entityTableName = "[Owner][Module]";
+        private readonly PrimaryKey<[Module]EntityBuilder> _primaryKey = new("PK_[Owner][Module]", x => x.[Module]Id);
+        private readonly ForeignKey<[Module]EntityBuilder> _moduleForeignKey = new("FK_[Owner][Module]_Module", x => x.ModuleId, "Module", "ModuleId", ReferentialAction.Cascade);
+
+        public [Module]EntityBuilder(MigrationBuilder migrationBuilder, IDatabase database) : base(migrationBuilder, database)
+        {
+            EntityTableName = _entityTableName;
+            PrimaryKey = _primaryKey;
+            ForeignKeys.Add(_moduleForeignKey);
+        }
+
+        protected override [Module]EntityBuilder BuildTable(ColumnsBuilder table)
+        {
+            [Module]Id = AddAutoIncrementColumn(table,"[Module]Id");
+            ModuleId = AddIntegerColumn(table,"ModuleId");
+            Name = AddMaxStringColumn(table,"Name");
+            AddAuditableColumns(table);
+            return this;
+        }
+
+        public OperationBuilder<AddColumnOperation> [Module]Id { get; set; }
+        public OperationBuilder<AddColumnOperation> ModuleId { get; set; }
+        public OperationBuilder<AddColumnOperation> Name { get; set; }
+    }
+}

Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Server/Repository/[Module]Context.cs

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

Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Server/Repository/[Module]Repository.cs

@@ -0,0 +1,75 @@
+using Microsoft.EntityFrameworkCore;
+using System.Linq;
+using System.Collections.Generic;
+using Oqtane.Modules;
+
+namespace [Owner].Module.[Module].Repository
+{
+    public interface I[Module]Repository
+    {
+        IEnumerable<Models.[Module]> Get[Module]s(int ModuleId);
+        Models.[Module] Get[Module](int [Module]Id);
+        Models.[Module] Get[Module](int [Module]Id, bool tracking);
+        Models.[Module] Add[Module](Models.[Module] [Module]);
+        Models.[Module] Update[Module](Models.[Module] [Module]);
+        void Delete[Module](int [Module]Id);
+    }
+
+    public class [Module]Repository : I[Module]Repository, ITransientService
+    {
+        private readonly IDbContextFactory<[Module]Context> _factory;
+
+        public [Module]Repository(IDbContextFactory<[Module]Context> factory)
+        {
+            _factory = factory;
+        }
+
+        public IEnumerable<Models.[Module]> Get[Module]s(int ModuleId)
+        {
+            using var db = _factory.CreateDbContext();
+            return db.[Module].Where(item => item.ModuleId == ModuleId).ToList();
+        }
+
+        public Models.[Module] Get[Module](int [Module]Id)
+        {
+            return Get[Module]([Module]Id, true);
+        }
+
+        public Models.[Module] Get[Module](int [Module]Id, bool tracking)
+        {
+            using var db = _factory.CreateDbContext();
+            if (tracking)
+            {
+                return db.[Module].Find([Module]Id);
+            }
+            else
+            {
+                return db.[Module].AsNoTracking().FirstOrDefault(item => item.[Module]Id == [Module]Id);
+            }
+        }
+
+        public Models.[Module] Add[Module](Models.[Module] [Module])
+        {
+            using var db = _factory.CreateDbContext();
+            db.[Module].Add([Module]);
+            db.SaveChanges();
+            return [Module];
+        }
+
+        public Models.[Module] Update[Module](Models.[Module] [Module])
+        {
+            using var db = _factory.CreateDbContext();
+            db.Entry([Module]).State = EntityState.Modified;
+            db.SaveChanges();
+            return [Module];
+        }
+
+        public void Delete[Module](int [Module]Id)
+        {
+            using var db = _factory.CreateDbContext();
+            Models.[Module] [Module] = db.[Module].Find([Module]Id);
+            db.[Module].Remove([Module]);
+            db.SaveChanges();
+        }
+    }
+}

Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Server/Services/[Module]Service.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 [Owner].Module.[Module].Repository;
+
+namespace [Owner].Module.[Module].Services
+{
+    public class Server[Module]Service : I[Module]Service
+    {
+        private readonly I[Module]Repository _[Module]Repository;
+        private readonly IUserPermissions _userPermissions;
+        private readonly ILogManager _logger;
+        private readonly IHttpContextAccessor _accessor;
+        private readonly Alias _alias;
+
+        public Server[Module]Service(I[Module]Repository [Module]Repository, IUserPermissions userPermissions, ITenantManager tenantManager, ILogManager logger, IHttpContextAccessor accessor)
+        {
+            _[Module]Repository = [Module]Repository;
+            _userPermissions = userPermissions;
+            _logger = logger;
+            _accessor = accessor;
+            _alias = tenantManager.GetAlias();
+        }
+
+        public Task<List<Models.[Module]>> Get[Module]sAsync(int ModuleId)
+        {
+            if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.View))
+            {
+                return Task.FromResult(_[Module]Repository.Get[Module]s(ModuleId).ToList());
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized [Module] Get Attempt {ModuleId}", ModuleId);
+                return null;
+            }
+        }
+
+        public Task<Models.[Module]> Get[Module]Async(int [Module]Id, int ModuleId)
+        {
+            if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.View))
+            {
+                return Task.FromResult(_[Module]Repository.Get[Module]([Module]Id));
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized [Module] Get Attempt {[Module]Id} {ModuleId}", [Module]Id, ModuleId);
+                return null;
+            }
+        }
+
+        public Task<Models.[Module]> Add[Module]Async(Models.[Module] [Module])
+        {
+            if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, [Module].ModuleId, PermissionNames.Edit))
+            {
+                [Module] = _[Module]Repository.Add[Module]([Module]);
+                _logger.Log(LogLevel.Information, this, LogFunction.Create, "[Module] Added {[Module]}", [Module]);
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized [Module] Add Attempt {[Module]}", [Module]);
+                [Module] = null;
+            }
+            return Task.FromResult([Module]);
+        }
+
+        public Task<Models.[Module]> Update[Module]Async(Models.[Module] [Module])
+        {
+            if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, [Module].ModuleId, PermissionNames.Edit))
+            {
+                [Module] = _[Module]Repository.Update[Module]([Module]);
+                _logger.Log(LogLevel.Information, this, LogFunction.Update, "[Module] Updated {[Module]}", [Module]);
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized [Module] Update Attempt {[Module]}", [Module]);
+                [Module] = null;
+            }
+            return Task.FromResult([Module]);
+        }
+
+        public Task Delete[Module]Async(int [Module]Id, int ModuleId)
+        {
+            if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.Edit))
+            {
+                _[Module]Repository.Delete[Module]([Module]Id);
+                _logger.Log(LogLevel.Information, this, LogFunction.Delete, "[Module] Deleted {[Module]Id}", [Module]Id);
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized [Module] Delete Attempt {[Module]Id} {ModuleId}", [Module]Id, ModuleId);
+            }
+            return Task.CompletedTask;
+        }
+    }
+}

Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Server/Startup/[Module]ServerStartup.cs

@@ -0,0 +1,28 @@
+using Microsoft.AspNetCore.Builder; 
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using Oqtane.Infrastructure;
+using [Owner].Module.[Module].Repository;
+using [Owner].Module.[Module].Services;
+
+namespace [Owner].Module.[Module].Startup
+{
+    public class [Module]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<I[Module]Service, Server[Module]Service>();
+            services.AddDbContextFactory<[Module]Context>(opt => { }, ServiceLifetime.Transient);
+        }
+    }
+}

Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Shared/Models/[Module].cs

@@ -0,0 +1,15 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Oqtane.Models;
+
+namespace [Owner].Module.[Module].Models
+{
+    [Table("[Owner][Module]")]
+    public class [Module] : ModelBase
+    {
+        [Key]
+        public int [Module]Id { get; set; }
+        public int ModuleId { get; set; }
+        public string Name { get; set; }
+    }
+}

Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/internal.module.template.json

@@ -0,0 +1,6 @@
+{
+  "Title": "Default Module Template",
+  "Type": "Internal",
+  "Version": "10.0.0",
+  "Namespace": "[Owner].Module.[Module]"
+}

Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Resources/[Owner].Theme.[Theme]/Container.resx

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+	<!-- 
+		Microsoft ResX Schema
+
+		Version 1.3
+
+		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">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+			[base64 mime encoded serialized .NET Framework object]
+		</data>
+		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+		</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.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:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<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" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</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>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+</root>

Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Resources/[Owner].Theme.[Theme]/ContainerSettings.resx

@@ -117,16 +117,10 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="SynchronizeContent" xml:space="preserve">
+  <data name="Title.HelpText" xml:space="preserve">
-    <value>Synchronize Content</value>
+    <value>Specify If The Module Title Should Be Displayed</value>
   </data>
-  <data name="InsertImage" xml:space="preserve">
+  <data name="Title.Text" xml:space="preserve">
-    <value>Insert Image</value>
+    <value>Display Title</value>
-  </data>
-  <data name="Close" xml:space="preserve">
-    <value>Close</value>
-  </data>
-  <data name="Message.Require.Image" xml:space="preserve">
-    <value>You Must Select An Image To Insert</value>
   </data>
 </root>

Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Resources/[Owner].Theme.[Theme]/Theme.resx

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+	<!-- 
+		Microsoft ResX Schema
+
+		Version 1.3
+
+		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">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+			[base64 mime encoded serialized .NET Framework object]
+		</data>
+		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+		</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.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:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<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" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</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>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+</root>

Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Resources/[Owner].Theme.[Theme]/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/Server/wwwroot/Themes/Templates/Internal/Client/Themes/[Owner].Theme.[Theme]/Container1.razor

@@ -0,0 +1,46 @@
+@namespace [Owner].Theme.[Theme]
+@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 => "[Owner] [Theme] - Container1";
+
+    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/Server/wwwroot/Themes/Templates/Internal/Client/Themes/[Owner].Theme.[Theme]/ContainerSettings.razor

@@ -0,0 +1,50 @@
+@namespace [Owner].Theme.[Theme]
+@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 = "[Owner].Theme.[Theme].ContainerSettings, [Owner].Theme.[Theme].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/Server/wwwroot/Themes/Templates/Internal/Client/Themes/[Owner].Theme.[Theme]/Theme1.razor

@@ -0,0 +1,118 @@
+@namespace [Owner].Theme.[Theme]
+@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 => "Theme1";
+
+    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/Server/wwwroot/Themes/Templates/Internal/Client/Themes/[Owner].Theme.[Theme]/ThemeInfo.cs

@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+using Oqtane.Models;
+using Oqtane.Themes;
+using Oqtane.Shared;
+
+namespace [Owner].Theme.[Theme]
+{
+    public class ThemeInfo : ITheme
+    {
+        public Oqtane.Models.Theme Theme => new Oqtane.Models.Theme
+        {
+            Name = "[Owner] [Theme]",
+            Version = "1.0.0",
+            PackageName = "[Owner].Theme.[Theme]",
+            ThemeSettingsType = "[Owner].Theme.[Theme].ThemeSettings, [Owner].Theme.[Theme].Client.Oqtane",
+            ContainerSettingsType = "[Owner].Theme.[Theme].ContainerSettings, [Owner].Theme.[Theme].Client.Oqtane",
+            Resources = new List<Resource>()
+            {
+		// obtained from https://cdnjs.com/libraries
+                new Stylesheet(Constants.BootstrapStylesheetUrl, Constants.BootstrapStylesheetIntegrity, "anonymous"),
+                new Stylesheet("~/Theme.css"),
+                new Script(Constants.BootstrapScriptUrl, Constants.BootstrapScriptIntegrity, "anonymous")
+            }
+        };
+
+    }
+}

Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Themes/[Owner].Theme.[Theme]/ThemeSettings.razor

@@ -0,0 +1,140 @@
+@namespace [Owner].Theme.[Theme]
+@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 = "[Owner].Theme.[Theme].ThemeSettings, [Owner].Theme.[Theme].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/Server/wwwroot/Themes/Templates/Internal/Server/wwwroot/Themes/[Owner].Theme.[Theme]/Theme.css

@@ -1,4 +1,4 @@
-/* Oqtane Styles */
+/* Oqtane Styles */ 
 
 body {
     padding-top: 7rem;
@@ -48,6 +48,7 @@ body {
 .app-menu .nav-item {
     font-size: 0.9rem;
     padding-bottom: 0.5rem;
+    white-space: nowrap;
 }
 
 .app-menu .nav-item a {
@@ -89,10 +90,10 @@ div.app-moduleactions a.dropdown-toggle, div.app-moduleactions div.dropdown-menu
   mix-blend-mode: difference;
 }
 
-@media (max-width: 767px) {
+@media (max-width: 767.98px) {
 
     .app-menu {
-        width: 100%
+        width: 100%;
     }
 
     .navbar {

Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/internal.theme.template.json

@@ -0,0 +1,6 @@
+{
+  "Title": "Default Theme Template",
+  "Type": "Internal",
+  "Version": "10.0.0",
+  "Namespace": "[Owner].Theme.[Theme]"
+}

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

@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net10.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="10.0.3" />
+  </ItemGroup>
+
+</Project>

Oqtane.Client/App.razor

@@ -1,91 +0,0 @@
-@using Microsoft.AspNetCore.Http
-@inject IInstallationService InstallationService
-@inject IJSRuntime JSRuntime
-@inject SiteState SiteState
-
-@if (_initialized)
-{
-    @if (!_installation.Success)
-    {
-        <Installer />
-    }
-    else
-    {
-        @if (string.IsNullOrEmpty(_installation.Message))
-        {
-            <div style="@_display">
-                <CascadingAuthenticationState>
-                    <CascadingValue Value="@PageState">
-                        <SiteRouter Runtime="@Runtime" RenderMode="@RenderMode" VisitorId="@VisitorId" OnStateChange="@ChangeState" />
-                    </CascadingValue>
-                </CascadingAuthenticationState>
-            </div>
-        }
-        else
-        {
-            <div class="app-alert">
-                @_installation.Message
-            </div>
-        }
-    }
-}
-
-@code {
-    [Parameter]
-    public string AntiForgeryToken { get; set; }
-
-    [Parameter]
-    public string Runtime { get; set; }
-
-    [Parameter]
-    public string RenderMode { get; set; }
-
-    [Parameter]
-    public int VisitorId { get; set; }
-
-    [Parameter]
-    public string RemoteIPAddress { get; set; }
-
-    [Parameter]
-    public string AuthorizationToken { get; set; }
-
-    [CascadingParameter]
-    HttpContext HttpContext { get; set; }
-
-    private bool _initialized = false;
-    private string _display = "display: none;";
-    private Installation _installation = new Installation { Success = false, Message = "" };
-
-    private PageState PageState { get; set; }
-
-    protected override async Task OnParametersSetAsync()
-    {
-        SiteState.RemoteIPAddress = RemoteIPAddress;
-        SiteState.AntiForgeryToken = AntiForgeryToken;
-        SiteState.AuthorizationToken = AuthorizationToken;
-        SiteState.IsPrerendering = (HttpContext != null) ? true : false;
-
-        _installation = await InstallationService.IsInstalled();
-        if (_installation.Alias != null)
-        {
-            SiteState.Alias = _installation.Alias;
-        }
-        _initialized = true;
-    }
-
-    protected override void OnAfterRender(bool firstRender)
-    {
-        if (firstRender)
-        {
-            // prevents flash on initial page load
-            _display = "";
-            StateHasChanged();
-        }
-    }
-
-    private void ChangeState(PageState pageState)
-    {
-        PageState = pageState;
-        StateHasChanged();
-    }
-}

Oqtane.Client/Extensions/OqtaneServiceCollectionExtensions.cs

@@ -1,27 +1,31 @@
 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
 {
     public static class OqtaneServiceCollectionExtensions
     {
-        public static IServiceCollection AddOqtaneAuthorization(this IServiceCollection services)
+        public static IServiceCollection AddOqtaneAuthentication(this IServiceCollection services)
         {
             services.AddAuthorizationCore();
+            services.AddCascadingAuthenticationState();
             services.AddScoped<IdentityAuthenticationStateProvider>();
             services.AddScoped<AuthenticationStateProvider>(s => s.GetRequiredService<IdentityAuthenticationStateProvider>());
 
             return services;
         }
 
-        public static IServiceCollection AddOqtaneScopedServices(this IServiceCollection services)
+        public static IServiceCollection AddOqtaneClientScopedServices(this IServiceCollection services)
         {
             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>();
@@ -37,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>();
@@ -49,6 +53,21 @@ namespace Microsoft.Extensions.DependencyInjection
             services.AddScoped<IUrlMappingService, UrlMappingService>();
             services.AddScoped<IVisitorService, VisitorService>();
             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 8)</div>
+            <div style="font-weight: bold">@SharedLocalizer["Version"] @Constants.Version (.NET @Environment.Version.Major)</div>
         </div>
     </div>
     <hr class="app-rule" />
@@ -69,16 +69,16 @@
             <h2>@Localizer["ApplicationAdmin"]</h2><br />
             <div class="container">
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="username" HelpText="Provide a username for the primary user accountt" ResourceKey="Username">Username:</Label>
+                    <Label Class="col-sm-3" For="username" HelpText="Provide a username for the primary user account" ResourceKey="Username">Username:</Label>
                     <div class="col-sm-9">
-                        <input id="username" type="text" class="form-control" @bind="@_hostUsername" />
+                        <input id="username" type="text" class="form-control" maxlength="256" @bind="@_hostUsername" />
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="password" HelpText="Provide a password for the primary user account" ResourceKey="Password">Password:</Label>
                     <div class="col-sm-9">
 						<div class="input-group">
-							<input id="password" type="@_passwordType" class="form-control" @bind="@_hostPassword" autocomplete="new-password" />
+                            <input id="password" type="@_passwordType" class="form-control" maxlength="256" @bind="@_hostPassword" autocomplete="new-password" />
                             <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglePassword</button>
 						</div>
                     </div>
@@ -87,7 +87,7 @@
                     <Label Class="col-sm-3" For="confirm" HelpText="Please confirm the password entered above by entering it again" ResourceKey="Confirm">Confirm:</Label>
                     <div class="col-sm-9">
 						<div class="input-group">
-							<input id="confirm" type="@_confirmPasswordType" class="form-control" @bind="@_confirmPassword" autocomplete="new-password" />
+                            <input id="confirm" type="@_confirmPasswordType" class="form-control" maxlength="256" @bind="@_confirmPassword" autocomplete="new-password" />
                             <button type="button" class="btn btn-secondary" @onclick="@ToggleConfirmPassword" tabindex="-1">@_toggleConfirmPassword</button>
 						</div>
                     </div>
@@ -95,7 +95,13 @@
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="email" HelpText="Provide the email address for the host user account" ResourceKey="Email">Email:</Label>
                     <div class="col-sm-9">
-                        <input type="text" class="form-control" @bind="@_hostEmail" />
+                        <input type="text" class="form-control" maxlength="256" @bind="@_hostEmail" />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="name" HelpText="Provide the full name of the host user" ResourceKey="Name">Full Name:</Label>
+                    <div class="col-sm-9">
+                        <input type="text" class="form-control" maxlength="50" @bind="@_hostName" />
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
@@ -153,130 +159,134 @@
     private string _toggleConfirmPassword = string.Empty;
     private string _confirmPassword = string.Empty;
     private string _hostEmail = string.Empty;
+    private string _hostName = string.Empty;
     private List<SiteTemplate> _templates;
     private string _template = Constants.DefaultSiteTemplate;
     private bool _register = true;
-	private string _message = string.Empty;
+    private string _message = string.Empty;
-	private string _loadingDisplay = "display: none;";
+    private string _loadingDisplay = "display: none;";
 
-	protected override async Task OnInitializedAsync()
+    protected override async Task OnInitializedAsync()
-	{
+    {
         // include CSS
-        var content = "<link rel=\"stylesheet\" href=\"https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.0/css/bootstrap.min.css\" integrity=\"sha512-t4GWSVZO1eC8BM339Xd7Uphw5s17a86tIZIj8qRxhnKub6WoyhnrxeCIMeAqBPgdZGlCcG2PrZjMc+Wr78+5Xg==\" crossorigin=\"anonymous\" type=\"text/css\"/>";
+        var content = $"<link rel=\"stylesheet\" href=\"{Constants.BootstrapStylesheetUrl}\" integrity=\"{Constants.BootstrapStylesheetIntegrity}\" crossorigin=\"anonymous\" type=\"text/css\"/>";
         SiteState.AppendHeadContent(content);
 
         _togglePassword = SharedLocalizer["ShowPassword"];
-		_toggleConfirmPassword = SharedLocalizer["ShowPassword"];
+        _toggleConfirmPassword = SharedLocalizer["ShowPassword"];
 
-		_databases = await DatabaseService.GetDatabasesAsync();
+        _databases = await DatabaseService.GetDatabasesAsync();
-		if (_databases.Exists(item => item.IsDefault))
+        if (_databases.Exists(item => item.IsDefault))
-		{
+        {
-			_databaseName = _databases.Find(item => item.IsDefault).Name;
+            _databaseName = _databases.Find(item => item.IsDefault).Name;
-		}
+        }
-		else
+        else
-		{
+        {
-			_databaseName = "LocalDB";
+            _databaseName = Constants.DefaultDBName;
-		}
+        }
-		LoadDatabaseConfigComponent();
+        LoadDatabaseConfigComponent();
 
         _templates = await SiteTemplateService.GetSiteTemplatesAsync();
     }
 
-	private void DatabaseChanged(ChangeEventArgs eventArgs)
+    private void DatabaseChanged(ChangeEventArgs eventArgs)
-	{
+    {
-		try
+        try
-		{
+        {
-			_databaseName = (string)eventArgs.Value;
+            _databaseName = (string)eventArgs.Value;
-			_showConnectionString = false;
+            _showConnectionString = false;
-			LoadDatabaseConfigComponent();
+            LoadDatabaseConfigComponent();
-		}
+        }
-		catch
+        catch
-		{
+        {
-			_message = Localizer["Error.DbConfig.Load"];
+            _message = Localizer["Error.DbConfig.Load"];
-		}
+        }
-	}
+    }
 
-	private void LoadDatabaseConfigComponent()
+    private void LoadDatabaseConfigComponent()
-	{
+    {
-		var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
+        var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
-		if (database != null)
+        if (database != null)
-		{
+        {
-			_databaseConfigType = Type.GetType(database.ControlType);
+            _databaseConfigType = Type.GetType(database.ControlType);
-			DatabaseConfigComponent = builder =>
+            DatabaseConfigComponent = builder =>
-			{
+            {
-				builder.OpenComponent(0, _databaseConfigType);
+                builder.OpenComponent(0, _databaseConfigType);
-				builder.AddComponentReferenceCapture(1, inst => { _databaseConfig = Convert.ChangeType(inst, _databaseConfigType); });
+                builder.AddComponentReferenceCapture(1, inst => { _databaseConfig = Convert.ChangeType(inst, _databaseConfigType); });
-				builder.CloseComponent();
+                builder.CloseComponent();
-			};
+            };
-		}
+        }
-	}
+    }
 
-	protected override async Task OnAfterRenderAsync(bool firstRender)
+    protected override async Task OnAfterRenderAsync(bool firstRender)
-	{
+    {
-		if (firstRender)
+        if (firstRender)
-		{
+        {
             // include JavaScript
-			var interop = new Interop(JSRuntime);
+            var interop = new Interop(JSRuntime);
-            await interop.IncludeScript("", "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.0/js/bootstrap.bundle.min.js", "sha512-VK2zcvntEufaimc+efOYi622VN5ZacdnufnmX7zIhCPmjhKnOi9ZDMtg1/ug5l183f19gG1/cBstPO4D8N/Img==", "anonymous", "", "head");
+            await interop.IncludeScript("", Constants.BootstrapScriptUrl, Constants.BootstrapScriptIntegrity, "anonymous", "", "head");
-		}
+        }
-	}
+    }
 
-	private async Task Install()
+    private async Task Install()
-	{
+    {
-		var connectionString = String.Empty;
+        var connectionString = String.Empty;
-		if (_showConnectionString)
+        if (_showConnectionString)
-		{
+        {
-			connectionString = _connectionString;
+            connectionString = _connectionString;
-		}
+        }
-		else
+        else
-		{
+        {
-			if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
+            if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
-			{
+            {
-				connectionString = databaseConfigControl.GetConnectionString();
+                connectionString = databaseConfigControl.GetConnectionString();
-			}
+            }
-		}
+        }
 
-		if (connectionString != "" && !string.IsNullOrEmpty(_hostUsername) && !string.IsNullOrEmpty(_hostPassword) && _hostPassword == _confirmPassword && !string.IsNullOrEmpty(_hostEmail) && _hostEmail.Contains("@"))
+        if (connectionString != "" && !string.IsNullOrEmpty(_hostUsername) && !string.IsNullOrEmpty(_hostPassword) && _hostPassword == _confirmPassword && !string.IsNullOrEmpty(_hostEmail) && _hostEmail.Contains("@") && !string.IsNullOrEmpty(_hostName))
-		{
+        {
-			if (await UserService.ValidatePasswordAsync(_hostPassword))
+            var result = await UserService.ValidateUserAsync(_hostUsername, _hostEmail, _hostPassword);
-			{
+            if (result.Succeeded)
-				_loadingDisplay = "";
+            {
-				StateHasChanged();
+                _loadingDisplay = "";
+                StateHasChanged();
 
-				Uri uri = new Uri(NavigationManager.Uri);
+                Uri uri = new Uri(NavigationManager.Uri);
 
-				var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
+                var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
 
-				var config = new InstallConfig
+                var config = new InstallConfig
-				{
+                    {
-					DatabaseType = database.DBType,
+                        DatabaseType = database.DBType,
-					ConnectionString = connectionString,
+                        ConnectionString = connectionString,
-					Aliases = uri.Authority,
+                        Aliases = uri.Authority,
-					HostUsername = _hostUsername,
+                        HostUsername = _hostUsername,
-					HostPassword = _hostPassword,
+                        HostPassword = _hostPassword,
-					HostEmail = _hostEmail,
+                        HostEmail = _hostEmail,
-					HostName = _hostUsername,
+                        HostName = _hostName,
-					TenantName = TenantNames.Master,
+                        TenantName = TenantNames.Master,
-					IsNewTenant = true,
+                        IsNewTenant = true,
-					SiteName = Constants.DefaultSite,
+                        SiteName = Constants.DefaultSite,
-					Register = _register,
+                        Register = _register,
-                    SiteTemplate = _template
+                        SiteTemplate = _template,
-				};
+                        RenderMode = "", // provided by appsettings.json
+                        Runtime = "" // provided by appsettings.json
+                    };
 
-				var installation = await InstallationService.Install(config);
+                var installation = await InstallationService.Install(config);
-				if (installation.Success)
+                if (installation.Success)
-				{
+                {
-					NavigationManager.NavigateTo(uri.Scheme + "://" + uri.Authority, true);
+                    NavigationManager.NavigateTo(uri.Scheme + "://" + uri.Authority, true);
-				}
+                }
-				else
+                else
-				{
+                {
-					_message = installation.Message;
+                    _message = installation.Message;
-					_loadingDisplay = "display: none;";
+                    _loadingDisplay = "display: none;";
-				}				
+                }
-			}
+            }
-			else
+            else
-			{
+            {
-				_message = Localizer["Message.Password.Invalid"];				
+                _message = string.Join("<br />", result.Errors.Select(i => !string.IsNullOrEmpty(i.Value) ? i.Value : Localizer[i.Key]));
 			}
 		}
 		else

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

@@ -12,24 +12,31 @@
             if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.PermissionList))
             {
                 string url = NavigateUrl(p.Path);
-                <p class="col-md-2 mx-auto text-center mb-3">
+                <div class="col-md-2 mx-auto text-center my-3">
-                    <NavLink class="nav-link text-body" href="@url" Match="NavLinkMatch.All">
+                    <NavLink class="nav-link text-body" href="@url" Match="NavLinkMatch.All" @attributes="_attributes">
                         <h2><span class="@p.Icon" aria-hidden="true"></span></h2>
-                        <p class="lead">@((MarkupString)SharedLocalizer[p.Name].ToString().Replace(" ", "<br />"))</p>
+                        <div class="lead">@((MarkupString)SharedLocalizer[p.Name].ToString().Replace(" ", "<br />"))</div>
                     </NavLink>
-                </p>
+                </div>
             }
         }
     </div>
 }
 
 @code {
-	private List<Page> _pages;
+    Dictionary<string, object> _attributes { get; set; } = new();
+    private List<Page> _pages;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
+    public override string RenderMode => RenderModes.Static;
 
 	protected override void OnInitialized()
 	{
+        if (PageState.RenderMode == RenderModes.Static && !PageState.Site.EnhancedNavigation)
+        {
+            _attributes.Add("data-enhance-nav", "true"); // Admin Dashboard utilizes enhanced navigation 
+        }
+
 		var admin = PageState.Pages.FirstOrDefault(item => item.Path == "admin");
 		if (admin != null)
 		{

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

@@ -40,10 +40,14 @@
                 </div>
             </div>
         </div>
+        <br />
         <button type="button" class="btn btn-success" @onclick="SaveFile">@SharedLocalizer["Save"]</button>
         <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
-        <br />
+        @if (_name.ToLower().EndsWith(".zip"))
-        <br />
+        {
+            <button type="button" class="btn btn-primary mx-1" @onclick="UnzipFile">Unzip</button>            
+        }
+        <br /><br />
         <AuditInfo CreatedBy="@_createdBy" CreatedOn="@_createdOn" ModifiedBy="@_modifiedBy" ModifiedOn="@_modifiedOn"></AuditInfo>
     </form>
 }
@@ -126,4 +130,18 @@
             AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
+
+    private async Task UnzipFile()
+    {
+        try
+        {
+            await FileService.UnzipFileAsync(_fileId);
+            NavigationManager.NavigateTo(NavigateUrl());
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Unzipping File {FileId} {Error}", _fileId, ex.Message);
+            AddModuleMessage(Localizer["Error.File.Unzip"], MessageType.Error);
+        }
+    }
 }

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

@@ -8,67 +8,95 @@
 
 @if (_folders != null)
 {
-    <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+    <TabStrip>
-        <div class="container">
+        <TabPanel Name="Settings" ResourceKey="Settings" Heading="Settings">
-            <div class="row mb-1 align-items-center">
+            <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
-                <Label Class="col-sm-3" For="parent" HelpText="Select the parent folder" ResourceKey="Parent">Parent: </Label>
+                <div class="container">
-                <div class="col-sm-9">
+                    <div class="row mb-1 align-items-center">
-                    <select id="parent" class="form-select" @bind="@_parentId" required>
+                        <Label Class="col-sm-3" For="parent" HelpText="Select the parent folder" ResourceKey="Parent">Parent: </Label>
-                        @if (PageState.QueryString.ContainsKey("id"))
+                        <div class="col-sm-9">
-                        {
+                            @if (_parentId == -1)
-                            <option value="-1">&lt;@Localizer["NoParent"]&gt;</option>
+                            {
-                        }
+                                <select id="parent" class="form-select" @bind="@_parentId" required>
-                        @foreach (Folder folder in _folders)
+                                    <option value="-1">&lt;@Localizer["NoParent"]&gt;</option>
-                        {
+                                </select>
-                            <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
+                            }
-                        }
+                            else
-                    </select>
+                            {
+                                <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">
+                        <Label Class="col-sm-3" For="type" HelpText="Select the folder type. Private folders are only accessible by authorized users. Public folders can be accessed by all users" ResourceKey="Type">Type: </Label>
+                        <div class="col-sm-9">
+                            @if (PageState.QueryString.ContainsKey("id"))
+                            {
+                                <input id="type" class="form-control" readonly @bind="@_type" />
+                            }
+                            else
+                            {
+                                <select id="type" class="form-select" @bind="@_type" required>
+                                    <option value="@FolderTypes.Private">@Localizer[FolderTypes.Private]</option>
+                                    <option value="@FolderTypes.Public">@Localizer[FolderTypes.Public]</option>
+                                </select>
+                            }
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="capacity" HelpText="Enter the maximum folder capacity (in megabytes). Specify zero if the capacity is unlimited." ResourceKey="Capacity">Capacity: </Label>
+                        <div class="col-sm-9">
+                            <input id="capacity" class="form-control" @bind="@_capacity" required />
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="cachecontrol" HelpText="Optionally provide a Cache-Control directive for this folder. For example 'public, max-age=60' indicates that files in this folder should be cached for 60 seconds. Please note that when caching is enabled, changes to files will not be immediately reflected in the UI." ResourceKey="CacheControl">Caching: </Label>
+                        <div class="col-sm-9">
+                            <input id="cachecontrol" class="form-control" @bind="@_cachecontrol" maxlength="50" />
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="imagesizes" HelpText="Optionally enter a list of image sizes which can be generated dynamically from uploaded images (ie. 200x200,400x400). Use * to indicate the folder supports all image sizes (not recommended)." ResourceKey="ImageSizes">Image Sizes: </Label>
+                        <div class="col-sm-9">
+                            <input id="imagesizes" class="form-control" @bind="@_imagesizes" maxlength="512" />
+                        </div>
+                    </div>
                 </div>
-            </div>
+                @if (PageState.QueryString.ContainsKey("id"))
-            <div class="row mb-1 align-items-center">
+                {
-                <Label Class="col-sm-3" For="name" HelpText="Enter the folder name" ResourceKey="Name">Name: </Label>
+                    <br />
-                <div class="col-sm-9">
+                    <AuditInfo CreatedBy="@_createdBy" CreatedOn="@_createdOn" ModifiedBy="@_modifiedBy" ModifiedOn="@_modifiedOn"></AuditInfo>
-                    <input id="name" class="form-control" @bind="@_name" maxlength="256" required />
+                }
-                </div>
+            </form>
-            </div>
+        </TabPanel>
-            <div class="row mb-1 align-items-center">
+        <TabPanel Name="Permissions" ResourceKey="Permissions" Heading="Permissions">
-                <Label Class="col-sm-3" For="type" HelpText="Select the folder type. Private folders are only accessible by authorized users. Public folders can be accessed by all users" ResourceKey="Type">Type: </Label>
+            <div class="container">
-                <div class="col-sm-9">
+                <div class="row mb-1 align-items-center">
-                    @if (PageState.QueryString.ContainsKey("id"))
-                    {
-                        <input id="type" class="form-control" readonly @bind="@_type" />
-                    }
-                    else
-                    {
-                        <select id="type" class="form-select" @bind="@_type" required>
-                            <option value="@FolderTypes.Private">@Localizer[FolderTypes.Private]</option>
-                            <option value="@FolderTypes.Public">@Localizer[FolderTypes.Public]</option>
-                        </select>
-                    }
-                </div>
-            </div>
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="imagesizes" HelpText="Enter a list of image sizes which can be generated dynamically from uploaded images (ie. 200x200,400x400). Use * to indicate the folder supports all image sizes." ResourceKey="ImageSizes">Image Sizes: </Label>
-                <div class="col-sm-9">
-                    <input id="imagesizes" class="form-control" @bind="@_imagesizes" maxlength="512" />
-                </div>
-            </div>
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="capacity" HelpText="Enter the maximum folder capacity (in megabytes). Specify zero if the capacity is unlimited." ResourceKey="Capacity">Capacity: </Label>
-                <div class="col-sm-9">
-                    <input id="capacity" class="form-control" @bind="@_capacity" required />
-                </div>
-            </div>
-            <div class="row mb-1 align-items-center">
-                <div class="col-sm-12">
-                    <Label Class="col-sm-3" For="permissions" HelpText="Select the permissions you want for the folder" ResourceKey="Permissions">Permissions: </Label>
                     <PermissionGrid EntityName="@EntityNames.Folder" PermissionNames="@(PermissionNames.Browse + "," + PermissionNames.View + "," + PermissionNames.Edit)" PermissionList="@_permissions" @ref="_permissionGrid" />
                 </div>
             </div>
-        </div>
+        </TabPanel>
-    </form>
+    </TabStrip>
-    <br /><br />
 
+    <br />
     @if (!_isSystem)
     {
         <button type="button" class="btn btn-success" @onclick="SaveFolder">@SharedLocalizer["Save"]</button>
@@ -80,11 +108,6 @@
         @((MarkupString)"&nbsp;")
         <ActionDialog Header="Delete Folder" Message="Are You Sure You Wish To Delete This Folder?" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteFolder())" ResourceKey="DeleteFolder" />
     }
-    <br /><br />
-    @if (PageState.QueryString.ContainsKey("id"))
-    {
-        <AuditInfo CreatedBy="@_createdBy" CreatedOn="@_createdOn" ModifiedBy="@_modifiedBy" ModifiedOn="@_modifiedOn"></AuditInfo>
-    }
 }
 
 @code {
@@ -95,8 +118,9 @@
     private int _parentId = -1;
     private string _name;
     private string _type = FolderTypes.Private;
-    private string _imagesizes = string.Empty;
     private string _capacity = "0";
+    private string _cachecontrol = string.Empty;
+    private string _imagesizes = string.Empty;
     private bool _isSystem;
     private List<Permission> _permissions = null;
     private string _createdBy;
@@ -127,8 +151,9 @@
                     _parentId = folder.ParentId ?? -1;
                     _name = folder.Name;
                     _type = folder.Type;
-                    _imagesizes = folder.ImageSizes;
                     _capacity = folder.Capacity.ToString();
+                    _cachecontrol = folder.CacheControl;
+                    _imagesizes = folder.ImageSizes;
                     _isSystem = folder.IsSystem;
                     _permissions = folder.PermissionList;
                     _createdBy = folder.CreatedBy;
@@ -170,6 +195,7 @@
             try
             {
                 Folder folder;
+
                 if (_folderId != -1)
                 {
                     folder = await FolderService.GetFolderAsync(_folderId);
@@ -179,8 +205,6 @@
                     folder = new Folder();
                 }
 
-                folder.SiteId = PageState.Site.SiteId;
-
                 if (_parentId == -1)
                 {
                     folder.ParentId = null;
@@ -190,10 +214,19 @@
                     folder.ParentId = _parentId;
                 }
 
+                // check for duplicate folder names
+                if (_folders.Any(item => item.ParentId == folder.ParentId && item.Name == _name && item.FolderId != _folderId))
+                {
+                    AddModuleMessage(Localizer["Message.Folder.Duplicate"], MessageType.Warning);
+                    return;
+                }
+
+                folder.SiteId = PageState.Site.SiteId;
                 folder.Name = _name;
                 folder.Type = _type;
-                folder.ImageSizes = _imagesizes;
                 folder.Capacity = int.Parse(_capacity);
+                folder.CacheControl = _cachecontrol;
+                folder.ImageSizes = _imagesizes;
                 folder.IsSystem = _isSystem;
                 folder.PermissionList = _permissionGrid.GetPermissionList();
 
@@ -208,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());
                 }
@@ -244,17 +276,9 @@
             }
             if (!isparent)
             {
-                var files = await FileService.GetFilesAsync(_folderId);
+                await FolderService.DeleteFolderAsync(_folderId);
-                if (files.Count == 0)
+                await logger.LogInformation("Folder Deleted {Folder}", _folderId);
-                {
+                NavigationManager.NavigateTo(NavigateUrl());
-                    await FolderService.DeleteFolderAsync(_folderId);
-                    await logger.LogInformation("Folder Deleted {Folder}", _folderId);
-                    NavigationManager.NavigateTo(NavigateUrl());
-                }
-                else
-                {
-                    AddModuleMessage(Localizer["Message.Folder.Files.InvalidDelete"], MessageType.Warning);
-                }
             }
             else
             {

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

@@ -3,54 +3,92 @@
 @inject NavigationManager NavigationManager
 @inject IFolderService FolderService
 @inject IFileService FileService
+@inject ISettingService SettingService
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (_files != null)
+@if (_files == null)
 {
-    <div class="row">
+    <p>
-        <div class="col-md mb-1">
+        <em>@SharedLocalizer["Loading"]</em>
-            <ActionLink Action="Edit" Text="Add Folder" Class="btn btn-secondary" ResourceKey="AddFolder" />
+    </p>
-        </div>
+}
-        <div class="col-md-8 mb-1">
+else
-            <div class="input-group">
+{
-                <span class="input-group-text">@Localizer["Folder"]:</span>
+    <TabStrip>
-                <select class="form-select" @onchange="(e => FolderChanged(e))">
+        <TabPanel Name="Files" Heading="Files" ResourceKey="Files">
-                    @foreach (Folder folder in _folders)
+            <div class="row">
-                    {
+                <div class="col-md mb-1">
-                        <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
+                    <ActionLink Action="Edit" Text="Add Folder" Class="btn btn-secondary" ResourceKey="AddFolder" />
-                    }
+                </div>
-                </select>
+                <div class="col-md-8 mb-1">
-                <ActionLink Action="Edit" Text="Edit Folder" Class="btn btn-secondary" Parameters="@($"id=" + _folderId.ToString())" ResourceKey="EditFolder" />&nbsp;
+                    <div class="input-group">
+                        <span class="input-group-text">@Localizer["Folder"]:</span>
+                        <select class="form-select" @onchange="(e => FolderChanged(e))">
+                            @foreach (Folder folder in _folders)
+                            {
+                                <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
+                            }
+                        </select>
+                        <ActionLink Action="Edit" Text="Edit Folder" Class="btn btn-secondary" Parameters="@($"id=" + _folderId.ToString())" ResourceKey="EditFolder" />&nbsp;
+                    </div>
+                </div>
+                <div class="col-md mb-1 text-end">
+                    <ActionLink Action="Add" Text="Upload Files" Parameters="@($"id=" + _folderId.ToString())" ResourceKey="UploadFiles" />
+                </div>
             </div>
-        </div>
-        <div class="col-md mb-1 text-end">
-            <ActionLink Action="Add" Text="Upload Files" Parameters="@($"id=" + _folderId.ToString())" ResourceKey="UploadFiles" />
-        </div>
-    </div>
 
-    <Pager Items="@_files" SearchProperties="Name">
+            @if (_files.Count != 0)
-        <Header>
+            {
-        <th style="width: 1px;">&nbsp;</th>
+                <Pager Items="@_files" SearchProperties="Name">
-        <th style="width: 1px;">&nbsp;</th>
+                    <Header>
-        <th>@SharedLocalizer["Name"]</th>
+                        <th style="width: 1px;">&nbsp;</th>
-        <th>@Localizer["Modified"]</th>
+                        <th style="width: 1px;">&nbsp;</th>
-        <th>@Localizer["Type"]</th>
+                        <th>@SharedLocalizer["Name"]</th>
-        <th>@Localizer["Size"]</th>
+                        <th>@Localizer["Modified"]</th>
-        </Header>
+                        <th>@Localizer["Type"]</th>
-        <Row>
+                        <th>@Localizer["Size"]</th>
-            <td><ActionLink Action="Details" Text="Edit" Parameters="@($"id=" + context.FileId.ToString())" ResourceKey="Details" /></td>
+                    </Header>
-            <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>
+                    <Row>
-            <td><a href="@context.Url" target="_new">@context.Name</a></td>
+                        <td><ActionLink Action="Details" Text="Edit" Parameters="@($"id=" + context.FileId.ToString())" ResourceKey="Details" /></td>
-            <td>@context.ModifiedOn</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>@context.Extension.ToUpper() @SharedLocalizer["File"]</td>
+                        <td><a href="@context.Url" target="_new">@context.Name</a></td>
-            <td>@string.Format("{0:0.00}", ((decimal)context.Size / 1000)) KB</td>
+                        <td>@UtcToLocal(context.ModifiedOn)</td>
-        </Row>
+                        <td>@context.Extension.ToUpper() @SharedLocalizer["File"]</td>
-    </Pager>
+                        <td>@string.Format("{0:0.00}", ((decimal)context.Size / 1000)) KB</td>
-    @if (_files.Count == 0)
+                    </Row>
-    {
+                </Pager>
-        <div class="text-center">@Localizer["NoFiles"]</div>
+            }
-    }
+            else
+            {
+                <div class="text-center">@Localizer["NoFiles"]</div>
+            }
+        </TabPanel>
+        <TabPanel Name="Settings" Heading="Settings" ResourceKey="Settings" Security="SecurityAccessLevel.Admin">
+			<div class="container">
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="imageExt" HelpText="Enter a comma separated list of image file extensions" ResourceKey="ImageExtensions">Image Extensions: </Label>
+                    <div class="col-sm-9">
+                        <input id="imageExt" spellcheck="false" class="form-control" @bind="@_imageFiles" />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="uploadableFileExt" HelpText="Enter a comma separated list of uploadable file extensions" ResourceKey="UploadableFileExtensions">Uploadable File Extensions: </Label>
+                    <div class="col-sm-9">
+                        <input id="uploadableFileExt" spellcheck="false" class="form-control" @bind="@_uploadableFiles" />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="maxChunkSize" HelpText="Files are split into chunks to streamline the upload process. Specify the maximum chunk size in MB (note that higher chunk sizes should only be used on faster networks)." ResourceKey="MaxChunkSize">Max Upload Chunk Size (MB): </Label>
+                    <div class="col-sm-9">
+                        <input id="maxChunkSize" type="number" min="1" max="10" step="1" class="form-control" @bind="@_maxChunkSize" />
+                    </div>
+                </div>
+            </div>
+            <br />
+            <button type="button" class="btn btn-success" @onclick="SaveSiteSettings">@SharedLocalizer["Save"]</button>
+        </TabPanel>
+    </TabStrip>
 }
 
 @code {
@@ -58,6 +96,10 @@
     private int _folderId = -1;
     private List<File> _files;
 
+    private string _imageFiles = string.Empty;
+    private string _uploadableFiles = string.Empty;
+    private int _maxChunkSize = 1;
+
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
     protected override async Task OnParametersSetAsync()
@@ -71,6 +113,13 @@
                 _folderId = _folders[0].FolderId;
                 await GetFiles();
             }
+
+            var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+            _imageFiles = SettingService.GetSetting(settings, "ImageFiles", Constants.ImageFiles);
+            _imageFiles = (string.IsNullOrEmpty(_imageFiles)) ? Constants.ImageFiles : _imageFiles;
+            _uploadableFiles = SettingService.GetSetting(settings, "UploadableFiles", Constants.UploadableFiles);
+            _uploadableFiles = (string.IsNullOrEmpty(_uploadableFiles)) ? Constants.UploadableFiles : _uploadableFiles;
+            _maxChunkSize = int.Parse(SettingService.GetSetting(settings, "MaxChunkSize", "1"));
         }
         catch (Exception ex)
         {
@@ -115,4 +164,23 @@
             AddModuleMessage(string.Format(Localizer["Error.File.Delete"], file.Name), MessageType.Error);
         }
     }
+
+    private async Task SaveSiteSettings()
+    {
+        try
+        {
+            var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+            settings = SettingService.SetSetting(settings, "ImageFiles", (_imageFiles != Constants.ImageFiles) ? _imageFiles.Replace(" ", "") : "", false);
+            settings = SettingService.SetSetting(settings, "UploadableFiles", (_uploadableFiles != Constants.UploadableFiles) ? _uploadableFiles.Replace(" ", "") : "", false);
+            settings = SettingService.SetSetting(settings, "MaxChunkSize", _maxChunkSize.ToString(), false);
+            await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
+            AddModuleMessage(Localizer["Success.SaveSiteSettings"], MessageType.Success);
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Saving Site Settings {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.SaveSiteSettings"], MessageType.Error);
+        }
+    }
+
 }

Oqtane.Client/Modules/Admin/Files/ModuleInfo.cs

@@ -0,0 +1,19 @@
+using Oqtane.Documentation;
+using Oqtane.Models;
+using Oqtane.Shared;
+
+namespace Oqtane.Modules.Admin.Files
+{
+    [PrivateApi("Mark this as private, since it's not very useful in the public docs")]
+    public class ModuleInfo : IModule
+    {
+        public ModuleDefinition ModuleDefinition => new ModuleDefinition
+        {
+            Name = "File Management",
+            Description = "File Management",
+            Version = Constants.Version,
+            Categories = "Admin",
+            ServerManagerType = "Oqtane.Modules.Admin.Files.Manager.FileManager, Oqtane.Server"
+        };
+    }
+}

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

@@ -31,7 +31,7 @@
         <div class="row mb-1 align-items-center">
             <Label Class="col-sm-3" For="runs-every" HelpText="Select how often you want the job to run" ResourceKey="RunsEvery">Runs Every: </Label>
             <div class="col-sm-9">
-                <input id="runs-every" class="form-control" @bind="@_interval" maxlength="4" required />
+                <input id="runs-every" class="form-control mb-1" @bind="@_interval" maxlength="4" required />
                 <select id="runs-every" class="form-select" @bind="@_frequency" required>
                     <option value="m">@Localizer["Minute(s)"]</option>
                     <option value="H">@Localizer["Hour(s)"]</option>
@@ -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;
@@ -154,6 +154,11 @@
 
 	private async Task SaveJob()
 	{
+        if (!Utilities.ValidateEffectiveExpiryDates(_startDate, _endDate))
+        {
+            AddModuleMessage(Localizer["Message.StartEndDateError"], MessageType.Warning);
+            return;
+        }
 		validated = true;
 		var interop = new Interop(JSRuntime);
 		if (await interop.FormValid(form))
@@ -171,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))
-			job.RetentionHistory = int.Parse(_retentionHistory);
+                : null;
-			job.NextExecution = Utilities.LocalDateAndTimeAsUtc(_nextDate, _nextTime);
+
+            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);
 
 			try
 			{
@@ -193,5 +206,4 @@
 			AddModuleMessage(Localizer["Message.Required.JobInfo"], MessageType.Warning);
 		}
 	}
-
 }

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

@@ -10,14 +10,11 @@
 }
 else
 {
-    <ActionLink Action="Log" Class="btn btn-secondary" Text="View Logs" ResourceKey="ViewJobs" />
+    <button type="button" class="btn btn-secondary" @onclick="Refresh">@Localizer["Refresh.Text"]</button>
-    <button type="button" class="btn btn-secondary" @onclick="(async () => await Refresh())">@Localizer["Refresh.Text"]</button>
-    <br />
     <br />
 
     <Pager Items="@_jobs" SearchProperties="Name">
         <Header>
-            <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
             <th>@SharedLocalizer["Name"]</th>
@@ -27,13 +24,12 @@ else
             <th style="width: 1px;">&nbsp;</th>
         </Header>
         <Row>
-            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.JobId.ToString())" ResourceKey="EditJob" /></td>
+            <td><ActionLink Action="Edit" Text="Edit"  Parameters="@($"id=" + context.JobId.ToString())" ResourceKey="EditJob" /></td>
-            <td><ActionDialog Header="Delete Job" Message="Are You Sure You Wish To Delete This Job?" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteJob(context))" ResourceKey="DeleteJob" /></td>
+            <td><ActionLink Action="Log" Text="Log" Class="btn btn-secondary" Parameters="@($"id=" + context.JobId.ToString())" ResourceKey="JobLog" /></td>
-            <td><ActionLink Action="Log" Class="btn btn-secondary" Parameters="@($"id=" + context.JobId.ToString())" ResourceKey="JobLog" /></td>
             <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)
                 {
@@ -46,21 +42,25 @@ else
             </td>
         </Row>
     </Pager>
+
+    <br />
+    <ActionLink Action="Log" Class="btn btn-secondary" Text="View All Logs" ResourceKey="ViewLogs" />
 }
 
 @code {
-	private List<Job> _jobs;
+    private List<Job> _jobs;
 
-	public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
+    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
 
-	protected override async Task OnParametersSetAsync()
+    protected override async Task OnInitializedAsync()
-	{
+    {
-		_jobs = await JobService.GetJobsAsync();
+        await GetJobs();
-		if (_jobs.Count == 0)
+    }
-		{
+
-			AddModuleMessage(string.Format(Localizer["Message.NoJobs"], NavigateUrl("admin/system")), MessageType.Warning);
+    private async Task GetJobs()
-		}
+    {
-	}
+        _jobs = await JobService.GetJobsAsync();
+    }
 
 	private string DisplayStatus(bool isEnabled, bool isExecuting)
 	{
@@ -112,31 +112,23 @@ else
         return result;
     }
 
-    private async Task DeleteJob(Job job)
-    {
-        try
-        {
-            await JobService.DeleteJobAsync(job.JobId);
-            await logger.LogInformation("Job Deleted {Job}", job);
-			_jobs = await JobService.GetJobsAsync();
-            StateHasChanged();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Deleting Job {Job} {Error}", job, ex.Message);
-            AddModuleMessage(Localizer["Error.Job.Delete"], MessageType.Error);
-        }
-    }
-
     private async Task StartJob(int jobId)
     {
         try
         {
-			await JobService.StartJobAsync(jobId);
+            Job _job = await JobService.GetJobAsync(jobId);
-            await logger.LogInformation("Job Started {JobId}", jobId);
+            if (!_job.IsEnabled)
-            AddModuleMessage(Localizer["Message.Job.Start"], MessageType.Success);
+            {
-			_jobs = await JobService.GetJobsAsync();
+                AddModuleMessage(Localizer["Message.Job.Disabled"], MessageType.Warning);
-            StateHasChanged();
+            }
+            else
+            {
+                await JobService.StartJobAsync(jobId);
+                await logger.LogInformation("Job Started {JobId}", jobId);
+                AddModuleMessage(Localizer["Message.Job.Start"], MessageType.Success);
+                _jobs = await JobService.GetJobsAsync();
+                StateHasChanged();
+            }
         }
         catch (Exception ex)
         {
@@ -164,7 +156,8 @@ else
 
     private async Task Refresh()
     {
-        _jobs = await JobService.GetJobsAsync();
+        ShowProgressIndicator();
-        StateHasChanged();
+        await GetJobs();
+        HideProgressIndicator();
     }
 }

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

@@ -10,6 +10,9 @@
 }
 else
 {
+    <button type="button" class="btn btn-secondary" @onclick="Refresh">@Localizer["Refresh"]</button>
+    <br /><br />
+
     <Pager Items="@_jobLogs">
         <Header>
             <th>@SharedLocalizer["Name"]</th>
@@ -20,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>
@@ -36,14 +39,17 @@ else
 
     protected override async Task OnParametersSetAsync()
     {
-        _jobLogs = await JobLogService.GetJobLogsAsync();
+        await GetJobLogs();
+    }
 
+    private async Task GetJobLogs()
+    {
+        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)
@@ -67,4 +73,11 @@ else
 
         return status;
     }
+
+    private async Task Refresh()
+    {
+        ShowProgressIndicator();
+        await GetJobLogs();
+        HideProgressIndicator();
+    }
 }

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

@@ -1,7 +1,6 @@
 @namespace Oqtane.Modules.Admin.Languages
 @inherits ModuleBase
 @using System.Globalization
-@using Microsoft.AspNetCore.Localization
 @inject NavigationManager NavigationManager
 @inject ILocalizationService LocalizationService
 @inject ILanguageService LanguageService
@@ -94,7 +93,6 @@ else
 			var language = new Language
 				{
 					SiteId = PageState.Page.SiteId,
-					Name = CultureInfo.GetCultureInfo(_code).DisplayName,
 					Code = _code,
 					IsDefault = (_default == null ? false : Boolean.Parse(_default))
 				};
@@ -130,7 +128,7 @@ else
         {
             var interop = new Interop(JSRuntime);
             var localizationCookieValue = CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture));
-            await interop.SetCookie(CookieRequestCultureProvider.DefaultCookieName, localizationCookieValue, 360);
+            await interop.SetCookie(CookieRequestCultureProvider.DefaultCookieName, localizationCookieValue, 360, true, "Lax");
         }
     }
 

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

@@ -1,7 +1,6 @@
 @namespace Oqtane.Modules.Admin.Languages
 @inherits ModuleBase
 @using System.Globalization
-@using Microsoft.AspNetCore.Localization
 @inject NavigationManager NavigationManager
 @inject ILocalizationService LocalizationService
 @inject ILanguageService LanguageService
@@ -103,7 +102,7 @@ else
         {
             var interop = new Interop(JSRuntime);
             var localizationCookieValue = CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture));
-            await interop.SetCookie(CookieRequestCultureProvider.DefaultCookieName, localizationCookieValue, 360);
+            await interop.SetCookie(CookieRequestCultureProvider.DefaultCookieName, localizationCookieValue, 360, true, "Lax");
         }
     }
 

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

@@ -8,89 +8,147 @@
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<AuthorizeView Roles="@RoleNames.Registered">
+@if (PageState.User != null)
-    <Authorizing>
+{
-        <text>...</text>
+    <ModuleMessage Message="@Localizer["Info.SignedIn"]" Type="MessageType.Info" />
-    </Authorizing>
+}
-    <NotAuthorized>
+else
-		@if (!twofactor)
+{
-		{
+    <form @ref="login" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
-			<form @ref="login" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+        <div class="Oqtane-Modules-Admin-Login" @onkeypress="@(e => KeyPressed(e))">
-				<div class="Oqtane-Modules-Admin-Login" @onkeypress="@(e => KeyPressed(e))">
+            @switch (_action)
-				@if (_allowexternallogin)
+            {
-				{
+                case "Login":
-					<button type="button" class="btn btn-primary" @onclick="ExternalLogin">@Localizer["Use"] @PageState.Site.Settings["ExternalLogin:ProviderName"]</button>						
+                    @if (_allowexternallogin)
-					<br /><br />
+                    {
-				}
+                        <button type="button" class="btn btn-primary col-12" @onclick="ExternalLogin">@Localizer["Use"] @PageState.Site.Settings["ExternalLogin:ProviderName"]</button>
-				@if (_allowsitelogin)
+                        <hr class="app-rule mt-3 mb-2" />
-				{
+                    }
-					<div class="form-group">
+                    @if (_allowsitelogin)
-						<Label Class="control-label" For="username" HelpText="Please enter your Username" ResourceKey="Username">Username:</Label>
+                    {
-						<input id="username" type="text" @ref="username" class="form-control" placeholder="@Localizer["Username.Placeholder"]" @bind="@_username" required />
+                        <div class="form-group text-center">
-					</div>
+                            <Label Class="control-label" For="username" HelpText="Please enter your Username" ResourceKey="Username">Username:</Label>
-					<div class="form-group mt-2">
+                            <input id="username" type="text" @ref="username" class="form-control" placeholder="@Localizer["Username.Placeholder"]" @bind="@_username" @bind:event="oninput" required />
-						<Label Class="control-label" For="password" HelpText="Please enter your Password" ResourceKey="Password">Password:</Label>
+                        </div>
-						<div class="input-group">
+                        <div class="form-group text-center mt-2">
-							<input id="password" type="@_passwordtype" name="Password" class="form-control" placeholder="@Localizer["Password.Placeholder"]" @bind="@_password" required />
+                            <Label Class="control-label" For="password" HelpText="Please enter your Password" ResourceKey="Password">Password:</Label>
-                            <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
+                            <div class="input-group">
-						</div>
+                                <input id="password" type="@_passwordtype" @ref="password" name="Password" class="form-control" placeholder="@Localizer["Password.Placeholder"]" @bind="@_password" @bind:event="oninput" required />
-					</div>
+                                <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
-					<div class="form-group mt-2">
+                            </div>
-						@if (!_alwaysremember)
+                        </div>
-						{
+                        @if (!_alwaysremember)
-						    <div class="form-check">
+                        {
-							    <input id="remember" type="checkbox" class="form-check-input" @bind="@_remember" />
+                            <div class="form-group text-center mt-2">
-							    <Label Class="control-label" For="remember" HelpText="Specify if you would like to be signed back in automatically the next time you visit this site" ResourceKey="Remember">Remember Me?</Label>
+                                <div>
-						    </div>
+                                    <input id="remember" type="checkbox" class="form-check-input" @bind="@_remember" />
-						}
+                                    <Label Class="control-label" For="remember" HelpText="Specify if you would like to be signed back in automatically the next time you visit this site" ResourceKey="Remember">Stay Signed In?</Label>
-					</div>
+                                </div>
-					<button type="button" class="btn btn-primary" @onclick="Login">@SharedLocalizer["Login"]</button>
+                            </div>
-					<button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
+                        }
-					<br /><br />
+
-					<button type="button" class="btn btn-secondary" @onclick="Forgot">@Localizer["ForgotPassword"]</button>		
+                        <div class="btn-group mt-2 col-12" role="group">
-				}
+                            <button type="button" class="btn btn-primary col-6" @onclick="Login">@SharedLocalizer["Login"]</button>
-				</div>
+                            <button type="button" class="btn btn-secondary col-6" @onclick="CancelLogin">@SharedLocalizer["Cancel"]</button>
-			</form>
+                        </div>
-		}
+
-		else
+                        <button type="button" class="btn btn-secondary col-12 mt-4" @onclick="@(() => SetAction("ForgotPassword"))">@Localizer["ForgotPassword"]</button>
-		{
+                    }
-			<form @ref="login" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+
-				<div class="container Oqtane-Modules-Admin-Login">
+                    @if (_allowloginlink)
-					<div class="form-group">
+                    {
-						<Label Class="control-label" For="code" HelpText="Please enter the secure verification code which was sent to you by email" ResourceKey="Code">Verification Code:</Label>
+                        <hr class="app-rule mt-3" />
-						<input id="code" class="form-control" @bind="@_code" placeholder="@Localizer["Code.Placeholder"]" maxlength="6" required />
+                        <button type="button" class="btn btn-primary col-12 mt-2" @onclick="@(() => SetAction("LoginLink"))">@Localizer["UseLoginLink"]</button>
-					</div>
+                    }
-					<br />
+
-					<button type="button" class="btn btn-primary" @onclick="Login">@SharedLocalizer["Login"]</button>
+                    @if (_allowpasskeys)
-					<button type="button" class="btn btn-secondary" @onclick="Reset">@SharedLocalizer["Cancel"]</button>
+                    {
-				</div>
+                        <hr class="app-rule mt-3" />
-			</form>
+                        <button type="button" class="btn btn-primary col-12 mt-2" @onclick="PasskeyLogin">@Localizer["Passkey"]</button>
-		}
+                    }
-	</NotAuthorized>
+
-</AuthorizeView>
+                    @if (PageState.Site.AllowRegistration)
+                    {
+                        <hr class="app-rule mt-3" />
+                        <div class="text-center mt-2">
+                            <NavLink href="@_registerurl">@Localizer["Register"]</NavLink>
+                        </div>
+                    }
+                    break;
+                case "ForgotPassword":
+                    <div class="form-group text-center">
+                        <Label Class="control-label" For="username" HelpText="Please enter your Username" ResourceKey="Username">Username:</Label>
+                        <input id="username" type="text" class="form-control" placeholder="@Localizer["Username.Placeholder"]" @bind="@_username" @bind:event="oninput" required />
+                    </div>
+                    <div class="btn-group mt-4 col-12" role="group">
+                        <button type="button" class="btn btn-primary col-6" @onclick="ForgotPassword">@SharedLocalizer["Send"]</button>
+                        <button type="button" class="btn btn-secondary col-6" @onclick="@(() => SetAction("Login"))">@SharedLocalizer["Cancel"]</button>
+                    </div>
+                    <button type="button" class="btn btn-secondary col-12 mt-4" @onclick="@(() => SetAction("ForgotUsername"))">@Localizer["ForgotUsername"]</button>
+                    break;
+                case "ForgotUsername":
+                    <div class="form-group text-center">
+                        <Label Class="control-label" For="email" HelpText="Please enter your Email" ResourceKey="Email">Email:</Label>
+                        <input id="email" type="text" class="form-control" placeholder="@Localizer["Email.Placeholder"]" @bind="@_email" required />
+                    </div>
+                    <div class="btn-group mt-4 col-12" role="group">
+                        <button type="button" class="btn btn-primary col-6" @onclick="ForgotUsername">@SharedLocalizer["Send"]</button>
+                        <button type="button" class="btn btn-secondary col-6" @onclick="@(() => SetAction("Login"))">@SharedLocalizer["Cancel"]</button>
+                    </div>
+                    break;
+                case "LoginLink":
+                    <div class="form-group text-center">
+                        <Label Class="control-label" For="email" HelpText="Please enter your Email" ResourceKey="Email">Email:</Label>
+                        <input id="email" type="text" class="form-control" placeholder="@Localizer["Email.Placeholder"]" @bind="@_email" required />
+                    </div>
+                    <div class="btn-group mt-4 col-12" role="group">
+                        <button type="button" class="btn btn-primary col-6" @onclick="LoginLink">@SharedLocalizer["Send"]</button>
+                        <button type="button" class="btn btn-secondary col-6" @onclick="@(() => SetAction("Login"))">@SharedLocalizer["Cancel"]</button>
+                    </div>
+                    break;
+                case "TwoFactor":
+                    <div class="form-group">
+                        <Label Class="control-label" For="code" HelpText="Please enter the secure verification code which was sent to you by email" ResourceKey="Code">Verification Code:</Label>
+                        <input id="code" class="form-control" @bind="@_code" placeholder="@Localizer["Code.Placeholder"]" maxlength="6" required />
+                    </div>
+                    <div class="btn-group mt-4 col-12" role="group">
+                        <button type="button" class="btn btn-primary" @onclick="Login">@SharedLocalizer["Login"]</button>
+                        <button type="button" class="btn btn-secondary" @onclick="@(() => SetAction("Login"))">@SharedLocalizer["Cancel"]</button>
+                    </div>
+                    break;
+            }
+        </div>
+    </form>
+}
 
 @code {
-    private bool _allowsitelogin = true;
+    private string _action = "Login";
     private bool _allowexternallogin = false;
+    private bool _allowsitelogin = true;
+    private bool _allowloginlink = false;
+    private bool _allowpasskeys = false;
+    private string _returnurl = string.Empty;
+
     private ElementReference login;
     private bool validated = false;
-    private bool twofactor = false;
     private string _username = string.Empty;
     private ElementReference username;
     private string _password = string.Empty;
     private string _passwordtype = "password";
     private string _togglepassword = string.Empty;
+    private ElementReference password;
     private bool _remember = false;
     private bool _alwaysremember = false;
+    private string _registerurl = string.Empty;
+    private string _email = string.Empty;
     private string _code = string.Empty;
 
-    private string _returnUrl = string.Empty;
-
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
+    public override bool? Prerender => true;
 
     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()
@@ -99,14 +157,23 @@
         {
             _allowexternallogin = (SettingService.GetSetting(PageState.Site.Settings, "ExternalLogin:ProviderType", "") != "") ? true : false;
             _allowsitelogin = bool.Parse(SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:AllowSiteLogin", "true"));
+            _allowloginlink = bool.Parse(SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:LoginLink", "false"));
+            _allowpasskeys = bool.Parse(SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:Passkeys", "false"));
             _alwaysremember = bool.Parse(SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:AlwaysRemember", "false"));
 
-            _togglepassword = SharedLocalizer["ShowPassword"];
+            if (!string.IsNullOrEmpty(SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:RegisterUrl", "")))
-
-            if (PageState.QueryString.ContainsKey("returnurl"))
             {
-                _returnUrl = PageState.QueryString["returnurl"];
+                _registerurl = SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:RegisterUrl", "");
             }
+            else
+            {
+                _registerurl = NavigateUrl("register");
+            }
+
+            // PageState.ReturnUrl is not specified if user navigated directly to login page
+            _returnurl = (!string.IsNullOrEmpty(PageState.ReturnUrl)) ? PageState.ReturnUrl : PageState.Alias.Path;
+
+            _togglepassword = SharedLocalizer["ShowPassword"];
 
             if (PageState.QueryString.ContainsKey("name"))
             {
@@ -121,7 +188,7 @@
 
                 if (PageState.QueryString.ContainsKey("key"))
                 {
-                    user = await UserService.LinkUserAsync(user, PageState.QueryString["token"], PageState.Site.Settings["ExternalLogin:ProviderType"], PageState.QueryString["key"], PageState.Site.Settings["ExternalLogin:ProviderName"]);
+                    user = await UserService.AddLoginAsync(user, PageState.QueryString["token"], PageState.Site.Settings["ExternalLogin:ProviderType"], PageState.QueryString["key"], PageState.Site.Settings["ExternalLogin:ProviderName"]);
                     if (user != null)
                     {
                         await logger.LogInformation(LogFunction.Security, "External Login Linkage Successful For Username {Username}", _username);
@@ -139,7 +206,7 @@
                     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
@@ -153,7 +220,7 @@
             {
                 if (PageState.QueryString.ContainsKey("status"))
                 {
-                    AddModuleMessage(Localizer["ExternalLoginStatus." + PageState.QueryString["status"]], MessageType.Info);
+                    AddModuleMessage(Localizer["ExternalLoginStatus." + PageState.QueryString["status"]], MessageType.Warning);
                 }
             }
         }
@@ -164,17 +231,45 @@
         }
     }
 
-    protected override async Task OnAfterRenderAsync(bool firstRender)
+    private async Task KeyPressed(KeyboardEventArgs e)
     {
-        if (firstRender && PageState.User == null && _allowsitelogin)
+        if (e.Code == "Enter" || e.Code == "NumpadEnter")
         {
-            await username.FocusAsync();
+            switch (_action)
+            {
+                case "Login":
+                    await Login();
+                    break;
+            }
         }
+    }
 
-        // redirect logged in user to specified page
+    private void SetAction(string action)
-        if (PageState.User != null)
+    {
+        _action = action;
+        _username = "";
+        _password = "";
+        _email = "";
+        ClearModuleMessage();
+        StateHasChanged();
+    }
+
+    private void ExternalLogin()
+    {
+        NavigationManager.NavigateTo(Utilities.TenantUrl(PageState.Alias, "/pages/external?returnurl=" + WebUtility.UrlEncode(_returnurl)), true);
+    }
+
+    private void TogglePassword()
+    {
+        if (_passwordtype == "password")
         {
-            NavigationManager.NavigateTo(PageState.ReturnUrl);
+            _passwordtype = "text";
+            _togglepassword = SharedLocalizer["HidePassword"];
+        }
+        else
+        {
+            _passwordtype = "password";
+            _togglepassword = SharedLocalizer["ShowPassword"];
         }
     }
 
@@ -189,7 +284,7 @@
                 var hybrid = (PageState.Runtime == Shared.Runtime.Hybrid);
                 var user = new User { SiteId = PageState.Site.SiteId, Username = _username, Password = _password, LastIPAddress = SiteState.RemoteIPAddress};
 
-                if (!twofactor)
+                if (_action == "Login")
                 { 
                     _remember = _alwaysremember || _remember;
                     user = await UserService.LoginUserAsync(user, hybrid, _remember);
@@ -199,36 +294,36 @@
                     user = await UserService.VerifyTwoFactorAsync(user, _code);
                 }
 
-                if (user.IsAuthenticated)
+                if (user != null && user.IsAuthenticated)
                 {
-                    await logger.LogInformation(LogFunction.Security, "Login Successful For Username {Username}", _username);
+                    await logger.LogInformation(LogFunction.Security, "Login Successful For {Username} From IP Address {IPAddress}", _username, SiteState.RemoteIPAddress);
 
                     if (hybrid)
                     {
                         // hybrid apps utilize an interactive login
                         var authstateprovider = (IdentityAuthenticationStateProvider)ServiceProvider.GetService(typeof(IdentityAuthenticationStateProvider));
                         authstateprovider.NotifyAuthenticationChanged();
-                        NavigationManager.NavigateTo(NavigateUrl(WebUtility.UrlDecode(_returnUrl), true));
+                        NavigationManager.NavigateTo(NavigateUrl(_returnurl, true));
                     }
                     else
                     {
                         // post back to the Login page so that the cookies are set correctly
-                        var fields = new { __RequestVerificationToken = SiteState.AntiForgeryToken, username = _username, password = _password, remember = _remember, returnurl = _returnUrl };
+                        var fields = new { __RequestVerificationToken = SiteState.AntiForgeryToken, username = _username, password = _password, remember = _remember, returnurl = WebUtility.UrlEncode(_returnurl) };
                         string url = Utilities.TenantUrl(PageState.Alias, "/pages/login/");
                         await interop.SubmitForm(url, fields);
                     }
                 }
                 else
                 {
-                    if (SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:TwoFactor", "false") == "required" || user.TwoFactorRequired)
+                    if (SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:TwoFactor", "false") == "required" || (user != null && user.TwoFactorRequired))
                     {
-                        twofactor = true;
+                        _action = "TwoFactor";
                         validated = false;
                         AddModuleMessage(Localizer["Message.TwoFactor"], MessageType.Info);
                     }
                     else
                     {
-                        if (!twofactor)
+                        if (_action != "TwoFactor")
                         {
                             await logger.LogInformation(LogFunction.Security, "Login Failed For Username {Username}", _username);
                             AddModuleMessage(Localizer["Error.Login.Fail"], MessageType.Error);
@@ -253,23 +348,30 @@
         }
     }
 
-    private void Cancel()
+    private void CancelLogin()
     {
-        NavigationManager.NavigateTo(_returnUrl);
+        NavigationManager.NavigateTo(_returnurl);
     }
 
-    private async Task Forgot()
+    private async Task PasskeyLogin()
+    {
+        // post back to the Passkey page so that the cookies are set correctly
+        var interop = new Interop(JSRuntime);
+        var fields = new { __RequestVerificationToken = SiteState.AntiForgeryToken, operation = "request", returnurl = _returnurl };
+        string url = Utilities.TenantUrl(PageState.Alias, "/pages/passkey/");
+        await interop.SubmitForm(url, fields);
+    }
+
+    private async Task ForgotPassword()
     {
         try
         {
-            if (_username != string.Empty)
+            if (!string.IsNullOrEmpty(_username))
             {
-                var user = await UserService.GetUserAsync(_username, PageState.Site.SiteId);
+                if (await UserService.ForgotPasswordAsync(_username))
-                if (user != null)
                 {
-                    await UserService.ForgotPasswordAsync(user);
                     await logger.LogInformation(LogFunction.Security, "Password Reset Notification Sent For Username {Username}", _username);
-                    AddModuleMessage(Localizer["Message.ForgotUser"], MessageType.Info);
+                    AddModuleMessage(Localizer["Message.ForgotPassword"], MessageType.Info);
                 }
                 else
                 {
@@ -278,10 +380,8 @@
             }
             else
             {
-                AddModuleMessage(Localizer["Message.ForgotPassword"], MessageType.Info);
+                AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning);
             }
-
-            StateHasChanged();
         }
         catch (Exception ex)
         {
@@ -290,40 +390,114 @@
         }
     }
 
-    private void Reset()
+    private async Task ForgotUsername()
     {
-        twofactor = false;
+        try
-        _username = "";
-        _password = "";
-        ClearModuleMessage();
-        StateHasChanged();
-    }
-
-    private async Task KeyPressed(KeyboardEventArgs e)
-    {
-        if (e.Code == "Enter" || e.Code == "NumpadEnter")
         {
-            await Login();
+            if (!string.IsNullOrEmpty(_email))
+            {
+                if (await UserService.ForgotUsernameAsync(_email))
+                {
+                    AddModuleMessage(Localizer["Message.ForgotUsername"], MessageType.Info);
+                    await logger.LogInformation(LogFunction.Security, "Username Reminder Notification Sent For Email {Email}", _email);
+                }
+                else
+                {
+                    AddModuleMessage(Localizer["Message.UserDoesNotExist"], MessageType.Warning);
+                }
+            }
+            else
+            {
+                AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning);
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Sending Username Reminder {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.ForgotUsername"], MessageType.Error);
         }
     }
 
-    private void TogglePassword()
+    private async Task LoginLink()
     {
-        if (_passwordtype == "password")
+        try
         {
-            _passwordtype = "text";
+            if (!string.IsNullOrEmpty(_email))
-            _togglepassword = SharedLocalizer["HidePassword"];
+            {
+                if (await UserService.SendLoginLinkAsync(_email, _returnurl))
+                {
+                    AddModuleMessage(Localizer["Message.SendLoginLink"], MessageType.Info);
+                    await logger.LogInformation(LogFunction.Security, "Login Link Sent To Email {Email}", _email);
+                }
+                else
+                {
+                    AddModuleMessage(Localizer["Message.UserDoesNotExist"], MessageType.Warning);
+                }
+            }
+            else
+            {
+                AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning);
+            }
         }
-        else
+        catch (Exception ex)
         {
-            _passwordtype = "password";
+            await logger.LogError(ex, "Error Sending Login Link {Error}", ex.Message);
-            _togglepassword = SharedLocalizer["ShowPassword"];
+            AddModuleMessage(Localizer["Error.SendLoginLink"], MessageType.Error);
         }
     }
 
-    private void ExternalLogin()
+    protected override async Task OnAfterRenderAsync(bool firstRender)
     {
-        NavigationManager.NavigateTo(Utilities.TenantUrl(PageState.Alias, "/pages/external?returnurl=" + _returnUrl), true);
+        if (firstRender && PageState.QueryString.ContainsKey("options"))
-    }
+        {
+            // user has initiated a passkey login
+            try
+            {
+                var interop = new Interop(JSRuntime);
+                var credential = await interop.RequestCredential(WebUtility.UrlDecode(PageState.QueryString["options"]));
+                if (!string.IsNullOrEmpty(credential))
+                {
+                    // post back to the Passkey page so that the cookies are set correctly
+                    var fields = new { __RequestVerificationToken = SiteState.AntiForgeryToken, operation = "login", credential = credential, returnurl = _returnurl };
+                    string url = Utilities.TenantUrl(PageState.Alias, "/pages/passkey/");
+                    await interop.SubmitForm(url, fields);
+                }
+                else
+                {
+                    await logger.LogError("Passkey Login Was Not Successful");
+                    AddModuleMessage(Localizer["Error.Passkey.Fail"], MessageType.Warning);
+                }
+            }
+            catch (Exception ex)
+            {
+                await logger.LogError(ex, "Passkey Login Was Not Successful");
+                AddModuleMessage(Localizer["Error.Passkey.Fail"], MessageType.Warning);
+            }
+            return;
+        }
 
+        if (firstRender && PageState.User == null && _allowsitelogin && _action == "Login")
+        {
+            if (string.IsNullOrEmpty(_username))
+            {
+                if (!string.IsNullOrEmpty(username.Id)) // ensure username is visible in UI
+                {
+                    await username.FocusAsync();
+                }
+            }
+            else
+            {
+                if (!string.IsNullOrEmpty(password.Id)) // ensure password is visible in UI
+                {
+                    await password.FocusAsync();
+                }
+            }
+        }
+
+        // redirect logged in user to specified page
+        if (PageState.User != null && !UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
+        {
+            NavigationManager.NavigateTo(_returnurl);
+        }
+    }
 }

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

@@ -63,8 +63,8 @@ else
 						<th>@Localizer["Function"]</th>
 					</Header>
 					<Row>
-						<td class="@GetClass(context.Function)"><ActionLink Action="Detail" Parameters="@($"/{context.LogId}")" ReturnUrl="@(NavigateUrl(PageState.Page.Path, AddUrlParameters(_level, _function, _rows, _page)))" ResourceKey="LogDetails" /></td>
+                        <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>
@@ -86,47 +86,48 @@ else
 				</div>
 			</div>
 			<br />
-			<button type="button" class="btn btn-success" @onclick="SaveSiteSettings">@SharedLocalizer["Save"]</button>
+            <button type="button" class="btn btn-success" @onclick="SaveSiteSettings">@SharedLocalizer["Save"]</button>
+            <ActionDialog Header="Clear Events" Message="Are You Sure You Wish To Remove All Log Events?" Action="DeleteLogs" Class="btn btn-danger" OnClick="@(async () => await DeleteLogs())" ResourceKey="DeleteLogs" />
 		</TabPanel>
 	</TabStrip>
 }
 
 @code {
-	private string _level = "-";
+    private string _level = "-";
-	private string _function = "-";
+    private string _function = "-";
-	private string _rows = "10";
+    private string _rows = "10";
-	private int _page = 1;
+    private int _page = 1;
-	private List<Log> _logs;
+    private List<Log> _logs;
-	private int _retention = 30;
+    private int _retention = 30;
 
-	public override string UrlParametersTemplate => "/{level}/{function}/{rows}/{page}";
+    public override string UrlParametersTemplate => "/{level}/{function}/{rows}/{page}";
-	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-	protected override async Task OnParametersSetAsync()
+    protected override async Task OnParametersSetAsync()
-	{
+    {
-		try
+        try
-		{
+        {
-			if (UrlParameters.ContainsKey("level"))
+            if (UrlParameters.ContainsKey("level"))
-			{
+            {
-				_level = UrlParameters["level"];
+                _level = UrlParameters["level"];
-			}
+            }
-			if (UrlParameters.ContainsKey("function"))
+            if (UrlParameters.ContainsKey("function"))
-			{
+            {
-				_function = UrlParameters["function"];
+                _function = UrlParameters["function"];
-			}
+            }
-			if (UrlParameters.ContainsKey("rows"))
+            if (UrlParameters.ContainsKey("rows"))
-			{
+            {
-				_rows = UrlParameters["rows"];
+                _rows = UrlParameters["rows"];
-			}
+            }
-			if (UrlParameters.ContainsKey("page") && int.TryParse(UrlParameters["page"], out int page))
+            if (UrlParameters.ContainsKey("page") && int.TryParse(UrlParameters["page"], out int page))
-			{
+            {
-				_page = page;
+                _page = page;
-			}
+            }
 
             await GetLogs();
 
-			var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+            var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
-			_retention = int.Parse( SettingService.GetSetting(settings, "LogRetention", "30"));
+            _retention = int.Parse( SettingService.GetSetting(settings, "LogRetention", "30"));
         }
         catch (Exception ex)
         {
@@ -213,22 +214,37 @@ else
         return classname;
     }
 
-	private async Task SaveSiteSettings()
+    private async Task SaveSiteSettings()
-	{
+    {
-		try
+        try
-		{
+        {
-			var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+            var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
-			settings = SettingService.SetSetting(settings, "LogRetention", _retention.ToString(), true);
+            settings = SettingService.SetSetting(settings, "LogRetention", _retention.ToString(), true);
             await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
 
-			AddModuleMessage(Localizer["Success.SaveSiteSettings"], MessageType.Success);
+            AddModuleMessage(Localizer["Success.SaveSiteSettings"], MessageType.Success);
-		}
+        }
-		catch (Exception ex)
+        catch (Exception ex)
-		{
+        {
-			await logger.LogError(ex, "Error Saving Site Settings {Error}", ex.Message);
+            await logger.LogError(ex, "Error Saving Site Settings {Error}", ex.Message);
-			AddModuleMessage(Localizer["Error.SaveSiteSettings"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.SaveSiteSettings"], MessageType.Error);
-		}
+        }
-	}
+    }
+
+    private async Task DeleteLogs()
+    {
+        try
+        {
+            await LogService.DeleteLogsAsync(PageState.Site.SiteId);
+            await GetLogs();
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Deleting Logs {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.DeleteLogs"], MessageType.Error);
+        }
+    }
 
 	private void OnPageChange(int page)
 	{

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

@@ -101,13 +101,20 @@
                                             <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 (!string.IsNullOrEmpty(context.PackageUrl))
+                                            @if (_moduledefinitions.Exists(item => item.PackageName == context.PackageId))
                                             {
-                                                <button type="button" class="btn btn-primary" @onclick=@(async () => await GetPackage(context.PackageId, context.Version))>@SharedLocalizer["Download"]</button>
+                                                <button type="button" class="btn btn-info">@SharedLocalizer["Installed"]</button>
                                             }
-                                            @if (context.Price != null && !string.IsNullOrEmpty(context.PaymentUrl))
+                                            else
                                             {
-                                                <a class="btn btn-success ms-2" style="text-decoration: none !important" href="@context.PaymentUrl" target="_new">@SharedLocalizer["Buy"]</a>
+                                                @if (!string.IsNullOrEmpty(context.PackageUrl))
+                                                {
+                                                    <button type="button" class="btn btn-primary" @onclick=@(async () => await GetPackage(context.PackageId, context.Version))>@SharedLocalizer["Download"]</button>
+                                                }
+                                                @if (context.Price != null && !string.IsNullOrEmpty(context.PaymentUrl))
+                                                {
+                                                    <a class="btn btn-success ms-2" style="text-decoration: none !important" href="@context.PaymentUrl" target="_new">@SharedLocalizer["Buy"]</a>
+                                                }
                                             }
                                             <br />
                                         </div>
@@ -125,7 +132,7 @@
     <TabPanel Name="Upload" ResourceKey="Upload" Heading="Upload">
         <div class="container">
             <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" HelpText="Upload one or more module packages. Once they are uploaded click Install to complete the installation." ResourceKey="Module">Module: </Label>
+                <Label Class="col-sm-3" HelpText="Upload one or more module packages." ResourceKey="Module">Module: </Label>
                 <div class="col-sm-9">
                     <FileManager Folder="@Constants.PackagesFolder" UploadMultiple="true" OnUpload="OnUpload" />
                 </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/Create.razor

@@ -1,6 +1,7 @@
 @namespace Oqtane.Modules.Admin.ModuleDefinitions
 @inherits ModuleBase
 @using System.Text.RegularExpressions
+@using System.Reflection
 @inject NavigationManager NavigationManager
 @inject IModuleDefinitionService ModuleDefinitionService
 @inject IModuleService ModuleService
@@ -13,13 +14,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="owner" HelpText="Enter the name of the organization who is developing this module. It should not contain spaces or punctuation." ResourceKey="OwnerName">Owner Name: </Label>
+                <Label Class="col-sm-3" For="owner" HelpText="Enter the name of the organization who is developing this module. It should not contain spaces or punctuation or the word oqtane." ResourceKey="OwnerName">Owner Name: </Label>
                 <div class="col-sm-9">
                     <input id="owner" class="form-control" @bind="@_owner" required />
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="module" HelpText="Enter a name for this module. It should not contain spaces or punctuation." ResourceKey="ModuleName">Module Name: </Label>
+                <Label Class="col-sm-3" For="module" HelpText="Enter a name for this module. It should not contain spaces or punctuation or the word oqtane." ResourceKey="ModuleName">Module Name: </Label>
                 <div class="col-sm-9">
                     <input id="module" class="form-control" @bind="@_module" required />
                 </div>
@@ -27,7 +28,7 @@
             <div class="row mb-1 align-items-center">
                 <Label Class="col-sm-3" For="description" HelpText="Enter a short description for the module" ResourceKey="Description">Description: </Label>
                 <div class="col-sm-9">
-                    <textarea id="description" class="form-control" @bind="@_description" rows="3" maxlength="2000" required></textarea>
+                    <textarea id="description" class="form-control" @bind="@_description" rows="3" maxlength="2000"></textarea>
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
@@ -42,29 +43,32 @@
                     </select>
                 </div>
             </div>
-            <div class="row mb-1 align-items-center">
+            @if (_type == "External")
-                <Label Class="col-sm-3" For="reference" HelpText="Select a framework reference version" ResourceKey="FrameworkReference">Framework Reference: </Label>
-                <div class="col-sm-9">
-                    <select id="reference" class="form-select" @bind="@_reference" required>
-                        @foreach (string version in _versions)
-                        {
-                            if (Version.Parse(version).CompareTo(Version.Parse(_minversion)) >= 0)
-                            {
-                                <option value="@(version)">@(version)</option>
-                            }
-                        }
-                        <option value="local">@SharedLocalizer["LocalVersion"]</option>
-                    </select>
-                </div>
-            </div>
-            @if (!string.IsNullOrEmpty(_location))
             {
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="location" HelpText="Location where the module will be created" ResourceKey="Location">Location: </Label>
+                    <Label Class="col-sm-3" For="reference" HelpText="Select a framework reference version" ResourceKey="FrameworkReference">Framework Reference: </Label>
                     <div class="col-sm-9">
-                        <input id="module" class="form-control" @bind="@_location" readonly />
+                        <select id="reference" class="form-select" @bind="@_reference" required>
+                            @foreach (string version in _versions)
+                            {
+                                if (Version.Parse(version).CompareTo(Version.Parse(_minversion)) >= 0)
+                                {
+                                    <option value="@(version)">@(version)</option>
+                                }
+                            }
+                            <option value="local">@SharedLocalizer["LocalVersion"]</option>
+                        </select>
                     </div>
                 </div>
+                @if (!string.IsNullOrEmpty(_location))
+                {
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="location" HelpText="Location where the module will be created" ResourceKey="Location">Location: </Label>
+                        <div class="col-sm-9">
+                            <input id="module" class="form-control" @bind="@_location" readonly />
+                        </div>
+                    </div>
+                }
             }
         </div>
         <button type="button" class="btn btn-success" @onclick="CreateModule">@Localizer["CreateModule"]</button>
@@ -80,9 +84,10 @@
     private string _description = string.Empty;
     private List<Template> _templates;
     private string _template = "-";
+    private string _minversion = "2.0.0";
+    private string _type = "";
     private string[] _versions;
     private string _reference = "local";
-    private string _minversion = "2.0.0";
     private string _location = string.Empty;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
@@ -93,6 +98,16 @@
         {
             AddModuleMessage(Localizer["Info.Module.Development"], MessageType.Info);
         }
+        else
+        {
+            var entryAssemblyName = Assembly.GetEntryAssembly().GetName().Name;
+            if (entryAssemblyName.EndsWith(".Oqtane"))
+            {
+                // Oqtane Application assemblies end with .Server.Oqtane or .Client.Oqtane
+                string[] segments = entryAssemblyName.Split('.');
+                _owner = string.Join(".", segments, 0, segments.Length - 2);
+            }
+        }
     }
 
     protected override async Task OnParametersSetAsync()
@@ -111,6 +126,8 @@
     private async Task CreateModule()
     {
         validated = true;
+        _owner = _owner.Trim();
+        _module = _module.Trim();
         var interop = new Interop(JSRuntime);
         if (await interop.FormValid(form))
         {
@@ -118,13 +135,21 @@
             {
                 if (IsValid(_owner) && IsValid(_module) && _owner != _module && _template != "-")
                 {
+                    if (string.IsNullOrEmpty(_description)) _description = _module;
                     if (IsValidXML(_description))
                     {
+                        if (_type == "Internal")
+                        {
+                            AddModuleMessage(Localizer["Success.Module.Create.Internal"], MessageType.Success);
+                        }
                         var template = _templates.FirstOrDefault(item => item.Name == _template);
                         var moduleDefinition = new ModuleDefinition { Owner = _owner, Name = _module, Description = _description, Template = _template, Version = _reference, ModuleDefinitionName = template.Namespace };
                         moduleDefinition = await ModuleDefinitionService.CreateModuleDefinitionAsync(moduleDefinition);
-                        GetLocation();
+                        if (_type == "External")
-                        AddModuleMessage(string.Format(Localizer["Success.Module.Create"], NavigateUrl("admin/system")), MessageType.Success);
+                        {
+                            GetLocation();
+                            AddModuleMessage(string.Format(Localizer["Success.Module.Create.External"], NavigateUrl("admin/system")), MessageType.Success);
+                        }
                     }
                     else
                     {
@@ -150,7 +175,7 @@
     private bool IsValid(string name)
     {
         // must contain letters, underscores and digits and first character must be letter or underscore
-        return !string.IsNullOrEmpty(name) && name.ToLower() != "module" && !name.ToLower().Contains("oqtane") && Regex.IsMatch(name, "^[A-Za-z_][A-Za-z0-9_]*$");
+        return !string.IsNullOrEmpty(name) && name.ToLower() != "module" && !name.ToLower().Contains("oqtane") && Regex.IsMatch(name, "^[A-Za-z_][A-Za-z0-9_.]*$");
     }
 
     private bool IsValidXML(string description)
@@ -162,11 +187,16 @@
     private void TemplateChanged(ChangeEventArgs e)
     {
         _template = (string)e.Value;
-        _minversion = "2.0.0";
         if (_template != "-")
         {
             var template = _templates.FirstOrDefault(item => item.Name == _template);
             _minversion = template.Version;
+            _type = template.Type;
+        }
+        else
+        {
+            _minversion = "2.0.0";
+            _type = "";
         }
         GetLocation();
     }

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

@@ -1,7 +1,6 @@
 @namespace Oqtane.Modules.Admin.ModuleDefinitions
 @inherits ModuleBase
 @using System.Globalization
-@using Microsoft.AspNetCore.Localization
 @inject IModuleDefinitionService ModuleDefinitionService
 @inject IPackageService PackageService
 @inject ILanguageService LanguageService
@@ -10,11 +9,12 @@
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 @inject IPageModuleService PageModuleService
 @inject IModuleService ModuleService
+@inject IPageService PageService
 
 @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">
@@ -32,7 +32,7 @@
 					<div class="row mb-1 align-items-center">
 						<Label Class="col-sm-3" For="categories" HelpText="Comma delimited list of module categories" ResourceKey="Categories">Categories: </Label>
 						<div class="col-sm-9">
-							<input id="categories" class="form-control" @bind="@_categories" maxlength="200" required />
+							<input id="categories" class="form-control" @bind="@_categories" maxlength="200" />
 						</div>
 					</div>
                     <div class="row mb-1 align-items-center">
@@ -63,24 +63,7 @@
 					<div class="row mb-1 align-items-center">
 						<Label Class="col-sm-3" For="packagename" HelpText="The unique name of the package from which this module was installed. This value must be specified within the module's IModule interface specification." ResourceKey="PackageName">Package Name: </Label>
 						<div class="col-sm-9">
-                            @if (!string.IsNullOrEmpty(_packagename))
+                            <input id="packagename" class="form-control" @bind="@_packagename" disabled />
-                            {
-                                <div class="input-group">
-                                    <input id="packagename" class="form-control" @bind="@_packagename" disabled />
-                                    @if (string.IsNullOrEmpty(_packageurl))
-                                    {
-                                        <button type="button" class="btn btn-secondary" @onclick="ValidatePackage">@Localizer["Validate"]</button>
-                                    }
-                                    else
-                                    {
-                                        <a href="@_packageurl" target="_blank" class="btn btn-primary">@SharedLocalizer["Download"]</a>
-                                    }
-                                </div>
-                            }
-                            else
-                            {
-                                <input id="packagename" class="form-control" @bind="@_packagename" disabled />
-                            }
 						</div>
 					</div>
 					<div class="row mb-1 align-items-center">
@@ -90,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>
@@ -244,7 +227,6 @@
     private string _moduledefinitionname = "";
     private string _version;
     private string _packagename = "";
-    private string _packageurl = ""; 
     private string _owner = "";
     private string _url = "";
     private string _contact = "";
@@ -254,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;
@@ -306,15 +287,16 @@
                     _languages = _languages.OrderBy(item => item.Name).ToList();
                 }
 
-                // Group modules by PageId
+                // get distinct pages where module exists
-                // Get distinct PageIds where modules are present
+                var modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId);
-                var distinctPageIds = PageState.Modules
+                var distinctPageIds = modules
-                    .Where(md => md.ModuleDefinition.ModuleDefinitionId == _moduleDefinitionId && md.IsDeleted == false)
+                    .Where(md => md.ModuleDefinition?.ModuleDefinitionId == _moduleDefinitionId && md.IsDeleted == false)
                     .Select(md => md.PageId)
                     .Distinct();
 
-                // Filter and retrieve the corresponding pages
+                // retrieve the pages which contain the module
-                _pagesWithModules = PageState.Pages
+                var pages = await PageService.GetPagesAsync(PageState.Site.SiteId);
+                _pagesWithModules = pages
                     .Where(pg => distinctPageIds.Contains(pg.PageId) && pg.IsDeleted == false)
                     .ToList();
 
@@ -444,27 +426,5 @@
         }
     }
 
-    private async Task ValidatePackage()
-    {
-        try
-        {
-            var package = await PackageService.GetPackageAsync(_packagename, _version, true);
-            if (package == null || string.IsNullOrEmpty(package.PackageUrl))
-            {
-                AddModuleMessage(Localizer["Message.Validate"], MessageType.Warning);
-            }
-            else
-            {
-                _packageurl = package.PackageUrl;
-                AddModuleMessage(Localizer["Message.Download"], MessageType.Info);
-            }
-            StateHasChanged();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Downloading Package {PackageId} {Version}", _packagename, _version);
-            AddModuleMessage(Localizer["Error.Validate"], MessageType.Error);
-        }
-    }
     private string Browse(Page page) => string.IsNullOrEmpty(page.Url) ? NavigateUrl(page.Path) : page.Url;
 }

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

@@ -1,6 +1,7 @@
 @namespace Oqtane.Modules.Admin.ModuleDefinitions
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
+@inject IModuleService ModuleService
 @inject IModuleDefinitionService ModuleDefinitionService
 @inject IPackageService PackageService
 @inject IStringLocalizer<Index> Localizer
@@ -12,32 +13,32 @@
 }
 else
 {
-	<div class="container">
+    <div class="container">
-		<div class="row mb-3 align-items-center">
+        <div class="row mb-3 align-items-center">
-			<div class="col-sm-6">
+            <div class="col-sm-6">
-				<ActionLink Action="Add" Text="Install Module" ResourceKey="InstallModule" />
+                <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>
-			<div class="col-sm-6">
+            <div class="col-sm-6">
-				<select class="form-select" @onchange="(e => CategoryChanged(e))">
+                <select class="form-select" @onchange="(e => CategoryChanged(e))">
-					@foreach (var category in _categories)
+                    @foreach (var category in _categories)
-					{
+                    {
-						if (category == _category)
+                        if (category == _category)
-						{
+                        {
-							<option value="@category" selected>@category @Localizer["Modules"]</option>
+                            <option value="@category" selected>@category @Localizer["Modules"]</option>
-						}
+                        }
-						else
+                        else
-						{
+                        {
-							<option value="@category">@category @Localizer["Modules"]</option>
+                            <option value="@category">@category @Localizer["Modules"]</option>
-						}
+                        }
-					}
+                    }
-				</select>
+                </select>
-			</div>
+            </div>
-		</div>
+        </div>
-	</div>
+    </div>
 
-	<Pager Items="@_moduleDefinitions">
+    <Pager Items="@_moduleDefinitions">
         <Header>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
@@ -50,7 +51,7 @@ else
             <th style="width: 1px;">&nbsp;</th>
         </Header>
         <Row>
-            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.ModuleDefinitionId.ToString())" ResourceKey="EditModule" /></td>
+            <td><ActionLink Action="Edit" Text="Edit" Parameters="@($"id=" + context.ModuleDefinitionId.ToString())" ResourceKey="EditModule" /></td>
             <td>
                 @if (context.AssemblyName != Constants.ClientId)
                 {
@@ -60,17 +61,17 @@ else
             <td>@context.Name</td>
             <td>@context.Version</td>
             <td>
-               @if (context.IsEnabled)
+                @if (context.IsEnabled)
-               {
+                {
-                   <span>@SharedLocalizer["Yes"]</span>
+                    <span>@SharedLocalizer["Yes"]</span>
-               }
+                }
-               else
+                else
-               {
+                {
-                   <span>@SharedLocalizer["No"]</span>
+                    <span>@SharedLocalizer["No"]</span>
-               }
+                }
             </td>
             <td>
-				@if (context.AssemblyName == Constants.ClientId || PageState.Modules.Where(m => m.ModuleDefinition?.ModuleDefinitionId == context.ModuleDefinitionId).FirstOrDefault() != null)
+                @if (context.AssemblyName == Constants.ClientId || _modules.Where(m => m.ModuleDefinition?.ModuleDefinitionId == context.ModuleDefinitionId).FirstOrDefault() != null)
                 {
                     <span>@SharedLocalizer["Yes"]</span>
                 }
@@ -86,9 +87,9 @@ else
                 @((MarkupString)PurchaseLink(context.PackageName))
             </td>
             <td>
-				@{ 
+                @{ 
-					var version = UpgradeAvailable(context.PackageName, context.Version);
+                    var version = UpgradeAvailable(context.PackageName, context.Version);
-				} 
+                } 
                 @if (version != context.Version)
                 {
                     <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadModule(context.PackageName, version))>@SharedLocalizer["Upgrade"]</button>
@@ -99,6 +100,7 @@ else
 }
 
 @code {
+    private List<Module> _modules;
     private List<ModuleDefinition> _allModuleDefinitions;
     private List<ModuleDefinition> _moduleDefinitions;
     private List<Package> _packages;
@@ -111,6 +113,7 @@ else
     {
         try
         {
+            _modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId);
             _allModuleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
             _categories = _allModuleDefinitions.SelectMany(m => m.Categories.Split(',')).Distinct().ToList();
             await LoadModuleDefinitions();
@@ -150,10 +153,10 @@ else
                         link = "<a class=\"btn btn-primary\" style=\"text-decoration: none !important\" href=\"" + package.PaymentUrl + "\" target=\"_new\">" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</a>";
                     }
                 }
-			}
+            }
-		}
+        }
-		return link;
+        return link;
-	}
+    }
 
     private string SupportLink(string packagename, string version)
     {
@@ -169,52 +172,75 @@ else
         return link;
     }
 
-	private string UpgradeAvailable(string packagename, string version)
+    private string UpgradeAvailable(string packagename, string version)
-	{
+    {
-		if (!string.IsNullOrEmpty(packagename) && _packages != null)
+        if (!string.IsNullOrEmpty(packagename) && _packages != null)
-		{
+        {
-			var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
+            var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
-			if (package != null && Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0)
+            if (package != null && Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0)
-			{
+            {
-				return package.Version;
+                return package.Version;
-			}
+            }
-		}
+        }
-		return version;
+        return version;
-	}
+    }
 
-	private async Task DownloadModule(string packagename, string version)
+    private async Task DownloadModule(string packagename, string version)
-	{
+    {
-		try
+        try
-		{
+        {
-			await PackageService.DownloadPackageAsync(packagename, version);
+            await PackageService.DownloadPackageAsync(packagename, version);
-			await logger.LogInformation("Module Downloaded {ModuleDefinitionName} {Version}", packagename, version);
+            await logger.LogInformation("Module Downloaded {ModuleDefinitionName} {Version}", packagename, version);
-			AddModuleMessage(string.Format(Localizer["Success.Module.Install"], NavigateUrl("admin/system")), MessageType.Success);
+            AddModuleMessage(string.Format(Localizer["Success.Module.Install"], NavigateUrl("admin/system")), MessageType.Success);
-		}
+        }
-		catch (Exception ex)
+        catch (Exception ex)
-		{
+        {
-			await logger.LogError(ex, "Error Downloading Module {ModuleDefinitionName} {Version} {Error}", packagename, version, ex.Message);
+            await logger.LogError(ex, "Error Downloading Module {ModuleDefinitionName} {Version} {Error}", packagename, version, ex.Message);
-			AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error);
-		}
+        }
-	}
+    }
 
-	private async Task DeleteModule(ModuleDefinition moduleDefinition)
+    private async Task DeleteModule(ModuleDefinition moduleDefinition)
-	{
+    {
-		try
+        try
-		{
+        {
-			await ModuleDefinitionService.DeleteModuleDefinitionAsync(moduleDefinition.ModuleDefinitionId, moduleDefinition.SiteId);
+            await ModuleDefinitionService.DeleteModuleDefinitionAsync(moduleDefinition.ModuleDefinitionId, moduleDefinition.SiteId);
-			AddModuleMessage(Localizer["Success.Module.Delete"], MessageType.Success);
+            AddModuleMessage(Localizer["Success.Module.Delete"], MessageType.Success);
-			NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, true));
+            NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, true));
-		}
+        }
-		catch (Exception ex)
+        catch (Exception ex)
-		{
+        {
-			await logger.LogError(ex, "Error Deleting Module {ModuleDefinition} {Error}", moduleDefinition, ex.Message);
+            await logger.LogError(ex, "Error Deleting Module {ModuleDefinition} {Error}", moduleDefinition, ex.Message);
-			AddModuleMessage(Localizer["Error.Module.Delete"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Module.Delete"], MessageType.Error);
-		}
+        }
-	}
+    }
 
-	private async Task CategoryChanged(ChangeEventArgs e)
+    private async Task CategoryChanged(ChangeEventArgs e)
-	{
+    {
-		_category = (string)e.Value;
+        _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
 
-<div class="container">
+<TabStrip>
-    <div class="row mb-1 align-items-center">
+    <TabPanel Name="Content" Heading="Content" ResourceKey="Content">
-        <Label Class="col-sm-3" For="content" HelpText="The Exported Module Content" ResourceKey="Content">Content: </Label>
+        <div class="container">
-        <div class="col-sm-9">
+            <div class="row mb-1 align-items-center">
-            <textarea id="content" class="form-control" @bind="@_content" rows="5" readonly></textarea>
+                <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>
-    </div>
+        <br />
-</div>
+        <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>
+
 
-<button type="button" class="btn btn-success" @onclick="ExportModule">@Localizer["Export"]</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 
 @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,22 +2,29 @@
 @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="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+    <NavLink class="btn btn-secondary" href="@PageState.ReturnUrl">@SharedLocalizer["Cancel"]</NavLink>
 </form>
 
 @code {
@@ -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

@@ -3,121 +3,156 @@
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IThemeService ThemeService
+@inject IPageService PageService
 @inject IModuleService ModuleService
 @inject IPageModuleService PageModuleService
 @inject IStringLocalizer<Settings> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+@if (_initialized)
-    <TabStrip>
+{
-        <TabPanel Name="Settings" Heading="Settings" ResourceKey="Settings">
+    <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
-            @if (_containers != null)
+        <TabStrip ActiveTab="@_activetab">
-            {
+            <TabPanel Name="Settings" Heading="Settings" ResourceKey="Settings">
-                <div class="container">
+                @if (_containers != null)
-                    <div class="row mb-1 align-items-center">
+                {
-                        <Label Class="col-sm-3" For="module" HelpText="The name of the module" ResourceKey="Module">Module: </Label>
+                    <div class="container">
-                        <div class="col-sm-9">
+                        <div class="row mb-1 align-items-center">
-                            <input id="module" type="text" class="form-control" @bind="@_module" disabled />
+                            <Label Class="col-sm-3" For="module" HelpText="The name of the module" ResourceKey="Module">Module: </Label>
+                            <div class="col-sm-9">
+                                <input id="module" type="text" class="form-control" @bind="@_module" disabled />
+                            </div>
                         </div>
-                    </div>
+                        <div class="row mb-1 align-items-center">
-                    <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="title" HelpText="Enter the title of the module" ResourceKey="Title">Title: </Label>
-                        <Label Class="col-sm-3" For="title" HelpText="Enter the title of the module" ResourceKey="Title">Title: </Label>
+                            <div class="col-sm-9">
-                        <div class="col-sm-9">
+                                <input id="title" type="text" class="form-control" @bind="@_title" required />
-                            <input id="title" type="text" class="form-control" @bind="@_title" required />
+                            </div>
                         </div>
-                    </div>
+                        <div class="row mb-1 align-items-center">
-                    <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="pane" HelpText="The pane where the module will be displayed" ResourceKey="Pane">Pane: </Label>
-                        <Label Class="col-sm-3" For="pane" HelpText="The pane where the module will be displayed" ResourceKey="Pane">Pane: </Label>
+                            <div class="col-sm-9">
-                        <div class="col-sm-9">
+                                <select class="form-select" @bind="@_pane">
-                            <select class="form-select" @bind="@_pane">
+                                    @foreach (string pane in PageState.Page.Panes)
-                                @foreach (string pane in PageState.Page.Panes)
-                                {
-                                    <option value="@pane">@pane Pane</option>
-                                }
-                            </select>
-                        </div>
-                    </div>
-                    <div class="row mb-1 align-items-center">
-                        <Label Class="col-sm-3" For="container" HelpText="Select the module's container" ResourceKey="Container">Container: </Label>
-                        <div class="col-sm-9">
-                            <select id="container" class="form-select" @bind="@_containerType" required>
-                                @foreach (var container in _containers)
-                                {
-                                    <option value="@container.TypeName">@container.Name</option>
-                                }
-                            </select>
-                        </div>
-                    </div>
-                    <div class="row mb-1 align-items-center">
-                        <Label Class="col-sm-3" For="allpages" HelpText="Indicate if this module should be displayed on all pages" ResourceKey="DisplayOnAllPages">Display On All Pages? </Label>
-                        <div class="col-sm-9">
-                            <select id="allpages" class="form-select" @bind="@_allPages" 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="page" HelpText="The page that the module is located on" ResourceKey="Page">Page: </Label>
-                        <div class="col-sm-9">
-                            <select id="page" class="form-select" @bind="@_pageId" required>
-                                @if (PageState.Page.UserId != null)
-                                {
-                                    <option value="@PageState.Page.PageId">@(PageState.Page.Name)</option>
-                                }
-                                else
-                                {
-                                    foreach (Page p in PageState.Pages)
                                     {
-                                        if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, p.PermissionList))
+                                        <option value="@pane">@pane Pane</option>
+                                    }
+                                </select>
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="container" HelpText="Select the module's container" ResourceKey="Container">Container: </Label>
+                            <div class="col-sm-9">
+                                <select id="container" class="form-select" @bind="@_containerType" required>
+                                    @foreach (var container in _containers)
+                                    {
+                                        <option value="@container.TypeName">@container.Name</option>
+                                    }
+                                </select>
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="effectiveDate" HelpText="The date that this module is active" ResourceKey="EffectiveDate">Effective Date: </Label>
+                            <div class="col-sm-9">
+                                <input type="date" id="effectiveDate" class="form-control" @bind="@_effectivedate" />
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="expiryDate" HelpText="The date that this module expires" ResourceKey="ExpiryDate">Expiry Date: </Label>
+                            <div class="col-sm-9">
+                                <input type="date" id="expiryDate" class="form-control" @bind="@_expirydate" />
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="allpages" HelpText="Indicate if this module should be displayed on all pages" ResourceKey="DisplayOnAllPages">Display On All Pages? </Label>
+                            <div class="col-sm-9">
+                                <select id="allpages" class="form-select" @bind="@_allPages" 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="page" HelpText="The page that the module is located on" ResourceKey="Page">Page: </Label>
+                            <div class="col-sm-9">
+                                <select id="page" class="form-select" @bind="@_pageId" required>
+                                    @if (PageState.Page.UserId != null)
+                                    {
+                                        <option value="@PageState.Page.PageId">@(PageState.Page.Name)</option>
+                                    }
+                                    else
+                                    {
+                                        if (_pages != null)
                                         {
-                                            <option value="@p.PageId">@(new string('-', p.Level * 2))@(p.Name)</option>
+                                            foreach (Page p in _pages)
+                                            {
+                                                if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, p.PermissionList))
+                                                {
+                                                    <option value="@p.PageId">@(new string('-', p.Level * 2))@(p.Name)</option>
+                                                }
+                                            }
                                         }
                                     }
-
+                                </select>
-                                }
+                            </div>
-                            </select>
                         </div>
                     </div>
-                </div>
+                    <br />
-            }
+                    <Section Name="ModuleContent" Heading="Content" ResourceKey="ModuleContent">
-        </TabPanel>
+                        <div class="container">
-        <TabPanel Name="Permissions" ResourceKey="Permissions">
+                            <div class="row mb-1 align-items-center">
-            @if (_permissions != null)
+                                <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">
-                <div class="container">
+                                    <textarea id="moduleheader" class="form-control" @bind="@_header" rows="3" maxlength="4000"></textarea>
-                    <div class="row mb-1 align-items-center">
+                                </div>
-                        <PermissionGrid EntityName="@EntityNames.Module" PermissionNames="@_permissionNames" PermissionList="@_permissions" @ref="_permissionGrid" />
+                            </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">
+                @if (_permissions != null)
+                {
+                    <div class="container">
+                        <div class="row mb-1 align-items-center">
+                            <PermissionGrid EntityName="@EntityNames.Module" PermissionNames="@_permissionNames" PermissionList="@_permissions" @ref="_permissionGrid" />
+                        </div>
                     </div>
-                </div>
 
+                }
+            </TabPanel>
+            @if (_moduleSettingsType != null)
+            {
+                <TabPanel Name="ModuleSettings" Heading="@_moduleSettingsTitle" ResourceKey="ModuleSettings">
+                    @ModuleSettingsComponent
+                </TabPanel>
             }
-        </TabPanel>
+            @if (_containerSettingsType != null)
-        @if (_moduleSettingsType != null)
+            {
-        {
+                <TabPanel Name="ContainerSettings" Heading="Container Settings" ResourceKey="ContainerSettings">
-            <TabPanel Name="ModuleSettings" Heading="@_moduleSettingsTitle" ResourceKey="ModuleSettings">
+                    @ContainerSettingsComponent
-                @ModuleSettingsComponent
+                </TabPanel>
-            </TabPanel>
+            }
-        }
+        </TabStrip>
-        @if (_containerSettingsType != null)
+        <br />
-        {
+        <button type="button" class="btn btn-success" @onclick="SaveModule">@SharedLocalizer["Save"]</button>
-            <TabPanel Name="ContainerSettings" Heading="Container Settings" ResourceKey="ContainerSettings">
+        <NavLink class="btn btn-secondary" href="@PageState.ReturnUrl">@SharedLocalizer["Cancel"]</NavLink>
-                @ContainerSettingsComponent
+        <br />
-            </TabPanel>
+        <br />
-        }
+        <AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon"></AuditInfo>
-    </TabStrip>
+    </form>
-    <br />
+}
-    <button type="button" class="btn btn-success" @onclick="SaveModule">@SharedLocalizer["Save"]</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
-    <br />
-    <br />
-    <AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon"></AuditInfo>
-</form>
 
 @code {
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
-    public override string Title => "Module Settings";
 
+    private bool _initialized = false;
     private ElementReference form;
     private bool validated = false;
     private List<ThemeControl> _containers = new List<ThemeControl>();
@@ -126,13 +161,15 @@
     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;
     private PermissionGrid _permissionGrid;
     private Type _moduleSettingsType;
     private object _moduleSettings;
-    private string _moduleSettingsTitle = "Module Settings";
+    private string _moduleSettingsTitle;
     private RenderFragment ModuleSettingsComponent { get; set; }
     private Type _containerSettingsType;
     private object _containerSettings;
@@ -141,35 +178,55 @@
     private DateTime createdon;
     private string modifiedby;
     private DateTime modifiedon;
+    private DateTime? _effectivedate = null;
+    private DateTime? _expirydate = null;
+    private List<Page> _pages;
+    private string _activetab = "";
 
-    protected override void OnInitialized()
+    protected override async Task OnInitializedAsync()
     {
-        _module = ModuleState.ModuleDefinition.Name;
+        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;
+        _pages = await PageService.GetPagesAsync(PageState.Site.SiteId);
-        _allPages = ModuleState.AllPages.ToString();
-        _permissions = ModuleState.PermissionList;
-        _pageId = ModuleState.PageId.ToString();
-        createdby = ModuleState.CreatedBy;
-        createdon = ModuleState.CreatedOn;
-        modifiedby = ModuleState.ModifiedBy;
-        modifiedon = ModuleState.ModifiedOn;
 
-        if (ModuleState.ModuleDefinition != null)
+        var pagemodule = await PageModuleService.GetPageModuleAsync(ModuleState.PageModuleId);
+
+        _pageId = pagemodule.PageId.ToString();
+        _title = pagemodule.Title;
+        _pane = pagemodule.Pane;
+        _containerType = pagemodule.ContainerType;
+        if (string.IsNullOrEmpty(_containerType))
         {
-            _permissionNames = ModuleState.ModuleDefinition?.PermissionNames;
+            _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);
 
-            if (!string.IsNullOrEmpty(ModuleState.ModuleDefinition.SettingsType))
+        _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)
             {
@@ -182,14 +239,15 @@
                 ModuleSettingsComponent = builder =>
                 {
                     builder.OpenComponent(0, _moduleSettingsType);
-                    builder.AddComponentReferenceCapture(1, inst => { _moduleSettings = Convert.ChangeType(inst, _moduleSettingsType); });
+                    builder.AddAttribute(1, "RenderModeBoundary", RenderModeBoundary);
+                    builder.AddComponentReferenceCapture(2, inst => { _moduleSettings = Convert.ChangeType(inst, _moduleSettingsType); });
                     builder.CloseComponent();
                 };
             }
         }
         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)));
@@ -201,42 +259,56 @@
                 ContainerSettingsComponent = builder =>
                 {
                     builder.OpenComponent(0, _containerSettingsType);
-                    builder.AddComponentReferenceCapture(1, inst => { _containerSettings = Convert.ChangeType(inst, _containerSettingsType); });
+                    builder.AddAttribute(1, "RenderModeBoundary", RenderModeBoundary);
+                    builder.AddComponentReferenceCapture(2, inst => { _containerSettings = Convert.ChangeType(inst, _containerSettingsType); });
                     builder.CloseComponent();
                 };
             }
         }
+
+        _initialized = true;
     }
 
     private async Task SaveModule()
     {
+
         validated = true;
         var interop = new Interop(JSRuntime);
         if (await interop.FormValid(form))
         {
+
             if (!string.IsNullOrEmpty(_title))
             {
+                if (!Utilities.ValidateEffectiveExpiryDates(_effectivedate, _expirydate))
+                {
+                    AddModuleMessage(SharedLocalizer["Message.EffectiveExpiryDateError"], MessageType.Warning);
+                    return;
+                }                
                 var pagemodule = await PageModuleService.GetPageModuleAsync(ModuleState.PageModuleId);
                 pagemodule.PageId = int.Parse(_pageId);
                 pagemodule.Title = _title;
                 pagemodule.Pane = _pane;
+                pagemodule.EffectiveDate = Utilities.LocalDateAndTimeAsUtc(_effectivedate);
+                pagemodule.ExpiryDate = Utilities.LocalDateAndTimeAsUtc(_expirydate);
                 pagemodule.ContainerType = (_containerType != "-") ? _containerType : string.Empty;
                 if (!string.IsNullOrEmpty(pagemodule.ContainerType) && pagemodule.ContainerType == PageState.Page.DefaultContainerType)
-				{
+                {
-					pagemodule.ContainerType = string.Empty;
+                    pagemodule.ContainerType = string.Empty;
-				}
+                }
-				if (!string.IsNullOrEmpty(pagemodule.ContainerType) && pagemodule.ContainerType == PageState.Site.DefaultContainerType)
+                if (!string.IsNullOrEmpty(pagemodule.ContainerType) && pagemodule.ContainerType == PageState.Site.DefaultContainerType)
-				{
+                {
-					pagemodule.ContainerType = string.Empty;
+                    pagemodule.ContainerType = string.Empty;
-				}
+                }
-				await PageModuleService.UpdatePageModuleAsync(pagemodule);
+                pagemodule.Header = _header;
-				await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
+                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.AllPages = bool.Parse(_allPages);
-				module.PageModuleId = ModuleState.PageModuleId;
+                module.PageModuleId = ModuleState.PageModuleId;
-				module.PermissionList = _permissionGrid.GetPermissionList();
+                module.PermissionList = _permissionGrid.GetPermissionList();
-				await ModuleService.UpdateModuleAsync(module);
+                await ModuleService.UpdateModuleAsync(module);
 
                 if (_moduleSettingsType != null)
                 {
@@ -257,17 +329,18 @@
                     await containerSettingsControl.UpdateSettings();
                 }
 
-                NavigationManager.NavigateTo(NavigateUrl());
+                NavigationManager.NavigateTo(PageState.ReturnUrl);
             }
             else
             {
+                _activetab = "Settings";
                 AddModuleMessage(Localizer["Message.Required.Title"], MessageType.Warning);
             }
         }
         else
         {
+            _activetab = "Settings";
             AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
-
 }

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

@@ -16,7 +16,7 @@
                     <div class="row mb-1 align-items-center">
                         <Label Class="col-sm-3" For="name" HelpText="Enter the page name" ResourceKey="Name">Name: </Label>
                         <div class="col-sm-9">
-                            <input id="name" class="form-control" @bind="@_name" required />
+                            <input id="name" class="form-control" @bind="@_name" maxlength="100" required />
                         </div>
                     </div>
                     @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
@@ -26,7 +26,7 @@
                             <div class="col-sm-9">
                                 <select id="parent" class="form-select" value="@_parentid" @onchange="(e => ParentChanged(e))" required>
                                     <option value="-1">&lt;@Localizer["SiteRoot"]&gt;</option>
-                                    @foreach (Page page in PageState.Pages)
+                                    @foreach (Page page in _pages)
                                     {
                                         if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, page.PermissionList))
                                         {
@@ -81,42 +81,21 @@
                         </div>
                     }
                     <div class="row mb-1 align-items-center">
-                        <Label Class="col-sm-3" For="navigation" HelpText="Select whether the page is part of the site navigation or hidden" ResourceKey="Navigation">Navigation? </Label>
+                        <Label Class="col-sm-3" For="title" HelpText="Optionally enter the page title. If you do not provide a page title, the page name will be used." ResourceKey="Title">Title: </Label>
                         <div class="col-sm-9">
-                            <select id="navigation" class="form-select" @bind="@_isnavigation" required>
+                            <input id="title" class="form-control" @bind="@_title" maxlength="200" />
-                                <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="clickable" HelpText="Select whether the link in the site navigation is enabled or disabled" ResourceKey="Clickable">Clickable? </Label>
-                        <div class="col-sm-9">
-                            <select id="clickable" class="form-select" @bind="@_isclickable" 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="path" HelpText="Optionally enter a url path for this page (ie. home ). If you do not provide a url path, the page name will be used. If the page is intended to be the root path specify '/'." ResourceKey="UrlPath">Url Path: </Label>
                         <div class="col-sm-9">
-                            <input id="path" class="form-control" @bind="@_path" />
+                            <input id="path" class="form-control" @bind="@_path" maxlength="256" />
                         </div>
                     </div>
                     <div class="row mb-1 align-items-center">
                         <Label Class="col-sm-3" For="url" HelpText="Optionally enter a url which this page should redirect to when a user navigates to it" ResourceKey="Redirect">Redirect: </Label>
                         <div class="col-sm-9">
-                            <input id="url" class="form-control" @bind="@_url" />
+                            <input id="url" class="form-control" @bind="@_url" maxlength="500" />
-                        </div>
-                    </div>
-                    <div class="row mb-1 align-items-center">
-                        <Label Class="col-sm-3" For="icon" HelpText="Optionally provide an icon class name for this page which will be displayed in the site navigation" ResourceKey="Icon">Icon: </Label>
-                        <div class="col-sm-8">
-                            <InputList Value="@_icon" ValueChanged="IconChanged" DataList="@_icons" ResourceKey="Icon" ResourceType="@_iconresources" />
-                        </div>
-                        <div class="col-sm-1">
-                            <i class="@_icon"></i>
                         </div>
                     </div>
                     <div class="row mb-1 align-items-center">
@@ -129,22 +108,22 @@
                         </div>
                     </div>
                 </div>
-
+                <Section Name="Theme" Heading="Theme" ResourceKey="Theme">
-                <Section Name="Appearance" ResourceKey="Appearance" Heading=@Localizer["Appearance.Name"]>
                     <div class="container">
-                        <div class="row mb-1 align-items-center">
-                            <Label Class="col-sm-3" For="title" HelpText="Optionally enter the page title. If you do not provide a page title, the page name will be used." ResourceKey="Title">Title: </Label>
-                            <div class="col-sm-9">
-                                <input id="title" class="form-control" @bind="@_title" />
-                            </div>
-                        </div>
                         <div class="row mb-1 align-items-center">
                             <Label Class="col-sm-3" For="theme" HelpText="Select the theme for this page" ResourceKey="Theme">Theme: </Label>
                             <div class="col-sm-9">
                                 <select id="theme" class="form-select" value="@_themetype" @onchange="(e => ThemeChanged(e))" required>
                                     @foreach (var theme in _themes)
                                     {
-                                        <option value="@theme.TypeName">@theme.Name</option>
+                                        @if (theme.TypeName == PageState.Site.DefaultThemeType)
+                                        {
+                                            <option value="@theme.TypeName">*@theme.Name*</option>
+                                        }
+                                        else
+                                        {
+                                            <option value="@theme.TypeName">@theme.Name</option>
+                                        }
                                     }
                                 </select>
                             </div>
@@ -162,18 +141,61 @@
                         </div>
                     </div>
                 </Section>
+                <Section Name="Appearance" Heading="Appearance" ResourceKey="Appearance">
+                    <div class="container">
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="icon" HelpText="Optionally provide an icon class name for this page which will be displayed in the site navigation" ResourceKey="Icon">Icon: </Label>
+                            <div class="col-sm-8">
+                                <InputList Value="@_icon" ValueChanged="IconChanged" DataList="@_icons" ResourceKey="Icon" ResourceType="@_iconresources" />
+                            </div>
+                            <div class="col-sm-1">
+                                <i class="@_icon"></i>
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="navigation" HelpText="Select whether the page is part of the site navigation or hidden" ResourceKey="Navigation">Navigation? </Label>
+                            <div class="col-sm-9">
+                                <select id="navigation" class="form-select" @bind="@_isnavigation" 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="clickable" HelpText="Select whether the link in the site navigation is enabled or disabled" ResourceKey="Clickable">Clickable? </Label>
+                            <div class="col-sm-9">
+                                <select id="clickable" class="form-select" @bind="@_isclickable" 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="effectiveDate" HelpText="The date that this page is active" ResourceKey="EffectiveDate">Effective Date: </Label>
+                            <div class="col-sm-9">
+                                <input type="date" id="effectiveDate" class="form-control" @bind="@_effectivedate" />
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="expiryDate" HelpText="The date that this page expires" ResourceKey="ExpiryDate">Expiry Date: </Label>
+                            <div class="col-sm-9">
+                                <input type="date" id="expiryDate" class="form-control" @bind="@_expirydate" />
+                            </div>
+                        </div>
+                    </div>
+                </Section>
                 <Section Name="PageContent" ResourceKey="PageContent" Heading=@Localizer["PageContent.Heading"]>
                     <div class="container">
                         <div class="row mb-1 align-items-center">
                             <Label Class="col-sm-3" For="headcontent" HelpText="Optionally enter content to be included in the page head (ie. meta, link, or script tags)" ResourceKey="HeadContent">Head Content: </Label>
                             <div class="col-sm-9">
-                                <textarea id="headcontent" class="form-control" @bind="@_headcontent" rows="3"></textarea>
+                                <textarea id="headcontent" class="form-control" @bind="@_headcontent" rows="3" maxlength="4000"></textarea>
                             </div>
                         </div>
                         <div class="row mb-1 align-items-center">
                             <Label Class="col-sm-3" For="bodycontent" HelpText="Optionally enter content to be included in the page body (ie. script tags)" ResourceKey="BodyContent">Body Content: </Label>
                             <div class="col-sm-9">
-                                <textarea id="bodycontent" class="form-control" @bind="@_bodycontent" rows="3"></textarea>
+                                <textarea id="bodycontent" class="form-control" @bind="@_bodycontent" rows="3" maxlength="4000"></textarea>
                             </div>
                         </div>
                     </div>
@@ -186,12 +208,6 @@
                     </div>
                 </div>
             </TabPanel>
-            @if (_themeSettingsType != null)
-            {
-                <TabPanel Name="ThemeSettings" Heading=@Localizer["Theme.Heading"] ResourceKey="ThemeSettings">
-                    @ThemeSettingsComponent
-                </TabPanel>
-            }
         </TabStrip>
         <br />
         <button type="button" class="btn btn-success" @onclick="SavePage">@SharedLocalizer["Save"]</button>
@@ -207,6 +223,7 @@
     private bool validated = false;
     private List<ThemeControl> _themes = new List<ThemeControl>();
     private List<ThemeControl> _containers = new List<ThemeControl>();
+    private List<Page> _pages;
     private int _pageId;
     private string _name;
     private string _parentid = "-1";
@@ -226,18 +243,19 @@
     private string _bodycontent;
     private string _permissions = null;
     private PermissionGrid _permissionGrid;
-    private Type _themeSettingsType;
-    private object _themeSettings;
-    private RenderFragment ThemeSettingsComponent { get; set; }
     private bool _refresh = false;
     protected Page _parent = null;
     protected Dictionary<string, string> _icons;
     private string _iconresources = "";
+    private DateTime? _effectivedate = null;
+    private DateTime? _expirydate = null;
 
     protected override async Task OnInitializedAsync()
     {
         try
         {
+            _pages = await PageService.GetPagesAsync(PageState.Site.SiteId);
+
             if (PageState.QueryString.ContainsKey("id"))
             {
                 _pageId = Int32.Parse(PageState.QueryString["id"]);
@@ -254,18 +272,27 @@
             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 PageState.Pages.Where(item => (_parentid == "-1" && item.ParentId == null) || (item.ParentId == int.Parse(_parentid))))
+                foreach (Page p in _pages.Where(item => (_parentid == "-1" && item.ParentId == null) || (item.ParentId == int.Parse(_parentid))))
                 {
                     if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.PermissionList))
                     {
                         _children.Add(p);
                     }
                 }
-                ThemeSettings();
+                _effectivedate = Utilities.UtcAsLocalDate(PageState.Page.EffectiveDate);
+                _expirydate = Utilities.UtcAsLocalDate(PageState.Page.ExpiryDate);
                 _initialized = true;
             }
             else
@@ -274,20 +301,20 @@
                 AddModuleMessage(Localizer["Error.Page.Load"], MessageType.Error);
             }
         }
-		catch (Exception ex)
+        catch (Exception ex)
-		{
+        {
-			await logger.LogError(ex, "Error Loading Page {Error}", ex.Message);
+            await logger.LogError(ex, "Error Loading Page {Error}", ex.Message);
-			AddModuleMessage(Localizer["Error.Page.Load"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Page.Load"], MessageType.Error);
-		}
+        }
-	}
+    }
 
-	private async void ParentChanged(ChangeEventArgs e)
+    private async void ParentChanged(ChangeEventArgs e)
-	{
+    {
-		try
+        try
-		{
+        {
-			_parentid = (string)e.Value;
+            _parentid = (string)e.Value;
             _children = new List<Page>();
-            foreach (Page p in PageState.Pages.Where(item => (_parentid == "-1" && item.ParentId == null) || (item.ParentId == int.Parse(_parentid))))
+            foreach (Page p in _pages.Where(item => (_parentid == "-1" && item.ParentId == null) || (item.ParentId == int.Parse(_parentid))))
             {
                 if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.PermissionList))
                 {
@@ -295,154 +322,151 @@
                 }
             }
             StateHasChanged();
-		}
+        }
-		catch (Exception ex)
+        catch (Exception ex)
-		{
+        {
-			await logger.LogError(ex, "Error Loading Child Pages For Parent {PageId} {Error}", _parentid, ex.Message);
+            await logger.LogError(ex, "Error Loading Child Pages For Parent {PageId} {Error}", _parentid, ex.Message);
-			AddModuleMessage(Localizer["Error.ChildPage.Load"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.ChildPage.Load"], MessageType.Error);
-		}
+            await ScrollToPageTop();
-	}
+        }
+    }
 
-    private void ThemeChanged(ChangeEventArgs e)
+    private async Task ThemeChanged(ChangeEventArgs e)
     {
         _themetype = (string)e.Value;
         _containers = ThemeService.GetContainerControls(PageState.Site.Themes, _themetype);
         _containertype = _containers.First().TypeName;
-        ThemeSettings();
         StateHasChanged();
 
         // if theme chosen is different than default site theme, display warning message to user
         if (ThemeService.GetTheme(PageState.Site.Themes, _themetype)?.ThemeName != ThemeService.GetTheme(PageState.Site.Themes, PageState.Site.DefaultThemeType)?.ThemeName)
         {
             AddModuleMessage(Localizer["ThemeChanged.Message"], MessageType.Warning);
+            await ScrollToPageTop();
         }
     }
 
-	private void ThemeSettings()
+    private async Task SavePage()
-	{
+    {
-		_themeSettingsType = null;
+        validated = true;
-        var theme = PageState.Site.Themes.FirstOrDefault(item => item.Themes.Any(themecontrol => themecontrol.TypeName.Equals(_themetype)));
+        var interop = new Interop(JSRuntime);
-		if (theme != null && !string.IsNullOrEmpty(theme.ThemeSettingsType))
+        if (await interop.FormValid(form))
-		{
+        {
-			_themeSettingsType = Type.GetType(theme.ThemeSettingsType);
+            Page page = null;
-			if (_themeSettingsType != null)
+            try
-			{
+            {
-				ThemeSettingsComponent = builder =>
+                if (!Utilities.ValidateEffectiveExpiryDates(_effectivedate, _expirydate))
-				{
+                {
-					builder.OpenComponent(0, _themeSettingsType);
+                    AddModuleMessage(SharedLocalizer["Message.EffectiveExpiryDateError"], MessageType.Warning);
-					builder.AddComponentReferenceCapture(1, inst => { _themeSettings = Convert.ChangeType(inst, _themeSettingsType); });
+                    await ScrollToPageTop();
-					builder.CloseComponent();
+                    return;
-				};
+                }
-			}
-			_refresh = true;
-		}
-	}
-
-	private async Task SavePage()
-	{
-		validated = true;
-		var interop = new Interop(JSRuntime);
-		if (await interop.FormValid(form))
-		{
-			Page page = null;
-			try
-			{
                 if (!string.IsNullOrEmpty(_themetype) && !string.IsNullOrEmpty(_containertype))
-				{
+                {
-					page = new Page();
+                    page = new Page();
-					page.SiteId = PageState.Page.SiteId;
+                    page.SiteId = PageState.Page.SiteId;
-					page.Name = _name;
+                    page.Name = _name;
 
-					if (string.IsNullOrEmpty(_path))
+                    if (_parentid == "-1")
-					{
+                    {
-						_path = _name;
+                        page.ParentId = null;
-					}
+                    }
-					if (_path.Contains("/"))
+                    else
-					{
+                    {
-						if (_path.EndsWith("/") && _path != "/")
+                        page.ParentId = Int32.Parse(_parentid);
-						{
+                    }
-							_path = _path.Substring(0, _path.Length - 1);
-						}
-						_path = _path.Substring(_path.LastIndexOf("/") + 1);
-					}
                     
-					if (_parentid == "-1")
+                    if (string.IsNullOrEmpty(_path))
-					{
+                    {
-						page.ParentId = null;
+                        _path = _name;
-						page.Path = Utilities.GetFriendlyUrl(_path);
+                    }
-					}
-					else
-					{
-						page.ParentId = Int32.Parse(_parentid);
-						var parent = PageState.Pages.Where(item => item.PageId == page.ParentId).FirstOrDefault();
-						if (parent.Path == string.Empty)
-						{
-							page.Path = Utilities.GetFriendlyUrl(parent.Name) + "/" + Utilities.GetFriendlyUrl(_path);
-						}
-						else
-						{
-							page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(_path);
-						}
-					}
 
-					var _pages = await PageService.GetPagesAsync(PageState.Site.SiteId);
+                    if (_path.Contains("/"))
-					if (_pages.Any(item => item.Path == page.Path))
+                    {
-					{
+                        if (_path.EndsWith("/") && _path != "/")
-						AddModuleMessage(string.Format(Localizer["Message.Page.Exists"], _path), MessageType.Warning);
+                        {
-						return;
+                            _path = _path.Substring(0, _path.Length - 1);
-					}
+                        }
+                        _path = _path.Substring(_path.LastIndexOf("/") + 1);
+                    }
+                    if (_parentid == "-1")
+                    {
+                        page.Path = Utilities.GetFriendlyUrl(_path);
+                    }
+                    else
+                    {
+                        Page parent = _pages.FirstOrDefault(item => item.PageId == page.ParentId);
+                        if (parent.Path == string.Empty)
+                        {
+                            page.Path = Utilities.GetFriendlyUrl(parent.Name) + "/" + Utilities.GetFriendlyUrl(_path);
+                        }
+                        else
+                        {
+                            page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(_path);
+                        }
+                    }
 
-					if (page.ParentId == null && Constants.ReservedRoutes.Contains(page.Name.ToLower()))
+                    if (_pages.Any(item => item.Path == page.Path))
-					{
+                    {
-						AddModuleMessage(string.Format(Localizer["Message.Page.Reserved"], page.Name), MessageType.Warning);
+                        AddModuleMessage(string.Format(Localizer["Message.Page.Exists"], _path), MessageType.Warning);
-						return;
+                        await ScrollToPageTop();
-					}
+                        return;
+                    }
 
-					Page child;
+                    if (page.ParentId == null && Constants.ReservedRoutes.Contains(page.Name.ToLower()))
-					switch (_insert)
+                    {
-					{
+                        AddModuleMessage(string.Format(Localizer["Message.Page.Reserved"], page.Name), MessageType.Warning);
-						case "<<":
+                        await ScrollToPageTop();
-							page.Order = 0;
+                        return;
-							break;
+                    }
-						case "<":
-							child = PageState.Pages.Where(item => item.PageId == _childid).FirstOrDefault();
-							page.Order = child.Order - 1;
-							break;
-						case ">":
-							child = PageState.Pages.Where(item => item.PageId == _childid).FirstOrDefault();
-							page.Order = child.Order + 1;
-							break;
-						case ">>":
-							page.Order = int.MaxValue;
-							break;
-					}
 
-					page.IsNavigation = (_isnavigation == null ? true : Boolean.Parse(_isnavigation));
+                    Page child;
-					page.IsClickable = (_isclickable == null ? true : Boolean.Parse(_isclickable));
+                    switch (_insert)
+                    {
+                        case "<<":
+                            page.Order = 0;
+                            break;
+                        case "<":
+                            child = _pages.Where(item => item.PageId == _childid).FirstOrDefault();
+                            page.Order = child.Order - 1;
+                            break;
+                        case ">":
+                            child = _pages.Where(item => item.PageId == _childid).FirstOrDefault();
+                            page.Order = child.Order + 1;
+                            break;
+                        case ">>":
+                            page.Order = int.MaxValue;
+                            break;
+                    }
+
+                    page.IsNavigation = (_isnavigation == null ? true : Boolean.Parse(_isnavigation));
+                    page.IsClickable = (_isclickable == null ? true : Boolean.Parse(_isclickable));
                     page.Url = _url;
                     page.IsPersonalizable = (_ispersonalizable == null ? false : Boolean.Parse(_ispersonalizable));
+                    page.EffectiveDate = Utilities.LocalDateAndTimeAsUtc(_effectivedate);
+                    page.ExpiryDate = Utilities.LocalDateAndTimeAsUtc(_expirydate);
                     page.UserId = null;
 
                     // appearance
                     page.Title = _title;
                     page.Icon = (_icon == null ? string.Empty : _icon);
-					page.ThemeType = _themetype;
+                    page.ThemeType = _themetype;
-					if (!string.IsNullOrEmpty(page.ThemeType) && page.ThemeType == PageState.Site.DefaultThemeType)
+                    if (!string.IsNullOrEmpty(page.ThemeType) && page.ThemeType == PageState.Site.DefaultThemeType)
-					{
+                    {
-						page.ThemeType = string.Empty;
+                        page.ThemeType = string.Empty;
-					}
+                    }
-					page.DefaultContainerType = _containertype;
+                    page.DefaultContainerType = _containertype;
-					if (!string.IsNullOrEmpty(page.DefaultContainerType) && page.DefaultContainerType == PageState.Site.DefaultContainerType)
+                    if (!string.IsNullOrEmpty(page.DefaultContainerType) && page.DefaultContainerType == PageState.Site.DefaultContainerType)
-					{
+                    {
-						page.DefaultContainerType = string.Empty;
+                        page.DefaultContainerType = string.Empty;
-					}
+                    }
 
                     // page content
                     page.HeadContent = _headcontent;
                     page.BodyContent = _bodycontent;
 
                     // permissions
-					page.PermissionList = _permissionGrid.GetPermissionList();
+                    page.PermissionList = _permissionGrid.GetPermissionList();
 
                     page = await PageService.AddPageAsync(page);
                     await PageService.UpdatePageOrderAsync(page.SiteId, page.PageId, page.ParentId);
@@ -450,7 +474,7 @@
                     await logger.LogInformation("Page Added {Page}", page);
                     if (!string.IsNullOrEmpty(PageState.ReturnUrl))
                     {
-                        NavigationManager.NavigateTo(page.Path); // redirect to new page
+                        NavigationManager.NavigateTo(NavigateUrl(page.Path), true); // redirect to page added and reload
                     }
                     else
                     {
@@ -460,6 +484,7 @@
                 else
                 {
                     AddModuleMessage(Localizer["Message.Required.PageInfo"], MessageType.Warning);
+                    await ScrollToPageTop();
                 }
 
             }
@@ -467,11 +492,13 @@
             {
                 await logger.LogError(ex, "Error Saving Page {Page} {Error}", page, ex.Message);
                 AddModuleMessage(Localizer["Error.Page.Save"], MessageType.Error);
+                await ScrollToPageTop();
             }
         }
         else
         {
             AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+            await ScrollToPageTop();
         }
     }
 

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

@@ -1,10 +1,12 @@
 @namespace Oqtane.Modules.Admin.Pages
 @using Oqtane.Interfaces
+@using System.Globalization
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IPageService PageService
 @inject IPageModuleService PageModuleService
-@inject IThemeService  ThemeService
+@inject IModuleService ModuleService
+@inject IThemeService ThemeService
 @inject ISystemService SystemService
 @inject IStringLocalizer<Edit> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
@@ -20,7 +22,7 @@
                         <div class="row mb-1 align-items-center">
                             <Label Class="col-sm-3" For="name" HelpText="Enter the page name" ResourceKey="Name">Name: </Label>
                             <div class="col-sm-9">
-                                <input id="name" class="form-control" @bind="@_name" maxlength="50" required />
+                                <input id="name" class="form-control" @bind="@_name" maxlength="100" required />
                             </div>
                         </div>
                         @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
@@ -28,16 +30,16 @@
                             <div class="row mb-1 align-items-center">
                                 <Label Class="col-sm-3" For="parent" HelpText="Select the parent for the page in the site hierarchy" ResourceKey="Parent">Parent: </Label>
                                 <div class="col-sm-9">
-                                        <select id="parent" class="form-select" value="@_parentid" @onchange="(e => ParentChanged(e))" required>
+                                    <select id="parent" class="form-select" value="@_parentid" @onchange="(e => ParentChanged(e))" required>
-                                            <option value="-1">&lt;@Localizer["SiteRoot"]&gt;</option>
+                                        <option value="-1">&lt;@Localizer["SiteRoot"]&gt;</option>
-                                            @foreach (Page page in PageState.Pages)
+                                        @foreach (Page page in _pages)
+                                        {
+                                            if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, page.PermissionList) && page.PageId != _pageId)
                                             {
-                                                if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, page.PermissionList) && page.PageId != _pageId)
+                                                <option value="@(page.PageId)">@(new string('-', page.Level * 2))@(page.Name)</option>
-                                                {
-                                                    <option value="@(page.PageId)">@(new string('-', page.Level * 2))@(page.Name)</option>
-                                                }
                                             }
-                                        </select>
+                                        }
+                                    </select>
                                 </div>
                             </div>
                             <div class="row mb-1 align-items-center">
@@ -96,25 +98,13 @@
                             </div>
                         }
                         <div class="row mb-1 align-items-center">
-                            <Label Class="col-sm-3" For="navigation" HelpText="Select whether the page is part of the site navigation or hidden" ResourceKey="Navigation">Navigation? </Label>
+                            <Label Class="col-sm-3" For="title" HelpText="Optionally enter the page title. If you do not provide a page title, the page name will be used." ResourceKey="Title">Title: </Label>
                             <div class="col-sm-9">
-                                <select id="navigation" class="form-select" @bind="@_isnavigation" required>
+                                <input id="title" class="form-control" @bind="@_title" maxlength="200" />
-                                    <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="clickable" HelpText="Select whether the link in the site navigation is enabled or disabled" ResourceKey="Clickable">Clickable? </Label>
+                            <Label Class="col-sm-3" For="path" HelpText="Optionally enter a url path for this page (ie. home ). If you do not provide a url path, the page name will be used. Please note that spaces and punctuation will be replaced by a dash. If the page is intended to be the root path specify '/'." ResourceKey="UrlPath">Url Path: </Label>
-                            <div class="col-sm-9">
-                                <select id="clickable" class="form-select" @bind="@_isclickable" 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="path" HelpText="Optionally enter a url path for this page (ie. home ). If you do not provide a url path, the page name will be used. If the page is intended to be the root path specify '/'." ResourceKey="UrlPath">Url Path: </Label>
                             <div class="col-sm-9">
                                 <input id="path" class="form-control" @bind="@_path" maxlength="256" />
                             </div>
@@ -125,15 +115,6 @@
                                 <input id="url" class="form-control" @bind="@_url" maxlength="500" />
                             </div>
                         </div>
-                        <div class="row mb-1 align-items-center">
-                            <Label Class="col-sm-3" For="icon" HelpText="Optionally provide an icon class name for this page which will be displayed in the site navigation" ResourceKey="Icon">Icon: </Label>
-                            <div class="col-sm-8">
-                                <InputList Value="@_icon" ValueChanged="IconChanged" DataList="@_icons" ResourceKey="Icon" ResourceType="@_iconresources" />
-                            </div>
-                            <div class="col-sm-1">
-                                <i class="@_icon"></i>
-                            </div>
-                        </div>
                         <div class="row mb-1 align-items-center">
                             <Label Class="col-sm-3" For="personalizable" HelpText="Select whether you would like users to be able to personalize this page with their own content" ResourceKey="Personalizable">Personalizable? </Label>
                             <div class="col-sm-9">
@@ -144,21 +125,22 @@
                             </div>
                         </div>
                     </div>
-                    <Section Name="Appearance" ResourceKey="Appearance" Heading="Appearance">
+                    <Section Name="Theme" ResourceKey="Theme" Heading="Theme">
                         <div class="container">
-                            <div class="row mb-1 align-items-center">
-                                <Label Class="col-sm-3" For="title" HelpText="Optionally enter the page title. If you do not provide a page title, the page name will be used." ResourceKey="Title">Title: </Label>
-                                <div class="col-sm-9">
-                                    <input id="title" class="form-control" @bind="@_title" maxlength="200" />
-                                </div>
-                            </div>
                             <div class="row mb-1 align-items-center">
                                 <Label Class="col-sm-3" For="theme" HelpText="Select the theme for this page" ResourceKey="Theme">Theme: </Label>
                                 <div class="col-sm-9">
                                     <select id="theme" class="form-select" value="@_themetype" @onchange="(e => ThemeChanged(e))" required>
                                         @foreach (var theme in _themes)
                                         {
-                                            <option value="@theme.TypeName">@theme.Name</option>
+                                            @if (theme.TypeName == PageState.Site.DefaultThemeType)
+                                            {
+                                                <option value="@theme.TypeName">*@theme.Name*</option>
+                                            }
+                                            else
+                                            {
+                                                <option value="@theme.TypeName">@theme.Name</option>
+                                            }
                                         }
                                     </select>
                                 </div>
@@ -167,32 +149,81 @@
                                 <Label Class="col-sm-3" For="container" HelpText="Select the default container for the page" ResourceKey="DefaultContainer">Default Container: </Label>
                                 <div class="col-sm-9">
                                     <select id="container" class="form-select" @bind="@_containertype" required>
-                                        @foreach (var container in _containers)
+                                        @if (_containers != null)
                                         {
-                                            <option value="@container.TypeName">@container.Name</option>
+                                            foreach (var container in _containers)
+                                            {
+                                                <option value="@container.TypeName">@container.Name</option>
+                                            }
                                         }
                                     </select>
                                 </div>
                             </div>
                         </div>
                     </Section>
+                    <Section Name="Appearance" ResourceKey="Appearance" Heading="Appearance">
+                        <div class="container">
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="icon" HelpText="Optionally provide an icon class name for this page which will be displayed in the site navigation" ResourceKey="Icon">Icon: </Label>
+                                <div class="col-sm-8">
+                                    <InputList Value="@_icon" ValueChanged="IconChanged" DataList="@_icons" ResourceKey="Icon" ResourceType="@_iconresources" />
+                                </div>
+                                <div class="col-sm-1">
+                                    <i class="@_icon"></i>
+                                </div>
+                            </div>
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="navigation" HelpText="Select whether the page is part of the site navigation or hidden" ResourceKey="Navigation">Navigation? </Label>
+                                <div class="col-sm-9">
+                                    <select id="navigation" class="form-select" @bind="@_isnavigation" 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="clickable" HelpText="Select whether the link in the site navigation is enabled or disabled" ResourceKey="Clickable">Clickable? </Label>
+                                <div class="col-sm-9">
+                                    <select id="clickable" class="form-select" @bind="@_isclickable" 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="effectiveDate" HelpText="The date that this page is active" ResourceKey="EffectiveDate">Effective Date: </Label>
+                                <div class="col-sm-9">
+                                    <input type="date" id="effectiveDate" class="form-control" @bind="@_effectivedate" />
+                                </div>
+                            </div>
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="expiryDate" HelpText="The date that this page expires" ResourceKey="ExpiryDate">Expiry Date: </Label>
+                                <div class="col-sm-9">
+                                    <input type="date" id="expiryDate" class="form-control" @bind="@_expirydate" />
+                                </div>
+                            </div>
+                        </div>
+                    </Section>
                     <Section Name="PageContent" Heading="Page Content" ResourceKey="PageContent">
                         <div class="container">
                             <div class="row mb-1 align-items-center">
                                 <Label Class="col-sm-3" For="headcontent" HelpText="Optionally enter content to be included in the page head (ie. meta, link, or script tags)" ResourceKey="HeadContent">Head Content: </Label>
                                 <div class="col-sm-9">
-                                    <textarea id="headcontent" class="form-control" @bind="@_headcontent" rows="3"></textarea>
+                                    <textarea id="headcontent" class="form-control" @bind="@_headcontent" rows="3" maxlength="4000"></textarea>
                                 </div>
                             </div>
                             <div class="row mb-1 align-items-center">
                                 <Label Class="col-sm-3" For="bodycontent" HelpText="Optionally enter content to be included in the page body (ie. script tags)" ResourceKey="BodyContent">Body Content: </Label>
                                 <div class="col-sm-9">
-                                    <textarea id="bodycontent" class="form-control" @bind="@_bodycontent" rows="3"></textarea>
+                                    <textarea id="bodycontent" class="form-control" @bind="@_bodycontent" rows="3" maxlength="4000"></textarea>
                                 </div>
                             </div>
                         </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>
@@ -201,15 +232,28 @@
                         <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">
                     <Pager Items="_pageModules">
                         <Header>
-                        <th style="width: 1px;">&nbsp;</th>
+                            <th style="width: 1px;">&nbsp;</th>
-                        <th style="width: 1px;">&nbsp;</th>
+                            <th style="width: 1px;">&nbsp;</th>
-                        <th>@Localizer["ModuleTitle"]</th>
+                            <th>@Localizer["ModuleTitle"]</th>
-                        <th>@Localizer["ModuleDefinition"]</th>
+                            <th>@Localizer["ModuleDefinition"]</th>
                         </Header>
                         <Row>
                             <td><ActionLink Action="Settings" Text="Edit" Path="@_actualpath" ModuleId="@context.ModuleId" Security="SecurityAccessLevel.Edit" PermissionList="@context.PermissionList" ResourceKey="ModuleSettings" /></td>
@@ -222,9 +266,11 @@
                 @if (_themeSettingsType != null)
                 {
                     <TabPanel Name="ThemeSettings" Heading="Theme Settings" ResourceKey="ThemeSettings">
-                        @ThemeSettingsComponent
+                        @_themeSettingsComponent
+                        <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>
-                    <br />
                 }
             </TabStrip>
         }
@@ -239,13 +285,26 @@
                                 <input id="title" class="form-control" @bind="@_title" maxlength="200" />
                             </div>
                         </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="path" HelpText="Provide a url path for your personalized page. Please note that spaces and punctuation will be replaced by a dash." ResourceKey="PersonalizedUrlPath">Url Path: </Label>
+                            <div class="col-sm-9">
+                                <input id="path" class="form-control" @bind="@_path" maxlength="256" />
+                            </div>
+                        </div>
                         <div class="row mb-1 align-items-center">
                             <Label Class="col-sm-3" For="theme" HelpText="Select the theme for this page" ResourceKey="Theme">Theme: </Label>
                             <div class="col-sm-9">
                                 <select id="theme" class="form-select" @bind="@_themetype" required>
                                     @foreach (var theme in _themes)
                                     {
-                                        <option value="@theme.TypeName">@theme.Name</option>
+                                        @if (theme.TypeName == PageState.Site.DefaultThemeType)
+                                        {
+                                            <option value="@theme.TypeName">*@theme.Name*</option>
+                                        }
+                                        else
+                                        {
+                                            <option value="@theme.TypeName">@theme.Name</option>
+                                        }
                                     }
                                 </select>
                             </div>
@@ -262,19 +321,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
+                        @_themeSettingsComponent
+                        <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>
-                    <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>
     </form>
 }
 
@@ -286,6 +347,7 @@
     private bool validated = false;
     private List<ThemeControl> _themes = new List<ThemeControl>();
     private List<ThemeControl> _containers = new List<ThemeControl>();
+    private List<Page> _pages;
     private int _pageId;
     private string _name;
     private string _currentparentid;
@@ -305,11 +367,12 @@
     private string _containertype = "-";
     private Type _themeSettingsType;
     private object _themeSettings;
-    private RenderFragment ThemeSettingsComponent { get; set; }
+    private RenderFragment _themeSettingsComponent { get; set; }
     private string _headcontent;
     private string _bodycontent;
     private List<Permission> _permissions = null;
     private PermissionGrid _permissionGrid;
+    private string _updatemodulepermissions;
     private List<Module> _pageModules;
     private string _createdby;
     private DateTime _createdon;
@@ -322,11 +385,14 @@
     protected Page _parent = null;
     protected Dictionary<string, string> _icons;
     private string _iconresources = "";
+    private DateTime? _effectivedate = null;
+    private DateTime? _expirydate = null;
 
     protected override async Task OnInitializedAsync()
     {
         try
         {
+            _pages = await PageService.GetPagesAsync(PageState.Site.SiteId);
             _pageId = Int32.Parse(PageState.QueryString["id"]);
             _page = await PageService.GetPageAsync(_pageId);
             _icons = await SystemService.GetIconsAsync();
@@ -342,10 +408,10 @@
                 else
                 {
                     _parentid = _page.ParentId.ToString();
-                    _parent = PageState.Pages.FirstOrDefault(item => item.PageId == _page.ParentId);
+                    _parent = _pages.FirstOrDefault(item => item.PageId == _page.ParentId);
                 }
                 _children = new List<Page>();
-                foreach (Page p in PageState.Pages.Where(item => (_parentid == "-1" && item.ParentId == null) || (item.ParentId == int.Parse(_parentid))))
+                foreach (Page p in _pages.Where(item => (_parentid == "-1" && item.ParentId == null) || (item.ParentId == int.Parse(_parentid, CultureInfo.InvariantCulture))))
                 {
                     if (p.PageId != _pageId && UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.PermissionList))
                     {
@@ -370,6 +436,8 @@
                 }
                 _url = _page.Url;
                 _icon = _page.Icon;
+                _effectivedate = Utilities.UtcAsLocalDate(_page.EffectiveDate);
+                _expirydate = Utilities.UtcAsLocalDate(_page.ExpiryDate);
                 _ispersonalizable = _page.IsPersonalizable.ToString();
 
                 // appearance
@@ -379,8 +447,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))
                 {
@@ -393,9 +469,11 @@
 
                 // permissions
                 _permissions = _page.PermissionList;
+                _updatemodulepermissions = "True";
 
                 // page modules
-                _pageModules = PageState.Modules.Where(m => m.PageId == _page.PageId).ToList();
+                var modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId);
+                _pageModules = modules.Where(item => item.PageId == _page.PageId && !item.IsDeleted).ToList();
 
                 // audit
                 _createdby = _page.CreatedBy;
@@ -427,7 +505,7 @@
         {
             _parentid = (string)e.Value;
             _children = new List<Page>();
-            foreach (Page p in PageState.Pages.Where(item => (_parentid == "-1" && item.ParentId == null) || (item.ParentId == int.Parse(_parentid))))
+            foreach (Page p in _pages.Where(item => (_parentid == "-1" && item.ParentId == null) || (item.ParentId == int.Parse(_parentid))))
             {
                 if (p.PageId != _pageId && UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.PermissionList))
                 {
@@ -441,10 +519,11 @@
         {
             await logger.LogError(ex, "Error Loading Child Pages For Parent {PageId} {Error}", _parentid, ex.Message);
             AddModuleMessage(Localizer["Error.ChildPage.Load"], MessageType.Error);
+            await ScrollToPageTop();
         }
     }
 
-    private void ThemeChanged(ChangeEventArgs e)
+    private async Task ThemeChanged(ChangeEventArgs e)
     {
         _themetype = (string)e.Value;
         _containers = ThemeService.GetContainerControls(PageState.Site.Themes, _themetype);
@@ -456,22 +535,26 @@
         if (ThemeService.GetTheme(PageState.Site.Themes, _themetype)?.ThemeName != ThemeService.GetTheme(PageState.Site.Themes, PageState.Site.DefaultThemeType)?.ThemeName)
         {
             AddModuleMessage(Localizer["ThemeChanged.Message"], MessageType.Warning);
+            await ScrollToPageTop();
         }
     }
 
     private void ThemeSettings()
     {
         _themeSettingsType = null;
+        _themeSettingsComponent = null;
         var theme = PageState.Site.Themes.FirstOrDefault(item => item.Themes.Any(themecontrol => themecontrol.TypeName.Equals(_themetype)));
         if (theme != null && !string.IsNullOrEmpty(theme.ThemeSettingsType))
         {
             _themeSettingsType = Type.GetType(theme.ThemeSettingsType);
             if (_themeSettingsType != null)
             {
-                ThemeSettingsComponent = builder =>
+                _themeSettingsComponent = builder =>
                 {
                     builder.OpenComponent(0, _themeSettingsType);
-                    builder.AddComponentReferenceCapture(1, inst => { _themeSettings = Convert.ChangeType(inst, _themeSettingsType); });
+                    builder.AddAttribute(1, "RenderModeBoundary", RenderModeBoundary);
+                    builder.AddComponentReferenceCapture(2, inst => { _themeSettings = Convert.ChangeType(inst, _themeSettingsType); });
+                    
                     builder.CloseComponent();
                 };
             }
@@ -487,16 +570,32 @@
         {
             try
             {
+                if (!Utilities.ValidateEffectiveExpiryDates(_effectivedate, _expirydate))
+                {
+                    AddModuleMessage(SharedLocalizer["Message.EffectiveExpiryDateError"], MessageType.Warning);
+                    await ScrollToPageTop();
+                    return;
+                }
                 if (!string.IsNullOrEmpty(_themetype) && _containertype != "-")
                 {
                     string currentPath = _page.Path;
 
                     _page.Name = _name;
 
+                    if (_parentid == "-1")
+                    {
+                        _page.ParentId = null;
+                    }
+                    else
+                    {
+                        _page.ParentId = Int32.Parse(_parentid);
+                    }
+
                     if (string.IsNullOrEmpty(_path))
                     {
                         _path = _name;
                     }
+
                     if (_path.Contains("/"))
                     {
                         if (_path.EndsWith("/") && _path != "/")
@@ -505,16 +604,13 @@
                         }
                         _path = _path.Substring(_path.LastIndexOf("/") + 1);
                     }
-
                     if (_parentid == "-1")
                     {
-                        _page.ParentId = null;
                         _page.Path = Utilities.GetFriendlyUrl(_path);
                     }
                     else
                     {
-                        _page.ParentId = Int32.Parse(_parentid);
+                        Page parent = _pages.FirstOrDefault(item => item.PageId == _page.ParentId);
-                        Page parent = PageState.Pages.FirstOrDefault(item => item.PageId == _page.ParentId);
                         if (parent.Path == string.Empty)
                         {
                             _page.Path = Utilities.GetFriendlyUrl(parent.Name) + "/" + Utilities.GetFriendlyUrl(_path);
@@ -525,16 +621,17 @@
                         }
                     }
 
-                    var _pages = await PageService.GetPagesAsync(PageState.Site.SiteId);
                     if (_pages.Any(item => item.Path == _page.Path && item.PageId != _page.PageId))
                     {
                         AddModuleMessage(string.Format(Localizer["Mesage.Page.PathExists"], _path), MessageType.Warning);
+                        await ScrollToPageTop();
                         return;
                     }
 
                     if (_page.ParentId == null && Constants.ReservedRoutes.Contains(_page.Name.ToLower()))
                     {
                         AddModuleMessage(string.Format(Localizer["Message.Page.Reserved"], _page.Name), MessageType.Warning);
+                        await ScrollToPageTop();
                         return;
                     }
 
@@ -547,11 +644,11 @@
                                 _page.Order = 0;
                                 break;
                             case "<":
-                                child = PageState.Pages.FirstOrDefault(item => item.PageId == _childid);
+                                child = _pages.FirstOrDefault(item => item.PageId == _childid);
                                 if (child != null) _page.Order = child.Order - 1;
                                 break;
                             case ">":
-                                child = PageState.Pages.FirstOrDefault(item => item.PageId == _childid);
+                                child = _pages.FirstOrDefault(item => item.PageId == _childid);
                                 if (child != null) _page.Order = child.Order + 1;
                                 break;
                             case ">>":
@@ -563,6 +660,8 @@
                     _page.IsClickable = (_isclickable == null ? true : Boolean.Parse(_isclickable));
                     _page.Url = _url;
                     _page.Icon = _icon ?? string.Empty;
+                    _page.EffectiveDate = Utilities.LocalDateAndTimeAsUtc(_effectivedate);
+                    _page.ExpiryDate = Utilities.LocalDateAndTimeAsUtc(_expirydate);
                     _page.IsPersonalizable = (_ispersonalizable != null && Boolean.Parse(_ispersonalizable));
 
                     // appearance
@@ -586,6 +685,7 @@
                     if (_page.UserId == null)
                     {
                         _page.PermissionList = _permissionGrid.GetPermissionList();
+                        _page.UpdateModulePermissions = bool.Parse(_updatemodulepermissions);
                     }
 
                     _page = await PageService.UpdatePageAsync(_page);
@@ -607,27 +707,30 @@
                     await logger.LogInformation("Page Saved {Page}", _page);
                     if (!string.IsNullOrEmpty(PageState.ReturnUrl))
                     {
-                        NavigationManager.NavigateTo(PageState.ReturnUrl);
+                        NavigationManager.NavigateTo(PageState.ReturnUrl, true); // redirect to page being edited and reload
                     }
                     else
                     {
-                        NavigationManager.NavigateTo(NavigateUrl());
+                        NavigationManager.NavigateTo(NavigateUrl()); // redirect to page management
                     }
                 }
                 else
                 {
                     AddModuleMessage(Localizer["Message.Required.PageInfo"], MessageType.Warning);
+                    await ScrollToPageTop();
                 }
             }
             catch (Exception ex)
             {
                 await logger.LogError(ex, "Error Saving Page {Page} {Error}", _page, ex.Message);
                 AddModuleMessage(Localizer["Error.Page.Save"], MessageType.Error);
+                await ScrollToPageTop();
             }
         }
         else
         {
             AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+            await ScrollToPageTop();
         }
     }
 

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

@@ -5,11 +5,11 @@
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (PageState.Pages != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
+@if (_pages != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
 {
     <ActionLink Action="Add" Text="Add Page" ResourceKey="AddPage" />
 
-    <Pager Items="@PageState.Pages.Where(item => !item.IsDeleted)" SearchProperties="Name">
+    <Pager Items="@_pages.Where(item => !item.IsDeleted)" SearchProperties="Name">
         <Header>
         <th style="width: 1px;">&nbsp;</th>
         <th style="width: 1px;">&nbsp;</th>
@@ -17,7 +17,7 @@
         <th>@SharedLocalizer["Name"]</th>
         </Header>
         <Row>
-            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.PageId.ToString())" ResourceKey="EditPage" /></td>
+            <td><ActionLink Action="Edit" Text="Edit" Parameters="@($"id=" + context.PageId.ToString())" ResourceKey="EditPage" /></td>
             <td><ActionDialog Header="Delete Page" Message="@string.Format(Localizer["Confirm.Page.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeletePage(context))" ResourceKey="DeletePage" /></td>
             <td><button type="button" class="btn btn-secondary" @onclick="@(async () => NavigationManager.NavigateTo(Browse(context)))">@Localizer["Browse"]</button></td>
             <td>@(new string('-', context.Level * 2))@(context.Name)</td>
@@ -28,6 +28,21 @@
 @code {
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
+    private List<Page> _pages;
+
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            _pages = await PageService.GetPagesAsync(PageState.Site.SiteId);
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Pages {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.Page.Load"], MessageType.Error);
+        }
+    }
+
     private async Task DeletePage(Page page)
     {
         try

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
 
@@ -34,7 +35,7 @@
         <div class="row mb-1 align-items-center">
             <Label Class="col-sm-3" For="order" HelpText="The index order of where this profile item should be displayed" ResourceKey="Order">Order: </Label>
             <div class="col-sm-9">
-                <input id="order" class="form-control" @bind="@_vieworder" min="0" max="99" type="number" required />
+                <input id="order" class="form-control" @bind="@_vieworder" min="0" max="9999" type="number" required />
             </div>
         </div>
         <div class="row mb-1 align-items-center">
@@ -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">
-                <input id="options" class="form-control" @bind="@_options" maxlength="2000" />
+                <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">
@@ -76,6 +93,12 @@
                 <input id="validation" class="form-control" @bind="@_validation" maxlength="200" />
             </div>
         </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="autocomplete" HelpText="The HTML autocomplete attribute allows you to specify browser behavior for automated user assistance in filling out form field values. Allowable values are blank (default), 'on', 'off', or any value from the standardized taxonomy defined for this attribute." ResourceKey="Autocomplete">Autocomplete: </Label>
+            <div class="col-sm-9">
+                <input id="autocomplete" class="form-control" @bind="@_autocomplete" maxlength="30" />
+            </div>
+        </div>
         <div class="row mb-1 align-items-center">
             <Label Class="col-sm-3" For="private" HelpText="Should this profile item be visible to all users?" ResourceKey="Private">Private? </Label>
             <div class="col-sm-9">
@@ -110,7 +133,10 @@
     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";
     private string _isprivate = "False";
     private string createdby;
@@ -126,6 +152,8 @@
     {
         try
         {
+            _entitynames = await SettingService.GetEntityNamesAsync();
+
             if (PageState.QueryString.ContainsKey("id"))
             {
                 _profileid = Int32.Parse(PageState.QueryString["id"]);
@@ -141,7 +169,13 @@
                     _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();
                     _isprivate = profile.IsPrivate.ToString();
                     createdby = profile.CreatedBy;
@@ -158,6 +192,18 @@
         }
     }
 
+    private void ToggleOptionType()
+    {
+        if (_optiontype == "Options")
+        {
+            _optiontype = "Settings";
+        }
+        else
+        {
+            _optiontype = "Options";
+        }
+    }
+
     private async Task SaveProfile()
     {
         validated = true;
@@ -185,10 +231,19 @@
                 profile.MaxLength = int.Parse(_maxlength);
                 profile.Rows = int.Parse(_rows);
                 profile.DefaultValue = _defaultvalue;
-                profile.Options = _options;
+                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));
                 profile.IsPrivate = (_isprivate == null ? false : Boolean.Parse(_isprivate));
+
                 if (_profileid != -1)
                 {
                     profile = await ProfileService.UpdateProfileAsync(profile);

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

@@ -22,7 +22,7 @@ else
             <th>@Localizer["Order"]</th>
         </Header>
         <Row>
-			<td><ActionLink Action="Edit" Parameters="@($"id=" + context.ProfileId.ToString())" Security="SecurityAccessLevel.Edit" ResourceKey="EditProfile" /></td>
+            <td><ActionLink Action="Edit" Text="Edit" Parameters="@($"id=" + context.ProfileId.ToString())" Security="SecurityAccessLevel.Edit" ResourceKey="EditProfile" /></td>
 			<td><ActionDialog Header="Delete Profile" Message="@string.Format(Localizer["Confirm.Profile.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Edit" Class="btn btn-danger" OnClick="@(async () => await DeleteProfile(context.ProfileId))" ResourceKey="DeleteProfile" /></td>
             <td>@context.Name</td>
             <td>@context.Title</td>

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

@@ -13,71 +13,71 @@
 }
 else
 {
-	<TabStrip>
+    <TabStrip>
-		<TabPanel Name="Pages" ResourceKey="Pages" Heading="Pages">
+        <TabPanel Name="Pages" ResourceKey="Pages" Heading="Pages">
-			@if (!_pages.Where(item => item.IsDeleted).Any())
+            @if (!_pages.Where(item => item.IsDeleted).Any())
-			{
+            {
-				<br />
+                <br />
-				<p>@Localizer["NoPage.Deleted"]</p>
+                <p>@Localizer["NoPage.Deleted"]</p>
-			}
+            }
-			else
+            else
-			{
+            {
-          <Pager Items="@_pages.Where(item => item.IsDeleted)" CurrentPage="@_pagePage.ToString()" OnPageChange="OnPageChangePage">
+                <Pager Items="@_pages.Where(item => item.IsDeleted).OrderByDescending(item => item.DeletedOn)" CurrentPage="@_pagePage.ToString()" OnPageChange="OnPageChangePage">
-					<Header>
+                    <Header>
-						<th style="width: 1px;">&nbsp;</th>
+                        <th style="width: 1px;">&nbsp;</th>
-						<th style="width: 1px;">&nbsp;</th>
+                        <th style="width: 1px;">&nbsp;</th>
-						<th>@SharedLocalizer["Name"]</th>
+                        <th>@SharedLocalizer["Path"]</th>
-						<th>@Localizer["DeletedBy"]</th>
+                        <th>@Localizer["DeletedBy"]</th>
-						<th>@Localizer["DeletedOn"]</th>
+                        <th>@Localizer["DeletedOn"]</th>
-					</Header>
+                    </Header>
-					<Row>
+                    <Row>
                         <td><button type="button" @onclick="@(() => RestorePage(context))" class="btn btn-success" title="Restore">@Localizer["Restore"]</button></td>
-						<td><ActionDialog Header="Delete Page" Message="@string.Format(Localizer["Confirm.Page.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeletePage(context))" ResourceKey="DeletePage" /></td>
+                        <td><ActionDialog Header="Delete Page" Message="@string.Format(Localizer["Confirm.Page.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeletePage(context))" ResourceKey="DeletePage" /></td>
-						<td>@context.Name</td>
+                        <td>@context.Path</td>
-						<td>@context.DeletedBy</td>
+                        <td>@context.DeletedBy</td>
-						<td>@context.DeletedOn</td>
+                        <td>@context.DeletedOn</td>
-					</Row>
+                    </Row>
-				</Pager>
+                </Pager>
-				<br />
+                <br />
-				<ActionDialog Header="Remove All Deleted Pages" Message="Are You Sure You Wish To Permanently Remove All Deleted Pages?" Action="Remove All Deleted Pages" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllPages())" ResourceKey="DeleteAllPages" />
+                <ActionDialog Header="Remove All Deleted Pages" Message="Are You Sure You Wish To Permanently Remove All Deleted Pages?" Action="Remove All Deleted Pages" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllPages())" ResourceKey="DeleteAllPages" />
-			}
+            }
-		</TabPanel>
+        </TabPanel>
-		<TabPanel Name="Modules" ResourceKey="Modules" Heading="Modules">
+        <TabPanel Name="Modules" ResourceKey="Modules" Heading="Modules">
-			@if (!_modules.Where(item => item.IsDeleted).Any())
+            @if (!_modules.Where(item => item.IsDeleted).Any())
-			{
+            {
-				<br />
+                <br />
-				<p>@Localizer["NoModule.Deleted"]</p>
+                <p>@Localizer["NoModule.Deleted"]</p>
-			}
+            }
-			else
+            else
-			{
+            {
-          <Pager Items="@_modules.Where(item => item.IsDeleted)" CurrentPage="@_pageModule.ToString()" OnPageChange="OnPageChangeModule">
+                <Pager Items="@_modules.Where(item => item.IsDeleted).OrderByDescending(item => item.DeletedOn)" CurrentPage="@_pageModule.ToString()" OnPageChange="OnPageChangeModule">
-					<Header>
+                    <Header>
-						<th style="width: 1px;">&nbsp;</th>
+                        <th style="width: 1px;">&nbsp;</th>
-						<th style="width: 1px;">&nbsp;</th>
+                        <th style="width: 1px;">&nbsp;</th>
-						<th>@Localizer["Page"]</th>
+                        <th>@Localizer["Page"]</th>
-						<th>@Localizer["Module"]</th>
+                        <th>@Localizer["Module"]</th>
-						<th>@Localizer["DeletedBy"]</th>
+                        <th>@Localizer["DeletedBy"]</th>
-						<th>@Localizer["DeletedOn"]</th>
+                        <th>@Localizer["DeletedOn"]</th>
-					</Header>
+                    </Header>
-					<Row>
+                    <Row>
-						<td><button type="button" @onclick="@(() => RestoreModule(context))" class="btn btn-success" title="Restore">@Localizer["Restore"]</button></td>
+                        <td><button type="button" @onclick="@(() => RestoreModule(context))" class="btn btn-success" title="Restore">@Localizer["Restore"]</button></td>
-						<td><ActionDialog Header="Delete Module" Message="@string.Format(Localizer["Confirm.Module.Delete"], context.Title)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" ResourceKey="DeleteModule" /></td>
+                        <td><ActionDialog Header="Delete Module" Message="@string.Format(Localizer["Confirm.Module.Delete"], context.Title)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" ResourceKey="DeleteModule" /></td>
-						<td>@_pages.Find(item => item.PageId == context.PageId).Name</td>
+                        <td>@_pages.Find(item => item.PageId == context.PageId).Name</td>
-						<td>@context.Title</td>
+                        <td>@context.Title</td>
-						<td>@context.DeletedBy</td>
+                        <td>@context.DeletedBy</td>
-						<td>@context.DeletedOn</td>
+                        <td>@context.DeletedOn</td>
-					</Row>
+                    </Row>
-				</Pager>
+                </Pager>
-				<br />
+                <br />
-				<ActionDialog Header="Remove All Deleted Modules" Message="Are You Sure You Wish To Permanently Remove All Deleted Modules?" Action="Remove All Deleted Modules" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllModules())" ResourceKey="DeleteAllModules" />
+                <ActionDialog Header="Remove All Deleted Modules" Message="Are You Sure You Wish To Permanently Remove All Deleted Modules?" Action="Remove All Deleted Modules" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllModules())" ResourceKey="DeleteAllModules" />
-			}
+            }
-		</TabPanel>
+        </TabPanel>
-	</TabStrip>
+    </TabStrip>
 }
 
 @code {
-	private List<Page> _pages;
+    private List<Page> _pages;
-	private List<Module> _modules;
+    private List<Module> _modules;
     private int _pagePage = 1;
     private int _pageModule = 1;
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
@@ -105,12 +105,25 @@ else
     {
         try
         {
-            page.IsDeleted = false;
+            var validated = true;
-            await PageService.UpdatePageAsync(page);
+            if (page.ParentId != null)
-            await logger.LogInformation("Page Restored {Page}", page);
+            {
-            await Load();
+                var parent = _pages.Find(item => item.PageId == page.ParentId);
-            StateHasChanged();
+                validated = !parent.IsDeleted;
-            NavigationManager.NavigateTo(NavigateUrl());
+            }
+            if (validated)
+            {
+                page.IsDeleted = false;
+                await PageService.UpdatePageAsync(page);
+                await logger.LogInformation("Page Restored {Page}", page);
+                AddModuleMessage(Localizer["Success.Page.Restore"], MessageType.Success);
+                await Load();
+                StateHasChanged();
+            }
+            else
+            {
+                AddModuleMessage(Localizer["Message.Page.Restore"], MessageType.Warning);
+            }
         }
         catch (Exception ex)
         {
@@ -125,9 +138,9 @@ else
         {
             await PageService.DeletePageAsync(page.PageId);
             await logger.LogInformation("Page Permanently Deleted {Page}", page);
+            AddModuleMessage(Localizer["Success.Page.Delete"], MessageType.Success);
             await Load();
             StateHasChanged();
-            NavigationManager.NavigateTo(NavigateUrl());
         }
         catch (Exception ex)
         {
@@ -140,7 +153,7 @@ else
     {
         try
         {
-            ModuleInstance.ShowProgressIndicator();
+            ShowProgressIndicator();
             foreach (Page page in _pages.Where(item => item.IsDeleted))
             {
                 await PageService.DeletePageAsync(page.PageId);
@@ -148,16 +161,16 @@ else
             }
 
             await logger.LogInformation("Pages Permanently Deleted");
+            AddModuleMessage(Localizer["Success.Pages.Delete"], MessageType.Success);
             await Load();
-            ModuleInstance.HideProgressIndicator();
+            HideProgressIndicator();
             StateHasChanged();
-            NavigationManager.NavigateTo(NavigateUrl());
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Permanently Deleting Pages {Error}", ex.Message);
             AddModuleMessage(ex.Message, MessageType.Error);
-            ModuleInstance.HideProgressIndicator();
+            HideProgressIndicator();
         }
     }
 
@@ -169,6 +182,7 @@ else
             pagemodule.IsDeleted = false;
             await PageModuleService.UpdatePageModuleAsync(pagemodule);
             await logger.LogInformation("Module Restored {Module}", module);
+            AddModuleMessage(Localizer["Success.Module.Restore"], MessageType.Success);
             await Load();
             StateHasChanged();
         }
@@ -185,6 +199,7 @@ else
         {
             await PageModuleService.DeletePageModuleAsync(module.PageModuleId);
             await logger.LogInformation("Module Permanently Deleted {Module}", module);
+            AddModuleMessage(Localizer["Success.Module.Delete"], MessageType.Success);
             await Load();
             StateHasChanged();
         }
@@ -199,21 +214,22 @@ else
     {
         try
         {
-            ModuleInstance.ShowProgressIndicator();
+            ShowProgressIndicator();
             foreach (Module module in _modules.Where(item => item.IsDeleted).ToList())
             {
                 await PageModuleService.DeletePageModuleAsync(module.PageModuleId);
             }
             await logger.LogInformation("Modules Permanently Deleted");
+            AddModuleMessage(Localizer["Success.Modules.Delete"], MessageType.Success);
             await Load();
-            ModuleInstance.HideProgressIndicator();
+            HideProgressIndicator();
             StateHasChanged();
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Permanently Deleting Modules {Error}", ex.Message);
             AddModuleMessage(Localizer["Error.Modules.Delete"], MessageType.Error);
-            ModuleInstance.HideProgressIndicator();
+            HideProgressIndicator();
         }
     }
     private void OnPageChangePage(int page)

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

@@ -6,70 +6,95 @@
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 @inject ISettingService SettingService
+@inject ITimeZoneService TimeZoneService
 
-@if (PageState.Site.AllowRegistration)
+@if (_initialized)
 {
-    <AuthorizeView Roles="@RoleNames.Registered">
+    @if (PageState.Site.AllowRegistration)
-        <Authorizing>
+    {
-            <text>...</text>
+        if (!_userCreated)
-        </Authorizing>
+        {
-        <Authorized>
+            if (PageState.User != null)
-            <ModuleMessage Message="@Localizer["Info.Registration.Exists"]" Type="MessageType.Info" />
+            {
-        </Authorized>
+                <ModuleMessage Message="@Localizer["Info.Registration.Exists"]" Type="MessageType.Info" />
-        <NotAuthorized>
+            }
-            <ModuleMessage Message="@_passwordrequirements" Type="MessageType.Info" />
+            else
-            <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+            {
-                <div class="container">
+                <ModuleMessage Message="@_passwordrequirements" Type="MessageType.Info" />
-                    <div class="row mb-1 align-items-center">
+                <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
-                        <Label Class="col-sm-3" For="username" HelpText="Your username. Note that this field can not be modified once it is saved." ResourceKey="Username"></Label>
+                    <div class="container">
-                        <div class="col-sm-9">
+                        <div class="row mb-1 align-items-center">
-                            <input id="username" class="form-control" @bind="@_username" maxlength="256" required />
+                            <Label Class="col-sm-3" For="username" HelpText="Your username. Note that this field can not be modified once it is saved." ResourceKey="Username"></Label>
+                            <div class="col-sm-9">
+                                <input id="username" class="form-control" @bind="@_username" maxlength="256" required />
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="password" HelpText="Please choose a sufficiently secure password and enter it here" ResourceKey="Password"></Label>
+                            <div class="col-sm-9">
+                                <div class="input-group">
+                                    <input id="password" type="@_passwordtype" class="form-control" @bind="@_password" autocomplete="new-password" required />
+                                    <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="confirm" HelpText="Enter your password again to confirm it matches the value entered above" 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" required />
+                                    <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="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" maxlength="256" required />
+                            </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" 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>
-                    <div class="row mb-1 align-items-center">
+                    <br />
-                        <Label Class="col-sm-3" For="password" HelpText="Please choose a sufficiently secure password and enter it here" ResourceKey="Password"></Label>
+                    <button type="button" class="btn btn-primary" @onclick="Register">@Localizer["Register"]</button>
-                        <div class="col-sm-9">
+                    <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
-							<div class="input-group">
+                    @if (_allowsitelogin)
-								<input id="password" type="@_passwordtype" class="form-control" @bind="@_password" autocomplete="new-password" required />
+                    {
-                                <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
+                        <br />
-							</div>
+
-                        </div>
+                        <br />
-                    </div>
+                        <NavLink href="@NavigateUrl("login")">@Localizer["Login"]</NavLink>
-                    <div class="row mb-1 align-items-center">
+                    }
-                        <Label Class="col-sm-3" For="confirm" HelpText="Enter your password again to confirm it matches the value entered above" ResourceKey="Confirm"></Label>
+                </form>
-                        <div class="col-sm-9">
+            }
-							<div class="input-group">
+        }
-								<input id="confirm" type="@_passwordtype" class="form-control" @bind="@_confirm" autocomplete="new-password" required />
+    }
-                                <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
+    else
-							</div>
+    {
-                        </div>
+        <ModuleMessage Message="@Localizer["Info.Registration.Disabled"]" Type="MessageType.Info" />
-                    </div>
+    }
-                    <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" maxlength="256" required />
-                        </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" maxlength="50" />
-                        </div>
-                    </div>
-                </div>
-                <br />
-                <button type="button" class="btn btn-primary" @onclick="Register">@Localizer["Register"]</button>
-                <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
-            </form>
-        </NotAuthorized>
-    </AuthorizeView>
-}
-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;
@@ -80,12 +105,19 @@ 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;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
 
     protected override async Task OnInitializedAsync()
     {
         _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()
@@ -114,6 +146,7 @@ else
                             Password = _password,
                             Email = _email,
                             DisplayName = (_displayname == string.Empty ? _username : _displayname),
+                            TimeZoneId = _timezoneid,
 							PhotoFileId = null
                         };
                         user = await UserService.AddUserAsync(user);
@@ -121,14 +154,8 @@ else
                         if (user != null)
                         {
                             await logger.LogInformation("User Created {Username} {Email}", _username, _email);
-                            if (PageState.QueryString.ContainsKey("returnurl"))
+                            _userCreated = true;
-                            {
+                             AddModuleMessage(Localizer["Info.User.AccountCreate"], MessageType.Info);
-                                NavigationManager.NavigateTo(WebUtility.UrlDecode(PageState.QueryString["returnurl"]));
-                            }
-                            else // legacy behavior
-                            {
-                                AddModuleMessage(Localizer["Info.User.AccountCreate"], MessageType.Info);
-                            }
                         }
                         else
                         {
@@ -160,7 +187,7 @@ else
 
     private void Cancel()
     {
-        NavigationManager.NavigateTo(NavigateUrl(string.Empty));
+        NavigationManager.NavigateTo(PageState.ReturnUrl);
     }
 
     private void TogglePassword()

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

@@ -20,9 +20,9 @@ else
             <th>@SharedLocalizer["Name"]</th>
         </Header>
         <Row>
-			<td><ActionLink Action="Edit" Parameters="@($"id=" + context.RoleId.ToString())" Security="SecurityAccessLevel.Edit" Disabled="@(context.IsSystem)" ResourceKey="Edit" /></td>
+            <td><ActionLink Action="Edit" Text="Edit" Parameters="@($"id=" + context.RoleId.ToString())" Security="SecurityAccessLevel.Edit" Disabled="@(context.IsSystem)" ResourceKey="Edit" /></td>
             <td><ActionDialog Header="Delete Role" Message="@string.Format(Localizer["Confirm.DeleteUser"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Edit" Class="btn btn-danger" OnClick="@(async () => await DeleteRole(context))" Disabled="@(context.IsSystem)" ResourceKey="DeleteRole" /></td>
-			<td><ActionLink Action="Users" Parameters="@($"id=" + context.RoleId.ToString())" Security="SecurityAccessLevel.Edit" ResourceKey="Users" /></td>
+			<td><ActionLink Action="Users" Text="Users" Parameters="@($"id=" + context.RoleId.ToString())" Security="SecurityAccessLevel.Edit" ResourceKey="Users" /></td>
             <td>@context.Name</td>
         </Row>
     </Pager>

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

@@ -58,7 +58,7 @@ else
                             <td>@context.EffectiveDate</td>
                             <td>@context.ExpiryDate</td>
                             <td>
-								<ActionDialog Header="Remove User" Message="@string.Format(Localizer["Confirm.User.DeleteRole"], context.User.DisplayName)" Action="Delete" Security="SecurityAccessLevel.Edit" Class="btn btn-danger" OnClick="@(async () => await DeleteUserRole(context.UserRoleId))" Disabled="@(context.Role.IsAutoAssigned || context.User.Username == UserNames.Host || context.User.UserId == PageState.User.UserId)" ResourceKey="DeleteUserRole" />
+								<ActionDialog Header="Remove User" Message="@string.Format(Localizer["Confirm.User.DeleteRole"], context.User.DisplayName)" Action="Delete" Security="SecurityAccessLevel.Edit" Class="btn btn-danger" OnClick="@(async () => await DeleteUserRole(context.UserRoleId))" Disabled="@(context.User.Username == UserNames.Host || context.User.UserId == PageState.User.UserId)" ResourceKey="DeleteUserRole" />
                             </td>
                         </Row>
                     </Pager>
@@ -180,27 +180,28 @@ else
 
     private async Task DeleteUserRole(int UserRoleId)
     {
-        validated = true;
+        try
-        var interop = new Interop(JSRuntime);
-        if (await interop.FormValid(form))
         {
-            try
+            var userrole = await UserRoleService.GetUserRoleAsync(UserRoleId);
+            if (userrole.Role.Name == RoleNames.Registered)
+            {
+                userrole.ExpiryDate = DateTime.UtcNow;
+                await UserRoleService.UpdateUserRoleAsync(userrole);
+                await logger.LogInformation("User {Username} Expired From Role {Role}", userrole.User.Username, userrole.Role.Name);
+            }
+            else
             {
                 await UserRoleService.DeleteUserRoleAsync(UserRoleId);
-                await logger.LogInformation("User Removed From Role {UserRoleId}", UserRoleId);
+                await logger.LogInformation("User {Username} Removed From Role {Role}", userrole.User.Username, userrole.Role.Name);
-                AddModuleMessage(Localizer["Confirm.User.RoleRemoved"], MessageType.Success);
-                await GetUserRoles();
-                StateHasChanged();
-            }
-            catch (Exception ex)
-            {
-                await logger.LogError(ex, "Error Removing User From Role {UserRoleId} {Error}", UserRoleId, ex.Message);
-                AddModuleMessage(Localizer["Error.User.RemoveRole"], MessageType.Error);
             }
+            AddModuleMessage(Localizer["Confirm.User.RoleRemoved"], MessageType.Success);
+            await GetUserRoles();
+            StateHasChanged();
         }
-        else
+        catch (Exception ex)
         {
-            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+            await logger.LogError(ex, "Error Removing User From Role {UserRoleId} {Error}", UserRoleId, ex.Message);
+            AddModuleMessage(Localizer["Error.User.RemoveRole"], MessageType.Error);
         }
     }
 }

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

@@ -0,0 +1,119 @@
+@namespace Oqtane.Modules.Admin.Search
+@inherits ModuleBase
+@inject ISettingService SettingService
+@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+<div class="container">
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="searchprovider" HelpText="Specify the search provider for this site" ResourceKey="SearchProvider">Search Provider: </Label>
+        <div class="col-sm-9">
+            <input id="searchprovider" class="form-control" @bind="@_searchProvider" />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="enabled" HelpText="Specify if search indexing is enabled" ResourceKey="Enabled">Indexing Enabled? </Label>
+        <div class="col-sm-9">
+            <select id="enabled" class="form-select" @bind="@_enabled">
+                <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="lastindexedon" HelpText="The date/time which the site was last indexed on" ResourceKey="LastIndexedOn">Last Indexed: </Label>
+        <div class="col-sm-9">
+            <input id="lastindexedon" class="form-control" @bind="@_lastIndexedOn" />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="ignorepages" HelpText="Comma delimited list of pages which should be ignored (based on their path)" ResourceKey="IgnorePages">Ignore Pages: </Label>
+        <div class="col-sm-9">
+            <textarea id="ignorepages" class="form-control" @bind="@_ignorePages" rows="3"></textarea>
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="ignoreentities" HelpText="Comma delimited list of entities which should be ignored" ResourceKey="IgnoreEntities">Ignore Entities: </Label>
+        <div class="col-sm-9">
+            <textarea id="ignoreentities" class="form-control" @bind="@_ignoreEntities" rows="3"></textarea>
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="minimumwordlength" HelpText="Minimum length of a word to be indexed" ResourceKey="MinimumWordLength">Word Length: </Label>
+        <div class="col-sm-9">
+            <input id="minimumwordlength" class="form-control" type="number" min="0" step="1" @bind="@_minimumWordLength" />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="ignorewords" HelpText="Comma delimited list of words which should be ignored" ResourceKey="IgnoreWords">Ignore Words: </Label>
+        <div class="col-sm-9">
+            <textarea id="ignorewords" class="form-control" @bind="@_ignoreWords" rows="3"></textarea>
+        </div>
+    </div>
+</div>
+<br /><br />
+<button type="button" class="btn btn-success" @onclick="Save">@SharedLocalizer["Save"]</button>  
+<ActionDialog Header="Reindex" Message="Are You Sure You Wish To Reindex Search Content?" Action="Reindex" Class="btn btn-danger" OnClick="@(async () => await Reindex())" ResourceKey="Reindex" />
+<br /><br />
+
+@code {
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+
+    private string _searchProvider;
+    private string _enabled = "True";
+    private string _lastIndexedOn = "";
+    private string _ignorePages = "";
+    private string _ignoreEntities = "File";
+    private string _minimumWordLength = "3";
+    private string _ignoreWords = "the,be,to,of,and,a,i,in,that,have,it,for,not,on,with,he,as,you,do,at,this,but,his,by,from,they,we,say,her,she,or,an,will,my,one,all,would,there,their,what,so,up,out,if,about,who,get,which,go,me,when,make,can,like,time,no,just,him,know,take,people,into,year,your,good,some,could,them,see,other,than,then,now,look,only,come,its,over,think,also,back,after,use,two,how,our,work,first,well,way,even,new,want,because,any,these,give,day,most,us";
+
+    protected override async Task OnInitializedAsync()
+    {
+        var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+        _searchProvider = SettingService.GetSetting(settings, "Search_SearchProvider", Constants.DefaultSearchProviderName);
+        _enabled = SettingService.GetSetting(settings, "Search_Enabled", _enabled);
+        _lastIndexedOn = SettingService.GetSetting(settings, "Search_LastIndexedOn", _lastIndexedOn);
+        _ignorePages = SettingService.GetSetting(settings, "Search_IgnorePages", _ignorePages);
+        _ignoreEntities = SettingService.GetSetting(settings, "Search_IgnoreEntities", _ignoreEntities);
+        _minimumWordLength = SettingService.GetSetting(settings, "Search_MininumWordLength", _minimumWordLength);
+        _ignoreWords = SettingService.GetSetting(settings, "Search_IgnoreWords", _ignoreWords);
+    }
+
+    private async Task Save()
+    {
+        try
+        {
+            var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+            settings = SettingService.SetSetting(settings, "Search_SearchProvider", _searchProvider);
+            settings = SettingService.SetSetting(settings, "Search_Enabled", _enabled);
+            settings = SettingService.SetSetting(settings, "Search_LastIndexedOn", _lastIndexedOn, true);
+            settings = SettingService.SetSetting(settings, "Search_IgnorePages", _ignorePages, true);
+            settings = SettingService.SetSetting(settings, "Search_IgnoreEntities", _ignoreEntities, true);
+            settings = SettingService.SetSetting(settings, "Search_MininumWordLength", _minimumWordLength, true);
+            settings = SettingService.SetSetting(settings, "Search_IgnoreWords", _ignoreWords, true);
+            await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
+            AddModuleMessage(Localizer["Success.Save"], MessageType.Success);
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Saving Search Settings {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.Save"], MessageType.Error);
+        }
+    }
+
+    private async Task Reindex()
+    {
+        try
+        {
+            _lastIndexedOn = DateTime.MinValue.ToString();
+            await Save();
+            AddModuleMessage(Localizer["Message.Reindex"], MessageType.Success);
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Saving Search Settings {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.Save"], MessageType.Error);
+        }
+    }
+
+}

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

@@ -0,0 +1,153 @@
+@using Oqtane.Services
+@using System.Net
+@namespace Oqtane.Modules.Admin.SearchResults
+@inherits ModuleBase
+@inject NavigationManager NavigationManager
+@inject ISearchResultsService SearchResultsService
+@inject ISettingService SettingService
+@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+@attribute [StreamRendering] // attribute allows the progress indicator to be displayed
+
+<div class="search-result-container">
+    <div class="row">
+        <div class="col">
+            <form method="post" @formname="SearchResultsForm" @onsubmit="Search" data-enhance>
+                <div class="input-group mb-3">
+                    <span class="input-group-text">@Localizer["SearchLabel"]</span>
+                    <input type="hidden" name="@Constants.RequestVerificationToken" value="@SiteState.AntiForgeryToken" />
+                    <input type="text" name="keywords" class="form-control shadow-none" maxlength="50"
+                            aria-label="Keywords"
+                            placeholder="@Localizer["SearchPlaceholder"]"
+                            @bind="@_keywords">
+                    <button class="btn btn-primary" type="submit">@SharedLocalizer["Search"]</button>
+                    <a class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Reset"]</a>
+                </div>
+            </form>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12  mb-3">
+            @if (_loading)
+            {
+                <div class="app-progress-indicator"></div>
+            }
+            else
+            {
+                @if (_searchResults != null && _searchResults.Results != null)
+                {
+                    if (_searchResults.Results.Any())
+                    {
+                        <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-body-secondary">@((MarkupString)context.Snippet)</p>
+                                </div>
+                            </Row>
+                        </Pager>
+                    }
+                    else
+                    {
+                        <div class="alert alert-info show mt-3" role="alert">
+                            @Localizer["NoResult"]
+                        </div>
+                    }
+                }
+                <div class="clearfix"></div>
+            }
+        </div>
+    </div>
+</div>
+
+@code {
+    public override string RenderMode => RenderModes.Static;
+    private const string SearchDefaultPageSize = "10";
+
+    private string _includeEntities;
+    private string _excludeEntities;
+    private string _fromDate;
+    private string _toDate;
+    private string _pageSize;
+    private string _sortField;
+    private string _sortOrder;
+    private string _bodyLength;
+    private string _currentPage = "0";
+    private string _displayPages = "7";
+    
+    private string _keywords;
+    private SearchResults _searchResults;
+    private bool _loading;
+
+    [SupplyParameterFromForm(FormName = "SearchResultsForm")]
+    public string KeyWords { get => ""; set => _keywords = value; }
+
+    protected override async Task OnInitializedAsync()
+    {
+        _includeEntities = SettingService.GetSetting(ModuleState.Settings, "SearchResults_IncludeEntities", "");
+        _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", 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"]);
+            await PerformSearch();
+        }
+    }
+
+    private void Search()
+    {
+        NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, $"page=1&q={WebUtility.UrlEncode(_keywords)}"));
+    }
+
+    private async Task PerformSearch()
+    {
+        _loading = true;
+        StateHasChanged();
+
+        if (!string.IsNullOrEmpty(_keywords))
+        {
+            var searchQuery = new SearchQuery
+            {
+                SiteId = PageState.Site.SiteId,
+                Alias = PageState.Alias,
+                Keywords = _keywords,
+                IncludeEntities = _includeEntities,
+                ExcludeEntities = _excludeEntities,
+                FromDate = (!string.IsNullOrEmpty(_fromDate)) ? DateTime.Parse(_fromDate) : DateTime.MinValue,
+                ToDate = (!string.IsNullOrEmpty(_toDate)) ? DateTime.Parse(_toDate) : DateTime.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,
+                BodyLength = (!string.IsNullOrEmpty(_bodyLength)) ? int.Parse(_bodyLength) : 255
+            };
+
+            _searchResults = await SearchResultsService.GetSearchResultsAsync(searchQuery);
+        }
+        else
+        {
+            AddModuleMessage(Localizer["NoCriteria"], MessageType.Info, "bottom");
+        }
+
+        _loading = false;
+        StateHasChanged();
+    }
+}

Oqtane.Client/Modules/Admin/SearchResults/ModuleInfo.cs

@@ -0,0 +1,19 @@
+using Oqtane.Documentation;
+using Oqtane.Models;
+using Oqtane.Shared;
+
+namespace Oqtane.Modules.Admin.SearchResults
+{
+    [PrivateApi("Mark this as private, since it's not very useful in the public docs")]
+    public class ModuleInfo : IModule
+    {
+        public ModuleDefinition ModuleDefinition => new ModuleDefinition
+        {
+            Name = "Search Results",
+            Description = "Search Results",
+            Categories = "Admin",
+            Version = Constants.Version,
+            SettingsType = "Oqtane.Modules.Admin.SearchResults.Settings, Oqtane.Client"
+        };
+    }
+}

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

@@ -0,0 +1,123 @@
+@namespace Oqtane.Modules.Admin.SearchResults
+@inherits ModuleBase
+@inject ISettingService SettingService
+@implements Oqtane.Interfaces.ISettingsControl
+@inject IStringLocalizer<Settings> 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="includeentities" ResourceKey="IncludeEntities" ResourceType="@resourceType" HelpText="Comma delimited list of entities to include in the search results. By default all entities will be included.">Include Entities: </Label>
+            <div class="col-sm-9">
+                <input id="includeentities" type="text" class="form-control" @bind="@_includeEntities" />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="excludeentities" ResourceKey="ExcludeEntities" ResourceType="@resourceType" HelpText="Comma delimited list of entities to exclude from search results. By default no entities will be excluded.">Exclude Entities: </Label>
+            <div class="col-sm-9">
+                <input id="excludeentities" class="form-control" @bind="@_excludeEntities" />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="daterange" ResourceKey="DateRange" ResourceType="@resourceType" HelpText="Enter the date range for search results. The default includes all content.">Date Range: </Label>
+            <div class="col-sm-9">
+                <div class="input-group">
+                    <input type="date" class="form-control" @bind="@_fromDate" />
+                    <span class="input-group-text">@Localizer["To"]</span>
+                    <input type="date" class="form-control" @bind="@_toDate" />
+                </div>
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="pagesize" ResourceKey="PageSize" ResourceType="@resourceType" HelpText="The maximum number of search results to retrieve. The default is unlimited.">Page Size: </Label>
+            <div class="col-sm-9">
+                <input id="pagesize" type="text" class="form-control" @bind="@_pageSize" />
+            </div>
+        </div>
+        <hr />
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="sortfield" ResourceKey="SortField" ResourceType="@resourceType" HelpText="Specify the default sort field">Sort By: </Label>
+            <div class="col-sm-9">
+                <select id="softfield" class="form-select" @bind="@_sortField">
+                    <option value="Relevance">@Localizer["Relevance"]</option>
+                    <option value="Title">@Localizer["Title"]</option>
+                    <option value="LastModified">@Localizer["LastModified"]</option>
+                </select>
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="sortorder" ResourceKey="SortOrder" ResourceType="@resourceType" HelpText="Specify the default sort order">Sort Order: </Label>
+            <div class="col-sm-9">
+                <select id="softorder" class="form-select" @bind="@_sortOrder">
+                    <option value="Ascending">@Localizer["Ascending"]</option>
+                    <option value="Descending">@Localizer["Descending"]</option>
+                </select>
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="bodylength" ResourceKey="BodyLength" ResourceType="@resourceType" HelpText="The number of characters displayed for each search result summary. The default is 255 characters.">Body Size: </Label>
+            <div class="col-sm-9">
+                <input id="bodylength" type="text" class="form-control" @bind="@_bodyLength" />
+            </div>
+        </div>
+    </div>
+</form>
+
+@code {
+    private string resourceType = "Oqtane.Modules.Admin.SearchResults.Settings, Oqtane.Client"; // for localization
+
+    private ElementReference form;
+    private bool validated = false;
+
+    private string _includeEntities;
+    private string _excludeEntities;
+    private DateTime? _fromDate = null;
+    private DateTime? _toDate = null;
+    private string _pageSize;
+    private string _sortField;
+    private string _sortOrder;
+    private string _bodyLength;
+
+    protected override void OnInitialized()
+    {
+        try
+        {
+            _includeEntities = SettingService.GetSetting(ModuleState.Settings, "SearchResults_IncludeEntities", "");
+            _excludeEntities = SettingService.GetSetting(ModuleState.Settings, "SearchResults_ExcludeEntities", "");
+            var fromDate = SettingService.GetSetting(ModuleState.Settings, "SearchResults_FromDate", "");
+            _fromDate = (string.IsNullOrEmpty(fromDate)) ? null : DateTime.Parse(fromDate);
+            var toDate = SettingService.GetSetting(ModuleState.Settings, "SearchResults_ToDate", "");
+            _toDate = (string.IsNullOrEmpty(toDate)) ? null : DateTime.Parse(toDate);
+            _pageSize = SettingService.GetSetting(ModuleState.Settings, "SearchResults_PageSize", "");
+            _sortField = SettingService.GetSetting(ModuleState.Settings, "SearchResults_SortField", "Relevance");
+            _sortOrder = SettingService.GetSetting(ModuleState.Settings, "SearchResults_SortOrder", "Descending");
+            _bodyLength = SettingService.GetSetting(ModuleState.Settings, "SearchResults_BodyLength", "255");
+        }
+        catch (Exception ex)
+        {
+            AddModuleMessage(ex.Message, MessageType.Error);
+        }
+    }
+
+    public async Task UpdateSettings()
+    {
+        try
+        {
+            var settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
+            settings = SettingService.SetSetting(settings, "SearchResults_IncludeEntities", _includeEntities);
+            settings = SettingService.SetSetting(settings, "SearchResults_ExcludeEntities", _excludeEntities);
+            settings = SettingService.SetSetting(settings, "SearchResults_From", _fromDate.ToString());
+            settings = SettingService.SetSetting(settings, "SearchResults_To", _toDate.ToString());
+            settings = SettingService.SetSetting(settings, "SearchResults_PageSize", _pageSize);
+            settings = SettingService.SetSetting(settings, "SearchResults_SortField", _sortField);
+            settings = SettingService.SetSetting(settings, "SearchResults_SortOrder", _sortOrder);
+            settings = SettingService.SetSetting(settings, "SearchResults_BodyLength", _bodyLength);
+            await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
+        }
+        catch (Exception ex)
+        {
+            AddModuleMessage(ex.Message, MessageType.Error);
+        }
+    }
+}

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/Sites/Add.razor

@@ -71,20 +71,22 @@ else
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="runtime" HelpText="The runtime hosting model" ResourceKey="Runtime">Runtime: </Label>
+                <Label Class="col-sm-3" For="rendermode" HelpText="The default render mode for the site" ResourceKey="Rendermode">Render Mode: </Label>
                 <div class="col-sm-9">
-                    <select id="runtime" class="form-select" @bind="@_runtime" required>
+                    <select id="rendermode" class="form-select" @bind="@_rendermode" required>
-                        <option value="Server">@SharedLocalizer["BlazorServer"]</option>
+                        <option value="@RenderModes.Interactive">@(SharedLocalizer["RenderMode" + @RenderModes.Interactive])</option>
-                        <option value="WebAssembly">@SharedLocalizer["BlazorWebAssembly"]</option>
+                        <option value="@RenderModes.Static">@(SharedLocalizer["RenderMode" + @RenderModes.Static])</option>
-					</select>
+                        <option value="@RenderModes.Headless">@(SharedLocalizer["RenderMode" + @RenderModes.Headless])</option>
+                    </select>
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="prerender" HelpText="Specifies if the site should be prerendered (for search crawlers, etc...)" ResourceKey="Prerender">Prerender? </Label>
+                <Label Class="col-sm-3" For="runtime" HelpText="The render mode for UI components which require interactivity" ResourceKey="Runtime">Interactivity: </Label>
                 <div class="col-sm-9">
-                    <select id="prerender" class="form-select" @bind="@_prerender" required>
+                    <select id="runtime" class="form-select" @bind="@_runtime" required>
-                        <option value="Prerendered">@SharedLocalizer["Yes"]</option>
+                        <option value="@Runtimes.Server">@(SharedLocalizer["Runtime" + @Runtimes.Server])</option>
-                        <option value="">@SharedLocalizer["No"]</option>
+                        <option value="@Runtimes.WebAssembly">@(SharedLocalizer["Runtime" + @Runtimes.WebAssembly])</option>
+                        <option value="@Runtimes.Auto">@(SharedLocalizer["Runtime" + @Runtimes.Auto])</option>
                     </select>
                 </div>
             </div>
@@ -107,7 +109,7 @@ else
                     <hr class="app-rule" />
                 </div>
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="name" HelpText="Enter the name for the database" ResourceKey="TenantName">Name: </Label>
+                    <Label Class="col-sm-3" For="name" HelpText="Enter the name for the database. Note that this will be the tenant name which is used within the framework to identify the database." ResourceKey="TenantName">Name: </Label>
                     <div class="col-sm-9">
                         <input id="name" class="form-control" @bind="@_tenantName" maxlength="100" required />
                     </div>
@@ -116,42 +118,42 @@ else
                     <Label Class="col-sm-3" For="databaseType" HelpText="Select the database type" ResourceKey="DatabaseType">Type: </Label>
                     <div class="col-sm-9">
                         @if (_databases != null)
-						{
+                        {
-							<div class="input-group">
+                            <div class="input-group">
-								<select id="databaseType" class="form-select" value="@_databaseName" @onchange="(e => DatabaseChanged(e))" required>
+                                <select id="databaseType" class="form-select" value="@_databaseName" @onchange="(e => DatabaseChanged(e))" required>
-									@foreach (var database in _databases)
+                                    @foreach (var database in _databases)
-									{
+                                    {
-										<option value="@database.Name">@Localizer[@database.Name]</option>
+                                        <option value="@database.Name">@Localizer[@database.Name]</option>
-									}
+                                    }
-								</select>
+                                </select>
-								@if (!_showConnectionString)
+                                @if (!_showConnectionString)
-								{
+                                {
-									<button type="button" class="btn btn-secondary" @onclick="ToggleConnectionString">@Localizer["EnterConnectionString"]</button>
+                                    <button type="button" class="btn btn-secondary" @onclick="ToggleConnectionString">@Localizer["EnterConnectionString"]</button>
-								}
+                                }
-								else
+                                else
-								{
+                                {
-									<button type="button" class="btn btn-secondary" @onclick="ToggleConnectionString">@Localizer["EnterConnectionParameters"]</button>
+                                    <button type="button" class="btn btn-secondary" @onclick="ToggleConnectionString">@Localizer["EnterConnectionParameters"]</button>
-								}
+                                }
-							</div>
+                            </div>
-						}
+                        }
-					</div>
+                    </div>
                 </div>
-				@if (!_showConnectionString)
+                @if (!_showConnectionString)
-				{
+                {
-					if (_databaseConfigType != null)
+                    if (_databaseConfigType != null)
-					{
+                    {
-						@DatabaseConfigComponent
+                        @DatabaseConfigComponent
-					}
+                    }
-				}
+                }
-				else
+                else
-				{
+                {
-					<div class="row mb-1 align-items-center">
+                    <div class="row mb-1 align-items-center">
-						<Label Class="col-sm-3" For="connectionstring" HelpText="Enter a complete connection string including all parameters and delimiters" ResourceKey="ConnectionString">Settings:</Label>
+                        <Label Class="col-sm-3" For="connectionstring" HelpText="Enter a complete connection string including all parameters and delimiters" ResourceKey="ConnectionString">Settings:</Label>
-						<div class="col-sm-9">
+                        <div class="col-sm-9">
-							<textarea id="connectionstring" class="form-control" @bind="@_connectionString" rows="3"></textarea>
+                            <textarea id="connectionstring" class="form-control" @bind="@_connectionString" rows="3"></textarea>
-						</div>
+                        </div>
-					</div>
+                    </div>
-				}
+                }
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="hostUsername" HelpText="Enter the username of an existing host user" ResourceKey="HostUsername">Host Username:</Label>
                     <div class="col-sm-9">
@@ -201,8 +203,8 @@ else
     private string _themetype = "-";
     private string _containertype = "-";
     private string _sitetemplatetype = "-";
-    private string _runtime = "Server";
+    private string _rendermode = RenderModes.Static;
-    private string _prerender = "Prerendered";
+    private string _runtime = Runtimes.Server;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
@@ -214,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))
         {
@@ -228,137 +230,137 @@ else
             _sitetemplatetype = Constants.DefaultSiteTemplate;
         }
 
-		_databases = await DatabaseService.GetDatabasesAsync();
+        _databases = await DatabaseService.GetDatabasesAsync();
-		if (_databases.Exists(item => item.IsDefault))
+        if (_databases.Exists(item => item.IsDefault))
-		{
+        {
-			_databaseName = _databases.Find(item => item.IsDefault).Name;
+            _databaseName = _databases.Find(item => item.IsDefault).Name;
-		}
+        }
-		else
+        else
-		{
+        {
-			_databaseName = "LocalDB";
+            _databaseName = Constants.DefaultDBName;
-		}
+        }
-		LoadDatabaseConfigComponent();
+        LoadDatabaseConfigComponent();
-	}
+    }
 
-	private void DatabaseChanged(ChangeEventArgs eventArgs)
+    private void DatabaseChanged(ChangeEventArgs eventArgs)
-	{
+    {
-		try
+        try
-		{
+        {
-			_databaseName = (string)eventArgs.Value;
+            _databaseName = (string)eventArgs.Value;
-			_showConnectionString = false;
+            _showConnectionString = false;
-			LoadDatabaseConfigComponent();
+            LoadDatabaseConfigComponent();
-		}
+        }
-		catch
+        catch
-		{
+        {
-			AddModuleMessage(Localizer["Error.Database.LoadConfig"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Database.LoadConfig"], MessageType.Error);
-		}
+        }
-	}
+    }
 
-	private void LoadDatabaseConfigComponent()
+    private void LoadDatabaseConfigComponent()
-	{
+    {
-		var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
+        var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
-		if (database != null)
+        if (database != null)
-		{
+        {
-			_databaseConfigType = Type.GetType(database.ControlType);
+            _databaseConfigType = Type.GetType(database.ControlType);
-			DatabaseConfigComponent = builder =>
+            DatabaseConfigComponent = builder =>
-			{
+            {
-				builder.OpenComponent(0, _databaseConfigType);
+                builder.OpenComponent(0, _databaseConfigType);
-				builder.AddComponentReferenceCapture(1, inst => { _databaseConfig = Convert.ChangeType(inst, _databaseConfigType); });
+                builder.AddComponentReferenceCapture(1, inst => { _databaseConfig = Convert.ChangeType(inst, _databaseConfigType); });
-				builder.CloseComponent();
+                builder.CloseComponent();
-			};
+            };
-		}
+        }
-	}
+    }
 
-	private void TenantChanged(ChangeEventArgs e)
+    private void TenantChanged(ChangeEventArgs e)
-	{
+    {
-		_tenantid = (string)e.Value;
+        _tenantid = (string)e.Value;
-		if (string.IsNullOrEmpty(_tenantName))
+        if (string.IsNullOrEmpty(_tenantName))
-		{
+        {
-			_tenantName = _name;
+            _tenantName = _name;
-		}
+        }
-		StateHasChanged();
+        StateHasChanged();
-	}
+    }
 
-	private async void ThemeChanged(ChangeEventArgs e)
+    private async void ThemeChanged(ChangeEventArgs e)
-	{
+    {
-		try
+        try
-		{
+        {
-			_themetype = (string)e.Value;
+            _themetype = (string)e.Value;
-			if (_themetype != "-")
+            if (_themetype != "-")
-			{
+            {
-				_containers = ThemeService.GetContainerControls(_themeList, _themetype);
+                _containers = ThemeService.GetContainerControls(_themeList, _themetype);
                 _containertype = _containers.First().TypeName;
             }
-			else
+            else
-			{
+            {
-				_containers = new List<ThemeControl>();
+                _containers = new List<ThemeControl>();
                 _containertype = "-";
             }
-			StateHasChanged();
+            StateHasChanged();
-		}
+        }
-		catch (Exception ex)
+        catch (Exception ex)
-		{
+        {
-			await logger.LogError(ex, "Error Loading Containers For Theme {ThemeType} {Error}", _themetype, ex.Message);
+            await logger.LogError(ex, "Error Loading Containers For Theme {ThemeType} {Error}", _themetype, ex.Message);
-			AddModuleMessage(Localizer["Error.Theme.LoadContainers"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Theme.LoadContainers"], MessageType.Error);
-		}
+        }
-	}
+    }
 
-	private async Task SaveSite()
+    private async Task SaveSite()
-	{
+    {
-		validated = true;
+        validated = true;
-		var interop = new Interop(JSRuntime);
+        var interop = new Interop(JSRuntime);
-		if (await interop.FormValid(form))
+        if (await interop.FormValid(form))
-		{
+        {
-			if (_tenantid != "-" && _name != string.Empty && _urls != string.Empty && _themetype != "-" && _containertype != "-" && _sitetemplatetype != "-")
+            if (_tenantid != "-" && _name != string.Empty && _urls != string.Empty && _themetype != "-" && _containertype != "-" && _sitetemplatetype != "-")
-			{
+            {
-				_urls = Regex.Replace(_urls, @"\r\n?|\n", ",");
+                _urls = Regex.Replace(_urls, @"\r\n?|\n", ",");
-				var duplicates = new List<string>();
+                var duplicates = new List<string>();
-				var aliases = await AliasService.GetAliasesAsync();
+                var aliases = await AliasService.GetAliasesAsync();
-				foreach (string name in _urls.Split(',', StringSplitOptions.RemoveEmptyEntries))
+                foreach (string name in _urls.Split(',', StringSplitOptions.RemoveEmptyEntries))
-				{
+                {
-					if (aliases.Exists(item => item.Name == name))
+                    if (aliases.Exists(item => item.Name == name))
-					{
+                    {
-						duplicates.Add(name);
+                        duplicates.Add(name);
-					}
+                    }
-				}
+                }
 
-				if (duplicates.Count == 0)
+                if (duplicates.Count == 0)
-				{
+                {
-					InstallConfig config = new InstallConfig();
+                    InstallConfig config = new InstallConfig();
 
-					if (_tenantid == "+")
+                    if (_tenantid == "+")
-					{
+                    {
-						if (!string.IsNullOrEmpty(_tenantName) && !_tenants.Exists(item => item.Name == _tenantName))
+                        if (!string.IsNullOrEmpty(_tenantName) && !_tenants.Exists(item => item.Name == _tenantName))
-						{
+                        {
-							// validate host credentials
+                            // validate host credentials
-							var user = new User();
+                            var user = new User();
-							user.SiteId = PageState.Site.SiteId;
+                            user.SiteId = PageState.Site.SiteId;
-							user.Username = _hostusername;
+                            user.Username = _hostusername;
-							user.Password = _hostpassword;
+                            user.Password = _hostpassword;
-							user.LastIPAddress = PageState.RemoteIPAddress;
+                            user.LastIPAddress = PageState.RemoteIPAddress;
-							user = await UserService.LoginUserAsync(user, false, false);
+                            user = await UserService.LoginUserAsync(user, false, false);
                             if (user.IsAuthenticated)
                             {
-								var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
+                                var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
-								var connectionString = String.Empty;
+                                var connectionString = String.Empty;
-								if (_showConnectionString)
+                                if (_showConnectionString)
-								{
+                                {
-									connectionString = _connectionString;
+                                    connectionString = _connectionString;
-								}
+                                }
-								else
+                                else
-								{
+                                {
-									if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
+                                    if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
-									{
+                                    {
-										connectionString = databaseConfigControl.GetConnectionString();
+                                        connectionString = databaseConfigControl.GetConnectionString();
-									}
+                                    }
-								}
+                                }
 
                                 if (connectionString != "")
                                 {
                                     config.TenantName = _tenantName;
                                     config.DatabaseType = database.DBType;
                                     config.ConnectionString = connectionString;
-									config.HostUsername = _hostusername;
+                                    config.HostUsername = _hostusername;
                                     config.HostPassword = _hostpassword;
                                     config.HostEmail = user.Email;
                                     config.HostName = user.DisplayName;
@@ -388,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;
                         }
                     }
 
@@ -399,8 +403,9 @@ else
                         config.DefaultContainer = _containertype;
                         config.DefaultAdminContainer = "";
                         config.SiteTemplate = _sitetemplatetype;
+                        config.RenderMode = _rendermode;
                         config.Runtime = _runtime;
-                        config.RenderMode = _runtime + _prerender;
+                        config.Register = false;
 
                         ShowProgressIndicator();