Merge pull request #2200 from oqtane/master

Merge pull request #2199 from oqtane/dev

.gitignore

@@ -12,9 +12,7 @@ msbuild.binlog
 *.idea
 
 Oqtane.Server/appsettings.json
-Oqtane.Server/Data/*.mdf
+Oqtane.Server/Data
-Oqtane.Server/Data/*.ldf
-Oqtane.Server/Data/*.db
 
 /Oqtane.Server/Properties/PublishProfiles/FolderProfile.pubxml
 Oqtane.Server/Content
@@ -22,3 +20,10 @@ Oqtane.Server/Packages
 Oqtane.Server/wwwroot/Content
 Oqtane.Server/wwwroot/Packages/*.log
 
+Oqtane.Server/wwwroot/Modules
+!Oqtane.Server/wwwroot/Modules/Oqtane.Modules.*
+!Oqtane.Server/wwwroot/Modules/Templates
+
+Oqtane.Server/wwwroot/Themes
+!Oqtane.Server/wwwroot/Themes/Oqtane.Themes.*
+!Oqtane.Server/wwwroot/Themes/Templates

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2021 .NET Foundation
+Copyright (c) 2018-2022 .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

@@ -15,7 +15,7 @@
             <div style="@_display">
                 <CascadingAuthenticationState>
                     <CascadingValue Value="@PageState">
-                        <SiteRouter Runtime="@Runtime" RenderMode="@RenderMode" OnStateChange="@ChangeState" />
+                        <SiteRouter Runtime="@Runtime" RenderMode="@RenderMode" VisitorId="@VisitorId" OnStateChange="@ChangeState" />
                     </CascadingValue>
                 </CascadingAuthenticationState>
             </div>
@@ -30,53 +30,48 @@
 }
 
 @code {
-    [Parameter]
+	[Parameter]
-    public string AntiForgeryToken { get; set; }
+	public string AntiForgeryToken { get; set; }
 
-    [Parameter]
+	[Parameter]
-    public string Runtime { get; set; }
+	public string Runtime { get; set; }
 
-    [Parameter]
+	[Parameter]
-    public string RenderMode { get; set; }
+	public string RenderMode { get; set; }
 
-    private bool _initialized = false;
+	[Parameter]
-    private string _display = "display: none;";
+	public int VisitorId { get; set; }
-    private Installation _installation = new Installation { Success = false, Message = "" };
 
-    private PageState PageState { get; set; }
+	[Parameter]
+	public string RemoteIPAddress { get; set; }
 
-    protected override async Task OnParametersSetAsync()
+	[Parameter]
-    {
+	public string AuthorizationToken { get; set; }
-        SiteState.AntiForgeryToken = AntiForgeryToken;
+
-        InstallationService.SetAntiForgeryTokenHeader(AntiForgeryToken);
+	private bool _initialized = false;
+	private string _display = "display: none;";
+	private Installation _installation = new Installation { Success = false, Message = "" };
+
+	private PageState PageState { get; set; }
+
+	protected override async Task OnParametersSetAsync()
+	{
+		SiteState.RemoteIPAddress = RemoteIPAddress;
+		SiteState.AntiForgeryToken = AntiForgeryToken;
+		SiteState.AuthorizationToken = AuthorizationToken;
 
         _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;
     }
 
-    protected override async Task OnAfterRenderAsync(bool firstRender)
+    protected override void OnAfterRender(bool firstRender)
     {
         if (firstRender)
         {
-            if (string.IsNullOrEmpty(AntiForgeryToken))
-            {
-                // parameter values are not set when running on WebAssembly (seems to be a .NET 5 bug) - need to retrieve using JSInterop
-                var interop = new Interop(JSRuntime);
-
-                SiteState.AntiForgeryToken = await interop.GetElementByName(Constants.RequestVerificationToken);
-                InstallationService.SetAntiForgeryTokenHeader(SiteState.AntiForgeryToken);
-
-                Runtime = await interop.GetElementByName("app_runtime");
-                RenderMode = await interop.GetElementByName("app_rendermode");
-            }
             _display = "";
             StateHasChanged();
         }

Oqtane.Client/Extensions/OqtaneServiceCollectionExtensions.cs

@@ -46,6 +46,8 @@ 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>();
 
             return services;

Oqtane.Client/Installer/Controls/LocalDBConfig.razor

@@ -24,7 +24,7 @@
 
         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

@@ -28,7 +28,7 @@
 <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">
-        <input id="pwd" type="password" class="form-control" @bind="@_pwd" />
+        <input id="pwd" type="password" class="form-control" @bind="@_pwd" autocomplete="new-password" />
     </div>
 </div>
 

Oqtane.Client/Installer/Controls/PostgreSQLConfig.razor

@@ -40,7 +40,7 @@
     <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">
-            <input id="pwd" type="password" class="form-control" @bind="@_pwd" />
+            <input id="pwd" type="password" class="form-control" @bind="@_pwd" autocomplete="new-password" />
         </div>
     </div>
 }

Oqtane.Client/Installer/Controls/SqlServerConfig.razor

@@ -1,6 +1,7 @@
 @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" ResourceKey="Server">Server:</Label>
@@ -34,10 +35,31 @@
     <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">
-            <input id="pwd" type="password" class="form-control" @bind="@_pwd" />
+            <input id="pwd" type="password" class="form-control" @bind="@_pwd" autocomplete="new-password" />
         </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" 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 = String.Empty;
@@ -45,6 +67,8 @@
     private string _security = "integrated";
     private string _uid = String.Empty;
     private string _pwd = String.Empty;
+    private string _encryption = "false";
+    private string _trustservercertificate = "false";
 
     public string GetConnectionString()
     {
@@ -61,15 +85,10 @@
         }
         else
         {
-            if (!String.IsNullOrEmpty(_uid) && !String.IsNullOrEmpty(_pwd))
+            connectionString += $"User ID={_uid};Password={_pwd};";
-            {
-                connectionString += $"User ID={_uid};Password={_pwd};";
-            }
-            else
-            {
-                connectionString = String.Empty;
-            }
         }
+		connectionString += $"Encrypt={_encryption};";
+		connectionString += $"TrustServerCertificate={_trustservercertificate};";
 
         return connectionString;
     }

Oqtane.Client/Installer/Installer.razor

@@ -24,10 +24,10 @@
                 <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">
-                        <select id="databasetype" class="form-select custom-select" value="@_databaseName" @onchange="(e => DatabaseChanged(e))">
+                        @if (_databases != null)
-                            @if (_databases != null)
+                        {
-                            {
+							<select id="databasetype" class="form-select custom-select" value="@_databaseName" @onchange="(e => DatabaseChanged(e))">
-                                foreach (var database in _databases)
+                                @foreach (var database in _databases)
                                 {
                                     if (database.IsDefault)
                                     {
@@ -38,8 +38,8 @@
                                         <option value="@database.Name">@Localizer[@database.Name]</option>
                                     }
                                 }
-                            }
+							</select>
-                        </select>
+                        }
                     </div>
                 </div>
                 @{
@@ -62,13 +62,19 @@
                 <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">
-                        <input id="password" type="password" class="form-control" @bind="@_hostPassword" />
+						<div class="input-group">
+							<input id="password" type="@_passwordtype" class="form-control" @bind="@_hostPassword" autocomplete="new-password" />
+							<button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_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">
-                        <input id="confirm" type="password" class="form-control" @bind="@_confirmPassword" />
+						<div class="input-group">
+							<input id="confirm" type="@_passwordtype" class="form-control" @bind="@_confirmPassword" autocomplete="new-password" />
+							<button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+						</div>
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
@@ -96,111 +102,143 @@
 </div>
 
 @code {
-    private List<Database> _databases;
+	private List<Database> _databases;
-    private string _databaseName = "LocalDB";
+	private string _databaseName;
-    private Type _databaseConfigType;
+	private Type _databaseConfigType;
-    private object _databaseConfig;
+	private object _databaseConfig;
-    private RenderFragment DatabaseConfigComponent { get; set; }
+	private RenderFragment DatabaseConfigComponent { get; set; }
 
-    private string _hostUsername = string.Empty;
+	private string _hostUsername = string.Empty;
-    private string _hostPassword = string.Empty;
+	private string _hostPassword = string.Empty;
-    private string _confirmPassword = string.Empty;
+	private string _passwordtype = "password";
-    private string _hostEmail = string.Empty;
+	private string _togglepassword = string.Empty;
-    private bool _register = true;
+	private string _confirmPassword = string.Empty;
-    private string _message = string.Empty;
+	private string _hostEmail = string.Empty;
-    private string _loadingDisplay = "display: none;";
+	private bool _register = true;
+	private string _message = string.Empty;
+	private string _loadingDisplay = "display: none;";
 
-    protected override async Task OnInitializedAsync()
+	protected override async Task OnInitializedAsync()
-    {
+	{
-        _databases = await DatabaseService.GetDatabasesAsync();
+		_togglepassword = SharedLocalizer["ShowPassword"];
-        LoadDatabaseConfigComponent();
+		_databases = await DatabaseService.GetDatabasesAsync();
-    }
+		if (_databases.Exists(item => item.IsDefault))
+		{
+			_databaseName = _databases.Find(item => item.IsDefault).Name;
+		}
+		else
+		{
+			_databaseName = "LocalDB";
+		}
+		LoadDatabaseConfigComponent();
+	}
 
-    private void DatabaseChanged(ChangeEventArgs eventArgs)
+	private void DatabaseChanged(ChangeEventArgs eventArgs)
-    {
+	{
-        try
+		try
-        {
+		{
-            _databaseName = (string)eventArgs.Value;
+			_databaseName = (string)eventArgs.Value;
 
-            LoadDatabaseConfigComponent();
+			LoadDatabaseConfigComponent();
-        }
+		}
-        catch
+		catch
-        {
+		{
-            _message = Localizer["Error.DbConfig.Load"];
+			_message = Localizer["Error.DbConfig.Load"];
-        }
+		}
-    }
+	}
 
-    private void LoadDatabaseConfigComponent()
+	private void LoadDatabaseConfigComponent()
-    {
+	{
-        var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
+		var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
-        if (database != null)
+		if (database != null)
-        {
+		{
-            _databaseConfigType = Type.GetType(database.ControlType);
+			_databaseConfigType = Type.GetType(database.ControlType);
-            DatabaseConfigComponent = builder =>
+			DatabaseConfigComponent = builder =>
-            {
+			{
-                builder.OpenComponent(0, _databaseConfigType);
+				builder.OpenComponent(0, _databaseConfigType);
-                builder.AddComponentReferenceCapture(1, inst => { _databaseConfig = Convert.ChangeType(inst, _databaseConfigType); });
+				builder.AddComponentReferenceCapture(1, inst => { _databaseConfig = Convert.ChangeType(inst, _databaseConfigType); });
-                builder.CloseComponent();
+				builder.CloseComponent();
-            };
+			};
-        }
+		}
-    }
+	}
 
-    protected override async Task OnAfterRenderAsync(bool firstRender)
+	protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
+	{
-        if (firstRender)
+		if (firstRender)
-        {
+		{
-            var interop = new Interop(JSRuntime);
+			var interop = new Interop(JSRuntime);
-            await interop.IncludeLink("", "stylesheet", "https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css", "text/css", "sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC", "anonymous", "");
+			await interop.IncludeLink("", "stylesheet", "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.3/css/bootstrap.min.css", "text/css", "sha512-GQGU0fMMi238uA+a/bdWJfpUGKUkBdgfFdgBm72SUQ6BeyWjoY/ton0tEjH+OSH9iP4Dfh+7HM0I9f5eR0L/4w==", "anonymous", "");
-            await interop.IncludeScript("", "https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js", "sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM", "anonymous", "", "head", "");
+			await interop.IncludeScript("", "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.3/js/bootstrap.bundle.min.js", "sha512-pax4MlgXjHEPfCwcJLQhigY7+N8rt6bVvWLFyUMuxShv170X53TRzGPmPkZmGBhk+jikR8WBM4yl7A9WMHHqvg==", "anonymous", "", "head");
-        }
+		}
-    }
+	}
 
-    private async Task Install()
+	private async Task Install()
-    {
+	{
-        var connectionString = String.Empty;
+		var connectionString = String.Empty;
-        if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
+		if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
-        {
+		{
-            connectionString = databaseConfigControl.GetConnectionString();
+			connectionString = databaseConfigControl.GetConnectionString();
-        }
+		}
 
-        if (connectionString != "" && !string.IsNullOrEmpty(_hostUsername) && _hostPassword.Length >= 6 && _hostPassword == _confirmPassword && !string.IsNullOrEmpty(_hostEmail) && _hostEmail.Contains("@"))
+		if (connectionString != "" && !string.IsNullOrEmpty(_hostUsername) && !string.IsNullOrEmpty(_hostPassword) && _hostPassword == _confirmPassword && !string.IsNullOrEmpty(_hostEmail) && _hostEmail.Contains("@"))
-        {
+		{
-            _loadingDisplay = "";
+			if (await UserService.ValidatePasswordAsync(_hostPassword))
-            StateHasChanged();
+			{
+				_loadingDisplay = "";
+				StateHasChanged();
 
-            Uri uri = new Uri(NavigationManager.Uri);
+				Uri uri = new Uri(NavigationManager.Uri);
 
-            var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
+				var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
 
-            var config = new InstallConfig
+				var config = new InstallConfig
-            {
+				{
-                DatabaseType = database.DBType,
+					DatabaseType = database.DBType,
-                ConnectionString = connectionString,
+					ConnectionString = connectionString,
-                Aliases = uri.Authority,
+					Aliases = uri.Authority,
-                HostUsername = _hostUsername,
+					HostUsername = _hostUsername,
-                HostPassword = _hostPassword,
+					HostPassword = _hostPassword,
-                HostEmail = _hostEmail,
+					HostEmail = _hostEmail,
-                HostName = _hostUsername,
+					HostName = _hostUsername,
-                TenantName = TenantNames.Master,
+					TenantName = TenantNames.Master,
-                IsNewTenant = true,
+					IsNewTenant = true,
-                SiteName = Constants.DefaultSite,
+					SiteName = Constants.DefaultSite,
-                Register = _register
+					Register = _register
-            };
+				};
 
-            var installation = await InstallationService.Install(config);
+				var installation = await InstallationService.Install(config);
-            if (installation.Success)
+				if (installation.Success)
-            {
+				{
-                NavigationManager.NavigateTo(uri.Scheme + "://" + uri.Authority, true);
+					NavigationManager.NavigateTo(uri.Scheme + "://" + uri.Authority, true);
-            }
+				}
-            else
+				else
-            {
+				{
-                _message = installation.Message;
+					_message = installation.Message;
-                _loadingDisplay = "display: none;";
+					_loadingDisplay = "display: none;";
-            }
+				}				
+			}
+			else
+			{
+				_message = Localizer["Message.Password.Invalid"];				
+			}
         }
         else
         {
             _message = Localizer["Message.Require.DbInfo"];
         }
     }
+
+	private void TogglePassword()
+	{
+		if (_passwordtype == "password")
+		{
+			_passwordtype = "text";
+			_togglepassword = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_passwordtype = "password";
+			_togglepassword = SharedLocalizer["ShowPassword"];
+		}
+	}
 }

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

@@ -13,7 +13,7 @@
             <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" />
+                    <FileManager UploadMultiple="true" ShowFiles="false" FolderId="@_folderId" ShowSuccess="true" />
                 </div>
             </div>
         </div>

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

@@ -36,7 +36,9 @@
                     <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>
@@ -95,82 +97,89 @@
 </form>
 
 @code {
-    private ElementReference form;
+	private ElementReference form;
-    private bool validated = false;
+	private bool validated = false;
-    private int _jobId;
+	private int _jobId;
-    private string _name = string.Empty;
+	private string _name = string.Empty;
-    private string _jobType = string.Empty;
+	private string _jobType = string.Empty;
-    private string _isEnabled = "True";
+	private string _isEnabled = "True";
-    private string _interval = string.Empty;
+	private string _interval = string.Empty;
-    private string _frequency = string.Empty;
+	private string _frequency = string.Empty;
-    private DateTime? _startDate = null;
+	private DateTime? _startDate = null;
-    private string _startTime = string.Empty;
+	private string _startTime = string.Empty;
-    private DateTime? _endDate = null;
+	private DateTime? _endDate = null;
-    private string _endTime = string.Empty;
+	private string _endTime = string.Empty;
-    private string _retentionHistory = string.Empty;
+	private string _retentionHistory = string.Empty;
-    private DateTime? _nextDate = null;
+	private DateTime? _nextDate = null;
-    private string _nextTime = string.Empty;
+	private string _nextTime = string.Empty;
-    private string createdby;
+	private string createdby;
-    private DateTime createdon;
+	private DateTime createdon;
-    private string modifiedby;
+	private string modifiedby;
-    private DateTime modifiedon;
+	private DateTime modifiedon;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-    protected override async Task OnInitializedAsync()
+	protected override async Task OnInitializedAsync()
-    {
+	{
-        try
+		try
-        {
+		{
-            _jobId = Int32.Parse(PageState.QueryString["id"]);
+			_jobId = Int32.Parse(PageState.QueryString["id"]);
-            Job job = await JobService.GetJobAsync(_jobId);
+			Job job = await JobService.GetJobAsync(_jobId);
-            if (job != null)
+			if (job != null)
-            {
+			{
-                _name = job.Name;
+				_name = job.Name;
-                _jobType = job.JobType;
+				_jobType = job.JobType;
-                _isEnabled = job.IsEnabled.ToString();
+				_isEnabled = job.IsEnabled.ToString();
-                _interval = job.Interval.ToString();
+				_interval = job.Interval.ToString();
-                _frequency = job.Frequency;
+				_frequency = job.Frequency;
-                _startDate = job.StartDate;
+				_startDate = job.StartDate;
-                if (job.StartDate != null && job.StartDate.Value.TimeOfDay.TotalSeconds != 0)
+				if (job.StartDate != null && job.StartDate.Value.TimeOfDay.TotalSeconds != 0)
-                {
+				{
-                    _startTime = job.StartDate.Value.ToString("HH:mm");
+					_startTime = job.StartDate.Value.ToString("HH:mm");
-                }
+				}
-                _endDate = job.EndDate;
+				_endDate = job.EndDate;
-                if (job.EndDate != null && job.EndDate.Value.TimeOfDay.TotalSeconds != 0)
+				if (job.EndDate != null && job.EndDate.Value.TimeOfDay.TotalSeconds != 0)
-                {
+				{
-                    _endTime = job.EndDate.Value.ToString("HH:mm");
+					_endTime = job.EndDate.Value.ToString("HH:mm");
-                }
+				}
-                _retentionHistory = job.RetentionHistory.ToString();
+				_retentionHistory = job.RetentionHistory.ToString();
-                _nextDate = job.NextExecution;
+				_nextDate = job.NextExecution;
-                if (job.NextExecution != null && job.NextExecution.Value.TimeOfDay.TotalSeconds != 0)
+				if (job.NextExecution != null && job.NextExecution.Value.TimeOfDay.TotalSeconds != 0)
-                {
+				{
-                    _nextTime = job.NextExecution.Value.ToString("HH:mm");
+					_nextTime = job.NextExecution.Value.ToString("HH:mm");
-                }
+				}
-                createdby = job.CreatedBy;
+				createdby = job.CreatedBy;
-                createdon = job.CreatedOn;
+				createdon = job.CreatedOn;
-                modifiedby = job.ModifiedBy;
+				modifiedby = job.ModifiedBy;
-                modifiedon = job.ModifiedOn;
+				modifiedon = job.ModifiedOn;
-            }
+			}
-        }
+		}
-        catch (Exception ex)
+		catch (Exception ex)
-        {
+		{
-            await logger.LogError(ex, "Error Loading Job {JobId} {Error}", _jobId, ex.Message);
+			await logger.LogError(ex, "Error Loading Job {JobId} {Error}", _jobId, ex.Message);
-            AddModuleMessage(Localizer["Error.Job.Load"], MessageType.Error);
+			AddModuleMessage(Localizer["Error.Job.Load"], MessageType.Error);
-        }
+		}
-    }
+	}
 
-    private async Task SaveJob()
+	private async Task SaveJob()
-    {
+	{
-        validated = true;
+		validated = true;
-        var interop = new Interop(JSRuntime);
+		var interop = new Interop(JSRuntime);
-        if (await interop.FormValid(form))
+		if (await interop.FormValid(form))
-        {
+		{
-            var job = await JobService.GetJobAsync(_jobId);
+			var job = await JobService.GetJobAsync(_jobId);
-            job.Name = _name;
+			job.Name = _name;
-            job.JobType = _jobType;
+			job.JobType = _jobType;
-            job.IsEnabled = Boolean.Parse(_isEnabled);
+			job.IsEnabled = Boolean.Parse(_isEnabled);
-            job.Frequency = _frequency;
+			job.Frequency = _frequency;
-            job.Interval = int.Parse(_interval);
+			if (job.Frequency == "O") // once
+			{
+				job.Interval = 1;
+			}
+			else
+			{
+				job.Interval = int.Parse(_interval);
+			}
             job.StartDate = _startDate;
             if (job.StartDate != null)
             {

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

@@ -36,75 +36,75 @@ else
             <td>@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>
 }
 
 @code {
-    private List<Job> _jobs;
+	private List<Job> _jobs;
 
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
+	public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
 
-    protected override async Task OnParametersSetAsync()
+	protected override async Task OnParametersSetAsync()
-    {
+	{
-        _jobs = await JobService.GetJobsAsync();
+		_jobs = await JobService.GetJobsAsync();
-    }
+	}
 
-    private string DisplayStatus(bool isEnabled, bool isExecuting)
+	private string DisplayStatus(bool isEnabled, bool isExecuting)
-    {
+	{
-        var status = string.Empty;
+		var status = string.Empty;
-        if (!isEnabled)
+		if (!isEnabled)
-        {
+		{
-            status = Localizer["Disabled"];
+			status = Localizer["Disabled"];
-        }
+		}
-        else
+		else
-        {
+		{
-            if (isExecuting)
+			if (isExecuting)
-            {
+			{
-                status = Localizer["Executing"];
+				status = Localizer["Executing"];
-            }
+			}
-            else
+			else
-            {
+			{
-                status = Localizer["Idle"];
+				status = Localizer["Idle"];
-            }
+			}
-        }
+		}
 
-        return status;
+		return status;
-    }
+	}
 
 
-    private string DisplayFrequency(int interval, string frequency)
+	private string DisplayFrequency(int interval, string frequency)
-    {
+	{
-        var result = $"{Localizer["Every"]} {interval.ToString()} ";
+		var result = "";
-        switch (frequency)
+		switch (frequency)
-        {
+		{
-            case "m":
+			case "m":
-                result += Localizer["Minute"];
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Minute"];
-                break;
+				break;
-            case "H":
+			case "H":
-                result += Localizer["Hour"];
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Hour"];
-                break;
+				break;
-            case "d":
+			case "d":
-                result += Localizer["Day"];
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Day"];
-                break;
+				break;
-            case "M":
+			case "w":
-                result += Localizer["Month"];
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Week"];
-                break;
+				break;
-        }
+			case "M":
-
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Month"];
-        if (interval > 1)
+				break;
-        {
+			case "O":
-            result += Localizer["s"];
+				result = Localizer["Once"];
-        }
+				break;
-
+		}
         return result;
     }
 
@@ -114,6 +114,7 @@ else
         {
             await JobService.DeleteJobAsync(job.JobId);
             await logger.LogInformation("Job Deleted {Job}", job);
+			_jobs = await JobService.GetJobsAsync();
             StateHasChanged();
         }
         catch (Exception ex)
@@ -125,12 +126,36 @@ else
 
     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()

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

@@ -113,9 +113,9 @@ else
         <TabPanel Name="Upload" ResourceKey="Upload" Security="SecurityAccessLevel.Host">
             <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 to complete the installation." ResourceKey="Module">Language: </Label>
+                    <Label Class="col-sm-3" HelpText="Upload one or more translations. Once they are uploaded click Install to complete the installation." ResourceKey="LanguageUpload">Language: </Label>
                     <div class="col-sm-9">
-                        <FileManager Filter="nupkg" ShowFiles="true" Folder="Packages" UploadMultiple="true" />
+                        <FileManager Folder="@Constants.PackagesFolder" UploadMultiple="true" />
                     </div>
                 </div>
             </div>
@@ -317,7 +317,7 @@ else
     {
         try
         {
-            await PackageService.DownloadPackageAsync(_packageid, _version, "Packages");
+            await PackageService.DownloadPackageAsync(_packageid, _version, Constants.PackagesFolder);
             await logger.LogInformation("Language Package {Name} {Version} Downloaded Successfully", _packageid, _version);
             AddModuleMessage(Localizer["Success.Language.Download"], MessageType.Success);
             StateHasChanged();
@@ -350,7 +350,7 @@ else
             var localizationCookieValue = CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture));
             await interop.SetCookie(CookieRequestCultureProvider.DefaultCookieName, localizationCookieValue, 360);
 
-            NavigationManager.NavigateTo(NavigationManager.Uri, forceLoad: true);
+            NavigationManager.NavigateTo(NavigationManager.Uri, true);
         }
     }
 }

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

@@ -84,7 +84,7 @@ else
             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);
+                upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(Constants.Version)) == 0);
             }
 
         }
@@ -97,7 +97,7 @@ else
         {
             if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
             {
-                await PackageService.DownloadPackageAsync(Constants.PackageId + ".Client." + code, Constants.Version, "Packages");
+                await PackageService.DownloadPackageAsync(Constants.PackageId + ".Client." + code, Constants.Version, Constants.PackagesFolder);
                 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);

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

@@ -7,197 +7,309 @@
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (_message != string.Empty)
-{
-    <ModuleMessage Message="@_message" Type="@_type" />
-}
 <AuthorizeView Roles="@RoleNames.Registered">
     <Authorizing>
         <text>...</text>
     </Authorizing>
     <Authorized>
-        <ModuleMessage Message="@Localizer["Info.SignedIn"]" Type="MessageType.Info" />
+		<div>@Localizer["Info.SignedIn"]</div>
     </Authorized>
     <NotAuthorized>
-        <form @ref="login" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+		@if (!twofactor)
-            <div class="container Oqtane-Modules-Admin-Login" @onkeypress="@(e => KeyPressed(e))">
+		{
-                <div class="form-group">
+			<form @ref="login" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
-                    <label for="Username" class="control-label">@SharedLocalizer["Username"] </label>
+				<div class="Oqtane-Modules-Admin-Login" @onkeypress="@(e => KeyPressed(e))">
-                    <input type="text" @ref="username" name="Username" class="form-control username" placeholder="Username" @bind="@_username" id="Username" required />
+				@if (_allowexternallogin)
-                </div>
+				{
-                <div class="form-group">
+					<button type="button" class="btn btn-primary" @onclick="ExternalLogin">@Localizer["Use"] @PageState.Site.Settings["ExternalLogin:ProviderName"]</button>						
-                    <label for="Password" class="control-label">@SharedLocalizer["Password"] </label>
+					<br /><br />
-                    <input type="password" name="Password" class="form-control password" placeholder="Password" @bind="@_password" id="Password" required />
+				}
-                </div>
+				@if (_allowsitelogin)
-                <div class="form-group">
+				{
-                    <div class="form-check form-check-inline">
+					<div class="form-group">
-                        <label class="form-check-label" for="Remember">@Localizer["RememberMe"]</label>&nbsp;
+						<Label Class="control-label" For="username" HelpText="Please enter your Username" ResourceKey="Username">Username:</Label>
-                        <input type="checkbox" class="form-check-input" name="Remember" @bind="@_remember" id="Remember" />
+						<input id="username" type="text" @ref="username" class="form-control" placeholder="@Localizer["Username.Placeholder"]" @bind="@_username" required />
-                    </div>
+					</div>
-                </div>
+					<div class="form-group mt-2">
-                <button type="button" class="btn btn-primary" @onclick="Login">@SharedLocalizer["Login"]</button>
+						<Label Class="control-label" For="password" HelpText="Please enter your Password" ResourceKey="Password">Password:</Label>
-                <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
+						<div class="input-group">
-                <br /><br />
+							<input id="password" type="@_passwordtype" name="Password" class="form-control" placeholder="@Localizer["Password.Placeholder"]" @bind="@_password" required />
-                <button type="button" class="btn btn-secondary" @onclick="Forgot">@Localizer["ForgotPassword"]</button>
+							<button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
-            </div>
+						</div>
-        </form>
+					</div>
-    </NotAuthorized>
+					<div class="form-group mt-2">
+						<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>		
+				}
+				</div>
+			</form>
+		}
+		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>
+		}
+	</NotAuthorized>
 </AuthorizeView>
 
 @code {
-    private string _returnUrl = string.Empty;
+	private bool _allowsitelogin = true;
-    private string _message = string.Empty;
+	private bool _allowexternallogin = false;
-    private MessageType _type = MessageType.Info;
+	private ElementReference login;
-    private string _username = string.Empty;
+	private bool validated = false;
-    private string _password = string.Empty;
+	private bool twofactor = false;
-    private bool _remember = false;
+	private string _username = string.Empty;
-    private bool validated = false;
+	private ElementReference username;
+	private string _password = string.Empty;
+	private string _passwordtype = "password";
+	private string _togglepassword = string.Empty;
+	private bool _remember = false;
+	private string _code = string.Empty;
 
-    private ElementReference login;
+	private string _returnUrl = string.Empty;
-    private ElementReference username;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
 
-    public override List<Resource> Resources => new List<Resource>()
+	public override List<Resource> Resources => new List<Resource>()
     {
         new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" }
     };
 
-    protected override async Task OnInitializedAsync()
+	protected override async Task OnInitializedAsync()
-    {
+	{
-        if (PageState.QueryString.ContainsKey("returnurl"))
+		try
-        {
+		{
-            _returnUrl = PageState.QueryString["returnurl"];
+			_togglepassword = SharedLocalizer["ShowPassword"];
-        }
 
-        if (PageState.QueryString.ContainsKey("name"))
+			if (PageState.Site.Settings.ContainsKey("LoginOptions:AllowSiteLogin") && !string.IsNullOrEmpty(PageState.Site.Settings["LoginOptions:AllowSiteLogin"]))
-        {
+			{
-            _username = PageState.QueryString["name"];
+				_allowsitelogin = bool.Parse(PageState.Site.Settings["LoginOptions:AllowSiteLogin"]);
-        }
+			}
 
-        if (PageState.QueryString.ContainsKey("token"))
+			if (PageState.Site.Settings.ContainsKey("ExternalLogin:ProviderType") && !string.IsNullOrEmpty(PageState.Site.Settings["ExternalLogin:ProviderType"]))
-        {
+			{
-            var user = new User();
+				_allowexternallogin = true;
-            user.SiteId = PageState.Site.SiteId;
+			}
-            user.Username = _username;
-            user = await UserService.VerifyEmailAsync(user, PageState.QueryString["token"]);
 
-            if (user != null)
+			if (PageState.QueryString.ContainsKey("returnurl"))
-            {
+			{
-                await logger.LogInformation(LogFunction.Security, "Email Verified For For Username {Username}", _username);
+				_returnUrl = PageState.QueryString["returnurl"];
-                _message = Localizer["Success.Account.Verified"];
+			}
-            }
-            else
-            {
-                await logger.LogError(LogFunction.Security, "Email Verification Failed For Username {Username}", _username);
-                _message = Localizer["Message.Account.NotVerfied"];
-                _type = MessageType.Warning;
-            }
-        }
-    }
 
-    protected override async Task OnAfterRenderAsync(bool firstRender)
+			if (PageState.QueryString.ContainsKey("name"))
-    {
+			{
-        if (firstRender)
+				_username = PageState.QueryString["name"];
-        {
+			}
-            if(PageState.User == null)
-            {
-                await username.FocusAsync();
-            }
-        }
-    }
 
-    private async Task Login()
+			if (PageState.QueryString.ContainsKey("token") && !string.IsNullOrEmpty(_username))
-    {
+			{
-        validated = true;
+				var user = new User();
-        var interop = new Interop(JSRuntime);
+				user.SiteId = PageState.Site.SiteId;
-        if (await interop.FormValid(login))
+				user.Username = _username;
-        {
-            if (PageState.Runtime == Oqtane.Shared.Runtime.Server)
-            {
-                var user = new User();
-                user.SiteId = PageState.Site.SiteId;
-                user.Username = _username;
-                user.Password = _password;
-                user = await UserService.LoginUserAsync(user, false, false);
 
-                if (user.IsAuthenticated)
+				if (PageState.QueryString.ContainsKey("key"))
-                {
+				{
-                    await logger.LogInformation(LogFunction.Security, "Login Successful For Username {Username}", _username);
+					user = await UserService.LinkUserAsync(user, PageState.QueryString["token"], PageState.Site.Settings["ExternalLogin:ProviderType"], PageState.QueryString["key"], PageState.Site.Settings["ExternalLogin:ProviderName"]);
-                    // server-side Blazor needs to post to the Login page so that the cookies are set correctly
+					if (user != null)
-                    var fields = new { __RequestVerificationToken = SiteState.AntiForgeryToken, username = _username, password = _password, remember = _remember, returnurl = _returnUrl };
+					{
-                    string url = Utilities.TenantUrl(PageState.Alias, "/pages/login/");
+						await logger.LogInformation(LogFunction.Security, "External Login Linkage Successful For Username {Username}", _username);
-                    await interop.SubmitForm(url, fields);
+						AddModuleMessage(Localizer["Success.Account.Linked"], MessageType.Info);						
-                }
+					}
-                else
+					else
-                {
+					{
-                    await logger.LogError(LogFunction.Security, "Login Failed For Username {Username}", _username);
+						await logger.LogError(LogFunction.Security, "External Login Linkage Failed For Username {Username}", _username);
-                    AddModuleMessage(Localizer["Error.Login.Fail"], MessageType.Error);
+						AddModuleMessage(Localizer["Message.Account.NotLinked"], MessageType.Warning);						
-                }
+					}
-            }
+					_username = "";
-            else
+				}
-            {
+				else
-                // client-side Blazor
+				{
-                var user = new User();
+					user = await UserService.VerifyEmailAsync(user, PageState.QueryString["token"]);
-                user.SiteId = PageState.Site.SiteId;
+					if (user != null)
-                user.Username = _username;
+					{
-                user.Password = _password;
+						await logger.LogInformation(LogFunction.Security, "Email Verified For For Username {Username}", _username);
-                user = await UserService.LoginUserAsync(user, true, _remember);
+						AddModuleMessage(Localizer["Success.Account.Verified"], MessageType.Info);						
-                if (user.IsAuthenticated)
+					}
-                {
+					else
-                    await logger.LogInformation(LogFunction.Security, "Login Successful For Username {Username}", _username);
+					{
-                    var authstateprovider = (IdentityAuthenticationStateProvider)ServiceProvider.GetService(typeof(IdentityAuthenticationStateProvider));
+						await logger.LogError(LogFunction.Security, "Email Verification Failed For Username {Username}", _username);
-                    authstateprovider.NotifyAuthenticationChanged();
+						AddModuleMessage(Localizer["Message.Account.NotVerified"], MessageType.Warning);						
-                    NavigationManager.NavigateTo(NavigateUrl(_returnUrl, true));
+					}
-                }
+				}
-                else
+			}
-                {
+			else
-                    await logger.LogError(LogFunction.Security, "Login Failed For Username {Username}", _username);
+			{
-                    AddModuleMessage(Localizer["Error.Login.Fail"], MessageType.Error);
+				if (PageState.QueryString.ContainsKey("status"))
-                }
+				{
-            }
+					AddModuleMessage(Localizer["ExternalLoginStatus." + PageState.QueryString["status"]], MessageType.Info);
-        }
+				}
-        else
+			}
-        {
+		}
-            AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning);
+		catch (Exception ex)
-        }
+		{
-    }
+			await logger.LogError(ex, "Error Loading Login {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.LoadLogin"], MessageType.Error);
+		}
+	}
 
-    private void Cancel()
+	protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
+	{
-        NavigationManager.NavigateTo(_returnUrl);
+		if (firstRender && PageState.User == null)
-    }
+		{
+			await username.FocusAsync();
+		}
+	}
 
-    private async Task Forgot()
+	private async Task Login()
-    {
+	{
-        if (_username != string.Empty)
+		try
-        {
+		{
-            var user = await UserService.GetUserAsync(_username, PageState.Site.SiteId);
+			validated = true;
-            if (user != null)
+			var interop = new Interop(JSRuntime);
-            {
+			if (await interop.FormValid(login))
-                await UserService.ForgotPasswordAsync(user);
+			{
-                await logger.LogInformation(LogFunction.Security, "Password Reset Notification Sent For Username {Username}", _username);
+				var user = new User { SiteId = PageState.Site.SiteId, Username = _username, Password = _password, LastIPAddress = SiteState.RemoteIPAddress};
-                _message = "Please Check The Email Address Associated To Your User Account For A Password Reset Notification";
-            }
-            else
-            {
-                _message = "User Does Not Exist";
-                _type = MessageType.Warning;
-            }
-        }
-        else
-        {
-            _message = "Please Enter The Username Related To Your Account And Then Select The Forgot Password Option Again";
-        }
 
-        StateHasChanged();
+				if (!twofactor)
-    }
+				{
+					user = await UserService.LoginUserAsync(user);
+				}
+				else
+				{
+					user = await UserService.VerifyTwoFactorAsync(user, _code);
+				}
+
+				if (user.IsAuthenticated)
+				{
+					await logger.LogInformation(LogFunction.Security, "Login Successful For Username {Username}", _username);
+
+					// post back to the Login page so that the cookies are set correctly
+					var fields = new { __RequestVerificationToken = SiteState.AntiForgeryToken, username = _username, password = _password, remember = _remember, returnurl = _returnUrl };
+					string url = Utilities.TenantUrl(PageState.Alias, "/pages/login/");
+					await interop.SubmitForm(url, fields);
+				}
+				else
+				{
+					if ((PageState.Site.Settings.ContainsKey("LoginOptions:TwoFactor") && PageState.Site.Settings["LoginOptions:TwoFactor"] == "required") || 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
+			{
+				AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning);
+			}
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Performing Login {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.Login"], MessageType.Error);
+		}
+	}
+
+	private void Cancel()
+	{
+		NavigationManager.NavigateTo(_returnUrl);
+	}
+
+	private async Task Forgot()
+	{
+		try
+		{
+			if (_username != string.Empty)
+			{
+				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
+			{
+				AddModuleMessage(Localizer["Message.ForgotPassword"], MessageType.Info);
+			}
+
+			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();
+	}
+
+	private async Task KeyPressed(KeyboardEventArgs e)
+	{
+		if (e.Code == "Enter" || e.Code == "NumpadEnter")
+		{
+			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=" + _returnUrl), true);
+	}
 
-    private async Task KeyPressed(KeyboardEventArgs e)
-    {
-        if (e.Code == "Enter" || e.Code == "NumpadEnter")
-        {
-            await Login();
-        }
-    }
 }

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

@@ -9,246 +9,195 @@
 @inject IStringLocalizer<Detail> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-    <div class="container">
+@if (_initialized)
-        <div class="row mb-1 align-items-center">
+{
-
+	<div class="container">
-            <div class="col-sm-9">
+		<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>
+			<div class="col-sm-9">
-        </div>
+				<input id="dateTime" class="form-control" @bind="@_logDate" readonly />
-        <div class="row mb-1 align-items-center">
+			</div>
-
+		</div>
-            <div class="col-sm-9">
+		<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>
+			<div class="col-sm-9">
-        </div>
+				<input id="level" class="form-control" @bind="@_level" readonly />
-        <div class="row mb-1 align-items-center">
+			</div>
-
+		</div>
-            <div class="col-sm-9">
+		<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>
+			<div class="col-sm-9">
-        </div>
+				<input id="feature" class="form-control" @bind="@_feature" readonly />
-        <div class="row mb-1 align-items-center">
+			</div>
-
+		</div>
-            <div class="col-sm-9">
+		<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>
+			<div class="col-sm-9">
-        </div>
+				<input id="function" class="form-control" @bind="@_function" readonly />
-        <div class="row mb-1 align-items-center">
+			</div>
-
+		</div>
-            <div class="col-sm-9">
+		<div class="row mb-1 align-items-center">
-
+			<Label Class="col-sm-3" For="category" HelpText="The categories that were affected" ResourceKey="Category">Category: </Label>
-            </div>
+			<div class="col-sm-9">
-        </div>
+				<input id="category" class="form-control" @bind="@_category" readonly />
-        <div class="row mb-1 align-items-center">
+			</div>
-
+		</div>
-            <div class="col-sm-9">
+		@if (_pageName != string.Empty)
-
+		{
-            </div>
+			<div class="row mb-1 align-items-center">
-        </div>
+				<Label Class="col-sm-3" For="page" HelpText="The page that was affected" ResourceKey="Page">Page: </Label>
-        <div class="row mb-1 align-items-center">
+				<div class="col-sm-9">
-
+					<input id="page" class="form-control" @bind="@_pageName" readonly />
-            <div class="col-sm-9">
+				</div>
-
+			</div>
-            </div>
+		}
-        </div>
+		@if (_moduleTitle != string.Empty)
-        <div class="row mb-1 align-items-center">
+		{
-
+			<div class="row mb-1 align-items-center">
-            <div class="col-sm-9">
+				<Label Class="col-sm-3" For="module" HelpText="The module that was affected" ResourceKey="Module">Module: </Label>
-
+				<div class="col-sm-9">
-            </div>
+					<input id="module" class="form-control" @bind="@_moduleTitle" readonly />
-        </div>
+				</div>
-        <div class="row mb-1 align-items-center">
+			</div>
-
+		}
-            <div class="col-sm-9">
+		@if (_username != string.Empty)
-
+		{
-            </div>
+			<div class="row mb-1 align-items-center">
-        </div>
+				<Label Class="col-sm-3" For="user" HelpText="The user that caused this log" ResourceKey="User">User: </Label>
-        <div class="row mb-1 align-items-center">
+				<div class="col-sm-9">
-
+					<input id="user" class="form-control" @bind="@_username" readonly />
-            <div class="col-sm-9">
+				</div>
-
+			</div>
-            </div>
+		}
-        </div>
+		<div class="row mb-1 align-items-center">
-        <div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="url" HelpText="The url the log comes from" ResourceKey="Url">Url: </Label>
-
+			<div class="col-sm-9">
-            <div class="col-sm-9">
+				<input id="url" class="form-control" @bind="@_url" readonly />
-
+			</div>
-            </div>
+		</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>
+			<div class="col-sm-9">
-       <div class="row mb-1 align-items-center">
+				<input id="template" class="form-control" @bind="@_template" readonly />
-                <Label Class="col-sm-3" For="dateTime" HelpText="The date and time of this log" ResourceKey="DateTime">Date/Time: </Label>
+			</div>
-            <div class="col-sm-9">
+		</div>
-                <input id="dateTime" class="form-control" @bind="@_logDate" readonly />
+		<div class="row mb-1 align-items-center">
-            </div>
+			<Label Class="col-sm-3" For="message" HelpText="The message that the system generated" ResourceKey="Message">Message: </Label>
-       </div>
+			<div class="col-sm-9">
-       <div class="row mb-1 align-items-center">
+				<textarea id="message" class="form-control" @bind="@_message" rows="5" readonly></textarea>
-                <Label Class="col-sm-3" For="level" HelpText="The level of this log" ResourceKey="Level">Level: </Label>
+			</div>
-            <div class="col-sm-9">
+		</div>
-                <input id="level" class="form-control" @bind="@_level" readonly />
+		@if (!string.IsNullOrEmpty(_exception))
-            </div>
+		{
-       </div>
+			<div class="row mb-1 align-items-center">
-       <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>
-                <Label Class="col-sm-3" For="feature" HelpText="The feature that was affected" ResourceKey="Feature">Feature: </Label>
+				<div class="col-sm-9">
-            <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 categories that were affected" ResourceKey="Category">Category: </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>
+            <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>
+            <Label Class="col-sm-3" For="server" HelpText="The server that was affected" ResourceKey="Server">Server: </Label>
-           <div class="col-sm-9">
+			<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>
 
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+@code {
+	private bool _initialized = false;
+    private int _logId;
+    private string _logDate = string.Empty;
+    private string _level = string.Empty;
+    private string _feature = string.Empty;
+    private string _function = string.Empty;
+    private string _category = string.Empty;
+    private string _pageName = string.Empty;
+    private string _moduleTitle = string.Empty;
+    private string _username = string.Empty;
+    private string _url = string.Empty;
+    private string _template = string.Empty;
+    private string _message = string.Empty;
+    private string _exception = string.Empty;
+    private string _properties = string.Empty;
+    private string _server = string.Empty;
 
-    @code {
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
-        private int _logId;
-        private string _logDate = string.Empty;
-        private string _level = string.Empty;
-        private string _feature = string.Empty;
-        private string _function = string.Empty;
-        private string _category = string.Empty;
-        private string _pageName = string.Empty;
-        private string _moduleTitle = string.Empty;
-        private string _username = string.Empty;
-        private string _url = string.Empty;
-        private string _template = string.Empty;
-        private string _message = string.Empty;
-        private string _exception = string.Empty;
-        private string _properties = string.Empty;
-        private string _server = string.Empty;
 
-        public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+    protected override async Task OnInitializedAsync()
-
+    {
-        protected override async Task OnInitializedAsync()
+        try
         {
-            try
+            _logId = Int32.Parse(PageState.QueryString["id"]);
+            var log = await LogService.GetLogAsync(_logId);
+            if (log != null)
             {
-                _logId = Int32.Parse(PageState.QueryString["id"]);
+                _logDate = log.LogDate.ToString(CultureInfo.CurrentCulture);
-                var log = await LogService.GetLogAsync(_logId);
+                _level = log.Level;
-                if (log != null)
+                _feature = log.Feature;
+                _function = log.Function;
+                _category = log.Category;
+
+                if (log.PageId != null)
                 {
-                    _logDate = log.LogDate.ToString(CultureInfo.CurrentCulture);
+                    var page = await PageService.GetPageAsync(log.PageId.Value);
-                    _level = log.Level;
+                    if (page != null)
-                    _feature = log.Feature;
-                    _function = log.Function;
-                    _category = log.Category;
-
-                    if (log.PageId != null)
                     {
-                        var page = await PageService.GetPageAsync(log.PageId.Value);
+                        _pageName = page.Name;
-                        if (page != null)
-                        {
-                            _pageName = page.Name;
-                        }
                     }
-
-                    if (log.PageId != null && log.ModuleId != null)
-                    {
-                        var pagemodule = await PageModuleService.GetPageModuleAsync(log.PageId.Value, log.ModuleId.Value);
-                        if (pagemodule != null)
-                        {
-                            _moduleTitle = pagemodule.Title;
-                        }
-                    }
-
-                    if (log.UserId != null)
-                    {
-                        var user = await UserService.GetUserAsync(log.UserId.Value, PageState.Site.SiteId);
-                        if (user != null)
-                        {
-                            _username = user.Username;
-                        }
-                    }
-
-                    _url = log.Url;
-                    _template = log.MessageTemplate;
-                    _message = log.Message;
-                    _exception = log.Exception;
-                    _properties = log.Properties;
-                    _server = log.Server;
                 }
-            }
+
-            catch (Exception ex)
+                if (log.PageId != null && log.ModuleId != null && log.ModuleId != -1)
-            {
+                {
-                await logger.LogError(ex, "Error Loading Log {LogId} {Error}", _logId, ex.Message);
+                    var pagemodule = await PageModuleService.GetPageModuleAsync(log.PageId.Value, log.ModuleId.Value);
-                AddModuleMessage(Localizer["Error.Log.Load"], MessageType.Error);
+                    if (pagemodule != null)
+                    {
+                        _moduleTitle = pagemodule.Title;
+                    }
+                }
+
+                if (log.UserId != null)
+                {
+                    var user = await UserService.GetUserAsync(log.UserId.Value, PageState.Site.SiteId);
+                    if (user != null)
+                    {
+                        _username = user.Username;
+                    }
+                }
+
+                _url = log.Url;
+                _template = log.MessageTemplate;
+                _message = log.Message;
+                _exception = log.Exception;
+                _properties = log.Properties;
+                _server = log.Server;
+				_initialized = true;
             }
         }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Log {LogId} {Error}", _logId, ex.Message);
+            AddModuleMessage(Localizer["Error.Log.Load"], MessageType.Error);
+        }
     }
+
+	private string CloseUrl()
+	{
+		if (!PageState.QueryString.ContainsKey("level"))
+		{
+			return NavigateUrl();
+		}
+		else
+		{
+			return NavigateUrl(PageState.Page.Path, "level=" + PageState.QueryString["level"] + "&function=" + PageState.QueryString["function"] + "&rows=" + PageState.QueryString["rows"] + "&page=" + PageState.QueryString["page"]);
+		}
+	}
+}

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

@@ -1,6 +1,7 @@
 @namespace Oqtane.Modules.Admin.Logs
 @inherits ModuleBase
 @inject ILogService LogService
+@inject ISettingService SettingService
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
@@ -10,73 +11,92 @@
 }
 else
 {
-    <div class="container g-0">
+    <TabStrip>
-        <div class="row mb-1 align-items-center">
+        <TabPanel Name="Events" Heading="Events" ResourceKey="Events">
-            <div class="col-sm-4">
+			<div class="container g-0">
-                <Label For="level" HelpText="Select the log level for event log items" ResourceKey="Level">Level: </Label><br /><br />
+				<div class="row mb-1 align-items-center">
-                <select id="level" class="form-select" @onchange="(e => LevelChanged(e))">
+					<div class="col-sm-4">
-                    <option value="-">&lt;@Localizer["AllLevels"]&gt;</option>
+						<Label For="level" HelpText="Select the log level for event log items" ResourceKey="Level">Level: </Label><br /><br />
-                    <option value="Trace">@Localizer["Trace"]</option>
+						<select id="level" class="form-select" value="@_level" @onchange="(e => LevelChanged(e))">
-                    <option value="Debug">@Localizer["Debug"]</option>
+							<option value="-">&lt;@Localizer["AllLevels"]&gt;</option>
-                    <option value="Information">@Localizer["Information"]</option>
+							<option value="Trace">@Localizer["Trace"]</option>
-                    <option value="Warning">@Localizer["Warning"]</option>
+							<option value="Debug">@Localizer["Debug"]</option>
-                    <option value="Error">@Localizer["Error"]</option>
+							<option value="Information">@Localizer["Information"]</option>
-                    <option value="Critical">@Localizer["Critical"]</option>
+							<option value="Warning">@Localizer["Warning"]</option>
-                </select>
+							<option value="Error">@Localizer["Error"]</option>
-            </div>            
+							<option value="Critical">@Localizer["Critical"]</option>
-            <div class="col-sm-4">
+						</select>
-                <Label For="function" HelpText="Select the function for event log items" ResourceKey="Function">Function: </Label><br /><br />
+					</div>            
-                <select id="function" class="form-select" @onchange="(e => FunctionChanged(e))">
+					<div class="col-sm-4">
-                    <option value="-">&lt;@Localizer["AllFunctions"]&gt;</option>
+						<Label For="function" HelpText="Select the function for event log items" ResourceKey="Function">Function: </Label><br /><br />
-                    <option value="Create">@Localizer["Create"]</option>
+						<select id="function" class="form-select" value="@_function" @onchange="(e => FunctionChanged(e))">
-                    <option value="Read">@Localizer["Read"]</option>
+							<option value="-">&lt;@Localizer["AllFunctions"]&gt;</option>
-                    <option value="Update">@SharedLocalizer["Update"]</option>
+							<option value="Create">@Localizer["Create"]</option>
-                    <option value="Delete">@SharedLocalizer["Delete"]</option>
+							<option value="Read">@Localizer["Read"]</option>
-                    <option value="Security">@Localizer["Security"]</option>
+							<option value="Update">@SharedLocalizer["Update"]</option>
-                    <option value="Other">@Localizer["Other"]</option>
+							<option value="Delete">@SharedLocalizer["Delete"]</option>
-                </select>
+							<option value="Security">@Localizer["Security"]</option>
-            </div>            
+							<option value="Other">@Localizer["Other"]</option>
-            <div class="col-sm-4">
+						</select>
-                <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 />
+					</div>            
-                <select id="rows" class="form-select" @onchange="(e => RowsChanged(e))">
+					<div class="col-sm-4">
-                    <option value="10">10</option>
+						<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 />
-                    <option value="50">50</option>
+						<select id="rows" class="form-select" value="@_rows" @onchange="(e => RowsChanged(e))">
-                    <option value="100">100</option>
+							<option value="10">10</option>
-                </select>
+							<option value="50">50</option>
-            </div>
+							<option value="100">100</option>
-        </div>
+						</select>
-    </div>
+					</div>
+				</div>
+			</div>
+			<br />
 
-    @if (_logs.Any())
+			@if (_logs.Any())
-    {
+			{
-        <Pager Items="@_logs">
+				<Pager Items="@_logs" CurrentPage="@_page.ToString()" OnPageChange="OnPageChange">
-            <Header>
+					<Header>
-            <th style="width: 1px;">&nbsp;</th>
+						<th style="width: 1px;">&nbsp;</th>
-            <th>@Localizer["Date"]</th>
+						<th>@Localizer["Date"]</th>
-            <th>@Localizer["Level"]</th>
+						<th>@Localizer["Level"]</th>
-            <th>@Localizer["Feature"]</th>
+						<th>@Localizer["Feature"]</th>
-            <th>@Localizer["Function"]</th>
+						<th>@Localizer["Function"]</th>
-            </Header>
+					</Header>
-            <Row>
+					<Row>
-                <td class="@GetClass(context.Function)"><ActionLink Action="Detail" Parameters="@($"id=" + context.LogId.ToString())" ResourceKey="LogDetails" /></td>
+						<td class="@GetClass(context.Function)"><ActionLink Action="Detail" Parameters="@($"id=" + context.LogId.ToString() + "&level=" + _level + "&function=" + _function + "&rows=" + _rows + "&page=" + _page.ToString())" ResourceKey="LogDetails" /></td>
-                <td class="@GetClass(context.Function)">@context.LogDate</td>
+						<td class="@GetClass(context.Function)">@context.LogDate</td>
-                <td class="@GetClass(context.Function)">@context.Level</td>
+						<td class="@GetClass(context.Function)">@context.Level</td>
-                <td class="@GetClass(context.Function)">@context.Feature</td>
+						<td class="@GetClass(context.Function)">@context.Feature</td>
-                <td class="@GetClass(context.Function)">@context.Function</td>
+						<td class="@GetClass(context.Function)">@context.Function</td>
-            </Row>
+					</Row>
-        </Pager>
+				</Pager>
-    }
+			}
-    else
+			else
-    {
+			{
-        <p><em>@Localizer["NoLogs"]</em></p>
+				<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" class="form-control" @bind="@_retention" />
+					</div>
+				</div>
+			</div>
+			<br />
+			<button type="button" class="btn btn-success" @onclick="SaveSiteSettings">@SharedLocalizer["Save"]</button>
+		</TabPanel>
+	</TabStrip>
 }
 
 @code {
     private string _level = "-";
     private string _function = "-";
     private string _rows = "10";
+	private int _page = 1;
     private List<Log> _logs;
+    private string _retention = "";
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
@@ -84,7 +104,27 @@ else
     {
         try
         {
+			if (PageState.QueryString.ContainsKey("level"))
+			{
+				_level = PageState.QueryString["level"];
+			}
+			if (PageState.QueryString.ContainsKey("function"))
+			{
+				_function = PageState.QueryString["function"];
+			}
+			if (PageState.QueryString.ContainsKey("rows"))
+			{
+				_rows = PageState.QueryString["rows"];
+			}
+			if (PageState.QueryString.ContainsKey("page") && int.TryParse(PageState.QueryString["page"], out int page))
+			{
+				_page = page;
+			}
+
             await GetLogs();
+
+			var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+			_retention = SettingService.GetSetting(settings, "LogRetention", "30");
         }
         catch (Exception ex)
         {
@@ -170,4 +210,27 @@ else
         }
         return classname;
     }
+
+	private async Task SaveSiteSettings()
+	{
+		try
+		{
+			var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+			settings = SettingService.SetSetting(settings, "LogRetention", _retention, 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/Admin/ModuleCreator/Index.razor

@@ -10,129 +10,137 @@
 
 @if (string.IsNullOrEmpty(_moduledefinitionname) && _templates != null)
 {
-    <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+	<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
-        <div class="container">
+		<div class="container">
-            <div class="row mb-1 align-items-center">
+			<div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="owner" HelpText="Enter the name of the organization who is developing this module. It should not contain spaces or punctuation." ResourceKey="OwnerName">Owner Name: </Label>
+				<Label Class="col-sm-3" For="owner" HelpText="Enter the name of the organization who is developing this module. It should not contain spaces or punctuation." ResourceKey="OwnerName">Owner Name: </Label>
-                <div class="col-sm-9">
+				<div class="col-sm-9">
-                    <input id="owner" class="form-control" @bind="@_owner" required />
+					<input id="owner" class="form-control" @bind="@_owner" required />
-                </div>
+				</div>
-            </div>
+			</div>
-            <div class="row mb-1 align-items-center">
+			<div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="module" HelpText="Enter a name for this module. It should not contain spaces or punctuation." ResourceKey="ModuleName">Module Name: </Label>
+				<Label Class="col-sm-3" For="module" HelpText="Enter a name for this module. It should not contain spaces or punctuation." ResourceKey="ModuleName">Module Name: </Label>
-                <div class="col-sm-9">
+				<div class="col-sm-9">
-                    <input id="module" class="form-control" @bind="@_module" required />
+					<input id="module" class="form-control" @bind="@_module" required />
-                </div>
+				</div>
-            </div>
+			</div>
-            <div class="row mb-1 align-items-center">
+			<div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="description" HelpText="Enter a short description for the module" ResourceKey="Description">Description: </Label>
+				<Label Class="col-sm-3" For="description" HelpText="Enter a short description for the module" ResourceKey="Description">Description: </Label>
-                <div class="col-sm-9">
+				<div class="col-sm-9">
-                    <textarea id="description" class="form-control" @bind="@_description" rows="3" ></textarea>
+					<textarea id="description" class="form-control" @bind="@_description" rows="3" ></textarea>
-                </div>
+				</div>
-            </div>
+			</div>
-            <div class="row mb-1 align-items-center">
+			<div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="template" HelpText="Select a module template. Templates are located in the wwwroot/Modules/Templates folder on the server." ResourceKey="Template">Template: </Label>
+				<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">
+				<div class="col-sm-9">
-                    <select id="template" class="form-select" @onchange="(e => TemplateChanged(e))" required>
+					<select id="template" class="form-select" @onchange="(e => TemplateChanged(e))" required>
-                        <option value="-">&lt;@Localizer["Template.Select"]&gt;</option>
+						<option value="-">&lt;@Localizer["Template.Select"]&gt;</option>
-                        @foreach (Template template in _templates)
+						@foreach (Template template in _templates)
-                        {
+						{
-                            <option value="@template.Name">@template.Title</option>
+							<option value="@template.Name">@template.Title</option>
-                        }
+						}
-                    </select>
+					</select>
-                </div>
+				</div>
-            </div>
+			</div>
-            <div class="row mb-1 align-items-center">
+			<div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="reference" HelpText="Select a framework reference version" ResourceKey="FrameworkReference">Framework Reference: </Label>
+				<Label Class="col-sm-3" For="reference" HelpText="Select a framework reference version" ResourceKey="FrameworkReference">Framework Reference: </Label>
-                <div class="col-sm-9">
+				<div class="col-sm-9">
-                    <select id="reference" class="form-select" @bind="@_reference" required>
+					<select id="reference" class="form-select" @bind="@_reference" required>
-                        @foreach (string version in _versions)
+						@foreach (string version in _versions)
-                        {
+						{
-                            if (Version.Parse(version).CompareTo(Version.Parse(_minversion)) >= 0)
+							if (Version.Parse(version).CompareTo(Version.Parse(_minversion)) >= 0)
-                            {
+							{
-                                <option value="@(version)">@(version)</option>
+								<option value="@(version)">@(version)</option>
-                            }
+							}
-                        }
+						}
-                        <option value="local">@SharedLocalizer["LocalVersion"]</option>
+						<option value="local">@SharedLocalizer["LocalVersion"]</option>
-                    </select>
+					</select>
-                </div>
+				</div>
-            </div>
+			</div>
-            @if (!string.IsNullOrEmpty(_location))
+			@if (!string.IsNullOrEmpty(_location))
-            {
+			{
-                <div class="row mb-1 align-items-center">
+				<div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="location" HelpText="Location where the module will be created" ResourceKey="Location">Location: </Label>
+					<Label Class="col-sm-3" For="location" HelpText="Location where the module will be created" ResourceKey="Location">Location: </Label>
-                    <div class="col-sm-9">
+					<div class="col-sm-9">
-                        <input id="module" class="form-control" @bind="@_location" readonly />
+						<input id="module" class="form-control" @bind="@_location" readonly />
-                    </div>
+					</div>
-                </div>
+				</div>
-            }
+			}
-        </div>
+		</div>
-
+	</form>
-        <button type="button" class="btn btn-success" @onclick="CreateModule">@Localizer["Module.Create"]</button>
+	<button type="button" class="btn btn-success" @onclick="CreateModule">@Localizer["Module.Create"]</button>
-        }
+}
-        else
+else
-        {
+{
-        <button type="button" class="btn btn-success" @onclick="ActivateModule">@Localizer["Module.Activate"]</button>
+    <button type="button" class="btn btn-success" @onclick="ActivateModule">@Localizer["Module.Activate"]</button>
-    </form>
 }
 
 @code {
-    private ElementReference form;
+	private ElementReference form;
-    private bool validated = false;
+	private bool validated = false;
-    private string _moduledefinitionname = string.Empty;
+	private string _moduledefinitionname = string.Empty;
-    private string _owner = string.Empty;
+	private string _owner = string.Empty;
-    private string _module = string.Empty;
+	private string _module = string.Empty;
-    private string _description = string.Empty;
+	private string _description = string.Empty;
-    private List<Template> _templates;
+	private List<Template> _templates;
-    private string _template = "-";
+	private string _template = "-";
-    private string[] _versions;
+	private string[] _versions;
-    private string _reference = Constants.Version;
+	private string _reference = Constants.Version;
-    private string _minversion = "2.0.0";
+	private string _minversion = "2.0.0";
-    private string _location = string.Empty;
+	private string _location = string.Empty;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-    protected override async Task OnParametersSetAsync()
+	protected override void OnInitialized()
-    {
+	{
-        try
+		_moduledefinitionname = SettingService.GetSetting(ModuleState.Settings, "ModuleDefinitionName", "");
-        {
+		if (string.IsNullOrEmpty(_moduledefinitionname))
-            _moduledefinitionname = SettingService.GetSetting(ModuleState.Settings, "ModuleDefinitionName", "");
+		{
-            _templates = await ModuleDefinitionService.GetModuleDefinitionTemplatesAsync();
+			AddModuleMessage(Localizer["Info.Module.Creator"], MessageType.Info);
-            _versions = Constants.ReleaseVersions.Split(',').Where(item => Version.Parse(item).CompareTo(Version.Parse("2.0.0")) >= 0).ToArray();
+		}
+		else
+		{
+			AddModuleMessage(Localizer["Info.Module.Activate"], MessageType.Info);
+		}
+	}
 
-            if (string.IsNullOrEmpty(_moduledefinitionname))
+	protected override async Task OnParametersSetAsync()
-            {
+	{
-                AddModuleMessage(Localizer["Info.Module.Creator"], MessageType.Info);
+		try
-            }
+		{
-            else
+			_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.Activate"], MessageType.Info);
+		}
-            }
+		catch (Exception ex)
-        }
+		{
-        catch (Exception ex)
+			await logger.LogError(ex, "Error Loading Module Creator");
-        {
+		}
-            await logger.LogError(ex, "Error Loading Module Creator");
+	}
-        }
-    }
 
-    private async Task CreateModule()
+	private async Task CreateModule()
-    {
+	{
-        validated = true;
+		validated = true;
-        var interop = new Interop(JSRuntime);
+		var interop = new Interop(JSRuntime);
-        if (await interop.FormValid(form))
+		if (await interop.FormValid(form))
-        {
+		{
-            try
+			try
-            {
+			{
-                var moduleDefinition = new ModuleDefinition { Owner = _owner, Name = _module, Description = _description, Template = _template, Version = _reference };
+				if (IsValid(_owner) && IsValid(_module) && _owner != _module && _template != "-")
-                moduleDefinition = await ModuleDefinitionService.CreateModuleDefinitionAsync(moduleDefinition);
+				{
+					var moduleDefinition = new ModuleDefinition { Owner = _owner, Name = _module, Description = _description, Template = _template, Version = _reference };
+					moduleDefinition = await ModuleDefinitionService.CreateModuleDefinitionAsync(moduleDefinition);
 
-                var settings = ModuleState.Settings;
+					var settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
-                SettingService.SetSetting(settings, "ModuleDefinitionName", moduleDefinition.ModuleDefinitionName);
+					SettingService.SetSetting(settings, "ModuleDefinitionName", moduleDefinition.ModuleDefinitionName);
-                await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
+					await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
 
-                GetLocation();
+					GetLocation();
-
+					AddModuleMessage(string.Format(Localizer["Success.Module.Create"], NavigateUrl("admin/system")), MessageType.Success);
-                AddModuleMessage(string.Format(Localizer["Success.Module.Create"], NavigateUrl("admin/system")), MessageType.Success);
+				}
+                else
+                {
+                    AddModuleMessage(Localizer["Message.Require.ValidName"], MessageType.Warning);
+                }
             }
             catch (Exception ex)
             {

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

@@ -1,7 +1,9 @@
-using Oqtane.Models;
+using Oqtane.Documentation;
+using Oqtane.Models;
 
 namespace Oqtane.Modules.Admin.ModuleCreator
 {
+    [PrivateApi("Mark this as private, since it's not very useful in the public docs")]
     public class ModuleInfo : IModule
     {
         public ModuleDefinition ModuleDefinition => new ModuleDefinition

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

@@ -70,7 +70,7 @@
             <div class="row mb-1 align-items-center">
                 <Label Class="col-sm-3" HelpText="Upload one or more module packages. Once they are uploaded click Install to complete the installation." ResourceKey="Module">Module: </Label>
                 <div class="col-sm-9">
-                    <FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" UploadMultiple="true" />
+                    <FileManager Folder="@Constants.PackagesFolder" UploadMultiple="true" />
                 </div>
             </div>
         </div>
@@ -229,7 +229,7 @@
     {
         try
         {
-            await PackageService.DownloadPackageAsync(_packageid, _version, "Packages");
+            await PackageService.DownloadPackageAsync(_packageid, _version, Constants.PackagesFolder);
             await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _packageid, _version);
             AddModuleMessage(Localizer["Success.Module.Download"], MessageType.Success);
             _productname = "";

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

@@ -81,19 +81,23 @@
     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()
+    {
+        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)
         {

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

@@ -22,6 +22,7 @@ else
             <th style="width: 1px;">&nbsp;</th>
             <th>@SharedLocalizer["Name"]</th>
             <th>@SharedLocalizer["Version"]</th>
+            <th>@Localizer["InUse"]</th>
             <th>@SharedLocalizer["Expires"]</th>
             <th style="width: 1px;">&nbsp;</th>
         </Header>
@@ -35,13 +36,26 @@ else
             </td>
             <td>@context.Name</td>
             <td>@context.Version</td>
+            <td>
+                @if(context.AssemblyName == "Oqtane.Client" || PageState.Modules.Where(m => m.ModuleDefinition?.ModuleDefinitionId == context.ModuleDefinitionId).FirstOrDefault() != null)
+                {
+                    <span>@SharedLocalizer["Yes"]</span>
+                }
+                else
+                {
+                    <span>@SharedLocalizer["No"]</span>
+                }
+            </td>
             <td>
                 @((MarkupString)PurchaseLink(context.PackageName))
             </td>
             <td>
-                @if (UpgradeAvailable(context.PackageName, context.Version))
+				@{ 
+					var version = UpgradeAvailable(context.PackageName, context.Version);
+				} 
+                @if (version != context.Version)
                 {
-                    <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadModule(context.PackageName, context.Version))>@SharedLocalizer["Upgrade"]</button>
+                    <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadModule(context.PackageName, version))>@SharedLocalizer["Upgrade"]</button>
                 }
             </td>
         </Row>
@@ -49,69 +63,67 @@ else
 }
 
 @code {
-    private List<ModuleDefinition> _moduleDefinitions;
+	private List<ModuleDefinition> _moduleDefinitions;
-    private List<Package> _packages;
+	private List<Package> _packages;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-    protected override async Task OnParametersSetAsync()
+	protected override async Task OnParametersSetAsync()
-    {
+	{
-        try
+		try
-        {
+		{
-            _moduleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
+			_moduleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
-            _packages = await PackageService.GetPackagesAsync("module");
+			_packages = await PackageService.GetPackagesAsync("module");
+		}
+		catch (Exception ex)
+		{
+			if (_moduleDefinitions == null)
+			{
+				await logger.LogError(ex, "Error Loading Modules {Error}", ex.Message);
+				AddModuleMessage(Localizer["Error.Module.Load"], MessageType.Error);
+			}
+		}
+	}
+
+	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)
+			{
+				if (package.ExpiryDate != null && package.ExpiryDate.Value.Date != DateTime.MaxValue.Date)
+				{
+					link += "<span>" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</span>";
+					if (!string.IsNullOrEmpty(package.PaymentUrl))
+					{
+						link += "&nbsp;&nbsp;<a class=\"btn btn-primary\" style=\"text-decoration: none !important\" href=\"" + package.PaymentUrl + "\" target=\"_new\">" + SharedLocalizer["Extend"] + "</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;
+			}
         }
-        catch (Exception ex)
+        return version;
-        {
-            if (_moduleDefinitions == null)
-            {
-                await logger.LogError(ex, "Error Loading Modules {Error}", ex.Message);
-                AddModuleMessage(Localizer["Error.Module.Load"], MessageType.Error);
-            }
-        }
-    }
-
-    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)
-            {
-                if (package.ExpiryDate != null && package.ExpiryDate.Value.Date != DateTime.MaxValue.Date)
-                {
-                    link += "<span>" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</span>";
-                    if (!string.IsNullOrEmpty(package.PaymentUrl))
-                    {
-                        link += "&nbsp;&nbsp;<a class=\"btn btn-primary\" style=\"text-decoration: none !important\" href=\"" + package.PaymentUrl + "\" target=\"_new\">" + SharedLocalizer["Extend"] + "</a>";
-                    }
-                }
-            }
-        }
-        return link;
-    }
-
-    private bool UpgradeAvailable(string packagename, string version)
-    {
-        var upgradeavailable = false;
-        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);
-            }
-
-        }
-        return upgradeavailable;
     }
 
     private async Task DownloadModule(string packagename, string version)
     {
         try
         {
-            await PackageService.DownloadPackageAsync(packagename, version, "Packages");
+            await PackageService.DownloadPackageAsync(packagename, version, Constants.PackagesFolder);
             await logger.LogInformation("Module Downloaded {ModuleDefinitionName} {Version}", packagename, version);
             await ModuleDefinitionService.InstallModuleDefinitionsAsync();
             AddModuleMessage(string.Format(Localizer["Success.Module.Install"], NavigateUrl("admin/system")), MessageType.Success);

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

@@ -74,7 +74,7 @@
                         </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." ResourceKey="UrlPath">Url Path: </Label>
+                        <Label Class="col-sm-3" For="path" HelpText="Optionally enter a url path for this page (ie. home ). If you do not provide a url path, the page name will be used. 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" />
                         </div>
@@ -95,6 +95,12 @@
                                 <input id="title" class="form-control" @bind="@_title" />
                             </div>
                         </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="meta" HelpText="Optionally enter meta tags (in exactly the form you want them to be included in the page output)." ResourceKey="Meta">Meta: </Label>
+                            <div class="col-sm-9">
+								<textarea id="meta" class="form-control" @bind="@_meta" rows="3"></textarea>
+                            </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">
@@ -156,220 +162,222 @@
 </form>
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
-    private List<Theme> _themeList;
+	private List<Theme> _themeList;
-    private List<ThemeControl> _themes = new List<ThemeControl>();
+	private List<ThemeControl> _themes = new List<ThemeControl>();
-    private List<ThemeControl> _containers = new List<ThemeControl>();
+	private List<ThemeControl> _containers = new List<ThemeControl>();
-    private List<Page> _pageList;
+	private List<Page> _pageList;
-    private string _name;
+	private string _name;
-    private string _title;
+	private string _title;
-    private string _path = string.Empty;
+	private string _meta;
-    private string _parentid = "-1";
+	private string _path = string.Empty;
-    private string _insert = ">>";
+	private string _parentid = "-1";
-    private List<Page> _children;
+	private string _insert = ">>";
-    private int _childid = -1;
+	private List<Page> _children;
-    private string _isnavigation = "True";
+	private int _childid = -1;
-    private string _isclickable = "True";
+	private string _isnavigation = "True";
-    private string _url;
+	private string _isclickable = "True";
-    private string _ispersonalizable = "False";
+	private string _url;
-    private string _themetype = string.Empty;
+	private string _ispersonalizable = "False";
-    private string _containertype = string.Empty;
+	private string _themetype = string.Empty;
-    private string _icon = string.Empty;
+	private string _containertype = string.Empty;
-    private string _permissions = string.Empty;
+	private string _icon = string.Empty;
-    private PermissionGrid _permissionGrid;
+	private string _permissions = string.Empty;
-    private Type _themeSettingsType;
+	private PermissionGrid _permissionGrid;
-    private object _themeSettings;
+	private Type _themeSettingsType;
-    private RenderFragment ThemeSettingsComponent { get; set; }
+	private object _themeSettings;
-    private bool _refresh = false;
+	private RenderFragment ThemeSettingsComponent { get; set; }
-    private ElementReference form;
+	private bool _refresh = false;
-    private bool validated = false;
+	private ElementReference form;
+	private bool validated = false;
 
-    protected override async Task OnInitializedAsync()
+	protected override async Task OnInitializedAsync()
-    {
+	{
-        try
+		try
-        {
+		{
-            _themeList = await ThemeService.GetThemesAsync();
+			_themeList = await ThemeService.GetThemesAsync();
-            _themes = ThemeService.GetThemeControls(_themeList);
+			_themes = ThemeService.GetThemeControls(_themeList);
-            _themetype = PageState.Site.DefaultThemeType;
+			_themetype = PageState.Site.DefaultThemeType;
-            _containers = ThemeService.GetContainerControls(_themeList, _themetype);
+			_containers = ThemeService.GetContainerControls(_themeList, _themetype);
-            _containertype = PageState.Site.DefaultContainerType;
+			_containertype = PageState.Site.DefaultContainerType;
-            _pageList = PageState.Pages;
+			_pageList = PageState.Pages;
-            _children = PageState.Pages.Where(item => item.ParentId == null).ToList();
+			_children = PageState.Pages.Where(item => item.ParentId == null).ToList();
-            _permissions = string.Empty;
+			_permissions = string.Empty;
-            ThemeSettings();
+			ThemeSettings();
-        }
+		}
-        catch (Exception ex)
+		catch (Exception ex)
-        {
+		{
-            await logger.LogError(ex, "Error Initializing Page {Error}", ex.Message);
+			await logger.LogError(ex, "Error Initializing Page {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error.Page.Initialize"], MessageType.Error);
+			AddModuleMessage(Localizer["Error.Page.Initialize"], MessageType.Error);
-        }
+		}
-    }
+	}
 
-    private async void ParentChanged(ChangeEventArgs e)
+	private async void ParentChanged(ChangeEventArgs e)
-    {
+	{
-        try
+		try
-        {
+		{
-            _parentid = (string)e.Value;
+			_parentid = (string)e.Value;
-            _children = new List<Page>();
+			_children = new List<Page>();
-            if (_parentid == "-1")
+			if (_parentid == "-1")
-            {
+			{
-                foreach (Page p in PageState.Pages.Where(item => item.ParentId == null))
+				foreach (Page p in PageState.Pages.Where(item => item.ParentId == null))
-                {
+				{
-                    if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+					if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
-                    {
+					{
-                        _children.Add(p);
+						_children.Add(p);
-                    }
+					}
-                }
+				}
-            }
+			}
-            else
+			else
-            {
+			{
-                foreach (Page p in PageState.Pages.Where(item => item.ParentId == int.Parse(_parentid)))
+				foreach (Page p in PageState.Pages.Where(item => item.ParentId == int.Parse(_parentid)))
-                {
+				{
-                    if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+					if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
-                    {
+					{
-                        _children.Add(p);
+						_children.Add(p);
-                    }
+					}
-                }
+				}
-            }
+			}
-            StateHasChanged();
+			StateHasChanged();
-        }
+		}
-        catch (Exception ex)
+		catch (Exception ex)
-        {
+		{
-            await logger.LogError(ex, "Error Loading Child Pages For Parent {PageId} {Error}", _parentid, ex.Message);
+			await logger.LogError(ex, "Error Loading Child Pages For Parent {PageId} {Error}", _parentid, ex.Message);
-            AddModuleMessage(Localizer["Error.ChildPage.Load"], MessageType.Error);
+			AddModuleMessage(Localizer["Error.ChildPage.Load"], MessageType.Error);
-        }
+		}
-    }
+	}
 
-    private async void ThemeChanged(ChangeEventArgs e)
+	private async void ThemeChanged(ChangeEventArgs e)
-    {
+	{
-        try
+		try
-        {
+		{
-            _themetype = (string)e.Value;
+			_themetype = (string)e.Value;
-            _containers = ThemeService.GetContainerControls(_themeList, _themetype);
+			_containers = ThemeService.GetContainerControls(_themeList, _themetype);
-            _containertype = "-";
+			_containertype = "-";
-            ThemeSettings();
+			ThemeSettings();
-            StateHasChanged();
+			StateHasChanged();
-        }
+		}
-        catch (Exception ex)
+		catch (Exception ex)
-        {
+		{
-            await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message);
+			await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message);
-            AddModuleMessage(Localizer["Error.Pane.Load"], MessageType.Error);
+			AddModuleMessage(Localizer["Error.Pane.Load"], MessageType.Error);
-        }
+		}
-    }
+	}
 
-    private void ThemeSettings()
+	private void ThemeSettings()
-    {
+	{
-        _themeSettingsType = null;
+		_themeSettingsType = null;
-        var theme = _themeList.FirstOrDefault(item => item.Themes.Any(themecontrol => themecontrol.TypeName.Equals(_themetype)));
+		var theme = _themeList.FirstOrDefault(item => item.Themes.Any(themecontrol => themecontrol.TypeName.Equals(_themetype)));
-        if (theme != null && !string.IsNullOrEmpty(theme.ThemeSettingsType))
+		if (theme != null && !string.IsNullOrEmpty(theme.ThemeSettingsType))
-        {
+		{
-            _themeSettingsType = Type.GetType(theme.ThemeSettingsType);
+			_themeSettingsType = Type.GetType(theme.ThemeSettingsType);
-            if (_themeSettingsType != null)
+			if (_themeSettingsType != null)
-            {
+			{
-                ThemeSettingsComponent = builder =>
+				ThemeSettingsComponent = builder =>
-                {
+				{
-                    builder.OpenComponent(0, _themeSettingsType);
+					builder.OpenComponent(0, _themeSettingsType);
-                    builder.AddComponentReferenceCapture(1, inst => { _themeSettings = Convert.ChangeType(inst, _themeSettingsType); });
+					builder.AddComponentReferenceCapture(1, inst => { _themeSettings = Convert.ChangeType(inst, _themeSettingsType); });
-                    builder.CloseComponent();
+					builder.CloseComponent();
-                };
+				};
-            }
+			}
-            _refresh = true;
+			_refresh = true;
-        }
+		}
-    }
+	}
 
-    private async Task SavePage()
+	private async Task SavePage()
-    {
+	{
-        validated = true;
+		validated = true;
-        var interop = new Interop(JSRuntime);
+		var interop = new Interop(JSRuntime);
-        if (await interop.FormValid(form))
+		if (await interop.FormValid(form))
-        {
+		{
-            Page page = null;
+			Page page = null;
-            try
+			try
-            {
+			{
-                if (!string.IsNullOrEmpty(_themetype) && _containertype != "-")
+				if (!string.IsNullOrEmpty(_themetype) && _containertype != "-")
-                {
+				{
-                    page = new Page();
+					page = new Page();
-                    page.SiteId = PageState.Page.SiteId;
+					page.SiteId = PageState.Page.SiteId;
-                    page.Name = _name;
+					page.Name = _name;
-                    page.Title = _title;
+					page.Title = _title;
-                    if (string.IsNullOrEmpty(_path))
-                    {
-                        _path = _name;
-                    }
 
-                    if (_path.Contains("/"))
+					if (string.IsNullOrEmpty(_path))
-                    {
+					{
-                        _path = _path.Substring(_path.LastIndexOf("/") + 1);
+						_path = _name;
-                    }
+					}
+					if (_path.Contains("/"))
+					{
+						_path = _path.Substring(_path.LastIndexOf("/") + 1);
+					}
 
-                    if (_parentid == "-1")
+					if (_parentid == "-1")
-                    {
+					{
-                        page.ParentId = null;
+						page.ParentId = null;
-                        page.Path = Utilities.GetFriendlyUrl(_path);
+						page.Path = Utilities.GetFriendlyUrl(_path);
-                    }
+					}
-                    else
+					else
-                    {
+					{
-                        page.ParentId = Int32.Parse(_parentid);
+						page.ParentId = Int32.Parse(_parentid);
-                        var parent = PageState.Pages.Where(item => item.PageId == page.ParentId).FirstOrDefault();
+						var parent = PageState.Pages.Where(item => item.PageId == page.ParentId).FirstOrDefault();
-                        if (parent.Path == string.Empty)
+						if (parent.Path == string.Empty)
-                        {
+						{
-                            page.Path = Utilities.GetFriendlyUrl(parent.Name) + "/" + Utilities.GetFriendlyUrl(_path);
+							page.Path = Utilities.GetFriendlyUrl(parent.Name) + "/" + Utilities.GetFriendlyUrl(_path);
-                        }
+						}
-                        else
+						else
-                        {
+						{
-                            page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(_path);
+							page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(_path);
-                        }
+						}
-                    }
+					}
 
-                    if(PagePathIsDeleted(page.Path, page.SiteId, _pageList))
+					if(PagePathIsDeleted(page.Path, page.SiteId, _pageList))
-                    {
+					{
-                        AddModuleMessage(string.Format(Localizer["Message.Page.Deleted"], _path), MessageType.Warning);
+						AddModuleMessage(string.Format(Localizer["Message.Page.Deleted"], _path), MessageType.Warning);
-                        return;
+						return;
-                    }
+					}
 
-                    if (!PagePathIsUnique(page.Path, page.SiteId, _pageList))
+					if (!PagePathIsUnique(page.Path, page.SiteId, _pageList))
-                    {
+					{
-                        AddModuleMessage(string.Format(Localizer["Message.Page.Exists"], _path), MessageType.Warning);
+						AddModuleMessage(string.Format(Localizer["Message.Page.Exists"], _path), MessageType.Warning);
-                        return;
+						return;
-                    }
+					}
 
-                    Page child;
+					Page child;
-                    switch (_insert)
+					switch (_insert)
-                    {
+					{
-                        case "<<":
+						case "<<":
-                            page.Order = 0;
+							page.Order = 0;
-                            break;
+							break;
-                        case "<":
+						case "<":
-                            child = PageState.Pages.Where(item => item.PageId == _childid).FirstOrDefault();
+							child = PageState.Pages.Where(item => item.PageId == _childid).FirstOrDefault();
-                            page.Order = child.Order - 1;
+							page.Order = child.Order - 1;
-                            break;
+							break;
-                        case ">":
+						case ">":
-                            child = PageState.Pages.Where(item => item.PageId == _childid).FirstOrDefault();
+							child = PageState.Pages.Where(item => item.PageId == _childid).FirstOrDefault();
-                            page.Order = child.Order + 1;
+							page.Order = child.Order + 1;
-                            break;
+							break;
-                        case ">>":
+						case ">>":
-                            page.Order = int.MaxValue;
+							page.Order = int.MaxValue;
-                            break;
+							break;
-                    }
+					}
 
-                    page.IsNavigation = (_isnavigation == null ? true : Boolean.Parse(_isnavigation));
+					page.IsNavigation = (_isnavigation == null ? true : Boolean.Parse(_isnavigation));
-                    page.IsClickable = (_isclickable == null ? true : Boolean.Parse(_isclickable));
+					page.IsClickable = (_isclickable == null ? true : Boolean.Parse(_isclickable));
-                    page.Url = _url;
+					page.Url = _url;
-                    page.ThemeType = (_themetype != "-") ? _themetype : string.Empty;
+					page.ThemeType = (_themetype != "-") ? _themetype : string.Empty;
-                    if (!string.IsNullOrEmpty(page.ThemeType) && page.ThemeType == PageState.Site.DefaultThemeType)
+					if (!string.IsNullOrEmpty(page.ThemeType) && page.ThemeType == PageState.Site.DefaultThemeType)
-                    {
+					{
-                        page.ThemeType = string.Empty;
+						page.ThemeType = string.Empty;
-                    }
+					}
-                    page.DefaultContainerType = (_containertype != "-") ? _containertype : string.Empty;
+					page.DefaultContainerType = (_containertype != "-") ? _containertype : string.Empty;
-                    if (!string.IsNullOrEmpty(page.DefaultContainerType) && page.DefaultContainerType == PageState.Site.DefaultContainerType)
+					if (!string.IsNullOrEmpty(page.DefaultContainerType) && page.DefaultContainerType == PageState.Site.DefaultContainerType)
-                    {
+					{
-                        page.DefaultContainerType = string.Empty;
+						page.DefaultContainerType = string.Empty;
-                    }
+					}
-                    page.Icon = (_icon == null ? string.Empty : _icon);
+					page.Icon = (_icon == null ? string.Empty : _icon);
-                    page.Permissions = _permissionGrid.GetPermissions();
+					page.Permissions = _permissionGrid.GetPermissions();
-                    page.IsPersonalizable = (_ispersonalizable == null ? false : Boolean.Parse(_ispersonalizable));
+					page.IsPersonalizable = (_ispersonalizable == null ? false : Boolean.Parse(_ispersonalizable));
-                    page.UserId = null;
+					page.UserId = null;
+					page.Meta = _meta;
 
                     page = await PageService.AddPageAsync(page);
                     await PageService.UpdatePageOrderAsync(page.SiteId, page.PageId, page.ParentId);

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

@@ -3,13 +3,14 @@
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IPageService PageService
+@inject IPageModuleService PageModuleService
 @inject IThemeService  ThemeService
 @inject IStringLocalizer<Edit> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
     <TabStrip Refresh="@_refresh">
-        <TabPanel Name="Settings" ResourceKey="Settings">
+        <TabPanel Name="Settings" ResourceKey="Settings" Heading=@Localizer["Settings.Heading"]>
             @if (_themeList != null)
             {
                 <div class="container">
@@ -81,7 +82,7 @@
                         </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." ResourceKey="UrlPath">Url Path: </Label>
+                        <Label Class="col-sm-3" For="path" HelpText="Optionally enter a url path for this page (ie. home ). If you do not provide a url path, the page name will be used. 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>
@@ -101,6 +102,12 @@
                                 <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="meta" HelpText="Optionally enter meta tags (in exactly the form you want them to be included in the page output)." ResourceKey="Meta">Meta: </Label>
+                            <div class="col-sm-9">
+								<textarea id="meta" class="form-control" @bind="@_meta" rows="3"></textarea>
+                            </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">
@@ -151,10 +158,27 @@
                 <div class="container">
                     <div class="row mb-1 align-items-center">
                         <PermissionGrid EntityName="@EntityNames.Page" Permissions="@_permissions" @ref="_permissionGrid" />
-
                     </div>
                 </div>
-
+            }
+        </TabPanel>
+        <TabPanel Name="PageModules" Heading="Modules" ResourceKey="PageModules">
+            @if(_pageModules != null)
+            {
+                <Pager Items="_pageModules">
+                    <Header>
+                        <th style="width: 1px;">&nbsp;</th>
+                        <th style="width: 1px;">&nbsp;</th>
+                        <th>@Localizer["ModuleTitle"]</th>
+                        <th>@Localizer["ModuleDefinition"]</th>
+                    </Header>
+                    <Row>
+                        <td><ActionLink Action="Settings" Text="Edit" ModuleId="@context.ModuleId" Security="SecurityAccessLevel.Edit" Permissions="@context.Permissions" ResourceKey="ModuleSettings" /></td>
+                        <td><ActionDialog Header="Delete Module" Message="Are You Sure You Wish To Delete This Module?" Action="Delete" Security="SecurityAccessLevel.Edit" Permissions="@context.Permissions" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" ResourceKey="DeleteModule" /></td>
+                        <td>@context.Title</td>
+                        <td>@context.ModuleDefinition?.Name</td>
+                    </Row>
+                </Pager>
             }
         </TabPanel>
         @if (_themeSettingsType != null)
@@ -170,277 +194,314 @@
 </form>
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
-    private ElementReference form;
+	private ElementReference form;
-    private bool validated = false;
+	private bool validated = false;
-    private List<Theme> _themeList;
+	private List<Theme> _themeList;
-    private List<ThemeControl> _themes = new List<ThemeControl>();
+	private List<ThemeControl> _themes = new List<ThemeControl>();
-    private List<ThemeControl> _containers = new List<ThemeControl>();
+	private List<ThemeControl> _containers = new List<ThemeControl>();
-    private List<Page> _pageList;
+	private List<Page> _pageList;
-    private int _pageId;
+	private List<Module> _pageModules;
-    private string _name;
+	private int _pageId;
-    private string _title;
+	private string _name;
-    private string _path;
+	private string _title;
-    private string _currentparentid;
+	private string _meta;
-    private string _parentid = "-1";
+	private string _path;
-    private string _insert = "=";
+	private string _currentparentid;
-    private List<Page> _children;
+	private string _parentid = "-1";
-    private int _childid = -1;
+	private string _insert = "=";
-    private string _isnavigation;
+	private List<Page> _children;
-    private string _isclickable;
+	private int _childid = -1;
-    private string _url;
+	private string _isnavigation;
-    private string _ispersonalizable;
+	private string _isclickable;
-    private string _themetype;
+	private string _url;
-    private string _containertype = "-";
+	private string _ispersonalizable;
-    private string _icon;
+	private string _themetype;
-    private string _permissions = null;
+	private string _containertype = "-";
-    private string _createdby;
+	private string _icon;
-    private DateTime _createdon;
+	private string _permissions = null;
-    private string _modifiedby;
+	private string _createdby;
-    private DateTime _modifiedon;
+	private DateTime _createdon;
-    private string _deletedby;
+	private string _modifiedby;
-    private DateTime? _deletedon;
+	private DateTime _modifiedon;
-    private PermissionGrid _permissionGrid;
+	private string _deletedby;
-    private Type _themeSettingsType;
+	private DateTime? _deletedon;
-    private object _themeSettings;
+	private PermissionGrid _permissionGrid;
-    private RenderFragment ThemeSettingsComponent { get; set; }
+	private Type _themeSettingsType;
-    private bool _refresh = false;
+	private object _themeSettings;
+	private RenderFragment ThemeSettingsComponent { get; set; }
+	private bool _refresh = false;
+	protected Page page;
 
-    protected override async Task OnInitializedAsync()
+	protected override async Task OnInitializedAsync()
-    {
+	{
-        try
+		try
-        {
+		{
-            _pageList = PageState.Pages;
+			_pageList = PageState.Pages;
-            _children = PageState.Pages.Where(item => item.ParentId == null).ToList();
+			_children = PageState.Pages.Where(item => item.ParentId == null).ToList();
+			_themeList = await ThemeService.GetThemesAsync();
+			_themes = ThemeService.GetThemeControls(_themeList);
 
-            _themeList = await ThemeService.GetThemesAsync();
+			_pageId = Int32.Parse(PageState.QueryString["id"]);
-            _themes = ThemeService.GetThemeControls(_themeList);
+			page = PageState.Pages.FirstOrDefault(item => item.PageId == _pageId);
 
-            _pageId = Int32.Parse(PageState.QueryString["id"]);
+			if (page != null)
-            var page = PageState.Pages.FirstOrDefault(item => item.PageId == _pageId);
+			{
-            if (page != null)
+				_name = page.Name;
-            {
+				_title = page.Title;
-                _name = page.Name;
+				_meta = page.Meta;
-                _title = page.Title;
+				_path = page.Path;
-                _path = page.Path;
+				_pageModules = PageState.Modules.Where(m => m.PageId == page.PageId).ToList();
 
-                if (_path.Contains("/"))
+				if (string.IsNullOrEmpty(_path))
-                {
+				{
-                    _path = _path.Substring(_path.LastIndexOf("/") + 1);
+					_path = "/";
-                }
+				}
+				else
+				{
+					if (_path.Contains("/"))
+					{
+						_path = _path.Substring(_path.LastIndexOf("/") + 1);
+					}
+				}
 
-                if (page.ParentId == null)
+				if (page.ParentId == null)
-                {
+				{
-                    _parentid = "-1";
+					_parentid = "-1";
-                }
+				}
-                else
+				else
-                {
+				{
-                    _parentid = page.ParentId.ToString();
+					_parentid = page.ParentId.ToString();
-                }
+				}
 
-                _currentparentid = _parentid;
+				_currentparentid = _parentid;
-                _isnavigation = page.IsNavigation.ToString();
+				_isnavigation = page.IsNavigation.ToString();
-                _isclickable = page.IsClickable.ToString();
+				_isclickable = page.IsClickable.ToString();
-                _url = page.Url;
+				_url = page.Url;
-                _ispersonalizable = page.IsPersonalizable.ToString();
+				_ispersonalizable = page.IsPersonalizable.ToString();
-                _themetype = page.ThemeType;
+				_themetype = page.ThemeType;
-                if (string.IsNullOrEmpty(_themetype))
+				if (string.IsNullOrEmpty(_themetype))
-                {
+				{
-                    _themetype = PageState.Site.DefaultThemeType;
+					_themetype = PageState.Site.DefaultThemeType;
-                }
+				}
-                _containers = ThemeService.GetContainerControls(_themeList, _themetype);
+				_containers = ThemeService.GetContainerControls(_themeList, _themetype);
-                _containertype = page.DefaultContainerType;
+				_containertype = page.DefaultContainerType;
-                if (string.IsNullOrEmpty(_containertype))
+				if (string.IsNullOrEmpty(_containertype))
-                {
+				{
-                    _containertype = PageState.Site.DefaultContainerType;
+					_containertype = PageState.Site.DefaultContainerType;
-                }
+				}
-                _icon = page.Icon;
+				_icon = page.Icon;
-                _permissions = page.Permissions;
+				_permissions = page.Permissions;
-                _createdby = page.CreatedBy;
+				_createdby = page.CreatedBy;
-                _createdon = page.CreatedOn;
+				_createdon = page.CreatedOn;
-                _modifiedby = page.ModifiedBy;
+				_modifiedby = page.ModifiedBy;
-                _modifiedon = page.ModifiedOn;
+				_modifiedon = page.ModifiedOn;
-                _deletedby = page.DeletedBy;
+				_deletedby = page.DeletedBy;
-                _deletedon = page.DeletedOn;
+				_deletedon = page.DeletedOn;
 
-                ThemeSettings();
+				ThemeSettings();
-            }
+			}
-        }
+		}
-        catch (Exception ex)
+		catch (Exception ex)
-        {
+		{
-            await logger.LogError(ex, "Error Loading Page {PageId} {Error}", _pageId, ex.Message);
+			await logger.LogError(ex, "Error Loading Page {PageId} {Error}", _pageId, ex.Message);
-            AddModuleMessage(Localizer["Error.Page.Load"], MessageType.Error);
+			AddModuleMessage(Localizer["Error.Page.Load"], MessageType.Error);
-        }
+		}
-    }
+	}
 
-    private async void ParentChanged(ChangeEventArgs e)
+	private async Task DeleteModule(Module module)
-    {
+	{
-        try
+		try
-        {
+		{
-            _parentid = (string)e.Value;
+			PageModule pagemodule = await PageModuleService.GetPageModuleAsync(page.PageId, module.ModuleId);
-            _children = new List<Page>();
+			pagemodule.IsDeleted = true;
-            if (_parentid == "-1")
+			await PageModuleService.UpdatePageModuleAsync(pagemodule);
-            {
+			await logger.LogInformation(LogFunction.Update,"Module Deleted {Title}", module.Title);
-                foreach (Page p in PageState.Pages.Where(item => item.ParentId == null))
+			_pageModules.RemoveAll(item => item.PageModuleId == pagemodule.PageModuleId);
-                {
+			StateHasChanged();
-                    if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+			NavigationManager.NavigateTo(NavigationManager.Uri + "&tab=PageModules");
-                    {
+		}
-                        _children.Add(p);
+		catch (Exception ex)
-                    }
+		{
-                }
+			await logger.LogError(ex, "Error Deleting Module {Title} {Error}", module.Title, ex.Message);
-            }
+			AddModuleMessage(Localizer["Error.Module.Delete"], MessageType.Error);
-            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);
-                    }
-                }
-            }
-            if (_parentid == _currentparentid)
-            {
-                _insert = "=";
-            }
-            else
-            {
-                _insert = ">>";
-            }
-            StateHasChanged();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Child Pages For Parent {PageId} {Error}", _parentid, ex.Message);
-            AddModuleMessage(Localizer["Error.ChildPage.Load"], MessageType.Error);
-        }
-    }
 
-    private async void ThemeChanged(ChangeEventArgs e)
+	private async void ParentChanged(ChangeEventArgs e)
-    {
+	{
-        try
+		try
-        {
+		{
-            _themetype = (string)e.Value;
+			_parentid = (string)e.Value;
-            _containers = ThemeService.GetContainerControls(_themeList, _themetype);
+			_children = new List<Page>();
-            _containertype = "-";
+			if (_parentid == "-1")
-            ThemeSettings();
+			{
-            StateHasChanged();
+				foreach (Page p in PageState.Pages.Where(item => item.ParentId == null))
-        }
+				{
-        catch (Exception ex)
+					if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
-        {
+					{
-            await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message);
+						_children.Add(p);
-            AddModuleMessage(Localizer["Error.Pane.Load"], MessageType.Error);
+					}
-        }
+				}
-    }
+			}
+			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);
+					}
+				}
+			}
+			if (_parentid == _currentparentid)
+			{
+				_insert = "=";
+			}
+			else
+			{
+				_insert = ">>";
+			}
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Child Pages For Parent {PageId} {Error}", _parentid, ex.Message);
+			AddModuleMessage(Localizer["Error.ChildPage.Load"], MessageType.Error);
+		}
+	}
 
-    private void ThemeSettings()
+	private async void ThemeChanged(ChangeEventArgs e)
-    {
+	{
-        _themeSettingsType = null;
+		try
-        var theme = _themeList.FirstOrDefault(item => item.Themes.Any(themecontrol => themecontrol.TypeName.Equals(_themetype)));
+		{
-        if (theme != null && !string.IsNullOrEmpty(theme.ThemeSettingsType))
+			_themetype = (string)e.Value;
-        {
+			_containers = ThemeService.GetContainerControls(_themeList, _themetype);
-            _themeSettingsType = Type.GetType(theme.ThemeSettingsType);
+			_containertype = "-";
-            if (_themeSettingsType != null)
+			ThemeSettings();
-            {
+			StateHasChanged();
-                ThemeSettingsComponent = builder =>
+		}
-                {
+		catch (Exception ex)
-                    builder.OpenComponent(0, _themeSettingsType);
+		{
-                    builder.AddComponentReferenceCapture(1, inst => { _themeSettings = Convert.ChangeType(inst, _themeSettingsType); });
+			await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message);
-                    builder.CloseComponent();
+			AddModuleMessage(Localizer["Error.Pane.Load"], MessageType.Error);
-                };
+		}
-            }
+	}
-            _refresh = true;
-        }
-    }
 
-    private async Task SavePage()
+	private void ThemeSettings()
-    {
+	{
-        validated = true;
+		_themeSettingsType = null;
-        var interop = new Interop(JSRuntime);
+		if (PageState.QueryString.ContainsKey("cp")) // can only be displayed if invoked from Control Panel
-        if (await interop.FormValid(form))
+		{
-        {
+			var theme = _themeList.FirstOrDefault(item => item.Themes.Any(themecontrol => themecontrol.TypeName.Equals(_themetype)));
-            Page page = null;
+			if (theme != null && !string.IsNullOrEmpty(theme.ThemeSettingsType))
-            try
+			{
-            {
+				_themeSettingsType = Type.GetType(theme.ThemeSettingsType);
-                if (!string.IsNullOrEmpty(_themetype) && _containertype != "-")
+				if (_themeSettingsType != null)
-                {
+				{
-                    page = PageState.Pages.FirstOrDefault(item => item.PageId == _pageId);
+					ThemeSettingsComponent = builder =>
-                    string currentPath = page.Path;
+					{
+						builder.OpenComponent(0, _themeSettingsType);
+						builder.AddComponentReferenceCapture(1, inst => { _themeSettings = Convert.ChangeType(inst, _themeSettingsType); });
+						builder.CloseComponent();
+					};
+				}
+				_refresh = true;
+			}
+		}
+	}
 
-                    page.Name = _name;
+	private async Task SavePage()
-                    page.Title = _title;
+	{
-                    if (string.IsNullOrEmpty(_path) && _name.ToLower() != "home")
+		validated = true;
-                    {
+		var interop = new Interop(JSRuntime);
-                        _path = _name;
+		if (await interop.FormValid(form))
-                    }
+		{
-                    if (_path.Contains("/"))
+			Page page = null;
-                    {
+			try
-                        _path = _path.Substring(_path.LastIndexOf("/") + 1);
+			{
-                    }
+				if (!string.IsNullOrEmpty(_themetype) && _containertype != "-")
-                    if (_parentid == "-1")
+				{
-                    {
+					page = PageState.Pages.FirstOrDefault(item => item.PageId == _pageId);
-                        page.ParentId = null;
+					string currentPath = page.Path;
-                        page.Path = Utilities.GetFriendlyUrl(_path);
-                    }
-                    else
-                    {
-                        page.ParentId = Int32.Parse(_parentid);
-                        Page parent = PageState.Pages.FirstOrDefault(item => item.PageId == page.ParentId);
-                        if (parent.Path == string.Empty)
-                        {
-                            page.Path = Utilities.GetFriendlyUrl(parent.Name) + "/" + Utilities.GetFriendlyUrl(_path);
-                        }
-                        else
-                        {
-                            page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(_path);
-                        }
-                    }
 
-                    if (!PagePathIsUnique(page.Path, page.SiteId, page.PageId, _pageList))
+					page.Name = _name;
-                    {
+					page.Title = _title;
-                        AddModuleMessage(string.Format(Localizer["Mesage.Page.PathExists"], _path), MessageType.Warning);
-                        return;
-                    }
 
-                    if (_insert != "=")
+					if (string.IsNullOrEmpty(_path))
-                    {
+					{
-                        Page child;
+						_path = _name;
-                        switch (_insert)
+					}
-                        {
+					if (_path.Contains("/"))
-                            case "<<":
+					{
-                                page.Order = 0;
+						_path = _path.Substring(_path.LastIndexOf("/") + 1);
-                                break;
+					}
-                            case "<":
+
-                                child = PageState.Pages.FirstOrDefault(item => item.PageId == _childid);
+					if (_parentid == "-1")
-                                if (child != null) page.Order = child.Order - 1;
+					{
-                                break;
+						page.ParentId = null;
-                            case ">":
+						page.Path = Utilities.GetFriendlyUrl(_path);
-                                child = PageState.Pages.FirstOrDefault(item => item.PageId == _childid);
+					}
-                                if (child != null) page.Order = child.Order + 1;
+					else
-                                break;
+					{
-                            case ">>":
+						page.ParentId = Int32.Parse(_parentid);
-                                page.Order = int.MaxValue;
+						Page parent = PageState.Pages.FirstOrDefault(item => item.PageId == page.ParentId);
-                                break;
+						if (parent.Path == string.Empty)
-                        }
+						{
-                    }
+							page.Path = Utilities.GetFriendlyUrl(parent.Name) + "/" + Utilities.GetFriendlyUrl(_path);
-                    page.IsNavigation = (_isnavigation == null || Boolean.Parse(_isnavigation));
+						}
-                    page.IsClickable = (_isclickable == null ? true : Boolean.Parse(_isclickable));
+						else
-                    page.Url = _url;
+						{
-                    page.ThemeType = (_themetype != "-") ? _themetype : string.Empty;
+							page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(_path);
-                    if (!string.IsNullOrEmpty(page.ThemeType) && page.ThemeType == PageState.Site.DefaultThemeType)
+						}
-                    {
+					}
-                        page.ThemeType = string.Empty;
+
-                    }
+					if (!PagePathIsUnique(page.Path, page.SiteId, page.PageId, _pageList))
-                    page.DefaultContainerType = (_containertype != "-") ? _containertype : string.Empty;
+					{
-                    if (!string.IsNullOrEmpty(page.DefaultContainerType) && page.DefaultContainerType == PageState.Site.DefaultContainerType)
+						AddModuleMessage(string.Format(Localizer["Mesage.Page.PathExists"], _path), MessageType.Warning);
-                    {
+						return;
-                        page.DefaultContainerType = string.Empty;
+					}
-                    }
+
-                    page.Icon = _icon ?? string.Empty;
+					if (_insert != "=")
-                    page.Permissions = _permissionGrid.GetPermissions();
+					{
-                    page.IsPersonalizable = (_ispersonalizable != null && Boolean.Parse(_ispersonalizable));
+						Page child;
-                    page.UserId = null;
+						switch (_insert)
+						{
+							case "<<":
+								page.Order = 0;
+								break;
+							case "<":
+								child = PageState.Pages.FirstOrDefault(item => item.PageId == _childid);
+								if (child != null) page.Order = child.Order - 1;
+								break;
+							case ">":
+								child = PageState.Pages.FirstOrDefault(item => item.PageId == _childid);
+								if (child != null) page.Order = child.Order + 1;
+								break;
+							case ">>":
+								page.Order = int.MaxValue;
+								break;
+						}
+					}
+					page.IsNavigation = (_isnavigation == null || 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 ?? string.Empty;
+					page.Permissions = _permissionGrid.GetPermissions();
+					page.IsPersonalizable = (_ispersonalizable != null && Boolean.Parse(_ispersonalizable));
+					page.UserId = null;
+					page.Meta = _meta;
 
                     page = await PageService.UpdatePageAsync(page);
                     await PageService.UpdatePageOrderAsync(page.SiteId, page.PageId, page.ParentId);

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

@@ -11,13 +11,15 @@
 
     <Pager Items="@PageState.Pages.Where(item => !item.IsDeleted)">
         <Header>
-            <th style="width: 1px;">&nbsp;</th>
+        <th style="width: 1px;">&nbsp;</th>
-            <th style="width: 1px;">&nbsp;</th>
+        <th style="width: 1px;">&nbsp;</th>
-            <th>@SharedLocalizer["Name"]</th>
+        <th style="width: 1px;">&nbsp;</th>
+        <th>@SharedLocalizer["Name"]</th>
         </Header>
         <Row>
             <td><ActionLink Action="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>
@@ -42,4 +44,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/RecycleBin/Index.razor

@@ -25,7 +25,7 @@
                     <th>@Localizer["DeletedOn"]</th>
                 </Header>
                 <Row>
-                    <td><button @onclick="@(() => RestorePage(context))" class="btn btn-info" title="Restore">Restore</button></td>
+                    <td><button type="button" @onclick="@(() => RestorePage(context))" class="btn btn-success" 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>
@@ -34,9 +34,7 @@
             </Pager>
             @if (_pages.Any())
             {
-                <div style="text-align:right;">
+                <br /><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" />
-                    <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>
             }
         }
     </TabPanel>
@@ -58,7 +56,7 @@
                     <th>@Localizer["DeletedOn"]</th>
                 </Header>
                 <Row>
-                    <td><button @onclick="@(() => RestoreModule(context))" class="btn btn-info" title="Restore">@Localizer["Restore"]</button></td>
+                    <td><button type="button" @onclick="@(() => RestoreModule(context))" class="btn btn-success" title="Restore">@Localizer["Restore"]</button></td>
                     <td><ActionDialog Header="Delete Module" Message="@string.Format(Localizer["Confirm.Module.Delete"], context.Title)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" ResourceKey="DeleteModule" /></td>
                     <td>@PageState.Pages.Find(item => item.PageId == context.PageId).Name</td>
                     <td>@context.Title</td>
@@ -68,9 +66,7 @@
             </Pager>
             @if (_modules.Any())
             {
-                <div style="text-align:right;">
+                <br /><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" />
-                    <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>
             }
 
         }

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

@@ -27,19 +27,25 @@
                     <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">
-                            <input id="password" type="password" class="form-control" @bind="@_password" autocomplete="new-password" required />
+							<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">@_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">
-                            <input id="confirm" type="password" class="form-control" @bind="@_confirm" autocomplete="new-password" required />
+							<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">@_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 />
+							<input id="email" class="form-control" @bind="@_email" maxlength="256" required />
                         </div>
                     </div>
                     <div class="row mb-1 align-items-center">
@@ -62,15 +68,22 @@ else
 }
 
 @code {
-    private string _username = string.Empty;
+	private string _username = string.Empty;
-    private ElementReference form;
+	private ElementReference form;
-    private bool validated = false;
+	private bool validated = false;
-    private string _password = string.Empty;
+	private string _password = string.Empty;
-    private string _confirm = string.Empty;
+	private string _passwordtype = "password";
-    private string _email = string.Empty;
+	private string _togglepassword = string.Empty;
-    private string _displayname = string.Empty;
+	private string _confirm = string.Empty;
+	private string _email = string.Empty;
+	private string _displayname = string.Empty;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
+
+	protected override void OnParametersSet()
+	{
+		_togglepassword = SharedLocalizer["ShowPassword"];
+	}
 
     private async Task Register()
     {
@@ -90,9 +103,10 @@ else
                         {
                             SiteId = PageState.Site.SiteId,
                             Username = _username,
-                            DisplayName = (_displayname == string.Empty ? _username : _displayname),
+                            Password = _password,
                             Email = _email,
-                            Password = _password
+                            DisplayName = (_displayname == string.Empty ? _username : _displayname),
+							PhotoFileId = null
                         };
                         user = await UserService.AddUserAsync(user);
 
@@ -133,4 +147,18 @@ else
     {
         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/Reset/Index.razor

@@ -7,41 +7,59 @@
 
 <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
     <div class="container">
-        <div class="form-group">
+        <div class="row mb-1 align-items-center">
-            <label for="Username" class="control-label">@SharedLocalizer["Username"] </label>
+            <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>
-            <input type="text" class="form-control" placeholder="Username" @bind="@_username" readonly id="Username" />
+            <div class="col-sm-9">
+                <input id="username" type="text" class="form-control" @bind="@_username" readonly />
+            </div>
         </div>
-        <div class="form-group">
+        <div class="row mb-1 align-items-center">
-            <label for="Password" class="control-label">@SharedLocalizer["Password"] </label>
+            <Label Class="col-sm-3" For="password" HelpText="The new password. It must satisfy complexity rules for the site." ResourceKey="Password">Password: </Label>
-            <input type="password" class="form-control" placeholder="Password" @bind="@_password" id="Password" required />
+            <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">@_togglepassword</button>
+				</div>
+            </div>
         </div>
-        <div class="form-group">
+        <div class="row mb-1 align-items-center">
-            <label for="Confirm" class="control-label">@Localizer["Password.Confirm"] </label>
+            <Label Class="col-sm-3" For="confirm" HelpText="Enter the password again. It must exactly match the password entered above." ResourceKey="Confirm">Confirm: </Label>
-            <input type="password" class="form-control" placeholder="Password" @bind="@_confirm" id="Confirm" required />
+            <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">@_togglepassword</button>
+				</div>
+            </div>
         </div>
-        <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>
+    <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>
 </form>
 
 @code {
-    private ElementReference form;
+	private ElementReference form;
-    private bool validated = false;
+	private bool validated = false;
-    private string _username = string.Empty;
+	private string _username = string.Empty;
-    private string _password = string.Empty;
+	private string _password = string.Empty;
-    private string _confirm = string.Empty;
+	private string _passwordtype = "password";
+	private string _togglepassword = string.Empty;
+	private string _confirm = string.Empty;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
 
-    protected override void OnInitialized()
+	protected override async Task OnInitializedAsync()
-    {
+	{
-        if (PageState.QueryString.ContainsKey("name") && PageState.QueryString.ContainsKey("token"))
+		_togglepassword = SharedLocalizer["ShowPassword"];
+
+		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
         }
     }
 
@@ -102,4 +120,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/Users.razor

@@ -35,13 +35,13 @@ else
             <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" required />
+                    <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" required />
+                    <input type="date" id="expiryDate" class="form-control" @bind="@expirydate" />
                 </div>
             </div>
             <br /><br />
@@ -53,12 +53,14 @@ else
                     <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>
@@ -93,11 +95,7 @@ else
             roleid = Int32.Parse(PageState.QueryString["id"]);
             Role role = await RoleService.GetRoleAsync(roleid);
             name = role.Name;
-            users = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId);
+            users = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, RoleNames.Registered);
-            users = users
-                .Where(u => u.Role.Name == RoleNames.Registered)
-                .OrderBy(u => u.User.DisplayName)
-                .ToList();
             await GetUserRoles();
         }
         catch (Exception ex)
@@ -111,8 +109,7 @@ else
     {
         try
         {
-            userroles = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId);
+            userroles = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, name);
-            userroles = userroles.Where(item => item.RoleId == roleid).ToList();
         }
         catch (Exception ex)
         {

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

@@ -1,5 +1,6 @@
 @namespace Oqtane.Modules.Admin.Site
 @inherits ModuleBase
+@using System.Text.RegularExpressions
 @inject NavigationManager NavigationManager
 @inject ISiteService SiteService
 @inject ITenantService TenantService
@@ -22,91 +23,64 @@
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="alias" HelpText="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 should be separated by commas." ResourceKey="Aliases">Aliases: </Label>
+                <Label Class="col-sm-3" For="logo" HelpText="Specify a logo for the site" ResourceKey="Logo">Logo: </Label>
                 <div class="col-sm-9">
-                    @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+                    <FileManager FileId="@_logofileid" Filter="@Constants.ImageFiles" @ref="_logofilemanager" />
-                    {
-                        <textarea id="alias" class="form-control" @bind="@_urls" rows="3" required></textarea>
-                    }
-                    else
-                    {
-                        <textarea id="alias" class="form-control" @bind="@_urls" rows="3" readonly></textarea>
-                    }
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="allowRegister" HelpText="Do you want the users to be able to register for an account on the site" ResourceKey="AllowRegistration">Allow User Registration? </Label>
+                <Label Class="col-sm-3" For="favicon" HelpText="Specify a Favicon" ResourceKey="FavoriteIcon">Favicon: </Label>
                 <div class="col-sm-9">
-                    <select id="allowRegister" class="form-select" @bind="@_allowregistration" required>
+                    <FileManager FileId="@_faviconfileid" Filter="ico" @ref="_faviconfilemanager" />
-                        <option value="True">@SharedLocalizer["Yes"]</option>
+                </div>
-                        <option value="False">@SharedLocalizer["No"]</option>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="defaultTheme" HelpText="Select the sites default theme" 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)
+                        {
+                            <option value="@theme.TypeName">@theme.Name</option>
+                        }
                     </select>
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="isDeleted" HelpText="Is this site deleted?" ResourceKey="IsDeleted">Is Deleted? </Label>
+                <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="isDeleted" class="form-select" @bind="@_isdeleted" required>
+                    <select id="defaultContainer" class="form-select" @bind="@_containertype" required>
-                        <option value="True">@SharedLocalizer["Yes"]</option>
+                        <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
-                        <option value="False">@SharedLocalizer["No"]</option>
+                        @foreach (var container in _containers)
+                        {
+                            <option value="@container.TypeName">@container.Name</option>
+                        }
                     </select>
                 </div>
             </div>
-        </div>
+            <div class="row mb-1 align-items-center">
-        <Section Name="Appearance" Heading="Appearance" ResourceKey="Appearance">
+                <Label Class="col-sm-3" For="defaultAdminContainer" HelpText="Select the default admin container for the site" ResourceKey="DefaultAdminContainer">Default Admin Container: </Label>
-            <div class="container">
+                <div class="col-sm-9">
-                <div class="row mb-1 align-items-center">
+                    <select id="defaultAdminContainer" class="form-select" @bind="@_admincontainertype" required>
-                    <Label Class="col-sm-3" For="logo" HelpText="Specify a logo for the site" ResourceKey="Logo">Logo: </Label>
+                        <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
-                    <div class="col-sm-9">
+                        <option value="@Constants.DefaultAdminContainer">&lt;@Localizer["DefaultAdminContainer"]&gt;</option>
-                        <FileManager FileId="@_logofileid" Filter="@Constants.ImageFiles" @ref="_logofilemanager" />
+                        @foreach (var container in _containers)
-                    </div>
+                        {
+                            <option value="@container.TypeName">@container.Name</option>
+                        }
+                    </select>
                 </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="favicon" HelpText="Specify a Favicon" ResourceKey="FavoriteIcon">Favicon: </Label>
-                    <div class="col-sm-9">
-                        <FileManager FileId="@_faviconfileid" Filter="ico" @ref="_faviconfilemanager" />
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="defaultTheme" HelpText="Select the sites default theme" 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)
-                            {
-                                <option value="@theme.TypeName">@theme.Name</option>
-                            }
-                        </select>
-                    </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="defaultAdminContainer" HelpText="Select the default admin container for the site" ResourceKey="DefaultAdminContainer">Default Admin Container: </Label>
-                    <div class="col-sm-9">
-                        <select id="defaultAdminContainer" class="form-select" @bind="@_admincontainertype" required>
-                            <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
-                            <option value="@Constants.DefaultAdminContainer">&lt;@Localizer["DefaultAdminContainer"]&gt;</option>
-                            @foreach (var container in _containers)
-                            {
-                                <option value="@container.TypeName">@container.Name</option>
-                            }
-                        </select>
-                    </div>
-                </div>
-
             </div>
-        </Section>
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="isDeleted" HelpText="Is this site deleted?" ResourceKey="IsDeleted">Deleted? </Label>
+				<div class="col-sm-9">
+					<select id="isDeleted" class="form-select" @bind="@_isdeleted" required>
+						<option value="True">@SharedLocalizer["Yes"]</option>
+						<option value="False">@SharedLocalizer["No"]</option>
+					</select>
+				</div>
+			</div>
+		</div>
         <Section Name="SMTP" Heading="SMTP Settings" ResourceKey="SMTPSettings">
             <div class="container">
                 <div class="row mb-1 align-items-center">
@@ -146,7 +120,10 @@
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="password" HelpText="Enter the password for your SMTP account" ResourceKey="SmtpPassword">Password: </Label>
                     <div class="col-sm-9">
-                        <input id="password" type="password" class="form-control" @bind="@_smtppassword" />
+						<div class="input-group">
+							<input id="password" type="@_smtppasswordtype" class="form-control" @bind="@_smtppassword" />
+							<button type="button" class="btn btn-secondary" @onclick="@ToggleSMTPPassword">@_togglesmtppassword</button>
+						</div>
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
@@ -155,12 +132,15 @@
                         <input id="sender" class="form-control" @bind="@_smtpsender" />
                     </div>
                 </div>
+                <div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="retention" HelpText="Number of days of notifications to retain" ResourceKey="Retention">Retention (Days): </Label>
+					<div class="col-sm-9">
+						<input id="retention" class="form-control" @bind="@_retention" />
+					</div>
+                </div>
                 <button type="button" class="btn btn-secondary" @onclick="SendEmail">@Localizer["Smtp.TestConfig"]</button>
                 <br /><br />
-
             </div>
-
-
         </Section>
         <Section Name="PWA" Heading="Progressive Web Application Settings" ResourceKey="PWASettings">
             <div class="container">
@@ -187,8 +167,51 @@
                 </div>
             </div>
         </Section>
-        @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+        @if (_aliases != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
         {
+			<Section Name="Aliases" Heading="Aliases" ResourceKey="Aliases">
+                <div class="container">
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="alias" HelpText="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 should be separated by commas." ResourceKey="Aliases">Aliases: </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="defaultalias" HelpText="The default alias for the site. Requests for non-default aliases will be redirected to the default alias." ResourceKey="DefaultAlias">Default Alias: </Label>
+						<div class="col-sm-9">
+                            <select id="defaultalias" class="form-select" @bind="@_defaultalias" required>
+								@foreach (string name in _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(sValue => sValue.Trim()).ToArray())
+								{
+									<option value="@name">@name</option>
+								}
+                            </select>
+						</div>
+					</div>
+				</div>
+			</Section>
+            <Section Name="Hosting" Heading="Hosting Model" ResourceKey="Hosting">
+                <div class="container">
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="runtime" HelpText="The Blazor runtime hosting model" ResourceKey="Runtime">Runtime: </Label>
+                        <div class="col-sm-9">
+                            <select id="runtime" class="form-select" @bind="@_runtime" required>
+                                <option value="Server">@SharedLocalizer["BlazorServer"]</option>
+                                <option value="WebAssembly">@SharedLocalizer["BlazorWebAssembly"]</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="prerender" HelpText="Specifies if the site should be prerendered (for search crawlers, etc...)" ResourceKey="Prerender">Prerender? </Label>
+                        <div class="col-sm-9">
+                            <select id="prerender" class="form-select" @bind="@_prerender" required>
+                                <option value="Prerendered">@SharedLocalizer["Yes"]</option>
+                                <option value="">@SharedLocalizer["No"]</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </Section>
             <Section Name="TenantInformation" Heading="Tenant Information" ResourceKey="TenantInformation">
                 <div class="container">
                     <div class="row mb-1 align-items-center">
@@ -222,357 +245,423 @@
 }
 
 @code {
-    private ElementReference form;
+	private ElementReference form;
-    private bool validated = false;
+	private bool validated = false;
-    private bool _initialized = false;
+	private bool _initialized = false;
-    private List<Theme> _themeList;
+	private List<Theme> _themeList;
-    private List<ThemeControl> _themes = new List<ThemeControl>();
+	private List<ThemeControl> _themes = new List<ThemeControl>();
-    private List<ThemeControl> _containers = new List<ThemeControl>();
+	private List<ThemeControl> _containers = new List<ThemeControl>();
-    private string _name = string.Empty;
+	private string _name = string.Empty;
-    private List<Alias> _aliasList;
+	private List<Alias> _aliases;
-    private string _urls = string.Empty;
+	private string _defaultalias = string.Empty;
-    private int _logofileid = -1;
+	private string _urls = string.Empty;
-    private FileManager _logofilemanager;
+	private string _runtime = "";
-    private int _faviconfileid = -1;
+	private string _prerender = "";
-    private FileManager _faviconfilemanager;
+	private int _logofileid = -1;
-    private string _themetype = "-";
+	private FileManager _logofilemanager;
-    private string _containertype = "-";
+	private int _faviconfileid = -1;
-    private string _admincontainertype = "-";
+	private FileManager _faviconfilemanager;
-    private string _allowregistration;
+	private string _themetype = "-";
-    private string _smtphost = string.Empty;
+	private string _containertype = "-";
-    private string _smtpport = string.Empty;
+	private string _admincontainertype = "-";
-    private string _smtpssl = "False";
+	private string _smtphost = string.Empty;
-    private string _smtpusername = string.Empty;
+	private string _smtpport = string.Empty;
-    private string _smtppassword = string.Empty;
+	private string _smtpssl = "False";
-    private string _smtpsender = string.Empty;
+	private string _smtpusername = string.Empty;
-    private string _pwaisenabled;
+	private string _smtppassword = string.Empty;
-    private int _pwaappiconfileid = -1;
+	private string _smtppasswordtype = "password";
-    private FileManager _pwaappiconfilemanager;
+	private string _togglesmtppassword = string.Empty;
-    private int _pwasplashiconfileid = -1;
+	private string _smtpsender = string.Empty;
-    private FileManager _pwasplashiconfilemanager;
+	private string _retention = string.Empty;
-    private string _tenant = string.Empty;
+	private string _pwaisenabled;
-    private string _database = string.Empty;
+	private int _pwaappiconfileid = -1;
-    private string _connectionstring = string.Empty;
+	private FileManager _pwaappiconfilemanager;
-    private string _createdby;
+	private int _pwasplashiconfileid = -1;
-    private DateTime _createdon;
+	private FileManager _pwasplashiconfilemanager;
-    private string _modifiedby;
+	private string _tenant = string.Empty;
-    private DateTime _modifiedon;
+	private string _database = string.Empty;
-    private string _deletedby;
+	private string _connectionstring = string.Empty;
-    private DateTime? _deletedon;
+	private string _createdby;
-    private string _isdeleted;
+	private DateTime _createdon;
+	private string _modifiedby;
+	private DateTime _modifiedon;
+	private string _deletedby;
+	private DateTime? _deletedon;
+	private string _isdeleted;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
-    protected override async Task OnInitializedAsync()
+	protected override async Task OnInitializedAsync()
-    {
+	{
-        try
+		try
-        {
+		{
-            _themeList = await ThemeService.GetThemesAsync();
+			_themeList = await ThemeService.GetThemesAsync();
-            Site site = await SiteService.GetSiteAsync(PageState.Site.SiteId);
+			Site site = await SiteService.GetSiteAsync(PageState.Site.SiteId);
-            if (site != null)
+			if (site != null)
-            {
+			{
-                _name = site.Name;
+				_name = site.Name;
-                _allowregistration = site.AllowRegistration.ToString();
+				_runtime = site.Runtime;
-                _isdeleted = site.IsDeleted.ToString();
+				_prerender = site.RenderMode.Replace(_runtime, "");
+				_isdeleted = site.IsDeleted.ToString();
 
-                if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+				if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-                {
+				{
-                    _aliasList = await AliasService.GetAliasesAsync();
+					await GetAliases();
-                    foreach (Alias alias in _aliasList.Where(item => item.SiteId == site.SiteId && item.TenantId == site.TenantId).ToList())
+				}
-                    {
-                        _urls += alias.Name + ",";
-                    }
-                    _urls = _urls.Substring(0, _urls.Length - 1);
 
-                }
+				if (site.LogoFileId != null)
+				{
+					_logofileid = site.LogoFileId.Value;
+				}
 
-                if (site.LogoFileId != null)
+				if (site.FaviconFileId != null)
-                {
+				{
-                    _logofileid = site.LogoFileId.Value;
+					_faviconfileid = site.FaviconFileId.Value;
-                }
+				}
 
-                if (site.FaviconFileId != null)
+				_themes = ThemeService.GetThemeControls(_themeList);
-                {
+				_themetype = (!string.IsNullOrEmpty(site.DefaultThemeType)) ? site.DefaultThemeType : Constants.DefaultTheme;
-                    _faviconfileid = site.FaviconFileId.Value;
+				_containers = ThemeService.GetContainerControls(_themeList, _themetype);
-                }
+				_containertype = (!string.IsNullOrEmpty(site.DefaultContainerType)) ? site.DefaultContainerType : Constants.DefaultContainer;
+				_admincontainertype = (!string.IsNullOrEmpty(site.AdminContainerType)) ? site.AdminContainerType : Constants.DefaultAdminContainer;
 
-                _themes = ThemeService.GetThemeControls(_themeList);
+				_pwaisenabled = site.PwaIsEnabled.ToString();
-                _themetype = (!string.IsNullOrEmpty(site.DefaultThemeType)) ? site.DefaultThemeType : Constants.DefaultTheme;
+				if (site.PwaAppIconFileId != null)
-                _containers = ThemeService.GetContainerControls(_themeList, _themetype);
+				{
-                _containertype = (!string.IsNullOrEmpty(site.DefaultContainerType)) ? site.DefaultContainerType : Constants.DefaultContainer;
+					_pwaappiconfileid = site.PwaAppIconFileId.Value;
-                _admincontainertype = (!string.IsNullOrEmpty(site.AdminContainerType)) ? site.AdminContainerType : Constants.DefaultAdminContainer;
+				}
+				if (site.PwaSplashIconFileId != null)
+				{
+					_pwasplashiconfileid = site.PwaSplashIconFileId.Value;
+				}
 
-                var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
+				var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
-                _smtphost = SettingService.GetSetting(settings, "SMTPHost", string.Empty);
+				_smtphost = SettingService.GetSetting(settings, "SMTPHost", string.Empty);
-                _smtpport = SettingService.GetSetting(settings, "SMTPPort", string.Empty);
+				_smtpport = SettingService.GetSetting(settings, "SMTPPort", string.Empty);
-                _smtpssl = SettingService.GetSetting(settings, "SMTPSSL", "False");
+				_smtpssl = SettingService.GetSetting(settings, "SMTPSSL", "False");
-                _smtpusername = SettingService.GetSetting(settings, "SMTPUsername", string.Empty);
+				_smtpusername = SettingService.GetSetting(settings, "SMTPUsername", string.Empty);
-                _smtppassword = SettingService.GetSetting(settings, "SMTPPassword", string.Empty);
+				_smtppassword = SettingService.GetSetting(settings, "SMTPPassword", string.Empty);
-                _smtpsender = SettingService.GetSetting(settings, "SMTPSender", string.Empty);
+				_togglesmtppassword = SharedLocalizer["ShowPassword"];
+				_smtpsender = SettingService.GetSetting(settings, "SMTPSender", string.Empty);
+				_retention = SettingService.GetSetting(settings, "NotificationRetention", "30");
 
-                _pwaisenabled = site.PwaIsEnabled.ToString();
+				if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+				{
+					var tenants = await TenantService.GetTenantsAsync();
+					var _databases = await DatabaseService.GetDatabasesAsync();
+					var tenant = tenants.Find(item => item.TenantId == site.TenantId);
+					if (tenant != null)
+					{
+						_tenant = tenant.Name;
+						_database = _databases.Find(item => item.DBType == tenant.DBType)?.Name;
+						_connectionstring = tenant.DBConnectionString;
+					}
+				}
 
-                if (site.PwaAppIconFileId != null)
+				_createdby = site.CreatedBy;
-                {
+				_createdon = site.CreatedOn;
-                    _pwaappiconfileid = site.PwaAppIconFileId.Value;
+				_modifiedby = site.ModifiedBy;
-                }
+				_modifiedon = site.ModifiedOn;
+				_deletedby = site.DeletedBy;
+				_deletedon = site.DeletedOn;
 
-                if (site.PwaSplashIconFileId != null)
+				_initialized = true;
-                {
+			}
-                    _pwasplashiconfileid = site.PwaSplashIconFileId.Value;
+		}
-                }
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message);
+			AddModuleMessage(ex.Message, MessageType.Error);
+		}
+	}
 
-                _pwaisenabled = site.PwaIsEnabled.ToString();
+	private async void ThemeChanged(ChangeEventArgs e)
-                if (site.PwaAppIconFileId != null)
+	{
-                {
+		try
-                    _pwaappiconfileid = site.PwaAppIconFileId.Value;
+		{
-                }
+			_themetype = (string)e.Value;
-                if (site.PwaSplashIconFileId != null)
+			if (_themetype != "-")
-                {
+			{
-                    _pwasplashiconfileid = site.PwaSplashIconFileId.Value;
+				_containers = ThemeService.GetContainerControls(_themeList, _themetype);
-                }
+			}
+			else
+			{
+				_containers = new List<ThemeControl>();
+			}
+			_containertype = "-";
+			_admincontainertype = Constants.DefaultAdminContainer;
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message);
+			AddModuleMessage(Localizer["Error.Theme.LoadPane"], MessageType.Error);
+		}
+	}
 
-                if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+	private async Task SaveSite()
-                {
+	{
-                    var tenants = await TenantService.GetTenantsAsync();
+		validated = true;
-                    var _databases = await DatabaseService.GetDatabasesAsync();
+		var interop = new Interop(JSRuntime);
-                    var tenant = tenants.Find(item => item.TenantId == site.TenantId);
+		if (await interop.FormValid(form))
-                    if (tenant != null)
+		{
-                    {
+			try
-                        _tenant = tenant.Name;
+			{
-                        _database = _databases.Find(item => item.DBType == tenant.DBType)?.Name;
+				if (_name != string.Empty && _themetype != "-" && _containertype != "-")
-                        _connectionstring = tenant.DBConnectionString;
+				{
-                    }
+					var unique = true;
-                }
+					if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+					{
+						_urls = Regex.Replace(_urls, @"\r\n?|\n", ","); // convert line breaks to commas
+						var aliases = await AliasService.GetAliasesAsync();
+						foreach (string name in _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(sValue => sValue.Trim()).ToArray())
+						{
+							var alias = aliases.Where(item => item.Name == name).FirstOrDefault();
+							if (alias != null && unique)
+							{
+								unique = (alias.TenantId == PageState.Site.TenantId && alias.SiteId == PageState.Site.SiteId);
+							}
+						}
+						if (unique && string.IsNullOrEmpty(_defaultalias)) unique = false;
+					}
 
-                _createdby = site.CreatedBy;
+					if (unique)
-                _createdon = site.CreatedOn;
+					{
-                _modifiedby = site.ModifiedBy;
+						var site = await SiteService.GetSiteAsync(PageState.Site.SiteId);
-                _modifiedon = site.ModifiedOn;
+						if (site != null)
-                _deletedby = site.DeletedBy;
+						{
-                _deletedon = site.DeletedOn;
+							bool refresh = false;
+							bool reload = false;
 
-                _initialized = true;
+							site.Name = _name;
-            }
+							if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-        }
+							{
-        catch (Exception ex)
+								if (site.Runtime != _runtime || site.RenderMode != _runtime + _prerender)
-        {
+								{
-            await logger.LogError(ex, "Error Loading Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message);
+									site.Runtime = _runtime;
-            AddModuleMessage(ex.Message, MessageType.Error);
+									site.RenderMode = _runtime + _prerender;
-        }
+									reload = true; // needs to be reloaded on server
-    }
+								}
+							}
+							site.IsDeleted = (_isdeleted == null ? true : Boolean.Parse(_isdeleted));
 
-    private async void ThemeChanged(ChangeEventArgs e)
+							site.LogoFileId = null;
-    {
+							var logofileid = _logofilemanager.GetFileId();
-        try
+							if (logofileid != -1)
-        {
+							{
-            _themetype = (string)e.Value;
+								site.LogoFileId = logofileid;
-            if (_themetype != "-")
+							}
-            {
+							int? faviconFieldId = _faviconfilemanager.GetFileId();
-                _containers = ThemeService.GetContainerControls(_themeList, _themetype);
+							if (faviconFieldId == -1) faviconFieldId = null;
-            }
+							if (site.FaviconFileId != faviconFieldId)
-            else
+							{
-            {
+								site.FaviconFileId = faviconFieldId;
-                _containers = new List<ThemeControl>();
+								reload = true; // needs to be reloaded on server
-            }
+							}
-            _containertype = "-";
+							if (site.DefaultThemeType != _themetype)
-            _admincontainertype = Constants.DefaultAdminContainer;
+							{
-            StateHasChanged();
+								site.DefaultThemeType = _themetype;
-        }
+								refresh = true; // needs to be refreshed on client
-        catch (Exception ex)
+							}
-        {
+							if (site.DefaultContainerType != _containertype)
-            await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message);
+							{
-            AddModuleMessage(Localizer["Error.Theme.LoadPane"], MessageType.Error);
+								site.DefaultContainerType = _containertype;
-        }
+								refresh = true; // needs to be refreshed on client
-    }
+							}
+							site.AdminContainerType = _admincontainertype;
 
-    private async Task SaveSite()
+							if (site.PwaIsEnabled.ToString() != _pwaisenabled)
-    {
+							{
-        validated = true;
+								site.PwaIsEnabled = Boolean.Parse(_pwaisenabled);
-        var interop = new Interop(JSRuntime);
+								reload = true; // needs to be reloaded on server
-        if (await interop.FormValid(form))
+							}
-        {
+							int? pwaappiconfileid = _pwaappiconfilemanager.GetFileId();
-            try
+							if (pwaappiconfileid == -1) pwaappiconfileid = null;
-            {
+							if (site.PwaAppIconFileId != pwaappiconfileid)
-                if (_name != string.Empty && _urls != string.Empty && _themetype != "-" && _containertype != "-")
+							{
-                {
+								site.PwaAppIconFileId = pwaappiconfileid;
-                    var unique = true;
+								reload = true; // needs to be reloaded on server
-                    if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+							}
-                    {
+							int? pwasplashiconfileid = _pwasplashiconfilemanager.GetFileId();
-                        foreach (string name in _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+							if (pwasplashiconfileid == -1) pwasplashiconfileid = null;
-                        {
+							if (site.PwaSplashIconFileId != pwasplashiconfileid)
-                            if (_aliasList.Exists(item => item.Name == name && item.SiteId != PageState.Alias.SiteId && item.TenantId != PageState.Alias.TenantId))
+							{
-                            {
+								site.PwaSplashIconFileId = pwasplashiconfileid;
-                                unique = false;
+								reload = true; // needs to be reloaded on server
-                            }
+							}
-                        }
-                    }
 
-                    if (unique)
+							site = await SiteService.UpdateSiteAsync(site);
-                    {
-                        var site = await SiteService.GetSiteAsync(PageState.Site.SiteId);
-                        if (site != null)
-                        {
-                            bool refresh = (site.DefaultThemeType != _themetype || site.DefaultContainerType != _containertype);
 
-                            site.Name = _name;
+							var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
-                            site.AllowRegistration = (_allowregistration == null ? true : Boolean.Parse(_allowregistration));
+							settings = SettingService.SetSetting(settings, "SMTPHost", _smtphost, true);
-                            site.IsDeleted = (_isdeleted == null ? true : Boolean.Parse(_isdeleted));
+							settings = SettingService.SetSetting(settings, "SMTPPort", _smtpport, true);
+							settings = SettingService.SetSetting(settings, "SMTPSSL", _smtpssl, true);
+							settings = SettingService.SetSetting(settings, "SMTPUsername", _smtpusername, true);
+							settings = SettingService.SetSetting(settings, "SMTPPassword", _smtppassword, true);
+							settings = SettingService.SetSetting(settings, "SMTPSender", _smtpsender, true);
+							settings = SettingService.SetSetting(settings, "NotificationRetention", _retention, true);
+							await SettingService.UpdateSiteSettingsAsync(settings, site.SiteId);
 
-                            site.LogoFileId = null;
+							if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-                            var logofileid = _logofilemanager.GetFileId();
+							{
-                            if (logofileid != -1)
+								var names = _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
-                            {
+									.Select(sValue => sValue.Trim()).ToArray();
-                                site.LogoFileId = logofileid;
+								foreach (Alias alias in _aliases)
-                            }
+								{
-                            var faviconFieldId = _faviconfilemanager.GetFileId();
+									if (!names.Contains(alias.Name.Trim()))
-                            if (faviconFieldId != -1)
+									{
-                            {
+										await AliasService.DeleteAliasAsync(alias.AliasId);
-                                site.FaviconFileId = faviconFieldId;
+									}
-                            }
+								}
-                            site.DefaultThemeType = _themetype;
-                            site.DefaultContainerType = _containertype;
-                            site.AdminContainerType = _admincontainertype;
 
-                            site.PwaIsEnabled = (_pwaisenabled == null ? true : Boolean.Parse(_pwaisenabled));
+								foreach (string name in names)
-                            var pwaappiconfileid = _pwaappiconfilemanager.GetFileId();
+								{
-                            if (pwaappiconfileid != -1)
+									var alias = _aliases.Find(item => item.Name.Trim() == name);
-                            {
+									if (alias == null)
-                                site.PwaAppIconFileId = pwaappiconfileid;
+									{
-                            }
+										alias = new Alias();
-                            var pwasplashiconfileid = _pwasplashiconfilemanager.GetFileId();
+										alias.Name = name;
-                            if (pwasplashiconfileid != -1)
+										alias.TenantId = site.TenantId;
-                            {
+										alias.SiteId = site.SiteId;
-                                site.PwaSplashIconFileId = pwasplashiconfileid;
+										alias.IsDefault = (name == _defaultalias);
-                            }
+										await AliasService.AddAliasAsync(alias);
+									}
+									else
+									{
+										if (alias.Name != name || alias.IsDefault != (alias.Name.Trim() == _defaultalias))
+										{
+											alias.Name = name;
+											alias.IsDefault = (name == _defaultalias);
+											await AliasService.UpdateAliasAsync(alias);
+										}
+									}
+								}
+								await GetAliases();
+							}
 
-                            site = await SiteService.UpdateSiteAsync(site);
+							await logger.LogInformation("Site Settings Saved {Site}", site);
 
-                            var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
+							if (refresh || reload)
-                            SettingService.SetSetting(settings, "SMTPHost", _smtphost);
+							{
-                            SettingService.SetSetting(settings, "SMTPPort", _smtpport);
+								NavigationManager.NavigateTo(NavigateUrl(true), reload); // refresh/reload
-                            SettingService.SetSetting(settings, "SMTPSSL", _smtpssl);
+							}
-                            SettingService.SetSetting(settings, "SMTPUsername", _smtpusername);
+							else
-                            SettingService.SetSetting(settings, "SMTPPassword", _smtppassword);
+							{
-                            SettingService.SetSetting(settings, "SMTPSender", _smtpsender);
+								AddModuleMessage(Localizer["Success.Settings.SaveSite"], MessageType.Success);
-                            await SettingService.UpdateSiteSettingsAsync(settings, site.SiteId);
+								await interop.ScrollTo(0, 0, "smooth");
+							}
+						}
+					}
+					else // deuplicate alias or default alias not specified
+					{
+						AddModuleMessage(Localizer["Message.Aliases.Taken"], MessageType.Warning);
+					}
+				}
+				else
+				{
+					AddModuleMessage(Localizer["Message.Required.SiteName"], MessageType.Warning);
+				}
+			}
+			catch (Exception ex)
+			{
+				await logger.LogError(ex, "Error Saving Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message);
+				AddModuleMessage(Localizer["Error.SaveSite"], MessageType.Error);
+			}
+		}
+		else
+		{
+			AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+		}
+	}
 
-                            if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+	private async Task DeleteSite()
-                            {
+	{
-                                var names = _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+		try
-                                foreach (Alias alias in _aliasList.Where(item => item.SiteId == site.SiteId && item.TenantId == site.TenantId).ToList())
+		{
-                                {
+			var sites = await SiteService.GetSitesAsync();
-                                    if (!names.Contains(alias.Name))
+			if (sites.Count > 1)
-                                    {
+			{
-                                        await AliasService.DeleteAliasAsync(alias.AliasId);
+				await SiteService.DeleteSiteAsync(PageState.Site.SiteId);
-                                    }
+				await logger.LogInformation("Site Deleted {SiteId}", PageState.Site.SiteId);
-                                }
 
-                                foreach (string name in names)
+				var aliases = await AliasService.GetAliasesAsync();
-                                {
+				foreach (Alias a in aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId))
-                                    if (!_aliasList.Exists(item => item.Name == name))
+				{
-                                    {
+					await AliasService.DeleteAliasAsync(a.AliasId);
-                                        Alias alias = new Alias();
+				}
-                                        alias.Name = name;
-                                        alias.TenantId = site.TenantId;
-                                        alias.SiteId = site.SiteId;
-                                        await AliasService.AddAliasAsync(alias);
-                                    }
-                                }
-                            }
 
-                            await logger.LogInformation("Site Settings Saved {Site}", site);
+				NavigationManager.NavigateTo(NavigateUrl("admin/sites"));
+			}
+			else
+			{
+				AddModuleMessage(Localizer["Message.FailAuth.DeleteSite"], MessageType.Warning);
+			}
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Deleting Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message);
+			AddModuleMessage(Localizer["Error.DeleteSite"], MessageType.Error);
+		}
+	}
 
-                            if (refresh)
+	private async Task SendEmail()
-                            {
+	{
-                                NavigationManager.NavigateTo(NavigateUrl()); // refresh to show new theme or container
+		if (_smtphost != "" && _smtpport != "" && _smtpsender != "")
-                            }
+		{
-                            else
+			try
-                            {
+			{
-                                AddModuleMessage(Localizer["Success.Settings.SaveSite"], MessageType.Success);
+				var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
-                            }
+				SettingService.SetSetting(settings, "SMTPHost", _smtphost, true);
-                        }
+				SettingService.SetSetting(settings, "SMTPPort", _smtpport, true);
-                    }
+				SettingService.SetSetting(settings, "SMTPSSL", _smtpssl, true);
-                    else
+				SettingService.SetSetting(settings, "SMTPUsername", _smtpusername, true);
-                    {
+				SettingService.SetSetting(settings, "SMTPPassword", _smtppassword, true);
-                        AddModuleMessage(Localizer["Message.Aliases.Taken"], MessageType.Warning);
+				SettingService.SetSetting(settings, "SMTPSender", _smtpsender, true);
-                    }
+				await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
-                }
+				await logger.LogInformation("Site SMTP Settings Saved");
-                else
-                {
-                    AddModuleMessage(Localizer["Message.Required.SiteName"], MessageType.Warning);
-                }
-            }
-            catch (Exception ex)
-            {
-                await logger.LogError(ex, "Error Saving Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message);
-                AddModuleMessage(Localizer["Error.SaveSite"], MessageType.Error);
-            }
-        }
-        else
-        {
-            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
-        }
-    }
 
-    private async Task DeleteSite()
+				await NotificationService.AddNotificationAsync(new Notification(PageState.Site.SiteId, PageState.User, PageState.Site.Name + " SMTP Configuration Test", "SMTP Server Is Configured Correctly."));
-    {
+				AddModuleMessage(Localizer["Info.Smtp.SaveSettings"], MessageType.Info);
-        try
+				var interop = new Interop(JSRuntime);
-        {
+				await interop.ScrollTo(0, 0, "smooth");
-            var sites = await SiteService.GetSitesAsync();
+			}
-            if (sites.Count > 1)
+			catch (Exception ex)
-            {
+			{
-                await SiteService.DeleteSiteAsync(PageState.Site.SiteId);
+				await logger.LogError(ex, "Error Testing SMTP Configuration");
-                await logger.LogInformation("Site Deleted {SiteId}", PageState.Site.SiteId);
+				AddModuleMessage(Localizer["Error.Smtp.TestConfig"], MessageType.Error);
+			}
+		}
+		else
+		{
+			AddModuleMessage(Localizer["Message.Required.Smtp"], MessageType.Warning);
+		}
+	}
 
-                var aliases = await AliasService.GetAliasesAsync();
+	private async Task GetAliases()
-                foreach (Alias a in aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId))
+	{
-                {
+		_urls = string.Empty;
-                    await AliasService.DeleteAliasAsync(a.AliasId);
+		_defaultalias = string.Empty;
-                }
+		_aliases = await AliasService.GetAliasesAsync();
+		_aliases = _aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId).OrderBy(item => item.AliasId).ToList();
+		foreach (Alias alias in _aliases)
+		{
+			_urls += (_urls == string.Empty) ? alias.Name.Trim() : ", " + alias.Name.Trim();
+			if (alias.IsDefault && string.IsNullOrEmpty(_defaultalias)) _defaultalias = alias.Name.Trim();
+		}
+		if (string.IsNullOrEmpty(_defaultalias)) _defaultalias = _aliases.First().Name.Trim();
+	}
 
-                NavigationManager.NavigateTo(NavigateUrl("admin/sites"));
+	private void ToggleSMTPPassword()
-            }
+	{
-            else
+		if (_smtppasswordtype == "password")
-            {
+		{
-                AddModuleMessage(Localizer["Message.FailAuth.DeleteSite"], MessageType.Warning);
+			_smtppasswordtype = "text";
-            }
+			_togglesmtppassword = SharedLocalizer["HidePassword"];
-        }
+		}
-        catch (Exception ex)
+		else
-        {
+		{
-            await logger.LogError(ex, "Error Deleting Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message);
+			_smtppasswordtype = "password";
-            AddModuleMessage(Localizer["Error.DeleteSite"], MessageType.Error);
+			_togglesmtppassword = SharedLocalizer["ShowPassword"];
-        }
+		}
-    }
+	}
-
-    private async Task SendEmail()
-    {
-        if (_smtphost != "" && _smtpport != "" && _smtpsender != "")
-        {
-            try
-            {
-                var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
-                SettingService.SetSetting(settings, "SMTPHost", _smtphost);
-                SettingService.SetSetting(settings, "SMTPPort", _smtpport);
-                SettingService.SetSetting(settings, "SMTPSSL", _smtpssl);
-                SettingService.SetSetting(settings, "SMTPUsername", _smtpusername);
-                SettingService.SetSetting(settings, "SMTPPassword", _smtppassword);
-                SettingService.SetSetting(settings, "SMTPSender", _smtpsender);
-                await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
-                await logger.LogInformation("Site SMTP Settings Saved");
-
-                await NotificationService.AddNotificationAsync(new Notification(PageState.Site.SiteId, PageState.User.DisplayName, PageState.User.Email, PageState.User.DisplayName, PageState.User.Email, PageState.Site.Name + " SMTP Configuration Test", "SMTP Server Is Configured Correctly."));
-                AddModuleMessage(Localizer["Info.Smtp.SaveSettings"], MessageType.Info);
-            }
-            catch (Exception ex)
-            {
-                await logger.LogError(ex, "Error Testing SMTP Configuration");
-                AddModuleMessage(Localizer["Error.Smtp.TestConfig"], MessageType.Error);
-            }
-        }
-        else
-        {
-            AddModuleMessage(Localizer["Message.required.Smtp"], MessageType.Warning);
-        }
-    }
 }

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
@@ -82,6 +83,24 @@ else
                     </select>
                 </div>
             </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="runtime" HelpText="The runtime hosting model" ResourceKey="Runtime">Runtime: </Label>
+                <div class="col-sm-9">
+                    <select id="runtime" class="form-select" @bind="@_runtime" required>
+                        <option value="Server">@SharedLocalizer["BlazorServer"]</option>
+                        <option value="WebAssembly">@SharedLocalizer["BlazorWebAssembly"]</option>
+                    </select>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="prerender" HelpText="Specifies if the site should be prerendered (for search crawlers, etc...)" ResourceKey="Prerender">Prerender? </Label>
+                <div class="col-sm-9">
+                    <select id="prerender" class="form-select" @bind="@_prerender" required>
+                        <option value="Prerendered">@SharedLocalizer["Yes"]</option>
+                        <option value="">@SharedLocalizer["No"]</option>
+                    </select>
+                </div>
+            </div>
             <div class="row mb-1 align-items-center">
                 <Label Class="col-sm-3" For="tenant" HelpText="Select the tenant for the site" ResourceKey="Tenant">Tenant: </Label>
                 <div class="col-sm-9">
@@ -129,15 +148,15 @@ else
                     @DatabaseConfigComponent;
                 }
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="hostUsername" HelpText="Enter the username of the host for this site" ResourceKey="HostUsername">Host Username:</Label>
+                    <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" readonly />
+                        <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 for the host of this site" ResourceKey="HostPassword">Host Password:</Label>
+                    <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" required />
+                        <input id="hostPassword" type="password" class="form-control" @bind="@_hostpassword" autocomplete="new-password" required />
                     </div>
                 </div>
             }
@@ -150,142 +169,146 @@ else
 }
 
 @code {
-    private List<Database> _databases;
+	private List<Database> _databases;
-    private ElementReference form;
+	private ElementReference form;
-    private bool validated = false;
+	private bool validated = false;
-    private string _databaseName = "LocalDB";
+	private string _databaseName = "LocalDB";
-    private Type _databaseConfigType;
+	private Type _databaseConfigType;
-    private object _databaseConfig;
+	private object _databaseConfig;
-    private RenderFragment DatabaseConfigComponent { get; set; }
+	private RenderFragment DatabaseConfigComponent { get; set; }
 
 
-    private List<Theme> _themeList;
+	private List<Theme> _themeList;
-    private List<ThemeControl> _themes = new List<ThemeControl>();
+	private List<ThemeControl> _themes = new List<ThemeControl>();
-    private List<ThemeControl> _containers = new List<ThemeControl>();
+	private List<ThemeControl> _containers = new List<ThemeControl>();
-    private List<SiteTemplate> _siteTemplates;
+	private List<SiteTemplate> _siteTemplates;
-    private List<Tenant> _tenants;
+	private List<Tenant> _tenants;
-    private string _tenantid = "-";
+	private string _tenantid = "-";
 
-    private string _tenantName = string.Empty;
+	private string _tenantName = string.Empty;
 
-    private string _hostUserName = UserNames.Host;
+	private string _hostusername = string.Empty;
-    private string _hostpassword = string.Empty;
+	private string _hostpassword = string.Empty;
 
-    private string _name = string.Empty;
+	private string _name = string.Empty;
-    private string _urls = string.Empty;
+	private string _urls = string.Empty;
-    private string _themetype = "-";
+	private string _themetype = "-";
-    private string _containertype = "-";
+	private string _containertype = "-";
-    private string _admincontainertype = "";
+	private string _admincontainertype = "";
-    private string _sitetemplatetype = "-";
+	private string _sitetemplatetype = "-";
+	private string _runtime = "Server";
+	private string _prerender = "Prerendered";
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-    protected override async Task OnInitializedAsync()
+	protected override async Task OnInitializedAsync()
-    {
+	{
-        _tenants = await TenantService.GetTenantsAsync();
+		_tenants = await TenantService.GetTenantsAsync();
-        _urls = PageState.Alias.Name;
+		_urls = PageState.Alias.Name;
-        _themeList = await ThemeService.GetThemesAsync();
+		_themeList = await ThemeService.GetThemesAsync();
-        _themes = ThemeService.GetThemeControls(_themeList);
+		_themes = ThemeService.GetThemeControls(_themeList);
-        _siteTemplates = await SiteTemplateService.GetSiteTemplatesAsync();
+		_siteTemplates = await SiteTemplateService.GetSiteTemplatesAsync();
-        _databases = await DatabaseService.GetDatabasesAsync();
+		_databases = await DatabaseService.GetDatabasesAsync();
-        LoadDatabaseConfigComponent();
+		LoadDatabaseConfigComponent();
-    }
+	}
 
-    private void DatabaseChanged(ChangeEventArgs eventArgs)
+	private void DatabaseChanged(ChangeEventArgs eventArgs)
-    {
+	{
-        try
+		try
-        {
+		{
-            _databaseName = (string)eventArgs.Value;
+			_databaseName = (string)eventArgs.Value;
 
-            LoadDatabaseConfigComponent();
+			LoadDatabaseConfigComponent();
-        }
+		}
-        catch
+		catch
-        {
+		{
-            AddModuleMessage(Localizer["Error.Database.LoadConfig"], MessageType.Error);
+			AddModuleMessage(Localizer["Error.Database.LoadConfig"], MessageType.Error);
-        }
+		}
-    }
+	}
 
-    private void LoadDatabaseConfigComponent()
+	private void LoadDatabaseConfigComponent()
-    {
+	{
-        var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
+		var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
-        if (database != null)
+		if (database != null)
-        {
+		{
-            _databaseConfigType = Type.GetType(database.ControlType);
+			_databaseConfigType = Type.GetType(database.ControlType);
-            DatabaseConfigComponent = builder =>
+			DatabaseConfigComponent = builder =>
-            {
+			{
-                builder.OpenComponent(0, _databaseConfigType);
+				builder.OpenComponent(0, _databaseConfigType);
-                builder.AddComponentReferenceCapture(1, inst => { _databaseConfig = Convert.ChangeType(inst, _databaseConfigType); });
+				builder.AddComponentReferenceCapture(1, inst => { _databaseConfig = Convert.ChangeType(inst, _databaseConfigType); });
-                builder.CloseComponent();
+				builder.CloseComponent();
-            };
+			};
-        }
+		}
-    }
+	}
 
-    private void TenantChanged(ChangeEventArgs e)
+	private void TenantChanged(ChangeEventArgs e)
-    {
+	{
-        _tenantid = (string)e.Value;
+		_tenantid = (string)e.Value;
-        if (string.IsNullOrEmpty(_tenantName))
+		if (string.IsNullOrEmpty(_tenantName))
-        {
+		{
-            _tenantName = _name;
+			_tenantName = _name;
-        }
+		}
-        StateHasChanged();
+		StateHasChanged();
-    }
+	}
 
-    private async void ThemeChanged(ChangeEventArgs e)
+	private async void ThemeChanged(ChangeEventArgs e)
-    {
+	{
-        try
+		try
-        {
+		{
-            _themetype = (string)e.Value;
+			_themetype = (string)e.Value;
-            if (_themetype != "-")
+			if (_themetype != "-")
-            {
+			{
-                _containers = ThemeService.GetContainerControls(_themeList, _themetype);
+				_containers = ThemeService.GetContainerControls(_themeList, _themetype);
-            }
+			}
-            else
+			else
-            {
+			{
-                _containers = new List<ThemeControl>();
+				_containers = new List<ThemeControl>();
-            }
+			}
-            _containertype = "-";
+			_containertype = "-";
-            _admincontainertype = "";
+			_admincontainertype = "";
-            StateHasChanged();
+			StateHasChanged();
-        }
+		}
-        catch (Exception ex)
+		catch (Exception ex)
-        {
+		{
-            await logger.LogError(ex, "Error Loading Containers For Theme {ThemeType} {Error}", _themetype, ex.Message);
+			await logger.LogError(ex, "Error Loading Containers For Theme {ThemeType} {Error}", _themetype, ex.Message);
-            AddModuleMessage(Localizer["Error.Theme.LoadContainers"], MessageType.Error);
+			AddModuleMessage(Localizer["Error.Theme.LoadContainers"], MessageType.Error);
-        }
+		}
-    }
+	}
 
-    private async Task SaveSite()
+	private async Task SaveSite()
-    {
+	{
-        validated = true;
+		validated = true;
-        var interop = new Interop(JSRuntime);
+		var interop = new Interop(JSRuntime);
-        if (await interop.FormValid(form))
+		if (await interop.FormValid(form))
-        {
+		{
-            if (_tenantid != "-" && _name != string.Empty && _urls != string.Empty && _themetype != "-" && _containertype != "-" && _sitetemplatetype != "-")
+			if (_tenantid != "-" && _name != string.Empty && _urls != string.Empty && _themetype != "-" && _containertype != "-" && _sitetemplatetype != "-")
-            {
+			{
-                var duplicates = new List<string>();
+				_urls = Regex.Replace(_urls, @"\r\n?|\n", ",");
-                var aliases = await AliasService.GetAliasesAsync();
+				var duplicates = new List<string>();
-                foreach (string name in _urls.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+				var aliases = await AliasService.GetAliasesAsync();
-                {
+				foreach (string name in _urls.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
-                    if (aliases.Exists(item => item.Name == name))
+				{
-                    {
+					if (aliases.Exists(item => item.Name == name))
-                        duplicates.Add(name);
+					{
-                    }
+						duplicates.Add(name);
-                }
+					}
+				}
 
-                if (duplicates.Count == 0)
+				if (duplicates.Count == 0)
-                {
+				{
-                    InstallConfig config = new InstallConfig();
+					InstallConfig config = new InstallConfig();
 
-                    if (_tenantid == "+")
+					if (_tenantid == "+")
-                    {
+					{
-                        if (!string.IsNullOrEmpty(_tenantName) && _tenants.FirstOrDefault(item => item.Name == _tenantName) == null)
+						if (!string.IsNullOrEmpty(_tenantName) && _tenants.FirstOrDefault(item => item.Name == _tenantName) == null)
-                        {
+						{
-                            // validate host credentials
+							// validate host credentials
-                            var user = new User();
+							var user = new User();
-                            user.SiteId = PageState.Site.SiteId;
+							user.SiteId = PageState.Site.SiteId;
-                            user.Username = UserNames.Host;
+							user.Username = _hostusername;
-                            user.Password = _hostpassword;
+							user.Password = _hostpassword;
-                            user = await UserService.LoginUserAsync(user, false, false);
+							user.LastIPAddress = PageState.RemoteIPAddress;
+							user = await UserService.LoginUserAsync(user);
                             if (user.IsAuthenticated)
                             {
                                 var connectionString = String.Empty;
@@ -300,8 +323,9 @@ else
                                     config.TenantName = _tenantName;
                                     config.DatabaseType = database.DBType;
                                     config.ConnectionString = connectionString;
-                                    config.HostEmail = user.Email;
+									config.HostUsername = _hostusername;
                                     config.HostPassword = _hostpassword;
+                                    config.HostEmail = user.Email;
                                     config.HostName = user.DisplayName;
                                     config.IsNewTenant = true;
                                 }
@@ -340,6 +364,8 @@ else
                         config.DefaultContainer = _containertype;
                         config.DefaultAdminContainer = _admincontainertype;
                         config.SiteTemplate = _sitetemplatetype;
+                        config.Runtime = _runtime;
+                        config.RenderMode = _runtime + _prerender;
 
                         ShowProgressIndicator();
 
@@ -347,8 +373,7 @@ else
                         if (installation.Success)
                         {
                             var aliasname = config.Aliases.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)[0];
-                            var uri = new Uri(NavigationManager.Uri);
+                            NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + aliasname, true);
-                            NavigationManager.NavigateTo(uri.Scheme + "://" + aliasname, true);
                         }
                         else
                         {

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

@@ -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,11 @@ else
 
     private void Edit(string name)
     {
-        NavigationManager.NavigateTo(_scheme + name + "/admin/site/?reload");
+        NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + name + "/admin/site", true);
     }
 
     private void Browse(string name)
     {
-        NavigationManager.NavigateTo(_scheme + name + "/?reload");
+        NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + name, true);
     }
 }

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

@@ -57,22 +57,20 @@ else
     {
         @if (_results.Count > 0)
         {
-            <div class="table-responsive">
+            <Pager Class="table table-bordered" Items="@_results">
-                <Pager Class="table table-bordered" Items="@_results">
+                <Header>
-                    <Header>
+                    @foreach (KeyValuePair<string, string> kvp in _results.First())
-                        @foreach (KeyValuePair<string, string> kvp in _results.First())
+                    {
-                        {
+                        <th>@kvp.Key</th>
-                            <th>@kvp.Key</th>
+                    }
-                        }
+                </Header>
-                    </Header>
+                <Row>
-                    <Row>
+                    @foreach (KeyValuePair<string, string> kvp in context)
-                        @foreach (KeyValuePair<string, string> kvp in context)
+                    {
-                        {
+                        <td>@kvp.Value</td>
-                            <td>@kvp.Value</td>
+                    }
-                        }
+                </Row>
-                    </Row>
+            </Pager>
-                </Pager>
-            </div>
         }
         else
         {

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

@@ -27,17 +27,47 @@
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="serverpath" HelpText="Server Path" ResourceKey="ServerPath">Server Path: </Label>
+                <Label Class="col-sm-3" For="machinename" HelpText="Machine Name" ResourceKey="MachineName">Machine Name: </Label>
                 <div class="col-sm-9">
-                    <input id="serverpath" class="form-control" @bind="@_serverpath" readonly />
+                    <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="servertime" HelpText="Server Time" ResourceKey="ServerTime">Server Time: </Label>
+                <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="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 />
                 </div>
             </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="tickcount" HelpText="Amount Of Time The Service Has Been Available And Operational" ResourceKey="TickCount">Service Uptime: </Label>
+                <div class="col-sm-9">
+                    <input id="tickcount" class="form-control" @bind="@_tickcount" readonly />
+                </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">
@@ -50,24 +80,6 @@
     </TabPanel>
     <TabPanel Name="Options" Heading="Options" ResourceKey="Options">
         <div class="container">
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="runtime" HelpText="Blazor Runtime (Server or WebAssembly)" ResourceKey="BlazorRuntime">Blazor Runtime: </Label>
-                <div class="col-sm-9">
-                    <select id="runtime" class="form-select" @bind="@_runtime">
-                        <option value="Server">@Localizer["Server"]</option>
-                        <option value="WebAssembly">@Localizer["WebAssembly"]</option>
-                    </select>
-                </div>
-            </div>
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="rendermode" HelpText="Blazor Server Render Mode" ResourceKey="RenderMode">Render Mode: </Label>
-                <div class="col-sm-9">
-                    <select id="rendermode" class="form-select" @bind="@_rendermode">
-                        <option value="Server">@Localizer["Server"]</option>
-                        <option value="ServerPrerendered">@Localizer["ServerPrerendered"]</option>
-                    </select>
-                </div>
-            </div>
             <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">
@@ -87,6 +99,21 @@
                         <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="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>
@@ -117,55 +144,66 @@
 </TabStrip>
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-    private string _version = string.Empty;
+	private string _version = string.Empty;
-    private string _clrversion = string.Empty;
+	private string _clrversion = string.Empty;
-    private string _osversion = string.Empty;
+	private string _osversion = string.Empty;
-    private string _serverpath = string.Empty;
+	private string _machinename = string.Empty;
-    private string _servertime = string.Empty;
+	private string _ipaddress = string.Empty;
-    private string _installationid = string.Empty;
+	private string _contentrootpath = string.Empty;
+	private string _webrootpath = string.Empty;
+	private string _servertime = string.Empty;
+	private string _tickcount = string.Empty;
+	private string _workingset = string.Empty;
+	private string _installationid = string.Empty;
 
-    private string _runtime = string.Empty;
+	private string _detailederrors = string.Empty;
-    private string _rendermode = string.Empty;
+	private string _logginglevel = string.Empty;
-    private string _detailederrors = string.Empty;
+	private string _notificationlevel = string.Empty;
-    private string _logginglevel = string.Empty;
+	private string _swagger = string.Empty;
-    private string _swagger = string.Empty;
+	private string _packageservice = string.Empty;
-    private string _packageservice = string.Empty;
 
-    protected override async Task OnInitializedAsync()
+	protected override async Task OnInitializedAsync()
-    {
+	{
-        _version = Constants.Version;
+		_version = Constants.Version;
 
-        Dictionary<string, string> systeminfo = await SystemService.GetSystemInfoAsync();
+		Dictionary<string, object> systeminfo = await SystemService.GetSystemInfoAsync("environment");
-        if (systeminfo != null)
+		if (systeminfo != null)
-        {
+		{
-            _clrversion = systeminfo["clrversion"];
+			_clrversion = systeminfo["CLRVersion"].ToString();
-            _osversion = systeminfo["osversion"];
+			_osversion = systeminfo["OSVersion"].ToString();
-            _serverpath = systeminfo["serverpath"];
+			_machinename = systeminfo["MachineName"].ToString();
-            _servertime = systeminfo["servertime"];
+			_ipaddress = systeminfo["IPAddress"].ToString();
-            _installationid = systeminfo["installationid"];
+			_contentrootpath = systeminfo["ContentRootPath"].ToString();
+			_webrootpath = systeminfo["WebRootPath"].ToString();
+			_servertime = systeminfo["ServerTime"].ToString() + " UTC";
+			_tickcount = TimeSpan.FromMilliseconds(Convert.ToInt64(systeminfo["TickCount"].ToString())).ToString();
+			_workingset = (Convert.ToInt64(systeminfo["WorkingSet"].ToString()) / 1000000).ToString() + " MB";
+		}
 
-            _runtime = systeminfo["runtime"];
+		systeminfo = await SystemService.GetSystemInfoAsync();
-            _rendermode = systeminfo["rendermode"];
+		if (systeminfo != null)
-            _detailederrors = systeminfo["detailederrors"];
+		{
-            _logginglevel = systeminfo["logginglevel"];
+			_installationid = systeminfo["InstallationId"].ToString();
-            _swagger = systeminfo["swagger"];
+            _detailederrors = systeminfo["DetailedErrors"].ToString();
-            _packageservice = systeminfo["packageservice"];
+            _logginglevel = systeminfo["Logging:LogLevel:Default"].ToString();
-        }
+            _notificationlevel = systeminfo["Logging:LogLevel:Notify"].ToString();
-    }
+            _swagger = systeminfo["UseSwagger"].ToString();
+            _packageservice = systeminfo["PackageService"].ToString();
+		}
+	}
 
     private async Task SaveConfig()
     {
         try
         {
-            var settings = new Dictionary<string, string>();
+            var settings = new Dictionary<string, object>();
-            settings.Add("runtime", _runtime);
+            settings.Add("DetailedErrors", _detailederrors);
-            settings.Add("rendermode", _rendermode);
+            settings.Add("Logging:LogLevel:Default", _logginglevel);
-            settings.Add("detailederrors", _detailederrors);
+            settings.Add("Logging:LogLevel:Notify", _notificationlevel);
-            settings.Add("logginglevel", _logginglevel);
+            settings.Add("UseSwagger", _swagger);
-            settings.Add("swagger", _swagger);
+            settings.Add("PackageService", _packageservice);
-            settings.Add("packageservice", _packageservice);
             await SystemService.UpdateSystemInfoAsync(settings);
             AddModuleMessage(Localizer["Success.UpdateConfig.Restart"], MessageType.Success);
         }

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

@@ -70,8 +70,7 @@
             <div class="row mb-1 align-items-center">
                 <Label Class="col-sm-3" HelpText="Upload one or more theme packages. Once they are uploaded click Install to complete the installation." ResourceKey="Theme">Theme: </Label>
                 <div class="col-sm-9">
-                    <FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" UploadMultiple="@true" />
+                    <FileManager Folder="@Constants.PackagesFolder" UploadMultiple="true" />
-
                 </div>
             </div>
         </div>
@@ -230,7 +229,7 @@
     {
         try
         {
-            await PackageService.DownloadPackageAsync(_packageid, _version, "Packages");
+            await PackageService.DownloadPackageAsync(_packageid, _version, Constants.PackagesFolder);
             await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _packageid, _version);
             AddModuleMessage(Localizer["Success.Theme.Download"], MessageType.Success);
             _productname = "";

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

@@ -11,55 +11,56 @@
 
 @if (_templates != null)
 {
-<div class="container">
+	<div class="container">
-    <div class="row mb-1 align-items-center">
+		<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>
+			<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">
+			<div class="col-sm-9">
-            <input id="owner" class="form-control" @bind="@_owner" />
+				<input id="owner" class="form-control" @bind="@_owner" />
-        </div>
+			</div>
-    </div>
+		</div>
-    <div class="row mb-1 align-items-center">
+		<div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="module" HelpText="Enter a name for this theme. It should not contain spaces or punctuation." ResourceKey="ThemeName">Theme Name: </Label>
+			<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">
+			<div class="col-sm-9">
-            <input id="module" class="form-control" @bind="@_theme" />
+				<input id="module" class="form-control" @bind="@_theme" />
-        </div>
+			</div>
-    </div>
+		</div>
-    <div class="row mb-1 align-items-center">
+		<div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="template" HelpText="Select a theme template. Templates are located in the wwwroot/Themes/Templates folder on the server." ResourceKey="Template">Template: </Label>
+			<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">
+			<div class="col-sm-9">
-            <select id="template" class="form-select" @onchange="(e => TemplateChanged(e))">
+				<select id="template" class="form-select" @onchange="(e => TemplateChanged(e))">
-                <option value="-">&lt;@Localizer["Template.Select"]&gt;</option>
+					<option value="-">&lt;@Localizer["Template.Select"]&gt;</option>
-                @foreach (Template template in _templates)
+					@foreach (Template template in _templates)
-                {
+					{
-                    <option value="@template.Name">@template.Title</option>
+						<option value="@template.Name">@template.Title</option>
-                }
+					}
-            </select>
+				</select>
-        </div>
+			</div>
-    </div>
+		</div>
-    <div class="row mb-1 align-items-center">
+		<div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="reference" HelpText="Select a framework reference version" ResourceKey="FrameworkReference">Framework Reference: </Label>
+			<Label Class="col-sm-3" For="reference" HelpText="Select a framework reference version" ResourceKey="FrameworkReference">Framework Reference: </Label>
-        <div class="col-sm-9">
+			<div class="col-sm-9">
-            <select id="reference" class="form-select" @bind="@_reference">
+				<select id="reference" class="form-select" @bind="@_reference">
-                @foreach (string version in _versions)
+					@foreach (string version in _versions)
-                {
+					{
-                    if (Version.Parse(version).CompareTo(Version.Parse(_minversion)) >= 0)
+						if (Version.Parse(version).CompareTo(Version.Parse(_minversion)) >= 0)
-                    {
+						{
-                        <option value="@(version)">@(version)</option>
+							<option value="@(version)">@(version)</option>
-                    }
+						}
-                }
+					}
-                <option value="local">@SharedLocalizer["LocalVersion"]</option>
+					<option value="local">@SharedLocalizer["LocalVersion"]</option>
-            </select>
+				</select>
-        </div>
+			</div>
-    </div>
+		</div>
-    @if (!string.IsNullOrEmpty(_location)) {
+		@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="row mb-1 align-items-center">
-            <div class="col-sm-9">
+				<Label Class="col-sm-3" For="location" HelpText="Location where the theme will be created" ResourceKey="Location">Location: </Label>
-                <input id="module" class="form-control" @bind="@_location" readonly />
+				<div class="col-sm-9">
-            </div>
+					<input id="module" class="form-control" @bind="@_location" readonly />
-        </div>
+				</div>
-    }
+			</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>
@@ -71,19 +72,23 @@
     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()
+    {
+        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)
         {

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

@@ -40,9 +40,12 @@ else
                 @((MarkupString)PurchaseLink(context.PackageName))
             </td>
             <td>
-                @if (UpgradeAvailable(context.PackageName, context.Version))
+				@{ 
+					var version = UpgradeAvailable(context.PackageName, context.Version);
+				} 
+                @if (version != context.Version)
                 {
-                    <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadTheme(context.PackageName, context.Version))>@SharedLocalizer["Upgrade"]</button>
+                    <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadTheme(context.PackageName, version))>@SharedLocalizer["Upgrade"]</button>
                 }
             </td>
             <td></td>
@@ -94,25 +97,24 @@ else
         return link;
     }
 
-    private bool UpgradeAvailable(string packagename, string version)
+	private string UpgradeAvailable(string packagename, string version)
-    {
+	{
-        var upgradeavailable = false;
+		if (!string.IsNullOrEmpty(packagename) && _packages != null)
-        if (!string.IsNullOrEmpty(packagename) && _packages != null)
+		{
-        {
+			var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
-            var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
+			if (package != null && Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0)
-            if (package != null)
+			{
-            {
+				return package.Version;
-                upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0);
+			}
-            }
         }
-        return upgradeavailable;
+        return version;
     }
 
     private async Task DownloadTheme(string packagename, string version)
     {
         try
         {
-            await PackageService.DownloadPackageAsync(packagename, version, "Packages");
+            await PackageService.DownloadPackageAsync(packagename, version, Constants.PackagesFolder);
             await logger.LogInformation("Theme Downloaded {ThemeName} {Version}", packagename, version);
             await ThemeService.InstallThemesAsync();
             AddModuleMessage(string.Format(Localizer["Success.Theme.Install"], NavigateUrl("admin/system")), MessageType.Success);

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

@@ -26,7 +26,7 @@
             <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 Filter="nupkg" ShowFiles="false" Folder="Packages" />
+                    <FileManager Folder="@Constants.PackagesFolder" />
                 </div>
             </div>
         </div>
@@ -85,8 +85,8 @@
     {
         try
         {
-            await PackageService.DownloadPackageAsync(packageid, version, "Packages");
+            await PackageService.DownloadPackageAsync(packageid, version, Constants.PackagesFolder);
-            await PackageService.DownloadPackageAsync(Constants.UpdaterPackageId, version, "Packages");
+            await PackageService.DownloadPackageAsync(Constants.UpdaterPackageId, version, Constants.PackagesFolder);
             AddModuleMessage(Localizer["Success.Framework.Download"], MessageType.Success);
         }
         catch (Exception ex)

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

@@ -0,0 +1,89 @@
+@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="The fully qualified Url for this site" ResourceKey="Url">Url:</Label>
+            <div class="col-sm-9">
+                <input id="url" class="form-control" @bind="@_url" maxlength="500" required />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="mappedurl" HelpText="A fully qualified Url where the user will be redirected" ResourceKey="MappedUrl">Redirect To:</Label>
+            <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;
+
+				if (_url.StartsWith(url))
+				{
+					var urlmapping = new UrlMapping();
+					urlmapping.SiteId = PageState.Site.SiteId;
+					var route = new Route(_url, PageState.Alias.Path);
+					urlmapping.Url = route.PagePath;
+					urlmapping.MappedUrl = _mappedurl.Replace(url, "");
+					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);
+        }
+    }
+}

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

@@ -0,0 +1,92 @@
+@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 fully qualified Url for this site" ResourceKey="Url">Url:</Label>
+            <div class="col-sm-9">
+                <input id="url" class="form-control" @bind="@_url" maxlength="500" readonly />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="mappedurl" HelpText="A fully qualified Url where the user will be redirected" ResourceKey="MappedUrl">Redirect To:</Label>
+            <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 + "/" : "");
+
+					var urlmapping = await UrlMappingService.GetUrlMappingAsync(_urlmappingid);
+					urlmapping.MappedUrl = _mappedurl.Replace(url, "");
+					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,135 @@
+@namespace Oqtane.Modules.Admin.UrlMappings
+@inherits ModuleBase
+@inject NavigationManager NavigationManager
+@inject IUrlMappingService UrlMappingService
+@inject ISiteService SiteService
+@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">
+				<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" 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>@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>
+			<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;
+
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+
+	protected override async Task OnParametersSetAsync()
+	{
+		await GetUrlMappings();
+		_capturebrokenurls = PageState.Site.CaptureBrokenUrls.ToString();
+	}
+
+	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);
+			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

@@ -13,7 +13,7 @@
         <Label Class="col-sm-3" For="to" HelpText="Enter the username you wish to send a message to" ResourceKey="To">To: </Label>
         <div class="col-sm-9">
             <input id="to" class="form-control" @bind="@username" />
-        </div> >
+        </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>
@@ -49,7 +49,7 @@
             var user = await UserService.GetUserAsync(username, PageState.Site.SiteId);
             if (user != null)
             {
-                var notification = new Notification(PageState.Site.SiteId, PageState.User, user, subject, body, 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(NavigateUrl());

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

@@ -12,7 +12,7 @@
 
 @if (PageState.User != null && photo != null)
 {
-    <img src="@ImageUrl(photofileid, 400, 400, "crop")" alt="@displayname" style="max-width: 400px" class="rounded-circle mx-auto d-block">
+    <img src="@ImageUrl(photofileid, 400, 400)" alt="@displayname" style="max-width: 400px" class="rounded-circle mx-auto d-block">
 }
 else
 {
@@ -31,16 +31,34 @@ else
                 </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="col-sm-9">
-                        <input id="password" type="password" class="form-control" @bind="@password" autocomplete="new-password" />
+                        <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">@_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">
-                        <input id="confirm" type="password" class="form-control" @bind="@confirm" autocomplete="new-password" />
+                        <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">@_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">
@@ -142,7 +160,7 @@ else
                         <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>
+                        <td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</td>
                     </Row>
                     <Detail>
                         <td colspan="2"></td>
@@ -175,7 +193,7 @@ else
                         <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>
+                        <td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</td>
                     </Row>
                     <Detail>
                         <td colspan="2"></td>
@@ -193,6 +211,8 @@ else
                     </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" />
             <br /><hr />
             <select class="form-select" @onchange="(e => FilterChanged(e))">
                 <option value="to">@Localizer["Inbox"]</option>
@@ -201,11 +221,16 @@ else
         }
     </TabPanel>
 </TabStrip>
+<br /><br />
 
 @code {
     private string username = string.Empty;
-    private string password = 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;
@@ -224,9 +249,17 @@ else
     {
         try
         {
+            _togglepassword = SharedLocalizer["ShowPassword"];
+
+            if (PageState.Site.Settings.ContainsKey("LoginOptions:TwoFactor") && !string.IsNullOrEmpty(PageState.Site.Settings["LoginOptions:TwoFactor"]))
+            {
+                allowtwofactor = (PageState.Site.Settings["LoginOptions:TwoFactor"] == "true");
+            }
+
             if (PageState.User != null)
             {
                 username = PageState.User.Username;
+                twofactor = PageState.User.TwoFactorRequired.ToString();
                 email = PageState.User.Email;
                 displayname = PageState.User.DisplayName;
 
@@ -280,11 +313,12 @@ else
         {
             if (username != string.Empty && email != string.Empty && ValidateProfiles())
             {
-                if (password == confirm)
+                if (_password == confirm)
                 {
                     var user = PageState.User;
                     user.Username = username;
-                    user.Password = password;
+                    user.Password = _password;
+                    user.TwoFactorRequired = bool.Parse(twofactor);
                     user.Email = email;
                     user.DisplayName = (displayname == string.Empty ? username : displayname);
                     user.PhotoFileId = filemanager.GetFileId();
@@ -292,12 +326,23 @@ else
                     {
                         user.PhotoFileId = null;
                     }
+                    if (user.PhotoFileId != null)
+                    {
+                        photofileid = user.PhotoFileId.Value;
+                        photo = await FileService.GetFileAsync(photofileid);
+                    }
+                    else
+                    {
+                        photofileid = -1;
+                        photo = null;
+                    }
 
                     await UserService.UpdateUserAsync(user);
                     await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId);
                     await logger.LogInformation("User Profile Saved");
 
-                    NavigationManager.NavigateTo(NavigateUrl());
+                    AddModuleMessage(Localizer["Success.Profile.Update"], MessageType.Success);
+                    StateHasChanged();
                 }
                 else
                 {
@@ -380,4 +425,47 @@ else
         StateHasChanged();
     }
 
+    private async Task DeleteAllNotifications()
+    {
+        try
+        {
+            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();
+            StateHasChanged();            
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Deleting Notifications {Error}", ex.Message);
+            AddModuleMessage(ex.Message, MessageType.Error);
+        }
+    
+    }
+
+    private void TogglePassword()
+	{
+		if (_passwordtype == "password")
+		{
+			_passwordtype = "text";
+			_togglepassword = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_passwordtype = "password";
+			_togglepassword = SharedLocalizer["ShowPassword"];
+		}
+	}
+
 }

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

@@ -20,14 +20,20 @@
                 </div>
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="password" HelpText="The user's password. Please choose a password which is sufficiently secure." ResourceKey="Password"></Label>
-                    <div class="col-sm-9">
+					<div class="col-sm-9">
-                        <input id="password" type="password" class="form-control" @bind="@password" />
+                        <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">@_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"></Label>
                     <div class="col-sm-9">
-                        <input id="confirm" type="password" class="form-control" @bind="@confirm" />
+                        <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">@_togglepassword</button>
+					    </div>
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
@@ -88,7 +94,9 @@
 
 @code {
     private string username = string.Empty;
-    private string password = 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 displayname = string.Empty;
@@ -102,6 +110,7 @@
     {
         try
         {
+            _togglepassword = SharedLocalizer["ShowPassword"];
             profiles = await ProfileService.GetProfilesAsync(ModuleState.SiteId);
             settings = new Dictionary<string, string>();
         }
@@ -119,9 +128,9 @@
     {
         try
         {
-            if (username != string.Empty && password != string.Empty && confirm != string.Empty && email != string.Empty && ValidateProfiles())
+            if (username != string.Empty && _password != string.Empty && confirm != string.Empty && email != string.Empty && ValidateProfiles())
             {
-                if (password == confirm)
+                if (_password == confirm)
                 {
                     var user = await UserService.GetUserAsync(username, PageState.Site.SiteId);
                     if (user == null)
@@ -129,7 +138,7 @@
                         user = new User();
                         user.SiteId = PageState.Site.SiteId;
                         user.Username = username;
-                        user.Password = password;
+                        user.Password = _password;
                         user.Email = email;
                         user.DisplayName = string.IsNullOrWhiteSpace(displayname) ? username : displayname;
                         user.PhotoFileId = null;
@@ -193,4 +202,17 @@
         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/Edit.razor

@@ -29,14 +29,20 @@ else
                 </div>
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="password" HelpText="The user's password. Please choose a password which is sufficiently secure." ResourceKey="Password"></Label>
-                    <div class="col-sm-9">
+					<div class="col-sm-9">
-                        <input id="password" type="password" class="form-control" @bind="@password" />
+                        <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">@_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"></Label>
                     <div class="col-sm-9">
-                        <input id="confirm" type="password" class="form-control" @bind="@confirm" />
+                        <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">@_togglepassword</button>
+					    </div>
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
@@ -66,8 +72,19 @@ else
                         </select>
                     </div>
                 </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="lastlogin" HelpText="The date and time when the user last signed in" ResourceKey="LastLogin"></Label>
+                    <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"></Label>
+                    <div class="col-sm-9">
+                        <input id="lastipaddress" class="form-control" @bind="@lastipaddress" readonly />
+                    </div>
+                </div>
             </div>
-
         }
     </TabPanel>
     <TabPanel Name="Profile" ResourceKey="Profile">
@@ -131,61 +148,70 @@ else
 <AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon" DeletedBy="@deletedby" DeletedOn="@deletedon"></AuditInfo>
 
 @code {
-    private int userid;
+	private int userid;
-    private string username = string.Empty;
+	private string username = string.Empty;
-    private string password = string.Empty;
+	private string _password = string.Empty;
-    private string confirm = string.Empty;
+	private string _passwordtype = "password";
-    private string email = string.Empty;
+	private string _togglepassword = string.Empty;
-    private string displayname = string.Empty;
+	private string confirm = string.Empty;
-    private FileManager filemanager;
+	private string email = string.Empty;
-    private int photofileid = -1;
+	private string displayname = string.Empty;
-    private File photo = null;
+	private FileManager filemanager;
-    private List<Profile> profiles;
+	private int photofileid = -1;
-    private Dictionary<string, string> settings;
+	private File photo = null;
-    private string category = string.Empty;
+	private string isdeleted;
-    private string createdby;
+	private string lastlogin;
-    private DateTime createdon;
+	private string lastipaddress;
-    private string modifiedby;
-    private DateTime modifiedon;
-    private string deletedby;
-    private DateTime? deletedon;
-    private string isdeleted;
 
-    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;
-        try
+	private string modifiedby;
-        {
+	private DateTime modifiedon;
-            // OnParametersSetAsync is called when the edit modal is closed - in which case there is no id parameter
+	private string deletedby;
-            if (PageState.QueryString.ContainsKey("id"))
+	private DateTime? deletedon;
-            {
+
-                profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId);
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
-                userid = Int32.Parse(PageState.QueryString["id"]);
+
-                var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
+	protected override async Task OnParametersSetAsync()
-                if (user != null)
+	{
-                {
+		try
-                    username = user.Username;
+		{
-                    email = user.Email;
+			if (PageState.QueryString.ContainsKey("id"))
-                    displayname = user.DisplayName;
+			{
-                    if (user.PhotoFileId != null)
+				_togglepassword = SharedLocalizer["ShowPassword"];
-                    {
+				profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId);
-                        photofileid = user.PhotoFileId.Value;
+				userid = Int32.Parse(PageState.QueryString["id"]);
-                        photo = await FileService.GetFileAsync(photofileid);
+				var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
-                    }
+				if (user != null)
-                    else
+				{
-                    {
+					username = user.Username;
-                        photofileid = -1;
+					email = user.Email;
-                        photo = null;
+					displayname = user.DisplayName;
-                    }
+					if (user.PhotoFileId != null)
-                    settings = await SettingService.GetUserSettingsAsync(user.UserId);
+					{
+						photofileid = user.PhotoFileId.Value;
+						photo = await FileService.GetFileAsync(photofileid);
+					}
+					else
+					{
+						photofileid = -1;
+						photo = null;
+					}
+                    isdeleted = user.IsDeleted.ToString();
+					lastlogin = string.Format("{0:MMM dd yyyy HH:mm:ss}", user.LastLoginOn);
+					lastipaddress = user.LastIPAddress;
+
+					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();
                 }
             }
         }
@@ -205,12 +231,12 @@ else
         {
             if (username != string.Empty && email != string.Empty && ValidateProfiles())
             {
-                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.Password = _password;
                     user.Email = email;
                     user.DisplayName = string.IsNullOrWhiteSpace(displayname) ? username : displayname;
                     user.PhotoFileId = null;
@@ -268,4 +294,17 @@ else
         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,12 @@
 @inject IUserRoleService UserRoleService
 @inject IUserService UserService
 @inject ISettingService SettingService
+@inject ISiteService SiteService
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
+@inject SiteState SiteState
 
-@if (userroles == null)
+@if (users == null)
 {
     <p>
         <em>@SharedLocalizer["Loading"]</em>
@@ -14,112 +16,625 @@
 }
 else
 {
-    <div class="container">
+    <TabStrip>
-        <div class="row mb-1 align-items-center">
+        <TabPanel Name="Users" Heading="Users" ResourceKey="Users">
-            <div class="col-sm-4">
+			<div class="container">
-                <ActionLink Action="Add" Text="Add User" ResourceKey="AddUser" />
+				<div class="row mb-1 align-items-center">
-            </div>
+					<div class="col-sm-4">
-            <div class="col-sm-4">
+						<ActionLink Action="Add" Text="Add User" ResourceKey="AddUser" />
-                <input class="form-control" @bind="@_search" />
+					</div>
-            </div>
+					<div class="col-sm-4">
-            <div class="col-sm-4">
+						<input class="form-control" @bind="@_search" />
-                <button class="btn btn-secondary" @onclick="OnSearch">@SharedLocalizer["Search"]</button>
+					</div>
-            </div>
+					<div class="col-sm-4">
-        </div>
+						<button type="button" class="btn btn-secondary" @onclick="OnSearch">@SharedLocalizer["Search"]</button>
-    </div>
+					</div>
-    <Pager Items="@userroles">
+				</div>
-        <Header>
+			</div>
-        <th style="width: 1px;">&nbsp;</th>
+			<Pager Items="@users" RowClass="align-middle">
-        <th style="width: 1px;">&nbsp;</th>
+				<Header>
-        <th style="width: 1px;">&nbsp;</th>
+					<th style="width: 1px;">&nbsp;</th>
-        <th>@SharedLocalizer["Name"]</th>
+					<th style="width: 1px;">&nbsp;</th>
-        </Header>
+					<th style="width: 1px;">&nbsp;</th>
-        <Row>
+					<th>@SharedLocalizer["Username"]</th>
-            <td>
+					<th>@SharedLocalizer["Name"]</th>
-                <ActionLink Action="Edit" Parameters="@($"id=" + context.UserId.ToString())" ResourceKey="EditUser" />
+					<th>@Localizer["LastLoginOn"]</th>
-            </td>
+				</Header>
-            <td>
+				<Row>
-                <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.UserId == PageState.User.UserId)" ResourceKey="DeleteUser" />
+					<td>
-            </td>
+						<ActionLink Action="Edit" Parameters="@($"id=" + context.UserId.ToString())" ResourceKey="EditUser" />
-            <td>
+					</td>
-                <ActionLink Action="Roles" Parameters="@($"id=" + context.UserId.ToString())" ResourceKey="Roles" />
+					<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.UserId == PageState.User.UserId)" ResourceKey="DeleteUser" />
-            <td>@context.User.DisplayName</td>
+					</td>
-        </Row>
+					<td>
-    </Pager>
+						<ActionLink Action="Roles" Parameters="@($"id=" + context.UserId.ToString())" ResourceKey="Roles" />
+					</td>
+					<td>@context.User.Username</td>
+					<td>@((MarkupString)string.Format("<a href=\"mailto:{0}\">{1}</a>", @context.User.Email, @context.User.DisplayName))</td>
+					<td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", context.User.LastLoginOn)</td>
+				</Row>
+			</Pager>
+	</TabPanel>
+        <TabPanel Name="Settings" Heading="Settings" ResourceKey="Settings">
+			<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 (_providertype != "")
+					{
+						<div class="row mb-1 align-items-center">
+							<Label Class="col-sm-3" For="allowsitelogin" HelpText="Do you want to allow users to sign in using a username and password that is managed locally on this site? Note that you should only disable this option if you have already sucessfully configured an external login provider, or else you may lock yourself out of the site." ResourceKey="AllowSiteLogin">Allow Login?</Label>
+							<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>
+					}
+					else
+					{
+						<div class="row mb-1 align-items-center">
+							<Label Class="col-sm-3" For="allowsitelogin" HelpText="Do you want to allow users to sign in using a username and password that is managed locally on this site? Note that you should only disable this option if you have already sucessfully configured an external login provider, or else you may lock yourself out of the site." ResourceKey="AllowSiteLogin">Allow Login?</Label>
+							<div class="col-sm-9">
+								<input id="allowsitelogin" class="form-control" value="@SharedLocalizer["Yes"]" readonly />
+							</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>
+					}
+				</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="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>@Localizer["Not Specified"]</option>
+									<option value="@AuthenticationProviderTypes.OpenIDConnect">@Localizer["OpenID Connect"]</option>
+									<option value="@AuthenticationProviderTypes.OAuth2">@Localizer["OAuth 2.0"]</option>
+								</select>
+							</div>
+						</div>		
+						@if (_providertype != "")
+						{
+							<div class="row mb-1 align-items-center">
+								<Label Class="col-sm-3" For="providername" HelpText="The external login provider name 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>
+							<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="identifierclaimtype" HelpText="The name of the unique user identifier claim provided by the provider" 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="emailclaimtype" HelpText="The name of the email address claim provided by the provider" 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="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>
+						}
+					</Section>
+					<Section Name="Token" Heading="Token Settings" ResourceKey="TokenSettings">
+						<div class="row mb-1 align-items-center">
+							<Label Class="col-sm-3" For="secret" 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="secret" 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> allusers;
-    private List<UserRole> userroles;
+	private List<UserRole> users;
-    private string _search;
+	private string _search = "";
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+	private string _allowregistration;
+	private string _allowsitelogin;
+	private string _twofactor;
+	private string _cookiename;
 
-    protected override async Task OnInitializedAsync()
+	private string _minimumlength;
-    {
+	private string _uniquecharacters;
-        allroles = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId);
+	private string _requiredigit;
-        await LoadSettingsAsync();
+	private string _requireupper;
-        userroles = Search(_search);
+	private string _requirelower;
-    }
+	private string _requirepunctuation;
+	private string _maximumfailures;
+	private string _lockoutduration;
 
-    private List<UserRole> Search(string search)
+	private string _providertype;
-    {
+	private string _providername;
-        var results = allroles.Where(item => item.Role.Name == RoleNames.Registered || (item.Role.Name == RoleNames.Host && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)));
+	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 _scopes;
+	private string _parameters;
+	private string _pkce;
+	private string _redirecturl;
+	private string _identifierclaimtype;
+	private string _emailclaimtype;
+	private string _domainfilter;
+	private string _createusers;
 
-        if (string.IsNullOrEmpty(_search))
+	private string _secret;
-        {
+	private string _secrettype = "password";
-            results = results.Where(item =>
+	private string _togglesecret = string.Empty;
-                (
+	private string _issuer;
-                    item.User.Username.Contains(search, StringComparison.OrdinalIgnoreCase) ||
+	private string _audience;
-                    item.User.Email.Contains(search, StringComparison.OrdinalIgnoreCase) ||
+	private string _lifetime;
-                    item.User.DisplayName.Contains(search, StringComparison.OrdinalIgnoreCase)
+	private string _token;
-                )
-            );
-        }
-        return results.ToList();
-    }
 
-    private async Task OnSearch()
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
-    {
-        userroles = Search(_search);
-        await UpdateSettingsAsync();
-    }
 
-    private async Task DeleteUser(UserRole UserRole)
+	protected override async Task OnInitializedAsync()
-    {
+	{
-        try
+		await LoadUserSettingsAsync();
-        {
+		await LoadUsersAsync(true);
-            var user = await UserService.GetUserAsync(UserRole.UserId, PageState.Site.SiteId);
-            if (user != null)
-            {
-                await UserService.DeleteUserAsync(user.UserId, PageState.Site.SiteId);
-                await logger.LogInformation("User Deleted {User}", UserRole.User);
-                allroles = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId);
-                userroles = Search(_search);
-                StateHasChanged();
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Deleting User {User} {Error}", UserRole.User, ex.Message);
-            AddModuleMessage(ex.Message, MessageType.Error);
-        }
-    }
 
-    private string settingSearch = "AU-search";
+		var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+		_allowregistration = PageState.Site.AllowRegistration.ToString();
+		_allowsitelogin = SettingService.GetSetting(settings, "LoginOptions:AllowSiteLogin", "true");
 
-    private async Task LoadSettingsAsync()
+		if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-    {
+		{
-        Dictionary<string, string> settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId);
+			_twofactor = SettingService.GetSetting(settings, "LoginOptions:TwoFactor", "false");
-        _search = SettingService.GetSetting(settings, settingSearch, "");
+			_cookiename = SettingService.GetSetting(settings, "LoginOptions:CookieName", ".AspNetCore.Identity.Application");
-    }
 
-    private async Task UpdateSettingsAsync()
+			_minimumlength = SettingService.GetSetting(settings, "IdentityOptions:Password:RequiredLength", "6");
-    {
+			_uniquecharacters = SettingService.GetSetting(settings, "IdentityOptions:Password:RequiredUniqueChars", "1");
-        Dictionary<string, string> settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId);
+			_requiredigit = SettingService.GetSetting(settings, "IdentityOptions:Password:RequireDigit", "true");
-        SettingService.SetSetting(settings, settingSearch, _search);
+			_requireupper = SettingService.GetSetting(settings, "IdentityOptions:Password:RequireUppercase", "true");
-        await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId);
+			_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();
+
+			_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"];
+			_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;
+			_identifierclaimtype = SettingService.GetSetting(settings, "ExternalLogin:IdentifierClaimType", "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier");
+			_emailclaimtype = SettingService.GetSetting(settings, "ExternalLogin:EmailClaimType", "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress");
+			_domainfilter = SettingService.GetSetting(settings, "ExternalLogin:DomainFilter", "");
+			_createusers = SettingService.GetSetting(settings, "ExternalLogin:CreateUsers", "true");
+
+			_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");		}
+	}
+
+	private async Task LoadUsersAsync(bool load)
+	{
+		if (load)
+		{
+			allusers = 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);
+				allusers.AddRange(hosts);
+				allusers = allusers.OrderBy(u => u.User.DisplayName).ToList();
+			}			
+		}
+
+		users = allusers;
+		if (!string.IsNullOrEmpty(_search))
+		{
+			users = users.Where(item =>
+				(
+					item.User.Username.Contains(_search, StringComparison.OrdinalIgnoreCase) ||
+					item.User.Email.Contains(_search, StringComparison.OrdinalIgnoreCase) ||
+					item.User.DisplayName.Contains(_search, StringComparison.OrdinalIgnoreCase)
+				)
+			).ToList();
+		}
+	}
+
+	private async Task OnSearch()
+	{
+		await UpdateUserSettingsAsync();
+		await LoadUsersAsync(false);
+	}
+
+	private async Task DeleteUser(UserRole UserRole)
+	{
+		try
+		{
+			var user = await UserService.GetUserAsync(UserRole.UserId, PageState.Site.SiteId);
+			if (user != null)
+			{
+				await UserService.DeleteUserAsync(user.UserId, PageState.Site.SiteId);
+				await logger.LogInformation("User Deleted {User}", UserRole.User);
+				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);
+		}
+	}
+
+	private string settingSearch = "AU-search";
+
+	private async Task LoadUserSettingsAsync()
+	{
+		Dictionary<string, string> settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId);
+		_search = SettingService.GetSetting(settings, settingSearch, "");
+	}
+
+	private async Task UpdateUserSettingsAsync()
+	{
+		Dictionary<string, string> settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId);
+		SettingService.SetSetting(settings, settingSearch, _search);
+		await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId);
+	}
+
+	private async Task SaveSiteSettings()
+	{
+		try
+		{
+			var site = PageState.Site;
+			site.AllowRegistration = bool.Parse(_allowregistration);
+			await SiteService.UpdateSiteAsync(site);
+
+			var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
+			settings = SettingService.SetSetting(settings, "LoginOptions:AllowSiteLogin", _allowsitelogin, false);
+
+			if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+			{
+				settings = SettingService.SetSetting(settings, "LoginOptions:TwoFactor", _twofactor, false);
+				settings = SettingService.SetSetting(settings, "LoginOptions:CookieName", _cookiename, true);
+
+				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: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:Scopes", _scopes, true);
+				settings = SettingService.SetSetting(settings, "ExternalLogin:Parameters", _parameters, true);
+				settings = SettingService.SetSetting(settings, "ExternalLogin:PKCE", _pkce, true);
+				settings = SettingService.SetSetting(settings, "ExternalLogin:IdentifierClaimType", _identifierclaimtype, true);
+				settings = SettingService.SetSetting(settings, "ExternalLogin:EmailClaimType", _emailclaimtype, true);
+				settings = SettingService.SetSetting(settings, "ExternalLogin:DomainFilter", _domainfilter, true);
+				settings = SettingService.SetSetting(settings, "ExternalLogin:CreateUsers", _createusers, true);
+
+				if (!string.IsNullOrEmpty(_secret) && _secret.Length < 16) _secret = (_secret + "????????????????").Substring(0, 16);
+				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);
+		}
+	}
+
+	private void ProviderTypeChanged(ChangeEventArgs e)
+	{
+		_providertype = (string)e.Value;
+		if (string.IsNullOrEmpty(_providername))
+		{
+			if (_providertype == AuthenticationProviderTypes.OpenIDConnect)
+			{
+				_scopes = "openid,profile,email";
+				_identifierclaimtype = "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier";
+				_emailclaimtype = "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress";
+			}
+			else
+			{
+				_scopes = "";
+				_identifierclaimtype = "sub";
+				_emailclaimtype = "email";
+			}			
+		}
+		_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"];
+		}
+	}
 }

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

@@ -110,8 +110,7 @@ else
     {
         try
         {
-            userroles = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId);
+            userroles = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, userid);
-            userroles = userroles.Where(item => item.UserId == userid).ToList();
         }
         catch (Exception ex)
         {

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

@@ -0,0 +1,140 @@
+@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 = visitor.VisitedOn.ToString(CultureInfo.CurrentCulture);
+				_created = visitor.CreatedOn.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()
+	{
+		if (!PageState.QueryString.ContainsKey("type"))
+		{
+			return NavigateUrl();
+		}
+		else
+		{
+			return NavigateUrl(PageState.Page.Path, "type=" + PageState.QueryString["type"] + "&days=" + PageState.QueryString["days"] + "&page=" + PageState.QueryString["page"]);
+		}
+	}
+}

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

@@ -0,0 +1,200 @@
+@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" Parameters="@($"id=" + context.VisitorId.ToString() + "&type=" + _type.ToString() + "&days=" + _days.ToString() + "&page=" + _page.ToString())" 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>@context.VisitedOn</td>
+					<td>@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="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 (Days): </Label>
+					<div class="col-sm-9">
+						<input id="retention" class="form-control" @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>
+	</TabStrip>
+}
+
+@code {
+	private string _type = "visitors";
+	private int _days = 1;
+	private int _page = 1;
+	private List<Visitor> _visitors;
+	private string _tracking;
+	private string _filter = "";
+	private string _retention = "";
+	private string _correlation = "true";
+
+	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);
+		_filter = SettingService.GetSetting(settings, "VisitorFilter", Constants.DefaultVisitorFilter);
+		_retention = SettingService.GetSetting(settings, "VisitorRetention", "30");
+		_correlation = SettingService.GetSetting(settings, "VisitorCorrelation", "true");
+	}
+
+	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, "VisitorFilter", _filter, true);
+			settings = SettingService.SetSetting(settings, "VisitorRetention", _retention, true);
+			settings = SettingService.SetSetting(settings, "VisitorCorrelation", _correlation, 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

@@ -17,7 +17,7 @@
                     <div class="modal-footer">
                         @if (!string.IsNullOrEmpty(Action))
                         {
-                            <button type="button" class="@Class" @onclick="Confirm">@((MarkupString)_iconSpan) @Localize(Action)</button>
+                            <button type="button" class="@Class" @onclick="Confirm">@((MarkupString)_iconSpan) @Text</button>
                         }
                         <button type="button" class="btn btn-secondary" @onclick="DisplayModal">@Localize("Cancel")</button>
                     </div>
@@ -30,16 +30,17 @@
 {
     if (Disabled)
     {
-        <button class="@Class" disabled>@((MarkupString)_iconSpan) @Text</button>
+        <button type="button" class="@Class" disabled>@((MarkupString)_iconSpan) @Text</button>
     }
     else
     {
-        <button class="@Class" @onclick="DisplayModal">@((MarkupString)_iconSpan) @Text</button>
+        <button type="button" class="@Class" @onclick="DisplayModal">@((MarkupString)_iconSpan) @Text</button>
     }
 }
 
 @code {
     private bool _visible = false;
+	private string _permissions = string.Empty;
     private bool _editmode = false;
     private bool _authorized = false;
     private string _iconSpan = string.Empty;
@@ -59,6 +60,9 @@
     [Parameter]
     public SecurityAccessLevel? Security { get; set; } // optional - can be used to explicitly specify SecurityAccessLevel
 
+	[Parameter]
+	public string Permissions { get; set; } // optional - can be used to specify a permission string
+
     [Parameter]
     public string Class { get; set; } // optional
 
@@ -105,6 +109,7 @@
         Header = Localize(nameof(Header), Header);
         Message = Localize(nameof(Message), Message);
 
+		_permissions = (string.IsNullOrEmpty(Permissions)) ? ModuleState.Permissions : Permissions;
         _authorized = IsAuthorized();
     }
 
@@ -138,10 +143,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/ActionLink.razor

@@ -6,101 +6,118 @@
 {
     if (Disabled)
     {
-        <button class="@_classname" style="@_style" disabled>@((MarkupString)_iconSpan) @_text</button>
+		<button type="button" class="@_classname" style="@_style" disabled>@((MarkupString)_iconSpan) @_text</button>
-    }
+	}
-    else
+	else
-    {
+	{
-        <NavLink class="@_classname" href="@_url" style="@_style">@((MarkupString)_iconSpan) @_text</NavLink>
+		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 _text = string.Empty;
-    private string _url = string.Empty;
+	private string _parameters = string.Empty;
-    private string _parameters = string.Empty;
+	private string _url = string.Empty;
-    private string _classname = "btn btn-primary";
+	private string _permissions = string.Empty;
-    private string _style = string.Empty;
+	private bool _editmode = false;
-    private bool _editmode = false;
+	private bool _authorized = false;
-    private bool _authorized = false;
+	private string _classname = "btn btn-primary";
-    private string _iconSpan = string.Empty;
+	private string _style = string.Empty;
+	private string _iconSpan = string.Empty;
 
-    [Parameter]
+	[Parameter]
-    public string Action { get; set; } // required
+	public string Action { get; set; } // required
 
-    [Parameter]
+	[Parameter]
-    public SecurityAccessLevel? Security { get; set; } // optional - can be used to explicitly specify SecurityAccessLevel
+	public string Text { get; set; } // optional - defaults to Action if not specified
 
-    [Parameter]
+	[Parameter]
-    public string Text { get; set; } // optional - defaults to Action if not specified
+	public string Parameters { get; set; } // optional - querystring parameters should be in the form of "id=x&name=y"
 
-    [Parameter]
+	[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]
+	[Parameter]
-    public string Class { get; set; } // optional - defaults to primary if not specified
+	public Action OnClick { get; set; } = null; // optional - executes a method in the calling component
 
-    [Parameter]
+	[Parameter]
-    public string Style { get; set; } // optional
+	public SecurityAccessLevel? Security { get; set; } // optional - can be used to explicitly specify SecurityAccessLevel
 
-    [Parameter]
+	[Parameter]
-    public bool Disabled { get; set; } // optional
+	public string Permissions { get; set; } // optional - can be used to specify a permission string
 
-    [Parameter]
+	[Parameter]
-    public string EditMode { get; set; } // optional - specifies if an authorized user must be in edit mode to see the action - default is false.
+	public bool Disabled { get; set; } // optional
 
-    [Parameter]
+	[Parameter]
-    public string IconName { get; set; } // optional - specifies an icon for the link - default is no icon
+	public string EditMode { get; set; } // optional - specifies if an authorized user must be in edit mode to see the action - default is false.
 
-    [Parameter]
+	[Parameter]
-    public bool IconOnly { get; set; } // optional - specifies only icon in link
+	public string Class { get; set; } // optional - defaults to primary if not specified
 
-    protected override void OnParametersSet()
+	[Parameter]
-    {
+	public string Style { get; set; } // optional
-        base.OnParametersSet();
 
-        _text = Action;
+	[Parameter]
-        if (!string.IsNullOrEmpty(Text))
+	public string IconName { get; set; } // optional - specifies an icon for the link - default is no icon
-        {
-            _text = Text;
-        }
 
-        if (IconOnly && !string.IsNullOrEmpty(IconName))
+	[Parameter]
-        {
+	public bool IconOnly { get; set; } // optional - specifies only icon in link
-            _text = string.Empty;
-        }
 
-        if (!string.IsNullOrEmpty(Parameters))
+	protected override void OnParametersSet()
-        {
+	{
-            _parameters = Parameters;
+		base.OnParametersSet();
-        }
 
-        if (!string.IsNullOrEmpty(Class))
+		_text = Action;
-        {
+		if (!string.IsNullOrEmpty(Text))
-            _classname = Class;
+		{
-        }
+			_text = Text;
+		}
 
-        if (!string.IsNullOrEmpty(Style))
+		if (IconOnly && !string.IsNullOrEmpty(IconName))
-        {
+		{
-            _style = Style;
+			_text = string.Empty;
-        }
+		}
 
-        if (!string.IsNullOrEmpty(EditMode))
+		if (!string.IsNullOrEmpty(Parameters))
-        {
+		{
-            _editmode = bool.Parse(EditMode);
+			_parameters = Parameters;
-        }
+		}
 
-        if (!string.IsNullOrEmpty(IconName))
+		if (!string.IsNullOrEmpty(Class))
-        {
+		{
-            if (!IconName.Contains(" "))
+			_classname = Class;
-            {
+		}
-                IconName = "oi oi-" + IconName;
-            }
-            _iconSpan = $"<span class=\"{IconName}\"></span>{(IconOnly ? "" : "&nbsp")}";
 
-        }
+		if (!string.IsNullOrEmpty(Style))
+		{
+			_style = Style;
+		}
 
-        _text = Localize(nameof(Text), _text);
+		if (!string.IsNullOrEmpty(EditMode))
-        _url = EditUrl(Action, _parameters);
+		{
+			_editmode = bool.Parse(EditMode);
+		}
+
+		if (!string.IsNullOrEmpty(IconName))
+		{
+			if (!IconName.Contains(" "))
+			{
+				IconName = "oi oi-" + IconName;
+			}
+			_iconSpan = $"<span class=\"{IconName}\"></span>{(IconOnly ? "" : "&nbsp")}";
+		}
+
+		_permissions = (string.IsNullOrEmpty(Permissions)) ? ModuleState.Permissions : Permissions;
+		_text = Localize(nameof(Text), _text);		
+        _url = (ModuleId == -1) ? EditUrl(Action, _parameters) : EditUrl(ModuleId, Action, _parameters);
         _authorized = IsAuthorized();
     }
 
@@ -136,10 +153,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>{CreatedOn.Value.ToString(DateTimeFormat)}</b>";
             }
 
             _text += "</p>";
@@ -66,7 +69,7 @@
 
             if (ModifiedOn != null)
             {
-                _text += $" {Localizer["on"]} <b>{ModifiedOn.Value.ToString("MMM dd yyyy HH:mm:ss")}</b>";
+                _text += $" {Localizer["on"]} <b>{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>{DeletedOn.Value.ToString(DateTimeFormat)}</b>";
             }
 
             _text += "</p>";

Oqtane.Client/Modules/Controls/FileManager.razor

@@ -10,54 +10,62 @@
     <div id="@Id" class="container-fluid px-0">
         <div class="row">
             <div class="col">
-                @if (ShowFolders || FolderId <= 0)
+                <div class="container-fluid px-0">
-                {
+                    @if (ShowFolders)
-                    <div>
+                    {
-                        <select class="form-select" value="@FolderId" @onchange="(e => FolderChanged(e))">
+                        <div class="row">
-                            @if (string.IsNullOrEmpty(Folder))
+                            <div class="col">
-                            {
+                                <select class="form-select" value="@FolderId" @onchange="(e => FolderChanged(e))">
-                                <option value="-1">&lt;@Localizer["Folder.Select"]&gt;</option>
+                                    <option value="-1">&lt;@Localizer["Folder.Select"]&gt;</option>
-                            }
+                                    @foreach (Folder folder in _folders)
-                            @foreach (Folder folder in _folders)
+                                    {
-                            {
+                                        <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
-                                <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
+                                    }
-                            }
+                                </select>
-                        </select>
+                            </div>
-                    </div>
+                        </div>
-                }
+                    }
-                @if (ShowFiles)
+                    @if (ShowFiles)
-                {
+                    {
-                    <div>
+                        <div class="row mt-1">
-                        <select class="form-select" value="@FileId" @onchange="(e => FileChanged(e))">
+                            <div class="col">
-                            <option value="-1">&lt;@Localizer["File.Select"]&gt;</option>
+                                <select class="form-select" value="@FileId" @onchange="(e => FileChanged(e))">
-                            @foreach (File file in _files)
+                                    <option value="-1">&lt;@Localizer["File.Select"]&gt;</option>
-                            {
+                                    @foreach (File file in _files)
-                                <option value="@(file.FileId)">@(file.Name)</option>
+                                    {
-                            }
+                                        <option value="@(file.FileId)">@(file.Name)</option>
-                        </select>
+                                    }
-                    </div>
+                                </select>
-                }
+                            </div>
-                @if (ShowUpload && _haseditpermission)
+                        </div>
-                {
+                    }
-                    <div>
+                    @if (ShowUpload && _haseditpermission)
-                        @if (UploadMultiple)
+                    {
-                        {
+                        <div class="row">
-                            <input type="file" id="@_fileinputid" name="file" accept="@_filter" multiple />
+                            <div class="col mt-2">
-                        }
+                                @if (UploadMultiple)
-                        else
+                                {
-                        {
+                                    <input type="file" id="@_fileinputid" name="file" accept="@_filter" multiple />
-                            <input type="file" id="@_fileinputid" name="file" accept="@_filter" />
+                                }
-                        }
+                                else
-                        <span id="@_progressinfoid"></span><progress id="@_progressbarid" style="width: 150px; visibility: hidden;"></progress>
+                                {
-                        <span class="float-end">
+                                    <input type="file" id="@_fileinputid" name="file" accept="@_filter" />
-                            <button type="button" class="btn btn-success" @onclick="UploadFile">@SharedLocalizer["Upload"]</button>
+                                }
-                            @if (ShowFiles && GetFileId() != -1)
+                            </div>
-                            {
+                            <div class="col mt-2 text-end">
-                                <button type="button" class="btn btn-danger" @onclick="DeleteFile">@SharedLocalizer["Delete"]</button>
+                                <button type="button" class="btn btn-success" @onclick="UploadFile">@SharedLocalizer["Upload"]</button>
-                            }
+                                @if (ShowFiles && GetFileId() != -1)
-                        </span>
+                                {
-                    </div>
+                                    <button type="button" class="btn btn-danger mx-1" @onclick="DeleteFile">@SharedLocalizer["Delete"]</button>
-                }
+                                }
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col mt-1"><span id="@_progressinfoid" style="display: none;"></span></div>
+                            <div class="col text-center mt-1"><progress id="@_progressbarid" class="mt-1" style="display: none;"></progress></div>
+                        </div>
+                    }
+                </div>
             </div>
             @if (_image != string.Empty)
             {
@@ -68,8 +76,8 @@
         </div>
         @if (!string.IsNullOrEmpty(_message))
         {
-            <div class="row">
+            <div class="row mt-1">
-                <div class="col mt-2">
+                <div class="col">
                     <ModuleMessage Message="@_message" Type="@_messagetype" />
                 </div>
             </div>
@@ -96,10 +104,16 @@
     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 ( only relevant for host functions )
+    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
@@ -114,10 +128,7 @@
     public bool ShowImage { get; set; } = true; // optional - for indicating whether an image thumbnail should be displayed - default is true
 
     [Parameter]
-    public int FileId { get; set; } = -1; // optional - for selecting a specific file by default
+    public bool ShowSuccess { get; set; } = false; // optional - for indicating whether a success message should be displayed upon successful upload - default is false
-
-    [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 UploadMultiple { get; set; } = false; // optional - enable multiple file uploads - default false
@@ -138,19 +149,35 @@
             _id = Id;
         }
 
+        // packages folder is a framework folder for uploading installable nuget packages
+        if (Folder == Constants.PackagesFolder)
+        {
+            ShowFiles = false;
+            ShowFolders = false;
+            Filter = "nupkg";
+            ShowSuccess = true;
+        }
+
         if (!ShowFiles)
         {
             ShowImage = false;
         }
 
-        if (!string.IsNullOrEmpty(Folder))
+        _folders = await FolderService.GetFoldersAsync(ModuleState.SiteId);
+
+        if (!string.IsNullOrEmpty(Folder) && Folder != Constants.PackagesFolder)
         {
-            _folders = new List<Folder> { new Folder { FolderId = -1, Name = Folder } };
+            Folder folder = await FolderService.GetFolderAsync(ModuleState.SiteId, Folder);
-            FolderId = -1;
+            if (folder != null)
-        }
+            {
-        else
+                FolderId = folder.FolderId;
-        {
+            }
-            _folders = await FolderService.GetFoldersAsync(ModuleState.SiteId);
+            else
+            {
+                FolderId = -1;
+                _message = "Folder Path " + Folder + "Does Not Exist";
+                _messagetype = MessageType.Error;
+            }
         }
 
         if (FileId != -1)
@@ -164,6 +191,8 @@
             else
             {
                 FileId = -1; // file does not exist
+                _message = "FileId " + FileId.ToString() + "Does Not Exist";
+                _messagetype = MessageType.Error;
             }
         }
 
@@ -186,10 +215,10 @@
     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
         {
@@ -234,7 +263,6 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Files {Error}", ex.Message);
-
             _message = Localizer["Error.File.Load"];
             _messagetype = MessageType.Error;
         }
@@ -286,7 +314,7 @@
             try
             {
                 string result;
-                if (!string.IsNullOrEmpty(Folder))
+                if (Folder == Constants.PackagesFolder)
                 {
                     result = await FileService.UploadFilesAsync(Folder, upload, _guid);
                 }
@@ -298,9 +326,11 @@
                 if (result == string.Empty)
                 {
                     await logger.LogInformation("File Upload Succeeded {Files}", upload);
-
+                    if (ShowSuccess)
-                    _message = Localizer["Success.File.Upload"];
+                    {
-                    _messagetype = MessageType.Success;
+                        _message = Localizer["Success.File.Upload"];
+                        _messagetype = MessageType.Success;
+                    }
 
                     // set FileId to first file in upload collection
                     await GetFiles();
@@ -364,5 +394,7 @@
 
     public int GetFileId() => FileId;
 
+    public int GetFolderId() => FolderId;
+
     public File GetFile() => _file;
 }

Oqtane.Client/Modules/Controls/Label.razor

@@ -25,8 +25,8 @@ else
     [Parameter]
     public string HelpText { get; set; } // optional - tooltip for this label
 
-    private string _spanclass = "app-tooltip";
+    private string _spanclass;
-    private string _labelclass = "form-label";
+    private string _labelclass;
     private string _helptext = string.Empty;
 
     protected override void OnParametersSet()
@@ -36,11 +36,15 @@ else
         if (!string.IsNullOrEmpty(HelpText))
         {
             _helptext = Localize(nameof(HelpText), HelpText);
-            _spanclass += (!string.IsNullOrEmpty(Class)) ? " " + Class : "";
+            _labelclass = "form-label";
+
+            var spanclass = (!string.IsNullOrEmpty(Class)) ? " " + Class : "";
+            _spanclass = "app-tooltip" + spanclass;
         }
         else
         {
-            _labelclass += (!string.IsNullOrEmpty(Class)) ? " " + Class : "";
+            var labelclass = (!string.IsNullOrEmpty(Class)) ? " " + Class : "";
+            _labelclass = "form-label" + labelclass;
         }
 
         var text = Localize("Text", String.Empty);

Oqtane.Client/Modules/Controls/LocalizableComponent.cs

@@ -13,6 +13,9 @@ namespace Oqtane.Modules.Controls
         [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;
@@ -50,9 +53,14 @@ namespace Oqtane.Modules.Controls
         {
             IsLocalizable = false;
 
-            if (!String.IsNullOrEmpty(ResourceKey) && ModuleState?.ModuleType != null)
+            if (string.IsNullOrEmpty(ResourceType))
             {
-                var moduleType = Type.GetType(ModuleState.ModuleType);
+                ResourceType = ModuleState?.ModuleType;
+            }
+
+            if (!String.IsNullOrEmpty(ResourceKey) && !string.IsNullOrEmpty(ResourceType))
+            {
+                var moduleType = Type.GetType(ResourceType);
                 if (moduleType != null)
                 {
                     using (var scope = ServiceActivator.GetScope())

Oqtane.Client/Modules/Controls/Pager.razor

@@ -4,13 +4,13 @@
 
 @if (ItemList != null)
 {
-    @if (Toolbar == "Top" && _pages > 0 && Items.Count() > _maxItems)
+    @if ((Toolbar == "Top" || Toolbar == "Both") && _pages > 0 && Items.Count() > _maxItems)
     {
         <ul class="pagination justify-content-center my-2">
             <li class="page-item@((_page > 1) ? "" : " disabled")">
                 <a class="page-link" @onclick=@(async () => UpdateList(1))><span class="oi oi-media-step-backward" title="start" aria-hidden="true"></span></a>
             </li>
-            @if (_pages > _displayPages)
+            @if (_pages > _displayPages && _displayPages > 1)
             {
                 <li class="page-item@((_page > _displayPages) ? "" : " disabled")">
                     <a class="page-link" @onclick=@(async () => SkipPages("back"))><span class="oi oi-media-skip-backward" title="skip back" aria-hidden="true"></span></a>
@@ -38,7 +38,7 @@
             <li class="page-item@((_page < _pages) ? "" : " disabled")">
                 <a class="page-link" @onclick=@(async () => NavigateToPage("next"))><span class="oi oi-chevron-right" title="next" aria-hidden="true"></span></a>
             </li>
-            @if (_pages > _displayPages)
+            @if (_pages > _displayPages && _displayPages > 1)
             {
                 <li class="page-item@((_endPage < _pages) ? "" : " disabled")">
                     <a class="page-link" @onclick=@(async () => SkipPages("forward"))><span class="oi oi-media-skip-forward" title="skip forward" aria-hidden="true"></span></a>
@@ -48,67 +48,78 @@
                 <a class="page-link" @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">Page @_page of @_pages</a>
+                <a class="page-link" style="white-space: nowrap;">Page @_page of @_pages</a>
             </li>
         </ul>
     }
     @if (Format == "Table" && Row != null)
     {
-        <table class="@Class">
+		<div class="table-responsive">
-            <thead>
+			<table class="@Class">
-                <tr>@Header</tr>
+				<thead>
-            </thead>
+					<tr class="@RowClass">@Header</tr>
-            <tbody>
+				</thead>
-                @foreach (var item in ItemList)
+				<tbody>
-                {
+					@foreach (var item in ItemList)
-                    <tr>@Row(item)</tr>
+					{
-                    @if (Detail != null)
+						<tr class="@RowClass">@Row(item)</tr>
-                    {
+						@if (Detail != null)
-                        <tr>@Detail(item)</tr>
+						{
-                    }
+							<tr>@Detail(item)</tr>
-                }
+						}
-            </tbody>
+					}
-        </table>
+				</tbody>
+			</table>
+		</div>
     }
     @if (Format == "Grid" && Row != null)
     {
         int count = 0;
-        if (ItemList != null)
+		int rows = 0;
+		int cols = 0;
+		if (ItemList != null)
         {
-            count = (int)Math.Ceiling(ItemList.Count() / (decimal)_columns) * _columns;
+			if (_columns == 0)
+			{
+				count = ItemList.Count();
+				rows = 1;
+				cols = count;
+			}
+			else
+			{
+				count = (int)Math.Ceiling(ItemList.Count() / (decimal)_columns) * _columns;
+				rows = count / _columns;
+				cols = _columns;
+			}
         }
         <div class="@Class">
-            @if (Header != null)
+            @for (int row = 0; row < rows; row++)
             {
-                <div class="row"><div class="col">@Header</div></div>
+                <div class="@RowClass">
-            }
+                    @for (int col = 0; col < cols; col++)
-            @for (int row = 0; row < (count / _columns); row++)
-            {
-                <div class="row">
-                    @for (int col = 0; col < _columns; col++)
                     {
                         int index = (row * _columns) + col;
                         if (index < ItemList.Count())
                         {
-                            <div class="col">@Row(ItemList.ElementAt(index))</div>
+                            <div class="@ColumnClass">@Row(ItemList.ElementAt(index))</div>
                         }
                         else
                         {
-                            <div class="col">&nbsp;</div>
+                            <div>&nbsp;</div>
                         }
                     }
                 </div>
             }
         </div>
     }
-    @if (Toolbar == "Bottom" && _pages > 0 && Items.Count() > _maxItems)
+    @if ((Toolbar == "Bottom"  || Toolbar == "Both") && _pages > 0 && Items.Count() > _maxItems)
     {
         <ul class="pagination justify-content-center my-2">
             <li class="page-item@((_page > 1) ? "" : " disabled")">
                 <a class="page-link" @onclick=@(async () => UpdateList(1))><span class="oi oi-media-step-backward" title="start" aria-hidden="true"></span></a>
             </li>
-            @if (_pages > _displayPages)
+            @if (_pages > _displayPages && _displayPages > 1)
-            {
+             {
                 <li class="page-item@((_page > _displayPages) ? "" : " disabled")">
                     <a class="page-link" @onclick=@(async () => SkipPages("back"))><span class="oi oi-media-skip-backward" title="skip back" aria-hidden="true"></span></a>
                 </li>
@@ -135,7 +146,7 @@
             <li class="page-item@((_page < _pages) ? "" : " disabled")">
                 <a class="page-link" @onclick=@(async () => NavigateToPage("next"))><span class="oi oi-chevron-right" title="next" aria-hidden="true"></span></a>
             </li>
-            @if (_pages > _displayPages)
+            @if (_pages > _displayPages && _displayPages > 1)
             {
                 <li class="page-item@((_endPage < _pages) ? "" : " disabled")">
                     <a class="page-link" @onclick=@(async () => SkipPages("forward"))><span class="oi oi-media-skip-forward" title="skip forward" aria-hidden="true"></span></a>
@@ -145,7 +156,7 @@
                 <a class="page-link" @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">Page @_page of @_pages</a>
+               <a class="page-link" style="white-space: nowrap;">Page @_page of @_pages</a>
             </li>
         </ul>
     }
@@ -158,19 +169,19 @@
     private int _displayPages = 5;
     private int _startPage = 0;
     private int _endPage = 0;
-    private int _columns = 1;
+    private int _columns = 0;
 
     [Parameter]
     public string Format { get; set; } // Table or Grid
 
     [Parameter]
-    public string Toolbar { get; set; } // Top or Bottom
+    public string Toolbar { get; set; } // Top, Bottom or Both
 
     [Parameter]
-    public RenderFragment Header { get; set; } = null;
+    public RenderFragment Header { get; set; } = null; // only applicable to Table layouts
 
     [Parameter]
-    public RenderFragment<TableItem> Row { get; set; } = null;
+    public RenderFragment<TableItem> Row { get; set; } = null; // required
 
     [Parameter]
     public RenderFragment<TableItem> Detail { get; set; } = null; // only applicable to Table layouts
@@ -182,16 +193,25 @@
     public string PageSize { get; set; } // number of items to display on a page
 
     [Parameter]
-    public string Columns { get; set; } // only applicable to Grid layouts
+    public string Columns { get; set; } // only applicable to Grid layouts - default is zero indicating use responsive behavior
 
     [Parameter]
-    public string CurrentPage { get; set; } // optional property to set the initial page to display
+    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; }
+    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
 
     private IEnumerable<TableItem> ItemList { get; set; }
 
@@ -215,11 +235,35 @@
             }
             else
             {
-                Class = "container";
+                Class = "container-fluid";
             }
         }
 
-        if (!string.IsNullOrEmpty(PageSize))
+        if (string.IsNullOrEmpty(RowClass))
+        {
+            if (Format == "Table")
+            {
+                RowClass = "";
+            }
+            else
+            {
+                RowClass = "row";
+            }
+        }	
+		
+        if (string.IsNullOrEmpty(ColumnClass))
+        {
+            if (Format == "Table")
+            {
+                ColumnClass = "";
+            }
+            else
+            {
+                ColumnClass = "col";
+            }
+        }	
+		
+		if (!string.IsNullOrEmpty(PageSize))
         {
             _maxItems = int.Parse(PageSize);
         }
@@ -266,6 +310,7 @@
         {
             _endPage = _pages;
         }
+        OnPageChange?.Invoke(_page);
         StateHasChanged();
     }
 

Oqtane.Client/Modules/Controls/PermissionGrid.razor

@@ -100,160 +100,172 @@
 }
 
 @code {
-    private string _permissionnames = string.Empty;
+	private string _permissionnames = string.Empty;
-    private List<Role> _roles;
+	private List<Role> _roles;
-    private List<PermissionString> _permissions;
+	private List<PermissionString> _permissions;
-    private List<User> _users = new List<User>();
+	private List<User> _users = new List<User>();
-    private string _username = string.Empty;
+	private string _username = string.Empty;
-    private string _message = string.Empty;
+	private string _message = string.Empty;
 
-    [Parameter]
+	[Parameter]
-    public string EntityName { get; set; }
+	public string EntityName { get; set; }
 
-    [Parameter]
+	[Parameter]
-    public string PermissionNames { get; set; }
+	public string PermissionNames { get; set; }
 
-    [Parameter]
+	[Parameter]
-    public string Permissions { get; set; }
+	public string Permissions { get; set; }
 
-    protected override async Task OnInitializedAsync()
+	protected override async Task OnInitializedAsync()
-    {
+	{
-        if (string.IsNullOrEmpty(PermissionNames))
+		if (string.IsNullOrEmpty(PermissionNames))
-        {
+		{
-            _permissionnames = Shared.PermissionNames.View + "," + Shared.PermissionNames.Edit;
+			_permissionnames = Shared.PermissionNames.View + "," + Shared.PermissionNames.Edit;
-        }
+		}
-        else
+		else
-        {
+		{
-            _permissionnames = PermissionNames;
+			_permissionnames = PermissionNames;
-        }
+		}
 
-        _roles = await RoleService.GetRolesAsync(ModuleState.SiteId);
+		_roles = await RoleService.GetRolesAsync(ModuleState.SiteId);
-        _roles.Insert(0, new Role { Name = RoleNames.Everyone });
+		_roles.Insert(0, new Role { Name = RoleNames.Everyone });
+		if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+		{
+			_roles.Add(new Role { Name = RoleNames.Host });
+		}
 
-        _permissions = new List<PermissionString>();
+		_permissions = new List<PermissionString>();
 
-        foreach (string permissionname in _permissionnames.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+		foreach (string permissionname in _permissionnames.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
-        {
+		{
-            // initialize with admin role
+			// initialize with admin role
-            _permissions.Add(new PermissionString { PermissionName = permissionname, Permissions = RoleNames.Admin });
+			_permissions.Add(new PermissionString { PermissionName = permissionname, Permissions = RoleNames.Admin });
-        }
+		}
 
-        if (!string.IsNullOrEmpty(Permissions))
+		if (!string.IsNullOrEmpty(Permissions))
-        {
+		{
-            // populate permissions
+			// populate permissions
-            foreach (PermissionString permissionstring in UserSecurity.GetPermissionStrings(Permissions))
+			foreach (PermissionString permissionstring in UserSecurity.GetPermissionStrings(Permissions))
-            {
+			{
-                if (_permissions.Find(item => item.PermissionName == permissionstring.PermissionName) != null)
+				if (_permissions.Find(item => item.PermissionName == permissionstring.PermissionName) != null)
-                {
+				{
-                    _permissions[_permissions.FindIndex(item => item.PermissionName == permissionstring.PermissionName)].Permissions = permissionstring.Permissions;
+					_permissions[_permissions.FindIndex(item => item.PermissionName == permissionstring.PermissionName)].Permissions = permissionstring.Permissions;
-                }
+				}
 
-                if (permissionstring.Permissions.Contains("["))
+				if (permissionstring.Permissions.Contains("["))
-                {
+				{
-                    foreach (string user in permissionstring.Permissions.Split(new char[] { '[' }, StringSplitOptions.RemoveEmptyEntries))
+					foreach (string user in permissionstring.Permissions.Split(new char[] { '[' }, StringSplitOptions.RemoveEmptyEntries))
-                    {
+					{
-                        if (user.Contains("]"))
+						if (user.Contains("]"))
-                        {
+						{
-                            var userid = int.Parse(user.Substring(0, user.IndexOf("]")));
+							var userid = int.Parse(user.Substring(0, user.IndexOf("]")));
-                            if (_users.Where(item => item.UserId == userid).FirstOrDefault() == null)
+							if (_users.Where(item => item.UserId == userid).FirstOrDefault() == null)
-                            {
+							{
-                                _users.Add(await UserService.GetUserAsync(userid, ModuleState.SiteId));
+								_users.Add(await UserService.GetUserAsync(userid, ModuleState.SiteId));
-                            }
+							}
-                        }
+						}
-                    }
+					}
-                }
+				}
-            }
+			}
-        }
+		}
-    }
+	}
 
-    private bool? GetPermissionValue(string permissions, string securityKey)
+	private bool? GetPermissionValue(string permissions, string securityKey)
-    {
+	{
-        if ((";" + permissions + ";").Contains(";" + "!" + securityKey + ";"))
+		if ((";" + permissions + ";").Contains(";" + "!" + securityKey + ";"))
-        {
+		{
-            return false; // deny permission
+			return false; // deny permission
-        }
+		}
-        else
+		else
-        {
+		{
-            if ((";" + permissions + ";").Contains(";" + securityKey + ";"))
+			if ((";" + permissions + ";").Contains(";" + securityKey + ";"))
-            {
+			{
-                return true; // grant permission
+				return true; // grant permission
-            }
+			}
-            else
+			else
-            {
+			{
-                return null; // not specified
+				return null; // not specified
-            }
+			}
-        }
+		}
-    }
+	}
 
-    private bool GetPermissionDisabled(string roleName)
+	private bool GetPermissionDisabled(string roleName)
-        => roleName == RoleNames.Admin
+		=> (roleName == RoleNames.Admin && !UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)) ? true : false;
-            ? true
-            : false;
 
-    private async Task AddUser()
+	private async Task AddUser()
-    {
+	{
-        if (_users.Where(item => item.Username == _username).FirstOrDefault() == null)
+		if (_users.Where(item => item.Username == _username).FirstOrDefault() == null)
-        {
+		{
-            try
+			try
-            {
+			{
-                var user = await UserService.GetUserAsync(_username, ModuleState.SiteId);
+				var user = await UserService.GetUserAsync(_username, ModuleState.SiteId);
-                if (user != null)
+				if (user != null)
-                {
+				{
-                    _users.Add(user);
+					_users.Add(user);
-                }
+				}
-            }
+			}
-            catch
+			catch
-            {
+			{
-                _message = Localizer["Message.Username.DontExist"];
+				_message = Localizer["Message.Username.DontExist"];
-            }
+			}
-        }
+		}
 
-        _username = string.Empty;
+		_username = string.Empty;
-    }
+	}
 
-    private void PermissionChanged(bool? value, string permissionName, string securityId)
+	private void PermissionChanged(bool? value, string permissionName, string securityId)
-    {
+	{
-        var selected = value;
+		var selected = value;
-        var permission = _permissions.Find(item => item.PermissionName == permissionName);
+		var permission = _permissions.Find(item => item.PermissionName == permissionName);
-        if (permission != null)
+		if (permission != null)
-        {
+		{
-            var ids = permission.Permissions.Split(';').ToList();
+			var ids = permission.Permissions.Split(';').ToList();
 
-            ids.Remove(securityId); // remove grant permission
+			ids.Remove(securityId); // remove grant permission
-            ids.Remove("!" + securityId); // remove deny permission
+			ids.Remove("!" + securityId); // remove deny permission
 
-            switch (selected)
+			switch (selected)
-            {
+			{
-                case true:
+				case true:
-                    ids.Add(securityId); // add grant permission
+					ids.Add(securityId); // add grant permission
-                    break;
+					break;
-                case false:
+				case false:
-                    ids.Add("!" + securityId); // add deny permission
+					ids.Add("!" + securityId); // add deny permission
-                    break;
+					break;
-                case null:
+				case null:
-                    break; // permission not specified
+					break; // permission not specified
-            }
+			}
 
-            _permissions[_permissions.FindIndex(item => item.PermissionName == permissionName)].Permissions = string.Join(";", ids.ToArray());
+			_permissions[_permissions.FindIndex(item => item.PermissionName == permissionName)].Permissions = string.Join(";", ids.ToArray());
-        }
+		}
-    }
+	}
 
-    public string GetPermissions()
+	public string GetPermissions()
-    {
+	{
-        ValidatePermissions();
+		ValidatePermissions();
-        return UserSecurity.SetPermissionStrings(_permissions);
+		return UserSecurity.SetPermissionStrings(_permissions);
-    }
+	}
 
-    private void ValidatePermissions()
+	private void ValidatePermissions()
-    {
+	{
-        PermissionString permission;
+		PermissionString permission;
-        for (int i = 0; i < _permissions.Count; i++)
+		for (int i = 0; i < _permissions.Count; i++)
-        {
+		{
-            permission = _permissions[i];
+			permission = _permissions[i];
-            List<string> ids = permission.Permissions.Split(';').ToList();
+			List<string> ids = permission.Permissions.Split(';', StringSplitOptions.RemoveEmptyEntries).ToList();
-            ids.Remove("!" + RoleNames.Everyone); // remove deny all users
+			ids.Remove("!" + RoleNames.Everyone); // remove deny all users
-            ids.Remove("!" + RoleNames.Registered); // remove deny registered users
+			ids.Remove("!" + RoleNames.Registered); // remove deny registered users
-            permission.Permissions = string.Join(";", ids.ToArray());
+			if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+			{
+				ids.Remove("!" + RoleNames.Admin); // remove deny administrators
+				ids.Remove("!" + RoleNames.Host); // remove deny host users
+				if (!ids.Contains(RoleNames.Host) && !ids.Contains(RoleNames.Admin))
+				{
+					// add administrators role if host user role is not assigned
+					ids.Add(RoleNames.Admin);				
+				}
+			}
+			permission.Permissions = string.Join(";", ids.ToArray());
             _permissions[i] = permission;
         }
     }

Oqtane.Client/Modules/Controls/RichTextEditor.razor

@@ -71,11 +71,11 @@
                 </div>
                 @if (ReadOnly)
                 {
-                    <textarea class="form-control" placeholder="@Placeholder" @bind="@_content" rows="10" readonly></textarea>
+                    <textarea class="form-control" placeholder="@Placeholder" @bind="@_rawhtml" rows="10" readonly></textarea>
                 }
                 else
                 {
-                    <textarea class="form-control" placeholder="@Placeholder" @bind="@_content" rows="10"></textarea>
+                    <textarea class="form-control" placeholder="@Placeholder" @bind="@_rawhtml" rows="10"></textarea>
                 }
             </TabPanel>
         </TabStrip>
@@ -83,109 +83,121 @@
 </div>
 
 @code {
-    private ElementReference _editorElement;
+	private ElementReference _editorElement;
-    private ElementReference _toolBar;
+	private ElementReference _toolBar;
-    private bool _filemanagervisible = false;
+	private bool _filemanagervisible = false;
-    private FileManager _fileManager;
+	private FileManager _fileManager;
-    private string _content = string.Empty;
+	private string _richhtml = string.Empty;
-    private string _original = string.Empty;
+	private string _originalrichhtml = string.Empty;
-    private string _message = string.Empty;
+	private string _rawhtml = string.Empty;
+	private string _originalrawhtml = string.Empty;
+	private string _message = string.Empty;
 
-    [Parameter]
+	[Parameter]
-    public string Content { get; set; }
+	public string Content { get; set; }
 
-    [Parameter]
+	[Parameter]
-    public bool ReadOnly { get; set; } = false;
+	public bool ReadOnly { get; set; } = false;
 
-    [Parameter]
+	[Parameter]
-    public string Placeholder { get; set; } = "Enter Your Content...";
+	public string Placeholder { get; set; } = "Enter Your Content...";
 
-    // parameters only applicable to rich text editor
+	// parameters only applicable to rich text editor
-    [Parameter]
+	[Parameter]
-    public RenderFragment ToolbarContent { get; set; }
+	public RenderFragment ToolbarContent { get; set; }
 
-    [Parameter]
+	[Parameter]
-    public string Theme { get; set; } = "snow";
+	public string Theme { get; set; } = "snow";
 
-    [Parameter]
+	[Parameter]
-    public string DebugLevel { get; set; } = "info";
+	public string DebugLevel { get; set; } = "info";
 
-    [Parameter]
+	[Parameter]
-    public bool AllowFileManagement { get; set; } = true;
+	public bool AllowFileManagement { get; set; } = true;
 
-    public override List<Resource> Resources => new List<Resource>()
+	public override List<Resource> Resources => new List<Resource>()
     {
-        new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill1.3.6.min.js" },
+        new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill.min.js" },
         new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill-blot-formatter.min.js" },
         new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill-interop.js" }
     };
 
-    protected override void OnInitialized()
+	protected override void OnParametersSet()
-    {
+	{
-        _content = Content; // raw HTML
+		_richhtml = Content;
-    }
+		_rawhtml = Content;
+		_originalrawhtml = _rawhtml; // preserve for comparison later
+	}
 
-    protected override async Task OnAfterRenderAsync(bool firstRender)
+	protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
+	{
-        if (firstRender)
+		await base.OnAfterRenderAsync(firstRender);
-        {
-            await base.OnAfterRenderAsync(firstRender);
 
-            var interop = new RichTextEditorInterop(JSRuntime);
+		var interop = new RichTextEditorInterop(JSRuntime);
 
-            await interop.CreateEditor(
+		if (firstRender)
-                _editorElement,
+		{
-                _toolBar,
+			await interop.CreateEditor(
-                ReadOnly,
+				_editorElement,
-                Placeholder,
+				_toolBar,
-                Theme,
+				ReadOnly,
-                DebugLevel);
+				Placeholder,
+				Theme,
+				DebugLevel);
 
-            await interop.LoadEditorContent(_editorElement, Content);
+			await interop.LoadEditorContent(_editorElement, _richhtml);
 
-            _content = Content; // raw HTML
+			// preserve a copy of the rich text content (Quill sanitizes content so we need to retrieve it from the editor)
+			_originalrichhtml = await interop.GetHtml(_editorElement);
+		}
+		else
+		{
+			await interop.LoadEditorContent(_editorElement, _richhtml);	
+		}
+	}
 
-            // preserve a copy of the rich text content ( Quill sanitizes content so we need to retrieve it from the editor )
+	public void CloseFileManager()
-            _original = await interop.GetHtml(_editorElement);
+	{
-        }
+		_filemanagervisible = false;
-    }
+		_message = string.Empty;
+		StateHasChanged();
+	}
 
-    public void CloseFileManager()
+	public void RefreshRichText()
-    {
+	{
-        _filemanagervisible = false;
+		_richhtml = _rawhtml;
-        _message = string.Empty;
+		StateHasChanged();
-        StateHasChanged();
+	}
-    }
 
-    public async Task RefreshRichText()
+	public async Task RefreshRawHtml()
-    {
+	{
-        var interop = new RichTextEditorInterop(JSRuntime);
+		var interop = new RichTextEditorInterop(JSRuntime);
-        await interop.LoadEditorContent(_editorElement, _content);
+		_rawhtml = await interop.GetHtml(_editorElement);
-    }
+		StateHasChanged();
+	}
 
-    public async Task RefreshRawHtml()
+	public async Task<string> GetHtml()
-    {
+	{
-        var interop = new RichTextEditorInterop(JSRuntime);
+		// evaluate raw html content as first priority
-        _content = await interop.GetHtml(_editorElement);
+		if (_rawhtml != _originalrawhtml)
-        StateHasChanged();
+		{
-    }
+			return _rawhtml;
-
+		}
-    public async Task<string> GetHtml()
+		else
-    {
+		{
-        // get rich text content
+			// return rich text content if it has changed
-        var interop = new RichTextEditorInterop(JSRuntime);
+			var interop = new RichTextEditorInterop(JSRuntime);
-        string content = await interop.GetHtml(_editorElement);
+			var richhtml = await interop.GetHtml(_editorElement);
-
+			if (richhtml != _originalrichhtml)
-        if (_original != content)
+			{
-        {
+				return richhtml;
-            // rich text content has changed - return it
+			}
-            return content;
+			else
-        }
+			{
-        else
+				// return original raw html content
-        {
+				return _originalrawhtml;
-            // return raw html content
+			}
-            return _content;
+		}
-        }
     }
 
     public async Task InsertImage()
@@ -211,23 +223,4 @@
         }
         StateHasChanged();
     }
-
-    // other rich text editor methods which can be used by developers
-    public async Task<string> GetText()
-    {
-        var interop = new RichTextEditorInterop(JSRuntime);
-        return await interop.GetText(_editorElement);
-    }
-
-    public async Task<string> GetContent()
-    {
-        var interop = new RichTextEditorInterop(JSRuntime);
-        return await interop.GetContent(_editorElement);
-    }
-
-    public async Task EnableEditor(bool mode)
-    {
-        var interop = new RichTextEditorInterop(JSRuntime);
-        await interop.EnableEditor(_editorElement, mode);
-    }
 }

Oqtane.Client/Modules/Controls/TabPanel.razor

@@ -38,7 +38,7 @@ else
 
         if (string.IsNullOrEmpty(Heading))
         {
-            Name = Localize(nameof(Name), Name);
+            Heading = Localize(nameof(Name), Name);
         }
         else
         {

Oqtane.Client/Modules/Controls/TabStrip.razor

@@ -43,16 +43,12 @@
     [Parameter]
     public bool Refresh { get; set; } // optional - used in scenarios where TabPanels are added/removed dynamically within a parent form. ActiveTab may need to be reset as well when this property is used.
 
-    protected override void OnInitialized()
+    protected override void OnParametersSet()
     {
         if (PageState.QueryString.ContainsKey("tab"))
         {
             ActiveTab = PageState.QueryString["tab"];
         }
-    }
-
-    protected override void OnParametersSet()
-    {
         if (_tabPanels == null || Refresh)
         {
             _tabPanels = new List<TabPanel>();

Oqtane.Client/Modules/HtmlText/Edit.razor

@@ -9,95 +9,186 @@
 @inject IStringLocalizer<Edit> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (_content != null)
+<TabStrip>
-{
+    <TabPanel Name="Edit" Heading="Edit" ResourceKey="Edit">
-    <RichTextEditor Content="@_content" AllowFileManagement="@_allowfilemanagement" @ref="@RichTextEditorHtml"></RichTextEditor>
+		@if (_content != null)
-    <button type="button" class="btn btn-success" @onclick="SaveContent">@SharedLocalizer["Save"]</button>
+		{
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+			<RichTextEditor Content="@_content" AllowFileManagement="@_allowfilemanagement" @ref="@RichTextEditorHtml"></RichTextEditor>
-    @if (!string.IsNullOrEmpty(_content))
+			<br />
-    {
+			<button type="button" class="btn btn-success" @onclick="SaveContent">@SharedLocalizer["Save"]</button>
-        <br />
+			<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
-        <br />
+			@if (!string.IsNullOrEmpty(_content))
-        <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
+			{
-    }
+				<br />
-}
+				<br />
+				<AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
+			}
+		}
+	</TabPanel>
+    <TabPanel Name="Versions" Heading="Versions" ResourceKey="Versions">
+		<Pager Items="@_htmltexts">
+			<Header>
+				<th style="width: 1px;">&nbsp;</th>
+				<th style="width: 1px;">&nbsp;</th>
+				<th style="width: 1px;">&nbsp;</th>
+				<th>@SharedLocalizer["CreatedOn"]</th>
+				<th>@SharedLocalizer["CreatedBy"]</th>
+			</Header>
+			<Row>
+				<td><ActionLink Action="View" Security="SecurityAccessLevel.Edit" OnClick="@(async () => await View(context))" ResourceKey="View" /></td>
+				<td><ActionDialog Header="Restore Version" Message="@string.Format(Localizer["Confirm.Restore"], context.CreatedOn)" Action="Restore" Security="SecurityAccessLevel.Edit" Class="btn btn-success" OnClick="@(async () => await Restore(context))" ResourceKey="Restore" /></td>
+				<td><ActionDialog Header="Delete Version" Message="@string.Format(Localizer["Confirm.Delete"], context.CreatedOn)" Action="Delete" Security="SecurityAccessLevel.Edit" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" ResourceKey="Delete" /></td>
+				<td>@context.CreatedOn</td>
+				<td>@context.CreatedBy</td>
+			</Row>
+		</Pager>
+		@((MarkupString)_view)
+	</TabPanel>
+</TabStrip>
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
 
-    public override string Title => "Edit Html/Text";
+	public override string Title => "Edit Html/Text";
 
-    public override List<Resource> Resources => new List<Resource>()
+	public override List<Resource> Resources => new List<Resource>()
-{
+	{
         new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" },
-        new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill1.3.6.bubble.css" },
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill.bubble.css" },
-        new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill1.3.6.snow.css" }
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill.snow.css" }
     };
 
-    private RichTextEditor RichTextEditorHtml;
+	private RichTextEditor RichTextEditorHtml;
-    private bool _allowfilemanagement;
+	private bool _allowfilemanagement;
-    private string _content = null;
+	private string _content = null;
-    private string _createdby;
+	private string _createdby;
-    private DateTime _createdon;
+	private DateTime _createdon;
-    private string _modifiedby;
+	private string _modifiedby;
-    private DateTime _modifiedon;
+	private DateTime _modifiedon;
+	private List<Models.HtmlText> _htmltexts;
+	private string _view = "";
 
-    protected override async Task OnInitializedAsync()
+	protected override async Task OnInitializedAsync()
-    {
+	{
-        try
+		try
-        {
+		{
-            _allowfilemanagement = bool.Parse(SettingService.GetSetting(ModuleState.Settings, "AllowFileManagement", "true"));
+			_allowfilemanagement = bool.Parse(SettingService.GetSetting(ModuleState.Settings, "AllowFileManagement", "true"));
+			await LoadContent();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Content {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.Content.Load"], MessageType.Error);
+		}
+	}
 
-            var htmltext = await HtmlTextService.GetHtmlTextAsync(ModuleState.ModuleId);
+	private async Task LoadContent()
-            if (htmltext != null)
+	{
-            {
+		var htmltext = await HtmlTextService.GetHtmlTextAsync(ModuleState.ModuleId);
-                _content = htmltext.Content;
+		if (htmltext != null)
-                _content = Utilities.FormatContent(_content, PageState.Alias, "render");
+		{
-                _createdby = htmltext.CreatedBy;
+			_content = htmltext.Content;
-                _createdon = htmltext.CreatedOn;
+			_content = Utilities.FormatContent(_content, PageState.Alias, "render");
-                _modifiedby = htmltext.ModifiedBy;
+			_createdby = htmltext.CreatedBy;
-                _modifiedon = htmltext.ModifiedOn;
+			_createdon = htmltext.CreatedOn;
-            }
+			_modifiedby = htmltext.ModifiedBy;
-            else
+			_modifiedon = htmltext.ModifiedOn;
-            {
+		}
-                _content = string.Empty;
+		else
-            }
+		{
-        }
+			_content = string.Empty;
-        catch (Exception ex)
+		}
-        {
-            await logger.LogError(ex, "An Error Occurred Loading Html/Text Content. " + ex.Message);
-            AddModuleMessage(ex.Message, MessageType.Error);
-        }
-    }
 
-    private async Task SaveContent()
+		_htmltexts = await HtmlTextService.GetHtmlTextsAsync(ModuleState.ModuleId);
-    {
+		_htmltexts = _htmltexts.OrderByDescending(item => item.CreatedOn).ToList();
-        string content = await RichTextEditorHtml.GetHtml();
-        content = Utilities.FormatContent(content, PageState.Alias, "save");
 
-        try
+		_view = "";
-        {
+	}
-            var htmltext = await HtmlTextService.GetHtmlTextAsync(ModuleState.ModuleId);
-            if (htmltext != null)
-            {
-                htmltext.Content = content;
-                await HtmlTextService.UpdateHtmlTextAsync(htmltext);
-            }
-            else
-            {
-                htmltext = new HtmlText();
-                htmltext.ModuleId = ModuleState.ModuleId;
-                htmltext.Content = content;
-                await HtmlTextService.AddHtmlTextAsync(htmltext);
-            }
 
-            await logger.LogInformation("Html/Text Content Saved {HtmlText}", htmltext);
+	private async Task SaveContent()
-            NavigationManager.NavigateTo(NavigateUrl());
+	{
-        }
+		string content = await RichTextEditorHtml.GetHtml();
-        catch (Exception ex)
+		content = Utilities.FormatContent(content, PageState.Alias, "save");
-        {
+
-            await logger.LogError(ex, "Error Saving Content {Error}", ex.Message);
+		try
-            AddModuleMessage(Localizer["Error.Content.Save"], MessageType.Error);
+		{
-        }
+			var htmltext = new HtmlText();
-    }
+			htmltext.ModuleId = ModuleState.ModuleId;
+			htmltext.Content = content;
+			await HtmlTextService.AddHtmlTextAsync(htmltext);
+
+			await logger.LogInformation("Content Saved {HtmlText}", htmltext);
+			NavigationManager.NavigateTo(NavigateUrl());
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Saving Content {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.Content.Save"], MessageType.Error);
+		}
+	}
+
+	private async Task View(Models.HtmlText htmltext)
+	{
+		try
+		{
+			htmltext = await HtmlTextService.GetHtmlTextAsync(htmltext.HtmlTextId, htmltext.ModuleId);
+			if (htmltext != null)
+			{
+				_view = htmltext.Content;
+				_view = Utilities.FormatContent(_view, PageState.Alias, "render");
+				StateHasChanged();
+			}		
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Viewing Content {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.Content.View"], MessageType.Error);
+		}
+	}
+
+	private async Task Restore(Models.HtmlText htmltext)
+	{
+		try
+		{
+			htmltext = await HtmlTextService.GetHtmlTextAsync(htmltext.HtmlTextId, ModuleState.ModuleId);
+			if (htmltext != null)
+			{
+				var content = htmltext.Content;
+				htmltext = new HtmlText();
+				htmltext.ModuleId = ModuleState.ModuleId;
+				htmltext.Content = content;
+				await HtmlTextService.AddHtmlTextAsync(htmltext);
+				await logger.LogInformation("Content Restored {HtmlText}", htmltext);
+				AddModuleMessage(Localizer["Message.Content.Restored"], MessageType.Success);
+				await LoadContent();
+				StateHasChanged();
+			}				
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Restoring Content {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.Content.Restore"], MessageType.Error);
+		}
+	}
+
+	private async Task Delete(Models.HtmlText htmltext)
+	{
+		try
+		{
+			htmltext = await HtmlTextService.GetHtmlTextAsync(htmltext.HtmlTextId, ModuleState.ModuleId);
+			if (htmltext != null)
+			{
+				await HtmlTextService.DeleteHtmlTextAsync(htmltext.HtmlTextId, htmltext.ModuleId);
+				await logger.LogInformation("Content Deleted {HtmlText}", htmltext);
+				AddModuleMessage(Localizer["Message.Content.Deleted"], MessageType.Success);
+				await LoadContent();
+				StateHasChanged();
+			}		
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Deleting Content {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.Content.Delete"], MessageType.Error);
+		}
+	}
 }

Oqtane.Client/Modules/HtmlText/Index.razor

@@ -15,16 +15,16 @@
 }
 
 @code {
-    public override List<Resource> Resources => new List<Resource>()
+	public override List<Resource> Resources => new List<Resource>()
     {
         new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" }
     };
 
-    private string content = "";
+	private string content = "";
 
-    protected override async Task OnParametersSetAsync()
+	protected override async Task OnParametersSetAsync()
-    {
+	{
-        try
+		try
         {
             var htmltext = await HtmlTextService.GetHtmlTextAsync(ModuleState.ModuleId);
             if (htmltext != null)
@@ -35,8 +35,8 @@
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "An Error Occurred Loading Html/Text Content. " + ex.Message);
+			await logger.LogError(ex, "Error Loading Content {Error}", ex.Message);
-            AddModuleMessage(ex.Message, MessageType.Error);
+            AddModuleMessage(Localizer["Error.Content.Load"], MessageType.Error);
         }
     }
 }

Oqtane.Client/Modules/HtmlText/ModuleInfo.cs

@@ -1,7 +1,9 @@
+using Oqtane.Documentation;
 using Oqtane.Models;
 
 namespace Oqtane.Modules.HtmlText
 {
+    [PrivateApi("Mark HtmlText classes as private, since it's not very useful in the public docs")]
     public class ModuleInfo : IModule
     {
         public ModuleDefinition ModuleDefinition => new ModuleDefinition

Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs

@@ -1,34 +1,43 @@
+using System.Collections.Generic;
+using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
+using Oqtane.Documentation;
 using Oqtane.Services;
 using Oqtane.Shared;
 
 namespace Oqtane.Modules.HtmlText.Services
 {
+    [PrivateApi("Mark HtmlText classes as private, since it's not very useful in the public docs")]
     public class HtmlTextService : ServiceBase, IHtmlTextService, IService
     {        
         public HtmlTextService(HttpClient http, SiteState siteState) : base(http, siteState) {}
 
         private string ApiUrl => CreateApiUrl("HtmlText");
 
+        public async Task<List<Models.HtmlText>> GetHtmlTextsAsync(int moduleId)
+        {
+            return await GetJsonAsync<List<Models.HtmlText>>(CreateAuthorizationPolicyUrl($"{ApiUrl}?moduleid={moduleId}", EntityNames.Module, moduleId));
+        }
+
         public async Task<Models.HtmlText> GetHtmlTextAsync(int moduleId)
         {
             return await GetJsonAsync<Models.HtmlText>(CreateAuthorizationPolicyUrl($"{ApiUrl}/{moduleId}", EntityNames.Module, moduleId));
         }
 
+        public async Task<Models.HtmlText> GetHtmlTextAsync(int htmlTextId, int moduleId)
+        {
+            return await GetJsonAsync<Models.HtmlText>(CreateAuthorizationPolicyUrl($"{ApiUrl}/{htmlTextId}/{moduleId}", EntityNames.Module, moduleId));
+        }
+
         public async Task AddHtmlTextAsync(Models.HtmlText htmlText)
         {
             await PostJsonAsync(CreateAuthorizationPolicyUrl($"{ApiUrl}", EntityNames.Module, htmlText.ModuleId), htmlText);
         }
 
-        public async Task UpdateHtmlTextAsync(Models.HtmlText htmlText)
+        public async Task DeleteHtmlTextAsync(int htmlTextId, int moduleId)
         {
-            await PutJsonAsync(CreateAuthorizationPolicyUrl($"{ApiUrl}/{htmlText.HtmlTextId}", EntityNames.Module, htmlText.ModuleId), htmlText);
+            await DeleteAsync(CreateAuthorizationPolicyUrl($"{ApiUrl}/{htmlTextId}/{moduleId}", EntityNames.Module, moduleId));
-        }
-
-        public async Task DeleteHtmlTextAsync(int moduleId)
-        {
-            await DeleteAsync(CreateAuthorizationPolicyUrl($"{ApiUrl}/{moduleId}", EntityNames.Module, moduleId));
         }
     }
 }

Oqtane.Client/Modules/HtmlText/Services/IHtmlTextService.cs

@@ -1,17 +1,20 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using Oqtane.Modules.HtmlText.Models;
+using Oqtane.Documentation;
 
 namespace Oqtane.Modules.HtmlText.Services
 {
+    [PrivateApi("Mark HtmlText classes as private, since it's not very useful in the public docs")]
     public interface IHtmlTextService 
     {
-        Task<Models.HtmlText> GetHtmlTextAsync(int ModuleId);
+        Task<List<Models.HtmlText>> GetHtmlTextsAsync(int moduleId);
+
+        Task<Models.HtmlText> GetHtmlTextAsync(int moduleId);
+
+        Task<Models.HtmlText> GetHtmlTextAsync(int htmlTextId, int moduleId);
 
         Task AddHtmlTextAsync(Models.HtmlText htmltext);
 
-        Task UpdateHtmlTextAsync(Models.HtmlText htmltext);
+        Task DeleteHtmlTextAsync(int htmlTextId, int moduleId);
-
-        Task DeleteHtmlTextAsync(int ModuleId);
     }
 }

Oqtane.Client/Modules/HtmlText/Settings.razor

@@ -5,44 +5,45 @@
 @inject IStringLocalizer<Settings> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-    <div class="container">
+<div class="container">
-        <div class="row mb-1 align-items-center">
+    <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="files" ResourceKey="Allow File Management" HelpText="Specify If Editors Can Upload and Select Files">Allow File Management: </Label>
+        <Label Class="col-sm-3" For="files" ResourceKey="AllowFileManagement" ResourceType="@resourceType" HelpText="Specify If Editors Can Upload and Select Files">Allow File Management: </Label>
-            <div class="col-sm-9">
+        <div class="col-sm-9">
-                <select id="files" class="form-select" @bind="@_allowfilemanagement">
+            <select id="files" class="form-select" @bind="@_allowfilemanagement">
-                    <option value="true">@SharedLocalizer["Yes"]</option>
+                <option value="true">@SharedLocalizer["Yes"]</option>
-                    <option value="false">@SharedLocalizer["No"]</option>
+                <option value="false">@SharedLocalizer["No"]</option>
-                </select>
+            </select>
-            </div>
         </div>
     </div>
+</div>
 
-    @code {
+@code {		
-        private string _allowfilemanagement;
+	private string resourceType = "Oqtane.Modules.HtmlText.Settings, Oqtane.Client"; // for localization
+    private string _allowfilemanagement;
 
-        protected override void OnInitialized()
+    protected override void OnInitialized()
+    {
+        try
         {
-            try
+            _allowfilemanagement = SettingService.GetSetting(ModuleState.Settings, "AllowFileManagement", "true");
-            {
-                _allowfilemanagement = SettingService.GetSetting(ModuleState.Settings, "AllowFileManagement", "true");
-            }
-            catch (Exception ex)
-            {
-                ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
-            }
         }
-
+        catch (Exception ex)
-        public async Task UpdateSettings()
         {
-            try
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
-            {
-                var settings = ModuleState.Settings;
-                settings = SettingService.SetSetting(settings, "AllowFileManagement", _allowfilemanagement);
-                await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
-            }
-            catch (Exception ex)
-            {
-                ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
-            }
         }
     }
+
+    public async Task UpdateSettings()
+    {
+        try
+        {
+			var settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
+            settings = SettingService.SetSetting(settings, "AllowFileManagement", _allowfilemanagement);
+            await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
+        }
+        catch (Exception ex)
+        {
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
+        }
+    }
+}

Oqtane.Client/Modules/ModuleBase.cs

@@ -30,8 +30,8 @@ namespace Oqtane.Modules
         [CascadingParameter]
         protected Module ModuleState { get; set; }
 
-        [CascadingParameter]
+        [Parameter]
-        protected ModuleInstance ModuleInstance { get; set; }
+        public ModuleInstance ModuleInstance { get; set; }
 
         // optional interface properties
         public virtual SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.View; } set { } } // default security
@@ -53,9 +53,9 @@ namespace Oqtane.Modules
                 if (Resources != null && Resources.Exists(item => item.ResourceType == ResourceType.Script))
                 {
                     var scripts = new List<object>();
-                    foreach (Resource resource in Resources.Where(item => item.ResourceType == ResourceType.Script && item.Declaration != ResourceDeclaration.Global))
+                    foreach (Resource resource in Resources.Where(item => item.ResourceType == ResourceType.Script))
                     {
-                        scripts.Add(new { href = resource.Url, bundle = resource.Bundle ?? "", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "" });
+                        scripts.Add(new { href = resource.Url, bundle = resource.Bundle ?? "", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", es6module = resource.ES6Module });
                     }
                     if (scripts.Any())
                     {
@@ -134,9 +134,19 @@ namespace Oqtane.Modules
             return Utilities.ContentUrl(PageState.Alias, fileid, asAttachment);
         }
 
+        public string ImageUrl(int fileid, int width, int height)
+        {
+            return ImageUrl(fileid, width, height, "");
+        }
+
         public string ImageUrl(int fileid, int width, int height, string mode)
         {
-            return Utilities.ImageUrl(PageState.Alias, fileid, width, height, mode);
+            return ImageUrl(fileid, width, height, mode, "", "", 0, false);
+        }
+
+        public string ImageUrl(int fileid, int width, int height, string mode, string position, string background, int rotate, bool recreate)
+        {
+            return Utilities.ImageUrl(PageState.Alias, fileid, width, height, mode, position, background, rotate, recreate);
         }
 
         public virtual Dictionary<string, string> GetUrlParameters(string parametersTemplate = "")

Oqtane.Client/Oqtane.Client.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <RazorLangVersion>3.0</RazorLangVersion>
     <Configurations>Debug;Release</Configurations>
-    <Version>2.3.1</Version>
+    <Version>3.1.2</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -13,7 +13,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.3.1</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.1.2</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane</RootNamespace>
@@ -22,23 +22,19 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.4" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.3" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="5.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.Localization" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="5.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
-    <PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="6.0.3" />
+    <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Oqtane.Shared\Oqtane.Shared.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Resources\" />
-    <Folder Include="Resources\Themes\Controls\Theme\" />
-  </ItemGroup>
-
   <ItemGroup>
     <TrimmerRootAssembly Include="System.Runtime" />
     <TrimmerRootAssembly Include="System.Linq.Parallel" />

Oqtane.Client/Program.cs

@@ -12,6 +12,7 @@ using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.AspNetCore.Localization;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.JSInterop;
+using Oqtane.Documentation;
 using Oqtane.Modules;
 using Oqtane.Services;
 using Oqtane.Shared;
@@ -19,16 +20,17 @@ using Oqtane.UI;
 
 namespace Oqtane.Client
 {
+    [PrivateApi("Mark Entry-Program as private, since it's not very useful in the public docs")]
     public class Program
     {
         public static async Task Main(string[] args)
         {
             var builder = WebAssemblyHostBuilder.CreateDefault(args);
-            builder.RootComponents.Add<App>("app");
 
             var httpClient = new HttpClient {BaseAddress = new Uri(builder.HostEnvironment.BaseAddress)};
-
             builder.Services.AddSingleton(httpClient);            
+            builder.Services.AddHttpClient(); // IHttpClientFactory for calling remote services via RemoteServiceBase
+
             builder.Services.AddOptions();
 
             // Register localization services

Oqtane.Client/Resources/Installer/Controls/SqlServerConfig.resx

@@ -153,4 +153,22 @@
   <data name="Integrated" xml:space="preserve">
     <value>Integrated</value>
   </data>
+  <data name="Encryption,Text" xml:space="preserve">
+    <value>Encryption:</value>
+  </data>
+  <data name="Encryption.HelpText" xml:space="preserve">
+    <value>Specify if you are using an encrypted database connection. It is highly recommended to use encryption in a production environment.</value>
+  </data>
+  <data name="Self Signed" xml:space="preserve">
+    <value>Self Signed</value>
+  </data>
+  <data name="TrustServerCertificate.HelpText" xml:space="preserve">
+    <value>Specify the type of certificate you are using for encryption</value>
+  </data>
+  <data name="TrustServerCertificate.Text" xml:space="preserve">
+    <value>Trust Server Certificate:</value>
+  </data>
+  <data name="Verifiable" xml:space="preserve">
+    <value>Verifiable</value>
+  </data>
 </root>

Oqtane.Client/Resources/Installer/Installer.resx

@@ -130,12 +130,15 @@
     <value>Install Now</value>
   </data>
   <data name="Error.DbConfig.Load" xml:space="preserve">
-    <value>Error loading Database Configuration Control</value>
+    <value>Error Loading Database Configuration Control</value>
   </data>
   <data name="Message.Require.DbInfo" xml:space="preserve">
-    <value>Please Enter All Required Fields. Ensure Passwords Match And Are Greater Than 5 Characters In Length. Ensure Email Address Provided Is Valid.</value>
+    <value>Please Enter All Required Fields. Ensure Passwords Match And Email Address Provided Is Valid.</value>
   </data>
-  <data name="Register" xml:space="preserve">
+    <data name="Message.Password.Invalid" xml:space="preserve">
+    <value>The Password Provided Does Not Meet The Password Policy. Please Verify The Minimum Password Length And Complexity Requirements.</value>
+  </data>
+    <data name="Register" xml:space="preserve">
     <value>Please Register Me For Major Product Updates And Security Bulletins</value>
   </data>
   <data name="Confirm.HelpText" xml:space="preserve">

Oqtane.Client/Resources/Modules/Admin/Files/Index.resx

@@ -159,4 +159,10 @@
   <data name="Type" xml:space="preserve">
     <value>Type</value>
   </data>
+  <data name="DeleteFile.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="UploadFiles.Text" xml:space="preserve">
+    <value>Upload Files</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Jobs/Edit.resx

@@ -186,4 +186,10 @@
   <data name="NextExecution.Text" xml:space="preserve">
     <value>Next Execution: </value>
   </data>
+  <data name="Week(s)" xml:space="preserve">
+    <value>Week(s)</value>
+  </data>
+  <data name="Once" xml:space="preserve">
+    <value>Execute Once</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Jobs/Index.resx

@@ -133,19 +133,16 @@
     <value>Every</value>
   </data>
   <data name="Minute" xml:space="preserve">
-    <value>Minute</value>
+    <value>Minute(s)</value>
   </data>
   <data name="Hour" xml:space="preserve">
-    <value>Hour</value>
+    <value>Hour(s)</value>
   </data>
   <data name="Day" xml:space="preserve">
-    <value>Day</value>
+    <value>Day(s)</value>
   </data>
   <data name="Month" xml:space="preserve">
-    <value>Month</value>
+    <value>Month(s)</value>
-  </data>
-  <data name="s" xml:space="preserve">
-    <value>s</value>
   </data>
   <data name="Error.Job.Delete" xml:space="preserve">
     <value>Error Deleting Job</value>
@@ -168,4 +165,31 @@
   <data name="Stop" xml:space="preserve">
     <value>Stop</value>
   </data>
+  <data name="DeleteJob.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="EditJob.Text" xml:space="preserve">
+    <value>Edit</value>
+  </data>
+  <data name="JobLog.Text" xml:space="preserve">
+    <value>Log</value>
+  </data>
+  <data name="Error.Job.Start" xml:space="preserve">
+    <value>An error occurred when starting the job</value>
+  </data>
+  <data name="Error.Job.Stop" xml:space="preserve">
+    <value>An error occurred when stopping the job</value>
+  </data>
+  <data name="Message.Job.Start" xml:space="preserve">
+    <value>The process responsible for executing this job has been started. The next execution will be based on the schedule criteria for the job.</value>
+  </data>
+  <data name="Message.Job.Stop" xml:space="preserve">
+    <value>The process responsible for executing this job has been stopped. In order to restart the process you will need to use the Start button or restart the application.</value>
+  </data>
+  <data name="Week" xml:space="preserve">
+    <value>Week(s)</value>
+  </data>
+  <data name="Once" xml:space="preserve">
+    <value>Execute Once</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Languages/Add.resx

@@ -153,4 +153,19 @@
   <data name="Search.NoResults" xml:space="preserve">
     <value>No Translations Match The Criteria Provided Or Package Service Is Disabled</value>
   </data>
+  <data name="Download.Heading" xml:space="preserve">
+    <value>Download</value>
+  </data>
+  <data name="LanguageUpload.HelpText" xml:space="preserve">
+    <value>Upload one or more translations. Once they are uploaded click Install to complete the installation.</value>
+  </data>
+  <data name="LanguageUpload.Text" xml:space="preserve">
+    <value>Upload Language</value>
+  </data>
+  <data name="Manage.Heading" xml:space="preserve">
+    <value>Manage</value>
+  </data>
+  <data name="Upload.Heading" xml:space="preserve">
+    <value>Upload</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Languages/Index.resx

@@ -141,4 +141,7 @@
   <data name="Default" xml:space="preserve">
     <value>Default</value>
   </data>
+  <data name="DeleteLanguage.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Login/Index.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -117,25 +117,112 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="RememberMe" xml:space="preserve">
-    <value>Remember Me?</value>
-  </data>
   <data name="ForgotPassword" xml:space="preserve">
     <value>Forgot Password</value>
   </data>
   <data name="Success.Account.Verified" xml:space="preserve">
     <value>User Account Verified Successfully. You Can Now Login With Your Username And Password Below.</value>
   </data>
-  <data name="Message.Account.NotVerfied" xml:space="preserve">
+  <data name="Message.Account.NotVerified" xml:space="preserve">
     <value>User Account Could Not Be Verified. Please Contact Your Administrator For Further Instructions.</value>
   </data>
+  <data name="Success.Account.Linked" xml:space="preserve">
+    <value>User Account Linked Successfully. You Can Now Login With Your External Login Below.</value>
+  </data>
+  <data name="Message.Account.NotLinked" xml:space="preserve">
+    <value>External Login Could Not Be Linked. Please Contact Your Administrator For Further Instructions.</value>
+  </data>
   <data name="Error.Login.Fail" xml:space="preserve">
-    <value>Login Failed. Please Remember That Passwords Are Case Sensitive And User Accounts Require Verification When They Are Initially Created So You May Wish To Check Your Email.</value>
+    <value>Login Failed. Please Remember That Passwords Are Case Sensitive. If You Have Attempted To Sign In Multiple Times Unsuccessfully, Your Account Will Be Locked Out For A Period Of Time. Note That User Accounts Require Verification When They Are Initially Created So You May Wish To Check Your Email If You Are A New User.</value>
   </data>
   <data name="Message.Required.UserInfo" xml:space="preserve">
-    <value>Please Provide Your Username And Password</value>
+    <value>Please Provide All Required Fields</value>
   </data>
   <data name="Info.SignedIn" xml:space="preserve">
     <value>You Are Already Signed In</value>
   </data>
+  <data name="Message.ForgotPassword" xml:space="preserve">
+    <value>Please Enter The Username Related To Your Account And Then Select The Forgot Password Option Again</value>
+  </data>
+  <data name="Message.ForgotUser" xml:space="preserve">
+    <value>Please Check The Email Address Associated To Your User Account For A Password Reset Notification</value>
+  </data>
+  <data name="Message.UserDoesNotExist" xml:space="preserve">
+    <value>User Does Not Exist</value>
+  </data>
+  <data name="Code.HelpText" xml:space="preserve">
+    <value>Please Enter The Secure Verification Code Which Was Sent To You By Email.</value>
+  </data>
+  <data name="Code.Placeholder" xml:space="preserve">
+    <value>Verification Code</value>
+  </data>
+  <data name="Code.Text" xml:space="preserve">
+    <value>Verification Code:</value>
+  </data>
+  <data name="Error.TwoFactor.Fail" xml:space="preserve">
+    <value>Verification Failed. Please Ensure You Entered The Code Exactly In The Form Provided In Your Email. If You Wish To Request A New Verification Code Please Select The Cancel Option And Sign In Again. </value>
+  </data>
+  <data name="Message.TwoFactor" xml:space="preserve">
+    <value>A Secure Verification Code Has Been Sent To Your Email Address. Please Enter The Code That You Received. If You Do Not Receive The Code Or You Have Lost Access To Your Email, Please Contact Your Administrator.</value>
+  </data>
+  <data name="Password.HelpText" xml:space="preserve">
+    <value>Please Enter The Password Related To Your Account. Remember That Passwords Are Case Sensitive. If You Attempt Unsuccessfully To Log In To Your Account Multiple Times, You Will Be Locked Out For A Period Of Time.</value>
+  </data>
+  <data name="Password.Placeholder" xml:space="preserve">
+    <value>Password</value>
+  </data>
+  <data name="Password.Text" xml:space="preserve">
+    <value>Password:</value>
+  </data>
+  <data name="Remember.HelpText" xml:space="preserve">
+    <value>Specify If You Would Like To Be Signed Back In Automatically The Next Time You Visit This Site</value>
+  </data>
+  <data name="Remember.Text" xml:space="preserve">
+    <value>Remember Me?</value>
+  </data>
+  <data name="Username.HelpText" xml:space="preserve">
+    <value>Please Enter The Username Related To Your Account</value>
+  </data>
+  <data name="Username.Placeholder" xml:space="preserve">
+    <value>Username</value>
+  </data>
+  <data name="Username.Text" xml:space="preserve">
+    <value>Username:</value>
+  </data>
+  <data name="Use" xml:space="preserve">
+    <value>Use</value>
+  </data>
+  <data name="Error.LoadLogin" xml:space="preserve">
+    <value>Error Loading Login</value>
+  </data>
+  <data name="Error.Login" xml:space="preserve">
+    <value>Error Performing Login</value>
+  </data>
+  <data name="Error.ResetPassword" xml:space="preserve">
+    <value>Error Resetting Password</value>
+  </data>
+  <data name="ExternalLoginStatus.DuplicateEmail" xml:space="preserve">
+    <value>Multiple User Accounts Already Exist With The Email Address Of Your External Login. Please Contact Your Administrator For Further Instructions.</value>
+  </data>
+  <data name="ExternalLoginStatus.InvalidEmail" xml:space="preserve">
+    <value>The External Login Provider Did Not Provide A Valid Email Address For Your Account. Please Contact Your Administrator For Further Instructions.</value>
+  </data>
+  <data name="ExternalLoginStatus.ProviderKeyMismatch" xml:space="preserve">
+    <value>An Error Occurred Verifying Your External Login. Please Contact Your Administrator For Further Instructions.</value>
+  </data>
+  <data name="ExternalLoginStatus.UserDoesNotExist" xml:space="preserve">
+    <value>A User Account Matching The Email Address Of Your External Login Does Not Exist. Please Contact Your Administrator For Further Instructions.</value>
+  </data>
+  <data name="ExternalLoginStatus.UserNotCreated" xml:space="preserve">
+    <value>A User Account Could Not Be Created For Your External Login. Please Contact Your Administrator For Further Instructions.</value>
+  </data>
+  <data name="ExternalLoginStatus.VerificationRequired" xml:space="preserve">
+    <value>In Order To Link Your External Login With Your User Account You Must Verify Your Identity. Please Check Your Email For Further Instructions.</value>
+  </data>
+  <data name="ExternalLoginStatus.AccessDenied" xml:space="preserve">
+    <value>Your External Login Was Denied Access. Please Contact Your Administrator For Further Instructions.</value>
+  </data>
+  <data name="ExternalLoginStatus.RemoteFailure" xml:space="preserve">
+    <value>Your External Login Failed. Please Contact Your Administrator For Further Instructions.</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Logs/Index.resx

@@ -189,4 +189,25 @@
   <data name="Create" xml:space="preserve">
     <value>Create</value>
   </data>
+  <data name="LogDetails.Text" xml:space="preserve">
+    <value>Details</value>
+  </data>
+  <data name="Error.SaveSiteSettings" xml:space="preserve">
+    <value>Error Saving Settings</value>
+  </data>
+  <data name="Events.Heading" xml:space="preserve">
+    <value>Events</value>
+  </data>
+  <data name="Retention.HelpText" xml:space="preserve">
+    <value>Number of days of events to retain</value>
+  </data>
+  <data name="Retention.Text" xml:space="preserve">
+    <value>Retention (Days):</value>
+  </data>
+  <data name="Settings.Heading" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="Success.SaveSiteSettings" xml:space="preserve">
+    <value>Settings Saved Successfully</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Add.resx

@@ -138,4 +138,10 @@
   <data name="Search.NoResults" xml:space="preserve">
     <value>No Modules Match The Criteria Provided Or Package Service Is Disabled</value>
   </data>
+  <data name="Download.Heading" xml:space="preserve">
+    <value>Download</value>
+  </data>
+  <data name="Upload.Heading" xml:space="preserve">
+    <value>Upload</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Edit.resx

@@ -183,7 +183,16 @@
   <data name="Runtimes.Text" xml:space="preserve">
     <value>Runtimes: </value>
   </data>
-  <data name="Definition.Name" xml:space="preserve">
+  <data name="Definition.Heading" xml:space="preserve">
     <value>Definition</value>
   </data>
+  <data name="Information.Heading" xml:space="preserve">
+    <value>Information</value>
+  </data>
+  <data name="Permissions.Heading" xml:space="preserve">
+    <value>Permissions</value>
+  </data>
+  <data name="Information.Text" xml:space="preserve">
+    <value>Information</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Index.resx

@@ -144,4 +144,10 @@
   <data name="DeleteModule.Header" xml:space="preserve">
     <value>Delete Module</value>
   </data>
+  <data name="InUse" xml:space="preserve">
+    <value>In Use</value>
+  </data>
+  <data name="EditModule.Text" xml:space="preserve">
+    <value>Edit</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Pages/Add.resx

@@ -181,7 +181,7 @@
     <value>Select whether the page is part of the site navigation or hidden</value>
   </data>
   <data name="UrlPath.HelpText" xml:space="preserve">
-    <value>Optionally enter a url path for this page (ie. home ). If you do not provide a url path, the page name will be used.</value>
+    <value>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 '/'.</value>
   </data>
   <data name="Redirect.HelpText" xml:space="preserve">
     <value>Optionally enter a url which this page should redirect to when a user navigates to it</value>
@@ -231,4 +231,10 @@
   <data name="Message.Page.Deleted" xml:space="preserve">
     <value>A page with path {0} already exists for the selected parent page in the Recycle Bin. Either recover the page or remove from the Recycle Bin and create it again.</value>
   </data>
+  <data name="Meta.HelpText" xml:space="preserve">
+    <value>Optionally enter meta tags (in exactly the form you want them to be included in the page output).</value>
+  </data>
+  <data name="Meta.Text" xml:space="preserve">
+    <value>Meta:</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -169,7 +169,7 @@
     <value>Select whether the page is part of the site navigation or hidden</value>
   </data>
   <data name="UrlPath.HelpText" xml:space="preserve">
-    <value>Optionally enter a url path for this page (ie. home ). If you do not provide a url path, the page name will be used.</value>
+    <value>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 '/'.</value>
   </data>
   <data name="Redirect.HelpText" xml:space="preserve">
     <value>Optionally enter a url which this page should redirect to when a user navigates to it</value>
@@ -210,7 +210,7 @@
   <data name="Personalizable.Text" xml:space="preserve">
     <value>Personalizable? </value>
   </data>
-  <data name="Appearance.Name" xml:space="preserve">
+  <data name="Appearance.Heading" xml:space="preserve">
     <value>Appearance</value>
   </data>
   <data name="ThisLocation.Keep" xml:space="preserve">
@@ -231,4 +231,43 @@
   <data name="Move.Text" xml:space="preserve">
     <value>Move: </value>
   </data>
+  <data name="ModuleDefinition" xml:space="preserve">
+    <value>Module</value>
+  </data>
+  <data name="ModuleTitle" xml:space="preserve">
+    <value>Title</value>
+  </data>
+  <data name="PageModules.Heading" xml:space="preserve">
+    <value>Modules</value>
+  </data>
+  <data name="ModuleSettings.Text" xml:space="preserve">
+    <value>Edit</value>
+  </data>
+  <data name="DeleteModule.Header" xml:space="preserve">
+    <value>Delete Module</value>
+  </data>
+  <data name="DeleteModule.Message" xml:space="preserve">
+    <value>Are You Sure You Wish To Delete This Module?</value>
+  </data>
+  <data name="DeleteModule.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="Permissions.Heading" xml:space="preserve">
+    <value>Permissions</value>
+  </data>
+  <data name="ThemeSettings.Heading" xml:space="preserve">
+    <value>Theme Settings</value>
+  </data>
+  <data name="Clickable.HelpText" xml:space="preserve">
+    <value>Select whether the link in the site navigation is enabled or disabled</value>
+  </data>
+  <data name="Clickable.Text" xml:space="preserve">
+    <value>Clickable?</value>
+  </data>
+  <data name="Meta.HelpText" xml:space="preserve">
+    <value>Optionally enter meta tags (in exactly the form you want them to be included in the page output).</value>
+  </data>
+  <data name="Meta.Text" xml:space="preserve">
+    <value>Meta:</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Pages/Index.resx

@@ -129,4 +129,13 @@
   <data name="DeletePage.Header" xml:space="preserve">
     <value>Delete Page</value>
   </data>
+  <data name="Browse" xml:space="preserve">
+    <value>Browse</value>
+  </data>
+  <data name="DeletePage.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="EditPage.Text" xml:space="preserve">
+    <value>Edit</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Profiles/Index.resx

@@ -132,4 +132,10 @@
   <data name="DeleteProfile.Header" xml:space="preserve">
     <value>Delete Profile</value>
   </data>
+  <data name="DeleteProfile.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="EditProfile.Text" xml:space="preserve">
+    <value>Edit</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/RecycleBin/Index.resx

@@ -177,7 +177,10 @@
   <data name="DeleteAllModules.Message" xml:space="preserve">
     <value>Are You Sure You Wish To Permanently Delete All Modules?</value>
   </data>
-  <data name="Pages.Name" xml:space="preserve">
+  <data name="Pages.Heading" xml:space="preserve">
     <value>Pages</value>
   </data>
+  <data name="Modules.Heading" xml:space="preserve">
+    <value>Modules</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Reset/Index.resx

@@ -117,22 +117,37 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="Password.Confirm" xml:space="preserve">
-    <value>Confirm Password:</value>
-  </data>
   <data name="Message.Password.NoMatch" xml:space="preserve">
     <value>Passwords Entered Do Not Match</value>
   </data>
   <data name="Message.Required.UserInfo" xml:space="preserve">
-    <value>You Must Provide A Username, Password, and Email Address</value>
+    <value>You Must Provide The Password And Confirmation</value>
   </data>
   <data name="Password.Reset" xml:space="preserve">
     <value>Reset Password</value>
   </data>
   <data name="Error.Password.ResetInfo" xml:space="preserve">
-    <value>Error Resetting User Password. Please Ensure Password Meets Complexity Requirements.</value>
+    <value>Error Resetting User Password. Please Ensure The Request To Reset Your Password Was Made Within The Past 24 Hours And The New Password Meets The Complexity Requirements.</value>
   </data>
   <data name="Error.Password.Reset" xml:space="preserve">
     <value>Error Resetting User Password</value>
   </data>
+  <data name="Confirm.Text" xml:space="preserve">
+    <value>Confirm:</value>
+  </data>
+  <data name="Conform.HelpText" xml:space="preserve">
+    <value>Enter the password again. It must exactly match the password entered above.</value>
+  </data>
+  <data name="Password.HelpText" xml:space="preserve">
+    <value>The new password. It must satisfy complexity rules for the site.</value>
+  </data>
+  <data name="Password.Text" xml:space="preserve">
+    <value>Password:</value>
+  </data>
+  <data name="Username.HelpText" xml:space="preserve">
+    <value>Your username will be populated from the link you received in the password reset notification</value>
+  </data>
+  <data name="Username.Text" xml:space="preserve">
+    <value>Username:</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Roles/Index.resx

@@ -129,4 +129,13 @@
   <data name="DeleteRole.Header" xml:space="preserve">
     <value>Delete Role</value>
   </data>
+  <data name="DeleteRole.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="Edit.Text" xml:space="preserve">
+    <value>Edit</value>
+  </data>
+  <data name="Users.Text" xml:space="preserve">
+    <value>Users</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Site/Index.resx

@@ -129,9 +129,6 @@
   <data name="DefaultContainer.Text" xml:space="preserve">
     <value>Default Container: </value>
   </data>
-  <data name="Appearance.Name" xml:space="preserve">
-    <value>Appearance</value>
-  </data>
   <data name="DefaultAdminContainer" xml:space="preserve">
     <value>Default Admin Container</value>
   </data>
@@ -145,7 +142,7 @@
     <value>Site Settings Saved</value>
   </data>
   <data name="Message.Aliases.Taken" xml:space="preserve">
-    <value>An Alias Specified Has Already Been Used For Another Site</value>
+    <value>The Default Alias Has Not Been Specified Or An Alias Was Specified That Has Already Been Used For Another Site</value>
   </data>
   <data name="Message.Required.SiteName" xml:space="preserve">
     <value>You Must Provide A Site Name, Alias, And Default Theme/Container</value>
@@ -169,10 +166,7 @@
     <value>Enter the tenant for the site</value>
   </data>
   <data name="Aliases.HelpText" xml:space="preserve">
-    <value>Enter the alias for the server</value>
+    <value>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 should be separated by commas.</value>
-  </data>
-  <data name="AllowRegistration.HelpText" xml:space="preserve">
-    <value>Do you want the users to be able to register for an account on the site</value>
   </data>
   <data name="IsDeleted.HelpText" xml:space="preserve">
     <value>Is this site deleted?</value>
@@ -225,11 +219,8 @@
   <data name="Aliases.Text" xml:space="preserve">
     <value>Aliases: </value>
   </data>
-  <data name="AllowRegistration.Text" xml:space="preserve">
-    <value>Allow User Registration? </value>
-  </data>
   <data name="IsDeleted.Text" xml:space="preserve">
-    <value>Is Deleted? </value>
+    <value>Deleted? </value>
   </data>
   <data name="Logo.Text" xml:space="preserve">
     <value>Logo: </value>
@@ -282,4 +273,55 @@
   <data name="Theme.Select" xml:space="preserve">
     <value>Select Theme</value>
   </data>
+  <data name="Hosting.Heading" xml:space="preserve">
+    <value>Hosting Model</value>
+  </data>
+  <data name="Prerender.HelpText" xml:space="preserve">
+    <value>Specifies if the site should be prerendered (for search crawlers, etc...)</value>
+  </data>
+  <data name="Prerender.Text" xml:space="preserve">
+    <value>Prerender? </value>
+  </data>
+  <data name="Runtime.HelpText" xml:space="preserve">
+    <value>The Blazor runtime hosting model</value>
+  </data>
+  <data name="Runtime.Text" xml:space="preserve">
+    <value>Runtime: </value>
+  </data>
+  <data name="Browse" xml:space="preserve">
+    <value>Browse</value>
+  </data>
+  <data name="TenantInformation.Heading" xml:space="preserve">
+    <value>Tenant Information</value>
+  </data>
+  <data name="PWASettings.Heading" xml:space="preserve">
+    <value>PWA Settings</value>
+  </data>
+  <data name="SMTPSettings.Heading" xml:space="preserve">
+    <value>SMTP Settings</value>
+  </data>
+  <data name="ConnectionString.Text" xml:space="preserve">
+    <value>Connection:</value>
+  </data>
+  <data name="Database.Text" xml:space="preserve">
+    <value>Database:</value>
+  </data>
+  <data name="ConnectionString.HelpText" xml:space="preserve">
+    <value>The connection information for the database</value>
+  </data>
+  <data name="Database.HelpText" xml:space="preserve">
+    <value>The database for the tenant</value>
+  </data>
+  <data name="DeleteSite.Text" xml:space="preserve">
+    <value>Delete Site</value>
+  </data>
+  <data name="DefaultAlias.HelpText" xml:space="preserve">
+    <value>The default alias for the site. Requests for non-default aliases will be redirected to the default alias.</value>
+  </data>
+  <data name="DefaultAlias.Text" xml:space="preserve">
+    <value>Default Alias: </value>
+  </data>
+  <data name="Aliases.Heading" xml:space="preserve">
+    <value>Aliases</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Sites/Add.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -217,10 +217,10 @@
     <value>Enter the password for the integrated security</value>
   </data>
   <data name="HostUsername.HelpText" xml:space="preserve">
-    <value>Enter a valid host username</value>
+    <value>Enter the username of an existing host user</value>
   </data>
   <data name="HostPassword.HelpText" xml:space="preserve">
-    <value>Enter a valid host password</value>
+    <value>Enter the password of an existing host user</value>
   </data>
   <data name="Name.Text" xml:space="preserve">
     <value>Site Name: </value>
@@ -258,4 +258,16 @@
   <data name="Error.Database.LoadConfig" xml:space="preserve">
     <value>Error loading Database Configuration Control</value>
   </data>
+  <data name="Prerender.HelpText" xml:space="preserve">
+    <value>Specifies if the site should be prerendered (for search crawlers, etc...)</value>
+  </data>
+  <data name="Prerender.Text" xml:space="preserve">
+    <value>Prerender? </value>
+  </data>
+  <data name="Runtime.HelpText" xml:space="preserve">
+    <value>The Blazor runtime hosting model</value>
+  </data>
+  <data name="Runtime.Text" xml:space="preserve">
+    <value>Runtime: </value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx

@@ -123,38 +123,32 @@
   <data name="FrameworkVersion.HelpText" xml:space="preserve">
     <value>Framework Version</value>
   </data>
-  <data name="BlazorRuntime.HelpText" xml:space="preserve">
-    <value>Blazor Runtime (Server or WebAssembly)</value>
-  </data>
   <data name="CLRVersion.HelpText" xml:space="preserve">
     <value>Common Language Runtime Version</value>
   </data>
   <data name="OSVersion.HelpText" xml:space="preserve">
     <value>Operating System Version</value>
   </data>
-  <data name="ServerPath.HelpText" xml:space="preserve">
+  <data name="ContentRootPath.HelpText" xml:space="preserve">
-    <value>Server Path</value>
+    <value>Server Root Path</value>
   </data>
   <data name="ServerTime.HelpText" xml:space="preserve">
-    <value>Server Time</value>
+    <value>Server Date/Time (in UTC)</value>
   </data>
   <data name="FrameworkVersion.Text" xml:space="preserve">
     <value>Framework Version: </value>
   </data>
-  <data name="BlazorRuntime.Text" xml:space="preserve">
-    <value>Blazor Runtime: </value>
-  </data>
   <data name="CLRVersion.Text" xml:space="preserve">
     <value>CLR Version: </value>
   </data>
   <data name="OSVersion.Text" xml:space="preserve">
     <value>OS Version: </value>
   </data>
-  <data name="ServerPath.Text" xml:space="preserve">
+  <data name="ContentRootPath.Text" xml:space="preserve">
-    <value>Server Path: </value>
+    <value>Root Path: </value>
   </data>
   <data name="ServerTime.Text" xml:space="preserve">
-    <value>Server Time: </value>
+    <value>Server Date/Time: </value>
   </data>
   <data name="RestartApplication.Header" xml:space="preserve">
     <value>Restart Application</value>
@@ -165,18 +159,9 @@
   <data name="Error.UpdateConfig" xml:space="preserve">
     <value>An Error Occurred Updating The Configuration</value>
   </data>
-  <data name="Server" xml:space="preserve">
-    <value>Server</value>
-  </data>
-  <data name="ServerPrerendered" xml:space="preserve">
-    <value>ServerPrerendered</value>
-  </data>
   <data name="Success.UpdateConfig.Restart" xml:space="preserve">
     <value>Configuration Updated. Please Select Restart Application For These Changes To Be Activated.</value>
   </data>
-  <data name="WebAssembly" xml:space="preserve">
-    <value>WebAssembly</value>
-  </data>
   <data name="InstallationId.Text" xml:space="preserve">
     <value>Installation ID: </value>
   </data>
@@ -219,10 +204,10 @@
   <data name="Critical" xml:space="preserve">
     <value>Critical</value>
   </data>
-  <data name="Info" xml:space="preserve">
+  <data name="Info.Heading" xml:space="preserve">
     <value>Info</value>
   </data>
-  <data name="Options" xml:space="preserve">
+  <data name="Options.Heading" xml:space="preserve">
     <value>Options</value>
   </data>
   <data name="Register" xml:space="preserve">
@@ -243,4 +228,46 @@
   <data name="Swagger.Text" xml:space="preserve">
     <value>Swagger Enabled?</value>
   </data>
+  <data name="RestartApplication.Text" xml:space="preserve">
+    <value>Restart Application</value>
+  </data>
+  <data name="None" xml:space="preserve">
+    <value>None</value>
+  </data>
+  <data name="NotificationLevel.HelpText" xml:space="preserve">
+    <value>The Minimum Logging Level For Which Notifications Should Be Sent To Host Users.</value>
+  </data>
+  <data name="NotificationLevel.Text" xml:space="preserve">
+    <value>Notification Level:</value>
+  </data>
+  <data name="IPAddress.HelpText" xml:space="preserve">
+    <value>Server IP Address</value>
+  </data>
+  <data name="IPAddress.Text" xml:space="preserve">
+    <value>IP Address:</value>
+  </data>
+  <data name="MachineName.HelpText" xml:space="preserve">
+    <value>Server Machine Name</value>
+  </data>
+  <data name="MachineName.Text" xml:space="preserve">
+    <value>Machine Name:</value>
+  </data>
+  <data name="TickCount.HelpText" xml:space="preserve">
+    <value>Amount Of Time The Service Has Been Available And Operational</value>
+  </data>
+  <data name="TickCount.Text" xml:space="preserve">
+    <value>Service Uptime:</value>
+  </data>
+  <data name="WebRootPath.HelpText" xml:space="preserve">
+    <value>Server Web Root Path</value>
+  </data>
+  <data name="WebRootPath.Text" xml:space="preserve">
+    <value>Web Path:</value>
+  </data>
+  <data name="WorkingSet.HelpText" xml:space="preserve">
+    <value>Memory Allocation Of Service (in MB)</value>
+  </data>
+  <data name="WorkingSet.Text" xml:space="preserve">
+    <value>Memory Allocation:</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Themes/Index.resx

@@ -138,4 +138,10 @@
   <data name="DeleteTheme.Header" xml:space="preserve">
     <value>Delete Theme</value>
   </data>
+  <data name="CreateTheme.Text" xml:space="preserve">
+    <value>Create Theme</value>
+  </data>
+  <data name="ViewTheme.Text" xml:space="preserve">
+    <value>View</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Upgrade/Index.resx

@@ -135,4 +135,10 @@
   <data name="Success.Framework.Download" xml:space="preserve">
     <value>Framework Downloaded Successfully... Please Select Upgrade To Complete the Process</value>
   </data>
+  <data name="Download.Heading" xml:space="preserve">
+    <value>Download</value>
+  </data>
+  <data name="Upload.Heading" xml:space="preserve">
+    <value>Upload</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/UrlMappings/Add.resx

@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="MappedUrl.Text" xml:space="preserve">
+    <value>Redirect To:</value>
+  </data>
+  <data name="MappedUrl.HelpText" xml:space="preserve">
+    <value>A relative or absolute Url where the user will be redirected</value>
+  </data>
+  <data name="Url.HelpText" xml:space="preserve">
+    <value>An absolute Url identifying a path to a specific page in the site</value>
+  </data>
+  <data name="Url.Text" xml:space="preserve">
+    <value>Url:</value>
+  </data>
+  <data name="Error.SaveUrlMapping" xml:space="preserve">
+    <value>Error Saving Url Mapping</value>
+  </data>
+  <data name="Message.InfoRequired" xml:space="preserve">
+    <value>Please Provide All Required Information</value>
+  </data>
+  <data name="Message.DuplicateUrlMapping" xml:space="preserve">
+    <value>The Url and Redirect To cannot be the same</value>
+  </data>
+  <data name="Message.SaveUrlMapping" xml:space="preserve">
+    <value>The Url must belong to the current site</value>
+  </data>
+</root>

Oqtane.Client/Resources/Modules/Admin/UrlMappings/Edit.resx

@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="MappedUrl.Text" xml:space="preserve">
+    <value>Redirect To:</value>
+  </data>
+  <data name="MappedUrl.HelpText" xml:space="preserve">
+    <value>A relative or absolute Url where the user will be redirected</value>
+  </data>
+  <data name="Url.HelpText" xml:space="preserve">
+    <value>A relative Url identifying a path to a specific page in the site</value>
+  </data>
+  <data name="Url.Text" xml:space="preserve">
+    <value>Url:</value>
+  </data>
+  <data name="Error.LoadUrlMapping" xml:space="preserve">
+    <value>Error Loading Url Mapping</value>
+  </data>
+  <data name="Error.SaveUrlMapping" xml:space="preserve">
+    <value>Error Saving Url Mapping</value>
+  </data>
+  <data name="Message.InfoRequired" xml:space="preserve">
+    <value>Please Provide All Required Information</value>
+  </data>
+  <data name="Message.DuplicateUrlMapping" xml:space="preserve">
+    <value>The Url and Redirect To cannot be the same</value>
+  </data>
+</root>

Oqtane.Client/Resources/Modules/Admin/UrlMappings/Index.resx

@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Confirm.DeleteUrlMapping" xml:space="preserve">
+    <value>Are You Sure You Wish To Delete {0}?</value>
+  </data>
+  <data name="AddUrlMapping.Text" xml:space="preserve">
+    <value>Add Url Mapping</value>
+  </data>
+  <data name="DeleteUrlMapping.Header" xml:space="preserve">
+    <value>Delete Url Mapping</value>
+  </data>
+  <data name="Requested" xml:space="preserve">
+    <value>Requested</value>
+  </data>
+  <data name="Requests" xml:space="preserve">
+    <value>Requests</value>
+  </data>
+  <data name="Mapped" xml:space="preserve">
+    <value>Mapped Urls</value>
+  </data>
+  <data name="Broken" xml:space="preserve">
+    <value>Broken Urls</value>
+  </data>
+  <data name="CaptureBrokenUrls.HelpText" xml:space="preserve">
+    <value>Specify if broken Urls should be captured automatically and saved in Url Mappings</value>
+  </data>
+  <data name="CaptureBrokenUrls.Text" xml:space="preserve">
+    <value>Capture Broken Urls?</value>
+  </data>
+  <data name="Error.SaveSiteSettings" xml:space="preserve">
+    <value>Error Saving Settings</value>
+  </data>
+  <data name="Settings.Heading" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="Success.SaveSiteSettings" xml:space="preserve">
+    <value>Settings Saved Successfully</value>
+  </data>
+  <data name="Urls.Heading" xml:space="preserve">
+    <value>Urls</value>
+  </data>
+  <data name="Url" xml:space="preserve">
+    <value>Url</value>
+  </data>
+</root>

Oqtane.Client/Resources/Modules/Admin/UserProfile/Index.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -169,10 +169,10 @@
     <value>Identity</value>
   </data>
   <data name="Confirm.HelpText" xml:space="preserve">
-    <value>If you are changing your password you must enter it again to confirm it matches</value>
+    <value>If you are changing your password you must enter it again to confirm it matches the value entered above</value>
   </data>
   <data name="Confirm.Text" xml:space="preserve">
-    <value>Confirm Password:</value>
+    <value>Confirmation:</value>
   </data>
   <data name="DisplayName.HelpText" xml:space="preserve">
     <value>Your full name</value>
@@ -204,4 +204,19 @@
   <data name="Username.Text" xml:space="preserve">
     <value>Username:</value>
   </data>
+  <data name="TwoFactor.HelpText" xml:space="preserve">
+    <value>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.</value>
+  </data>
+  <data name="TwoFactor.Text" xml:space="preserve">
+    <value>Two Factor?</value>
+  </data>
+  <data name="DeleteAllNotifications.Header" xml:space="preserve">
+    <value>Clear Notifications</value>
+  </data>
+  <data name="DeleteAllNotifications.Message" xml:space="preserve">
+    <value>Are You Sure You Wish To Permanently Delete All Notifications?</value>
+  </data>
+  <data name="DeleteAllNotifications.Text" xml:space="preserve">
+    <value>Delete ALL Notifications</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Users/Add.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -168,4 +168,7 @@
   <data name="Username.Text" xml:space="preserve">
     <value>Username:</value>
   </data>
+  <data name="Password.Placeholder" xml:space="preserve">
+    <value>Password</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Users/Edit.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -177,4 +177,25 @@
   <data name="Username.Text" xml:space="preserve">
     <value>Username:</value>
   </data>
+  <data name="Identity.Heading" xml:space="preserve">
+    <value>Identity</value>
+  </data>
+  <data name="Profile.Heading" xml:space="preserve">
+    <value>Profile</value>
+  </data>
+  <data name="Password.Placeholder" xml:space="preserve">
+    <value>Password</value>
+  </data>
+  <data name="LastIPAddress.HelpText" xml:space="preserve">
+    <value>The IP Address of the user recorded during their last login</value>
+  </data>
+  <data name="LastIPAddress.Text" xml:space="preserve">
+    <value>Last IP Address: </value>
+  </data>
+  <data name="LastLogin.HelpText" xml:space="preserve">
+    <value>The date and time when the user last signed in</value>
+  </data>
+  <data name="LastLogin.Text" xml:space="preserve">
+    <value>Last Login:</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Users/Index.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -126,4 +126,262 @@
   <data name="DeleteUser.Header" xml:space="preserve">
     <value>Delete User</value>
   </data>
+  <data name="AllowRegistration.HelpText" xml:space="preserve">
+    <value>Do you want anonymous visitors to be able to register for an account on the site</value>
+  </data>
+  <data name="AllowRegistration.Text" xml:space="preserve">
+    <value>Allow Registration? </value>
+  </data>
+  <data name="Error.SaveSiteSettings" xml:space="preserve">
+    <value>Error Saving Settings</value>
+  </data>
+  <data name="Settings.Heading" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="Success.SaveSiteSettings" xml:space="preserve">
+    <value>Settings Saved Successfully</value>
+  </data>
+  <data name="Users.Heading" xml:space="preserve">
+    <value>Users</value>
+  </data>
+  <data name="DeleteUser.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="EditUser.Text" xml:space="preserve">
+    <value>Edit</value>
+  </data>
+  <data name="Roles.Text" xml:space="preserve">
+    <value>Roles</value>
+  </data>
+  <data name="LockoutDuration.HelpText" xml:space="preserve">
+    <value>The number of minutes a user should be locked out</value>
+  </data>
+  <data name="LockoutDuration.Text" xml:space="preserve">
+    <value>Lockout Duration:</value>
+  </data>
+  <data name="MaximumFailures.HelpText" xml:space="preserve">
+    <value>The maximum number of sign in attempts before a user is locked out</value>
+  </data>
+  <data name="MaximumFailures.Text" xml:space="preserve">
+    <value>Maximum Failures:</value>
+  </data>
+  <data name="RequireDigit.HelpText" xml:space="preserve">
+    <value>Indicate if passwords must contain a digit</value>
+  </data>
+  <data name="RequireDigit.Text" xml:space="preserve">
+    <value>Require Digit?</value>
+  </data>
+  <data name="RequiredLength.HelpText" xml:space="preserve">
+    <value>The minimum length for a password</value>
+  </data>
+  <data name="RequiredLength.Text" xml:space="preserve">
+    <value>Minimum Length:</value>
+  </data>
+  <data name="RequireLower.HelpText" xml:space="preserve">
+    <value>Indicate if passwords must contain a lower case character</value>
+  </data>
+  <data name="RequireLower.Text" xml:space="preserve">
+    <value>Require Lowercase?</value>
+  </data>
+  <data name="RequirePunctuation.HelpText" xml:space="preserve">
+    <value>Indicate if passwords must contain a non-alphanumeric character (ie. punctuation)</value>
+  </data>
+  <data name="RequirePunctuation.Text" xml:space="preserve">
+    <value>Require Punctuation?</value>
+  </data>
+  <data name="RequireUpper.HelpText" xml:space="preserve">
+    <value>Indicate if passwords must contain an upper case character</value>
+  </data>
+  <data name="RequireUpper.Text" xml:space="preserve">
+    <value>Require Uppercase?</value>
+  </data>
+  <data name="Success.UpdateConfig.Restart" xml:space="preserve">
+    <value>Configuration Updated. Please Select Restart Application For These Changes To Be Activated.</value>
+  </data>
+  <data name="UniqueCharacters.HelpText" xml:space="preserve">
+    <value>The minimum number of unique characters which a password must contain</value>
+  </data>
+  <data name="UniqueCharacters.Text" xml:space="preserve">
+    <value>Unique Characters:</value>
+  </data>
+  <data name="AllowSiteLogin.HelpText" xml:space="preserve">
+    <value>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.</value>
+  </data>
+  <data name="AllowSiteLogin.Text" xml:space="preserve">
+    <value>Allow Login?</value>
+  </data>
+  <data name="Authority.HelpText" xml:space="preserve">
+    <value>The Authority Url or Issuer Url associated with the OpenID Connect provider</value>
+  </data>
+  <data name="Authority.Text" xml:space="preserve">
+    <value>Authority:</value>
+  </data>
+  <data name="AuthorizationUrl.HelpText" xml:space="preserve">
+    <value>The endpoint for obtaining an Authorization Code</value>
+  </data>
+  <data name="AuthorizationUrl.Text" xml:space="preserve">
+    <value>Authorization Url:</value>
+  </data>
+  <data name="ClientID.HelpText" xml:space="preserve">
+    <value>The Client ID from the provider</value>
+  </data>
+  <data name="ClientID.Text" xml:space="preserve">
+    <value>Client ID:</value>
+  </data>
+  <data name="ClientSecret.HelpText" xml:space="preserve">
+    <value>The Client Secret from the provider</value>
+  </data>
+  <data name="ClientSecret.Text" xml:space="preserve">
+    <value>Client Secret:</value>
+  </data>
+  <data name="CreateUsers.HelpText" xml:space="preserve">
+    <value>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.</value>
+  </data>
+  <data name="CreateUsers.Text" xml:space="preserve">
+    <value>Create New Users?</value>
+  </data>
+  <data name="DomainFilter.HelpText" xml:space="preserve">
+    <value>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.</value>
+  </data>
+  <data name="DomainFilter.Text" xml:space="preserve">
+    <value>Domain Filter:</value>
+  </data>
+  <data name="EmailClaimType.HelpText" xml:space="preserve">
+    <value>The name of the email address claim provided by the provider</value>
+  </data>
+  <data name="EmailClaimType.Text" xml:space="preserve">
+    <value>Email Claim:</value>
+  </data>
+  <data name="ExternalLoginSettings.Heading" xml:space="preserve">
+    <value>External Login Settings</value>
+  </data>
+  <data name="LockoutSettings.Heading" xml:space="preserve">
+    <value>Lockout Settings</value>
+  </data>
+  <data name="MetadataUrl.HelpText" xml:space="preserve">
+    <value>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)</value>
+  </data>
+  <data name="MetadataUrl.Text" xml:space="preserve">
+    <value>Metadata Url:</value>
+  </data>
+  <data name="PasswordSettings.Heading" xml:space="preserve">
+    <value>Password Settings</value>
+  </data>
+  <data name="PKCE.HelpText" xml:space="preserve">
+    <value>Indicate if the provider supports Proof Key for Code Exchange (PKCE)</value>
+  </data>
+  <data name="PKCE.Text" xml:space="preserve">
+    <value>Use PKCE?</value>
+  </data>
+  <data name="ProviderName.HelpText" xml:space="preserve">
+    <value>The external login provider name which will be displayed on the login page</value>
+  </data>
+  <data name="ProviderName.Text" xml:space="preserve">
+    <value>Provider Name:</value>
+  </data>
+  <data name="ProviderType.HelpText" xml:space="preserve">
+    <value>Select the external login provider type</value>
+  </data>
+  <data name="ProviderType.Text" xml:space="preserve">
+    <value>Provider Type:</value>
+  </data>
+  <data name="RedirectUrl.HelpText" xml:space="preserve">
+    <value>The Redirect Url (or Callback Url) which usually needs to be registered with the provider</value>
+  </data>
+  <data name="RedirectUrl.Text" xml:space="preserve">
+    <value>Redirect Url:</value>
+  </data>
+  <data name="Scopes.HelpText" xml:space="preserve">
+    <value>A list of Scopes to request from the provider (separated by commas). If none are specified, standard Scopes will be used by default.</value>
+  </data>
+  <data name="Scopes.Text" xml:space="preserve">
+    <value>Scopes:</value>
+  </data>
+  <data name="TokenUrl.HelpText" xml:space="preserve">
+    <value>The endpoint for obtaining an Auth Token</value>
+  </data>
+  <data name="TokenUrl.Text" xml:space="preserve">
+    <value>Token Url:</value>
+  </data>
+  <data name="UserInfoUrl.HelpText" xml:space="preserve">
+    <value>The endpoint for obtaining user information. This should be an API or Page Url which contains the users email address.</value>
+  </data>
+  <data name="UserInfoUrl.Text" xml:space="preserve">
+    <value>User Info Url:</value>
+  </data>
+  <data name="Audience.HelpText" xml:space="preserve">
+    <value>Optionally provide the audience for the token</value>
+  </data>
+  <data name="Audience.Text" xml:space="preserve">
+    <value>Audience:</value>
+  </data>
+  <data name="UserSettings.Heading" xml:space="preserve">
+    <value>User Settings</value>
+  </data>
+  <data name="CookieName.HelpText" xml:space="preserve">
+    <value>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.</value>
+  </data>
+  <data name="CookieName.Text" xml:space="preserve">
+    <value>Cookie Name:</value>
+  </data>
+  <data name="CreateToken" xml:space="preserve">
+    <value>Create Token</value>
+  </data>
+  <data name="Issuer.HelpText" xml:space="preserve">
+    <value>Optionally provide the issuer of the token</value>
+  </data>
+  <data name="Issuer.Text" xml:space="preserve">
+    <value>Issuer:</value>
+  </data>
+  <data name="Lifetime.HelpText" xml:space="preserve">
+    <value>The number of minutes for which a token should be valid</value>
+  </data>
+  <data name="Lifetime.Text" xml:space="preserve">
+    <value>Lifetime:</value>
+  </data>
+  <data name="Secret.HelpText" xml:space="preserve">
+    <value>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.</value>
+  </data>
+  <data name="Secret.Text" xml:space="preserve">
+    <value>Secret:</value>
+  </data>
+  <data name="Token.HelpText" xml:space="preserve">
+    <value>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.</value>
+  </data>
+  <data name="Token.Text" xml:space="preserve">
+    <value>Token:</value>
+  </data>
+  <data name="TokenSettings.Heading" xml:space="preserve">
+    <value>Token Settings</value>
+  </data>
+  <data name="TwoFactor.HelpText" xml:space="preserve">
+    <value>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.</value>
+  </data>
+  <data name="TwoFactor.Text" xml:space="preserve">
+    <value>Two Factor?</value>
+  </data>
+  <data name="Disabled" xml:space="preserve">
+    <value>Disabled</value>
+  </data>
+  <data name="Optional" xml:space="preserve">
+    <value>Optional</value>
+  </data>
+  <data name="Required" xml:space="preserve">
+    <value>Required</value>
+  </data>
+  <data name="LastLoginOn" xml:space="preserve">
+    <value>Last Login</value>
+  </data>
+  <data name="IdentifierClaimType.HelpText" xml:space="preserve">
+    <value>The name of the unique user identifier claim provided by the provider</value>
+  </data>
+  <data name="IdentifierClaimType.Text" xml:space="preserve">
+    <value>Identifier Claim:</value>
+  </data>
+  <data name="Parameters.HelpText" xml:space="preserve">
+    <value>Optionally specify any additional parameters as name/value pairs to send to the provider (separated by commas if there are multiple).</value>
+  </data>
+  <data name="Parameters.Text" xml:space="preserve">
+    <value>Parameters:</value>
+  </data>
 </root>