+
+
+
+ @ToolbarContent
+
+
+
+
@code {
@@ -128,4 +131,4 @@
StateHasChanged();
}
-}
\ No newline at end of file
+}
diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor
index d396da3c..c5829d05 100644
--- a/Oqtane.Client/Modules/HtmlText/Edit.razor
+++ b/Oqtane.Client/Modules/HtmlText/Edit.razor
@@ -7,71 +7,102 @@
@inject HttpClient http
@inject SiteState sitestate
-
-
- |
-
- |
-
- @if (!RichTextEditorMode)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @if (!RichTextEditorMode)
+ {
+
+ }
+ else
+ {
+
+ }
+
+ Cancel
+
+ |
-
-
-@if (!RichTextEditorMode)
-{
-
-}
-else
-{
-
-}
-
-
Cancel
-
-
-
+ }
+ }
-@code {
- public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Edit; } }
- public override string Title { get { return "Edit Html/Text"; } }
+ string _visibleText;
+ string _visibleRich;
+ bool _richTextEditorMode;
RichTextEditor RichTextEditorHtml;
- bool RichTextEditorMode = true;
string content;
string createdby;
DateTime createdon;
@@ -80,18 +111,22 @@ else
protected override async Task OnAfterRenderAsync(bool firstRender)
{
- if (firstRender)
+ try
{
- try
+ if (firstRender)
{
- await LoadText();
- }
- catch (Exception ex)
- {
- await logger.LogError(ex, "An Error Occurred Loading Html/Text Content. " + ex.Message);
- AddModuleMessage(ex.Message, MessageType.Error);
+ if (content == null)
+ {
+ RichTextEditorMode = true;
+ await LoadText();
+ }
}
}
+ catch (Exception ex)
+ {
+ await logger.LogError(ex, "An Error Occurred Loading Html/Text Content. " + ex.Message);
+ AddModuleMessage(ex.Message, MessageType.Error);
+ }
}
private async Task LoadText()
@@ -117,20 +152,22 @@ else
private async Task RichTextEditor()
{
RichTextEditorMode = true;
- await LoadText();
+ await RichTextEditorHtml.LoadContent(content);
+ StateHasChanged();
}
- private async Task RawHTMLEditor()
+ private async Task RawHtmlEditor()
{
+ content = await this.RichTextEditorHtml.GetHTML();
RichTextEditorMode = false;
- await LoadText();
+ StateHasChanged();
}
private async Task SaveContent()
{
if (RichTextEditorMode)
{
- content = await this.RichTextEditorHtml.GetHTML();
+ content = await RichTextEditorHtml.GetHTML();
}
content = content.Replace(((PageState.Alias.Path == "") ? "/~" : PageState.Alias.Path) + Constants.ContentUrl, Constants.ContentUrl);
@@ -160,4 +197,5 @@ else
AddModuleMessage("Error Saving Content", MessageType.Error);
}
}
+
}
diff --git a/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs b/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs
index b6336015..8639a737 100644
--- a/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs
+++ b/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs
@@ -1,3 +1,5 @@
+using System.Collections.Generic;
+using System.Linq;
using System.Threading.Tasks;
using System.Net.Http;
using Microsoft.AspNetCore.Components;
@@ -10,20 +12,20 @@ namespace Oqtane.Modules.HtmlText.Services
{
public class HtmlTextService : ServiceBase, IHtmlTextService
{
- private readonly HttpClient http;
- private readonly SiteState sitestate;
- private readonly NavigationManager NavigationManager;
+ private readonly HttpClient _http;
+ private readonly SiteState _siteState;
+ private readonly NavigationManager _navigationManager;
- public HtmlTextService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
+ public HtmlTextService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
{
- this.http = http;
- this.sitestate = sitestate;
- this.NavigationManager = NavigationManager;
+ _http = http;
+ _siteState = siteState;
+ _navigationManager = navigationManager;
}
private string apiurl
{
- get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "HtmlText"); }
+ get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "HtmlText"); }
}
public async Task
GetHtmlTextAsync(int ModuleId)
@@ -31,8 +33,10 @@ namespace Oqtane.Modules.HtmlText.Services
HtmlTextInfo htmltext;
try
{
- // exception handling is required because GetJsonAsync() returns an error if no content exists for the ModuleId ( https://github.com/aspnet/AspNetCore/issues/14041 )
- htmltext = await http.GetJsonAsync(apiurl + "/" + ModuleId.ToString() + "?entityid=" + ModuleId.ToString());
+ //because GetJsonAsync() returns an error if no content exists for the ModuleId ( https://github.com/aspnet/AspNetCore/issues/14041 )
+ //null value is transfered as empty list
+ var htmltextList = await _http.GetJsonAsync>(apiurl + "/" + ModuleId.ToString() + "?entityid=" + ModuleId.ToString());
+ htmltext = htmltextList.FirstOrDefault();
}
catch
{
@@ -43,17 +47,17 @@ namespace Oqtane.Modules.HtmlText.Services
public async Task AddHtmlTextAsync(HtmlTextInfo htmltext)
{
- await http.PostJsonAsync(apiurl + "?entityid=" + htmltext.ModuleId.ToString(), htmltext);
+ await _http.PostJsonAsync(apiurl + "?entityid=" + htmltext.ModuleId.ToString(), htmltext);
}
public async Task UpdateHtmlTextAsync(HtmlTextInfo htmltext)
{
- await http.PutJsonAsync(apiurl + "/" + htmltext.HtmlTextId.ToString() + "?entityid=" + htmltext.ModuleId.ToString(), htmltext);
+ await _http.PutJsonAsync(apiurl + "/" + htmltext.HtmlTextId.ToString() + "?entityid=" + htmltext.ModuleId.ToString(), htmltext);
}
public async Task DeleteHtmlTextAsync(int ModuleId)
{
- await http.DeleteAsync(apiurl + "/" + ModuleId.ToString() + "?entityid=" + ModuleId.ToString());
+ await _http.DeleteAsync(apiurl + "/" + ModuleId.ToString() + "?entityid=" + ModuleId.ToString());
}
}
diff --git a/Oqtane.Client/Modules/ModuleBase.cs b/Oqtane.Client/Modules/ModuleBase.cs
index 4e60257a..ecfe4f8e 100644
--- a/Oqtane.Client/Modules/ModuleBase.cs
+++ b/Oqtane.Client/Modules/ModuleBase.cs
@@ -10,13 +10,10 @@ namespace Oqtane.Modules
{
public class ModuleBase : ComponentBase, IModuleControl
{
- public Logger logger { get; set; }
-
- public ModuleBase()
- {
- this.logger = new Logger(this);
- }
+ private Logger _logger;
+ protected Logger logger => _logger ?? (_logger = new Logger(this));
+
[Inject]
protected ILogService LoggingService { get; set; }
@@ -43,7 +40,7 @@ namespace Oqtane.Modules
public string ModulePath()
{
- return "Modules/" + this.GetType().Namespace + "/";
+ return "Modules/" + GetType().Namespace + "/";
}
// url methods
@@ -87,14 +84,14 @@ namespace Oqtane.Modules
return EditUrl(ModuleState.ModuleId, action, parameters);
}
- public string EditUrl(int moduleid, string action)
+ public string EditUrl(int moduleId, string action)
{
- return EditUrl(moduleid, action, "");
+ return EditUrl(moduleId, action, "");
}
- public string EditUrl(int moduleid, string action, string parameters)
+ public string EditUrl(int moduleId, string action, string parameters)
{
- return EditUrl(PageState.Page.Path, moduleid, action, parameters);
+ return EditUrl(PageState.Page.Path, moduleId, action, parameters);
}
public string EditUrl(string path, int moduleid, string action, string parameters)
@@ -128,16 +125,16 @@ namespace Oqtane.Modules
// logging methods
public async Task Log(Alias alias, LogLevel level, string function, Exception exception, string message, params object[] args)
{
- int PageId = PageState.Page.PageId;
- int ModuleId = ModuleState.ModuleId;
- int? UserId = null;
+ int pageId = PageState.Page.PageId;
+ int moduleId = ModuleState.ModuleId;
+ int? userId = null;
if (PageState.User != null)
{
- UserId = PageState.User.UserId;
+ userId = PageState.User.UserId;
}
- string category = this.GetType().AssemblyQualifiedName;
+ string category = GetType().AssemblyQualifiedName;
string feature = Utilities.GetTypeNameLastSegment(category, 1);
- LogFunction logfunction;
+ LogFunction logFunction;
if (string.IsNullOrEmpty(function))
{
function = PageState.Action;
@@ -145,92 +142,92 @@ namespace Oqtane.Modules
switch (function.ToLower())
{
case "add":
- logfunction = LogFunction.Create;
+ logFunction = LogFunction.Create;
break;
case "edit":
- logfunction = LogFunction.Update;
+ logFunction = LogFunction.Update;
break;
case "delete":
- logfunction = LogFunction.Delete;
+ logFunction = LogFunction.Delete;
break;
default:
- logfunction = LogFunction.Read;
+ logFunction = LogFunction.Read;
break;
}
if (feature == "Login")
{
- logfunction = LogFunction.Security;
+ logFunction = LogFunction.Security;
}
- await LoggingService.Log(alias, PageId, ModuleId, UserId, category, feature, logfunction, level, exception, message, args);
+ await LoggingService.Log(alias, pageId, moduleId, userId, category, feature, logFunction, level, exception, message, args);
}
public class Logger
{
- private ModuleBase modulebase;
+ private readonly ModuleBase _moduleBase;
- public Logger(ModuleBase modulebase)
+ public Logger(ModuleBase moduleBase)
{
- this.modulebase = modulebase;
+ _moduleBase = moduleBase;
}
public async Task LogTrace(string message, params object[] args)
{
- await modulebase.Log(null, LogLevel.Trace, "", null, message, args);
+ await _moduleBase.Log(null, LogLevel.Trace, "", null, message, args);
}
public async Task LogTrace(Exception exception, string message, params object[] args)
{
- await modulebase.Log(null, LogLevel.Trace, "", exception, message, args);
+ await _moduleBase.Log(null, LogLevel.Trace, "", exception, message, args);
}
public async Task LogDebug(string message, params object[] args)
{
- await modulebase.Log(null, LogLevel.Debug, "", null, message, args);
+ await _moduleBase.Log(null, LogLevel.Debug, "", null, message, args);
}
public async Task LogDebug(Exception exception, string message, params object[] args)
{
- await modulebase.Log(null, LogLevel.Debug, "", exception, message, args);
+ await _moduleBase.Log(null, LogLevel.Debug, "", exception, message, args);
}
public async Task LogInformation(string message, params object[] args)
{
- await modulebase.Log(null, LogLevel.Information, "", null, message, args);
+ await _moduleBase.Log(null, LogLevel.Information, "", null, message, args);
}
public async Task LogInformation(Exception exception, string message, params object[] args)
{
- await modulebase.Log(null, LogLevel.Information, "", exception, message, args);
+ await _moduleBase.Log(null, LogLevel.Information, "", exception, message, args);
}
public async Task LogWarning(string message, params object[] args)
{
- await modulebase.Log(null, LogLevel.Warning, "", null, message, args);
+ await _moduleBase.Log(null, LogLevel.Warning, "", null, message, args);
}
public async Task LogWarning(Exception exception, string message, params object[] args)
{
- await modulebase.Log(null, LogLevel.Warning, "", exception, message, args);
+ await _moduleBase.Log(null, LogLevel.Warning, "", exception, message, args);
}
public async Task LogError(string message, params object[] args)
{
- await modulebase.Log(null, LogLevel.Error, "", null, message, args);
+ await _moduleBase.Log(null, LogLevel.Error, "", null, message, args);
}
public async Task LogError(Exception exception, string message, params object[] args)
{
- await modulebase.Log(null, LogLevel.Error, "", exception, message, args);
+ await _moduleBase.Log(null, LogLevel.Error, "", exception, message, args);
}
public async Task LogCritical(string message, params object[] args)
{
- await modulebase.Log(null, LogLevel.Critical, "", null, message, args);
+ await _moduleBase.Log(null, LogLevel.Critical, "", null, message, args);
}
public async Task LogCritical(Exception exception, string message, params object[] args)
{
- await modulebase.Log(null, LogLevel.Critical, "", exception, message, args);
+ await _moduleBase.Log(null, LogLevel.Critical, "", exception, message, args);
}
}
}
diff --git a/Oqtane.Client/Providers/IdentityAuthenticationStateProvider.cs b/Oqtane.Client/Providers/IdentityAuthenticationStateProvider.cs
index 2aa9b618..40904341 100644
--- a/Oqtane.Client/Providers/IdentityAuthenticationStateProvider.cs
+++ b/Oqtane.Client/Providers/IdentityAuthenticationStateProvider.cs
@@ -13,22 +13,22 @@ namespace Oqtane.Providers
{
public class IdentityAuthenticationStateProvider : AuthenticationStateProvider
{
- private readonly NavigationManager NavigationManager;
- private readonly SiteState sitestate;
- private readonly IServiceProvider provider;
+ private readonly NavigationManager _navigationManager;
+ private readonly SiteState _siteState;
+ private readonly IServiceProvider _serviceProvider;
- public IdentityAuthenticationStateProvider(NavigationManager NavigationManager, SiteState sitestate, IServiceProvider provider)
+ public IdentityAuthenticationStateProvider(NavigationManager navigationManager, SiteState siteState, IServiceProvider serviceProvider)
{
- this.NavigationManager = NavigationManager;
- this.sitestate = sitestate;
- this.provider = provider;
+ _navigationManager = navigationManager;
+ _siteState = siteState;
+ _serviceProvider = serviceProvider;
}
public override async Task GetAuthenticationStateAsync()
{
// get HttpClient lazily from IServiceProvider as you cannot use standard dependency injection due to the AuthenticationStateProvider being initialized prior to NavigationManager ( https://github.com/aspnet/AspNetCore/issues/11867 )
- var http = provider.GetRequiredService();
- string apiurl = ServiceBase.CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "User") + "/authenticate";
+ var http = _serviceProvider.GetRequiredService();
+ string apiurl = ServiceBase.CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "User") + "/authenticate";
User user = await http.GetJsonAsync(apiurl);
ClaimsIdentity identity = new ClaimsIdentity();
diff --git a/Oqtane.Client/Services/AliasService.cs b/Oqtane.Client/Services/AliasService.cs
index c60fed12..03c0b845 100644
--- a/Oqtane.Client/Services/AliasService.cs
+++ b/Oqtane.Client/Services/AliasService.cs
@@ -12,31 +12,31 @@ namespace Oqtane.Services
{
public class AliasService : ServiceBase, IAliasService
{
- private readonly HttpClient http;
- private readonly SiteState sitestate;
- private readonly NavigationManager NavigationManager;
+ private readonly HttpClient _http;
+ private readonly SiteState _siteState;
+ private readonly NavigationManager _navigationManager;
- public AliasService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
+ public AliasService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
{
- this.http = http;
- this.sitestate = sitestate;
- this.NavigationManager = NavigationManager;
+ _http = http;
+ _siteState = siteState;
+ _navigationManager = navigationManager;
}
private string apiurl
{
- get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Alias"); }
+ get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Alias"); }
}
public async Task> GetAliasesAsync()
{
- List aliases = await http.GetJsonAsync>(apiurl);
+ List aliases = await _http.GetJsonAsync>(apiurl);
return aliases.OrderBy(item => item.Name).ToList();
}
public async Task GetAliasAsync(int AliasId)
{
- return await http.GetJsonAsync(apiurl + "/" + AliasId.ToString());
+ return await _http.GetJsonAsync(apiurl + "/" + AliasId.ToString());
}
public async Task GetAliasAsync(string Url)
@@ -51,21 +51,21 @@ namespace Oqtane.Services
{
name = name.Substring(0, name.Length - 1);
}
- return await http.GetJsonAsync(apiurl + "/name/" + WebUtility.UrlEncode(name));
+ return await _http.GetJsonAsync(apiurl + "/name/" + WebUtility.UrlEncode(name));
}
public async Task AddAliasAsync(Alias alias)
{
- return await http.PostJsonAsync(apiurl, alias);
+ return await _http.PostJsonAsync(apiurl, alias);
}
public async Task UpdateAliasAsync(Alias alias)
{
- return await http.PutJsonAsync(apiurl + "/" + alias.AliasId.ToString(), alias);
+ return await _http.PutJsonAsync(apiurl + "/" + alias.AliasId.ToString(), alias);
}
public async Task DeleteAliasAsync(int AliasId)
{
- await http.DeleteAsync(apiurl + "/" + AliasId.ToString());
+ await _http.DeleteAsync(apiurl + "/" + AliasId.ToString());
}
}
}
diff --git a/Oqtane.Client/Services/FileService.cs b/Oqtane.Client/Services/FileService.cs
index f706756f..3a3bc8a8 100644
--- a/Oqtane.Client/Services/FileService.cs
+++ b/Oqtane.Client/Services/FileService.cs
@@ -12,22 +12,22 @@ namespace Oqtane.Services
{
public class FileService : ServiceBase, IFileService
{
- private readonly HttpClient http;
- private readonly SiteState sitestate;
- private readonly NavigationManager NavigationManager;
- private readonly IJSRuntime jsRuntime;
+ private readonly HttpClient _http;
+ private readonly SiteState _siteState;
+ private readonly NavigationManager _navigationManager;
+ private readonly IJSRuntime _jsRuntime;
- public FileService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager, IJSRuntime jsRuntime)
+ public FileService(HttpClient http, SiteState siteState, NavigationManager navigationManager, IJSRuntime jsRuntime)
{
- this.http = http;
- this.sitestate = sitestate;
- this.NavigationManager = NavigationManager;
- this.jsRuntime = jsRuntime;
+ _http = http;
+ _siteState = siteState;
+ _navigationManager = navigationManager;
+ _jsRuntime = jsRuntime;
}
private string apiurl
{
- get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "File"); }
+ get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "File"); }
}
public async Task> GetFilesAsync(int FolderId)
@@ -37,32 +37,32 @@ namespace Oqtane.Services
public async Task> GetFilesAsync(string Folder)
{
- return await http.GetJsonAsync>(apiurl + "?folder=" + Folder);
+ return await _http.GetJsonAsync>(apiurl + "?folder=" + Folder);
}
public async Task GetFileAsync(int FileId)
{
- return await http.GetJsonAsync(apiurl + "/" + FileId.ToString());
+ return await _http.GetJsonAsync(apiurl + "/" + FileId.ToString());
}
public async Task AddFileAsync(File File)
{
- return await http.PostJsonAsync(apiurl, File);
+ return await _http.PostJsonAsync(apiurl, File);
}
public async Task UpdateFileAsync(File File)
{
- return await http.PutJsonAsync(apiurl + "/" + File.FileId.ToString(), File);
+ return await _http.PutJsonAsync(apiurl + "/" + File.FileId.ToString(), File);
}
public async Task DeleteFileAsync(int FileId)
{
- await http.DeleteAsync(apiurl + "/" + FileId.ToString());
+ await _http.DeleteAsync(apiurl + "/" + FileId.ToString());
}
public async Task UploadFileAsync(string Url, int FolderId)
{
- return await http.GetJsonAsync(apiurl + "/upload?url=" + WebUtility.UrlEncode(Url) + "&folderid=" + FolderId.ToString());
+ return await _http.GetJsonAsync(apiurl + "/upload?url=" + WebUtility.UrlEncode(Url) + "&folderid=" + FolderId.ToString());
}
public async Task UploadFilesAsync(int FolderId, string[] Files, string Id)
@@ -74,7 +74,7 @@ namespace Oqtane.Services
{
string result = "";
- var interop = new Interop(jsRuntime);
+ var interop = new Interop(_jsRuntime);
await interop.UploadFiles(apiurl + "/upload", Folder, Id);
// uploading files is asynchronous so we need to wait for the upload to complete
@@ -110,7 +110,7 @@ namespace Oqtane.Services
public async Task DownloadFileAsync(int FileId)
{
- return await http.GetByteArrayAsync(apiurl + "/download/" + FileId.ToString());
+ return await _http.GetByteArrayAsync(apiurl + "/download/" + FileId.ToString());
}
}
}
diff --git a/Oqtane.Client/Services/FolderService.cs b/Oqtane.Client/Services/FolderService.cs
index 73ab4d74..762ff7d8 100644
--- a/Oqtane.Client/Services/FolderService.cs
+++ b/Oqtane.Client/Services/FolderService.cs
@@ -11,52 +11,52 @@ namespace Oqtane.Services
{
public class FolderService : ServiceBase, IFolderService
{
- private readonly HttpClient http;
- private readonly SiteState sitestate;
- private readonly NavigationManager NavigationManager;
+ private readonly HttpClient _http;
+ private readonly SiteState _siteState;
+ private readonly NavigationManager _navigationManager;
- public FolderService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
+ public FolderService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
{
- this.http = http;
- this.sitestate = sitestate;
- this.NavigationManager = NavigationManager;
+ _http = http;
+ _siteState = siteState;
+ _navigationManager = navigationManager;
}
private string apiurl
{
- get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Folder"); }
+ get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Folder"); }
}
public async Task> GetFoldersAsync(int SiteId)
{
- List folders = await http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString());
+ List folders = await _http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString());
folders = GetFoldersHierarchy(folders);
return folders;
}
public async Task GetFolderAsync(int FolderId)
{
- return await http.GetJsonAsync(apiurl + "/" + FolderId.ToString());
+ return await _http.GetJsonAsync(apiurl + "/" + FolderId.ToString());
}
public async Task AddFolderAsync(Folder Folder)
{
- return await http.PostJsonAsync(apiurl, Folder);
+ return await _http.PostJsonAsync(apiurl, Folder);
}
public async Task UpdateFolderAsync(Folder Folder)
{
- return await http.PutJsonAsync(apiurl + "/" + Folder.FolderId.ToString(), Folder);
+ return await _http.PutJsonAsync(apiurl + "/" + Folder.FolderId.ToString(), Folder);
}
public async Task UpdateFolderOrderAsync(int SiteId, int FolderId, int? ParentId)
{
- await http.PutJsonAsync(apiurl + "/?siteid=" + SiteId.ToString() + "&folderid=" + FolderId.ToString() + "&parentid=" + ((ParentId == null) ? "" : ParentId.ToString()), null);
+ await _http.PutJsonAsync(apiurl + "/?siteid=" + SiteId.ToString() + "&folderid=" + FolderId.ToString() + "&parentid=" + ((ParentId == null) ? "" : ParentId.ToString()), null);
}
public async Task DeleteFolderAsync(int FolderId)
{
- await http.DeleteAsync(apiurl + "/" + FolderId.ToString());
+ await _http.DeleteAsync(apiurl + "/" + FolderId.ToString());
}
private static List GetFoldersHierarchy(List Folders)
diff --git a/Oqtane.Client/Services/InstallationService.cs b/Oqtane.Client/Services/InstallationService.cs
index 9a749c2b..e8b66cc4 100644
--- a/Oqtane.Client/Services/InstallationService.cs
+++ b/Oqtane.Client/Services/InstallationService.cs
@@ -10,35 +10,35 @@ namespace Oqtane.Services
{
public class InstallationService : ServiceBase, IInstallationService
{
- private readonly HttpClient http;
- private readonly SiteState sitestate;
- private readonly NavigationManager NavigationManager;
+ private readonly HttpClient _http;
+ private readonly SiteState _siteState;
+ private readonly NavigationManager _navigationManager;
- public InstallationService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
+ public InstallationService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
{
- this.http = http;
- this.sitestate = sitestate;
- this.NavigationManager = NavigationManager;
+ _http = http;
+ _siteState = siteState;
+ _navigationManager = navigationManager;
}
private string apiurl
{
- get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Installation"); }
+ get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Installation"); }
}
public async Task IsInstalled()
{
- return await http.GetJsonAsync(apiurl + "/installed");
+ return await _http.GetJsonAsync(apiurl + "/installed");
}
public async Task Install(string connectionstring)
{
- return await http.PostJsonAsync(apiurl, connectionstring);
+ return await _http.PostJsonAsync(apiurl, connectionstring);
}
public async Task Upgrade()
{
- return await http.GetJsonAsync(apiurl + "/upgrade");
+ return await _http.GetJsonAsync(apiurl + "/upgrade");
}
}
}
diff --git a/Oqtane.Client/Services/JobLogService.cs b/Oqtane.Client/Services/JobLogService.cs
index bd1d0c44..fde2c158 100644
--- a/Oqtane.Client/Services/JobLogService.cs
+++ b/Oqtane.Client/Services/JobLogService.cs
@@ -10,45 +10,45 @@ namespace Oqtane.Services
{
public class JobLogService : ServiceBase, IJobLogService
{
- private readonly HttpClient http;
- private readonly SiteState sitestate;
- private readonly NavigationManager NavigationManager;
+ private readonly HttpClient _http;
+ private readonly SiteState _siteState;
+ private readonly NavigationManager _navigationManager;
- public JobLogService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
+ public JobLogService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
{
- this.http = http;
- this.sitestate = sitestate;
- this.NavigationManager = NavigationManager;
+ _http = http;
+ _siteState = siteState;
+ _navigationManager = navigationManager;
}
private string apiurl
{
- get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "JobLog"); }
+ get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "JobLog"); }
}
public async Task> GetJobLogsAsync()
{
- List Joblogs = await http.GetJsonAsync>(apiurl);
+ List Joblogs = await _http.GetJsonAsync>(apiurl);
return Joblogs.OrderBy(item => item.StartDate).ToList();
}
public async Task GetJobLogAsync(int JobLogId)
{
- return await http.GetJsonAsync(apiurl + "/" + JobLogId.ToString());
+ return await _http.GetJsonAsync(apiurl + "/" + JobLogId.ToString());
}
public async Task AddJobLogAsync(JobLog Joblog)
{
- return await http.PostJsonAsync(apiurl, Joblog);
+ return await _http.PostJsonAsync(apiurl, Joblog);
}
public async Task UpdateJobLogAsync(JobLog Joblog)
{
- return await http.PutJsonAsync(apiurl + "/" + Joblog.JobLogId.ToString(), Joblog);
+ return await _http.PutJsonAsync(apiurl + "/" + Joblog.JobLogId.ToString(), Joblog);
}
public async Task DeleteJobLogAsync(int JobLogId)
{
- await http.DeleteAsync(apiurl + "/" + JobLogId.ToString());
+ await _http.DeleteAsync(apiurl + "/" + JobLogId.ToString());
}
}
}
diff --git a/Oqtane.Client/Services/JobService.cs b/Oqtane.Client/Services/JobService.cs
index 8481b0b1..b6b6a003 100644
--- a/Oqtane.Client/Services/JobService.cs
+++ b/Oqtane.Client/Services/JobService.cs
@@ -10,55 +10,55 @@ namespace Oqtane.Services
{
public class JobService : ServiceBase, IJobService
{
- private readonly HttpClient http;
- private readonly SiteState sitestate;
- private readonly NavigationManager NavigationManager;
+ private readonly HttpClient _http;
+ private readonly SiteState _siteState;
+ private readonly NavigationManager _navigationManager;
- public JobService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
+ public JobService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
{
- this.http = http;
- this.sitestate = sitestate;
- this.NavigationManager = NavigationManager;
+ _http = http;
+ _siteState = siteState;
+ _navigationManager = navigationManager;
}
private string apiurl
{
- get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Job"); }
+ get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Job"); }
}
public async Task> GetJobsAsync()
{
- List Jobs = await http.GetJsonAsync>(apiurl);
+ List Jobs = await _http.GetJsonAsync>(apiurl);
return Jobs.OrderBy(item => item.Name).ToList();
}
public async Task GetJobAsync(int JobId)
{
- return await http.GetJsonAsync(apiurl + "/" + JobId.ToString());
+ return await _http.GetJsonAsync(apiurl + "/" + JobId.ToString());
}
public async Task AddJobAsync(Job Job)
{
- return await http.PostJsonAsync(apiurl, Job);
+ return await _http.PostJsonAsync(apiurl, Job);
}
public async Task UpdateJobAsync(Job Job)
{
- return await http.PutJsonAsync(apiurl + "/" + Job.JobId.ToString(), Job);
+ return await _http.PutJsonAsync(apiurl + "/" + Job.JobId.ToString(), Job);
}
public async Task DeleteJobAsync(int JobId)
{
- await http.DeleteAsync(apiurl + "/" + JobId.ToString());
+ await _http.DeleteAsync(apiurl + "/" + JobId.ToString());
}
public async Task StartJobAsync(int JobId)
{
- await http.GetAsync(apiurl + "/start/" + JobId.ToString());
+ await _http.GetAsync(apiurl + "/start/" + JobId.ToString());
}
public async Task StopJobAsync(int JobId)
{
- await http.GetAsync(apiurl + "/stop/" + JobId.ToString());
+ await _http.GetAsync(apiurl + "/stop/" + JobId.ToString());
}
}
}
diff --git a/Oqtane.Client/Services/LogService.cs b/Oqtane.Client/Services/LogService.cs
index 50cd6ebf..127effb4 100644
--- a/Oqtane.Client/Services/LogService.cs
+++ b/Oqtane.Client/Services/LogService.cs
@@ -11,30 +11,30 @@ namespace Oqtane.Services
{
public class LogService : ServiceBase, ILogService
{
- private readonly HttpClient http;
- private readonly SiteState sitestate;
- private readonly NavigationManager NavigationManager;
+ private readonly HttpClient _http;
+ private readonly SiteState _siteState;
+ private readonly NavigationManager _navigationManager;
- public LogService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
+ public LogService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
{
- this.http = http;
- this.sitestate = sitestate;
- this.NavigationManager = NavigationManager;
+ _http = http;
+ _siteState = siteState;
+ _navigationManager = navigationManager;
}
private string apiurl
{
- get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Log"); }
+ get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Log"); }
}
public async Task> GetLogsAsync(int SiteId, string Level, string Function, int Rows)
{
- return await http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString() + "&level=" + Level + "&function=" + Function + "&rows=" + Rows.ToString());
+ return await _http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString() + "&level=" + Level + "&function=" + Function + "&rows=" + Rows.ToString());
}
public async Task GetLogAsync(int LogId)
{
- return await http.GetJsonAsync(apiurl + "/" + LogId.ToString());
+ return await _http.GetJsonAsync(apiurl + "/" + LogId.ToString());
}
public async Task Log(int? PageId, int? ModuleId, int? UserId, string category, string feature, LogFunction function, LogLevel level, Exception exception, string message, params object[] args)
@@ -47,7 +47,7 @@ namespace Oqtane.Services
Log log = new Log();
if (Alias == null)
{
- log.SiteId = sitestate.Alias.SiteId;
+ log.SiteId = _siteState.Alias.SiteId;
}
else
{
@@ -56,7 +56,7 @@ namespace Oqtane.Services
log.PageId = PageId;
log.ModuleId = ModuleId;
log.UserId = UserId;
- log.Url = NavigationManager.Uri;
+ log.Url = _navigationManager.Uri;
log.Category = category;
log.Feature = feature;
log.Function = Enum.GetName(typeof(LogFunction), function);
@@ -68,7 +68,7 @@ namespace Oqtane.Services
log.Message = message;
log.MessageTemplate = "";
log.Properties = JsonSerializer.Serialize(args);
- await http.PostJsonAsync(CreateCrossTenantUrl(apiurl, Alias), log);
+ await _http.PostJsonAsync(CreateCrossTenantUrl(apiurl, Alias), log);
}
}
}
diff --git a/Oqtane.Client/Services/ModuleDefinitionService.cs b/Oqtane.Client/Services/ModuleDefinitionService.cs
index 70bf8ee1..9be0c222 100644
--- a/Oqtane.Client/Services/ModuleDefinitionService.cs
+++ b/Oqtane.Client/Services/ModuleDefinitionService.cs
@@ -12,46 +12,46 @@ namespace Oqtane.Services
{
public class ModuleDefinitionService : ServiceBase, IModuleDefinitionService
{
- private readonly HttpClient http;
- private readonly SiteState sitestate;
- private readonly NavigationManager NavigationManager;
+ private readonly HttpClient _http;
+ private readonly SiteState _siteState;
+ private readonly NavigationManager _navigationManager;
- public ModuleDefinitionService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
+ public ModuleDefinitionService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
{
- this.http = http;
- this.sitestate = sitestate;
- this.NavigationManager = NavigationManager;
+ _http = http;
+ _siteState = siteState;
+ _navigationManager = navigationManager;
}
private string apiurl
{
- get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "ModuleDefinition"); }
+ get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "ModuleDefinition"); }
}
public async Task> GetModuleDefinitionsAsync(int SiteId)
{
- List moduledefinitions = await http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString());
+ List moduledefinitions = await _http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString());
return moduledefinitions.OrderBy(item => item.Name).ToList();
}
public async Task GetModuleDefinitionAsync(int ModuleDefinitionId, int SiteId)
{
- return await http.GetJsonAsync(apiurl + "/" + ModuleDefinitionId.ToString() + "?siteid=" + SiteId.ToString());
+ return await _http.GetJsonAsync(apiurl + "/" + ModuleDefinitionId.ToString() + "?siteid=" + SiteId.ToString());
}
public async Task UpdateModuleDefinitionAsync(ModuleDefinition ModuleDefinition)
{
- await http.PutJsonAsync(apiurl + "/" + ModuleDefinition.ModuleDefinitionId.ToString(), ModuleDefinition);
+ await _http.PutJsonAsync(apiurl + "/" + ModuleDefinition.ModuleDefinitionId.ToString(), ModuleDefinition);
}
public async Task InstallModuleDefinitionsAsync()
{
- await http.GetJsonAsync>(apiurl + "/install");
+ await _http.GetJsonAsync>(apiurl + "/install");
}
public async Task DeleteModuleDefinitionAsync(int ModuleDefinitionId, int SiteId)
{
- await http.DeleteAsync(apiurl + "/" + ModuleDefinitionId.ToString() + "?siteid=" + SiteId.ToString());
+ await _http.DeleteAsync(apiurl + "/" + ModuleDefinitionId.ToString() + "?siteid=" + SiteId.ToString());
}
public async Task LoadModuleDefinitionsAsync(int SiteId)
@@ -73,7 +73,7 @@ namespace Oqtane.Services
if (assemblies.Where(item => item.FullName.StartsWith(assemblyname + ",")).FirstOrDefault() == null)
{
// download assembly from server and load
- var bytes = await http.GetByteArrayAsync(apiurl + "/load/" + assemblyname + ".dll");
+ var bytes = await _http.GetByteArrayAsync(apiurl + "/load/" + assemblyname + ".dll");
Assembly.Load(bytes);
}
}
@@ -82,7 +82,7 @@ namespace Oqtane.Services
if (assemblies.Where(item => item.FullName.StartsWith(moduledefinition.AssemblyName + ",")).FirstOrDefault() == null)
{
// download assembly from server and load
- var bytes = await http.GetByteArrayAsync(apiurl + "/load/" + moduledefinition.AssemblyName + ".dll");
+ var bytes = await _http.GetByteArrayAsync(apiurl + "/load/" + moduledefinition.AssemblyName + ".dll");
Assembly.Load(bytes);
}
}
diff --git a/Oqtane.Client/Services/ModuleService.cs b/Oqtane.Client/Services/ModuleService.cs
index 09c47de7..ee49abc5 100644
--- a/Oqtane.Client/Services/ModuleService.cs
+++ b/Oqtane.Client/Services/ModuleService.cs
@@ -10,25 +10,25 @@ namespace Oqtane.Services
{
public class ModuleService : ServiceBase, IModuleService
{
- private readonly HttpClient http;
- private readonly SiteState sitestate;
- private readonly NavigationManager NavigationManager;
+ private readonly HttpClient _http;
+ private readonly SiteState _siteState;
+ private readonly NavigationManager _navigationManager;
- public ModuleService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
+ public ModuleService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
{
- this.http = http;
- this.sitestate = sitestate;
- this.NavigationManager = NavigationManager;
+ _http = http;
+ _siteState = siteState;
+ _navigationManager = navigationManager;
}
private string apiurl
{
- get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Module"); }
+ get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Module"); }
}
public async Task> GetModulesAsync(int SiteId)
{
- List modules = await http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString());
+ List modules = await _http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString());
modules = modules
.OrderBy(item => item.Order)
.ToList();
@@ -37,32 +37,32 @@ namespace Oqtane.Services
public async Task GetModuleAsync(int ModuleId)
{
- return await http.GetJsonAsync(apiurl + "/" + ModuleId.ToString());
+ return await _http.GetJsonAsync(apiurl + "/" + ModuleId.ToString());
}
public async Task AddModuleAsync(Module Module)
{
- return await http.PostJsonAsync(apiurl, Module);
+ return await _http.PostJsonAsync(apiurl, Module);
}
public async Task UpdateModuleAsync(Module Module)
{
- return await http.PutJsonAsync(apiurl + "/" + Module.ModuleId.ToString(), Module);
+ return await _http.PutJsonAsync(apiurl + "/" + Module.ModuleId.ToString(), Module);
}
public async Task DeleteModuleAsync(int ModuleId)
{
- await http.DeleteAsync(apiurl + "/" + ModuleId.ToString());
+ await _http.DeleteAsync(apiurl + "/" + ModuleId.ToString());
}
public async Task ImportModuleAsync(int ModuleId, string Content)
{
- return await http.PostJsonAsync(apiurl + "/import?moduleid=" + ModuleId, Content);
+ return await _http.PostJsonAsync(apiurl + "/import?moduleid=" + ModuleId, Content);
}
public async Task ExportModuleAsync(int ModuleId)
{
- return await http.GetStringAsync(apiurl + "/export?moduleid=" + ModuleId.ToString());
+ return await _http.GetStringAsync(apiurl + "/export?moduleid=" + ModuleId.ToString());
}
}
}
diff --git a/Oqtane.Client/Services/NotificationService.cs b/Oqtane.Client/Services/NotificationService.cs
index c43f6f3e..22e4f7d3 100644
--- a/Oqtane.Client/Services/NotificationService.cs
+++ b/Oqtane.Client/Services/NotificationService.cs
@@ -10,46 +10,46 @@ namespace Oqtane.Services
{
public class NotificationService : ServiceBase, INotificationService
{
- private readonly HttpClient http;
- private readonly SiteState sitestate;
- private readonly NavigationManager NavigationManager;
+ private readonly HttpClient _http;
+ private readonly SiteState _siteState;
+ private readonly NavigationManager _navigationManager;
- public NotificationService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
+ public NotificationService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
{
- this.http = http;
- this.sitestate = sitestate;
- this.NavigationManager = NavigationManager;
+ _http = http;
+ _siteState = siteState;
+ _navigationManager = navigationManager;
}
private string apiurl
{
- get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Notification"); }
+ get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Notification"); }
}
public async Task> GetNotificationsAsync(int SiteId, string Direction, int UserId)
{
string querystring = "?siteid=" + SiteId.ToString() + "&direction=" + Direction.ToLower() + "&userid=" + UserId.ToString();
- List Notifications = await http.GetJsonAsync>(apiurl + querystring);
+ List Notifications = await _http.GetJsonAsync>(apiurl + querystring);
return Notifications.OrderByDescending(item => item.CreatedOn).ToList();
}
public async Task GetNotificationAsync(int NotificationId)
{
- return await http.GetJsonAsync(apiurl + "/" + NotificationId.ToString());
+ return await _http.GetJsonAsync(apiurl + "/" + NotificationId.ToString());
}
public async Task AddNotificationAsync(Notification Notification)
{
- return await http.PostJsonAsync(apiurl, Notification);
+ return await _http.PostJsonAsync(apiurl, Notification);
}
public async Task UpdateNotificationAsync(Notification Notification)
{
- return await http.PutJsonAsync(apiurl + "/" + Notification.NotificationId.ToString(), Notification);
+ return await _http.PutJsonAsync(apiurl + "/" + Notification.NotificationId.ToString(), Notification);
}
public async Task DeleteNotificationAsync(int NotificationId)
{
- await http.DeleteAsync(apiurl + "/" + NotificationId.ToString());
+ await _http.DeleteAsync(apiurl + "/" + NotificationId.ToString());
}
}
}
diff --git a/Oqtane.Client/Services/PackageService.cs b/Oqtane.Client/Services/PackageService.cs
index bd2c8b39..018b5f50 100644
--- a/Oqtane.Client/Services/PackageService.cs
+++ b/Oqtane.Client/Services/PackageService.cs
@@ -10,31 +10,31 @@ namespace Oqtane.Services
{
public class PackageService : ServiceBase, IPackageService
{
- private readonly HttpClient http;
- private readonly SiteState sitestate;
- private readonly NavigationManager NavigationManager;
+ private readonly HttpClient _http;
+ private readonly SiteState _siteState;
+ private readonly NavigationManager _navigationManager;
- public PackageService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
+ public PackageService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
{
- this.http = http;
- this.sitestate = sitestate;
- this.NavigationManager = NavigationManager;
+ _http = http;
+ _siteState = siteState;
+ _navigationManager = navigationManager;
}
private string apiurl
{
- get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Package"); }
+ get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Package"); }
}
public async Task> GetPackagesAsync(string Tag)
{
- List packages = await http.GetJsonAsync>(apiurl + "?tag=" + Tag);
+ List packages = await _http.GetJsonAsync>(apiurl + "?tag=" + Tag);
return packages.OrderByDescending(item => item.Downloads).ToList();
}
public async Task DownloadPackageAsync(string PackageId, string Version, string Folder)
{
- await http.PostJsonAsync(apiurl + "?packageid=" + PackageId + "&version=" + Version + "&folder=" + Folder, null);
+ await _http.PostJsonAsync(apiurl + "?packageid=" + PackageId + "&version=" + Version + "&folder=" + Folder, null);
}
}
}
diff --git a/Oqtane.Client/Services/PageModuleService.cs b/Oqtane.Client/Services/PageModuleService.cs
index 5095b060..28924e85 100644
--- a/Oqtane.Client/Services/PageModuleService.cs
+++ b/Oqtane.Client/Services/PageModuleService.cs
@@ -10,50 +10,50 @@ namespace Oqtane.Services
{
public class PageModuleService : ServiceBase, IPageModuleService
{
- private readonly HttpClient http;
- private readonly SiteState sitestate;
- private readonly NavigationManager NavigationManager;
+ private readonly HttpClient _http;
+ private readonly SiteState _siteState;
+ private readonly NavigationManager _navigationManager;
- public PageModuleService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
+ public PageModuleService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
{
- this.http = http;
- this.sitestate = sitestate;
- this.NavigationManager = NavigationManager;
+ _http = http;
+ _siteState = siteState;
+ _navigationManager = navigationManager;
}
private string apiurl
{
- get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "PageModule"); }
+ get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "PageModule"); }
}
public async Task GetPageModuleAsync(int PageModuleId)
{
- return await http.GetJsonAsync(apiurl + "/" + PageModuleId.ToString());
+ return await _http.GetJsonAsync(apiurl + "/" + PageModuleId.ToString());
}
public async Task GetPageModuleAsync(int PageId, int ModuleId)
{
- return await http.GetJsonAsync(apiurl + "/" + PageId.ToString() + "/" + ModuleId.ToString());
+ return await _http.GetJsonAsync(apiurl + "/" + PageId.ToString() + "/" + ModuleId.ToString());
}
public async Task AddPageModuleAsync(PageModule PageModule)
{
- return await http.PostJsonAsync(apiurl, PageModule);
+ return await _http.PostJsonAsync(apiurl, PageModule);
}
public async Task UpdatePageModuleAsync(PageModule PageModule)
{
- return await http.PutJsonAsync(apiurl + "/" + PageModule.PageModuleId.ToString(), PageModule);
+ return await _http.PutJsonAsync(apiurl + "/" + PageModule.PageModuleId.ToString(), PageModule);
}
public async Task UpdatePageModuleOrderAsync(int PageId, string Pane)
{
- await http.PutJsonAsync(apiurl + "/?pageid=" + PageId.ToString() + "&pane=" + Pane, null);
+ await _http.PutJsonAsync(apiurl + "/?pageid=" + PageId.ToString() + "&pane=" + Pane, null);
}
public async Task DeletePageModuleAsync(int PageModuleId)
{
- await http.DeleteAsync(apiurl + "/" + PageModuleId.ToString());
+ await _http.DeleteAsync(apiurl + "/" + PageModuleId.ToString());
}
}
}
diff --git a/Oqtane.Client/Services/PageService.cs b/Oqtane.Client/Services/PageService.cs
index 92607162..9ad8cbbc 100644
--- a/Oqtane.Client/Services/PageService.cs
+++ b/Oqtane.Client/Services/PageService.cs
@@ -11,62 +11,62 @@ namespace Oqtane.Services
{
public class PageService : ServiceBase, IPageService
{
- private readonly HttpClient http;
- private readonly SiteState sitestate;
- private readonly NavigationManager NavigationManager;
+ private readonly HttpClient _http;
+ private readonly SiteState _siteState;
+ private readonly NavigationManager _navigationManager;
- public PageService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
+ public PageService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
{
- this.http = http;
- this.sitestate = sitestate;
- this.NavigationManager = NavigationManager;
+ _http = http;
+ _siteState = siteState;
+ _navigationManager = navigationManager;
}
private string apiurl
{
- get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Page"); }
+ get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Page"); }
}
public async Task> GetPagesAsync(int SiteId)
{
- List pages = await http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString());
+ List pages = await _http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString());
pages = GetPagesHierarchy(pages);
return pages;
}
public async Task GetPageAsync(int PageId)
{
- return await http.GetJsonAsync(apiurl + "/" + PageId.ToString());
+ return await _http.GetJsonAsync(apiurl + "/" + PageId.ToString());
}
public async Task GetPageAsync(int PageId, int UserId)
{
- return await http.GetJsonAsync(apiurl + "/" + PageId.ToString() + "?userid=" + UserId.ToString());
+ return await _http.GetJsonAsync(apiurl + "/" + PageId.ToString() + "?userid=" + UserId.ToString());
}
public async Task AddPageAsync(Page Page)
{
- return await http.PostJsonAsync(apiurl, Page);
+ return await _http.PostJsonAsync(apiurl, Page);
}
public async Task AddPageAsync(int PageId, int UserId)
{
- return await http.PostJsonAsync(apiurl + "/" + PageId.ToString() + "?userid=" + UserId.ToString(), null);
+ return await _http.PostJsonAsync(apiurl + "/" + PageId.ToString() + "?userid=" + UserId.ToString(), null);
}
public async Task UpdatePageAsync(Page Page)
{
- return await http.PutJsonAsync(apiurl + "/" + Page.PageId.ToString(), Page);
+ return await _http.PutJsonAsync(apiurl + "/" + Page.PageId.ToString(), Page);
}
public async Task UpdatePageOrderAsync(int SiteId, int PageId, int? ParentId)
{
- await http.PutJsonAsync(apiurl + "/?siteid=" + SiteId.ToString() + "&pageid=" + PageId.ToString() + "&parentid=" + ((ParentId == null) ? "" : ParentId.ToString()), null);
+ await _http.PutJsonAsync(apiurl + "/?siteid=" + SiteId.ToString() + "&pageid=" + PageId.ToString() + "&parentid=" + ((ParentId == null) ? "" : ParentId.ToString()), null);
}
public async Task DeletePageAsync(int PageId)
{
- await http.DeleteAsync(apiurl + "/" + PageId.ToString());
+ await _http.DeleteAsync(apiurl + "/" + PageId.ToString());
}
private static List GetPagesHierarchy(List Pages)
diff --git a/Oqtane.Client/Services/ProfileService.cs b/Oqtane.Client/Services/ProfileService.cs
index 7e187b03..c456423b 100644
--- a/Oqtane.Client/Services/ProfileService.cs
+++ b/Oqtane.Client/Services/ProfileService.cs
@@ -10,45 +10,45 @@ namespace Oqtane.Services
{
public class ProfileService : ServiceBase, IProfileService
{
- private readonly HttpClient http;
- private readonly SiteState sitestate;
- private readonly NavigationManager NavigationManager;
+ private readonly HttpClient _http;
+ private readonly SiteState _siteState;
+ private readonly NavigationManager _navigationManager;
- public ProfileService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
+ public ProfileService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
{
- this.http = http;
- this.sitestate = sitestate;
- this.NavigationManager = NavigationManager;
+ _http = http;
+ _siteState = siteState;
+ _navigationManager = navigationManager;
}
private string apiurl
{
- get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Profile"); }
+ get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Profile"); }
}
public async Task> GetProfilesAsync(int SiteId)
{
- List Profiles = await http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString());
+ List Profiles = await _http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString());
return Profiles.OrderBy(item => item.ViewOrder).ToList();
}
public async Task GetProfileAsync(int ProfileId)
{
- return await http.GetJsonAsync(apiurl + "/" + ProfileId.ToString());
+ return await _http.GetJsonAsync(apiurl + "/" + ProfileId.ToString());
}
public async Task AddProfileAsync(Profile Profile)
{
- return await http.PostJsonAsync(apiurl, Profile);
+ return await _http.PostJsonAsync(apiurl, Profile);
}
public async Task UpdateProfileAsync(Profile Profile)
{
- return await http.PutJsonAsync(apiurl + "/" + Profile.SiteId.ToString(), Profile);
+ return await _http.PutJsonAsync(apiurl + "/" + Profile.SiteId.ToString(), Profile);
}
public async Task DeleteProfileAsync(int ProfileId)
{
- await http.DeleteAsync(apiurl + "/" + ProfileId.ToString());
+ await _http.DeleteAsync(apiurl + "/" + ProfileId.ToString());
}
}
}
diff --git a/Oqtane.Client/Services/RoleService.cs b/Oqtane.Client/Services/RoleService.cs
index b56f2e80..302d3271 100644
--- a/Oqtane.Client/Services/RoleService.cs
+++ b/Oqtane.Client/Services/RoleService.cs
@@ -10,45 +10,45 @@ namespace Oqtane.Services
{
public class RoleService : ServiceBase, IRoleService
{
- private readonly HttpClient http;
- private readonly SiteState sitestate;
- private readonly NavigationManager NavigationManager;
+ private readonly HttpClient _http;
+ private readonly SiteState _siteState;
+ private readonly NavigationManager _navigationManager;
- public RoleService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
+ public RoleService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
{
- this.http = http;
- this.sitestate = sitestate;
- this.NavigationManager = NavigationManager;
+ _http = http;
+ _siteState = siteState;
+ _navigationManager = navigationManager;
}
private string apiurl
{
- get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Role"); }
+ get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Role"); }
}
public async Task> GetRolesAsync(int SiteId)
{
- List Roles = await http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString());
+ List Roles = await _http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString());
return Roles.OrderBy(item => item.Name).ToList();
}
public async Task GetRoleAsync(int RoleId)
{
- return await http.GetJsonAsync(apiurl + "/" + RoleId.ToString());
+ return await _http.GetJsonAsync(apiurl + "/" + RoleId.ToString());
}
public async Task AddRoleAsync(Role Role)
{
- return await http.PostJsonAsync(apiurl, Role);
+ return await _http.PostJsonAsync(apiurl, Role);
}
public async Task UpdateRoleAsync(Role Role)
{
- return await http.PutJsonAsync(apiurl + "/" + Role.RoleId.ToString(), Role);
+ return await _http.PutJsonAsync(apiurl + "/" + Role.RoleId.ToString(), Role);
}
public async Task DeleteRoleAsync(int RoleId)
{
- await http.DeleteAsync(apiurl + "/" + RoleId.ToString());
+ await _http.DeleteAsync(apiurl + "/" + RoleId.ToString());
}
}
}
diff --git a/Oqtane.Client/Services/SettingService.cs b/Oqtane.Client/Services/SettingService.cs
index e2b00c13..cc308f5d 100644
--- a/Oqtane.Client/Services/SettingService.cs
+++ b/Oqtane.Client/Services/SettingService.cs
@@ -10,20 +10,20 @@ namespace Oqtane.Services
{
public class SettingService : ServiceBase, ISettingService
{
- private readonly HttpClient http;
- private readonly SiteState sitestate;
- private readonly NavigationManager NavigationManager;
+ private readonly HttpClient _http;
+ private readonly SiteState _siteState;
+ private readonly NavigationManager _navigationManager;
- public SettingService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
+ public SettingService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
{
- this.http = http;
- this.sitestate = sitestate;
- this.NavigationManager = NavigationManager;
+ _http = http;
+ _siteState = siteState;
+ _navigationManager = navigationManager;
}
private string apiurl
{
- get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Setting"); }
+ get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Setting"); }
}
public async Task> GetHostSettingsAsync()
@@ -99,7 +99,7 @@ namespace Oqtane.Services
public async Task> GetSettingsAsync(string EntityName, int EntityId)
{
Dictionary dictionary = new Dictionary();
- List Settings = await http.GetJsonAsync>(apiurl + "?entityname=" + EntityName + "&entityid=" + EntityId.ToString());
+ List Settings = await _http.GetJsonAsync>(apiurl + "?entityname=" + EntityName + "&entityid=" + EntityId.ToString());
foreach(Setting setting in Settings.OrderBy(item => item.SettingName).ToList())
{
dictionary.Add(setting.SettingName, setting.SettingValue);
@@ -109,7 +109,7 @@ namespace Oqtane.Services
public async Task UpdateSettingsAsync(Dictionary Settings, string EntityName, int EntityId)
{
- List settings = await http.GetJsonAsync>(apiurl + "?entityname=" + EntityName + "&entityid=" + EntityId.ToString());
+ List settings = await _http.GetJsonAsync>(apiurl + "?entityname=" + EntityName + "&entityid=" + EntityId.ToString());
foreach (KeyValuePair kvp in Settings)
{
Setting setting = settings.Where(item => item.SettingName == kvp.Key).FirstOrDefault();
@@ -136,22 +136,22 @@ namespace Oqtane.Services
public async Task GetSettingAsync(int SettingId)
{
- return await http.GetJsonAsync(apiurl + "/" + SettingId.ToString());
+ return await _http.GetJsonAsync(apiurl + "/" + SettingId.ToString());
}
public async Task AddSettingAsync(Setting Setting)
{
- return await http.PostJsonAsync(apiurl, Setting);
+ return await _http.PostJsonAsync(apiurl, Setting);
}
public async Task UpdateSettingAsync(Setting Setting)
{
- return await http.PutJsonAsync(apiurl + "/" + Setting.SettingId.ToString(), Setting);
+ return await _http.PutJsonAsync(apiurl + "/" + Setting.SettingId.ToString(), Setting);
}
public async Task DeleteSettingAsync(int SettingId)
{
- await http.DeleteAsync(apiurl + "/" + SettingId.ToString());
+ await _http.DeleteAsync(apiurl + "/" + SettingId.ToString());
}
diff --git a/Oqtane.Client/Services/SiteService.cs b/Oqtane.Client/Services/SiteService.cs
index 48a5e5ba..6a5daff8 100644
--- a/Oqtane.Client/Services/SiteService.cs
+++ b/Oqtane.Client/Services/SiteService.cs
@@ -10,46 +10,46 @@ namespace Oqtane.Services
{
public class SiteService : ServiceBase, ISiteService
{
- private readonly HttpClient http;
- private readonly SiteState sitestate;
- private readonly NavigationManager NavigationManager;
+ private readonly HttpClient _http;
+ private readonly SiteState _siteState;
+ private readonly NavigationManager _navigationManager;
- public SiteService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
+ public SiteService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
{
- this.http = http;
- this.sitestate = sitestate;
- this.NavigationManager = NavigationManager;
+ _http = http;
+ _siteState = siteState;
+ _navigationManager = navigationManager;
}
private string apiurl
{
- get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Site"); }
+ get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Site"); }
}
public async Task> GetSitesAsync(Alias Alias)
{
- List sites = await http.GetJsonAsync>(CreateCrossTenantUrl(apiurl, Alias));
+ List sites = await _http.GetJsonAsync>(CreateCrossTenantUrl(apiurl, Alias));
return sites.OrderBy(item => item.Name).ToList();
}
public async Task GetSiteAsync(int SiteId, Alias Alias)
{
- return await http.GetJsonAsync(CreateCrossTenantUrl(apiurl + "/" + SiteId.ToString(), Alias));
+ return await _http.GetJsonAsync(CreateCrossTenantUrl(apiurl + "/" + SiteId.ToString(), Alias));
}
public async Task AddSiteAsync(Site Site, Alias Alias)
{
- return await http.PostJsonAsync(CreateCrossTenantUrl(apiurl, Alias), Site);
+ return await _http.PostJsonAsync(CreateCrossTenantUrl(apiurl, Alias), Site);
}
public async Task UpdateSiteAsync(Site Site, Alias Alias)
{
- return await http.PutJsonAsync(CreateCrossTenantUrl(apiurl + "/" + Site.SiteId.ToString(), Alias), Site);
+ return await _http.PutJsonAsync(CreateCrossTenantUrl(apiurl + "/" + Site.SiteId.ToString(), Alias), Site);
}
public async Task DeleteSiteAsync(int SiteId, Alias Alias)
{
- await http.DeleteAsync(CreateCrossTenantUrl(apiurl + "/" + SiteId.ToString(), Alias));
+ await _http.DeleteAsync(CreateCrossTenantUrl(apiurl + "/" + SiteId.ToString(), Alias));
}
}
}
diff --git a/Oqtane.Client/Services/TenantService.cs b/Oqtane.Client/Services/TenantService.cs
index 9922ab41..e1778bc4 100644
--- a/Oqtane.Client/Services/TenantService.cs
+++ b/Oqtane.Client/Services/TenantService.cs
@@ -10,46 +10,46 @@ namespace Oqtane.Services
{
public class TenantService : ServiceBase, ITenantService
{
- private readonly HttpClient http;
- private readonly SiteState sitestate;
- private readonly NavigationManager NavigationManager;
+ private readonly HttpClient _http;
+ private readonly SiteState _siteState;
+ private readonly NavigationManager _navigationManager;
- public TenantService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
+ public TenantService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
{
- this.http = http;
- this.sitestate = sitestate;
- this.NavigationManager = NavigationManager;
+ _http = http;
+ _siteState = siteState;
+ _navigationManager = navigationManager;
}
private string apiurl
{
- get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Tenant"); }
+ get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Tenant"); }
}
public async Task> GetTenantsAsync()
{
- List tenants = await http.GetJsonAsync>(apiurl);
+ List tenants = await _http.GetJsonAsync>(apiurl);
return tenants.OrderBy(item => item.Name).ToList();
}
public async Task