kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #99 from sbwalker/master

Browse Source 
implement new AddModuleMessage
This commit is contained in:
Shaun Walker 2019-09-25 14:27:21 -04:00 committed by GitHub
commit a13be014e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 19 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Oqtane.Client/Modules/Admin/Login/Index.razor
View File

@ -14,7 +14,6 @@
</Authorized> </Authorized>
<NotAuthorized> <NotAuthorized>
<div class="container"> <div class="container">
@((MarkupString)Message)
<div class="form-group"> <div class="form-group">
<label for="Username" class="control-label">Username: </label> <label for="Username" class="control-label">Username: </label>
<input type="text" name="Username" class="form-control" placeholder="Username" @bind="@Username" /> <input type="text" name="Username" class="form-control" placeholder="Username" @bind="@Username" />
@ -38,7 +37,6 @@
@code { @code {
public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Anonymous; } } public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Anonymous; } }
public string Message { get; set; } = "";
public string Username { get; set; } = ""; public string Username { get; set; } = "";
public string Password { get; set; } = ""; public string Password { get; set; } = "";
public bool Remember { get; set; } = false; public bool Remember { get; set; } = false;
@ -66,7 +64,7 @@
} }
else else
{ {
Message = "<div class=\"alert alert-danger\" role=\"alert\">Login Failed. Please Remember That Passwords Are Case Sensitive.</div>"; ModuleInstance.AddModuleMessage("Login Failed. Please Remember That Passwords Are Case Sensitive.", MessageType.Error);
} }
} }
else else
@ -84,7 +82,7 @@
} }
else else
{ {
Message = "<div class=\"alert alert-danger\" role=\"alert\">Login Failed. Please Remember That Passwords Are Case Sensitive.</div>"; ModuleInstance.AddModuleMessage("Login Failed. Please Remember That Passwords Are Case Sensitive.", MessageType.Error);
} }
} }
} }

8
Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
View File

@ -3,8 +3,6 @@
@inject IModuleDefinitionService ModuleDefinitionService @inject IModuleDefinitionService ModuleDefinitionService
@inject NavigationManager NavigationManager @inject NavigationManager NavigationManager
<ModuleMessage Message="@message" />
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td>
@ -32,8 +30,6 @@
@code { @code {
public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
string message = "";
int ModuleDefinitionId; int ModuleDefinitionId;
string name; string name;
string permissions; string permissions;
@ -62,7 +58,7 @@
} }
catch (Exception ex) catch (Exception ex)
{ {
message = ex.Message; ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
} }
} }
@ -77,7 +73,7 @@
} }
catch (Exception ex) catch (Exception ex)
{ {
message = ex.Message; ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
} }
} }
} }

10
Oqtane.Client/Modules/Admin/Pages/Add.razor
View File

@ -4,8 +4,6 @@
@inject IPageService PageService @inject IPageService PageService
@inject IThemeService ThemeService @inject IThemeService ThemeService
<ModuleMessage Message="@message" />
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td>
@ -136,8 +134,6 @@
@code { @code {
public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
string message = "";
Dictionary<string, string> themes = new Dictionary<string, string>(); Dictionary<string, string> themes = new Dictionary<string, string>();
Dictionary<string, string> panelayouts = new Dictionary<string, string>(); Dictionary<string, string> panelayouts = new Dictionary<string, string>();
@ -177,7 +173,7 @@
} }
catch (Exception ex) catch (Exception ex)
{ {
message = ex.Message; ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
} }
} }
@ -198,7 +194,7 @@
} }
catch (Exception ex) catch (Exception ex)
{ {
message = ex.Message; ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
} }
} }
@ -277,7 +273,7 @@
} }
catch (Exception ex) catch (Exception ex)
{ {
message = ex.Message; ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
} }
} }

8
Oqtane.Client/Modules/Admin/Pages/Delete.razor
View File

