From 8deb119f36e6d345119050d4abb8ec6c66c9e9a3 Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Fri, 24 May 2019 13:33:19 -0400 Subject: [PATCH] Performance improvements, refactoring of multi-tenant support, split Alias and Tenant entities for cleaner separation of concerns, create an additional site during installation for demonstratng multitenancy --- Oqtane.Client/Modules/Admin/Admin/Index.razor | 2 +- Oqtane.Client/Modules/Admin/Login/Index.razor | 2 +- Oqtane.Client/Modules/Admin/Pages/Add.razor | 8 +- .../Modules/Admin/Pages/Delete.razor | 10 +- Oqtane.Client/Modules/Admin/Pages/Edit.razor | 7 +- Oqtane.Client/Modules/HtmlText/Edit.razor | 7 +- Oqtane.Client/Modules/HtmlText/Index.razor | 5 +- .../HtmlText/Services/HtmlTextService.cs | 12 ++- Oqtane.Client/Modules/ModuleBase.cs | 26 ++--- Oqtane.Client/Services/AliasService.cs | 53 ++++++++++ Oqtane.Client/Services/IAliasService.cs | 19 ++++ .../Services/ModuleDefinitionService.cs | 54 ++++++----- Oqtane.Client/Services/ModuleService.cs | 12 ++- Oqtane.Client/Services/PageModuleService.cs | 12 ++- Oqtane.Client/Services/PageService.cs | 12 ++- Oqtane.Client/Services/ServiceBase.cs | 18 ++-- Oqtane.Client/Services/SiteService.cs | 12 ++- Oqtane.Client/Services/TenantService.cs | 12 ++- Oqtane.Client/Services/ThemeService.cs | 55 +++++------ Oqtane.Client/Services/UserService.cs | 11 ++- Oqtane.Client/Shared/PageState.cs | 6 +- Oqtane.Client/Shared/SiteRouter.razor | 86 +++++++++++++---- Oqtane.Client/Shared/SiteState.cs | 11 +++ Oqtane.Client/Shared/Utilities.cs | 46 +++++++-- Oqtane.Client/Startup.cs | 11 +-- Oqtane.Client/Themes/AdminContainer.razor | 2 +- Oqtane.Client/Themes/ContainerBase.cs | 30 ++++++ .../Themes/Controls/ControlPanel.razor | 37 ++++--- Oqtane.Client/Themes/Controls/Login.razor | 4 +- Oqtane.Client/Themes/Controls/Logo.razor | 2 +- Oqtane.Client/Themes/Controls/Menu.razor | 4 +- Oqtane.Client/Themes/Controls/Mode.razor | 44 --------- .../Themes/Controls/ModuleActions.razor | 2 +- Oqtane.Client/Themes/ThemeBase.cs | 21 ++++ Oqtane.Client/Themes/ThemeObjectBase.cs | 20 ++++ Oqtane.Client/wwwroot/Sites/2/oqtane.png | Bin 0 -> 7963 bytes Oqtane.Client/wwwroot/index.html | 10 +- Oqtane.Client/wwwroot/js/site.js | 17 ---- Oqtane.Server/Controllers/AliasController.cs | 55 +++++++++++ Oqtane.Server/Controllers/TenantController.cs | 35 ++++++- .../HtmlText/Repository/HtmlTextContext.cs | 3 +- Oqtane.Server/Repository/AliasRepository.cs | 91 ++++++++++++++++++ Oqtane.Server/Repository/ContextBase.cs | 4 +- Oqtane.Server/Repository/HostContext.cs | 1 + Oqtane.Server/Repository/IAliasRepository.cs | 14 +++ Oqtane.Server/Repository/ITenantRepository.cs | 7 +- Oqtane.Server/Repository/ITenantResolver.cs | 9 ++ Oqtane.Server/Repository/TenantContext.cs | 4 +- Oqtane.Server/Repository/TenantRepository.cs | 76 +++++++++++---- Oqtane.Server/Repository/TenantResolver.cs | 48 +++++++++ Oqtane.Server/Scripts/Initialize.sql | 79 +++++++++++---- Oqtane.Server/Startup.cs | 9 +- Oqtane.Server/wwwroot/Sites/2/oqtane.png | Bin 0 -> 7963 bytes Oqtane.Server/wwwroot/favicon.ico | Bin 1150 -> 5430 bytes Oqtane.Shared/Models/Alias.cs | 41 ++++++++ Oqtane.Shared/Models/Page.cs | 4 +- Oqtane.Shared/Models/Tenant.cs | 3 +- 57 files changed, 878 insertions(+), 307 deletions(-) create mode 100644 Oqtane.Client/Services/AliasService.cs create mode 100644 Oqtane.Client/Services/IAliasService.cs create mode 100644 Oqtane.Client/Shared/SiteState.cs delete mode 100644 Oqtane.Client/Themes/Controls/Mode.razor create mode 100644 Oqtane.Client/wwwroot/Sites/2/oqtane.png create mode 100644 Oqtane.Server/Controllers/AliasController.cs create mode 100644 Oqtane.Server/Repository/AliasRepository.cs create mode 100644 Oqtane.Server/Repository/IAliasRepository.cs create mode 100644 Oqtane.Server/Repository/ITenantResolver.cs create mode 100644 Oqtane.Server/Repository/TenantResolver.cs create mode 100644 Oqtane.Server/wwwroot/Sites/2/oqtane.png create mode 100644 Oqtane.Shared/Models/Alias.cs diff --git a/Oqtane.Client/Modules/Admin/Admin/Index.razor b/Oqtane.Client/Modules/Admin/Admin/Index.razor index 62d3242f0..ddc6a87e6 100644 --- a/Oqtane.Client/Modules/Admin/Admin/Index.razor +++ b/Oqtane.Client/Modules/Admin/Admin/Index.razor @@ -12,7 +12,7 @@ { if (p.IsNavigation && UserService.IsAuthorized(PageState.User, p.ViewPermissions)) { - string url = PageState.Alias + p.Path; + string url = NavigateUrl(p.Path);
  • @p.Name diff --git a/Oqtane.Client/Modules/Admin/Login/Index.razor b/Oqtane.Client/Modules/Admin/Login/Index.razor index dcb9af1df..0afe0834c 100644 --- a/Oqtane.Client/Modules/Admin/Login/Index.razor +++ b/Oqtane.Client/Modules/Admin/Login/Index.razor @@ -39,7 +39,7 @@ { var interop = new Interop(jsRuntime); await interop.SetCookie("user", user.UserId.ToString(), 7); - UriHelper.NavigateTo(PageState.Alias, true); + UriHelper.NavigateTo(NavigateUrl(""), true); } else { diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor index 4a39046b0..bb6a93e32 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Add.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor @@ -3,7 +3,6 @@ @using Oqtane.Services @using Oqtane.Modules @using Oqtane.Shared -@using Oqtane.Client.Modules.Controls @inherits ModuleBase @inject IUriHelper UriHelper @inject IPageService PageService @@ -132,11 +131,10 @@ string viewpermissions = "All Users"; string editpermissions = "Administrators"; - protected override async Task OnInitAsync() + protected override void OnInit() { - var Themes = await ThemeService.GetThemesAsync(); - themes = ThemeService.GetThemeTypes(Themes); - panelayouts = ThemeService.GetPaneLayoutTypes(Themes); + themes = ThemeService.GetThemeTypes(PageState.Themes); + panelayouts = ThemeService.GetPaneLayoutTypes(PageState.Themes); } private async Task SavePage() diff --git a/Oqtane.Client/Modules/Admin/Pages/Delete.razor b/Oqtane.Client/Modules/Admin/Pages/Delete.razor index e8464ff66..3c8feeb04 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Delete.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Delete.razor @@ -3,7 +3,6 @@ @using Oqtane.Services @using Oqtane.Modules @using Oqtane.Shared -@using Oqtane.Client.Modules.Controls @inherits ModuleBase @inject IUriHelper UriHelper @inject IPageService PageService @@ -133,11 +132,10 @@ string viewpermissions; string editpermissions; - protected override async Task OnInitAsync() + protected override void OnInit() { - List Themes = await ThemeService.GetThemesAsync(); - themes = ThemeService.GetThemeTypes(Themes); - panelayouts = ThemeService.GetPaneLayoutTypes(Themes); + themes = ThemeService.GetThemeTypes(PageState.Themes); + panelayouts = ThemeService.GetPaneLayoutTypes(PageState.Themes); PageId = Int32.Parse(PageState.QueryString["id"]); Page p = PageState.Pages.Where(item => item.PageId == PageId).FirstOrDefault(); @@ -159,6 +157,6 @@ private async Task DeletePage() { await PageService.DeletePageAsync(Int32.Parse(PageState.QueryString["id"])); - UriHelper.NavigateTo(PageState.Alias); + UriHelper.NavigateTo(NavigateUrl("", true)); } } diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor index fb381e39f..698dc3de9 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor @@ -133,11 +133,10 @@ string viewpermissions; string editpermissions; - protected override async Task OnInitAsync() + protected override void OnInit() { - List Themes = await ThemeService.GetThemesAsync(); - themes = ThemeService.GetThemeTypes(Themes); - panelayouts = ThemeService.GetPaneLayoutTypes(Themes); + themes = ThemeService.GetThemeTypes(PageState.Themes); + panelayouts = ThemeService.GetPaneLayoutTypes(PageState.Themes); PageId = Int32.Parse(PageState.QueryString["id"]); Page p = PageState.Pages.Where(item => item.PageId == PageId).FirstOrDefault(); diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor index e6c74b7d6..de6c70e17 100644 --- a/Oqtane.Client/Modules/HtmlText/Edit.razor +++ b/Oqtane.Client/Modules/HtmlText/Edit.razor @@ -3,10 +3,11 @@ @using Oqtane.Client.Modules.HtmlText.Services @using Oqtane.Shared.Modules.HtmlText.Models @using System.Net.Http; -@using Oqtane.Client.Modules.Controls +@using Oqtane.Shared; @inherits ModuleBase @inject IUriHelper UriHelper @inject HttpClient http +@inject SiteState sitestate
    @@ -32,7 +33,7 @@ protected override async Task OnInitAsync() { - HtmlTextService htmltextservice = new HtmlTextService(http, UriHelper); + HtmlTextService htmltextservice = new HtmlTextService(http, sitestate); List htmltextlist = await htmltextservice.GetHtmlTextAsync(ModuleState.ModuleId); if (htmltextlist != null) { @@ -43,7 +44,7 @@ private async Task SaveContent() { - HtmlTextService htmltextservice = new HtmlTextService(http, UriHelper); + HtmlTextService htmltextservice = new HtmlTextService(http, sitestate); if (htmltext != null) { htmltext.Content = content; diff --git a/Oqtane.Client/Modules/HtmlText/Index.razor b/Oqtane.Client/Modules/HtmlText/Index.razor index a19ee82b5..a8fa3cd36 100644 --- a/Oqtane.Client/Modules/HtmlText/Index.razor +++ b/Oqtane.Client/Modules/HtmlText/Index.razor @@ -3,9 +3,10 @@ @using Oqtane.Shared.Modules.HtmlText.Models @using System.Net.Http; @using Oqtane.Client.Modules.Controls +@using Oqtane.Shared; @inherits ModuleBase @inject HttpClient http -@inject IUriHelper UriHelper +@inject SiteState sitestate @((MarkupString)content) @@ -16,7 +17,7 @@ protected override async Task OnInitAsync() { - HtmlTextService htmltextservice = new HtmlTextService(http, UriHelper); + HtmlTextService htmltextservice = new HtmlTextService(http, sitestate); List htmltext = await htmltextservice.GetHtmlTextAsync(ModuleState.ModuleId); if (htmltext != null) { diff --git a/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs b/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs index fb4097514..c6f2443b7 100644 --- a/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs +++ b/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs @@ -5,18 +5,24 @@ using Microsoft.AspNetCore.Components; using Oqtane.Services; using Oqtane.Shared.Modules.HtmlText.Models; +using Oqtane.Shared; namespace Oqtane.Client.Modules.HtmlText.Services { public class HtmlTextService : ServiceBase, IHtmlTextService { private readonly HttpClient http; - private readonly string apiurl; + private readonly SiteState sitestate; - public HtmlTextService(HttpClient http, IUriHelper urihelper) + public HtmlTextService(HttpClient http, SiteState sitestate) { this.http = http; - apiurl = CreateApiUrl(urihelper.GetAbsoluteUri(), "HtmlText"); + this.sitestate = sitestate; + } + + private string apiurl + { + get { return CreateApiUrl(sitestate.Alias, "HtmlText"); } } public async Task> GetHtmlTextAsync(int ModuleId) diff --git a/Oqtane.Client/Modules/ModuleBase.cs b/Oqtane.Client/Modules/ModuleBase.cs index f81d3bced..80fc318b1 100644 --- a/Oqtane.Client/Modules/ModuleBase.cs +++ b/Oqtane.Client/Modules/ModuleBase.cs @@ -20,46 +20,32 @@ public class ModuleBase : ComponentBase, IModuleControl public string NavigateUrl() { - return NavigateUrl(PageState.Page.Path, false); + return Utilities.NavigateUrl(PageState); } public string NavigateUrl(bool reload) { - return NavigateUrl(PageState.Page.Path, reload); + return Utilities.NavigateUrl(PageState, reload); } public string NavigateUrl(string path) { - return NavigateUrl(path, false); + return Utilities.NavigateUrl(PageState, path); } public string NavigateUrl(string path, bool reload) { - string url = PageState.Alias + path; - if (reload) - { - url += "?reload=true"; - } - return url; + return Utilities.NavigateUrl(PageState, path, reload); } public string EditUrl(string action) { - return EditUrl(action, ""); + return Utilities.EditUrl(PageState, ModuleState, action, ""); } public string EditUrl(string action, string parameters) { - string url = PageState.Alias + PageState.Page.Path + "?mid=" + ModuleState.ModuleId.ToString(); - if (action != "") - { - url += "&ctl=" + action; - } - if (!string.IsNullOrEmpty(parameters)) - { - url += "&" + parameters; - } - return url; + return Utilities.EditUrl(PageState, ModuleState, action, parameters); } } } diff --git a/Oqtane.Client/Services/AliasService.cs b/Oqtane.Client/Services/AliasService.cs new file mode 100644 index 000000000..acc81b47c --- /dev/null +++ b/Oqtane.Client/Services/AliasService.cs @@ -0,0 +1,53 @@ +using Oqtane.Models; +using System.Threading.Tasks; +using System.Net.Http; +using System.Linq; +using Microsoft.AspNetCore.Components; +using System.Collections.Generic; +using Oqtane.Shared; + +namespace Oqtane.Services +{ + public class AliasService : ServiceBase, IAliasService + { + private readonly HttpClient http; + private readonly IUriHelper urihelper; + + public AliasService(HttpClient http, IUriHelper urihelper) + { + this.http = http; + this.urihelper = urihelper; + } + + private string apiurl + { + get { return CreateApiUrl(urihelper.GetAbsoluteUri(), "Alias"); } + } + + public async Task> GetAliasesAsync() + { + List aliases = await http.GetJsonAsync>(apiurl); + return aliases.OrderBy(item => item.Name).ToList(); + } + + public async Task GetAliasAsync(int AliasId) + { + List aliases = await http.GetJsonAsync>(apiurl); + return aliases.Where(item => item.AliasId == AliasId).FirstOrDefault(); + } + + public async Task AddAliasAsync(Alias alias) + { + await http.PostJsonAsync(apiurl, alias); + } + + public async Task UpdateAliasAsync(Alias alias) + { + await http.PutJsonAsync(apiurl + "/" + alias.AliasId.ToString(), alias); + } + public async Task DeleteAliasAsync(int AliasId) + { + await http.DeleteAsync(apiurl + "/" + AliasId.ToString()); + } + } +} diff --git a/Oqtane.Client/Services/IAliasService.cs b/Oqtane.Client/Services/IAliasService.cs new file mode 100644 index 000000000..c4fe200be --- /dev/null +++ b/Oqtane.Client/Services/IAliasService.cs @@ -0,0 +1,19 @@ +using Oqtane.Models; +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace Oqtane.Services +{ + public interface IAliasService + { + Task> GetAliasesAsync(); + + Task GetAliasAsync(int AliasId); + + Task AddAliasAsync(Alias alias); + + Task UpdateAliasAsync(Alias alias); + + Task DeleteAliasAsync(int AliasId); + } +} diff --git a/Oqtane.Client/Services/ModuleDefinitionService.cs b/Oqtane.Client/Services/ModuleDefinitionService.cs index baa039d4d..75b06b2f7 100644 --- a/Oqtane.Client/Services/ModuleDefinitionService.cs +++ b/Oqtane.Client/Services/ModuleDefinitionService.cs @@ -6,54 +6,56 @@ using Microsoft.AspNetCore.Components; using System; using System.Reflection; +using Oqtane.Shared; namespace Oqtane.Services { public class ModuleDefinitionService : ServiceBase, IModuleDefinitionService { private readonly HttpClient http; - private readonly string apiurl; + private readonly SiteState sitestate; - private List moduledefinitions; - - public ModuleDefinitionService(HttpClient http, IUriHelper urihelper) + public ModuleDefinitionService(HttpClient http, SiteState sitestate) { this.http = http; - apiurl = CreateApiUrl(urihelper.GetAbsoluteUri(), "ModuleDefinition"); + this.sitestate = sitestate; + } + + private string apiurl + { + get { return CreateApiUrl(sitestate.Alias, "ModuleDefinition"); } } public async Task> GetModuleDefinitionsAsync() { - if (moduledefinitions == null) - { - moduledefinitions = await http.GetJsonAsync>(apiurl); + List moduledefinitions = await http.GetJsonAsync>(apiurl); - // get list of loaded assemblies - Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies(); + // get list of loaded assemblies + Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies(); - foreach (ModuleDefinition moduledefinition in moduledefinitions) + foreach (ModuleDefinition moduledefinition in moduledefinitions) + { + if (moduledefinition.Dependencies != "") { - if (moduledefinition.Dependencies != "") + foreach (string dependency in moduledefinition.Dependencies.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries)) { - foreach (string dependency in moduledefinition.Dependencies.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries)) + string assemblyname = dependency.Replace(".dll", ""); + if (assemblies.Where(item => item.FullName.StartsWith(assemblyname + ",")).FirstOrDefault() == null) { - string assemblyname = dependency.Replace(".dll", ""); - if (assemblies.Where(item => item.FullName.StartsWith(assemblyname + ",")).FirstOrDefault() == null) - { - // download assembly from server and load - var bytes = await http.GetByteArrayAsync("_framework/_bin/" + assemblyname + ".dll"); - Assembly.Load(bytes); - } + // download assembly from server and load + var bytes = await http.GetByteArrayAsync("_framework/_bin/" + assemblyname + ".dll"); + Assembly.Load(bytes); } } - if (assemblies.Where(item => item.FullName.StartsWith(moduledefinition.AssemblyName + ",")).FirstOrDefault() == null) - { - // download assembly from server and load - var bytes = await http.GetByteArrayAsync("_framework/_bin/" + moduledefinition.AssemblyName + ".dll"); - Assembly.Load(bytes); - } + } + if (assemblies.Where(item => item.FullName.StartsWith(moduledefinition.AssemblyName + ",")).FirstOrDefault() == null) + { + // download assembly from server and load + var bytes = await http.GetByteArrayAsync("_framework/_bin/" + moduledefinition.AssemblyName + ".dll"); + Assembly.Load(bytes); } } + return moduledefinitions.OrderBy(item => item.Name).ToList(); } } diff --git a/Oqtane.Client/Services/ModuleService.cs b/Oqtane.Client/Services/ModuleService.cs index a2fd4cef1..3b4b6d747 100644 --- a/Oqtane.Client/Services/ModuleService.cs +++ b/Oqtane.Client/Services/ModuleService.cs @@ -4,18 +4,24 @@ using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Components; +using Oqtane.Shared; namespace Oqtane.Services { public class ModuleService : ServiceBase, IModuleService { private readonly HttpClient http; - private readonly string apiurl; + private readonly SiteState sitestate; - public ModuleService(HttpClient http, IUriHelper urihelper) + public ModuleService(HttpClient http, SiteState sitestate) { this.http = http; - apiurl = CreateApiUrl(urihelper.GetAbsoluteUri(), "Module"); + this.sitestate = sitestate; + } + + private string apiurl + { + get { return CreateApiUrl(sitestate.Alias, "Module"); } } public async Task> GetModulesAsync(int PageId) diff --git a/Oqtane.Client/Services/PageModuleService.cs b/Oqtane.Client/Services/PageModuleService.cs index d017eb506..240b4c441 100644 --- a/Oqtane.Client/Services/PageModuleService.cs +++ b/Oqtane.Client/Services/PageModuleService.cs @@ -4,18 +4,24 @@ using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Components; +using Oqtane.Shared; namespace Oqtane.Services { public class PageModuleService : ServiceBase, IPageModuleService { private readonly HttpClient http; - private readonly string apiurl; + private readonly SiteState sitestate; - public PageModuleService(HttpClient http, IUriHelper urihelper) + public PageModuleService(HttpClient http, SiteState sitestate) { this.http = http; - apiurl = CreateApiUrl(urihelper.GetAbsoluteUri(), "PageModule"); + this.sitestate = sitestate; + } + + private string apiurl + { + get { return CreateApiUrl(sitestate.Alias, "PageModule"); } } public async Task> GetPageModulesAsync() diff --git a/Oqtane.Client/Services/PageService.cs b/Oqtane.Client/Services/PageService.cs index 26ed564f5..172d79509 100644 --- a/Oqtane.Client/Services/PageService.cs +++ b/Oqtane.Client/Services/PageService.cs @@ -4,18 +4,24 @@ using System.Net.Http; using Microsoft.AspNetCore.Components; using System.Collections.Generic; +using Oqtane.Shared; namespace Oqtane.Services { public class PageService : ServiceBase, IPageService { private readonly HttpClient http; - private readonly string apiurl; + private readonly SiteState sitestate; - public PageService(HttpClient http, IUriHelper urihelper) + public PageService(HttpClient http, SiteState sitestate) { this.http = http; - apiurl = CreateApiUrl(urihelper.GetAbsoluteUri(), "Page"); + this.sitestate = sitestate; + } + + private string apiurl + { + get { return CreateApiUrl(sitestate.Alias, "Page"); } } public async Task> GetPagesAsync(int SiteId) diff --git a/Oqtane.Client/Services/ServiceBase.cs b/Oqtane.Client/Services/ServiceBase.cs index 71a1b6114..ca7c588fe 100644 --- a/Oqtane.Client/Services/ServiceBase.cs +++ b/Oqtane.Client/Services/ServiceBase.cs @@ -1,20 +1,24 @@ using System; +using Oqtane.Models; using Oqtane.Shared; namespace Oqtane.Services { public class ServiceBase { + // method for alias agnostic api call public string CreateApiUrl(string absoluteUri, string serviceName) { Uri uri = new Uri(absoluteUri); - string apiurl = uri.Scheme + "://" + uri.Authority + "/"; - string alias = Utilities.GetAlias(absoluteUri); - if (alias != "") - { - apiurl += alias; - } - else + string apiurl = uri.Scheme + "://" + uri.Authority + "/~/api/" + serviceName; + return apiurl; + } + + // method for alias specific api call + public string CreateApiUrl(Alias alias, string serviceName) + { + string apiurl = alias.Url + "/"; + if (alias.Path == "") { apiurl += "~/"; } diff --git a/Oqtane.Client/Services/SiteService.cs b/Oqtane.Client/Services/SiteService.cs index 4289bdf54..7d7d135e5 100644 --- a/Oqtane.Client/Services/SiteService.cs +++ b/Oqtane.Client/Services/SiteService.cs @@ -4,18 +4,24 @@ using System.Linq; using Microsoft.AspNetCore.Components; using System.Collections.Generic; +using Oqtane.Shared; namespace Oqtane.Services { public class SiteService : ServiceBase, ISiteService { private readonly HttpClient http; - private readonly string apiurl; + private readonly SiteState sitestate; - public SiteService(HttpClient http, IUriHelper urihelper) + public SiteService(HttpClient http, SiteState sitestate) { this.http = http; - apiurl = CreateApiUrl(urihelper.GetAbsoluteUri(), "Site"); + this.sitestate = sitestate; + } + + private string apiurl + { + get { return CreateApiUrl(sitestate.Alias, "Site"); } } public async Task> GetSitesAsync() diff --git a/Oqtane.Client/Services/TenantService.cs b/Oqtane.Client/Services/TenantService.cs index 6e41be0a2..9904f6aa4 100644 --- a/Oqtane.Client/Services/TenantService.cs +++ b/Oqtane.Client/Services/TenantService.cs @@ -2,18 +2,24 @@ using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Components; +using Oqtane.Shared; namespace Oqtane.Services { public class TenantService : ServiceBase, ITenantService { private readonly HttpClient http; - private readonly string apiurl; + private readonly SiteState sitestate; - public TenantService(HttpClient http, IUriHelper urihelper) + public TenantService(HttpClient http, SiteState sitestate) { this.http = http; - apiurl = CreateApiUrl(urihelper.GetAbsoluteUri(), "Tenant"); + this.sitestate = sitestate; + } + + private string apiurl + { + get { return CreateApiUrl(sitestate.Alias, "Tenant"); } } public async Task GetTenantAsync() diff --git a/Oqtane.Client/Services/ThemeService.cs b/Oqtane.Client/Services/ThemeService.cs index 5ed20b459..b6c2201e5 100644 --- a/Oqtane.Client/Services/ThemeService.cs +++ b/Oqtane.Client/Services/ThemeService.cs @@ -13,48 +13,49 @@ namespace Oqtane.Services public class ThemeService : ServiceBase, IThemeService { private readonly HttpClient http; - private readonly string apiurl; + private readonly SiteState sitestate; - private List themes; - - public ThemeService(HttpClient http, IUriHelper urihelper) + public ThemeService(HttpClient http, SiteState sitestate) { this.http = http; - apiurl = CreateApiUrl(urihelper.GetAbsoluteUri(), "Theme"); + this.sitestate = sitestate; + } + + private string apiurl + { + get { return CreateApiUrl(sitestate.Alias, "Theme"); } } - //TODO: Implement Caching or otherwise on this, and other calls within this class + public async Task> GetThemesAsync() { - if (themes == null) - { - themes = await http.GetJsonAsync>(apiurl); + List themes = await http.GetJsonAsync>(apiurl); - // get list of loaded assemblies - Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies(); + // get list of loaded assemblies + Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies(); - foreach (Theme theme in themes) + foreach (Theme theme in themes) + { + if (theme.Dependencies != "") { - if (theme.Dependencies != "") + foreach (string dependency in theme.Dependencies.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries)) { - foreach (string dependency in theme.Dependencies.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries)) + string assemblyname = dependency.Replace(".dll", ""); + if (assemblies.Where(item => item.FullName.StartsWith(assemblyname + ",")).FirstOrDefault() == null) { - string assemblyname = dependency.Replace(".dll", ""); - if (assemblies.Where(item => item.FullName.StartsWith(assemblyname + ",")).FirstOrDefault() == null) - { - // download assembly from server and load - var bytes = await http.GetByteArrayAsync("_framework/_bin/" + assemblyname + ".dll"); - Assembly.Load(bytes); - } + // download assembly from server and load + var bytes = await http.GetByteArrayAsync("_framework/_bin/" + assemblyname + ".dll"); + Assembly.Load(bytes); } } - if (assemblies.Where(item => item.FullName.StartsWith(theme.AssemblyName + ",")).FirstOrDefault() == null) - { - // download assembly from server and load - var bytes = await http.GetByteArrayAsync("_framework/_bin/" + theme.AssemblyName + ".dll"); - Assembly.Load(bytes); - } + } + if (assemblies.Where(item => item.FullName.StartsWith(theme.AssemblyName + ",")).FirstOrDefault() == null) + { + // download assembly from server and load + var bytes = await http.GetByteArrayAsync("_framework/_bin/" + theme.AssemblyName + ".dll"); + Assembly.Load(bytes); } } + return themes.OrderBy(item => item.Name).ToList(); } diff --git a/Oqtane.Client/Services/UserService.cs b/Oqtane.Client/Services/UserService.cs index 290f69f5e..bc00f00a1 100644 --- a/Oqtane.Client/Services/UserService.cs +++ b/Oqtane.Client/Services/UserService.cs @@ -12,12 +12,17 @@ namespace Oqtane.Services public class UserService : ServiceBase, IUserService { private readonly HttpClient http; - private readonly string apiurl; + private readonly SiteState sitestate; - public UserService(HttpClient http, IUriHelper urihelper) + public UserService(HttpClient http, SiteState sitestate) { this.http = http; - apiurl = CreateApiUrl(urihelper.GetAbsoluteUri(), "User"); + this.sitestate = sitestate; + } + + private string apiurl + { + get { return CreateApiUrl(sitestate.Alias, "User"); } } public async Task> GetUsersAsync() diff --git a/Oqtane.Client/Shared/PageState.cs b/Oqtane.Client/Shared/PageState.cs index 59f2306de..419b92adf 100644 --- a/Oqtane.Client/Shared/PageState.cs +++ b/Oqtane.Client/Shared/PageState.cs @@ -6,7 +6,10 @@ namespace Oqtane.Shared { public class PageState { - public string Alias { get; set; } + public List ModuleDefinitions { get; set; } + public List Themes { get; set; } + public List Aliases { get; set; } + public Alias Alias { get; set; } public Site Site { get; set; } public List Pages { get; set; } public Page Page { get; set; } @@ -16,6 +19,5 @@ public class PageState public Dictionary QueryString { get; set; } public int ModuleId { get; set; } public string Control { get; set; } - public string Mode { get; set; } } } diff --git a/Oqtane.Client/Shared/SiteRouter.razor b/Oqtane.Client/Shared/SiteRouter.razor index 6b2709fa5..89621362e 100644 --- a/Oqtane.Client/Shared/SiteRouter.razor +++ b/Oqtane.Client/Shared/SiteRouter.razor @@ -5,8 +5,10 @@ @using System.Collections.Generic @using Oqtane.Shared @using Microsoft.JSInterop +@inject SiteState SiteState @inject IUriHelper UriHelper @inject IJSRuntime jsRuntime +@inject IAliasService AliasService @inject ITenantService TenantService @inject ISiteService SiteService @inject IPageService PageService @@ -25,12 +27,6 @@ RenderFragment DynamicComponent { get; set; } private string _absoluteUri; - string alias; - Site site; - List pages; - Page page; - User user; - List modules; PageState pagestate; protected override void OnInit() @@ -63,33 +59,51 @@ private async Task Refresh() { - List moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(); - List themes = await ThemeService.GetThemesAsync(); + List moduledefinitions; + List themes; + List aliases; + Alias alias; + Site site; + List pages; + Page page; + User user; + List modules; bool reload = false; if (PageState == null) { - Tenant tenant = await TenantService.GetTenantAsync(); - site = await SiteService.GetSiteAsync(tenant.SiteId); - alias = Utilities.GetAlias(_absoluteUri); + aliases = await AliasService.GetAliasesAsync(); + alias = null; } else { - site = PageState.Site; + aliases = PageState.Aliases; alias = PageState.Alias; } - if (Utilities.GetAlias(_absoluteUri) != alias) + if (alias == null || GetAlias(_absoluteUri, aliases).Name != alias.Name) { - Tenant tenant = await TenantService.GetTenantAsync(); - site = await SiteService.GetSiteAsync(tenant.SiteId); - alias = Utilities.GetAlias(_absoluteUri); + alias = GetAlias(_absoluteUri, aliases); + SiteState.Alias = alias; // set state for services reload = true; } - if (site != null) + if (PageState == null || reload == true) + { + moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(); + themes = await ThemeService.GetThemesAsync(); + site = await SiteService.GetSiteAsync(alias.SiteId); + } + else + { + moduledefinitions = PageState.ModuleDefinitions; + themes = PageState.Themes; + site = PageState.Site; + } + if (site != null || reload == true) { var interop = new Interop(jsRuntime); string userid = await interop.GetCookie("user"); + user = null; if (PageState == null || reload == true) { if (!string.IsNullOrEmpty(userid)) @@ -120,9 +134,11 @@ } string path = new Uri(_absoluteUri).PathAndQuery.Substring(1); - if (alias != "") + if (path.EndsWith("/")) { path = path.Substring(0, path.Length - 1); } + if (alias.Path != "") { - path = path.Replace(alias, ""); + path = path.Replace(alias.Path, ""); + if (path.StartsWith("/")) { path = path.Substring(1); } } Dictionary querystring = ParseQueryString(path); @@ -165,6 +181,9 @@ if (UserService.IsAuthorized(user, page.ViewPermissions)) { pagestate = new PageState(); + pagestate.ModuleDefinitions = moduledefinitions; + pagestate.Themes = themes; + pagestate.Aliases = aliases; pagestate.Alias = alias; pagestate.Site = site; pagestate.Pages = pages; @@ -174,7 +193,6 @@ pagestate.QueryString = querystring; pagestate.ModuleId = -1; pagestate.Control = ""; - pagestate.Mode = "client"; if (querystring.ContainsKey("mid")) { @@ -309,4 +327,32 @@ return modules; } + private Alias GetAlias(string absoluteUri, List aliases) + { + + string aliasname; + Alias alias = null; + Uri uri = new Uri(absoluteUri); + + if (uri.Segments.Count() > 1) + { + // check if first path segment is an alias ( ie. a subfolder - www.domain.com/subfolder ) + aliasname = uri.Authority + "/" + uri.Segments[1]; + if (aliasname.EndsWith("/")) { aliasname = aliasname.Substring(0, aliasname.Length - 1); } + alias = aliases.Where(item => item.Name == aliasname).FirstOrDefault(); + } + if (alias == null) + { + aliasname = uri.Authority; + alias = aliases.Where(item => item.Name == aliasname).FirstOrDefault(); + } + if (alias == null && aliases.Count > 0) + { + // use first alias if Uri does not exist + alias = aliases.FirstOrDefault(); + } + alias.Scheme = uri.Scheme; + return alias; + } + } \ No newline at end of file diff --git a/Oqtane.Client/Shared/SiteState.cs b/Oqtane.Client/Shared/SiteState.cs new file mode 100644 index 000000000..89de8abe9 --- /dev/null +++ b/Oqtane.Client/Shared/SiteState.cs @@ -0,0 +1,11 @@ +using Oqtane.Models; + +namespace Oqtane.Shared +{ + // this class is used for passing state between Blazor components and Services + public class SiteState + { + public Alias Alias { get; set; } + + } +} diff --git a/Oqtane.Client/Shared/Utilities.cs b/Oqtane.Client/Shared/Utilities.cs index 043dac6cb..410e2b0ee 100644 --- a/Oqtane.Client/Shared/Utilities.cs +++ b/Oqtane.Client/Shared/Utilities.cs @@ -1,18 +1,52 @@ using System; +using Oqtane.Models; namespace Oqtane.Shared { public class Utilities { - public static string GetAlias(string absoluteUri) + public static string NavigateUrl(PageState pagestate) { - string alias = ""; - Uri uri = new Uri(absoluteUri); - if (uri.AbsolutePath.StartsWith("/~")) + return NavigateUrl(pagestate, pagestate.Page.Path, false); + } + + public static string NavigateUrl(PageState pagestate, bool reload) + { + return NavigateUrl(pagestate, pagestate.Page.Path, reload); + } + + public static string NavigateUrl(PageState pagestate, string path) + { + return NavigateUrl(pagestate, path, false); + } + + public static string NavigateUrl(PageState pagestate, string path, bool reload) + { + string url = pagestate.Alias.Path + "/" + path; + if (reload) + { + url += "?reload=true"; + } + return url; + } + + public static string EditUrl(PageState pagestate, Module modulestate, string action) + { + return EditUrl(pagestate, modulestate, action, ""); + } + + public static string EditUrl(PageState pagestate, Module modulestate, string action, string parameters) + { + string url = pagestate.Alias.Path + "/" + pagestate.Page.Path + "?mid=" + modulestate.ModuleId.ToString(); + if (action != "") + { + url += "&ctl=" + action; + } + if (!string.IsNullOrEmpty(parameters)) { - alias = uri.Segments[1]; + url += "&" + parameters; } - return alias; + return url; } public static string GetTypeNameClass(string typename) diff --git a/Oqtane.Client/Startup.cs b/Oqtane.Client/Startup.cs index 24e6152a2..7f1b70781 100644 --- a/Oqtane.Client/Startup.cs +++ b/Oqtane.Client/Startup.cs @@ -1,5 +1,3 @@ -#define ServerSideBlazor - using Microsoft.AspNetCore.Components.Builder; using Microsoft.Extensions.DependencyInjection; using System; @@ -9,6 +7,7 @@ using Microsoft.AspNetCore.Components; using System.Reflection; using Oqtane.Modules; +using Oqtane.Shared; namespace Oqtane.Client { @@ -28,11 +27,11 @@ public void Configure(IComponentsApplicationBuilder app) #if WASM public void ConfigureServices(IServiceCollection services) { - // register singleton core services - services.AddSingleton(); - services.AddSingleton(); - // register scoped core services + services.AddScoped(); + services.AddScoped(); + services.AddScoped(); + services.AddScoped(); services.AddScoped(); services.AddScoped(); services.AddScoped(); diff --git a/Oqtane.Client/Themes/AdminContainer.razor b/Oqtane.Client/Themes/AdminContainer.razor index 9f5937d32..ee62578d3 100644 --- a/Oqtane.Client/Themes/AdminContainer.razor +++ b/Oqtane.Client/Themes/AdminContainer.razor @@ -25,7 +25,7 @@ protected override void OnInit() { - closeurl = PageState.Alias + PageState.Page.Path; + closeurl = NavigateUrl(); } } diff --git a/Oqtane.Client/Themes/ContainerBase.cs b/Oqtane.Client/Themes/ContainerBase.cs index 31c3b9ccf..d476b7b71 100644 --- a/Oqtane.Client/Themes/ContainerBase.cs +++ b/Oqtane.Client/Themes/ContainerBase.cs @@ -13,5 +13,35 @@ public class ContainerBase : ComponentBase, IContainerControl protected Module ModuleState { get; set; } public virtual string Name { get; set; } + + public string NavigateUrl() + { + return Utilities.NavigateUrl(PageState); + } + + public string NavigateUrl(bool reload) + { + return Utilities.NavigateUrl(PageState, reload); + } + + public string NavigateUrl(string path) + { + return Utilities.NavigateUrl(PageState, path); + } + + public string NavigateUrl(string path, bool reload) + { + return Utilities.NavigateUrl(PageState, path, reload); + } + + public string EditUrl(string action) + { + return Utilities.EditUrl(PageState, ModuleState, action, ""); + } + + public string EditUrl(string action, string parameters) + { + return Utilities.EditUrl(PageState, ModuleState, action, parameters); + } } } diff --git a/Oqtane.Client/Themes/Controls/ControlPanel.razor b/Oqtane.Client/Themes/Controls/ControlPanel.razor index 70ca422cd..ec7f38916 100644 --- a/Oqtane.Client/Themes/Controls/ControlPanel.razor +++ b/Oqtane.Client/Themes/Controls/ControlPanel.razor @@ -74,7 +74,7 @@ string display = "display: none"; List moduledefinitions; Dictionary containers = new Dictionary(); - int pagemanagementmoduleid; + int pagemanagementmoduleid = -1; string moduledefinitionname; string pane; string title = ""; @@ -82,11 +82,13 @@ protected override async Task OnInitAsync() { - //TODO: Move this to shared component. This is used in this control Add, Edit, and Delete controls as well - moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(); - containers = ThemeService.GetContainerTypes(await ThemeService.GetThemesAsync()); + moduledefinitions = PageState.ModuleDefinitions; + containers = ThemeService.GetContainerTypes(PageState.Themes); List modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId, Constants.PageManagementModule); - pagemanagementmoduleid = modules.FirstOrDefault().ModuleId; + if (modules.Count > 0) + { + pagemanagementmoduleid = modules.FirstOrDefault().ModuleId; + } if (UserService.IsAuthorized(PageState.User, PageState.Page.EditPermissions)) { display = "display: inline"; @@ -117,23 +119,26 @@ pagemodule.Order = 0; pagemodule.ContainerType = containertype; await PageModuleService.AddPageModuleAsync(pagemodule); - UriHelper.NavigateTo(PageState.Alias + PageState.Page.Path + "?reload=true"); + UriHelper.NavigateTo(NavigateUrl(true)); } private string PageUrl(string action) { string url = ""; - switch (action) + if (pagemanagementmoduleid != -1) { - case "Add": - url = "admin/pages?mid=" + pagemanagementmoduleid.ToString() + "&ctl=" + action; - break; - case "Edit": - url = "admin/pages?mid=" + pagemanagementmoduleid.ToString() + "&ctl=" + action + "&id=" + PageState.Page.PageId.ToString(); - break; - case "Delete": - url = "admin/pages?mid=" + pagemanagementmoduleid.ToString() + "&ctl=" + action + "&id=" + PageState.Page.PageId.ToString(); - break; + switch (action) + { + case "Add": + url = "admin/pages?mid=" + pagemanagementmoduleid.ToString() + "&ctl=" + action; + break; + case "Edit": + url = "admin/pages?mid=" + pagemanagementmoduleid.ToString() + "&ctl=" + action + "&id=" + PageState.Page.PageId.ToString(); + break; + case "Delete": + url = "admin/pages?mid=" + pagemanagementmoduleid.ToString() + "&ctl=" + action + "&id=" + PageState.Page.PageId.ToString(); + break; + } } return url; } diff --git a/Oqtane.Client/Themes/Controls/Login.razor b/Oqtane.Client/Themes/Controls/Login.razor index a1e2cf5f8..718c71fa3 100644 --- a/Oqtane.Client/Themes/Controls/Login.razor +++ b/Oqtane.Client/Themes/Controls/Login.razor @@ -29,13 +29,13 @@ { if (name == "Login") { - UriHelper.NavigateTo(PageState.Alias + "login"); + UriHelper.NavigateTo(NavigateUrl("login")); } else { var interop = new Interop(jsRuntime); await interop.SetCookie("user", "", 7); - UriHelper.NavigateTo(PageState.Alias, true); + UriHelper.NavigateTo(NavigateUrl(""), true); } } } diff --git a/Oqtane.Client/Themes/Controls/Logo.razor b/Oqtane.Client/Themes/Controls/Logo.razor index 761776586..2c42061f7 100644 --- a/Oqtane.Client/Themes/Controls/Logo.razor +++ b/Oqtane.Client/Themes/Controls/Logo.razor @@ -1,5 +1,5 @@ @using Oqtane.Themes @inherits ThemeObjectBase - + diff --git a/Oqtane.Client/Themes/Controls/Menu.razor b/Oqtane.Client/Themes/Controls/Menu.razor index cd21562f0..3589bc8cd 100644 --- a/Oqtane.Client/Themes/Controls/Menu.razor +++ b/Oqtane.Client/Themes/Controls/Menu.razor @@ -9,7 +9,7 @@
      @if (parent != null) { - string url = PageState.Alias + parent.Path; + string url = NavigateUrl();
    • Back @@ -20,7 +20,7 @@ { if (p.IsNavigation && UserService.IsAuthorized(PageState.User, p.ViewPermissions)) { - string url = PageState.Alias + p.Path; + string url = NavigateUrl(p.Path);
    • @p.Name diff --git a/Oqtane.Client/Themes/Controls/Mode.razor b/Oqtane.Client/Themes/Controls/Mode.razor deleted file mode 100644 index f9caba737..000000000 --- a/Oqtane.Client/Themes/Controls/Mode.razor +++ /dev/null @@ -1,44 +0,0 @@ -@using Oqtane.Themes -@using Oqtane.Shared; -@using Microsoft.JSInterop -@inject IJSRuntime jsRuntime - -@inherits ThemeObjectBase - - - -@functions { - string displayMode = ""; - - protected override async Task OnInitAsync() - { - var interop = new Interop(jsRuntime); - string value = await interop.GetCookie("blazor"); - - if (value == "client") - { - displayMode = "Server Mode"; - } - else - { - displayMode = "Client Mode"; - } - } - - public async void SetMode() - { - var interop = new Interop(jsRuntime); - string mode = await interop.GetCookie("blazor"); - if (mode == "client") - { - mode = "server"; - } - else - { - mode = "client"; - } - await interop.SetCookie("blazor", mode, 7); - } -} diff --git a/Oqtane.Client/Themes/Controls/ModuleActions.razor b/Oqtane.Client/Themes/Controls/ModuleActions.razor index cc5c662dc..2f31deb5f 100644 --- a/Oqtane.Client/Themes/Controls/ModuleActions.razor +++ b/Oqtane.Client/Themes/Controls/ModuleActions.razor @@ -81,7 +81,7 @@ await PageModuleService.UpdatePageModuleAsync(pagemodule); break; } - UriHelper.NavigateTo(PageState.Alias + path); + UriHelper.NavigateTo(NavigateUrl(path)); } public class ActionViewModel diff --git a/Oqtane.Client/Themes/ThemeBase.cs b/Oqtane.Client/Themes/ThemeBase.cs index e9f53e07e..d9190f0ed 100644 --- a/Oqtane.Client/Themes/ThemeBase.cs +++ b/Oqtane.Client/Themes/ThemeBase.cs @@ -9,5 +9,26 @@ public class ThemeBase : ComponentBase, IThemeControl protected PageState PageState { get; set; } public virtual string Name { get; set; } public virtual string Panes { get; set; } + + public string NavigateUrl() + { + return Utilities.NavigateUrl(PageState); + } + + public string NavigateUrl(bool reload) + { + return Utilities.NavigateUrl(PageState, reload); + } + + public string NavigateUrl(string path) + { + return Utilities.NavigateUrl(PageState, path); + } + + public string NavigateUrl(string path, bool reload) + { + return Utilities.NavigateUrl(PageState, path, reload); + } + } } diff --git a/Oqtane.Client/Themes/ThemeObjectBase.cs b/Oqtane.Client/Themes/ThemeObjectBase.cs index 640b2eec6..61402bc66 100644 --- a/Oqtane.Client/Themes/ThemeObjectBase.cs +++ b/Oqtane.Client/Themes/ThemeObjectBase.cs @@ -7,5 +7,25 @@ public class ThemeObjectBase : ComponentBase { [CascadingParameter] protected PageState PageState { get; set; } + + public string NavigateUrl() + { + return Utilities.NavigateUrl(PageState); + } + + public string NavigateUrl(bool reload) + { + return Utilities.NavigateUrl(PageState, reload); + } + + public string NavigateUrl(string path) + { + return Utilities.NavigateUrl(PageState, path); + } + + public string NavigateUrl(string path, bool reload) + { + return Utilities.NavigateUrl(PageState, path, reload); + } } } diff --git a/Oqtane.Client/wwwroot/Sites/2/oqtane.png b/Oqtane.Client/wwwroot/Sites/2/oqtane.png new file mode 100644 index 0000000000000000000000000000000000000000..94454bf601612d061901f9d33121d19f5996d8bf GIT binary patch literal 7963 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 ZEyo$1+#R*=J79AfLqkPJxdCDq^FMa;ML_@n literal 0 HcmV?d00001 diff --git a/Oqtane.Client/wwwroot/index.html b/Oqtane.Client/wwwroot/index.html index f3810bbe1..5c5f51c00 100644 --- a/Oqtane.Client/wwwroot/index.html +++ b/Oqtane.Client/wwwroot/index.html @@ -21,15 +21,7 @@ - - + diff --git a/Oqtane.Client/wwwroot/js/site.js b/Oqtane.Client/wwwroot/js/site.js index 523c82272..3a3e3ed9f 100644 --- a/Oqtane.Client/wwwroot/js/site.js +++ b/Oqtane.Client/wwwroot/js/site.js @@ -1,20 +1,3 @@ -/* called by index.html to check if mode is set */ -function getCookie(name) { - name = name + "="; - var decodedCookie = decodeURIComponent(document.cookie); - var ca = decodedCookie.split(';'); - for (var i = 0; i < ca.length; i++) { - var c = ca[i]; - while (c.charAt(0) === ' ') { - c = c.substring(1); - } - if (c.indexOf(name) === 0) { - return c.substring(name.length, c.length); - } - } - return ""; -} - /* Open when someone clicks on the span element */ function openActions() { document.getElementById("actions").style.width = "25%"; diff --git a/Oqtane.Server/Controllers/AliasController.cs b/Oqtane.Server/Controllers/AliasController.cs new file mode 100644 index 000000000..cd8296e3f --- /dev/null +++ b/Oqtane.Server/Controllers/AliasController.cs @@ -0,0 +1,55 @@ +using System.Collections.Generic; +using Microsoft.AspNetCore.Mvc; +using Oqtane.Repository; +using Oqtane.Models; + +namespace Oqtane.Controllers +{ + [Route("{site}/api/[controller]")] + public class AliasController : Controller + { + private readonly IAliasRepository aliases; + + public AliasController(IAliasRepository Aliases) + { + aliases = Aliases; + } + + // GET: api/ + [HttpGet] + public IEnumerable Get() + { + return aliases.GetAliases(); + } + + // GET api//5 + [HttpGet("{id}")] + public Alias Get(int id) + { + return aliases.GetAlias(id); + } + + // POST api/ + [HttpPost] + public void Post([FromBody] Alias site) + { + if (ModelState.IsValid) + aliases.AddAlias(site); + } + + // PUT api//5 + [HttpPut("{id}")] + public void Put(int id, [FromBody] Alias site) + { + if (ModelState.IsValid) + aliases.UpdateAlias(site); + } + + // DELETE api//5 + [HttpDelete("{id}")] + public void Delete(int id) + { + aliases.DeleteAlias(id); + } + } +} diff --git a/Oqtane.Server/Controllers/TenantController.cs b/Oqtane.Server/Controllers/TenantController.cs index 32a875ac3..af19f7afb 100644 --- a/Oqtane.Server/Controllers/TenantController.cs +++ b/Oqtane.Server/Controllers/TenantController.cs @@ -1,6 +1,7 @@ using Microsoft.AspNetCore.Mvc; using Oqtane.Repository; using Oqtane.Models; +using System.Collections.Generic; namespace Oqtane.Controllers { @@ -16,9 +17,39 @@ public TenantController(ITenantRepository Tenants) // GET: api/ [HttpGet] - public Tenant Get() + public IEnumerable Get() { - return tenants.GetTenant(); + return tenants.GetTenants(); + } + + // GET api//5 + [HttpGet("{id}")] + public Tenant Get(int id) + { + return tenants.GetTenant(id); + } + + // POST api/ + [HttpPost] + public void Post([FromBody] Tenant site) + { + if (ModelState.IsValid) + tenants.AddTenant(site); + } + + // PUT api//5 + [HttpPut("{id}")] + public void Put(int id, [FromBody] Tenant site) + { + if (ModelState.IsValid) + tenants.UpdateTenant(site); + } + + // DELETE api//5 + [HttpDelete("{id}")] + public void Delete(int id) + { + tenants.DeleteTenant(id); } } } diff --git a/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextContext.cs b/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextContext.cs index 86de7f06f..3ec81ddd5 100644 --- a/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextContext.cs +++ b/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextContext.cs @@ -1,5 +1,4 @@ using Microsoft.EntityFrameworkCore; -using Oqtane.Models; using Oqtane.Shared.Modules.HtmlText.Models; using Oqtane.Repository; using Oqtane.Modules; @@ -10,7 +9,7 @@ public class HtmlTextContext : ContextBase, IService { public virtual DbSet HtmlText { get; set; } - public HtmlTextContext(ITenantRepository TenantRepository):base(TenantRepository) + public HtmlTextContext(ITenantResolver TenantResolver):base(TenantResolver) { // ContextBase handles multi-tenant database connections } diff --git a/Oqtane.Server/Repository/AliasRepository.cs b/Oqtane.Server/Repository/AliasRepository.cs new file mode 100644 index 000000000..0cc3b365d --- /dev/null +++ b/Oqtane.Server/Repository/AliasRepository.cs @@ -0,0 +1,91 @@ +using System.Collections.Generic; +using System.Linq; +using Oqtane.Models; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Caching.Memory; +using System; + +namespace Oqtane.Repository +{ + public class AliasRepository : IAliasRepository + { + private HostContext db; + private readonly IMemoryCache _cache; + + public AliasRepository(HostContext context, IMemoryCache cache) + { + db = context; + _cache = cache; + } + + public IEnumerable GetAliases() + { + try + { + IEnumerable aliases = _cache.GetOrCreate("aliases", entry => + { + entry.SlidingExpiration = TimeSpan.FromMinutes(30); + return db.Alias.ToList(); + }); + return aliases; + } + catch + { + throw; + } + } + + public void AddAlias(Alias alias) + { + try + { + db.Alias.Add(alias); + db.SaveChanges(); + } + catch + { + throw; + } + } + + public void UpdateAlias(Alias alias) + { + try + { + db.Entry(alias).State = EntityState.Modified; + db.SaveChanges(); + } + catch + { + throw; + } + } + + public Alias GetAlias(int aliasId) + { + try + { + Alias alias = db.Alias.Find(aliasId); + return alias; + } + catch + { + throw; + } + } + + public void DeleteAlias(int aliasId) + { + try + { + Alias alias = db.Alias.Find(aliasId); + db.Alias.Remove(alias); + db.SaveChanges(); + } + catch + { + throw; + } + } + } +} diff --git a/Oqtane.Server/Repository/ContextBase.cs b/Oqtane.Server/Repository/ContextBase.cs index 06599f46c..bc1f475ff 100644 --- a/Oqtane.Server/Repository/ContextBase.cs +++ b/Oqtane.Server/Repository/ContextBase.cs @@ -8,9 +8,9 @@ public class ContextBase : DbContext { private Tenant tenant; - public ContextBase(ITenantRepository TenantRepository) + public ContextBase(ITenantResolver TenantResolver) { - tenant = TenantRepository.GetTenant(); + tenant = TenantResolver.GetTenant(); } protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) diff --git a/Oqtane.Server/Repository/HostContext.cs b/Oqtane.Server/Repository/HostContext.cs index 452f8e51c..f0f770230 100644 --- a/Oqtane.Server/Repository/HostContext.cs +++ b/Oqtane.Server/Repository/HostContext.cs @@ -7,6 +7,7 @@ public class HostContext : DbContext { public HostContext(DbContextOptions options) : base(options) { } + public virtual DbSet Alias { get; set; } public virtual DbSet Tenant { get; set; } } } diff --git a/Oqtane.Server/Repository/IAliasRepository.cs b/Oqtane.Server/Repository/IAliasRepository.cs new file mode 100644 index 000000000..4bc56f7bb --- /dev/null +++ b/Oqtane.Server/Repository/IAliasRepository.cs @@ -0,0 +1,14 @@ +using System.Collections.Generic; +using Oqtane.Models; + +namespace Oqtane.Repository +{ + public interface IAliasRepository + { + IEnumerable GetAliases(); + void AddAlias(Alias alias); + void UpdateAlias(Alias alias); + Alias GetAlias(int aliasId); + void DeleteAlias(int aliasId); + } +} diff --git a/Oqtane.Server/Repository/ITenantRepository.cs b/Oqtane.Server/Repository/ITenantRepository.cs index 3d1b56069..df9181f6d 100644 --- a/Oqtane.Server/Repository/ITenantRepository.cs +++ b/Oqtane.Server/Repository/ITenantRepository.cs @@ -1,9 +1,14 @@ using Oqtane.Models; +using System.Collections.Generic; namespace Oqtane.Repository { public interface ITenantRepository { - Tenant GetTenant(); + IEnumerable GetTenants(); + void AddTenant(Tenant tenant); + void UpdateTenant(Tenant tenant); + Tenant GetTenant(int tenantId); + void DeleteTenant(int tenantId); } } diff --git a/Oqtane.Server/Repository/ITenantResolver.cs b/Oqtane.Server/Repository/ITenantResolver.cs new file mode 100644 index 000000000..e665d76c7 --- /dev/null +++ b/Oqtane.Server/Repository/ITenantResolver.cs @@ -0,0 +1,9 @@ +using Oqtane.Models; + +namespace Oqtane.Repository +{ + public interface ITenantResolver + { + Tenant GetTenant(); + } +} diff --git a/Oqtane.Server/Repository/TenantContext.cs b/Oqtane.Server/Repository/TenantContext.cs index 596d059b5..e5c2baf2b 100644 --- a/Oqtane.Server/Repository/TenantContext.cs +++ b/Oqtane.Server/Repository/TenantContext.cs @@ -14,9 +14,9 @@ public class TenantContext : DbContext private readonly Tenant tenant; - public TenantContext(ITenantRepository TenantRepository) + public TenantContext(ITenantResolver TenantResolver) { - tenant = TenantRepository.GetTenant(); + tenant = TenantResolver.GetTenant(); } protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) diff --git a/Oqtane.Server/Repository/TenantRepository.cs b/Oqtane.Server/Repository/TenantRepository.cs index f64ea3c2b..9ee2c1887 100644 --- a/Oqtane.Server/Repository/TenantRepository.cs +++ b/Oqtane.Server/Repository/TenantRepository.cs @@ -4,6 +4,7 @@ using Oqtane.Models; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Caching.Memory; +using Microsoft.EntityFrameworkCore; namespace Oqtane.Repository { @@ -11,23 +12,14 @@ public class TenantRepository : ITenantRepository { private HostContext db; private readonly IMemoryCache _cache; - private readonly string alias; - public TenantRepository(HostContext context, IMemoryCache cache, IHttpContextAccessor accessor) + public TenantRepository(HostContext context, IMemoryCache cache) { db = context; _cache = cache; - - // get site alias based on request context - alias = accessor.HttpContext.Request.Host.Value; - string path = accessor.HttpContext.Request.Path.Value; - if (path.StartsWith("/~") && !path.StartsWith("/~/")) - { - alias += path.Substring(0, path.IndexOf("/", 1)); - } } - public Tenant GetTenant() + public IEnumerable GetTenants() { try { @@ -36,15 +28,45 @@ public Tenant GetTenant() entry.SlidingExpiration = TimeSpan.FromMinutes(30); return db.Tenant.ToList(); }); - Tenant tenant; - if (tenants.Count() == 1) - { - tenant = tenants.FirstOrDefault(); - } - else - { - tenant = tenants.Where(item => item.Alias == alias).FirstOrDefault(); - } + return tenants; + } + catch + { + throw; + } + } + + public void AddTenant(Tenant tenant) + { + try + { + db.Tenant.Add(tenant); + db.SaveChanges(); + } + catch + { + throw; + } + } + + public void UpdateTenant(Tenant tenant) + { + try + { + db.Entry(tenant).State = EntityState.Modified; + db.SaveChanges(); + } + catch + { + throw; + } + } + + public Tenant GetTenant(int tenantId) + { + try + { + Tenant tenant = db.Tenant.Find(tenantId); return tenant; } catch @@ -52,5 +74,19 @@ public Tenant GetTenant() throw; } } + + public void DeleteTenant(int tenantId) + { + try + { + Tenant tenant = db.Tenant.Find(tenantId); + db.Tenant.Remove(tenant); + db.SaveChanges(); + } + catch + { + throw; + } + } } } diff --git a/Oqtane.Server/Repository/TenantResolver.cs b/Oqtane.Server/Repository/TenantResolver.cs new file mode 100644 index 000000000..1e806b31d --- /dev/null +++ b/Oqtane.Server/Repository/TenantResolver.cs @@ -0,0 +1,48 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Oqtane.Models; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Caching.Memory; + +namespace Oqtane.Repository +{ + public class TenantResolver : ITenantResolver + { + private HostContext db; + private readonly string aliasname; + private readonly IAliasRepository _aliasrepository; + private readonly ITenantRepository _tenantrepository; + + public TenantResolver(HostContext context, IHttpContextAccessor accessor, IAliasRepository aliasrepository, ITenantRepository tenantrepository) + { + db = context; + _aliasrepository = aliasrepository; + _tenantrepository = tenantrepository; + + // get alias based on request context + aliasname = accessor.HttpContext.Request.Host.Value; + string path = accessor.HttpContext.Request.Path.Value; + string[] segments = path.Split('/'); + if (segments[1] != "~") + { + aliasname += "/" + segments[1]; + } + } + + public Tenant GetTenant() + { + try + { + IEnumerable aliases = _aliasrepository.GetAliases(); // cached + Alias alias = aliases.Where(item => item.Name == aliasname).FirstOrDefault(); + IEnumerable tenants = _tenantrepository.GetTenants(); // cached + return tenants.Where(item => item.TenantId == alias.TenantId).FirstOrDefault(); + } + catch + { + throw; + } + } + } +} \ No newline at end of file diff --git a/Oqtane.Server/Scripts/Initialize.sql b/Oqtane.Server/Scripts/Initialize.sql index bf4380568..62349ac04 100644 --- a/Oqtane.Server/Scripts/Initialize.sql +++ b/Oqtane.Server/Scripts/Initialize.sql @@ -3,12 +3,23 @@ Create tables */ +CREATE TABLE [dbo].[Alias]( + [AliasId] [int] IDENTITY(1,1) NOT NULL, + [Name] [nvarchar](200) NOT NULL, + [TenantId] [int] NOT NULL, + [SiteId] [int] NOT NULL, + CONSTRAINT [PK_Alias] PRIMARY KEY CLUSTERED + ( + [AliasId] ASC + ) +) +GO + CREATE TABLE [dbo].[Tenant]( [TenantId] [int] IDENTITY(1,1) NOT NULL, - [Alias] [nvarchar](200) NOT NULL, + [Name] [nvarchar](100) NOT NULL, [DBConnectionString] [nvarchar](1024) NOT NULL, - [DBSchema] [nvarchar](50) NOT NULL, - [SiteId] [int] NOT NULL, + [DBSchema] [nvarchar](50) NOT NULL CONSTRAINT [PK_Tenant] PRIMARY KEY CLUSTERED ( [TenantId] ASC @@ -102,7 +113,7 @@ GO /* -Create relationships +Create foreign key relationships */ ALTER TABLE [dbo].[HtmlText] WITH CHECK ADD CONSTRAINT [FK_HtmlText_Module] FOREIGN KEY([ModuleId]) @@ -110,38 +121,28 @@ REFERENCES [dbo].[Module] ([ModuleId]) ON DELETE CASCADE GO -ALTER TABLE [dbo].[HtmlText] CHECK CONSTRAINT [FK_HtmlText_Module] -GO - ALTER TABLE [dbo].[Module] WITH CHECK ADD CONSTRAINT [FK_Module_Site] FOREIGN KEY([SiteId]) REFERENCES [dbo].[Site] ([SiteId]) ON DELETE CASCADE GO -ALTER TABLE [dbo].[Module] CHECK CONSTRAINT [FK_Module_Site] -GO - ALTER TABLE [dbo].[Page] WITH CHECK ADD CONSTRAINT [FK_Page_Site] FOREIGN KEY([SiteId]) REFERENCES [dbo].[Site] ([SiteId]) ON DELETE CASCADE GO -ALTER TABLE [dbo].[Page] CHECK CONSTRAINT [FK_Page_Site] -GO - ALTER TABLE [dbo].[PageModule] WITH CHECK ADD CONSTRAINT [FK_PageModule_Module] FOREIGN KEY([ModuleId]) REFERENCES [dbo].[Module] ([ModuleId]) GO -ALTER TABLE [dbo].[PageModule] CHECK CONSTRAINT [FK_PageModule_Module] -GO - ALTER TABLE [dbo].[PageModule] WITH CHECK ADD CONSTRAINT [FK_PageModule_Page] FOREIGN KEY([PageId]) REFERENCES [dbo].[Page] ([PageId]) ON DELETE CASCADE GO -ALTER TABLE [dbo].[PageModule] CHECK CONSTRAINT [FK_PageModule_Page] +ALTER TABLE [dbo].[Alias] WITH CHECK ADD CONSTRAINT [FK_Alias_Tenant] FOREIGN KEY([TenantId]) +REFERENCES [dbo].[Tenant] ([TenantId]) +ON DELETE CASCADE GO /* @@ -151,17 +152,31 @@ Create seed data */ SET IDENTITY_INSERT [dbo].[Tenant] ON GO -INSERT [dbo].[Tenant] ([TenantId], [Alias], [DBConnectionString], [DBSchema], [SiteId]) -VALUES (1, N'localhost:44357', N'{ConnectionString}', N'', 1) +INSERT [dbo].[Tenant] ([TenantId], [Name], [DBConnectionString], [DBSchema]) +VALUES (1, N'Tenant1', N'{ConnectionString}', N'') GO SET IDENTITY_INSERT [dbo].[Tenant] OFF GO +SET IDENTITY_INSERT [dbo].[Alias] ON +GO +INSERT [dbo].[Alias] ([AliasId], [Name], [TenantId], [SiteId]) +VALUES (1, N'localhost:44357', 1, 1) +GO +INSERT [dbo].[Alias] ([AliasId], [Name], [TenantId], [SiteId]) +VALUES (2, N'localhost:44357/site2', 1, 2) +GO +SET IDENTITY_INSERT [dbo].[Alias] OFF +GO + SET IDENTITY_INSERT [dbo].[Site] ON GO INSERT [dbo].[Site] ([SiteId], [Name], [Logo]) VALUES (1, N'Site1', N'oqtane.png') GO +INSERT [dbo].[Site] ([SiteId], [Name], [Logo]) +VALUES (2, N'Site2', N'oqtane.png') +GO SET IDENTITY_INSERT [dbo].[Site] OFF GO @@ -200,6 +215,12 @@ GO INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ViewPermissions], [EditPermissions], [ParentId], [Order], [IsNavigation], [LayoutType]) VALUES (11, 1, N'Theme Management', N'admin/themes', N'Oqtane.Client.Themes.Theme2.Theme2, Oqtane.Client', N'', N'Top;Bottom', N'Administrators', N'Administrators', 4, 4, 1, N'') GO +INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ViewPermissions], [EditPermissions], [ParentId], [Order], [IsNavigation], [LayoutType]) +VALUES (12, 2, N'Page1', N'', N'Oqtane.Client.Themes.Theme2.Theme2, Oqtane.Client', N'oi-home', N'Top;Bottom', N'All Users', N'Administrators', NULL, 1, 1, N'') +GO +INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ViewPermissions], [EditPermissions], [ParentId], [Order], [IsNavigation], [LayoutType]) +VALUES (13, 2, N'Page2', N'page2', N'Oqtane.Client.Themes.Theme2.Theme2, Oqtane.Client', N'oi-home', N'Top;Bottom', N'All Users', N'Administrators', NULL, 1, 1, N'') +GO SET IDENTITY_INSERT [dbo].[Page] OFF GO @@ -250,6 +271,12 @@ GO INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [ViewPermissions], [EditPermissions]) VALUES (15, 1, N'Oqtane.Client.Modules.Admin.Themes, Oqtane.Client', N'Administrators', N'Administrators') GO +INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [ViewPermissions], [EditPermissions]) +VALUES (16, 2, N'Oqtane.Client.Modules.HtmlText, Oqtane.Client', N'All Users', N'Administrators') +GO +INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [ViewPermissions], [EditPermissions]) +VALUES (17, 2, N'Oqtane.Client.Modules.HtmlText, Oqtane.Client', N'All Users', N'Administrators') +GO SET IDENTITY_INSERT [dbo].[Module] OFF GO @@ -300,13 +327,19 @@ GO INSERT [dbo].[PageModule] ([PageModuleId], [PageId], [ModuleId], [Title], [Pane], [Order], [ContainerType]) VALUES (15, 11, 15, N'Theme Management', N'Top', 0, N'Oqtane.Client.Themes.Theme2.Container2, Oqtane.Client') GO +INSERT [dbo].[PageModule] ([PageModuleId], [PageId], [ModuleId], [Title], [Pane], [Order], [ContainerType]) +VALUES (16, 12, 16, N'Text', N'Top', 1, N'Oqtane.Client.Themes.Theme2.Container2, Oqtane.Client') +GO +INSERT [dbo].[PageModule] ([PageModuleId], [PageId], [ModuleId], [Title], [Pane], [Order], [ContainerType]) +VALUES (17, 13, 17, N'Text', N'Top', 1, N'Oqtane.Client.Themes.Theme2.Container2, Oqtane.Client') +GO SET IDENTITY_INSERT [dbo].[PageModule] OFF GO SET IDENTITY_INSERT [dbo].[HtmlText] ON GO INSERT [dbo].[HtmlText] ([HtmlTextId], [ModuleId], [Content]) -VALUES (1, 3, N'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.') +VALUES (1, 3, N'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

      Go To Site2') GO INSERT [dbo].[HtmlText] ([HtmlTextId], [ModuleId], [Content]) VALUES (2, 5, N'Enim sed faucibus turpis in eu mi bibendum neque egestas. Quis hendrerit dolor magna eget est lorem. Dui faucibus in ornare quam viverra orci sagittis. Integer eget aliquet nibh praesent tristique magna sit. Nunc aliquet bibendum enim facilisis gravida neque convallis a cras. Tortor id aliquet lectus proin. Diam volutpat commodo sed egestas egestas fringilla. Posuere sollicitudin aliquam ultrices sagittis orci. Viverra mauris in aliquam sem fringilla ut morbi tincidunt. Eget gravida cum sociis natoque penatibus et. Sagittis orci a scelerisque purus semper. Eget velit aliquet sagittis id consectetur purus. Volutpat blandit aliquam etiam erat. Et tortor consequat id porta nibh venenatis cras. Volutpat odio facilisis mauris sit amet. Varius duis at consectetur lorem.') @@ -317,6 +350,12 @@ GO INSERT [dbo].[HtmlText] ([HtmlTextId], [ModuleId], [Content]) VALUES (4, 7, N'Ornare arcu dui vivamus arcu felis bibendum ut. Tortor vitae purus faucibus ornare. Lectus sit amet est placerat in egestas erat imperdiet sed. Aliquam sem et tortor consequat id. Fermentum iaculis eu non diam phasellus vestibulum. Ultricies integer quis auctor elit sed. Fermentum odio eu feugiat pretium nibh ipsum. Ut consequat semper viverra nam libero. Blandit aliquam etiam erat velit scelerisque in dictum non consectetur. At risus viverra adipiscing at in tellus. Facilisi nullam vehicula ipsum a arcu cursus vitae congue. At varius vel pharetra vel turpis nunc eget lorem dolor. Morbi non arcu risus quis varius. Turpis massa sed elementum tempus egestas.') GO +INSERT [dbo].[HtmlText] ([HtmlTextId], [ModuleId], [Content]) +VALUES (5, 16, N'Id consectetur purus ut faucibus pulvinar elementum integer. Bibendum neque egestas congue quisque egestas diam in arcu. Eget nullam non nisi est sit amet facilisis. Sit amet consectetur adipiscing elit pellentesque. Id aliquet risus feugiat in. Enim blandit volutpat maecenas volutpat blandit aliquam etiam erat. Commodo odio aenean sed adipiscing. Pharetra massa massa ultricies mi quis hendrerit dolor magna. Aliquet enim tortor at auctor urna nunc. Nulla pellentesque dignissim enim sit amet. Suscipit adipiscing bibendum est ultricies integer quis auctor. Lacinia quis vel eros donec ac odio tempor. Aliquam vestibulum morbi blandit cursus risus at.

      Go To Site1') +GO +INSERT [dbo].[HtmlText] ([HtmlTextId], [ModuleId], [Content]) +VALUES (6, 17, N'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.') +GO SET IDENTITY_INSERT [dbo].[HtmlText] OFF GO diff --git a/Oqtane.Server/Startup.cs b/Oqtane.Server/Startup.cs index 736d9500f..321cf242d 100644 --- a/Oqtane.Server/Startup.cs +++ b/Oqtane.Server/Startup.cs @@ -18,6 +18,7 @@ using System.Net.Http; using Microsoft.AspNetCore.Components; using Oqtane.Client; +using Oqtane.Shared; namespace Oqtane.Server { @@ -57,11 +58,11 @@ public void ConfigureServices(IServiceCollection services) }); } - // register singleton core services + // register scoped core services + services.AddScoped(); services.AddScoped(); services.AddScoped(); - - // register scoped core services + services.AddScoped(); services.AddScoped(); services.AddScoped(); services.AddScoped(); @@ -110,6 +111,8 @@ public void ConfigureServices(IServiceCollection services) services.AddSingleton(); // register transient scoped core services + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); diff --git a/Oqtane.Server/wwwroot/Sites/2/oqtane.png b/Oqtane.Server/wwwroot/Sites/2/oqtane.png new file mode 100644 index 0000000000000000000000000000000000000000..94454bf601612d061901f9d33121d19f5996d8bf GIT binary patch literal 7963 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 ZEyo$1+#R*=J79AfLqkPJxdCDq^FMa;ML_@n literal 0 HcmV?d00001 diff --git a/Oqtane.Server/wwwroot/favicon.ico b/Oqtane.Server/wwwroot/favicon.ico index 3a0d8ed42f5f60c5517ef9f83aebcad54281f815..0e569015cd5b8ef24cb0b2b28fe9e49e5fe34a87 100644 GIT binary patch literal 5430 zcmc&&Ye-{96rRMG#28InV|*K*Q4vE3F^KqnA@Ps+0I5*-M`@)LtYK|oDar0q*HV@( zl%+okQYfXA{t#KDl+qt=TUzOlZ7F40N};x07Lig?yDTD-+wUY!xS8CWYusQ54l{G+ zyyl!U=gwTlbWG3ec80#5Eg2YdGsf!c6Z21izYSa)a2SFjfk$`dHa9nCsI06ETCLV= zg@uJTDk>_bCMPG2XA#iY*yuKyO!q-6$pN^Bb#-;#OfuTr+bcp!C*Mf&(A-W z%@5peca55i;^N{rIjzlRyE!^KY8@XRHv@k~r_;slDJUqoqsGte2F6PXsB_&hDPk>yytVELuH#Rn=r#QlAkNf)i%$aD_*5HQ__WzdJx)#2*wbj|u z(o&y^E*4?z$i-OH#@O%QG4`hn{{4Zmf8N3R2aKKk1^_M56G#M7qRx*dGT(|Z0 zb>raRptYx`#~KcY&*jH#Z9@ICAn%tP4#$_syT1`fI+GH{hrsP3pI$>fbYv^{EcDII z&Cj9MJOVAes}8Uy3fe2n%gctd$kn0=g+hAl`3|p>nRLt7P$M=G7mJpBt##;rTP`=7 zad~<9ryCm^dMzDl>-g>rqedzE8}*uM>0hWp2RO?oYIY$OOKS49@TH}t@meL9O>scI z{BU@9xNU1|E50|>-Ws%9u=PkzOJn52BhY3Yhd?0EuM~59t3zsb!>%CtMYI9m{>y4S zYWT9UviNsVE(>RDM~$B2LGzxRhsMBd^7XU!i0fyf9NaPHwfN!dfao{W>W5l<;yU8? zm8gGye%>$AiSy~{X{*IzNr?eu9f)*VbI3^3-__Nnsefi><`T|BihkU2veu8>{}?u= z$U*L1)v~*(scBl|!#Um6;uF_V%U==YU?2Oqf2r1Y+{X;an;%6!8U6SHI4kD*l;(eyIqRUC>On6Z$Obj1Bt!7t0eE#$0^)6;~v6c?9!__j-sAC%V_#|Y9rbB*b#*mf ze`{-N=`NP$clhMR^XL?LkoUKgR?6c`xR4PN#DdwIFUE(L75V8X7Vp_tV~P z6bIbF9BXT9M#MQ;FA%f+-rnA1e4a%&=k4t5^ee^Tv`(<@?(R0MKcRfb*^T>!^X96D zPw5<|#TobMS<->?7s6TpJXiWeIe5PmlW&1fv4PG=Fc@^MtgIODo~aP|ayiF6gK|1W zKh1I9Q>{z6)K70X+_!%bZNT^HaAah}oJ(D5vfzW~Mg7PPssR_$@P;&^-X-4xIETl0 zOIBTo@>3<%)zw!qjOPJz{-cZ3O}cQ;sKHzQn9jT3?;pHq{iF{y?=Euj*X`}?oV>NN z-2>{*G~V&5|826B_kYk!)Q((|v}cl}YdZRM5QkXaP9$cFMow(effLtJ3IIP4GesjY p(_Tc%+mWQ}*8%q=Y3FOmc?s~kBt-`ja!K|H0p>A+NCKop`wt!H9{>OV literal 1150 zcmbtSy^euV5WQb0Bnq;UjR?u=G(vpI|iyfIe_ntXt?wIc?W$2&Vt@Qe)-t9`gDy2f&HKdUTu7grK_wn*@ zob^H$yWj7`ez{y|GMP}dTBS;*LZi`$PNx%?x7*F4_}U7-TCFIRN)eYf3 zyB)bwsRZuzdPU?#YNgX@aB{gEa{Ql!S11&ai$3;c$RnG&tx*`dlm)qI DtpGcJ diff --git a/Oqtane.Shared/Models/Alias.cs b/Oqtane.Shared/Models/Alias.cs new file mode 100644 index 000000000..704acf433 --- /dev/null +++ b/Oqtane.Shared/Models/Alias.cs @@ -0,0 +1,41 @@ +using System.ComponentModel.DataAnnotations.Schema; + +namespace Oqtane.Models +{ + public class Alias + { + public int AliasId { get; set; } + public string Name { get; set; } + public int TenantId { get; set; } + public int SiteId { get; set; } + + [NotMapped] + public string Scheme { get; set; } + + [NotMapped] + public string Url + { + get + { + return Scheme + "://" + Name; + } + } + + [NotMapped] + public string Path + { + get + { + if (Name.Contains("/")) + { + return Name.Substring(Name.IndexOf("/") + 1); + } + else + { + return ""; + } + } + } + + } +} diff --git a/Oqtane.Shared/Models/Page.cs b/Oqtane.Shared/Models/Page.cs index c83314fc2..1e04f4c3f 100644 --- a/Oqtane.Shared/Models/Page.cs +++ b/Oqtane.Shared/Models/Page.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; - -namespace Oqtane.Models +namespace Oqtane.Models { public class Page { diff --git a/Oqtane.Shared/Models/Tenant.cs b/Oqtane.Shared/Models/Tenant.cs index 7059319b2..9a4fd66ac 100644 --- a/Oqtane.Shared/Models/Tenant.cs +++ b/Oqtane.Shared/Models/Tenant.cs @@ -5,9 +5,8 @@ namespace Oqtane.Models public class Tenant { public int TenantId { get; set; } - public string Alias { get; set; } + public string Name { get; set; } public string DBConnectionString { get; set; } public string DBSchema { get; set; } - public int SiteId { get; set; } } }