From 52c5f38a7ddcc126af923d963cb7f4159bccdbbb Mon Sep 17 00:00:00 2001 From: alirizaadiyahsi Date: Wed, 21 Nov 2018 23:22:40 +0300 Subject: [PATCH 01/13] Removed doc folder --- Nucleus.sln | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Nucleus.sln b/Nucleus.sln index 8aa53ab..df481f0 100644 --- a/Nucleus.sln +++ b/Nucleus.sln @@ -7,8 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{51A63C9A-C EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CBE903BE-AD0D-4857-98E4-CCA1AD73902E}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{47DBDDFE-C870-4057-8312-219461BA268C}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nucleus.Application", "src\Nucleus.Application\Nucleus.Application.csproj", "{788EBFEF-7A50-4AB7-807A-4147D49E237E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nucleus.EntityFramework", "src\Nucleus.EntityFramework\Nucleus.EntityFramework.csproj", "{73195EBE-BDE4-428C-865D-E7F589F3DD52}" @@ -27,7 +25,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nucleus.Tests.Application", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nucleus.Tests.Web.Api", "test\Nucleus.Tests.Web.Api\Nucleus.Tests.Web.Api.csproj", "{E36E92AC-E12D-4B70-A355-6CBC1AFDAB43}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nucleus.Web.Vue", "src\Nucleus.Web.Vue\Nucleus.Web.Vue.csproj", "{3979C24B-DFE1-4090-9743-8DFA9C52878E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nucleus.Web.Vue", "src\Nucleus.Web.Vue\Nucleus.Web.Vue.csproj", "{3979C24B-DFE1-4090-9743-8DFA9C52878E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution From f658015899d1b8b8f55de745273e9b5d6e539cc2 Mon Sep 17 00:00:00 2001 From: alirizaadiyahsi Date: Thu, 22 Nov 2018 23:55:35 +0300 Subject: [PATCH 02/13] Removed dublicated configuration --- src/Nucleus.EntityFramework/NucleusDbContext.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Nucleus.EntityFramework/NucleusDbContext.cs b/src/Nucleus.EntityFramework/NucleusDbContext.cs index 67cb722..3aefaef 100644 --- a/src/Nucleus.EntityFramework/NucleusDbContext.cs +++ b/src/Nucleus.EntityFramework/NucleusDbContext.cs @@ -54,10 +54,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) { b.ToTable("UserRole"); - b.HasOne(ur => ur.User) - .WithMany(u => u.UserRoles) - .HasForeignKey(ur => ur.UserId); - b.HasOne(ur => ur.User) .WithMany(u => u.UserRoles) .HasForeignKey(ur => ur.UserId); From 465f86403ada113baa5933ac9ed2ceaf5c90d5ba Mon Sep 17 00:00:00 2001 From: alirizaadiyahsi Date: Fri, 23 Nov 2018 00:03:46 +0300 Subject: [PATCH 03/13] Update permissions on app start #66 --- .../Permissions/IPermissionAppService.cs | 3 ++ .../Permissions/PermissionAppService.cs | 44 ++++++++++++++----- src/Nucleus.Web.Api/Program.cs | 14 +++++- .../Permissions/PermissionAppServiceTests.cs | 2 - 4 files changed, 49 insertions(+), 14 deletions(-) diff --git a/src/Nucleus.Application/Permissions/IPermissionAppService.cs b/src/Nucleus.Application/Permissions/IPermissionAppService.cs index a66ab74..d2c0de0 100644 --- a/src/Nucleus.Application/Permissions/IPermissionAppService.cs +++ b/src/Nucleus.Application/Permissions/IPermissionAppService.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Nucleus.Application.Permissions.Dto; +using Nucleus.Core.Permissions; namespace Nucleus.Application.Permissions { @@ -9,5 +10,7 @@ public interface IPermissionAppService Task> GetGrantedPermissionsAsync(string userNameOrEmail); Task IsUserGrantedToPermissionAsync(string userNameOrEmail, string permissionName); + + void InitializePermissions(List permissions); } } \ No newline at end of file diff --git a/src/Nucleus.Application/Permissions/PermissionAppService.cs b/src/Nucleus.Application/Permissions/PermissionAppService.cs index 54ff7c5..2a59c55 100644 --- a/src/Nucleus.Application/Permissions/PermissionAppService.cs +++ b/src/Nucleus.Application/Permissions/PermissionAppService.cs @@ -1,19 +1,14 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using AutoMapper; using Nucleus.Application.Permissions.Dto; -using Nucleus.Core.Permissions; -using Nucleus.Core.Roles; -using Nucleus.EntityFramework; -using Nucleus.Utilities.Collections; -using Nucleus.Utilities.Extensions.Collections; -using Nucleus.Utilities.Extensions.PrimitiveTypes; -using System.Linq.Dynamic.Core; using Microsoft.AspNetCore.Identity; using Microsoft.EntityFrameworkCore; +using Nucleus.Core.Permissions; +using Nucleus.Core.Roles; using Nucleus.Core.Users; +using Nucleus.EntityFramework; namespace Nucleus.Application.Permissions { @@ -21,14 +16,16 @@ public class PermissionAppService : IPermissionAppService { private readonly UserManager _userManager; private readonly IMapper _mapper; + private readonly NucleusDbContext _dbContext; public PermissionAppService( UserManager userManager, - IMapper mapper - ) + IMapper mapper, + NucleusDbContext dbContext) { _userManager = userManager; _mapper = mapper; + _dbContext = dbContext; } public async Task> GetGrantedPermissionsAsync(string userNameOrEmail) @@ -60,5 +57,30 @@ public async Task IsUserGrantedToPermissionAsync(string userNameOrEmail, s return grantedPermissions.Any(p => p.Name == permissionName); } + + public void InitializePermissions(List permissions) + { + _dbContext.RolePermissions.RemoveRange(_dbContext.RolePermissions.Where(rp => rp.RoleId == DefaultRoles.Admin.Id)); + _dbContext.SaveChanges(); + + _dbContext.Permissions.RemoveRange(_dbContext.Permissions); + _dbContext.SaveChanges(); + + _dbContext.AddRange(permissions); + GrantAllPermissionsToAdminRole(permissions); + _dbContext.SaveChanges(); + } + + private void GrantAllPermissionsToAdminRole(List permissions) + { + foreach (var permission in permissions) + { + _dbContext.RolePermissions.Add(new RolePermission + { + PermissionId = permission.Id, + RoleId = DefaultRoles.Admin.Id + }); + } + } } } diff --git a/src/Nucleus.Web.Api/Program.cs b/src/Nucleus.Web.Api/Program.cs index bac40b1..889e198 100644 --- a/src/Nucleus.Web.Api/Program.cs +++ b/src/Nucleus.Web.Api/Program.cs @@ -1,6 +1,9 @@ using System; using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.DependencyInjection; +using Nucleus.Application.Permissions; +using Nucleus.Core.Permissions; using Serilog; using Serilog.Events; @@ -26,7 +29,16 @@ public static int Main(string[] args) try { Log.Information("Starting web host"); - BuildWebHost(args).Run(); + + Log.Information("Starting web host"); + var host = BuildWebHost(args); + using (var scope = host.Services.CreateScope()) + { + var permissionAppService = scope.ServiceProvider.GetRequiredService(); + permissionAppService.InitializePermissions(DefaultPermissions.All()); + } + + host.Run(); return 0; } catch (Exception ex) diff --git a/test/Nucleus.Tests.Application/Permissions/PermissionAppServiceTests.cs b/test/Nucleus.Tests.Application/Permissions/PermissionAppServiceTests.cs index 28403bf..3c2c176 100644 --- a/test/Nucleus.Tests.Application/Permissions/PermissionAppServiceTests.cs +++ b/test/Nucleus.Tests.Application/Permissions/PermissionAppServiceTests.cs @@ -2,9 +2,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; using Nucleus.Application.Permissions; -using Nucleus.Application.Permissions.Dto; using Nucleus.Core.Permissions; -using Nucleus.Core.Roles; using Nucleus.Core.Users; using Xunit; From 26581641a4f790837da391428c46f4be978c8311 Mon Sep 17 00:00:00 2001 From: alirizaadiyahsi Date: Fri, 23 Nov 2018 16:17:33 +0300 Subject: [PATCH 04/13] Upgraded npm packages --- src/Nucleus.Web.Vue/package-lock.json | 138 ++++++++------------------ src/Nucleus.Web.Vue/package.json | 8 +- src/Nucleus.Web.Vue/yarn.lock | 24 ++--- 3 files changed, 58 insertions(+), 112 deletions(-) diff --git a/src/Nucleus.Web.Vue/package-lock.json b/src/Nucleus.Web.Vue/package-lock.json index 5e08530..33eb0b9 100644 --- a/src/Nucleus.Web.Vue/package-lock.json +++ b/src/Nucleus.Web.Vue/package-lock.json @@ -911,9 +911,9 @@ } }, "@vue/cli-service": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@vue/cli-service/-/cli-service-3.1.3.tgz", - "integrity": "sha512-tcMKnzBfUU7Tj2DghL/bhFc1criO7PKYqgh0CqMCth5xpy/wiFKvNr3iBM8FT1jeF1s50I338j2tKeWqhs6M5A==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/@vue/cli-service/-/cli-service-3.1.4.tgz", + "integrity": "sha512-dArLh5yd2B2an/jTD+cmkRmyRxKSE+5il9408vhciyqvZGVjkajTN95YjY5VLkBMQvrv/Z+goGSn+7wtnQSOFg==", "dev": true, "requires": { "@intervolga/optimize-cssnano-plugin": "^1.0.5", @@ -2235,7 +2235,7 @@ }, "callsites": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", + "resolved": "http://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=", "dev": true }, @@ -2558,7 +2558,7 @@ }, "colors": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", + "resolved": "http://registry.npmjs.org/colors/-/colors-1.1.2.tgz", "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", "dev": true }, @@ -3321,7 +3321,7 @@ "dependencies": { "globby": { "version": "6.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", + "resolved": "http://registry.npmjs.org/globby/-/globby-6.1.0.tgz", "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, "requires": { @@ -4191,9 +4191,9 @@ } }, "follow-redirects": { - "version": "1.5.9", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.9.tgz", - "integrity": "sha512-Bh65EZI/RU8nx0wbYF9shkFZlqLP+6WT/5FnA3cE/djNSuKNHJEinGGZgu/cQEkeeb2GdFOgenAmn8qaqYke2w==", + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", + "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", "dev": true, "requires": { "debug": "=3.1.0" @@ -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", @@ -6314,9 +6300,9 @@ } }, "map-age-cleaner": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz", - "integrity": "sha512-UN1dNocxQq44IhJyMI4TU8phc2m9BddacHRPRjKGLYaF0jqd3xLz0jS0skpAU9WgYyoR4gHtUpzytNBS385FWQ==", + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", + "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", "dev": true, "requires": { "p-defer": "^1.0.0" @@ -6478,9 +6464,9 @@ "dev": true }, "mini-css-extract-plugin": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.4.tgz", - "integrity": "sha512-o+Jm+ocb0asEngdM6FsZWtZsRzA8koFUudIDwYUfl94M3PejPHG7Vopw5hN9V8WsMkSFpm3tZP3Fesz89EyrfQ==", + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.5.tgz", + "integrity": "sha512-dqBanNfktnp2hwL2YguV9Jh91PFX7gu7nRLs4TGsbAfAG6WOtlynFRYzwDwmmeSb5uIwHo9nx1ta0f7vAZVp2w==", "dev": true, "requires": { "loader-utils": "^1.1.0", @@ -7458,9 +7444,9 @@ "dev": true }, "postcss": { - "version": "7.0.5", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.5.tgz", - "integrity": "sha512-HBNpviAUFCKvEh7NZhw1e8MBPivRszIiUnhrJ+sBFVSYSqubrzwX3KG51mYgcRHX8j/cAgZJedONZcm5jTBdgQ==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.6.tgz", + "integrity": "sha512-Nq/rNjnHFcKgCDDZYO0lNsl6YWe6U7tTy+ESN+PnLxebL8uBtYX59HZqvrj7YLK5UCyll2hqDsJOo3ndzEW8Ug==", "dev": true, "requires": { "chalk": "^2.4.1", @@ -9261,7 +9247,7 @@ }, "stream-browserify": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", + "resolved": "http://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=", "dev": true, "requires": { @@ -9422,9 +9408,9 @@ } }, "sweetalert2": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-7.29.0.tgz", - "integrity": "sha512-QYMpgj+W1nmE5I6hQ+Kvj+xSAJ78o5oawNOm65fq+0DRuZqmNPwGNnyfMcA3/porpje6RjXJd41NCJN8Rj83wQ==" + "version": "7.29.1", + "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-7.29.1.tgz", + "integrity": "sha512-cSq4MTBLTQbU8VvkkgaHcqapTHlXeNJU4iLVcHC3nWL+MvSbKrM6hdfzuiAx7NivaHe/z1xcJGVMNpvEzosvFg==" }, "symbol-tree": { "version": "3.2.2", @@ -9439,9 +9425,9 @@ "dev": true }, "terser": { - "version": "3.10.11", - "resolved": "https://registry.npmjs.org/terser/-/terser-3.10.11.tgz", - "integrity": "sha512-iruZ7j14oBbRYJC5cP0/vTU7YOWjN+J1ZskEGoF78tFzXdkK2hbCL/3TRZN8XB+MuvFhvOHMp7WkOCBO4VEL5g==", + "version": "3.10.12", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.10.12.tgz", + "integrity": "sha512-3ODPC1eVt25EVNb04s/PkHxOmzKBQUF6bwwuR6h2DbEF8/j265Y1UkwNtOk9am/pRxfJ5HPapOlUlO6c16mKQQ==", "dev": true, "requires": { "commander": "~2.17.1", @@ -9931,46 +9917,6 @@ } } }, - "uglifyjs-webpack-plugin": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz", - "integrity": "sha512-ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw==", - "dev": true, - "requires": { - "cacache": "^10.0.4", - "find-cache-dir": "^1.0.0", - "schema-utils": "^0.4.5", - "serialize-javascript": "^1.4.0", - "source-map": "^0.6.1", - "uglify-es": "^3.3.4", - "webpack-sources": "^1.1.0", - "worker-farm": "^1.5.2" - }, - "dependencies": { - "commander": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz", - "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==", - "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "uglify-es": { - "version": "3.3.9", - "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz", - "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==", - "dev": true, - "requires": { - "commander": "~2.13.0", - "source-map": "~0.6.1" - } - } - } - }, "unicode-canonical-property-names-ecmascript": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz", @@ -10333,9 +10279,9 @@ "dev": true }, "vue-i18n": { - "version": "8.3.1", - "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.3.1.tgz", - "integrity": "sha512-EFerdnu7kJh0tgn6JZvaJW11bN2hYn4d4Q84eJG+kvArVH0bCa36fMwdmWPj29rZHvBoVx20fmABt0hKs8Q3NQ==" + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.3.2.tgz", + "integrity": "sha512-MQ06tG1Tl/VL6NDh6XXfGr1uI6KVinb4fuu4alprwmbn5BG0J/a1RIVSSOsDmGkYKKaHlLzvRydiiulnBy2iXQ==" }, "vue-loader": { "version": "15.4.2", @@ -10390,9 +10336,9 @@ "dev": true }, "vuetify": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-1.3.8.tgz", - "integrity": "sha512-MWqHEAwVQaKujNoRZBPmEcNE4cbx1nLJp+VHXp8s+umS/DSpW5kYTkvGr8SLm4w7xPlUBmTzawLE3qieYXiJAg==" + "version": "1.3.9", + "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-1.3.9.tgz", + "integrity": "sha512-6cgWRVEBkuUowrfAR9i4lVcTQtwpz9WLM5IcmsMmsmto2GLgf+bi3EfbVFi5xBF3UaV+TC1oHkZq+H/bqgyfhw==" }, "w3c-hr-time": { "version": "1.0.1", @@ -10450,9 +10396,9 @@ "dev": true }, "webpack": { - "version": "4.25.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.25.1.tgz", - "integrity": "sha512-T0GU/3NRtO4tMfNzsvpdhUr8HnzA4LTdP2zd+e5zd6CdOH5vNKHnAlO+DvzccfhPdzqRrALOFcjYxx7K5DWmvA==", + "version": "4.26.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.26.0.tgz", + "integrity": "sha512-J/dP9SJIc5OtX2FZ/+U9ikQtd6H6Mcbqt0xeXtmPwYGDKf8nkbOQQA9KL2Y0rJOsN1Al9Pdn+/j63X58ub8gvQ==", "dev": true, "requires": { "@webassemblyjs/ast": "1.7.11", @@ -10476,7 +10422,7 @@ "node-libs-browser": "^2.0.0", "schema-utils": "^0.4.4", "tapable": "^1.1.0", - "uglifyjs-webpack-plugin": "^1.2.4", + "terser-webpack-plugin": "^1.1.0", "watchpack": "^1.5.0", "webpack-sources": "^1.3.0" }, diff --git a/src/Nucleus.Web.Vue/package.json b/src/Nucleus.Web.Vue/package.json index 7f33dfe..b6d95b5 100644 --- a/src/Nucleus.Web.Vue/package.json +++ b/src/Nucleus.Web.Vue/package.json @@ -13,10 +13,10 @@ "vue-class-component": "^6.3.2", "vue-property-decorator": "^7.2.0", "vue-router": "^3.0.1", - "vuetify": "^1.3.8", + "vuetify": "^1.3.9", "material-design-icons-iconfont": "4.0.2", - "sweetalert2": "^7.29.0", - "vue-i18n": "^8.3.1" + "sweetalert2": "^7.29.1", + "vue-i18n": "^8.3.2" }, "devDependencies": { "@types/chai": "^4.1.7", @@ -24,7 +24,7 @@ "@vue/cli-plugin-babel": "^3.1.1", "@vue/cli-plugin-typescript": "^3.1.1", "@vue/cli-plugin-unit-mocha": "^3.1.1", - "@vue/cli-service": "^3.1.3", + "@vue/cli-service": "^3.1.4", "@vue/test-utils": "^1.0.0-beta.25", "@types/query-string": "^6.1.1", "chai": "^4.2.0", diff --git a/src/Nucleus.Web.Vue/yarn.lock b/src/Nucleus.Web.Vue/yarn.lock index e36ac3c..3beac6f 100644 --- a/src/Nucleus.Web.Vue/yarn.lock +++ b/src/Nucleus.Web.Vue/yarn.lock @@ -661,9 +661,9 @@ mocha "^5.2.0" mocha-webpack "^2.0.0-beta.0" -"@vue/cli-service@^3.1.3": - version "3.1.3" - resolved "https://registry.yarnpkg.com/@vue/cli-service/-/cli-service-3.1.3.tgz#05e65b1c18f735497580e1d38650e3f50db618c6" +"@vue/cli-service@^3.1.4": + version "3.1.4" + resolved "https://registry.yarnpkg.com/@vue/cli-service/-/cli-service-3.1.4.tgz#04c84c1bb798db03e2c0fecc414d6a5f2954d602" dependencies: "@intervolga/optimize-cssnano-plugin" "^1.0.5" "@vue/cli-overlay" "^3.1.0" @@ -6150,9 +6150,9 @@ svgo@^1.0.0: unquote "~1.1.1" util.promisify "~1.0.0" -sweetalert2@^7.29.0: - version "7.29.0" - resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-7.29.0.tgz#636aa5e0a57bbbb75501ef39104fc68a1a26b351" +sweetalert2@^7.29.1: + version "7.29.1" + resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-7.29.1.tgz#506d2d5c4a862c8469f67384d374432a03c49005" symbol-tree@^3.2.2: version "3.2.2" @@ -6579,9 +6579,9 @@ vue-hot-reload-api@^2.3.0: version "2.3.1" resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.1.tgz#b2d3d95402a811602380783ea4f566eb875569a2" -vue-i18n@^8.3.1: - version "8.3.1" - resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.3.1.tgz#690c840a98db9a5abf94a5f8303ec4a86a6609c6" +vue-i18n@^8.3.2: + version "8.3.2" + resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.3.2.tgz#8878a622858060a1723fca1e735053854accdd52" vue-loader@^15.4.2: version "15.4.2" @@ -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.8: - version "1.3.8" - resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-1.3.8.tgz#e56832f40e5043470e2100a1501463d5a1ca6d8e" +vuetify@^1.3.9: + version "1.3.9" + resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-1.3.9.tgz#19af65f7ef0c26efb1076464815d9ad9a5e4fa4f" w3c-hr-time@^1.0.1: version "1.0.1" From 94934fd8c7c68b3dd23aec6a79b3acf50346cc5f Mon Sep 17 00:00:00 2001 From: alirizaadiyahsi Date: Fri, 23 Nov 2018 16:59:04 +0300 Subject: [PATCH 05/13] Press enter and submit form fixed #71 --- src/Nucleus.Web.Vue/src/account/views/login/login.vue | 4 ++-- src/Nucleus.Web.Vue/src/account/views/register/register.vue | 4 ++-- src/Nucleus.Web.Vue/src/admin/views/roles/role-list.vue | 2 +- src/Nucleus.Web.Vue/src/admin/views/users/user-list.vue | 2 +- 4 files changed, 6 insertions(+), 6 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 3933e40..c8e01f5 100644 --- a/src/Nucleus.Web.Vue/src/account/views/login/login.vue +++ b/src/Nucleus.Web.Vue/src/account/views/login/login.vue @@ -1,5 +1,5 @@