@ -4,8 +4,6 @@
@inject IPageService PageService @inject IPageService PageService
@inject IThemeService ThemeService @inject IThemeService ThemeService
<ModuleMessage Message="@message" />
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td>
@ -113,8 +111,6 @@
@code { @code {
public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
string message = "";
Dictionary<string, string> themes = new Dictionary<string, string>(); Dictionary<string, string> themes = new Dictionary<string, string>();
Dictionary<string, string> panelayouts = new Dictionary<string, string>(); Dictionary<string, string> panelayouts = new Dictionary<string, string>();
@ -162,7 +158,7 @@
} }
catch (Exception ex) catch (Exception ex)
{ {
message = ex.Message; ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
} }
} }
@ -175,7 +171,7 @@
} }
catch (Exception ex) catch (Exception ex)
{ {
message = ex.Message; ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
} }
} }
} }

10
Oqtane.Client/Modules/Admin/Pages/Edit.razor
View File

@ -4,8 +4,6 @@
@inject IPageService PageService @inject IPageService PageService
@inject IThemeService ThemeService @inject IThemeService ThemeService
<ModuleMessage Message="@message" />
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td>
@ -150,8 +148,6 @@
@code { @code {
public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
string message = "";
Dictionary<string, string> themes = new Dictionary<string, string>(); Dictionary<string, string> themes = new Dictionary<string, string>();
Dictionary<string, string> panelayouts = new Dictionary<string, string>(); Dictionary<string, string> panelayouts = new Dictionary<string, string>();
@ -220,7 +216,7 @@
} }
catch (Exception ex) catch (Exception ex)
{ {
message = ex.Message; ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
} }
} }
@ -249,7 +245,7 @@
} }
catch (Exception ex) catch (Exception ex)
{ {
message = ex.Message; ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
} }
} }
@ -350,7 +346,7 @@
} }
catch (Exception ex) catch (Exception ex)
{ {
message = ex.Message; ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
} }
} }
} }

9
Oqtane.Client/Modules/Admin/Profile/Index.razor
View File

@ -5,8 +5,6 @@
@inject IProfileService ProfileService @inject IProfileService ProfileService
@inject ISettingService SettingService @inject ISettingService SettingService
<ModuleMessage Message="@message" />
@if (PageState.User != null && profiles != null) @if (PageState.User != null && profiles != null)
{ {
<table class="table table-borderless"> <table class="table table-borderless">
@ -58,7 +56,6 @@
@code { @code {
public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.View; } } public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.View; } }
string message = "";
string displayname = ""; string displayname = "";
string email = ""; string email = "";
List<Profile> profiles; List<Profile> profiles;
@ -78,12 +75,12 @@
} }
else else
{ {
message = "Current User Is Not Logged In"; ModuleInstance.AddModuleMessage("Current User Is Not Logged In", MessageType.Warning);
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
message = ex.Message; ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
} }
} }
@ -106,7 +103,7 @@
} }
catch (Exception ex) catch (Exception ex)
{ {
message = ex.Message; ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
} }
} }

3
Oqtane.Client/Modules/Controls/ModuleMessage.razor
View File

@ -4,7 +4,7 @@
@if (!string.IsNullOrEmpty(message)) @if (!string.IsNullOrEmpty(message))
{ {
<div class="@classname" role="alert">@message</div> <div class="@classname" role="alert">@message</div>
<br /><br /> <br />
} }
@code { @code {
@ -27,6 +27,7 @@
{ {
this.message = message; this.message = message;
classname = GetMessageType(type); classname = GetMessageType(type);
StateHasChanged();
} }
private string GetMessageType(MessageType type) private string GetMessageType(MessageType type)

7
Oqtane.Client/Modules/HtmlText/Edit.razor
View File

@ -6,8 +6,6 @@
@inject HttpClient http @inject HttpClient http
@inject SiteState sitestate @inject SiteState sitestate
<ModuleMessage Message="@message" />
<table class="form-group"> <table class="form-group">
<tr> <tr>
<td> <td>
@ -28,7 +26,6 @@
public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Edit; } } public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Edit; } }
public override string Title { get { return "Edit Html/Text"; } } public override string Title { get { return "Edit Html/Text"; } }
string message = "";
string content; string content;
string createdby; string createdby;
DateTime createdon; DateTime createdon;
@ -52,7 +49,7 @@
} }
catch (Exception ex) catch (Exception ex)
{ {
message = ex.Message; ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
} }
} }
@ -78,7 +75,7 @@
} }
catch (Exception ex) catch (Exception ex)
{ {
message = ex.Message; ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
} }
} }
} }