diff --git a/projects/Infrastructure/Web/Mvc/CrudController.cs b/projects/Infrastructure/Web/Mvc/CrudController.cs index ba3fde0a..390d563e 100644 --- a/projects/Infrastructure/Web/Mvc/CrudController.cs +++ b/projects/Infrastructure/Web/Mvc/CrudController.cs @@ -6,6 +6,8 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.EntityFrameworkCore; +using Newtonsoft.Json; +using Newtonsoft.Json.Serialization; using System; using System.Collections.Generic; using System.Linq; @@ -295,7 +297,7 @@ namespace Infrastructure.Web.Mvc public IActionResult GetEditSchema() { - return Json(this.GetJsonSchema()); + return Json(this.GetJsonSchema(), new JsonSerializerSettings { ContractResolver = new CamelCasePropertyNamesContractResolver() }); } } } \ No newline at end of file diff --git a/projects/WebMVC/wwwroot/js/components.js b/projects/WebMVC/wwwroot/js/components.js index a58e0c3b..6120a818 100644 --- a/projects/WebMVC/wwwroot/js/components.js +++ b/projects/WebMVC/wwwroot/js/components.js @@ -1,4 +1,9 @@ -Vue.component('layout', function (resolve, reject) { +Vue.component('pagination', function (resolve, reject) { + axios.get("/pages/shared/pagination.html").then(function (response) { + resolve(parseModel(response)); + }); +}); +Vue.component('layout', function (resolve, reject) { axios.get("/pages/shared/layout.html").then(function (response) { resolve(parseModel(response)); }); diff --git a/projects/WebMVC/wwwroot/pages/admin/list.html b/projects/WebMVC/wwwroot/pages/admin/list.html index 924dba06..a35dfb4d 100644 --- a/projects/WebMVC/wwwroot/pages/admin/list.html +++ b/projects/WebMVC/wwwroot/pages/admin/list.html @@ -1,6 +1,17 @@  \ No newline at end of file diff --git a/projects/WebMVC/wwwroot/pages/shared/layout.html b/projects/WebMVC/wwwroot/pages/shared/layout.html index 8c67196d..31a4d236 100644 --- a/projects/WebMVC/wwwroot/pages/shared/layout.html +++ b/projects/WebMVC/wwwroot/pages/shared/layout.html @@ -58,11 +58,11 @@

- diff --git a/projects/WebMVC/wwwroot/pages/shared/pagination.html b/projects/WebMVC/wwwroot/pages/shared/pagination.html new file mode 100644 index 00000000..1f9a7201 --- /dev/null +++ b/projects/WebMVC/wwwroot/pages/shared/pagination.html @@ -0,0 +1,90 @@ + + \ No newline at end of file