diff --git a/Oqtane.Client/App.razor b/Oqtane.Client/App.razor index 0723e1e7..66e5b15f 100644 --- a/Oqtane.Client/App.razor +++ b/Oqtane.Client/App.razor @@ -1,8 +1,8 @@ @inject IInstallationService InstallationService -@if (Initialized) +@if (_initialized) { - @if (!Installed) + @if (!_installed) { } @@ -17,20 +17,20 @@ } @code { - private bool Initialized = false; - private bool Installed = false; + private bool _initialized; + private bool _installed; private PageState PageState { get; set; } protected override async Task OnParametersSetAsync() { var response = await InstallationService.IsInstalled(); - Installed = response.Success; - Initialized = true; + _installed = response.Success; + _initialized = true; } - private void ChangeState(PageState pagestate) + private void ChangeState(PageState pageState) { - PageState = pagestate; + PageState = pageState; StateHasChanged(); } } diff --git a/Oqtane.Client/Modules/Admin/Dashboard/Index.razor b/Oqtane.Client/Modules/Admin/Dashboard/Index.razor index 7f7bfd60..c1776600 100644 --- a/Oqtane.Client/Modules/Admin/Dashboard/Index.razor +++ b/Oqtane.Client/Modules/Admin/Dashboard/Index.razor @@ -4,7 +4,7 @@ @inject IUserService UserService
- @foreach (var p in pages) + @foreach (var p in _pages) { if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions)) { @@ -21,11 +21,11 @@ @code { public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } - List pages; + List _pages; protected override void OnInitialized() { - Page admin = PageState.Pages.Where(item => item.Path == "admin").FirstOrDefault(); - pages = PageState.Pages.Where(item => item.ParentId == admin.PageId).ToList(); + Page admin = PageState.Pages.FirstOrDefault(item => item.Path == "admin"); + _pages = PageState.Pages.Where(item => item.ParentId == admin?.PageId).ToList(); } } diff --git a/Oqtane.Client/Modules/Admin/Files/Add.razor b/Oqtane.Client/Modules/Admin/Files/Add.razor index fa041fed..65935a72 100644 --- a/Oqtane.Client/Modules/Admin/Files/Add.razor +++ b/Oqtane.Client/Modules/Admin/Files/Add.razor @@ -4,7 +4,7 @@ @inject IFileService FileService @inject IFolderService FolderService -@if (folders != null) +@if (_folders != null) {
@@ -27,10 +27,10 @@
- + - +
@@ -39,7 +39,7 @@ @@ -42,7 +42,7 @@ - @if (Files.Count == 0) + @if (_files.Count == 0) {
No Files Exist In Selected Folder
} @@ -51,22 +51,22 @@ @code { public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } - List Folders; - int folderid = -1; - List Files; - Uri uri; + List _folders; + int _folderId = -1; + List _files; + Uri _uri; protected override async Task OnParametersSetAsync() { try { - Folders = await FolderService.GetFoldersAsync(PageState.Site.SiteId); - if (folderid == -1 && Folders.Count > 0) + _folders = await FolderService.GetFoldersAsync(PageState.Site.SiteId); + if (_folderId == -1 && _folders.Count > 0) { - folderid = Folders[0].FolderId; + _folderId = _folders[0].FolderId; await GetFiles(); } - uri = new Uri(NavigationManager.Uri); + _uri = new Uri(NavigationManager.Uri); } catch (Exception ex) { @@ -77,14 +77,14 @@ private async Task GetFiles() { - Files = await FileService.GetFilesAsync(folderid); + _files = await FileService.GetFilesAsync(_folderId); } private async void FolderChanged(ChangeEventArgs e) { try { - folderid = int.Parse((string)e.Value); + _folderId = int.Parse((string)e.Value); await GetFiles(); StateHasChanged(); } diff --git a/Oqtane.Client/Modules/Admin/Jobs/Add.razor b/Oqtane.Client/Modules/Admin/Jobs/Add.razor index 29c77c6a..a333d0d5 100644 --- a/Oqtane.Client/Modules/Admin/Jobs/Add.razor +++ b/Oqtane.Client/Modules/Admin/Jobs/Add.razor @@ -6,26 +6,26 @@
- + @@ -47,12 +47,12 @@
- + - - @foreach (Folder folder in folders) + @foreach (Folder folder in _folders) { } @@ -73,16 +73,16 @@ public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } string url = ""; - List folders; - int folderid = -1; + List _folders; + int _folderId = -1; protected override async Task OnInitializedAsync() { - folders = await FolderService.GetFoldersAsync(ModuleState.SiteId); + _folders = await FolderService.GetFoldersAsync(ModuleState.SiteId); if (PageState.QueryString.ContainsKey("id")) { - folderid = int.Parse(PageState.QueryString["id"]); + _folderId = int.Parse(PageState.QueryString["id"]); } } @@ -90,9 +90,9 @@ { try { - if (url != "" && folderid != -1) + if (url != "" && _folderId != -1) { - await FileService.UploadFileAsync(url, folderid); + await FileService.UploadFileAsync(url, _folderId); await logger.LogInformation("File Downloaded Successfully From Url {Url}", url); AddModuleMessage("File Downloaded Successfully From Url", MessageType.Success); } diff --git a/Oqtane.Client/Modules/Admin/Files/Edit.razor b/Oqtane.Client/Modules/Admin/Files/Edit.razor index 234dd684..d6c642ad 100644 --- a/Oqtane.Client/Modules/Admin/Files/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Files/Edit.razor @@ -3,20 +3,20 @@ @inject IFolderService FolderService @inject NavigationManager NavigationManager -@if (folders != null) +@if (_folders != null) {
- + - @if (PageState.QueryString.ContainsKey("id")) { } - @foreach (Folder folder in folders) + @foreach (Folder folder in _folders) { } @@ -25,27 +25,27 @@
- + - +
- + - +
- @if (!issystem) + @if (!_isSystem) { } Cancel - @if (!issystem && PageState.QueryString.ContainsKey("id")) + @if (!_isSystem && PageState.QueryString.ContainsKey("id")) { } @@ -53,7 +53,7 @@
@if (PageState.QueryString.ContainsKey("id")) { - + } } @@ -61,39 +61,41 @@ public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } public override string Title { get { return "Folder Management"; } } - List folders; - int folderid = -1; - string name; - int parentid = -1; - bool issystem = false; - string permissions = ""; - string createdby; - DateTime createdon; - string modifiedby; - DateTime modifiedon; + List _folders; + int _folderId = -1; + string _name; + int _parentId = -1; + bool _isSystem; + string _permissions = ""; + string _createdBy; + DateTime _createdOn; + string _modifiedBy; + DateTime _modifiedOn; - PermissionGrid permissiongrid; +#pragma warning disable 649 + PermissionGrid _permissionGrid; +#pragma warning restore 649 protected override async Task OnInitializedAsync() { try { - folders = await FolderService.GetFoldersAsync(PageState.Site.SiteId); + _folders = await FolderService.GetFoldersAsync(PageState.Site.SiteId); if (PageState.QueryString.ContainsKey("id")) { - folderid = Int32.Parse(PageState.QueryString["id"]); - Folder folder = await FolderService.GetFolderAsync(folderid); + _folderId = Int32.Parse(PageState.QueryString["id"]); + Folder folder = await FolderService.GetFolderAsync(_folderId); if (folder != null) { - parentid = folder.ParentId ?? -1; - name = folder.Name; - issystem = folder.IsSystem; - permissions = folder.Permissions; - createdby = folder.CreatedBy; - createdon = folder.CreatedOn; - modifiedby = folder.ModifiedBy; - modifiedon = folder.ModifiedOn; + _parentId = folder.ParentId ?? -1; + _name = folder.Name; + _isSystem = folder.IsSystem; + _permissions = folder.Permissions; + _createdBy = folder.CreatedBy; + _createdOn = folder.CreatedOn; + _modifiedBy = folder.ModifiedBy; + _modifiedOn = folder.ModifiedOn; } } else @@ -108,7 +110,7 @@ } catch (Exception ex) { - await logger.LogError(ex, "Error Loading Folder {FolderId} {Error}", folderid, ex.Message); + await logger.LogError(ex, "Error Loading Folder {FolderId} {Error}", _folderId, ex.Message); AddModuleMessage("Error Loading Folder", MessageType.Error); } } @@ -117,12 +119,12 @@ { try { - if (name != "" && parentid != -1) + if (_name != "" && _parentId != -1) { Folder folder; - if (folderid != -1) + if (_folderId != -1) { - folder = await FolderService.GetFolderAsync(folderid); + folder = await FolderService.GetFolderAsync(_folderId); } else { @@ -130,19 +132,19 @@ } folder.SiteId = PageState.Site.SiteId; - if (parentid == -1) + if (_parentId == -1) { folder.ParentId = null; } else { - folder.ParentId = parentid; + folder.ParentId = _parentId; } - folder.Name = name; - folder.IsSystem = issystem; - folder.Permissions = permissiongrid.GetPermissions(); + folder.Name = _name; + folder.IsSystem = _isSystem; + folder.Permissions = _permissionGrid.GetPermissions(); - if (folderid != -1) + if (_folderId != -1) { folder = await FolderService.UpdateFolderAsync(folder); } @@ -161,7 +163,7 @@ } catch (Exception ex) { - await logger.LogError(ex, "Error Saving Folder {FolderId} {Error}", folderid, ex.Message); + await logger.LogError(ex, "Error Saving Folder {FolderId} {Error}", _folderId, ex.Message); AddModuleMessage("Error Saving Module", MessageType.Error); } } @@ -170,13 +172,13 @@ { try { - await FolderService.DeleteFolderAsync(folderid); - await logger.LogInformation("Folder Deleted {Folder}", folderid); + await FolderService.DeleteFolderAsync(_folderId); + await logger.LogInformation("Folder Deleted {Folder}", _folderId); AddModuleMessage("Folder Deleted", MessageType.Success); } catch (Exception ex) { - await logger.LogError(ex, "Error Deleting Folder {Folder} {Error}", folderid, ex.Message); + await logger.LogError(ex, "Error Deleting Folder {Folder} {Error}", _folderId, ex.Message); AddModuleMessage("Error Deleting Folder", MessageType.Error); } } diff --git a/Oqtane.Client/Modules/Admin/Files/Index.razor b/Oqtane.Client/Modules/Admin/Files/Index.razor index 489587a8..6dd27603 100644 --- a/Oqtane.Client/Modules/Admin/Files/Index.razor +++ b/Oqtane.Client/Modules/Admin/Files/Index.razor @@ -4,29 +4,29 @@ @inject IFolderService FolderService @inject IFileService FileService -@if (Files != null) +@if (_files != null) {
- + -   +     - +
- +
  Name@(context.Size / 1000) KB
- + - +
- + - +
- + - @@ -33,11 +33,11 @@
- + - - +
- + - +
- + - +
- + - +
@@ -76,42 +76,42 @@ @code { public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } } - string name = ""; - string jobtype = ""; - string isenabled = "True"; - string interval = ""; - string frequency = ""; - string startdate = ""; - string enddate = ""; - string retentionhistory = "10"; + string _name = ""; + string _jobType = ""; + string _isEnabled = "True"; + string _interval = ""; + string _frequency = ""; + string _startDate = ""; + string _endDate = ""; + string _retentionHistory = "10"; private async Task SaveJob() { - if (name != "" && !string.IsNullOrEmpty(jobtype) && frequency != "" && interval != "" && retentionhistory != "") + if (_name != "" && !string.IsNullOrEmpty(_jobType) && _frequency != "" && _interval != "" && _retentionHistory != "") { Job job = new Job(); - job.Name = name; - job.JobType = jobtype; - job.IsEnabled = Boolean.Parse(isenabled); - job.Frequency = frequency; - job.Interval = int.Parse(interval); - if (startdate == "") + job.Name = _name; + job.JobType = _jobType; + job.IsEnabled = Boolean.Parse(_isEnabled); + job.Frequency = _frequency; + job.Interval = int.Parse(_interval); + if (_startDate == "") { job.StartDate = null; } else { - job.StartDate = DateTime.Parse(startdate); + job.StartDate = DateTime.Parse(_startDate); } - if (enddate == "") + if (_endDate == "") { job.EndDate = null; } else { - job.EndDate = DateTime.Parse(enddate); + job.EndDate = DateTime.Parse(_endDate); } - job.RetentionHistory = int.Parse(retentionhistory); + job.RetentionHistory = int.Parse(_retentionHistory); job.IsStarted = false; job.IsExecuting = false; job.NextExecution = null; diff --git a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor index a2651e87..205dda81 100644 --- a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor @@ -6,26 +6,26 @@
- + - +
- + - +
- + - @@ -33,11 +33,11 @@
- + - - +
- + - +
- + - +
- + - +
@@ -76,68 +76,68 @@ @code { public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } } - int jobid; - string name = ""; - string jobtype = ""; - string isenabled = "True"; - string interval = ""; - string frequency = ""; - string startdate = ""; - string enddate = ""; - string retentionhistory = ""; + int _jobId; + string _name = ""; + string _jobType = ""; + string _isEnabled = "True"; + string _interval = ""; + string _frequency = ""; + string _startDate = ""; + string _endDate = ""; + string _retentionHistory = ""; protected override async Task OnInitializedAsync() { try { - jobid = Int32.Parse(PageState.QueryString["id"]); - Job job = await JobService.GetJobAsync(jobid); + _jobId = Int32.Parse(PageState.QueryString["id"]); + Job job = await JobService.GetJobAsync(_jobId); if (job != null) { - name = job.Name; - jobtype = job.JobType; - isenabled = job.IsEnabled.ToString(); - interval = job.Interval.ToString(); - frequency = job.Frequency; - startdate = (job.StartDate != null) ? job.StartDate.ToString() : ""; - enddate = (job.EndDate != null) ? job.EndDate.ToString() : ""; - retentionhistory = job.RetentionHistory.ToString(); + _name = job.Name; + _jobType = job.JobType; + _isEnabled = job.IsEnabled.ToString(); + _interval = job.Interval.ToString(); + _frequency = job.Frequency; + _startDate = (job.StartDate != null) ? job.StartDate.ToString() : ""; + _endDate = (job.EndDate != null) ? job.EndDate.ToString() : ""; + _retentionHistory = job.RetentionHistory.ToString(); } } catch (Exception ex) { - await logger.LogError(ex, "Error Loading Job {JobId} {Error}", jobid, ex.Message); + await logger.LogError(ex, "Error Loading Job {JobId} {Error}", _jobId, ex.Message); AddModuleMessage("Error Loading Job", MessageType.Error); } } private async Task SaveJob() { - if (name != "" && !string.IsNullOrEmpty(jobtype) && frequency != "" && interval != "" && retentionhistory != "") + if (_name != "" && !string.IsNullOrEmpty(_jobType) && _frequency != "" && _interval != "" && _retentionHistory != "") { - Job job = await JobService.GetJobAsync(jobid); - job.Name = name; - job.JobType = jobtype; - job.IsEnabled = Boolean.Parse(isenabled); - job.Frequency = frequency; - job.Interval = int.Parse(interval); - if (startdate == "") + Job job = await JobService.GetJobAsync(_jobId); + job.Name = _name; + job.JobType = _jobType; + job.IsEnabled = Boolean.Parse(_isEnabled); + job.Frequency = _frequency; + job.Interval = int.Parse(_interval); + if (_startDate == "") { job.StartDate = null; } else { - job.StartDate = DateTime.Parse(startdate); + job.StartDate = DateTime.Parse(_startDate); } - if (enddate == "") + if (_endDate == "") { job.EndDate = null; } else { - job.EndDate = DateTime.Parse(enddate); + job.EndDate = DateTime.Parse(_endDate); } - job.RetentionHistory = int.Parse(retentionhistory); + job.RetentionHistory = int.Parse(_retentionHistory); try { diff --git a/Oqtane.Client/Modules/Admin/Jobs/Index.razor b/Oqtane.Client/Modules/Admin/Jobs/Index.razor index e908225d..602708c9 100644 --- a/Oqtane.Client/Modules/Admin/Jobs/Index.razor +++ b/Oqtane.Client/Modules/Admin/Jobs/Index.razor @@ -2,7 +2,7 @@ @inherits ModuleBase @inject IJobService JobService -@if (Jobs == null) +@if (_jobs == null) {

Loading...

} @@ -13,7 +13,7 @@ else

- +
    @@ -49,23 +49,23 @@ else @code { public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } } - List Jobs; + List _jobs; protected override async Task OnParametersSetAsync() { - Jobs = await JobService.GetJobsAsync(); + _jobs = await JobService.GetJobsAsync(); } - private string DisplayStatus(bool IsEnabled, bool IsExecuting) + private string DisplayStatus(bool isEnabled, bool isExecuting) { string status = ""; - if (!IsEnabled) + if (!isEnabled) { status = "Disabled"; } else { - if (IsExecuting) + if (isExecuting) { status = "Executing"; } @@ -79,59 +79,59 @@ else } - private string DisplayFrequency(int Interval, string Frequency) + private string DisplayFrequency(int interval, string frequency) { - string frequency = "Every " + Interval.ToString() + " "; - switch (Frequency) + string result = "Every " + interval.ToString() + " "; + switch (frequency) { case "m": - frequency += "Minute"; + result += "Minute"; break; case "H": - frequency += "Hour"; + result += "Hour"; break; case "d": - frequency += "Day"; + result += "Day"; break; case "M": - frequency += "Month"; + result += "Month"; break; } - if (Interval > 1) + if (interval > 1) { - frequency += "s"; + result += "s"; } - return frequency; + return result; } - private async Task DeleteJob(Job Job) + private async Task DeleteJob(Job job) { try { - await JobService.DeleteJobAsync(Job.JobId); - await logger.LogInformation("Job Deleted {Job}", Job); + await JobService.DeleteJobAsync(job.JobId); + await logger.LogInformation("Job Deleted {Job}", job); StateHasChanged(); } catch (Exception ex) { - await logger.LogError(ex, "Error Deleting Job {Job} {Error}", Job, ex.Message); + await logger.LogError(ex, "Error Deleting Job {Job} {Error}", job, ex.Message); AddModuleMessage("Error Deleting Job", MessageType.Error); } } - private async Task StartJob(int JobId) + private async Task StartJob(int jobId) { - await JobService.StartJobAsync(JobId); + await JobService.StartJobAsync(jobId); } - private async Task StopJob(int JobId) + private async Task StopJob(int jobId) { - await JobService.StopJobAsync(JobId); + await JobService.StopJobAsync(jobId); } private async Task Refresh() { - Jobs = await JobService.GetJobsAsync(); + _jobs = await JobService.GetJobsAsync(); StateHasChanged(); } -} \ No newline at end of file +} diff --git a/Oqtane.Client/Modules/Admin/Jobs/Log.razor b/Oqtane.Client/Modules/Admin/Jobs/Log.razor index d2177e94..af0d5d5e 100644 --- a/Oqtane.Client/Modules/Admin/Jobs/Log.razor +++ b/Oqtane.Client/Modules/Admin/Jobs/Log.razor @@ -2,13 +2,13 @@ @inherits ModuleBase @inject IJobLogService JobLogService -@if (JobLogs == null) +@if (_jobLogs == null) {

Loading...

} else { - +
Name Status @@ -30,28 +30,28 @@ else @code { public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } } - List JobLogs; + List _jobLogs; protected override async Task OnParametersSetAsync() { - JobLogs = await JobLogService.GetJobLogsAsync(); + _jobLogs = await JobLogService.GetJobLogsAsync(); if (PageState.QueryString.ContainsKey("id")) { - JobLogs = JobLogs.Where(item => item.JobId == Int32.Parse(PageState.QueryString["id"])).ToList(); + _jobLogs = _jobLogs.Where(item => item.JobId == Int32.Parse(PageState.QueryString["id"])).ToList(); } - JobLogs = JobLogs.OrderByDescending(item => item.JobLogId).ToList(); + _jobLogs = _jobLogs.OrderByDescending(item => item.JobLogId).ToList(); } - private string DisplayStatus(bool IsExecuting, bool? Succeeded) + private string DisplayStatus(bool isExecuting, bool? succeeded) { string status = ""; - if (IsExecuting) + if (isExecuting) { status = "Executing"; } else { - if (Succeeded.Value) + if (succeeded != null && succeeded.Value) { status = "Succeeded"; } @@ -62,4 +62,4 @@ else } return status; } -} \ No newline at end of file +} diff --git a/Oqtane.Client/Modules/Admin/Login/Index.razor b/Oqtane.Client/Modules/Admin/Login/Index.razor index ebf204b5..5310049d 100644 --- a/Oqtane.Client/Modules/Admin/Login/Index.razor +++ b/Oqtane.Client/Modules/Admin/Login/Index.razor @@ -1,13 +1,13 @@ @namespace Oqtane.Modules.Admin.Login @inherits ModuleBase @inject NavigationManager NavigationManager -@inject IJSRuntime jsRuntime +@inject IJSRuntime JsRuntime @inject IUserService UserService @inject IServiceProvider ServiceProvider -@if (Message != "") +@if (_message != "") { - + } @@ -20,16 +20,16 @@
- +
- +
  - +
@@ -43,38 +43,38 @@ @code { public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Anonymous; } } - string ReturnUrl = ""; - public string Message = ""; - public MessageType Type = MessageType.Info; - public string Username = ""; - public string Password = ""; - public bool Remember = false; + string _returnUrl = ""; + string _message = ""; + MessageType _type = MessageType.Info; + string _username = ""; + string _password = ""; + bool _remember = false; protected override async Task OnInitializedAsync() { if (PageState.QueryString.ContainsKey("returnurl")) { - ReturnUrl = PageState.QueryString["returnurl"]; + _returnUrl = PageState.QueryString["returnurl"]; } if (PageState.QueryString.ContainsKey("name")) { - Username = PageState.QueryString["name"]; + _username = PageState.QueryString["name"]; } if (PageState.QueryString.ContainsKey("token")) { User user = new User(); user.SiteId = PageState.Site.SiteId; - user.Username = Username; + user.Username = _username; user = await UserService.VerifyEmailAsync(user, PageState.QueryString["token"]); if (user != null) { - Message = "User Account Verified Successfully. You Can Now Login With Your Username And Password Below."; + _message = "User Account Verified Successfully. You Can Now Login With Your Username And Password Below."; } else { - Message = "User Account Could Not Be Verified. Please Contact Your Administrator For Further Instructions."; - Type = MessageType.Warning; + _message = "User Account Could Not Be Verified. Please Contact Your Administrator For Further Instructions."; + _type = MessageType.Warning; } } } @@ -87,21 +87,21 @@ // server-side Blazor User user = new User(); user.SiteId = PageState.Site.SiteId; - user.Username = Username; - user.Password = Password; + user.Username = _username; + user.Password = _password; user = await UserService.LoginUserAsync(user, false, false); if (user.IsAuthenticated) { - await logger.LogInformation("Login Successful For Username {Username}", Username); + await logger.LogInformation("Login Successful For Username {Username}", _username); // complete the login on the server so that the cookies are set correctly on SignalR - var interop = new Interop(jsRuntime); + var interop = new Interop(JsRuntime); string antiforgerytoken = await interop.GetElementByName("__RequestVerificationToken"); - var fields = new { __RequestVerificationToken = antiforgerytoken, username = Username, password = Password, remember = Remember, returnurl = ReturnUrl }; + var fields = new { __RequestVerificationToken = antiforgerytoken, username = _username, password = _password, remember = _remember, returnurl = _returnUrl }; await interop.SubmitForm("/pages/login/", fields); } else { - await logger.LogInformation("Login Failed For Username {Username}", Username); + await logger.LogInformation("Login Failed For Username {Username}", _username); AddModuleMessage("Login Failed. Please Remember That Passwords Are Case Sensitive And User Accounts Require Email Verification When They Initially Created.", MessageType.Error); } } @@ -110,18 +110,18 @@ // client-side Blazor User user = new User(); user.SiteId = PageState.Site.SiteId; - user.Username = Username; - user.Password = Password; - user = await UserService.LoginUserAsync(user, true, Remember); + user.Username = _username; + user.Password = _password; + user = await UserService.LoginUserAsync(user, true, _remember); if (user.IsAuthenticated) { - await logger.LogInformation("Login Successful For Username {Username}", Username); + await logger.LogInformation("Login Successful For Username {Username}", _username); authstateprovider.NotifyAuthenticationChanged(); - NavigationManager.NavigateTo(NavigateUrl(ReturnUrl, "reload")); + NavigationManager.NavigateTo(NavigateUrl(_returnUrl, "reload")); } else { - await logger.LogInformation("Login Failed For Username {Username}", Username); + await logger.LogInformation("Login Failed For Username {Username}", _username); AddModuleMessage("Login Failed. Please Remember That Passwords Are Case Sensitive And User Accounts Require Verification When They Are Initially Created So You May Wish To Check Your Email.", MessageType.Error); } } @@ -129,28 +129,28 @@ private void Cancel() { - NavigationManager.NavigateTo(ReturnUrl); + NavigationManager.NavigateTo(_returnUrl); } private async Task Forgot() { - if (Username != "") + if (_username != "") { - User user = await UserService.GetUserAsync(Username, PageState.Site.SiteId); + User user = await UserService.GetUserAsync(_username, PageState.Site.SiteId); if (user != null) { await UserService.ForgotPasswordAsync(user); - Message = "Please Check The Email Address Associated To Your User Account For A Password Reset Notification"; + _message = "Please Check The Email Address Associated To Your User Account For A Password Reset Notification"; } else { - Message = "User Does Not Exist"; - Type = MessageType.Warning; + _message = "User Does Not Exist"; + _type = MessageType.Warning; } } else { - Message = "Please Enter The Username Related To Your Account And Then Select The Forgot Password Option Again"; + _message = "Please Enter The Username Related To Your Account And Then Select The Forgot Password Option Again"; } StateHasChanged(); } diff --git a/Oqtane.Client/Modules/Admin/Logs/Detail.razor b/Oqtane.Client/Modules/Admin/Logs/Detail.razor index 28aa59a8..0fd6333a 100644 --- a/Oqtane.Client/Modules/Admin/Logs/Detail.razor +++ b/Oqtane.Client/Modules/Admin/Logs/Detail.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Logs +@using System.Globalization @inherits ModuleBase @inject NavigationManager NavigationManager @inject ILogService LogService @@ -12,7 +13,7 @@ - + @@ -20,7 +21,7 @@ - + @@ -28,7 +29,7 @@ - + @@ -36,7 +37,7 @@ - + @@ -44,39 +45,39 @@ - + - @if (pagename != "") + @if (_pageName != "") { - + } - @if (moduletitle != "") + @if (_moduleTitle != "") { - + } - @if (username != "") + @if (_username != "") { - + } @@ -85,7 +86,7 @@ - + @@ -93,7 +94,7 @@ - + @@ -101,17 +102,17 @@ - - @if (!string.IsNullOrEmpty(exception)) + @if (!string.IsNullOrEmpty(_exception)) { - } @@ -120,7 +121,7 @@ - @@ -128,7 +129,7 @@ - + @@ -137,41 +138,41 @@ @code { public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } - int logid; - string logdate = ""; - string level = ""; - string feature = ""; - string function = ""; - string category = ""; - string pagename = ""; - string moduletitle = ""; - string username = ""; - string url = ""; - string template = ""; - string message = ""; - string exception = ""; - string properties = ""; - string server = ""; + int _logId; + string _logDate = ""; + string _level = ""; + string _feature = ""; + string _function = ""; + string _category = ""; + string _pageName = ""; + string _moduleTitle = ""; + string _username = ""; + string _url = ""; + string _template = ""; + string _message = ""; + string _exception = ""; + string _properties = ""; + string _server = ""; protected override async Task OnInitializedAsync() { try { - logid = Int32.Parse(PageState.QueryString["id"]); - Log log = await LogService.GetLogAsync(logid); + _logId = Int32.Parse(PageState.QueryString["id"]); + Log log = await LogService.GetLogAsync(_logId); if (log != null) { - logdate = log.LogDate.ToString(); - level = log.Level; - feature = log.Feature; - function = log.Function; - category = log.Category; + _logDate = log.LogDate.ToString(CultureInfo.CurrentCulture); + _level = log.Level; + _feature = log.Feature; + _function = log.Function; + _category = log.Category; if (log.PageId != null) { Page page = await PageService.GetPageAsync(log.PageId.Value); if (page != null) { - pagename = page.Name; + _pageName = page.Name; } } if (log.PageId != null && log.ModuleId != null) @@ -179,7 +180,7 @@ PageModule pagemodule = await PageModuleService.GetPageModuleAsync(log.PageId.Value, log.ModuleId.Value); if (pagemodule != null) { - moduletitle = pagemodule.Title; + _moduleTitle = pagemodule.Title; } } if (log.UserId != null) @@ -187,20 +188,20 @@ User user = await UserService.GetUserAsync(log.UserId.Value, PageState.Site.SiteId); if (user != null) { - username = user.Username; + _username = user.Username; } } - url = log.Url; - template = log.MessageTemplate; - message = log.Message; - exception = log.Exception; - properties = log.Properties; - server = log.Server; + _url = log.Url; + _template = log.MessageTemplate; + _message = log.Message; + _exception = log.Exception; + _properties = log.Properties; + _server = log.Server; } } catch (Exception ex) { - await logger.LogError(ex, "Error Loading Log {LogId} {Error}", logid, ex.Message); + await logger.LogError(ex, "Error Loading Log {LogId} {Error}", _logId, ex.Message); AddModuleMessage("Error Loading Log", MessageType.Error); } } diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor index 4b89cafb..77fd5d4c 100644 --- a/Oqtane.Client/Modules/Admin/Logs/Index.razor +++ b/Oqtane.Client/Modules/Admin/Logs/Index.razor @@ -2,7 +2,7 @@ @inherits ModuleBase @inject ILogService LogService -@if (Logs == null) +@if (_logs == null) {

Loading...

} @@ -45,9 +45,9 @@ else - @if (Logs.Any()) + @if (_logs.Any()) { - +
  Date @@ -73,10 +73,10 @@ else @code { public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } - string level = "-"; - string function = "-"; - string rows = "10"; - List Logs; + string _level = "-"; + string _function = "-"; + string _rows = "10"; + List _logs; protected override async Task OnInitializedAsync() { @@ -95,7 +95,7 @@ else { try { - level = (string)e.Value; + _level = (string)e.Value; await GetLogs(); StateHasChanged(); } @@ -110,7 +110,7 @@ else { try { - function = (string)e.Value; + _function = (string)e.Value; await GetLogs(); StateHasChanged(); } @@ -126,7 +126,7 @@ else { try { - rows = (string)e.Value; + _rows = (string)e.Value; await GetLogs(); StateHasChanged(); } @@ -139,7 +139,7 @@ else private async Task GetLogs() { - Logs = await LogService.GetLogsAsync(PageState.Site.SiteId, ((level == "-") ? "" : level), ((function == "-") ? "" : function), int.Parse(rows)); + _logs = await LogService.GetLogsAsync(PageState.Site.SiteId, ((_level == "-") ? "" : _level), ((_function == "-") ? "" : _function), int.Parse(_rows)); } private string GetClass(string function) diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor index 30cfd525..bce9e1eb 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor @@ -8,7 +8,7 @@
- + @@ -16,12 +16,12 @@
-@if (packages != null) +@if (_packages != null) {

Available Modules

- +
Name Version @@ -44,19 +44,19 @@ @code { public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } } - List packages; + List _packages; protected override async Task OnInitializedAsync() { try { List moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId); - packages = await PackageService.GetPackagesAsync("module"); - foreach(Package package in packages.ToArray()) + _packages = await PackageService.GetPackagesAsync("module"); + foreach(Package package in _packages.ToArray()) { if (moduledefinitions.Exists(item => Utilities.GetTypeName(item.ModuleDefinitionName) == package.PackageId)) { - packages.Remove(package); + _packages.Remove(package); } } } diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor index 36032ce9..61a61b7b 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor @@ -6,15 +6,15 @@ @@ -43,15 +43,15 @@ else @code { public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } } - List moduledefinitions; - List packages; + List _moduleDefinitions; + List _packages; protected override async Task OnInitializedAsync() { try { - moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId); - packages = await PackageService.GetPackagesAsync("module"); + _moduleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId); + _packages = await PackageService.GetPackagesAsync("module"); } catch (Exception ex) { @@ -63,7 +63,7 @@ else private bool UpgradeAvailable(string moduledefinitionname, string version) { bool upgradeavailable = false; - Package package = packages.Where(item => item.PackageId == Utilities.GetTypeName(moduledefinitionname)).FirstOrDefault(); + Package package = _packages.Where(item => item.PackageId == Utilities.GetTypeName(moduledefinitionname)).FirstOrDefault(); if (package != null) { upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0); @@ -87,18 +87,18 @@ else } } - private async Task DeleteModule(ModuleDefinition ModuleDefinition) + private async Task DeleteModule(ModuleDefinition moduleDefinition) { try { - await ModuleDefinitionService.DeleteModuleDefinitionAsync(ModuleDefinition.ModuleDefinitionId, ModuleDefinition.SiteId); - await logger.LogInformation("Module Deleted {ModuleDefinition}", ModuleDefinition); + await ModuleDefinitionService.DeleteModuleDefinitionAsync(moduleDefinition.ModuleDefinitionId, moduleDefinition.SiteId); + await logger.LogInformation("Module Deleted {ModuleDefinition}", moduleDefinition); NavigationManager.NavigateTo(NavigateUrl()); } catch (Exception ex) { - await logger.LogError(ex, "Error Deleting Module {ModuleDefinition} {Error}", ModuleDefinition, ex.Message); + await logger.LogError(ex, "Error Deleting Module {ModuleDefinition} {Error}", moduleDefinition, ex.Message); AddModuleMessage("Error Deleting Module", MessageType.Error); } } -} \ No newline at end of file +} diff --git a/Oqtane.Client/Modules/Admin/Modules/Export.razor b/Oqtane.Client/Modules/Admin/Modules/Export.razor index c8368d40..5ac95386 100644 --- a/Oqtane.Client/Modules/Admin/Modules/Export.razor +++ b/Oqtane.Client/Modules/Admin/Modules/Export.razor @@ -7,10 +7,10 @@ @@ -23,10 +23,10 @@ public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } public override string Title { get { return "Export Module"; } } - string content = ""; + string _content = ""; private async Task ExportModule() { - content = await ModuleService.ExportModuleAsync(ModuleState.ModuleId); + _content = await ModuleService.ExportModuleAsync(ModuleState.ModuleId); } } diff --git a/Oqtane.Client/Modules/Admin/Modules/Import.razor b/Oqtane.Client/Modules/Admin/Modules/Import.razor index 56549632..5fe730fd 100644 --- a/Oqtane.Client/Modules/Admin/Modules/Import.razor +++ b/Oqtane.Client/Modules/Admin/Modules/Import.razor @@ -10,7 +10,7 @@ @@ -23,16 +23,16 @@ public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } public override string Title { get { return "Import Module"; } } - string content = ""; + string _content = ""; private async Task ImportModule() { - if (content != "") + if (_content != "") { try { - await ModuleService.ImportModuleAsync(ModuleState.ModuleId, content); + await ModuleService.ImportModuleAsync(ModuleState.ModuleId, _content); StateHasChanged(); NavigationManager.NavigateTo(NavigateUrl()); } diff --git a/Oqtane.Client/Modules/Admin/Modules/Settings.razor b/Oqtane.Client/Modules/Admin/Modules/Settings.razor index 18659e7e..86ddb41b 100644 --- a/Oqtane.Client/Modules/Admin/Modules/Settings.razor +++ b/Oqtane.Client/Modules/Admin/Modules/Settings.razor @@ -12,7 +12,7 @@ @@ -20,9 +20,9 @@ @@ -42,7 +42,7 @@
- + - +
- + @@ -25,40 +25,42 @@ Cancel

- + @code { public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } - int ModuleDefinitionId; - string name; - string permissions; - string createdby; - DateTime createdon; - string modifiedby; - DateTime modifiedon; + int _moduleDefinitionId; + string _name; + string _permissions; + string _createdby; + DateTime _createdon; + string _modifiedby; + DateTime _modifiedon; - PermissionGrid permissiongrid; +#pragma warning disable 649 + PermissionGrid _permissionGrid; +#pragma warning restore 649 protected override async Task OnInitializedAsync() { try { - ModuleDefinitionId = Int32.Parse(PageState.QueryString["id"]); - ModuleDefinition moduledefinition = await ModuleDefinitionService.GetModuleDefinitionAsync(ModuleDefinitionId, ModuleState.SiteId); - if (moduledefinition != null) + _moduleDefinitionId = Int32.Parse(PageState.QueryString["id"]); + ModuleDefinition moduleDefinition = await ModuleDefinitionService.GetModuleDefinitionAsync(_moduleDefinitionId, ModuleState.SiteId); + if (moduleDefinition != null) { - name = moduledefinition.Name; - permissions = moduledefinition.Permissions; - createdby = moduledefinition.CreatedBy; - createdon = moduledefinition.CreatedOn; - modifiedby = moduledefinition.ModifiedBy; - modifiedon = moduledefinition.ModifiedOn; + _name = moduleDefinition.Name; + _permissions = moduleDefinition.Permissions; + _createdby = moduleDefinition.CreatedBy; + _createdon = moduleDefinition.CreatedOn; + _modifiedby = moduleDefinition.ModifiedBy; + _modifiedon = moduleDefinition.ModifiedOn; } } catch (Exception ex) { - await logger.LogError(ex, "Error Loading ModuleDefinition {ModuleDefinitionId} {Error}", ModuleDefinitionId, ex.Message); + await logger.LogError(ex, "Error Loading ModuleDefinition {ModuleDefinitionId} {Error}", _moduleDefinitionId, ex.Message); AddModuleMessage("Error Loading Module", MessageType.Error); } } @@ -67,15 +69,15 @@ { try { - ModuleDefinition moduledefinition = await ModuleDefinitionService.GetModuleDefinitionAsync(ModuleDefinitionId, ModuleState.SiteId); - moduledefinition.Permissions = permissiongrid.GetPermissions(); + ModuleDefinition moduledefinition = await ModuleDefinitionService.GetModuleDefinitionAsync(_moduleDefinitionId, ModuleState.SiteId); + moduledefinition.Permissions = _permissionGrid.GetPermissions(); await ModuleDefinitionService.UpdateModuleDefinitionAsync(moduledefinition); await logger.LogInformation("ModuleDefinition Saved {ModuleDefinition}", moduledefinition); NavigationManager.NavigateTo(NavigateUrl()); } catch (Exception ex) { - await logger.LogError(ex, "Error Saving ModuleDefinition {ModuleDefinitionId} {Error}", ModuleDefinitionId, ex.Message); + await logger.LogError(ex, "Error Saving ModuleDefinition {ModuleDefinitionId} {Error}", _moduleDefinitionId, ex.Message); AddModuleMessage("Error Saving Module", MessageType.Error); } } diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor index 7d40389f..3efd4ff8 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor @@ -4,7 +4,7 @@ @inject IModuleDefinitionService ModuleDefinitionService @inject IPackageService PackageService -@if (moduledefinitions == null) +@if (_moduleDefinitions == null) {

Loading...

} @@ -12,7 +12,7 @@ else { - +
   
- + -
-
- +
- - @foreach (KeyValuePair container in containers) + @foreach (KeyValuePair container in _containers) { } @@ -34,7 +34,7 @@ - +
- @foreach (Page p in PageState.Pages) { @@ -63,26 +63,26 @@ public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Edit; } } public override string Title { get { return "Module Settings"; } } - Dictionary containers = new Dictionary(); - string title; - string containertype; - string permissionnames = ""; - string permissions; - string pageid; + Dictionary _containers = new Dictionary(); + string _title; + string _containerType; + string _permissionNames = ""; + string _permissions; + string _pageId; - PermissionGrid permissiongrid; + PermissionGrid _permissionGrid; RenderFragment DynamicComponent { get; set; } - object settings; + object _settings; protected override async Task OnInitializedAsync() { - title = ModuleState.Title; - containers = ThemeService.GetContainerTypes(await ThemeService.GetThemesAsync()); - containertype = ModuleState.ContainerType; - permissions = ModuleState.Permissions; - permissionnames = ModuleState.ModuleDefinition.PermissionNames; - pageid = ModuleState.PageId.ToString(); + _title = ModuleState.Title; + _containers = ThemeService.GetContainerTypes(await ThemeService.GetThemesAsync()); + _containerType = ModuleState.ContainerType; + _permissions = ModuleState.Permissions; + _permissionNames = ModuleState.ModuleDefinition.PermissionNames; + _pageId = ModuleState.PageId.ToString(); DynamicComponent = builder => { @@ -90,7 +90,7 @@ if (moduleType != null) { builder.OpenComponent(0, moduleType); - builder.AddComponentReferenceCapture(1, inst => { settings = Convert.ChangeType(inst, moduleType); }); + builder.AddComponentReferenceCapture(1, inst => { _settings = Convert.ChangeType(inst, moduleType); }); builder.CloseComponent(); } }; @@ -99,20 +99,20 @@ private async Task SaveModule() { Module module = ModuleState; - module.Permissions = permissiongrid.GetPermissions(); + module.Permissions = _permissionGrid.GetPermissions(); await ModuleService.UpdateModuleAsync(module); PageModule pagemodule = await PageModuleService.GetPageModuleAsync(ModuleState.PageModuleId); - pagemodule.PageId = int.Parse(pageid); - pagemodule.Title = title; - pagemodule.ContainerType = containertype; + pagemodule.PageId = int.Parse(_pageId); + pagemodule.Title = _title; + pagemodule.ContainerType = _containerType; await PageModuleService.UpdatePageModuleAsync(pagemodule); await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane); Type moduleType = Type.GetType(ModuleState.ModuleType); if (moduleType != null) { - moduleType.GetMethod("UpdateSettings").Invoke(settings, null); // method must be public in settings component + moduleType.GetMethod("UpdateSettings")?.Invoke(_settings, null); // method must be public in settings component } NavigationManager.NavigateTo(NavigateUrl()); diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor index e0743b13..cad64681 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor @@ -209,7 +209,7 @@ themes = ThemeService.GetThemeTypes(Themes); PageId = Int32.Parse(PageState.QueryString["id"]); - Page page = PageState.Pages.Where(item => item.PageId == PageId).FirstOrDefault(); + Page page = PageState.Pages.FirstOrDefault(item => item.PageId == PageId); if (page != null) { name = page.Name; @@ -310,7 +310,7 @@ if (name != "" && !string.IsNullOrEmpty(themetype) && (panelayouts.Count == 0 || !string.IsNullOrEmpty(layouttype))) { page = PageState.Pages.Where(item => item.PageId == PageId).FirstOrDefault(); - string currentpath = page.Path; + string currentPath = page.Path; page.Name = name; if (path == "" && name.ToLower() != "home") @@ -329,7 +329,7 @@ else { page.ParentId = Int32.Parse(parentid); - Page parent = PageState.Pages.Where(item => item.PageId == page.ParentId).FirstOrDefault(); + Page parent = PageState.Pages.FirstOrDefault(item => item.PageId == page.ParentId); if (parent.Path == "") { page.Path = Utilities.GetFriendlyUrl(parent.Name) + "/" + Utilities.GetFriendlyUrl(path); @@ -348,12 +348,12 @@ page.Order = 0; break; case "<": - child = PageState.Pages.Where(item => item.PageId == childid).FirstOrDefault(); - page.Order = child.Order - 1; + child = PageState.Pages.FirstOrDefault(item => item.PageId == childid); + if (child != null) page.Order = child.Order - 1; break; case ">": - child = PageState.Pages.Where(item => item.PageId == childid).FirstOrDefault(); - page.Order = child.Order + 1; + child = PageState.Pages.FirstOrDefault(item => item.PageId == childid); + if (child != null) page.Order = child.Order + 1; break; case ">>": page.Order = int.MaxValue; @@ -363,8 +363,8 @@ page.IsNavigation = (isnavigation == null ? true : Boolean.Parse(isnavigation)); page.EditMode = (mode == "edit" ? true : false); page.ThemeType = themetype; - page.LayoutType = (layouttype == null ? "" : layouttype); - page.Icon = (icon == null ? "" : icon); + page.LayoutType = layouttype ?? ""; + page.Icon = icon ?? ""; page.Permissions = permissiongrid.GetPermissions(); if (page.ThemeType == PageState.Site.DefaultThemeType) @@ -375,7 +375,7 @@ { page.LayoutType = ""; } - page.IsPersonalizable = (ispersonalizable == null ? false : Boolean.Parse(ispersonalizable)); + page.IsPersonalizable = (ispersonalizable != null && Boolean.Parse(ispersonalizable)); page.UserId = null; page = await PageService.UpdatePageAsync(page); @@ -392,9 +392,9 @@ // update child paths if (parentid != currentparentid) { - foreach (Page p in PageState.Pages.Where(item => item.Path.StartsWith(currentpath))) + foreach (Page p in PageState.Pages.Where(item => item.Path.StartsWith(currentPath))) { - p.Path = p.Path.Replace(currentpath, page.Path); + p.Path = p.Path.Replace(currentPath, page.Path); await PageService.UpdatePageAsync(p); } } diff --git a/Oqtane.Client/Modules/Admin/Profiles/Edit.razor b/Oqtane.Client/Modules/Admin/Profiles/Edit.razor index a1eaff65..dfdbe432 100644 --- a/Oqtane.Client/Modules/Admin/Profiles/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Profiles/Edit.razor @@ -6,7 +6,7 @@
- + @@ -14,7 +14,7 @@
- + @@ -22,7 +22,7 @@
- +