From 4a16386f33fe27c88c39f62d2fbda1d71092dcab Mon Sep 17 00:00:00 2001 From: malik masis Date: Fri, 11 Nov 2022 15:58:43 +0300 Subject: [PATCH 1/7] Fixed identity blazor side --- .../Pages/Identity/UserManagement.razor | 4 +++- .../Pages/Identity/UserManagement.razor.cs | 10 ++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor index 1aa88f2c14..2782bcd05d 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor @@ -101,7 +101,9 @@ - + diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs index 28520a018c..2532d8f87b 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs @@ -35,12 +35,13 @@ public partial class UserManagement protected string CreateModalSelectedTab = DefaultSelectedTab; protected string EditModalSelectedTab = DefaultSelectedTab; + protected bool IsShowPasswordText { get; set; } = false; protected PageToolbar Toolbar { get; } = new(); private List UserManagementTableColumns => TableColumns.Get(); private TextRole _passwordTextRole = TextRole.Password; - + public UserManagement() { ObjectMapperContext = typeof(AbpIdentityBlazorModule); @@ -232,13 +233,18 @@ public partial class UserManagement { if (textRole == null) { - ChangePasswordTextRole(_passwordTextRole == TextRole.Password ? TextRole.Text: TextRole.Password); + ChangePasswordTextRole(_passwordTextRole == TextRole.Password ? TextRole.Text : TextRole.Password); } else { _passwordTextRole = textRole.Value; } } + + protected virtual void IsShowPassword(bool isShowPassword) + { + IsShowPasswordText = !isShowPassword; + } } public class AssignedRoleViewModel From c0210c5d0bfd5a4b351b56c178507088449c007f Mon Sep 17 00:00:00 2001 From: malik masis Date: Fri, 11 Nov 2022 16:14:04 +0300 Subject: [PATCH 2/7] Moved the click from the icon to the button --- .../Pages/Identity/UserManagement.razor | 4 ++-- .../Pages/Identity/UserManagement.razor.cs | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor index 2782bcd05d..e8743cf65e 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor @@ -101,8 +101,8 @@ - diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs index 2532d8f87b..3eea6f01c6 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs @@ -35,7 +35,7 @@ public partial class UserManagement protected string CreateModalSelectedTab = DefaultSelectedTab; protected string EditModalSelectedTab = DefaultSelectedTab; - protected bool IsShowPasswordText { get; set; } = false; + protected bool IsShowPassword { get; set; } protected PageToolbar Toolbar { get; } = new(); @@ -229,7 +229,7 @@ public partial class UserManagement return base.SetToolbarItemsAsync(); } - protected virtual void ChangePasswordTextRole(TextRole? textRole) + protected virtual void ChangePasswordTextRole(TextRole? textRole, bool? isShowPassword = null) { if (textRole == null) { @@ -239,11 +239,11 @@ public partial class UserManagement { _passwordTextRole = textRole.Value; } - } - protected virtual void IsShowPassword(bool isShowPassword) - { - IsShowPasswordText = !isShowPassword; + if (isShowPassword.HasValue) + { + IsShowPassword = !isShowPassword.Value; + } } } From 391b8b7bf63461dae7ff71da509f204ced85dc89 Mon Sep 17 00:00:00 2001 From: malik masis Date: Mon, 14 Nov 2022 14:52:59 +0300 Subject: [PATCH 3/7] Added Hiden-Show button for razor - tenant --- .../Volo/Abp/TenantManagement/TenantConsts.cs | 4 ++++ .../Pages/TenantManagement/Tenants/Create.js | 22 +++++++++++++++++++ .../Tenants/CreateModal.cshtml | 11 +++++++++- .../Tenants/CreateModal.cshtml.cs | 4 ++-- .../TenantManagement/Tenants/Index.cshtml | 3 ++- 5 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Create.js diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/TenantConsts.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/TenantConsts.cs index 99077d265b..255f01c0ab 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/TenantConsts.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/TenantConsts.cs @@ -6,4 +6,8 @@ public static class TenantConsts /// Default value: 64 /// public static int MaxNameLength { get; set; } = 64; + + public const int MaxPasswordLength = 128; + + public const int AdminEmailAddress = 256; } diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Create.js b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Create.js new file mode 100644 index 0000000000..b19f44be46 --- /dev/null +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Create.js @@ -0,0 +1,22 @@ +$(document).ready(function () { + $(document).on('click', '#PasswordVisibilityButton', function () { + let button = $(this); + let passwordInput = button.parent().find("input"); + if (!passwordInput) { + return; + } + + if (passwordInput.attr("type") === "password") { + passwordInput.attr("type", "text"); + } + else { + passwordInput.attr("type", "password"); + } + + let icon = button.find("i"); + if (icon) { + icon.toggleClass("fa-eye-slash").toggleClass("fa-eye"); + } + }) +}); + diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml index 03f6f6d70c..27c228a80a 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml @@ -7,6 +7,7 @@ @using Volo.Abp.TenantManagement.Localization @using Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants @using Volo.Abp.Data +@using Volo.Abp.TenantManagement; @model CreateModalModel @inject IHtmlLocalizer L @inject IStringLocalizerFactory StringLocalizerFactory @@ -21,7 +22,15 @@ - +
+
+ + +
+ +
@foreach (var propertyInfo in ObjectExtensionManager.Instance.GetProperties()) { diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs index ffd9c162a0..c9f73d8aa0 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs @@ -43,12 +43,12 @@ public class CreateModalModel : TenantManagementPageModel [Required] [EmailAddress] - [MaxLength(256)] + [MaxLength(TenantConsts.AdminEmailAddress)] public string AdminEmailAddress { get; set; } [Required] [DataType(DataType.Password)] - [MaxLength(128)] + [MaxLength(TenantConsts.MaxPasswordLength)] public string AdminPassword { get; set; } } } diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml index a93733a338..f2bf7d3705 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml @@ -21,7 +21,8 @@ - + + } @section content_toolbar { From d37476122662fd5c4c398daee3bfb287761cf5c7 Mon Sep 17 00:00:00 2001 From: malik masis Date: Mon, 14 Nov 2022 15:03:32 +0300 Subject: [PATCH 4/7] Added Hiden-Show button for blazor - tenant --- .../TenantManagement/TenantManagement.razor | 23 ++++++++++++------- .../TenantManagement.razor.cs | 10 +++++--- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor index a1d4f66427..cf47e4c82b 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor @@ -65,14 +65,21 @@ - - @L["DisplayName:AdminPassword"] * - - - - - - + + @L["DisplayName:AdminPassword"] * + + + + + + + + + + + diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs index 5969237a21..89142f2cf6 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs @@ -1,14 +1,11 @@ using System; using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; using System.Threading.Tasks; using Blazorise; using Microsoft.AspNetCore.Authorization; using Volo.Abp.AspNetCore.Components.Web.Extensibility.EntityActions; using Volo.Abp.AspNetCore.Components.Web.Extensibility.TableColumns; using Volo.Abp.AspNetCore.Components.Web.Theming.PageToolbars; -using Volo.Abp.BlazoriseUI; -using Volo.Abp.FeatureManagement; using Volo.Abp.FeatureManagement.Blazor.Components; using Volo.Abp.ObjectExtending; using Volo.Abp.TenantManagement.Localization; @@ -24,6 +21,8 @@ public partial class TenantManagement protected FeatureManagementModal FeatureManagementModal; + protected bool IsShowPassword { get; set; } + protected PageToolbar Toolbar { get; } = new(); protected List TenantManagementTableColumns => TableColumns.Get(); @@ -127,4 +126,9 @@ public partial class TenantManagement return base.SetTableColumnsAsync(); } + + protected virtual void ShowHidePassword(bool isShowPassword) + { + IsShowPassword = !isShowPassword; + } } From 6a45bae887084f6d23b8e35f4cda2da401c0200a Mon Sep 17 00:00:00 2001 From: malik masis Date: Mon, 14 Nov 2022 16:46:02 +0300 Subject: [PATCH 5/7] Added Hiden-Show button for razor - account --- .../Pages/Account/Login.cshtml | 28 ++++++++++++++++--- .../Pages/Account/Login.js | 22 +++++++++++++++ 2 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.js diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml index ae31edc5e7..2b0fcb9c2c 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml @@ -2,10 +2,26 @@ @using Microsoft.AspNetCore.Mvc.Localization @using Volo.Abp.Account.Localization @using Volo.Abp.Account.Settings +@using Volo.Abp.Account.Web.Pages.Account; +@using Volo.Abp.AspNetCore.Mvc.UI.Theming; +@using Volo.Abp.Identity; @using Volo.Abp.Settings @model Volo.Abp.Account.Web.Pages.Account.LoginModel @inject IHtmlLocalizer L +@inject IThemeManager ThemeManager @inject Volo.Abp.Settings.ISettingProvider SettingProvider + +@{ + Layout = ThemeManager.CurrentTheme.GetAccountLayout(); +} + +@section scripts + { + + + +} +

