diff --git a/Client/package.json b/Client/package.json index 6f9e3fd3..416420bd 100644 --- a/Client/package.json +++ b/Client/package.json @@ -1,6 +1,6 @@ { "name": "sunengine-client", - "version": "2.11.9", + "version": "2.11.10", "description": "SunEngine - web engine with support of blog, forum and articles functionality", "productName": "SunEngine", "author": "Dmitrij Polianin", @@ -9,14 +9,14 @@ "dev run": "quasar dev" }, "dependencies": { - "@quasar/extras": "^1.8.1", + "@quasar/extras": "^1.8.2", "axios": "^0.19.2", "js-lock": "^0.1.1", - "quasar": "^1.11.3", - "vue-i18n": "^8.17.7" + "quasar": "^1.12.11", + "vue-i18n": "^8.18.2" }, "devDependencies": { - "@quasar/app": "^1.8.6", + "@quasar/app": "^1.9.6", "babel-preset-proposals": "^0.3.0", "glob": "^7.1.6", "minimist": "^1.2.5", diff --git a/Client/src/css/sunstylemixins.scss b/Client/src/css/sunstylemixins.scss new file mode 100644 index 00000000..e69de29b diff --git a/Client/src/statics/PartialSkins/CenterHomePage/styles.scss b/Client/src/statics/PartialSkins/CenterHomePage/styles.scss index eaad0f68..54f5dc61 100644 --- a/Client/src/statics/PartialSkins/CenterHomePage/styles.scss +++ b/Client/src/statics/PartialSkins/CenterHomePage/styles.scss @@ -1,5 +1,5 @@ .partial-skin-center-home-page { - .index-page { + .index-page {z display: flex; align-items: center; flex-direction: column; diff --git a/Client/src/statics/PartialSkins/PaddingsHomePage/PaddingsHomePage.zip b/Client/src/statics/PartialSkins/PaddingsHomePage/PaddingsHomePage.zip new file mode 100644 index 00000000..82fbecbf Binary files /dev/null and b/Client/src/statics/PartialSkins/PaddingsHomePage/PaddingsHomePage.zip differ diff --git a/Client/src/statics/PartialSkins/PaddingsHomePage/info.json b/Client/src/statics/PartialSkins/PaddingsHomePage/info.json new file mode 100644 index 00000000..7b0f95b9 --- /dev/null +++ b/Client/src/statics/PartialSkins/PaddingsHomePage/info.json @@ -0,0 +1,4 @@ +{ + "Name": "PaddingsHomePage", + "Description": "Make border adaptive paddings on index home page" +} diff --git a/Client/src/statics/PartialSkins/PaddingsHomePage/styles.css b/Client/src/statics/PartialSkins/PaddingsHomePage/styles.css new file mode 100644 index 00000000..c175a776 --- /dev/null +++ b/Client/src/statics/PartialSkins/PaddingsHomePage/styles.css @@ -0,0 +1,20 @@ +@media (max-width: 599px) { + .partial-skin-paddings-home-page .index-page { + padding-right: 6px !important; + padding-left: 6px !important; + } +} +@media (min-width: 600px) and (max-width: 1023px) { + .partial-skin-paddings-home-page .index-page { + padding-right: 12px !important; + padding-left: 12px !important; + } +} +@media (min-width: 1024px) { + .partial-skin-paddings-home-page .index-page { + padding-right: 24px !important; + padding-left: 24px !important; + } +} + +/*# sourceMappingURL=styles.css.map */ diff --git a/Client/src/statics/PartialSkins/PaddingsHomePage/styles.css.map b/Client/src/statics/PartialSkins/PaddingsHomePage/styles.css.map new file mode 100644 index 00000000..986855f7 --- /dev/null +++ b/Client/src/statics/PartialSkins/PaddingsHomePage/styles.css.map @@ -0,0 +1 @@ +{"version":3,"sourceRoot":"","sources":["styles.scss"],"names":[],"mappings":"AAUI;EADF;IAJE;IACA;;;AAQA;EALF;IAJE;IACA;;;AAYA;EATF;IAJE;IACA","file":"styles.css"} \ No newline at end of file diff --git a/Client/src/statics/PartialSkins/PaddingsHomePage/styles.scss b/Client/src/statics/PartialSkins/PaddingsHomePage/styles.scss new file mode 100644 index 00000000..14d05b8f --- /dev/null +++ b/Client/src/statics/PartialSkins/PaddingsHomePage/styles.scss @@ -0,0 +1,23 @@ +.partial-skin-paddings-home-page { + + $paddings: (6px 12px 24px); + + @mixin page-paddings-ip($size) { + padding-right: $size !important; + padding-left: $size !important; + } + + .index-page { + @media (max-width: 599px) { + @include page-paddings-ip(nth($paddings, 1)); + } + + @media (min-width: 600px) and (max-width: 1023px) { + @include page-paddings-ip(nth($paddings, 2)); + } + + @media (min-width: 1024px) { + @include page-paddings-ip(nth($paddings, 3)); + } + } +} \ No newline at end of file diff --git a/README.RU.md b/README.RU.md index 52e83d50..6e46b7f0 100644 --- a/README.RU.md +++ b/README.RU.md @@ -9,7 +9,7 @@ # SunEngine - +
diff --git a/README.md b/README.md index 420f7dc2..af3fc1fd 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Build on AspNet Core, VueJS, Quasar. # SunEngine - +
diff --git a/Server/SunEngine.Admin/Controllers/CacheAdminController.cs b/Server/SunEngine.Admin/Controllers/CacheAdminController.cs index 6cb627da..c383dafb 100644 --- a/Server/SunEngine.Admin/Controllers/CacheAdminController.cs +++ b/Server/SunEngine.Admin/Controllers/CacheAdminController.cs @@ -8,7 +8,7 @@ namespace SunEngine.Admin.Controllers { public class CacheAdminController : BaseAdminController { - protected readonly ISectionsCache SectionsCache; + protected readonly ISectionsCache sectionsCache; protected readonly ICategoriesCache categoriesCache; protected readonly IMenuCache menuCache; protected readonly SpamProtectionCache spamProtectionCache; @@ -28,7 +28,7 @@ public CacheAdminController( SanitizerService sanitizerService, IServiceProvider serviceProvider) : base(serviceProvider) { - this.SectionsCache = sectionsCache; + this.sectionsCache = sectionsCache; this.categoriesCache = categoriesCache; this.menuCache = menuCache; this.spamProtectionCache = spamProtectionCache; @@ -40,7 +40,7 @@ public CacheAdminController( public IActionResult ResetAllCache() { - SectionsCache.Initialize(); + sectionsCache.Initialize(); categoriesCache.Initialize(); menuCache.Initialize(); rolesCache.Initialize(); diff --git a/Server/SunEngine.Admin/Controllers/DeletedElementsAdminController.cs b/Server/SunEngine.Admin/Controllers/DeletedElementsAdminController.cs index b2aef7ef..eb056d50 100644 --- a/Server/SunEngine.Admin/Controllers/DeletedElementsAdminController.cs +++ b/Server/SunEngine.Admin/Controllers/DeletedElementsAdminController.cs @@ -2,7 +2,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using SunEngine.Admin.Managers; -using SunEngine.Admin.Services; namespace SunEngine.Admin.Controllers { diff --git a/Server/SunEngine.Admin/Managers/ConfigurationManager.cs b/Server/SunEngine.Admin/Managers/ConfigurationManager.cs index bdb7a501..082f15bd 100644 --- a/Server/SunEngine.Admin/Managers/ConfigurationManager.cs +++ b/Server/SunEngine.Admin/Managers/ConfigurationManager.cs @@ -1,8 +1,6 @@ -using System; using System.Collections.Generic; using System.Linq; using LinqToDB; -using LinqToDB.Data; using SunEngine.Core.Cache.Services; using SunEngine.Core.Configuration; using SunEngine.Core.Configuration.ConfigItemType; diff --git a/Server/SunEngine.Admin/Managers/SectionsAdminManager.cs b/Server/SunEngine.Admin/Managers/SectionsAdminManager.cs index 2c96a821..7d4a7864 100644 --- a/Server/SunEngine.Admin/Managers/SectionsAdminManager.cs +++ b/Server/SunEngine.Admin/Managers/SectionsAdminManager.cs @@ -1,14 +1,7 @@ -using System; -using System.Collections.Generic; using System.Linq; -using System.Reflection; -using System.Text.Json; using System.Threading.Tasks; using LinqToDB; -using Microsoft.AspNetCore.Mvc; -using SunEngine.Admin.Presenters; using SunEngine.Core.Cache.Services; -using SunEngine.Core.Configuration.ConfigItemType; using SunEngine.Core.DataBase; using SunEngine.Core.Models; using SunEngine.Core.Services; diff --git a/Server/SunEngine.Admin/Presenters/ConfigurationAdminPresenter.cs b/Server/SunEngine.Admin/Presenters/ConfigurationAdminPresenter.cs index 5b7a3a46..617ecf1b 100644 --- a/Server/SunEngine.Admin/Presenters/ConfigurationAdminPresenter.cs +++ b/Server/SunEngine.Admin/Presenters/ConfigurationAdminPresenter.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using LinqToDB; diff --git a/Server/SunEngine.Admin/Presenters/SectionsAdminPresenter.cs b/Server/SunEngine.Admin/Presenters/SectionsAdminPresenter.cs index 2ade2eda..df1f1711 100644 --- a/Server/SunEngine.Admin/Presenters/SectionsAdminPresenter.cs +++ b/Server/SunEngine.Admin/Presenters/SectionsAdminPresenter.cs @@ -6,11 +6,9 @@ using System.Threading.Tasks; using LinqToDB; using SunEngine.Admin.Presenters.ViewModels; -using SunEngine.Core.Cache.Services; using SunEngine.Core.Configuration.ConfigItemType; using SunEngine.Core.DataBase; using SunEngine.Core.Models; -using SunEngine.Core.Sections; using SunEngine.Core.Security; using SunEngine.Core.Services; diff --git a/Server/SunEngine.Admin/SunEngine.Admin.csproj b/Server/SunEngine.Admin/SunEngine.Admin.csproj index 89d7b0e9..107d8c90 100644 --- a/Server/SunEngine.Admin/SunEngine.Admin.csproj +++ b/Server/SunEngine.Admin/SunEngine.Admin.csproj @@ -5,7 +5,7 @@ - + diff --git a/Server/SunEngine.Cli/ServerRun.cs b/Server/SunEngine.Cli/ServerRun.cs index 316f065f..9ec1e050 100644 --- a/Server/SunEngine.Cli/ServerRun.cs +++ b/Server/SunEngine.Cli/ServerRun.cs @@ -5,7 +5,6 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; -using Namotion.Reflection; using SunEngine.Core.Configuration; using SunEngine.Core.DataBase; using SunEngine.Core.Services; diff --git a/Server/SunEngine.Cli/Startup.cs b/Server/SunEngine.Cli/Startup.cs index d060a7ee..1d1ea94b 100644 --- a/Server/SunEngine.Cli/Startup.cs +++ b/Server/SunEngine.Cli/Startup.cs @@ -1,6 +1,5 @@ using System; using System.Text.Json; -using LinqToDB.Common; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; diff --git a/Server/SunEngine.Cli/SunEngine.Cli.csproj b/Server/SunEngine.Cli/SunEngine.Cli.csproj index 3a37a6cf..aa6fe20f 100644 --- a/Server/SunEngine.Cli/SunEngine.Cli.csproj +++ b/Server/SunEngine.Cli/SunEngine.Cli.csproj @@ -3,7 +3,7 @@ netcoreapp3.1 latest - 2.11.9 + 2.11.10 SunEngine Dmitrij Polianin Site engine with blog, forum and articles functionalities on Asp.Net Core and Vue.Js. diff --git a/Server/SunEngine.Core/Cache/CacheModels/SectionServerCached.cs b/Server/SunEngine.Core/Cache/CacheModels/SectionServerCached.cs index 7020ab24..6042746b 100644 --- a/Server/SunEngine.Core/Cache/CacheModels/SectionServerCached.cs +++ b/Server/SunEngine.Core/Cache/CacheModels/SectionServerCached.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Text.Json; using SunEngine.Core.Cache.Services; -using SunEngine.Core.Errors.Exceptions; using SunEngine.Core.Models; namespace SunEngine.Core.Cache.CacheModels diff --git a/Server/SunEngine.Core/Cache/Services/SectionsCache.cs b/Server/SunEngine.Core/Cache/Services/SectionsCache.cs index 91be9fe2..0ab0a00d 100644 --- a/Server/SunEngine.Core/Cache/Services/SectionsCache.cs +++ b/Server/SunEngine.Core/Cache/Services/SectionsCache.cs @@ -3,9 +3,7 @@ using System.Collections.Immutable; using System.Linq; using SunEngine.Core.Cache.CacheModels; -using SunEngine.Core.Controllers; using SunEngine.Core.DataBase; -using SunEngine.Core.Models; using SunEngine.Core.Services; namespace SunEngine.Core.Cache.Services diff --git a/Server/SunEngine.Core/Configuration/AddServices/AddPresenters.cs b/Server/SunEngine.Core/Configuration/AddServices/AddPresenters.cs index fde9a9bb..382f7114 100644 --- a/Server/SunEngine.Core/Configuration/AddServices/AddPresenters.cs +++ b/Server/SunEngine.Core/Configuration/AddServices/AddPresenters.cs @@ -1,4 +1,3 @@ -using System; using Microsoft.Extensions.DependencyInjection; using SunEngine.Core.Presenters; diff --git a/Server/SunEngine.Core/Configuration/ConfigItemType/BooleanItem.cs b/Server/SunEngine.Core/Configuration/ConfigItemType/BooleanItem.cs index 63ccf2dc..1f630c7f 100644 --- a/Server/SunEngine.Core/Configuration/ConfigItemType/BooleanItem.cs +++ b/Server/SunEngine.Core/Configuration/ConfigItemType/BooleanItem.cs @@ -1,5 +1,3 @@ -using System; - namespace SunEngine.Core.Configuration.ConfigItemType { public class BooleanItem : ConfigItem diff --git a/Server/SunEngine.Core/Configuration/ConfigItemType/IntegerItem.cs b/Server/SunEngine.Core/Configuration/ConfigItemType/IntegerItem.cs index f82c9095..fd29a3cc 100644 --- a/Server/SunEngine.Core/Configuration/ConfigItemType/IntegerItem.cs +++ b/Server/SunEngine.Core/Configuration/ConfigItemType/IntegerItem.cs @@ -1,5 +1,3 @@ -using System; - namespace SunEngine.Core.Configuration.ConfigItemType { public class IntegerItem : ConfigItem diff --git a/Server/SunEngine.Core/Configuration/ConfigItemType/JsonItem.cs b/Server/SunEngine.Core/Configuration/ConfigItemType/JsonItem.cs index 5492809f..adcd377f 100644 --- a/Server/SunEngine.Core/Configuration/ConfigItemType/JsonItem.cs +++ b/Server/SunEngine.Core/Configuration/ConfigItemType/JsonItem.cs @@ -1,5 +1,3 @@ -using SunEngine.Core.Utils; - namespace SunEngine.Core.Configuration.ConfigItemType { public class JsonItem : StringItem diff --git a/Server/SunEngine.Core/Controllers/BaseController.cs b/Server/SunEngine.Core/Controllers/BaseController.cs index 3a911e5a..7744d488 100644 --- a/Server/SunEngine.Core/Controllers/BaseController.cs +++ b/Server/SunEngine.Core/Controllers/BaseController.cs @@ -1,7 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; using System.Text; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; @@ -11,9 +9,7 @@ using SunEngine.Core.Cache.Services; using SunEngine.Core.Managers; using SunEngine.Core.Models; -using SunEngine.Core.Models.Materials; using SunEngine.Core.Security; -using SunEngine.Core.Services; using SunEngine.Core.Utils; namespace SunEngine.Core.Controllers @@ -108,95 +104,96 @@ public async Task CacheContentAsync( return await CacheContentAsync(category, key, dataLoader, page); } - public async Task CacheContentAsync( - CategoryCached category, - int categoryId, - Func> dataLoader, - RequestOptions options) - { - string key; - if (options.Sort == null) - key = keyGenerator.ContentGenerateKey(ControllerName, ActionName, options.PageNumber, categoryId); - else - key = keyGenerator.ContentGenerateKey(ControllerName, ActionName, options.PageNumber, categoryId, options.Sort); - return await CacheContentAsync(category, key, dataLoader, options); - } - - - protected async Task CacheContentAsync( - CategoryCached category, - string key, - Func> dataLoader, - RequestOptions options) - { - if (!cachePolicy.CanCache(category, options)) - return Json(await dataLoader()); - string json; - - if (!string.IsNullOrEmpty(json = contentCache.GetContent(key))) - return JsonString(json); - var content = await dataLoader(); - contentCache.CacheContent(key, json); - return JsonString(json); - } - - public async Task CacheContentAsync( - CategoryCached category, - int categoryId, - Func> dataLoader, - string sortType, - int? page = null) - { - var key = keyGenerator.ContentGenerateKey(ControllerName, ActionName, page, categoryId, sortType); - return await CacheContentAsync(category, key, dataLoader, sortType, page); - } - - - protected async Task CacheContentAsync( - CategoryCached category, - string key, - Func> dataLoader, - string sortType, - int? page) - { - if (!cachePolicy.CanCache(category, new RequestOptions(){PageNumber = page, Sort = sortType})) - return Json(await dataLoader()); - string json; - - if (!string.IsNullOrEmpty(json = contentCache.GetContent(key))) - return JsonString(json); - var content = await dataLoader(); - contentCache.CacheContent(key, json); - return JsonString(json); - } - + public async Task CacheContentAsync( + CategoryCached category, + int categoryId, + Func> dataLoader, + RequestOptions options) + { + string key; + if (options.Sort == null) + key = keyGenerator.ContentGenerateKey(ControllerName, ActionName, options.PageNumber, categoryId); + else + key = keyGenerator.ContentGenerateKey(ControllerName, ActionName, options.PageNumber, categoryId, + options.Sort); + return await CacheContentAsync(category, key, dataLoader, options); + } + + protected async Task CacheContentAsync( CategoryCached category, string key, Func> dataLoader, - int? page) + RequestOptions options) { - if (!cachePolicy.CanCache(category, new RequestOptions(){PageNumber = page})) + if (!cachePolicy.CanCache(category, options)) return Json(await dataLoader()); - string json; + if (!string.IsNullOrEmpty(json = contentCache.GetContent(key))) return JsonString(json); - - var content = await dataLoader(); + var content = await dataLoader(); + contentCache.CacheContent(key, json); + return JsonString(json); + } - json = SunJson.Serialize(content); + public async Task CacheContentAsync( + CategoryCached category, + int categoryId, + Func> dataLoader, + string sortType, + int? page = null) + { + var key = keyGenerator.ContentGenerateKey(ControllerName, ActionName, page, categoryId, sortType); + return await CacheContentAsync(category, key, dataLoader, sortType, page); + } + + + protected async Task CacheContentAsync( + CategoryCached category, + string key, + Func> dataLoader, + string sortType, + int? page) + { + if (!cachePolicy.CanCache(category, new RequestOptions() {PageNumber = page, Sort = sortType})) + return Json(await dataLoader()); + string json; + + if (!string.IsNullOrEmpty(json = contentCache.GetContent(key))) + return JsonString(json); + var content = await dataLoader(); + contentCache.CacheContent(key, json); + return JsonString(json); + } + + protected async Task CacheContentAsync( + CategoryCached category, + string key, + Func> dataLoader, + int? page) + { + if (!cachePolicy.CanCache(category, new RequestOptions() {PageNumber = page})) + return Json(await dataLoader()); + + string json; + if (!string.IsNullOrEmpty(json = contentCache.GetContent(key))) + return JsonString(json); + + var content = await dataLoader(); + + json = SunJson.Serialize(content); contentCache.CacheContent(key, json); return JsonString(json); } - + public async Task CacheContentAsync( SectionServerCached component, IEnumerable categoryIds, Func> dataLoader, int? page = null) { - if (!cachePolicy.CanCache(component, new RequestOptions(){PageNumber = page})) + if (!cachePolicy.CanCache(component, new RequestOptions() {PageNumber = page})) return Json(await dataLoader()); var key = keyGenerator.ContentGenerateKey(component.Name, categoryIds, page); @@ -210,11 +207,11 @@ public async Task CacheContentAsync( contentCache.CacheContent(key, json); return JsonString(json); } - + protected override void Dispose(bool disposing) { userManager.Dispose(); base.Dispose(disposing); } } -} +} \ No newline at end of file diff --git a/Server/SunEngine.Core/DataBase/DataBaseConnection.cs b/Server/SunEngine.Core/DataBase/DataBaseConnection.cs index 031e8f93..66a9df5d 100644 --- a/Server/SunEngine.Core/DataBase/DataBaseConnection.cs +++ b/Server/SunEngine.Core/DataBase/DataBaseConnection.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Specialized; using System.Linq; using LinqToDB; using LinqToDB.Data; diff --git a/Server/SunEngine.Core/Sections/ActivitiesServerSection.cs b/Server/SunEngine.Core/Sections/ActivitiesServerSection.cs index 257841e0..34eaa45c 100644 --- a/Server/SunEngine.Core/Sections/ActivitiesServerSection.cs +++ b/Server/SunEngine.Core/Sections/ActivitiesServerSection.cs @@ -1,5 +1,4 @@ using SunEngine.Core.Configuration.ConfigItemType; -using SunEngine.Core.Models; namespace SunEngine.Core.Sections { diff --git a/Server/SunEngine.Core/Sections/MaterialsServerSection.cs b/Server/SunEngine.Core/Sections/MaterialsServerSection.cs index 535e41d4..8c4e961c 100644 --- a/Server/SunEngine.Core/Sections/MaterialsServerSection.cs +++ b/Server/SunEngine.Core/Sections/MaterialsServerSection.cs @@ -1,5 +1,4 @@ using SunEngine.Core.Configuration.ConfigItemType; -using SunEngine.Core.Models; namespace SunEngine.Core.Sections { diff --git a/Server/SunEngine.Core/Sections/PostsServerSection.cs b/Server/SunEngine.Core/Sections/PostsServerSection.cs index 4da05d41..23548a45 100644 --- a/Server/SunEngine.Core/Sections/PostsServerSection.cs +++ b/Server/SunEngine.Core/Sections/PostsServerSection.cs @@ -1,5 +1,4 @@ using SunEngine.Core.Configuration.ConfigItemType; -using SunEngine.Core.Models; namespace SunEngine.Core.Sections { diff --git a/Server/SunEngine.Core/SunEngine.Core.csproj b/Server/SunEngine.Core/SunEngine.Core.csproj index 638568f7..d417d411 100644 --- a/Server/SunEngine.Core/SunEngine.Core.csproj +++ b/Server/SunEngine.Core/SunEngine.Core.csproj @@ -2,28 +2,28 @@ netcoreapp3.1 - 2.11.9 + 2.11.10 default - - + + - - - - - - + + + + + + - + diff --git a/Server/SunEngine.Core/Utils/External/RegQueryValue.Win32.cs b/Server/SunEngine.Core/Utils/External/RegQueryValue.Win32.cs index 04f00058..bb55cb60 100644 --- a/Server/SunEngine.Core/Utils/External/RegQueryValue.Win32.cs +++ b/Server/SunEngine.Core/Utils/External/RegQueryValue.Win32.cs @@ -1,8 +1,5 @@ using System; -using System.Collections.Generic; using System.Runtime.InteropServices; -using System.Security.Policy; -using System.Text; namespace SunEngine.Core.Utils.External { diff --git a/Server/SunEngine.DataSeed/SectionsSeeder.cs b/Server/SunEngine.DataSeed/SectionsSeeder.cs index 32bf8d03..d7f6db5b 100644 --- a/Server/SunEngine.DataSeed/SectionsSeeder.cs +++ b/Server/SunEngine.DataSeed/SectionsSeeder.cs @@ -1,6 +1,5 @@ using System.IO; using Newtonsoft.Json.Linq; -using SunEngine.Core.Cache.Services; using SunEngine.Core.Models; using SunEngine.Core.Security; using SunEngine.Core.Services; diff --git a/Server/SunEngine.DataSeed/SunEngine.DataSeed.csproj b/Server/SunEngine.DataSeed/SunEngine.DataSeed.csproj index 849d9e55..2bd494f4 100644 --- a/Server/SunEngine.DataSeed/SunEngine.DataSeed.csproj +++ b/Server/SunEngine.DataSeed/SunEngine.DataSeed.csproj @@ -6,10 +6,10 @@ - + - - + + diff --git a/Server/SunEngine.Materials/Controllers/ActivitiesController.cs b/Server/SunEngine.Materials/Controllers/ActivitiesController.cs index 69eb6cff..d8855903 100644 --- a/Server/SunEngine.Materials/Controllers/ActivitiesController.cs +++ b/Server/SunEngine.Materials/Controllers/ActivitiesController.cs @@ -5,7 +5,6 @@ using Microsoft.AspNetCore.Mvc; using SunEngine.Core.Cache.CacheModels; using SunEngine.Core.Cache.Services; -using SunEngine.Core.Presenters; using SunEngine.Core.Sections; using SunEngine.Core.Security; using SunEngine.Materials.Presenters; diff --git a/Server/SunEngine.Materials/Controllers/BlogController.cs b/Server/SunEngine.Materials/Controllers/BlogController.cs index 6370d76d..678ce80e 100644 --- a/Server/SunEngine.Materials/Controllers/BlogController.cs +++ b/Server/SunEngine.Materials/Controllers/BlogController.cs @@ -74,8 +74,7 @@ public virtual async Task GetPosts(string categoryName, int page return Ok(await LoadDataAsync()); return await CacheContentAsync(category, category.Id, LoadDataAsync, page); - - + async Task> LoadDataAsync() => await blogPresenter.GetPostsAsync(options); } diff --git a/Server/SunEngine.Migrations/SunEngine.Migrations.csproj b/Server/SunEngine.Migrations/SunEngine.Migrations.csproj index f1817322..19f7df10 100644 --- a/Server/SunEngine.Migrations/SunEngine.Migrations.csproj +++ b/Server/SunEngine.Migrations/SunEngine.Migrations.csproj @@ -7,11 +7,11 @@ - - - - - + + + + + diff --git a/SunEngine.md b/SunEngine.md index eaf4a3ad..56d722f4 100644 --- a/SunEngine.md +++ b/SunEngine.md @@ -1,5 +1,5 @@ # SunEngine -**Version 2.11.9** +**Version 2.11.10** *************************************************************** Do not delete this file! This file need to detect project root. ***************************************************************