From d9361b125a274a03a3e6ea4491d3c278b4b351f3 Mon Sep 17 00:00:00 2001 From: alirizaadiyahsi Date: Wed, 28 Nov 2018 22:19:56 +0300 Subject: [PATCH 1/8] Upgrade vuetify to latest. Resolved #96 --- src/Nucleus.Web.Vue/package-lock.json | 34 ++++++++------------------- src/Nucleus.Web.Vue/package.json | 2 +- src/Nucleus.Web.Vue/yarn.lock | 6 ++--- 3 files changed, 14 insertions(+), 28 deletions(-) diff --git a/src/Nucleus.Web.Vue/package-lock.json b/src/Nucleus.Web.Vue/package-lock.json index 577929c..49614bd 100644 --- a/src/Nucleus.Web.Vue/package-lock.json +++ b/src/Nucleus.Web.Vue/package-lock.json @@ -4420,14 +4420,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4442,20 +4440,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -4572,8 +4567,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -4585,7 +4579,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4600,7 +4593,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -4608,14 +4600,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -4634,7 +4624,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -4715,8 +4704,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -4728,7 +4716,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -4850,7 +4837,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -10350,9 +10336,9 @@ "dev": true }, "vuetify": { - "version": "1.3.9", - "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-1.3.9.tgz", - "integrity": "sha512-6cgWRVEBkuUowrfAR9i4lVcTQtwpz9WLM5IcmsMmsmto2GLgf+bi3EfbVFi5xBF3UaV+TC1oHkZq+H/bqgyfhw==" + "version": "1.3.11", + "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-1.3.11.tgz", + "integrity": "sha512-K9RS3DaREv9KCX6CqaO5owMltN8V++z9ReyPWnZdq8aokNCu9oDh7cZ3yqkkaoymy9kH89mtjhEu8ybLm6QCsg==" }, "w3c-hr-time": { "version": "1.0.1", diff --git a/src/Nucleus.Web.Vue/package.json b/src/Nucleus.Web.Vue/package.json index b6d95b5..f4312c2 100644 --- a/src/Nucleus.Web.Vue/package.json +++ b/src/Nucleus.Web.Vue/package.json @@ -13,7 +13,7 @@ "vue-class-component": "^6.3.2", "vue-property-decorator": "^7.2.0", "vue-router": "^3.0.1", - "vuetify": "^1.3.9", + "vuetify": "^1.3.11", "material-design-icons-iconfont": "4.0.2", "sweetalert2": "^7.29.1", "vue-i18n": "^8.3.2" diff --git a/src/Nucleus.Web.Vue/yarn.lock b/src/Nucleus.Web.Vue/yarn.lock index 3beac6f..c90ed99 100644 --- a/src/Nucleus.Web.Vue/yarn.lock +++ b/src/Nucleus.Web.Vue/yarn.lock @@ -6625,9 +6625,9 @@ vue@^2.5.17: version "2.5.17" resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.17.tgz#0f8789ad718be68ca1872629832ed533589c6ada" -vuetify@^1.3.9: - version "1.3.9" - resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-1.3.9.tgz#19af65f7ef0c26efb1076464815d9ad9a5e4fa4f" +vuetify@^1.3.11: + version "1.3.11" + resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-1.3.11.tgz#8be51f752a821704bb7fe0b7ac1f9324b902e52a" w3c-hr-time@^1.0.1: version "1.0.1" From 85177b6cb4cd91f2dac8bdd50cf56138f405221e Mon Sep 17 00:00:00 2001 From: alirizaadiyahsi Date: Wed, 28 Nov 2018 23:07:04 +0300 Subject: [PATCH 2/8] Upgraded nuget packages --- src/Nucleus.Application/Nucleus.Application.csproj | 2 +- src/Nucleus.Utilities/Nucleus.Utilities.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Nucleus.Application/Nucleus.Application.csproj b/src/Nucleus.Application/Nucleus.Application.csproj index dc970da..4a47587 100644 --- a/src/Nucleus.Application/Nucleus.Application.csproj +++ b/src/Nucleus.Application/Nucleus.Application.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Nucleus.Utilities/Nucleus.Utilities.csproj b/src/Nucleus.Utilities/Nucleus.Utilities.csproj index 2ec24c9..ea94422 100644 --- a/src/Nucleus.Utilities/Nucleus.Utilities.csproj +++ b/src/Nucleus.Utilities/Nucleus.Utilities.csproj @@ -5,7 +5,7 @@ - + From 10fcd6b6e17d237870e48b864b2f6210339456f4 Mon Sep 17 00:00:00 2001 From: alirizaadiyahsi Date: Thu, 29 Nov 2018 00:17:49 +0300 Subject: [PATCH 3/8] Select all permissions/roles --- .../src/admin/views/roles/role-list.ts | 8 +++++++ .../src/admin/views/roles/role-list.vue | 4 ++-- .../src/admin/views/users/user-list.ts | 8 +++++++ .../src/admin/views/users/user-list.vue | 24 +++++++++---------- .../src/assets/js/locales/en.json | 1 + .../src/assets/js/locales/tr.json | 1 + 6 files changed, 32 insertions(+), 14 deletions(-) diff --git a/src/Nucleus.Web.Vue/src/admin/views/roles/role-list.ts b/src/Nucleus.Web.Vue/src/admin/views/roles/role-list.ts index af41203..36625bc 100644 --- a/src/Nucleus.Web.Vue/src/admin/views/roles/role-list.ts +++ b/src/Nucleus.Web.Vue/src/admin/views/roles/role-list.ts @@ -11,6 +11,7 @@ export default class RoleListComponent extends NucleusComponentBase { public formTitle = ''; public pagination = {}; public search = ''; + public selectAll = false; get headers() { return [ @@ -112,4 +113,11 @@ export default class RoleListComponent extends NucleusComponentBase { this.loading = false; }); } + + public selectAllPermissions() { + this.createOrUpdateRoleInput.grantedPermissionIds = []; + if (this.selectAll) { + this.createOrUpdateRoleInput.grantedPermissionIds = ((this.allPermissions.map(permissions => permissions.id)) as string[]); + } + } } \ No newline at end of file diff --git a/src/Nucleus.Web.Vue/src/admin/views/roles/role-list.vue b/src/Nucleus.Web.Vue/src/admin/views/roles/role-list.vue index c0bcb46..65ae53e 100644 --- a/src/Nucleus.Web.Vue/src/admin/views/roles/role-list.vue +++ b/src/Nucleus.Web.Vue/src/admin/views/roles/role-list.vue @@ -31,8 +31,8 @@ - - {{$t('SelectPermissions')}} + + diff --git a/src/Nucleus.Web.Vue/src/admin/views/users/user-list.ts b/src/Nucleus.Web.Vue/src/admin/views/users/user-list.ts index 7908814..530c2ab 100644 --- a/src/Nucleus.Web.Vue/src/admin/views/users/user-list.ts +++ b/src/Nucleus.Web.Vue/src/admin/views/users/user-list.ts @@ -12,6 +12,7 @@ export default class UserListComponent extends NucleusComponentBase { public errors: INameValueDto[] = []; public allRoles: IRoleDto[] = []; public isEdit = false; + public selectAll = false; get headers() { return [ @@ -120,4 +121,11 @@ export default class UserListComponent extends NucleusComponentBase { public isAdminUser(userName: string) { return userName.includes('admin'); } + + public selectAllRoles() { + this.createOrUpdateUserInput.grantedRoleIds = []; + if (this.selectAll) { + this.createOrUpdateUserInput.grantedRoleIds = ((this.allRoles.map(roles => roles.id)) as string[]); + } + } } \ No newline at end of file diff --git a/src/Nucleus.Web.Vue/src/admin/views/users/user-list.vue b/src/Nucleus.Web.Vue/src/admin/views/users/user-list.vue index b3222b7..69bbf91 100644 --- a/src/Nucleus.Web.Vue/src/admin/views/users/user-list.vue +++ b/src/Nucleus.Web.Vue/src/admin/views/users/user-list.vue @@ -28,26 +28,26 @@ - - - - - - {{$t('SelectRoles')}} + + diff --git a/src/Nucleus.Web.Vue/src/assets/js/locales/en.json b/src/Nucleus.Web.Vue/src/assets/js/locales/en.json index 4ae5df3..959e1f5 100644 --- a/src/Nucleus.Web.Vue/src/assets/js/locales/en.json +++ b/src/Nucleus.Web.Vue/src/assets/js/locales/en.json @@ -42,6 +42,7 @@ "Roles": "Roles", "Save": "Save", "Search": "Search", + "SelectAll": "Select all", "SelectPermissions": "Select permissions", "SelectRoles": "Select roles", "Successful": "Successful!", diff --git a/src/Nucleus.Web.Vue/src/assets/js/locales/tr.json b/src/Nucleus.Web.Vue/src/assets/js/locales/tr.json index 8ef6351..bda1282 100644 --- a/src/Nucleus.Web.Vue/src/assets/js/locales/tr.json +++ b/src/Nucleus.Web.Vue/src/assets/js/locales/tr.json @@ -42,6 +42,7 @@ "Roles": "Roller", "Save": "Kaydet", "Search": "Ara", + "SelectAll": "Tümünü seç", "SelectPermissions": "Yetki seçin", "SelectRoles": "Rol seçin", "Successful": "Başarılı!", From 0425568f0d32e32961cce704b2c15f946ca4ef0d Mon Sep 17 00:00:00 2001 From: alirizaadiyahsi Date: Thu, 29 Nov 2018 23:35:37 +0300 Subject: [PATCH 4/8] Translated error massages that come from server --- src/Nucleus.Web.Vue/src/account/views/login/login.vue | 2 +- src/Nucleus.Web.Vue/src/account/views/register/register.vue | 2 +- .../components/profile/change-password/change-password.vue | 2 +- src/Nucleus.Web.Vue/src/admin/views/roles/role-list.vue | 2 +- src/Nucleus.Web.Vue/src/admin/views/users/user-list.vue | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Nucleus.Web.Vue/src/account/views/login/login.vue b/src/Nucleus.Web.Vue/src/account/views/login/login.vue index c8e01f5..5693359 100644 --- a/src/Nucleus.Web.Vue/src/account/views/login/login.vue +++ b/src/Nucleus.Web.Vue/src/account/views/login/login.vue @@ -6,7 +6,7 @@
- {{error.value}} + {{$t(error.name)}}
diff --git a/src/Nucleus.Web.Vue/src/account/views/register/register.vue b/src/Nucleus.Web.Vue/src/account/views/register/register.vue index 1f37d4a..f15ec31 100644 --- a/src/Nucleus.Web.Vue/src/account/views/register/register.vue +++ b/src/Nucleus.Web.Vue/src/account/views/register/register.vue @@ -7,7 +7,7 @@
- {{error.value}} + {{$t(error.name)}}
diff --git a/src/Nucleus.Web.Vue/src/admin/components/profile/change-password/change-password.vue b/src/Nucleus.Web.Vue/src/admin/components/profile/change-password/change-password.vue index 896a239..92dcd98 100644 --- a/src/Nucleus.Web.Vue/src/admin/components/profile/change-password/change-password.vue +++ b/src/Nucleus.Web.Vue/src/admin/components/profile/change-password/change-password.vue @@ -8,7 +8,7 @@
- {{error.value}} + {{$t(error.name)}}
diff --git a/src/Nucleus.Web.Vue/src/admin/views/roles/role-list.vue b/src/Nucleus.Web.Vue/src/admin/views/roles/role-list.vue index 65ae53e..99657ff 100644 --- a/src/Nucleus.Web.Vue/src/admin/views/roles/role-list.vue +++ b/src/Nucleus.Web.Vue/src/admin/views/roles/role-list.vue @@ -24,7 +24,7 @@
- {{error.value}} + {{$t(error.name)}}
diff --git a/src/Nucleus.Web.Vue/src/admin/views/users/user-list.vue b/src/Nucleus.Web.Vue/src/admin/views/users/user-list.vue index 69bbf91..09b4edd 100644 --- a/src/Nucleus.Web.Vue/src/admin/views/users/user-list.vue +++ b/src/Nucleus.Web.Vue/src/admin/views/users/user-list.vue @@ -24,7 +24,7 @@
- {{error.value}} + {{$t(error.name)}}
From e0b546bd6eea3163e13a8357876aa5a6cc8f8210 Mon Sep 17 00:00:00 2001 From: alirizaadiyahsi Date: Fri, 30 Nov 2018 14:22:29 +0300 Subject: [PATCH 5/8] Add missing localization keys that come from server, fixes #104 --- src/Nucleus.Application/Roles/RoleAppService.cs | 2 +- src/Nucleus.Application/Users/UserAppService.cs | 2 +- .../Controller/Account/AccountController.cs | 2 +- src/Nucleus.Web.Vue/src/admin/views/users/user-list.ts | 1 + src/Nucleus.Web.Vue/src/assets/js/locales/en.json | 9 +++++++++ src/Nucleus.Web.Vue/src/assets/js/locales/tr.json | 9 +++++++++ 6 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/Nucleus.Application/Roles/RoleAppService.cs b/src/Nucleus.Application/Roles/RoleAppService.cs index 6be6fcd..fd36fd4 100644 --- a/src/Nucleus.Application/Roles/RoleAppService.cs +++ b/src/Nucleus.Application/Roles/RoleAppService.cs @@ -84,7 +84,7 @@ public async Task EditRoleAsync(CreateOrUpdateRoleInput input) return IdentityResult.Failed(new IdentityError { Code = "RoleNameAlreadyExist", - Description = "Role name '" + input.Role.Name + "' is already taken!" + Description = "This role name is already exists!" }); } role.Name = input.Role.Name; diff --git a/src/Nucleus.Application/Users/UserAppService.cs b/src/Nucleus.Application/Users/UserAppService.cs index 9dc83fc..16b86f2 100644 --- a/src/Nucleus.Application/Users/UserAppService.cs +++ b/src/Nucleus.Application/Users/UserAppService.cs @@ -88,7 +88,7 @@ public async Task EditUserAsync(CreateOrUpdateUserInput input) return IdentityResult.Failed(new IdentityError { Code = "UserNameAlreadyExist", - Description = "User name '" + input.User.UserName + "' is already taken!" + Description = "This user name is already exist!" }); } diff --git a/src/Nucleus.Web.Api/Controller/Account/AccountController.cs b/src/Nucleus.Web.Api/Controller/Account/AccountController.cs index ec3e6ea..85fd862 100644 --- a/src/Nucleus.Web.Api/Controller/Account/AccountController.cs +++ b/src/Nucleus.Web.Api/Controller/Account/AccountController.cs @@ -44,7 +44,7 @@ public async Task> Login([FromBody]LoginInput input) { return BadRequest(new List { - new NameValueDto("UserNameOrPasswordIncorrect", "The user name or password is incorrect.") + new NameValueDto("UserNameOrPasswordIncorrect", "The user name or password is incorrect!") }); } diff --git a/src/Nucleus.Web.Vue/src/admin/views/users/user-list.ts b/src/Nucleus.Web.Vue/src/admin/views/users/user-list.ts index 530c2ab..ead2ff4 100644 --- a/src/Nucleus.Web.Vue/src/admin/views/users/user-list.ts +++ b/src/Nucleus.Web.Vue/src/admin/views/users/user-list.ts @@ -119,6 +119,7 @@ export default class UserListComponent extends NucleusComponentBase { } public isAdminUser(userName: string) { + // todo: this is a temp solution, should check if user is in admin role return userName.includes('admin'); } diff --git a/src/Nucleus.Web.Vue/src/assets/js/locales/en.json b/src/Nucleus.Web.Vue/src/assets/js/locales/en.json index 959e1f5..34fdadf 100644 --- a/src/Nucleus.Web.Vue/src/assets/js/locales/en.json +++ b/src/Nucleus.Web.Vue/src/assets/js/locales/en.json @@ -18,11 +18,14 @@ "Administration": "Administration", "AreYouSureToDelete": "Are you sure you want to delete?", "Cancel": "Cancel", + "CannotRemoveAdminUser": "You cannot remove admin user!", + "CannotRemoveSystemRole": "You cannot remove default system roles!", "ChangePassword": "Change password", "EditRole": "Edit role", "EditUser": "Edit user", "Email": "E-mail", "EmailAddress": "E-mail address", + "EmailAlreadyExist": "This email already exists!", "EmailValidationError": "E-mail must be valid!", "HelloWorld": "Hello world!", "Home": "Home", @@ -34,11 +37,14 @@ "NothingToDisplay": "Sorry, nothing to display here :(", "Password": "Password", "PasswordRepeat": "Password repeat", + "PasswordsDoesNotMatch": "Passwords doesn't match!", "PasswordsMustMatch": "Passwords must match!", "Register": "Register", "RegistrationSuccessful": "Registration successful!", "RequiredField": "This field is required!", "RoleName": "Role name", + "RoleNameAlreadyExist": "This role name is already exists!", + "RoleNotFound": "Role not found!", "Roles": "Roles", "Save": "Save", "Search": "Search", @@ -47,7 +53,10 @@ "SelectRoles": "Select roles", "Successful": "Successful!", "UserName": "User name", + "UserNameAlreadyExist": "This user name is already exist!", "UserNameOrEmailAddress": "User name or e-mail address", + "UserNameOrPasswordIncorrect": "The user name or password is incorrect!", + "UserNotFound": "User not found!", "Users": "Users", "Yes": "Yes" } \ No newline at end of file diff --git a/src/Nucleus.Web.Vue/src/assets/js/locales/tr.json b/src/Nucleus.Web.Vue/src/assets/js/locales/tr.json index bda1282..7c55c2c 100644 --- a/src/Nucleus.Web.Vue/src/assets/js/locales/tr.json +++ b/src/Nucleus.Web.Vue/src/assets/js/locales/tr.json @@ -18,11 +18,14 @@ "Administration": "Yönetim", "AreYouSureToDelete": "Silmek istediğinize emin misiniz?", "Cancel": "İptal", + "CannotRemoveAdminUser": "Admin kullanıcısını silemezsiniz!", + "CannotRemoveSystemRole": "Varsayılan sistem rollerini silemezsiniz!", "ChangePassword": "Şifre değiştir", "EditRole": "Rol düzenle", "EditUser": "Kullanıcı düzenle", "Email": "E-posta", "EmailAddress": "E-posta adresi", + "EmailAlreadyExist": "Bu e-mail adresi zaten mevcut!", "EmailValidationError": "Geçerli bir e-posta adresi girin!", "HelloWorld": "Merhaba dünya!", "Home": "Anasayfa", @@ -34,11 +37,14 @@ "NothingToDisplay": "Üzgünüz, gösterilecek birşey bulunamadı :(", "Password": "Şifre", "PasswordRepeat": "Şifre tekrar", + "PasswordsDoesNotMatch": "Şifreler eşleşmiyor!", "PasswordsMustMatch": "Şifreler eşleşmeli!", "Register": "Kayıt", "RegistrationSuccessful": "Kayıt başarılı!", "RequiredField": "Bu alan gerekli!", "RoleName": "Rol adı", + "RoleNameAlreadyExist": "Bu role adı zaten mevcut!", + "RoleNotFound": "Rol bulunamadı!", "Roles": "Roller", "Save": "Kaydet", "Search": "Ara", @@ -47,7 +53,10 @@ "SelectRoles": "Rol seçin", "Successful": "Başarılı!", "UserName": "Kullanıcı adı", + "UserNameAlreadyExist": "Bu kullanıcı adı zaten mevcut!", "UserNameOrEmailAddress": "Kullanıcı adı veya e-posta adresi", + "UserNameOrPasswordIncorrect": "Kullanıcı adı veya şifre yanlış!", + "UserNotFound": "Kullanıcı bulunamadı!", "Users": "Kullanıcılar", "Yes": "Evet" } \ No newline at end of file From 9df97c4566fe3122db0576c5017b2ecbaaa29717 Mon Sep 17 00:00:00 2001 From: alirizaadiyahsi Date: Fri, 30 Nov 2018 17:32:47 +0300 Subject: [PATCH 6/8] Linting errors fixed --- src/Nucleus.Web.Vue/src/admin/views/roles/role-list.ts | 3 ++- src/Nucleus.Web.Vue/src/admin/views/users/user-list.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Nucleus.Web.Vue/src/admin/views/roles/role-list.ts b/src/Nucleus.Web.Vue/src/admin/views/roles/role-list.ts index 36625bc..02a9839 100644 --- a/src/Nucleus.Web.Vue/src/admin/views/roles/role-list.ts +++ b/src/Nucleus.Web.Vue/src/admin/views/roles/role-list.ts @@ -117,7 +117,8 @@ export default class RoleListComponent extends NucleusComponentBase { public selectAllPermissions() { this.createOrUpdateRoleInput.grantedPermissionIds = []; if (this.selectAll) { - this.createOrUpdateRoleInput.grantedPermissionIds = ((this.allPermissions.map(permissions => permissions.id)) as string[]); + this.createOrUpdateRoleInput.grantedPermissionIds = + ((this.allPermissions.map((permissions) => permissions.id)) as string[]); } } } \ No newline at end of file diff --git a/src/Nucleus.Web.Vue/src/admin/views/users/user-list.ts b/src/Nucleus.Web.Vue/src/admin/views/users/user-list.ts index ead2ff4..655344f 100644 --- a/src/Nucleus.Web.Vue/src/admin/views/users/user-list.ts +++ b/src/Nucleus.Web.Vue/src/admin/views/users/user-list.ts @@ -126,7 +126,7 @@ export default class UserListComponent extends NucleusComponentBase { public selectAllRoles() { this.createOrUpdateUserInput.grantedRoleIds = []; if (this.selectAll) { - this.createOrUpdateUserInput.grantedRoleIds = ((this.allRoles.map(roles => roles.id)) as string[]); + this.createOrUpdateUserInput.grantedRoleIds = ((this.allRoles.map((roles) => roles.id)) as string[]); } } } \ No newline at end of file From a2d0eadc850b004dcfaf6b59d43777d51872afe5 Mon Sep 17 00:00:00 2001 From: alirizaadiyahsi Date: Fri, 30 Nov 2018 17:45:01 +0300 Subject: [PATCH 7/8] Seperated automapper profile class --- .../ApplicationServiceAutoMapperProfile.cs | 15 +++++++++++++++ .../ApplicationServiceCollectionExtensions.cs | 11 ----------- 2 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 src/Nucleus.Application/ApplicationServiceAutoMapperProfile.cs diff --git a/src/Nucleus.Application/ApplicationServiceAutoMapperProfile.cs b/src/Nucleus.Application/ApplicationServiceAutoMapperProfile.cs new file mode 100644 index 0000000..90e7de8 --- /dev/null +++ b/src/Nucleus.Application/ApplicationServiceAutoMapperProfile.cs @@ -0,0 +1,15 @@ +using AutoMapper; +using Nucleus.Application.Users.Dto; +using Nucleus.Core.Users; + +namespace Nucleus.Application +{ + public class ApplicationServiceAutoMapperProfile : Profile + { + public ApplicationServiceAutoMapperProfile() + { + CreateMap() + .ForMember(u => u.Password, opt => opt.Ignore()); + } + } +} \ No newline at end of file diff --git a/src/Nucleus.Application/ApplicationServiceCollectionExtensions.cs b/src/Nucleus.Application/ApplicationServiceCollectionExtensions.cs index 6a1729c..ef4d7b4 100644 --- a/src/Nucleus.Application/ApplicationServiceCollectionExtensions.cs +++ b/src/Nucleus.Application/ApplicationServiceCollectionExtensions.cs @@ -3,8 +3,6 @@ using Nucleus.Application.Permissions; using Nucleus.Application.Roles; using Nucleus.Application.Users; -using Nucleus.Application.Users.Dto; -using Nucleus.Core.Users; namespace Nucleus.Application { @@ -23,13 +21,4 @@ public static IServiceCollection ConfigureNucleusApplication(this IServiceCollec return services; } } - - public class ApplicationServiceAutoMapperProfile : Profile - { - public ApplicationServiceAutoMapperProfile() - { - CreateMap() - .ForMember(u => u.Password, opt => opt.Ignore()); - } - } } \ No newline at end of file From ae49d17b8e5c2f8f34dcf348e36540540a237697 Mon Sep 17 00:00:00 2001 From: alirizaadiyahsi Date: Sat, 1 Dec 2018 00:43:01 +0300 Subject: [PATCH 8/8] Removed isAdmin check in user list --- src/Nucleus.Web.Vue/src/admin/views/users/user-list.ts | 5 ----- src/Nucleus.Web.Vue/src/admin/views/users/user-list.vue | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/Nucleus.Web.Vue/src/admin/views/users/user-list.ts b/src/Nucleus.Web.Vue/src/admin/views/users/user-list.ts index 655344f..673f3da 100644 --- a/src/Nucleus.Web.Vue/src/admin/views/users/user-list.ts +++ b/src/Nucleus.Web.Vue/src/admin/views/users/user-list.ts @@ -118,11 +118,6 @@ export default class UserListComponent extends NucleusComponentBase { }); } - public isAdminUser(userName: string) { - // todo: this is a temp solution, should check if user is in admin role - return userName.includes('admin'); - } - public selectAllRoles() { this.createOrUpdateUserInput.grantedRoleIds = []; if (this.selectAll) { diff --git a/src/Nucleus.Web.Vue/src/admin/views/users/user-list.vue b/src/Nucleus.Web.Vue/src/admin/views/users/user-list.vue index 09b4edd..4baabfd 100644 --- a/src/Nucleus.Web.Vue/src/admin/views/users/user-list.vue +++ b/src/Nucleus.Web.Vue/src/admin/views/users/user-list.vue @@ -76,12 +76,12 @@ {{ props.item.userName }} {{ props.item.email }} - edit - delete