From 18a843e74f6bc2bab9b71dc5e37262f473b37298 Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Thu, 19 Mar 2020 12:07:33 -0400 Subject: [PATCH] extensibility enhancements for site templates --- Oqtane.Client/App.razor | 4 +- Oqtane.Client/Modules/Admin/Files/Edit.razor | 6 +- Oqtane.Client/Modules/Admin/Pages/Add.razor | 7 +- Oqtane.Client/Modules/Admin/Sites/Add.razor | 41 +- Oqtane.Client/Modules/Admin/Tenants/Add.razor | 8 +- .../Modules/Controls/PermissionGrid.razor | 16 +- Oqtane.Client/Services/InstallationService.cs | 12 +- .../Interfaces/IInstallationService.cs | 6 +- .../Interfaces/ISiteTemplateService.cs | 11 + Oqtane.Client/Services/SiteTemplateService.cs | 35 ++ Oqtane.Client/Startup.cs | 1 + Oqtane.Client/UI/Installer.razor | 6 +- Oqtane.Server/Controllers/FolderController.cs | 8 +- .../Controllers/InstallationController.cs | 40 +- Oqtane.Server/Controllers/PageController.cs | 24 +- .../Controllers/SiteTemplateController.cs | 25 ++ .../OqtaneServiceCollectionExtensions.cs | 14 +- .../Interfaces/ISiteTemplate.cs | 12 + Oqtane.Server/Infrastructure/LogManager.cs | 2 +- .../SiteTemplates/DefaultSiteTemplate.cs | 151 +++++++ Oqtane.Server/Repository/FileRepository.cs | 4 +- Oqtane.Server/Repository/FolderRepository.cs | 6 +- .../Interfaces/IPermissionRepository.cs | 2 +- .../Interfaces/ISiteTemplateRepository.cs | 10 + .../Repository/ModuleDefinitionRepository.cs | 2 +- Oqtane.Server/Repository/ModuleRepository.cs | 2 +- .../Repository/PageModuleRepository.cs | 8 +- Oqtane.Server/Repository/PageRepository.cs | 8 +- .../Repository/PermissionRepository.cs | 4 +- Oqtane.Server/Repository/SiteRepository.cs | 380 +++++++++++++----- .../Repository/SiteTemplateRepository.cs | 57 +++ Oqtane.Server/Security/UserPermissions.cs | 2 +- Oqtane.Server/Startup.cs | 5 + Oqtane.Server/wwwroot/images/logo.png | Bin 0 -> 7963 bytes .../{GenericResponse.cs => Installation.cs} | 2 +- Oqtane.Shared/Models/Permission.cs | 18 + Oqtane.Shared/Models/Site.cs | 5 +- .../{PageTemplate.cs => SiteTemplate.cs} | 6 + Oqtane.Shared/Shared/Constants.cs | 2 + 39 files changed, 758 insertions(+), 194 deletions(-) create mode 100644 Oqtane.Client/Services/Interfaces/ISiteTemplateService.cs create mode 100644 Oqtane.Client/Services/SiteTemplateService.cs create mode 100644 Oqtane.Server/Controllers/SiteTemplateController.cs create mode 100644 Oqtane.Server/Infrastructure/Interfaces/ISiteTemplate.cs create mode 100644 Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs create mode 100644 Oqtane.Server/Repository/Interfaces/ISiteTemplateRepository.cs create mode 100644 Oqtane.Server/Repository/SiteTemplateRepository.cs create mode 100644 Oqtane.Server/wwwroot/images/logo.png rename Oqtane.Shared/Models/{GenericResponse.cs => Installation.cs} (79%) rename Oqtane.Shared/Models/{PageTemplate.cs => SiteTemplate.cs} (86%) diff --git a/Oqtane.Client/App.razor b/Oqtane.Client/App.razor index 66e5b15f..ffc2a160 100644 --- a/Oqtane.Client/App.razor +++ b/Oqtane.Client/App.razor @@ -23,8 +23,8 @@ protected override async Task OnParametersSetAsync() { - var response = await InstallationService.IsInstalled(); - _installed = response.Success; + var installation = await InstallationService.IsInstalled(); + _installed = installation.Success; _initialized = true; } diff --git a/Oqtane.Client/Modules/Admin/Files/Edit.razor b/Oqtane.Client/Modules/Admin/Files/Edit.razor index bbe37f9b..c965a8ea 100644 --- a/Oqtane.Client/Modules/Admin/Files/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Files/Edit.razor @@ -101,11 +101,7 @@ else { _parentId = _folders[0].FolderId; - List permissionstrings = new List(); - permissionstrings.Add(new PermissionString { PermissionName = PermissionNames.Browse, Permissions = Constants.AdminRole }); - permissionstrings.Add(new PermissionString { PermissionName = PermissionNames.View, Permissions = Constants.AdminRole }); - permissionstrings.Add(new PermissionString { PermissionName = PermissionNames.Edit, Permissions = Constants.AdminRole }); - _permissions = UserSecurity.SetPermissionStrings(permissionstrings); + _permissions = ""; } } catch (Exception ex) diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor index e912cc9d..d67c81a4 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Add.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor @@ -165,7 +165,7 @@ string _themetype = ""; string _layouttype = ""; string _icon = ""; - string _permissions = ""; + string _permissions = ""; PermissionGrid _permissionGrid; @@ -183,10 +183,7 @@ _panelayouts = ThemeService.GetPaneLayoutTypes(_themeList, _themetype); _layouttype = PageState.Site.DefaultLayoutType; - List permissionstrings = new List(); - permissionstrings.Add(new PermissionString { PermissionName = PermissionNames.View, Permissions = Constants.AdminRole }); - permissionstrings.Add(new PermissionString { PermissionName = PermissionNames.Edit, Permissions = Constants.AdminRole }); - _permissions = UserSecurity.SetPermissionStrings(permissionstrings); + _permissions = ""; } catch (Exception ex) { diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor index a692d081..7700a3b0 100644 --- a/Oqtane.Client/Modules/Admin/Sites/Add.razor +++ b/Oqtane.Client/Modules/Admin/Sites/Add.razor @@ -5,6 +5,7 @@ @inject IAliasService AliasService @inject ISiteService SiteService @inject IThemeService ThemeService +@inject ISiteTemplateService SiteTemplateService @inject IUserService UserService @if (_tenants == null) @@ -16,7 +17,7 @@ else + + + + @if (!_isinitialized) {
- +
- + @@ -38,7 +39,7 @@ else
- + @@ -46,7 +47,7 @@ else
- +
- +
- +
+ + + +
- + @@ -98,7 +113,7 @@ else
- + @@ -116,6 +131,7 @@ else Dictionary _themes = new Dictionary(); Dictionary _panelayouts = new Dictionary(); Dictionary _containers = new Dictionary(); + List _siteTemplates; List _themeList; List _tenants; @@ -125,6 +141,7 @@ else string _themetype = ""; string _layouttype = ""; string _containertype = ""; + string _sitetemplatetype = ""; bool _isinitialized = true; string _username = ""; string _password = ""; @@ -136,6 +153,7 @@ else _urls = PageState.Alias.Name; _themes = ThemeService.GetThemeTypes(_themeList); _containers = ThemeService.GetContainerTypes(_themeList); + _siteTemplates = await SiteTemplateService.GetSiteTemplatesAsync(); _username = Constants.HostUser; } @@ -185,7 +203,7 @@ else private async Task SaveSite() { - if (_tenantid != "-1" && _name != "" && _urls != "" && !string.IsNullOrEmpty(_themetype) && (_panelayouts.Count == 0 || !string.IsNullOrEmpty(_layouttype)) && !string.IsNullOrEmpty(_containertype)) + if (_tenantid != "-1" && _name != "" && _urls != "" && !string.IsNullOrEmpty(_themetype) && (_panelayouts.Count == 0 || !string.IsNullOrEmpty(_layouttype)) && !string.IsNullOrEmpty(_containertype) && !string.IsNullOrEmpty(_sitetemplatetype)) { bool unique = true; List aliases = await AliasService.GetAliasesAsync(); @@ -233,6 +251,7 @@ else site.DefaultThemeType = _themetype; site.DefaultLayoutType = (_layouttype == null ? "" : _layouttype); site.DefaultContainerType = _containertype; + site.SiteTemplateType = _sitetemplatetype; site = await SiteService.AddSiteAsync(site, aliases[0]); foreach (Alias alias in aliases) @@ -276,7 +295,7 @@ else } else { - AddModuleMessage("You Must Provide A Tenant, Site Name, Alias, And Default Theme/Container", MessageType.Warning); + AddModuleMessage("You Must Provide A Tenant, Site Name, Alias, Default Theme/Container, And Site Template", MessageType.Warning); } } diff --git a/Oqtane.Client/Modules/Admin/Tenants/Add.razor b/Oqtane.Client/Modules/Admin/Tenants/Add.razor index baccdfa8..4348bda7 100644 --- a/Oqtane.Client/Modules/Admin/Tenants/Add.razor +++ b/Oqtane.Client/Modules/Admin/Tenants/Add.razor @@ -127,8 +127,8 @@ } } - GenericResponse response = await InstallationService.Install(connectionstring); - if (response.Success) + Installation installation = await InstallationService.Install(connectionstring); + if (installation.Success) { Tenant tenant = new Tenant(); tenant.Name = name; @@ -142,8 +142,8 @@ } else { - await logger.LogError("Error Creating Tenant {Error}", response.Message); - AddModuleMessage(response.Message, MessageType.Error); + await logger.LogError("Error Creating Tenant {Error}", installation.Message); + AddModuleMessage(installation.Message, MessageType.Error); } } else diff --git a/Oqtane.Client/Modules/Controls/PermissionGrid.razor b/Oqtane.Client/Modules/Controls/PermissionGrid.razor index 3d240dec..5e253a9d 100644 --- a/Oqtane.Client/Modules/Controls/PermissionGrid.razor +++ b/Oqtane.Client/Modules/Controls/PermissionGrid.razor @@ -94,22 +94,26 @@ { if (string.IsNullOrEmpty(PermissionNames)) { - _permissionnames = "View,Edit"; + _permissionnames = Shared.PermissionNames.View + "," + Shared.PermissionNames.Edit; } else { _permissionnames = PermissionNames; } + _roles = await RoleService.GetRolesAsync(ModuleState.SiteId); _roles.Insert(0, new Role { Name = Constants.AllUsersRole }); + _permissions = new List(); + foreach (string permissionname in _permissionnames.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)) + { + // initialize with admin role + _permissions.Add(new PermissionString { PermissionName = permissionname, Permissions = Constants.AdminRole }); + } + if (!string.IsNullOrEmpty(Permissions)) { - _permissions = new List(); - foreach (string permissionname in _permissionnames.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)) - { - _permissions.Add(new PermissionString { PermissionName = permissionname, Permissions = "" }); - } + // populate permissions foreach (PermissionString permissionstring in UserSecurity.GetPermissionStrings(Permissions)) { if (_permissions.Find(item => item.PermissionName == permissionstring.PermissionName) != null) diff --git a/Oqtane.Client/Services/InstallationService.cs b/Oqtane.Client/Services/InstallationService.cs index 9d497e68..31a1e3dd 100644 --- a/Oqtane.Client/Services/InstallationService.cs +++ b/Oqtane.Client/Services/InstallationService.cs @@ -24,19 +24,19 @@ namespace Oqtane.Services get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Installation"); } } - public async Task IsInstalled() + public async Task IsInstalled() { - return await _http.GetJsonAsync(Apiurl + "/installed"); + return await _http.GetJsonAsync(Apiurl + "/installed"); } - public async Task Install(string connectionstring) + public async Task Install(string connectionstring) { - return await _http.PostJsonAsync(Apiurl, connectionstring); + return await _http.PostJsonAsync(Apiurl, connectionstring); } - public async Task Upgrade() + public async Task Upgrade() { - return await _http.GetJsonAsync(Apiurl + "/upgrade"); + return await _http.GetJsonAsync(Apiurl + "/upgrade"); } } } diff --git a/Oqtane.Client/Services/Interfaces/IInstallationService.cs b/Oqtane.Client/Services/Interfaces/IInstallationService.cs index 91a3a11a..580fd225 100644 --- a/Oqtane.Client/Services/Interfaces/IInstallationService.cs +++ b/Oqtane.Client/Services/Interfaces/IInstallationService.cs @@ -5,8 +5,8 @@ namespace Oqtane.Services { public interface IInstallationService { - Task IsInstalled(); - Task Install(string connectionstring); - Task Upgrade(); + Task IsInstalled(); + Task Install(string connectionstring); + Task Upgrade(); } } diff --git a/Oqtane.Client/Services/Interfaces/ISiteTemplateService.cs b/Oqtane.Client/Services/Interfaces/ISiteTemplateService.cs new file mode 100644 index 00000000..abb9a6c1 --- /dev/null +++ b/Oqtane.Client/Services/Interfaces/ISiteTemplateService.cs @@ -0,0 +1,11 @@ +using Oqtane.Models; +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace Oqtane.Services +{ + public interface ISiteTemplateService + { + Task> GetSiteTemplatesAsync(); + } +} diff --git a/Oqtane.Client/Services/SiteTemplateService.cs b/Oqtane.Client/Services/SiteTemplateService.cs new file mode 100644 index 00000000..410f2abc --- /dev/null +++ b/Oqtane.Client/Services/SiteTemplateService.cs @@ -0,0 +1,35 @@ +using Oqtane.Models; +using System.Collections.Generic; +using System.Linq; +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Components; +using Oqtane.Shared; + +namespace Oqtane.Services +{ + public class SiteTemplateService : ServiceBase, ISiteTemplateService + { + private readonly HttpClient _http; + private readonly SiteState _siteState; + private readonly NavigationManager _navigationManager; + + public SiteTemplateService(HttpClient http, SiteState siteState, NavigationManager navigationManager) + { + _http = http; + _siteState = siteState; + _navigationManager = navigationManager; + } + + private string Apiurl + { + get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "SiteTemplate"); } + } + + public async Task> GetSiteTemplatesAsync() + { + List siteTemplates = await _http.GetJsonAsync>(Apiurl); + return siteTemplates.OrderBy(item => item.Name).ToList(); + } + } +} diff --git a/Oqtane.Client/Startup.cs b/Oqtane.Client/Startup.cs index 817e36fa..b7991d90 100644 --- a/Oqtane.Client/Startup.cs +++ b/Oqtane.Client/Startup.cs @@ -58,6 +58,7 @@ namespace Oqtane.Client services.AddScoped(); services.AddScoped(); services.AddScoped(); + services.AddScoped(); // dynamically register module contexts and repository services Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies(); diff --git a/Oqtane.Client/UI/Installer.razor b/Oqtane.Client/UI/Installer.razor index d8ea0606..071a97bb 100644 --- a/Oqtane.Client/UI/Installer.razor +++ b/Oqtane.Client/UI/Installer.razor @@ -175,8 +175,8 @@ } } - GenericResponse response = await InstallationService.Install(connectionstring); - if (response.Success) + Installation installation = await InstallationService.Install(connectionstring); + if (installation.Success) { Site site = new Site(); site.TenantId = -1; // will be populated on server @@ -199,7 +199,7 @@ } else { - _message = "
" + response.Message + "
"; + _message = "
" + installation.Message + "
"; _loadingDisplay = "display: none;"; } } diff --git a/Oqtane.Server/Controllers/FolderController.cs b/Oqtane.Server/Controllers/FolderController.cs index 9fad4baf..1a2fdb2f 100644 --- a/Oqtane.Server/Controllers/FolderController.cs +++ b/Oqtane.Server/Controllers/FolderController.cs @@ -17,12 +17,14 @@ namespace Oqtane.Controllers { private readonly IFolderRepository _folders; private readonly IUserPermissions _userPermissions; + private readonly IPermissionRepository _permissionRepository; private readonly ILogManager _logger; - public FolderController(IFolderRepository folders, IUserPermissions userPermissions, ILogManager logger) + public FolderController(IFolderRepository folders, IUserPermissions userPermissions, IPermissionRepository permissionRepository, ILogManager logger) { _folders = folders; _userPermissions = userPermissions; + _permissionRepository = permissionRepository; _logger = logger; } @@ -98,7 +100,9 @@ namespace Oqtane.Controllers } else { - permissions = UserSecurity.SetPermissionStrings(new List { new PermissionString { PermissionName = PermissionNames.Edit, Permissions = Constants.AdminRole } }); + permissions = _permissionRepository.EncodePermissions(new List { + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }); } if (_userPermissions.IsAuthorized(User,PermissionNames.Edit, permissions)) { diff --git a/Oqtane.Server/Controllers/InstallationController.cs b/Oqtane.Server/Controllers/InstallationController.cs index cde7a4be..763a570d 100644 --- a/Oqtane.Server/Controllers/InstallationController.cs +++ b/Oqtane.Server/Controllers/InstallationController.cs @@ -31,9 +31,9 @@ namespace Oqtane.Controllers // POST api/ [HttpPost] - public GenericResponse Post([FromBody] string connectionString) + public Installation Post([FromBody] string connectionString) { - var response = new GenericResponse { Success = false, Message = "" }; + var installation = new Installation { Success = false, Message = "" }; if (ModelState.IsValid) { @@ -110,7 +110,7 @@ namespace Oqtane.Controllers } catch (Exception ex) { - response.Message = "Can Not Create Database - " + ex.Message; + installation.Message = "Can Not Create Database - " + ex.Message; } // sleep to allow SQL server to attach new database @@ -140,7 +140,7 @@ namespace Oqtane.Controllers var result = dbUpgrade.PerformUpgrade(); if (!result.Successful) { - response.Message = result.Error.Message; + installation.Message = result.Error.Message; } else { @@ -161,24 +161,24 @@ namespace Oqtane.Controllers } _config.Reload(); } - response.Success = true; + installation.Success = true; } } } } else { - response.Message = "Application Is Already Installed"; + installation.Message = "Application Is Already Installed"; } } - return response; + return installation; } // GET api//installed [HttpGet("installed")] - public GenericResponse IsInstalled() + public Installation IsInstalled() { - var response = new GenericResponse { Success = false, Message = "" }; + var installation = new Installation { Success = false, Message = "" }; string datadirectory = AppDomain.CurrentDomain.GetData("DataDirectory").ToString(); string connectionString = _config.GetConnectionString("DefaultConnection"); @@ -193,28 +193,28 @@ namespace Oqtane.Controllers { connection.Open(); } - response.Success = true; + installation.Success = true; } catch { // database does not exist - response.Message = "Database Does Not Exist"; + installation.Message = "Database Does Not Exist"; } } else { - response.Message = "Connection String Has Not Been Specified In Oqtane.Server\\appsettings.json"; + installation.Message = "Connection String Has Not Been Specified In Oqtane.Server\\appsettings.json"; } - if (response.Success) + if (installation.Success) { var dbUpgradeConfig = DeployChanges.To.SqlDatabase(connectionString) .WithScript(new DbUp.Engine.SqlScript("Master.sql", "")); var dbUpgrade = dbUpgradeConfig.Build(); - response.Success = !dbUpgrade.IsUpgradeRequired(); - if (!response.Success) + installation.Success = !dbUpgrade.IsUpgradeRequired(); + if (!installation.Success) { - response.Message = "Master Installation Scripts Have Not Been Executed"; + installation.Message = "Master Installation Scripts Have Not Been Executed"; } else { @@ -264,7 +264,7 @@ namespace Oqtane.Controllers } } - return response; + return installation; } private void InstallModule(Assembly assembly, string connectionstring) @@ -284,11 +284,11 @@ namespace Oqtane.Controllers [HttpGet("upgrade")] [Authorize(Roles = Constants.HostRole)] - public GenericResponse Upgrade() + public Installation Upgrade() { - var response = new GenericResponse { Success = true, Message = "" }; + var installation = new Installation { Success = true, Message = "" }; _installationManager.UpgradeFramework(); - return response; + return installation; } } diff --git a/Oqtane.Server/Controllers/PageController.cs b/Oqtane.Server/Controllers/PageController.cs index 01abb4ac..3a65407d 100644 --- a/Oqtane.Server/Controllers/PageController.cs +++ b/Oqtane.Server/Controllers/PageController.cs @@ -19,15 +19,17 @@ namespace Oqtane.Controllers private readonly IModuleRepository _modules; private readonly IPageModuleRepository _pageModules; private readonly IUserPermissions _userPermissions; + private readonly IPermissionRepository _permissionRepository; private readonly ISyncManager _syncManager; private readonly ILogManager _logger; - public PageController(IPageRepository pages, IModuleRepository modules, IPageModuleRepository pageModules, IUserPermissions userPermissions, ISyncManager syncManager, ILogManager logger) + public PageController(IPageRepository pages, IModuleRepository modules, IPageModuleRepository pageModules, IUserPermissions userPermissions, IPermissionRepository permissionRepository, ISyncManager syncManager, ILogManager logger) { _pages = pages; _modules = modules; _pageModules = pageModules; _userPermissions = userPermissions; + _permissionRepository = permissionRepository; _syncManager = syncManager; _logger = logger; } @@ -111,7 +113,9 @@ namespace Oqtane.Controllers } else { - permissions = UserSecurity.SetPermissionStrings(new List { new PermissionString { PermissionName = PermissionNames.Edit, Permissions = Constants.AdminRole } }); + permissions = _permissionRepository.EncodePermissions(new List { + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }); } if (_userPermissions.IsAuthorized(User,PermissionNames.Edit, permissions)) @@ -150,10 +154,10 @@ namespace Oqtane.Controllers page.ThemeType = parent.ThemeType; page.LayoutType = parent.LayoutType; page.Icon = parent.Icon; - List permissions = new List(); - permissions.Add(new PermissionString { PermissionName = PermissionNames.View, Permissions = "[" + userid + "]" }); - permissions.Add(new PermissionString { PermissionName = PermissionNames.Edit, Permissions = "[" + userid + "]" }); - page.Permissions = UserSecurity.SetPermissionStrings(permissions); + page.Permissions = _permissionRepository.EncodePermissions(new List { + new Permission(PermissionNames.View, userid, true), + new Permission(PermissionNames.Edit, userid, true) + }); page.IsPersonalizable = false; page.UserId = int.Parse(userid); page = _pages.AddPage(page); @@ -167,10 +171,10 @@ namespace Oqtane.Controllers module.SiteId = page.SiteId; module.PageId = page.PageId; module.ModuleDefinitionName = pm.Module.ModuleDefinitionName; - permissions = new List(); - permissions.Add(new PermissionString { PermissionName = PermissionNames.View, Permissions = "[" + userid + "]" }); - permissions.Add(new PermissionString { PermissionName = PermissionNames.Edit, Permissions = "[" + userid + "]" }); - module.Permissions = UserSecurity.SetPermissionStrings(permissions); + module.Permissions = _permissionRepository.EncodePermissions(new List { + new Permission(PermissionNames.View, userid, true), + new Permission(PermissionNames.Edit, userid, true) + }); module = _modules.AddModule(module); string content = _modules.ExportModule(pm.ModuleId); diff --git a/Oqtane.Server/Controllers/SiteTemplateController.cs b/Oqtane.Server/Controllers/SiteTemplateController.cs new file mode 100644 index 00000000..c74e69a4 --- /dev/null +++ b/Oqtane.Server/Controllers/SiteTemplateController.cs @@ -0,0 +1,25 @@ +using System.Collections.Generic; +using Microsoft.AspNetCore.Mvc; +using Oqtane.Models; +using Oqtane.Repository; + +namespace Oqtane.Controllers +{ + [Route("{site}/api/[controller]")] + public class SiteTemplateController : Controller + { + private readonly ISiteTemplateRepository _siteTemplates; + + public SiteTemplateController(ISiteTemplateRepository siteTemplates) + { + _siteTemplates = siteTemplates; + } + + // GET: api/ + [HttpGet] + public IEnumerable Get() + { + return _siteTemplates.GetSiteTemplates(); + } + } +} diff --git a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs index 3911d03b..e2bf622e 100644 --- a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs +++ b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs @@ -43,6 +43,18 @@ namespace Microsoft.Extensions.DependencyInjection return services; } + public static IServiceCollection AddOqtaneSiteTemplates(this IServiceCollection services) + { + if (services is null) + { + throw new ArgumentNullException(nameof(services)); + } + + LoadAssemblies("SiteTemplate"); + + return services; + } + public static IServiceCollection AddOqtaneServices(this IServiceCollection services) { if (services is null) @@ -99,7 +111,7 @@ namespace Microsoft.Extensions.DependencyInjection var assembliesFolder = new DirectoryInfo(assemblyPath); - // iterate through Oqtane theme assemblies in /bin ( filter is narrow to optimize loading process ) + // iterate through Oqtane assemblies in /bin ( filter is narrow to optimize loading process ) foreach (var file in assembliesFolder.EnumerateFiles($"*.{pattern}.*.dll")) { // check if assembly is already loaded diff --git a/Oqtane.Server/Infrastructure/Interfaces/ISiteTemplate.cs b/Oqtane.Server/Infrastructure/Interfaces/ISiteTemplate.cs new file mode 100644 index 00000000..20b8cdb8 --- /dev/null +++ b/Oqtane.Server/Infrastructure/Interfaces/ISiteTemplate.cs @@ -0,0 +1,12 @@ +using Oqtane.Models; +using System.Collections.Generic; + +namespace Oqtane.Infrastructure.Interfaces +{ + public interface ISiteTemplate + { + string Name { get; } + + List CreateSite(Site site); + } +} diff --git a/Oqtane.Server/Infrastructure/LogManager.cs b/Oqtane.Server/Infrastructure/LogManager.cs index ddaaf4fb..47101016 100644 --- a/Oqtane.Server/Infrastructure/LogManager.cs +++ b/Oqtane.Server/Infrastructure/LogManager.cs @@ -112,7 +112,7 @@ namespace Oqtane.Infrastructure var section = _config.GetSection("Logging:LogLevel:Default"); if (section.Exists()) { - minlevel = Enum.Parse(_config.GetSection("Logging:LogLevel:Default").ToString()); + minlevel = Enum.Parse(section.Value); } if (Enum.Parse(log.Level) >= minlevel) diff --git a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs new file mode 100644 index 00000000..b524b6bd --- /dev/null +++ b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs @@ -0,0 +1,151 @@ +using Oqtane.Models; +using Oqtane.Infrastructure.Interfaces; +using System.Collections.Generic; +using Oqtane.Repository; +using Microsoft.AspNetCore.Hosting; +using Oqtane.Shared; + +namespace Oqtane.SiteTemplates +{ + public class DefaultSiteTemplate : ISiteTemplate + { + private readonly IPermissionRepository _permissionRepository; + private readonly IWebHostEnvironment _environment; + private readonly ISiteRepository _siteRepository; + private readonly IFolderRepository _folderRepository; + private readonly IFileRepository _fileRepository; + + public DefaultSiteTemplate(IPermissionRepository permissionRepository, IWebHostEnvironment environment, ISiteRepository siteRepository, IFolderRepository folderRepository, IFileRepository fileRepository) + { + _permissionRepository = permissionRepository; + _environment = environment; + _siteRepository = siteRepository; + _folderRepository = folderRepository; + _fileRepository = fileRepository; + } + + public string Name + { + get { return "Default Site Template"; } + } + + public List CreateSite(Site site) + { + List _pageTemplates = new List(); + + _pageTemplates.Add(new PageTemplate + { + Name = "Home", + Parent = "", + Path = "", + Icon = "home", + IsNavigation = true, + IsPersonalizable = false, + EditMode = false, + PagePermissions = _permissionRepository.EncodePermissions( new List { + new Permission(PermissionNames.View, Constants.AllUsersRole, true), + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }) , + PageTemplateModules = new List { + new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Welcome To Oqtane...", Pane = "Content", + ModulePermissions = _permissionRepository.EncodePermissions( new List { + new Permission(PermissionNames.View, Constants.AllUsersRole, true), + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), + Content = "

Oqtane is an open source modular application framework built from the ground up using modern .NET Core technology. It leverages the revolutionary new Blazor component model to create a fully dynamic web development experience which can be executed on a client or server. Whether you are looking for a platform to accelerate your web development efforts, or simply interested in exploring the anatomy of a large-scale Blazor application, Oqtane provides a solid foundation based on proven enterprise architectural principles.

" + + "



Join Our Community  Clone Our Repo

" + + "

Blazor is a single-page app framework that lets you build interactive web applications using C# instead of JavaScript. Client-side Blazor relies on WebAssembly, an open web standard that does not require plugins or code transpilation in order to run natively in a web browser. Server-side Blazor uses SignalR to host your application on a web server and provide a responsive and robust debugging experience. Blazor applications works in all modern web browsers, including mobile browsers.

" + + "

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

" + }, + new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "MIT License", Pane = "Content", + ModulePermissions = _permissionRepository.EncodePermissions( new List { + new Permission(PermissionNames.View, Constants.AllUsersRole, true), + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), + Content = "

Copyright (c) 2019-2020 .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 in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

" + + "

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

" + + "

THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

" + }, + new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Secure Content", Pane = "Content", + ModulePermissions = _permissionRepository.EncodePermissions( new List { + new Permission(PermissionNames.View, Constants.RegisteredRole, true), + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), + Content = "

Oqtane allows you to control access to your content using security roles. This module is only visible to Registered Users of the site.

" + } + } + }); + _pageTemplates.Add(new PageTemplate + { + Name = "Private", + Parent = "", + Path = "private", + Icon = "lock-locked", + IsNavigation = true, + IsPersonalizable = false, + EditMode = false, + PagePermissions = _permissionRepository.EncodePermissions(new List { + new Permission(PermissionNames.View, Constants.RegisteredRole, true), + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), + PageTemplateModules = new List { + new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Secure Content", Pane = "Content", + ModulePermissions = _permissionRepository.EncodePermissions( new List { + new Permission(PermissionNames.View, Constants.RegisteredRole, true), + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), + Content = "

Oqtane allows you to control access to your content using security roles. This page is only visible to Registered Users of the site.

" + } + } + }); + _pageTemplates.Add(new PageTemplate + { + Name = "My Page", + Parent = "", + Path = "mypage", + Icon = "target", + IsNavigation = true, + IsPersonalizable = true, + EditMode = false, + PagePermissions = _permissionRepository.EncodePermissions(new List { + new Permission(PermissionNames.View, Constants.AllUsersRole, true), + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), + PageTemplateModules = new List { + new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "My Page", Pane = "Content", + ModulePermissions = _permissionRepository.EncodePermissions( new List { + new Permission(PermissionNames.View, Constants.AllUsersRole, true), + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), + Content = "

Oqtane offers native support for user personalized pages. If a page is identified as personalizable by the site administrator in the page settings, when an authenticated user visits the page they will see an edit button at the top right corner of the page next to their username. When they click this button the sytem will create a new version of the page and allow them to edit the page content.

" + } + } + }); + + if (System.IO.File.Exists(_environment.WebRootPath + "\\images\\logo.png")) + { + string folderpath = _environment.ContentRootPath + "\\Content\\Tenants\\" + site.TenantId.ToString() + "\\Sites\\" + site.SiteId.ToString() + "\\"; + System.IO.Directory.CreateDirectory(folderpath); + if (!System.IO.File.Exists(folderpath + "logo.png")) + { + System.IO.File.Copy(_environment.WebRootPath + "\\images\\logo.png", folderpath + "logo.png"); + } + Folder folder = _folderRepository.GetFolder(site.SiteId, ""); + File file = _fileRepository.AddFile(new File { FolderId = folder.FolderId, Name = "logo.png", Extension = "png", Size = 8192, ImageHeight = 80, ImageWidth = 250 }); + site.LogoFileId = file.FileId; + _siteRepository.UpdateSite(site); + } + + return _pageTemplates; + } + } +} diff --git a/Oqtane.Server/Repository/FileRepository.cs b/Oqtane.Server/Repository/FileRepository.cs index fe5d3380..63d964eb 100644 --- a/Oqtane.Server/Repository/FileRepository.cs +++ b/Oqtane.Server/Repository/FileRepository.cs @@ -22,7 +22,7 @@ namespace Oqtane.Repository IEnumerable files = _db.File.Where(item => item.FolderId == folderId).Include(item => item.Folder); foreach (File file in files) { - file.Folder.Permissions = _permissions.EncodePermissions(folderId, permissions); + file.Folder.Permissions = _permissions.EncodePermissions(permissions); } return files; } @@ -47,7 +47,7 @@ namespace Oqtane.Repository if (file != null) { IEnumerable permissions = _permissions.GetPermissions("Folder", file.FolderId).ToList(); - file.Folder.Permissions = _permissions.EncodePermissions(file.FolderId, permissions); + file.Folder.Permissions = _permissions.EncodePermissions(permissions); } return file; } diff --git a/Oqtane.Server/Repository/FolderRepository.cs b/Oqtane.Server/Repository/FolderRepository.cs index b3d6f4e3..a52f372f 100644 --- a/Oqtane.Server/Repository/FolderRepository.cs +++ b/Oqtane.Server/Repository/FolderRepository.cs @@ -22,7 +22,7 @@ namespace Oqtane.Repository IEnumerable folders = _db.Folder.Where(item => item.SiteId == siteId); foreach(Folder folder in folders) { - folder.Permissions = _permissions.EncodePermissions(folder.FolderId, permissions); + folder.Permissions = _permissions.EncodePermissions(permissions.Where(item => item.EntityId == folder.FolderId)); } return folders; } @@ -49,7 +49,7 @@ namespace Oqtane.Repository if (folder != null) { IEnumerable permissions = _permissions.GetPermissions("Folder", folder.FolderId).ToList(); - folder.Permissions = _permissions.EncodePermissions(folder.FolderId, permissions); + folder.Permissions = _permissions.EncodePermissions(permissions); } return folder; } @@ -60,7 +60,7 @@ namespace Oqtane.Repository if (folder != null) { IEnumerable permissions = _permissions.GetPermissions("Folder", folder.FolderId).ToList(); - folder.Permissions = _permissions.EncodePermissions(folder.FolderId, permissions); + folder.Permissions = _permissions.EncodePermissions(permissions); } return folder; } diff --git a/Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs b/Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs index 2fe96254..5be9bb50 100644 --- a/Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs @@ -14,7 +14,7 @@ namespace Oqtane.Repository Permission GetPermission(int permissionId); void DeletePermission(int permissionId); void DeletePermissions(int siteId, string entityName, int entityId); - string EncodePermissions(int entityId, IEnumerable permissionList); + string EncodePermissions(IEnumerable permissionList); IEnumerable DecodePermissions(string permissions, int siteId, string entityName, int entityId); } } diff --git a/Oqtane.Server/Repository/Interfaces/ISiteTemplateRepository.cs b/Oqtane.Server/Repository/Interfaces/ISiteTemplateRepository.cs new file mode 100644 index 00000000..659226ff --- /dev/null +++ b/Oqtane.Server/Repository/Interfaces/ISiteTemplateRepository.cs @@ -0,0 +1,10 @@ +using System.Collections.Generic; +using Oqtane.Models; + +namespace Oqtane.Repository +{ + public interface ISiteTemplateRepository + { + IEnumerable GetSiteTemplates(); + } +} diff --git a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs index 509a7bcf..9bed525e 100644 --- a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs +++ b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs @@ -86,7 +86,7 @@ namespace Oqtane.Repository } else { - moduledefinition.Permissions = _permissions.EncodePermissions(moduledef.ModuleDefinitionId, permissions); + moduledefinition.Permissions = _permissions.EncodePermissions(permissions.Where(item => item.EntityId == moduledef.ModuleDefinitionId)); } // remove module definition from list moduledefs.Remove(moduledef); diff --git a/Oqtane.Server/Repository/ModuleRepository.cs b/Oqtane.Server/Repository/ModuleRepository.cs index 76644286..18d9df3b 100644 --- a/Oqtane.Server/Repository/ModuleRepository.cs +++ b/Oqtane.Server/Repository/ModuleRepository.cs @@ -53,7 +53,7 @@ namespace Oqtane.Repository if (module != null) { List permissions = _permissions.GetPermissions("Module", module.ModuleId).ToList(); - module.Permissions = _permissions.EncodePermissions(module.ModuleId, permissions); + module.Permissions = _permissions.EncodePermissions(permissions); } return module; } diff --git a/Oqtane.Server/Repository/PageModuleRepository.cs b/Oqtane.Server/Repository/PageModuleRepository.cs index 70f7c201..ee85270d 100644 --- a/Oqtane.Server/Repository/PageModuleRepository.cs +++ b/Oqtane.Server/Repository/PageModuleRepository.cs @@ -26,7 +26,7 @@ namespace Oqtane.Repository IEnumerable permissions = _permissions.GetPermissions(pagemodules.FirstOrDefault().Module.SiteId, "Module").ToList(); foreach (PageModule pagemodule in pagemodules) { - pagemodule.Module.Permissions = _permissions.EncodePermissions(pagemodule.ModuleId, permissions); + pagemodule.Module.Permissions = _permissions.EncodePermissions(permissions.Where(item => item.EntityId == pagemodule.ModuleId)); } } return pagemodules; @@ -46,7 +46,7 @@ namespace Oqtane.Repository IEnumerable permissions = _permissions.GetPermissions(pagemodules.FirstOrDefault().Module.SiteId, "Module").ToList(); foreach (PageModule pagemodule in pagemodules) { - pagemodule.Module.Permissions = _permissions.EncodePermissions(pagemodule.ModuleId, permissions); + pagemodule.Module.Permissions = _permissions.EncodePermissions(permissions.Where(item => item.EntityId == pagemodule.ModuleId)); } } return pagemodules; @@ -73,7 +73,7 @@ namespace Oqtane.Repository if (pagemodule != null) { IEnumerable permissions = _permissions.GetPermissions("Module", pagemodule.ModuleId).ToList(); - pagemodule.Module.Permissions = _permissions.EncodePermissions(pagemodule.ModuleId, permissions); + pagemodule.Module.Permissions = _permissions.EncodePermissions(permissions); } return pagemodule; } @@ -85,7 +85,7 @@ namespace Oqtane.Repository if (pagemodule != null) { IEnumerable permissions = _permissions.GetPermissions("Module", pagemodule.ModuleId).ToList(); - pagemodule.Module.Permissions = _permissions.EncodePermissions(pagemodule.ModuleId, permissions); + pagemodule.Module.Permissions = _permissions.EncodePermissions(permissions); } return pagemodule; } diff --git a/Oqtane.Server/Repository/PageRepository.cs b/Oqtane.Server/Repository/PageRepository.cs index f5b726f3..cd3f78ee 100644 --- a/Oqtane.Server/Repository/PageRepository.cs +++ b/Oqtane.Server/Repository/PageRepository.cs @@ -24,7 +24,7 @@ namespace Oqtane.Repository IEnumerable pages = _db.Page.Where(item => item.SiteId == siteId && item.UserId == null); foreach(Page page in pages) { - page.Permissions = _permissions.EncodePermissions(page.PageId, permissions); + page.Permissions = _permissions.EncodePermissions(permissions.Where(item => item.EntityId == page.PageId)); } return pages; } @@ -51,7 +51,7 @@ namespace Oqtane.Repository if (page != null) { IEnumerable permissions = _permissions.GetPermissions("Page", page.PageId).ToList(); - page.Permissions = _permissions.EncodePermissions(page.PageId, permissions); + page.Permissions = _permissions.EncodePermissions(permissions); } return page; } @@ -69,7 +69,7 @@ namespace Oqtane.Repository if (page != null) { IEnumerable permissions = _permissions.GetPermissions("Page", page.PageId).ToList(); - page.Permissions = _permissions.EncodePermissions(page.PageId, permissions); + page.Permissions = _permissions.EncodePermissions(permissions); } } return page; @@ -81,7 +81,7 @@ namespace Oqtane.Repository if (page != null) { IEnumerable permissions = _permissions.GetPermissions("Page", page.PageId).ToList(); - page.Permissions = _permissions.EncodePermissions(page.PageId, permissions); + page.Permissions = _permissions.EncodePermissions(permissions); } return page; } diff --git a/Oqtane.Server/Repository/PermissionRepository.cs b/Oqtane.Server/Repository/PermissionRepository.cs index 991d222c..fd9670d3 100644 --- a/Oqtane.Server/Repository/PermissionRepository.cs +++ b/Oqtane.Server/Repository/PermissionRepository.cs @@ -101,14 +101,14 @@ namespace Oqtane.Repository } // permissions are stored in the format "{permissionname:!rolename1;![userid1];rolename2;rolename3;[userid2];[userid3]}" where "!" designates Deny permissions - public string EncodePermissions(int entityId, IEnumerable permissionList) + public string EncodePermissions(IEnumerable permissionList) { List permissionstrings = new List(); string permissionname = ""; string permissions = ""; StringBuilder permissionsbuilder = new StringBuilder(); string securityid = ""; - foreach (Permission permission in permissionList.Where(item => item.EntityId == entityId).OrderBy(item => item.PermissionName)) + foreach (Permission permission in permissionList.OrderBy(item => item.PermissionName)) { // permission collections are grouped by permissionname if (permissionname != permission.PermissionName) diff --git a/Oqtane.Server/Repository/SiteRepository.cs b/Oqtane.Server/Repository/SiteRepository.cs index 7dead20c..d1d0d1d5 100644 --- a/Oqtane.Server/Repository/SiteRepository.cs +++ b/Oqtane.Server/Repository/SiteRepository.cs @@ -3,7 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Oqtane.Infrastructure.Interfaces; using Oqtane.Models; using Oqtane.Modules; using Oqtane.Shared; @@ -22,10 +24,12 @@ namespace Oqtane.Repository private readonly IModuleRepository _moduleRepository; private readonly IPageModuleRepository _pageModuleRepository; private readonly IModuleDefinitionRepository _moduleDefinitionRepository; + private readonly IPermissionRepository _permissionRepository; private readonly IServiceProvider _serviceProvider; - private readonly List _siteTemplate; + private readonly List _pageTemplates; + private readonly IConfigurationRoot _config; - public SiteRepository(TenantDBContext context, IRoleRepository roleRepository, IProfileRepository profileRepository, IFolderRepository folderRepository, IFileRepository fileRepository, IPageRepository pageRepository, IModuleRepository moduleRepository, IPageModuleRepository pageModuleRepository, IModuleDefinitionRepository moduleDefinitionRepository, IServiceProvider serviceProvider) + public SiteRepository(TenantDBContext context, IRoleRepository roleRepository, IProfileRepository profileRepository, IFolderRepository folderRepository, IFileRepository fileRepository, IPageRepository pageRepository, IModuleRepository moduleRepository, IPageModuleRepository pageModuleRepository, IModuleDefinitionRepository moduleDefinitionRepository, IPermissionRepository permissionRepository, IServiceProvider serviceProvider, IConfigurationRoot config) { _db = context; _roleRepository = roleRepository; @@ -36,94 +40,259 @@ namespace Oqtane.Repository _moduleRepository = moduleRepository; _pageModuleRepository = pageModuleRepository; _moduleDefinitionRepository = moduleDefinitionRepository; + _permissionRepository = permissionRepository; _serviceProvider = serviceProvider; + _config = config; - // define the default site template - _siteTemplate = new List(); - _siteTemplate.Add(new PageTemplate { Name = "Home", Parent = "", Path = "", Icon = "home", IsNavigation = true, IsPersonalizable = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { - new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Welcome To Oqtane...", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", - Content = "

Oqtane is an open source modular application framework built from the ground up using modern .NET Core technology. It leverages the revolutionary new Blazor component model to create a fully dynamic web development experience which can be executed on a client or server. Whether you are looking for a platform to accelerate your web development efforts, or simply interested in exploring the anatomy of a large-scale Blazor application, Oqtane provides a solid foundation based on proven enterprise architectural principles.

" + - "



Join Our Community  Clone Our Repo

" + - "

Blazor is a single-page app framework that lets you build interactive web applications using C# instead of JavaScript. Client-side Blazor relies on WebAssembly, an open web standard that does not require plugins or code transpilation in order to run natively in a web browser. Server-side Blazor uses SignalR to host your application on a web server and provide a responsive and robust debugging experience. Blazor applications works in all modern web browsers, including mobile browsers.

" + - "

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

" - }, - new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "MIT License", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", - Content = "

Copyright (c) 2019-2020 .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 in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

" + - "

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

" + - "

THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

" - } + // define the default site template ( admin pages ) + _pageTemplates = new List(); + _pageTemplates.Add(new PageTemplate { Name = "Admin", Parent = "", Path = "admin", Icon = "", IsNavigation = false, IsPersonalizable = false, EditMode = true, + PagePermissions = _permissionRepository.EncodePermissions(new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), + PageTemplateModules = new List { + new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Dashboard, Oqtane.Client", Title = "Admin Dashboard", Pane = "Content", + ModulePermissions = _permissionRepository.EncodePermissions( new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), Content = "" } + }}); + _pageTemplates.Add(new PageTemplate { Name = "Site Management", Parent = "Admin", Path = "admin/sites", Icon = "globe", IsNavigation = false, IsPersonalizable = false, EditMode = true, + PagePermissions = _permissionRepository.EncodePermissions(new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), + PageTemplateModules = new List { + new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Sites, Oqtane.Client", Title = "Site Management", Pane = "Content", + ModulePermissions = _permissionRepository.EncodePermissions( new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), Content = "" } } - }); - _siteTemplate.Add(new PageTemplate { Name = "Private", Parent = "", Path = "private", Icon = "lock-locked", IsNavigation = true, IsPersonalizable = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Registered Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { - new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Secure Content", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Registered Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", - Content = "

Oqtane allows you to control access to your content using security roles. This page is only visible to Registered Users of the site.

" - } + }); + _pageTemplates.Add(new PageTemplate { Name = "Site Settings", Parent = "Admin", Path = "admin/site", Icon = "home", IsNavigation = false, IsPersonalizable = false, EditMode = true, + PagePermissions = _permissionRepository.EncodePermissions(new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), + PageTemplateModules = new List { + new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Site, Oqtane.Client", Title = "Site Settings", Pane = "Content", + ModulePermissions = _permissionRepository.EncodePermissions( new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), Content = "" } } - }); - _siteTemplate.Add(new PageTemplate { Name = "My Page", Parent = "", Path = "mypage", Icon = "target", IsNavigation = true, IsPersonalizable = true, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { - new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "My Page", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", - Content = "

Oqtane offers native support for user personalized pages. If a page is identified as personalizable by the site administrator in the page settings, when an authenticated user visits the page they will see an edit button at the top right corner of the page next to their username. When they click this button the sytem will create a new version of the page and allow them to edit the page content.

" - } + }); + _pageTemplates.Add(new PageTemplate { Name = "Page Management", Parent = "Admin", Path = "admin/pages", Icon = "layers", IsNavigation = false, IsPersonalizable = false, EditMode = true, + PagePermissions = _permissionRepository.EncodePermissions(new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), + PageTemplateModules = new List { + new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Pages, Oqtane.Client", Title = "Page Management", Pane = "Content", + ModulePermissions = _permissionRepository.EncodePermissions( new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), Content = "" } } - }); - _siteTemplate.Add(new PageTemplate { Name = "Admin", Parent = "", Path = "admin", Icon = "", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { - new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Dashboard, Oqtane.Client", Title = "Admin Dashboard", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } - }}); - _siteTemplate.Add(new PageTemplate { Name = "Site Management", Parent = "Admin", Path = "admin/sites", Icon = "globe", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { - new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Sites, Oqtane.Client", Title = "Site Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } - }}); - _siteTemplate.Add(new PageTemplate { Name = "Site Settings", Parent = "Admin", Path = "admin/site", Icon = "home", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { - new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Site, Oqtane.Client", Title = "Site Settings", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } - }}); - _siteTemplate.Add(new PageTemplate { Name = "Page Management", Parent = "Admin", Path = "admin/pages", Icon = "layers", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { - new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Pages, Oqtane.Client", Title = "Page Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } - }}); - _siteTemplate.Add(new PageTemplate { Name = "User Management", Parent = "Admin", Path = "admin/users", Icon = "people", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { - new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Users, Oqtane.Client", Title = "User Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } - }}); - _siteTemplate.Add(new PageTemplate { Name = "Profile Management", Parent = "Admin", Path = "admin/profiles", Icon = "person", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { - new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Profiles, Oqtane.Client", Title = "Profile Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } - }}); - _siteTemplate.Add(new PageTemplate { Name = "Role Management", Parent = "Admin", Path = "admin/roles", Icon = "lock-locked", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { - new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Roles, Oqtane.Client", Title = "Role Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } - }}); - _siteTemplate.Add(new PageTemplate { Name = "Event Log", Parent = "Admin", Path = "admin/log", Icon = "magnifying-glass", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { - new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Logs, Oqtane.Client", Title = "Event Log", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } - }}); - _siteTemplate.Add(new PageTemplate { Name = "File Management", Parent = "Admin", Path = "admin/files", Icon = "file", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { - new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Files, Oqtane.Client", Title = "File Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } - }}); - _siteTemplate.Add(new PageTemplate { Name = "Recycle Bin", Parent = "Admin", Path = "admin/recyclebin", Icon = "trash", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { - new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.RecycleBin, Oqtane.Client", Title = "Recycle Bin", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } - }}); - _siteTemplate.Add(new PageTemplate { Name = "Tenant Management", Parent = "Admin", Path = "admin/tenants", Icon = "list", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { - new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Tenants, Oqtane.Client", Title = "Tenant Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } - }}); - _siteTemplate.Add(new PageTemplate { Name = "Module Management", Parent = "Admin", Path = "admin/modules", Icon = "browser", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { - new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.ModuleDefinitions, Oqtane.Client", Title = "Module Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } - }}); - _siteTemplate.Add(new PageTemplate { Name = "Theme Management", Parent = "Admin", Path = "admin/themes", Icon = "brush", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { - new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Themes, Oqtane.Client", Title = "Theme Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } - }}); - _siteTemplate.Add(new PageTemplate { Name = "Scheduled Jobs", Parent = "Admin", Path = "admin/jobs", Icon = "timer", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { - new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Jobs, Oqtane.Client", Title = "Scheduled Jobs", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } - }}); - _siteTemplate.Add(new PageTemplate { Name = "Upgrade Service", Parent = "Admin", Path = "admin/upgrade", Icon = "aperture", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { - new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Upgrade, Oqtane.Client", Title = "Upgrade Service", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } - }}); - _siteTemplate.Add(new PageTemplate { Name = "Login", Parent = "", Path = "login", Icon = "lock-locked", IsNavigation = false, IsPersonalizable = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { - new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Login, Oqtane.Client", Title = "User Login", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } - }}); - _siteTemplate.Add(new PageTemplate { Name = "Register", Parent = "", Path = "register", Icon = "person", IsNavigation = false, IsPersonalizable = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { - new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Register, Oqtane.Client", Title = "User Registration", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } - }}); - _siteTemplate.Add(new PageTemplate { Name = "Reset", Parent = "", Path = "reset", Icon = "person", IsNavigation = false, IsPersonalizable = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { - new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Reset, Oqtane.Client", Title = "Password Reset", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } - }}); - _siteTemplate.Add(new PageTemplate { Name = "Profile", Parent = "", Path = "profile", Icon = "person", IsNavigation = false, IsPersonalizable = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { - new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.UserProfile, Oqtane.Client", Title = "User Profile", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } - }}); + }); + _pageTemplates.Add(new PageTemplate { Name = "User Management", Parent = "Admin", Path = "admin/users", Icon = "people", IsNavigation = false, IsPersonalizable = false, EditMode = true, + PagePermissions = _permissionRepository.EncodePermissions(new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), + PageTemplateModules = new List { + new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Users, Oqtane.Client", Title = "User Management", Pane = "Content", + ModulePermissions = _permissionRepository.EncodePermissions( new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), Content = "" } + } + }); + _pageTemplates.Add(new PageTemplate { Name = "Profile Management", Parent = "Admin", Path = "admin/profiles", Icon = "person", IsNavigation = false, IsPersonalizable = false, EditMode = true, + PagePermissions = _permissionRepository.EncodePermissions(new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), + PageTemplateModules = new List { + new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Profiles, Oqtane.Client", Title = "Profile Management", Pane = "Content", + ModulePermissions = _permissionRepository.EncodePermissions( new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), Content = "" } + } + }); + _pageTemplates.Add(new PageTemplate { Name = "Role Management", Parent = "Admin", Path = "admin/roles", Icon = "lock-locked", IsNavigation = false, IsPersonalizable = false, EditMode = true, + PagePermissions = _permissionRepository.EncodePermissions(new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), + PageTemplateModules = new List { + new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Roles, Oqtane.Client", Title = "Role Management", Pane = "Content", + ModulePermissions = _permissionRepository.EncodePermissions( new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), Content = "" } + } + }); + _pageTemplates.Add(new PageTemplate { Name = "Event Log", Parent = "Admin", Path = "admin/log", Icon = "magnifying-glass", IsNavigation = false, IsPersonalizable = false, EditMode = true, + PagePermissions = _permissionRepository.EncodePermissions(new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), + PageTemplateModules = new List { + new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Logs, Oqtane.Client", Title = "Event Log", Pane = "Content", + ModulePermissions = _permissionRepository.EncodePermissions( new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), Content = "" } + } + }); + _pageTemplates.Add(new PageTemplate { Name = "File Management", Parent = "Admin", Path = "admin/files", Icon = "file", IsNavigation = false, IsPersonalizable = false, EditMode = true, + PagePermissions = _permissionRepository.EncodePermissions(new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), + PageTemplateModules = new List { + new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Files, Oqtane.Client", Title = "File Management", Pane = "Content", + ModulePermissions = _permissionRepository.EncodePermissions( new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), Content = "" } + } + }); + _pageTemplates.Add(new PageTemplate { Name = "Recycle Bin", Parent = "Admin", Path = "admin/recyclebin", Icon = "trash", IsNavigation = false, IsPersonalizable = false, EditMode = true, + PagePermissions = _permissionRepository.EncodePermissions(new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), + PageTemplateModules = new List { + new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.RecycleBin, Oqtane.Client", Title = "Recycle Bin", Pane = "Content", + ModulePermissions = _permissionRepository.EncodePermissions( new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), Content = "" } + } + }); + _pageTemplates.Add(new PageTemplate { Name = "Tenant Management", Parent = "Admin", Path = "admin/tenants", Icon = "list", IsNavigation = false, IsPersonalizable = false, EditMode = true, + PagePermissions = _permissionRepository.EncodePermissions(new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), + PageTemplateModules = new List { + new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Tenants, Oqtane.Client", Title = "Tenant Management", Pane = "Content", + ModulePermissions = _permissionRepository.EncodePermissions( new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), Content = "" } + } + }); + _pageTemplates.Add(new PageTemplate { Name = "Module Management", Parent = "Admin", Path = "admin/modules", Icon = "browser", IsNavigation = false, IsPersonalizable = false, EditMode = true, + PagePermissions = _permissionRepository.EncodePermissions(new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), + PageTemplateModules = new List { + new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.ModuleDefinitions, Oqtane.Client", Title = "Module Management", Pane = "Content", + ModulePermissions = _permissionRepository.EncodePermissions( new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), Content = "" } + } + }); + _pageTemplates.Add(new PageTemplate { Name = "Theme Management", Parent = "Admin", Path = "admin/themes", Icon = "brush", IsNavigation = false, IsPersonalizable = false, EditMode = true, + PagePermissions = _permissionRepository.EncodePermissions(new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), + PageTemplateModules = new List { + new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Themes, Oqtane.Client", Title = "Theme Management", Pane = "Content", + ModulePermissions = _permissionRepository.EncodePermissions( new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), Content = "" } + } + }); + _pageTemplates.Add(new PageTemplate { Name = "Scheduled Jobs", Parent = "Admin", Path = "admin/jobs", Icon = "timer", IsNavigation = false, IsPersonalizable = false, EditMode = true, + PagePermissions = _permissionRepository.EncodePermissions(new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), + PageTemplateModules = new List { + new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Jobs, Oqtane.Client", Title = "Scheduled Jobs", Pane = "Content", + ModulePermissions = _permissionRepository.EncodePermissions( new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), Content = "" } + } + }); + _pageTemplates.Add(new PageTemplate { Name = "Upgrade Service", Parent = "Admin", Path = "admin/upgrade", Icon = "aperture", IsNavigation = false, IsPersonalizable = false, EditMode = true, + PagePermissions = _permissionRepository.EncodePermissions(new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), + PageTemplateModules = new List { + new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Upgrade, Oqtane.Client", Title = "Upgrade Service", Pane = "Content", + ModulePermissions = _permissionRepository.EncodePermissions( new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), Content = "" } + } + }); + _pageTemplates.Add(new PageTemplate { Name = "Login", Parent = "", Path = "login", Icon = "lock-locked", IsNavigation = false, IsPersonalizable = false, EditMode = false, + PagePermissions = _permissionRepository.EncodePermissions(new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), + PageTemplateModules = new List { + new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Login, Oqtane.Client", Title = "User Login", Pane = "Content", + ModulePermissions = _permissionRepository.EncodePermissions( new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), Content = "" } + } + }); + _pageTemplates.Add(new PageTemplate { Name = "Register", Parent = "", Path = "register", Icon = "person", IsNavigation = false, IsPersonalizable = false, EditMode = false, + PagePermissions = _permissionRepository.EncodePermissions(new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), + PageTemplateModules = new List { + new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Register, Oqtane.Client", Title = "User Registration", Pane = "Content", + ModulePermissions = _permissionRepository.EncodePermissions( new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), Content = "" } + } + }); + + _pageTemplates.Add(new PageTemplate { Name = "Reset", Parent = "", Path = "reset", Icon = "person", IsNavigation = false, IsPersonalizable = false, EditMode = false, + PagePermissions = _permissionRepository.EncodePermissions(new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), + PageTemplateModules = new List { + new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Reset, Oqtane.Client", Title = "Password Reset", Pane = "Content", + ModulePermissions = _permissionRepository.EncodePermissions( new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), Content = "" } + } + }); + _pageTemplates.Add(new PageTemplate { Name = "Profile", Parent = "", Path = "profile", Icon = "person", IsNavigation = false, IsPersonalizable = false, EditMode = false, + PagePermissions = _permissionRepository.EncodePermissions(new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), + PageTemplateModules = new List { + new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.UserProfile, Oqtane.Client", Title = "User Profile", Pane = "Content", + ModulePermissions = _permissionRepository.EncodePermissions( new List { + new Permission(PermissionNames.View, Constants.AdminRole, true), + new Permission(PermissionNames.Edit, Constants.AdminRole, true) + }), Content = "" } + } + }); } public IEnumerable GetSites() @@ -160,6 +329,7 @@ namespace Oqtane.Repository private void CreateSite(Site site) { + // create default entities for site List roles = _roleRepository.GetRoles(site.SiteId, true).ToList(); if (!roles.Where(item => item.Name == Constants.AllUsersRole).Any()) { @@ -184,15 +354,38 @@ namespace Oqtane.Repository Folder folder = _folderRepository.AddFolder(new Folder { SiteId = site.SiteId, ParentId = null, Name = "Root", Path = "", Order = 1, IsSystem = true, Permissions = "[{\"PermissionName\":\"Browse\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"View\",\"Permissions\":\"All Users\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]" }); _folderRepository.AddFolder(new Folder { SiteId = site.SiteId, ParentId = folder.FolderId, Name = "Users", Path = "Users\\", Order = 1, IsSystem = true, Permissions = "[{\"PermissionName\":\"Browse\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]" }); - if (site.Name == "Default Site") - { - File file = _fileRepository.AddFile(new File { FolderId = folder.FolderId, Name = "logo.png", Extension = "png", Size = 8192, ImageHeight = 80, ImageWidth = 250 }); - site.LogoFileId = file.FileId; - UpdateSite(site); - } + CreatePages(site, _pageTemplates); + + // process site template + if (string.IsNullOrEmpty(site.SiteTemplateType)) + { + var section = _config.GetSection("SiteTemplate"); + if (section.Exists()) + { + site.SiteTemplateType = section.Value; + } + else + { + site.SiteTemplateType = Constants.DefaultSiteTemplate; + } + } + Type siteTemplateType = Type.GetType(site.SiteTemplateType); + if (siteTemplateType != null) + { + var siteTemplateObject = ActivatorUtilities.CreateInstance(_serviceProvider, siteTemplateType); + List pageTemplates = ((ISiteTemplate)siteTemplateObject).CreateSite(site); + if (pageTemplates != null && pageTemplates.Count > 0) + { + CreatePages(site, pageTemplates); + } + } + } + + private void CreatePages(Site site, List pageTemplates) + { List moduledefinitions = _moduleDefinitionRepository.GetModuleDefinitions(site.SiteId).ToList(); - foreach (PageTemplate pagetemplate in _siteTemplate) + foreach (PageTemplate pagetemplate in pageTemplates) { int? parentid = null; if (pagetemplate.Parent != "") @@ -220,7 +413,7 @@ namespace Oqtane.Repository }; page = _pageRepository.AddPage(page); - foreach(PageTemplateModule pagetemplatemodule in pagetemplate.PageTemplateModules) + foreach (PageTemplateModule pagetemplatemodule in pagetemplate.PageTemplateModules) { if (pagetemplatemodule.ModuleDefinitionName != "") { @@ -264,7 +457,6 @@ namespace Oqtane.Repository }; _pageModuleRepository.AddPageModule(pagemodule); } - } } } diff --git a/Oqtane.Server/Repository/SiteTemplateRepository.cs b/Oqtane.Server/Repository/SiteTemplateRepository.cs new file mode 100644 index 00000000..4d3b5f7b --- /dev/null +++ b/Oqtane.Server/Repository/SiteTemplateRepository.cs @@ -0,0 +1,57 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using Microsoft.Extensions.DependencyInjection; +using Oqtane.Infrastructure.Interfaces; +using Oqtane.Models; + +namespace Oqtane.Repository +{ + public class SiteTemplateRepository : ISiteTemplateRepository + { + private readonly IServiceProvider _serviceProvider; + + public SiteTemplateRepository(IServiceProvider serviceProvider) + { + _serviceProvider = serviceProvider; + } + + private List LoadSiteTemplates() + { + List siteTemplates = new List(); + + // iterate through Oqtane site template assemblies + Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies() + .Where(item => item.FullName.StartsWith("Oqtane.") || item.FullName.Contains(".SiteTemplate.")).ToArray(); + foreach (Assembly assembly in assemblies) + { + siteTemplates = LoadSiteTemplatesFromAssembly(siteTemplates, assembly); + } + + return siteTemplates; + } + + private List LoadSiteTemplatesFromAssembly(List siteTemplates, Assembly assembly) + { + SiteTemplate siteTemplate; + Type[] siteTemplateTypes = assembly.GetTypes().Where(item => item.GetInterfaces().Contains(typeof(ISiteTemplate))).ToArray(); + foreach (Type siteTemplateType in siteTemplateTypes) + { + var siteTemplateObject = ActivatorUtilities.CreateInstance(_serviceProvider, siteTemplateType); + siteTemplate = new SiteTemplate + { + Name = (string)siteTemplateType.GetProperty("Name").GetValue(siteTemplateObject), + TypeName = siteTemplateType.AssemblyQualifiedName + }; + siteTemplates.Add(siteTemplate); + } + return siteTemplates; + } + + public IEnumerable GetSiteTemplates() + { + return LoadSiteTemplates(); + } + } +} diff --git a/Oqtane.Server/Security/UserPermissions.cs b/Oqtane.Server/Security/UserPermissions.cs index 2e20b062..72108b5d 100644 --- a/Oqtane.Server/Security/UserPermissions.cs +++ b/Oqtane.Server/Security/UserPermissions.cs @@ -19,7 +19,7 @@ namespace Oqtane.Security public bool IsAuthorized(ClaimsPrincipal user, string entityName, int entityId, string permissionName) { - return IsAuthorized(user, permissionName, _permissions.EncodePermissions(entityId, _permissions.GetPermissions(entityName, entityId, permissionName).ToList())); + return IsAuthorized(user, permissionName, _permissions.EncodePermissions(_permissions.GetPermissions(entityName, entityId, permissionName).ToList())); } public bool IsAuthorized(ClaimsPrincipal user, string permissionName, string permissions) diff --git a/Oqtane.Server/Startup.cs b/Oqtane.Server/Startup.cs index 79a2d31c..ff1de600 100644 --- a/Oqtane.Server/Startup.cs +++ b/Oqtane.Server/Startup.cs @@ -104,6 +104,7 @@ namespace Oqtane services.AddScoped(); services.AddScoped(); services.AddScoped(); + services.AddScoped(); services.AddSingleton(); @@ -181,9 +182,11 @@ namespace Oqtane services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddOqtaneModules(); services.AddOqtaneThemes(); + services.AddOqtaneSiteTemplates(); services.AddMvc() .AddOqtaneApplicationParts() @@ -332,9 +335,11 @@ namespace Oqtane services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddOqtaneModules(); services.AddOqtaneThemes(); + services.AddOqtaneSiteTemplates(); services.AddMvc() .AddOqtaneApplicationParts() diff --git a/Oqtane.Server/wwwroot/images/logo.png b/Oqtane.Server/wwwroot/images/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..94454bf601612d061901f9d33121d19f5996d8bf GIT binary patch literal 7963 zcmcJUWmHsAyT@s1hDJg{TDlpehL-Mb>4qVchM`M9kcI&fBvlxsTR^E9N@+$wN*V-_ zxJTc2t^4JEy=$E_XJ+=EHT&$dpa1jwKRZcJM~#G#o)7~AgG57J*#Nj+0jC~59`GvU z;feq*I4+9XiWnI0Gl;J3ae>bSzUt-y7#I}3e@{%-!aR52OBSe#8C1#N$sX$F<89>T z<%A(3BrFXU5&?^du?S0mMWn&v!bh&wP@wPqzkLmToT0(?{!SRa_HN!#0dFTLiwL`NOla*5Q-p=76a}@G! zWIiiHcw1nRQ%g+5RzpkcdgW6Jt^RDU0vSFjX>QYqQyBtb%mHQN;!-2LA;hqDT7)I3 z{&*zt$^&y(U&?o_SG0(u4OaB{nE}@slT460+!nK}*0T_}sW8l@i&<-H>tVeNh^3_^ zsf(rnYXT`#4O&1iF(oA%(u1X7Ixq2efc>{Oe@YdYc;znFV!QM5@?=^QHz-g`OIE|y zWf*Yz!GA;K{WnBrd~n2dh}l& z+57L7R-2%i(~O~^AyD185kB1~RH8np51qGc@n^iS7W-v~Fo|&29nUuflTrD{WJsp?y z;TI6FxrZw0@I_;lj!UD_=$?(5gtgFisdh`H}Z&wQd!@v^AsS_IEbuyjtCoyIDF18384q$A|``{coVlM4qP z;&AsDi)EySK68^-Fg_dzW;GG;$5O2D+2Ic)Q;Ue-v{k4Fx$nuAE|_}Rm+mMM`q|Mb^MHw z!DLGhX)sZF`gFrbIG{Z&iAGsro9u`ueymvLVz{U-Drtl2Lrja;q6BGa#-j9HTfmm< z=MM~C=V@eTg>J_5JP{A-5+&K{KEQTN2ysqYJ2_uBXTyd2W7Y>U>`C`|mXrc^C`Tz;9Z5Y=cEEi6 zES}G{+lmW{Us>DP`FQcwCh3qHm-7WYjNa07p?Sw8ukultwKqx*#0I}u6N;ELCQ{V@ zry(*_R8)_hKXo{a&yhCXP|J-SBAsGwz@VjFAhJ@NcJ9OE0Rct3!nqCXe8}cwLY2COcdQr0LWn<39EU>vlv(ZDogDK)Jf60?dLr9dVq&7qTT&6J_n~?{?nVZ`zkU1W zBD=Tz(P!1SdE8f7(b1Qw?^1?NR9EQM#Mumlqt-gZ{iM9zubb>BT!)2zMD>r815-&- zU=SyciSIU&^}_k#l>2JrUAVEz3=JJaG7{wthW{aQS4#AxEB!*Xkf31M6~BJ{Lpf<> zWd*Z2Qi?zJ(uh}Y@Sj}ry23m_Qxa=*N+aZUG)$ip+8D^no5e*7qN8Oq@Cs?h6ljBf zeme#iXQx;=0Agv|C+?iQ`&uYseJD*HT@Ep6w7D@R{$(PkjEkqu45N~8nJ8-X^V38+ z)0m>;8R;0a*`WNO5_e2(NU@N8|DA7(6SAf8Ii)nCt$cYkv9iEJ*Zr{sx|lup?*q#( zkmUK?kOYu+oX)VGyj||vpP%RWa$8xD6iwzE*P7(Z z^~MPYP+z&Fp!jswD{5;!Fh=tQq*~pTAx?=_)|X3ae`w2-TtHJQ=H}*E>OV(X{;gO- z=NLC`AHvR7_byX&^WP%kpzaMH>Caqqb>^o^VlCe6Z1ur^e(itZ%&;Dje(K^PNK4`m z^{hl$5UuiSFMd9g%q2~DKXJoD+oS|ygzj zx4%g1)^v1qT)sNrJ6tc%RSXBi6XN4}A(LZcVpL!P{7kjSjFsquLJ4$rmx{x{xB9AK zL|Zj!GKd`Qc|lV@6*3^s{t)uq|7;u8z8t>r$fDI3oe_MnBu%Zalk-tqvxXU!6_n3D zQ2^{3SBg@ z`hh4a0lC}D_1rj}SSE*t9|P1OoKN0^V?Fv(tLPT*dbJ5iT3$>q}i4WN*r4^E@r>*a5duxR`vzgMGyMjKG1;EnH- z8f|y>#lMtb&Vt_rCHz7Uu_eUrKYit)$j{F&U9|rOKq84PX@{Mu%GJ1PWA9fJg*iE! zAJx1+pMIU4&G9=YZ2dJ*ZqAhM!c42*3q}y3ziV3!N>!g1T%+X>b6&1JHJcK1ceRTyP2mHx=*EeEbAy1Kj9 zoO&9v|Kpzg=#-n35m7gI0@Ec(64V>8u)YSLWCdRe)4nGG+ni^cVR@`)Z(H@qwQufuWb8{x?n0v1A)s2mfYwlDl;TOxFiuO%GSTsjGRLRN7xxOt73-C?8 zI3)lFk2%$AS^V297Q@)Be9p5fD( zz;KxkxDSSBa|^SEkRa+=lD|B8@ z{lgnfMKjxd<@-ufoqrgZ*N6CK)VRjb<+*Te(AY}5V(j^}wbfuF5ahZus_edEzl-+q zBDn%`Apov06z$VdfQz`kUb33ShEjvS*j5$yt?BU-F*y{DC-AIwF#Y0q%KW;k%X-!Y zT1++P{|l6;%LTn^0J!^Fgw_uyHz2$DCZW1AxoO$R)O0V``ei&{k6e}R*5)p?5Npx> zpSss>|FD__wz6Ii`)QVO@Lg#MSuftS&VnTR^y!oQmJ(lPUf!kb{#wG(WCp$X7Zhja zeK;IW<{rEzd?_QnNP-u)D{NFiGS^_eclw3}uNPr~4uV2MsKMhe78W6S8vI0EH8s4& zWQN>)d{%?=a+s(Zm`>)v>fLRy$~K(~7+z7F;oIU!!*3yGv=|Bc`loqE{r7a0?p;9; zcJ>!FRaLp~4ZRsGyG3tiand&Li#mrTocwoY@yDL54#!oi6=1yFQM{~q-te)rGb|6) zHKK?dIgCq4h%6x!-Q4(`{iS0EukUJj3lmM!ey_eulIWOw(r(%_VMHZZbMF(aZD)Rp zRQxWI)Sv*~MR1d2YSX5@C}GB6Ndw05%_9p?f{R|MB1!_Wl+T}8_=iA333TOen%T}e zJ3IA@Dx=PSKbQ#8^7TDRi@9a!6>pOiBQME7CQokqBZ$FRkue(U54<7`7uPZ)hvSpt_gx*7Y)zD}%LrlzuO^0|p)i5cb^)9waJNli` z!;%TvXD3fL+n!gwD8ns;-GHVMR!>JtWJ8Dia+9<+r51(7Dm;dX zinJtMrj>O30My)epmFI?bPZ2vA&ta>cU%M$|o8~ZH`#PE zQsMp>l0m|=RhuEcywwRlV1J^|42dnw#Rg(|0XjWVV;1uk)*X2lQH&Ipx#ELL?J^+N z$tHBk!Op8*MRj_XmNErR%Sg+_x>WnBpG$40C-^s)$Ln$GqARS5Af-`2qeE#0Z9KuXjtaXrwkk41Mf;N52!qR#8nx+auMbU4wrDnQKuYI)Td*32 z{r`kKl#uvkxzOEvg{(!Qe@2w?XPBctAkn?h3~E{`s>?9J{0FHhLfq`6C)>WcVEDuS zBlB&*VYlh;@%eeHY~xQ?NSm`tN(OVdbifmFZhqgH1!qK4=EeI)(hsePS*?m`IZO+w zI_JK6mB7kR>}Kz)XYcw;XhVf%L9_SjF=i>Hs}~uU(%qZ&KQs^P={A!EN1YkHgw}kN zSVn>-UFPdwl$PE-g2lXffJ5SVMI>1i+T3#LYMqMr=RWN*k(-;_G@`%n1Deg5d$ZUJ zM|P{B>j58^09)9d9IfA=C6GTg8+0&Z2WpW!NwNZOqHde{pnUVrC-#JNOXo%Vd2bD? zc7KtkKaj1V0K-Ibny7>pfmO1L?Zy0kDH(|#;q*B5TX{Uu{d#TYUpB-Uw*#dfX|yO- z4 zkCajB#gD!E`giZ%HL_m&`vEL~&B}=m-4J4!m?L#2GzEadc9X4TzCEy3XPb$MiMpuX zaUhy=CP|RKWd37U)-k;)5Z81z=rZ_<%;7e~Y6@y#=u3 zC+e5dndBp`5%{IXJvikamD}+tm(=Z=>-!o?MGJqGB2^*pmxvrg%>4D_K|g6<-m~ml z3P@T}c6LSQHIjkdnfMEKSRNM1PXIO;$9|?iD28z#__kTKGqWHA?ZaE*Q+9fP-%@&r zFW2c@WB}z6o9_-SQQ1g>E(Bt>7U@UQ&iobR8zF2pNVPCC<6VRbR)c0GUd55^=8=<= z!zsb#963nxv>jM_^|%WhsNC$qNL}7OKPYc)l}ZMd3Oumz=GQU--C_VL*W7h<^x``~ zSX<@gPin$FSA`BDnWvK_vNn;ykJZi1=jjBzM*#Lc=!2K78 zh75i!Se&V0k&iFM@MW^xADpl;HO*E~^oP-YiqQS!_*mdXN zpyez=0!tLBS7#ZgD~cR5vbD8E0B$X*nMd^U+d9kHshU)Z?FLZxQmkHSAPKz}JuRhm z(G29Alhe}*L~McG)^xl_zV~^c!TtO9%g3b}AzVUH68`$sd7maYIXR~oytFTf0e2Zr zG*}ke#(^L!uXf*9TsRvH?k=v?>jj&0K&6C=ksj{uVKiV)8Wg?t1v|%3ud`PV>f)0p z^A_2A$09i`eJs=c2V`e#WLnCvZZEc5K}zt4t0$xlk}R!)`LbcYKfk>vuv(&6Z1D=E z!k*vbWE1CAc?i-F#50mDj|#sG!!KQ)P+-@JnL=Zb#>dA;6zVz=j$fV0iTmipMw#{` z>LJ>jo5kWGCd97ovZ9otKeV1}JWP-DM)${+KH}q>Az%`1fg^XkYN~XKDI!>d!l)Ak zIHxlLZJzH`HirBW26^?OnDFF`aGm9!Yl-EoynrxNge4|dYQDN<7ZmhS^z{5`eP-bz zXN0*A5PbIq?}UMZ%q1Tb|7WmOF&3v-F;WQvX;53-wJ}n>Nz4zQTxtvO>Iu&1^|Mv! zX&9o=`I;+b+vEa+vHvITNkB=HHhmc3tJcVS$fNeqE{ioizRB%aWmVN%e3GxOCLfK} zsq&bnA4fiMqo$CVvnSAD{!rG3t9xe%>l~2Qz(i@%mkvG3`_!Mh5Ph=!2PIg=vJi3R zAzzM&kotCuOGLvhf1$0Z`A2kOOZ>Wggg9Jfq5{*aG%k^YJcb{5SYWk`&Z&!D1aaIn zlK-o(K+Zr+ljX2EVPIgOoKK?HYWK}uD;W1O54)(|0dUd5_WhvlKH9ILU>TXvf}BlS z=}Dk`at~cSXKx@axJ#s5zlFvzK3q}y@HYqENBg(Ypqosq*M&l_pgwfi_F|@6)Uck1 zt*!iTwDM1$jj`E_Ir9G~79SH-)Oug1WYl!Ylf|gPb(|C#_ssPs5=c&laYqmF`TVyqO8j|C3Y%P8tD$hM12E?oj$&UmlA!Ji#X+4KXQ=5LP*SIk4a^ zOMlHb>w>$WJfH<-=i+kVbvD$zD6Wt4Xv1y#LqjYuN~USZuCRBx+!6dYpH#j@5`-mq zyvJK|ZqYh{EfB(cyz?P<_8dd1@vappeEOfw2{HM4Tu>>693-ndD)pcV`TiGhcU!-B zp;!(*2?vM(zaA{EDWZDJ?oI~l-s@D&v7WQYdcz6S}*jXD*3ln3~Z=-CP& zR!V|hgD6YO?6U1R{8oWtBzcep#T5%^!B)ufplUJ9S@f~>r3$vuC*iYsEV=o>)dH&&yg3n zXAz2WaimoL>X#3AntE(T;{~f; zQIwSiIJVc1isghS>NH^SwMO=sjkfmP{2EiD#2e)S^K9&`~bv`>KLyttzQB$9LDC1>>+y-mmFs=xKj?+}` zGU8$xh@#U!flUy$YdBIUTl*M|Xl<-cg~Ts)V+g!+=w55N(!pte4ziMm{!l4sEI?akTzzwdEFi51DcRfF! zlwFN;xd(0h=l{9J$H(J!N1g#&LW>FW&lx(GS6h5mZ$(4a3xVQAq;|%%0k^C82J2xW z=+Lbjhd?288%Dat8~32BEcBm;daURg7_O^3>G#@J1Z1;$w8N3Q{qY{Yd?gZ_>c9U% zGd7lST)Ij9an1a z+Vf37@za?fQKP1(18M;GO;-wG!`N@2e6FdPvVS-9#NR3E0P(lxDOyooy?xNo&_Mt4 zoWO$6?%jcoy1MW6DnX=yRLD`8&bGiSO+r}(#fyc1H8)l%smtAhf&v2I5wrwvXsiK3 zmczlpA=d@}k*)0Hv|0K*G}P37XG5ZSbuRqRFX^kkjE!}&rw;$NEE3F{oUK)2D%E&c zuYxLET7;!mmD&(M36|^#O_8LG!S494>OsZGKt(~}Z)k6ijx`I&=uMT!(y_zoTA4q+ z>&aDTA959U`vmNO{O^XTeu0=CLjOmjx`fb% ZEyo$1+#R*=J79AfLqkPJxdCDq^FMa;ML_@n literal 0 HcmV?d00001 diff --git a/Oqtane.Shared/Models/GenericResponse.cs b/Oqtane.Shared/Models/Installation.cs similarity index 79% rename from Oqtane.Shared/Models/GenericResponse.cs rename to Oqtane.Shared/Models/Installation.cs index 2281d79f..4dc25840 100644 --- a/Oqtane.Shared/Models/GenericResponse.cs +++ b/Oqtane.Shared/Models/Installation.cs @@ -1,6 +1,6 @@ namespace Oqtane.Models { - public class GenericResponse + public class Installation { public bool Success { get; set; } public string Message { get; set; } diff --git a/Oqtane.Shared/Models/Permission.cs b/Oqtane.Shared/Models/Permission.cs index 0f7f7b61..aff910f4 100644 --- a/Oqtane.Shared/Models/Permission.cs +++ b/Oqtane.Shared/Models/Permission.cs @@ -19,5 +19,23 @@ namespace Oqtane.Models public DateTime ModifiedOn { get; set; } public Role Role { get; set; } + + public Permission() + { + } + + public Permission(string permissionName, string roleName, bool isAuthorized) + { + PermissionName = permissionName; + Role = new Role { Name = roleName }; + IsAuthorized = isAuthorized; + } + + public Permission(string permissionName, int userId, bool isAuthorized) + { + PermissionName = permissionName; + UserId = userId; + IsAuthorized = isAuthorized; + } } } diff --git a/Oqtane.Shared/Models/Site.cs b/Oqtane.Shared/Models/Site.cs index bcb358df..700209b2 100644 --- a/Oqtane.Shared/Models/Site.cs +++ b/Oqtane.Shared/Models/Site.cs @@ -1,4 +1,5 @@ using System; +using System.ComponentModel.DataAnnotations.Schema; namespace Oqtane.Models { @@ -12,7 +13,6 @@ namespace Oqtane.Models public string DefaultLayoutType { get; set; } public string DefaultContainerType { get; set; } - public string CreatedBy { get; set; } public DateTime CreatedOn { get; set; } public string ModifiedBy { get; set; } @@ -20,5 +20,8 @@ namespace Oqtane.Models public string DeletedBy { get; set; } public DateTime? DeletedOn { get; set; } public bool IsDeleted { get; set; } + + [NotMapped] + public string SiteTemplateType { get; set; } } } diff --git a/Oqtane.Shared/Models/PageTemplate.cs b/Oqtane.Shared/Models/SiteTemplate.cs similarity index 86% rename from Oqtane.Shared/Models/PageTemplate.cs rename to Oqtane.Shared/Models/SiteTemplate.cs index c87d2e58..e4e7a02d 100644 --- a/Oqtane.Shared/Models/PageTemplate.cs +++ b/Oqtane.Shared/Models/SiteTemplate.cs @@ -2,6 +2,12 @@ namespace Oqtane.Models { + public class SiteTemplate + { + public string Name { get; set; } + public string TypeName { get; set; } + } + public class PageTemplate { public string Name { get; set; } diff --git a/Oqtane.Shared/Shared/Constants.cs b/Oqtane.Shared/Shared/Constants.cs index c5b2926d..198db352 100644 --- a/Oqtane.Shared/Shared/Constants.cs +++ b/Oqtane.Shared/Shared/Constants.cs @@ -26,6 +26,8 @@ public const string ErrorModule = "Oqtane.Modules.Admin.Error.{Action}, Oqtane.Client"; public const string ModuleMessageComponent = "Oqtane.Modules.Controls.ModuleMessage, Oqtane.Client"; + public const string DefaultSiteTemplate = "Oqtane.SiteTemplates.DefaultSiteTemplate, Oqtane.Server"; + public const string ContentUrl = "/api/file/download/"; public const string HostUser = "host";