@L["Login"]

@@ -21,17 +37,21 @@
- +
+
- - +
+ + +
+
- + @L["ForgotPassword"] diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.js b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.js new file mode 100644 index 0000000000..56934f4fef --- /dev/null +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.js @@ -0,0 +1,22 @@ +$(function () { + $("#PasswordVisibilityButton").click(function (e) { + let button = $(this); + let passwordInput = button.parent().find("input"); + if (!passwordInput) { + return; + } + + if (passwordInput.attr("type") === "password") { + passwordInput.attr("type", "text"); + } + else { + passwordInput.attr("type", "password"); + } + + let icon = button.find("i"); + if (icon) { + icon.toggleClass("fa-eye-slash").toggleClass("fa-eye"); + } + }); + +}); From 5c19b6907511e25486cd5a6b3816071923f39b92 Mon Sep 17 00:00:00 2001 From: malik masis Date: Tue, 15 Nov 2022 14:05:43 +0300 Subject: [PATCH 6/7] Renamed property and method names --- .../Pages/Identity/UserManagement.razor | 8 +++++--- .../Pages/Identity/UserManagement.razor.cs | 9 +++------ .../Pages/TenantManagement/TenantManagement.razor | 6 +++--- .../Pages/TenantManagement/TenantManagement.razor.cs | 6 +++--- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor index e8743cf65e..657fe795ec 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor @@ -101,8 +101,8 @@ - @@ -222,7 +222,9 @@ - + diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs index 3eea6f01c6..403e46601d 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs @@ -35,7 +35,7 @@ public partial class UserManagement protected string CreateModalSelectedTab = DefaultSelectedTab; protected string EditModalSelectedTab = DefaultSelectedTab; - protected bool IsShowPassword { get; set; } + protected bool ShowPassword { get; set; } protected PageToolbar Toolbar { get; } = new(); @@ -229,21 +229,18 @@ public partial class UserManagement return base.SetToolbarItemsAsync(); } - protected virtual void ChangePasswordTextRole(TextRole? textRole, bool? isShowPassword = null) + protected virtual void ChangePasswordTextRole(TextRole? textRole) { if (textRole == null) { ChangePasswordTextRole(_passwordTextRole == TextRole.Password ? TextRole.Text : TextRole.Password); + ShowPassword = !ShowPassword; } else { _passwordTextRole = textRole.Value; } - if (isShowPassword.HasValue) - { - IsShowPassword = !isShowPassword.Value; - } } } diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor index cf47e4c82b..0c03d5cbd2 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor @@ -69,12 +69,12 @@ @L["DisplayName:AdminPassword"] * - + - diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs index 89142f2cf6..9d1edbad7a 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs @@ -21,7 +21,7 @@ public partial class TenantManagement protected FeatureManagementModal FeatureManagementModal; - protected bool IsShowPassword { get; set; } + protected bool ShowPassword { get; set; } protected PageToolbar Toolbar { get; } = new(); @@ -127,8 +127,8 @@ public partial class TenantManagement return base.SetTableColumnsAsync(); } - protected virtual void ShowHidePassword(bool isShowPassword) + protected virtual void TogglePasswordVisibility() { - IsShowPassword = !isShowPassword; + ShowPassword = !ShowPassword; } } From 0c71423decb5b81662138e57673ee8b3fabef7ea Mon Sep 17 00:00:00 2001 From: malik masis Date: Wed, 16 Nov 2022 16:38:55 +0300 Subject: [PATCH 7/7] Used DynamicStringLength instead of [StringLength] --- .../Volo/Abp/TenantManagement/TenantConsts.cs | 12 +++++++++--- .../TenantManagement/Tenants/CreateModal.cshtml.cs | 5 +++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/TenantConsts.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/TenantConsts.cs index 255f01c0ab..4dcd003af2 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/TenantConsts.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/TenantConsts.cs @@ -7,7 +7,13 @@ public static class TenantConsts /// public static int MaxNameLength { get; set; } = 64; - public const int MaxPasswordLength = 128; - - public const int AdminEmailAddress = 256; + /// + /// Default value: 128 + /// + public static int MaxPasswordLength { get; set; } = 128; + + /// + /// Default value: 256 + /// + public static int AdminEmailAddress { get; set; } = 256; } diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs index c9f73d8aa0..24f732442d 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs @@ -43,12 +43,13 @@ public class CreateModalModel : TenantManagementPageModel [Required] [EmailAddress] - [MaxLength(TenantConsts.AdminEmailAddress)] + [DynamicStringLength(typeof(TenantConsts), nameof(TenantConsts.AdminEmailAddress))] + public string AdminEmailAddress { get; set; } [Required] [DataType(DataType.Password)] - [MaxLength(TenantConsts.MaxPasswordLength)] + [DynamicStringLength(typeof(TenantConsts), nameof(TenantConsts.MaxPasswordLength))] public string AdminPassword { get; set; } } }