From bf85ceb5e5a5efaabb2525e9506a13c5ade8c4ea Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 3 Mar 2022 09:58:32 +0300 Subject: [PATCH] CmsKit: Requested changes for GlobalResources --- .../GlobalResourceUpdateDto.cs | 6 -- .../GlobalResourcesUpdateDto.cs | 8 +++ .../IGlobalResourceAdminAppService.cs | 4 +- ...CmsKitAdminPermissionDefinitionProvider.cs | 3 + .../Permissions/CmsKitAdminPermissions.cs | 2 +- .../GlobalResourceAdminAppService.cs | 10 +--- ...lobalResourceAdminClientProxy.Generated.cs | 14 +---- .../GlobalResourcesAdminClientProxy.cs | 7 --- .../cms-kit-admin-generate-proxy.json | 55 +++---------------- .../GlobalResourceAdminController.cs | 12 +--- .../Pages/CmsKit/GlobalResources/index.js | 11 ++-- .../client-proxies/cms-kit-admin-proxy.js | 13 +---- .../CmsKit/Localization/Resources/en.json | 1 + .../GlobalResources/GlobalResourceManager.cs | 4 +- .../IGlobalResourceRepository.cs | 2 +- .../EfCoreGlobalResourceRepository.cs | 2 +- .../MongoGlobalResourceRepository.cs | 2 +- .../CmsKitPublicGlobalResourcesController.cs | 2 +- .../GlobalResources/Script/Default.cshtml | 2 +- .../GlobalResources/Style/Default.cshtml | 2 +- 20 files changed, 48 insertions(+), 114 deletions(-) delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/GlobalResources/GlobalResourceUpdateDto.cs create mode 100644 modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/GlobalResources/GlobalResourcesUpdateDto.cs delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/GlobalResourcesAdminClientProxy.cs diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/GlobalResources/GlobalResourceUpdateDto.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/GlobalResources/GlobalResourceUpdateDto.cs deleted file mode 100644 index 73f06f437f..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/GlobalResources/GlobalResourceUpdateDto.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Volo.CmsKit.Admin.GlobalResources; - -public class GlobalResourceUpdateDto -{ - public string Value { get; set; } -} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/GlobalResources/GlobalResourcesUpdateDto.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/GlobalResources/GlobalResourcesUpdateDto.cs new file mode 100644 index 0000000000..e0227a0b31 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/GlobalResources/GlobalResourcesUpdateDto.cs @@ -0,0 +1,8 @@ +namespace Volo.CmsKit.Admin.GlobalResources; + +public class GlobalResourcesUpdateDto +{ + public string Style { get; set; } + + public string Script { get; set; } +} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/GlobalResources/IGlobalResourceAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/GlobalResources/IGlobalResourceAdminAppService.cs index 5be8e7f431..473c2dc685 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/GlobalResources/IGlobalResourceAdminAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/GlobalResources/IGlobalResourceAdminAppService.cs @@ -7,7 +7,5 @@ public interface IGlobalResourceAdminAppService : IApplicationService { Task GetAsync(); - Task SetGlobalStyleAsync(GlobalResourceUpdateDto input); - - Task SetGlobalScriptAsync(GlobalResourceUpdateDto input); + Task SetGlobalResourcesAsync(GlobalResourcesUpdateDto input); } \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissionDefinitionProvider.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissionDefinitionProvider.cs index d1b5556306..eb733cc36f 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissionDefinitionProvider.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissionDefinitionProvider.cs @@ -65,6 +65,9 @@ public class CmsKitAdminPermissionDefinitionProvider : PermissionDefinitionProvi .RequireGlobalFeatures(typeof(MenuFeature)); menuManagement.AddChild(CmsKitAdminPermissions.Menus.Delete, L("Permission:MenuManagement.Delete")) .RequireGlobalFeatures(typeof(MenuFeature)); + + cmsGroup.AddPermission(CmsKitAdminPermissions.GlobalResources.Default, L("Permission:GlobalResources")) + .RequireGlobalFeatures(typeof(GlobalResourcesFeature)); } private static LocalizableString L(string name) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissions.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissions.cs index c620f3c899..49fa7c8ffc 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissions.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissions.cs @@ -63,6 +63,6 @@ public class CmsKitAdminPermissions public static class GlobalResources { - public const string Default = GroupName + ".Menus"; + public const string Default = GroupName + ".GlobalResources"; } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/GlobalResources/GlobalResourceAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/GlobalResources/GlobalResourceAdminAppService.cs index 5939c49536..a78a21de41 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/GlobalResources/GlobalResourceAdminAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/GlobalResources/GlobalResourceAdminAppService.cs @@ -27,13 +27,9 @@ public class GlobalResourceAdminAppService : ApplicationService, IGlobalResource }; } - public async Task SetGlobalStyleAsync(GlobalResourceUpdateDto input) + public async Task SetGlobalResourcesAsync(GlobalResourcesUpdateDto input) { - await GlobalResourceManager.SetGlobalStyleAsync(input.Value); - } - - public async Task SetGlobalScriptAsync(GlobalResourceUpdateDto input) - { - await GlobalResourceManager.SetGlobalScriptAsync(input.Value); + await GlobalResourceManager.SetGlobalStyleAsync(input.Style); + await GlobalResourceManager.SetGlobalScriptAsync(input.Script); } } \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/GlobalResourceAdminClientProxy.Generated.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/GlobalResourceAdminClientProxy.Generated.cs index fc44352320..f1ee975d59 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/GlobalResourceAdminClientProxy.Generated.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/GlobalResourceAdminClientProxy.Generated.cs @@ -20,19 +20,11 @@ public partial class GlobalResourceAdminClientProxy : ClientProxyBase(nameof(GetAsync)); } - public virtual async Task SetGlobalStyleAsync(GlobalResourceUpdateDto input) + public virtual async Task SetGlobalResourcesAsync(GlobalResourcesUpdateDto input) { - await RequestAsync(nameof(SetGlobalStyleAsync), new ClientProxyRequestTypeValue + await RequestAsync(nameof(SetGlobalResourcesAsync), new ClientProxyRequestTypeValue { - { typeof(GlobalResourceUpdateDto), input } - }); - } - - public virtual async Task SetGlobalScriptAsync(GlobalResourceUpdateDto input) - { - await RequestAsync(nameof(SetGlobalScriptAsync), new ClientProxyRequestTypeValue - { - { typeof(GlobalResourceUpdateDto), input } + { typeof(GlobalResourcesUpdateDto), input } }); } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/GlobalResourcesAdminClientProxy.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/GlobalResourcesAdminClientProxy.cs deleted file mode 100644 index 80c6be31b8..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/GlobalResourcesAdminClientProxy.cs +++ /dev/null @@ -1,7 +0,0 @@ -// This file is part of GlobalResourcesAdminClientProxy, you can customize it here -// ReSharper disable once CheckNamespace -namespace Volo.CmsKit.Admin.Menus.ClientProxies; - -public partial class GlobalResourcesAdminClientProxy -{ -} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/cms-kit-admin-generate-proxy.json b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/cms-kit-admin-generate-proxy.json index 8f07233a0d..6608a2e1b9 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/cms-kit-admin-generate-proxy.json +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/cms-kit-admin-generate-proxy.json @@ -1140,55 +1140,18 @@ "allowAnonymous": false, "implementFrom": "Volo.CmsKit.Admin.GlobalResources.IGlobalResourceAdminAppService" }, - "SetGlobalStyleAsyncByInput": { - "uniqueName": "SetGlobalStyleAsyncByInput", - "name": "SetGlobalStyleAsync", + "SetGlobalResourcesAsyncByInput": { + "uniqueName": "SetGlobalResourcesAsyncByInput", + "name": "SetGlobalResourcesAsync", "httpMethod": "POST", - "url": "api/cms-kit-admin/global-resources/style", - "supportedVersions": [], - "parametersOnMethod": [ - { - "name": "input", - "typeAsString": "Volo.CmsKit.Admin.GlobalResources.GlobalResourceUpdateDto, Volo.CmsKit.Admin.Application.Contracts", - "type": "Volo.CmsKit.Admin.GlobalResources.GlobalResourceUpdateDto", - "typeSimple": "Volo.CmsKit.Admin.GlobalResources.GlobalResourceUpdateDto", - "isOptional": false, - "defaultValue": null - } - ], - "parameters": [ - { - "nameOnMethod": "input", - "name": "input", - "jsonName": null, - "type": "Volo.CmsKit.Admin.GlobalResources.GlobalResourceUpdateDto", - "typeSimple": "Volo.CmsKit.Admin.GlobalResources.GlobalResourceUpdateDto", - "isOptional": false, - "defaultValue": null, - "constraintTypes": null, - "bindingSourceId": "Body", - "descriptorName": "" - } - ], - "returnValue": { - "type": "System.Void", - "typeSimple": "System.Void" - }, - "allowAnonymous": false, - "implementFrom": "Volo.CmsKit.Admin.GlobalResources.IGlobalResourceAdminAppService" - }, - "SetGlobalScriptAsyncByInput": { - "uniqueName": "SetGlobalScriptAsyncByInput", - "name": "SetGlobalScriptAsync", - "httpMethod": "POST", - "url": "api/cms-kit-admin/global-resources/script", + "url": "api/cms-kit-admin/global-resources", "supportedVersions": [], "parametersOnMethod": [ { "name": "input", - "typeAsString": "Volo.CmsKit.Admin.GlobalResources.GlobalResourceUpdateDto, Volo.CmsKit.Admin.Application.Contracts", - "type": "Volo.CmsKit.Admin.GlobalResources.GlobalResourceUpdateDto", - "typeSimple": "Volo.CmsKit.Admin.GlobalResources.GlobalResourceUpdateDto", + "typeAsString": "Volo.CmsKit.Admin.GlobalResources.GlobalResourcesUpdateDto, Volo.CmsKit.Admin.Application.Contracts", + "type": "Volo.CmsKit.Admin.GlobalResources.GlobalResourcesUpdateDto", + "typeSimple": "Volo.CmsKit.Admin.GlobalResources.GlobalResourcesUpdateDto", "isOptional": false, "defaultValue": null } @@ -1198,8 +1161,8 @@ "nameOnMethod": "input", "name": "input", "jsonName": null, - "type": "Volo.CmsKit.Admin.GlobalResources.GlobalResourceUpdateDto", - "typeSimple": "Volo.CmsKit.Admin.GlobalResources.GlobalResourceUpdateDto", + "type": "Volo.CmsKit.Admin.GlobalResources.GlobalResourcesUpdateDto", + "typeSimple": "Volo.CmsKit.Admin.GlobalResources.GlobalResourcesUpdateDto", "isOptional": false, "defaultValue": null, "constraintTypes": null, diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/GlobalResources/GlobalResourceAdminController.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/GlobalResources/GlobalResourceAdminController.cs index 2bb1541771..3bfe51a600 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/GlobalResources/GlobalResourceAdminController.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/GlobalResources/GlobalResourceAdminController.cs @@ -29,16 +29,8 @@ public class GlobalResourceAdminController: CmsKitAdminController, IGlobalResour } [HttpPost] - [Route("style")] - public Task SetGlobalStyleAsync(GlobalResourceUpdateDto input) + public Task SetGlobalResourcesAsync(GlobalResourcesUpdateDto input) { - return _globalResourceAdminAppService.SetGlobalStyleAsync(input); - } - - [HttpPost] - [Route("script")] - public Task SetGlobalScriptAsync(GlobalResourceUpdateDto input) - { - return _globalResourceAdminAppService.SetGlobalScriptAsync(input); + return _globalResourceAdminAppService.SetGlobalResourcesAsync(input); } } \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/GlobalResources/index.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/GlobalResources/index.js index 6af7bd5489..72fb11e8dc 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/GlobalResources/index.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/GlobalResources/index.js @@ -4,10 +4,13 @@ $(function (){ var service = volo.cmsKit.admin.globalResources.globalResourceAdmin; $('#SaveResourcesButton').on('click','',function(){ - service.setGlobalStyle({value:$('#StyleContent').val()}).then(function () { - service.setGlobalScript({value:$('#ScriptContent').val()}).then(function () { - abp.message.success(l("SavedSuccessfully")); - }); + service.setGlobalResources( + { + style: $('#StyleContent').val(), + script: $('#ScriptContent').val() + } + ).then(function () { + abp.message.success(l("SavedSuccessfully")); }); }); }); \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/wwwroot/client-proxies/cms-kit-admin-proxy.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/wwwroot/client-proxies/cms-kit-admin-proxy.js index bff49911d5..0a1424d92a 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/wwwroot/client-proxies/cms-kit-admin-proxy.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/wwwroot/client-proxies/cms-kit-admin-proxy.js @@ -236,18 +236,9 @@ }, ajaxParams)); }; - volo.cmsKit.admin.globalResources.globalResourceAdmin.setGlobalStyle = function(input, ajaxParams) { + volo.cmsKit.admin.globalResources.globalResourceAdmin.setGlobalResources = function(input, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/global-resources/style', - type: 'POST', - dataType: null, - data: JSON.stringify(input) - }, ajaxParams)); - }; - - volo.cmsKit.admin.globalResources.globalResourceAdmin.setGlobalScript = function(input, ajaxParams) { - return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/global-resources/script', + url: abp.appPath + 'api/cms-kit-admin/global-resources', type: 'POST', dataType: null, data: JSON.stringify(input) diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json index 65df3fdff4..0dd826480d 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json @@ -115,6 +115,7 @@ "Permission:TagManagement.Create": "Create", "Permission:TagManagement.Delete": "Delete", "Permission:TagManagement.Update": "Update", + "Permission:GlobalResources": "Global Resources", "PickYourReaction": "Pick your reaction", "Rating": "Rating", "RatingUndoMessage": "Your rating will be undo.", diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/GlobalResources/GlobalResourceManager.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/GlobalResources/GlobalResourceManager.cs index 3506a00cb1..815dc29f14 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/GlobalResources/GlobalResourceManager.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/GlobalResources/GlobalResourceManager.cs @@ -34,7 +34,7 @@ public class GlobalResourceManager : DomainService protected virtual async Task SetGlobalResourceAsync(string name, string value) { - var resource = await _globalResourceRepository.FindByName(name); + var resource = await _globalResourceRepository.FindByNameAsync(name); if (resource == null) { @@ -50,7 +50,7 @@ public class GlobalResourceManager : DomainService protected virtual async Task GetOrCreateResourceAsync(string name) { - var resource = await _globalResourceRepository.FindByName(name); + var resource = await _globalResourceRepository.FindByNameAsync(name); if (resource == null) { diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/GlobalResources/IGlobalResourceRepository.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/GlobalResources/IGlobalResourceRepository.cs index 36b1406e98..7019a5a40a 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/GlobalResources/IGlobalResourceRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/GlobalResources/IGlobalResourceRepository.cs @@ -8,5 +8,5 @@ namespace Volo.CmsKit.GlobalResources; public interface IGlobalResourceRepository: IBasicRepository { - Task FindByName([NotNull] string name, CancellationToken cancellationToken = default); + Task FindByNameAsync([NotNull] string name, CancellationToken cancellationToken = default); } \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/GlobalResources/EfCoreGlobalResourceRepository.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/GlobalResources/EfCoreGlobalResourceRepository.cs index dcf85e9e56..addd4c867d 100644 --- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/GlobalResources/EfCoreGlobalResourceRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/GlobalResources/EfCoreGlobalResourceRepository.cs @@ -15,7 +15,7 @@ public class EfCoreGlobalResourceRepository: EfCoreRepository FindByName(string name, + public Task FindByNameAsync(string name, CancellationToken cancellationToken = default) { Check.NotNullOrEmpty(name, nameof(name)); diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/GlobalResources/MongoGlobalResourceRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/GlobalResources/MongoGlobalResourceRepository.cs index 9a2f5f8dcf..6ca052846e 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/GlobalResources/MongoGlobalResourceRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/GlobalResources/MongoGlobalResourceRepository.cs @@ -16,7 +16,7 @@ public class MongoGlobalResourceRepository: MongoDbRepository FindByName(string name, + public Task FindByNameAsync(string name, CancellationToken cancellationToken = default) { Check.NotNullOrEmpty(name, nameof(name)); diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicGlobalResourcesController.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicGlobalResourcesController.cs index 520df2a389..c709904527 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicGlobalResourcesController.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicGlobalResourcesController.cs @@ -10,7 +10,7 @@ using Volo.CmsKit.Public.GlobalResources; namespace Volo.CmsKit.Public.Web.Controllers; -[Route("global-resources")] +[Route("cms-kit/global-resources")] public class CmsKitPublicGlobalResourcesController: AbpController { private readonly IGlobalResourcePublicAppService _globalResourcePublicAppService; diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Script/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Script/Default.cshtml index 5c22315e9a..118e04f4a8 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Script/Default.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Script/Default.cshtml @@ -1 +1 @@ - + diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Style/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Style/Default.cshtml index 6e0671ec72..11929dec03 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Style/Default.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Style/Default.cshtml @@ -1 +1 @@ - +