Add entrypoint, modify Dockerfile: Overwrite volume files

update Azure ARM template to 6.1.3

.deployment

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

.gitattributes

@@ -0,0 +1,2 @@
+Oqtane.Server/wwwroot/Modules/Templates/External/Package/*.sh eol=lf
+Oqtane.Server/wwwroot/Themes/Templates/External/Package/*.sh eol=lf

.gitea/workflows/build-container.yml

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

.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

@@ -10,15 +10,29 @@ msbuild.binlog
 *.zip
 
 *.idea
+_ReSharper.Caches
+.DS_Store
 
 Oqtane.Server/appsettings.json
-Oqtane.Server/Data/*.mdf
-Oqtane.Server/Data/*.ldf
-Oqtane.Server/Data/*.db
+Oqtane.Server/Data
 
-/Oqtane.Server/Properties/PublishProfiles/FolderProfile.pubxml
+Oqtane.Server/Properties/PublishProfiles/FolderProfile.pubxml
 Oqtane.Server/Content
 Oqtane.Server/Packages
 Oqtane.Server/wwwroot/Content
 Oqtane.Server/wwwroot/Packages/*.log
 
+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.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!

Dockerfile

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

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2020 .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.Client/App.razor

@@ -1,61 +0,0 @@
-@inject IInstallationService InstallationService
-@inject IJSRuntime JSRuntime
-@inject SiteState SiteState
-
-@if (_initialized)
-{
-    @if (!_installation.Success)
-    {
-        <Installer />
-    }
-    else
-    {
-        @if (string.IsNullOrEmpty(_installation.Message))
-        {
-            <CascadingAuthenticationState>
-                <CascadingValue Value="@PageState">
-                    <SiteRouter OnStateChange="@ChangeState" />
-                </CascadingValue>
-            </CascadingAuthenticationState>
-        }
-        else
-        {
-            <div class="app-alert">
-                @_installation.Message
-            </div>
-        }
-    }
-}
-
-@code {
-    private bool _initialized = false;
-    private Installation _installation = new Installation { Success = false, Message = "" };
-
-    private PageState PageState { get; set; }
-
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (firstRender && !_initialized)
-        {
-            var interop = new Interop(JSRuntime);
-            SiteState.AntiForgeryToken = await interop.GetElementByName(Constants.RequestVerificationToken);
-            _installation = await InstallationService.IsInstalled();
-            if (_installation.Alias != null)
-            {
-                SiteState.Alias = _installation.Alias;
-            }
-            else
-            {
-                _installation.Message = "Site Not Configured Correctly - No Matching Alias Exists For Host Name";
-            }
-            _initialized = true;
-            StateHasChanged();
-        }
-    }
-
-    private void ChangeState(PageState pageState)
-    {
-        PageState = pageState;
-        StateHasChanged();
-    }
-}

Oqtane.Client/Extensions/OqtaneLocalizationExtensions.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace Microsoft.Extensions.Localization
 {
     public static class OqtaneLocalizationExtensions
@@ -18,5 +20,42 @@ namespace Microsoft.Extensions.Localization
             }
             return localizedValue;
         }
+
+        /// <summary>
+        /// Creates an IStringLocalizer based on a type name. This extension method is useful in scenarios where the default IStringLocalizer is unable to locate the resources.
+        /// </summary>
+        /// <param name="localizerFactory"></param>
+        /// <param name="fullTypeName">the full type name ie. GetType().FullName</param>
+        /// <returns></returns>
+        public static IStringLocalizer Create(this IStringLocalizerFactory localizerFactory, string fullTypeName)
+        {
+            var typename = fullTypeName;
+
+            // handle generic types
+            var type = Type.GetType(fullTypeName);
+            if (type.IsGenericType)
+            {
+                typename = type.GetGenericTypeDefinition().FullName;
+                typename = typename.Substring(0, typename.IndexOf("`")); // remove generic type info
+            }
+
+            // format typename
+            if (typename.Contains(","))
+            {
+                typename = typename.Substring(0, typename.IndexOf(",")); // remove assembly info
+            }
+
+            // remove rootnamespace
+            var rootnamespace = "";
+            var attributes = type.Assembly.GetCustomAttributes(typeof(RootNamespaceAttribute), false);
+            if (attributes.Length > 0)
+            {
+                rootnamespace = ((RootNamespaceAttribute)attributes[0]).RootNamespace;
+            }
+            typename = typename.Replace(rootnamespace + ".", "");
+
+            // create IStringLocalizer using factory
+            return localizerFactory.Create(typename, type.Assembly.GetName().Name);
+        }    
     }
 }

Oqtane.Client/Extensions/OqtaneServiceCollectionExtensions.cs

@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Components.Authorization;
+using Oqtane.Interfaces;
 using Oqtane.Providers;
 using Oqtane.Services;
 using Oqtane.Shared;
@@ -7,16 +8,17 @@ 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;
         }
 
-        internal static IServiceCollection AddOqtaneScopedServices(this IServiceCollection services)
+        public static IServiceCollection AddOqtaneClientScopedServices(this IServiceCollection services)
         {
             services.AddScoped<SiteState>();
             services.AddScoped<IInstallationService, InstallationService>();
@@ -46,7 +48,17 @@ namespace Microsoft.Extensions.DependencyInjection
             services.AddScoped<ILocalizationService, LocalizationService>();
             services.AddScoped<ILanguageService, LanguageService>();
             services.AddScoped<IDatabaseService, DatabaseService>();
+            services.AddScoped<IUrlMappingService, UrlMappingService>();
+            services.AddScoped<IVisitorService, VisitorService>();
             services.AddScoped<ISyncService, SyncService>();
+            services.AddScoped<ILocalizationCookieService, LocalizationCookieService>();
+            services.AddScoped<ICookieConsentService, CookieConsentService>();
+            services.AddScoped<IOutputCacheService, OutputCacheService>();
+            services.AddScoped<ITimeZoneService, TimeZoneService>();
+
+            // providers
+            services.AddScoped<ITextEditor, Oqtane.Modules.Controls.QuillJSTextEditor>();
+            services.AddScoped<ITextEditor, Oqtane.Modules.Controls.TextAreaTextEditor>();
 
             return services;
         }

Oqtane.Client/IconResources.cs

@@ -0,0 +1,14 @@
+namespace Oqtane
+{
+    /// <summary>
+    /// Dummy class used to collect shared resource strings for this application
+    /// </summary>
+    /// <remarks>
+    /// This class is mostly used with IStringLocalizer and IHtmlLocalizer interfaces.
+    /// The class must reside at the project root.
+    /// </remarks>
+    public class IconResources
+    {
+
+    }
+}

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/LocalDBConfig.razor

@@ -1,41 +1,30 @@
 @namespace Oqtane.Installer.Controls
 @implements Oqtane.Interfaces.IDatabaseConfigControl
-@inject IStringLocalizer<Installer> Localizer
 
-@{
-    foreach (var field in _connectionStringFields)
-    {
-        var fieldId = field.Name.ToLowerInvariant();
-        field.Value = field.Value.Replace("{{Date}}", DateTime.UtcNow.ToString("yyyyMMddHHmm"));
-
-        <tr>
-            <td>
-                <Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label>
-            </td>
-            <td>
-                <input id="@fieldId" type="text" class="form-control" @bind="@field.Value" />
-            </td>
-        </tr>
-    }
-}
+<div class="row mb-1 align-items-center">
+    <Label Class="col-sm-3" For="server" HelpText="Enter the database server" 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>
 
 @code {
-    private readonly List<ConnectionStringField> _connectionStringFields = new()
-    {
-        new() {Name = "Server", FriendlyName = "Server", Value = "(LocalDb)\\MSSQLLocalDB", HelpText="Enter the database server"},
-        new() {Name = "Database", FriendlyName = "Database", Value = "Oqtane-{{Date}}", HelpText="Enter the name of the database"}
-    };
+    private string _server = "(LocalDb)\\MSSQLLocalDB";
+    private string _database = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm");
 
     public string GetConnectionString()
     {
         var connectionString = String.Empty;
 
-        var server = _connectionStringFields[0].Value;
-        var database = _connectionStringFields[1].Value;
-
-        if (!String.IsNullOrEmpty(server)  && !String.IsNullOrEmpty(database))
+        if (!String.IsNullOrEmpty(_server) && !String.IsNullOrEmpty(_database))
         {
-            connectionString = $"Data Source={server};AttachDbFilename=|DataDirectory|\\{database}.mdf;Initial Catalog={database};Integrated Security=SSPI;";
+            connectionString = $"Data Source={_server};AttachDbFilename=|DataDirectory|\\{_database}.mdf;Initial Catalog={_database};Integrated Security=SSPI;Encrypt=false;";
         }
 
         return connectionString;

Oqtane.Client/Installer/Controls/MySQLConfig.razor

@@ -1,54 +1,83 @@
 @namespace Oqtane.Installer.Controls
 @implements Oqtane.Interfaces.IDatabaseConfigControl
-@inject IStringLocalizer<Installer> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@{
-    foreach (var field in _connectionStringFields)
-    {
-        var fieldId = field.Name.ToLowerInvariant();
-        var fieldType = (field.Name == "Pwd") ? "password" : "text";
-        field.Value = field.Value.Replace("{{Date}}", DateTime.UtcNow.ToString("yyyyMMddHHmm"));
-            
-        <tr>
-            <td>
-                <Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label>
-            </td>
-            <td>
-                <input id="@fieldId" type="@fieldType" class="form-control" @bind="@field.Value" />
-            </td>
-        </tr>
-    }
-}
+<div class="row mb-1 align-items-center">
+    <Label Class="col-sm-3" For="server" HelpText="Enter the database server" 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="port" HelpText="Enter the port used to connect to the server" ResourceKey="Port">Port:</Label>
+    <div class="col-sm-9">
+        <input id="port" type="text" class="form-control" @bind="@_port" />
+    </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="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>
 
 @code {
-    private readonly List<ConnectionStringField> _connectionStringFields = new()
-    {
-        new() {Name = "Server", FriendlyName = "Server", Value = "127.0.0.1", HelpText="Enter the database server"},
-        new() {Name = "Port", FriendlyName = "Port", Value = "3306", HelpText="Enter the port used to connect to the server"},
-        new() {Name = "Database", FriendlyName = "Database", Value = "Oqtane-{{Date}}", HelpText="Enter the name of the database"},
-        new() {Name = "Uid", FriendlyName = "User Id", Value = "", HelpText="Enter the username to use for the database"},
-        new() {Name = "Pwd", FriendlyName = "Password", Value = "", HelpText="Enter the password to use for the database"}
-    };
+    private string _server = "127.0.0.1";
+    private string _port = "3306";
+    private string _database = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm");
+    private string _uid = String.Empty;
+    private string _pwd = String.Empty;
+    private string _passwordType = "password";
+    private string _togglePassword = string.Empty;
+
+    protected override void OnInitialized()
+	{
+        _togglePassword = SharedLocalizer["ShowPassword"];
+    }
 
     public string GetConnectionString()
     {
         var connectionString = String.Empty;
 
-        var server = _connectionStringFields[0].Value;
-        var port = _connectionStringFields[1].Value;
-        var database = _connectionStringFields[2].Value;
-        var userId = _connectionStringFields[3].Value;
-        var password = _connectionStringFields[4].Value;
-
-        if (!String.IsNullOrEmpty(server) && !String.IsNullOrEmpty(database) && !String.IsNullOrEmpty(userId) && !String.IsNullOrEmpty(password))
+        if (!String.IsNullOrEmpty(_server) && !String.IsNullOrEmpty(_database) && !String.IsNullOrEmpty(_uid) && !String.IsNullOrEmpty(_pwd))
         {
-            connectionString = $"Server={server};Database={database};Uid={userId};Pwd={password};";
+            connectionString = $"Server={_server};Database={_database};Uid={_uid};Pwd={_pwd};";
         }
 
-        if (!String.IsNullOrEmpty(port))
+        if (!String.IsNullOrEmpty(_port))
         {
-            connectionString += $"Port={port};";
+            connectionString += $"Port={_port};";
         }
+
         return connectionString;
     }
+
+    private void TogglePassword()
+    {
+        if (_passwordType == "password")
+        {
+            _passwordType = "text";
+            _togglePassword = SharedLocalizer["HidePassword"];
+        }
+        else
+        {
+            _passwordType = "password";
+            _togglePassword = SharedLocalizer["ShowPassword"];
+        }
+    }
 }

Oqtane.Client/Installer/Controls/PostgreSQLConfig.razor

@@ -1,89 +1,87 @@
 @namespace Oqtane.Installer.Controls
 @implements Oqtane.Interfaces.IDatabaseConfigControl
-@inject IStringLocalizer<Installer> Localizer
+@inject IStringLocalizer<PostgreSQLConfig> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@{
-    foreach (var field in _connectionStringFields)
-    {
-        var fieldId = field.Name.ToLowerInvariant();
-        if (field.Name != "IntegratedSecurity")
-        {
-            var isVisible = "";
-            var fieldType = (field.Name == "Pwd") ? "password" : "text";
-            if ((field.Name == "Uid" || field.Name == "Pwd"))
-            {
-                var intSecurityField = _connectionStringFields.Single(f => f.Name == "IntegratedSecurity");
-                if (intSecurityField != null)
-                {
-                    isVisible = (Convert.ToBoolean(intSecurityField.Value)) ? "display: none;" : "";
-                }
-            }
-
-            field.Value = field.Value.Replace("{{Date}}", DateTime.UtcNow.ToString("yyyyMMddHHmm"));
-
-            <tr style="@isVisible">
-                <td>
-                    <Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label>
-                </td>
-                <td>
-                    <input id="@fieldId" type="@fieldType" class="form-control" @bind="@field.Value" />
-                </td>
-            </tr>
-        }
-        else
-        {
-            <tr>
-                <td>
-                    <Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label>
-                </td>
-                <td>
-                    <select id="@fieldId" class="custom-select" @bind="@field.Value">
-                        <option value="true" selected>@SharedLocalizer["True"]</option>
-                        <option value="false">@SharedLocalizer["False"]</option>
-                    </select>
-                </td>
-            </tr>
-        }
-    }
+<div class="row mb-1 align-items-center">
+    <Label Class="col-sm-3" For="server" HelpText="Enter the database server" 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="port" HelpText="Enter the port used to connect to the server" ResourceKey="Port">Port:</Label>
+    <div class="col-sm-9">
+        <input id="port" type="text" class="form-control" @bind="@_port" />
+    </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>
 }
 
 @code {
-    private readonly List<ConnectionStringField> _connectionStringFields = new()
-    {
-            new() { Name = "Server", FriendlyName = "Server", Value = "127.0.0.1", HelpText = "Enter the database server" },
-            new() { Name = "Port", FriendlyName = "Port", Value = "5432", HelpText = "Enter the port used to connect to the server" },
-            new() { Name = "Database", FriendlyName = "Database", Value = "Oqtane-{{Date}}", HelpText = "Enter the name of the database" },
-            new() { Name = "IntegratedSecurity", FriendlyName = "Integrated Security", Value = "true", HelpText = "Select if you want integrated security or not" },
-            new() { Name = "Uid", FriendlyName = "User Id", Value = "", HelpText = "Enter the username to use for the database" },
-            new() { Name = "Pwd", FriendlyName = "Password", Value = "", HelpText = "Enter the password to use for the database" }
-        };
+    private string _server = "127.0.0.1";
+    private string _port = "5432";
+    private string _database = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm");
+    private string _security = "integrated";
+    private string _uid = String.Empty;
+    private string _pwd = String.Empty;
+    private string _passwordType = "password";
+    private string _togglePassword = string.Empty;
+
+    protected override void OnInitialized()
+	{
+        _togglePassword = SharedLocalizer["ShowPassword"];
+    }
 
     public string GetConnectionString()
     {
         var connectionString = String.Empty;
 
-        var server = _connectionStringFields[0].Value;
-        var port = _connectionStringFields[1].Value;
-        var database = _connectionStringFields[2].Value;
-        var integratedSecurity = Boolean.Parse(_connectionStringFields[3].Value);
-        var userId = _connectionStringFields[4].Value;
-        var password = _connectionStringFields[5].Value;
-
-        if (!String.IsNullOrEmpty(server) && !String.IsNullOrEmpty(database) && !String.IsNullOrEmpty(port))
+        if (!String.IsNullOrEmpty(_server) && !String.IsNullOrEmpty(_database) && !String.IsNullOrEmpty(_port))
         {
-            connectionString = $"Server={server};Port={port};Database={database};";
+            connectionString = $"Server={_server};Port={_port};Database={_database};";
         }
 
-        if (integratedSecurity)
+        if (_security == "integrated")
         {
             connectionString += "Integrated Security=true;";
         }
         else
         {
-            if (!String.IsNullOrEmpty(userId) && !String.IsNullOrEmpty(password))
+            if (!String.IsNullOrEmpty(_uid) && !String.IsNullOrEmpty(_pwd))
             {
-                connectionString += $"User ID={userId};Password={password};";
+                connectionString += $"User ID={_uid};Password={_pwd};";
             }
             else
             {
@@ -93,4 +91,18 @@
 
         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

@@ -1,95 +1,119 @@
 @namespace Oqtane.Installer.Controls
 @implements Oqtane.Interfaces.IDatabaseConfigControl
-@inject IStringLocalizer<Installer> Localizer
+@inject IStringLocalizer<SqlServerConfig> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@{
-    foreach (var field in _connectionStringFields)
-    {
-        var fieldId = field.Name.ToLowerInvariant();
-        if (field.Name != "IntegratedSecurity")
-        {
-            var isVisible = "";
-            var fieldType = (field.Name == "Pwd") ? "password" : "text";
-            if ((field.Name == "Uid" || field.Name == "Pwd"))
-            {
-                var intSecurityField = _connectionStringFields.Single(f => f.Name == "IntegratedSecurity");
-                if (intSecurityField != null)
-                {
-                    isVisible = (Convert.ToBoolean(intSecurityField.Value)) ? "display: none;" : "";
-                }
-            }
-
-            field.Value = field.Value.Replace("{{Date}}", DateTime.UtcNow.ToString("yyyyMMddHHmm"));
-
-            <tr style="@isVisible">
-                <td>
-                    <Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label>
-                </td>
-                <td>
-                    <input id="@fieldId" type="@fieldType" class="form-control" @bind="@field.Value" />
-                </td>
-            </tr>
-        }
-        else
-        {
-            <tr>
-                <td>
-                    <Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label>
-                </td>
-                <td>
-                    <select id="@fieldId" class="custom-select" @bind="@field.Value">
-                        <option value="true" selected>@SharedLocalizer["True"]</option>
-                        <option value="false">@SharedLocalizer["False"]</option>
-                    </select>
-                </td>
-            </tr>
-        }
-    }
+<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 readonly List<ConnectionStringField> _connectionStringFields = new()
-    {
-            new() { Name = "Server", FriendlyName = "Server", Value = ".", HelpText = "Enter the database server" },
-            new() { Name = "Database", FriendlyName = "Database", Value = "Oqtane-{{Date}}", HelpText = "Enter the name of the database" },
-            new() { Name = "IntegratedSecurity", FriendlyName = "Integrated Security", Value = "true", HelpText = "Select if you want integrated security or not" },
-            new() { Name = "Uid", FriendlyName = "User Id", Value = "", HelpText = "Enter the username to use for the database" },
-            new() { Name = "Pwd", FriendlyName = "Password", Value = "", HelpText = "Enter the password to use for the database" }
-        };
+    private string _server = String.Empty;
+    private string _database = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm");
+    private string _security = "integrated";
+    private string _uid = String.Empty;
+    private string _pwd = String.Empty;
+    private string _passwordType = "password";
+    private string _togglePassword = string.Empty;
+    private string _encryption = "false";
+    private string _trustservercertificate = "false";
+
+    protected override void OnInitialized()
+	{
+        _togglePassword = SharedLocalizer["ShowPassword"];
+    }
 
     public string GetConnectionString()
     {
         var connectionString = String.Empty;
 
-        var server = _connectionStringFields[0].Value;
-        var database = _connectionStringFields[1].Value;
-        var integratedSecurity = Boolean.Parse(_connectionStringFields[2].Value);
-        var userId = _connectionStringFields[3].Value;
-        var password = _connectionStringFields[4].Value;
-
-        if (!String.IsNullOrEmpty(server) && !String.IsNullOrEmpty(database))
+        if (!String.IsNullOrEmpty(_server) && !String.IsNullOrEmpty(_database))
         {
-            connectionString = $"Data Source={server};Initial Catalog={database};";
+            connectionString = $"Data Source={_server};Initial Catalog={_database};";
         }
 
-        if (integratedSecurity)
+        if (_security == "integrated")
         {
             connectionString += "Integrated Security=SSPI;";
         }
         else
         {
-            if (!String.IsNullOrEmpty(userId) && !String.IsNullOrEmpty(password))
-            {
-                connectionString += $"User ID={userId};Password={password};";
-            }
-            else
-            {
-                connectionString = String.Empty;
-            }
+            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/SqliteConfig.razor

@@ -1,39 +1,23 @@
 @namespace Oqtane.Installer.Controls
 @implements Oqtane.Interfaces.IDatabaseConfigControl
-@inject IStringLocalizer<Installer> Localizer
 
-@{
-    foreach (var field in _connectionStringFields)
-    {        
-        var fieldId = field.Name.ToLowerInvariant();
-        field.Value = field.Value.Replace("{{Date}}", DateTime.UtcNow.ToString("yyyyMMddHHmm"));
-        
-        <tr>
-            <td>
-                <Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label>
-            </td>
-            <td>
-                <input id="@fieldId" type="text" class="form-control" @bind="@field.Value" />
-            </td>
-        </tr>
-    }
-}
+<div class="row mb-1 align-items-center">
+    <Label Class="col-sm-3" For="server" HelpText="Enter the file name to use for the database" ResourceKey="Server">File Name:</Label>
+    <div class="col-sm-9">
+        <input id="server" type="text" class="form-control" @bind="@_server" />
+    </div>
+</div>
 
 @code {
-    private readonly List<ConnectionStringField> _connectionStringFields = new()
-    {
-        new() {Name = "Server", FriendlyName = "File Name", Value = "Oqtane-{{Date}}.db", HelpText="Enter the file name to use for the database"}
-    };
+    private string _server = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm") + ".db";
 
     public string GetConnectionString()
     {
         var connectionstring = String.Empty;
 
-        var server = _connectionStringFields[0].Value;
-
-        if (!String.IsNullOrEmpty(server))
+        if (!String.IsNullOrEmpty(_server))
         {
-            connectionstring = $"Data Source={server};";
+            connectionstring = $"Data Source={_server};";
         }
 
         return connectionstring;

Oqtane.Client/Installer/Installer.razor

@@ -5,100 +5,133 @@
 @inject ISiteService SiteService
 @inject IUserService UserService
 @inject IDatabaseService DatabaseService
+@inject ISiteTemplateService SiteTemplateService
 @inject IJSRuntime JSRuntime
 @inject IStringLocalizer<Installer> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
+@inject SiteState SiteState
 
 <div class="container">
     <div class="row">
         <div class="mx-auto text-center">
             <img src="oqtane-black.png" />
-            <div style="font-weight: bold">@SharedLocalizer["Version"] @Constants.Version</div>
+            <div style="font-weight: bold">@SharedLocalizer["Version"] @Constants.Version (.NET @Environment.Version.Major)</div>
         </div>
     </div>
     <hr class="app-rule" />
     <div class="row justify-content-center">
         <div class="col text-center">
             <h2>@Localizer["DatabaseConfig"]</h2><br />
-            <table class="form-group" cellpadding="4" cellspacing="4" style="margin: auto;">
-                <tbody>
-                    <tr>
-                        <td>
-                            <Label For="databasetype" HelpText="Select the type of database you wish to create" ResourceKey="DatabaseType">Database Type:</Label>
-                        </td>
-                        <td>
-                            <select id="databasetype" class="custom-select" value="@_databaseName" @onchange="(e => DatabaseChanged(e))">
-                                @if (_databases != null)
-                                {
-                                    foreach (var database in _databases)
-                                    {
-                                        if (database.IsDefault)
-                                        {
-                                            <option value="@database.Name" selected>@Localizer[@database.Name]</option>
-                                        }
-                                        else
-                                        {
-                                            <option value="@database.Name">@Localizer[@database.Name]</option>
-                                        }
-                                    }
-                                }
-                            </select>
-                        </td>
-                    </tr>
-                    @{
-                        if (_databaseConfigType != null)
+            <div class="container">
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="databasetype" HelpText="Select the type of database you wish to use" ResourceKey="DatabaseType">Database:</Label>
+                    <div class="col-sm-9">
+                        @if (_databases != null)
                         {
-                            @DatabaseConfigComponent;
+							<div class="input-group">
+								<select id="databaseType" class="form-select" value="@_databaseName" @onchange="(e => DatabaseChanged(e))" required>
+									@foreach (var database in _databases)
+									{
+										<option value="@database.Name">@Localizer[@database.Name]</option>
+									}
+								</select>
+								@if (!_showConnectionString)
+								{
+									<button type="button" class="btn btn-secondary" @onclick="ToggleConnectionString">@Localizer["EnterConnectionString"]</button>
+								}
+								else
+								{
+									<button type="button" class="btn btn-secondary" @onclick="ToggleConnectionString">@Localizer["EnterConnectionParameters"]</button>
+								}
+							</div>
                         }
-                    }
-                </tbody>
-            </table>
+                    </div>
+                </div>
+				@if (!_showConnectionString)
+				{
+					if (_databaseConfigType != null)
+					{
+						@DatabaseConfigComponent
+					}
+				}
+				else
+				{
+					<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>
+						<div class="col-sm-9">
+							<textarea id="connectionstring" class="form-control" @bind="@_connectionString" rows="3"></textarea>
+						</div>
+					</div>
+				}
+            </div>
         </div>
         <div class="col text-center">
             <h2>@Localizer["ApplicationAdmin"]</h2><br />
-            <table class="form-group" cellpadding="4" cellspacing="4" style="margin: auto;">
-                <tbody>
-                    <tr>
-                        <td>
-                            <Label For="username" HelpText="The username of the host user account ( this is not customizable )" ResourceKey="Username">Username:</Label>
-                        </td>
-                        <td>
-                            <input id="username" type="text" class="form-control" @bind="@_hostUsername" readonly />
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <Label For="password" HelpText="Provide the password for the host user account" ResourceKey="Password">Password:</Label>
-                        </td>
-                        <td>
-                            <input id="password" type="password" class="form-control" @bind="@_hostPassword" />
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <Label For="confirm" HelpText="Please confirm the password entered above by entering it again" ResourceKey="Confirm">Confirm:</Label>
-                        </td>
-                        <td>
-                            <input id="confirm" type="password" class="form-control" @bind="@_confirmPassword" />
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <Label For="email" HelpText="Provide the email address for the host user account" ResourceKey="Email">Email:</Label>
-                        </td>
-                        <td>
-                            <input type="text" class="form-control" @bind="@_hostEmail" />
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
+            <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 account" ResourceKey="Username">Username:</Label>
+                    <div class="col-sm-9">
+                        <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" maxlength="256" @bind="@_hostPassword" 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="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" maxlength="256" @bind="@_confirmPassword" autocomplete="new-password" />
+                            <button type="button" class="btn btn-secondary" @onclick="@ToggleConfirmPassword" tabindex="-1">@_toggleConfirmPassword</button>
+						</div>
+                    </div>
+                </div>
+                <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" 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">
+                    <Label Class="col-sm-3" For="template" HelpText="Select a site template" ResourceKey="Template">Template:</Label>
+                    <div class="col-sm-9">
+                        @if (_templates != null)
+                        {
+                            <select id="template" class="form-select" @bind="@_template" required>
+                                @foreach (var template in _templates)
+                                {
+                                    <option value="@template.TypeName">@template.Name</option>
+                                }
+                            </select>
+                        }
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
     <hr class="app-rule" />
     <div class="row">
         <div class="mx-auto text-center">
             <button type="button" class="btn btn-success" @onclick="Install">@Localizer["InstallNow"]</button><br /><br />
-            <ModuleMessage Message="@_message" Type="MessageType.Error"></ModuleMessage>
+            @if (!string.IsNullOrEmpty(_message))
+            {
+                <div class="alert alert-danger alert-dismissible fade show mb-3" role="alert">
+                    @((MarkupString)_message)
+                    <button type="button" class="btn-close" aria-label="Close" @onclick="DismissModal"></button>
+                </div>
+            }
         </div>
         <div class="app-progress-indicator" style="@_loadingDisplay"></div>
     </div>
@@ -111,23 +144,49 @@
 
 @code {
     private List<Database> _databases;
-    private string _databaseName = "LocalDB";
+    private string _databaseName;
     private Type _databaseConfigType;
     private object _databaseConfig;
     private RenderFragment DatabaseConfigComponent { get; set; }
+    private bool _showConnectionString = false;
+    private string _connectionString = string.Empty;
 
-    private string _hostUsername = UserNames.Host;
+    private string _hostUsername = string.Empty;
     private string _hostPassword = string.Empty;
+    private string _passwordType = "password";
+    private string _confirmPasswordType = "password";
+    private string _togglePassword = string.Empty;
+    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 _loadingDisplay = "display: none;";
 
     protected override async Task OnInitializedAsync()
     {
+        // include 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"];
+
         _databases = await DatabaseService.GetDatabasesAsync();
+        if (_databases.Exists(item => item.IsDefault))
+        {
+            _databaseName = _databases.Find(item => item.IsDefault).Name;
+        }
+        else
+        {
+            _databaseName = "LocalDB";
+        }
         LoadDatabaseConfigComponent();
+
+        _templates = await SiteTemplateService.GetSiteTemplatesAsync();
     }
 
     private void DatabaseChanged(ChangeEventArgs eventArgs)
@@ -135,7 +194,7 @@
         try
         {
             _databaseName = (string)eventArgs.Value;
-
+            _showConnectionString = false;
             LoadDatabaseConfigComponent();
         }
         catch
@@ -163,57 +222,119 @@
     {
         if (firstRender)
         {
+            // include JavaScript
             var interop = new Interop(JSRuntime);
-            await interop.IncludeLink("app-stylesheet", "stylesheet", "https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css", "text/css", "sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T", "anonymous", "");
+            await interop.IncludeScript("", Constants.BootstrapScriptUrl, Constants.BootstrapScriptIntegrity, "anonymous", "", "head");
         }
     }
 
     private async Task Install()
     {
         var connectionString = String.Empty;
-        if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
+        if (_showConnectionString)
         {
-            connectionString = databaseConfigControl.GetConnectionString();
-        }
-
-        if (connectionString != "" && _hostUsername != "" && _hostPassword.Length >= 6 && _hostPassword == _confirmPassword && _hostEmail != "" && _hostEmail.Contains("@"))
-        {
-            _loadingDisplay = "";
-            StateHasChanged();
-
-            Uri uri = new Uri(NavigationManager.Uri);
-
-            var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
-
-            var config = new InstallConfig
-            {
-                DatabaseType = database.DBType,
-                ConnectionString = connectionString,
-                Aliases = uri.Authority,
-                HostEmail = _hostEmail,
-                HostPassword = _hostPassword,
-                HostName = UserNames.Host,
-                TenantName = TenantNames.Master,
-                IsNewTenant = true,
-                SiteName = Constants.DefaultSite,
-                Register = _register
-            };
-
-            var installation = await InstallationService.Install(config);
-            if (installation.Success)
-            {
-                NavigationManager.NavigateTo(uri.Scheme + "://" + uri.Authority, true);
-            }
-            else
-            {
-                _message = installation.Message;
-                _loadingDisplay = "display: none;";
-            }
+            connectionString = _connectionString;
         }
         else
         {
-            _message = Localizer["Message.Require.DbInfo"];
+            if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
+            {
+                connectionString = databaseConfigControl.GetConnectionString();
+            }
         }
-    }
 
+        if (connectionString != "" && !string.IsNullOrEmpty(_hostUsername) && !string.IsNullOrEmpty(_hostPassword) && _hostPassword == _confirmPassword && !string.IsNullOrEmpty(_hostEmail) && _hostEmail.Contains("@") && !string.IsNullOrEmpty(_hostName))
+        {
+            var result = await UserService.ValidateUserAsync(_hostUsername, _hostEmail, _hostPassword);
+            if (result.Succeeded)
+            {
+                _loadingDisplay = "";
+                StateHasChanged();
+
+                Uri uri = new Uri(NavigationManager.Uri);
+
+                var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
+
+                var config = new InstallConfig
+                    {
+                        DatabaseType = database.DBType,
+                        ConnectionString = connectionString,
+                        Aliases = uri.Authority,
+                        HostUsername = _hostUsername,
+                        HostPassword = _hostPassword,
+                        HostEmail = _hostEmail,
+                        HostName = _hostName,
+                        TenantName = TenantNames.Master,
+                        IsNewTenant = true,
+                        SiteName = Constants.DefaultSite,
+                        Register = _register,
+                        SiteTemplate = _template,
+                        RenderMode = RenderModes.Static,
+                        Runtime = Runtimes.Server
+                    };
+
+                var installation = await InstallationService.Install(config);
+                if (installation.Success)
+                {
+                    NavigationManager.NavigateTo(uri.Scheme + "://" + uri.Authority, true);
+                }
+                else
+                {
+                    _message = installation.Message;
+                    _loadingDisplay = "display: none;";
+                }
+            }
+            else
+            {
+                _message = string.Join("<br />", result.Errors.Select(i => !string.IsNullOrEmpty(i.Value) ? i.Value : Localizer[i.Key]));
+			}
+		}
+		else
+		{
+			_message = Localizer["Message.Require.DbInfo"];
+		}
+	}
+
+	private void TogglePassword()
+	{
+		if (_passwordType == "password")
+		{
+			_passwordType = "text";
+			_togglePassword = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_passwordType = "password";
+			_togglePassword = SharedLocalizer["ShowPassword"];
+		}
+	}
+
+	private void ToggleConfirmPassword()
+	{
+		if (_confirmPasswordType == "password")
+		{
+			_confirmPasswordType = "text";
+			_toggleConfirmPassword = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_confirmPasswordType = "password";
+			_toggleConfirmPassword = SharedLocalizer["ShowPassword"];
+		}
+	}
+
+	private void ToggleConnectionString()
+	{
+		if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
+		{
+			_connectionString = databaseConfigControl.GetConnectionString();
+		}
+		_showConnectionString = !_showConnectionString;
+	}
+
+    private void DismissModal()
+    {
+        _message = "";
+        StateHasChanged();
+    }
 }

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

@@ -4,29 +4,37 @@
 @inject IUserService UserService
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<div class="row">
-    @foreach (var p in _pages)
-    {
-        if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+@if (_pages != null)
+{
+    <div class="row">
+        @foreach (var p in _pages)
         {
-            string url = NavigateUrl(p.Path);
-            <div class="col-md-2 mx-auto text-center">
-                <NavLink class="nav-link" href="@url" Match="NavLinkMatch.All">
-                    <h2><span class="@p.Icon" aria-hidden="true"></span></h2>@SharedLocalizer[p.Name]
-                </NavLink>
-            </div>
+            if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.PermissionList))
+            {
+                string url = NavigateUrl(p.Path);
+                <div class="col-md-2 mx-auto text-center my-3">
+                    <NavLink class="nav-link text-body" href="@url" Match="NavLinkMatch.All">
+                        <h2><span class="@p.Icon" aria-hidden="true"></span></h2>
+                        <div class="lead">@((MarkupString)SharedLocalizer[p.Name].ToString().Replace(" ", "<br />"))</div>
+                    </NavLink>
+                </div>
+            }
         }
-    }
-</div>
+    </div>
+}
 
 @code {
-    private List<Page> _pages;
+	private List<Page> _pages;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
+    public override string RenderMode => RenderModes.Static;
 
-    protected override void OnInitialized()
-    {
-        var admin = PageState.Pages.FirstOrDefault(item => item.Path == "admin");
-        _pages = PageState.Pages.Where(item => item.ParentId == admin?.PageId).ToList();
+	protected override void OnInitialized()
+	{
+		var admin = PageState.Pages.FirstOrDefault(item => item.Path == "admin");
+		if (admin != null)
+		{
+			_pages = PageState.Pages.Where(item => item.ParentId == admin.PageId).ToList();
+		}
     }
 }

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

@@ -11,8 +11,7 @@
         Module module = await ModuleService.GetModuleAsync(ModuleState.ModuleId);
         if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
         {
-            string message = string.Format(Localizer["Error.Module.Load"], module.ModuleDefinitionName);
-            AddModuleMessage(message, MessageType.Error);
+			AddModuleMessage(string.Format(Localizer["Error.Module.Load"], module.ModuleDefinitionName), MessageType.Error);
         }
 
         await logger.LogCritical("Error Loading Module {Module}", module);

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

@@ -4,60 +4,66 @@
 @inject NavigationManager NavigationManager
 @inject IFileService FileService
 @inject IFolderService FolderService
+@inject ISettingService SettingService
 @inject IStringLocalizer<Add> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <TabStrip>
     <TabPanel Name="Upload" Heading="Upload Files" ResourceKey="UploadFiles">
-        <table class="table table-borderless">
-            <tr>
-                <td>
-                    <Label For="upload" HelpText="Upload the file you want" ResourceKey="Upload">Upload: </Label>
-                </td>
-                <td>
-                    <FileManager UploadMultiple="true" ShowFiles="false" FolderId="@_folderId" />
-                </td>
-            </tr>
-        </table>
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="upload" HelpText="Upload the file you want" ResourceKey="Upload">Upload: </Label>
+                <div class="col-sm-9">
+                    <FileManager UploadMultiple="true" ShowFiles="false" FolderId="@_folderId" ShowSuccess="true" />
+                </div>
+            </div>
+        </div>
         <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
     </TabPanel>
     <TabPanel Name="Download" Heading="Download Files" ResourceKey="DownloadFiles">
         @if (_folders != null)
         {
-            <table class="table table-borderless">
-                <tr>
-                    <td>
-                        <Label For="url" HelpText="Enter the url of the file you wish to download" ResourceKey="Url">Url: </Label>
-                    </td>
-                    <td>
-                        <input id="url" class="form-control" @bind="@url" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="folder" HelpText="Select the folder to save the file in" ResourceKey="Folder">Folder: </Label>
-                    </td>
-                    <td>
-                        <select id="folder" class="form-select" @bind="@_folderId">
-                            <option value="-1">&lt;@Localizer["Folder.Select"]&gt;</option>
-                            @foreach (Folder folder in _folders)
-                            {
-                                <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
-                            }
-                        </select>
-                    </td>
-                </tr>
-            </table>
-            <button type="button" class="btn btn-success" @onclick="Download">@SharedLocalizer["Download"]</button>
-            <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+            <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+                <div class="container">
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="url" HelpText="Enter the url of the file you wish to download" ResourceKey="Url">Url: </Label>
+                        <div class="col-sm-9">
+                            <input id="url" class="form-control" @bind="@_url" required />
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="folder" HelpText="Select the folder to save the file in" ResourceKey="Folder">Folder: </Label>
+                        <div class="col-sm-9">
+                            <select id="folder" class="form-select" @bind="@_folderId" required>
+                                <option value="-1">&lt;@Localizer["Folder.Select"]&gt;</option>
+                                @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 name of the file being downloaded" ResourceKey="Name">Name: </Label>
+                        <div class="col-sm-9">
+                            <input id="name" class="form-control" @bind="@_name" />
+                        </div>
+                    </div>
+                </div>
+                <button type="button" class="btn btn-success" @onclick="Download">@SharedLocalizer["Download"]</button>
+                <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+            </form>
         }
     </TabPanel>
 </TabStrip>
 
 @code {
-    private string url = string.Empty;
+    private ElementReference form;
+    private bool validated = false;
+    private string _url = string.Empty;
     private List<Folder> _folders;
     private int _folderId = -1;
+    private string _name = "";
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
@@ -73,37 +79,49 @@
 
     private async Task Download()
     {
-        if (url == string.Empty || _folderId == -1)
-        {
-            AddModuleMessage(Localizer["Message.Required.UrlFolder"], MessageType.Warning);
-            return;
-        }
+        validated = true;
+        var interop = new Interop(JSRuntime);
 
-        var filename = url.Substring(url.LastIndexOf("/", StringComparison.Ordinal) + 1);
+        if (await interop.FormValid(form))
+        {
+            if (_url == string.Empty || _folderId == -1)
+            {
+                AddModuleMessage(Localizer["Message.Required.UrlFolder"], MessageType.Warning);
+                return;
+            }
 
-        if (!Constants.UploadableFiles.Split(',')
-                .Contains(Path.GetExtension(filename).ToLower().Replace(".", "")))
-        {
-            AddModuleMessage(Localizer["Message.Download.InvalidExtension"], MessageType.Warning);
-            return;
-        }
+            if (string.IsNullOrEmpty(_name))
+            {
+                _name = _url.Substring(_url.LastIndexOf("/", StringComparison.Ordinal) + 1);
+            }
 
-        if (!filename.IsPathOrFileValid())
-        {
-            AddModuleMessage(Localizer["Message.Required.UrlName"], MessageType.Warning);
-            return;
-        }
+            if (!PageState.Site.UploadableFiles.Split(',').Contains(Path.GetExtension(_name).ToLower().Replace(".", "")))
+            {
+                AddModuleMessage(Localizer["Message.Download.InvalidExtension"], MessageType.Warning);
+                return;
+            }
 
-        try
-        {
-            await FileService.UploadFileAsync(url, _folderId);
-            await logger.LogInformation("File Downloaded Successfully From Url {Url}", url);
-            AddModuleMessage(Localizer["Success.Download.File"], MessageType.Success);
+            if (!_name.IsPathOrFileValid())
+            {
+                AddModuleMessage(Localizer["Message.Required.UrlName"], MessageType.Warning);
+                return;
+            }
+
+            try
+            {
+                await FileService.UploadFileAsync(_url, _folderId, _name);
+                await logger.LogInformation("File Downloaded Successfully From Url {Url}", _url);
+                AddModuleMessage(Localizer["Success.Download.File"], MessageType.Success);
+            }
+            catch (Exception ex)
+            {
+                await logger.LogError(ex, "Error Downloading File From Url {Url} {Error}", _url, ex.Message);
+                AddModuleMessage(Localizer["Error.Download.InvalidUrl"], MessageType.Error);
+            }
         }
-        catch (Exception ex)
+        else
         {
-            await logger.LogError(ex, "Error Downloading File From Url {Url} {Error}", url, ex.Message);
-            AddModuleMessage(Localizer["Error.Download.InvalidUrl"], MessageType.Error);
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
-}
+}

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

@@ -8,49 +8,58 @@
 
 @if (_folders != null)
 {
-    <table class="table table-borderless">
-        <tr>
-            <td width="30%">
-                <Label for="name" HelpText="The name of the file" ResourceKey="Name">Name: </Label>
-            </td>
-            <td>
-                <input id="name" class="form-control" @bind="@_name" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="parent" HelpText="The folder where the file is located" ResourceKey="Folder">Folder: </Label>
-            </td>
-            <td>
-                <select id="parent" class="form-select" @bind="@_folderId">
-                    @foreach (Folder folder in _folders)
-                    {
-                        <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
-                    }
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label for="size" HelpText="The size of the file (in bytes)" ResourceKey="Size">Size: </Label>
-            </td>
-            <td>
-                <input id="size" class="form-control" @bind="@_size" readonly />
-            </td>
-        </tr>
-    </table>
-    <button type="button" class="btn btn-success" @onclick="SaveFile">@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 @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="name" HelpText="The name of the file" ResourceKey="Name">Name: </Label>
+                <div class="col-sm-9">
+                    <input id="name" class="form-control" @bind="@_name" maxlength="50" required />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="parent" HelpText="The folder where the file is located" ResourceKey="Folder">Folder: </Label>
+                <div class="col-sm-9">
+                    <select id="parent" class="form-select" @bind="@_folderId" 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="description" HelpText="A description of the file. This can be used as a caption for image files." ResourceKey="Description">Description: </Label>
+                <div class="col-sm-9">
+                    <input id="description" class="form-control" @bind="@_description" />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="size" HelpText="The size of the file (in bytes)" ResourceKey="Size">Size: </Label>
+                <div class="col-sm-9">
+                    <input id="size" class="form-control" @bind="@_size" readonly />
+                </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>
+        @if (_name.ToLower().EndsWith(".zip"))
+        {
+            <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>
 }
 
 @code {
+    private ElementReference form;
+    private bool validated = false;
     private int _fileId = -1;
     private string _name;
     private List<Folder> _folders;
     private int _folderId = -1;
+    private string _description = string.Empty;
     private int _size;
     private string _createdBy;
     private DateTime _createdOn;
@@ -72,6 +81,7 @@
             {
                 _name = file.Name;
                 _folderId = file.FolderId;
+                _description = file.Description;
                 _size = file.Size;
                 _createdBy = file.CreatedBy;
                 _createdOn = file.CreatedOn;
@@ -87,27 +97,51 @@
     }
 
     private async Task SaveFile()
+    {
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
+        {
+            try
+            {
+                if (_name.IsPathOrFileValid())
+                {
+                    File file = await FileService.GetFileAsync(_fileId);
+                    file.Name = _name;
+                    file.FolderId = _folderId;
+                    file.Description = _description;
+                    file = await FileService.UpdateFileAsync(file);
+                    await logger.LogInformation("File Saved {File}", file);
+                    NavigationManager.NavigateTo(NavigateUrl());
+                }
+                else
+                {
+                    AddModuleMessage(Localizer["Message.File.InvalidName"], MessageType.Warning);
+                }
+            }
+            catch (Exception ex)
+            {
+                await logger.LogError(ex, "Error Saving File {FileId} {Error}", _fileId, ex.Message);
+                AddModuleMessage(Localizer["Error.File.Save"], MessageType.Error);
+            }
+        }
+        else
+        {
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+        }
+    }
+
+    private async Task UnzipFile()
     {
         try
         {
-            if (_name.IsPathOrFileValid())
-            {
-                File file = await FileService.GetFileAsync(_fileId);
-                file.Name = _name;
-                file.FolderId = _folderId;
-                file = await FileService.UpdateFileAsync(file);
-                await logger.LogInformation("File Saved {File}", file);
-                NavigationManager.NavigateTo(NavigateUrl());
-            }
-            else
-            {
-                AddModuleMessage(Localizer["Message.File.InvalidName"], MessageType.Warning);
-            }
+            await FileService.UnzipFileAsync(_fileId);
+            NavigationManager.NavigateTo(NavigateUrl());
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Saving File {FileId} {Error}", _fileId, ex.Message);
-            AddModuleMessage(Localizer["Error.File.Save"], MessageType.Error);
+            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,57 +8,95 @@
 
 @if (_folders != null)
 {
-    <table class="table table-borderless">
-        <tr>
-            <td width="30%">
-                <Label For="parent" HelpText="Select the parent folder" ResourceKey="Parent">Parent: </Label>
-            </td>
-            <td>
-                <select id="parent" class="form-select" @bind="@_parentId">
-                    @if (PageState.QueryString.ContainsKey("id"))
-                    {
-                        <option value="-1">&lt;@Localizer["NoParent"]&gt;</option>
-                    }
-                    @foreach (Folder folder in _folders)
-                    {
-                        <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
-                    }
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label for="name" HelpText="Enter the folder name" ResourceKey="Name">Name: </Label>
-            </td>
-            <td>
-                <input id="name" class="form-control" @bind="@_name" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label for="type" HelpText="Select the folder type. Private folders are only accessible by authorized users. Public folders can be accessed by all users" ResourceKey="Name">Type: </Label>
-            </td>
-            <td>
+    <TabStrip>
+        <TabPanel Name="Settings" ResourceKey="Settings" Heading="Settings">
+            <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="parent" HelpText="Select the parent folder" ResourceKey="Parent">Parent: </Label>
+                        <div class="col-sm-9">
+                            @if (_parentId == -1)
+                            {
+                                <select id="parent" class="form-select" @bind="@_parentId" required>
+                                    <option value="-1">&lt;@Localizer["NoParent"]&gt;</option>
+                                </select>
+                            }
+                            else
+                            {
+                                <select id="parent" class="form-select" @bind="@_parentId" required>
+                                @foreach (Folder folder in _folders)
+                                {
+                                    <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
+                                }
+                                </select>
+                            }
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="name" HelpText="Enter the folder name" ResourceKey="Name">Name: </Label>
+                        <div class="col-sm-9">
+                            @if (_isSystem)
+                            {
+                                <input id="name" class="form-control" @bind="@_name" readonly />
+                            }
+                            else
+                            {
+                                <input id="name" class="form-control" @bind="@_name" maxlength="256" required />
+                            }
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <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>
                 @if (PageState.QueryString.ContainsKey("id"))
                 {
-                    <input id="type" class="form-control" readonly @bind="@_type" />
+                    <br />
+                    <AuditInfo CreatedBy="@_createdBy" CreatedOn="@_createdOn" ModifiedBy="@_modifiedBy" ModifiedOn="@_modifiedOn"></AuditInfo>
                 }
-                else
-                {
-                    <select id="type" class="form-select" @bind="@_type">
-                        <option value="@FolderTypes.Private">@Localizer[FolderTypes.Private]</option>
-                        <option value="@FolderTypes.Public">@Localizer[FolderTypes.Public]</option>
-                    </select>
-                }
-            </td>
-        </tr>
-        <tr>
-            <td colspan="2" align="center">
-                <Label 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)" Permissions="@_permissions" @ref="_permissionGrid" />
-            </td>
-        </tr>
-    </table>
+            </form>
+        </TabPanel>
+        <TabPanel Name="Permissions" ResourceKey="Permissions" Heading="Permissions">
+            <div class="container">
+                <div class="row mb-1 align-items-center">
+                    <PermissionGrid EntityName="@EntityNames.Folder" PermissionNames="@(PermissionNames.Browse + "," + PermissionNames.View + "," + PermissionNames.Edit)" PermissionList="@_permissions" @ref="_permissionGrid" />
+                </div>
+            </div>
+        </TabPanel>
+    </TabStrip>
+
+    <br />
     @if (!_isSystem)
     {
         <button type="button" class="btn btn-success" @onclick="SaveFolder">@SharedLocalizer["Save"]</button>
@@ -70,22 +108,21 @@
         @((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 {
+    private ElementReference form;
+    private bool validated = false;
     private List<Folder> _folders;
     private int _folderId = -1;
     private int _parentId = -1;
     private string _name;
     private string _type = FolderTypes.Private;
+    private string _capacity = "0";
+    private string _cachecontrol = string.Empty;
+    private string _imagesizes = string.Empty;
     private bool _isSystem;
-    private string _permissions = string.Empty;
+    private List<Permission> _permissions = null;
     private string _createdBy;
     private DateTime _createdOn;
     private string _modifiedBy;
@@ -97,7 +134,7 @@
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
-    public override string Title => "Folder Management";
+    public override string Title => "Folder Management"; 
 
     protected override async Task OnInitializedAsync()
     {
@@ -114,8 +151,11 @@
                     _parentId = folder.ParentId ?? -1;
                     _name = folder.Name;
                     _type = folder.Type;
+                    _capacity = folder.Capacity.ToString();
+                    _cachecontrol = folder.CacheControl;
+                    _imagesizes = folder.ImageSizes;
                     _isSystem = folder.IsSystem;
-                    _permissions = folder.Permissions;
+                    _permissions = folder.PermissionList;
                     _createdBy = folder.CreatedBy;
                     _createdOn = folder.CreatedOn;
                     _modifiedBy = folder.ModifiedBy;
@@ -125,7 +165,6 @@
             else
             {
                 _parentId = _folders[0].FolderId;
-                _permissions = string.Empty;
             }
         }
         catch (Exception ex)
@@ -137,70 +176,88 @@
 
     private async Task SaveFolder()
     {
-        if (_name == string.Empty || _parentId == -1)
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
         {
-            AddModuleMessage(Localizer["Message.Required.FolderParent"], MessageType.Warning);
-            return;
-        }
-
-        if (!_name.IsPathOrFileValid())
-        {
-            AddModuleMessage(Localizer["Message.Folder.InvalidName"], MessageType.Warning);
-            return;
-        }
-
-        try
-        {
-            Folder folder;
-            if (_folderId != -1)
+            if (_name == string.Empty || _parentId == -1)
             {
-                folder = await FolderService.GetFolderAsync(_folderId);
-            }
-            else
-            {
-                folder = new Folder();
+                AddModuleMessage(Localizer["Message.Required.FolderParent"], MessageType.Warning);
+                return;
             }
 
-            folder.SiteId = PageState.Site.SiteId;
-
-            if (_parentId == -1)
+            if (!_name.IsPathOrFileValid())
             {
-                folder.ParentId = null;
-            }
-            else
-            {
-                folder.ParentId = _parentId;
+                AddModuleMessage(Localizer["Message.Folder.InvalidName"], MessageType.Warning);
+                return;
             }
 
-            folder.Name = _name;
-            folder.Type = _type;
-            folder.IsSystem = _isSystem;
-            folder.Permissions = _permissionGrid.GetPermissions();
+            try
+            {
+                Folder folder;
 
-            if (_folderId != -1)
-            {
-                folder = await FolderService.UpdateFolderAsync(folder);
-            }
-            else
-            {
-                folder = await FolderService.AddFolderAsync(folder);
-            }
+                if (_folderId != -1)
+                {
+                    folder = await FolderService.GetFolderAsync(_folderId);
+                }
+                else
+                {
+                    folder = new Folder();
+                }
 
-            if (folder != null)
-            {
-                await FolderService.UpdateFolderOrderAsync(folder.SiteId, folder.FolderId, folder.ParentId);
-                await logger.LogInformation("Folder Saved {Folder}", folder);
-                NavigationManager.NavigateTo(NavigateUrl());
+                if (_parentId == -1)
+                {
+                    folder.ParentId = null;
+                }
+                else
+                {
+                    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.Capacity = int.Parse(_capacity);
+                folder.CacheControl = _cachecontrol;
+                folder.ImageSizes = _imagesizes;
+                folder.IsSystem = _isSystem;
+                folder.PermissionList = _permissionGrid.GetPermissionList();
+
+                if (_folderId != -1)
+                {
+                    folder = await FolderService.UpdateFolderAsync(folder);
+                }
+                else
+                {
+                    folder = await FolderService.AddFolderAsync(folder);
+                }
+
+                if (folder != null)
+                {
+                    await logger.LogInformation("Folder Saved {Folder}", folder);
+                    NavigationManager.NavigateTo(NavigateUrl());
+                }
+                else
+                {
+                    AddModuleMessage(Localizer["Error.Folder.Save"], MessageType.Error);
+                }
             }
-            else
+            catch (Exception ex)
             {
+                await logger.LogError(ex, "Error Saving Folder {FolderId} {Error}", _folderId, ex.Message);
                 AddModuleMessage(Localizer["Error.Folder.Save"], MessageType.Error);
             }
         }
-        catch (Exception ex)
+        else
         {
-            await logger.LogError(ex, "Error Saving Folder {FolderId} {Error}", _folderId, ex.Message);
-            AddModuleMessage(Localizer["Error.Folder.Save"], MessageType.Error);
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
 
@@ -219,17 +276,9 @@
             }
             if (!isparent)
             {
-                var files = await FileService.GetFilesAsync(_folderId);
-                if (files.Count == 0)
-                {
-                    await FolderService.DeleteFolderAsync(_folderId);
-                    await logger.LogInformation("Folder Deleted {Folder}", _folderId);
-                    NavigationManager.NavigateTo(NavigateUrl());
-                }
-                else
-                {
-                    AddModuleMessage(Localizer["Message.Folder.Files.InvalidDelete"], MessageType.Warning);
-                }
+                await FolderService.DeleteFolderAsync(_folderId);
+                await logger.LogInformation("Folder Deleted {Folder}", _folderId);
+                NavigationManager.NavigateTo(NavigateUrl());
             }
             else
             {
@@ -242,4 +291,4 @@
             AddModuleMessage(Localizer["Error.Folder.Delete"], MessageType.Error);
         }
     }
-}
+}

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

@@ -3,53 +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)
 {
-    <table class="table table-borderless">
-        <tr>
-            <td>
-                <label class="control-label">@Localizer["Folder"] </label>
-            </td>
-            <td>
-                <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>
-            </td>
-            <td>
-                <ActionLink Action="Edit" Text="Edit Folder" Class="btn btn-secondary" Parameters="@($"id=" + _folderId.ToString())" ResourceKey="EditFolder" />&nbsp;
-                <ActionLink Action="Edit" Text="Add Folder" Class="btn btn-secondary" ResourceKey="AddFolder" />&nbsp;
-                <ActionLink Action="Add" Text="Upload Files" Parameters="@($"id=" + _folderId.ToString())" ResourceKey="UploadFiles" />
-            </td>
-        </tr>
-    </table>
-    <Pager Items="@_files">
-        <Header>
-            <th style="width: 1px;">&nbsp;</th>
-            <th style="width: 1px;">&nbsp;</th>
-            <th>@SharedLocalizer["Name"]</th>
-            <th>@Localizer["Modified"]</th>
-            <th>@Localizer["Type"]</th>
-            <th>@Localizer["Size"]</th>
-        </Header>
-        <Row>
-            <td><ActionLink Action="Details" Text="Edit" Parameters="@($"id=" + context.FileId.ToString())" ResourceKey="Details" /></td>
-            <td><ActionDialog Header="Delete File" Message="@string.Format(Localizer["Confirm.File.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteFile(context))" ResourceKey="DeleteFile" /></td>
-            <td><a href="@context.Url" target="_new">@context.Name</a></td>
-            <td>@context.ModifiedOn</td>
-            <td>@context.Extension.ToUpper() @SharedLocalizer["File"]</td>
-            <td>@string.Format("{0:0.00}", ((decimal)context.Size / 1000)) KB</td>
-        </Row>
-    </Pager>
-    @if (_files.Count == 0)
-    {
-        <div class="text-center">@Localizer["NoFiles"]</div>
-    }
+    <p>
+        <em>@SharedLocalizer["Loading"]</em>
+    </p>
+}
+else
+{
+    <TabStrip>
+        <TabPanel Name="Files" Heading="Files" ResourceKey="Files">
+            <div class="row">
+                <div class="col-md mb-1">
+                    <ActionLink Action="Edit" Text="Add Folder" Class="btn btn-secondary" ResourceKey="AddFolder" />
+                </div>
+                <div class="col-md-8 mb-1">
+                    <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>
+
+            @if (_files.Count != 0)
+            {
+                <Pager Items="@_files" SearchProperties="Name">
+                    <Header>
+                        <th style="width: 1px;">&nbsp;</th>
+                        <th style="width: 1px;">&nbsp;</th>
+                        <th>@SharedLocalizer["Name"]</th>
+                        <th>@Localizer["Modified"]</th>
+                        <th>@Localizer["Type"]</th>
+                        <th>@Localizer["Size"]</th>
+                    </Header>
+                    <Row>
+                        <td><ActionLink Action="Details" Text="Edit" Parameters="@($"id=" + context.FileId.ToString())" ResourceKey="Details" /></td>
+                        <td><ActionDialog Header="Delete File" Message="@string.Format(Localizer["Confirm.File.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteFile(context))" ResourceKey="DeleteFile" /></td>
+                        <td><a href="@context.Url" target="_new">@context.Name</a></td>
+                        <td>@UtcToLocal(context.ModifiedOn)</td>
+                        <td>@context.Extension.ToUpper() @SharedLocalizer["File"]</td>
+                        <td>@string.Format("{0:0.00}", ((decimal)context.Size / 1000)) KB</td>
+                    </Row>
+                </Pager>
+            }
+            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 {
@@ -57,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()
@@ -70,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)
         {
@@ -114,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

@@ -5,191 +5,198 @@
 @inject IStringLocalizer<Edit> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<table class="table table-borderless">
-    <tr>
-        <td width="30%">
-            <Label For="name" HelpText="Enter the job name" ResourceKey="Name">Name: </Label>
-        </td>
-        <td>
-            <input id="name" class="form-control" @bind="@_name" />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="type" HelpText="The fully qualified job type name" ResourceKey="Type">Type: </Label>
-        </td>
-        <td>
-            <input id="type" class="form-control" @bind="@_jobType" readonly />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="enabled" HelpText="Select whether you want the job enabled or not" ResourceKey="Enabled">Enabled? </Label>
-        </td>
-        <td>
-            <select id="enabled" class="form-select" @bind="@_isEnabled">
-                <option value="True">@SharedLocalizer["Yes"]</option>
-                <option value="False">@SharedLocalizer["No"]</option>
-            </select>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="runs-every" HelpText="Select how often you want the job to run" ResourceKey="RunsEvery">Runs Every: </Label>
-        </td>
-        <td>
-            <input id="runs-every" class="form-control" @bind="@_interval" />
-            <select id="runs-every" class="form-select" @bind="@_frequency">
-                <option value="m">@Localizer["Minute(s)"]</option>
-                <option value="H">@Localizer["Hour(s)"]</option>
-                <option value="d">@Localizer["Day(s)"]</option>
-                <option value="M">@Localizer["Month(s)"]</option>
-            </select>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="starting" HelpText="What time do you want the job to start" ResourceKey="Starting">Starting: </Label>
-        </td>
-        <td>
-            <input id="starting" class="form-control" @bind="@_startDate" />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="ending" HelpText="When do you want the job to end" ResourceKey="Ending">Ending: </Label>
-        </td>
-        <td>
-            <input id="ending" class="form-control" @bind="@_endDate" />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="retention" HelpText="Number of log entries to retain for this job" ResourceKey="RetentionLog">Retention Log (Items): </Label>
-        </td>
-        <td>
-            <input id="retention" class="form-control" @bind="@_retentionHistory" />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="next" HelpText="Next execution for this job." ResourceKey="NextExecution">Next Execution: </Label>
-        </td>
-        <td>
-            <input id="next" class="form-control" @bind="@_nextExecution" />
-        </td>
-    </tr>
-</table>
-<button type="button" class="btn btn-success" @onclick="SaveJob">@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 @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 the job name" ResourceKey="Name">Name: </Label>
+            <div class="col-sm-9">
+                <input id="name" class="form-control" @bind="@_name" maxlength="200" required />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="type" HelpText="The fully qualified job type name" ResourceKey="Type">Type: </Label>
+            <div class="col-sm-9">
+                <input id="type" class="form-control" @bind="@_jobType" readonly />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="enabled" HelpText="Select whether you want the job enabled or not" ResourceKey="Enabled">Enabled? </Label>
+            <div class="col-sm-9">
+                <select id="enabled" class="form-select" @bind="@_isEnabled" 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="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 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>
+                    <option value="d">@Localizer["Day(s)"]</option>
+                    <option value="w">@Localizer["Week(s)"]</option>
+                    <option value="M">@Localizer["Month(s)"]</option>
+                    <option value="O">@Localizer["Once"]</option>
+                </select>
+            </div>
+        </div>
+        <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="3" required />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="starting" HelpText="Optionally enter the date and time when this job should start executing" ResourceKey="Starting">Starting: </Label>
+            <div class="col-sm-9">
+                <div class="row">
+                    <div class="col">
+                        <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" />
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="ending" HelpText="Optionally enter the date and time when this job should stop executing" ResourceKey="Ending">Ending: </Label>
+            <div class="col-sm-9">
+                <div class="row">
+                    <div class="col">
+                        <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" />
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="next" HelpText="Optionally modify the date and time when this job should execute next" ResourceKey="NextExecution">Next Execution: </Label>
+            <div class="col-sm-9">
+                <div class="row">
+                    <div class="col">
+                        <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" />
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <br />
+    <button type="button" class="btn btn-success" @onclick="SaveJob">@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 {
+    private ElementReference form;
+    private bool validated = false;
     private int _jobId;
     private string _name = string.Empty;
     private string _jobType = string.Empty;
     private string _isEnabled = "True";
     private string _interval = string.Empty;
     private string _frequency = string.Empty;
-    private string _startDate = string.Empty;
-    private string _endDate = string.Empty;
+    private DateTime? _startDate = null;
+    private DateTime? _startTime = null;
+    private DateTime? _endDate = null;
+    private DateTime? _endTime = null;
     private string _retentionHistory = string.Empty;
-    private string _nextExecution = string.Empty;
+    private DateTime? _nextDate = null;
+    private DateTime? _nextTime = null;
     private string createdby;
-    private DateTime createdon;
-    private string modifiedby;
-    private DateTime modifiedon;
+	private DateTime createdon;
+	private string modifiedby;
+	private DateTime modifiedon;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            _jobId = Int32.Parse(PageState.QueryString["id"]);
-            Job job = await JobService.GetJobAsync(_jobId);
-            if (job != null)
-            {
-                _name = job.Name;
-                _jobType = job.JobType;
-                _isEnabled = job.IsEnabled.ToString();
-                _interval = job.Interval.ToString();
-                _frequency = job.Frequency;
-                _startDate = (job.StartDate != null) ? job.StartDate.ToString() : string.Empty;
-                _endDate = (job.EndDate != null) ? job.EndDate.ToString() : string.Empty;
+	protected override async Task OnInitializedAsync()
+	{
+		try
+		{
+			_jobId = Int32.Parse(PageState.QueryString["id"]);
+			Job job = await JobService.GetJobAsync(_jobId);
+			if (job != null)
+			{
+				_name = job.Name;
+				_jobType = job.JobType;
+				_isEnabled = job.IsEnabled.ToString();
+				_interval = job.Interval.ToString();
+				_frequency = job.Frequency;
+				_startDate = UtcToLocal(job.StartDate);
+                _startTime = UtcToLocal(job.StartDate);
+                _endDate = UtcToLocal(job.EndDate);
+                _endTime = UtcToLocal(job.EndDate);
                 _retentionHistory = job.RetentionHistory.ToString();
-                _nextExecution = job.NextExecution.ToString();
+                _nextDate = UtcToLocal(job.NextExecution);
+                _nextTime = UtcToLocal(job.NextExecution);
                 createdby = job.CreatedBy;
-                createdon = job.CreatedOn;
-                modifiedby = job.ModifiedBy;
-                modifiedon = job.ModifiedOn;
-            }
-        }
-        catch (Exception ex)
+				createdon = job.CreatedOn;
+				modifiedby = job.ModifiedBy;
+				modifiedon = job.ModifiedOn;
+			}
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Job {JobId} {Error}", _jobId, ex.Message);
+			AddModuleMessage(Localizer["Error.Job.Load"], MessageType.Error);
+		}
+	}
+
+	private async Task SaveJob()
+	{
+        if (!Utilities.ValidateEffectiveExpiryDates(_startDate, _endDate))
         {
-            await logger.LogError(ex, "Error Loading Job {JobId} {Error}", _jobId, ex.Message);
-            AddModuleMessage(Localizer["Error.Job.Load"], MessageType.Error);
+            AddModuleMessage(Localizer["Message.StartEndDateError"], MessageType.Warning);
+            return;
         }
-    }
+		validated = true;
+		var interop = new Interop(JSRuntime);
+		if (await interop.FormValid(form))
+		{
+			var job = await JobService.GetJobAsync(_jobId);
+			job.Name = _name;
+			job.JobType = _jobType;
+			job.IsEnabled = Boolean.Parse(_isEnabled);
+			job.Frequency = _frequency;
+			if (job.Frequency == "O") // once
+			{
+				job.Interval = 1;
+			}
+			else
+			{
+				job.Interval = int.Parse(_interval);
+			}
+            job.StartDate = LocalToUtc(_startDate.Value.Date.Add(_startTime.Value.TimeOfDay));
+            job.EndDate = LocalToUtc(_endDate.Value.Date.Add(_endTime.Value.TimeOfDay));
+			job.RetentionHistory = int.Parse(_retentionHistory);
+            job.NextExecution = LocalToUtc(_nextDate.Value.Date.Add(_nextTime.Value.TimeOfDay));
 
-    private async Task SaveJob()
-    {
-        if (_name != string.Empty && !string.IsNullOrEmpty(_jobType) && _frequency != string.Empty && _interval != string.Empty && _retentionHistory != string.Empty)
-        {
-            var job = await JobService.GetJobAsync(_jobId);
-            job.Name = _name;
-            job.JobType = _jobType;
-            job.IsEnabled = Boolean.Parse(_isEnabled);
-            job.Frequency = _frequency;
-            job.Interval = int.Parse(_interval);
-
-            if (_startDate == string.Empty)
-            {
-                job.StartDate = null;
-            }
-            else
-            {
-                job.StartDate = DateTime.Parse(_startDate);
-            }
-
-            if (_endDate == string.Empty)
-            {
-                job.EndDate = null;
-            }
-            else
-            {
-                job.EndDate = DateTime.Parse(_endDate);
-            }
-
-            if (_nextExecution == string.Empty)
-            {
-                job.NextExecution = null;
-            }
-            else
-            {
-                job.NextExecution = DateTime.Parse(_nextExecution);
-            }
-
-            job.RetentionHistory = int.Parse(_retentionHistory);
-
-            try
-            {
-                job = await JobService.UpdateJobAsync(job);
-                await logger.LogInformation("Job Updated {Job}", job);
-                NavigationManager.NavigateTo(NavigateUrl());
-            }
-            catch (Exception ex)
-            {
-                await logger.LogError(ex, "Error Udate Job {Job} {Error}", job, ex.Message);
-                AddModuleMessage(Localizer["Error.Job.Update"], MessageType.Error);
-            }
-        }
-        else
-        {
-            AddModuleMessage(Localizer["Message.Required.JobInfo"], MessageType.Warning);
-        }
-    }
+			try
+			{
+				job = await JobService.UpdateJobAsync(job);
+				await logger.LogInformation("Job Updated {Job}", job);
+				NavigationManager.NavigateTo(NavigateUrl());
+			}
+			catch (Exception ex)
+			{
+				await logger.LogError(ex, "Error Udate Job {Job} {Error}", job, ex.Message);
+				AddModuleMessage(Localizer["Error.Job.Update"], MessageType.Error);
+			}
+		}
+		else
+		{
+			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="(async () => await Refresh())">Refresh</button>
-    <br />
+    <button type="button" class="btn btn-secondary" @onclick="Refresh">@Localizer["Refresh.Text"]</button>
     <br />
 
-    <Pager Items="@_jobs">
+    <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,25 +24,27 @@ else
             <th style="width: 1px;">&nbsp;</th>
         </Header>
         <Row>
-            <td><ActionLink Action="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" Class="btn btn-secondary" Parameters="@($"id=" + context.JobId.ToString())" ResourceKey="JobLog" /></td>
+            <td><ActionLink Action="Edit" Text="Edit"  Parameters="@($"id=" + context.JobId.ToString())" ResourceKey="EditJob" /></td>
+            <td><ActionLink Action="Log" Text="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</td>
+            <td>@UtcToLocal(context.NextExecution)</td>
             <td>
                 @if (context.IsStarted)
-                    {
+                {
                     <button type="button" class="btn btn-danger" @onclick="(async () => await StopJob(context.JobId))">@Localizer["Stop"]</button>
-                    }
-                    else
-                    {
+                }
+                else
+                {
                     <button type="button" class="btn btn-success" @onclick="(async () => await StartJob(context.JobId))">@Localizer["Start"]</button>
-                    }
+                }
             </td>
         </Row>
     </Pager>
+
+    <br />
+    <ActionLink Action="Log" Class="btn btn-secondary" Text="View All Logs" ResourceKey="ViewLogs" />
 }
 
 @code {
@@ -53,89 +52,104 @@ else
 
     public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
 
-    protected override async Task OnParametersSetAsync()
+    protected override async Task OnInitializedAsync()
+    {
+        await GetJobs();
+    }
+
+    private async Task GetJobs()
     {
         _jobs = await JobService.GetJobsAsync();
     }
 
-    private string DisplayStatus(bool isEnabled, bool isExecuting)
-    {
-        var status = string.Empty;
-        if (!isEnabled)
-        {
-            status = Localizer["Disabled"];
-        }
-        else
-        {
-            if (isExecuting)
-            {
-                status = Localizer["Executing"];
-            }
-            else
-            {
-                status = Localizer["Idle"];
-            }
-        }
+	private string DisplayStatus(bool isEnabled, bool isExecuting)
+	{
+		var status = string.Empty;
+		if (!isEnabled)
+		{
+			status = Localizer["Disabled"];
+		}
+		else
+		{
+			if (isExecuting)
+			{
+				status = Localizer["Executing"];
+			}
+			else
+			{
+				status = Localizer["Idle"];
+			}
+		}
 
-        return status;
-    }
+		return status;
+	}
 
 
-    private string DisplayFrequency(int interval, string frequency)
-    {
-        var result = $"{Localizer["Every"]} {interval.ToString()} ";
-        switch (frequency)
-        {
-            case "m":
-                result += Localizer["Minute"];
-                break;
-            case "H":
-                result += Localizer["Hour"];
-                break;
-            case "d":
-                result += Localizer["Day"];
-                break;
-            case "M":
-                result += Localizer["Month"];
-                break;
-        }
-
-        if (interval > 1)
-        {
-            result += Localizer["s"];
-        }
-
+	private string DisplayFrequency(int interval, string frequency)
+	{
+		var result = "";
+		switch (frequency)
+		{
+			case "m":
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Minute"];
+				break;
+			case "H":
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Hour"];
+				break;
+			case "d":
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Day"];
+				break;
+			case "w":
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Week"];
+				break;
+			case "M":
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Month"];
+				break;
+			case "O":
+				result = Localizer["Once"];
+				break;
+		}
         return result;
     }
 
-    private async Task DeleteJob(Job job)
-    {
-        try
-        {
-            await JobService.DeleteJobAsync(job.JobId);
-            await logger.LogInformation("Job Deleted {Job}", job);
-            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)
     {
-        await JobService.StartJobAsync(jobId);
+        try
+        {
+			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)
+        {
+            await logger.LogError(ex, "Error Starting Job {JobId} {Error}", jobId, ex.Message);
+            AddModuleMessage(Localizer["Error.Job.Start"], MessageType.Error);
+        }
     }
 
     private async Task StopJob(int jobId)
     {
-        await JobService.StopJobAsync(jobId);
+        try
+        {
+			await JobService.StopJobAsync(jobId);
+            await logger.LogInformation("Job Stopped {JobId}", jobId);
+            AddModuleMessage(Localizer["Message.Job.Stop"], MessageType.Success);
+			_jobs = await JobService.GetJobsAsync();
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Stopping Job {JobId} {Error}", jobId, ex.Message);
+            AddModuleMessage(Localizer["Error.Job.Stop"], MessageType.Error);
+        }
     }
 
     private async Task Refresh()
     {
-        _jobs = await JobService.GetJobsAsync();
-        StateHasChanged();
+        ShowProgressIndicator();
+        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>@context.FinishDate</td>
+            <td>@UtcToLocal(context.StartDate)</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 = _jobLogs.OrderByDescending(item => item.JobLogId).ToList();
+        _jobLogs = await JobLogService.GetJobLogsAsync(jobId);
     }
 
     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
@@ -9,229 +8,119 @@
 @inject IStringLocalizer<Add> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (_supportedCultures == null)
+@if (_cultures == null)
 {
     <p><em>@SharedLocalizer["Loading"]</em></p>
 }
 else
 {
     <TabStrip>
-        <TabPanel Name="Manage" ResourceKey="Manage">
-            @if (_availableCultures.Count() == 0)
-            {
-                <ModuleMessage Type="MessageType.Info" Message="@_message"></ModuleMessage>
-            }
-            else
-            {
-                <table class="table table-borderless">
-                    <tr>
-                        <td width="30%">
-                            <Label For="name" HelpText="Name Of The Language" ResourceKey="Name">Name:</Label>
-                        </td>
-                        <td>
-                            <select id="_code" class="form-select" @bind="@_code">
-                                @foreach (var culture in _availableCultures)
+        <TabPanel Name="Manage" ResourceKey="Manage" Heading="Manage">
+            <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="Name Of The Language" ResourceKey="Name">Name:</Label>
+                        <div class="col-sm-9">
+                            <select id="_code" class="form-select" @bind="@_code" required>
+								<option value="-">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
+								@foreach (var culture in _cultures)
                                 {
-                                    <option value="@culture.Name">@culture.DisplayName</option>
+                                    <option value="@culture.Name">@(culture.DisplayName + " (" + culture.Name + ")")</option>
                                 }
                             </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <Label For="default" HelpText="Indicates Whether Or Not This Language Is The Default For The Site" ResourceKey="IsDefault">Default?</Label>
-                        </td>
-                        <td>
-                            <select id="default" class="form-select" @bind="@_isDefault">
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="default" HelpText="Indicates Whether Or Not This Language Is The Default For The Site" ResourceKey="IsDefault">Default?</Label>
+                        <div class="col-sm-9">
+                            <select id="default" class="form-select" @bind="@_default" required>
                                 <option value="True">@SharedLocalizer["Yes"]</option>
                                 <option value="False">@SharedLocalizer["No"]</option>
                             </select>
-                        </td>
-                    </tr>
-                </table>
-                <button type="button" class="btn btn-success" @onclick="SaveLanguage">@SharedLocalizer["Save"]</button>
-            }
-            <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
-        </TabPanel>
-        <TabPanel Name="Download" ResourceKey="Download" Security="SecurityAccessLevel.Host">
-            <ModuleMessage Type="MessageType.Info" Message="Download one or more translations from the list below. Once you are ready click Install to complete the installation."></ModuleMessage>
-
-            <table class="table table-borderless" style=" margin: auto; width: 50% !important;">
-                <tr>
-                    <td>
-                        <input id="search" class="form-control" placeholder="@SharedLocalizer["Search.Hint"]" @bind="@_search" />
-                    </td>
-                    <td>
-                        <button type="button" class="btn btn-primary" @onclick="Search">@SharedLocalizer["Search"]</button>&nbsp;
-                        <button type="button" class="btn btn-secondary" @onclick="Reset">@SharedLocalizer["Reset"]</button>
-                    </td>
-                </tr>
-            </table>
-
-            @if (_packages != null)
-            {
-                @if (_packages.Count > 0)
-                {
-                    <Pager Items="@_packages">
-                        <Row>
-                            <td>
-                                <h3 style="display: inline;"><a href="@context.ProductUrl" target="_new">@context.Name</a></h3>&nbsp;&nbsp;by:&nbsp;&nbsp;<strong><a href="@context.OwnerUrl" target="new">@context.Owner</a></strong><br />
-                                @(context.Description.Length > 400 ? (context.Description.Substring(0, 400) + "...") : context.Description)<br />
-                                <strong>@(String.Format("{0:n0}", context.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp; @SharedLocalizer["Search.Released"]: <strong>@context.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;@SharedLocalizer["Search.Version"]: <strong>@context.Version</strong>&nbsp;&nbsp;|&nbsp;&nbsp;@SharedLocalizer["Search.Source"]: <strong>@context.PackageUrl</strong>
-                            </td>
-                            <td style="vertical-align: middle;">
-                                <button type="button" class="btn btn-primary" @onclick=@(async () => await DownloadLanguage(context.PackageId, context.Version))>@SharedLocalizer["Download"]</button>
-                            </td>
-                        </Row>
-                    </Pager>
-                }
-                else
-                {
-                    <br />
-                    <div class="mx-auto text-center">
-                        @Localizer["Search.NoResults"]
+                        </div>
                     </div>
-                }
-                <button type="button" class="btn btn-success" @onclick="InstallLanguages">@SharedLocalizer["Install"]</button>
-                <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
-            }
+                </div>
+                <button type="button" class="btn btn-success" @onclick="SaveLanguage">@SharedLocalizer["Save"]</button>
+				<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+            </form>
         </TabPanel>
-        <TabPanel Name="Upload" ResourceKey="Upload" Security="SecurityAccessLevel.Host">
-            <table class="table table-borderless">
-                <tr>
-                    <td>
-                        <Label HelpText="Upload one or more translations. Once they are uploaded click Install to complete the installation." ResourceKey="Module">Language: </Label>
-                    </td>
-                    <td>
-                        <FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" UploadMultiple="true" />
-                    </td>
-                </tr>
-            </table>
-            <button type="button" class="btn btn-success" @onclick="InstallLanguages">@SharedLocalizer["Install"]</button>
+        <TabPanel Name="Upload" ResourceKey="Upload" Security="SecurityAccessLevel.Host" Heading="Upload">
+            <div class="container">
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" HelpText="Upload one or more translations. Once they are uploaded click Install." ResourceKey="LanguageUpload">Translation: </Label>
+                    <div class="col-sm-9">
+                        <FileManager Folder="@Constants.PackagesFolder" UploadMultiple="true" OnUpload="OnUpload" />
+                    </div>
+                </div>
+            </div>
             <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
         </TabPanel>
     </TabStrip>
 }
 
 @code {
-    private string _code = string.Empty;
-    private string _isDefault = "False";
-    private string _message;
-    private IEnumerable<Culture> _supportedCultures;
-    private IEnumerable<Culture> _availableCultures;
-    private List<Package> _packages;
-    private string _search = "";
+	private ElementReference form;
+	private bool validated = false;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+	private string _code = "-";
+	private string _default = "False";
+	private List<string> _languages;
+	private IEnumerable<Culture> _cultures;
 
-    protected override async Task OnParametersSetAsync()
-    {
-        var languages = await LanguageService.GetLanguagesAsync(PageState.Site.SiteId);
-        var languagesCodes = languages.Select(l => l.Code).ToList();
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
-        _supportedCultures = await LocalizationService.GetCulturesAsync();
-        _availableCultures = _supportedCultures
-            .Where(c => !c.Name.Equals(Constants.DefaultCulture) && !languagesCodes.Contains(c.Name));
-        await LoadTranslations();
+	protected override async Task OnParametersSetAsync()
+	{
+		var languages = await LanguageService.GetLanguagesAsync(PageState.Site.SiteId);
+		_languages = languages.Select(l => l.Code).ToList();
 
-        if (_supportedCultures.Count() == 1)
-        {
-            _message = Localizer["OnlyEnglish"];
-        }
-        else if (_availableCultures.Count() == 0)
-        {
-            _message = Localizer["AllLanguages"];
-        }
-    }
+		await LoadCultures();
+	}
 
-    private async Task LoadTranslations()
-    {
-        _packages = await PackageService.GetPackagesAsync("translation", _search);
-    }
+	private async Task LoadCultures()
+	{
+		_cultures = await LocalizationService.GetCulturesAsync(false);
+		_cultures = _cultures.Where(c => !c.Name.Equals(Constants.DefaultCulture) && !_languages.Contains(c.Name));
+		_code = "-";
+	}
 
-    private async Task Search()
-    {
-        try
-        {
-            await LoadTranslations();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error On Search");
-        }
-    }
+	private async Task SaveLanguage()
+	{
+		validated = true;
+		var interop = new Interop(JSRuntime);
+		if (await interop.FormValid(form) && _code != "-")
+		{
+			var language = new Language
+				{
+					SiteId = PageState.Page.SiteId,
+					Code = _code,
+					IsDefault = (_default == null ? false : Boolean.Parse(_default))
+				};
 
-    private async Task Reset()
-    {
-        try
-        {
-            _search = "";
-            await LoadTranslations();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error On Reset");
-        }
-    }
+			try
+			{
+				language = await LanguageService.AddLanguageAsync(language);
 
-    private async Task SaveLanguage()
-    {
-        var language = new Language
-        {
-            SiteId = PageState.Page.SiteId,
-            Name = CultureInfo.GetCultureInfo(_code).DisplayName,
-            Code = _code,
-            IsDefault = (_isDefault == null ? false : Boolean.Parse(_isDefault))
-        };
+				if (language.IsDefault)
+				{
+					await SetCultureAsync(language.Code);
+				}
 
-        try
-        {
-            language = await LanguageService.AddLanguageAsync(language);
+				await logger.LogInformation("Language Added {Language}", language);
 
-            if (language.IsDefault)
-            {
-                await SetCultureAsync(language.Code);
-            }
-
-            await logger.LogInformation("Language Added {Language}", language);
-
-            NavigationManager.NavigateTo(NavigateUrl());
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Adding Language {Language} {Error}", language, ex.Message);
-            AddModuleMessage(Localizer["Error.Language.Add"], MessageType.Error);
-        }
-    }
-
-    private async Task InstallLanguages()
-    {
-        try
-        {
-            await PackageService.InstallPackagesAsync();
-            AddModuleMessage(string.Format(Localizer["Success.Language.Install"], NavigateUrl("admin/system")), MessageType.Success);
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Installing Translations");
-        }
-    }
-
-    private async Task DownloadLanguage(string packageid, string version)
-    {
-        try
-        {
-            await PackageService.DownloadPackageAsync(packageid, version, "Packages");
-            await logger.LogInformation("Language Paclage {Name} {Version} Downloaded Successfully", packageid, version);
-            AddModuleMessage(Localizer["Success.Language.Download"], MessageType.Success);
-            StateHasChanged();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Downloading Translation {Name} {Version}", packageid, version);
-            AddModuleMessage(Localizer["Error.Language.Download"], MessageType.Error);
-        }
-    }
+				NavigationManager.NavigateTo(NavigateUrl());
+			}
+			catch (Exception ex)
+			{
+				await logger.LogError(ex, "Error Adding Language {Language} {Error}", language, ex.Message);
+				AddModuleMessage(Localizer["Error.Language.Add"], MessageType.Error);
+			}
+		}
+		else
+		{
+			AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+		}
+	}
 
     private async Task SetCultureAsync(string culture)
     {
@@ -239,9 +128,12 @@ else
         {
             var interop = new Interop(JSRuntime);
             var localizationCookieValue = CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture));
-            await interop.SetCookie(CookieRequestCultureProvider.DefaultCookieName, localizationCookieValue, 360);
-
-            NavigationManager.NavigateTo(NavigationManager.Uri, forceLoad: true);
+            await interop.SetCookie(CookieRequestCultureProvider.DefaultCookieName, localizationCookieValue, 360, true, "Lax");
         }
     }
+
+    private void OnUpload()
+    {
+        AddModuleMessage(string.Format(Localizer["Success.Language.Download"], NavigateUrl("admin/system")), MessageType.Success);
+    }
 }

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

@@ -0,0 +1,109 @@
+@namespace Oqtane.Modules.Admin.Languages
+@inherits ModuleBase
+@using System.Globalization
+@inject NavigationManager NavigationManager
+@inject ILocalizationService LocalizationService
+@inject ILanguageService LanguageService
+@inject IPackageService PackageService
+@inject IStringLocalizer<Edit> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+@if (_code == null)
+{
+    <p><em>@SharedLocalizer["Loading"]</em></p>
+}
+else
+{
+    <TabStrip>
+        <TabPanel Name="Manage" ResourceKey="Manage" Heading="Manage">
+            <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="Name Of The Language" ResourceKey="Name">Name:</Label>
+                        <div class="col-sm-9">
+                            <input id="code" class="form-control" @bind="@_code" readonly/>
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="default" HelpText="Indicates Whether Or Not This Language Is The Default For The Site" ResourceKey="IsDefault">Default?</Label>
+                        <div class="col-sm-9">
+                            <select id="default" class="form-select" @bind="@_default" required>
+                                <option value="True">@SharedLocalizer["Yes"]</option>
+                                <option value="False">@SharedLocalizer["No"]</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+                <button type="button" class="btn btn-success" @onclick="SaveLanguage">@SharedLocalizer["Save"]</button>
+			    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+            </form>
+        </TabPanel>
+    </TabStrip>
+}
+
+@code {
+    private ElementReference form;
+    private bool validated = false;
+    private int _languageId = -1;
+    private string _code = string.Empty;
+    private string _cultureName = string.Empty;
+    private string _default = "False";
+    private List<Language> _languages;
+
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+
+    protected override async Task OnInitializedAsync()
+    {
+        _languageId = Int32.Parse(PageState.QueryString["id"]);
+        _languages = await LanguageService.GetLanguagesAsync(PageState.Site.SiteId, Constants.ClientId);
+        Language language = _languages.Where(x => x.LanguageId == _languageId).FirstOrDefault();
+        if (language != null)
+        {
+            _code = language.Code;
+            _cultureName = language.Name;
+            _default = language.IsDefault.ToString();
+            if (language.SiteId == null) 
+            {
+                language.SiteId = PageState.Site.SiteId;
+            }
+        };
+    }
+
+	private async Task SaveLanguage()
+	{
+        Language language = _languages.Where(x => x.LanguageId == _languageId).FirstOrDefault();
+        if (language != null)
+        {
+            language.IsDefault = Boolean.Parse(_default);
+			try
+			{
+				await LanguageService.EditLanguageAsync(language);
+
+				if (language.IsDefault)
+				{
+					await SetCultureAsync(language.Code);
+				}
+
+				await logger.LogInformation("Language Edited {Language}", language);
+
+				NavigationManager.NavigateTo(NavigateUrl());
+			}
+			catch (Exception ex)
+			{
+				await logger.LogError(ex, "Error Editing Language {Language} {Error}", language, ex.Message);
+				AddModuleMessage(Localizer["Error.Language.Edit"], MessageType.Error);
+			}
+        };
+	}
+
+    private async Task SetCultureAsync(string culture)
+    {
+        if (culture != CultureInfo.CurrentUICulture.Name)
+        {
+            var interop = new Interop(JSRuntime);
+            var localizationCookieValue = CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture));
+            await interop.SetCookie(CookieRequestCultureProvider.DefaultCookieName, localizationCookieValue, 360, true, "Lax");
+        }
+    }
+
+}

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

@@ -14,58 +14,126 @@ else
 {
     <ActionLink Action="Add" Text="Add Language" ResourceKey="AddLanguage" />
 
-    <Pager Items="@_languages">
+    <Pager Items="@_languages" SearchProperties="Name,Code">
         <Header>
+            <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
             <th>@SharedLocalizer["Name"]</th>
             <th>@Localizer["Code"]</th>
             <th>@Localizer["Default"]</th>
-            <th style="width: 1px;">&nbsp;</th>
+			@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+			{
+                <th style="width: 1px;">@Localizer["Translation"]</th>
+				<th style="width: 1px;">&nbsp;</th>
+			}
         </Header>
         <Row>
+            <td>
+            @if (!context.IsDefault)
+            {
+                <ActionLink Action="Edit" Text="Edit" Parameters="@($"id=" + context.LanguageId.ToString())" ResourceKey="EditLanguage" />                    
+            }
+            </td>
             <td><ActionDialog Header="Delete Language" Message="@string.Format(Localizer["Confirm.Language.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteLanguage(context))" Disabled="@((context.IsDefault && _languages.Count > 2) || context.Code == Constants.DefaultCulture)" ResourceKey="DeleteLanguage" /></td>
             <td>@context.Name</td>
             <td>@context.Code</td>
-            <td><TriStateCheckBox Value="@(context.IsDefault)" Disabled="true"></TriStateCheckBox></td>
-            <td>
-                @if (UpgradeAvailable(context.Code))
-                    {
-                    <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadLanguage(context.Code))>@SharedLocalizer["Upgrade"]</button>
-                    }
-            </td>
+			<td><TriStateCheckBox Value="@(context.IsDefault)" Disabled="true"></TriStateCheckBox></td>
+			@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+			{
+                <td>@((string.IsNullOrEmpty(context.Version)) ? "---" : context.Version)</td>
+				<td>
+					@{
+						var translation = TranslationAvailable(context.Code, context.Version);
+					}
+					@if (translation != null)
+					{
+						if (string.IsNullOrEmpty(context.Version))
+						{
+							<button type="button" class="btn btn-success" @onclick=@(async () => await GetPackage(context.Code, translation.Version))>@SharedLocalizer["Download"]</button>
+						}
+						else
+						{
+							if (Version.Parse(translation.Version).CompareTo(Version.Parse(context.Version)) > 0)
+							{
+								<button type="button" class="btn btn-success" @onclick=@(async () => await GetPackage(context.Code, translation.Version))>@SharedLocalizer["Upgrade"]</button>
+							}
+						}
+					}
+				</td>
+			}
         </Row>
     </Pager>
 }
 
+@if (_package != null)
+{
+	<div class="app-actiondialog">
+		<div class="modal" tabindex="-1" role="dialog">
+			<div class="modal-dialog">
+				<div class="modal-content">
+					<div class="modal-header">
+						<h5 class="modal-title">@SharedLocalizer["Review License Terms"]</h5>
+						<button type="button" class="btn-close" aria-label="Close" @onclick="HideModal"></button>
+					</div>
+					<div class="modal-body">
+						<p style="height: 200px; overflow-y: scroll;">
+							<h4 style="display: inline;"><a href="@_package.ProductUrl" target="_new">@_package.Name</a></h4><br />
+							@SharedLocalizer["Search.By"]:&nbsp;&nbsp;<strong><a href="@_package.OwnerUrl" target="new">@_package.Owner</a></strong><br />
+							@(_package.Description.Length > 400 ? (_package.Description.Substring(0, 400) + "...") : _package.Description)<br />
+							<strong>@(String.Format("{0:n0}", _package.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp;
+							@SharedLocalizer["Search.Released"]: <strong>@_package.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;
+							@SharedLocalizer["Search.Version"]: <strong>@_package.Version</strong>
+							@((MarkupString)(!string.IsNullOrEmpty(_package.PackageUrl) ? "&nbsp;&nbsp;|&nbsp;&nbsp;" + SharedLocalizer["Search.Source"] + ": <strong>" + new Uri(_package.PackageUrl).Host + "</strong>" : ""))
+							<br /><br />
+							@if (!string.IsNullOrEmpty(_package.License))
+							{
+								@((MarkupString)_package.License.Replace("\n", "<br />"))
+							}
+							else
+							{
+								@SharedLocalizer["License Not Specified"]
+							}
+						</p>
+					</div>
+					<div class="modal-footer">
+						<button type="button" class="btn btn-success" @onclick="DownloadPackage">@SharedLocalizer["Accept"]</button>
+						<button type="button" class="btn btn-secondary" @onclick="HideModal">@SharedLocalizer["Cancel"]</button>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+}
+
 @code {
     private List<Language> _languages;
     private List<Package> _packages;
+    private Package _package;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
     protected override async Task OnParametersSetAsync()
     {
-        _languages = await LanguageService.GetLanguagesAsync(PageState.Site.SiteId);
-
-        var cultures = await LocalizationService.GetCulturesAsync();
-        var culture = cultures.First(c => c.Name.Equals(Constants.DefaultCulture));
-
-        // Adds English as default language
-        _languages.Insert(0, new Language { Name = culture.DisplayName, Code = culture.Name, IsDefault = !_languages.Any(l => l.IsDefault) });
+        await GetLanguages();
 
         if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
         {
-            _packages = await PackageService.GetPackagesAsync("translation");
+            _packages = await PackageService.GetPackagesAsync("translation");			
         }
     }
 
+    private async Task GetLanguages()
+    {
+        _languages = await LanguageService.GetLanguagesAsync(PageState.Site.SiteId, Constants.ClientId);
+    }
+
     private async Task DeleteLanguage(Language language)
     {
         try
         {
             await LanguageService.DeleteLanguageAsync(language.LanguageId);
             await logger.LogInformation("Language Deleted {Language}", language);
-
+            await GetLanguages();
             StateHasChanged();
         }
         catch (Exception ex)
@@ -76,37 +144,53 @@ else
         }
     }
 
-    private bool UpgradeAvailable(string code)
+    private Package TranslationAvailable(string code, string version)
     {
-        var upgradeavailable = false;
-        if (_packages != null)
-        {
-            var package = _packages.Where(item => item.PackageId == (Constants.PackageId + ".Client." + code)).FirstOrDefault();
-            if (package != null)
-            {
-                upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(Constants.Version)) > 0);
-            }
-
-        }
-        return upgradeavailable;
+        return _packages?.FirstOrDefault(item => item.PackageId == (Constants.PackageId + "." + code));
     }
 
-    private async Task DownloadLanguage(string code)
+    private async Task GetPackage(string code, string version)
     {
         try
         {
-            if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+            _package = await PackageService.GetPackageAsync(Constants.PackageId + "." + code, version, false);
+            if (_package != null)
             {
-                await PackageService.DownloadPackageAsync(Constants.PackageId + ".Client." + code, Constants.Version, "Packages");
-                await logger.LogInformation("Translation Downloaded {Code} {Version}", code, Constants.Version);
-                await PackageService.InstallPackagesAsync();
-                AddModuleMessage(string.Format(Localizer["Success.Language.Install"], NavigateUrl("admin/system")), MessageType.Success);
+                StateHasChanged();
+            }
+            else
+            {
+                await logger.LogError("Error Getting Package {PackageId} {Version}", Constants.PackageId + "." + code, Constants.Version);
+                AddModuleMessage(Localizer["Error.Translation.Download"], MessageType.Error);
             }
         }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Downloading Translation {Code} {Version} {Error}", code, Constants.Version, ex.Message);
-            AddModuleMessage(Localizer["Error.Language.Download"], MessageType.Error);
-        }
-    }
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", Constants.PackageId + "." + code, Constants.Version);
+			AddModuleMessage(Localizer["Error.Translation.Download"], MessageType.Error);
+		}
+	}
+
+	private async Task DownloadPackage()
+	{
+		try
+		{
+			await PackageService.DownloadPackageAsync(_package.PackageId, _package.Version);
+			await logger.LogInformation("Language Package {Name} {Version} Downloaded Successfully", _package.PackageId, _package.Version);
+			AddModuleMessage(string.Format(Localizer["Success.Language.Download"], NavigateUrl("admin/system")), MessageType.Success);
+			_package = null;
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Downloading Translation {Name} {Version}", _package.PackageId, _package.Version);
+			AddModuleMessage(Localizer["Error.Language.Download"], MessageType.Error);
+		}
+	}
+
+	private void HideModal()
+	{
+		_package = null;
+		StateHasChanged();
+	}
 }

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

@@ -1,189 +1,312 @@
+@using System.Net
 @namespace Oqtane.Modules.Admin.Login
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
+@inject ISettingService SettingService
 @inject IServiceProvider ServiceProvider
-@inject SiteState SiteState
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (_message != string.Empty)
+@if (PageState.User != null)
 {
-    <ModuleMessage Message="@_message" Type="@_type" />
+    <ModuleMessage Message="@Localizer["Info.SignedIn"]" Type="MessageType.Info" />
 }
-<AuthorizeView Roles="@RoleNames.Registered">
-    <Authorizing>
-        <text>...</text>
-    </Authorizing>
-    <Authorized>
-        <ModuleMessage Message="@Localizer["Info.SignedIn"]" Type="MessageType.Info" />
-    </Authorized>
-    <NotAuthorized>
+else
+{
+    @if (!twofactor)
+    {
         <form @ref="login" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
-            <div class="container Oqtane-Modules-Admin-Login" @onkeypress="@(e => KeyPressed(e))">
-                <div class="form-group">
-                    <label for="Username" class="control-label">@SharedLocalizer["Username"] </label>
-                    <input type="text" @ref="username" name="Username" class="form-control username" placeholder="Username" @bind="@_username" id="Username" required />
-                </div>
-                <div class="form-group">
-                    <label for="Password" class="control-label">@SharedLocalizer["Password"] </label>
-                    <input type="password" name="Password" class="form-control password" placeholder="Password" @bind="@_password" id="Password" required />
-                </div>
-                <div class="form-group">
-                    <div class="form-check form-check-inline">
-                        <label class="form-check-label" for="Remember">@Localizer["RememberMe"]</label>&nbsp;
-                        <input type="checkbox" class="form-check-input" name="Remember" @bind="@_remember" id="Remember" />
+            <div class="Oqtane-Modules-Admin-Login" @onkeypress="@(e => KeyPressed(e))">
+                @if (_allowexternallogin)
+                {
+                    <button type="button" class="btn btn-primary" @onclick="ExternalLogin">@Localizer["Use"] @PageState.Site.Settings["ExternalLogin:ProviderName"]</button>
+                    <br />
+
+                    <br />
+                }
+                @if (_allowsitelogin)
+                {
+                    <div class="form-group">
+                        <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" @bind:event="oninput" required />
                     </div>
-                </div>
-                <button type="button" class="btn btn-primary" @onclick="Login">@SharedLocalizer["Login"]</button>
-                <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
-                <br /><br />
-                <button type="button" class="btn btn-secondary" @onclick="Forgot">@Localizer["ForgotPassword"]</button>
+                    <div class="form-group mt-2">
+                        <Label Class="control-label" For="password" HelpText="Please enter your Password" ResourceKey="Password">Password:</Label>
+                        <div class="input-group">
+                            <input id="password" type="@_passwordtype" name="Password" class="form-control" placeholder="@Localizer["Password.Placeholder"]" @bind="@_password" @bind:event="oninput" required />
+                            <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
+                        </div>
+                    </div>
+                    <div class="form-group mt-2">
+                        @if (!_alwaysremember)
+                        {
+                            <div class="form-check">
+                                <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">Remember Me?</Label>
+                            </div>
+                        }
+                    </div>
+                    <button type="button" class="btn btn-primary" @onclick="Login">@SharedLocalizer["Login"]</button>
+                    <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
+                    <br />
+
+                    <br />
+                    <button type="button" class="btn btn-secondary" @onclick="Forgot">@Localizer["ForgotPassword"]</button>
+                    @if (PageState.Site.AllowRegistration)
+                    {
+                        <br />
+
+                        <br />
+                        <NavLink href="@NavigateUrl("register")">@Localizer["Register"]</NavLink>
+                    }
+                }
             </div>
         </form>
-    </NotAuthorized>
-</AuthorizeView>
+    }
+    else
+    {
+        <form @ref="login" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+            <div class="container Oqtane-Modules-Admin-Login">
+                <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>
+                <br />
+                <button type="button" class="btn btn-primary" @onclick="Login">@SharedLocalizer["Login"]</button>
+                <button type="button" class="btn btn-secondary" @onclick="Reset">@SharedLocalizer["Cancel"]</button>
+            </div>
+        </form>
+    }
+}
 
 @code {
-    private string _returnUrl = string.Empty;
-    private string _message = string.Empty;
-    private MessageType _type = MessageType.Info;
-    private string _username = string.Empty;
-    private string _password = string.Empty;
-    private bool _remember = false;
-    private bool validated = false;
-
+    private bool _allowsitelogin = true;
+    private bool _allowexternallogin = false;
     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 bool _remember = false;
+    private bool _alwaysremember = false;
+    private string _code = 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" }
     };
 
     protected override async Task OnInitializedAsync()
     {
-        if (PageState.QueryString.ContainsKey("returnurl"))
+        try
         {
-            _returnUrl = PageState.QueryString["returnurl"];
-        }
+            _allowexternallogin = (SettingService.GetSetting(PageState.Site.Settings, "ExternalLogin:ProviderType", "") != "") ? true : false;
+            _allowsitelogin = bool.Parse(SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:AllowSiteLogin", "true"));
+            _alwaysremember = bool.Parse(SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:AlwaysRemember", "false"));
 
-        if (PageState.QueryString.ContainsKey("name"))
-        {
-            _username = PageState.QueryString["name"];
-        }
+            _togglepassword = SharedLocalizer["ShowPassword"];
 
-        if (PageState.QueryString.ContainsKey("token"))
-        {
-            var user = new User();
-            user.SiteId = PageState.Site.SiteId;
-            user.Username = _username;
-            user = await UserService.VerifyEmailAsync(user, PageState.QueryString["token"]);
-
-            if (user != null)
+            if (PageState.QueryString.ContainsKey("name"))
             {
-                _message = Localizer["Success.Account.Verified"];
+                _username = PageState.QueryString["name"];
+            }
+
+            if (PageState.QueryString.ContainsKey("token") && !string.IsNullOrEmpty(_username))
+            {
+                var user = new User();
+                user.SiteId = PageState.Site.SiteId;
+                user.Username = _username;
+
+                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"]);
+                    if (user != null)
+                    {
+                        await logger.LogInformation(LogFunction.Security, "External Login Linkage Successful For Username {Username}", _username);
+                        AddModuleMessage(Localizer["Success.Account.Linked"], MessageType.Info);						
+                    }
+                    else
+                    {
+                        await logger.LogError(LogFunction.Security, "External Login Linkage Failed For Username {Username}", _username);
+                        AddModuleMessage(Localizer["Message.Account.NotLinked"], MessageType.Warning);						
+                    }
+                    _username = "";
+                }
+                else
+                {
+                    user = await UserService.VerifyEmailAsync(user, PageState.QueryString["token"]);
+                    if (user != null)
+                    {
+                        await logger.LogInformation(LogFunction.Security, "Email Verified For Username {Username}", _username);
+                        AddModuleMessage(Localizer["Success.Account.Verified"], MessageType.Info);						
+                    }
+                    else
+                    {
+                        await logger.LogError(LogFunction.Security, "Email Verification Failed For Username {Username}", _username);
+                        AddModuleMessage(Localizer["Message.Account.NotVerified"], MessageType.Warning);						
+                    }
+                }
             }
             else
             {
-                _message = Localizer["Message.Account.NotVerfied"];
-                _type = MessageType.Warning;
+                if (PageState.QueryString.ContainsKey("status"))
+                {
+                    AddModuleMessage(Localizer["ExternalLoginStatus." + PageState.QueryString["status"]], MessageType.Info);
+                }
             }
         }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Login {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.LoadLogin"], MessageType.Error);
+        }
     }
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
-        if (firstRender)
+        if (firstRender && PageState.User == null && _allowsitelogin)
         {
-            await username.FocusAsync();
+            if (!string.IsNullOrEmpty(username.Id)) // ensure username is visible in UI
+            {
+                await username.FocusAsync();
+            }
+        }
+
+        // redirect logged in user to specified page
+        if (PageState.User != null && !UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
+        {
+            NavigationManager.NavigateTo(PageState.ReturnUrl);
         }
     }
 
     private async Task Login()
     {
-        validated = true;
-        var interop = new Interop(JSRuntime);
-        if (await interop.FormValid(login))
+        try
         {
-            if (PageState.Runtime == Oqtane.Shared.Runtime.Server)
+            validated = true;
+            var interop = new Interop(JSRuntime);
+            if (await interop.FormValid(login))
             {
-                var user = new User();
-                user.SiteId = PageState.Site.SiteId;
-                user.Username = _username;
-                user.Password = _password;
-                user = await UserService.LoginUserAsync(user, false, false);
+                var hybrid = (PageState.Runtime == Shared.Runtime.Hybrid);
+                var user = new User { SiteId = PageState.Site.SiteId, Username = _username, Password = _password, LastIPAddress = SiteState.RemoteIPAddress};
 
-                if (user.IsAuthenticated)
-                {
-                    await logger.LogInformation("Login Successful For Username {Username}", _username);
-                    // server-side Blazor needs to post 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 };
-                    string url = Utilities.TenantUrl(PageState.Alias, "/pages/login/");
-                    await interop.SubmitForm(url, fields);
+                if (!twofactor)
+                { 
+                    _remember = _alwaysremember || _remember;
+                    user = await UserService.LoginUserAsync(user, hybrid, _remember);
                 }
                 else
                 {
-                    await logger.LogInformation("Login Failed For Username {Username}", _username);
-                    AddModuleMessage(Localizer["Error.Login.Fail"], MessageType.Error);
+                    user = await UserService.VerifyTwoFactorAsync(user, _code);
+                }
+
+                if (user != null && user.IsAuthenticated)
+                {
+                    await logger.LogInformation(LogFunction.Security, "Login Successful For {Username} From IP Address {IPAddress}", _username, SiteState.RemoteIPAddress);
+
+                    // return url is not specified if user navigated directly to login page
+                    var returnurl = (!string.IsNullOrEmpty(PageState.ReturnUrl)) ? PageState.ReturnUrl : PageState.Alias.Path;
+
+                    if (hybrid)
+                    {
+                        // hybrid apps utilize an interactive login
+                        var authstateprovider = (IdentityAuthenticationStateProvider)ServiceProvider.GetService(typeof(IdentityAuthenticationStateProvider));
+                        authstateprovider.NotifyAuthenticationChanged();
+                        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 = 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 != null && user.TwoFactorRequired))
+                    {
+                        twofactor = true;
+                        validated = false;
+                        AddModuleMessage(Localizer["Message.TwoFactor"], MessageType.Info);
+                    }
+                    else
+                    {
+                        if (!twofactor)
+                        {
+                            await logger.LogInformation(LogFunction.Security, "Login Failed For Username {Username}", _username);
+                            AddModuleMessage(Localizer["Error.Login.Fail"], MessageType.Error);
+                        }
+                        else
+                        {
+                            await logger.LogInformation(LogFunction.Security, "Two Factor Verification Failed For Username {Username}", _username);
+                            AddModuleMessage(Localizer["Error.TwoFactor.Fail"], MessageType.Error);
+                        }
+                    }
                 }
             }
             else
             {
-                // client-side Blazor
-                var user = new User();
-                user.SiteId = PageState.Site.SiteId;
-                user.Username = _username;
-                user.Password = _password;
-                user = await UserService.LoginUserAsync(user, true, _remember);
-                if (user.IsAuthenticated)
-                {
-                    await logger.LogInformation("Login Successful For Username {Username}", _username);
-                    var authstateprovider = (IdentityAuthenticationStateProvider)ServiceProvider.GetService(typeof(IdentityAuthenticationStateProvider));
-                    authstateprovider.NotifyAuthenticationChanged();
-                    NavigationManager.NavigateTo(NavigateUrl(_returnUrl, true));
-                }
-                else
-                {
-                    await logger.LogInformation("Login Failed For Username {Username}", _username);
-                    AddModuleMessage(Localizer["Error.Login.Fail"], MessageType.Error);
-                }
+                AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning);
             }
         }
-        else
+        catch (Exception ex)
         {
-            AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning);
+            await logger.LogError(ex, "Error Performing Login {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.Login"], MessageType.Error);
         }
     }
 
     private void Cancel()
     {
-        NavigationManager.NavigateTo(_returnUrl);
+        NavigationManager.NavigateTo(PageState.ReturnUrl);
     }
 
     private async Task Forgot()
     {
-        if (_username != string.Empty)
+        try
         {
-            var user = await UserService.GetUserAsync(_username, PageState.Site.SiteId);
-            if (user != null)
+            if (_username != string.Empty)
             {
-                await UserService.ForgotPasswordAsync(user);
-                _message = "Please Check The Email Address Associated To Your User Account For A Password Reset Notification";
+                var user = await UserService.GetUserAsync(_username, PageState.Site.SiteId);
+                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);
+                }
+                else
+                {
+                    AddModuleMessage(Localizer["Message.UserDoesNotExist"], MessageType.Warning);
+                }
             }
             else
             {
-                _message = "User Does Not Exist";
-                _type = MessageType.Warning;
+                AddModuleMessage(Localizer["Message.ForgotPassword"], MessageType.Info);
             }
-        }
-        else
-        {
-            _message = "Please Enter The Username Related To Your Account And Then Select The Forgot Password Option Again";
-        }
 
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Resetting Password {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.ResetPassword"], MessageType.Error);
+        }
+    }
+
+    private void Reset()
+    {
+        twofactor = false;
+        _username = "";
+        _password = "";
+        ClearModuleMessage();
         StateHasChanged();
     }
 
@@ -194,4 +317,24 @@
             await Login();
         }
     }
+
+    private void TogglePassword()
+    {
+        if (_passwordtype == "password")
+        {
+            _passwordtype = "text";
+            _togglepassword = SharedLocalizer["HidePassword"];
+        }
+        else
+        {
+            _passwordtype = "password";
+            _togglepassword = SharedLocalizer["ShowPassword"];
+        }
+    }
+
+    private void ExternalLogin()
+    {
+        NavigationManager.NavigateTo(Utilities.TenantUrl(PageState.Alias, "/pages/external?returnurl=" + WebUtility.UrlEncode(PageState.ReturnUrl)), true);
+    }
+
 }

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

@@ -9,135 +9,111 @@
 @inject IStringLocalizer<Detail> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<table class="table table-borderless">
-    <tr>
-        <td width="30%">
-            <Label For="dateTime" HelpText="The date and time of this log" ResourceKey="DateTime">Date/Time: </Label>
-        </td>
-        <td>
-            <input id="dateTime" class="form-control" @bind="@_logDate" readonly />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="level" HelpText="The level of this log" ResourceKey="Level">Level: </Label>
-        </td>
-        <td>
-            <input id="level" class="form-control" @bind="@_level" readonly />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="feature" HelpText="The feature that was affected" ResourceKey="Feature">Feature: </Label>
-        </td>
-        <td>
-            <input id="feature" class="form-control" @bind="@_feature" readonly />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="function" HelpText="The function that was performed" ResourceKey="Function">Function: </Label>
-        </td>
-        <td>
-            <input id="function" class="form-control" @bind="@_function" readonly />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="category" HelpText="The categories that were affected" ResourceKey="Category">Category: </Label>
-        </td>
-        <td>
-            <input id="category" class="form-control" @bind="@_category" readonly />
-        </td>
-    </tr>
-    @if (_pageName != string.Empty)
-    {
-        <tr>
-            <td>
-                <Label For="page" HelpText="The page that was affected" ResourceKey="Page">Page: </Label>
-            </td>
-            <td>
-                <input id="page" class="form-control" @bind="@_pageName" readonly />
-            </td>
-        </tr>
-    }
-    @if (_moduleTitle != string.Empty)
-    {
-        <tr>
-            <td>
-                <Label For="module" HelpText="The module that was affected" ResourceKey="Module">Module: </Label>
-            </td>
-            <td>
-                <input id="module" class="form-control" @bind="@_moduleTitle" readonly />
-            </td>
-        </tr>
-    }
-    @if (_username != string.Empty)
-    {
-        <tr>
-            <td>
-                <Label For="user" HelpText="The user that caused this log" ResourceKey="User">User: </Label>
-            </td>
-            <td>
-                <input id="user" class="form-control" @bind="@_username" readonly />
-            </td>
-        </tr>
-    }
-    <tr>
-        <td>
-            <Label For="url" HelpText="The url the log comes from" ResourceKey="Url">Url: </Label>
-        </td>
-        <td>
-            <input id="url" class="form-control" @bind="@_url" readonly />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="template" HelpText="What the log is about" ResourceKey="Template">Template: </Label>
-        </td>
-        <td>
-            <input id="template" class="form-control" @bind="@_template" readonly />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="message" HelpText="The message that the system generated" class="control-label" ResourceKey="Message">Message: </Label>
-        </td>
-        <td>
-            <textarea id="message" class="form-control" @bind="@_message" rows="5" readonly></textarea>
-        </td>
-    </tr>
-    @if (!string.IsNullOrEmpty(_exception))
-    {
-        <tr>
-            <td>
-                <Label For="exception" HelpText="The exceptions generated by the system" ResourceKey="Exception">Exception: </Label>
-            </td>
-            <td>
-                <textarea id="exception" class="form-control" @bind="@_exception" rows="5" readonly></textarea>
-            </td>
-        </tr>
-    }
-    <tr>
-        <td>
-            <Label For="properties" HelpText="The properties that were affected" ResourceKey="Properties">Properties: </Label>
-        </td>
-        <td>
-            <textarea id="properties" class="form-control" @bind="@_properties" rows="5" readonly></textarea>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="server" HelpText="The server that was affected" ResourceKey="Server">Server: </Label>
-        </td>
-        <td>
-            <input id="server" class="form-control" @bind="@_server" readonly />
-        </td>
-    </tr>
-</table>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+@if (_initialized)
+{
+	<div class="container">
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="dateTime" HelpText="The date and time of this log" ResourceKey="DateTime">Date/Time: </Label>
+			<div class="col-sm-9">
+				<input id="dateTime" class="form-control" @bind="@_logDate" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="level" HelpText="The level of this log" ResourceKey="Level">Level: </Label>
+			<div class="col-sm-9">
+				<input id="level" class="form-control" @bind="@_level" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="feature" HelpText="The feature that was affected" ResourceKey="Feature">Feature: </Label>
+			<div class="col-sm-9">
+				<input id="feature" class="form-control" @bind="@_feature" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="function" HelpText="The function that was performed" ResourceKey="Function">Function: </Label>
+			<div class="col-sm-9">
+				<input id="function" class="form-control" @bind="@_function" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="category" HelpText="The fully qualified type type that was affected" ResourceKey="Category">Type Name: </Label>
+			<div class="col-sm-9">
+				<input id="category" class="form-control" @bind="@_category" readonly />
+			</div>
+		</div>
+		@if (_pageName != string.Empty)
+		{
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="page" HelpText="The page that was affected" ResourceKey="Page">Page: </Label>
+				<div class="col-sm-9">
+					<input id="page" class="form-control" @bind="@_pageName" readonly />
+				</div>
+			</div>
+		}
+		@if (_moduleTitle != string.Empty)
+		{
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="module" HelpText="The module that was affected" ResourceKey="Module">Module: </Label>
+				<div class="col-sm-9">
+					<input id="module" class="form-control" @bind="@_moduleTitle" readonly />
+				</div>
+			</div>
+		}
+		@if (_username != string.Empty)
+		{
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="user" HelpText="The user that caused this log" ResourceKey="User">User: </Label>
+				<div class="col-sm-9">
+					<input id="user" class="form-control" @bind="@_username" readonly />
+				</div>
+			</div>
+		}
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="url" HelpText="The url the log comes from" ResourceKey="Url">Url: </Label>
+			<div class="col-sm-9">
+				<input id="url" class="form-control" @bind="@_url" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="template" HelpText="What the log is about" ResourceKey="Template">Template: </Label>
+			<div class="col-sm-9">
+				<input id="template" class="form-control" @bind="@_template" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="message" HelpText="The message that the system generated" ResourceKey="Message">Message: </Label>
+			<div class="col-sm-9">
+				<textarea id="message" class="form-control" @bind="@_message" rows="5" readonly></textarea>
+			</div>
+		</div>
+		@if (!string.IsNullOrEmpty(_exception))
+		{
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="exception" HelpText="The exceptions generated by the system" ResourceKey="Exception">Exception: </Label>
+				<div class="col-sm-9">
+                    <textarea id="exception" class="form-control" @bind="@_exception" rows="5" readonly></textarea>
+                </div>
+           </div>
+        }
+       <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="properties" HelpText="The properties that were affected" ResourceKey="Properties">Properties: </Label>
+            <div class="col-sm-9">
+                <textarea id="properties" class="form-control" @bind="@_properties" rows="5" readonly></textarea>
+            </div>
+       </div>
+       <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="server" HelpText="The server that was affected" ResourceKey="Server">Server: </Label>
+			<div class="col-sm-9">
+                <input id="server" class="form-control" @bind="@_server" readonly />
+            </div>
+        </div>
+    </div>
+}
+<NavLink class="btn btn-secondary" href="@CloseUrl()">@SharedLocalizer["Cancel"]</NavLink>
 
 @code {
+	private bool _initialized = false;
     private int _logId;
     private string _logDate = string.Empty;
     private string _level = string.Empty;
@@ -154,17 +130,18 @@
     private string _properties = string.Empty;
     private string _server = string.Empty;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+	public override string UrlParametersTemplate => "/{id}";
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnInitializedAsync()
     {
         try
         {
-            _logId = Int32.Parse(PageState.QueryString["id"]);
+            _logId = Int32.Parse(UrlParameters["id"]);
             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;
@@ -179,7 +156,7 @@
                     }
                 }
 
-                if (log.PageId != null && log.ModuleId != null)
+                if (log.PageId != null && log.ModuleId != null && log.ModuleId != -1)
                 {
                     var pagemodule = await PageModuleService.GetPageModuleAsync(log.PageId.Value, log.ModuleId.Value);
                     if (pagemodule != null)
@@ -203,6 +180,7 @@
                 _exception = log.Exception;
                 _properties = log.Properties;
                 _server = log.Server;
+				_initialized = true;
             }
         }
         catch (Exception ex)
@@ -211,4 +189,9 @@
             AddModuleMessage(Localizer["Error.Log.Load"], MessageType.Error);
         }
     }
+
+	private string CloseUrl()
+	{
+		return (!string.IsNullOrEmpty(PageState.ReturnUrl)) ? PageState.ReturnUrl : NavigateUrl();
+	}
 }

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

@@ -1,6 +1,8 @@
 @namespace Oqtane.Modules.Admin.Logs
 @inherits ModuleBase
+@inject NavigationManager NavigationManager
 @inject ILogService LogService
+@inject ISettingService SettingService
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
@@ -10,81 +12,122 @@
 }
 else
 {
-    <table class="table table-borderless">
-        <tr>
-            <td>
-                <Label For="level" HelpText="Select the log level for event log items" ResourceKey="Level">Level: </Label><br /><br />
-                <select id="level" class="form-select" @onchange="(e => LevelChanged(e))">
-                    <option value="-">&lt;@Localizer["AllLevels"]&gt;</option>
-                    <option value="Trace">@Localizer["Trace"]</option>
-                    <option value="Debug">@Localizer["Debug"]</option>
-                    <option value="Information">@Localizer["Information"]</option>
-                    <option value="Warning">@Localizer["Warning"]</option>
-                    <option value="Error">@Localizer["Error"]</option>
-                    <option value="Critical">@Localizer["Critical"]</option>
-                </select>
-            </td>
-            <td>
-                <Label For="function" HelpText="Select the function for event log items" ResourceKey="Function">Function: </Label><br /><br />
-                <select id="function" class="form-select" @onchange="(e => FunctionChanged(e))">
-                    <option value="-">&lt;@Localizer["AllFunctions"]&gt;</option>
-                    <option value="Create">@Localizer["Create"]</option>
-                    <option value="Read">@Localizer["Read"]</option>
-                    <option value="Update">@SharedLocalizer["Update"]</option>
-                    <option value="Delete">@SharedLocalizer["Delete"]</option>
-                    <option value="Security">@Localizer["Security"]</option>
-                    <option value="Other">@Localizer["Other"]</option>
-                </select>
-            </td>
-            <td>
-                <Label For="rows" HelpText="Select the maximum number of event log items to review. Please note that if you choose more than 10 items the information will be split into pages." ResourceKey="Rows">Maximum Items: </Label><br /><br />
-                <select id="rows" class="form-select" @onchange="(e => RowsChanged(e))">
-                    <option value="10">10</option>
-                    <option value="50">50</option>
-                    <option value="100">100</option>
-                </select>
-            </td>
-        </tr>
-    </table>
+    <TabStrip>
+        <TabPanel Name="Events" Heading="Events" ResourceKey="Events">
+			<div class="container g-0">
+				<div class="row mb-1 align-items-center">
+					<div class="col-sm-4">
+						<Label For="level" HelpText="Select the log level for event log items" ResourceKey="Level">Level: </Label><br /><br />
+						<select id="level" class="form-select" value="@_level" @onchange="(e => LevelChanged(e))">
+							<option value="-">&lt;@Localizer["AllLevels"]&gt;</option>
+							<option value="Trace">@Localizer["Trace"]</option>
+							<option value="Debug">@Localizer["Debug"]</option>
+							<option value="Information">@Localizer["Information"]</option>
+							<option value="Warning">@Localizer["Warning"]</option>
+							<option value="Error">@Localizer["Error"]</option>
+							<option value="Critical">@Localizer["Critical"]</option>
+						</select>
+					</div>            
+					<div class="col-sm-4">
+						<Label For="function" HelpText="Select the function for event log items" ResourceKey="Function">Function: </Label><br /><br />
+						<select id="function" class="form-select" value="@_function" @onchange="(e => FunctionChanged(e))">
+							<option value="-">&lt;@Localizer["AllFunctions"]&gt;</option>
+							<option value="Create">@Localizer["Create"]</option>
+							<option value="Read">@Localizer["Read"]</option>
+							<option value="Update">@SharedLocalizer["Update"]</option>
+							<option value="Delete">@SharedLocalizer["Delete"]</option>
+							<option value="Security">@Localizer["Security"]</option>
+							<option value="Other">@Localizer["Other"]</option>
+						</select>
+					</div>            
+					<div class="col-sm-4">
+						<Label For="rows" HelpText="Select the maximum number of event log items to review. Please note that if you choose more than 10 items the information will be split into pages." ResourceKey="Rows">Maximum Items: </Label><br /><br />
+						<select id="rows" class="form-select" value="@_rows" @onchange="(e => RowsChanged(e))">
+							<option value="10">10</option>
+							<option value="50">50</option>
+							<option value="100">100</option>
+						</select>
+					</div>
+				</div>
+			</div>
+			<br />
 
-    @if (_logs.Any())
-    {
-        <Pager Items="@_logs">
-            <Header>
-                <th style="width: 1px;">&nbsp;</th>
-                <th>@Localizer["Date"]</th>
-                <th>@Localizer["Level"]</th>
-                <th>@Localizer["Feature"]</th>
-                <th>@Localizer["Function"]</th>
-            </Header>
-            <Row>
-                <td class="@GetClass(context.Function)"><ActionLink Action="Detail" Parameters="@($"id=" + context.LogId.ToString())" ResourceKey="LogDetails" /></td>
-                <td class="@GetClass(context.Function)">@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>
-            </Row>
-        </Pager>
-    }
-    else
-    {
-        <p><em>@Localizer["NoLogs"]</em></p>
-    }
+			@if (_logs.Any())
+			{
+				<Pager Items="@_logs" CurrentPage="@_page.ToString()" OnPageChange="OnPageChange">
+					<Header>
+						<th style="width: 1px;">&nbsp;</th>
+						<th>@Localizer["Date"]</th>
+						<th>@Localizer["Level"]</th>
+						<th>@Localizer["Feature"]</th>
+						<th>@Localizer["Function"]</th>
+					</Header>
+					<Row>
+                        <td class="@GetClass(context.Function)"><ActionLink Action="Detail" Text="Details" Parameters="@($"/{context.LogId}")" ReturnUrl="@(NavigateUrl(PageState.Page.Path, AddUrlParameters(_level, _function, _rows, _page)))" ResourceKey="LogDetails" /></td>
+						<td class="@GetClass(context.Function)">@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>
+					</Row>
+				</Pager>
+			}
+			else
+			{
+				<p><em>@Localizer["NoLogs"]</em></p>
+			}
+		</TabPanel>
+        <TabPanel Name="Settings" Heading="Settings" ResourceKey="Settings">
+			<div class="container">
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="retention" HelpText="Number of days of events to retain" ResourceKey="Retention">Retention (Days): </Label>
+					<div class="col-sm-9">
+                        <input id="retention" type="number" min="0" step="1" class="form-control" @bind="@_retention" />
+					</div>
+				</div>
+			</div>
+			<br />
+            <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 _function = "-";
     private string _rows = "10";
+    private int _page = 1;
     private List<Log> _logs;
+    private int _retention = 30;
 
+    public override string UrlParametersTemplate => "/{level}/{function}/{rows}/{page}";
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-    protected override async Task OnInitializedAsync()
+    protected override async Task OnParametersSetAsync()
     {
         try
         {
+            if (UrlParameters.ContainsKey("level"))
+            {
+                _level = UrlParameters["level"];
+            }
+            if (UrlParameters.ContainsKey("function"))
+            {
+                _function = UrlParameters["function"];
+            }
+            if (UrlParameters.ContainsKey("rows"))
+            {
+                _rows = UrlParameters["rows"];
+            }
+            if (UrlParameters.ContainsKey("page") && int.TryParse(UrlParameters["page"], out int page))
+            {
+                _page = page;
+            }
+
             await GetLogs();
+
+            var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+            _retention = int.Parse( SettingService.GetSetting(settings, "LogRetention", "30"));
         }
         catch (Exception ex)
         {
@@ -170,4 +213,53 @@ else
         }
         return classname;
     }
+
+    private async Task SaveSiteSettings()
+    {
+        try
+        {
+            var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+            settings = SettingService.SetSetting(settings, "LogRetention", _retention.ToString(), true);
+            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);
+        }
+    }
+
+    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)
+	{
+		_page = page;	
+	}
+
+	protected override void OnAfterRender(bool firstRender)
+	{
+		if (firstRender)
+		{
+			// external link to log item will display Details component
+			if (PageState.QueryString.ContainsKey("id") && int.TryParse(PageState.QueryString["id"], out int id))
+			{
+				NavigationManager.NavigateTo(EditUrl(PageState.Page.Path, ModuleState.ModuleId, "Detail", $"/{id}"));
+			}
+		}
+	}
 }

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

@@ -1,200 +0,0 @@
-@namespace Oqtane.Modules.Admin.ModuleCreator
-@inherits ModuleBase
-@using System.Text.RegularExpressions
-@inject NavigationManager NavigationManager
-@inject IModuleDefinitionService ModuleDefinitionService
-@inject IModuleService ModuleService
-@inject ISettingService SettingService
-@inject IStringLocalizer<Index> Localizer
-@inject IStringLocalizer<SharedResources> SharedLocalizer
-
-@if (string.IsNullOrEmpty(_moduledefinitionname) && _templates != null)
-{
-    <table class="table table-borderless">
-        <tr>
-            <td width="30%">
-                <Label 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>
-            </td>
-            <td>
-                <input id="owner" class="form-control" @bind="@_owner" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="module" HelpText="Enter a name for this module. It should not contain spaces or punctuation." ResourceKey="ModuleName">Module Name: </Label>
-            </td>
-            <td>
-                <input id="module" class="form-control" @bind="@_module" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="description" HelpText="Enter a short description for the module" ResourceKey="Description">Description: </Label>
-            </td>
-            <td>
-                <textarea id="description" class="form-control" @bind="@_description" rows="3"></textarea>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="template" HelpText="Select a module template. Templates are located in the wwwroot/Modules/Templates folder on the server." ResourceKey="Template">Template: </Label>
-            </td>
-            <td>
-                <select id="template" class="form-select" @onchange="(e => TemplateChanged(e))">
-                    <option value="-">&lt;@Localizer["Template.Select"]&gt;</option>
-                    @foreach (Template template in _templates)
-                    {
-                        <option value="@template.Name">@template.Title</option>
-                    }
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="reference" HelpText="Select a framework reference version" ResourceKey="FrameworkReference">Framework Reference: </Label>
-            </td>
-            <td>
-                <select id="reference" class="form-select" @bind="@_reference">
-                    @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>
-            </td>
-        </tr>
-        @if (!string.IsNullOrEmpty(_location))
-        {
-            <tr>
-                <td>
-                    <Label For="location" HelpText="Location where the module will be created" ResourceKey="Location">Location: </Label>
-                </td>
-                <td>
-                    <input id="module" class="form-control" @bind="@_location" readonly />
-                </td>
-            </tr>
-        }
-    </table>
-    <button type="button" class="btn btn-success" @onclick="CreateModule">@Localizer["Module.Create"]</button>
-}
-else
-{
-    <button type="button" class="btn btn-success" @onclick="ActivateModule">@Localizer["Module.Activate"]</button>
-}
-
-@code {
-    private string _moduledefinitionname = string.Empty;
-    private string _owner = string.Empty;
-    private string _module = string.Empty;
-    private string _description = string.Empty;
-    private List<Template> _templates;
-    private string _template = "-";
-    private string[] _versions;
-    private string _reference = Constants.Version;
-    private string _minversion = "2.0.0";
-    private string _location = string.Empty;
-
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
-
-    protected override async Task OnParametersSetAsync()
-    {
-        try
-        {
-            _moduledefinitionname = SettingService.GetSetting(ModuleState.Settings, "ModuleDefinitionName", "");
-            _templates = await ModuleDefinitionService.GetModuleDefinitionTemplatesAsync();
-            _versions = Constants.ReleaseVersions.Split(',').Where(item => Version.Parse(item).CompareTo(Version.Parse("2.0.0")) >= 0).ToArray();
-
-            if (string.IsNullOrEmpty(_moduledefinitionname))
-            {
-                AddModuleMessage(Localizer["Info.Module.Creator"], MessageType.Info);
-            }
-            else
-            {
-                AddModuleMessage(Localizer["Info.Module.Activate"], MessageType.Info);
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Module Creator");
-        }
-    }
-
-    private async Task CreateModule()
-    {
-        try
-        {
-            if (IsValid(_owner) && IsValid(_module) && _owner != _module && _template != "-")
-            {
-                var moduleDefinition = new ModuleDefinition { Owner = _owner, Name = _module, Description = _description, Template = _template, Version = _reference };
-                moduleDefinition = await ModuleDefinitionService.CreateModuleDefinitionAsync(moduleDefinition);
-
-                var settings = ModuleState.Settings;
-                SettingService.SetSetting(settings, "ModuleDefinitionName", moduleDefinition.ModuleDefinitionName);
-                await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
-
-                GetLocation();
-
-                AddModuleMessage(string.Format(Localizer["Success.Module.Create"], NavigateUrl("admin/system")), MessageType.Success);
-            }
-            else
-            {
-                AddModuleMessage(Localizer["Message.Require.ValidName"], MessageType.Warning);
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Creating Module");
-        }
-    }
-
-    private async Task ActivateModule()
-    {
-        try
-        {
-            if (!string.IsNullOrEmpty(_moduledefinitionname))
-            {
-                Module module = await ModuleService.GetModuleAsync(ModuleState.ModuleId);
-                module.ModuleDefinitionName = _moduledefinitionname;
-                await ModuleService.UpdateModuleAsync(module);
-                NavigationManager.NavigateTo(NavigateUrl(), true);
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Activating Module");
-        }
-    }
-
-    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" && Regex.IsMatch(name, "^[A-Za-z_][A-Za-z0-9_]*$");
-    }
-
-    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;
-        }
-        GetLocation();
-    }
-
-    private void GetLocation()
-    {
-        _location = string.Empty;
-        if (_owner != "" && _module != "" && _template != "-")
-        {
-            var template = _templates.FirstOrDefault(item => item.Name == _template);
-            _location = template.Location + _owner + "." + _module;
-
-        }
-        StateHasChanged();
-    }
-}

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

@@ -1,15 +0,0 @@
-using Oqtane.Models;
-
-namespace Oqtane.Modules.Admin.ModuleCreator
-{
-    public class ModuleInfo : IModule
-    {
-        public ModuleDefinition ModuleDefinition => new ModuleDefinition
-        {
-            Name = "Module Creator",
-            Description = "Enables software developers to quickly create modules by automating many of the initial module creation tasks",
-            Version = "1.0.0",
-            Categories = "Developer"
-        };
-    }
-}

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

@@ -8,67 +8,178 @@
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <TabStrip>
-    <TabPanel Name="Download" ResourceKey="Download">
-        <ModuleMessage Type="MessageType.Info" Message="Download one or more modules from the list below. Once you are ready click Install to complete the installation."></ModuleMessage>
-
-        <table class="table table-borderless" style="margin: auto; width: 50% !important;">
-            <tr>
-                <td>
-                    <input id="search" class="form-control" placeholder="@SharedLocalizer["Search.Hint"]" @bind="@_search" />
-                </td>
-                <td>
-                    <button type="button" class="btn btn-primary" @onclick="Search">@SharedLocalizer["Search"]</button>&nbsp;
-                    <button type="button" class="btn btn-secondary" @onclick="Reset">@SharedLocalizer["Reset"]</button>
-                </td>
-            </tr>
-        </table>
-
-        @if (_packages != null)
-        {
-            if (_packages.Count > 0)
-            {
-                <Pager Items="@_packages">
-                    <Row>
-                        <td>
-                            <h3 style="display: inline;"><a href="@context.ProductUrl" target="_new">@context.Name</a></h3>&nbsp;&nbsp;by:&nbsp;&nbsp;<strong><a href="@context.OwnerUrl" target="new">@context.Owner</a></strong><br />
-                            @(context.Description.Length > 400 ? (context.Description.Substring(0, 400) + "...") : context.Description)<br />
-                            <strong>@(String.Format("{0:n0}", context.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp; @SharedLocalizer["Search.Released"]: <strong>@context.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;@SharedLocalizer["Search.Version"]: <strong>@context.Version</strong>&nbsp;&nbsp;|&nbsp;&nbsp;@SharedLocalizer["Search.Source"]: <strong>@context.PackageUrl</strong>
-                        </td>
-                        <td style="vertical-align: middle;">
-                            <button type="button" class="btn btn-primary" @onclick=@(async () => await DownloadModule(context.PackageId, context.Version))>@SharedLocalizer["Download"]</button>
-                        </td>
-                    </Row>
-                </Pager>
-            }
-            else
-            {
-                <br />
-                <div class="mx-auto text-center">
-                    @Localizer["Search.NoResults"]
+    <TabPanel Name="Download" ResourceKey="Download" Heading="Download">
+        <div class="row justify-content-center mb-3">
+            <div class="text-center">
+                <div class="form-check form-check-inline">
+                    <input id="free" class="form-check-input" type="radio" checked="@(_price == "free")" name="Price" @onchange="@(() => PriceChanged("free"))" />
+                    <label class="form-check-label" for="free">@SharedLocalizer["Free"]</label>
                 </div>
-            }
-        }
+                <div class="form-check form-check-inline">
+                    <input id="paid" class="form-check-input" type="radio" checked="@(_price == "paid")" name="Price" @onchange="@(() => PriceChanged("paid"))" />
+                    <label class="form-check-label" for="paid">@SharedLocalizer["Paid"]</label>
+                </div>
+            </div>
+        </div>
+        <div class="row justify-content-center mb-3">
+            <div class="col">
+                <div class="input-group">
+                    <span class="input-group-text">@Localizer["Product"]</span>
+                    <input id="search" class="form-control" placeholder="@SharedLocalizer["Search.Hint"]" @bind="@_search" />
+                    <button type="button" class="btn btn-primary" @onclick="Search">@SharedLocalizer["Search"]</button>
+                    <button type="button" class="btn btn-secondary" @onclick="Reset">@SharedLocalizer["Reset"]</button>
+                    <button type="button" class="btn btn-primary ms-2" @onclick="Refresh"><span class="@Icons.Reload" aria-hidden="true"></span></button>
+                </div>
+            </div>
+        </div>
+        <div class="row mb-3">
+            <div class="col">
+                @if (_initialized)
+                {
+                    <br />
+                    <div class="row mb-3">
+                        <div class="col-sm-4">
+                            <h3>@((_packages != null) ? _packages.Count : 0) @SharedLocalizer["Search.Results"]</h3>
+                        </div>
+                        <div class="col-sm-4">
+                            &nbsp;
+                        </div>
+                        <div class="col-sm-4">
+                            <select class="form-select" value="@_sort" @onchange="(e => SortChanged(e))">
+                                <option value="popularity">@SharedLocalizer["Search.Popularity"]</option>
+                                <option value="alphabetical">@SharedLocalizer["Search.Alphabetical"]</option>
+                                @if (_price == "free")
+                                {
+                                    <option value="downloads">@SharedLocalizer["Search.Downloads"]</option>
+                                }
+                                <option value="recent">@SharedLocalizer["Search.RecentlyReleased"]</option>
+                                @if (_price == "paid")
+                                {
+                                    <option value="price">@SharedLocalizer["Search.Price"]</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
+                    <Pager Format="Grid" Items="@_packages" DisplayPages="1" PageSize="9" Toolbar="Both" Class="container-fluid px-0" RowClass="row g-0" ColumnClass="col-lg-4 col-md-6"  CurrentPage="@_page.ToString()" OnPageChange="OnPageChange">
+                        <Row>
+                            <div class="m-2 p-2 d-flex justify-content-center">
+                                <div class="container-fluid px-0">
+                                    <div class="row g-0 mb-2">
+                                        <div class="col-4">
+                                            <a href="@context.ProductUrl" target="_blank">
+                                            @if (context.LogoUrl != null)
+                                            {
+                                                <img src="@context.LogoUrl" class="img-fluid" alt="@context.Name" />
+                                            }
+                                            else
+                                            {
+                                                <img src="/package.png" class="img-fluid" alt="@context.Name" />
+                                            }
+                                            </a>
+                                        </div>
+                                        <div class="col-8 text-end">
+                                            <small>@SharedLocalizer["Search.Version"]:</small> <strong>@context.Version</strong>
+                                            <br /><small>@SharedLocalizer["Search.Released"]:</small> <strong>@context.ReleaseDate.ToString("MM/dd/yyyy")</strong>
+                                            @if (!string.IsNullOrEmpty(context.PackageUrl))
+                                            {
+                                                <br /><small>@SharedLocalizer["Search.Source"]:</small> <strong>@(new Uri(context.PackageUrl).Host)</strong>
+                                            }
+                                            @if (context.Price == null)
+                                            {
+                                                <br /><small>@SharedLocalizer["Search.Downloads"]:</small> <strong>@(String.Format("{0:n0}", context.Downloads))</strong>
+                                            }
+                                            else
+                                            {
+                                                <br /><small>@SharedLocalizer["From"]:</small> <strong>@context.Price.Value.ToString("$#,##0.00")</strong>
+                                                @((MarkupString)(context.TrialPeriod > 0 ? " <strong>(" + context.TrialPeriod + " Day Trial)</strong>" : ""))
+                                            }
+                                        </div>
+                                    </div>
+                                    <div class="row g-0">
+                                        <div class="col">
+                                            <h3 style="display: inline;"><a href="@context.ProductUrl" target="_blank">@context.Name</a></h3><br />
+                                            <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))
+                                            {
+                                                <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>
+                                    </div>
+                                </div>
+                            </div>
+                        </Row>
+                    </Pager>
+                }
+            </div>
+        </div>
+        <br />
+        <ModuleMessage Type="MessageType.Info" Message="@SharedLocalizer["Oqtane.Marketplace"]" />
     </TabPanel>
-    <TabPanel Name="Upload" ResourceKey="Upload">
-        <table class="table table-borderless">
-            <tr>
-                <td>
-                    <Label HelpText="Upload one or more module packages. Once they are uploaded click Install to complete the installation." ResourceKey="Module">Module: </Label>
-                </td>
-                <td>
-                    <FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" UploadMultiple="true" />
-                </td>
-            </tr>
-        </table>
+    <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." ResourceKey="Module">Module: </Label>
+                <div class="col-sm-9">
+                    <FileManager Folder="@Constants.PackagesFolder" UploadMultiple="true" OnUpload="OnUpload" />
+                </div>
+            </div>
+        </div>
     </TabPanel>
 </TabStrip>
 
-<button type="button" class="btn btn-success" @onclick="InstallModules">@SharedLocalizer["Install"]</button>
+@if (_productname != "")
+{
+    <div class="app-actiondialog">
+        <div class="modal" tabindex="-1" role="dialog">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title">@SharedLocalizer["Review License Terms"]</h5>
+                        <button type="button" class="btn-close" aria-label="Close" @onclick="HideModal"></button>
+                    </div>
+                    <div class="modal-body">
+                        <p style="height: 200px; overflow-y: scroll;">
+                            <h3>@_productname</h3>
+                            @if (!string.IsNullOrEmpty(_packagelicense))
+                            {
+								@((MarkupString)_packagelicense)
+                            }
+                            else
+                            {
+                                @SharedLocalizer["License Not Specified"]
+                            }
+                        </p>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-success" @onclick="DownloadPackage">@SharedLocalizer["Accept"]</button>
+                        <button type="button" class="btn btn-secondary" @onclick="HideModal">@SharedLocalizer["Cancel"]</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+}
+
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 
 @code {
+    private bool _initialized = false;
+    private int _page = 1;
     private List<Package> _packages;
+    private string _price = "free";
+    private string _sort = "popularity";
     private string _search = "";
+    private string _productname = "";
+    private string _packageid = "";
+    private string _packagelicense = "";
+    private string _packageversion = "";
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
@@ -77,6 +188,7 @@
         try
         {
             await LoadModuleDefinitions();
+            _initialized = true;
         }
         catch (Exception ex)
         {
@@ -87,8 +199,10 @@
 
     private async Task LoadModuleDefinitions()
     {
+        ShowProgressIndicator();
+
         var moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
-        _packages = await PackageService.GetPackagesAsync("module", _search);
+        _packages = await PackageService.GetPackagesAsync("module", _search, _price, "", _sort);
 
         if (_packages != null)
         {
@@ -100,59 +214,102 @@
                 }
             }
         }
+
+        HideProgressIndicator();
+    }
+
+    private async void PriceChanged(string price)
+    {
+        _price = price;
+        _sort = "popularity";
+        await LoadModuleDefinitions();
+        StateHasChanged();
     }
 
     private async Task Search()
     {
-        try
-        {
-            await LoadModuleDefinitions();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error On Search");
-        }
+        await LoadModuleDefinitions();
     }
 
     private async Task Reset()
     {
-        try
-        {
-            _search = "";
-            await LoadModuleDefinitions();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error On Reset");
-        }
+        _page = 1;
+        _search = "";
+        await LoadModuleDefinitions();
     }
 
-    private async Task InstallModules()
+    private async Task Refresh()
+    {
+        await LoadModuleDefinitions();
+    }
+
+    private void OnPageChange(int page)
+    {
+        _page = page;
+    }
+
+    private async void SortChanged(ChangeEventArgs e)
+    {
+        _sort = (string)e.Value;
+        await LoadModuleDefinitions();
+    }
+
+    private void HideModal()
+    {
+        _productname = "";
+        _packagelicense = "";
+        StateHasChanged();
+    }
+
+    private async Task GetPackage(string packageid, string version)
     {
         try
         {
-            await ModuleDefinitionService.InstallModuleDefinitionsAsync();
-            AddModuleMessage(string.Format(Localizer["Success.Module.Install"], NavigateUrl("admin/system")), MessageType.Success);
+            var package = await PackageService.GetPackageAsync(packageid, version, false);
+            if (package != null)
+            {
+                _productname = package.Name;
+                _packageid = package.PackageId;
+                if (!string.IsNullOrEmpty(package.License))
+                {
+                    _packagelicense = package.License.Replace("\n", "<br />");
+                }
+                _packageversion = package.Version;
+                StateHasChanged();
+            }
+            else
+            {
+                await logger.LogError("Error Getting Package {PackageId} {Version}", packageid, version);
+                AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error);
+            }
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Installing Module");
+            await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", packageid, version);
+            AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error);
         }
     }
 
-    private async Task DownloadModule(string packageid, string version)
+    private async Task DownloadPackage()
     {
         try
         {
-            await PackageService.DownloadPackageAsync(packageid, version, "Packages");
-            await logger.LogInformation("Module {ModuleDefinitionName} {Version} Downloaded Successfully", packageid, version);
-            AddModuleMessage(Localizer["Success.Module.Download"], MessageType.Success);
+            await PackageService.DownloadPackageAsync(_packageid, _packageversion);
+            await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _packageid, _packageversion);
+            AddModuleMessage(string.Format(Localizer["Success.Module.Download"], NavigateUrl("admin/system")), MessageType.Success);
+            _productname = "";
+            _packagelicense = "";
             StateHasChanged();
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Downloading Module {ModuleDefinitionName} {Version}", packageid, version);
+            await logger.LogError(ex, "Error Downloading Package {PackageId} {Version}", _packageid, _packageversion);
             AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error);
         }
     }
+
+    private void OnUpload()
+    {
+        AddModuleMessage(string.Format(Localizer["Success.Module.Download"], NavigateUrl("admin/system")), MessageType.Success);
+    }
 }

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

@@ -10,98 +10,97 @@
 
 @if (_templates != null)
 {
-    <table class="table table-borderless">
-        <tr>
-            <td width="30%">
-                <Label 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>
-            </td>
-            <td>
-                <input id="owner" class="form-control" @bind="@_owner" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="module" HelpText="Enter a name for this module. It should not contain spaces or punctuation." ResourceKey="ModuleName">Module Name: </Label>
-            </td>
-            <td>
-                <input id="module" class="form-control" @bind="@_module" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="description" HelpText="Enter a short description for the module" ResourceKey="Description">Description: </Label>
-            </td>
-            <td>
-                <textarea id="description" class="form-control" @bind="@_description" rows="3"></textarea>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="template" HelpText="Select a module template. Templates are located in the wwwroot/Modules/Templates folder on the server." ResourceKey="Template">Template: </Label>
-            </td>
-            <td>
-                <select id="template" class="form-select" @onchange="(e => TemplateChanged(e))">
-                    <option value="-">&lt;@Localizer["Template.Select"]&gt;</option>
-                    @foreach (Template template in _templates)
-                    {
-                        <option value="@template.Name">@template.Title</option>
-                    }
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="reference" HelpText="Select a framework reference version" ResourceKey="FrameworkReference">Framework Reference: </Label>
-            </td>
-            <td>
-                <select id="reference" class="form-select" @bind="@_reference">
-                    @foreach (string version in _versions)
-                    {
-                        if (Version.Parse(version).CompareTo(Version.Parse(_minversion)) >= 0)
+    <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 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 or the word oqtane." ResourceKey="ModuleName">Module Name: </Label>
+                <div class="col-sm-9">
+                    <input id="module" class="form-control" @bind="@_module" required />
+                </div>
+            </div>
+            <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"></textarea>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="template" HelpText="Select a module template. Templates are located in the wwwroot/Modules/Templates folder on the server." ResourceKey="Template">Template: </Label>
+                <div class="col-sm-9">
+                    <select id="template" class="form-select" @onchange="(e => TemplateChanged(e))" required>
+                        <option value="-">&lt;@Localizer["Template.Select"]&gt;</option>
+                        @foreach (Template template in _templates)
                         {
-                            <option value="@(version)">@(version)</option>
+                            <option value="@template.Name">@template.Title</option>
                         }
-                    }
-                    <option value="local">@SharedLocalizer["LocalVersion"]</option>
-                </select>
-            </td>
-        </tr>
-        @if (!string.IsNullOrEmpty(_location))
-        {
-            <tr>
-                <td>
-                    <Label For="location" HelpText="Location where the module will be created" ResourceKey="Location">Location: </Label>
-                </td>
-                <td>
-                    <input id="module" class="form-control" @bind="@_location" readonly />
-                </td>
-            </tr>
-        }
-    </table>
-    <button type="button" class="btn btn-success" @onclick="CreateModule">@Localizer["CreateModule"]</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+                    </select>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <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>
+                    <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>
+        <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+    </form>
 }
 
 @code {
+    private ElementReference form;
+    private bool validated = false;
     private string _owner = string.Empty;
     private string _module = string.Empty;
     private string _description = string.Empty;
     private List<Template> _templates;
     private string _template = "-";
     private string[] _versions;
-    private string _reference = Constants.Version;
+    private string _reference = "local";
     private string _minversion = "2.0.0";
     private string _location = string.Empty;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
+    protected override void OnInitialized()
+    {
+        if (!NavigationManager.BaseUri.Contains("localhost:"))
+        {
+            AddModuleMessage(Localizer["Info.Module.Development"], MessageType.Info);
+        }
+    }
+
     protected override async Task OnParametersSetAsync()
     {
         try
         {
             _templates = await ModuleDefinitionService.GetModuleDefinitionTemplatesAsync();
             _versions = Constants.ReleaseVersions.Split(',').Where(item => Version.Parse(item).CompareTo(Version.Parse("2.0.0")) >= 0).ToArray();
-            AddModuleMessage(Localizer["Info.Module.Development"], MessageType.Info);
         }
         catch (Exception ex)
         {
@@ -111,30 +110,56 @@
 
     private async Task CreateModule()
     {
-        try
+        validated = true;
+        _owner = _owner.Trim();
+        _module = _module.Trim();
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
         {
-            if (IsValid(_owner) && IsValid(_module) && _owner != _module && _template != "-")
+            try
             {
-                var moduleDefinition = new ModuleDefinition { Owner = _owner, Name = _module, Description = _description, Template = _template, Version = _reference };
-                moduleDefinition = await ModuleDefinitionService.CreateModuleDefinitionAsync(moduleDefinition);
-                GetLocation();
-                AddModuleMessage(string.Format(Localizer["Success.Module.Create"], NavigateUrl("admin/system")), MessageType.Success);
+                if (IsValid(_owner) && IsValid(_module) && _owner != _module && _template != "-")
+                {
+                    if (string.IsNullOrEmpty(_description)) _description = _module;
+                    if (IsValidXML(_description))
+                    {
+                        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();
+                        AddModuleMessage(string.Format(Localizer["Success.Module.Create"], NavigateUrl("admin/system")), MessageType.Success);
+                    }
+                    else
+                    {
+                        AddModuleMessage(Localizer["Message.Require.ValidDescription"], MessageType.Warning);
+                    }
+                }
+                else
+                {
+                    AddModuleMessage(Localizer["Message.Require.ValidName"], MessageType.Warning);
+                }
             }
-            else
+            catch (Exception ex)
             {
-                AddModuleMessage(Localizer["Message.Require.ValidName"], MessageType.Warning);
+                await logger.LogError(ex, "Error Creating Module");
             }
         }
-        catch (Exception ex)
+        else
         {
-            await logger.LogError(ex, "Error Creating Module");
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
 
     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" && 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)
+    {
+        // must contain letters, digits, or spaces
+        return Regex.IsMatch(description, "^[A-Za-z0-9 .,!?]+$");
     }
 
     private void TemplateChanged(ChangeEventArgs e)
@@ -155,8 +180,14 @@
         if (_owner != "" && _module != "" && _template != "-")
         {
             var template = _templates.FirstOrDefault(item => item.Name == _template);
-            _location = template.Location + _owner + "." + _module;
-
+            if (!string.IsNullOrEmpty(template.Namespace))
+            {
+                _location = template.Location + template.Namespace.Replace("[Owner]", _owner).Replace("[Module]", _module);
+            }
+            else
+            {
+                _location = template.Location + _owner + ".Module." + _module;
+            }
         }
         StateHasChanged();
     }

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

@@ -1,137 +1,251 @@
 @namespace Oqtane.Modules.Admin.ModuleDefinitions
 @inherits ModuleBase
+@using System.Globalization
 @inject IModuleDefinitionService ModuleDefinitionService
+@inject IPackageService PackageService
+@inject ILanguageService LanguageService
 @inject NavigationManager NavigationManager
 @inject IStringLocalizer<Edit> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
+@inject IPageModuleService PageModuleService
+@inject IModuleService ModuleService
+@inject IPageService PageService
 
-<TabStrip>
-    <TabPanel Name="Definition" ResourceKey="Definition">
-        <table class="table table-borderless">
-            <tr>
-                <td width="30%">
-                    <Label For="name" HelpText="The name of the module" ResourceKey="Name">Name: </Label>
-                </td>
-                <td>
-                    <input id="name" class="form-control" @bind="@_name" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <Label For="description" HelpText="The description of the module" ResourceKey="Description">Description: </Label>
-                </td>
-                <td>
-                    <textarea id="description" class="form-control" @bind="@_description" rows="2"></textarea>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <Label For="categories" HelpText="Comma delimited list of module categories" ResourceKey="Categories">Categories: </Label>
-                </td>
-                <td>
-                    <input id="categories" class="form-control" @bind="@_categories" />
-                </td>
-            </tr>
-        </table>
-        <Section Name="Information" ResourceKey="Information">
-            <table class="table table-borderless">
-                <tr>
-                    <td width="30%">
-                        <Label For="moduledefinitionname" HelpText="The internal name of the module" ResourceKey="InternalName">Internal Name: </Label>
-                    </td>
-                    <td>
-                        <input id="moduledefinitionname" class="form-control" @bind="@_moduledefinitionname" disabled />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="version" HelpText="The version of the module" ResourceKey="Version">Version: </Label>
-                    </td>
-                    <td>
-                        <input id="version" class="form-control" @bind="@_version" disabled />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="owner" HelpText="The owner or creator of the module" ResourceKey="Owner">Owner: </Label>
-                    </td>
-                    <td>
-                        <input id="owner" class="form-control" @bind="@_owner" disabled />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="url" HelpText="The reference url of the module" ResourceKey="ReferenceUrl">Reference Url: </Label>
-                    </td>
-                    <td>
-                        <input id="url" class="form-control" @bind="@_url" disabled />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="contact" HelpText="The contact for the module" ResourceKey="Contact">Contact: </Label>
-                    </td>
-                    <td>
-                        <input id="contact" class="form-control" @bind="@_contact" disabled />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="license" HelpText="The module license terms" ResourceKey="License">License: </Label>
-                    </td>
-                    <td>
-                        <textarea id="license" class="form-control" @bind="@_license" rows="5" disabled></textarea>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="runtimes" HelpText="The Blazor runtimes which this module supports" ResourceKey="Runtimes">Runtimes: </Label>
-                    </td>
-                    <td>
-                        <input id="runtimes" class="form-control" @bind="@_runtimes" disabled />
-                    </td>
-                </tr>
-            </table>
-        </Section>
-    </TabPanel>
-    <TabPanel Name="Permissions" ResourceKey="Permissions">
-        <table class="table table-borderless">
-            <tr>
-                <td>
-                    <PermissionGrid EntityName="@EntityNames.ModuleDefinition" PermissionNames="@PermissionNames.Utilize" Permissions="@_permissions" @ref="_permissionGrid" />
-                </td>
-            </tr>
-        </table>
-    </TabPanel>
-</TabStrip>
-<button type="button" class="btn btn-success" @onclick="SaveModuleDefinition">@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>
+@if (_initialized)
+{
+	<TabStrip>
+        <TabPanel Name="Definition" ResourceKey="Definition" Heading="Definition">
+			<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+				<div class="container">
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="name" HelpText="The name of the module" ResourceKey="Name">Name: </Label>
+						<div class="col-sm-9">
+							<input id="name" class="form-control" @bind="@_name" maxlength="200" required />
+						</div>
+					</div>
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="description" HelpText="The description of the module" ResourceKey="Description">Description: </Label>
+						<div class="col-sm-9">
+							<textarea id="description" class="form-control" @bind="@_description" rows="2" maxlength="2000" required></textarea>
+						</div>
+					</div>
+					<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" />
+						</div>
+					</div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="isenabled" HelpText="Is module enabled for this site?" ResourceKey="IsEnabled">Enabled? </Label>
+                        <div class="col-sm-9">
+                            <select id="isenabled" class="form-select" @bind="@_isenabled" required>
+                                <option value="True">@SharedLocalizer["Yes"]</option>
+                                <option value="False">@SharedLocalizer["No"]</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+			</form>
+			<Section Name="Information" ResourceKey="Information">
+				<div class="container">
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="moduledefinitionname" HelpText="The internal name of the module" ResourceKey="InternalName">Internal Name: </Label>
+						<div class="col-sm-9">
+							<input id="moduledefinitionname" class="form-control" @bind="@_moduledefinitionname" disabled />
+						</div>
+					</div>
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="version" HelpText="The version of the module" ResourceKey="Version">Version: </Label>
+						<div class="col-sm-9">
+							<input id="version" class="form-control" @bind="@_version" disabled />
+						</div>
+					</div>
+					<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">
+                            <input id="packagename" class="form-control" @bind="@_packagename" disabled />
+						</div>
+					</div>
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="owner" HelpText="The owner or creator of the module" ResourceKey="Owner">Owner: </Label>
+						<div class="col-sm-9">
+							<input id="owner" class="form-control" @bind="@_owner" disabled />
+						</div>
+					</div>
+					<div class="row mb-1 align-items-center">
+						<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>
+					</div>
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="contact" HelpText="The contact for the module" ResourceKey="Contact">Contact: </Label>
+						<div class="col-sm-9">
+							<input id="contact" class="form-control" @bind="@_contact" disabled />
+						</div>
+					</div>
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="license" HelpText="The module license terms" ResourceKey="License">License: </Label>
+						<div class="col-sm-9">
+                            @if (_license.StartsWith("http") || _license.StartsWith("/") || _license.StartsWith("~"))
+                            {
+                                <a href="@_license.Replace("~", PageState?.Alias.BaseUrl + "/Modules/" + Utilities.GetTypeName(_moduledefinitionname))" class="btn btn-info" style="text-decoration: none !important" target="_new">@Localizer["View License"]</a>
+                            }
+                            else
+                            {
+                                <textarea id="license" class="form-control" @bind="@_license" rows="5" disabled></textarea>
+                            }
+						</div>
+					</div>
+				</div>
+			</Section>
+			<br />
+			<button type="button" class="btn btn-success" @onclick="SaveModuleDefinition">@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>
+		</TabPanel>
+		<TabPanel Name="Permissions" ResourceKey="Permissions" Heading="Permissions">
+			<div class="container">
+				<div class="row mb-1 align-items-center">
+					<PermissionGrid EntityName="@EntityNames.ModuleDefinition" PermissionNames="@PermissionNames.Utilize" PermissionList="@_permissions" @ref="_permissionGrid" />
+				</div>
+			</div>
+			<br />
+			<button type="button" class="btn btn-success" @onclick="SaveModuleDefinition">@SharedLocalizer["Save"]</button>
+			<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+		</TabPanel>
+        <TabPanel Name="Pages" ResourceKey="Pages" Heading="Pages">
+                <Pager Items="@_pagesWithModules" RowClass="align-middle">
+                <Header>
+                <th style="width: 1px;">&nbsp;</th>
+                <th>@SharedLocalizer["Name"]</th>
+                </Header>
+                <Row>
+                    <td><button type="button" class="btn btn-secondary" @onclick="@(async () => NavigationManager.NavigateTo(Browse(context)))">@Localizer["Browse"]</button></td>
+                    <td>@(string.IsNullOrEmpty(context.Title) ? @context.Name : @context.Title )</td>
+                </Row>
+                </Pager>
+        </TabPanel>
+        <TabPanel Name="Translations" ResourceKey="Translations" Heading="Translations">
+			@if (_languages != null && _languages.Count > 0)
+			{
+                <Pager Items="@_languages">
+					<Header>
+					<th>@SharedLocalizer["Name"]</th>
+					<th>@Localizer["Code"]</th>
+					<th style="width: 1px;">@Localizer["Version"]</th>
+					<th style="width: 1px;">&nbsp;</th>
+					</Header>
+					<Row>
+						<td>@context.Name</td>
+						<td>@context.Code</td>
+						<td>@((string.IsNullOrEmpty(context.Version)) ? "---" : context.Version)</td>
+						<td>
+							@switch (TranslationAvailable(_packagename + "." + context.Code, context.Version))
+							{
+								case "install":
+									<button type="button" class="btn btn-success" @onclick=@(async () => await GetPackage(_packagename + "." + context.Code))>@SharedLocalizer["Download"]</button>
+									break;
+								case "upgrade":
+									<button type="button" class="btn btn-success" @onclick=@(async () => await GetPackage(_packagename + "." + context.Code))>@SharedLocalizer["Upgrade"]</button>
+									break;
+							}
+						</td>
+					</Row>
+				</Pager>
+			}
+			else
+			{
+				<br />
+				<div class="mx-auto text-center">
+					@if (string.IsNullOrEmpty(_packagename))
+					{
+						@Localizer["Search.PackageNameMissing"]
+					}
+					else
+					{
+						@Localizer["Search.NoResults"]
+					}
+				</div>
+				<br />
+			}
+		</TabPanel>
+	</TabStrip>
+
+	@if (_package != null)
+	{
+		<div class="app-actiondialog">
+			<div class="modal" tabindex="-1" role="dialog">
+				<div class="modal-dialog">
+					<div class="modal-content">
+						<div class="modal-header">
+							<h5 class="modal-title">@SharedLocalizer["Review License Terms"]</h5>
+							<button type="button" class="btn-close" aria-label="Close" @onclick="HideModal"></button>
+						</div>
+						<div class="modal-body">
+							<p style="height: 200px; overflow-y: scroll;">
+								<h4 style="display: inline;"><a href="@_package.ProductUrl" target="_new">@_package.Name</a></h4><br />
+								@SharedLocalizer["Search.By"]:&nbsp;&nbsp;<strong><a href="@_package.OwnerUrl" target="new">@_package.Owner</a></strong><br />
+								@(_package.Description.Length > 400 ? (_package.Description.Substring(0, 400) + "...") : _package.Description)<br />
+								<strong>@(String.Format("{0:n0}", _package.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp;
+								@SharedLocalizer["Search.Released"]: <strong>@_package.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;
+								@SharedLocalizer["Search.Version"]: <strong>@_package.Version</strong>
+								@((MarkupString)(!string.IsNullOrEmpty(_package.PackageUrl) ? "&nbsp;&nbsp;|&nbsp;&nbsp;" + SharedLocalizer["Search.Source"] + ": <strong>" + new Uri(_package.PackageUrl).Host + "</strong>" : ""))
+								<br /><br />
+								@if (!string.IsNullOrEmpty(_package.License))
+								{
+									@((MarkupString)_package.License.Replace("\n", "<br />"))
+								}
+								else
+								{
+									@SharedLocalizer["License Not Specified"]
+								}
+							</p>
+						</div>
+						<div class="modal-footer">
+							<button type="button" class="btn btn-success" @onclick="DownloadTranslation">@SharedLocalizer["Accept"]</button>
+							<button type="button" class="btn btn-secondary" @onclick="HideModal">@SharedLocalizer["Cancel"]</button>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	}
+}
 
 @code {
+    private bool _initialized = false;
+    private ElementReference form;
+    private bool validated = false;
     private int _moduleDefinitionId;
     private string _name;
-    private string _version;
-    private string _categories;
-    private string _moduledefinitionname = "";
     private string _description = "";
+    private string _categories;
+    private string _isenabled;
+    private string _moduledefinitionname = "";
+    private string _version;
+    private string _packagename = "";
     private string _owner = "";
     private string _url = "";
     private string _contact = "";
     private string _license = "";
-    private string _runtimes = "";
-    private string _permissions;
+    private List<Permission> _permissions = null;
     private string _createdby;
     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<Package> _packages;
+    private List<Language> _languages;
+    private Package _package;
+
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
     protected override async Task OnInitializedAsync()
@@ -143,20 +257,51 @@
             if (moduleDefinition != null)
             {
                 _name = moduleDefinition.Name;
-                _version = moduleDefinition.Version;
-                _categories = moduleDefinition.Categories;
-                _moduledefinitionname = moduleDefinition.ModuleDefinitionName;
                 _description = moduleDefinition.Description;
+                _categories = moduleDefinition.Categories;
+                _isenabled = moduleDefinition.IsEnabled.ToString();
+                _moduledefinitionname = moduleDefinition.ModuleDefinitionName;
+                _version = moduleDefinition.Version;
+                _packagename = moduleDefinition.PackageName;
                 _owner = moduleDefinition.Owner;
                 _url = moduleDefinition.Url;
                 _contact = moduleDefinition.Contact;
                 _license = moduleDefinition.License;
-                _runtimes = moduleDefinition.Runtimes;
-                _permissions = moduleDefinition.Permissions;
+                _permissions = moduleDefinition.PermissionList;
                 _createdby = moduleDefinition.CreatedBy;
                 _createdon = moduleDefinition.CreatedOn;
                 _modifiedby = moduleDefinition.ModifiedBy;
                 _modifiedon = moduleDefinition.ModifiedOn;
+
+                if (!string.IsNullOrEmpty(_packagename))
+                {
+                    _packages = await PackageService.GetPackagesAsync("translation", "", "", _packagename);
+                    _languages = await LanguageService.GetLanguagesAsync(-1, _packagename);
+                    foreach (var package in _packages)
+                    {
+                        var code = package.PackageId.Split('.').Last();
+                        if (!_languages.Any(item => item.Code == code))
+                        {
+                            _languages.Add(new Language { Code = code, Name = CultureInfo.GetCultureInfo(code).DisplayName, Version = package.Version, IsDefault = true });
+                        }
+                    }
+                    _languages = _languages.OrderBy(item => item.Name).ToList();
+                }
+
+                // get distinct pages where module exists
+                var modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId);
+                var distinctPageIds = modules
+                    .Where(md => md.ModuleDefinition?.ModuleDefinitionId == _moduleDefinitionId && md.IsDeleted == false)
+                    .Select(md => md.PageId)
+                    .Distinct();
+
+                // retrieve the pages which contain the module
+                var pages = await PageService.GetPagesAsync(PageState.Site.SiteId);
+                _pagesWithModules = pages
+                    .Where(pg => distinctPageIds.Contains(pg.PageId) && pg.IsDeleted == false)
+                    .ToList();
+
+                _initialized = true;
             }
         }
         catch (Exception ex)
@@ -168,30 +313,119 @@
 
     private async Task SaveModuleDefinition()
     {
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
+        {
+            try
+            {
+                var moduleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
+                if (!moduleDefinitions.Any(item => item.Name.ToLower() == _name.ToLower() && item.ModuleDefinitionId != _moduleDefinitionId))
+                {
+                    var moduledefinition = await ModuleDefinitionService.GetModuleDefinitionAsync(_moduleDefinitionId, ModuleState.SiteId);
+                    if (moduledefinition.Name != _name)
+                    {
+                        moduledefinition.Name = _name;
+                    }
+                    if (moduledefinition.Description != _description)
+                    {
+                        moduledefinition.Description = _description;
+                    }
+                    if (moduledefinition.Categories != _categories)
+                    {
+                        moduledefinition.Categories = _categories;
+                    }
+                    moduledefinition.IsEnabled = (_isenabled == null ? true : bool.Parse(_isenabled));
+                    moduledefinition.PermissionList = _permissionGrid.GetPermissionList();
+                    await ModuleDefinitionService.UpdateModuleDefinitionAsync(moduledefinition);
+                    await logger.LogInformation("ModuleDefinition Saved {ModuleDefinition}", moduledefinition);
+                    NavigationManager.NavigateTo(NavigateUrl());
+                }
+                else
+                {
+                    AddModuleMessage(Localizer["Message.DuplicateName"], MessageType.Warning);
+                }
+            }
+            catch (Exception ex)
+            {
+                await logger.LogError(ex, "Error Saving ModuleDefinition {ModuleDefinitionId} {Error}", _moduleDefinitionId, ex.Message);
+                AddModuleMessage(Localizer["Error.Module.Save"], MessageType.Error);
+            }
+        }
+        else
+        {
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+        }
+    }
+
+    private void HideModal()
+    {
+        _package = null;
+        StateHasChanged();
+    }
+
+    private string TranslationAvailable(string packagename, string version)
+    {
+        if (_packages != null)
+        {
+            var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
+            if (package != null)
+            {
+                if (string.IsNullOrEmpty(version))
+                {
+                    return "install";
+                }
+                else
+                {
+                    if (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0)
+                    {
+                        return "upgrade";
+                    }
+                }
+            }
+        }
+        return "";
+    }
+
+    private async Task GetPackage(string packagename)
+    {
+        var version = _packages.Where(item => item.PackageId == packagename).FirstOrDefault().Version;
         try
         {
-            var moduledefinition = await ModuleDefinitionService.GetModuleDefinitionAsync(_moduleDefinitionId, ModuleState.SiteId);
-            if (moduledefinition.Name != _name)
+            _package = await PackageService.GetPackageAsync(packagename, version, false);
+            if (_package != null)
             {
-                moduledefinition.Name = _name;
+                StateHasChanged();
             }
-            if (moduledefinition.Description != _description)
+            else
             {
-                moduledefinition.Description = _description;
+                await logger.LogError("Error Getting Package {PackageId} {Version}", packagename, version);
+                AddModuleMessage(Localizer["Error.Translation.Download"], MessageType.Error);
             }
-            if (moduledefinition.Categories != _categories)
-            {
-                moduledefinition.Categories = _categories;
-            }
-            moduledefinition.Permissions = _permissionGrid.GetPermissions();
-            await ModuleDefinitionService.UpdateModuleDefinitionAsync(moduledefinition);
-            await logger.LogInformation("ModuleDefinition Saved {ModuleDefinition}", moduledefinition);
-            NavigationManager.NavigateTo(NavigateUrl());
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Saving ModuleDefinition {ModuleDefinitionId} {Error}", _moduleDefinitionId, ex.Message);
-            AddModuleMessage(Localizer["Error.Module.Save"], MessageType.Error);
+            await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", packagename, version);
+            AddModuleMessage(Localizer["Error.Translation.Download"], MessageType.Error);
         }
     }
+
+    private async Task DownloadTranslation()
+    {
+        try
+        {
+            await PackageService.DownloadPackageAsync(_package.PackageId, _package.Version);
+            await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _package.PackageId, _package.Version);
+            AddModuleMessage(string.Format(Localizer["Success.Translation.Download"], NavigateUrl("admin/system")), MessageType.Success);
+            _package = null;
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Downloading Package {PackageId} {Version}", _packagename, _version);
+            AddModuleMessage(Localizer["Error.Translation.Download"], 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,9 +13,30 @@
 }
 else
 {
-    <ActionLink Action="Add" Text="Install Module" ResourceKey="InstallModule" />
-    @((MarkupString)"&nbsp;")
-    <ActionLink Action="Create" Text="Create Module" ResourceKey="CreateModule" Class="btn btn-secondary" />
+    <div class="container">
+        <div class="row mb-3 align-items-center">
+            <div class="col-sm-6">
+                <ActionLink Action="Add" Text="Install Module" ResourceKey="InstallModule" />
+                <ActionLink Action="Create" Text="Create Module" ResourceKey="CreateModule" Class="btn btn-secondary ps-2" />
+                <button type="button" class="btn btn-secondary pw-2" @onclick="@Synchronize">@Localizer["Synchronize"]</button>
+            </div>
+            <div class="col-sm-6">
+                <select class="form-select" @onchange="(e => CategoryChanged(e))">
+                    @foreach (var category in _categories)
+                    {
+                        if (category == _category)
+                        {
+                            <option value="@category" selected>@category @Localizer["Modules"]</option>
+                        }
+                        else
+                        {
+                            <option value="@category">@category @Localizer["Modules"]</option>
+                        }
+                    }
+                </select>
+            </div>
+        </div>
+    </div>
 
     <Pager Items="@_moduleDefinitions">
         <Header>
@@ -22,31 +44,68 @@ else
             <th style="width: 1px;">&nbsp;</th>
             <th>@SharedLocalizer["Name"]</th>
             <th>@SharedLocalizer["Version"]</th>
+            <th>@Localizer["Enabled"]</th>
+            <th>@Localizer["InUse"]</th>
+            <th>@SharedLocalizer["Support"]</th>
+            <th>@SharedLocalizer["Expires"]</th>
             <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 != "Oqtane.Client")
-                    {
+                @if (context.AssemblyName != Constants.ClientId)
+                {
                     <ActionDialog Header="Delete Module" Message="@string.Format(Localizer["Confirm.Module.Delete", context.Name])" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" ResourceKey="DeleteModule" />
-                    }
+                }
             </td>
             <td>@context.Name</td>
             <td>@context.Version</td>
             <td>
-                @if (UpgradeAvailable(context.PackageName, context.Version))
-                    {
-                    <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadModule(context.PackageName, context.Version))>@SharedLocalizer["Upgrade"]</button>
-                    }
+                @if (context.IsEnabled)
+                {
+                    <span>@SharedLocalizer["Yes"]</span>
+                }
+                else
+                {
+                    <span>@SharedLocalizer["No"]</span>
+                }
+            </td>
+            <td>
+                @if (context.AssemblyName == Constants.ClientId || _modules.Where(m => m.ModuleDefinition?.ModuleDefinitionId == context.ModuleDefinitionId).FirstOrDefault() != null)
+                {
+                    <span>@SharedLocalizer["Yes"]</span>
+                }
+                else
+                {
+                    <span>@SharedLocalizer["No"]</span>
+                }
+            </td>
+            <td>
+                @((MarkupString)SupportLink(context.PackageName, context.Version))
+            </td>
+            <td>
+                @((MarkupString)PurchaseLink(context.PackageName))
+            </td>
+            <td>
+                @{ 
+                    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>
+                }
             </td>
         </Row>
     </Pager>
 }
 
 @code {
+    private List<Module> _modules;
+    private List<ModuleDefinition> _allModuleDefinitions;
     private List<ModuleDefinition> _moduleDefinitions;
     private List<Package> _packages;
+    private List<string> _categories = new List<string>();
+    private string _category = "Common";
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
@@ -54,8 +113,10 @@ else
     {
         try
         {
-            _moduleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
-            _packages = await PackageService.GetPackagesAsync("module");
+            _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();
         }
         catch (Exception ex)
         {
@@ -67,28 +128,69 @@ else
         }
     }
 
-    private bool UpgradeAvailable(string packagename, string version)
+    private async Task LoadModuleDefinitions()
     {
-        var upgradeavailable = false;
-        if (_packages != null)
+        _moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Contains(_category)).ToList();
+        _packages = await PackageService.GetPackageUpdatesAsync("module");
+    }
+
+    private string PurchaseLink(string packagename)
+    {
+        string link = "";
+        if (!string.IsNullOrEmpty(packagename) && _packages != null)
         {
             var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
             if (package != null)
             {
-                upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0);
+                if (package.ExpiryDate != null && package.ExpiryDate.Value.Date != DateTime.MaxValue.Date)
+                {
+                    if (string.IsNullOrEmpty(package.PaymentUrl))
+                    {
+                        link = "<span>" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</span>";
+                    }
+                    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 upgradeavailable;
+        return link;
+    }
+
+    private string SupportLink(string packagename, string version)
+    {
+        string link = "";
+        if (!string.IsNullOrEmpty(packagename) && _packages != null)
+        {
+            var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
+            if (package != null && !string.IsNullOrEmpty(package.SupportUrl))
+            {
+                link += "<a class=\"btn btn-info\" style=\"text-decoration: none !important\" href=\"" + package.SupportUrl.Replace("{Version}", version) + "\" target=\"_new\">" + SharedLocalizer["Help"] + "</a>";
+            }
+        }
+        return link;
+    }
+
+    private string UpgradeAvailable(string packagename, string version)
+    {
+        if (!string.IsNullOrEmpty(packagename) && _packages != null)
+        {
+            var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
+            if (package != null && Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0)
+            {
+                return package.Version;
+            }
+        }
+        return version;
     }
 
     private async Task DownloadModule(string packagename, string version)
     {
         try
         {
-            await PackageService.DownloadPackageAsync(packagename, version, "Packages");
+            await PackageService.DownloadPackageAsync(packagename, version);
             await logger.LogInformation("Module Downloaded {ModuleDefinitionName} {Version}", packagename, version);
-            await ModuleDefinitionService.InstallModuleDefinitionsAsync();
             AddModuleMessage(string.Format(Localizer["Success.Module.Install"], NavigateUrl("admin/system")), MessageType.Success);
         }
         catch (Exception ex)
@@ -112,4 +214,33 @@ else
             AddModuleMessage(Localizer["Error.Module.Delete"], MessageType.Error);
         }
     }
+
+    private async Task CategoryChanged(ChangeEventArgs e)
+    {
+        _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,31 +5,97 @@
 @inject IStringLocalizer<Export> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<table class="table table-borderless">
-    <tbody>
-        <tr>
-            <td width="30%">
-                <Label For="content" HelpText="Enter the module content" ResourceKey="Content">Content: </Label>
-            </td>
-            <td>
-                <textarea id="content" class="form-control" @bind="@_content" rows="5"></textarea>
-            </td>
-        </tr>
-    </tbody>
-</table>
-<button type="button" class="btn btn-success" @onclick="ExportModule">@Localizer["Export"]</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+<TabStrip>
+    <TabPanel Name="Content" Heading="Content" ResourceKey="Content">
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="content" HelpText="Select the Export option and you will be able to view the module content" ResourceKey="Content">Content: </Label>
+                <div class="col-sm-9">
+                    <textarea id="content" class="form-control" @bind="@_content" rows="5" readonly></textarea>
+                </div>
+            </div>
+        </div>
+        <br />
+        <button type="button" class="btn btn-success" @onclick="ExportText">@Localizer["Export"]</button>
+        <NavLink class="btn btn-secondary" href="@PageState.ReturnUrl">@SharedLocalizer["Cancel"]</NavLink>
+    </TabPanel>
+    <TabPanel Name="File" Heading="File" ResourceKey="File">
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="folder" HelpText="Select a folder where you wish to save the exported content" ResourceKey="Folder">Folder: </Label>
+                <div class="col-sm-9">
+                    <FileManager ShowFiles="false" ShowUpload="false" @ref="_filemanager" />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="filename" HelpText="Specify a name for the file (without an extension)" ResourceKey="Filename">Filename: </Label>
+                <div class="col-sm-9">
+                    <input id="content" type="text" class="form-control" @bind="@_filename" />
+                </div>
+            </div>
+        </div>
+        <br />
+        <button type="button" class="btn btn-success" @onclick="ExportFile">@Localizer["Export"]</button>
+        <NavLink class="btn btn-secondary" href="@PageState.ReturnUrl">@SharedLocalizer["Cancel"]</NavLink>
+    </TabPanel>
+</TabStrip>
+
 
 
 @code {
     private string _content = string.Empty;
+    private FileManager _filemanager;
+    private string _filename = string.Empty;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
     public override string Title => "Export Content";
 
-
-    private async Task ExportModule()
+    protected override void OnInitialized()
     {
-        _content = await ModuleService.ExportModuleAsync(ModuleState.ModuleId);
+        _filename = Utilities.GetFriendlyUrl(ModuleState.Title);
     }
+
+    private async Task ExportText()
+    {
+        try
+        {
+            _content = await ModuleService.ExportModuleAsync(ModuleState.ModuleId, PageState.Page.PageId);
+            AddModuleMessage(Localizer["Success.Content.Export"], MessageType.Success);
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Exporting Module {ModuleId} {Error}", ModuleState.ModuleId, ex.Message);
+            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,56 +2,79 @@
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IModuleService ModuleService
+@inject IFileService FileService
 @inject IStringLocalizer<Import> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<table class="table table-borderless">
-    <tbody>
-        <tr>
-            <td width="30%">
-                <Label For="content" HelpText="Enter the module content" ResourceKey="Content">Content: </Label>
-            </td>
-            <td>
-                <textarea id="content" class="form-control" @bind="@_content" rows="5"></textarea>
-            </td>
-        </tr>
-    </tbody>
-</table>
-<button type="button" class="btn btn-success" @onclick="ImportModule">@Localizer["Import"]</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
-
+<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="file" HelpText="Optionally upload or select a file to import for this module" ResourceKey="File">File: </Label>
+            <div class="col-sm-9">
+                <FileManager Filter="json" OnSelectFile="OnSelectFile" />
+            </div>
+        </div>
+        <hr />
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="content" HelpText="Provide the module content to import" ResourceKey="Content">Content: </Label>
+            <div class="col-sm-9">
+                <textarea id="content" class="form-control" @bind="@_content" rows="5" required></textarea>
+            </div>
+        </div>
+    </div>
+    <br />
+    <button type="button" class="btn btn-success" @onclick="ImportModule">@Localizer["Import"]</button>
+    <NavLink class="btn btn-secondary" href="@PageState.ReturnUrl">@SharedLocalizer["Cancel"]</NavLink>
+</form>
 
 @code {
     private string _content = string.Empty;
+    private ElementReference form;
+    private bool validated = false;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    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()
     {
-        if (_content != string.Empty)
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
         {
-            try
+            if (_content != string.Empty)
             {
-                bool success = await ModuleService.ImportModuleAsync(ModuleState.ModuleId, _content);
-                if (success)
+                try
                 {
-                    AddModuleMessage(Localizer["Success.Content.Import"], MessageType.Success);
+					bool success = await ModuleService.ImportModuleAsync(ModuleState.ModuleId, PageState.Page.PageId, _content);
+                    if (success)
+                    {
+                        AddModuleMessage(Localizer["Success.Content.Import"], MessageType.Success);
+                    }
+                    else
+                    {
+                        AddModuleMessage(Localizer["Message.Content.ImportProblem"], MessageType.Warning);
+                    }
                 }
-                else
+                catch (Exception ex)
                 {
-                    AddModuleMessage(Localizer["Message.Content.ImportProblem"], MessageType.Warning);
+                    await logger.LogError(ex, "Error Importing Module {ModuleId} {Error}", ModuleState.ModuleId, ex.Message);
+                    AddModuleMessage(Localizer["Error.Module.Import"], MessageType.Error);
                 }
             }
-            catch (Exception ex)
+            else
             {
-                await logger.LogError(ex, "Error Importing Module {ModuleId} {Error}", ModuleState.ModuleId, ex.Message);
-                AddModuleMessage(Localizer["Error.Module.Import"], MessageType.Error);
+                AddModuleMessage(Localizer["Message.Required.ImportContent"], MessageType.Warning);
             }
         }
         else
         {
-            AddModuleMessage(Localizer["Message.Required.ImportContent"], MessageType.Warning);
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
 }

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

@@ -3,114 +3,173 @@
 @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
 
-<TabStrip>
-    <TabPanel Name="Settings" Heading="Settings" ResourceKey="Settings">
-        @if (_containers != null)
-        {
-            <table class="table table-borderless">
-                <tr>
-                    <td width="30%">
-                        <Label For="title" HelpText="Enter the title of the module" ResourceKey="Title">Title: </Label>
-                    </td>
-                    <td>
-                        <input id="title" type="text" name="Title" class="form-control" @bind="@_title" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="container" HelpText="Select the module's container" ResourceKey="Container">Container: </Label>
-                    </td>
-                    <td>
-                        <select id="container" class="form-select" @bind="@_containerType">
-                            @foreach (var container in _containers)
-                            {
-                                <option value="@container.TypeName">@container.Name</option>
-                            }
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="allpages" HelpText="Indicate if this module should be displayed on all pages" ResourceKey="DisplayOnAllPages">Display On All Pages? </Label>
-                    </td>
-                    <td>
-                        <select id="allpages" class="form-select" @bind="@_allPages">
-                            <option value="True">@SharedLocalizer["Yes"]</option>
-                            <option value="False">@SharedLocalizer["No"]</option>
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="page" HelpText="The page that the module is located on" ResourceKey="Page">Page: </Label>
-                    </td>
-                    <td>
-                        <select id="page" class="form-select" @bind="@_pageId">
-                            @foreach (Page p in PageState.Pages)
-                            {
-                                if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
-                                {
-                                    <option value="@p.PageId">@(new string('-', p.Level * 2))@(p.Name)</option>
-                                }
-                            }
-                        </select>
-                    </td>
-                </tr>
-            </table>
-        }
-    </TabPanel>
-    <TabPanel Name="Permissions" ResourceKey="Permissions">
-        @if (_permissions != null)
-        {
-            <table class="table table-borderless">
-                <tr>
-                    <td>
-                        <PermissionGrid EntityName="@EntityNames.Module" PermissionNames="@_permissionNames" Permissions="@_permissions" @ref="_permissionGrid" />
-                    </td>
-                </tr>
-            </table>
-        }
-    </TabPanel>
-    @if (_moduleSettingsType != null)
-    {
-        <TabPanel Name="ModuleSettings" Heading="@_moduleSettingsTitle" ResourceKey="ModuleSettings">
-            @ModuleSettingsComponent
-        </TabPanel>
-    }
-    @if (_containerSettingsType != null)
-    {
-        <TabPanel Name="ContainerSettings" Heading="Container Settings" ResourceKey="ContainerSettings">
-            @ContainerSettingsComponent
-        </TabPanel>
-    }
-</TabStrip>
-<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>
+@if (_initialized)
+{
+    <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+        <TabStrip ActiveTab="@_activetab">
+            <TabPanel Name="Settings" Heading="Settings" ResourceKey="Settings">
+                @if (_containers != null)
+                {
+                    <div class="container">
+                        <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="col-sm-9">
+                                <input id="module" type="text" class="form-control" @bind="@_module" disabled />
+                            </div>
+                        </div>
+                        <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>
+                            <div class="col-sm-9">
+                                <input id="title" type="text" class="form-control" @bind="@_title" required />
+                            </div>
+                        </div>
+                        <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>
+                            <div class="col-sm-9">
+                                <select class="form-select" @bind="@_pane">
+                                    @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="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)
+                                        {
+                                            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>
+                        </div>
+                    </div>
+                    <br />
+                    <Section Name="ModuleContent" Heading="Content" ResourceKey="ModuleContent">
+                        <div class="container">
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="moduleheader" HelpText="Optionally provide content to be injected above the module instance" ResourceKey="Header">Header: </Label>
+                                <div class="col-sm-9">
+                                    <textarea id="moduleheader" class="form-control" @bind="@_header" rows="3" maxlength="4000"></textarea>
+                                </div>
+                            </div>
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="modulefooter" HelpText="Optionally provide content to be injected below the module instance" ResourceKey="Footer">Footer: </Label>
+                                <div class="col-sm-9">
+                                    <textarea id="modulefooter" class="form-control" @bind="@_footer" rows="3" maxlength="4000"></textarea>
+                                </div>
+                            </div>
+                        </div>
+                    </Section>
+                }
+            </TabPanel>
+            <TabPanel Name="Permissions" Heading="Permissions" ResourceKey="Permissions">
+                @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>
+
+                }
+            </TabPanel>
+            @if (_moduleSettingsType != null)
+            {
+                <TabPanel Name="ModuleSettings" Heading="@_moduleSettingsTitle" ResourceKey="ModuleSettings">
+                    @ModuleSettingsComponent
+                </TabPanel>
+            }
+            @if (_containerSettingsType != null)
+            {
+                <TabPanel Name="ContainerSettings" Heading="Container Settings" ResourceKey="ContainerSettings">
+                    @ContainerSettingsComponent
+                </TabPanel>
+            }
+        </TabStrip>
+        <br />
+        <button type="button" class="btn btn-success" @onclick="SaveModule">@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>
+    </form>
+}
 
 @code {
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
-    public override string Title => "Module Settings";
 
-    private List<Theme> _themes;
+    private bool _initialized = false;
+    private ElementReference form;
+    private bool validated = false;
     private List<ThemeControl> _containers = new List<ThemeControl>();
+    private string _module;
     private string _title;
+    private string _pane;
     private string _containerType;
     private string _allPages = "false";
+    private string _header = "";
+    private string _footer = "";
     private string _permissionNames = "";
-    private string _permissions = null;
+    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;
@@ -119,49 +178,79 @@
     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 async Task OnInitializedAsync()
     {
-        _title = ModuleState.Title;
-        _themes = await ThemeService.GetThemesAsync();
-        _containers = ThemeService.GetContainerControls(_themes, PageState.Page.ThemeType);
-        _containerType = ModuleState.ContainerType;
-        _allPages = ModuleState.AllPages.ToString();
-        _permissions = ModuleState.Permissions;
-        _permissionNames = ModuleState.ModuleDefinition.PermissionNames;
-        _pageId = ModuleState.PageId.ToString();
-        createdby = ModuleState.CreatedBy;
-        createdon = ModuleState.CreatedOn;
-        modifiedby = ModuleState.ModifiedBy;
-        modifiedon = ModuleState.ModifiedOn;
+        SetModuleTitle(Localizer["ModuleSettings.Title"]);
+        _moduleSettingsTitle = Localizer["ModuleSettings.Heading"];
 
-        if (!string.IsNullOrEmpty(ModuleState.ModuleDefinition.SettingsType))
+        _containers = ThemeService.GetContainerControls(PageState.Site.Themes, PageState.Page.ThemeType);
+        _pages = await PageService.GetPagesAsync(PageState.Site.SiteId);
+
+        var pagemodule = await PageModuleService.GetPageModuleAsync(ModuleState.PageModuleId);
+
+        _pageId = pagemodule.PageId.ToString();
+        _title = pagemodule.Title;
+        _pane = pagemodule.Pane;
+        _containerType = pagemodule.ContainerType;
+        if (string.IsNullOrEmpty(_containerType))
         {
-            // module settings type explicitly declared in IModule interface
-            _moduleSettingsType = Type.GetType(ModuleState.ModuleDefinition.SettingsType);
+            _containerType = (!string.IsNullOrEmpty(PageState.Page.DefaultContainerType)) ? PageState.Page.DefaultContainerType : PageState.Site.DefaultContainerType;
+        }
+        _header = pagemodule.Header;
+        _footer = pagemodule.Footer;
+        _effectivedate = Utilities.UtcAsLocalDate(pagemodule.EffectiveDate);
+        _expirydate = Utilities.UtcAsLocalDate(pagemodule.ExpiryDate);
+
+        _allPages = pagemodule.Module.AllPages.ToString();
+        createdby = pagemodule.Module.CreatedBy;
+        createdon = pagemodule.Module.CreatedOn;
+        modifiedby = pagemodule.Module.ModifiedBy;
+        modifiedon = pagemodule.Module.ModifiedOn;
+        _permissions = pagemodule.Module.PermissionList;
+
+        if (pagemodule.Module.ModuleDefinition != null)
+        {
+            _module = pagemodule.Module.ModuleDefinition.Name;
+            _permissionNames = pagemodule.Module.ModuleDefinition?.PermissionNames;
+
+            if (!string.IsNullOrEmpty(pagemodule.Module.ModuleDefinition.SettingsType))
+            {
+                // module settings type explicitly declared in IModule interface
+                _moduleSettingsType = Type.GetType(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(pagemodule.Module.ModuleDefinition.ControlTypeTemplate.Replace(Constants.ActionToken, PageState.Action), false, true);
+            }
+            if (_moduleSettingsType != null)
+            {
+                var moduleobject = Activator.CreateInstance(_moduleSettingsType) as IModuleControl;
+                if (!string.IsNullOrEmpty(moduleobject.Title))
+                {
+                    _moduleSettingsTitle = moduleobject.Title;
+                }
+
+                ModuleSettingsComponent = builder =>
+                {
+                    builder.OpenComponent(0, _moduleSettingsType);
+                    builder.AddAttribute(1, "RenderModeBoundary", RenderModeBoundary);
+                    builder.AddComponentReferenceCapture(2, inst => { _moduleSettings = Convert.ChangeType(inst, _moduleSettingsType); });
+                    builder.CloseComponent();
+                };
+            }
         }
         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);
-        }
-        if (_moduleSettingsType != null)
-        {
-            var moduleobject = Activator.CreateInstance(_moduleSettingsType) as IModuleControl;
-            if (!string.IsNullOrEmpty(moduleobject.Title))
-            {
-                _moduleSettingsTitle = moduleobject.Title;
-            }
-
-            ModuleSettingsComponent = builder =>
-            {
-                builder.OpenComponent(0, _moduleSettingsType);
-                builder.AddComponentReferenceCapture(1, inst => { _moduleSettings = Convert.ChangeType(inst, _moduleSettingsType); });
-                builder.CloseComponent();
-            };
+            AddModuleMessage(string.Format(Localizer["Error.Module.Load"], pagemodule.Module.ModuleDefinitionName), MessageType.Error);
         }
 
-        var theme = _themes.FirstOrDefault(item => item.Containers.Any(themecontrol => themecontrol.TypeName.Equals(_containerType)));
+        var theme = PageState.Site.Themes.FirstOrDefault(item => item.Containers.Any(themecontrol => themecontrol.TypeName.Equals(_containerType)));
         if (theme != null && !string.IsNullOrEmpty(theme.ContainerSettingsType))
         {
             _containerSettingsType = Type.GetType(theme.ContainerSettingsType);
@@ -170,62 +259,88 @@
                 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()
     {
-        if (!string.IsNullOrEmpty(_title))
+
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
         {
-            var pagemodule = await PageModuleService.GetPageModuleAsync(ModuleState.PageModuleId);
-            pagemodule.PageId = int.Parse(_pageId);
-            pagemodule.Title = _title;
-            pagemodule.ContainerType = (_containerType != "-") ? _containerType : string.Empty;
-            if (!string.IsNullOrEmpty(pagemodule.ContainerType) && pagemodule.ContainerType == PageState.Page.DefaultContainerType)
-            {
-                pagemodule.ContainerType = string.Empty;
-            }
-            if (!string.IsNullOrEmpty(pagemodule.ContainerType) && pagemodule.ContainerType == PageState.Site.DefaultContainerType)
-            {
-                pagemodule.ContainerType = string.Empty;
-            }
-            await PageModuleService.UpdatePageModuleAsync(pagemodule);
-            await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
 
-            var module = ModuleState;
-            module.AllPages = bool.Parse(_allPages);
-            module.Permissions = _permissionGrid.GetPermissions();
-            await ModuleService.UpdateModuleAsync(module);
-
-            if (_moduleSettingsType != null)
+            if (!string.IsNullOrEmpty(_title))
             {
-                if (_moduleSettings is ISettingsControl moduleSettingsControl)
+                if (!Utilities.ValidateEffectiveExpiryDates(_effectivedate, _expirydate))
                 {
-                    // module settings updated using explicit interface
-                    await moduleSettingsControl.UpdateSettings();
-                }
-                else
+                    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)
                 {
-                    // legacy support - module settings updated by convention ( ie. by calling a public method named "UpdateSettings" in settings component )
-                    _moduleSettings?.GetType().GetMethod("UpdateSettings")?.Invoke(_moduleSettings, null);
+                    pagemodule.ContainerType = string.Empty;
                 }
-            }
+                if (!string.IsNullOrEmpty(pagemodule.ContainerType) && pagemodule.ContainerType == PageState.Site.DefaultContainerType)
+                {
+                    pagemodule.ContainerType = string.Empty;
+                }
+                pagemodule.Header = _header;
+                pagemodule.Footer = _footer;
+                await PageModuleService.UpdatePageModuleAsync(pagemodule);
+                await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
 
-            if (_containerSettingsType != null && _containerSettings is ISettingsControl containerSettingsControl)
+                var module = await ModuleService.GetModuleAsync(ModuleState.ModuleId);
+                module.AllPages = bool.Parse(_allPages);
+                module.PageModuleId = ModuleState.PageModuleId;
+                module.PermissionList = _permissionGrid.GetPermissionList();
+                await ModuleService.UpdateModuleAsync(module);
+
+                if (_moduleSettingsType != null)
+                {
+                    if (_moduleSettings is ISettingsControl moduleSettingsControl)
+                    {
+                        // module settings updated using explicit interface
+                        await moduleSettingsControl.UpdateSettings();
+                    }
+                    else
+                    {
+                        // legacy support - module settings updated by convention ( ie. by calling a public method named "UpdateSettings" in settings component )
+                        _moduleSettings?.GetType().GetMethod("UpdateSettings")?.Invoke(_moduleSettings, null);
+                    }
+                }
+
+                if (_containerSettingsType != null && _containerSettings is ISettingsControl containerSettingsControl)
+                {
+                    await containerSettingsControl.UpdateSettings();
+                }
+
+                NavigationManager.NavigateTo(PageState.ReturnUrl);
+            }
+            else
             {
-                await containerSettingsControl.UpdateSettings();
+                _activetab = "Settings";
+                AddModuleMessage(Localizer["Message.Required.Title"], MessageType.Warning);
             }
-
-            NavigationManager.NavigateTo(NavigateUrl());
         }
         else
         {
-            AddModuleMessage(Localizer["Message.Required.Title"], MessageType.Warning);
+            _activetab = "Settings";
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
-
 }

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

@@ -3,226 +3,297 @@
 @inject NavigationManager NavigationManager
 @inject IPageService PageService
 @inject IThemeService  ThemeService
+@inject ISystemService SystemService
 @inject IStringLocalizer<Add> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<TabStrip Refresh="@_refresh">
-    <TabPanel Name="Settings" ResourceKey="Settings">
-        @if (_themeList != null)
-        {
-            <table class="table table-borderless">
-                <tr>
-                    <td width="30%">
-                        <Label For="Name" HelpText="Enter the page name" ResourceKey="Name">Name: </Label>
-                    </td>
-                    <td>
-                        <input id="Name" class="form-control" @bind="@_name" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="Parent" HelpText="Select the parent for the page in the site hierarchy" ResourceKey="Parent">Parent: </Label>
-                    </td>
-                    <td>
-                        <select id="Parent" class="form-select" @onchange="(e => ParentChanged(e))">
-                            <option value="-1">&lt;@Localizer["SiteRoot"]&gt;</option>
-                            @foreach (Page page in _pageList)
-                            {
-                                <option value="@(page.PageId)">@(new string('-', page.Level * 2))@(page.Name)</option>
-                            }
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="Insert" HelpText="Select the location where you would like the page to be inserted in relation to other pages" ResourceKey="Insert">Insert: </Label>
-                    </td>
-                    <td>
-                        <select id="Insert" class="form-select" @bind="@_insert">
-                            <option value="<<">@Localizer["AtBeginning"]</option>
-                            @if (_children != null && _children.Count > 0)
-                            {
-                                <option value="<">@Localizer["Before"]</option>
-                                <option value=">">@Localizer["After"]</option>
-                            }
-                            <option value=">>">@Localizer["AtEnd"]</option>
-                        </select>
-                        @if (_children != null && _children.Count > 0 && (_insert == "<" || _insert == ">"))
-                        {
-                            <select class="form-select" @bind="@_childid">
-                                <option value="-1">&lt;@Localizer["Page.Select"]&gt;</option>
-                                @foreach (Page page in _children)
+@if (_initialized)
+{
+    <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+        <TabStrip Refresh="@_refresh">
+            <TabPanel Name="Settings" ResourceKey="Settings" Heading="Settings">
+                <div class="container">
+                    <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 />
+                        </div>
+                    </div>
+                    @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
+                    {
+                        <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>
+                                    <option value="-1">&lt;@Localizer["SiteRoot"]&gt;</option>
+                                    @foreach (Page page in _pages)
+                                    {
+                                        if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, page.PermissionList))
+                                        {
+                                            <option value="@(page.PageId)">@(new string('-', page.Level * 2))@(page.Name)</option>
+                                        }
+                                    }
+                                </select>
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="insert" HelpText="Select the location where you would like the page to be inserted in relation to other pages" ResourceKey="Insert">Insert: </Label>
+                            <div class="col-sm-9">
+                                <select id="insert" class="form-select" @bind="@_insert" required>
+                                    @if (_children != null && _children.Count > 0)
+                                    {
+                                        <option value="<<">@Localizer["AtBeginning"]</option>
+                                        <option value="<">@Localizer["Before"]</option>
+                                        <option value=">">@Localizer["After"]</option>
+                                    }
+                                    <option value=">>">@Localizer["AtEnd"]</option>
+                                </select>
+                                @if (_children != null && _children.Count > 0 && (_insert == "<" || _insert == ">"))
                                 {
-                                    <option value="@(page.PageId)">@(page.Name)</option>
+                                    <select class="form-select" @bind="@_childid">
+                                        <option value="-1">&lt;@Localizer["Page.Select"]&gt;</option>
+                                        @foreach (Page page in _children)
+                                        {
+                                            <option value="@(page.PageId)">@(page.Name)</option>
+                                        }
+                                    </select>
                                 }
-                            </select>
-                        }
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="navigation" HelpText="Select whether the page is part of the site navigation or hidden" ResourceKey="Navigation">Navigation? </Label>
-                    </td>
-                    <td>
-                        <select id="navigation" class="form-select" @bind="@_isnavigation">
-                            <option value="True">@SharedLocalizer["Yes"]</option>
-                            <option value="False">@SharedLocalizer["No"]</option>
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="clickable" HelpText="Select whether the link in the site navigation is enabled or disabled" ResourceKey="Clickable">Clickable? </Label>
-                    </td>
-                    <td>
-                        <select id="clickable" class="form-select" @bind="@_isclickable">
-                            <option value="True">@SharedLocalizer["Yes"]</option>
-                            <option value="False">@SharedLocalizer["No"]</option>
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label 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." ResourceKey="UrlPath">Url Path: </Label>
-                    </td>
-                    <td>
-                        <input id="Path" class="form-control" @bind="@_path" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="Url" HelpText="Optionally enter a url which this page should redirect to when a user navigates to it" ResourceKey="Redirect">Redirect: </Label>
-                    </td>
-                    <td>
-                        <input id="Url" class="form-control" @bind="@_url" />
-                    </td>
-                </tr>
-            </table>
-            <Section Name="Appearance" ResourceKey="Appearance">
-                <table class="table table-borderless">
-                    <tr>
-                        <td width="30%">
-                            <Label 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>
-                        </td>
-                        <td>
-                            <input id="Title" class="form-control" @bind="@_title" />
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <Label For="Theme" HelpText="Select the theme for this page" ResourceKey="Theme">Theme: </Label>
-                        </td>
-                        <td>
-                            <select id="Theme" class="form-select" value="@_themetype" @onchange="(e => ThemeChanged(e))">
-                                @foreach (var theme in _themes)
-                                {
-                                    <option value="@theme.TypeName">@theme.Name</option>
-                                }
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <Label For="defaultContainer" HelpText="Select the default container for the page" ResourceKey="DefaultContainer">Default Container: </Label>
-                        </td>
-                        <td>
-                            <select id="defaultContainer" class="form-select" @bind="@_containertype">
-                                <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
-                                @foreach (var container in _containers)
-                                {
-                                    <option value="@container.TypeName">@container.Name</option>
-                                }
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <Label For="Icon" HelpText="Optionally provide an icon class name for this page which will be displayed in the site navigation" ResourceKey="Icon">Icon: </Label>
-                        </td>
-                        <td>
-                            <input id="Icon" class="form-control" @bind="@_icon" />
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <Label For="Personalizable" HelpText="Select whether you would like users to be able to personalize this page with their own content" ResourceKey="Personalizable">Personalizable? </Label>
-                        </td>
-                        <td>
-                            <select id="Personalizable" class="form-select" @bind="@_ispersonalizable">
+                            </div>
+                        </div>
+                    }
+                    else
+                    {
+                        <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" @onchange="(e => ParentChanged(e))" required>
+                                    <option value="@(_parent.PageId)">@(new string('-', _parent.Level * 2))@(_parent.Name)</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="insert" HelpText="Select the location where you would like the page to be inserted in relation to other pages" ResourceKey="Insert">Insert: </Label>
+                            <div class="col-sm-9">
+                                <select id="insert" class="form-select" @bind="@_insert" required>
+                                    <option value=">>">@Localizer["AtEnd"]</option>
+                                </select>
+                            </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>
-                        </td>
-                    </tr>
-                </table>
-            </Section>
-        }
-    </TabPanel>
-    <TabPanel Name="Permissions" ResourceKey="Permissions">
-        <table class="table table-borderless">
-            <tr>
-                <td>
-                    <PermissionGrid EntityName="@EntityNames.Page" Permissions="@_permissions" @ref="_permissionGrid" />
-                </td>
-            </tr>
-        </table>
-    </TabPanel>
-    @if (_themeSettingsType != null)
-    {
-        <TabPanel Name="ThemeSettings" Heading="Theme Settings" ResourceKey="ThemeSettings">
-            @ThemeSettingsComponent
-        </TabPanel>
-    }
-</TabStrip>
-<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>
+                    </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" 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" 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="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 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">
+                            <select id="personalizable" class="form-select" @bind="@_ispersonalizable" required>
+                                <option value="True">@SharedLocalizer["Yes"]</option>
+                                <option value="False">@SharedLocalizer["No"]</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+
+                <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" 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)
+                                    {
+                                        @if (theme.TypeName == PageState.Site.DefaultThemeType)
+                                        {
+                                            <option value="@theme.TypeName">*@theme.Name*</option>
+                                        }
+                                        else
+                                        {
+                                            <option value="@theme.TypeName">@theme.Name</option>
+                                        }
+                                    }
+                                </select>
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <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)
+                                    {
+                                        <option value="@container.TypeName">@container.Name</option>
+                                    }
+                                </select>
+                            </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" 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" maxlength="4000"></textarea>
+                            </div>
+                        </div>
+                    </div>
+                </Section>
+            </TabPanel>
+            <TabPanel Name="Permissions" ResourceKey="Permissions" Heading=@Localizer["Permissions.Heading"]>
+                <div class="container">
+                    <div class="row mb-1 align-items-center">
+                        <PermissionGrid EntityName="@EntityNames.Page" Permissions="@_permissions" @ref="_permissionGrid" />
+                    </div>
+                </div>
+            </TabPanel>
+        </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>
+}
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
 
-    private List<Theme> _themeList;
+    private bool _initialized = false;
+    private ElementReference form;
+    private bool validated = false;
     private List<ThemeControl> _themes = new List<ThemeControl>();
     private List<ThemeControl> _containers = new List<ThemeControl>();
-    private List<Page> _pageList;
+    private List<Page> _pages;
+    private int _pageId;
     private string _name;
-    private string _title;
-    private string _path = string.Empty;
-    private string _parentid;
+    private string _parentid = "-1";
     private string _insert = ">>";
     private List<Page> _children;
     private int _childid = -1;
     private string _isnavigation = "True";
     private string _isclickable = "True";
+    private string _path = string.Empty;
     private string _url;
     private string _ispersonalizable = "False";
+    private string _title;
+    private string _icon = string.Empty;
     private string _themetype = string.Empty;
     private string _containertype = string.Empty;
-    private string _icon = string.Empty;
-    private string _permissions = string.Empty;
+    private string _headcontent;
+    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
         {
-            _themeList = await ThemeService.GetThemesAsync();
-            _themes = ThemeService.GetThemeControls(_themeList);
-            _themetype = PageState.Site.DefaultThemeType;
-            _containers = ThemeService.GetContainerControls(_themeList, _themetype);
-            _containertype = PageState.Site.DefaultContainerType;
-            _pageList = PageState.Pages;
-            _children = PageState.Pages.Where(item => item.ParentId == null).ToList();
-            _permissions = string.Empty;
-            ThemeSettings();
+            _pages = await PageService.GetPagesAsync(PageState.Site.SiteId);
+
+            if (PageState.QueryString.ContainsKey("id"))
+            {
+                _pageId = Int32.Parse(PageState.QueryString["id"]);
+                _parent = await PageService.GetPageAsync(_pageId);
+                if (_parent != null)
+                {
+                    _parentid = _parent.PageId.ToString();
+                }
+            }
+            _icons = await SystemService.GetIconsAsync();
+            _iconresources = typeof(IconResources).FullName;
+
+            // if admin or user has edit access to parent page
+            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);
+                _containers = ThemeService.GetContainerControls(PageState.Site.Themes, _themetype);
+                _containertype = PageState.Site.DefaultContainerType;
+                _children = new List<Page>();
+                foreach (Page p in _pages.Where(item => (_parentid == "-1" && item.ParentId == null) || (item.ParentId == int.Parse(_parentid))))
+                {
+                    if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.PermissionList))
+                    {
+                        _children.Add(p);
+                    }
+                }
+                _effectivedate = Utilities.UtcAsLocalDate(PageState.Page.EffectiveDate);
+                _expirydate = Utilities.UtcAsLocalDate(PageState.Page.ExpiryDate);
+                _initialized = true;
+            }
+            else
+            {
+                await logger.LogWarning("Error Loading Page {ParentId}", _parentid);
+                AddModuleMessage(Localizer["Error.Page.Load"], MessageType.Error);
+            }
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Initializing Page {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error.Page.Initialize"], MessageType.Error);
+            await logger.LogError(ex, "Error Loading Page {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.Page.Load"], MessageType.Error);
         }
     }
 
@@ -232,24 +303,11 @@
         {
             _parentid = (string)e.Value;
             _children = new List<Page>();
-            if (_parentid == "-1")
+            foreach (Page p in _pages.Where(item => (_parentid == "-1" && item.ParentId == null) || (item.ParentId == int.Parse(_parentid))))
             {
-                foreach (Page p in PageState.Pages.Where(item => item.ParentId == null))
+                if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.PermissionList))
                 {
-                    if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
-                    {
-                        _children.Add(p);
-                    }
-                }
-            }
-            else
-            {
-                foreach (Page p in PageState.Pages.Where(item => item.ParentId == int.Parse(_parentid)))
-                {
-                    if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
-                    {
-                        _children.Add(p);
-                    }
+                    _children.Add(p);
                 }
             }
             StateHasChanged();
@@ -258,169 +316,194 @@
         {
             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 async void ThemeChanged(ChangeEventArgs e)
+    private async Task ThemeChanged(ChangeEventArgs e)
     {
-        try
-        {
-            _themetype = (string)e.Value;
-            _containers = ThemeService.GetContainerControls(_themeList, _themetype);
-            _containertype = "-";
-            ThemeSettings();
-            StateHasChanged();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message);
-            AddModuleMessage(Localizer["Error.Pane.Load"], MessageType.Error);
-        }
-    }
+        _themetype = (string)e.Value;
+        _containers = ThemeService.GetContainerControls(PageState.Site.Themes, _themetype);
+        _containertype = _containers.First().TypeName;
+        StateHasChanged();
 
-    private void ThemeSettings()
-    {
-        _themeSettingsType = null;
-        var theme = _themeList.FirstOrDefault(item => item.Themes.Any(themecontrol => themecontrol.TypeName.Equals(_themetype)));
-        if (theme != null && !string.IsNullOrEmpty(theme.ThemeSettingsType))
+        // 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)
         {
-            _themeSettingsType = Type.GetType(theme.ThemeSettingsType);
-            if (_themeSettingsType != null)
-            {
-                ThemeSettingsComponent = builder =>
-                {
-                    builder.OpenComponent(0, _themeSettingsType);
-                    builder.AddComponentReferenceCapture(1, inst => { _themeSettings = Convert.ChangeType(inst, _themeSettingsType); });
-                    builder.CloseComponent();
-                };
-            }
-            _refresh = true;
+            AddModuleMessage(Localizer["ThemeChanged.Message"], MessageType.Warning);
+            await ScrollToPageTop();
         }
     }
 
     private async Task SavePage()
     {
-        Page page = null;
-        try
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
         {
-            if (!string.IsNullOrEmpty(_name) && !string.IsNullOrEmpty(_themetype) && _containertype != "-")
+            Page page = null;
+            try
             {
-                page = new Page();
-                page.SiteId = PageState.Page.SiteId;
-                page.Name = _name;
-                page.Title = _title;
-                if (_path == "")
+                if (!Utilities.ValidateEffectiveExpiryDates(_effectivedate, _expirydate))
                 {
-                    _path = _name;
+                    AddModuleMessage(SharedLocalizer["Message.EffectiveExpiryDateError"], MessageType.Warning);
+                    await ScrollToPageTop();
+                    return;
                 }
+                if (!string.IsNullOrEmpty(_themetype) && !string.IsNullOrEmpty(_containertype))
+                {
+                    page = new Page();
+                    page.SiteId = PageState.Page.SiteId;
+                    page.Name = _name;
 
-                if (_path.Contains("/"))
-                {
-                    _path = _path.Substring(_path.LastIndexOf("/") + 1);
-                }
-
-                if (string.IsNullOrEmpty(_parentid))
-                {
-                    page.ParentId = null;
-                    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)
+                    if (_parentid == "-1")
                     {
-                        page.Path = Utilities.GetFriendlyUrl(parent.Name) + "/" + Utilities.GetFriendlyUrl(_path);
+                        page.ParentId = null;
                     }
                     else
                     {
-                        page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(_path);
+                        page.ParentId = Int32.Parse(_parentid);
+                    }
+                    
+                    if (string.IsNullOrEmpty(_path))
+                    {
+                        _path = _name;
                     }
-                }
 
-                if (!PagePathIsUnique(page.Path, page.SiteId, _pageList))
-                {
-                    AddModuleMessage(string.Format(Localizer["Message.Page.Exists"], _path), MessageType.Warning);
-                    return;
-                }
+                    if (_path.Contains("/"))
+                    {
+                        if (_path.EndsWith("/") && _path != "/")
+                        {
+                            _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);
+                        }
+                    }
 
-                Page child;
-                switch (_insert)
-                {
-                    case "<<":
-                        page.Order = 0;
-                        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;
-                }
+                    if (_pages.Any(item => item.Path == page.Path))
+                    {
+                        AddModuleMessage(string.Format(Localizer["Message.Page.Exists"], _path), MessageType.Warning);
+                        await ScrollToPageTop();
+                        return;
+                    }
 
-                page.IsNavigation = (_isnavigation == null ? true : Boolean.Parse(_isnavigation));
-                page.IsClickable = (_isclickable == null ? true : Boolean.Parse(_isclickable));
-                page.Url = _url;
-                page.ThemeType = (_themetype != "-") ? _themetype : string.Empty;
-                if (!string.IsNullOrEmpty(page.ThemeType) && page.ThemeType == PageState.Site.DefaultThemeType)
-                {
-                    page.ThemeType = string.Empty;
-                }
-                page.DefaultContainerType = (_containertype != "-") ? _containertype : string.Empty;
-                if (!string.IsNullOrEmpty(page.DefaultContainerType) && page.DefaultContainerType == PageState.Site.DefaultContainerType)
-                {
-                    page.DefaultContainerType = string.Empty;
-                }
-                page.Icon = (_icon == null ? string.Empty : _icon);
-                page.Permissions = _permissionGrid.GetPermissions();
-                page.IsPersonalizable = (_ispersonalizable == null ? false : Boolean.Parse(_ispersonalizable));
-                page.UserId = null;
+                    if (page.ParentId == null && Constants.ReservedRoutes.Contains(page.Name.ToLower()))
+                    {
+                        AddModuleMessage(string.Format(Localizer["Message.Page.Reserved"], page.Name), MessageType.Warning);
+                        await ScrollToPageTop();
+                        return;
+                    }
 
-                page = await PageService.AddPageAsync(page);
-                await PageService.UpdatePageOrderAsync(page.SiteId, page.PageId, page.ParentId);
+                    Page child;
+                    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;
+                    }
 
-                await logger.LogInformation("Page Added {Page}", page);
-                if (PageState.QueryString.ContainsKey("cp"))
-                {
-                    NavigationManager.NavigateTo(NavigateUrl(PageState.Pages.First(item => item.PageId == int.Parse(PageState.QueryString["cp"])).Path));
+                    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;
+                    if (!string.IsNullOrEmpty(page.ThemeType) && page.ThemeType == PageState.Site.DefaultThemeType)
+                    {
+                        page.ThemeType = string.Empty;
+                    }
+                    page.DefaultContainerType = _containertype;
+                    if (!string.IsNullOrEmpty(page.DefaultContainerType) && page.DefaultContainerType == PageState.Site.DefaultContainerType)
+                    {
+                        page.DefaultContainerType = string.Empty;
+                    }
+
+                    // page content
+                    page.HeadContent = _headcontent;
+                    page.BodyContent = _bodycontent;
+
+                    // permissions
+                    page.PermissionList = _permissionGrid.GetPermissionList();
+
+                    page = await PageService.AddPageAsync(page);
+                    await PageService.UpdatePageOrderAsync(page.SiteId, page.PageId, page.ParentId);
+
+                    await logger.LogInformation("Page Added {Page}", page);
+                    if (!string.IsNullOrEmpty(PageState.ReturnUrl))
+                    {
+                        NavigationManager.NavigateTo(NavigateUrl(page.Path), true); // redirect to page added and reload
+                    }
+                    else
+                    {
+                        NavigationManager.NavigateTo(NavigateUrl()); // redirect to page management
+                    }
                 }
                 else
                 {
-                    NavigationManager.NavigateTo(NavigateUrl(page.Path));
+                    AddModuleMessage(Localizer["Message.Required.PageInfo"], MessageType.Warning);
+                    await ScrollToPageTop();
                 }
-            }
-            else
-            {
-                AddModuleMessage(Localizer["Message.Required.PageInfo"], MessageType.Warning);
-            }
 
+            }
+            catch (Exception ex)
+            {
+                await logger.LogError(ex, "Error Saving Page {Page} {Error}", page, ex.Message);
+                AddModuleMessage(Localizer["Error.Page.Save"], MessageType.Error);
+                await ScrollToPageTop();
+            }
         }
-        catch (Exception ex)
+        else
         {
-            await logger.LogError(ex, "Error Saving Page {Page} {Error}", page, ex.Message);
-            AddModuleMessage(Localizer["Error.Page.Save"], MessageType.Error);
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+            await ScrollToPageTop();
         }
     }
 
     private void Cancel()
     {
-        if (PageState.QueryString.ContainsKey("cp"))
+        if (!string.IsNullOrEmpty(PageState.ReturnUrl))
         {
-            NavigationManager.NavigateTo(NavigateUrl(PageState.Pages.First(item => item.PageId == int.Parse(PageState.QueryString["cp"])).Path));
+            NavigationManager.NavigateTo(PageState.ReturnUrl);
         }
         else
         {
             NavigationManager.NavigateTo(NavigateUrl());
         }
     }
-
-    private static bool PagePathIsUnique(string pagePath, int siteId, List<Page> existingPages)
+    private void IconChanged(string NewIcon)
     {
-        return !existingPages.Any(page => page.SiteId == siteId && page.Path == pagePath);
+        _icon = NewIcon;
     }
 }

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

@@ -5,19 +5,21 @@
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (PageState.Pages != null)
+@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)">
+    <Pager Items="@_pages.Where(item => !item.IsDeleted)" SearchProperties="Name">
         <Header>
-            <th style="width: 1px;">&nbsp;</th>
-            <th style="width: 1px;">&nbsp;</th>
-            <th>@SharedLocalizer["Name"]</th>
+        <th style="width: 1px;">&nbsp;</th>
+        <th style="width: 1px;">&nbsp;</th>
+        <th style="width: 1px;">&nbsp;</th>
+        <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>
         </Row>
     </Pager>
@@ -26,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
@@ -42,4 +59,8 @@
             AddModuleMessage(Localizer["Error.Page.Delete"], MessageType.Error);
         }
     }
+    protected string Browse(Page page)
+    {
+        return string.IsNullOrEmpty(page.Url) ? NavigateUrl(page.Path) : page.Url;
+    }
 }

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

@@ -5,113 +5,119 @@
 @inject IStringLocalizer<Edit> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<table class="table table-borderless">
-    <tr>
-        <td width="30%">
-            <Label For="name" HelpText="The name of this profile item" ResourceKey="Name">Name: </Label>
-        </td>
-        <td>
-            <input id="name" class="form-control" @bind="@_name" />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="title" HelpText="The title of the profile item to display to the user" ResourceKey="Title">Title: </Label>
-        </td>
-        <td>
-            <input id="title" class="form-control" @bind="@_title" />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="description" HelpText="The help text displayed to the user for this profile item" ResourceKey="Description">Description: </Label>
-        </td>
-        <td>
-            <textarea id="description" class="form-control" @bind="@_description" rows="5"></textarea>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="category" HelpText="The category of this profile item (for grouping)" ResourceKey="Category">Category: </Label>
-        </td>
-        <td>
-            <input id="category" class="form-control" @bind="@_category" />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="order" HelpText="The index order of where this profile item should be displayed" ResourceKey="Order">Order: </Label>
-        </td>
-        <td>
-            <input id="order" class="form-control" @bind="@_vieworder" />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="length" HelpText="The max number of characters this profile item should accept (enter zero for unlimited)" ResourceKey="Length">Length: </Label>
-        </td>
-        <td>
-            <input id="length" class="form-control" @bind="@_maxlength" />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="defaultVal" HelpText="The default value for this profile item" ResourceKey="DefaultValue">Default Value: </Label>
-        </td>
-        <td>
-            <input id="defaultVal" class="form-control" @bind="@_defaultvalue" />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="options" HelpText="A comma delimited list of options the user can select from" ResourceKey="Options">Options: </Label>
-        </td>
-        <td>
-            <input id="options" class="form-control" @bind="@_options" />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="required" HelpText="Should a user be required to provide a value for this profile item?" ResourceKey="Required">Required? </Label>
-        </td>
-        <td>
-            <select id="required" class="form-select" @bind="@_isrequired">
-                <option value="True">@SharedLocalizer["Yes"]</option>
-                <option value="False">@SharedLocalizer["No"]</option>
-            </select>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="private" HelpText="Should this profile item be visible to all users?" ResourceKey="Private">Private? </Label>
-        </td>
-        <td>
-            <select id="private" class="form-select" @bind="@_isprivate">
-                <option value="True">@SharedLocalizer["Yes"]</option>
-                <option value="False">@SharedLocalizer["No"]</option>
-            </select>
-        </td>
-    </tr>
-</table>
-<button type="button" class="btn btn-success" @onclick="SaveProfile">@SharedLocalizer["Save"]</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
-@if (PageState.QueryString.ContainsKey("id"))
-{
+<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+    <div class="container">
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="name" HelpText="The name of this profile item" ResourceKey="Name">Name: </Label>
+            <div class="col-sm-9">
+                <input id="name" class="form-control" @bind="@_name" maxlength="50" required />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="title" HelpText="The title of the profile item to display to the user" ResourceKey="Title">Title: </Label>
+            <div class="col-sm-9">
+                <input id="title" class="form-control" @bind="@_title" maxlength="50" required />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="description" HelpText="The help text displayed to the user for this profile item" ResourceKey="Description">Description: </Label>
+            <div class="col-sm-9">
+                <textarea id="description" class="form-control" @bind="@_description" rows="3" maxlength="256" required></textarea>
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="category" HelpText="The category of this profile item (for grouping)" ResourceKey="Category">Category: </Label>
+            <div class="col-sm-9">
+                <input id="category" class="form-control" @bind="@_category" maxlength="50" />
+            </div>
+        </div>
+        <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="9999" type="number" required />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="length" HelpText="The max number of characters this profile item should accept (enter zero for unlimited)" ResourceKey="Length">Length: </Label>
+            <div class="col-sm-9">
+                <input id="length" class="form-control" @bind="@_maxlength" min="0" max="524288" type="number" required />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="rows" HelpText="The number of rows for text entry (one is the default)" ResourceKey="Rows">Rows: </Label>
+            <div class="col-sm-9">
+                <input id="rows" class="form-control" @bind="@_rows" min="1" max="10" type="number" required />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="defaultVal" HelpText="The default value for this profile item" ResourceKey="DefaultValue">Default Value: </Label>
+            <div class="col-sm-9">
+                <input id="defaultVal" class="form-control" @bind="@_defaultvalue" maxlength="2000" />
+            </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>
+            <div class="col-sm-9">
+                <input id="options" class="form-control" @bind="@_options" maxlength="2000" />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="required" HelpText="Should a user be required to provide a value for this profile item?" ResourceKey="Required">Required? </Label>
+            <div class="col-sm-9">
+                <select id="required" class="form-select" @bind="@_isrequired" 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="validation" HelpText="Optionally provide a regular expression (RegExp) for validating the value entered" ResourceKey="Validation">Validation: </Label>
+            <div class="col-sm-9">
+                <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">
+                <select id="private" class="form-select" @bind="@_isprivate" required>
+                    <option value="True">@SharedLocalizer["Yes"]</option>
+                    <option value="False">@SharedLocalizer["No"]</option>
+                </select>
+            </div>
+        </div>
+    </div>
     <br />
-    <br />
-    <AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon"></AuditInfo>
-}
+    <button type="button" class="btn btn-success" @onclick="SaveProfile">@SharedLocalizer["Save"]</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+        @if (PageState.QueryString.ContainsKey("id"))
+    {
+        <br />
+        <br />
+        <AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon"></AuditInfo>
+    }
+</form>
 
 @code {
     private int _profileid = -1;
+    private ElementReference form;
+    private bool validated = false;
     private string _name = string.Empty;
     private string _title = string.Empty;
     private string _description = string.Empty;
     private string _category = string.Empty;
     private string _vieworder = "0";
     private string _maxlength = "0";
+    private string _rows = "1";
     private string _defaultvalue = string.Empty;
     private string _options = string.Empty;
+    private string _validation = string.Empty;
+    private string _autocomplete = string.Empty;
     private string _isrequired = "False";
     private string _isprivate = "False";
     private string createdby;
@@ -119,7 +125,7 @@
     private string modifiedby;
     private DateTime modifiedon;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
 
     public override string Actions => "Add,Edit";
 
@@ -139,8 +145,11 @@
                     _category = profile.Category;
                     _vieworder = profile.ViewOrder.ToString();
                     _maxlength = profile.MaxLength.ToString();
+                    _rows = profile.Rows.ToString();
                     _defaultvalue = profile.DefaultValue;
                     _options = profile.Options;
+                    _validation = profile.Validation;
+                    _autocomplete = profile.Autocomplete;
                     _isrequired = profile.IsRequired.ToString();
                     _isprivate = profile.IsPrivate.ToString();
                     createdby = profile.CreatedBy;
@@ -159,45 +168,58 @@
 
     private async Task SaveProfile()
     {
-        try
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
         {
-            Profile profile;
-            if (_profileid != -1)
+            try
             {
-                profile = await ProfileService.GetProfileAsync(_profileid);
-            }
-            else
-            {
-                profile = new Profile();
-            }
+                Profile profile;
+                if (_profileid != -1)
+                {
+                    profile = await ProfileService.GetProfileAsync(_profileid);
+                }
+                else
+                {
+                    profile = new Profile();
+                }
 
-            profile.SiteId = PageState.Site.SiteId;
-            profile.Name = _name;
-            profile.Title = _title;
-            profile.Description = _description;
-            profile.Category = _category;
-            profile.ViewOrder = int.Parse(_vieworder);
-            profile.MaxLength = int.Parse(_maxlength);
-            profile.DefaultValue = _defaultvalue;
-            profile.Options = _options;
-            profile.IsRequired = (_isrequired == null ? false : Boolean.Parse(_isrequired));
-            profile.IsPrivate = (_isprivate == null ? false : Boolean.Parse(_isprivate));
-            if (_profileid != -1)
-            {
-                profile = await ProfileService.UpdateProfileAsync(profile);
-            }
-            else
-            {
-                profile = await ProfileService.AddProfileAsync(profile);
-            }
+                profile.SiteId = PageState.Site.SiteId;
+                profile.Name = _name;
+                profile.Title = _title;
+                profile.Description = _description;
+                profile.Category = _category;
+                profile.ViewOrder = int.Parse(_vieworder);
+                profile.MaxLength = int.Parse(_maxlength);
+                profile.Rows = int.Parse(_rows);
+                profile.DefaultValue = _defaultvalue;
+                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));
 
-            await logger.LogInformation("Profile Saved {Profile}", profile);
-            NavigationManager.NavigateTo(NavigateUrl());
+                if (_profileid != -1)
+                {
+                    profile = await ProfileService.UpdateProfileAsync(profile);
+                }
+                else
+                {
+                    profile = await ProfileService.AddProfileAsync(profile);
+                }
+
+                await logger.LogInformation("Profile Saved {Profile}", profile);
+                NavigationManager.NavigateTo(NavigateUrl());
+            }
+            catch (Exception ex)
+            {
+                await logger.LogError(ex, "Error Saving Profile {ProfleId} {Error}", _profileid, ex.Message);
+                AddModuleMessage(Localizer["Error.Profile.Save"], MessageType.Error);
+            }
         }
-        catch (Exception ex)
+        else
         {
-            await logger.LogError(ex, "Error Saving Profile {ProfleId} {Error}", _profileid, ex.Message);
-            AddModuleMessage(Localizer["Error.Profile.Save"], MessageType.Error);
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
 }

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

@@ -10,18 +10,24 @@
 }
 else
 {
-    <ActionLink Action="Add" Security="SecurityAccessLevel.Admin" Text="Add Profile" ResourceKey="AddProfile" />
+	<ActionLink Action="Add" Text="Add Profile" Security="SecurityAccessLevel.Edit" ResourceKey="AddProfile" />
 
-    <Pager Items="@_profiles">
+    <Pager Items="@_profiles" SearchProperties="Title,Category">
         <Header>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
             <th>@SharedLocalizer["Name"]</th>
+            <th>@Localizer["Title"]</th>
+            <th>@Localizer["Category"]</th>
+            <th>@Localizer["Order"]</th>
         </Header>
         <Row>
-            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.ProfileId.ToString())" ResourceKey="EditProfile" /></td>
-            <td><ActionDialog Header="Delete Profile" Message="@string.Format(Localizer["Confirm.Profile.Delete"], context.Name)" Action="Delete" Class="btn btn-danger" OnClick="@(async () => await DeleteProfile(context.ProfileId))" ResourceKey="DeleteProfile" /></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>
+            <td>@context.Category</td>
+            <td>@context.ViewOrder</td>
         </Row>
     </Pager>
 }
@@ -29,7 +35,7 @@ else
 @code {
     private List<Profile> _profiles;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
 
     protected override async Task OnParametersSetAsync()
     {

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

@@ -0,0 +1,20 @@
+using Oqtane.Documentation;
+using Oqtane.Models;
+using Oqtane.Shared;
+
+namespace Oqtane.Modules.Admin.Profiles
+{
+    [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 = "Profiles",
+            Description = "Manage Profiles",
+            Categories = "Admin",
+            Version = Constants.Version,
+            PermissionNames = $"{PermissionNames.View},{PermissionNames.Edit}," +
+                $"{EntityNames.Profile}:{PermissionNames.Write}:{RoleNames.Admin}"
+        };
+    }
+}

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

@@ -7,80 +7,79 @@
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<TabStrip>
-    <TabPanel Name="Pages" ResourceKey="Pages">
-        @if (_pages == null)
-        {
-            <br />
-            <p>@Localizer["NoPage.Deleted"]</p>
-        }
-        else
-        {
-            <Pager Items="@_pages">
-                <Header>
-                    <th style="width: 1px;">&nbsp;</th>
-                    <th style="width: 1px;">&nbsp;</th>
-                    <th>@SharedLocalizer["Name"]</th>
-                    <th>@Localizer["DeletedBy"]</th>
-                    <th>@Localizer["DeletedOn"]</th>
-                </Header>
-                <Row>
-                    <td><button @onclick="@(() => RestorePage(context))" class="btn btn-info" title="Restore">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>@context.Name</td>
-                    <td>@context.DeletedBy</td>
-                    <td>@context.DeletedOn</td>
-                </Row>
-            </Pager>
-            @if (_pages.Any())
+@if (_pages == null || _modules == null)
+{
+    <p><em>@SharedLocalizer["Loading"]</em></p>
+}
+else
+{
+    <TabStrip>
+        <TabPanel Name="Pages" ResourceKey="Pages" Heading="Pages">
+            @if (!_pages.Where(item => item.IsDeleted).Any())
             {
-                <div style="text-align:right;">
-                    <ActionDialog Header="Delete All Pages" Message="Are You Sure You Wish To Permanently Delete All Pages?" Action="Delete All Pages" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllPages())" ResourceKey="DeleteAllPages" />
-                </div>
+                <br />
+                <p>@Localizer["NoPage.Deleted"]</p>
             }
-        }
-    </TabPanel>
-    <TabPanel Name="Modules" ResourceKey="Modules">
-        @if (_modules == null)
-        {
-            <br />
-            <p>@Localizer["NoModule.Deleted"]</p>
-        }
-        else
-        {
-            <Pager Items="@_modules">
-                <Header>
-                    <th style="width: 1px;">&nbsp;</th>
-                    <th style="width: 1px;">&nbsp;</th>
-                    <th>@Localizer["Page"]</th>
-                    <th>@Localizer["Module"]</th>
-                    <th>@Localizer["DeletedBy"]</th>
-                    <th>@Localizer["DeletedOn"]</th>
-                </Header>
-                <Row>
-                    <td><button @onclick="@(() => RestoreModule(context))" class="btn btn-info" 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>@PageState.Pages.Find(item => item.PageId == context.PageId).Name</td>
-                    <td>@context.Title</td>
-                    <td>@context.DeletedBy</td>
-                    <td>@context.DeletedOn</td>
-                </Row>
-            </Pager>
-            @if (_modules.Any())
+            else
             {
-                <div style="text-align:right;">
-                    <ActionDialog Header="Delete All Modules" Message="Are You Sure You Wish To Permanently Delete All Modules?" Action="Delete All Modules" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllModules())" ResourceKey="DeleteAllModules" />
-                </div>
+                <Pager Items="@_pages.Where(item => item.IsDeleted).OrderByDescending(item => item.DeletedOn)" CurrentPage="@_pagePage.ToString()" OnPageChange="OnPageChangePage">
+                    <Header>
+                        <th style="width: 1px;">&nbsp;</th>
+                        <th style="width: 1px;">&nbsp;</th>
+                        <th>@SharedLocalizer["Path"]</th>
+                        <th>@Localizer["DeletedBy"]</th>
+                        <th>@Localizer["DeletedOn"]</th>
+                    </Header>
+                    <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>@context.Path</td>
+                        <td>@context.DeletedBy</td>
+                        <td>@context.DeletedOn</td>
+                    </Row>
+                </Pager>
+                <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" />
             }
-
-        }
-    </TabPanel>
-</TabStrip>
+        </TabPanel>
+        <TabPanel Name="Modules" ResourceKey="Modules" Heading="Modules">
+            @if (!_modules.Where(item => item.IsDeleted).Any())
+            {
+                <br />
+                <p>@Localizer["NoModule.Deleted"]</p>
+            }
+            else
+            {
+                <Pager Items="@_modules.Where(item => item.IsDeleted).OrderByDescending(item => item.DeletedOn)" CurrentPage="@_pageModule.ToString()" OnPageChange="OnPageChangeModule">
+                    <Header>
+                        <th style="width: 1px;">&nbsp;</th>
+                        <th style="width: 1px;">&nbsp;</th>
+                        <th>@Localizer["Page"]</th>
+                        <th>@Localizer["Module"]</th>
+                        <th>@Localizer["DeletedBy"]</th>
+                        <th>@Localizer["DeletedOn"]</th>
+                    </Header>
+                    <Row>
+                        <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>@_pages.Find(item => item.PageId == context.PageId).Name</td>
+                        <td>@context.Title</td>
+                        <td>@context.DeletedBy</td>
+                        <td>@context.DeletedOn</td>
+                    </Row>
+                </Pager>
+                <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" />
+            }
+        </TabPanel>
+    </TabStrip>
+}
 
 @code {
     private List<Page> _pages;
     private List<Module> _modules;
-
+    private int _pagePage = 1;
+    private int _pageModule = 1;
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
     protected override async Task OnInitializedAsync()
@@ -99,22 +98,32 @@
     private async Task Load()
     {
         _pages = await PageService.GetPagesAsync(PageState.Site.SiteId);
-        _pages = _pages.Where(item => item.IsDeleted).ToList();
-
         _modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId);
-        _modules = _modules.Where(item => item.IsDeleted).ToList();
     }
 
     private async Task RestorePage(Page page)
     {
         try
         {
-            page.IsDeleted = false;
-            await PageService.UpdatePageAsync(page);
-            await logger.LogInformation("Page Restored {Page}", page);
-            await Load();
-            StateHasChanged();
-            NavigationManager.NavigateTo(NavigateUrl());
+            var validated = true;
+            if (page.ParentId != null)
+            {
+                var parent = _pages.Find(item => item.PageId == page.ParentId);
+                validated = !parent.IsDeleted;
+            }
+            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)
         {
@@ -129,9 +138,9 @@
         {
             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)
         {
@@ -144,21 +153,24 @@
     {
         try
         {
-            foreach (Page page in _pages)
+            ShowProgressIndicator();
+            foreach (Page page in _pages.Where(item => item.IsDeleted))
             {
                 await PageService.DeletePageAsync(page.PageId);
                 await logger.LogInformation("Page Permanently Deleted {Page}", page);
             }
 
             await logger.LogInformation("Pages Permanently Deleted");
+            AddModuleMessage(Localizer["Success.Pages.Delete"], MessageType.Success);
             await Load();
+            HideProgressIndicator();
             StateHasChanged();
-            NavigationManager.NavigateTo(NavigateUrl());
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Permanently Deleting Pages {Error}", ex.Message);
             AddModuleMessage(ex.Message, MessageType.Error);
+            HideProgressIndicator();
         }
     }
 
@@ -170,6 +182,7 @@
             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,15 +198,8 @@
         try
         {
             await PageModuleService.DeletePageModuleAsync(module.PageModuleId);
-            // check if there are any remaining module instances in the site
-            _modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId);
-
-            if (!_modules.Exists(item => item.ModuleId == module.ModuleId))
-            {
-                await ModuleService.DeleteModuleAsync(module.ModuleId);
-            }
-
             await logger.LogInformation("Module Permanently Deleted {Module}", module);
+            AddModuleMessage(Localizer["Success.Module.Delete"], MessageType.Success);
             await Load();
             StateHasChanged();
         }
@@ -208,26 +214,30 @@
     {
         try
         {
-            foreach (Module module in _modules)
+            ShowProgressIndicator();
+            foreach (Module module in _modules.Where(item => item.IsDeleted).ToList())
             {
                 await PageModuleService.DeletePageModuleAsync(module.PageModuleId);
-                // check if there are any remaining module instances in the site
-                _modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId);
-
-                if (!_modules.Exists(item => item.ModuleId == module.ModuleId))
-                {
-                    await ModuleService.DeleteModuleAsync(module.ModuleId);
-                }
             }
-
             await logger.LogInformation("Modules Permanently Deleted");
+            AddModuleMessage(Localizer["Success.Modules.Delete"], MessageType.Success);
             await Load();
+            HideProgressIndicator();
             StateHasChanged();
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Permanently Deleting Modules {Error}", ex.Message);
             AddModuleMessage(Localizer["Error.Modules.Delete"], MessageType.Error);
+            HideProgressIndicator();
         }
     }
+    private void OnPageChangePage(int page)
+    {
+        _pagePage = page;
+    }
+    private void OnPageChangeModule(int page)
+    {
+        _pageModule = page;
+    }
 }

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

@@ -1,134 +1,206 @@
 @namespace Oqtane.Modules.Admin.Register
+@using System.Net
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
+@inject ITimeZoneService TimeZoneService
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
+@inject ISettingService SettingService
 
-@if (PageState.Site.AllowRegistration)
+@if (_initialized)
 {
-    <AuthorizeView Roles="@RoleNames.Registered">
-        <Authorizing>
-            <text>...</text>
-        </Authorizing>
-        <Authorized>
-            <ModuleMessage Message="@Localizer["Info.Registration.Exists"]" Type="MessageType.Info" />
-        </Authorized>
-        <NotAuthorized>
-            <ModuleMessage Message="@Localizer["Info.Registration.InvalidEmail"]" Type="MessageType.Info" />
+    @if (PageState.Site.AllowRegistration)
+    {
+        if (!_userCreated)
+        {
+            if (PageState.User != null)
+            {
+                <ModuleMessage Message="@Localizer["Info.Registration.Exists"]" Type="MessageType.Info" />
+            }
+            else
+            {
+                <ModuleMessage Message="@_passwordrequirements" Type="MessageType.Info" />
+                <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="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>
+                    <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>
+                    @if (_allowsitelogin)
+                    {
+                        <br />
 
-            <table class="table table-borderless">
-                <tr>
-                    <td width="30%">
-                        <Label For="username" HelpText="Your username. Note that this field can not be modified once it is saved." ResourceKey="Username"></Label>
-                    </td>
-                    <td>
-                        <input id="username" class="form-control" @bind="@_username" readonly />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="password" HelpText="If you wish to change your password you can enter it here. Please choose a sufficiently secure password." ResourceKey="Password"></Label>
-                    </td>
-                    <td>
-                        <input id="password" type="password" class="form-control" @bind="@_password" autocomplete="new-password" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="confirm" HelpText="If you are changing your password you must enter it again to confirm it matches" ResourceKey="Confirm"></Label>
-                    </td>
-                    <td>
-                        <input id="confirm" type="password" class="form-control" @bind="@_confirm" autocomplete="new-password" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="email" HelpText="Your email address where you wish to receive notifications" ResourceKey="Email"></Label>
-                    </td>
-                    <td>
-                        <input id="email" class="form-control" @bind="@_email" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="displayname" HelpText="Your full name" ResourceKey="DisplayName"></Label>
-                    </td>
-                    <td>
-                        <input id="displayname" class="form-control" @bind="@_displayname" />
-                    </td>
-                </tr>
-            </table>
-
-            <button type="button" class="btn btn-primary" @onclick="Register">@Localizer["Register"]</button>
-            <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
-        </NotAuthorized>
-    </AuthorizeView>
-}
-else
-{
-    <ModuleMessage Message="@Localizer["Info.Registration.Disabled"]" Type="MessageType.Info" />
+                        <br />
+                        <NavLink href="@NavigateUrl("login")">@Localizer["Login"]</NavLink>
+                    }
+                </form>
+            }
+        }
+    }
+    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;
+    private bool validated = false;
     private string _password = string.Empty;
+    private string _passwordtype = "password";
+    private string _togglepassword = string.Empty;
     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 = await TimeZoneService.GetTimeZonesAsync();
+        _timezoneid = PageState.Site.TimeZoneId;
+        _initialized = true;
+    }
+
+    protected override void OnParametersSet()
+    {
+        _togglepassword = SharedLocalizer["ShowPassword"];     
+    }
+
     private async Task Register()
     {
-        try
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
         {
-            bool _isEmailValid = Utilities.IsValidEmail(_email);
-
-            if (_username != "" && _password != "" && _confirm != "" && _isEmailValid)
+            try
             {
-                if (_password == _confirm)
-                {
-                    var user = new User
-                    {
-                        SiteId = PageState.Site.SiteId,
-                        Username = _username,
-                        DisplayName = (_displayname == string.Empty ? _username : _displayname),
-                        Email = _email,
-                        Password = _password
-                    };
-                    user = await UserService.AddUserAsync(user);
+                bool _isEmailValid = Utilities.IsValidEmail(_email);
 
-                    if (user != null)
+                if (_isEmailValid)
+                {
+                    if (_password == _confirm)
                     {
-                        await logger.LogInformation("User Created {Username} {Email}", _username, _email);
-                        AddModuleMessage(Localizer["Info.User.AccountCreate"], MessageType.Info);
+                        var user = new User
+                        {
+                            SiteId = PageState.Site.SiteId,
+                            Username = _username,
+                            Password = _password,
+                            Email = _email,
+                            DisplayName = (_displayname == string.Empty ? _username : _displayname),
+                            TimeZoneId = _timezoneid,
+							PhotoFileId = null
+                        };
+                        user = await UserService.AddUserAsync(user);
+
+                        if (user != null)
+                        {
+                            await logger.LogInformation("User Created {Username} {Email}", _username, _email);
+                            _userCreated = true;
+                             AddModuleMessage(Localizer["Info.User.AccountCreate"], MessageType.Info);
+                        }
+                        else
+                        {
+                            await logger.LogError("Error Adding User {Username} {Email}", _username, _email);
+                            AddModuleMessage(Localizer["Error.User.AddInfo"], MessageType.Error);
+                        }
                     }
                     else
                     {
-                        await logger.LogError("Error Adding User {Username} {Email}", _username, _email);
-                        AddModuleMessage(Localizer["Error.User.AddInfo"], MessageType.Error);
+                        AddModuleMessage(Localizer["Message.Password.NoMatch"], MessageType.Warning);
                     }
                 }
                 else
                 {
-                    AddModuleMessage(Localizer["Message.Password.NoMatch"], MessageType.Warning);
+                    AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning);
                 }
             }
-            else
+            catch (Exception ex)
             {
-                AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning);
+                await logger.LogError(ex, "Error Adding User {Username} {Email} {Error}", _username, _email, ex.Message);
+                AddModuleMessage(Localizer["Error.User.Add"], MessageType.Error);
             }
         }
-        catch (Exception ex)
+        else
         {
-            await logger.LogError(ex, "Error Adding User {Username} {Email} {Error}", _username, _email, ex.Message);
-            AddModuleMessage(Localizer["Error.User.Add"], MessageType.Error);
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
 
     private void Cancel()
     {
-        NavigationManager.NavigateTo(NavigateUrl(string.Empty));
+        NavigationManager.NavigateTo(PageState.ReturnUrl);
     }
-}
+
+    private void TogglePassword()
+	{
+		if (_passwordtype == "password")
+		{
+			_passwordtype = "text";
+			_togglepassword = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_passwordtype = "password";
+			_togglepassword = SharedLocalizer["ShowPassword"];
+		}
+	}
+}

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

@@ -5,83 +5,117 @@
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<div class="container">
-    <div class="form-group">
-        <label for="Username" class="control-label">@SharedLocalizer["Username"] </label>
-        <input type="text" class="form-control" placeholder="Username" @bind="@_username" readonly id="Username" />
-    </div>
-    <div class="form-group">
-        <label for="Password" class="control-label">@SharedLocalizer["Password"] </label>
-        <input type="password" class="form-control" placeholder="Password" @bind="@_password" id="Password" />
-    </div>
-    <div class="form-group">
-        <label for="Confirm" class="control-label">@Localizer["Password.Confirm"] </label>
-        <input type="password" class="form-control" placeholder="Password" @bind="@_confirm" id="Confirm" />
+<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+    <ModuleMessage Message="@_passwordrequirements" Type="MessageType.Info" />
+    <div class="container">
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="username" HelpText="Your username will be populated from the link you received in the password reset notification" ResourceKey="Username">Username: </Label>
+            <div class="col-sm-9">
+                <input id="username" type="text" class="form-control" @bind="@_username" readonly />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="password" HelpText="The new password. It must satisfy complexity rules for the site." ResourceKey="Password">Password: </Label>
+            <div class="col-sm-9">
+				<div class="input-group">
+					<input id="password" type="@_passwordtype" class="form-control" @bind="@_password" autocomplete="new-password" 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 the password again. It must exactly match the password entered above." ResourceKey="Confirm">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>
+    <br />
     <button type="button" class="btn btn-primary" @onclick="Reset">@Localizer["Password.Reset"]</button>
     <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
-</div>
+</form>
 
 @code {
-    private string _username = string.Empty;
-    private string _password = string.Empty;
-    private string _confirm = string.Empty;
+	private ElementReference form;
+	private bool validated = false;
+	private string _username = string.Empty;
+	private string _password = string.Empty;
+	private string _passwordtype = "password";
+	private string _togglepassword = string.Empty;
+	private string _confirm = string.Empty;
+    private string _passwordrequirements;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
 
-    protected override void OnInitialized()
-    {
-        if (PageState.QueryString.ContainsKey("name") && PageState.QueryString.ContainsKey("token"))
+	protected override async Task OnInitializedAsync()
+	{
+		_togglepassword = SharedLocalizer["ShowPassword"];
+        _passwordrequirements = await UserService.GetPasswordRequirementsAsync(PageState.Site.SiteId);
+
+		if (PageState.QueryString.ContainsKey("name") && PageState.QueryString.ContainsKey("token"))
         {
             _username = PageState.QueryString["name"];
         }
         else
         {
-            NavigationManager.NavigateTo(NavigateUrl(string.Empty));
+            await logger.LogError(LogFunction.Security, "Invalid Attempt To Access User Password Reset");
+            NavigationManager.NavigateTo(NavigateUrl("")); // home page
         }
     }
 
     private async Task Reset()
     {
-        try
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
         {
-            if (_username != string.Empty && _password != string.Empty && _confirm != string.Empty)
+            try
             {
-                if (_password == _confirm)
+                if (_username != string.Empty && _password != string.Empty && _confirm != string.Empty)
                 {
-                    var user = new User
+                    if (_password == _confirm)
                     {
-                        SiteId = PageState.Site.SiteId,
-                        Username = _username,
-                        Password = _password
-                    };
-                    user = await UserService.ResetPasswordAsync(user, PageState.QueryString["token"]);
+                        var user = new User
+                        {
+                            SiteId = PageState.Site.SiteId,
+                            Username = _username,
+                            Password = _password
+                        };
+                        user = await UserService.ResetPasswordAsync(user, PageState.QueryString["token"]);
 
-                    if (user != null)
-                    {
-                        await logger.LogInformation("User Password Reset {Username}", _username);
-                        NavigationManager.NavigateTo(NavigateUrl("login"));
+                        if (user != null)
+                        {
+                            await logger.LogInformation("User Password Reset {Username}", _username);
+                            NavigationManager.NavigateTo(NavigateUrl("login"));
+                        }
+                        else
+                        {
+                            await logger.LogError("Error Resetting User Password {Username}", _username);
+                            AddModuleMessage(Localizer["Error.Password.ResetInfo"], MessageType.Error);
+                        }
                     }
                     else
                     {
-                        await logger.LogError("Error Resetting User Password {Username}", _username);
-                        AddModuleMessage(Localizer["Error.Password.ResetInfo"], MessageType.Error);
+                        AddModuleMessage(Localizer["Message.Password.NoMatch"], MessageType.Warning);
                     }
                 }
                 else
                 {
-                    AddModuleMessage(Localizer["Message.Password.NoMatch"], MessageType.Warning);
+                    AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning);
                 }
             }
-            else
+            catch (Exception ex)
             {
-                AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning);
+                await logger.LogError(ex, "Error Resetting User Password {Username} {Error}", _username, ex.Message);
+                AddModuleMessage(Localizer["Error.Password.Reset"], MessageType.Error);
             }
         }
-        catch (Exception ex)
+        else
         {
-            await logger.LogError(ex, "Error Resetting User Password {Username} {Error}", _username, ex.Message);
-            AddModuleMessage(Localizer["Error.Password.Reset"], MessageType.Error);
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
 
@@ -89,4 +123,18 @@
     {
         NavigationManager.NavigateTo(NavigateUrl(string.Empty));
     }
+
+    private void TogglePassword()
+	{
+		if (_passwordtype == "password")
+		{
+			_passwordtype = "text";
+			_togglepassword = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_passwordtype = "password";
+			_togglepassword = SharedLocalizer["ShowPassword"];
+		}
+	}
 }

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

@@ -6,37 +6,32 @@
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
-    <table class="table table-borderless">
-        <tr>
-            <td width="30%">
-                <Label For="name" HelpText="Name Of The Role" ResourceKey="Name">Name:</Label>
-            </td>
-            <td>
+    <div class="container">
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="name" HelpText="Name Of The Role" ResourceKey="Name">Name:</Label>
+            <div class="col-sm-9">
                 <input id="name" class="form-control" @bind="@_name" maxlength="256" required />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="description" HelpText="A Short Description Of The Role Which Describes Its Purpose" ResourceKey="Description">Description:</Label>
-            </td>
-            <td>
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="description" HelpText="A Short Description Of The Role Which Describes Its Purpose" ResourceKey="Description">Description:</Label>
+            <div class="col-sm-9">
                 <textarea id="description" class="form-control" @bind="@_description" rows="5" maxlength="256" required></textarea>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="isautoassigned" HelpText="Indicates Whether Or Not New Users Are Automatically Assigned To This Role" ResourceKey="AutoAssigned">Auto Assigned?</Label>
-            </td>
-            <td>
-                <select id="isautoassigned" class="form-select" @bind="@_isautoassigned">
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="isautoassigned" HelpText="Indicates Whether Or Not New Users Are Automatically Assigned To This Role" ResourceKey="AutoAssigned">Auto Assigned?</Label>
+            <div class="col-sm-9">
+                <select id="isautoassigned" class="form-select" @bind="@_isautoassigned" required>
                     <option value="True">@SharedLocalizer["Yes"]</option>
                     <option value="False">@SharedLocalizer["No"]</option>
                 </select>
-            </td>
-        </tr>
-    </table>
-    <button type="button" class="btn btn-success" @onclick="SaveRole">@SharedLocalizer["Save"]</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+            </div>
+        </div>
+        <br /><br />
+        <button type="button" class="btn btn-success" @onclick="SaveRole">@SharedLocalizer["Save"]</button>
+        <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+    </div>
 </form>
 
 @code {
@@ -47,7 +42,7 @@
     private string _description = string.Empty;
     private string _isautoassigned = "False";
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
 
     private async Task SaveRole()
     {
@@ -77,7 +72,7 @@
         }
         else
         {
-            AddModuleMessage(Localizer["Message.InfoRequired"], MessageType.Warning);
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
 

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

@@ -6,39 +6,34 @@
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
-    <table class="table table-borderless">
-        <tr>
-            <td width="30%">
-                <Label For="name" HelpText="Name Of The Role" ResourceKey="Name">Name:</Label>
-            </td>
-            <td>
+    <div class="container">
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="name" HelpText="Name Of The Role" ResourceKey="Name">Name:</Label>
+            <div class="col-sm-9">
                 <input id="name" class="form-control" @bind="@_name" maxlength="256" required />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="description" HelpText="A Short Description Of The Role Which Describes Its Purpose" ResourceKey="Description">Description:</Label>
-            </td>
-            <td>
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="description" HelpText="A Short Description Of The Role Which Describes Its Purpose" ResourceKey="Description">Description:</Label>
+            <div class="col-sm-9">
                 <textarea id="description" class="form-control" @bind="@_description" rows="5" maxlength="256" required></textarea>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="isautoassigned" HelpText="Indicates Whether Or Not New Users Are Automatically Assigned To This Role" ResourceKey="AutoAssigned">Auto Assigned?</Label>
-            </td>
-            <td>
-                <select id="isautoassigned" class="form-select" @bind="@_isautoassigned">
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="isautoassigned" HelpText="Indicates Whether Or Not New Users Are Automatically Assigned To This Role" ResourceKey="AutoAssigned">Auto Assigned?</Label>
+            <div class="col-sm-9">
+                <select id="isautoassigned" class="form-select" @bind="@_isautoassigned" required>
                     <option value="True">@SharedLocalizer["Yes"]</option>
                     <option value="False">@SharedLocalizer["No"]</option>
                 </select>
-            </td>
-        </tr>
-    </table>
-    <button type="button" class="btn btn-success" @onclick="SaveRole">@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>
+            </div>
+        </div>
+        <br /><br />
+        <button type="button" class="btn btn-success" @onclick="SaveRole">@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>
+    </div>
 </form>
 
 @code {
@@ -54,7 +49,7 @@
     private string _modifiedby;
     private DateTime _modifiedon;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
 
     protected override async Task OnInitializedAsync()
     {
@@ -106,7 +101,7 @@
         }
         else
         {
-            AddModuleMessage(Localizer["Message.InfoRequired"], MessageType.Warning);
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
 }

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

@@ -10,9 +10,9 @@
 }
 else
 {
-    <ActionLink Action="Add" Text="Add Role" ResourceKey="AddRole" />
+	<ActionLink Action="Add" Text="Add Role" Security="SecurityAccessLevel.Edit" ResourceKey="AddRole" />
 
-    <Pager Items="@_roles">
+    <Pager Items="@_roles" SearchProperties="Name">
         <Header>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
@@ -20,9 +20,9 @@ else
             <th>@SharedLocalizer["Name"]</th>
         </Header>
         <Row>
-            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.RoleId.ToString())" Disabled="@(context.IsSystem)" ResourceKey="Edit" /></td>
-            <td><ActionDialog Header="Delete Role" Message="@string.Format(Localizer["Confirm.DeleteUser"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteRole(context))" Disabled="@(context.IsSystem)" ResourceKey="DeleteRole" /></td>
-            <td><ActionLink Action="Users" Parameters="@($"id=" + context.RoleId.ToString())" ResourceKey="Users" /></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" Text="Users" Parameters="@($"id=" + context.RoleId.ToString())" Security="SecurityAccessLevel.Edit" ResourceKey="Users" /></td>
             <td>@context.Name</td>
         </Row>
     </Pager>
@@ -31,7 +31,7 @@ else
 @code {
     private List<Role> _roles;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
 
     protected override async Task OnParametersSetAsync()
     {
@@ -59,7 +59,7 @@ else
         if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
         {
             _roles = await RoleService.GetRolesAsync(PageState.Site.SiteId, true);
-            _roles = _roles.Where(item => item.Name != RoleNames.Everyone).ToList();
+			_roles.RemoveAll(item => item.Name == RoleNames.Everyone || item.Name == RoleNames.Unauthenticated);
         }
         else
         {

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

@@ -0,0 +1,21 @@
+using Oqtane.Documentation;
+using Oqtane.Models;
+using Oqtane.Shared;
+
+namespace Oqtane.Modules.Admin.Roles
+{
+    [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 = "Roles",
+            Description = "Manage Roles",
+            Categories = "Admin",
+            Version = Constants.Version,
+            PermissionNames = $"{PermissionNames.View},{PermissionNames.Edit}," +
+                $"{EntityNames.Role}:{PermissionNames.Write}:{RoleNames.Admin}," +
+                $"{EntityNames.UserRole}:{PermissionNames.Write}:{RoleNames.Admin}"
+        };
+    }
+}

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

@@ -11,154 +11,170 @@
 }
 else
 {
-    <table class="table table-borderless">
-        <tr>
-            <td width="30%">
-                <Label For="role" HelpText="The role you are assigning users to" ResourceKey="Role">Role: </Label>
-            </td>
-            <td>
-                <input id="role" class="form-control" @bind="@name" disabled />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="user" HelpText="Select a user" ResourceKey="User">User: </Label>
-            </td>
-            <td>
-                <select id="user" class="form-select" @bind="@userid">
-                    <option value="-1">&lt;@Localizer["User.Select"]&gt;</option>
-                    @foreach (UserRole userrole in users)
-                    {
-                        <option value="@(userrole.UserId)">@userrole.User.DisplayName</option>
-                    }
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="effectiveDate" HelpText="The date that this role assignment is active" ResourceKey="EffectiveDate">Effective Date: </Label>
-            </td>
-            <td>
-                <input type="date" id="effectiveDate" class="form-control" @bind="@effectivedate" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="expiryDate" HelpText="The date that this role assignment expires" ResourceKey="ExpiryDate">Expiry Date: </Label>
-            </td>
-            <td>
-                <input type="date" id="expiryDate" class="form-control" @bind="@expirydate" />
-            </td>
-        </tr>
-    </table>
-    <button type="button" class="btn btn-success" @onclick="SaveUserRole">@SharedLocalizer["Save"]</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 
-    <hr class="app-rule" />
-    <p align="center">
-        <Pager Items="@userroles">
-            <Header>
-                <th>@Localizer["Users"]</th>
-                <th>@Localizer["Effective"]</th>
-                <th>@Localizer["Expiry"]</th>
-                <th>&nbsp;</th>
-            </Header>
-            <Row>
-                <td>@context.User.DisplayName</td>
-                <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.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteUserRole(context.UserRoleId))" Disabled="@(context.Role.IsAutoAssigned || PageState.User.Username == UserNames.Host)" ResourceKey="DeleteUserRole" />
-                </td>
-            </Row>
-        </Pager>
-    </p>
+    <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="role" HelpText="The role you are assigning users to" ResourceKey="Role">Role: </Label>
+                <div class="col-sm-9">
+                    <input id="role" class="form-control" @bind="@name" disabled />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="user" HelpText="Select a user" ResourceKey="User">User: </Label>
+                <div class="col-sm-9">
+					<AutoComplete OnSearch="GetUsers" Placeholder="@Localizer["User.Select"]" @ref="user" />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="effectiveDate" HelpText="The date that this role assignment 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 role assignment expires" ResourceKey="ExpiryDate">Expiry Date: </Label>
+                <div class="col-sm-9">
+                    <input type="date" id="expiryDate" class="form-control" @bind="@expirydate" />
+                </div>
+            </div>
+            <br /><br />
+            <button type="button" class="btn btn-success" @onclick="SaveUserRole">@SharedLocalizer["Save"]</button>
+            <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+            <hr class="app-rule" />
+            <div class="row mb-1 align-items-center">
+                <p align="center">
+                    <Pager Items="@userroles">
+                        <Header>
+                            <th>@Localizer["Users"]</th>
+                            <th>@SharedLocalizer["Username"]</th>
+                            <th>@Localizer["Effective"]</th>
+                            <th>@Localizer["Expiry"]</th>
+                            <th>&nbsp;</th>
+                        </Header>
+                        <Row>
+                            <td>@context.User.DisplayName</td>
+                            <td>@context.User.Username</td>
+                            <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.User.Username == UserNames.Host || context.User.UserId == PageState.User.UserId)" ResourceKey="DeleteUserRole" />
+                            </td>
+                        </Row>
+                    </Pager>
+                </p>
+            </div>
+        </div>
+    </form>
 }
 
 @code {
-    private int roleid;
-    private string name = string.Empty;
-    private List<UserRole> users;
-    private int userid = -1;
-    private DateTime? effectivedate = null;
-    private DateTime? expirydate = null;
-    private List<UserRole> userroles;
+	private ElementReference form;
+	private bool validated = false;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+	private int roleid;
+	private string name = string.Empty;
+	private AutoComplete user;
+	private DateTime? effectivedate = null;
+	private DateTime? expirydate = null;
+	private List<UserRole> userroles;
 
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            roleid = Int32.Parse(PageState.QueryString["id"]);
-            Role role = await RoleService.GetRoleAsync(roleid);
-            name = role.Name;
-            users = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId);
-            users = users
-                .Where(u => u.Role.Name == RoleNames.Registered)
-                .OrderBy(u => u.User.DisplayName)
-                .ToList();
-            await GetUserRoles();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Users {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error.User.Load"], MessageType.Error);
-        }
-    }
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
 
-    private async Task GetUserRoles()
-    {
-        try
-        {
-            userroles = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId);
-            userroles = userroles.Where(item => item.RoleId == roleid).ToList();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading User Roles {RoleId} {Error}", roleid, ex.Message);
-            AddModuleMessage(Localizer["Error.User.LoadRole"], MessageType.Error);
-        }
-    }
+	protected override async Task OnInitializedAsync()
+	{
+		try
+		{
+			roleid = Int32.Parse(PageState.QueryString["id"]);
+			Role role = await RoleService.GetRoleAsync(roleid);
+			name = role.Name;
+			await GetUserRoles();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Users {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.User.Load"], MessageType.Error);
+		}
+	}
 
-    private async Task SaveUserRole()
-    {
-        try
-        {
-            if (userid != -1)
-            {
-                var userrole = userroles.Where(item => item.UserId == userid && item.RoleId == roleid).FirstOrDefault();
-                if (userrole != null)
-                {
-                    userrole.EffectiveDate = effectivedate;
-                    userrole.ExpiryDate = expirydate;
-                    await UserRoleService.UpdateUserRoleAsync(userrole);
+	private async Task<Dictionary<string, string>> GetUsers(string filter)
+	{
+		try
+		{
+			var users = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, RoleNames.Registered);
+			return users.Where(item => item.User.DisplayName.Contains(filter, StringComparison.OrdinalIgnoreCase))
+				.ToDictionary(item => item.UserId.ToString(), item => item.User.DisplayName);
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Users {filter} {Error}", filter, ex.Message);
+			AddModuleMessage(Localizer["Error.User.Load"], MessageType.Error);
+		}
+		return new Dictionary<string, string>();
+	}
+
+	private async Task GetUserRoles()
+	{
+		try
+		{
+			userroles = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, name);
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading User Roles {RoleId} {Error}", roleid, ex.Message);
+			AddModuleMessage(Localizer["Error.User.LoadRole"], MessageType.Error);
+		}
+	}
+
+	private async Task SaveUserRole()
+	{
+		validated = true;
+		var interop = new Interop(JSRuntime);
+		if (await interop.FormValid(form))
+		{
+			try
+			{
+				if (!string.IsNullOrEmpty(user.Key) && int.TryParse(user.Key, out int userid))
+				{
+					var userrole = userroles.Where(item => item.UserId == userid && item.RoleId == roleid).FirstOrDefault();
+					if (userrole != null)
+					{
+						userrole.EffectiveDate = effectivedate;
+						userrole.ExpiryDate = expirydate;
+						await UserRoleService.UpdateUserRoleAsync(userrole);
+					}
+					else
+					{
+						userrole = new UserRole();
+						userrole.UserId = userid;
+						userrole.RoleId = roleid;
+						userrole.EffectiveDate = effectivedate;
+						userrole.ExpiryDate = expirydate;
+
+						await UserRoleService.AddUserRoleAsync(userrole);
+					}
+
+					await logger.LogInformation("User Assigned To Role {UserRole}", userrole);
+					AddModuleMessage(Localizer["Success.User.AssignedRole"], MessageType.Success);
+					await GetUserRoles();
+					user.Clear();
+					StateHasChanged();
                 }
                 else
                 {
-                    userrole = new UserRole();
-                    userrole.UserId = userid;
-                    userrole.RoleId = roleid;
-                    userrole.EffectiveDate = effectivedate;
-                    userrole.ExpiryDate = expirydate;
-
-                    await UserRoleService.AddUserRoleAsync(userrole);
+                    AddModuleMessage(Localizer["Message.Required.UserSelect"], MessageType.Warning);
                 }
-
-                await logger.LogInformation("User Assigned To Role {UserRole}", userrole);
-                AddModuleMessage(Localizer["Success.User.AssignedRole"], MessageType.Success);
-                await GetUserRoles();
-                StateHasChanged();
             }
-            else
+            catch (Exception ex)
             {
-                AddModuleMessage(Localizer["Message.Required.UserSelect"], MessageType.Warning);
+                await logger.LogError(ex, "Error Saving User Roles {RoleId} {Error}", roleid, ex.Message);
+                AddModuleMessage(Localizer["Error.User.SaveRole"], MessageType.Error);
             }
         }
-        catch (Exception ex)
+
+        else
         {
-            await logger.LogError(ex, "Error Saving User Roles {RoleId} {Error}", roleid, ex.Message);
-            AddModuleMessage(Localizer["Error.User.SaveRole"], MessageType.Error);
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
 
@@ -166,8 +182,18 @@ else
     {
         try
         {
-            await UserRoleService.DeleteUserRoleAsync(UserRoleId);
-            await logger.LogInformation("User Removed From Role {UserRoleId}", UserRoleId);
+            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 {Username} Removed From Role {Role}", userrole.User.Username, userrole.Role.Name);
+            }
             AddModuleMessage(Localizer["Confirm.User.RoleRemoved"], MessageType.Success);
             await GetUserRoles();
             StateHasChanged();

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,142 @@
+@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"
+                                Columns="1"
+                                Toolbar="Bottom"
+                                Parameters="@($"q={_keywords}")">
+                            <Row>
+                                <div class="search-item mb-2">
+                                    <h4 class="mb-1"><a href="@context.Url">@context.Title</a></h4>
+                                    <p class="mb-0 text-muted">@((MarkupString)context.Snippet)</p>
+                                </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 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 _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", int.MaxValue.ToString());
+        _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 (_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 = (!string.IsNullOrEmpty(_pageSize)) ? int.Parse(_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/Sites/Add.razor

@@ -1,5 +1,6 @@
 @namespace Oqtane.Modules.Admin.Sites
 @using Oqtane.Interfaces
+@using System.Text.RegularExpressions
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject ITenantService TenantService
@@ -19,163 +20,171 @@
 }
 else
 {
-    <table class="table table-borderless">
-        <tr>
-            <td width="30%">
-                <Label For="name" HelpText="Enter the name of the site" ResourceKey="Name">Site Name: </Label>
-            </td>
-            <td>
-                <input id="name" class="form-control" @bind="@_name" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="alias" HelpText="Enter the aliases for the site. An alias can be a domain name (www.site.com) or a virtual folder (ie. www.site.com/folder). If a site has multiple aliases they can be separated by commas." ResourceKey="Aliases">Aliases: </Label>
-            </td>
-            <td>
-                <textarea id="alias" class="form-control" @bind="@_urls" rows="3"></textarea>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="defaultTheme" HelpText="Select the default theme for the website" ResourceKey="DefaultTheme">Default Theme: </Label>
-            </td>
-            <td>
-                <select id="defaultTheme" class="form-select" @onchange="(e => ThemeChanged(e))">
-                    <option value="-">&lt;@Localizer["Theme.Select"]&gt;</option>
-                    @foreach (var theme in _themes)
-                    {
-                        <option value="@theme.TypeName">@theme.Name</option>
-                    }
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="defaultContainer" HelpText="Select the default container for the site" ResourceKey="DefaultContainer">Default Container: </Label>
-            </td>
-            <td>
-                <select id="defaultContainer" class="form-select" @bind="@_containertype">
-                    <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
-                    @foreach (var container in _containers)
-                    {
-                        <option value="@container.TypeName">@container.Name</option>
-                    }
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="adminContainer" HelpText="Select the admin container for the site" ResourceKey="AdminContainer">Admin Container: </Label>
-            </td>
-            <td>
-                <select id="adminContainer" class="form-select" @bind="@_admincontainertype">
-                    <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
-                    <option value="">&lt;@Localizer["DefaultContainer.Admin"]&gt;</option>
-                    @foreach (var container in _containers)
-                    {
-                        <option value="@container.TypeName">@container.Name</option>
-                    }
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="siteTemplate" HelpText="Select the site template" ResourceKey="SiteTemplate">Site Template: </Label>
-            </td>
-            <td>
-                <select id="siteTemplate" class="form-select" @bind="@_sitetemplatetype">
-                    <option value="-">&lt;@Localizer["SiteTemplate.Select"]&gt;</option>
-                    @foreach (SiteTemplate siteTemplate in _siteTemplates)
-                    {
-                        <option value="@siteTemplate.TypeName">@siteTemplate.Name</option>
-                    }
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="tenant" HelpText="Select the tenant for the site" ResourceKey="Tenant">Tenant: </Label>
-            </td>
-            <td>
-                <select id="tenant" class="form-select" @onchange="(e => TenantChanged(e))">
-                    <option value="-">&lt;@Localizer["Tenant.Select"]&gt;</option>
-                    <option value="+">&lt;@Localizer["Tenant.Add"]&gt;</option>
-                    @foreach (Tenant tenant in _tenants)
-                    {
-                        <option value="@tenant.TenantId">@tenant.Name</option>
-                    }
-                </select>
-            </td>
-        </tr>
-        @if (_tenantid == "+")
-        {
-            <tr>
-                <td colspan="2">
-                    <hr class="app-rule" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <Label For="name" HelpText="Enter the name for the tenant" ResourceKey="TenantName">Tenant Name: </Label>
-                </td>
-                <td>
-                    <input id="name" class="form-control" @bind="@_tenantName" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <Label For="databaseType" HelpText="Select the database type for the tenant" ResourceKey="DatabaseType">Database Type: </Label>
-                </td>
-                <td>
-                    <select id="databaseType" class="form-select" value="@_databaseName" @onchange="(e => DatabaseChanged(e))">
-                        @foreach (var database in _databases)
+    <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 the name of the site" ResourceKey="Name">Site Name: </Label>
+                <div class="col-sm-9">
+                    <input id="name" class="form-control" @bind="@_name" maxlength="200" required />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="alias" HelpText="The urls for the site (comman delimited). This can include domain names (ie. domain.com), subdomains (ie. sub.domain.com) or virtual folders (ie. domain.com/folder)." ResourceKey="Aliases">Urls: </Label>
+                <div class="col-sm-9">
+                    <textarea id="alias" class="form-control" @bind="@_urls" rows="3" required></textarea>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="defaultTheme" HelpText="Select the default theme for the website" ResourceKey="DefaultTheme">Default Theme: </Label>
+                <div class="col-sm-9">
+                    <select id="defaultTheme" class="form-select" value="@_themetype" @onchange="(e => ThemeChanged(e))" required>
+                        <option value="-">&lt;@Localizer["Theme.Select"]&gt;</option>
+                        @foreach (var theme in _themes)
                         {
-                            if (database.IsDefault)
-                            {
-                                <option value="@database.Name" selected>@Localizer[@database.Name]</option>
-                            }
-                            else
-                            {
-                                <option value="@database.Name">@Localizer[@database.Name]</option>
-                            }
+                            <option value="@theme.TypeName">@theme.Name</option>
                         }
                     </select>
-                </td>
-            </tr>
-            if (_databaseConfigType != null)
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="defaultContainer" HelpText="Select the default container for the site" ResourceKey="DefaultContainer">Default Container: </Label>
+                <div class="col-sm-9">
+                    <select id="defaultContainer" class="form-select" @bind="@_containertype" required>
+                        <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
+                        @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="siteTemplate" HelpText="Select the site template" ResourceKey="SiteTemplate">Site Template: </Label>
+                <div class="col-sm-9">
+                    <select id="siteTemplate" class="form-select" @bind="@_sitetemplatetype" required>
+                        <option value="-">&lt;@Localizer["SiteTemplate.Select"]&gt;</option>
+                        @foreach (SiteTemplate siteTemplate in _siteTemplates)
+                        {
+                            <option value="@siteTemplate.TypeName">@siteTemplate.Name</option>
+                        }
+                    </select>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <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="rendermode" class="form-select" @bind="@_rendermode" required>
+                        <option value="@RenderModes.Interactive">@(SharedLocalizer["RenderMode" + @RenderModes.Interactive])</option>
+                        <option value="@RenderModes.Static">@(SharedLocalizer["RenderMode" + @RenderModes.Static])</option>
+                        <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="runtime" HelpText="The render mode for UI components which require interactivity" ResourceKey="Runtime">Interactivity: </Label>
+                <div class="col-sm-9">
+                    <select id="runtime" class="form-select" @bind="@_runtime" required>
+                        <option value="@Runtimes.Server">@(SharedLocalizer["Runtime" + @Runtimes.Server])</option>
+                        <option value="@Runtimes.WebAssembly">@(SharedLocalizer["Runtime" + @Runtimes.WebAssembly])</option>
+                        <option value="@Runtimes.Auto">@(SharedLocalizer["Runtime" + @Runtimes.Auto])</option>
+                    </select>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="tenant" HelpText="Select the database for the site" ResourceKey="Tenant">Database: </Label>
+                <div class="col-sm-9">
+                    <select id="tenant" class="form-select" value="@_tenantid" @onchange="(e => TenantChanged(e))" required>
+                        <option value="-">&lt;@Localizer["Tenant.Select"]&gt;</option>
+                        <option value="+">&lt;@Localizer["Tenant.Add"]&gt;</option>
+                        @foreach (Tenant tenant in _tenants)
+                        {
+                            <option value="@tenant.TenantId">@tenant.Name</option>
+                        }
+                    </select>
+                </div>
+            </div>
+            @if (_tenantid == "+")
             {
-                @DatabaseConfigComponent;
+                <div class="row mb-1 align-items-center">
+                    <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. 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>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <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">
+								<select id="databaseType" class="form-select" value="@_databaseName" @onchange="(e => DatabaseChanged(e))" required>
+									@foreach (var database in _databases)
+									{
+										<option value="@database.Name">@Localizer[@database.Name]</option>
+									}
+								</select>
+								@if (!_showConnectionString)
+								{
+									<button type="button" class="btn btn-secondary" @onclick="ToggleConnectionString">@Localizer["EnterConnectionString"]</button>
+								}
+								else
+								{
+									<button type="button" class="btn btn-secondary" @onclick="ToggleConnectionString">@Localizer["EnterConnectionParameters"]</button>
+								}
+							</div>
+						}
+					</div>
+                </div>
+				@if (!_showConnectionString)
+				{
+					if (_databaseConfigType != null)
+					{
+						@DatabaseConfigComponent
+					}
+				}
+				else
+				{
+					<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>
+						<div class="col-sm-9">
+							<textarea id="connectionstring" class="form-control" @bind="@_connectionString" rows="3"></textarea>
+						</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">
+                        <input id="hostUsername" class="form-control" @bind="@_hostusername" required />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="hostPassword" HelpText="Enter the password of an existing host user" ResourceKey="HostPassword">Host Password:</Label>
+                    <div class="col-sm-9">
+                        <input id="hostPassword" type="password" class="form-control" @bind="@_hostpassword" autocomplete="new-password" required />
+                    </div>
+                </div>
             }
-            <tr>
-                <td>
-                    <Label For="hostUsername" HelpText="Enter the username of the host for this site" ResourceKey="HostUsername">Host Username:</Label>
-                </td>
-                <td>
-                    <input id="hostUsername" class="form-control" @bind="@_hostUserName" readonly />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <Label For="hostPassword" HelpText="Enter the password for the host of this site" ResourceKey="HostPassword">Host Password:</Label>
-                </td>
-                <td>
-                    <input id="hostPassword" type="password" class="form-control" @bind="@_hostpassword" />
-                </td>
-            </tr>
-        }
-    </table>
-    <button type="button" class="btn btn-success" @onclick="SaveSite">@SharedLocalizer["Save"]</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+        </div>
+        <br />
+        <br />
+        <button type="button" class="btn btn-success" @onclick="SaveSite">@SharedLocalizer["Save"]</button>
+        <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+    </form>
 }
 
 @code {
     private List<Database> _databases;
-    private string _databaseName = "LocalDB";
+    private ElementReference form;
+    private bool validated = false;
+    private string _databaseName;
     private Type _databaseConfigType;
     private object _databaseConfig;
     private RenderFragment DatabaseConfigComponent { get; set; }
-
+    private bool _showConnectionString = false;
+    private string _connectionString = string.Empty;
 
     private List<Theme> _themeList;
     private List<ThemeControl> _themes = new List<ThemeControl>();
@@ -186,26 +195,50 @@ else
 
     private string _tenantName = string.Empty;
 
-    private string _hostUserName = UserNames.Host;
+    private string _hostusername = string.Empty;
     private string _hostpassword = string.Empty;
 
     private string _name = string.Empty;
     private string _urls = string.Empty;
     private string _themetype = "-";
     private string _containertype = "-";
-    private string _admincontainertype = "";
     private string _sitetemplatetype = "-";
+    private string _rendermode = RenderModes.Static;
+    private string _runtime = Runtimes.Server;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnInitializedAsync()
     {
         _tenants = await TenantService.GetTenantsAsync();
+        if (_tenants.Any(item => item.Name == TenantNames.Master))
+        {
+            _tenantid = _tenants.First(item => item.Name == TenantNames.Master).TenantId.ToString();
+        }
         _urls = PageState.Alias.Name;
         _themeList = await ThemeService.GetThemesAsync();
         _themes = ThemeService.GetThemeControls(_themeList);
+        if (_themes.Any(item => item.TypeName == Constants.DefaultTheme))
+        {
+            _themetype = Constants.DefaultTheme;
+            _containers = ThemeService.GetContainerControls(_themeList, _themetype);
+            _containertype = _containers.First().TypeName;
+        }
         _siteTemplates = await SiteTemplateService.GetSiteTemplatesAsync();
+        if (_siteTemplates.Any(item => item.TypeName == Constants.DefaultSiteTemplate))
+        {
+            _sitetemplatetype = Constants.DefaultSiteTemplate;
+        }
+
         _databases = await DatabaseService.GetDatabasesAsync();
+        if (_databases.Exists(item => item.IsDefault))
+        {
+            _databaseName = _databases.Find(item => item.IsDefault).Name;
+        }
+        else
+        {
+            _databaseName = "LocalDB";
+        }
         LoadDatabaseConfigComponent();
     }
 
@@ -214,7 +247,7 @@ else
         try
         {
             _databaseName = (string)eventArgs.Value;
-
+            _showConnectionString = false;
             LoadDatabaseConfigComponent();
         }
         catch
@@ -256,13 +289,13 @@ else
             if (_themetype != "-")
             {
                 _containers = ThemeService.GetContainerControls(_themeList, _themetype);
+                _containertype = _containers.First().TypeName;
             }
             else
             {
                 _containers = new List<ThemeControl>();
+                _containertype = "-";
             }
-            _containertype = "-";
-            _admincontainertype = "";
             StateHasChanged();
         }
         catch (Exception ex)
@@ -274,111 +307,140 @@ else
 
     private async Task SaveSite()
     {
-        if (_tenantid != "-" && _name != string.Empty && _urls != string.Empty && _themetype != "-" && _containertype != "-" && _sitetemplatetype != "-")
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
         {
-            var duplicates = new List<string>();
-            var aliases = await AliasService.GetAliasesAsync();
-            foreach (string name in _urls.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+            if (_tenantid != "-" && _name != string.Empty && _urls != string.Empty && _themetype != "-" && _containertype != "-" && _sitetemplatetype != "-")
             {
-                if (aliases.Exists(item => item.Name == name))
+                _urls = Regex.Replace(_urls, @"\r\n?|\n", ",");
+                var duplicates = new List<string>();
+                var aliases = await AliasService.GetAliasesAsync();
+                foreach (string name in _urls.Split(',', StringSplitOptions.RemoveEmptyEntries))
                 {
-                    duplicates.Add(name);
-                }
-            }
-
-            if (duplicates.Count == 0)
-            {
-                InstallConfig config = new InstallConfig();
-
-                if (_tenantid == "+")
-                {
-                    if (!string.IsNullOrEmpty(_tenantName) && _tenants.FirstOrDefault(item => item.Name == _tenantName) == null)
+                    if (aliases.Exists(item => item.Name == name))
                     {
-                        // validate host credentials
-                        var user = new User();
-                        user.SiteId = PageState.Site.SiteId;
-                        user.Username = UserNames.Host;
-                        user.Password = _hostpassword;
-                        user = await UserService.LoginUserAsync(user, false, false);
-                        if (user.IsAuthenticated)
-                        {
-                            var connectionString = String.Empty;
-                            if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
-                            {
-                                connectionString = databaseConfigControl.GetConnectionString();
-                            }
-                            var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
+                        duplicates.Add(name);
+                    }
+                }
 
-                            if (connectionString != "")
+                if (duplicates.Count == 0)
+                {
+                    InstallConfig config = new InstallConfig();
+
+                    if (_tenantid == "+")
+                    {
+                        if (!string.IsNullOrEmpty(_tenantName) && !_tenants.Exists(item => item.Name == _tenantName))
+                        {
+                            // validate host credentials
+                            var user = new User();
+                            user.SiteId = PageState.Site.SiteId;
+                            user.Username = _hostusername;
+                            user.Password = _hostpassword;
+                            user.LastIPAddress = PageState.RemoteIPAddress;
+                            user = await UserService.LoginUserAsync(user, false, false);
+                            if (user.IsAuthenticated)
                             {
-                                config.TenantName = _tenantName;
-                                config.DatabaseType = database.DBType;
-                                config.ConnectionString = connectionString;
-                                config.HostEmail = user.Email;
-                                config.HostPassword = _hostpassword;
-                                config.HostName = user.DisplayName;
-                                config.IsNewTenant = true;
+                                var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
+                                var connectionString = String.Empty;
+                                if (_showConnectionString)
+                                {
+                                    connectionString = _connectionString;
+                                }
+                                else
+                                {
+                                    if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
+                                    {
+                                        connectionString = databaseConfigControl.GetConnectionString();
+                                    }
+                                }
+
+                                if (connectionString != "")
+                                {
+                                    config.TenantName = _tenantName;
+                                    config.DatabaseType = database.DBType;
+                                    config.ConnectionString = connectionString;
+                                    config.HostUsername = _hostusername;
+                                    config.HostPassword = _hostpassword;
+                                    config.HostEmail = user.Email;
+                                    config.HostName = user.DisplayName;
+                                    config.IsNewTenant = true;
+                                }
+                                else
+                                {
+                                    AddModuleMessage(Localizer["Error.Required.ServerDatabase"], MessageType.Error);
+                                }
                             }
                             else
                             {
-                                AddModuleMessage(Localizer["Error.Required.ServerDatabase"], MessageType.Error);
+                                AddModuleMessage(Localizer["Error.InvalidPassword"], MessageType.Error);
                             }
                         }
                         else
                         {
-                            AddModuleMessage(Localizer["Error.InvalidPassword"], MessageType.Error);
+                            AddModuleMessage(Localizer["Error.TenantName.Exists"], MessageType.Error);
                         }
                     }
                     else
                     {
-                        AddModuleMessage(Localizer["Error.TenantName.Exists"], MessageType.Error);
+                        var tenant = _tenants.FirstOrDefault(item => item.TenantId == int.Parse(_tenantid));
+                        if (tenant != null)
+                        {
+                            config.TenantName = tenant.Name;
+                            config.DatabaseType = tenant.DBType;
+                            config.ConnectionString = tenant.DBConnectionString;
+                            config.IsNewTenant = false;
+                        }
+                    }
+
+                    if (!string.IsNullOrEmpty(config.TenantName))
+                    {
+                        config.SiteName = _name;
+                        config.Aliases = _urls;
+                        config.DefaultTheme = _themetype;
+                        config.DefaultContainer = _containertype;
+                        config.DefaultAdminContainer = "";
+                        config.SiteTemplate = _sitetemplatetype;
+                        config.RenderMode = _rendermode;
+                        config.Runtime = _runtime;
+
+                        ShowProgressIndicator();
+
+                        var installation = await InstallationService.Install(config);
+                        if (installation.Success)
+                        {
+                            var aliasname = config.Aliases.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)[0];
+                            NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + aliasname, true);
+                        }
+                        else
+                        {
+                            await logger.LogError("Error Creating Site {Error}", installation.Message);
+                            AddModuleMessage(installation.Message, MessageType.Error);
+                        }
                     }
                 }
                 else
                 {
-                    var tenant = _tenants.FirstOrDefault(item => item.TenantId == int.Parse(_tenantid));
-                    if (tenant != null)
-                    {
-                        config.TenantName = tenant.Name;
-                        config.DatabaseType = tenant.DBType;
-                        config.ConnectionString = tenant.DBConnectionString;
-                        config.IsNewTenant = false;
-                    }
-                }
-
-                if (!string.IsNullOrEmpty(config.TenantName))
-                {
-                    config.SiteName = _name;
-                    config.Aliases = _urls;
-                    config.DefaultTheme = _themetype;
-                    config.DefaultContainer = _containertype;
-                    config.DefaultAdminContainer = _admincontainertype;
-                    config.SiteTemplate = _sitetemplatetype;
-
-                    ShowProgressIndicator();
-
-                    var installation = await InstallationService.Install(config);
-                    if (installation.Success)
-                    {
-                        var aliasname = config.Aliases.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)[0];
-                        var uri = new Uri(NavigationManager.Uri);
-                        NavigationManager.NavigateTo(uri.Scheme + "://" + aliasname, true);
-                    }
-                    else
-                    {
-                        await logger.LogError("Error Creating Site {Error}", installation.Message);
-                        AddModuleMessage(installation.Message, MessageType.Error);
-                    }
+                    AddModuleMessage(string.Format(Localizer["Message.SiteName.InUse"], string.Join(", ", duplicates.ToArray())), MessageType.Warning);
                 }
             }
             else
             {
-                AddModuleMessage(string.Format(Localizer["Message.SiteName.InUse"], string.Join(", ", duplicates.ToArray())), MessageType.Warning);
+                AddModuleMessage(Localizer["Message.Required.Tenant"], MessageType.Warning);
             }
         }
         else
         {
-            AddModuleMessage(Localizer["Message.Required.Tenant"], MessageType.Warning);
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
+
+	private void ToggleConnectionString()
+	{
+		if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
+		{
+			_connectionString = databaseConfigControl.GetConnectionString();
+		}
+		_showConnectionString = !_showConnectionString;
+	}
 }

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

@@ -8,17 +8,17 @@
 
 @if (_sites == null)
 {
-    <p><em>Loading...</em></p>
+    <p><em>@SharedLocalizer["Loading"]</em></p>
 }
 else
 {
     <ActionLink Action="Add" Text="Add Site" ResourceKey="AddSite" />
 
-    <Pager Items="@_sites">
+    <Pager Items="@_sites" SearchProperties="Name">
         <Header>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
-            <th>@SharedLocalizer["Name"]</th>
+            <th>@Localizer["AliasName"]</th>
         </Header>
         <Row>
             <td><button type="button" class="btn btn-primary" @onclick="@(async () => Edit(context.Name))">@SharedLocalizer["Edit"]</button></td>
@@ -30,20 +30,16 @@ else
 
 @code {
     private List<Alias> _sites;
-    private string _scheme;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnParametersSetAsync()
     {
-        var uri = new Uri(NavigationManager.Uri);
-        _scheme = uri.Scheme + "://";
-
         var aliases = await AliasService.GetAliasesAsync();
         _sites = new List<Alias>();
         foreach (Alias alias in aliases)
         {
-            if (!_sites.Exists(item => item.TenantId == alias.TenantId && item.SiteId == alias.SiteId))
+            if (alias.IsDefault && !_sites.Exists(item => item.TenantId == alias.TenantId && item.SiteId == alias.SiteId))
             {
                 _sites.Add(alias);
             }
@@ -52,11 +48,25 @@ else
 
     private void Edit(string name)
     {
-        NavigationManager.NavigateTo(_scheme + name + "/admin/site/?reload");
+        if (PageState.Alias.Name == name)
+        {
+            NavigationManager.NavigateTo("/admin/site");
+        }
+        else
+        {
+            NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + name + "/admin/site", true);
+        }
     }
 
     private void Browse(string name)
     {
-        NavigationManager.NavigateTo(_scheme + name + "/?reload");
+        if (PageState.Alias.Name == name)
+        {
+            NavigationManager.NavigateTo(PageState.Alias.Path + "/");
+        }
+        else
+        {
+            NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + name, true);
+        }
     }
 }

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

@@ -1,6 +1,7 @@
 @namespace Oqtane.Modules.Admin.Sql
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
+@inject ISystemService SystemService
 @inject ITenantService TenantService
 @inject IDatabaseService DatabaseService
 @inject ISqlService SqlService
@@ -13,112 +14,301 @@
 }
 else
 {
-    <table class="table table-borderless">
-        <tr>
-            <td width="30%">
-                <Label For="tenant" HelpText="Select the tenant for the SQL server" ResourceKey="Tenant">Tenant: </Label>
-            </td>
-            <td>
-                <select id="tenant" class="form-select" value="@_tenantid" @onchange="(e => TenantChanged(e))">
-                    <option value="-1">&lt;@Localizer["Tenant.Select"]&gt;</option>
-                    @foreach (Tenant tenant in _tenants)
-                    {
-                        <option value="@tenant.TenantId">@tenant.Name</option>
-                    }
-                </select>
-            </td>
-        </tr>
-        @if (_tenantid != "-1")
-        {
-            <tr>
-                <td>
-                    <Label For="database" HelpText="The database for the tenant" ResourceKey="Database">Database: </Label>
-                </td>
-                <td>
-                    <input id="database" class="form-control" @bind="@_database" readonly />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <Label For="connectionstring" HelpText="The connection information for the database" ResourceKey="ConnectionString">Connection: </Label>
-                </td>
-                <td>
-                    <textarea id="connectionstring" class="form-control" @bind="@_connectionstring" rows="2" readonly></textarea>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <Label For="sqlQeury" HelpText="Enter the query for the SQL server" ResourceKey="SqlQuery">SQL Query: </Label>
-                </td>
-                <td>
-                    <textarea id="sqlQeury" class="form-control" @bind="@_sql" rows="5"></textarea>
-                </td>
-            </tr>
-        }
-    </table>
-    <button type="button" class="btn btn-success" @onclick="Execute">@Localizer["Execute"]</button>
-    <br />
-    <br />
-    @if (!string.IsNullOrEmpty(_results))
-    {
-        @((MarkupString)_results)
-    }
+    <div class="container">
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="connection" HelpText="Select a database connection (from appsettings.json)" ResourceKey="Connection">Connection: </Label>
+			<div class="col-sm-9">
+				<select id="tenant" class="form-select" value="@_connection" @onchange="(e => ConnectionChanged(e))">
+					<option value="-">&lt;@Localizer["Connection.Select"]&gt;</option>
+					<option value="+">&lt;@Localizer["Connection.Add"]&gt;</option>
+					@foreach (var connection in _connections)
+					{
+						<option value="@connection.Key">@connection.Key</option>
+					}
+				</select>
+			</div>
+		</div>
+		@if (_connection == "+")
+		{
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="name" HelpText="Enter the name of the connection" ResourceKey="Name">Name: </Label>
+				<div class="col-sm-9">
+					<input id="name" class="form-control" @bind="@_name" maxlength="100" required />
+				</div>
+			</div>
+			<div class="row mb-1 align-items-center">
+				<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">
+							<select id="databasetype" class="form-select" value="@_databasetype" @onchange="(e => DatabaseTypeChanged(e))" required>
+								@foreach (var database in _databases)
+								{
+									<option value="@database.Name">@Localizer[@database.Name]</option>
+								}
+							</select>
+							@if (!_showConnectionString)
+							{
+								<button type="button" class="btn btn-secondary" @onclick="ShowConnectionString">@Localizer["EnterConnectionString"]</button>
+							}
+							else
+							{
+								<button type="button" class="btn btn-secondary" @onclick="ShowConnectionString">@Localizer["EnterConnectionParameters"]</button>
+							}
+						</div>
+					}
+				</div>
+			</div>
+			@if (!_showConnectionString)
+			{
+				if (_databaseConfigType != null)
+				{
+					@DatabaseConfigComponent
+				}
+			}
+			else
+			{
+				<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>
+					<div class="col-sm-9">
+						<textarea id="connectionstring" class="form-control" @bind="@_connectionstring" rows="3"></textarea>
+					</div>
+				</div>
+			}
+			<br />
+			<button type="button" class="btn btn-success" @onclick="Add">@Localizer["Add"]</button>
+		}
+		else
+		{
+			@if (_connection != "-")
+			{
+				@if (!string.IsNullOrEmpty(_tenant))
+				{
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="databasetype" HelpText="The database type" ResourceKey="DatabaseType">Type: </Label>
+                        <div class="col-sm-9">
+                            <input id="databasetype" class="form-control" @bind="@_databasetype" readonly />
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="tenant" HelpText="The database using this connection" ResourceKey="Tenant">Database: </Label>
+						<div class="col-sm-9">
+							<input id="tenant" class="form-control" @bind="@_tenant" readonly />
+						</div>
+					</div>
+				}
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="connectionstring" HelpText="The connection string" ResourceKey="ConnectionString">Settings: </Label>
+					<div class="col-sm-9">
+						<div class="input-group">
+							<input id="connectionstring" type="@_connectionstringtype" class="form-control" @bind="@_connectionstring" readonly />
+							<button type="button" class="btn btn-secondary" @onclick="@ToggleConnectionString">@_connectionstringtoggle</button>
+						</div>
+					</div>
+				</div>
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="sqlQuery" HelpText="Enter a valid SQL query for the database" ResourceKey="SqlQuery">SQL Query: </Label>
+					<div class="col-sm-9">
+						<textarea id="sqlQuery" class="form-control" @bind="@_sql" rows="3"></textarea>
+					</div>
+				</div>
+				<br />
+				<button type="button" class="btn btn-success" @onclick="Execute">@Localizer["Execute"]</button>
+				<br />
+				<br />
+				@if (_results != null)
+				{
+					@if (_results.Count > 0)
+					{
+						<Pager Class="table table-bordered" Items="@_results">
+							<Header>
+								@foreach (KeyValuePair<string, string> kvp in _results.First())
+								{
+								<th>@kvp.Key</th>
+								}
+							</Header>
+							<Row>
+								@foreach (KeyValuePair<string, string> kvp in context)
+								{
+									<td>@kvp.Value</td>
+								}
+							</Row>
+						</Pager>
+					}
+					else
+					{
+						@Localizer["Return.NoResult"]
+					}
+					<br />
+
+					<br />
+				}
+			}
+		}
+	</div>
 }
 
 @code {
-    private List<Tenant> _tenants;
-    private string _tenantid = "-1";
-    private string _database = string.Empty;
-    private string _connectionstring = string.Empty;
-    private string _sql = string.Empty;
-    private string _results = string.Empty;
+	private string _connection = "-";
+	private Dictionary<string, object> _connections;
+	private List<Tenant> _tenants;
+	private List<Database> _databases;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+	private string _name = string.Empty;
+	private string _databasetype = string.Empty;
+	private Type _databaseConfigType;
+	private object _databaseConfig;
+	private RenderFragment DatabaseConfigComponent { get; set; }
+	private bool _showConnectionString = false;
+	private string _tenant = string.Empty;
+	private string _connectionstring = string.Empty;
+	private string _connectionstringtype = "password";
+	private string _connectionstringtoggle = string.Empty;
+	private string _sql = string.Empty;
+	private List<Dictionary<string, string>> _results;
 
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            _tenants = await TenantService.GetTenantsAsync();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Tenants {Error}", ex.Message);
-            AddModuleMessage(ex.Message, MessageType.Error);
-        }
-    }
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-    private async void TenantChanged(ChangeEventArgs e)
-    {
-        try
-        {
-            _tenantid = (string)e.Value;
-            var tenants = await TenantService.GetTenantsAsync();
-            var _databases = await DatabaseService.GetDatabasesAsync();
-            var tenant = tenants.Find(item => item.TenantId == int.Parse(_tenantid));
-            if (tenant != null)
-            {
-                _database = _databases.Find(item => item.DBType == tenant.DBType)?.Name;
-                _connectionstring = tenant.DBConnectionString;
-            }
-            StateHasChanged();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Tenant {TenantId} {Error}", _tenantid, ex.Message);
-            AddModuleMessage(ex.Message, MessageType.Error);
-        }
-    }
+	protected override async Task OnInitializedAsync()
+	{
+		try
+		{
+			_connections = await SystemService.GetSystemInfoAsync("connectionstrings");
+			_tenants = await TenantService.GetTenantsAsync();
+			_databases = await DatabaseService.GetDatabasesAsync();
+			_connectionstringtoggle = SharedLocalizer["ShowPassword"];
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Tenants {Error}", ex.Message);
+			AddModuleMessage(ex.Message, MessageType.Error);
+		}
+	}
 
-    private async Task Execute()
-    {
-        try
-        {
-            if (_tenantid != "-1" && !string.IsNullOrEmpty(_sql))
-            {
-                var sqlquery = new SqlQuery { TenantId = int.Parse(_tenantid), Query = _sql };
+	private async void ConnectionChanged(ChangeEventArgs e)
+	{
+		try
+		{
+			_connection = (string)e.Value;
+			if (_connection != "-" && _connection != "+")
+			{
+				_connectionstring = _connections[_connection].ToString();
+				_tenant = "";
+				_databasetype = "";
+				var tenant = _tenants.FirstOrDefault(item => item.DBConnectionString == _connection);
+				if (tenant != null)
+				{
+					_tenant = tenant.Name;
+					_databasetype = _databases.FirstOrDefault(item => item.DBType == tenant.DBType && item.Name != "LocalDB").Name;
+				}
+			}
+			else
+			{
+				if (_databases.Exists(item => item.IsDefault))
+				{
+					_databasetype = _databases.Find(item => item.IsDefault).Name;
+				}
+				else
+				{
+					_databasetype = "LocalDB";
+				}
+				_showConnectionString = false;
+				LoadDatabaseConfigComponent();
+			}
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Connection {Connection} {Error}", _connection, ex.Message);
+			AddModuleMessage(ex.Message, MessageType.Error);
+		}
+	}
+
+	private void DatabaseTypeChanged(ChangeEventArgs eventArgs)
+	{
+		try
+		{
+			_databasetype = (string)eventArgs.Value;
+			_showConnectionString = false;
+			LoadDatabaseConfigComponent();
+		}
+		catch
+		{
+			AddModuleMessage(Localizer["Error.Database.LoadConfig"], MessageType.Error);
+		}
+	}
+
+	private void LoadDatabaseConfigComponent()
+	{
+		var database = _databases.SingleOrDefault(d => d.Name == _databasetype);
+		if (database != null)
+		{
+			_databaseConfigType = Type.GetType(database.ControlType);
+			DatabaseConfigComponent = builder =>
+			{
+				builder.OpenComponent(0, _databaseConfigType);
+				builder.AddComponentReferenceCapture(1, inst => { _databaseConfig = Convert.ChangeType(inst, _databaseConfigType); });
+				builder.CloseComponent();
+			};
+		}
+	}
+
+	private void ShowConnectionString()
+	{
+		if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
+		{
+			_connectionstring = databaseConfigControl.GetConnectionString();
+		}
+		_showConnectionString = !_showConnectionString;
+	}
+
+	private async Task Add()
+	{
+		var connectionstring = _connectionstring;
+		if (!_showConnectionString && _databaseConfig is IDatabaseConfigControl databaseConfigControl)
+		{
+			connectionstring = databaseConfigControl.GetConnectionString();
+		}
+		if (!string.IsNullOrEmpty(_name) && !string.IsNullOrEmpty(connectionstring))
+		{
+			var settings = new Dictionary<string, object>();
+			settings.Add($"{SettingKeys.ConnectionStringsSection}:{_name}", connectionstring);
+			await SystemService.UpdateSystemInfoAsync(settings);
+			_connections = await SystemService.GetSystemInfoAsync("connectionstrings");
+			_connection = "-";
+			AddModuleMessage(Localizer["Message.Connection.Added"], MessageType.Success);
+		}
+		else
+		{
+			AddModuleMessage(Localizer["Message.Required.Connection"], MessageType.Warning);
+		}
+	}
+
+	private void ToggleConnectionString()
+	{
+		if (_connectionstringtype == "password")
+		{
+			_connectionstringtype = "text";
+			_connectionstringtoggle = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_connectionstringtype = "password";
+			_connectionstringtoggle = SharedLocalizer["ShowPassword"];
+		}
+	}
+
+	private async Task Execute()
+	{
+		try
+		{
+			if (_databasetype != "-" && !string.IsNullOrEmpty(_sql))
+			{
+				var dbtype = _databases.FirstOrDefault(item => item.Name == _databasetype).DBType;
+				var sqlquery = new SqlQuery { DBConnectionString = _connection, DBType = dbtype, Query = _sql };
                 sqlquery = await SqlService.ExecuteQueryAsync(sqlquery);
-                _results = DisplayResults(sqlquery.Results);
+                _results = sqlquery.Results;
                 AddModuleMessage(Localizer["Success.QueryExecuted"], MessageType.Success);
             }
             else
@@ -132,44 +322,4 @@ else
             AddModuleMessage(ex.Message, MessageType.Error);
         }
     }
-
-    private string DisplayResults(List<Dictionary<string, string>> results)
-    {
-        var table = string.Empty;
-        foreach (Dictionary<string, string> item in results)
-        {
-            if (table == string.Empty)
-            {
-                table = "<div class=\"table-responsive\">";
-                table += "<table class=\"table table-bordered\"><thead><tr>";
-
-                foreach (KeyValuePair<string, string> kvp in item)
-                {
-                    table += "<th scope=\"col\">" + kvp.Key + "</th>";
-                }
-
-                table += "</tr></thead><tbody>";
-            }
-
-            table += "<tr>";
-
-            foreach (KeyValuePair<string, string> kvp in item)
-            {
-                table += "<td>" + kvp.Value + "</td>";
-            }
-
-            table += "</tr>";
-        }
-
-        if (table != string.Empty)
-        {
-            table += "</tbody></table></div>";
-        }
-        else
-        {
-            table = Localizer["Return.NoResult"];
-        }
-
-        return table;
-    }
 }

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

@@ -7,105 +7,97 @@
 
 <TabStrip>
     <TabPanel Name="Info" Heading="Info" ResourceKey="Info">
-        <table class="table table-borderless">
-            <tr>
-                <td width="30%">
-                    <Label For="version" HelpText="Framework Version" ResourceKey="FrameworkVersion">Framework Version: </Label>
-                </td>
-                <td>
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="version" HelpText="Framework Version" ResourceKey="FrameworkVersion">Framework Version: </Label>
+                <div class="col-sm-9">
                     <input id="version" class="form-control" @bind="@_version" readonly />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <Label For="clrversion" HelpText="Common Language Runtime Version" ResourceKey="CLRVersion">CLR Version: </Label>
-                </td>
-                <td>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="clrversion" HelpText="Common Language Runtime Version" ResourceKey="CLRVersion">CLR Version: </Label>
+                <div class="col-sm-9">
                     <input id="clrversion" class="form-control" @bind="@_clrversion" readonly />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <Label For="osversion" HelpText="Operating System Version" ResourceKey="OSVersion">OS Version: </Label>
-                </td>
-                <td>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="osversion" HelpText="Operating System Version" ResourceKey="OSVersion">OS Version: </Label>
+                <div class="col-sm-9">
                     <input id="osversion" class="form-control" @bind="@_osversion" readonly />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <Label For="serverpath" HelpText="Server Path" ResourceKey="ServerPath">Server Path: </Label>
-                </td>
-                <td>
-                    <input id="serverpath" class="form-control" @bind="@_serverpath" readonly />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <Label For="servertime" HelpText="Server Time" ResourceKey="ServerTime">Server Time: </Label>
-                </td>
-                <td>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="process" HelpText="Indicates if the current process is 32 bit or 64 bit" ResourceKey="Process">Process: </Label>
+                <div class="col-sm-9">
+                    <input id="process" class="form-control" @bind="@_process" readonly />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="machinename" HelpText="Machine Name" ResourceKey="MachineName">Machine Name: </Label>
+                <div class="col-sm-9">
+                    <input id="machinename" class="form-control" @bind="@_machinename" readonly />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="ipaddress" HelpText="Server IP Address" ResourceKey="IPAddress">IP Address: </Label>
+                <div class="col-sm-9">
+                    <input id="ipaddress" class="form-control" @bind="@_ipaddress" readonly />
+                </div>
+            </div>
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="environment" HelpText="Environment name" ResourceKey="Environment">Environment: </Label>
+				<div class="col-sm-9">
+					<input id="environment" class="form-control" @bind="@_environment" readonly />
+				</div>
+			</div>
+			<div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="contentrootpath" HelpText="Root Path" ResourceKey="ContentRootPath">Root Path: </Label>
+                <div class="col-sm-9">
+                    <input id="contentrootpath" class="form-control" @bind="@_contentrootpath" readonly />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="webrootpath" HelpText="Web Path" ResourceKey="WebRootPath">Web Path: </Label>
+                <div class="col-sm-9">
+                    <input id="webrootpath" class="form-control" @bind="@_webrootpath" readonly />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="servertime" HelpText="Server Date/Time (in UTC)" ResourceKey="ServerTime">Server Date/Time: </Label>
+                <div class="col-sm-9">
                     <input id="servertime" class="form-control" @bind="@_servertime" readonly />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <Label For="installationid" HelpText="The Unique Identifier For Your Installation" ResourceKey="InstallationId">Installation ID: </Label>
-                </td>
-                <td>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="workingset" HelpText="Memory Allocation Of Service (in MB)" ResourceKey="WorkingSet">Memory Allocation: </Label>
+                <div class="col-sm-9">
+                    <input id="workingset" class="form-control" @bind="@_workingset" readonly />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="installationid" HelpText="The Unique Identifier For Your Installation" ResourceKey="InstallationId">Installation ID: </Label>
+                <div class="col-sm-9">
                     <input id="installationid" class="form-control" @bind="@_installationid" readonly />
-                </td>
-            </tr>
-            <tr>
-                <td>&nbsp;</td>
-                <td>
-                    <br /><input type="checkbox" @onchange="(e => RegisterChecked(e))" /> @Localizer["Register"]
-                </td>
-            </tr>
-        </table>
+                </div>
+            </div>
+        </div>
         <br /><br />
         <ActionDialog Header="Restart Application" Message="Are You Sure You Wish To Restart The Application?" Action="Restart Application" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await RestartApplication())" ResourceKey="RestartApplication" />
     </TabPanel>
     <TabPanel Name="Options" Heading="Options" ResourceKey="Options">
-        <table class="table table-borderless">
-            <tr>
-                <td width="30%">
-                    <Label For="runtime" HelpText="Blazor Runtime (Server or WebAssembly)" ResourceKey="BlazorRuntime">Blazor Runtime: </Label>
-                </td>
-                <td>
-                    <select id="runtime" class="form-select" @bind="@_runtime">
-                        <option value="Server">@Localizer["Server"]</option>
-                        <option value="WebAssembly">@Localizer["WebAssembly"]</option>
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <Label For="rendermode" HelpText="Blazor Server Render Mode" ResourceKey="RenderMode">Render Mode: </Label>
-                </td>
-                <td>
-                    <select id="rendermode" class="form-select" @bind="@_rendermode">
-                        <option value="Server">@Localizer["Server"]</option>
-                        <option value="ServerPrerendered">@Localizer["ServerPrerendered"]</option>
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <Label For="detailederrors" HelpText="Specify If Detailed Errors Are Enabled For Blazor. This Option Should Not Not Be Enabled In Production." ResourceKey="DetailedErrors">Detailed Errors? </Label>
-                </td>
-                <td>
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="detailederrors" HelpText="Specify If Detailed Errors Are Enabled For Blazor. This Option Should Not Not Be Enabled In Production." ResourceKey="DetailedErrors">Detailed Errors? </Label>
+                <div class="col-sm-9">
                     <select id="detailederrors" class="form-select" @bind="@_detailederrors">
                         <option value="true">@SharedLocalizer["True"]</option>
                         <option value="false">@SharedLocalizer["False"]</option>
                     </select>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <Label For="logginglevel" HelpText="The Minimum Logging Level For The Event Log. This Option Can Be Used To Control The Volume Of Items Stored In Your Event Log." ResourceKey="LoggingLevel">Logging Level: </Label>
-                </td>
-                <td>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="logginglevel" HelpText="The Minimum Logging Level For The Event Log. This Option Can Be Used To Control The Volume Of Items Stored In Your Event Log." ResourceKey="LoggingLevel">Logging Level: </Label>
+                <div class="col-sm-9">
                     <select id="logginglevel" class="form-select" @bind="@_logginglevel">
                         <option value="Trace">@Localizer["Trace"]</option>
                         <option value="Debug">@Localizer["Debug"]</option>
@@ -113,98 +105,177 @@
                         <option value="Warning">@Localizer["Warning"]</option>
                         <option value="Error">@Localizer["Error"]</option>
                         <option value="Critical">@Localizer["Critical"]</option>
+                        <option value="None">@Localizer["None"]</option>
                     </select>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <Label For="swagger" HelpText="Specify If Swagger Is Enabled For Your Server API" ResourceKey="Swagger">Swagger Enabled? </Label>
-                </td>
-                <td>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="notificationlevel" HelpText="The Minimum Logging Level For Which Notifications Should Be Sent To Host Users." ResourceKey="NotificationLevel">Notification Level: </Label>
+                <div class="col-sm-9">
+                    <select id="notificationlevel" class="form-select" @bind="@_notificationlevel">
+                        <option value="Trace">@Localizer["Trace"]</option>
+                        <option value="Debug">@Localizer["Debug"]</option>
+                        <option value="Information">@Localizer["Information"]</option>
+                        <option value="Warning">@Localizer["Warning"]</option>
+                        <option value="Error">@Localizer["Error"]</option>
+                        <option value="Critical">@Localizer["Critical"]</option>
+                        <option value="None">@Localizer["None"]</option>
+                    </select>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="swagger" HelpText="Specify If Swagger Is Enabled For Your Server API" ResourceKey="Swagger">Swagger Enabled? </Label>
+                <div class="col-sm-9">
                     <select id="swagger" class="form-select" @bind="@_swagger">
                         <option value="true">@SharedLocalizer["True"]</option>
                         <option value="false">@SharedLocalizer["False"]</option>
                     </select>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <Label For="packageservice" HelpText="Specify If The Package Service Is Enabled For Installing Modules, Themes, And Translations" ResourceKey="PackageService">Enable Package Service? </Label>
-                </td>
-                <td>
-                    <select id="packageservice" class="form-select" @bind="@_packageservice">
-                        <option value="true">@SharedLocalizer["True"]</option>
-                        <option value="false">@SharedLocalizer["False"]</option>
-                    </select>
-                </td>
-            </tr>
-        </table>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="cachecontrol" HelpText="Provide a Cache-Control directive for static assets. For example 'public, max-age=60' indicates that static assets should be cached for 60 seconds. A blank value indicates caching is not enabled." ResourceKey="CacheControl">Static Asset Caching: </Label>
+                <div class="col-sm-9">
+                    <input id="cachecontrol" class="form-control" @bind="@_cachecontrol" />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="packageregistryurl" HelpText="Specify The Url Of The Package Manager Service For Installing Modules, Themes, And Translations. If This Field Is Blank It Means The Package Manager Service Is Disabled For This Installation." ResourceKey="PackageManager">Package Manager Url: </Label>
+                <div class="col-sm-9">
+                    <input id="packageregistryurl" class="form-control" @bind="@_packageregistryurl" />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="packageregistryemail" HelpText="Specify The Email Address Of The User Account Used For Interacting With The Package Manager Service. This Account Is Used For Managing Packages Across Multiple Installations." ResourceKey="PackageManagerEmail">Package Manager Email: </Label>
+                <div class="col-sm-9">
+                    <input id="packageregistryemail" class="form-control" @bind="@_packageregistryemail" />
+                </div>
+            </div>
+        </div>
         <br /><br />
         <button type="button" class="btn btn-success" @onclick="SaveConfig">@SharedLocalizer["Save"]</button>&nbsp;
-        <a class="btn btn-primary" href="swagger/index.html" target="_new">@Localizer["Access.ApiFramework"]</a>&nbsp;
         <ActionDialog Header="Restart Application" Message="Are You Sure You Wish To Restart The Application?" Action="Restart Application" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await RestartApplication())" ResourceKey="RestartApplication" />
+        <br /><br />
+        <a class="btn btn-primary" href="swagger/index.html" target="_new">@Localizer["Swagger"]</a>&nbsp;
+        <a class="btn btn-secondary" href="api/endpoint" target="_new">@Localizer["Endpoints"]</a>
     </TabPanel>
+    <TabPanel Name="Log" Heading="Log" ResourceKey="Log">
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="log" HelpText="System log information for current day" ResourceKey="Log">Log: </Label>
+                <div class="col-sm-9">
+                    <textarea id="log" class="form-control" rows="10" @bind="@_log" readonly />
+                </div>
+            </div>
+		</div>
+		<br /><br />
+		<button type="button" class="btn btn-danger" @onclick="ClearLog">@Localizer["Clear"]</button>
+	</TabPanel>
 </TabStrip>
+<br /><br />
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-    private string _version = string.Empty;
-    private string _clrversion = string.Empty;
-    private string _osversion = string.Empty;
-    private string _serverpath = string.Empty;
-    private string _servertime = string.Empty;
-    private string _installationid = string.Empty;
+	private string _version = string.Empty;
+	private string _clrversion = string.Empty;
+	private string _osversion = string.Empty;
+    private string _process = string.Empty;
+    private string _machinename = string.Empty;
+	private string _ipaddress = string.Empty;
+	private string _environment = string.Empty;
+	private string _contentrootpath = string.Empty;
+	private string _webrootpath = string.Empty;
+	private string _servertime = string.Empty;
+	private string _workingset = string.Empty;
+	private string _installationid = string.Empty;
 
-    private string _runtime = string.Empty;
-    private string _rendermode = string.Empty;
-    private string _detailederrors = string.Empty;
-    private string _logginglevel = string.Empty;
-    private string _swagger = string.Empty;
-    private string _packageservice = string.Empty;
+	private string _detailederrors = string.Empty;
+	private string _logginglevel = string.Empty;
+	private string _notificationlevel = string.Empty;
+	private string _swagger = string.Empty;
+    private string _cachecontrol = string.Empty;
+    private string _packageregistryurl = string.Empty;
+    private string _packageregistryemail = string.Empty;
 
-    protected override async Task OnInitializedAsync()
-    {
-        _version = Constants.Version;
+    private string _log = string.Empty;
 
-        Dictionary<string, string> systeminfo = await SystemService.GetSystemInfoAsync();
-        if (systeminfo != null)
-        {
-            _clrversion = systeminfo["clrversion"];
-            _osversion = systeminfo["osversion"];
-            _serverpath = systeminfo["serverpath"];
-            _servertime = systeminfo["servertime"];
-            _installationid = systeminfo["installationid"];
+	protected override async Task OnInitializedAsync()
+	{
+		_version = Constants.Version;
 
-            _runtime = systeminfo["runtime"];
-            _rendermode = systeminfo["rendermode"];
-            _detailederrors = systeminfo["detailederrors"];
-            _logginglevel = systeminfo["logginglevel"];
-            _swagger = systeminfo["swagger"];
-            _packageservice = systeminfo["packageservice"];
+		var systeminfo = await SystemService.GetSystemInfoAsync("environment");
+		if (systeminfo != null)
+		{
+			_clrversion = systeminfo["CLRVersion"].ToString();
+			_osversion = systeminfo["OSVersion"].ToString();
+            _process = systeminfo["Process"].ToString();
+            _machinename = systeminfo["MachineName"].ToString();
+			_ipaddress = systeminfo["IPAddress"].ToString();
+			_environment = systeminfo["Environment"].ToString();
+			_contentrootpath = systeminfo["ContentRootPath"].ToString();
+			_webrootpath = systeminfo["WebRootPath"].ToString();
+			_servertime = systeminfo["ServerTime"].ToString() + " UTC";
+			_workingset = (Convert.ToInt64(systeminfo["WorkingSet"].ToString()) / 1000000).ToString() + " MB";
+		}
+
+		systeminfo = await SystemService.GetSystemInfoAsync("configuration");
+		if (systeminfo != null)
+		{
+			_installationid = systeminfo["InstallationId"].ToString();
+			_detailederrors = systeminfo["DetailedErrors"].ToString();
+			_logginglevel = systeminfo["Logging:LogLevel:Default"].ToString();
+			_notificationlevel = systeminfo["Logging:LogLevel:Notify"].ToString();
+            _swagger = systeminfo["UseSwagger"].ToString();
+            _cachecontrol = systeminfo["CacheControl"].ToString();
+            _packageregistryurl = systeminfo["PackageRegistryUrl"].ToString();
+            _packageregistryemail = systeminfo["PackageRegistryEmail"].ToString();
         }
-    }
 
-    private async Task SaveConfig()
-    {
-        try
-        {
-            var settings = new Dictionary<string, string>();
-            settings.Add("runtime", _runtime);
-            settings.Add("rendermode", _rendermode);
-            settings.Add("detailederrors", _detailederrors);
-            settings.Add("logginglevel", _logginglevel);
-            settings.Add("swagger", _swagger);
-            settings.Add("packageservice", _packageservice);
+		systeminfo = await SystemService.GetSystemInfoAsync("log");
+		if (systeminfo != null)
+		{
+			_log = systeminfo["Log"].ToString();
+		}
+	}
+
+	private async Task SaveConfig()
+	{
+		try
+		{
+			var settings = new Dictionary<string, object>();
+			settings.Add("DetailedErrors", _detailederrors);
+			settings.Add("Logging:LogLevel:Default", _logginglevel);
+			settings.Add("Logging:LogLevel:Notify", _notificationlevel);
+			settings.Add("UseSwagger", _swagger);
+            settings.Add("CacheControl", _cachecontrol);
+            settings.Add("PackageRegistryUrl", _packageregistryurl);
+            settings.Add("PackageRegistryEmail", _packageregistryemail);
             await SystemService.UpdateSystemInfoAsync(settings);
-            AddModuleMessage(Localizer["Success.UpdateConfig.Restart"], MessageType.Success);
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Saving Configuration");
-            AddModuleMessage(Localizer["Error.UpdateConfig"], MessageType.Error);
-        }
-    }
+			AddModuleMessage(Localizer["Success.UpdateConfig.Restart"], MessageType.Success);
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Saving Configuration");
+			AddModuleMessage(Localizer["Error.UpdateConfig"], MessageType.Error);
+		}
+	}
+
+	private async Task ClearLog()
+	{
+		try
+		{
+			var settings = new Dictionary<string, object>();
+			settings.Add("clearlog", "true");
+			await SystemService.UpdateSystemInfoAsync(settings);
+			_log = string.Empty;
+			AddModuleMessage(Localizer["Success.ClearLog"], MessageType.Success);
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Clearing Log");
+			AddModuleMessage(Localizer["Error.ClearLog"], MessageType.Error);
+		}
+	}
 
     private async Task RestartApplication()
     {
@@ -220,20 +291,4 @@
             await logger.LogError(ex, "Error Restarting Application");
         }
     }
-
-    private async Task RegisterChecked(ChangeEventArgs e)
-    {
-        try
-        {
-            if ((bool)e.Value)
-            {
-                await InstallationService.RegisterAsync(PageState.User.Email);
-                AddModuleMessage(Localizer["Success.Register"], MessageType.Success);
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error On Register");
-        }
-    }
 }

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

@@ -9,66 +9,177 @@
 
 <TabStrip>
     <TabPanel Name="Download" ResourceKey="Download">
-        <ModuleMessage Type="MessageType.Info" Message="Download one or more themes from the list below. Once you are ready click Install to complete the installation."></ModuleMessage>
-
-        <table class="table table-borderless" style=" margin: auto; width: 50% !important;">
-            <tr>
-                <td>
-                    <input id="search" class="form-control" placeholder="@SharedLocalizer["Search.Hint"]" @bind="@_search" />
-                </td>
-                <td>
-                    <button type="button" class="btn btn-primary" @onclick="Search">@SharedLocalizer["Search"]</button>&nbsp;
-                    <button type="button" class="btn btn-secondary" @onclick="Reset">@SharedLocalizer["Reset"]</button>
-                </td>
-            </tr>
-        </table>
-
-        @if (_packages != null)
-        {
-            if (_packages.Count > 0)
-            {
-                <Pager Items="@_packages">
-                    <Row>
-                        <td>
-                            <h3 style="display: inline;"><a href="@context.ProductUrl" target="_new">@context.Name</a></h3>&nbsp;&nbsp;@SharedLocalizer["Search.By"]:&nbsp;&nbsp;<strong><a href="@context.OwnerUrl" target="new">@context.Owner</a></strong><br />
-                            @(context.Description.Length > 400 ? (context.Description.Substring(0, 400) + "...") : context.Description)<br />
-                            <strong>@(String.Format("{0:n0}", context.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp; @SharedLocalizer["Search.Released"]: <strong>@context.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;@SharedLocalizer["Search.Version"]: <strong>@context.Version</strong>&nbsp;&nbsp;|&nbsp;&nbsp;@SharedLocalizer["Search.Source"]: <strong>@context.PackageUrl</strong>
-                        </td>
-                        <td style="vertical-align: middle;">
-                            <button type="button" class="btn btn-primary" @onclick=@(async () => await DownloadTheme(context.PackageId, context.Version))>@SharedLocalizer["Download"]</button>
-                        </td>
-                    </Row>
-                </Pager>
-            }
-            else
-            {
-                <br />
-                <div class="mx-auto text-center">
-                    @Localizer["Search.NoResults"]
+        <div class="row justify-content-center mb-3">
+            <div class="text-center">
+                <div class="form-check form-check-inline">
+                    <input id="free" class="form-check-input" type="radio" checked="@(_price == "free")" name="Price" @onchange="@(() => PriceChanged("free"))" />
+                    <label class="form-check-label" for="free">@SharedLocalizer["Free"]</label>
                 </div>
-            }
-        }
+                <div class="form-check form-check-inline">
+                    <input id="paid" class="form-check-input" type="radio" checked="@(_price == "paid")" name="Price" @onchange="@(() => PriceChanged("paid"))" />
+                    <label class="form-check-label" for="paid">@SharedLocalizer["Paid"]</label>
+                </div>
+            </div>
+        </div>
+        <div class="row justify-content-center mb-3">
+            <div class="col">
+                <div class="input-group">
+                    <span class="input-group-text">@Localizer["Product"]</span>
+                    <input id="search" class="form-control" placeholder="@SharedLocalizer["Search.Hint"]" @bind="@_search" />
+                    <button type="button" class="btn btn-primary" @onclick="Search">@SharedLocalizer["Search"]</button>
+                    <button type="button" class="btn btn-secondary" @onclick="Reset">@SharedLocalizer["Reset"]</button>
+                    <button type="button" class="btn btn-primary ms-2" @onclick="Refresh"><span class="@Icons.Reload" aria-hidden="true"></span></button>
+                </div>
+            </div>
+        </div>
+        <div class="row mb-3">
+            <div class="col">
+                @if (_initialized)
+                {
+                    <br />
+                    <div class="row mb-3">
+                        <div class="col-sm-4">
+                            <h3>@((_packages != null) ? _packages.Count : 0) @SharedLocalizer["Search.Results"]</h3>
+                        </div>
+                        <div class="col-sm-4">
+                            &nbsp;
+                        </div>
+                        <div class="col-sm-4">
+                            <select class="form-select" value="@_sort" @onchange="(e => SortChanged(e))">
+                                <option value="popularity">@SharedLocalizer["Search.Popularity"]</option>
+                                <option value="alphabetical">@SharedLocalizer["Search.Alphabetical"]</option>
+                                @if (_price == "free")
+                                {
+                                    <option value="downloads">@SharedLocalizer["Search.Downloads"]</option>
+                                }
+                                <option value="recent">@SharedLocalizer["Search.RecentlyReleased"]</option>
+                                @if (_price == "paid")
+                                {
+                                    <option value="price">@SharedLocalizer["Search.Price"]</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
+                    <Pager Format="Grid" Items="@_packages" DisplayPages="1" PageSize="9" Toolbar="Both" Class="container-fluid px-0" RowClass="row g-0" ColumnClass="col-lg-4 col-md-6">
+                        <Row>
+                            <div class="m-2 p-2 d-flex justify-content-center">
+                                <div class="container-fluid px-0">
+                                    <div class="row g-0 mb-2">
+                                        <div class="col-4">
+                                            <a href="@context.ProductUrl" target="_blank">
+                                            @if (context.LogoUrl != null)
+                                            {
+                                                <img src="@context.LogoUrl" class="img-fluid" alt="@context.Name" />
+                                            }
+                                            else
+                                            {
+                                                <img src="/package.png" class="img-fluid" alt="@context.Name" />
+                                            }
+                                            </a>
+                                        </div>
+                                        <div class="col-8 text-end">
+                                            <small>@SharedLocalizer["Search.Version"]:</small> <strong>@context.Version</strong>
+                                            <br /><small>@SharedLocalizer["Search.Released"]:</small> <strong>@context.ReleaseDate.ToString("MM/dd/yyyy")</strong>
+                                            @if (!string.IsNullOrEmpty(context.PackageUrl))
+                                            {
+                                                <br /><small>@SharedLocalizer["Search.Source"]:</small> <strong>@(new Uri(context.PackageUrl).Host)</strong>
+                                            }
+                                            @if (context.Price == null)
+                                            {
+                                                <br /><small>@SharedLocalizer["Search.Downloads"]:</small> <strong>@(String.Format("{0:n0}", context.Downloads))</strong>
+                                            }
+                                            else
+                                            {
+                                                <br /><small>@SharedLocalizer["From"]:</small> <strong>@context.Price.Value.ToString("$#,##0.00")</strong>
+                                                @((MarkupString)(context.TrialPeriod > 0 ? " <strong>(" + context.TrialPeriod + " Day Trial)</strong>" : ""))
+                                            }
+                                        </div>
+                                    </div>
+                                    <div class="row g-0">
+                                        <div class="col">
+                                            <h3 style="display: inline;"><a href="@context.ProductUrl" target="_blank">@context.Name</a></h3><br />
+                                            <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))
+                                            {
+                                                <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>
+                                    </div>
+                                </div>
+                            </div>
+                        </Row>
+                    </Pager>
+                }
+            </div>
+        </div>
+        <br />
+        <ModuleMessage Type="MessageType.Info" Message="@SharedLocalizer["Oqtane.Marketplace"]" />
     </TabPanel>
     <TabPanel Name="Upload" ResourceKey="Upload">
-        <table class="table table-borderless">
-            <tr>
-                <td>
-                    <Label HelpText="Upload one or more theme packages. Once they are uploaded click Install to complete the installation." ResourceKey="Theme">Theme: </Label>
-                </td>
-                <td>
-                    <FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" UploadMultiple="@true" />
-                </td>
-            </tr>
-        </table>
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" HelpText="Upload one or more theme packages." ResourceKey="Theme">Theme: </Label>
+                <div class="col-sm-9">
+                    <FileManager Folder="@Constants.PackagesFolder" UploadMultiple="true" OnUpload="OnUpload" />
+                </div>
+            </div>
+        </div>
     </TabPanel>
 </TabStrip>
 
-<button type="button" class="btn btn-success" @onclick="InstallThemes">@SharedLocalizer["Install"]</button>
+@if (_productname != "")
+{
+    <div class="app-actiondialog">
+        <div class="modal" tabindex="-1" role="dialog">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title">@SharedLocalizer["Review License Terms"]</h5>
+                        <button type="button" class="btn-close" aria-label="Close" @onclick="HideModal"></button>
+                    </div>
+                    <div class="modal-body">
+                        <p style="height: 200px; overflow-y: scroll;">
+                            <h3>@_productname</h3>
+                            @if (!string.IsNullOrEmpty(_license))
+                            {
+                                @((MarkupString)_license)
+                            }
+                            else
+                            {
+                                @SharedLocalizer["License Not Specified"]
+                            }
+                        </p>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-success" @onclick="DownloadPackage">@SharedLocalizer["Accept"]</button>
+                        <button type="button" class="btn btn-secondary" @onclick="HideModal">@SharedLocalizer["Cancel"]</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+}
+
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 
 @code {
+    private bool _initialized = false;
+    private int _page = 1;
     private List<Package> _packages;
+    private string _price = "free";
+    private string _sort = "popularity";
     private string _search = "";
+    private string _productname = "";
+    private string _license = "";
+    private string _packageid = "";
+    private string _version = "";
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
@@ -77,6 +188,7 @@
         try
         {
             await LoadThemes();
+            _initialized = true;
         }
         catch (Exception ex)
         {
@@ -87,8 +199,10 @@
 
     private async Task LoadThemes()
     {
+        ShowProgressIndicator();
+ 
         var themes = await ThemeService.GetThemesAsync();
-        _packages = await PackageService.GetPackagesAsync("theme", _search);
+        _packages = await PackageService.GetPackagesAsync("theme", _search, _price, "", _sort);
 
         if (_packages != null)
         {
@@ -100,59 +214,102 @@
                 }
             }
         }
+
+        HideProgressIndicator();
+    }
+
+    private async void PriceChanged(string price)
+    {
+        _price = price;
+        _sort = "popularity";
+        await LoadThemes();
+        StateHasChanged();
     }
 
     private async Task Search()
     {
-        try
-        {
-            await LoadThemes();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error On Search");
-        }
+        await LoadThemes();
     }
 
     private async Task Reset()
     {
-        try
-        {
-            _search = "";
-            await LoadThemes();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error On Reset");
-        }
+        _page = 1;
+        _search = "";
+        await LoadThemes();
     }
 
-    private async Task InstallThemes()
+    private async Task Refresh()
+    {
+        await LoadThemes();
+    }
+
+    private void OnPageChange(int page)
+    {
+        _page = page;
+    }
+
+    private async void SortChanged(ChangeEventArgs e)
+    {
+        _sort = (string)e.Value;
+        await LoadThemes();
+    }
+
+    private void HideModal()
+    {
+        _productname = "";
+        _license = "";
+        StateHasChanged();
+    }
+
+    private async Task GetPackage(string packageid, string version)
     {
         try
         {
-            await ThemeService.InstallThemesAsync();
-            AddModuleMessage(string.Format(Localizer["Success.Theme.Install"], NavigateUrl("admin/system")), MessageType.Success);
+            var package = await PackageService.GetPackageAsync(packageid, version, false);
+            if (package != null)
+            {
+                _productname = package.Name;
+                if (!string.IsNullOrEmpty(package.License))
+                {
+                    _license = package.License.Replace("\n", "<br />");
+                }
+                _packageid = package.PackageId;
+                _version = package.Version;
+                StateHasChanged();
+            }
+            else
+            {
+                await logger.LogError("Error Getting Package {PackageId} {Version}", packageid, version);
+                AddModuleMessage(Localizer["Error.Theme.Download"], MessageType.Error);
+            }
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Installing Theme");
+            await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", packageid, version);
+            AddModuleMessage(Localizer["Error.Theme.Download"], MessageType.Error);
         }
     }
 
-    private async Task DownloadTheme(string packageid, string version)
+    private async Task DownloadPackage()
     {
         try
         {
-            await PackageService.DownloadPackageAsync(packageid, version, "Packages");
-            await logger.LogInformation("Theme {ThemeName} {Version} Downloaded Successfully", packageid, version);
-            AddModuleMessage(Localizer["Success.Theme.Download"], MessageType.Success);
+            await PackageService.DownloadPackageAsync(_packageid, _version);
+            await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _packageid, _version);
+			AddModuleMessage(string.Format(Localizer["Success.Theme.Download"], NavigateUrl("admin/system")), MessageType.Success);
+            _productname = "";
+            _license = "";
             StateHasChanged();
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Downloading Module {ThemeName} {Version}", packageid, version);
+            await logger.LogError(ex, "Error Downloading Package {PackageId} {Version}", _packageid, _version);
             AddModuleMessage(Localizer["Error.Theme.Download"], MessageType.Error);
         }
     }
+
+    private void OnUpload()
+    {
+        AddModuleMessage(string.Format(Localizer["Success.Theme.Download"], NavigateUrl("admin/system")), MessageType.Success);
+    }
 }

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

@@ -11,66 +11,57 @@
 
 @if (_templates != null)
 {
-    <table class="table table-borderless">
-        <tr>
-            <td width="30%">
-                <Label For="owner" HelpText="Enter the name of the organization who is developing this theme. It should not contain spaces or punctuation." ResourceKey="OwnerName">Owner Name: </Label>
-            </td>
-            <td>
-                <input id="owner" class="form-control" @bind="@_owner" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="module" HelpText="Enter a name for this theme. It should not contain spaces or punctuation." ResourceKey="ThemeName">Theme Name: </Label>
-            </td>
-            <td>
-                <input id="module" class="form-control" @bind="@_theme" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="template" HelpText="Select a theme template. Templates are located in the wwwroot/Themes/Templates folder on the server." ResourceKey="Template">Template: </Label>
-            </td>
-            <td>
-                <select id="template" class="form-select" @onchange="(e => TemplateChanged(e))">
-                    <option value="-">&lt;@Localizer["Template.Select"]&gt;</option>
-                    @foreach (Template template in _templates)
-                    {
-                        <option value="@template.Name">@template.Title</option>
-                    }
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="reference" HelpText="Select a framework reference version" ResourceKey="FrameworkReference">Framework Reference: </Label>
-            </td>
-            <td>
-                <select id="reference" class="form-select" @bind="@_reference">
-                    @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>
-            </td>
-        </tr>
-        @if (!string.IsNullOrEmpty(_location))
-        {
-            <tr>
-                <td>
-                    <Label For="location" HelpText="Location where the theme will be created" ResourceKey="Location">Location: </Label>
-                </td>
-                <td>
-                    <input id="module" class="form-control" @bind="@_location" readonly />
-                </td>
-            </tr>
-        }
-    </table>
+	<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 theme. It should not contain spaces or punctuation." ResourceKey="OwnerName">Owner Name: </Label>
+			<div class="col-sm-9">
+				<input id="owner" class="form-control" @bind="@_owner" />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="module" HelpText="Enter a name for this theme. It should not contain spaces or punctuation." ResourceKey="ThemeName">Theme Name: </Label>
+			<div class="col-sm-9">
+				<input id="module" class="form-control" @bind="@_theme" />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="template" HelpText="Select a theme template. Templates are located in the wwwroot/Themes/Templates folder on the server." ResourceKey="Template">Template: </Label>
+			<div class="col-sm-9">
+				<select id="template" class="form-select" @onchange="(e => TemplateChanged(e))">
+					<option value="-">&lt;@Localizer["Template.Select"]&gt;</option>
+					@foreach (Template template in _templates)
+					{
+						<option value="@template.Name">@template.Title</option>
+					}
+				</select>
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<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">
+					@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 theme will be created" ResourceKey="Location">Location: </Label>
+				<div class="col-sm-9">
+					<input id="module" class="form-control" @bind="@_location" readonly />
+				</div>
+			</div>
+		}
+	</div>
+    <br />
     <button type="button" class="btn btn-success" @onclick="CreateTheme">@Localizer["Theme.Create"]</button>
     <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 }
@@ -81,19 +72,26 @@
     private List<Template> _templates;
     private string _template = "-";
     private string[] _versions;
-    private string _reference = Constants.Version;
+    private string _reference = "local";
     private string _minversion = "2.0.0";
     private string _location = string.Empty;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-    protected override async Task OnParametersSetAsync()
+    protected override void OnInitialized()
+    {
+        if (!NavigationManager.BaseUri.Contains("localhost:"))
+        {
+            AddModuleMessage(Localizer["Info.Theme.CreatorIntent"], MessageType.Info);
+        }
+    }
+	
+	protected override async Task OnParametersSetAsync()
     {
         try
         {
             _templates = await ThemeService.GetThemeTemplatesAsync();
             _versions = Constants.ReleaseVersions.Split(',').Where(item => Version.Parse(item).CompareTo(Version.Parse("2.0.0")) >= 0).ToArray();
-            AddModuleMessage(Localizer["Info.Theme.CreatorIntent"], MessageType.Info);
         }
         catch (Exception ex)
         {
@@ -107,7 +105,8 @@
         {
             if (IsValid(_owner) && IsValid(_theme) && _owner != _theme && _template != "-")
             {
-                var theme = new Theme { Owner = _owner, Name = _theme, Template = _template, Version = _reference };
+                var template = _templates.FirstOrDefault(item => item.Name == _template);
+                var theme = new Theme { Owner = _owner, Name = _theme, Template = _template, Version = _reference, ThemeName = template.Namespace };
                 theme = await ThemeService.CreateThemeAsync(theme);
                 GetLocation();
                 AddModuleMessage(string.Format(Localizer["Success.Theme.Create"], NavigateUrl("admin/system")), MessageType.Success);
@@ -126,7 +125,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() != "theme" && Regex.IsMatch(name, "^[A-Za-z_][A-Za-z0-9_]*$");
+		return !string.IsNullOrEmpty(name) && name.ToLower() != "theme" && !name.ToLower().Contains("oqtane") && Regex.IsMatch(name, "^[A-Za-z_][A-Za-z0-9_]*$");
     }
 
     private void TemplateChanged(ChangeEventArgs e)
@@ -147,8 +146,14 @@
         if (_owner != "" && _theme != "" && _template != "-")
         {
             var template = _templates.FirstOrDefault(item => item.Name == _template);
-            _location = template.Location + _owner + "." + _theme;
-
+            if (!string.IsNullOrEmpty(template.Namespace))
+            {
+                _location = template.Location + template.Namespace.Replace("[Owner]", _owner).Replace("[Theme]", _theme);
+            }
+            else
+            {
+                _location = template.Location + _owner + ".Theme." + _theme;
+            }
         }
         StateHasChanged();
     }

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

@@ -0,0 +1,170 @@
+@namespace Oqtane.Modules.Admin.Themes
+@using System.Net
+@inherits ModuleBase
+@inject IThemeService ThemeService
+@inject IPackageService PackageService
+@inject NavigationManager NavigationManager
+@inject IStringLocalizer<Edit> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+@if (_initialized)
+{
+    <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="name" HelpText="The name of the module" ResourceKey="Name">Name: </Label>
+                <div class="col-sm-9">
+                    <input id="name" class="form-control" @bind="@_name" />
+                </div>
+            </div>
+             <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="isenabled" HelpText="Is theme enabled for this site?" ResourceKey="IsEnabled">Enabled? </Label>
+                <div class="col-sm-9">
+                    <select id="isenabled" class="form-select" @bind="@_isenabled" required>
+                        <option value="True">@SharedLocalizer["Yes"]</option>
+                        <option value="False">@SharedLocalizer["No"]</option>
+                    </select>
+                </div>
+            </div>
+        </div>
+    </form>
+    <Section Name="Information" ResourceKey="Information" Heading="Information">
+        <div class="container">
+             <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="themename" HelpText="The internal name of the module" ResourceKey="InternalName">Internal Name: </Label>
+                <div class="col-sm-9">
+                    <input id="themename" class="form-control" @bind="@_themeName" disabled />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="version" HelpText="The version of the theme" ResourceKey="Version">Version: </Label>
+                <div class="col-sm-9">
+                    <input id="version" class="form-control" @bind="@_version" disabled />
+                </div>
+            </div>
+	        <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 theme was installed. This value must be specified within the theme's ITheme interface specification." ResourceKey="PackageName">Package Name: </Label>
+		        <div class="col-sm-9">
+                    <input id="packagename" class="form-control" @bind="@_packagename" disabled />
+                </div>
+	        </div>
+	        <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="owner" HelpText="The owner or creator of the theme" ResourceKey="Owner">Owner: </Label>
+                <div class="col-sm-9">
+                    <input id="owner" class="form-control" @bind="@_owner" disabled />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="url" HelpText="The url of the theme" ResourceKey="Url">Url: </Label>
+                <div class="col-sm-9">
+                    <input id="url" class="form-control" @bind="@_url" disabled />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="contact" HelpText="The contact for the theme" ResourceKey="Contact">Contact: </Label>
+                <div class="col-sm-9">
+                    <input id="contact" class="form-control" @bind="@_contact" disabled />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="license" HelpText="The license of the theme" ResourceKey="License">License: </Label>
+                <div class="col-sm-9">
+                    @if (_license.StartsWith("http") || _license.StartsWith("/") || _license.StartsWith("~"))
+                    {
+                        <a href="@_license.Replace("~", PageState?.Alias.BaseUrl + "/Themes/" + Utilities.GetTypeName(_themeName))" class="btn btn-info" style="text-decoration: none !important" target="_new">@Localizer["View License"]</a>
+                    }
+                    else
+                    {
+                        <textarea id="license" class="form-control" @bind="@_license" rows="5" disabled></textarea>
+                    }
+                </div>
+            </div>
+        </div>
+    </Section>
+    <br />
+    <button type="button" class="btn btn-success" @onclick="SaveTheme">@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>
+}
+
+@code {
+    private bool _initialized = false;
+    private ElementReference form;
+    private bool validated = false;
+    private int _themeId;
+    private string _themeName = "";
+    private string _isenabled;
+    private string _name;
+    private string _version;
+    private string _packagename = "";
+    private string _owner = "";
+    private string _url = "";
+    private string _contact = "";
+    private string _license = "";
+    private string _createdby;
+    private DateTime _createdon;
+    private string _modifiedby;
+    private DateTime _modifiedon;
+
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            _themeId = Int32.Parse(PageState.QueryString["id"]);
+            var theme = await ThemeService.GetThemeAsync(_themeId, ModuleState.SiteId);
+            if (theme != null)
+            {
+                _name = theme.Name;
+                _isenabled =theme.IsEnabled.ToString();
+                _version = theme.Version;
+                _packagename = theme.PackageName;
+                _owner = theme.Owner;
+                _url = theme.Url;
+                _contact = theme.Contact;
+                _license = theme.License;
+                _createdby = theme.CreatedBy;
+                _createdon = theme.CreatedOn;
+                _modifiedby = theme.ModifiedBy;
+                _modifiedon = theme.ModifiedOn;
+
+                _initialized = true;
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Theme {ThemeName} {Error}", _themeName, ex.Message);
+            AddModuleMessage(Localizer["Error.Theme.Loading"], MessageType.Error);
+        }
+    }
+
+    private async Task SaveTheme()
+    {
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
+        {
+            try
+            {
+                var theme = await ThemeService.GetThemeAsync(_themeId, ModuleState.SiteId);
+                theme.Name = _name;
+                theme.IsEnabled = (_isenabled == null ? true : bool.Parse(_isenabled));
+                await ThemeService.UpdateThemeAsync(theme);
+                await logger.LogInformation("Theme Saved {Theme}", theme);
+                NavigationManager.NavigateTo(NavigateUrl());
+            }
+            catch (Exception ex)
+            {
+                await logger.LogError(ex, "Error Saving Theme {ThemeId} {Error}", _themeId, ex.Message);
+                AddModuleMessage(Localizer["Error.Module.Save"], MessageType.Error);
+            }
+        }
+        else
+        {
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+        }
+    }
+}

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

@@ -4,6 +4,7 @@
 @inject NavigationManager NavigationManager
 @inject IThemeService ThemeService
 @inject IPackageService PackageService
+@inject ISiteService SiteService
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
@@ -13,35 +14,58 @@
 }
 else
 {
-    <ActionLink Action="Add" Text="Install Theme" />
-    @((MarkupString)"&nbsp;")
-    <ActionLink Action="Create" Text="Create Theme" ResourceKey="CreateTheme" Class="btn btn-secondary" />
+    <ActionLink Action="Add" Text="Install Theme" ResourceKey="InstallTheme" />
+    <ActionLink Action="Create" Text="Create Theme" ResourceKey="CreateTheme" Class="btn btn-secondary ps-2" />
+    <button type="button" class="btn btn-secondary pw-2" @onclick="@Synchronize">@Localizer["Synchronize"]</button>
 
     <Pager Items="@_themes">
         <Header>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
-            <th scope="col">@SharedLocalizer["Name"]</th>
-            <th scope="col">@SharedLocalizer["Version"]</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th>@SharedLocalizer["Name"]</th>
+            <th>@SharedLocalizer["Version"]</th>
+            <th>@Localizer["Enabled"]</th>
+            <th>@SharedLocalizer["Support"]</th>
+            <th>@SharedLocalizer["Expires"]</th>
             <th>&nbsp;</th>
         </Header>
         <Row>
-            <td><ActionLink Action="View" Parameters="@($"name=" + WebUtility.UrlEncode(context.ThemeName))" ResourceKey="ViewTheme" /></td>
+            <td><ActionLink Action="Edit" Text="Edit" Parameters="@($"id=" + context.ThemeId.ToString())" ResourceKey="EditTheme" /></td>
             <td>
-                @if (context.AssemblyName != "Oqtane.Client")
-                    {
+				@if (context.AssemblyName != Constants.ClientId)
+                {
                     <ActionDialog Header="Delete Theme" Message="@string.Format(Localizer["Confirm.Theme.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteTheme(context))" ResourceKey="DeleteTheme" />
-                    }
+                }
             </td>
+            <td><NavLink class="btn btn-secondary" href="@NavigateUrl("admin/site")">@Localizer["Assign"]</NavLink></td>
             <td>@context.Name</td>
             <td>@context.Version</td>
             <td>
-                @if (UpgradeAvailable(context.PackageName, context.Version))
-                    {
-                    <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadTheme(context.PackageName, context.Version))>@SharedLocalizer["Upgrade"]</button>
-                    }
+                @if (context.IsEnabled)
+                {
+                    <span>@SharedLocalizer["Yes"]</span>
+                }
+                else
+                {
+                    <span>@SharedLocalizer["No"]</span>
+                }
+            </td>
+            <td>
+                @((MarkupString)SupportLink(context.PackageName, context.Version))
+            </td>
+            <td>
+                @((MarkupString)PurchaseLink(context.PackageName))
+            </td>
+            <td>
+				@{ 
+					var version = UpgradeAvailable(context.PackageName, context.Version);
+				} 
+                @if (version != context.Version)
+                {
+                    <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadTheme(context.PackageName, version))>@SharedLocalizer["Upgrade"]</button>
+                }
             </td>
-            <td></td>
         </Row>
     </Pager>
 }
@@ -57,7 +81,7 @@ else
         try
         {
             _themes = await ThemeService.GetThemesAsync();
-            _packages = await PackageService.GetPackagesAsync("theme");
+            _packages = await PackageService.GetPackageUpdatesAsync("theme");
         }
         catch (Exception ex)
         {
@@ -69,27 +93,63 @@ else
         }
     }
 
-    private bool UpgradeAvailable(string packagename, string version)
+    private string PurchaseLink(string packagename)
     {
-        var upgradeavailable = false;
-        if (_packages != null)
+        string link = "";
+        if (!string.IsNullOrEmpty(packagename) && _packages != null)
         {
             var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
             if (package != null)
             {
-                upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0);
+                if (package.ExpiryDate != null && package.ExpiryDate.Value.Date != DateTime.MaxValue.Date)
+                { 
+                    if (string.IsNullOrEmpty(package.PaymentUrl))
+                    {
+                        link = "<span>" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</span>";
+                    }
+                    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 upgradeavailable;
+        return link;
+    }
+
+    private string SupportLink(string packagename, string version)
+    {
+        string link = "";
+        if (!string.IsNullOrEmpty(packagename) && _packages != null)
+        {
+            var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
+            if (package != null && !string.IsNullOrEmpty(package.SupportUrl))
+            {
+                link += "<a class=\"btn btn-info\" style=\"text-decoration: none !important\" href=\"" + package.SupportUrl.Replace("{Version}", version) + "\" target=\"_new\">" + SharedLocalizer["Help"] + "</a>";
+            }
+        }
+        return link;
+    }
+
+	private string UpgradeAvailable(string packagename, string version)
+	{
+		if (!string.IsNullOrEmpty(packagename) && _packages != null)
+		{
+			var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
+			if (package != null && Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0)
+			{
+				return package.Version;
+			}
+        }
+        return version;
     }
 
     private async Task DownloadTheme(string packagename, string version)
     {
         try
         {
-            await PackageService.DownloadPackageAsync(packagename, version, "Packages");
+            await PackageService.DownloadPackageAsync(packagename, version);
             await logger.LogInformation("Theme Downloaded {ThemeName} {Version}", packagename, version);
-            await ThemeService.InstallThemesAsync();
             AddModuleMessage(string.Format(Localizer["Success.Theme.Install"], NavigateUrl("admin/system")), MessageType.Success);
         }
         catch (Exception ex)
@@ -113,4 +173,27 @@ else
             AddModuleMessage(Localizer["Error.Theme.Delete"], MessageType.Error);
         }
     }
+
+    private async Task Synchronize()
+    {
+        try
+        {
+            ShowProgressIndicator();
+            foreach (var theme in _themes)
+            {
+                if (!string.IsNullOrEmpty(theme.PackageName) && !_packages.Any(item => item.PackageId == theme.PackageName))
+                {
+                    await PackageService.GetPackageAsync(theme.PackageName, theme.Version, false);
+                }
+            }
+            HideProgressIndicator();
+            AddModuleMessage(Localizer["Success.Theme.Synchronize"], MessageType.Success);
+            NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, true));
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Synchronizing Themes {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.Theme.Synchronize"], MessageType.Error);
+        }
+    }
 }

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

@@ -1,103 +0,0 @@
-@namespace Oqtane.Modules.Admin.Themes
-@using System.Net
-@inherits ModuleBase
-@inject IThemeService ThemeService
-@inject NavigationManager NavigationManager
-@inject IStringLocalizer<View> Localizer
-@inject IStringLocalizer<SharedResources> SharedLocalizer
-
-<table class="table table-borderless">
-    <tr>
-        <td width="30%">
-            <Label For="name" HelpText="The name of the theme" ResourceKey="Name">Name: </Label>
-        </td>
-        <td>
-            <input id="name" class="form-control" @bind="@_name" disabled />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="themename" HelpText="The internal name of the module" ResourceKey="InternalName">Internal Name: </Label>
-        </td>
-        <td>
-            <input id="themename" class="form-control" @bind="@_themeName" disabled />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="version" HelpText="The version of the theme" ResourceKey="Version">Version: </Label>
-        </td>
-        <td>
-            <input id="version" class="form-control" @bind="@_version" disabled />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="owner" HelpText="The owner or creator of the theme" ResourceKey="Owner">Owner: </Label>
-        </td>
-        <td>
-            <input id="owner" class="form-control" @bind="@_owner" disabled />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="url" HelpText="The reference url of the theme" ResourceKey="ReferenceUrl">Reference Url: </Label>
-        </td>
-        <td>
-            <input id="url" class="form-control" @bind="@_url" disabled />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="contact" HelpText="The contact for the theme" ResourceKey="Contact">Contact: </Label>
-        </td>
-        <td>
-            <input id="contact" class="form-control" @bind="@_contact" disabled />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="license" HelpText="The license of the theme" ResourceKey="License">License: </Label>
-        </td>
-        <td>
-            <textarea id="license" class="form-control" @bind="@_license" rows="5" disabled></textarea>
-        </td>
-    </tr>
-</table>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
-
-@code {
-    private string _themeName = "";
-    private string _name;
-    private string _version;
-    private string _owner = "";
-    private string _url = "";
-    private string _contact = "";
-    private string _license = "";
-
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
-
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            _themeName = WebUtility.UrlDecode(PageState.QueryString["name"]);
-            var themes = await ThemeService.GetThemesAsync();
-            var theme = themes.FirstOrDefault(item => item.ThemeName == _themeName);
-            if (theme != null)
-            {
-                _name = theme.Name;
-                _version = theme.Version;
-                _owner = theme.Owner;
-                _url = theme.Url;
-                _contact = theme.Contact;
-                _license = theme.License;
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Theme {ThemeName} {Error}", _themeName, ex.Message);
-            AddModuleMessage(Localizer["Error.Theme.Loading"], MessageType.Error);
-        }
-    }
-}

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

@@ -7,38 +7,68 @@
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<TabStrip>
-    <TabPanel Name="Download" ResourceKey="Download">
-        @if (_package != null && _upgradeavailable)
-        {
-            <ModuleMessage Type="MessageType.Info" Message="Select The Download Button To Download The Framework Upgrade Package And Then Select Upgrade"></ModuleMessage>
-            <button type="button" class="btn btn-primary" @onclick=@(async () => await Download(Constants.PackageId, @_package.Version))>@SharedLocalizer["Download"] @_package.Version</button>
+@if (_initialized)
+{
+    <TabStrip>
+        <TabPanel Name="Download" ResourceKey="Download">
+            @if (_package != null && _upgradeavailable)
+            {
+                <div class="container">
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" HelpText="Specify if you want to backup files during the upgrade process. Disabling this option will reduce the time required for the upgrade." ResourceKey="Backup">Backup Files? </Label>
+                        <div class="col-sm-9">
+                            <select id="backup" class="form-select" @bind="@_backup">
+                                <option value="True">@SharedLocalizer["Yes"]</option>
+                                <option value="False">@SharedLocalizer["No"]</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+                <br />
+                @if (!_downloaded)
+                {
+                    <button type="button" class="btn btn-primary" @onclick=@(async () => await Download(Constants.PackageId, @_package.Version))>@SharedLocalizer["Download"] @_package.Version</button>
+                }
+                else
+                {
+                    <button type="button" class="btn btn-success" @onclick="Upgrade">@SharedLocalizer["Upgrade"]</button>
+                }
+            }
+            else
+            {
+                <ModuleMessage Type="MessageType.Info" Message=@Localizer["Message.Text"]></ModuleMessage>
+            }
+        </TabPanel>
+        <TabPanel Name="Upload" ResourceKey="Upload">
+            <div class="container">
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" HelpText="Upload A Framework Package And Then Select Upgrade" ResourceKey="Framework">Framework: </Label>
+                    <div class="col-sm-9">
+                        <FileManager Folder="@Constants.PackagesFolder" />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" HelpText="Specify if you want to backup files during the upgrade process. Disabling this option will reduce the time required for the upgrade." ResourceKey="Backup">Backup Files? </Label>
+                    <div class="col-sm-9">
+                        <select id="backup" class="form-select" @bind="@_backup">
+                            <option value="True">@SharedLocalizer["Yes"]</option>
+                            <option value="False">@SharedLocalizer["No"]</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+            <br />
             <button type="button" class="btn btn-success" @onclick="Upgrade">@SharedLocalizer["Upgrade"]</button>
-        }
-        else
-        {
-            <ModuleMessage Type="MessageType.Info" Message="Framework Is Already Up To Date"></ModuleMessage>
-        }
-    </TabPanel>
-    <TabPanel Name="Upload" ResourceKey="Upload">
-        <ModuleMessage Type="MessageType.Info" Message="Upload A Framework Package (Oqtane.Framework.version.nupkg) And Then Select Upgrade"></ModuleMessage>
-        <table class="table table-borderless">
-            <tr>
-                <td>
-                    <Label HelpText="Upload A Framework Package And Then Select Upgrade" ResourceKey="Framework">Framework: </Label>
-                </td>
-                <td>
-                    <FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" />
-                </td>
-            </tr>
-        </table>
-        <button type="button" class="btn btn-success" @onclick="Upgrade">@SharedLocalizer["Upgrade"]</button>
-    </TabPanel>
-</TabStrip>
+        </TabPanel>
+    </TabStrip>
+}
 
 @code {
+    private bool _initialized = false;
+    private bool _downloaded = false;
     private Package _package;
     private bool _upgradeavailable = false;
+    private string _backup = "True";
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
@@ -46,18 +76,28 @@
     {
         try
         {
-            List<Package> packages = await PackageService.GetPackagesAsync("framework");
-            if (packages != null)
+            if (NavigationManager.BaseUri.Contains("localhost:"))
             {
-                _package = packages.Where(item => item.PackageId.StartsWith(Constants.PackageId)).FirstOrDefault();
-                if (_package != null)
+                AddModuleMessage(Localizer["Localhost.Text"], MessageType.Info);
+            }
+            else
+            {
+                AddModuleMessage(Localizer["Disclaimer.Text"], MessageType.Warning);
+
+                List<Package> packages = await PackageService.GetPackagesAsync("framework", "", "", "");
+                if (packages != null)
                 {
-                    _upgradeavailable = (Version.Parse(_package.Version).CompareTo(Version.Parse(Constants.Version)) > 0);
-                }
-                else
-                {
-                    _package = new Package { Name = Constants.PackageId, Version = Constants.Version };
+                    _package = packages.Where(item => item.PackageId.StartsWith(Constants.PackageId)).FirstOrDefault();
+                    if (_package != null)
+                    {
+                        _upgradeavailable = (Version.Parse(_package.Version).CompareTo(Version.Parse(Constants.Version)) > 0);
+                    }
+                    else
+                    {
+                        _package = new Package { Name = Constants.PackageId, Version = Constants.Version };
+                    }
                 }
+                _initialized = true;
             }
         }
         catch
@@ -73,8 +113,8 @@
             AddModuleMessage(Localizer["Info.Upgrade.Wait"], MessageType.Info);
             ShowProgressIndicator();
             var interop = new Interop(JSRuntime);
-            await interop.RedirectBrowser(NavigateUrl(), 20);
-            await InstallationService.Upgrade();
+            await interop.RedirectBrowser(NavigateUrl(), 10);
+            await InstallationService.Upgrade(bool.Parse(_backup));
         }
         catch (Exception ex)
         {
@@ -87,13 +127,17 @@
     {
         try
         {
-            await PackageService.DownloadPackageAsync(packageid, version, "Packages");
-            await PackageService.DownloadPackageAsync(Constants.UpdaterPackageId, version, "Packages");
+            ShowProgressIndicator();
+            await PackageService.DownloadPackageAsync(packageid, version);
+            await PackageService.DownloadPackageAsync(Constants.UpdaterPackageId, version);
+            _downloaded = true;
+            HideProgressIndicator();
             AddModuleMessage(Localizer["Success.Framework.Download"], MessageType.Success);
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Downloading Framework Package {Error}", ex.Message);
+            HideProgressIndicator();
             AddModuleMessage(Localizer["Error.Framework.Download"], MessageType.Error);
         }
     }

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

@@ -0,0 +1,108 @@
+@namespace Oqtane.Modules.Admin.UrlMappings
+@inherits ModuleBase
+@inject NavigationManager NavigationManager
+@inject IUrlMappingService UrlMappingService
+@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="url" HelpText="A Url identifying a path to a specific page in the site (absolute or relative)" ResourceKey="Url">Url:</Label>
+            <div class="col-sm-9">
+                <div class="input-group">
+                    <input id="url" class="form-control" @bind="@_url" maxlength="500" required />
+                    <button type="button" class="btn btn-primary" @onclick="GenerateUrl">@Localizer["Generate"]</button>
+                </div>
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="mappedurl" HelpText="A Url where the user will be redirected (absolute or relative). Use '/' for site root path." ResourceKey="MappedUrl">Redirect To:</Label>
+            <div class="col-sm-9">
+                <input id="mappedurl" class="form-control" @bind="@_mappedurl" maxlength="500" required />
+            </div>
+        </div>
+        <br /><br />
+        <button type="button" class="btn btn-success" @onclick="SaveUrlMapping">@SharedLocalizer["Save"]</button>
+        <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+    </div>
+</form>
+
+@code {
+    private ElementReference form;
+    private bool validated = false;
+
+    private string _url = string.Empty;
+    private string _mappedurl = string.Empty;
+
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+
+    private async Task SaveUrlMapping()
+    {
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
+        {
+            if (_url != _mappedurl)
+            {
+                var url = PageState.Uri.Scheme + "://" + PageState.Uri.Authority + "/";
+                url = url + (!string.IsNullOrEmpty(PageState.Alias.Path) ? PageState.Alias.Path + "/" : "");
+
+                _url = (_url.StartsWith("/")) ? _url.Substring(1) : _url;
+                _url = (!_url.StartsWith("http")) ? url + _url : _url;
+
+                _mappedurl = _mappedurl.Replace(url, "");
+                _mappedurl = (_mappedurl.StartsWith("/") && _mappedurl != "/") ? _mappedurl.Substring(1) : _mappedurl;
+
+                if (_url.StartsWith(url))
+                {
+                    var urlmapping = new UrlMapping();
+                    urlmapping.SiteId = PageState.Site.SiteId;
+                    urlmapping.Url = new Route(_url, PageState.Alias.Path).PagePath;
+                    urlmapping.MappedUrl = _mappedurl;
+                    urlmapping.Requests = 0;
+                    urlmapping.CreatedOn = DateTime.UtcNow;
+                    urlmapping.RequestedOn = DateTime.UtcNow;
+
+                    try
+                    {
+                        urlmapping = await UrlMappingService.AddUrlMappingAsync(urlmapping);
+                        await logger.LogInformation("UrlMapping Saved {UrlMapping}", urlmapping);
+                        NavigationManager.NavigateTo(NavigateUrl());
+                    }
+                    catch (Exception ex)
+                    {
+                        await logger.LogError(ex, "Error Saving UrlMapping {UrlMapping} {Error}", urlmapping, ex.Message);
+                        AddModuleMessage(Localizer["Error.SaveUrlMapping"], MessageType.Error);
+                    }
+                }
+                else
+                {
+                    AddModuleMessage(Localizer["Message.SaveUrlMapping"], MessageType.Warning);
+                }
+            }
+            else
+            {
+                AddModuleMessage(Localizer["Message.DuplicateUrlMapping"], MessageType.Warning);
+            }
+        }
+        else
+        {
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+        }
+    }
+
+    private void GenerateUrl()
+    {
+        var url = PageState.Uri.Scheme + "://" + PageState.Uri.Authority + "/";
+        url = url + (!string.IsNullOrEmpty(PageState.Alias.Path) ? PageState.Alias.Path + "/" : "");
+
+        var chars = "abcdefghijklmnopqrstuvwxyz";
+        Random rnd = new Random();
+        for (int i = 0; i < 5; i++)
+        {
+            url += chars.Substring(rnd.Next(0, chars.Length - 1), 1);
+        }
+        _url = url;
+    }
+}

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

@@ -0,0 +1,95 @@
+@namespace Oqtane.Modules.Admin.UrlMappings
+@inherits ModuleBase
+@inject NavigationManager NavigationManager
+@inject IUrlMappingService UrlMappingService
+@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="url" HelpText="A Url identifying a path to a specific page in the site (absolute or relative)" ResourceKey="Url">Url:</Label>
+            <div class="col-sm-9">
+                <input id="url" class="form-control" @bind="@_url" maxlength="500" readonly />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="mappedurl" HelpText="A Url where the user will be redirected (absolute or relative). Use '/' for site root path." ResourceKey="MappedUrl">Redirect To:</Label>
+            <div class="col-sm-9">
+                <input id="mappedurl" class="form-control" @bind="@_mappedurl" maxlength="500" required />
+            </div>
+        </div>
+        <br /><br />
+        <button type="button" class="btn btn-success" @onclick="SaveUrlMapping">@SharedLocalizer["Save"]</button>
+        <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+    </div>
+</form>
+
+@code {
+	private ElementReference form;
+	private bool validated = false;
+
+	private int _urlmappingid;
+	private string _url = string.Empty;
+	private string _mappedurl = string.Empty;
+
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+
+	protected override async Task OnInitializedAsync()
+	{
+		try
+		{
+			_urlmappingid = Int32.Parse(PageState.QueryString["id"]);
+			var urlmapping = await UrlMappingService.GetUrlMappingAsync(_urlmappingid);
+			if (urlmapping != null)
+			{
+				_url = urlmapping.Url;
+				_mappedurl = urlmapping.MappedUrl;
+			}
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading UrlMapping {UrlMappingId} {Error}", _urlmappingid, ex.Message);
+			AddModuleMessage(Localizer["Error.LoadUrlMapping"], MessageType.Error);
+		}
+	}
+
+	private async Task SaveUrlMapping()
+	{
+		validated = true;
+		var interop = new Interop(JSRuntime);
+		if (await interop.FormValid(form))
+		{
+			if (_url != _mappedurl)
+			{
+				try
+				{
+					var url = PageState.Uri.Scheme + "://" + PageState.Uri.Authority + "/";
+					url = url + (!string.IsNullOrEmpty(PageState.Alias.Path) ? PageState.Alias.Path + "/" : "");
+
+                    _mappedurl = _mappedurl.Replace(url, "");
+                    _mappedurl = (_mappedurl.StartsWith("/") && _mappedurl != "/") ? _mappedurl.Substring(1) : _mappedurl;
+
+					var urlmapping = await UrlMappingService.GetUrlMappingAsync(_urlmappingid);
+					urlmapping.MappedUrl = _mappedurl;
+					urlmapping = await UrlMappingService.UpdateUrlMappingAsync(urlmapping);
+					await logger.LogInformation("UrlMapping Saved {UrlMapping}", urlmapping);
+					NavigationManager.NavigateTo(NavigateUrl());
+				}
+				catch (Exception ex)
+				{
+					await logger.LogError(ex, "Error Saving UrlMapping {UrlMappingId} {Error}", _urlmappingid, ex.Message);
+					AddModuleMessage(Localizer["Error.SaveUrlMapping"], MessageType.Error);
+				}
+			}
+			else
+			{
+                AddModuleMessage(Localizer["Message.DuplicateUrlMapping"], MessageType.Warning);
+			}
+		}
+        else
+        {
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+        }
+    }
+}

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

@@ -0,0 +1,151 @@
+@namespace Oqtane.Modules.Admin.UrlMappings
+@inherits ModuleBase
+@inject NavigationManager NavigationManager
+@inject IUrlMappingService UrlMappingService
+@inject ISiteService SiteService
+@inject ISettingService SettingService
+@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+@if (_urlMappings == null)
+{
+    <p><em>@SharedLocalizer["Loading"]</em></p>
+}
+else
+{
+    <TabStrip>
+        <TabPanel Name="Urls" Heading="Urls" ResourceKey="Urls">
+			<div class="container">
+				<div class="row mb-1 align-items-center">
+					<div class="col-sm-6">
+						<ActionLink Action="Add" Text="Add Url Mapping" ResourceKey="AddUrlMapping" />
+					</div>
+					<div class="col-sm-6">
+						<select id="type" class="form-select custom-select" @onchange="(e => MappedChanged(e))">
+							<option value="true">@Localizer["Mapped"]</option>
+							<option value="false">@Localizer["Broken"]</option>
+						</select>
+					</div>
+				</div>
+			</div>
+			<br/>
+            <Pager Items="@_urlMappings" SearchProperties="Url">
+				<Header>
+					<th style="width: 1px;">&nbsp;</th>
+					<th style="width: 1px;">&nbsp;</th>
+					<th>@Localizer["Url"]</th>
+					<th>@Localizer["Requests"]</th>
+					<th>@Localizer["Requested"]</th>
+				</Header>
+				<Row>
+                    <td><ActionLink Action="Edit" Text="Edit" Parameters="@($"id=" + context.UrlMappingId.ToString())" ResourceKey="Edit" /></td>
+					<td><ActionDialog Header="Delete Url Mapping" Message="@string.Format(Localizer["Confirm.DeleteUrlMapping"], context.Url)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteUrlMapping(context))" ResourceKey="DeleteUrlMapping" /></td>
+					<td>
+						<a href="@Utilities.TenantUrl(PageState.Alias, context.Url)">@context.Url</a>
+						@if (_mapped)
+						{
+							@((MarkupString)"<br />&gt;&gt;&nbsp;")<a href="@((context.MappedUrl.StartsWith("http") ? context.MappedUrl : Utilities.TenantUrl(PageState.Alias, context.MappedUrl)))">@context.MappedUrl</a>
+						}
+					</td>
+					<td>@context.Requests</td>
+					<td>@UtcToLocal(context.RequestedOn)</td>
+				</Row>
+			</Pager>
+		</TabPanel>
+        <TabPanel Name="Settings" Heading="Settings" ResourceKey="Settings">
+			<div class="container">
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="capturebrokenurls" HelpText="Specify if broken Urls should be captured automatically and saved in Url Mappings" ResourceKey="CaptureBrokenUrls">Capture Broken Urls? </Label>
+					<div class="col-sm-9">
+						<select id="capturebrokenurls" class="form-select" @bind="@_capturebrokenurls" >
+							<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="retention" HelpText="Number of days of broken urls to retain" ResourceKey="Retention">Retention (Days): </Label>
+                    <div class="col-sm-9">
+                        <input id="retention" class="form-control" type="number" min="0" step="1" @bind="@_retention" />
+                    </div>
+                </div>
+            </div>
+			<br />
+			<button type="button" class="btn btn-success" @onclick="SaveSiteSettings">@SharedLocalizer["Save"]</button>
+		</TabPanel>
+	</TabStrip>
+}
+
+@code {
+	private bool _mapped = true;
+	private List<UrlMapping> _urlMappings;
+	private string _capturebrokenurls;
+    private int _retention = 30;
+
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+
+	protected override async Task OnParametersSetAsync()
+	{
+		await GetUrlMappings();
+		_capturebrokenurls = PageState.Site.CaptureBrokenUrls.ToString();
+
+        var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+        _retention = int.Parse(SettingService.GetSetting(settings, "UrlMappingRetention", "30"));
+    }
+
+	private async void MappedChanged(ChangeEventArgs e)
+	{
+		try
+		{
+			_mapped = bool.Parse(e.Value.ToString());
+			await GetUrlMappings();
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error On TypeChanged");
+		}
+	}
+
+	private async Task DeleteUrlMapping(UrlMapping urlMapping)
+	{
+		try
+		{
+			await UrlMappingService.DeleteUrlMappingAsync(urlMapping.UrlMappingId);
+			await logger.LogInformation("UrlMapping Deleted {UrlMapping}", urlMapping);
+			await GetUrlMappings();
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Deleting UrlMapping {UrlMapping} {Error}", urlMapping, ex.Message);
+			AddModuleMessage(Localizer["Error.DeleteUrlMapping"], MessageType.Error);
+		}
+	}
+
+	private async Task GetUrlMappings()
+	{
+		_urlMappings = await UrlMappingService.GetUrlMappingsAsync(PageState.Site.SiteId, _mapped);
+	}
+
+	private async Task SaveSiteSettings()
+	{
+		try
+		{
+			var site = PageState.Site;
+			site.CaptureBrokenUrls = bool.Parse(_capturebrokenurls);
+			await SiteService.UpdateSiteAsync(site);
+
+            var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
+            settings = SettingService.SetSetting(settings, "UrlMappingRetention", _retention.ToString(), true);
+            await SettingService.UpdateSiteSettingsAsync(settings, 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/UserProfile/Add.razor

@@ -2,44 +2,40 @@
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
+@inject IUserRoleService UserRoleService
 @inject INotificationService NotificationService
 @inject IStringLocalizer<Add> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (PageState.User != null)
 {
-    <table class="table table-borderless">
-        <tr>
-            <td width="30%">
-                <Label For="to" HelpText="Enter the username you wish to send a message to" ResourceKey="To">To: </Label>
-            </td>
-            <td>
-                <input id="to" class="form-control" @bind="@username" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="subject" HelpText="Enter the subject of the message" ResourceKey="Subject">Subject: </Label>
-            </td>
-            <td>
-                <input id="subject" class="form-control" @bind="@subject" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="message" HelpText="Enter the message" ResourceKey="Message">Message: </Label>
-            </td>
-            <td>
-                <textarea id="message" class="form-control" @bind="@body" rows="5" />
-            </td>
-        </tr>
-    </table>
+<div class="container">
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="to" HelpText="Enter the user you wish to send a message to" ResourceKey="To">To: </Label>
+        <div class="col-sm-9">
+            <AutoComplete OnSearch="GetUsers" Placeholder="@Localizer["Username.Enter"]" @ref="username" />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="subject" HelpText="Enter the subject of the message" ResourceKey="Subject">Subject: </Label>
+        <div class="col-sm-9">
+            <input id="subject" class="form-control" @bind="@subject" />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="message" HelpText="Enter the message" ResourceKey="Message">Message: </Label>
+        <div class="col-sm-9">
+            <textarea id="message" class="form-control" @bind="@body" rows="5" />
+        </div>
+    </div>
+</div>
+<br/>
     <button type="button" class="btn btn-primary" @onclick="Send">@SharedLocalizer["Send"]</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+    <NavLink class="btn btn-secondary" href="@PageState.ReturnUrl">@SharedLocalizer["Cancel"]</NavLink>
 }
 
 @code {
-    private string username = "";
+    private AutoComplete username;
     private string subject = "";
     private string body = "";
 
@@ -47,21 +43,35 @@
 
     public override string Title => "Send Notification";
 
+    private async Task<Dictionary<string, string>> GetUsers(string filter)
+    {
+        var users = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, RoleNames.Registered);
+        return users.Where(item => item.User.Username.Contains(filter, StringComparison.OrdinalIgnoreCase))
+            .ToDictionary(item => item.UserId.ToString(), item => item.User.Username);
+    }
+
     private async Task Send()
     {
         try
         {
-            var user = await UserService.GetUserAsync(username, PageState.Site.SiteId);
-            if (user != null)
+            if (!string.IsNullOrEmpty(username.Key) && !string.IsNullOrEmpty(subject))
             {
-                var notification = new Notification(PageState.Site.SiteId, PageState.User, user, subject, body, null);
-                notification = await NotificationService.AddNotificationAsync(notification);
-                await logger.LogInformation("Notification Created {NotificationId}", notification.NotificationId);
-                NavigationManager.NavigateTo(NavigateUrl());
+                var user = await UserService.GetUserAsync(int.Parse(username.Key), ModuleState.SiteId);
+                if (user != null)
+                {
+                    var notification = new Notification(PageState.Site.SiteId, PageState.User, user, subject, body);
+                    notification = await NotificationService.AddNotificationAsync(notification);
+                    await logger.LogInformation("Notification Created {NotificationId}", notification.NotificationId);
+                    NavigationManager.NavigateTo(PageState.ReturnUrl);
+                }
+                else
+                {
+                    AddModuleMessage(Localizer["Message.User.Invalid"], MessageType.Warning);
+                }
             }
             else
             {
-                AddModuleMessage(Localizer["Message.User.Invalid"], MessageType.Warning);
+                AddModuleMessage(Localizer["Message.Required"], MessageType.Warning);
             }
         }
         catch (Exception ex)

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

@@ -1,4 +1,6 @@
 @namespace Oqtane.Modules.Admin.UserProfile
+@using System.Net
+@using System.Text.RegularExpressions;
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
@@ -6,256 +8,443 @@
 @inject ISettingService SettingService
 @inject INotificationService NotificationService
 @inject IFileService FileService
+@inject IFolderService FolderService
+@inject ITimeZoneService TimeZoneService
+@inject IJSRuntime jsRuntime
+@inject IServiceProvider ServiceProvider
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (PageState.User != null && photo != null)
+@if (_initialized)
 {
-    <img src="@photo.Url" alt="@displayname" style="max-width: 400px" class="rounded-circle mx-auto d-block">
-}
-else
-{
-    <br />
-}
-<TabStrip>
-    <TabPanel Name="Identity" ResourceKey="Identity">
-        @if (PageState.User != null)
-        {
-            <table class="table table-borderless">
-                <tr>
-                    <td width="30%">
-                        <Label For="username" HelpText="Your username. Note that this field can not be modified." ResourceKey="Username"></Label>
-                    </td>
-                    <td>
-                        <input id="username" class="form-control" @bind="@username" readonly />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="password" HelpText="If you wish to change your password you can enter it here. Please choose a sufficiently secure password." ResourceKey="Password"></Label>
-                    </td>
-                    <td>
-                        <input id ="password" type="password" class="form-control" @bind="@password" autocomplete="new-password" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="confirm" HelpText="If you are changing your password you must enter it again to confirm it matches" ResourceKey="Confirm"></Label>
-                    </td>
-                    <td>
-                        <input id="confirm" type="password" class="form-control" @bind="@confirm" autocomplete="new-password" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="email" HelpText="Your email address where you wish to receive notifications" ResourceKey="Email"></Label>
-                    </td>
-                    <td>
-                        <input id="email" class="form-control" @bind="@email" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="displayname" HelpText="Your full name" ResourceKey="DisplayName"></Label>
-                    </td>
-                    <td>
-                        <input id="displayname" class="form-control" @bind="@displayname" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="@photofileid.ToString()" HelpText="A photo of yourself" ResourceKey="Photo"></Label>
-                    </td>
-                    <td>
-                        <FileManager FileId="@photofileid" @ref="filemanager" />
-                    </td>
-                </tr>
-            </table>
+    @if (PageState.User != null && _photo != null)
+    {
+        <img src="@ImageUrl(_photofileid, 400, 400)" alt="@_displayname" style="max-width: 400px" class="rounded-circle mx-auto d-block">
+    }
+    else
+    {
+        <br />
+    }
+    <TabStrip>
+        <TabPanel Name="Identity" ResourceKey="Identity">
+            <ModuleMessage Message="@_passwordrequirements" Type="MessageType.Info" />
+            <div class="container">
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="username" HelpText="Your username. Note that this field can not be modified." ResourceKey="Username"></Label>
+                    <div class="col-sm-9">
+                        <input id="username" class="form-control" @bind="@_username" readonly />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="password" HelpText="If you wish to change your password you can enter it here. Please choose a sufficiently secure password." 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" />
+                            <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="If you are changing your password you must enter it again to confirm it matches" ResourceKey="Confirm"></Label>
+                    <div class="col-sm-9">
+                        <div class="input-group">
+                            <input id="confirm" type="@_passwordtype" class="form-control" @bind="@_confirm" autocomplete="new-password" />
+                            <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
+                        </div>
+                    </div>
+                </div>
+                @if (_allowtwofactor)
+                {
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="twofactor" HelpText="Indicates if you are using two factor authentication. Two factor authentication requires you to enter a verification code sent via email after you sign in." ResourceKey="TwoFactor"></Label>
+                        <div class="col-sm-9">
+                            <select id="twofactor" class="form-select" @bind="@_twofactor" required>
+                                <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="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" />
+                    </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" />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="timezone" HelpText="Your time zone" ResourceKey="TimeZone">Time Zone:</Label>
+                    <div class="col-sm-9">
+                        <select id="timezone" class="form-select" @bind="@_timezoneid">
+                            <option value="">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
+                            @foreach (var timezone in _timezones)
+                            {
+                                <option value="@timezone.Id">@timezone.DisplayName</option>
+                            }
+                        </select>
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="@_photofileid.ToString()" HelpText="A photo of yourself" ResourceKey="Photo"></Label>
+                    <div class="col-sm-9">
+                        <FileManager FileId="@_photofileid" Filter="@PageState.Site.ImageFiles" ShowFolders="false" ShowFiles="true" UploadMultiple="false" FolderId="@_folderid" @ref="_filemanager" />
+                    </div>
+                </div>
+            </div>
+            <br />
             <button type="button" class="btn btn-success" @onclick="Save">@SharedLocalizer["Save"]</button>
             <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
-        }
-    </TabPanel>
-    <TabPanel Name="Profile" ResourceKey="Profile">
-        @if (profiles != null && settings != null)
-        {
-            <table class="table table-borderless">
-                @foreach (Profile profile in profiles)
-                {
-                    var p = profile;
-                    if (!p.IsPrivate || UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
+            <button type="button" class="btn btn-danger" @onclick="Logout">@Localizer["Logout Everywhere"]</button>
+        </TabPanel>
+        <TabPanel Name="Profile" ResourceKey="Profile">
+            <div class="container">
+                <div class="row mb-1 align-items-center">
+                    @foreach (Profile profile in _profiles)
                     {
-                        if (p.Category != category)
+                        var p = profile;
+                        if (!p.IsPrivate || UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
                         {
-                            <tr>
-                                <th colspan="2" style="text-align: center;">
+                            if (p.Category != _category)
+                            {
+                                <div class="col text-center pb-2">
                                     @p.Category
-                                </th>
-                            </tr>
-                            category = p.Category;
-                        }
-                        <tr>
-                            <td width="30%">
-                                <Label For="@p.Name" HelpText="@p.Description">@p.Title</Label>
-                            </td>
-                            <td>
-                                @if (!string.IsNullOrEmpty(p.Options))
-                                {
-                                    <select id="@p.Name" class="form-select" @onchange="@(e => ProfileChanged(e, p.Name))">
-                                        @foreach (var option in p.Options.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
-                                        {
-                                            @if (GetProfileValue(p.Name, "") == option || (GetProfileValue(p.Name, "") == "" && p.DefaultValue == option))
-                                            {
-                                                <option value="@option" selected>@option</option>
-                                            }
-                                            else
-                                            {
-                                                <option value="@option">@option</option>
-                                            }
-                                        }
-                                    </select>
-                                }
-                                else
-                                {
-                                    @if (p.IsRequired)
+                                </div>
+                                _category = p.Category;
+                            }
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="@p.Name" HelpText="@p.Description">@p.Title</Label>
+                                <div class="col-sm-9">
+                                    @if (!string.IsNullOrEmpty(p.Options))
                                     {
-                                        <input id="@p.Name" class="form-control" maxlength="@p.MaxLength" value="@GetProfileValue(p.Name, p.DefaultValue)" required @onchange="@(e => ProfileChanged(e, p.Name))" />
+                                        @if (!string.IsNullOrEmpty(p.Autocomplete))
+                                        {
+                                            <select id="@p.Name" class="form-select" @onchange="@(e => ProfileChanged(e, p.Name))" autocomplete="@p.Autocomplete">
+                                                @foreach (var option in p.Options.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+                                                {
+                                                    @if (GetProfileValue(p.Name, "") == option || (GetProfileValue(p.Name, "") == "" && p.DefaultValue == option))
+                                                    {
+                                                        <option value="@option" selected>@option</option>
+                                                    }
+                                                    else
+                                                    {
+                                                        <option value="@option">@option</option>
+                                                    }
+                                                }
+                                            </select>
+                                        }
+                                        else
+                                        {
+                                            <select id="@p.Name" class="form-select" @onchange="@(e => ProfileChanged(e, p.Name))">
+                                                @foreach (var option in p.Options.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+                                                {
+                                                    @if (GetProfileValue(p.Name, "") == option || (GetProfileValue(p.Name, "") == "" && p.DefaultValue == option))
+                                                    {
+                                                        <option value="@option" selected>@option</option>
+                                                    }
+                                                    else
+                                                    {
+                                                        <option value="@option">@option</option>
+                                                    }
+                                                }
+                                            </select>
+                                        }
                                     }
                                     else
                                     {
-                                        <input id="@p.Name" class="form-control" maxlength="@p.MaxLength" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))" />
+                                        @if (p.Rows == 1)
+                                        {
+                                            if (!string.IsNullOrEmpty(p.Autocomplete))
+                                            {
+                                                @if (p.IsRequired)
+                                                {
+                                                    <input id="@p.Name" class="form-control" value="@GetProfileValue(p.Name, p.DefaultValue)" required @onchange="@(e => ProfileChanged(e, p.Name))" autocomplete="@p.Autocomplete"
+                                                    @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)" />
+                                                }
+                                                else
+                                                {
+                                                    <input id="@p.Name" class="form-control" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))" autocomplete="@p.Autocomplete"
+                                                    @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)" />
+                                                }
+                                            }
+                                            else
+                                            {
+                                                @if (p.IsRequired)
+                                                {
+                                                    <input id="@p.Name" class="form-control" value="@GetProfileValue(p.Name, p.DefaultValue)" required @onchange="@(e => ProfileChanged(e, p.Name))"
+                                                    @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)" />
+                                                }
+                                                else
+                                                {
+                                                    <input id="@p.Name" class="form-control" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))"
+                                                    @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)" />
+                                                }
+                                            }
+                                        }
+                                        else
+                                        {
+                                            if (!string.IsNullOrEmpty(p.Autocomplete))
+                                            {
+                                                @if (p.IsRequired)
+                                                {
+                                                    <textarea id="@p.Name" class="form-control" rows="@p.Rows" value="@GetProfileValue(p.Name, p.DefaultValue)" required @onchange="@(e => ProfileChanged(e, p.Name))" autocomplete="@p.Autocomplete"
+                                                    @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)"></textarea>
+                                                }
+                                                else
+                                                {
+                                                    <textarea id="@p.Name" class="form-control" rows="@p.Rows" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))" autocomplete="@p.Autocomplete"
+                                                    @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)"></textarea>
+                                                }
+                                            }
+                                            else
+                                            {
+                                                @if (p.IsRequired)
+                                                {
+                                                    <textarea id="@p.Name" class="form-control" rows="@p.Rows" value="@GetProfileValue(p.Name, p.DefaultValue)" required @onchange="@(e => ProfileChanged(e, p.Name))"
+                                                    @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)"></textarea>
+                                                }
+                                                else
+                                                {
+                                                    <textarea id="@p.Name" class="form-control" rows="@p.Rows" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))"
+                                                    @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)"></textarea>
+                                                }
+                                            }
+                                        }
                                     }
-                                }
-                            </td>
-                        </tr>
+                                </div>
+                            </div>
+                        }
                     }
-                }
-            </table>
+                </div>
+            </div>
             <button type="button" class="btn btn-success" @onclick="Save">@SharedLocalizer["Save"]</button>
             <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
-        }
-    </TabPanel>
-    <TabPanel Name="Notifications" ResourceKey="Notifications">
-        @if (notifications != null)
-        {
-            <ActionLink Action="Add" Text="Send Notification" Security="SecurityAccessLevel.View" EditMode="false" ResourceKey="SendNotification" />
-            <br /><br />
-            @if (filter == "to")
-            {
-                <Pager Items="@notifications">
-                    <Header>
-                        <th style="width: 1px;">&nbsp;</th>
-                        <th style="width: 1px;">&nbsp;</th>
-                        <th>@Localizer["From"]</th>
-                        <th>@Localizer["Subject"]</th>
-                        <th>@Localizer["Received"]</th>
-                    </Header>
-                    <Row>
-                        <td><ActionLink Action="View" Parameters="@($"id=" + context.NotificationId.ToString())" Security="SecurityAccessLevel.View" EditMode="false" ResourceKey="ViewNotification" /></td>
-                        <td><ActionDialog Header="Delete Notification" Message="Are You Sure You Wish To Delete This Notification?" Action="Delete" Security="SecurityAccessLevel.View" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" EditMode="false" ResourceKey="DeleteNotification" /></td>
-                        <td>@context.FromDisplayName</td>
-                        <td>@context.Subject</td>
-                        <td>@context.CreatedOn</td>
-                    </Row>
-                    <Detail>
-                        <td colspan="2"></td>
-                        <td colspan="3">
-                            @{
-                                        string input = "___";
-                                        if (context.Body.Contains(input))
-                                        {
-                                            context.Body = context.Body.Split(input)[0];
-                                            context.Body = context.Body.Replace("\n", "");
-                                            context.Body = context.Body.Replace("\r", "");
-                                        } }
-                            @(context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body)
-                        </td>
-                    </Detail>
-                </Pager>
-            }
-            else
-            {
-                <Pager Items="@notifications">
-                    <Header>
-                        <th>&nbsp;</th>
-                        <th>&nbsp;</th>
-                        <th>@Localizer["To"]</th>
-                        <th>@Localizer["Subject"]</th>
-                        <th>@Localizer["Sent"]</th>
-                    </Header>
-                    <Row>
-                        <td><ActionLink Action="View" Parameters="@($"id=" + context.NotificationId.ToString())" Security="SecurityAccessLevel.View" EditMode="false" ResourceKey="ViewNotification" /></td>
-                        <td><ActionDialog Header="Delete Notification" Message="Are You Sure You Wish To Delete This Notification?" Action="Delete" Security="SecurityAccessLevel.View" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" EditMode="false" ResourceKey="DeleteNotification" /></td>
-                        <td>@context.ToDisplayName</td>
-                        <td>@context.Subject</td>
-                        <td>@context.CreatedOn</td>
-                    </Row>
-                    <Detail>
-                        <td colspan="2"></td>
-                        <td colspan="3">
-                            @{
-                                        string input = "___";
-                                        if (context.Body.Contains(input))
-                                        {
-                                            context.Body = context.Body.Split(input)[0];
-                                            context.Body = context.Body.Replace("\n", "");
-                                            context.Body = context.Body.Replace("\r", "");
-                                        } }
-                            @(context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body)
-                        </td>
-                    </Detail>
-                </Pager>
-            }
-            <br /><hr />
+        </TabPanel>
+        <TabPanel Name="Notifications" ResourceKey="Notifications">
+            <ActionLink Action="Add" Text="Send Notification" Security="SecurityAccessLevel.View" EditMode="false" ResourceKey="SendNotification" ReturnUrl="@NavigateUrl(PageState.Page.Path, "tab=Notifications")" />
+            <br />
+            <br />
             <select class="form-select" @onchange="(e => FilterChanged(e))">
                 <option value="to">@Localizer["Inbox"]</option>
                 <option value="from">@Localizer["Items.Sent"]</option>
             </select>
-        }
-    </TabPanel>
-</TabStrip>
-
-@code {
-    private string username = string.Empty;
-    private string password = string.Empty;
-    private string confirm = string.Empty;
-    private string email = string.Empty;
-    private string displayname = string.Empty;
-    private FileManager filemanager;
-    private int photofileid = -1;
-    private File photo = null;
-    private List<Profile> profiles;
-    private Dictionary<string, string> settings;
-    private string category = string.Empty;
-    private string filter = "to";
-    private List<Notification> notifications;
-
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
-
-    protected override async Task OnParametersSetAsync()
-    {
-        try
-        {
-            if (PageState.User != null)
+            <br />
+            @if (_filter == "to")
             {
-                username = PageState.User.Username;
-                email = PageState.User.Email;
-                displayname = PageState.User.DisplayName;
-
-                if (PageState.User.PhotoFileId != null)
+                @if (_notifications.Any())
                 {
-                    photofileid = PageState.User.PhotoFileId.Value;
-                    photo = await FileService.GetFileAsync(photofileid);
+                    <Pager Items="@_notifications">
+                        <Header>
+                            <th style="width: 1px;">&nbsp;</th>
+                            <th style="width: 1px;">&nbsp;</th>
+                            <th>@Localizer["From"]</th>
+                            <th>@Localizer["Subject"]</th>
+                            <th>@Localizer["Received"]</th>
+                        </Header>
+                        <Row>
+                            <td><ActionLink Action="View" Parameters="@($"id=" + context.NotificationId.ToString())" Security="SecurityAccessLevel.View" EditMode="false" ResourceKey="ViewNotification" ReturnUrl="@NavigateUrl(PageState.Page.Path, "tab=Notifications")" /></td>
+                            <td><ActionDialog Header="Delete Notification" Message="Are You Sure You Wish To Delete This Notification?" Action="Delete" Security="SecurityAccessLevel.View" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" EditMode="false" ResourceKey="DeleteNotification" /></td>
+
+                            @if (context.IsRead)
+                            {
+                                <td>@(string.IsNullOrEmpty(context.FromDisplayName) ? SharedLocalizer["System"] : context.FromDisplayName)</td>
+                                <td>@context.Subject</td>
+                                <td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</td>
+                            }
+                            else
+                            {
+                                <td><b>@(string.IsNullOrEmpty(context.FromDisplayName) ? SharedLocalizer["System"] : context.FromDisplayName)</b></td>
+                                <td><b>@context.Subject</b></td>
+                                <td><b>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</b></td>
+                            }
+                        </Row>
+                        <Detail>
+                            <td colspan="2"></td>
+                            <td colspan="3">
+                                @{
+                                    string input = "___";
+                                    if (context.Body.Contains(input))
+                                    {
+                                        context.Body = context.Body.Split(input)[0];
+                                        context.Body = context.Body.Replace("\n", "");
+                                        context.Body = context.Body.Replace("\r", "");
+                                    }
+                                    _notificationSummary = context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body;
+                                }
+                                @if (context.IsRead)
+                                {
+                                    @_notificationSummary
+                                }
+                                else
+                                {
+                                    <b>@_notificationSummary</b>
+                                }
+                            </td>
+                        </Detail>
+                    </Pager>
+                    <br />
+                    <ActionDialog Header="Clear Notifications" Message="Are You Sure You Wish To Permanently Delete All Notifications ?" Action="Delete All Notifications" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllNotifications())" ResourceKey="DeleteAllNotifications" />
                 }
                 else
                 {
-                    photofileid = -1;
-                    photo = null;
+                    <div class="no-notifications-text">
+                        @Localizer["NoNotificationsReceived.Text"]
+                    </div>
+                }
+            }
+            else
+            {
+                @if (_notifications.Any())
+                {
+                    <Pager Items="@_notifications">
+                        <Header>
+                            <th style="width: 1px;"></th>
+                            <th style="width: 1px;"></th>
+                            <th>@Localizer["To"]</th>
+                            <th>@Localizer["Subject"]</th>
+                            <th>@Localizer["Sent"]</th>
+                        </Header>
+                        <Row>
+                            <td><ActionLink Action="View" Parameters="@($"id=" + context.NotificationId.ToString())" Security="SecurityAccessLevel.View" EditMode="false" ResourceKey="ViewNotification" ReturnUrl="@NavigateUrl(PageState.Page.Path, "tab=Notifications")" /></td>
+                            <td><ActionDialog Header="Delete Notification" Message="Are You Sure You Wish To Delete This Notification?" Action="Delete" Security="SecurityAccessLevel.View" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" EditMode="false" ResourceKey="DeleteNotification" /></td>
+
+                            @if (context.IsRead)
+                            {
+                                <td>@context.ToDisplayName</td>
+                                <td>@context.Subject</td>
+                                <td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</td>
+                            }
+                            else
+                            {
+                                <td><b>@context.ToDisplayName</b></td>
+                                <td><b>@context.Subject</b></td>
+                                <td><b>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</b></td>
+                            }
+
+                        </Row>
+                        <Detail>
+                            <td colspan="2"></td>
+                            <td colspan="3">
+                                @{
+                                    string input = "___";
+                                    if (context.Body.Contains(input))
+                                    {
+                                        context.Body = context.Body.Split(input)[0];
+                                        context.Body = context.Body.Replace("\n", "");
+                                        context.Body = context.Body.Replace("\r", "");
+                                    }
+                                    _notificationSummary = context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body;
+                                }
+                                @if (context.IsRead)
+                                {
+                                    @_notificationSummary
+                                }
+                                else
+                                {
+                                    <b>@_notificationSummary</b>
+                                }
+                            </td>
+                        </Detail>
+                    </Pager>
+                    <br />
+                    <ActionDialog Header="Clear Notifications" Message="Are You Sure You Wish To Permanently Delete All Notifications ?" Action="Delete All Notifications" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllNotifications())" ResourceKey="DeleteAllNotifications" />
+                }
+                else
+                {
+                    <div class="no-notifications-text">
+                        @Localizer["NoNotificationsSent.Text"]
+                    </div>
+                }
+            }
+        </TabPanel>
+    </TabStrip>
+    <br />
+    <br />
+}
+
+@code {
+    private List<Models.TimeZone> _timezones;
+    private bool _initialized = false;
+    private string _passwordrequirements;
+    private string _username = string.Empty;
+    private string _password = string.Empty;
+    private string _passwordtype = "password";
+    private string _togglepassword = string.Empty;
+    private string _confirm = string.Empty;
+    private bool _allowtwofactor = false;
+    private string _twofactor = "False";
+    private string _email = string.Empty;
+    private string _displayname = string.Empty;
+    private FileManager _filemanager;
+    private int _folderid = -1;
+    private string _timezoneid = string.Empty;
+    private int _photofileid = -1;
+    private File _photo = null;
+    private string _imagefiles = string.Empty;
+
+    private List<Profile> _profiles;
+    private Dictionary<string, string> _userSettings;
+    private string _category = string.Empty;
+
+    private string _filter = "to";
+    private List<Notification> _notifications;
+    private string _notificationSummary = string.Empty;
+
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
+
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            _passwordrequirements = await UserService.GetPasswordRequirementsAsync(PageState.Site.SiteId);
+            _togglepassword = SharedLocalizer["ShowPassword"];
+            _allowtwofactor = (SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:TwoFactor", "false") == "true");
+            _profiles = await ProfileService.GetProfilesAsync(ModuleState.SiteId);
+            _timezones = await TimeZoneService.GetTimeZonesAsync();
+
+            if (PageState.User != null)
+            {
+                _username = PageState.User.Username;
+                _twofactor = PageState.User.TwoFactorRequired.ToString();
+                _email = PageState.User.Email;
+                _displayname = PageState.User.DisplayName;
+                _timezoneid = PageState.User.TimeZoneId;
+
+                if (string.IsNullOrEmpty(_email))
+                {
+                    AddModuleMessage(Localizer["Message.User.NoEmail"], MessageType.Warning);
                 }
 
-                profiles = await ProfileService.GetProfilesAsync(ModuleState.SiteId);
-                settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId);
+                // get user folder
+                var folder = await FolderService.GetFolderAsync(ModuleState.SiteId, PageState.User.FolderPath);
+                if (folder != null)
+                {
+                    _folderid = folder.FolderId;
+                }
+
+                if (PageState.User.PhotoFileId != null)
+                {
+                    _photofileid = PageState.User.PhotoFileId.Value;
+                    _photo = await FileService.GetFileAsync(_photofileid);
+                }
+                else
+                {
+                    _photofileid = -1;
+                    _photo = null;
+                }
+
+                _userSettings = PageState.User.Settings;
+                var sitesettings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+                _imagefiles = SettingService.GetSetting(_userSettings, "ImageFiles", Constants.ImageFiles);
+                _imagefiles = (string.IsNullOrEmpty(_imagefiles)) ? Constants.ImageFiles : _imagefiles;
 
                 await LoadNotificationsAsync();
+
+                _initialized = true;
             }
             else
             {
@@ -271,37 +460,74 @@ else
 
     private async Task LoadNotificationsAsync()
     {
-        notifications = await NotificationService.GetNotificationsAsync(PageState.Site.SiteId, filter, PageState.User.UserId);
-        notifications = notifications.Where(item => item.DeletedBy != PageState.User.Username).ToList();
+        _notifications = await NotificationService.GetNotificationsAsync(PageState.Site.SiteId, _filter, PageState.User.UserId);
+        _notifications = _notifications.Where(item => item.DeletedBy != PageState.User.Username).ToList();
     }
 
     private string GetProfileValue(string SettingName, string DefaultValue)
-        => SettingService.GetSetting(settings, SettingName, DefaultValue);
+    {
+        string value = SettingService.GetSetting(_userSettings, SettingName, DefaultValue);
+        if (value.Contains("]"))
+        {
+            value = value.Substring(value.IndexOf("]") + 1);
+        }
+        return value;
+    }
 
     private async Task Save()
     {
         try
         {
-            if (username != string.Empty && email != string.Empty && ValidateProfiles())
+            if (_username != string.Empty && _email != string.Empty)
             {
-                if (password == confirm)
+                if (_password == _confirm)
                 {
-                    var user = PageState.User;
-                    user.Username = username;
-                    user.Password = password;
-                    user.Email = email;
-                    user.DisplayName = (displayname == string.Empty ? username : displayname);
-                    user.PhotoFileId = filemanager.GetFileId();
-                    if (user.PhotoFileId == -1)
+                    if (ValidateProfiles())
                     {
-                        user.PhotoFileId = null;
+                        var user = PageState.User;
+                        user.Username = _username;
+                        user.Password = _password;
+                        user.TwoFactorRequired = bool.Parse(_twofactor);
+                        user.Email = _email;
+                        user.DisplayName = (_displayname == string.Empty ? _username : _displayname);
+                        user.TimeZoneId = _timezoneid;
+                        user.PhotoFileId = _filemanager.GetFileId();
+                        if (user.PhotoFileId == -1)
+                        {
+                            user.PhotoFileId = null;
+                        }
+                        if (user.PhotoFileId != null)
+                        {
+                            _photofileid = user.PhotoFileId.Value;
+                            _photo = await FileService.GetFileAsync(_photofileid);
+                        }
+                        else
+                        {
+                            _photofileid = -1;
+                            _photo = null;
+                        }
+
+                        user = await UserService.UpdateUserAsync(user);
+                        if (user != null)
+                        {
+                            await SettingService.UpdateUserSettingsAsync(_userSettings, PageState.User.UserId);
+                            await logger.LogInformation("User Profile Saved");
+
+                            if (!string.IsNullOrEmpty(PageState.ReturnUrl))
+                            {
+                                NavigationManager.NavigateTo(PageState.ReturnUrl);
+                            }
+                            else // legacy behavior
+                            {
+                                AddModuleMessage(Localizer["Success.Profile.Update"], MessageType.Success);
+                                StateHasChanged();
+                            }
+                        }
+                        else
+                        {
+                            AddModuleMessage(Localizer["Message.Password.Complexity"], MessageType.Error);
+                        }
                     }
-
-                    await UserService.UpdateUserAsync(user);
-                    await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId);
-                    await logger.LogInformation("User Profile Saved");
-
-                    NavigationManager.NavigateTo(NavigateUrl());
                 }
                 else
                 {
@@ -312,6 +538,8 @@ else
             {
                 AddModuleMessage(Localizer["Message.Required.ProfileInfo"], MessageType.Warning);
             }
+
+            await ScrollToPageTop();
         }
         catch (Exception ex)
         {
@@ -320,35 +548,72 @@ else
         }
     }
 
+    private async Task Logout()
+    {
+        await logger.LogInformation("User Logout Everywhere For Username {Username}", PageState.User?.Username);
+
+        var url = NavigateUrl(""); // home page
+
+        if (PageState.Runtime == Shared.Runtime.Hybrid)
+        {
+            if (PageState.User != null)
+            {
+                // hybrid apps utilize an interactive logout
+                await UserService.LogoutUserEverywhereAsync(PageState.User);
+                var authstateprovider = (IdentityAuthenticationStateProvider)ServiceProvider.GetService(typeof(IdentityAuthenticationStateProvider));
+                authstateprovider.NotifyAuthenticationChanged();
+                NavigationManager.NavigateTo(url, true);
+            }
+        }
+        else
+        {
+            // post to the Logout page to complete the logout process
+            var fields = new { __RequestVerificationToken = SiteState.AntiForgeryToken, returnurl = url, everywhere = true };
+            var interop = new Interop(jsRuntime);
+            await interop.SubmitForm(Utilities.TenantUrl(PageState.Alias, "/pages/logout/"), fields);
+        }
+    }
+
     private bool ValidateProfiles()
     {
-        bool valid = true;
-        foreach (Profile profile in profiles)
+        foreach (Profile profile in _profiles)
         {
-            if (string.IsNullOrEmpty(SettingService.GetSetting(settings, profile.Name, string.Empty)) && !string.IsNullOrEmpty(profile.DefaultValue))
+            var value = GetProfileValue(profile.Name, string.Empty);
+            if (string.IsNullOrEmpty(value) && !string.IsNullOrEmpty(profile.DefaultValue))
             {
-                settings = SettingService.SetSetting(settings, profile.Name, profile.DefaultValue);
+                _userSettings = SettingService.SetSetting(_userSettings, profile.Name, profile.DefaultValue);
             }
             if (!profile.IsPrivate || UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
             {
-                if (profile.IsRequired && string.IsNullOrEmpty(SettingService.GetSetting(settings, profile.Name, string.Empty)))
+                if (profile.IsRequired && string.IsNullOrEmpty(value))
                 {
-                    valid = false;
+                    AddModuleMessage(string.Format(SharedLocalizer["ProfileRequired"], profile.Title), MessageType.Warning);
+                    return false;
+                }
+                if (!string.IsNullOrEmpty(profile.Validation))
+                {
+                    Regex regex = new Regex(profile.Validation);
+                    bool valid = regex.Match(value).Success;
+                    if (!valid)
+                    {
+                        AddModuleMessage(string.Format(SharedLocalizer["ProfileInvalid"], profile.Title), MessageType.Warning);
+                        return false;
+                    }
                 }
             }
         }
-        return valid;
+        return true;
     }
 
     private void Cancel()
     {
-        NavigationManager.NavigateTo(NavigateUrl(string.Empty));
+        NavigationManager.NavigateTo(PageState.ReturnUrl);
     }
 
     private void ProfileChanged(ChangeEventArgs e, string SettingName)
     {
         var value = (string)e.Value;
-        settings = SettingService.SetSetting(settings, SettingName, value);
+        _userSettings = SettingService.SetSetting(_userSettings, SettingName, value);
     }
 
     private async Task Delete(Notification Notification)
@@ -378,10 +643,54 @@ else
 
     private async void FilterChanged(ChangeEventArgs e)
     {
-        filter = (string)e.Value;
-
+        _filter = (string)e.Value;
         await LoadNotificationsAsync();
         StateHasChanged();
     }
 
+    private async Task DeleteAllNotifications()
+    {
+        try
+        {
+            ShowProgressIndicator();
+            foreach(var Notification in _notifications)
+            {
+                if (!Notification.IsDeleted)
+                {
+                    Notification.IsDeleted = true;
+                    await NotificationService.UpdateNotificationAsync(Notification);
+                }
+                else
+                {
+                    await NotificationService.DeleteNotificationAsync(Notification.NotificationId);
+                }
+                await logger.LogInformation("Notification Deleted {Notification}", Notification);
+            }
+            await logger.LogInformation("Notifications Permanently Deleted");
+            await LoadNotificationsAsync();
+            HideProgressIndicator();
+
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Deleting Notifications {Error}", ex.Message);
+            AddModuleMessage(ex.Message, MessageType.Error);
+            HideProgressIndicator();
+        }
+    }
+
+    private void TogglePassword()
+    {
+        if (_passwordtype == "password")
+        {
+            _passwordtype = "text";
+            _togglepassword = SharedLocalizer["HidePassword"];
+        }
+        else
+        {
+            _passwordtype = "password";
+            _togglepassword = SharedLocalizer["ShowPassword"];
+        }
+    }
 }

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

@@ -8,98 +8,71 @@
 
 @if (PageState.User != null)
 {
-    <table class="table table-borderless">
-        <tr>
-            <td width="30%">
-                <label class="control-label">@Localizer["Title"] </label>
-            </td>
-            @if (title == "From")
-            {
-                <td>
-                    <input class="form-control" @bind="@username" readonly />
-                </td>
-            }
-            @if (title == "To")
-            {
-                <td>
-                    <input class="form-control" @bind="@username" />
-                </td>
-            }
-        </tr>
-        <tr>
-            <td>
-                <label class="control-label">@Localizer["Subject"] </label>
-            </td>
-            @if (title == "From")
-            {
-                <td>
-                    <input class="form-control" @bind="@subject" readonly />
-                </td>
-            }
-            @if (title == "To")
-            {
-                <td>
-                    <input class="form-control" @bind="@subject" />
-                </td>
-            }
-        </tr>
-        @if (title == "From")
-        {
-            <tr>
-                <td>
-                    <label class="control-label">@Localizer["Date"] </label>
-                </td>
-                <td>
-                    <input class="form-control" @bind="@createdon" readonly />
-                </td>
-            </tr>
-        }
-        @if (title == "From")
-        {
-            <tr>
-                <td>
-                    <label class="control-label">@Localizer["Message"] </label>
-                </td>
-                <td>
-                    <textarea class="form-control" @bind="@body" rows="5" readonly />
-                </td>
-            </tr>
-        }
-        @if (title == "To")
-        {
-            <tr>
-                <td>
-                    <label class="control-label">@Localizer["Message"] </label>
-                </td>
-                <td>
-                    <textarea class="form-control" @bind="@body" rows="5" />
-                </td>
-            </tr>
-        }
-    </table>
-
-
-    @if (reply != string.Empty)
+    @if (title == "From")
     {
-        <button type="button" class="btn btn-primary" @onclick="Send">@SharedLocalizer["Send"]</button>
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="username" HelpText="The user who sent the message" ResourceKey="From">From:</Label>
+                <div class="col-sm-9">
+                    <input id="username" class="form-control" @bind="@username" readonly />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="subject" HelpText="The subject of the message" ResourceKey="Subject">Subject:</Label>
+                <div class="col-sm-9">
+                    <input id="subject" class="form-control" @bind="@subject" readonly />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label class="col-sm-3" For="date" HelpText="The date the message was sent" ResourceKey="Date">Sent:</Label>
+                <div class="col-sm-9">
+                    <input id="date" class="form-control" @bind="@createdon" readonly />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label class="col-sm-3" For="message" HelpText="The contents of the message" ResourceKey="Message">Message:</Label>
+                <div class="col-sm-9">
+                    <textarea id="message" class="form-control" @bind="@body" rows="5" readonly />
+                </div>
+            </div>
+        </div>
     }
     else
     {
-        if (title == "From")
-        {
-            <button type="button" class="btn btn-primary" @onclick="Reply">@Localizer["Reply"]</button>
-        }
-    }
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
-    <br />
-    <br />
-    @if (title == "To")
-    {
-        <div class="control-group">
-            <label class="control-label">@Localizer["OriginalMessage"] </label>
-            <textarea class="form-control" @bind="@reply" rows="5" readonly />
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="username" HelpText="The user who will be the recipient of the message" ResourceKey="To">To:</Label>
+                <div class="col-sm-9">
+                    <input id="username" class="form-control" @bind="@username" readonly />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="subject" HelpText="The subject of the message" ResourceKey="Subject">Subject:</Label>
+                <div class="col-sm-9">
+                    <input id="subject" class="form-control" @bind="@subject" readonly="@(!reply)" />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label class="col-sm-3" For="message" HelpText="The content of the message" ResourceKey="Message">Message:</Label>
+                <div class="col-sm-9">
+                    <textarea id="message" class="form-control" @bind="@body" rows="5" readonly="@(!reply)" />
+                </div>
+            </div>
         </div>
     }
+
+    @if (reply)
+    {
+        <button type="button" class="btn btn-primary me-2" @onclick="Send">@SharedLocalizer["Send"]</button>
+    }
+    else
+    {
+        if (title == "From" && username != Localizer["System"])
+        {
+            <button type="button" class="btn btn-primary me-2" @onclick="Reply">@Localizer["Reply"]</button>
+        }
+    }
+    <NavLink class="btn btn-secondary" href="@PageState.ReturnUrl">@SharedLocalizer["Cancel"]</NavLink>
 }
 
 @code {
@@ -109,7 +82,7 @@
     private string subject = string.Empty;
     private string createdon = string.Empty;
     private string body = string.Empty;
-    private string reply = string.Empty;
+    private bool reply = false;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
     public override string Title => "View Notification";
@@ -149,11 +122,17 @@
                 }
                 if (username == "")
                 {
-                    username = "System";
+                    username = Localizer["System"];
                 }
                 subject = notification.Subject;
                 createdon = notification.CreatedOn.ToString();
                 body = notification.Body;
+
+                if (title == "From" && !notification.IsRead)
+                {
+                    notification.IsRead = true;
+                    notification = await NotificationService.UpdateNotificationAsync(notification);
+                }
             }
         }
         catch (Exception ex)
@@ -166,12 +145,16 @@
     private void Reply()
     {
         title = "To";
-        if (!subject.Contains("RE:"))
+        if (!subject.Contains(Localizer["RE:"]))
         {
-            subject = "RE: " + subject;
+            subject = Localizer["RE"] + " " + subject;
         }
-        reply = body;
-        body = "\n\n____________________________________________\nSent: " + createdon + "\nSubject: " + subject + "\n\n" + body;
+        body = $"\n\n____________________________________________\n" +
+            $"{Localizer["From.Text"]} {username}\n" +
+            $"{Localizer["Date.Text"]} {createdon}\n" +
+            $"{Localizer["Subject.Text"]} {subject}\n\n" +
+            body;
+        reply = true;
         StateHasChanged();
     }
 
@@ -185,7 +168,7 @@
                 var notification = new Notification(PageState.Site.SiteId, PageState.User, user, subject, body, notificationid);
                 notification = await NotificationService.AddNotificationAsync(notification);
                 await logger.LogInformation("Notification Created {NotificationId}", notification.NotificationId);
-                NavigationManager.NavigateTo(NavigateUrl());
+                NavigationManager.NavigateTo(PageState.ReturnUrl);
             }
             else
             {

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

@@ -1,118 +1,143 @@
 @namespace Oqtane.Modules.Admin.Users
+@using System.Text.RegularExpressions;
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
 @inject IProfileService ProfileService
 @inject ISettingService SettingService
+@inject ITimeZoneService TimeZoneService
 @inject IStringLocalizer<Add> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<TabStrip>
-    <TabPanel Name="Identity" ResourceKey="Identity">
-        @if (profiles != null)
-        {
-            <table class="table table-borderless">
-                <tr>
-                    <td width="30%">
-                        <Label For="username" HelpText="A unique username for a user. Note that this field can not be modified once it is saved." ResourceKey="Username"></Label>
-                    </td>
-                    <td>
-                        <input id="username" class="form-control" @bind="@username" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="password" HelpText="The user's password. Please choose a password which is sufficiently secure." ResourceKey="Password"></Label>
-                    </td>
-                    <td>
-                        <input id="password" type="password" class="form-control" @bind="@password" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="confirm" HelpText="Please enter the password again to confirm it matches with the value above" ResourceKey="Confirm"></Label>
-                    </td>
-                    <td>
-                        <input id="confirm" type="password" class="form-control" @bind="@confirm" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="email" HelpText="The email address where the user will receive notifications" ResourceKey="Email"></Label>
-                    </td>
-                    <td>
-                        <input id="email" class="form-control" @bind="@email" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="displayname" HelpText="The full name of the user" ResourceKey="DisplayName"></Label>
-                    </td>
-                    <td>
-                        <input id="displayname" class="form-control" @bind="@displayname" />
-                    </td>
-                </tr>
-            </table>
-        }
-    </TabPanel>
-    <TabPanel Name="Profile" ResourceKey="Profile">
-        @if (profiles != null)
-        {
-            <table class="table table-borderless">
-                @foreach (Profile profile in profiles)
-                {
-                    var p = profile;
-                    if (p.Category != category)
+@if (_initialized)
+{
+    <TabStrip>
+        <TabPanel Name="Identity" ResourceKey="Identity">
+            @if (_profiles != null)
+            {
+                <div class="container">
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="username" HelpText="A unique username for a user. 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" />
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="email" HelpText="The email address where the user will receive notifications" ResourceKey="Email"></Label>
+                        <div class="col-sm-9">
+                            <input id="email" class="form-control" @bind="@_email" />
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="displayname" HelpText="The full name of the user" ResourceKey="DisplayName"></Label>
+                        <div class="col-sm-9">
+                            <input id="displayname" class="form-control" @bind="@_displayname" />
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="timezone" HelpText="Your time zone" ResourceKey="TimeZone">Time Zone:</Label>
+                        <div class="col-sm-9">
+                            <select id="timezone" class="form-select" @bind="@_timezoneid">
+                                <option value="">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
+                                @foreach (var timezone in _timezones)
+                                {
+                                    <option value="@timezone.Id">@timezone.DisplayName</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="notify" HelpText="Indicate if new users should receive an email notification" ResourceKey="Notify">Notify? </Label>
+                        <div class="col-sm-9">
+                            <select id="notify" class="form-select" @bind="@_notify" required>
+                                <option value="True">@SharedLocalizer["Yes"]</option>
+                                <option value="False">@SharedLocalizer["No"]</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            }
+        </TabPanel>
+        <TabPanel Name="Profile" ResourceKey="Profile">
+            <div class="container">
+                <div class="row mb-1 align-items-center">
+                    @foreach (Profile profile in _profiles)
                     {
-                        <tr>
-                            <th colspan="2" style="text-align: center;">
-                                @p.Category
-                            </th>
-                        </tr>
-                        category = p.Category;
+                        var p = profile;
+                        if (p.Category != _category)
+                        {
+                            <div class="col text-center pb-2">
+                                <strong>@p.Category</strong>
+                            </div>
+                            _category = p.Category;
+                        }
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="@p.Name" HelpText="@p.Description">@p.Title</Label>
+                            <div class="col-sm-9">
+                                @if (!string.IsNullOrEmpty(p.Options))
+                                {
+                                    <select id="@p.Name" class="form-select" @onchange="@(e => ProfileChanged(e, p.Name))">
+                                        @foreach (var option in p.Options.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+                                        {
+                                            @if (GetProfileValue(p.Name, "") == option || (GetProfileValue(p.Name, "") == "" && p.DefaultValue == option))
+                                            {
+                                                <option value="@option" selected>@option</option>
+                                            }
+                                            else
+                                            {
+                                                <option value="@option">@option</option>
+                                            }
+                                        }
+                                    </select>
+                                }
+                                else
+                                {
+                                    @if (p.Rows == 1)
+                                    {
+                                        <input id="@p.Name" class="form-control" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))" @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)" />
+                                    }
+                                    else
+                                    {
+                                        <textarea id="@p.Name" class="form-control" rows="@p.Rows" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))" @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)"></textarea>
+                                    }
+                                }
+                            </div>
+                        </div>
                     }
-                    <tr>
-                        <td width="30%">
-                            <Label For="@p.Name" HelpText="@p.Description">@p.Title</Label>
-                        </td>
-                        <td>
-                            @if (p.IsRequired)
-                            {
-                                <input id="@p.Name" class="form-control" maxlength="@p.MaxLength" value="@GetProfileValue(p.Name, p.DefaultValue)" required @onchange="@(e => ProfileChanged(e, p.Name))" />
-                            }
-                            else
-                            {
-                                <input id="@p.Name" class="form-control" maxlength="@p.MaxLength" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))" />
-                            }
-                        </td>
-                    </tr>
-                }
-            </table>
-        }
-    </TabPanel>
-</TabStrip>
+                </div>
+            </div>
+        </TabPanel>
+    </TabStrip>
+    <br />
+    <br />
+    <button type="button" class="btn btn-success" @onclick="SaveUser">@SharedLocalizer["Save"]</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+}
 
-<button type="button" class="btn btn-success" @onclick="SaveUser">@SharedLocalizer["Save"]</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 
 @code {
-    private string username = string.Empty;
-    private string password = string.Empty;
-    private string confirm = string.Empty;
-    private string email = string.Empty;
-    private string displayname = string.Empty;
-    private List<Profile> profiles;
-    private Dictionary<string, string> settings;
-    private string category = string.Empty;
+    private List<Models.TimeZone> _timezones;
+    private bool _initialized = false;
+    private string _username = string.Empty;
+    private string _email = string.Empty;
+    private string _displayname = string.Empty;
+    private string _timezoneid = string.Empty;
+    private string _notify = "True";
+    private List<Profile> _profiles;
+    private Dictionary<string, string> _settings;
+    private string _category = string.Empty;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
 
     protected override async Task OnInitializedAsync()
     {
         try
         {
-            profiles = await ProfileService.GetProfilesAsync(ModuleState.SiteId);
-            settings = new Dictionary<string, string>();
+            _timezones = await TimeZoneService.GetTimeZonesAsync();
+            _profiles = await ProfileService.GetProfilesAsync(ModuleState.SiteId);
+            _settings = new Dictionary<string, string>();
+            _timezoneid = PageState.Site.TimeZoneId;
+            _initialized = true;
         }
         catch (Exception ex)
         {
@@ -122,50 +147,47 @@
     }
 
     private string GetProfileValue(string SettingName, string DefaultValue)
-        => SettingService.GetSetting(settings, SettingName, DefaultValue);
+    {
+        string value = SettingService.GetSetting(_settings, SettingName, DefaultValue);
+        if (value.Contains("]"))
+        {
+            value = value.Substring(value.IndexOf("]") + 1);
+        }
+        return value;
+    }
 
     private async Task SaveUser()
     {
         try
         {
-            if (username != string.Empty && password != string.Empty && confirm != string.Empty && email != string.Empty && ValidateProfiles())
+            if (_username != string.Empty && _email != string.Empty)
             {
-                if (password == confirm)
+                if (ValidateProfiles())
                 {
-                    var user = await UserService.GetUserAsync(username, PageState.Site.SiteId);
-                    if (user == null)
+                    var user = new User();
+                    user.SiteId = PageState.Site.SiteId;
+                    user.Username = _username;
+                    user.Password = ""; // will be auto generated
+                    user.Email = _email;
+                    user.DisplayName = string.IsNullOrWhiteSpace(_displayname) ? _username : _displayname;
+                    user.TimeZoneId = _timezoneid;
+                    user.PhotoFileId = null;
+                    user.SuppressNotification = !bool.Parse(_notify);
+
+                    user = await UserService.AddUserAsync(user);
+
+                    if (user != null)
                     {
-                        user = new User();
-                        user.SiteId = PageState.Site.SiteId;
-                        user.Username = username;
-                        user.Password = password;
-                        user.Email = email;
-                        user.DisplayName = string.IsNullOrWhiteSpace(displayname) ? username : displayname;
-                        user.PhotoFileId = null;
-
-                        user = await UserService.AddUserAsync(user);
-
-                        if (user != null)
-                        {
-                            await SettingService.UpdateUserSettingsAsync(settings, user.UserId);
-                            await logger.LogInformation("User Created {User}", user);
-                            NavigationManager.NavigateTo(NavigateUrl());
-                        }
-                        else
-                        {
-                            await logger.LogError("Error Adding User {Username} {Email}", username, email);
-                            AddModuleMessage(Localizer["Error.User.AddCheckPass"], MessageType.Error);
-                        }
+                        await SettingService.UpdateUserSettingsAsync(_settings, user.UserId);
+                        await logger.LogInformation("User Created {User}", user);
+                        NavigationManager.NavigateTo(NavigateUrl());
                     }
                     else
                     {
-                        AddModuleMessage(Localizer["Message.Username.Exists"], MessageType.Warning);
+                        await logger.LogError("Error Adding User {Username} {Email}", _username, _email);
+                        AddModuleMessage(Localizer["Error.User.AddCheckPass"], MessageType.Error);
                     }
                 }
-                else
-                {
-                    AddModuleMessage(Localizer["Message.Password.NoMatch"], MessageType.Warning);
-                }
             }
             else
             {
@@ -174,32 +196,45 @@
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Adding User {Username} {Email} {Error}", username, email, ex.Message);
+            await logger.LogError(ex, "Error Adding User {Username} {Email} {Error}", _username, _email, ex.Message);
             AddModuleMessage(Localizer["Error.User.Add"], MessageType.Error);
         }
     }
 
     private bool ValidateProfiles()
     {
-        bool valid = true;
-        foreach (Profile profile in profiles)
+        foreach (Profile profile in _profiles)
         {
-            if (string.IsNullOrEmpty(SettingService.GetSetting(settings, profile.Name, string.Empty)) && !string.IsNullOrEmpty(profile.DefaultValue))
+            var value = GetProfileValue(profile.Name, string.Empty);
+            if (string.IsNullOrEmpty(value) && !string.IsNullOrEmpty(profile.DefaultValue))
             {
-                settings = SettingService.SetSetting(settings, profile.Name, profile.DefaultValue);
+                _settings = SettingService.SetSetting(_settings, profile.Name, profile.DefaultValue);
             }
-            if (profile.IsRequired && string.IsNullOrEmpty(SettingService.GetSetting(settings, profile.Name, string.Empty)))
+            if (!profile.IsPrivate || UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
             {
-                valid = false;
+                if (profile.IsRequired && string.IsNullOrEmpty(value))
+                {
+                    AddModuleMessage(string.Format(SharedLocalizer["ProfileRequired"], profile.Title), MessageType.Warning);
+                    return false;
+                }
+                if (!string.IsNullOrEmpty(profile.Validation))
+                {
+                    Regex regex = new Regex(profile.Validation);
+                    bool valid = regex.Match(value).Success;
+                    if (!valid)
+                    {
+                        AddModuleMessage(string.Format(SharedLocalizer["ProfileInvalid"], profile.Title), MessageType.Warning);
+                        return false;
+                    }
+                }
             }
         }
-        return valid;
+        return true;
     }
 
     private void ProfileChanged(ChangeEventArgs e, string SettingName)
     {
         var value = (string)e.Value;
-        settings = SettingService.SetSetting(settings, SettingName, value);
+        _settings = SettingService.SetSetting(_settings, SettingName, value);
     }
-
 }

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

@@ -1,228 +1,291 @@
 @namespace Oqtane.Modules.Admin.Users
+@using System.Text.RegularExpressions;
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
 @inject IProfileService ProfileService
 @inject ISettingService SettingService
 @inject IFileService FileService
+@inject ITimeZoneService TimeZoneService
+@inject IServiceProvider ServiceProvider
 @inject IStringLocalizer<Edit> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (PageState.User != null && photo != null)
+@if (_initialized)
 {
-    <img src="@photo.Url" alt="@displayname" style="max-width: 400px" class="rounded-circle mx-auto d-block">
-}
-else
-{
-    <br />
-}
-<TabStrip>
-    <TabPanel Name="Identity" ResourceKey="Identity">
-        @if (profiles != null)
-        {
-            <table class="table table-borderless">
-                <tr>
-                    <td width="30%">
-                        <Label For="username" HelpText="The unique username for a user. Note that this field can not be modified." ResourceKey="Username"></Label>
-                    </td>
-                    <td>
-                        <input id="username" class="form-control" @bind="@username" readonly />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="password" HelpText="The user's password. Please choose a password which is sufficiently secure." ResourceKey="Password"></Label>
-                    </td>
-                    <td>
-                        <input id="password" type="password" class="form-control" @bind="@password" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="confirm" HelpText="Please enter the password again to confirm it matches with the value above" ResourceKey="Confirm"></Label>
-                    </td>
-                    <td>
-                        <input id="confirm" type="password" class="form-control" @bind="@confirm" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="email" HelpText="The email address where the user will receive notifications" ResourceKey="Email"></Label>
-                    </td>
-                    <td>
-                        <input id="email" class="form-control" @bind="@email" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="displayname" HelpText="The full name of the user" ResourceKey="DisplayName"></Label>
-                    </td>
-                    <td>
-                        <input id="displayname" class="form-control" @bind="@displayname" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="@photofileid.ToString()" HelpText="A photo of the user" ResourceKey="Photo"></Label>
-                    </td>
-                    <td>
-                        <FileManager FileId="@photofileid" @ref="filemanager" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="isdeleted" HelpText="Indicate if the user is active" ResourceKey="IsDeleted"></Label>
-                    </td>
-                    <td>
-                        <select id="isdeleted" class="form-select" @bind="@isdeleted">
+    <TabStrip>
+        <TabPanel Name="Identity" ResourceKey="Identity">
+            <ModuleMessage Message="@_passwordrequirements" Type="MessageType.Info" />
+            <div class="container">
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="username" HelpText="The unique username for a user. Note that this field can not be modified." ResourceKey="Username">Username:</Label>
+                    <div class="col-sm-9">
+                        <input id="username" class="form-control" @bind="@_username" readonly />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="password" HelpText="The user's password. Please choose a password which is sufficiently secure." ResourceKey="Password">Password:</Label>
+                    <div class="col-sm-9">
+                        <div class="input-group">
+                            <input id="password" type="@_passwordtype" class="form-control" @bind="@_password" 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="confirm" HelpText="Please enter the password again to confirm it matches with the value above" ResourceKey="Confirm">Confirm Password:</Label>
+                    <div class="col-sm-9">
+                        <div class="input-group">
+                            <input id="confirm" type="@_passwordtype" class="form-control" @bind="@_confirm" autocomplete="new-password" />
+                            <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
+                        </div>
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="email" HelpText="The email address where the user will receive notifications" ResourceKey="Email">Email:</Label>
+                    <div class="col-sm-9">
+                        <input id="email" class="form-control" @bind="@_email" />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="confirmed" HelpText="Indicates if the user's email is verified" ResourceKey="Confirmed">Confirmed?</Label>
+                    <div class="col-sm-9">
+                        <select id="confirmed" class="form-select" @bind="@_confirmed">
                             <option value="True">@SharedLocalizer["Yes"]</option>
                             <option value="False">@SharedLocalizer["No"]</option>
                         </select>
-                    </td>
-                </tr>
-            </table>
-        }
-    </TabPanel>
-    <TabPanel Name="Profile" ResourceKey="Profile">
-        @if (profiles != null)
-        {
-            <table class="table table-borderless">
-                @foreach (Profile profile in profiles)
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="displayname" HelpText="The full name of the user" ResourceKey="DisplayName">Full Name:</Label>
+                    <div class="col-sm-9">
+                        <input id="displayname" class="form-control" @bind="@_displayname" />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="timezone" HelpText="Your time zone" ResourceKey="TimeZone">Time Zone:</Label>
+                    <div class="col-sm-9">
+                        <select id="timezone" class="form-select" @bind="@_timezoneid">
+                            <option value="">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
+                            @foreach (var timezone in _timezones)
+                            {
+                                <option value="@timezone.Id">@timezone.DisplayName</option>
+                            }
+                        </select>
+                    </div>
+                </div>
+                @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
                 {
-                    var p = profile;
-                    if (p.Category != category)
-                    {
-                        <tr>
-                            <th colspan="2" style="text-align: center;">
-                                @p.Category
-                            </th>
-                        </tr>
-                        category = p.Category;
-                    }
-                    <tr>
-                        <td width="30%">
-                            <Label For="@p.Name" HelpText="@p.Description">@p.Title</Label>
-                        </td>
-                        <td>
-                            @if (p.IsRequired)
-                            {
-                                <input id="@p.Name" class="form-control" maxlength="@p.MaxLength" value="@GetProfileValue(p.Name, p.DefaultValue)" required @onchange="@(e => ProfileChanged(e, p.Name))" />
-                            }
-                            else
-                            {
-                                <input id="@p.Name" class="form-control" maxlength="@p.MaxLength" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))" />
-                            }
-                        </td>
-                    </tr>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="isdeleted" HelpText="Indicate if the user is active" ResourceKey="IsDeleted">Deleted?</Label>
+                        <div class="col-sm-9">
+                            <select id="isdeleted" class="form-select" @bind="@_isdeleted">
+                                <option value="True">@SharedLocalizer["Yes"]</option>
+                                <option value="False">@SharedLocalizer["No"]</option>
+                            </select>
+                        </div>
+                    </div>
                 }
-            </table>
-        }
-    </TabPanel>
-</TabStrip>
-
-<button type="button" class="btn btn-success" @onclick="SaveUser">@SharedLocalizer["Save"]</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
-<br />
-<br />
-<AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon" DeletedBy="@deletedby" DeletedOn="@deletedon"></AuditInfo>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="lastlogin" HelpText="The date and time when the user last signed in" ResourceKey="LastLogin">Last Login:</Label>
+                    <div class="col-sm-9">
+                        <input id="lastlogin" class="form-control" @bind="@_lastlogin" readonly />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="lastipaddress" HelpText="The IP Address of the user recorded during their last login" ResourceKey="LastIPAddress">Last IP Address:</Label>
+                    <div class="col-sm-9">
+                        <input id="lastipaddress" class="form-control" @bind="@_lastipaddress" readonly />
+                    </div>
+                </div>
+            </div>
+        </TabPanel>
+        <TabPanel Name="Profile" ResourceKey="Profile">
+            <div class="container">
+                <div class="row mb-1 align-items-center">
+                    @foreach (Profile profile in _profiles)
+                    {
+                        var p = profile;
+                        if (p.Category != _category)
+                        {
+                            <div class="col text-center pb-2">
+                                <strong>@p.Category</strong>
+                            </div>
+                            _category = p.Category;
+                        }
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="@p.Name" HelpText="@p.Description">@p.Title</Label>
+                            <div class="col-sm-9">
+                                @if (!string.IsNullOrEmpty(p.Options))
+                                {
+                                    <select id="@p.Name" class="form-select" @onchange="@(e => ProfileChanged(e, p.Name))">
+                                        @foreach (var option in p.Options.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+                                        {
+                                            @if (GetProfileValue(p.Name, "") == option || (GetProfileValue(p.Name, "") == "" && p.DefaultValue == option))
+                                            {
+                                                <option value="@option" selected>@option</option>
+                                            }
+                                            else
+                                            {
+                                                <option value="@option">@option</option>
+                                            }
+                                        }
+                                    </select>
+                                }
+                                else
+                                {
+                                    @if (p.Rows == 1)
+                                    {
+                                        <input id="@p.Name" class="form-control" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))" @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)" />
+                                    }
+                                    else
+                                    {
+                                        <textarea id="@p.Name" class="form-control" rows="@p.Rows" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))" @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)"></textarea>
+                                    }
+                                }
+                            </div>
+                        </div>
+                    }
+                </div>
+            </div>
+        </TabPanel>
+    </TabStrip>
+    <br />
+    <button type="button" class="btn btn-success" @onclick="SaveUser">@SharedLocalizer["Save"]</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+    @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin) && PageState.Runtime != Shared.Runtime.Hybrid && !_ishost)
+    {
+        <button type="button" class="btn btn-primary ms-1" @onclick="ImpersonateUser">@Localizer["Impersonate"]</button>
+    }
+    @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host) && _isdeleted == "True")
+    {
+        <ActionDialog Header="Delete User" Message="Are You Sure You Wish To Permanently Delete This User?" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteUser())" ResourceKey="DeleteUser" />
+    }
+    <br /><br />
+    <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon" DeletedBy="@_deletedby" DeletedOn="@_deletedon"></AuditInfo>
+}
 
 @code {
-    private int userid;
-    private string username = string.Empty;
-    private string password = string.Empty;
-    private string confirm = string.Empty;
-    private string email = string.Empty;
-    private string displayname = string.Empty;
-    private FileManager filemanager;
-    private int photofileid = -1;
-    private File photo = null;
-    private List<Profile> profiles;
-    private Dictionary<string, string> settings;
-    private string category = string.Empty;
-    private string createdby;
-    private DateTime createdon;
-    private string modifiedby;
-    private DateTime modifiedon;
-    private string deletedby;
-    private DateTime? deletedon;
-    private string isdeleted;
+    private List<Models.TimeZone> _timezones;
+    private bool _initialized = false;
+    private string _passwordrequirements;
+    private int _userid;
+    private string _username = string.Empty;
+    private string _password = string.Empty;
+    private string _passwordtype = "password";
+    private string _togglepassword = string.Empty;
+    private string _confirm = string.Empty;
+    private string _email = string.Empty;
+    private string _confirmed = string.Empty;
+    private string _displayname = string.Empty;
+    private string _timezoneid = string.Empty;
+    private string _isdeleted;
+    private string _lastlogin;
+    private string _lastipaddress;
+    private bool _ishost = false;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    private List<Profile> _profiles;
+    private Dictionary<string, string> _settings;
+    private string _category = string.Empty;
 
-    protected override async Task OnParametersSetAsync()
+    private string _createdby;
+    private DateTime _createdon;
+    private string _modifiedby;
+    private DateTime _modifiedon;
+    private string _deletedby;
+    private DateTime? _deletedon;
+
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
+
+    protected override async Task OnInitializedAsync()
     {
         try
         {
-            // OnParametersSetAsync is called when the edit modal is closed - in which case there is no id parameter
-            if (PageState.QueryString.ContainsKey("id"))
+            _passwordrequirements = await UserService.GetPasswordRequirementsAsync(PageState.Site.SiteId);
+            _togglepassword = SharedLocalizer["ShowPassword"];
+            _profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId);
+            _timezones = await TimeZoneService.GetTimeZonesAsync();
+
+            if (PageState.QueryString.ContainsKey("id") && int.TryParse(PageState.QueryString["id"], out int UserId))
             {
-                profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId);
-                userid = Int32.Parse(PageState.QueryString["id"]);
-                var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
+                _userid = UserId;
+                var user = await UserService.GetUserAsync(_userid, PageState.Site.SiteId);
                 if (user != null)
                 {
-                    username = user.Username;
-                    email = user.Email;
-                    displayname = user.DisplayName;
-                    if (user.PhotoFileId != null)
-                    {
-                        photofileid = user.PhotoFileId.Value;
-                        photo = await FileService.GetFileAsync(photofileid);
-                    }
-                    else
-                    {
-                        photofileid = -1;
-                        photo = null;
-                    }
-                    settings = await SettingService.GetUserSettingsAsync(user.UserId);
-                    createdby = user.CreatedBy;
-                    createdon = user.CreatedOn;
-                    modifiedby = user.ModifiedBy;
-                    modifiedon = user.ModifiedOn;
-                    deletedby = user.DeletedBy;
-                    deletedon = user.DeletedOn;
-                    isdeleted = user.IsDeleted.ToString();
+                    _username = user.Username;
+                    _email = user.Email;
+                    _confirmed = user.EmailConfirmed.ToString();
+                    _displayname = user.DisplayName;
+                    _timezoneid = PageState.User.TimeZoneId;
+                    _isdeleted = user.IsDeleted.ToString();
+                    _lastlogin = string.Format("{0:MMM dd yyyy HH:mm:ss}", UtcToLocal(user.LastLoginOn));
+                    _lastipaddress = user.LastIPAddress;
+                    _ishost = UserSecurity.ContainsRole(user.Roles, RoleNames.Host);
+
+                    _settings = user.Settings;
+                    _createdby = user.CreatedBy;
+                    _createdon = user.CreatedOn;
+                    _modifiedby = user.ModifiedBy;
+                    _modifiedon = user.ModifiedOn;
+                    _deletedby = user.DeletedBy;
+                    _deletedon = user.DeletedOn;
                 }
             }
+
+            _initialized = true;
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Loading User {UserId} {Error}", userid, ex.Message);
+            await logger.LogError(ex, "Error Loading User {UserId} {Error}", _userid, ex.Message);
             AddModuleMessage(Localizer["Error.User.Load"], MessageType.Error);
         }
     }
 
     private string GetProfileValue(string SettingName, string DefaultValue)
-        => SettingService.GetSetting(settings, SettingName, DefaultValue);
+    {
+        string value = SettingService.GetSetting(_settings, SettingName, DefaultValue);
+        if (value.Contains("]"))
+        {
+            value = value.Substring(value.IndexOf("]") + 1);
+        }
+        return value;
+    }
 
     private async Task SaveUser()
     {
         try
         {
-            if (username != string.Empty && email != string.Empty && ValidateProfiles())
+            if (_username != string.Empty && _email != string.Empty)
             {
-                if (password == confirm)
+                if (_password == _confirm)
                 {
-                    var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
-                    user.SiteId = PageState.Site.SiteId;
-                    user.Username = username;
-                    user.Password = password;
-                    user.Email = email;
-                    user.DisplayName = string.IsNullOrWhiteSpace(displayname) ? username : displayname;
-                    user.PhotoFileId = null;
-                    user.PhotoFileId = filemanager.GetFileId();
-                    if (user.PhotoFileId == -1)
+                    if (ValidateProfiles())
                     {
-                        user.PhotoFileId = null;
+                        var user = await UserService.GetUserAsync(_userid, PageState.Site.SiteId);
+                        user.SiteId = PageState.Site.SiteId;
+                        user.Username = _username;
+                        user.Password = _password;
+                        user.Email = _email;
+                        user.EmailConfirmed = bool.Parse(_confirmed);
+                        user.DisplayName = string.IsNullOrWhiteSpace(_displayname) ? _username : _displayname;
+                        user.TimeZoneId = _timezoneid;
+                        if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+                        {
+                            user.IsDeleted = (_isdeleted == null ? true : Boolean.Parse(_isdeleted));
+                        }
+
+                        user = await UserService.UpdateUserAsync(user);
+                        if (user != null)
+                        {
+                            await SettingService.UpdateUserSettingsAsync(_settings, user.UserId);
+                            await logger.LogInformation("User Saved {User}", user);
+                            NavigationManager.NavigateTo(NavigateUrl());
+                        }
+                        else
+                        {
+                            AddModuleMessage(Localizer["Message.Password.Complexity"], MessageType.Error);
+                        }
                     }
-
-                    user.IsDeleted = (isdeleted == null ? true : Boolean.Parse(isdeleted));
-
-                    user = await UserService.UpdateUserAsync(user);
-                    await SettingService.UpdateUserSettingsAsync(settings, user.UserId);
-                    await logger.LogInformation("User Saved {User}", user);
-
-                    NavigationManager.NavigateTo(NavigateUrl());
                 }
                 else
                 {
@@ -236,32 +299,97 @@ else
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Saving User {Username} {Email} {Error}", username, email, ex.Message);
+            await logger.LogError(ex, "Error Saving User {Username} {Email} {Error}", _username, _email, ex.Message);
             AddModuleMessage(Localizer["Error.User.Save"], MessageType.Error);
         }
     }
 
+    private async Task ImpersonateUser()
+    {
+        try
+        {
+            await logger.LogInformation(LogFunction.Security, "User {Username} Impersonated By Administrator {Administrator}", _username, PageState.User.Username);
+
+            // post back to the server so that the cookies are set correctly
+            var interop = new Interop(JSRuntime);
+            var fields = new { __RequestVerificationToken = SiteState.AntiForgeryToken, username = _username, returnurl = PageState.Alias.Path };
+            string url = Utilities.TenantUrl(PageState.Alias, "/pages/impersonate/");
+            await interop.SubmitForm(url, fields);
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Impersonating User {Username} {Error}", _username, ex.Message);
+            AddModuleMessage(Localizer["Error.User.Impersonate"], MessageType.Error);
+        }
+    }
+
+    private async Task DeleteUser()
+    {
+        try
+        {
+            if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host) && _userid != PageState.User.UserId)
+            {
+                var user = await UserService.GetUserAsync(_userid, PageState.Site.SiteId);
+                await UserService.DeleteUserAsync(user.UserId, PageState.Site.SiteId);
+                await logger.LogInformation("User Permanently Deleted {User}", user);
+                NavigationManager.NavigateTo(NavigateUrl());
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Permanently Deleting User {UserId} {Error}", _userid, ex.Message);
+            AddModuleMessage(Localizer["Error.DeleteUser"], MessageType.Error);
+        }
+    }
+
     private bool ValidateProfiles()
     {
-        bool valid = true;
-        foreach (Profile profile in profiles)
+        foreach (Profile profile in _profiles)
         {
-            if (string.IsNullOrEmpty(SettingService.GetSetting(settings, profile.Name, string.Empty)) && !string.IsNullOrEmpty(profile.DefaultValue))
+            var value = GetProfileValue(profile.Name, string.Empty);
+            if (string.IsNullOrEmpty(value) && !string.IsNullOrEmpty(profile.DefaultValue))
             {
-                settings = SettingService.SetSetting(settings, profile.Name, profile.DefaultValue);
+                _settings = SettingService.SetSetting(_settings, profile.Name, profile.DefaultValue);
             }
-            if (profile.IsRequired && string.IsNullOrEmpty(SettingService.GetSetting(settings, profile.Name, string.Empty)))
+            if (!profile.IsPrivate || UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
             {
-                valid = false;
+                if (profile.IsRequired && string.IsNullOrEmpty(value))
+                {
+                    AddModuleMessage(string.Format(SharedLocalizer["ProfileRequired"], profile.Title), MessageType.Warning);
+                    return false;
+                }
+                if (!string.IsNullOrEmpty(profile.Validation))
+                {
+                    Regex regex = new Regex(profile.Validation);
+                    bool valid = regex.Match(value).Success;
+                    if (!valid)
+                    {
+                        AddModuleMessage(string.Format(SharedLocalizer["ProfileInvalid"], profile.Title), MessageType.Warning);
+                        return false;
+                    }
+                }
             }
         }
-        return valid;
+        return true;
     }
 
     private void ProfileChanged(ChangeEventArgs e, string SettingName)
     {
         var value = (string)e.Value;
-        settings = SettingService.SetSetting(settings, SettingName, value);
+        _settings = SettingService.SetSetting(_settings, SettingName, value);
     }
 
+    private void TogglePassword()
+	{
+		if (_passwordtype == "password")
+		{
+			_passwordtype = "text";
+			_togglepassword = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_passwordtype = "password";
+			_togglepassword = SharedLocalizer["ShowPassword"];
+		}
+	}
 }

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

@@ -3,10 +3,11 @@
 @inject IUserRoleService UserRoleService
 @inject IUserService UserService
 @inject ISettingService SettingService
+@inject ISiteService SiteService
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (userroles == null)
+@if (users == null)
 {
     <p>
         <em>@SharedLocalizer["Loading"]</em>
@@ -14,111 +15,846 @@
 }
 else
 {
-    <table class="table table-borderless">
-        <tr>
-            <td>
-                <div><ActionLink Action="Add" Text="Add User" ResourceKey="AddUser" /></div>
-            </td>
-            <td>
-                <input class="form-control" @bind="@_search" />
-            </td>
-            <td>
-                <button class="btn btn-secondary" @onclick="OnSearch">@SharedLocalizer["Search"]</button>
-            </td>
-        </tr>
-    </table>
+    <TabStrip>
+        <TabPanel Name="Users" Heading="Users" ResourceKey="Users">
+            <ActionLink Action="Add" Text="Add User" Security="SecurityAccessLevel.Edit" ResourceKey="AddUser" />&nbsp;
+            <ActionLink Text="Import Users" Class="btn btn-secondary ms-2" Action="Users" Security="SecurityAccessLevel.Admin" ResourceKey="ImportUsers"/>
 
-    <Pager Items="@userroles">
-        <Header>
-            <th style="width: 1px;">&nbsp;</th>
-            <th style="width: 1px;">&nbsp;</th>
-            <th style="width: 1px;">&nbsp;</th>
-            <th>@SharedLocalizer["Name"]</th>
-        </Header>
-        <Row>
-            <td>
-                <ActionLink Action="Edit" Parameters="@($"id=" + context.UserId.ToString())" ResourceKey="EditUser" />
-            </td>
-            <td>
-                <ActionDialog Header="Delete User" Message="@string.Format(Localizer["Confirm.User.Delete"], context.User.DisplayName)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteUser(context))" Disabled="@(context.Role.Name == RoleNames.Host)" ResourceKey="DeleteUser" />
-            </td>
-            <td>
-                <ActionLink Action="Roles" Parameters="@($"id=" + context.UserId.ToString())" ResourceKey="Roles" />
-            </td>
-            <td>@context.User.DisplayName</td>
-        </Row>
-    </Pager>
+            <Pager Items="@users" RowClass="align-middle" SearchProperties="User.Username,User.Email,User.DisplayName">
+                <Header>
+                    <th style="width: 1px;">&nbsp;</th>
+                    <th style="width: 1px;">&nbsp;</th>
+                    <th style="width: 1px;">&nbsp;</th>
+                    <th class="app-sort-th link-primary text-decoration-underline" @onclick="@(() => SortTable("Username"))">@Localizer["Username"]<i class="@(SetSortIcon("Username"))"></i></th>
+                    <th class="app-sort-th link-primary text-decoration-underline" @onclick="@(() => SortTable("DisplayName"))">@Localizer["Name"]<i class="@(SetSortIcon("DisplayName"))"></i></th>
+                    <th class="app-sort-th link-primary text-decoration-underline" @onclick="@(() => SortTable("Email"))">@Localizer["Email"]<i class="@(SetSortIcon("Email"))"></i></th>
+                    <th class="app-sort-th link-primary text-decoration-underline" @onclick="@(() => SortTable("LastLoginOn"))">@Localizer["LastLoginOn"]<i class="@(SetSortIcon("LastLoginOn"))"></i></th>
+                </Header>
+                <Row>
+                    <td>
+                        <ActionLink Action="Edit" Text="Edit" Parameters="@($"id=" + context.UserId.ToString())" Security="SecurityAccessLevel.Edit" ResourceKey="EditUser" />
+                    </td>
+                    <td>
+                        <ActionDialog Header="Delete User" Message="@string.Format(Localizer["Confirm.User.Delete"], context.User.DisplayName)" Action="Delete" Security="SecurityAccessLevel.Edit" Class="btn btn-danger" OnClick="@(async () => await DeleteUser(context))" Disabled="@(context.UserId == PageState.User.UserId || context.User.IsDeleted)" ResourceKey="DeleteUser" />
+                    </td>
+                    <td>
+                        <ActionLink Action="Roles" Text="Roles" Parameters="@($"id=" + context.UserId.ToString())" Security="SecurityAccessLevel.Edit" ResourceKey="Roles" />
+                    </td>
+                    <td>@context.User.Username</td>
+                    <td>@context.User.DisplayName</td>
+                    <td>@((MarkupString)string.Format("<a href=\"mailto:{0}\">{1}</a>", @context.User.Email, @context.User.Email))</td>
+                    <td>@((context.User.LastLoginOn != DateTime.MinValue) ? string.Format("{0:dd-MMM-yyyy HH:mm:ss}", UtcToLocal(context.User.LastLoginOn)) : "")</td>
+                </Row>
+            </Pager>
+        </TabPanel>
+        <TabPanel Name="Settings" Heading="Settings" ResourceKey="Settings" Security="SecurityAccessLevel.Admin">
+            <div class="container">
+                <Section Name="User" Heading="User Settings" ResourceKey="UserSettings">
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="allowregistration" HelpText="Do you want anonymous visitors to be able to register for an account on the site" ResourceKey="AllowRegistration">Allow User Registration?</Label>
+                        <div class="col-sm-9">
+                            <select id="allowregistration" class="form-select" @bind="@_allowregistration">
+                                <option value="true">@SharedLocalizer["Yes"]</option>
+                                <option value="false">@SharedLocalizer["No"]</option>
+                            </select>
+                        </div>
+                    </div>
+                    @if (_allowregistration == "true")
+                    {
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="registerurl" HelpText="Optionally provide a custom registration url" ResourceKey="RegisterUrl">Register Url:</Label>
+                            <div class="col-sm-9">
+                                <input id="registerurl" class="form-control" @bind="@_registerurl" />
+                            </div>
+                        </div>
+                    }
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="profileurl" HelpText="Optionally provide a custom profile url" ResourceKey="ProfileUrl">Profile Url:</Label>
+                        <div class="col-sm-9">
+                            <input id="profileurl" class="form-control" @bind="@_profileurl" />
+                        </div>
+                    </div>
+                    @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+                    {
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="twofactor" HelpText="Do you want users to use two factor authentication? Note that you should use the Disabled option until you have successfully verified that the Notification Job in Scheduled Jobs is enabled and your SMTP options in Site Settings are configured or else you will lock yourself out." ResourceKey="TwoFactor">Two Factor?</Label>
+                            <div class="col-sm-9">
+                                <select id="twofactor" class="form-select" @bind="@_twofactor">
+                                    <option value="false">@Localizer["Disabled"]</option>
+                                    <option value="true">@Localizer["Optional"]</option>
+                                    <option value="required">@Localizer["Required"]</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="cookiename" HelpText="You can choose to use a custom authentication cookie name for each site. However please be aware that if you want to share an authentication cookie between sites on the same domain they need to use a consistent cookie name. Also be aware that changing the authentication cookie name will logout all current users." ResourceKey="CookieName">Cookie Name:</Label>
+                            <div class="col-sm-9">
+                                <input id="cookiename" class="form-control" @bind="@_cookiename" />
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="cookieexpiration" HelpText="You can choose to use a custom authentication cookie expiration timespan for each site (e.g. '08:00:00' for 8 hours). The default is 14 days if not specified." ResourceKey="CookieExpiration">Cookie Expiration Timespan:</Label>
+                            <div class="col-sm-9">
+                                <input id="cookieexpiration" class="form-control" @bind="@_cookieexpiration" />
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="alwaysremember" HelpText="Enabling this option will set a permanent cookie in conjunction with the Cookie Expiration Timespan, which will automatically sign in users the next time they visit the site. By default the site will use session cookies." ResourceKey="AlwaysRemember">Always Remember User?</Label>
+                            <div class="col-sm-9">
+                                <select id="alwaysremember" class="form-select" @bind="@_alwaysremember">
+                                    <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="logouteverywhere" HelpText="Do you want users to be logged out of every active session on any device, or only their current session?" ResourceKey="LogoutEverywhere">Logout Everywhere?</Label>
+                            <div class="col-sm-9">
+                                <select id="logouteverywhere" class="form-select" @bind="@_logouteverywhere">
+                                    <option value="true">@SharedLocalizer["Yes"]</option>
+                                    <option value="false">@SharedLocalizer["No"]</option>
+                                </select>
+                            </div>
+                        </div>
+                    }
+                </Section>
+                @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+                {
+                    <Section Name="Password" Heading="Password Settings" ResourceKey="PasswordSettings">
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="minimumlength" HelpText="The Minimum Length For A Password" ResourceKey="RequiredLength">Minimum Length:</Label>
+                            <div class="col-sm-9">
+                                <input id="minimumlength" class="form-control" @bind="@_minimumlength" required />
+                            </div>
+                        </div>					
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="uniquecharacters" HelpText="The Minimum Number Of Unique Characters Which A Password Must Contain" ResourceKey="UniqueCharacters">Unique Characters:</Label>
+                            <div class="col-sm-9">
+                                <input id="uniquecharacters" class="form-control" @bind="@_uniquecharacters" required />
+                            </div>
+                        </div>					
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="requiredigit" HelpText="Indicate If Passwords Must Contain A Digit" ResourceKey="RequireDigit">Require Digit?</Label>
+                            <div class="col-sm-9">
+                                <select id="requiredigit" class="form-select" @bind="@_requiredigit" 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="requireupper" HelpText="Indicate If Passwords Must Contain An Upper Case Character" ResourceKey="RequireUpper">Require Uppercase?</Label>
+                            <div class="col-sm-9">
+                                <select id="requireupper" class="form-select" @bind="@_requireupper" 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="requirelower" HelpText="Indicate If Passwords Must Contain A Lower Case Character" ResourceKey="RequireLower">Require Lowercase?</Label>
+                            <div class="col-sm-9">
+                                <select id="requirelower" class="form-select" @bind="@_requirelower" 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="requirepunctuation" HelpText="Indicate if Passwords Must Contain A Non-alphanumeric Character (ie. Punctuation)" ResourceKey="RequirePunctuation">Require Punctuation?</Label>
+                            <div class="col-sm-9">
+                                <select id="requirepunctuation" class="form-select" @bind="@_requirepunctuation" required>
+                                    <option value="true">@SharedLocalizer["Yes"]</option>
+                                    <option value="false">@SharedLocalizer["No"]</option>
+                                </select>
+                            </div>
+                        </div>					
+                    </Section>
+                    <Section Name="Lockout" Heading="Lockout Settings" ResourceKey="LockoutSettings">
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="maximum" HelpText="The Maximum Number Of Sign In Attempts Before A User Is Locked Out" ResourceKey="MaximumFailures">Maximum Failures:</Label>
+                            <div class="col-sm-9">
+                                <input id="maximum" class="form-control" @bind="@_maximumfailures" required />
+                            </div>
+                        </div>					
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="lockoutduration" HelpText="The Number Of Minutes A User Should Be Locked Out" ResourceKey="LockoutDuration">Lockout Duration:</Label>
+                            <div class="col-sm-9">
+                                <input id="lockoutduration" class="form-control" @bind="@_lockoutduration" required />
+                            </div>
+                        </div>					
+                    </Section>
+                    <Section Name="ExternalLogin" Heading="External Login Settings" ResourceKey="ExternalLoginSettings">
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="provider" HelpText="Select the external login provider" ResourceKey="Provider">Provider:</Label>
+                            <div class="col-sm-9">
+                                <div class="input-group">
+                                    <select id="provider" class="form-select" value="@_provider" @onchange="(e => ProviderChanged(e))">
+                                        @foreach (var provider in Shared.ExternalLoginProviders.Providers)
+                                        {
+                                            <option value="@provider.Name">@Localizer[provider.Name]</option>
+                                        }
+                                    </select>
+                                    @if (!string.IsNullOrEmpty(_providerurl))
+                                    {
+                                        <a href="@_providerurl" class="btn btn-secondary" target="_new">@Localizer["Info"]</a>
+                                    }
+                                </div>
+
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="providertype" HelpText="Select the external login provider type" ResourceKey="ProviderType">Provider Type:</Label>
+                            <div class="col-sm-9">
+                                <select id="providertype" class="form-select" value="@_providertype" @onchange="(e => ProviderTypeChanged(e))">
+                                    <option value="" selected>&lt;@Localizer["Not Specified"]&gt;</option>
+                                    <option value="@AuthenticationProviderTypes.OpenIDConnect">@Localizer["OIDC"]</option>
+                                    <option value="@AuthenticationProviderTypes.OAuth2">@Localizer["OAuth2"]</option>
+                                </select>
+                            </div>
+                        </div>		
+                        @if (_providertype != "")
+                        {
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="providername" HelpText="Specify a friendly name for the external login provider which will be displayed on the Login page" ResourceKey="ProviderName">Provider Name:</Label>
+                                <div class="col-sm-9">
+                                    <input id="providername" class="form-control" @bind="@_providername" />
+                                </div>
+                            </div>
+                        }
+                        @if (_providertype == AuthenticationProviderTypes.OpenIDConnect)
+                        {
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="authority" HelpText="The Authority Url or Issuer Url associated with the OpenID Connect provider" ResourceKey="Authority">Authority:</Label>
+                                <div class="col-sm-9">
+                                    <input id="authority" class="form-control" @bind="@_authority" />
+                                </div>
+                            </div>
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="metadataurl" HelpText="The discovery endpoint for obtaining metadata for this provider. Only specify if the OpenID Connect provider does not use the standard approach (ie. /.well-known/openid-configuration)" ResourceKey="MetadataUrl">Metadata Url:</Label>
+                                <div class="col-sm-9">
+                                    <input id="metadataurl" class="form-control" @bind="@_metadataurl" />
+                                </div>
+                            </div>
+                        }
+                        @if (_providertype == AuthenticationProviderTypes.OAuth2)
+                        {
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="authorizationurl" HelpText="The endpoint for obtaining an Authorization Code" ResourceKey="AuthorizationUrl">Authorization Url:</Label>
+                                <div class="col-sm-9">
+                                    <input id="authorizationurl" class="form-control" @bind="@_authorizationurl" />
+                                </div>
+                            </div>
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="tokenurl" HelpText="The endpoint for obtaining an Auth Token" ResourceKey="TokenUrl">Token Url:</Label>
+                                <div class="col-sm-9">
+                                    <input id="tokenurl" class="form-control" @bind="@_tokenurl" />
+                                </div>
+                            </div>
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="userinfourl" HelpText="The endpoint for obtaining user information. This should be an API or Page Url which contains the users email address." ResourceKey="UserInfoUrl">User Info Url:</Label>
+                                <div class="col-sm-9">
+                                    <input id="userinfourl" class="form-control" @bind="@_userinfourl" />
+                                </div>
+                            </div>
+                        }
+                        @if (_providertype != "")
+                        {
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="clientid" HelpText="The Client ID from the provider" ResourceKey="ClientID">Client ID:</Label>
+                                <div class="col-sm-9">
+                                    <input id="clientid" class="form-control" @bind="@_clientid" />
+                                </div>
+                            </div>
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="clientsecret" HelpText="The Client Secret from the provider" ResourceKey="ClientSecret">Client Secret:</Label>
+                                <div class="col-sm-9">
+                                    <div class="input-group">
+                                        <input type="@_clientsecrettype" id="clientsecret" class="form-control" @bind="@_clientsecret" />
+                                        <button type="button" class="btn btn-secondary" @onclick="@ToggleClientSecret">@_toggleclientsecret</button>
+                                    </div>
+                                </div>
+                            </div>
+                            @if (_providertype == AuthenticationProviderTypes.OpenIDConnect)
+                            {
+                                <div class="row mb-1 align-items-center">
+                                    <Label Class="col-sm-3" For="authresponsetype" HelpText="Specify the authorization response type. The default is Authorization Code which is considered to be the most secure option based on the latest OAuth specification." ResourceKey="AuthResponseType">Authorization Response Type:</Label>
+                                    <div class="col-sm-9">
+                                        <select id="authresponsetype" class="form-select" @bind="@_authresponsetype" required>
+                                            <option value="code">@Localizer["AuthFlow.Code"]</option>
+                                            <option value="code id_token">@Localizer["AuthFlow.CodeIdToken"]</option>
+                                            <option value="code id_token token">@Localizer["AuthFlow.CodeIdTokenToken"]</option>
+                                            <option value="code token">@Localizer["AuthFlow.CodeToken"]</option>
+                                            <option value="id_token">@Localizer["AuthFlow.IdToken"]</option>
+                                            <option value="id_token token">@Localizer["AuthFlow.IdTokenToken"]</option>
+                                            <option value="token">@Localizer["AuthFlow.Token"]</option>
+                                            <option value="none">@Localizer["AuthFlow.None"]</option>
+                                        </select>
+                                    </div>
+                                </div>
+                            }
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="scopes" HelpText="A list of Scopes to request from the provider (separated by commas). If none are specified, standard Scopes will be used by default." ResourceKey="Scopes">Scopes:</Label>
+                                <div class="col-sm-9">
+                                    <input id="scopes" class="form-control" @bind="@_scopes" />
+                                </div>
+                            </div>
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="parameters" HelpText="Optionally specify any additional parameters as name/value pairs to send to the provider (separated by commas if there are multiple)." ResourceKey="Parameters">Parameters:</Label>
+                                <div class="col-sm-9">
+                                    <input id="parameters" class="form-control" @bind="@_parameters" />
+                                </div>
+                            </div>
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="pkce" HelpText="Indicate if the provider supports Proof Key for Code Exchange (PKCE)" ResourceKey="PKCE">Use PKCE?</Label>
+                                <div class="col-sm-9">
+                                    <select id="pkce" class="form-select" @bind="@_pkce" 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="redirecturl" HelpText="The Redirect Url (or Callback Url) which usually needs to be registered with the provider" ResourceKey="RedirectUrl">Redirect Url:</Label>
+                                <div class="col-sm-9">
+                                    <input id="redirecturl" class="form-control" @bind="@_redirecturl" readonly />
+                                </div>
+                            </div>
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="reviewclaims" HelpText="This option will record the full list of Claims returned by the Provider in the Event Log. It should only be used for testing purposes. External Login will be restricted when this option is enabled." ResourceKey="ReviewClaims">Review Claims?</Label>
+                                <div class="col-sm-9">
+                                    <div class="input-group">
+                                        <select id="reviewclaims" class="form-select" @bind="@_reviewclaims" required>
+                                            <option value="true">@SharedLocalizer["Yes"]</option>
+                                            <option value="false">@SharedLocalizer["No"]</option>
+                                        </select>
+                                        @if (_reviewclaims == "true")
+                                        {
+                                            <a href="@_externalloginurl" target="_blank" class="btn btn-secondary">@SharedLocalizer["Test"]</a>
+                                        }
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="identifierclaimtype" HelpText="Specify the type name of the unique user identifier claim provided by the provider. The default value is 'sub'." ResourceKey="IdentifierClaimType">Identifier Claim:</Label>
+                                <div class="col-sm-9">
+                                    <input id="identifierclaimtype" class="form-control" @bind="@_identifierclaimtype" />
+                                </div>
+                            </div>
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="nameclaimtype" HelpText="Optionally specify the type name of the user's name claim provided by the provider. The typical value is 'name'." ResourceKey="NameClaimType">Name Claim:</Label>
+                                <div class="col-sm-9">
+                                    <input id="nameclaimtype" class="form-control" @bind="@_nameclaimtype" />
+                                </div>
+                            </div>
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="emailclaimtype" HelpText="Optionally specify the type name of the email address claim provided by the provider. The typical value is 'email'," ResourceKey="EmailClaimType">Email Claim:</Label>
+                                <div class="col-sm-9">
+                                    <input id="emailclaimtype" class="form-control" @bind="@_emailclaimtype" />
+                                </div>
+                            </div>
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="roleclaimtype" HelpText="The name of the roles claim provided by the provider" ResourceKey="RoleClaimType">Roles Claim:</Label>
+                                <div class="col-sm-9">
+                                    <input id="roleclaimtype" class="form-control" @bind="@_roleclaimtype" />
+                                </div>
+                            </div>
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="roleclaimmappings" HelpText="Optionally provide a comma delimited list of role names provided by the identity provider, as well as mappings to your site roles." ResourceKey="RoleClaimMappings">Role Claim Mappings:</Label>
+                                <div class="col-sm-9">
+                                    <input id="roleclaimmappings" class="form-control" @bind="@_roleclaimmappings" />
+                                </div>
+                            </div>
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="synchronizeroles" HelpText="This option will add or remove role assignments so that the site roles exactly match the roles provided by the identity provider" ResourceKey="SynchronizeRoles">Synchronize Roles?</Label>
+                                <div class="col-sm-9">
+                                    <div class="input-group">
+                                        <select id="synchronizeroles" class="form-select" @bind="@_synchronizeroles" required>
+                                            <option value="true">@SharedLocalizer["Yes"]</option>
+                                            <option value="false">@SharedLocalizer["No"]</option>
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="profileclaimtypes" HelpText="A comma delimited list of user profile claims provided by the provider, as well as mappings to your user profile definition. For example if the provider includes a 'given_name' claim and you have a 'FirstName' user profile definition you should specify 'given_name:FirstName'." ResourceKey="ProfileClaimTypes">User Profile Claims:</Label>
+                                <div class="col-sm-9">
+                                    <input id="profileclaimtypes" class="form-control" @bind="@_profileclaimtypes" />
+                                </div>
+                            </div>
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="savetokens" HelpText="Specify whether access and refresh tokens should be saved after a successful login. The default is false to reduce the size of the authentication cookie." ResourceKey="SaveTokens">Save Tokens?</Label>
+                                <div class="col-sm-9">
+                                    <select id="savetokens" class="form-select" @bind="@_savetokens" 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="domainfilter" HelpText="Provide any email domain filter criteria (separated by commas). Domains to exclude should be prefixed with an exclamation point (!). For example 'microsoft.com,!hotmail.com' would include microsoft.com email addresses but not hotmail.com email addresses." ResourceKey="DomainFilter">Domain Filter:</Label>
+                                <div class="col-sm-9">
+                                    <input id="domainfilter" class="form-control" @bind="@_domainfilter" />
+                                </div>
+                            </div>
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="createusers" HelpText="Do you want new users to be created automatically? If you disable this option, users must already be registered on the site in order to sign in with their external login." ResourceKey="CreateUsers">Create New Users?</Label>
+                                <div class="col-sm-9">
+                                    <select id="createusers" class="form-select" @bind="@_createusers">
+                                        <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="verifyusers" HelpText="Do you want existing users to perform an additional email verification step to link their external login? If you disable this option, existing users will be linked automatically." ResourceKey="VerifyUsers">Verify Existing Users?</Label>
+                                <div class="col-sm-9">
+                                    <select id="verifyusers" class="form-select" @bind="@_verifyusers">
+                                        <option value="true">@SharedLocalizer["Yes"]</option>
+                                        <option value="false">@SharedLocalizer["No"]</option>
+                                    </select>
+                                </div>
+                            </div>
+                            @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+                            {
+                                <div class="row mb-1 align-items-center">
+                                    <Label Class="col-sm-3" For="allowhostrole" HelpText="Indicate if host roles are supported from the identity provider. Please use caution with this option as it allows the host user to administrate every site within your installation." ResourceKey="AllowHostRole">Allow Host Role?</Label>
+                                    <div class="col-sm-9">
+                                        <select id="allowhostrole" class="form-select" @bind="@_allowhostrole" required>
+                                            <option value="true">@SharedLocalizer["Yes"]</option>
+                                            <option value="false">@SharedLocalizer["No"]</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="row mb-1 align-items-center">
+                                    <Label Class="col-sm-3" For="allowsitelogin" HelpText="Do you want to allow users to sign in using a username and password that is managed locally on this site? Note that you should only disable this option if you have already sucessfully configured an external login provider, or else you may lock yourself out of the site." ResourceKey="AllowSiteLogin">Allow Local Login?</Label>
+                                    <div class="col-sm-9">
+                                        <select id="allowsitelogin" class="form-select" @bind="@_allowsitelogin">
+                                            <option value="true">@SharedLocalizer["Yes"]</option>
+                                            <option value="false">@SharedLocalizer["No"]</option>
+                                        </select>
+                                    </div>
+                                </div>
+                            }
+                        }
+                    </Section>
+                    <Section Name="Token" Heading="Token Settings" ResourceKey="TokenSettings">
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="jwtsecret" HelpText="If you want to want to provide API access, please specify a secret which will be used to encrypt your tokens. The secret should be 16 characters or more to ensure optimal security. Please note that if you change this secret, all existing tokens will become invalid and will need to be regenerated." ResourceKey="Secret">Secret:</Label>
+                            <div class="col-sm-9">
+                                <div class="input-group">
+                                    <input type="@_secrettype" id="jwtsecret" class="form-control" @bind="@_secret" />
+                                    <button type="button" class="btn btn-secondary" @onclick="@ToggleSecret">@_togglesecret</button>
+                                </div>
+                            </div>
+                        </div>					
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="issuer" HelpText="Optionally provide the issuer of the token" ResourceKey="Issuer">Issuer:</Label>
+                            <div class="col-sm-9">
+                                <input id="issuer" class="form-control" @bind="@_issuer" />
+                            </div>
+                        </div>					
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="audience" HelpText="Optionally provide the audience for the token" ResourceKey="Audience">Audience:</Label>
+                            <div class="col-sm-9">
+                                <input id="audience" class="form-control" @bind="@_audience" />
+                            </div>
+                        </div>					
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="lifetime" HelpText="The number of minutes for which a token should be valid" ResourceKey="Lifetime">Lifetime:</Label>
+                            <div class="col-sm-9">
+                                <input id="lifetime" class="form-control" @bind="@_lifetime" />
+                            </div>
+                        </div>					
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="token" HelpText="Select the Create Token button to generate a long-lived access token (valid for 1 year). Be sure to store this token in a safe location as you will not be able to access it in the future." ResourceKey="Token">Access Token:</Label>
+                            <div class="col-sm-9">
+                                <div class="input-group">
+                                    <input id="token" class="form-control" @bind="@_token" />
+                                    <button type="button" class="btn btn-secondary" @onclick="@CreateToken">@Localizer["CreateToken"]</button>
+                                </div>
+                            </div>
+                        </div>					
+                    </Section>
+                }
+            </div>
+            <br />
+            <button type="button" class="btn btn-success" @onclick="SaveSiteSettings">@SharedLocalizer["Save"]</button>
+        </TabPanel>
+    </TabStrip>
 }
 
 @code {
-    private List<UserRole> allroles;
-    private List<UserRole> userroles;
-    private string _search;
+    private List<UserRole> users;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    private string _allowregistration;
+    private string _registerurl;
+    private string _profileurl;
+    private string _twofactor;
+    private string _cookiename;
+    private string _cookieexpiration;
+    private string _alwaysremember;
+    private string _logouteverywhere;
+
+    private string _minimumlength;
+    private string _uniquecharacters;
+    private string _requiredigit;
+    private string _requireupper;
+    private string _requirelower;
+    private string _requirepunctuation;
+    private string _maximumfailures;
+    private string _lockoutduration;
+
+    private string _provider;
+    private string _providerurl;
+    private string _providertype;
+    private string _providername;
+    private string _authority;
+    private string _metadataurl;
+    private string _authorizationurl;
+    private string _tokenurl;
+    private string _userinfourl;
+    private string _clientid;
+    private string _clientsecret;
+    private string _clientsecrettype = "password";
+    private string _toggleclientsecret = string.Empty;
+    private string _authresponsetype;
+    private string _scopes;
+    private string _parameters;
+    private string _pkce;
+    private string _redirecturl;
+    private string _reviewclaims;
+    private string _externalloginurl;
+    private string _identifierclaimtype;
+    private string _nameclaimtype;
+    private string _emailclaimtype;
+    private string _roleclaimtype;
+    private string _roleclaimmappings;
+    private string _synchronizeroles;
+    private string _profileclaimtypes;
+    private string _savetokens;
+    private string _domainfilter;
+    private string _createusers;
+    private string _verifyusers;
+    private string _allowhostrole;
+    private string _allowsitelogin;
+
+    private string _secret;
+    private string _secrettype = "password";
+    private string _togglesecret = string.Empty;
+    private string _issuer;
+    private string _audience;
+    private string _lifetime;
+    private string _token;
+
+    private bool isSortedAscending;
+    private string activeSortColumn;
+
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
 
     protected override async Task OnInitializedAsync()
     {
-        allroles = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId);
-        await LoadSettingsAsync();
-        userroles = Search(_search);
-    }
+        await LoadUsersAsync(true);
 
-    private List<UserRole> Search(string search)
-    {
-        var results = allroles.Where(item => item.Role.Name == RoleNames.Registered || (item.Role.Name == RoleNames.Host && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)));
+        var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+        _allowregistration = PageState.Site.AllowRegistration.ToString().ToLower();
+        _registerurl = SettingService.GetSetting(settings, "LoginOptions:RegisterUrl", "");
+        _profileurl = SettingService.GetSetting(settings, "LoginOptions:ProfileUrl", "");
 
-        if (string.IsNullOrEmpty(_search))
+        if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
         {
-            results = results.Where(item =>
-                (
-                    item.User.Username.Contains(search, StringComparison.OrdinalIgnoreCase) ||
-                    item.User.Email.Contains(search, StringComparison.OrdinalIgnoreCase) ||
-                    item.User.DisplayName.Contains(search, StringComparison.OrdinalIgnoreCase)
-                )
-            );
+            _twofactor = SettingService.GetSetting(settings, "LoginOptions:TwoFactor", "false");
+            _cookiename = SettingService.GetSetting(settings, "LoginOptions:CookieName", ".AspNetCore.Identity.Application");
+            _cookieexpiration = SettingService.GetSetting(settings, "LoginOptions:CookieExpiration", "");
+            _alwaysremember = SettingService.GetSetting(settings, "LoginOptions:AlwaysRemember", "false");
+            _logouteverywhere = SettingService.GetSetting(settings, "LoginOptions:LogoutEverywhere", "false");
+
+            _minimumlength = SettingService.GetSetting(settings, "IdentityOptions:Password:RequiredLength", "6");
+            _uniquecharacters = SettingService.GetSetting(settings, "IdentityOptions:Password:RequiredUniqueChars", "1");
+            _requiredigit = SettingService.GetSetting(settings, "IdentityOptions:Password:RequireDigit", "true");
+            _requireupper = SettingService.GetSetting(settings, "IdentityOptions:Password:RequireUppercase", "true");
+            _requirelower = SettingService.GetSetting(settings, "IdentityOptions:Password:RequireLowercase", "true");
+            _requirepunctuation = SettingService.GetSetting(settings, "IdentityOptions:Password:RequireNonAlphanumeric", "true");
+
+            _maximumfailures = SettingService.GetSetting(settings, "IdentityOptions:Lockout:MaxFailedAccessAttempts", "5");
+            _lockoutduration = TimeSpan.Parse(SettingService.GetSetting(settings, "IdentityOptions:Lockout:DefaultLockoutTimeSpan", "00:05:00")).TotalMinutes.ToString();
+
+            LoadExternalLoginSettings(settings);
+
+            _secret = SettingService.GetSetting(settings, "JwtOptions:Secret", "");
+            _togglesecret = SharedLocalizer["ShowPassword"];
+            _issuer = SettingService.GetSetting(settings, "JwtOptions:Issuer", PageState.Uri.Scheme + "://" + PageState.Alias.Name);
+            _audience = SettingService.GetSetting(settings, "JwtOptions:Audience", "");
+            _lifetime = SettingService.GetSetting(settings, "JwtOptions:Lifetime", "20");
         }
-        return results.ToList();
     }
 
-    private async Task OnSearch()
+    private void LoadExternalLoginSettings(Dictionary<string, string> settings)
     {
-        userroles = Search(_search);
-        await UpdateSettingsAsync();
+        _provider = SettingService.GetSetting(settings, "ExternalLogin:Provider", "<Custom>");
+        _providerurl = SettingService.GetSetting(settings, "ExternalLogin:ProviderUrl", "");
+        _providertype = SettingService.GetSetting(settings, "ExternalLogin:ProviderType", "");
+        _providername = SettingService.GetSetting(settings, "ExternalLogin:ProviderName", "");
+        _authority = SettingService.GetSetting(settings, "ExternalLogin:Authority", "");
+        _metadataurl = SettingService.GetSetting(settings, "ExternalLogin:MetadataUrl", "");
+        _authorizationurl = SettingService.GetSetting(settings, "ExternalLogin:AuthorizationUrl", "");
+        _tokenurl = SettingService.GetSetting(settings, "ExternalLogin:TokenUrl", "");
+        _userinfourl = SettingService.GetSetting(settings, "ExternalLogin:UserInfoUrl", "");
+        _clientid = SettingService.GetSetting(settings, "ExternalLogin:ClientId", "");
+        _clientsecret = SettingService.GetSetting(settings, "ExternalLogin:ClientSecret", "");
+        _toggleclientsecret = SharedLocalizer["ShowPassword"];
+        _authresponsetype = SettingService.GetSetting(settings, "ExternalLogin:AuthResponseType", "code");
+        _scopes = SettingService.GetSetting(settings, "ExternalLogin:Scopes", "");
+        _parameters = SettingService.GetSetting(settings, "ExternalLogin:Parameters", "");
+        _pkce = SettingService.GetSetting(settings, "ExternalLogin:PKCE", "false");
+        _redirecturl = PageState.Uri.Scheme + "://" + PageState.Alias.Name + "/signin-" + _providertype;
+        _reviewclaims = SettingService.GetSetting(settings, "ExternalLogin:ReviewClaims", "false");
+        _externalloginurl = Utilities.TenantUrl(PageState.Alias, "/pages/external");
+        _identifierclaimtype = SettingService.GetSetting(settings, "ExternalLogin:IdentifierClaimType", "sub");
+        _nameclaimtype = SettingService.GetSetting(settings, "ExternalLogin:NameClaimType", "name");
+        _emailclaimtype = SettingService.GetSetting(settings, "ExternalLogin:EmailClaimType", "email");
+        _roleclaimtype = SettingService.GetSetting(settings, "ExternalLogin:RoleClaimType", "");
+        _roleclaimmappings = SettingService.GetSetting(settings, "ExternalLogin:RoleClaimMappings", "");
+        _synchronizeroles = SettingService.GetSetting(settings, "ExternalLogin:SynchronizeRoles", "false");
+        _profileclaimtypes = SettingService.GetSetting(settings, "ExternalLogin:ProfileClaimTypes", "");
+        _savetokens = SettingService.GetSetting(settings, "ExternalLogin:SaveTokens", "false");
+        _domainfilter = SettingService.GetSetting(settings, "ExternalLogin:DomainFilter", "");
+        _createusers = SettingService.GetSetting(settings, "ExternalLogin:CreateUsers", "true");
+        _verifyusers = SettingService.GetSetting(settings, "ExternalLogin:VerifyUsers", "true");
+        _allowhostrole = SettingService.GetSetting(settings, "ExternalLogin:AllowHostRole", "false");
+        _allowsitelogin = SettingService.GetSetting(settings, "LoginOptions:AllowSiteLogin", "true");
+    }
+
+    private async Task LoadUsersAsync(bool load)
+    {
+        if (load)
+        {
+            users = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, RoleNames.Registered);
+            if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+            {
+                var hosts = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, RoleNames.Host);
+                users.AddRange(hosts);
+                users = users.OrderBy(u => u.User.DisplayName).ToList();
+            }           
+        }
     }
 
     private async Task DeleteUser(UserRole UserRole)
     {
         try
         {
-            var user = await UserService.GetUserAsync(UserRole.UserId, PageState.Site.SiteId);
-            if (user != null)
+            if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
             {
-                await UserService.DeleteUserAsync(user.UserId, PageState.Site.SiteId);
-                await logger.LogInformation("User Deleted {User}", UserRole.User);
-                StateHasChanged();
+                var user = await UserService.GetUserAsync(UserRole.UserId, PageState.Site.SiteId);
+                if (user != null)
+                {
+                    user.IsDeleted = true;
+                    await UserService.UpdateUserAsync(user);
+                    await logger.LogInformation("User Soft Deleted {User}", user);
+                }
             }
+            else
+            {
+                var userrole = await UserRoleService.GetUserRoleAsync(UserRole.UserRoleId);
+                userrole.ExpiryDate = DateTime.UtcNow;
+                await UserRoleService.UpdateUserRoleAsync(userrole);
+                await logger.LogInformation("User {Username} Expired From Role {Role}", userrole.User.Username, userrole.Role.Name);
+            }
+            AddModuleMessage(Localizer["Success.DeleteUser"], MessageType.Success);
+            await LoadUsersAsync(true);
+            StateHasChanged();
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Deleting User {User} {Error}", UserRole.User, ex.Message);
-            AddModuleMessage(ex.Message, MessageType.Error);
+            AddModuleMessage(Localizer["Error.DeleteUser"], MessageType.Error);
         }
     }
 
-    private string settingSearch = "AU-search";
-
-    private async Task LoadSettingsAsync()
+    private async Task SaveSiteSettings()
     {
-        Dictionary<string, string> settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId);
-        _search = SettingService.GetSetting(settings, settingSearch, "");
+        try
+        {
+            var site = PageState.Site;
+            site.AllowRegistration = bool.Parse(_allowregistration);
+            await SiteService.UpdateSiteAsync(site);
+
+            var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
+
+            if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+            {
+                settings = SettingService.SetSetting(settings, "LoginOptions:RegisterUrl", _registerurl, false);
+                settings = SettingService.SetSetting(settings, "LoginOptions:ProfileUrl", _profileurl, false);
+                settings = SettingService.SetSetting(settings, "LoginOptions:TwoFactor", _twofactor, false);
+                settings = SettingService.SetSetting(settings, "LoginOptions:CookieName", _cookiename, true);
+                settings = SettingService.SetSetting(settings, "LoginOptions:CookieExpiration", _cookieexpiration, true);
+                settings = SettingService.SetSetting(settings, "LoginOptions:AlwaysRemember", _alwaysremember, false);
+                settings = SettingService.SetSetting(settings, "LoginOptions:LogoutEverywhere", _logouteverywhere, false);
+
+                settings = SettingService.SetSetting(settings, "IdentityOptions:Password:RequiredLength", _minimumlength, true);
+                settings = SettingService.SetSetting(settings, "IdentityOptions:Password:RequiredUniqueChars", _uniquecharacters, true);
+                settings = SettingService.SetSetting(settings, "IdentityOptions:Password:RequireDigit", _requiredigit, true);
+                settings = SettingService.SetSetting(settings, "IdentityOptions:Password:RequireUppercase", _requireupper, true);
+                settings = SettingService.SetSetting(settings, "IdentityOptions:Password:RequireLowercase", _requirelower, true);
+                settings = SettingService.SetSetting(settings, "IdentityOptions:Password:RequireNonAlphanumeric", _requirepunctuation, true);
+
+                settings = SettingService.SetSetting(settings, "IdentityOptions:Lockout:MaxFailedAccessAttempts", _maximumfailures, true);
+                settings = SettingService.SetSetting(settings, "IdentityOptions:Lockout:DefaultLockoutTimeSpan", TimeSpan.FromMinutes(Convert.ToInt64(_lockoutduration)).ToString(), true);
+
+                settings = SettingService.SetSetting(settings, "ExternalLogin:Provider", _provider, false);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:ProviderType", _providertype, false);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:ProviderName", _providername, false);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:Authority", _authority, true);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:MetadataUrl", _metadataurl, true);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:AuthorizationUrl", _authorizationurl, true);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:TokenUrl", _tokenurl, true);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:UserInfoUrl", _userinfourl, true);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:ClientId", _clientid, true);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:ClientSecret", _clientsecret, true);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:AuthResponseType", _authresponsetype, true);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:Scopes", _scopes, true);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:Parameters", _parameters, true);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:PKCE", _pkce, true);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:ReviewClaims", _reviewclaims, true);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:IdentifierClaimType", _identifierclaimtype, true);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:NameClaimType", _nameclaimtype, true);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:EmailClaimType", _emailclaimtype, true);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:RoleClaimType", _roleclaimtype, true);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:RoleClaimMappings", _roleclaimmappings, true);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:SynchronizeRoles", _synchronizeroles, true);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:ProfileClaimTypes", _profileclaimtypes, true);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:SaveTokens", _savetokens, true);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:DomainFilter", _domainfilter, true);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:CreateUsers", _createusers, true);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:VerifyUsers", _verifyusers, true);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:AllowHostRole", _allowhostrole, true);
+                settings = SettingService.SetSetting(settings, "LoginOptions:AllowSiteLogin", _allowsitelogin, false);
+
+                settings = SettingService.SetSetting(settings, "JwtOptions:Secret", _secret, true);
+                settings = SettingService.SetSetting(settings, "JwtOptions:Issuer", _issuer, true);
+                settings = SettingService.SetSetting(settings, "JwtOptions:Audience", _audience, true);
+                settings = SettingService.SetSetting(settings, "JwtOptions:Lifetime", _lifetime, true);
+            }
+
+            await SettingService.UpdateSiteSettingsAsync(settings, site.SiteId);
+            await SettingService.ClearSiteSettingsCacheAsync();
+
+            if (!string.IsNullOrEmpty(_secret))
+            {
+                SiteState.AuthorizationToken = await UserService.GetTokenAsync();
+            }
+
+            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);
+        }
+        finally
+        {
+            await ScrollToPageTop();
+        }
     }
 
-    private async Task UpdateSettingsAsync()
+    private void ProviderChanged(ChangeEventArgs e)
     {
-        Dictionary<string, string> settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId);
-        SettingService.SetSetting(settings, settingSearch, _search);
-        await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId);
+        _provider = (string)e.Value;
+        var provider = Shared.ExternalLoginProviders.Providers.FirstOrDefault(item => item.Name == _provider);
+        if (provider != null)
+        {
+            LoadExternalLoginSettings(provider.Settings);
+        }
+        StateHasChanged();
+	}
+    
+    private void ProviderTypeChanged(ChangeEventArgs e)
+	{
+		_providertype = (string)e.Value;
+		if (string.IsNullOrEmpty(_providername))
+		{
+			if (_providertype == AuthenticationProviderTypes.OpenIDConnect)
+			{
+				_scopes = "openid,profile,email";
+			}
+			else
+			{
+				_scopes = "";
+			}			
+		}
+		_redirecturl = PageState.Uri.Scheme + "://" + PageState.Alias.Name + "/signin-" + _providertype;
+		StateHasChanged();
+	}
+
+	private async Task CreateToken()
+	{
+		_token = await UserService.GetPersonalAccessTokenAsync();
+	}
+
+	private void ToggleClientSecret()
+	{
+		if (_clientsecrettype == "password")
+		{
+			_clientsecrettype = "text";
+			_toggleclientsecret = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_clientsecrettype = "password";
+			_toggleclientsecret = SharedLocalizer["ShowPassword"];
+		}
+	}
+
+	private void ToggleSecret()
+	{
+		if (_secrettype == "password")
+		{
+			_secrettype = "text";
+			_togglesecret = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_secrettype = "password";
+			_togglesecret = SharedLocalizer["ShowPassword"];
+		}
+	}
+
+    private void SortTable(string columnName)
+    {
+        if (columnName != activeSortColumn)
+        {
+            users = users.OrderBy(x => x.User.GetType().GetProperty(columnName)?.GetValue(x.User)).ToList();
+            isSortedAscending = true;
+            activeSortColumn = columnName;
+        }
+        else
+        {
+            if (isSortedAscending)
+            {
+                users = users.OrderByDescending(x => x.User.GetType().GetProperty(columnName)?.GetValue(x.User)).ToList();
+            }
+            else
+            {
+                users = users.OrderBy(x => x.User.GetType().GetProperty(columnName)?.GetValue(x.User)).ToList();
+            }
+
+            isSortedAscending = !isSortedAscending;
+        }
     }
 
+    private string SetSortIcon(string columnName)
+    {
+        if (activeSortColumn != columnName)
+        {
+            return "app-fas pe-3 ";
+        }
+        if (isSortedAscending)
+        {
+            return "app-fas oi oi-sort-ascending";
+        }
+        else
+        {
+            return "app-fas oi oi-sort-descending";
+        }
+    }
 }

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

@@ -0,0 +1,21 @@
+using Oqtane.Documentation;
+using Oqtane.Models;
+using Oqtane.Shared;
+
+namespace Oqtane.Modules.Admin.Users
+{
+    [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 = "Users",
+            Description = "Manage Users",
+            Categories = "Admin",
+            Version = Constants.Version,
+            PermissionNames = $"{PermissionNames.View},{PermissionNames.Edit}," +
+                $"{EntityNames.User}:{PermissionNames.Write}:{RoleNames.Admin}," +
+                $"{EntityNames.UserRole}:{PermissionNames.Write}:{RoleNames.Admin}"
+        };
+    }
+}

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

@@ -12,20 +12,16 @@
 }
 else
 {
-    <table class="table table-borderless">
-        <tr>
-            <td width="30%">
-                <Label For="user" HelpText="The user you are assigning roles to" ResourceKey="User">User: </Label>
-            </td>
-            <td>
+    <div class="container">
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="user" HelpText="The user you are assigning roles to" ResourceKey="User">User: </Label>
+            <div class="col-sm-9">
                 <input id="user" class="form-control" @bind="@name" disabled />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="role" HelpText="Select a role" ResourceKey="Role">Role: </Label>
-            </td>
-            <td>
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="role" HelpText="Select a role" ResourceKey="Role">Role: </Label>
+            <div class="col-sm-9">
                 <select id="role" class="form-select" @bind="@roleid">
                     <option value="-1">&lt;@Localizer["Role.Select"]&gt;</option>
                     @foreach (Role role in roles)
@@ -33,28 +29,26 @@ else
                         <option value="@(role.RoleId)">@role.Name</option>
                     }
                 </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="effectiveDate" HelpText="The date that this role assignment is active" ResourceKey="EffectiveDate">Effective Date: </Label>
-            </td>
-            <td>
-                <input id="effectiveDate" class="form-control" @bind="@effectivedate" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="expiryDate" HelpText="The date that this role assignment expires" ResourceKey="ExpiryDate">Expiry Date: </Label>
-            </td>
-            <td>
-                <input id="expiryDate" class="form-control" @bind="@expirydate" />
-            </td>
-        </tr>
-    </table>
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="effectiveDate" HelpText="The date that this role assignment 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 role assignment expires" ResourceKey="ExpiryDate">Expiry Date: </Label>
+            <div class="col-sm-9">
+                <input type="date" id="expiryDate" class="form-control" @bind="@_expirydate" />
+            </div>
+        </div>
+
+    </div>
+    <br />
+    <br />
     <button type="button" class="btn btn-success" @onclick="SaveUserRole">@SharedLocalizer["Save"]</button>
     <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
-
     <hr class="app-rule" />
     <p align="center">
         <Pager Items="@userroles">
@@ -66,10 +60,10 @@ else
             </Header>
             <Row>
                 <td>@context.Role.Name</td>
-                <td>@context.EffectiveDate</td>
-                <td>@context.ExpiryDate</td>
+                <td>@Utilities.UtcAsLocalDate(context.EffectiveDate)</td>
+                <td>@Utilities.UtcAsLocalDate(context.ExpiryDate)</td>
                 <td>
-                    <ActionDialog Header="Remove Role" Message="@string.Format(Localizer["Confirm.User.RemoveRole"], context.Role.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteUserRole(context.UserRoleId))" Disabled="@(context.Role.IsAutoAssigned || (context.Role.Name == RoleNames.Host && userid == PageState.User.UserId))" ResourceKey="DeleteUserRole" />
+                    <ActionDialog Header="Remove Role" Message="@string.Format(Localizer["Confirm.User.RemoveRole"], context.Role.Name)" Action="Delete" Security="SecurityAccessLevel.Edit" Class="btn btn-danger" OnClick="@(async () => await DeleteUserRole(context.UserRoleId))" Disabled="@(context.Role.Name == RoleNames.Host && userid == PageState.User.UserId)" ResourceKey="DeleteUserRole" />
                 </td>
             </Row>
         </Pager>
@@ -81,11 +75,11 @@ else
     private string name = string.Empty;
     private List<Role> roles;
     private int roleid = -1;
-    private string effectivedate = string.Empty;
-    private string expirydate = string.Empty;
+    private DateTime? _effectivedate = null;
+    private DateTime? _expirydate = null;
     private List<UserRole> userroles;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
 
     protected override async Task OnInitializedAsync()
     {
@@ -94,15 +88,17 @@ else
             userid = Int32.Parse(PageState.QueryString["id"]);
             User user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
             name = user.DisplayName;
+
             if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
             {
                 roles = await RoleService.GetRolesAsync(PageState.Site.SiteId, true);
-                roles = roles.Where(item => item.Name != RoleNames.Everyone).ToList();
+                roles.RemoveAll(item => item.Name == RoleNames.Everyone || item.Name == RoleNames.Unauthenticated);
             }
             else
             {
                 roles = await RoleService.GetRolesAsync(PageState.Site.SiteId);
             }
+
             await GetUserRoles();
         }
         catch (Exception ex)
@@ -116,8 +112,8 @@ else
     {
         try
         {
-            userroles = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId);
-            userroles = userroles.Where(item => item.UserId == userid).ToList();
+            userroles = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, userid);
+
         }
         catch (Exception ex)
         {
@@ -132,26 +128,16 @@ else
         {
             if (roleid != -1)
             {
+                if (!Utilities.ValidateEffectiveExpiryDates(_effectivedate, _expirydate))
+                {
+                    AddModuleMessage(SharedLocalizer["Message.EffectiveExpiryDateError"], MessageType.Warning);
+                    return;
+                }
                 var userrole = userroles.Where(item => item.UserId == userid && item.RoleId == roleid).FirstOrDefault();
                 if (userrole != null)
                 {
-                    if (string.IsNullOrEmpty(effectivedate))
-                    {
-                        userrole.EffectiveDate = null;
-                    }
-                    else
-                    {
-                        userrole.EffectiveDate = DateTime.Parse(effectivedate);
-                    }
-
-                    if (string.IsNullOrEmpty(expirydate))
-                    {
-                        userrole.ExpiryDate = null;
-                    }
-                    else
-                    {
-                        userrole.ExpiryDate = DateTime.Parse(expirydate);
-                    }
+                    userrole.EffectiveDate = _effectivedate;
+                    userrole.ExpiryDate = _expirydate;
                     await UserRoleService.UpdateUserRoleAsync(userrole);
                 }
                 else
@@ -159,32 +145,15 @@ else
                     userrole = new UserRole();
                     userrole.UserId = userid;
                     userrole.RoleId = roleid;
-
-                    if (string.IsNullOrEmpty(effectivedate))
-                    {
-                        userrole.EffectiveDate = null;
-                    }
-                    else
-                    {
-                        userrole.EffectiveDate = DateTime.Parse(effectivedate);
-                    }
-
-                    if (string.IsNullOrEmpty(expirydate))
-                    {
-                        userrole.ExpiryDate = null;
-                    }
-                    else
-                    {
-                        userrole.ExpiryDate = DateTime.Parse(expirydate);
-                    }
-
+                    userrole.EffectiveDate = Utilities.UtcAsLocalDate(_effectivedate);
+                    userrole.ExpiryDate = Utilities.UtcAsLocalDate(_expirydate);
                     await UserRoleService.AddUserRoleAsync(userrole);
                 }
 
                 await logger.LogInformation("User Assigned To Role {UserRole}", userrole);
                 AddModuleMessage(Localizer["Success.User.AssignRole"], MessageType.Success);
                 await GetUserRoles();
-                StateHasChanged();
+                StateHasChanged();                    
             }
             else
             {
@@ -202,8 +171,18 @@ else
     {
         try
         {
-            await UserRoleService.DeleteUserRoleAsync(UserRoleId);
-            await logger.LogInformation("User Removed From Role {UserRoleId}", UserRoleId);
+            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 {Username} Removed From Role {Role}", userrole.User.Username, userrole.Role.Name);
+            }
             AddModuleMessage(Localizer["Success.User.Remove"], MessageType.Success);
             await GetUserRoles();
             StateHasChanged();

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

@@ -0,0 +1,69 @@
+@namespace Oqtane.Modules.Admin.Users
+@inherits ModuleBase
+@inject NavigationManager NavigationManager
+@inject IUserService UserService
+@inject IStringLocalizer<Users> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+<div class="container">
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="importfile" HelpText="Upload or select a tab delimited text file containing user information. The file must be in the Template format specified (Roles can be specified as a comma delimited list)." ResourceKey="ImportFile">Import File:</Label>
+        <div class="col-sm-9">
+            <FileManager Id="importfile" @ref="_filemanager" Filter="txt" />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="notify" HelpText="Indicate if new users should receive an email notification" ResourceKey="Notify">Notify? </Label>
+        <div class="col-sm-9">
+            <select id="notify" class="form-select" @bind="@_notify" required>
+                <option value="True">@SharedLocalizer["Yes"]</option>
+                <option value="False">@SharedLocalizer["No"]</option>
+            </select>
+        </div>
+    </div>
+</div>
+<br />
+<button type="button" class="btn btn-success" @onclick="ImportUsers">@Localizer["Import"]</button>&nbsp;
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>&nbsp;
+<a class="btn btn-info" href="/users.txt" target="_new">@Localizer["Template"]</a>
+
+@code {
+    private FileManager _filemanager;
+
+    public override string Title => "Import Users";
+
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+
+    private string _notify = "True";
+
+    private async Task ImportUsers()
+    {
+        try
+        {
+            var fileid = _filemanager.GetFileId();
+            if (fileid != -1)
+            {
+                ShowProgressIndicator();
+                var results = await UserService.ImportUsersAsync(PageState.Site.SiteId, fileid, bool.Parse(_notify));
+                if (bool.Parse(results["Success"]))
+                {
+                    AddModuleMessage(string.Format(Localizer["Message.Import.Success"], results["Users"]), 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 Users {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.Import"], MessageType.Error);
+        }
+    }
+}

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

@@ -0,0 +1,133 @@
+@namespace Oqtane.Modules.Admin.Visitors
+@using System.Globalization
+@inherits ModuleBase
+@inject NavigationManager NavigationManager
+@inject IVisitorService VisitorService
+@inject IUserService UserService
+@inject IStringLocalizer<Detail> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+@if (_initialized)
+{
+	<div class="container">
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="ip" HelpText="The last recorded IP address for this visitor" ResourceKey="IP">IP Address: </Label>
+			<div class="col-sm-9">
+				<input id="ip" class="form-control" @bind="@_ip" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="language" HelpText="The last recorded language for this visitor" ResourceKey="Language">Language: </Label>
+			<div class="col-sm-9">
+				<input id="language" class="form-control" @bind="@_language" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="useragent" HelpText="The last recorded user agent for this visitor" ResourceKey="UserAgent">User Agent: </Label>
+			<div class="col-sm-9">
+				<input id="useragent" class="form-control" @bind="@_useragent" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="url" HelpText="The last recorded url for this visitor" ResourceKey="Url">Url: </Label>
+			<div class="col-sm-9">
+				<input id="url" class="form-control" @bind="@_url" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="referrer" HelpText="The last recorded referrer for this visitor" ResourceKey="Referrer">Referrer: </Label>
+			<div class="col-sm-9">
+				<input id="referrer" class="form-control" @bind="@_referrer" readonly />
+			</div>
+		</div>
+		@if (_user != string.Empty)
+		{
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="user" HelpText="The last recorded user associated with this visitor" ResourceKey="User">User: </Label>
+				<div class="col-sm-9">
+					<input id="user" class="form-control" @bind="@_user" readonly />
+				</div>
+			</div>
+		}
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="visits" HelpText="The total number of visits by this visitor all time" ResourceKey="Visits">Visits: </Label>
+			<div class="col-sm-9">
+				<input id="visits" class="form-control" @bind="@_visits" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="visited" HelpText="The last recorded date/time when the visitor visited the site" ResourceKey="Visited">Visited: </Label>
+				<div class="col-sm-9">
+				<input id="visited" class="form-control" @bind="@_visited" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="created" HelpText="The first recorded date/time when this visitor visited the site" ResourceKey="Created">Created: </Label>
+			<div class="col-sm-9">
+				<input id="created" class="form-control" @bind="@_created" readonly />
+			</div>
+		</div>
+	</div>
+}
+
+<NavLink class="btn btn-secondary" href="@CloseUrl()">@SharedLocalizer["Cancel"]</NavLink>
+
+@code {
+	private bool _initialized = false;
+	private int _visitorId;
+	private string _ip = string.Empty;
+	private string _language = string.Empty;
+	private string _useragent = string.Empty;
+	private string _url = string.Empty;
+	private string _referrer = string.Empty;
+	private string _user = string.Empty;
+	private string _visits = string.Empty;
+	private string _visited = string.Empty;
+	private string _created = string.Empty;
+
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+
+	protected override async Task OnInitializedAsync()
+	{
+		try
+		{
+			_visitorId = Int32.Parse(PageState.QueryString["id"]);
+			var visitor = await VisitorService.GetVisitorAsync(_visitorId);
+			if (visitor != null)
+			{
+				_ip = visitor.IPAddress;
+				_language = visitor.Language;
+				_useragent = visitor.UserAgent;
+				_url = visitor.Url;
+				_referrer = visitor.Referrer;
+				_visits = visitor.Visits.ToString();
+				_visited = UtcToLocal(visitor.VisitedOn).Value.ToString(CultureInfo.CurrentCulture);
+				_created = UtcToLocal(visitor.CreatedOn).Value.ToString(CultureInfo.CurrentCulture);
+
+				if (visitor.UserId != null)
+				{
+					var user = await UserService.GetUserAsync(visitor.UserId.Value, PageState.Site.SiteId);
+					if (user != null)
+					{
+						_user = user.DisplayName;
+					}
+				}
+				_initialized = true;
+			}
+			else
+			{
+				AddModuleMessage(Localizer["Error.LoadVisitor"], MessageType.Error);
+			}
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Visitor {VisitorId} {Error}", _visitorId, ex.Message);
+			AddModuleMessage(Localizer["Error.LoadVisitor"], MessageType.Error);
+		}
+	}
+
+	private string CloseUrl()
+	{
+		return (!string.IsNullOrEmpty(PageState.ReturnUrl)) ? PageState.ReturnUrl : NavigateUrl();
+	}
+}

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

@@ -0,0 +1,224 @@
+@namespace Oqtane.Modules.Admin.Visitors
+@inherits ModuleBase
+@inject IVisitorService VisitorService
+@inject ISiteService SiteService
+@inject ISettingService SettingService
+@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+@if (_visitors == null)
+{
+    <p><em>@SharedLocalizer["Loading"]</em></p>
+}
+else
+{
+    <TabStrip>
+        <TabPanel Name="Visitors" Heading="Visitors" ResourceKey="Visitors">
+			<div class="container">
+				<div class="row mb-1 align-items-center">
+					<div class="col-sm-6">
+						<select id="type" class="form-select custom-select" value="@_type" @onchange="(e => TypeChanged(e))">
+							<option value="visitors">@Localizer["AllVisitors"]</option>
+							<option value="users">@Localizer["UsersOnly"]</option>
+						</select>
+					</div>
+					<div class="col-sm-6">
+						<select id="days" class="form-select custom-select" value="@_days" @onchange="(e => DaysChanged(e))">
+							<option value="1">@Localizer["PastDay"]</option>
+							<option value="7">@Localizer["PastWeek"]</option>
+							<option value="30">@Localizer["PastMonth"]</option>
+						</select>
+					</div>
+				</div>
+			</div>
+			<br/>
+			<Pager Items="@_visitors" CurrentPage="@_page.ToString()" OnPageChange="OnPageChange">
+				<Header>
+					<th style="width: 1px;">&nbsp;</th>
+					<th>@Localizer["IP"]</th>
+					<th>@Localizer["User"]</th>
+					<th>@Localizer["Language"]</th>
+					<th>@Localizer["Visits"]</th>
+					<th>@Localizer["Visited"]</th>
+					<th>@Localizer["Created"]</th>
+				</Header>
+				<Row>
+                    <td><ActionLink Action="Detail" Text="Detail" Parameters="@($"id={context.VisitorId}")" ReturnUrl="@(NavigateUrl(PageState.Page.Path, $"type={_type}&days={_days}&page={_page}"))" ResourceKey="Details" /></td>
+					<td>@context.IPAddress</td>
+					<td>
+						@if (context.UserId != null)
+						{
+							@context.User.DisplayName
+						}
+					</td>
+					<td>@context.Language</td>
+					<td>@context.Visits</td>
+					<td>@UtcToLocal(context.VisitedOn)</td>
+					<td>@UtcToLocal(context.CreatedOn)</td>
+				</Row>
+			</Pager>
+		</TabPanel>
+        <TabPanel Name="Settings" Heading="Settings" ResourceKey="Settings">
+			<div class="container">
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="tracking" HelpText="Specify if visitor tracking is enabled" ResourceKey="Tracking">Tracking Enabled? </Label>
+					<div class="col-sm-9">
+						<select id="tracking" class="form-select" @bind="@_tracking" >
+							<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="duration" HelpText="The duration of a browsing session considered to be a distinct visit (in minutes)" ResourceKey="Duration">Session Duration: </Label>
+                    <div class="col-sm-9">
+                        <input id="duration" class="form-control" type="number" min="0" step="1" @bind="@_duration" />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="filter" HelpText="Comma delimited list of terms which may exist in IP addresses, user agents, or languages identifying visitors which should not be tracked" ResourceKey="Filter">Filter: </Label>
+					<div class="col-sm-9">
+						<textarea id="filter" class="form-control" @bind="@_filter" rows="3"></textarea>
+					</div>
+				</div>
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="retention" HelpText="Number of days of visitor activity to retain" ResourceKey="Retention">Retention: </Label>
+					<div class="col-sm-9">
+                        <input id="retention" class="form-control" type="number" min="0" step="1" @bind="@_retention" />
+					</div>
+				</div>
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="correlation" HelpText="Indicate if new visitors to this site should be correlated based on their IP Address" ResourceKey="Correlation">Correlate Visitors? </Label>
+					<div class="col-sm-9">
+                        <select id="correlation" class="form-select" @bind="@_correlation">
+							<option value="true">@SharedLocalizer["True"]</option>
+							<option value="false">@SharedLocalizer["False"]</option>
+                        </select>
+					</div>
+				</div>
+			</div>
+			<br />
+			<button type="button" class="btn btn-success" @onclick="SaveSiteSettings">@SharedLocalizer["Save"]</button>
+		</TabPanel>
+        <TabPanel Name="Robots" Heading="Robots.txt" ResourceKey="Robots">
+			<div class="container">
+				<div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="robots" HelpText="Specify your robots.txt instructions to provide bots with guidance on which parts of your site should be indexed" ResourceKey="Robots">Instructions: </Label>
+					<div class="col-sm-9">
+                        <textarea id="robots" class="form-control" @bind="@_robots" rows="3"></textarea>
+                    </div>
+				</div>
+            </div>
+            <br />
+            <button type="button" class="btn btn-success" @onclick="SaveSiteSettings">@SharedLocalizer["Save"]</button>
+        </TabPanel>
+	</TabStrip>
+}
+
+@code {
+	private string _type = "visitors";
+	private int _days = 1;
+	private int _page = 1;
+	private List<Visitor> _visitors;
+	private string _tracking;
+    private int _duration = 5;
+    private string _filter = "";
+	private int _retention = 30;
+	private string _correlation = "true";
+    private string _robots = "";
+
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+
+	protected override async Task OnParametersSetAsync()
+	{
+		if (PageState.QueryString.ContainsKey("type"))
+		{
+			_type = PageState.QueryString["type"];
+		}
+		if (PageState.QueryString.ContainsKey("days") && int.TryParse(PageState.QueryString["days"], out int days))
+		{
+			_days = days;
+		}
+		if (PageState.QueryString.ContainsKey("page") && int.TryParse(PageState.QueryString["page"], out int page))
+		{
+			_page = page;
+		}
+
+		await GetVisitors();
+
+		_tracking = PageState.Site.VisitorTracking.ToString();
+		var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+        _duration = int.Parse(SettingService.GetSetting(settings, "VisitorDuration", "5"));
+        _filter = SettingService.GetSetting(settings, "VisitorFilter", Constants.DefaultVisitorFilter);
+		_retention = int.Parse(SettingService.GetSetting(settings, "VisitorRetention", "30"));
+		_correlation = SettingService.GetSetting(settings, "VisitorCorrelation", "true");
+        _robots = SettingService.GetSetting(settings, "Robots", "");
+    }
+
+	private async void TypeChanged(ChangeEventArgs e)
+	{
+		try
+		{
+			_type = e.Value.ToString();
+			await GetVisitors();
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error On TypeChanged");
+		}
+	}
+
+	private async void DaysChanged(ChangeEventArgs e)
+	{
+		try
+		{
+			_days = int.Parse(e.Value.ToString());
+			await GetVisitors();
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error On DateChanged");
+		}
+	}
+
+	private async Task GetVisitors()
+	{
+		_visitors = await VisitorService.GetVisitorsAsync(PageState.Site.SiteId, DateTime.UtcNow.AddDays(-_days));
+		if (_type == "users")
+		{
+			_visitors = _visitors.Where(item => item.UserId != null).ToList();
+		}
+	}
+
+	private async Task SaveSiteSettings()
+	{
+		try
+		{
+			var site = PageState.Site;
+			site.VisitorTracking = bool.Parse(_tracking);
+			await SiteService.UpdateSiteAsync(site);
+
+			var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+            settings = SettingService.SetSetting(settings, "VisitorDuration", _duration.ToString(), true);
+            settings = SettingService.SetSetting(settings, "VisitorFilter", _filter, true);
+			settings = SettingService.SetSetting(settings, "VisitorRetention", _retention.ToString(), true);
+			settings = SettingService.SetSetting(settings, "VisitorCorrelation", _correlation, true);
+            settings = SettingService.SetSetting(settings, "Robots", _robots, true);
+            await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
+
+			AddModuleMessage(Localizer["Success.SaveSiteSettings"], MessageType.Success);
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Saving Site Settings {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.SaveSiteSettings"], MessageType.Error);
+		}
+	}
+
+	private void OnPageChange(int page)
+	{
+		_page = page;	
+	}
+}

Oqtane.Client/Modules/Controls/ActionDialog.razor

@@ -1,48 +1,108 @@
 @namespace Oqtane.Modules.Controls
+@using System.Text.Json
 @inherits LocalizableComponent
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+@inject NavigationManager NavigationManager
 
-@if (_visible)
+@if (PageState.RenderMode == RenderModes.Interactive || ModuleState.RenderMode == RenderModes.Interactive)
 {
-    <div class="app-actiondialog">
-        <div class="modal" tabindex="-1" role="dialog">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title">@Header</h5>
-                        <button type="button" class="btn-close" aria-label="Close" @onclick="DisplayModal"></button>
-                    </div>
-                    <div class="modal-body">
-                        <p>@Message</p>
-                    </div>
-                    <div class="modal-footer">
-                        @if (!string.IsNullOrEmpty(Action))
-                        {
-                            <button type="button" class="@Class" @onclick="Confirm">@((MarkupString)_iconSpan) @Localize(Action)</button>
-                        }
-                        <button type="button" class="btn btn-secondary" @onclick="DisplayModal">@Localize("Cancel")</button>
+    @if (_visible)
+    {
+        <div class="app-actiondialog">
+            <div class="modal" tabindex="-1" role="dialog">
+                <div class="modal-dialog">
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <h5 class="modal-title">@Header</h5>
+                            <button type="button" class="btn-close" aria-label="Close" @onclick="DisplayModal"></button>
+                        </div>
+                        <div class="modal-body">
+                            <p>@Message</p>
+                        </div>
+                        <div class="modal-footer">
+                            @if (!string.IsNullOrEmpty(Action))
+                            {
+                                <button type="button" class="@ConfirmClass" @onclick="Confirm">@((MarkupString)_iconSpan) @Text</button>
+                            }
+                            <button type="button" class="@CancelClass" @onclick="DisplayModal">@SharedLocalizer["Cancel"]</button>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
-    </div>
-}
-@if (_authorized)
-{
-    if (Disabled)
-    {
-        <button class="@Class" disabled>@((MarkupString)_iconSpan) @Text</button>
     }
-    else
+    @if (_authorized)
     {
-        <button class="@Class" @onclick="DisplayModal">@((MarkupString)_iconSpan) @Text</button>
+        if (Disabled)
+        {
+            <button type="button" class="@Class" disabled>@((MarkupString)_openIconSpan) @_openText</button>
+        }
+        else
+        {
+            <button type="button" class="@Class" @onclick="DisplayModal">@((MarkupString)_openIconSpan) @_openText</button>
+        }
+    }
+}
+else
+{
+    @if (_visible)
+    {
+        <div class="app-actiondialog">
+            <div class="modal" tabindex="-1" role="dialog">
+                <div class="modal-dialog">
+                    <div class="modal-content">
+                        <form class="app-form-inline" method="post" @formname="@($"ActionDialogCloseForm:{ModuleState.PageModuleId}:{Id}")" @onsubmit="DisplayModal" data-enhance>
+                            <input type="hidden" name="@Constants.RequestVerificationToken" value="@SiteState.AntiForgeryToken" />
+                            <div class="modal-header">
+                                <h5 class="modal-title">@Header</h5>
+                                <button type="submit" class="btn-close" aria-label="Close"></button>
+                            </div>
+                        </form>
+                        <div class="modal-body">
+                            <p>@Message</p>
+                        </div>
+                        <div class="modal-footer">
+                            @if (!string.IsNullOrEmpty(Action))
+                            {
+                                <form method="post" @formname="@($"ActionDialogConfirmForm:{ModuleState.PageModuleId}:{Id}")" @onsubmit="Confirm" data-enhance>
+                                    <input type="hidden" name="@Constants.RequestVerificationToken" value="@SiteState.AntiForgeryToken" />
+                                    <button type="submit" class="@ConfirmClass">@((MarkupString)_iconSpan) @Text</button>
+                                </form>
+                            }
+                            <form method="post" @formname="@($"ActionDialogCancelForm:{ModuleState.PageModuleId}:{Id}")" @onsubmit="DisplayModal" data-enhance>
+                                <input type="hidden" name="@Constants.RequestVerificationToken" value="@SiteState.AntiForgeryToken" />
+                                <button type="submit" class="@CancelClass">@SharedLocalizer["Cancel"]</button>
+                            </form>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    }
+    @if (_authorized)
+    {
+        if (Disabled)
+        {
+            <button type="button" class="@Class" disabled>@((MarkupString)_openIconSpan) @_openText</button>
+        }
+        else
+        {
+            <form method="post" class="app-form-inline" @formname="@($"ActionDialogActionForm:{ModuleState.PageModuleId}:{Id}")" @onsubmit="DisplayModal" data-enhance>
+                <input type="hidden" name="@Constants.RequestVerificationToken" value="@SiteState.AntiForgeryToken" />
+                <button type="submit" class="@Class">@((MarkupString)_openIconSpan) @_openText</button>
+            </form>
+        }
     }
 }
 
 @code {
     private bool _visible = false;
+    private List<Permission> _permissions;
     private bool _editmode = false;
     private bool _authorized = false;
     private string _iconSpan = string.Empty;
+    private string _openIconSpan = string.Empty;
+    private string _openText = string.Empty;
 
     [Parameter]
     public string Header { get; set; } // required
@@ -59,9 +119,21 @@
     [Parameter]
     public SecurityAccessLevel? Security { get; set; } // optional - can be used to explicitly specify SecurityAccessLevel
 
+    [Parameter]
+    public string Permissions { get; set; } // deprecated - use PermissionList instead
+
+    [Parameter]
+    public List<Permission> PermissionList { get; set; } // optional - can be used to specify permissions
+
     [Parameter]
     public string Class { get; set; } // optional
 
+    [Parameter]
+    public string ConfirmClass { get; set; } // optional - for Confirm modal button
+
+    [Parameter]
+    public string CancelClass { get; set; } // optional - for Cancel modal button
+
     [Parameter]
     public bool Disabled { get; set; } // optional
 
@@ -74,6 +146,20 @@
     [Parameter]
     public string IconName { get; set; } // optional - specifies an icon for the link - default is no icon
 
+    [Parameter]
+    public bool IconOnly { get; set; } // optional - specifies only icon in opening link
+
+    [Parameter]
+    public string Id { get; set; } // optional - specifies a unique id for the compoment - required when there are multiple component instances on a page in static rendering
+
+    protected override void OnInitialized()
+    {
+        if (!string.IsNullOrEmpty(Permissions))
+        {
+            PermissionList = JsonSerializer.Deserialize<List<Permission>>(Permissions);
+        }
+    }
+
     protected override void OnParametersSet()
     {
         base.OnParametersSet();
@@ -82,30 +168,60 @@
         {
             Text = Action;
         }
+
         if (string.IsNullOrEmpty(Class))
         {
             Class = "btn btn-success";
         }
 
+        if (string.IsNullOrEmpty(ConfirmClass))
+        {
+            ConfirmClass = Class;
+        }
+
+        if (string.IsNullOrEmpty(CancelClass))
+        {
+            CancelClass = "btn btn-secondary";
+        }
+
         if (!string.IsNullOrEmpty(EditMode))
         {
             _editmode = bool.Parse(EditMode);
         }
 
-        if (!string.IsNullOrEmpty(IconName))
-        {
-            if (!IconName.Contains(" "))
-            {
-                IconName = "oi oi-" + IconName;
-            }
-            _iconSpan = $"<span class=\"{IconName}\"></span>&nbsp;";
-        }
-
         Text = Localize(nameof(Text), Text);
         Header = Localize(nameof(Header), Header);
         Message = Localize(nameof(Message), Message);
 
+        _openText = Text;
+
+        if (!string.IsNullOrEmpty(IconName))
+        {
+            if (IconOnly)
+            {
+                _openText = string.Empty;
+            }
+
+            // Check if IconName starts with "oi oi-"
+            bool startsWithOiOi = IconName.StartsWith("oi oi-");
+
+            if (!startsWithOiOi && !IconName.Contains(" "))
+            {
+                IconName = "oi oi-" + IconName;
+            }
+            _openIconSpan = $"<span class=\"{IconName}\"></span>{(IconOnly ? "" : "&nbsp")}";
+            _iconSpan = $"<span class=\"{IconName}\"></span>&nbsp";
+        }
+
+        _permissions = (PermissionList == null) ? ModuleState.PermissionList : PermissionList;
         _authorized = IsAuthorized();
+
+        if (string.IsNullOrEmpty(Id)) Id = "1";
+
+        if (PageState.QueryString.ContainsKey("dialog"))
+        {
+            _visible = (PageState.QueryString["dialog"] == Id); 
+        }
     }
 
     private bool IsAuthorized()
@@ -138,10 +254,10 @@
                     authorized = true;
                     break;
                 case SecurityAccessLevel.View:
-                    authorized = UserSecurity.IsAuthorized(PageState.User,PermissionNames.View, ModuleState.Permissions);
+                    authorized = UserSecurity.IsAuthorized(PageState.User,PermissionNames.View, _permissions);
                     break;
                 case SecurityAccessLevel.Edit:
-                    authorized = UserSecurity.IsAuthorized(PageState.User,PermissionNames.Edit, ModuleState.Permissions);
+                    authorized = UserSecurity.IsAuthorized(PageState.User,PermissionNames.Edit, _permissions);
                     break;
                 case SecurityAccessLevel.Admin:
                     authorized = UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin);
@@ -157,12 +273,22 @@
     private void DisplayModal()
     {
         _visible = !_visible;
-        StateHasChanged();
+        if (PageState.RenderMode == RenderModes.Interactive || ModuleState.RenderMode == RenderModes.Interactive)
+        {
+            StateHasChanged();
+        }
+        else
+        {
+            var parameters = new Dictionary<string, string>(PageState.QueryString);
+            if (parameters.ContainsKey("dialog")) parameters.Remove("dialog");
+            if (_visible) parameters.Add("dialog", Id);
+            NavigationManager.NavigateTo(PageState.Route.AbsolutePath + Utilities.CreateQueryString(parameters));
+        }
     }
 
     private void Confirm()
     {
-        DisplayModal();
         OnClick();
+        DisplayModal();
     }
 }

Oqtane.Client/Modules/Controls/ActionLink.razor

@@ -1,4 +1,6 @@
 @namespace Oqtane.Modules.Controls
+@using System.Net
+@using System.Text.Json
 @inherits LocalizableComponent
 @inject IUserService UserService
 
@@ -6,41 +8,60 @@
 {
     if (Disabled)
     {
-        <button class="@_classname" style="@_style" disabled>@((MarkupString)_iconSpan) @_text</button>
-    }
-    else
-    {
-        <NavLink class="@_classname" href="@_url" style="@_style">@((MarkupString)_iconSpan) @_text</NavLink>
-    }
+        <NavLink class="@($"{_classname} disabled")" href="@_url" style="@_style">@((MarkupString)_iconSpan) @_text</NavLink>
+	}
+	else
+	{
+		if (OnClick == null)
+		{
+			<NavLink class="@_classname" href="@_url" style="@_style">@((MarkupString)_iconSpan) @_text</NavLink>
+		}
+		else
+		{
+			<button type="button" class="@_classname" style="@_style" onclick="@OnClick">@((MarkupString)_iconSpan) @_text</button>
+		}
+	}
 }
 
 @code {
     private string _text = string.Empty;
-    private string _url = string.Empty;
+    private int _moduleId = -1;
+    private string _path = string.Empty;
     private string _parameters = string.Empty;
-    private string _classname = "btn btn-primary";
-    private string _style = string.Empty;
+    private string _url = string.Empty;
+    private List<Permission> _permissions;
     private bool _editmode = false;
     private bool _authorized = false;
+    private string _classname = "btn btn-primary";
+    private string _style = string.Empty;
     private string _iconSpan = string.Empty;
 
     [Parameter]
     public string Action { get; set; } // required
 
-    [Parameter]
-    public SecurityAccessLevel? Security { get; set; } // optional - can be used to explicitly specify SecurityAccessLevel
-
     [Parameter]
     public string Text { get; set; } // optional - defaults to Action if not specified
 
     [Parameter]
-    public string Parameters { get; set; } // optional - querystring parameter should be in the form of "id=x&name=y"
+    public int ModuleId { get; set; } = -1; // optional - allows the link to target a specific moduleid
 
     [Parameter]
-    public string Class { get; set; } // optional - defaults to primary if not specified
+    public string Path { get; set; } = null; // optional - allows the link to target a specific page
 
     [Parameter]
-    public string Style { get; set; } // optional
+    public string Parameters { get; set; } // optional - querystring parameters should be in the form of "id=x&name=y"
+
+    [Parameter]
+    public Action OnClick { get; set; } = null; // optional - executes a method in the calling component
+
+    [Parameter]
+    public SecurityAccessLevel? Security { get; set; } // optional - can be used to explicitly specify SecurityAccessLevel
+
+    [Parameter]
+    public string Permissions { get; set; } // deprecated - use PermissionList instead
+
+    [Parameter]
+    public List<Permission> PermissionList { get; set; } // optional - can be used to specify permissions
 
     [Parameter]
     public bool Disabled { get; set; } // optional
@@ -48,20 +69,41 @@
     [Parameter]
     public string EditMode { get; set; } // optional - specifies if an authorized user must be in edit mode to see the action - default is false.
 
+    [Parameter]
+    public string Class { get; set; } // optional - defaults to primary if not specified
+
+    [Parameter]
+    public string Style { get; set; } // optional
+
     [Parameter]
     public string IconName { get; set; } // optional - specifies an icon for the link - default is no icon
 
     [Parameter]
     public bool IconOnly { get; set; } // optional - specifies only icon in link
 
+    [Parameter]
+    public string ReturnUrl { get; set; } // optional - used to set a url to redirect to
+
+
+    protected override void OnInitialized()
+    {
+        if (!string.IsNullOrEmpty(Permissions))
+        {
+            PermissionList = JsonSerializer.Deserialize<List<Permission>>(Permissions);
+        }
+    }
+
     protected override void OnParametersSet()
     {
         base.OnParametersSet();
 
-        _text = Action;
         if (!string.IsNullOrEmpty(Text))
         {
-            _text = Text;
+            _text = Localize(nameof(Text), Text);
+        }
+        else
+        {
+            _text = Localize(nameof(Action), Action);
         }
 
         if (IconOnly && !string.IsNullOrEmpty(IconName))
@@ -69,6 +111,18 @@
             _text = string.Empty;
         }
 
+        _moduleId = ModuleState.ModuleId;
+        if (ModuleId != -1)
+        {
+            _moduleId = ModuleId;
+        }
+
+        _path = PageState.Page.Path;
+        if (Path != null)
+        {
+            _path = Path;
+        }
+
         if (!string.IsNullOrEmpty(Parameters))
         {
             _parameters = Parameters;
@@ -91,17 +145,24 @@
 
         if (!string.IsNullOrEmpty(IconName))
         {
-            if (!IconName.Contains(" "))
+            // Check if IconName starts with "oi oi-"
+            bool startsWithOiOi = IconName.StartsWith("oi oi-");
+
+            if (!startsWithOiOi && !IconName.Contains(" "))
             {
                 IconName = "oi oi-" + IconName;
             }
             _iconSpan = $"<span class=\"{IconName}\"></span>{(IconOnly ? "" : "&nbsp")}";
-
         }
 
-        _text = Localize(nameof(Text), _text);
-        _url = EditUrl(Action, _parameters);
-        _authorized = IsAuthorized();
+		_permissions = (PermissionList == null) ? ModuleState.PermissionList : PermissionList;
+
+		_url = EditUrl(_path, _moduleId, Action, _parameters);
+		if (!string.IsNullOrEmpty(ReturnUrl))
+		{
+			_url += ((_url.Contains("?")) ? "&" : "?") + $"returnurl={WebUtility.UrlEncode(ReturnUrl)}";
+		}
+		_authorized = IsAuthorized();
     }
 
     private bool IsAuthorized()
@@ -136,10 +197,10 @@
                     authorized = true;
                     break;
                 case SecurityAccessLevel.View:
-                    authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, ModuleState.Permissions);
+                    authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, _permissions);
                     break;
                 case SecurityAccessLevel.Edit:
-                    authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, ModuleState.Permissions);
+                    authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, _permissions);
                     break;
                 case SecurityAccessLevel.Admin:
                     authorized = UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin);

Oqtane.Client/Modules/Controls/AuditInfo.razor

@@ -35,6 +35,9 @@
     [Parameter]
     public string Style { get; set; }
 
+    [Parameter]
+    public string DateTimeFormat { get; set; } = "MMM dd yyyy HH:mm:ss";
+
     protected override void OnParametersSet()
     {
         _text = string.Empty;
@@ -49,7 +52,7 @@
 
             if (CreatedOn != null)
             {
-                _text += $" {Localizer["On"]} <b>{CreatedOn.Value.ToString("MMM dd yyyy HH:mm:ss")}</b>";
+                _text += $" {Localizer["On"]} <b>{UtcToLocal(CreatedOn).Value.ToString(DateTimeFormat)}</ b >";
             }
 
             _text += "</p>";
@@ -61,12 +64,12 @@
 
             if (!String.IsNullOrEmpty(ModifiedBy))
             {
-                _text += $" {Localizer["by"]} <b>{ModifiedBy}</b>";
+                _text += $" {Localizer["By"]} <b>{ModifiedBy}</b>";
             }
 
             if (ModifiedOn != null)
             {
-                _text += $" {Localizer["on"]} <b>{ModifiedOn.Value.ToString("MMM dd yyyy HH:mm:ss")}</b>";
+                _text += $" {Localizer["On"]} <b>{UtcToLocal(ModifiedOn).Value.ToString(DateTimeFormat)}</ b >";
             }
 
             _text += "</p>";
@@ -83,7 +86,7 @@
 
             if (DeletedOn != null)
             {
-                _text += $" {Localizer["On"]} <b>{DeletedOn.Value.ToString("MMM dd yyyy HH:mm:ss")}</b>";
+                _text += $" {Localizer["On"]} <b>{UtcToLocal(DeletedOn).Value.ToString(DateTimeFormat)}</ b >";
             }
 
             _text += "</p>";

Oqtane.Client/Modules/Controls/AutoComplete.razor

@@ -0,0 +1,174 @@
+@namespace Oqtane.Modules.Controls
+@inherits LocalizableComponent
+
+<div class="app-autocomplete">
+    <input class="form-control" value="@Value" @oninput="OnInput" @onkeyup="OnKeyUp" placeholder="@Placeholder" autocomplete="off" @attributes="InputAttributes" />
+	@if (_results != null)
+	{
+		<select class="form-select" style="position: relative;" value="@Value" size="@Rows" @onkeyup="OnKeyUp" @onchange="(e => OnChange(e))">
+			@if (_results.Any())
+			{
+				@foreach (var result in _results)
+				{
+					if (result.Value == Value)
+					{
+						<option selected>@result.Value</option>
+					}
+					else
+					{
+						<option>@result.Value</option>
+					}
+				}
+			}
+			else
+			{
+				<option disabled>No Results</option>
+			}
+		</select>
+	}
+</div>
+
+@code {
+    Dictionary<string, string> _results;
+    Dictionary<string, object> InputAttributes { get; set; } = new();
+
+    [Parameter]
+    public Func<string, Task<Dictionary<string, string>>> OnSearch { get; set; } // required - an async delegate method which accepts a filter string parameter and returns a dictionary
+
+    [Parameter]
+    public int Characters { get; set; } = 3; // optional - number of characters before search is initiated
+
+    [Parameter]
+    public int Rows { get; set; } = 3; // optional - number of result rows to display
+
+    [Parameter]
+    public string Placeholder { get; set; } // optional - placeholder input text
+
+    [Parameter]
+    public string Value { get; set; } // value of item selected
+
+    [Parameter]
+    public string Key { get; set; } // key of item selected
+
+    [Parameter]
+    public bool Required { get; set; } // optional - if the item is required
+
+    protected override void OnParametersSet()
+    {
+        if (Required)
+        {
+            if (!InputAttributes.ContainsKey(nameof(Required)))
+            {
+                InputAttributes.Add(nameof(Required), true);
+            }
+        }
+        else
+        {
+            if (InputAttributes.ContainsKey(nameof(Required)))
+            {
+                InputAttributes.Remove(nameof(Required));
+            }
+        }
+    }
+    private async Task OnInput(ChangeEventArgs e)
+	{
+		Value = e.Value?.ToString();
+		if (Value?.Length >= Characters)
+		{
+			_results = await OnSearch?.Invoke(Value);
+		}
+		else
+		{
+			_results = null;
+		}
+		SetKey();
+	}
+
+	private async Task OnKeyUp(KeyboardEventArgs e)
+	{
+		var index = -1;
+		switch (e.Key)
+		{
+			case "ArrowDown":
+				if (_results == null)
+				{
+					if (Value?.Length >= Characters)
+					{
+						_results = await OnSearch?.Invoke(Value);
+					}
+				}
+				else
+				{
+					index = GetIndex();
+					if (index < _results.Count - 1)
+					{
+						Value = _results.ElementAt(index + 1).Value;
+						Key = _results.ElementAt(index + 1).Key;
+					}
+				}
+				break;
+			case "ArrowUp":
+				index = GetIndex();
+				if (index > 0)
+				{
+					Value = _results.ElementAt(index - 1).Value;
+					Key = _results.ElementAt(index - 1).Key;
+				}
+				break;
+			case "ArrowRight":
+			case "Tab":
+				_results = null;
+				break;
+			case "Enter": // note within a form the enter key submits the entire form
+			case "NumpadEnter":
+				_results = null;
+				break;
+			case "Escape":
+				Value = "";
+				_results = null;
+				break;
+		}
+	}
+
+	private void OnChange(ChangeEventArgs e)
+	{
+		Value = (string)e.Value;
+		SetKey();
+		_results = null;
+	}
+
+	private int GetIndex()
+	{
+		if (_results != null)
+		{
+			for (int index = 0; index < _results.Count; index++)
+			{
+				if (_results.ElementAt(index).Value == Value)
+				{
+					return index;
+				}
+			}
+		}
+		return -1;
+	}
+
+	private void SetKey()
+	{
+		var index = GetIndex();
+		if (index != -1)
+		{
+			Key = _results.ElementAt(index).Key;
+		}
+		else
+		{
+			Key = "";
+		}
+	}
+
+	public void Clear()
+	{
+		Value = "";
+		Key = "";
+		_results = null;
+	}
+}

Oqtane.Client/Modules/Controls/FileManager.razor

@@ -1,64 +1,99 @@
 @namespace Oqtane.Modules.Controls
+@using System.Threading
 @inherits ModuleControlBase
 @inject IFolderService FolderService
 @inject IFileService FileService
+@inject IUserService UserService
+@inject ISettingService SettingService
 @inject IStringLocalizer<FileManager> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (_folders != null)
+@if (_initialized)
 {
     <div id="@Id" class="container-fluid px-0">
         <div class="row">
             <div class="col">
-                @if (ShowFolders || FolderId <= 0)
-                {
-                    <div>
-                        <select class="form-select" value="@FolderId" @onchange="(e => FolderChanged(e))">
-                            @if (string.IsNullOrEmpty(Folder))
-                            {
-                                <option value="-1">&lt;@Localizer["Folder.Select"]&gt;</option>
-                            }
-                            @foreach (Folder folder in _folders)
-                            {
-                                <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
-                            }
-                        </select>
-                    </div>
-                }
-                @if (ShowFiles)
-                {
-                    <div>
-                        <select class="form-select" value="@FileId" @onchange="(e => FileChanged(e))">
-                            <option value="-1">&lt;@Localizer["File.Select"]&gt;</option>
-                            @foreach (File file in _files)
-                            {
-                                <option value="@(file.FileId)">@(file.Name)</option>
-                            }
-                        </select>
-                    </div>
-                }
-                @if (ShowUpload && _haseditpermission)
-                {
-                    <div>
-                        @if (UploadMultiple)
+                <div class="container-fluid px-0">
+                    @if (ShowFolders)
+                    {
+                        <div class="row">
+                            <div class="col">
+                                <select class="form-select" value="@FolderId" @onchange="(e => FolderChanged(e))">
+                                    <option value="-1">&lt;@Localizer["Folder.Select"]&gt;</option>
+                                    @foreach (Folder folder in _folders)
+                                    {
+                                        <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
+                                    }
+                                </select>
+                            </div>
+                        </div>
+                    }
+                    @if (ShowFiles)
+                    {
+                        <div class="row mt-1">
+                            <div class="col">
+                                <select class="form-select" value="@FileId" @onchange="(e => FileChanged(e))">
+                                    <option value="-1">&lt;@Localizer["File.Select"]&gt;</option>
+                                    @foreach (File file in _files)
+                                    {
+                                        <option value="@(file.FileId)">@(file.Name)</option>
+                                    }
+                                </select>
+                            </div>
+                        </div>
+                    }
+                    else
+                    {
+                        if (FileId != -1 && _file != null && !UploadMultiple)
                         {
-                            <input type="file" id="@_fileinputid" name="file" accept="@_filter" multiple />
+                            <input class="form-control" @bind="@_file.Name" disabled />
+                        }
+                    }
+                    @if (ShowUpload && _haseditpermission)
+                    {
+                        <div class="row mt-2">
+                            <div class="col">
+                                @if (UploadMultiple)
+                                {
+                                    <input type="file" id="@_fileinputid" name="file" accept="@_filter" multiple />
+                                }
+                                else
+                                {
+                                    <input type="file" id="@_fileinputid" name="file" accept="@_filter" />
+                                }
+                            </div>
+                            <div class="col-auto">
+                                <button type="button" class="btn btn-success" @onclick="UploadFiles">@SharedLocalizer["Upload"]</button>
+                                @if (FileId != -1 && !UploadMultiple)
+                                {
+                                    <button type="button" class="btn btn-danger mx-1" @onclick="DeleteFile">@SharedLocalizer["Delete"]</button>
+                                }
+                            </div>
+                        </div>
+                        @if (ShowProgress)
+                        {
+                            <div class="row">
+                                <div class="col mt-1"><span id="@_progressinfoid" style="display: none;"></span></div>
+                                <div class="col mt-1"><progress id="@_progressbarid" class="mt-1" style="display: none;"></progress></div>
+                            </div>
                         }
                         else
                         {
-                            <input type="file" id="@_fileinputid" name="file" accept="@_filter" />
-                        }
-                        <span id="@_progressinfoid"></span><progress id="@_progressbarid" style="width: 150px; visibility: hidden;"></progress>
-                        <span class="float-end">
-                            <button type="button" class="btn btn-success" @onclick="UploadFile">@SharedLocalizer["Upload"]</button>
-                            @if (ShowFiles && GetFileId() != -1)
+                            if (_uploading)
                             {
-                                <button type="button" class="btn btn-danger" @onclick="DeleteFile">@SharedLocalizer["Delete"]</button>
+                                <div class="app-progress-indicator"></div>
                             }
-                        </span>
-                    </div>
-                }
-                <ModuleMessage Message="@_message" Type="@_messagetype"></ModuleMessage>
+                        }
+                    }
+                    @if (!string.IsNullOrEmpty(_message))
+                    {
+                        <div class="row mt-1">
+                            <div class="col">
+                                <ModuleMessage Message="@_message" Type="@_messagetype" />
+                            </div>
+                        </div>
+                    }
+                </div>
             </div>
             @if (_image != string.Empty)
             {
@@ -71,7 +106,7 @@
 }
 
 @code {
-    private string _id;
+    private bool _initialized = false;
     private List<Folder> _folders;
     private List<File> _files = new List<File>();
     private string _fileinputid = string.Empty;
@@ -84,15 +119,22 @@
     private string _guid;
     private string _message = string.Empty;
     private MessageType _messagetype;
+    private bool _uploading = false;
 
     [Parameter]
     public string Id { get; set; } // optional - for setting the id of the FileManager component for accessibility
 
     [Parameter]
-    public string Folder { get; set; } // optional - for setting a specific folder by default
+    public int FolderId { get; set; } = -1; // optional - for setting a specific default folder by folderid 
 
     [Parameter]
-    public int FolderId { get; set; } = -1; // optional - for setting a specific folderid by default
+    public string Folder { get; set; } = ""; // optional - for setting a specific default folder by folder path 
+
+    [Parameter]
+    public int FileId { get; set; } = -1; // optional - for selecting a specific file by default
+
+    [Parameter]
+    public string Filter { get; set; } // optional - comma delimited list of file types that can be selected or uploaded ie. "jpg,gif"
 
     [Parameter]
     public bool ShowFiles { get; set; } = true; // optional - for indicating whether a list of files should be displayed - default is true
@@ -104,29 +146,85 @@
     public bool ShowFolders { get; set; } = true; // optional - for indicating whether a list of folders should be displayed - default is true
 
     [Parameter]
-    public int FileId { get; set; } = -1; // optional - for setting a specific file by default
+    public bool ShowImage { get; set; } = true; // optional - for indicating whether an image thumbnail should be displayed - default is true
 
     [Parameter]
-    public string Filter { get; set; } // optional - comma delimited list of file types that can be selected or uploaded ie. "jpg,gif"
+    public bool ShowProgress { get; set; } = true; // optional - for indicating whether progress info should be displayed during upload - default is true
+
+    [Parameter]
+    public bool ShowSuccess { get; set; } = false; // optional - for indicating whether a success message should be displayed upon successful upload - default is false
 
     [Parameter]
     public bool UploadMultiple { get; set; } = false; // optional - enable multiple file uploads - default false
 
-    protected override async Task OnInitializedAsync()
+    [Parameter]
+    public int ChunkSize { get; set; } = 1; // optional - size of file chunks to upload in MB
+
+    [Parameter]
+    public EventCallback<int> OnUpload { get; set; } // optional - executes a method in the calling component when a file is uploaded
+
+    [Parameter]
+    public EventCallback<int> OnSelectFolder { get; set; } // optional - executes a method in the calling component when a folder is selected
+
+    [Parameter]
+    public EventCallback<int> OnSelectFile { get; set; } // optional - executes a method in the calling component when a file is selected
+
+    [Obsolete("Use OnSelectFile instead.")]
+    [Parameter]
+    public EventCallback<int> OnSelect { get; set; } // optional - executes a method in the calling component when a file is selected
+
+    [Parameter]
+    public EventCallback<int> OnDelete { get; set; } // optional - executes a method in the calling component when a file is deleted
+
+    protected override void OnInitialized()
     {
-        if (!string.IsNullOrEmpty(Id))
+        // create unique id for component
+        _guid = Guid.NewGuid().ToString("N");
+        _fileinputid = "FileInput_" + _guid;
+        _progressinfoid = "ProgressInfo_" + _guid;
+        _progressbarid = "ProgressBar_" + _guid;
+    }
+
+    protected override async Task OnParametersSetAsync()
+    {
+        // packages folder is a framework folder for uploading installable nuget packages
+        if (Folder == Constants.PackagesFolder)
         {
-            _id = Id;
+            ShowFiles = false;
+            ShowFolders = false;
+            Filter = "nupkg";
+            ShowSuccess = true;
         }
 
-        if (!string.IsNullOrEmpty(Folder))
+        if (!string.IsNullOrEmpty(Folder) && Folder != Constants.PackagesFolder)
         {
-            _folders = new List<Folder> { new Folder { FolderId = -1, Name = Folder } };
-            FolderId = -1;
+            Folder folder = await FolderService.GetFolderAsync(ModuleState.SiteId, Folder);
+            if (folder != null)
+            {
+                FolderId = folder.FolderId;
+            }
+            else
+            {
+                FolderId = -1;
+                _message = "Folder Path " + Folder + " Does Not Exist";
+                _messagetype = MessageType.Error;
+            }
+        }
+
+        if (ShowFolders)
+        {
+            _folders = await FolderService.GetFoldersAsync(ModuleState.SiteId);
         }
         else
         {
-            _folders = await FolderService.GetFoldersAsync(ModuleState.SiteId);
+            if (FolderId != -1)
+            {
+                var folder = await FolderService.GetFolderAsync(FolderId);
+                if (folder != null)
+                {
+                    _folders = new List<Folder> { folder };
+                }
+            }
         }
 
         if (FileId != -1)
@@ -138,9 +236,12 @@
             }
             else
             {
+                _message = "FileId " + FileId.ToString() + " Does Not Exist";
+                _messagetype = MessageType.Error;
                 FileId = -1; // file does not exist
             }
         }
+
         await SetImage();
 
         if (!string.IsNullOrEmpty(Filter))
@@ -150,46 +251,49 @@
 
         await GetFiles();
 
-        // create unique id for component
-        _guid = Guid.NewGuid().ToString("N");
-        _fileinputid = _guid + "FileInput";
-        _progressinfoid = _guid + "ProgressInfo";
-        _progressbarid = _guid + "ProgressBar";
+        _initialized = true;
     }
 
     private async Task GetFiles()
     {
         _haseditpermission = false;
-        if (!string.IsNullOrEmpty(Folder))
+        if (Folder == Constants.PackagesFolder)
         {
             _haseditpermission = UserSecurity.IsAuthorized(PageState.User, RoleNames.Host);
-            _files = await FileService.GetFilesAsync(Folder);
+            _files = new List<File>();
         }
         else
         {
             Folder folder = _folders.FirstOrDefault(item => item.FolderId == FolderId);
             if (folder != null)
             {
-                _haseditpermission = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, folder.Permissions);
-                _files = await FileService.GetFilesAsync(FolderId);
+                _haseditpermission = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, folder.PermissionList);
+                if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Browse, folder.PermissionList))
+                {
+                    _files = await FileService.GetFilesAsync(FolderId);
+                }
+                else
+                {
+                    _files = new List<File>();
+                }
             }
             else
             {
                 _haseditpermission = false;
                 _files = new List<File>();
             }
-        }
-        if (_filter != "*")
-        {
-            List<File> filtered = new List<File>();
-            foreach (File file in _files)
+            if (_filter != "*")
             {
-                if (_filter.ToUpper().IndexOf("." + file.Extension.ToUpper()) != -1)
+                List<File> filtered = new List<File>();
+                foreach (File file in _files)
                 {
-                    filtered.Add(file);
+                    if (_filter.ToUpper().IndexOf("." + file.Extension.ToUpper()) != -1)
+                    {
+                        filtered.Add(file);
+                    }
                 }
+                _files = filtered;
             }
-            _files = filtered;
         }
     }
 
@@ -203,12 +307,13 @@
             FileId = -1;
             _file = null;
             _image = string.Empty;
+
+            await OnSelectFolder.InvokeAsync(FolderId);
             StateHasChanged();
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Files {Error}", ex.Message);
-
             _message = Localizer["Error.File.Load"];
             _messagetype = MessageType.Error;
         }
@@ -218,8 +323,11 @@
     {
         _message = string.Empty;
         FileId = int.Parse((string)e.Value);
-
         await SetImage();
+    #pragma warning disable CS0618
+        await OnSelect.InvokeAsync(FileId);
+    #pragma warning restore CS0618
+        await OnSelectFile.InvokeAsync(FileId);
         StateHasChanged();
     }
 
@@ -230,7 +338,7 @@
         if (FileId != -1)
         {
             _file = await FileService.GetFileAsync(FileId);
-            if (_file != null && _file.ImageHeight != 0 && _file.ImageWidth != 0)
+            if (_file != null && ShowImage && _file.ImageHeight != 0 && _file.ImageWidth != 0)
             {
                 var maxwidth = 200;
                 var maxheight = 200;
@@ -240,65 +348,135 @@
                 var ratio = ratioX < ratioY ? ratioX : ratioY;
 
                 _image = "<img src=\"" + _file.Url + "\" alt=\"" + _file.Name +
-                         "\" width=\"" + Convert.ToInt32(_file.ImageWidth * ratio).ToString() +
-                         "\" height=\"" + Convert.ToInt32(_file.ImageHeight * ratio).ToString() + "\" />";
+                            "\" width=\"" + Convert.ToInt32(_file.ImageWidth * ratio).ToString() +
+                            "\" height=\"" + Convert.ToInt32(_file.ImageHeight * ratio).ToString() + "\" />";
             }
         }
     }
 
-    private async Task UploadFile()
+    private async Task UploadFiles()
     {
         _message = string.Empty;
         var interop = new Interop(JSRuntime);
-        var upload = await interop.GetFiles(_fileinputid);
-        if (upload.Length > 0)
+        var uploads = await interop.GetFiles(_fileinputid);
+
+        if (uploads.Length > 0)
         {
-            try
+            string restricted = "";
+            foreach (var upload in uploads)
             {
-                string result;
-                if (!string.IsNullOrEmpty(Folder))
+                var filename = upload.Split(':')[0];
+                var extension = (filename.LastIndexOf(".") != -1) ? filename.Substring(filename.LastIndexOf(".") + 1) : "";
+                if (!PageState.Site.UploadableFiles.Split(',').Contains(extension.ToLower()))
                 {
-                    result = await FileService.UploadFilesAsync(Folder, upload, _guid);
+                    restricted += (restricted == "" ? "" : ",") + extension;
                 }
-                else
+            }
+            if (restricted == "")
+            {
+                CancellationTokenSource tokenSource = new CancellationTokenSource();
+
+                try
                 {
-                    result = await FileService.UploadFilesAsync(FolderId, upload, _guid);
-                }
-
-                if (result == string.Empty)
-                {
-                    await logger.LogInformation("File Upload Succeeded {Files}", upload);
-
-                    _message = Localizer["Success.File.Upload"];
-                    _messagetype = MessageType.Success;
-
-                    await GetFiles();
-
-                    if (upload.Length == 1)
+                    // upload the files
+                    var posturl = Utilities.TenantUrl(PageState.Alias, "/api/file/upload");
+                    var folder = (Folder == Constants.PackagesFolder) ? Folder : FolderId.ToString();
+                    var jwt = "";
+                    if (PageState.Runtime == Shared.Runtime.Hybrid)
                     {
-                        var file = _files.Where(item => item.Name == upload[0]).FirstOrDefault();
+                        jwt = await UserService.GetTokenAsync();
+                        if (string.IsNullOrEmpty(jwt))
+                        {
+                            await logger.LogInformation("File Upload Failed From .NET MAUI Due To Missing Security Token. Token Options Must Be Set In User Settings.");
+                            _message = "Security Token Not Specified";
+                            _messagetype = MessageType.Error;
+                            return;
+                        }
+                    }
+
+                    var chunksize = ChunkSize;
+                    if (chunksize == 1)
+                    {
+                        // if ChunkSize parameter is not overridden use the site setting
+                        chunksize = int.Parse(SettingService.GetSetting(PageState.Site.Settings, "MaxChunkSize", "1"));
+                    }
+
+                    if (!ShowProgress)
+                    {
+                        _uploading = true;
+                        StateHasChanged();
+                    }
+
+                    // upload files
+                    var success = await interop.UploadFiles(posturl, folder, _guid, SiteState.AntiForgeryToken, jwt, chunksize, tokenSource.Token);
+
+                    // reset progress indicators
+                    if (ShowProgress)
+                    {
+                        await interop.SetElementAttribute(_progressinfoid, "style", "display: none;");
+                        await interop.SetElementAttribute(_progressbarid, "style", "display: none;");
+                    }
+                    else
+                    {
+                        _uploading = false;
+                        StateHasChanged();
+                    }
+
+                    if (success)
+                    {
+                        await logger.LogInformation("File Upload Succeeded {Files}", uploads);
+                        if (ShowSuccess)
+                        {
+                            _message = Localizer["Success.File.Upload"];
+                            _messagetype = MessageType.Success;
+                        }
+                    }
+                    else
+                    {
+                        await logger.LogError("File Upload Failed {Files}", uploads);
+                        _message = Localizer["Error.File.Upload"];
+                        _messagetype = MessageType.Error;
+                    }
+
+                    if (Folder == Constants.PackagesFolder)
+                    {
+                        await OnUpload.InvokeAsync(-1);
+                    }
+                    else
+                    {
+                        // set FileId to first file in upload collection
+                        var file = await FileService.GetFileAsync(int.Parse(folder), uploads[0].Split(":")[0]);
                         if (file != null)
                         {
                             FileId = file.FileId;
                             await SetImage();
+#pragma warning disable CS0618
+                            await OnSelect.InvokeAsync(FileId);
+#pragma warning restore CS0618
+                            await OnSelectFile.InvokeAsync(FileId);
+                            await OnUpload.InvokeAsync(FileId);
                         }
+                        await GetFiles();
+                        StateHasChanged();
                     }
-                    StateHasChanged();
                 }
-                else
+                catch (Exception ex)
                 {
-                    await logger.LogError("File Upload Failed For {Files}", result.Replace(",", ", "));
-
+                    await logger.LogError(ex, "File Upload Failed {Error}", ex.Message);
                     _message = Localizer["Error.File.Upload"];
                     _messagetype = MessageType.Error;
+                    _uploading = false;
+                    await tokenSource.CancelAsync();
+                }
+                finally {
+                    tokenSource.Dispose();
                 }
-            }
-            catch (Exception ex)
-            {
-                await logger.LogError(ex, "File Upload Failed {Error}", ex.Message);
 
-                _message = Localizer["Error.File.Upload"];
-                _messagetype = MessageType.Error;
+            }
+            else
+            {
+                _message = string.Format(Localizer["Message.File.Restricted"], restricted);
+                _messagetype = MessageType.Warning;
             }
         }
         else
@@ -315,25 +493,55 @@
         {
             await FileService.DeleteFileAsync(FileId);
             await logger.LogInformation("File Deleted {File}", FileId);
+            await OnDelete.InvokeAsync(FileId);
 
-            _message = Localizer["Success.File.Delete"];
-            _messagetype = MessageType.Success;
+            if (ShowSuccess)
+            {
+                _message = Localizer["Success.File.Delete"];
+                _messagetype = MessageType.Success;
+            }
 
-            await GetFiles();
-            FileId = -1;
-            await SetImage();
+			await GetFiles();
+			FileId = -1;
+			await SetImage();
+#pragma warning disable CS0618
+            await OnSelect.InvokeAsync(FileId);
+#pragma warning restore CS0618
+            await OnSelectFile.InvokeAsync(FileId);
             StateHasChanged();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Deleting File {File} {Error}", FileId, ex.Message);
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Deleting File {File} {Error}", FileId, ex.Message);
 
-            _message = Localizer["Error.File.Delete"];
-            _messagetype = MessageType.Error;
-        }
-    }
+			_message = Localizer["Error.File.Delete"];
+			_messagetype = MessageType.Error;
+		}
+	}
 
-    public int GetFileId() => FileId;
+	public int GetFileId() => FileId;
 
-    public File GetFile() => _file;
+	public int GetFolderId() => FolderId;
+
+	public File GetFile() => _file;
+
+	public async Task Refresh()
+	{
+		await Refresh(-1);
+	}
+
+	public async Task Refresh(int fileId)
+	{
+		await GetFiles();
+		if (fileId != -1)
+		{
+			var file = _files.Where(item => item.FileId == fileId).FirstOrDefault();
+			if (file != null)
+			{
+				FileId = file.FileId;
+				await SetImage();
+			}
+		}
+		StateHasChanged();
+	}
 }

Oqtane.Client/Modules/Controls/InputList.razor

@@ -0,0 +1,47 @@
+@namespace Oqtane.Modules.Controls
+@inherits LocalizableComponent
+
+<input type="text" value="@Value" list="@_id" class="form-control" @onchange="(e => OnChange(e))" />
+<datalist id="@_id" value="@Value">
+    @foreach(var kvp in DataList)
+    {
+        if (!string.IsNullOrEmpty(kvp.Value))
+        {
+            <option value="@kvp.Key">@Localize(kvp.Value, kvp.Value)</option>
+        }
+        else
+        {
+            <option value="@kvp.Key">@Localize(kvp.Key, kvp.Key)</option>
+        }
+    }
+</datalist>
+
+@code {
+    private string _id;
+
+    [Parameter]
+    public string Value { get; set; }
+
+    [EditorRequired]
+    [Parameter]    
+    public Dictionary<string, string> DataList { get; set; }
+
+    [EditorRequired]
+    [Parameter]
+    public EventCallback<string> ValueChanged { get; set; }
+
+    protected override void OnInitialized()
+    {
+        // create unique id for component
+        _id = "DataList_" + Guid.NewGuid().ToString("N");
+    }
+
+    protected void OnChange(ChangeEventArgs e)
+    {
+        Value = e.Value.ToString();
+        if (ValueChanged.HasDelegate)
+        {
+            ValueChanged.InvokeAsync(Value);
+        }
+    }
+}

Oqtane.Client/Modules/Controls/Label.razor

@@ -3,17 +3,16 @@
 
 @if (!string.IsNullOrEmpty(HelpText))
 {
-    <span class="app-tooltip" data-tip="@((MarkupString)HelpText)">@((MarkupString)_openLabel)@ChildContent@((MarkupString)_closeLabel) <img src="images/help.png" /></span>
+    <span class="@_spanclass" data-tip="@((MarkupString)@_helptext)">
+        <label for="@For" class="@_labelclass">@ChildContent</label> <img src="images/help.png" />
+    </span>
 }
 else
 {
-    @((MarkupString)_openLabel)@ChildContent@((MarkupString)_closeLabel)
+    <label for="@For" class="@_labelclass">@ChildContent</label>
 }
 
 @code {
-    private string _openLabel = string.Empty;
-    private string _closeLabel = "</label>";
-
     [Parameter]
     public RenderFragment ChildContent { get; set; }
 
@@ -21,39 +20,37 @@ else
     public string For { get; set; } // optional - the id of the associated input control for accessibility
 
     [Parameter]
-    public string Class { get; set; } // optional - the class for the label ( ie. control-label )
+    public string Class { get; set; } // optional - CSS classes
 
     [Parameter]
     public string HelpText { get; set; } // optional - tooltip for this label
 
+    private string _spanclass;
+    private string _labelclass;
+    private string _helptext = string.Empty;
+
     protected override void OnParametersSet()
     {
         base.OnParametersSet();
 
-        if (string.IsNullOrEmpty(Class))
+        if (!string.IsNullOrEmpty(HelpText))
         {
-            Class = "form-label";
-        }
+            _helptext = Localize(nameof(HelpText), HelpText);
+            _labelclass = "form-label";
 
-        _openLabel = "<label";
-        if (!string.IsNullOrEmpty(For))
+            var spanclass = (!string.IsNullOrEmpty(Class)) ? " " + Class : "";
+            _spanclass = "app-tooltip" + spanclass;
+        }
+        else
         {
-            _openLabel += " for=\"" + For + "\"";
+            var labelclass = (!string.IsNullOrEmpty(Class)) ? " " + Class : "";
+            _labelclass = "form-label" + labelclass;
         }
 
-        if (!string.IsNullOrEmpty(Class))
-        {
-            _openLabel += " class=\"" + Class + "\"";
-        }
-
-        _openLabel += ">";
-
         var text = Localize("Text", String.Empty);
-        if (text != String.Empty)
+        if (!string.IsNullOrEmpty(text))
         {
             ChildContent =@<text>@text</text>;
         }
-
-        HelpText = Localize(nameof(HelpText), HelpText);
     }
 }

Oqtane.Client/Modules/Controls/LocalizableComponent.cs

@@ -1,18 +1,21 @@
 using System;
 using Microsoft.AspNetCore.Components;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
-using Oqtane.Shared;
 
 namespace Oqtane.Modules.Controls
 {
     public class LocalizableComponent : ModuleControlBase
     {
+        [Inject] public IStringLocalizerFactory LocalizerFactory { get; set; }
+
         private IStringLocalizer _localizer;
 
         [Parameter]
         public string ResourceKey { get; set; }
 
+        [Parameter]
+        public string ResourceType { get; set; }
+
         protected bool IsLocalizable { get; private set; }
 
         protected string Localize(string name) => _localizer?[name] ?? name;
@@ -27,22 +30,15 @@ namespace Oqtane.Modules.Controls
             var key = $"{ResourceKey}.{propertyName}";
             var value = Localize(key);
 
-            if (value == key)
+            if (value == key || value == String.Empty)
             {
-                // Returns default property value (English version) instead of ResourceKey.PropertyName
+                // return default property value if key does not exist in resource file or value is empty
                 return propertyValue;
             }
             else
             {
-                if (value == String.Empty)
-                {
-                    // Returns default property value (English version)
-                    return propertyValue;
-                }
-                else
-                {
-                    return value;
-                }
+                // return localized value
+                return value;
             }
         }
 
@@ -50,19 +46,15 @@ namespace Oqtane.Modules.Controls
         {
             IsLocalizable = false;
 
-            if (!String.IsNullOrEmpty(ResourceKey) && ModuleState?.ModuleType != null)
+            if (String.IsNullOrEmpty(ResourceType))
             {
-                var moduleType = Type.GetType(ModuleState.ModuleType);
-                if (moduleType != null)
-                {
-                    using (var scope = ServiceActivator.GetScope())
-                    {
-                        var localizerFactory = scope.ServiceProvider.GetService<IStringLocalizerFactory>();
-                        _localizer = localizerFactory.Create(moduleType);
+                ResourceType = ModuleState?.ModuleType;
+            }
 
-                        IsLocalizable = true;
-                    }
-                }
+            if (!String.IsNullOrEmpty(ResourceKey) && !String.IsNullOrEmpty(ResourceType))
+            {
+                _localizer = LocalizerFactory.Create(ResourceType);
+                IsLocalizable = true;
             }
         }
     }

Oqtane.Client/Modules/Controls/ModuleMessage.razor

@@ -2,17 +2,26 @@
 @inherits ModuleControlBase
 @inject NavigationManager NavigationManager
 
-@if (!string.IsNullOrEmpty(_message))
+@if (!string.IsNullOrEmpty(Message))
 {
-    <div class="@_classname alert-dismissible fade show" role="alert">
-        @((MarkupString)_message)
+    <div class="@_classname alert-dismissible fade show mb-3" role="alert">
+        @((MarkupString)Message)
         @if (Type == MessageType.Error && PageState != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
         {
-            @((MarkupString)"&nbsp;&nbsp;")<NavLink href="@NavigateUrl("admin/log")">View Details</NavLink>
+            <NavLink class="ms-2" href="@NavigateUrl("admin/log")">View Details</NavLink>
+        }
+        @if (ModuleState != null)
+        {
+            @if (ModuleState.RenderMode == RenderModes.Static)
+            {
+                <a href="@NavigationManager.Uri" class="btn-close" data-dismiss="alert" aria-label="close"></a>
+            }
+            else
+            {
+                <button type="button" class="btn-close" data-dismiss="alert" aria-label="close" @onclick="CloseMessage"></button>
+            }
         }
-        <button type="button" class="btn-close" aria-label="Close" @onclick="DismissModal"></button>
     </div>
-    <br />
 }
 
 @code {
@@ -25,6 +34,9 @@
     [Parameter]
     public MessageType Type { get; set; }
 
+    [Parameter]
+    public RenderModeBoundary Parent { get; set; }
+
     protected override void OnParametersSet()
     {
         _message = Message;
@@ -55,10 +67,15 @@
 
         return classname;
     }
-
-    private void DismissModal()
+    private void CloseMessage(MouseEventArgs e)
     {
-        _message = "";
-        StateHasChanged();
+        if(Parent != null)
+        {
+            Parent.DismissMessage();
+        }
+        else
+        {
+            NavigationManager.NavigateTo(NavigationManager.Uri);
+        }
     }
 }

Oqtane.Client/Modules/Controls/Pager.razor

@@ -1,153 +1,386 @@
 @namespace Oqtane.Modules.Controls
 @inherits ModuleControlBase
+@inject IStringLocalizerFactory LocalizerFactory
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 @typeparam TableItem
 
-<p>
-    @if (Toolbar == "Top")
+@if (ItemList != null)
+{
+    @if (PageState.RenderMode == RenderModes.Interactive || ModuleState.RenderMode == RenderModes.Interactive)
     {
-        <div class="mx-auto text-center">
-            @if (_endPage > 1)
-            {
-                <button class="btn btn-secondary m-1" @onclick=@(async () => UpdateList(1))><span class="oi oi-media-step-backward" title="first" aria-hidden="true"></span></button>
-            }
-            @if (_page > _maxPages)
-            {
-                <button class="btn btn-secondary m-1" @onclick=@(async () => SetPagerSize("back"))><span class="oi oi-media-skip-backward" title="back" aria-hidden="true"></span></button>
-            }
-            @if (_endPage > 1)
-            {
-                <button class="btn btn-secondary m-1" @onclick=@(async () => NavigateToPage("previous"))><span class="oi oi-chevron-left" title="previous" aria-hidden="true"></span></button>
+        @if (!string.IsNullOrEmpty(SearchProperties))
+        {
+            <form autocomplete="off">
+                <div class="input-group my-3 @SearchBoxClass">
+                    <input type="text" id="pagersearch" class="form-control" placeholder=@string.Format(Localizer["SearchPlaceholder"], FormatSearchProperties()) @bind="@_search" />
+                    <button type="button" class="btn btn-primary" @onclick="Search">@SharedLocalizer["Search"]</button>
+                    <button type="button" class="btn btn-secondary" @onclick="Reset">@SharedLocalizer["Reset"]</button>
+                </div>
+            </form>
+        }
+
+        @if ((Toolbar == "Top" || Toolbar == "Both") && _pages > 0 && Items.Count() > _maxItems)
+        {
+            <ul class="pagination justify-content-@PaginationAlignment.ToLower() my-2">
+                <li class="page-item@((_page > 1) ? " app-pager-pointer" : " disabled")">
+                    <a class="page-link shadow-none" @onclick=@(async () => UpdateList(1))><span class="oi oi-media-step-backward" title="start" aria-hidden="true"></span></a>
+                </li>
+                @if (_pages > _displayPages && _displayPages > 1)
+                {
+                    <li class="page-item@((_page > _displayPages) ? " app-pager-pointer" : " disabled")">
+                        <a class="page-link shadow-none" @onclick=@(async () => SkipPages("back"))><span class="oi oi-media-skip-backward" title="skip back" aria-hidden="true"></span></a>
+                    </li>
+                }
+                <li class="page-item@((_page > 1) ? " app-pager-pointer" : " disabled")">
+                    <a class="page-link shadow-none" @onclick=@(async () => NavigateToPage("previous"))><span class="oi oi-chevron-left" title="previous" aria-hidden="true"></span></a>
+                </li>
                 @for (int i = _startPage; i <= _endPage; i++)
                 {
                     var pager = i;
-                    <button class="btn @((pager == _page) ? "btn-primary" : "btn-link")" @onclick=@(async () => UpdateList(pager))>
-                        @pager
-                    </button>
-                }
-                <button class="btn btn-secondary m-1" @onclick=@(async () => NavigateToPage("next"))><span class="oi oi-chevron-right" title="next" aria-hidden="true"></span></button>
-            }
-            @if (_endPage < _pages)
-            {
-                <button class="btn btn-secondary m-1" @onclick=@(async () => SetPagerSize("forward"))><span class="oi oi-media-skip-forward" title="forward" aria-hidden="true"></span></button>
-            }
-            @if (_endPage > 1)
-            {
-                <button class="btn btn-secondary m-1" @onclick=@(async () => UpdateList(_pages))><span class="oi oi-media-step-forward" title="last" aria-hidden="true"></span></button>
-            }
-            @if (_endPage > 1)
-            {
-                <span class="btn btn-link disabled">Page @_page of @_pages</span>
-            }
-        </div>
-    }
-    @if (Format == "Table")
-    {
-        <table class="@Class">
-            <thead>
-                <tr>@Header</tr>
-            </thead>
-            <tbody>
-                @foreach (var item in ItemList)
-                {
-                    <tr>@Row(item)</tr>
-                    @if (Detail != null)
+                    if (pager == _page)
                     {
-                        <tr>@Detail(item)</tr>
+                        <li class="page-item app-pager-pointer active">
+                            <a class="page-link shadow-none" @onclick=@(async () => UpdateList(pager))>@pager</a>
+                        </li>
+                    }
+                    else
+                    {
+                        <li class="page-item app-pager-pointer">
+                            <a class="page-link shadow-none" @onclick=@(async () => UpdateList(pager))>@pager</a>
+                        </li>
                     }
                 }
-            </tbody>
-        </table>
-    }
-    @if (Format == "Grid")
-    {
-        <div class="@Class">
-            <div class="row">@Header</div>
-            @foreach (var item in ItemList)
-            {
-                <div class="row">@Row(item)</div>
-                @if (Detail != null)
+                <li class="page-item@((_page < _pages) ? " app-pager-pointer" : " disabled")">
+                    <a class="page-link shadow-none" @onclick=@(async () => NavigateToPage("next"))><span class="oi oi-chevron-right" title="next" aria-hidden="true"></span></a>
+                </li>
+                @if (_pages > _displayPages && _displayPages > 1)
                 {
-                    <div class="row">@Detail(item)</div>
+                    <li class="page-item@((_endPage < _pages) ? " app-pager-pointer" : " disabled")">
+                        <a class="page-link shadow-none" @onclick=@(async () => SkipPages("forward"))><span class="oi oi-media-skip-forward" title="skip forward" aria-hidden="true"></span></a>
+                    </li>
                 }
-            }
-        </div>
+                <li class="page-item@((_page < _pages) ? " app-pager-pointer" : " disabled")">
+                    <a class="page-link shadow-none" @onclick=@(async () => UpdateList(_pages))><span class="oi oi-media-step-forward" title="end" aria-hidden="true"></span></a>
+                </li>
+                <li class="page-item disabled">
+                    <a class="page-link shadow-none" style="white-space: nowrap;">@Localizer["PageOfPages", _page, _pages]</a>
+                </li>
+            </ul>
+        }
     }
-    @if (Toolbar == "Bottom")
+    else
     {
-        <div class="mx-auto text-center">
-            @if (_endPage > 1)
-            {
-                <button class="btn btn-secondary mr-1" @onclick=@(async () => UpdateList(1))><span class="oi oi-media-step-backward" title="first" aria-hidden="true"></span></button>
-            }
-            @if (_page > _maxPages)
-            {
-                <button class="btn btn-secondary mr-1" @onclick=@(async () => SetPagerSize("back"))><span class="oi oi-media-skip-backward" title="back" aria-hidden="true"></span></button>
-            }
-            @if (_endPage > 1)
-            {
-                <button class="btn btn-secondary mr-1" @onclick=@(async () => NavigateToPage("previous"))><span class="oi oi-chevron-left" title="previous" aria-hidden="true"></span></button>
+        @if (!string.IsNullOrEmpty(SearchProperties))
+        {
+            <form method="post" autocomplete="off" @formname="PagerForm" @onsubmit="Search" data-enhance>
+                <input type="hidden" name="@Constants.RequestVerificationToken" value="@SiteState.AntiForgeryToken" />
+                <div class="input-group my-3 @SearchBoxClass">
+                    <input type="text" id="pagersearch" name="_search" class="form-control" placeholder=@string.Format(Localizer["SearchPlaceholder"], FormatSearchProperties()) @bind="@_search" />
+                    <button type="submit" class="btn btn-primary">@SharedLocalizer["Search"]</button>
+                    <a class="btn btn-secondary" href="@PageUrl(1, "")">@SharedLocalizer["Reset"]</a>
+                </div>
+            </form>
+        }
+
+        @if ((Toolbar == "Top" || Toolbar == "Both") && _pages > 0 && Items.Count() > _maxItems)
+        {
+            <ul class="pagination justify-content-@PaginationAlignment.ToLower() my-2">
+                <li class="page-item@((_page > 1) ? " app-pager-pointer" : " disabled")">
+                    <a class="page-link shadow-none" href="@PageUrl(1, _search)"><span class="oi oi-media-step-backward" title="start" aria-hidden="true"></span></a>
+                </li>
+                @if (_pages > _displayPages && _displayPages > 1)
+                {
+                    <li class="page-item@((_page > _displayPages) ? " app-pager-pointer" : " disabled")">
+                        <a class="page-link shadow-none" href="@PageUrl(_startPage - 1, _search)"><span class="oi oi-media-skip-backward" title="skip back" aria-hidden="true"></span></a>
+                    </li>
+                }
+                <li class="page-item@((_page > 1) ? " app-pager-pointer" : " disabled")">
+                    <a class="page-link shadow-none" href="@PageUrl(((_page > 1) ? _page - 1 : _page), _search)"><span class="oi oi-chevron-left" title="previous" aria-hidden="true"></span></a>
+                </li>
                 @for (int i = _startPage; i <= _endPage; i++)
                 {
                     var pager = i;
-                    <button class="btn @((pager == _page) ? "btn-primary" : "btn-link")" @onclick=@(async () => UpdateList(pager))>
-                        @pager
-                    </button>
+                    if (pager == _page)
+                    {
+                        <li class="page-item app-pager-pointer active">
+                            <a class="page-link shadow-none" href="@PageUrl(pager, _search)">@pager</a>
+                        </li>
+                    }
+                    else
+                    {
+                        <li class="page-item app-pager-pointer">
+                            <a class="page-link shadow-none" href="@PageUrl(pager, _search)">@pager</a>
+                        </li>
+                    }
                 }
-                <button class="btn btn-secondary mr-1" @onclick=@(async () => NavigateToPage("next"))><span class="oi oi-chevron-right" title="next" aria-hidden="true"></span></button>
-            }
-            @if (_endPage < _pages)
+                <li class="page-item@((_page < _pages) ? " app-pager-pointer" : " disabled")">
+                    <a class="page-link shadow-none" href="@PageUrl(((_page < _pages) ? _page + 1 : _page), _search)"><span class="oi oi-chevron-right" title="next" aria-hidden="true"></span></a>
+                </li>
+                @if (_pages > _displayPages && _displayPages > 1)
+                {
+                    <li class="page-item@((_endPage < _pages) ? " app-pager-pointer" : " disabled")">
+                        <a class="page-link shadow-none" href="@PageUrl(_endPage + 1, _search)"><span class="oi oi-media-skip-forward" title="skip forward" aria-hidden="true"></span></a>
+                    </li>
+                }
+                <li class="page-item@((_page < _pages) ? " app-pager-pointer" : " disabled")">
+                    <a class="page-link shadow-none" href="@PageUrl(_pages, _search)"><span class="oi oi-media-step-forward" title="end" aria-hidden="true"></span></a>
+                </li>
+                <li class="page-item disabled">
+                    <a class="page-link shadow-none" style="white-space: nowrap;">@Localizer["PageOfPages", _page, _pages]</a>
+                </li>
+            </ul>
+        }
+    }
+
+    @if (Format == "Table" && Row != null)
+    {
+        <div class="table-responsive">
+            <table class="@Class">
+                <thead>
+                    <tr class="@RowClass">@Header</tr>
+                </thead>
+                <tbody>
+                    @foreach (var item in ItemList)
+                    {
+                        <tr class="@RowClass">@Row(item)</tr>
+                        @if (Detail != null)
+                        {
+                            <tr>@Detail(item)</tr>
+                        }
+                    }
+                </tbody>
+                <tfoot>
+                    <tr class="@RowClass">@Footer</tr>
+                </tfoot>
+            </table>
+        </div>
+    }
+    @if (Format == "Grid" && Row != null)
+    {
+        int count = 0;
+        int rows = 0;
+        int cols = 0;
+        if (ItemList != null)
+        {
+            if (_columns == 0)
             {
-                <button class="btn btn-secondary mr-1" @onclick=@(async () => SetPagerSize("forward"))><span class="oi oi-media-skip-forward" title="forward" aria-hidden="true"></span></button>
+                count = ItemList.Count();
+                rows = 1;
+                cols = count;
             }
-            @if (_endPage > 1)
+            else
             {
-                <button class="btn btn-secondary mr-1" @onclick=@(async () => UpdateList(_pages))><span class="oi oi-media-step-forward" title="last" aria-hidden="true"></span></button>
+                count = (int)Math.Ceiling(ItemList.Count() / (decimal)_columns) * _columns;
+                rows = count / _columns;
+                cols = _columns;
             }
-            @if (_endPage > 1)
+        }
+        <div class="@Class">
+            @for (int row = 0; row < rows; row++)
             {
-                <span class="btn btn-link disabled">Page @_page of @_pages</span>
+                <div class="@RowClass">
+                    @for (int col = 0; col < cols; col++)
+                    {
+                        int index = (row * _columns) + col;
+                        if (index < ItemList.Count())
+                        {
+                            <div class="@ColumnClass">@Row(ItemList.ElementAt(index))</div>
+                        }
+                        else
+                        {
+                            <div>&nbsp;</div>
+                        }
+                    }
+                </div>
             }
         </div>
     }
-</p>
+
+    @if ((Toolbar == "Bottom" || Toolbar == "Both") && _pages > 0 && Items.Count() > _maxItems)
+    {
+        @if (PageState.RenderMode == RenderModes.Interactive || ModuleState.RenderMode == RenderModes.Interactive)
+        {
+            <ul class="pagination justify-content-@PaginationAlignment.ToLower() my-2">
+                <li class="page-item@((_page > 1) ? " app-pager-pointer" : " disabled")">
+                    <a class="page-link shadow-none" @onclick=@(async () => UpdateList(1))><span class="oi oi-media-step-backward" title="start" aria-hidden="true"></span></a>
+                </li>
+                @if (_pages > _displayPages && _displayPages > 1)
+                {
+                    <li class="page-item@((_page > _displayPages) ? " app-pager-pointer" : " disabled")">
+                        <a class="page-link shadow-none" @onclick=@(async () => SkipPages("back"))><span class="oi oi-media-skip-backward" title="skip back" aria-hidden="true"></span></a>
+                    </li>
+                }
+                <li class="page-item@((_page > 1) ? " app-pager-pointer" : " disabled")">
+                    <a class="page-link shadow-none" @onclick=@(async () => NavigateToPage("previous"))><span class="oi oi-chevron-left" title="previous" aria-hidden="true"></span></a>
+                </li>
+                @for (int i = _startPage; i <= _endPage; i++)
+                {
+                    var pager = i;
+                    if (pager == _page)
+                    {
+                        <li class="page-item app-pager-pointer active">
+                            <a class="page-link shadow-none" @onclick=@(async () => UpdateList(pager))>@pager</a>
+                        </li>
+                    }
+                    else
+                    {
+                        <li class="page-item app-pager-pointer">
+                            <a class="page-link shadow-none" @onclick=@(async () => UpdateList(pager))>@pager</a>
+                        </li>
+                    }
+                }
+                <li class="page-item@((_page < _pages) ? " app-pager-pointer" : " disabled")">
+                    <a class="page-link shadow-none" @onclick=@(async () => NavigateToPage("next"))><span class="oi oi-chevron-right" title="next" aria-hidden="true"></span></a>
+                </li>
+                @if (_pages > _displayPages && _displayPages > 1)
+                {
+                    <li class="page-item@((_endPage < _pages) ? " app-pager-pointer" : " disabled")">
+                        <a class="page-link shadow-none" @onclick=@(async () => SkipPages("forward"))><span class="oi oi-media-skip-forward" title="skip forward" aria-hidden="true"></span></a>
+                    </li>
+                }
+                <li class="page-item@((_page < _pages) ? " app-pager-pointer" : " disabled")">
+                    <a class="page-link shadow-none" @onclick=@(async () => UpdateList(_pages))><span class="oi oi-media-step-forward" title="end" aria-hidden="true"></span></a>
+                </li>
+                <li class="page-item disabled">
+                    <a class="page-link shadow-none" style="white-space: nowrap;">@Localizer["PageOfPages", _page, _pages]</a>
+                </li>
+            </ul>
+        }
+        else
+        {
+            <ul class="pagination justify-content-@PaginationAlignment.ToLower() my-2">
+                <li class="page-item@((_page > 1) ? " app-pager-pointer" : " disabled")">
+                    <a class="page-link shadow-none" href="@PageUrl(1, _search)"><span class="oi oi-media-step-backward" title="start" aria-hidden="true"></span></a>
+                </li>
+                @if (_pages > _displayPages && _displayPages > 1)
+                {
+                    <li class="page-item@((_page > _displayPages) ? " app-pager-pointer" : " disabled")">
+                        <a class="page-link shadow-none" href="@PageUrl(_startPage - 1, _search)"><span class="oi oi-media-skip-backward" title="skip back" aria-hidden="true"></span></a>
+                    </li>
+                }
+                <li class="page-item@((_page > 1) ? " app-pager-pointer" : " disabled")">
+                    <a class="page-link shadow-none" href="@PageUrl(((_page > 1) ? _page - 1 : _page), _search)"><span class="oi oi-chevron-left" title="previous" aria-hidden="true"></span></a>
+                </li>
+                @for (int i = _startPage; i <= _endPage; i++)
+                {
+                    var pager = i;
+                    if (pager == _page)
+                    {
+                        <li class="page-item app-pager-pointer active">
+                            <a class="page-link shadow-none" href="@PageUrl(pager, _search)">@pager</a>
+                        </li>
+                    }
+                    else
+                    {
+                        <li class="page-item app-pager-pointer">
+                            <a class="page-link shadow-none" href="@PageUrl(pager, _search)">@pager</a>
+                        </li>
+                    }
+                }
+                <li class="page-item@((_page < _pages) ? " app-pager-pointer" : " disabled")">
+                    <a class="page-link shadow-none" href="@PageUrl(((_page < _pages) ? _page + 1 : _page), _search)"><span class="oi oi-chevron-right" title="next" aria-hidden="true"></span></a>
+                </li>
+                @if (_pages > _displayPages && _displayPages > 1)
+                {
+                    <li class="page-item@((_endPage < _pages) ? " app-pager-pointer" : " disabled")">
+                        <a class="page-link shadow-none" href="@PageUrl(_endPage + 1, _search)"><span class="oi oi-media-skip-forward" title="skip forward" aria-hidden="true"></span></a>
+                    </li>
+                }
+                <li class="page-item@((_page < _pages) ? " app-pager-pointer" : " disabled")">
+                    <a class="page-link shadow-none" href="@PageUrl(_pages, _search)"><span class="oi oi-media-step-forward" title="end" aria-hidden="true"></span></a>
+                </li>
+                <li class="page-item disabled">
+                    <a class="page-link shadow-none" style="white-space: nowrap;">@Localizer["PageOfPages", _page, _pages]</a>
+                </li>
+            </ul>
+        }
+
+    }
+}
 
 @code {
+    private IStringLocalizer Localizer;
     private int _pages = 0;
     private int _page = 1;
     private int _maxItems = 10;
-    private int _maxPages = 5;
+    private int _displayPages = 5;
     private int _startPage = 0;
     private int _endPage = 0;
+    private int _columns = 0;
+    private string _search = "";
+
+    private IEnumerable<TableItem> AllItems;
 
     [Parameter]
-    public string Format { get; set; }
+    public string Format { get; set; } // Table or Grid
 
     [Parameter]
-    public string Toolbar { get; set; }
+    public string Toolbar { get; set; } // Top, Bottom or Both
 
     [Parameter]
-    public RenderFragment Header { get; set; }
+    public RenderFragment Header { get; set; } = null; // only applicable to Table layouts
 
     [Parameter]
-    public RenderFragment<TableItem> Row { get; set; }
+    public RenderFragment<TableItem> Row { get; set; } = null; // required
 
     [Parameter]
-    public RenderFragment<TableItem> Detail { get; set; }
+    public RenderFragment Footer { get; set; } = null; // only applicable to Table layouts
 
     [Parameter]
-    public IEnumerable<TableItem> Items { get; set; }
+    public RenderFragment<TableItem> Detail { get; set; } = null; // only applicable to Table layouts
 
     [Parameter]
-    public string PageSize { get; set; }
+    public IEnumerable<TableItem> Items { get; set; } // the IEnumerable data source
 
     [Parameter]
-    public string DisplayPages { get; set; }
+    public string PageSize { get; set; } // number of items to display on a page
 
     [Parameter]
-    public string Class { get; set; }
+    public string Columns { get; set; } // only applicable to Grid layouts - default is zero indicating use responsive behavior
+
+    [Parameter]
+    public string CurrentPage { get; set; } // sets the initial page to display
+
+    [Parameter]
+    public string DisplayPages { get; set; } // maximum number of page numbers to display for user selection
+
+    [Parameter]
+    public string Class { get; set; } // class for the containing element - ie. <table> for Table or <div> for Grid
+
+    [Parameter]
+    public string RowClass { get; set; } // class for row element - ie. <tr> for Table or <div> for Grid
+
+    [Parameter]
+    public string ColumnClass { get; set; } // class for column element - only applicable to Grid format
+
+    [Parameter]
+    public Action<int> OnPageChange { get; set; } // a method to be executed in the calling component when the page changes
+
+    [Parameter]
+    public string SearchProperties { get; set; } // comma delimited list of property names to include in search
+
+    [Parameter]
+    public string SearchBoxClass { get; set; } // class for Search box
+
+    [Parameter]
+    public string Parameters { get; set; } // optional - querystring parameters in the form of "id=x&name=y" used in static render mode
+
+    [SupplyParameterFromForm(FormName = "PagerForm")]
+    public string _Search { get => ""; set => _search = value; }
+
+    /// <summary>
+    /// Accepted values are Start or Center or End. The default value is Center
+    /// </summary>
+    [Parameter]
+    public string PaginationAlignment { get; set; } = "center"; // Alignment of the Page Numbering start, center, end
 
     private IEnumerable<TableItem> ItemList { get; set; }
 
+    protected override void OnInitialized()
+    {
+        Localizer = LocalizerFactory.Create(GetType().FullName);
+    }
+
     protected override void OnParametersSet()
     {
         if (string.IsNullOrEmpty(Format))
@@ -168,7 +401,45 @@
             }
             else
             {
-                Class = "container";
+                Class = "container-fluid";
+            }
+        }
+
+        if (string.IsNullOrEmpty(RowClass))
+        {
+            if (Format == "Table")
+            {
+                RowClass = "";
+            }
+            else
+            {
+                RowClass = "row";
+            }
+        }
+
+        if (string.IsNullOrEmpty(ColumnClass))
+        {
+            if (Format == "Table")
+            {
+                ColumnClass = "";
+            }
+            else
+            {
+                ColumnClass = "col";
+            }
+        }
+
+        if (PageState.QueryString.ContainsKey("search"))
+        {
+            _search = PageState.QueryString["search"];
+        }
+
+        if (!string.IsNullOrEmpty(SearchProperties))
+        {
+            AllItems = Items; // only used in search
+            if (!string.IsNullOrEmpty(_search))
+            {
+                Search();
             }
         }
 
@@ -177,88 +448,191 @@
             _maxItems = int.Parse(PageSize);
         }
 
-        if (!string.IsNullOrEmpty(DisplayPages))
+        if (!string.IsNullOrEmpty(Columns))
         {
-            _maxPages = int.Parse(DisplayPages);
+            _columns = int.Parse(Columns);
         }
 
-        _page = 1;
+        if (!string.IsNullOrEmpty(DisplayPages))
+        {
+            _displayPages = int.Parse(DisplayPages);
+        }
+
+        if (PageState.QueryString.ContainsKey("page") && int.TryParse(PageState.QueryString["page"], out int page))
+        {
+            _page = page;
+        }
+        else
+        {
+            if (!string.IsNullOrEmpty(CurrentPage))
+            {
+                _page = int.Parse(CurrentPage);
+            }
+            else
+            {
+                _page = 1;
+            }
+        }
+        if (_page < 1) _page = 1;
+
         _startPage = 0;
         _endPage = 0;
 
         if (Items != null)
         {
-            ItemList = Items.Skip((_page - 1) * _maxItems).Take(_maxItems);
             _pages = (int)Math.Ceiling(Items.Count() / (decimal)_maxItems);
+            if (_page > _pages)
+            {
+                _page = _pages;
+            }
+            SetPagerSize();
         }
-
-        SetPagerSize("forward");
     }
 
-    public void UpdateList(int currentPage)
+    public void SetPagerSize()
     {
-        ItemList = Items.Skip((currentPage - 1) * _maxItems).Take(_maxItems);
-        _page = currentPage;
-
+        _startPage = ((_page - 1) / _displayPages) * _displayPages + 1;
+        _endPage = _startPage + _displayPages - 1;
+        if (_endPage > _pages)
+        {
+            _endPage = _pages;
+        }
+        ItemList = Items.Skip((_page - 1) * _maxItems).Take(_maxItems);
         StateHasChanged();
+        OnPageChange?.Invoke(_page);
     }
 
-    public void SetPagerSize(string direction)
+    public void UpdateList(int page)
     {
-        if (direction == "forward")
-        {
-            if (_endPage + 1 < _pages)
-            {
-                _startPage = _endPage + 1;
-            }
-            else
-            {
-                _startPage = 1;
-            }
+        _page = page;
+        SetPagerSize();
+    }
 
-            if (_endPage + _maxPages < _pages)
-            {
-                _endPage = _startPage + _maxPages - 1;
-            }
-            else
-            {
-                _endPage = _pages;
-            }
-
-            StateHasChanged();
-        }
-        else if (direction == "back")
+    public void SkipPages(string direction)
+    {
+        switch (direction)
         {
-            _endPage = _startPage - 1;
-            _startPage = _startPage - _maxPages;
+            case "forward":
+                _page = _endPage + 1;
+                break;
+            case "back":
+                _page = _startPage - 1;
+                break;
         }
+
+        SetPagerSize();
     }
 
     public void NavigateToPage(string direction)
     {
-        if (direction == "next")
+        switch (direction)
         {
-            if (_page < _pages)
-            {
-                if (_page == _endPage)
+            case "next":
+                if (_page < _pages)
                 {
-                    SetPagerSize("forward");
+                    _page += 1;
                 }
-                _page += 1;
-            }
-        }
-        else if (direction == "previous")
-        {
-            if (_page > 1)
-            {
-                if (_page == _startPage)
+                break;
+            case "previous":
+                if (_page > 1)
                 {
-                    SetPagerSize("back");
+                    _page -= 1;
                 }
-                _page -= 1;
-            }
+                break;
         }
 
         UpdateList(_page);
     }
+
+    public void Search()
+    {
+        if (!string.IsNullOrEmpty(_search))
+        {
+            Items = AllItems.Where(item =>
+            {
+                var values = SearchProperties.Split(',')
+                    .Select(itemType => GetPropertyValue(item, itemType))
+                    .Where(value => value != null)
+                    .Select(value => value.ToString().ToLower());
+
+                return values.Any(value => value.Contains(_search.ToLower()));
+            }).ToList();
+        }
+        else
+        {
+            Items = AllItems;
+        }
+        _pages = (int)Math.Ceiling(Items.Count() / (decimal)_maxItems);
+        UpdateList(1);
+    }
+
+    private object GetPropertyValue(object obj, string propertyName)
+    {
+        var index = propertyName.IndexOf(".");
+        if (index != -1)
+        {
+            var propertyInfo = obj.GetType().GetProperty(propertyName.Substring(0, index));
+            if (propertyInfo != null)
+            {
+                return GetPropertyValue(propertyInfo.GetValue(obj), propertyName.Substring(index + 1));
+            }
+            return null;
+        }
+        else
+        {
+            var propertyInfo = obj.GetType().GetProperty(propertyName);
+            if (propertyInfo != null)
+            {
+                return propertyInfo.GetValue(obj);
+            }
+            return null;
+        }
+    }
+
+    public void Reset()
+    {
+        _search = "";
+        Items = AllItems;
+        _pages = (int)Math.Ceiling(Items.Count() / (decimal)_maxItems);
+        UpdateList(1);
+    }
+
+    private string FormatSearchProperties()
+    {
+        var properties = new List<string>();
+        foreach (var property in SearchProperties.Split(',', StringSplitOptions.RemoveEmptyEntries))
+        {
+            var index = property.LastIndexOf(".");
+            if (index != -1)
+            {
+                properties.Add(property.Substring(index + 1));
+            }
+            else
+            {
+                properties.Add(property);
+            }
+        }
+        return string.Join(",", properties);
+    }
+
+    private string PageUrl(int page, string search)
+    {
+        var parameters = new Dictionary<string, string>(PageState.QueryString);
+        if (parameters.ContainsKey("page")) parameters.Remove("page");
+        parameters.Add("page", page.ToString());
+        if (parameters.ContainsKey("search")) parameters.Remove("search");
+        if (!string.IsNullOrEmpty(search))
+        {
+            parameters.Add("search", search);
+        }
+        if (!string.IsNullOrEmpty(Parameters))
+        {
+            foreach (var parameter in Utilities.ParseQueryString(Parameters))
+            {
+                if (parameters.ContainsKey(parameter.Key)) parameters.Remove(parameter.Key);
+                parameters.Add(parameter.Key, parameter.Value);
+            }
+        }
+        return PageState.Route.AbsolutePath + Utilities.CreateQueryString(parameters);
+    }
 }

Oqtane.Client/Modules/Controls/PermissionGrid.razor

@@ -1,237 +1,335 @@
 @namespace Oqtane.Modules.Controls
+@using System.Text.Json
 @inherits ModuleControlBase
 @inject IRoleService RoleService
 @inject IUserService UserService
+@inject IUserRoleService UserRoleService
 @inject IStringLocalizer<PermissionGrid> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_permissions != null)
 {
-    <br />
-    <table class="table table-borderless" style="width: 50%; min-width: 250px;">
-        <tbody>
-            <tr>
-                <th scope="col">@Localizer["Role"]</th>
-                @foreach (PermissionString permission in _permissions)
-                {
-                    <th style="text-align: center; width: 1px;">@Localizer[permission.PermissionName]</th>
-                }
-            </tr>
-            @foreach (Role role in _roles)
-            {
-                <tr>
-                    <td>@role.Name</td>
-                    @foreach (PermissionString permission in _permissions)
-                    {
-                        var p = permission;
-                        <td style="text-align: center;">
-                            <TriStateCheckBox Value=@GetPermissionValue(p.Permissions, role.Name) Disabled=@GetPermissionDisabled(role.Name) OnChange="@(e => PermissionChanged(e, p.PermissionName, role.Name))" />
-                        </td>
-                    }
-                </tr>
-            }
-        </tbody>
-    </table>
-    @if (_users.Count != 0)
-    {
-        <table class="table table-borderless" style="width: 50%; min-width: 250px;">
-            <thead>
-                <tr>
-                    <th scope="col">@Localizer["User"]</th>
-                    @foreach (PermissionString permission in _permissions)
-                    {
-                        <th style="text-align: center; width: 1px;">@Localizer[permission.PermissionName]</th>
-                    }
-                </tr>
-            </thead>
-            <tbody>
-                @foreach (User user in _users)
-                {
-                    string userid = "[" + user.UserId.ToString() + "]";
+<div class="container">
+    <div class="row">
+        <div class="col">
+            <table class="table table-borderless">
+                <tbody>
                     <tr>
-                        <td>@user.DisplayName</td>
-                        @foreach (PermissionString permission in _permissions)
+                        <th scope="col">@Localizer["Role"]</th>
+                        @foreach (var permissionname in _permissionnames)
                         {
-                            var p = permission;
-                            <td style="text-align: center; width: 1px;">
-                                <TriStateCheckBox Value=@GetPermissionValue(p.Permissions, userid) Disabled=false OnChange="@(e => PermissionChanged(e, p.PermissionName, userid))" />
-                            </td>
-                        }
+							<th style="text-align: center; width: 1px;">@((MarkupString)DisplayPermissionName(permissionname).Replace(" ", "<br />"))</th>
+						}
                     </tr>
-                }
-            </tbody>
-        </table>
-    }
-    <table class="table table-borderless" style="width: 50%; min-width: 250px;">
-        <tbody>
-            <tr>
-                <td class="input-group">
-                    <input type="text" name="Username" class="form-control" placeholder="@Localizer["Username.Enter"]" @bind="@_username" />
-                    <button type="button" class="btn btn-primary" @onclick="AddUser">@SharedLocalizer["Add"]</button>
-                </td>
-            </tr>
-        </tbody>
-    </table>
-    <br />
-    <ModuleMessage Type="MessageType.Error" Message="@_message" />
+                    @foreach (Role role in _roles)
+                    {
+                        <tr>
+                            <td>@role.Name</td>
+                            @foreach (var permissionname in _permissionnames)
+                            {
+                                <td style="text-align: center;">
+									<TriStateCheckBox Value=@GetPermissionValue(permissionname, role.Name, -1) Disabled="@GetPermissionDisabled(permissionname, role.Name)" OnChange="@(e => PermissionChanged(e, permissionname, role.Name, -1))" />
+                                </td>
+                            }
+                        </tr>
+                    }
+                </tbody>
+            </table>
+            <br />
+        </div>
+    </div>
+    <div class="row">
+        <div class="col">
+            @if (_users.Count != 0)
+            {
+                <div class="row">
+                    <div class="col">
+                    </div>
+                </div>
+                <table class="table table-borderless">
+                    <thead>
+                        <tr>
+                            <th scope="col">@Localizer["User"]</th>
+								@foreach (var permissionname in _permissionnames)
+								{
+									<th style="text-align: center; width: 1px;">@((MarkupString)DisplayPermissionName(permissionname).Replace(" ", "<br />"))</th>
+								}
+							</tr>
+                    </thead>
+                    <tbody>
+                        @foreach (User user in _users)
+                        {
+                            <tr>
+                                <td>@user.DisplayName (@user.Username)</td>
+                                @foreach (var permissionname in _permissionnames)
+                                {
+                                    <td style="text-align: center; width: 1px;">
+										<TriStateCheckBox Value=@GetPermissionValue(permissionname, "", user.UserId) Disabled="@GetPermissionDisabled(permissionname, "")" OnChange="@(e => PermissionChanged(e, permissionname, "", user.UserId))" />
+                                    </td>
+                                }
+                            </tr>
+                        }
+                    </tbody>
+                </table>
+                <br />
+            }
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-11">
+			<AutoComplete OnSearch="GetUsers" Placeholder="@Localizer["Username.Enter"]" @ref="_user" />
+		</div>
+		<div class="col-1">
+			<button type="button" class="btn btn-primary" @onclick="AddUser">@SharedLocalizer["Add"]</button>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col">
+            <ModuleMessage Type="MessageType.Warning" Message="@_message" />
+        </div>
+    </div>
+</div>
 }
 
 @code {
-    private string _permissionnames = string.Empty;
-    private List<Role> _roles;
-    private List<PermissionString> _permissions;
-    private List<User> _users = new List<User>();
-    private string _username = string.Empty;
-    private string _message = string.Empty;
+	private List<string> _permissionnames;
+	private List<Permission> _permissions;
+	private List<Role> _roles;
+	private List<User> _users = new List<User>();
+	private AutoComplete _user;
+	private string _message = string.Empty;
 
-    [Parameter]
-    public string EntityName { get; set; }
+	[Parameter]
+	public string EntityName { get; set; }
 
-    [Parameter]
-    public string PermissionNames { get; set; }
+	[Parameter]
+	public string PermissionNames { get; set; }
 
-    [Parameter]
-    public string Permissions { get; set; }
+	[Parameter]
+	public string Permissions { get; set; } // deprecated - use PermissionList instead
+
+	[Parameter]
+	public List<Permission> PermissionList { get; set; }
 
     protected override async Task OnInitializedAsync()
-    {
-        if (string.IsNullOrEmpty(PermissionNames))
-        {
-            _permissionnames = Shared.PermissionNames.View + "," + Shared.PermissionNames.Edit;
-        }
-        else
-        {
-            _permissionnames = PermissionNames;
-        }
+	{
+		if (!string.IsNullOrEmpty(Permissions))
+		{
+			PermissionList = JsonSerializer.Deserialize<List<Permission>>(Permissions);			
+		}
 
-        _roles = await RoleService.GetRolesAsync(ModuleState.SiteId);
-        _roles.Insert(0, new Role { Name = RoleNames.Everyone });
+		_roles = await RoleService.GetRolesAsync(ModuleState.SiteId, true);
+		if (!UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+		{
+			_roles.RemoveAll(item => item.Name == RoleNames.Host);
+		}
 
-        _permissions = new List<PermissionString>();
+		// get permission names
+		if (string.IsNullOrEmpty(PermissionNames))
+		{
+			_permissionnames = new List<string>();
+			_permissionnames.Add(Shared.PermissionNames.View);
+			_permissionnames.Add(Shared.PermissionNames.Edit);
+		}
+		else
+		{
+			_permissionnames = PermissionNames.Split(',', StringSplitOptions.RemoveEmptyEntries).ToList();
+		}
 
-        foreach (string permissionname in _permissionnames.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
-        {
-            // initialize with admin role
-            _permissions.Add(new PermissionString { PermissionName = permissionname, Permissions = RoleNames.Admin });
-        }
+		// initialize permissions
+		_permissions = new List<Permission>();
+		if (PermissionList != null && PermissionList.Any())
+		{
+			foreach (var permission in PermissionList)
+			{
+				_permissions.Add(permission);
+				if (permission.UserId != null)
+				{
+					if (!_users.Any(item => item.UserId == permission.UserId.Value))
+					{
+						_users.Add(await UserService.GetUserAsync(permission.UserId.Value, ModuleState.SiteId));
+					}
+				}
+			}
+		}
+		else
+		{
+			foreach (string permissionname in _permissionnames)
+			{
+				// permission names can be in the form of "EntityName:PermissionName:Roles"
+				if (permissionname.Contains(":"))
+				{
+					var segments = permissionname.Split(':');
+					if (segments.Length == 3)
+					{
+						foreach (var role in segments[2].Split(';'))
+						{
+							_permissions.Add(new Permission(ModuleState.SiteId, segments[0], segments[1], role, null, true));
+						}
+						// ensure admin access
+						if (!_permissions.Any(item => item.EntityName == segments[0] && item.PermissionName == segments[1] && item.RoleName == RoleNames.Admin))
+						{
+							_permissions.Add(new Permission(ModuleState.SiteId, segments[0], segments[1], RoleNames.Admin, null, true));
+						}
+					}
+				}
+				else
+				{
+					_permissions.Add(new Permission(ModuleState.SiteId, EntityName, permissionname, RoleNames.Admin, null, true));
+				}
+			}
+		}
+	}
 
-        if (!string.IsNullOrEmpty(Permissions))
-        {
-            // populate permissions
-            foreach (PermissionString permissionstring in UserSecurity.GetPermissionStrings(Permissions))
-            {
-                if (_permissions.Find(item => item.PermissionName == permissionstring.PermissionName) != null)
-                {
-                    _permissions[_permissions.FindIndex(item => item.PermissionName == permissionstring.PermissionName)].Permissions = permissionstring.Permissions;
-                }
+	private string GetPermissionName(string permissionName)
+	{
+		return (permissionName.Contains(":")) ? permissionName.Split(':')[1] : permissionName;
+	}
 
-                if (permissionstring.Permissions.Contains("["))
-                {
-                    foreach (string user in permissionstring.Permissions.Split(new char[] { '[' }, StringSplitOptions.RemoveEmptyEntries))
-                    {
-                        if (user.Contains("]"))
-                        {
-                            var userid = int.Parse(user.Substring(0, user.IndexOf("]")));
-                            if (_users.Where(item => item.UserId == userid).FirstOrDefault() == null)
-                            {
-                                _users.Add(await UserService.GetUserAsync(userid, ModuleState.SiteId));
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
+	private string GetEntityName(string permissionName)
+	{
+		return (permissionName.Contains(":")) ? permissionName.Split(':')[0] : EntityName;
+	}
 
-    private bool? GetPermissionValue(string permissions, string securityKey)
-    {
-        if ((";" + permissions + ";").Contains(";" + "!" + securityKey + ";"))
-        {
-            return false; // deny permission
-        }
-        else
-        {
-            if ((";" + permissions + ";").Contains(";" + securityKey + ";"))
-            {
-                return true; // grant permission
-            }
-            else
-            {
-                return null; // not specified
-            }
-        }
-    }
+	private string DisplayPermissionName(string permissionName)
+	{
+		var name = Localizer[GetPermissionName(permissionName)].ToString();
+		name += " " + Localizer[GetEntityName(permissionName)].ToString();
+		return name;
+	}
 
-    private bool GetPermissionDisabled(string roleName)
-        => roleName == RoleNames.Admin
-            ? true
-            : false;
+	private bool? GetPermissionValue(string permissionName, string roleName, int userId)
+	{
+		bool? isauthorized = null;
+		if (roleName != "")
+		{
+			var permission = _permissions.FirstOrDefault(item => item.EntityName == GetEntityName(permissionName) && item.PermissionName == GetPermissionName(permissionName) && item.RoleName == roleName);
+			if (permission != null)
+			{
+				isauthorized = permission.IsAuthorized;
+			}
+		}
+		else
+		{
+			var permission = _permissions.FirstOrDefault(item => item.EntityName == GetEntityName(permissionName) && item.PermissionName == GetPermissionName(permissionName) && item.UserId == userId);
+			if (permission != null)
+			{
+				isauthorized = permission.IsAuthorized;
+			}			
+		}
+		return isauthorized;
+	}
 
-    private async Task AddUser()
-    {
-        if (_users.Where(item => item.Username == _username).FirstOrDefault() == null)
-        {
-            try
-            {
-                var user = await UserService.GetUserAsync(_username, ModuleState.SiteId);
-                if (user != null)
-                {
-                    _users.Add(user);
-                }
-            }
-            catch
-            {
-                _message = Localizer["Message.Username.DontExist"];
-            }
-        }
+	private bool GetPermissionDisabled(string permissionName, string roleName)
+	{
+		if (roleName == RoleNames.Admin && !UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+		{
+			return true;
+		}
+		else
+		{
+			if (GetEntityName(permissionName) != EntityName && !UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
+			{
+				return true;
+			}
+			else
+			{
+				return false;
+			}
+		}
+	}
 
-        _username = string.Empty;
-    }
+	private void PermissionChanged(bool? value, string permissionName, string roleName, int userId)
+	{
+		if (roleName != "")
+		{
+			var permission = _permissions.FirstOrDefault(item => item.EntityName == GetEntityName(permissionName) && item.PermissionName == GetPermissionName(permissionName) && item.RoleName == roleName);
+			if (permission != null)
+			{
+				_permissions.Remove(permission);
+			}
+			if (value != null)
+			{
+				_permissions.Add(new Permission(ModuleState.SiteId, GetEntityName(permissionName), GetPermissionName(permissionName), roleName, null, value.Value));
+			}
+		}
+		else
+		{
+			var permission = _permissions.FirstOrDefault(item => item.EntityName == GetEntityName(permissionName) && item.PermissionName == GetPermissionName(permissionName) && item.UserId == userId);
+			if (permission != null)
+			{
+				_permissions.Remove(permission);
+			}
+			if (value != null)
+			{
+				_permissions.Add(new Permission(ModuleState.SiteId, GetEntityName(permissionName), GetPermissionName(permissionName), null, userId, value.Value));
+			}
+		}
+	}
 
-    private void PermissionChanged(bool? value, string permissionName, string securityId)
-    {
-        var selected = value;
-        var permission = _permissions.Find(item => item.PermissionName == permissionName);
-        if (permission != null)
-        {
-            var ids = permission.Permissions.Split(';').ToList();
+	private async Task<Dictionary<string, string>> GetUsers(string filter)
+	{
+		var users = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, RoleNames.Registered);
+        return users.Where(item => item.User.DisplayName.Contains(filter, StringComparison.OrdinalIgnoreCase) || item.User.Username.Contains(filter, StringComparison.OrdinalIgnoreCase))
+			.ToDictionary(item => item.UserId.ToString(), item => item.User.DisplayName + " (" + item.User.Username + ")");
+	}
 
-            ids.Remove(securityId); // remove grant permission
-            ids.Remove("!" + securityId); // remove deny permission
+	private async Task AddUser()
+	{
+		if (!string.IsNullOrEmpty(_user.Key))
+		{
+			var user = await UserService.GetUserAsync(int.Parse(_user.Key), ModuleState.SiteId);
+			if (user != null && !_users.Any(item => item.UserId == user.UserId))
+			{
+				_users.Add(user);
+			}
+		}
+		else
+		{
+			_message = Localizer["Message.Username.DontExist"];
+		}
+		_user.Clear();
+	}
 
-            switch (selected)
-            {
-                case true:
-                    ids.Add(securityId); // add grant permission
-                    break;
-                case false:
-                    ids.Add("!" + securityId); // add deny permission
-                    break;
-                case null:
-                    break; // permission not specified
-            }
+	public string GetPermissions()
+	{
+		ValidatePermissions();
+		return JsonSerializer.Serialize(_permissions);
+	}
 
-            _permissions[_permissions.FindIndex(item => item.PermissionName == permissionName)].Permissions = string.Join(";", ids.ToArray());
-        }
-    }
+	public List<Permission> GetPermissionList()
+	{
+		ValidatePermissions();
+		return _permissions;
+	}
 
-    public string GetPermissions()
-    {
-        ValidatePermissions();
-        return UserSecurity.SetPermissionStrings(_permissions);
-    }
-
-    private void ValidatePermissions()
-    {
-        PermissionString permission;
-        for (int i = 0; i < _permissions.Count; i++)
-        {
-            permission = _permissions[i];
-            List<string> ids = permission.Permissions.Split(';').ToList();
-            ids.Remove("!" + RoleNames.Everyone); // remove deny all users
-            ids.Remove("!" + RoleNames.Registered); // remove deny registered users
-            permission.Permissions = string.Join(";", ids.ToArray());
-            _permissions[i] = permission;
-        }
+	private void ValidatePermissions()
+	{
+		// remove deny all users, unauthenticated, and registered users
+		var permissions = _permissions.Where(item => !item.IsAuthorized && 
+			(item.RoleName == RoleNames.Everyone || item.RoleName == RoleNames.Unauthenticated || item.RoleName == RoleNames.Registered)).ToList();
+		foreach (var permission in permissions)
+		{
+			_permissions.Remove(permission);
+		}
+		if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+		{
+			// remove deny administrators and host users
+			permissions = _permissions.Where(item => !item.IsAuthorized &&
+				(item.RoleName == RoleNames.Admin || item.RoleName == RoleNames.Host)).ToList();
+			foreach (var permission in permissions)
+			{
+				_permissions.Remove(permission);
+			}
+			foreach (var permissionname in _permissionnames)
+			{
+				// add administrators role if neither host or administrator is assigned
+				if (!_permissions.Any(item => item.EntityName == GetEntityName(permissionname) && item.PermissionName == GetPermissionName(permissionname) &&
+					(item.RoleName == RoleNames.Admin || item.RoleName == RoleNames.Host)))
+				{
+					_permissions.Add(new Permission(ModuleState.SiteId, GetEntityName(permissionname), GetPermissionName(permissionname), RoleNames.Admin, null, true));
+				}
+			}
+		}
     }
 }

Oqtane.Client/Modules/Controls/QuillEditorInterop.cs

@@ -4,11 +4,11 @@ using System.Threading.Tasks;
 
 namespace Oqtane.Modules.Controls
 {
-    public class RichTextEditorInterop
+    public class QuillEditorInterop
     {
         private readonly IJSRuntime _jsRuntime;
 
-        public RichTextEditorInterop(IJSRuntime jsRuntime)
+        public QuillEditorInterop(IJSRuntime jsRuntime)
         {
             _jsRuntime = jsRuntime;
         }
@@ -105,13 +105,25 @@ namespace Oqtane.Modules.Controls
             }
         }
 
-        public Task InsertImage(ElementReference quillElement, string imageUrl, string altText)
+        public ValueTask<int> GetCurrentCursor(ElementReference quillElement)
+        {
+            try
+            {
+                return _jsRuntime.InvokeAsync<int>("Oqtane.RichTextEditor.getCurrentCursor", quillElement);
+            }
+            catch
+            {
+                return new ValueTask<int>(Task.FromResult(0));
+            }
+        }
+
+        public Task InsertImage(ElementReference quillElement, string imageUrl, string altText, int editorIndex)
         {
             try
             {
                 _jsRuntime.InvokeAsync<object>(
                     "Oqtane.RichTextEditor.insertQuillImage",
-                    quillElement, imageUrl, altText);
+                    quillElement, imageUrl, altText, editorIndex);
                 return Task.CompletedTask;
             }
             catch