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 new file mode 100644 index 0000000000..fc44352320 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/GlobalResourceAdminClientProxy.Generated.cs @@ -0,0 +1,38 @@ +// This file is automatically generated by ABP framework to use MVC Controllers from CSharp +using System; +using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; +using Volo.Abp.Http.Client; +using Volo.Abp.Http.Modeling; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Http.Client.ClientProxying; +using Volo.CmsKit.Admin.GlobalResources; + +// ReSharper disable once CheckNamespace +namespace Volo.CmsKit.Admin.GlobalResources.ClientProxies; + +[Dependency(ReplaceServices = true)] +[ExposeServices(typeof(IGlobalResourceAdminAppService), typeof(GlobalResourceAdminClientProxy))] +public partial class GlobalResourceAdminClientProxy : ClientProxyBase, IGlobalResourceAdminAppService +{ + public virtual async Task GetAsync() + { + return await RequestAsync(nameof(GetAsync)); + } + + public virtual async Task SetGlobalStyleAsync(GlobalResourceUpdateDto input) + { + await RequestAsync(nameof(SetGlobalStyleAsync), new ClientProxyRequestTypeValue + { + { typeof(GlobalResourceUpdateDto), input } + }); + } + + public virtual async Task SetGlobalScriptAsync(GlobalResourceUpdateDto input) + { + await RequestAsync(nameof(SetGlobalScriptAsync), new ClientProxyRequestTypeValue + { + { typeof(GlobalResourceUpdateDto), input } + }); + } +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/GlobalResourceAdminClientProxy.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/GlobalResourceAdminClientProxy.cs new file mode 100644 index 0000000000..49a4f4c558 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/GlobalResourceAdminClientProxy.cs @@ -0,0 +1,7 @@ +// This file is part of GlobalResourceAdminClientProxy, you can customize it here +// ReSharper disable once CheckNamespace +namespace Volo.CmsKit.Admin.GlobalResources.ClientProxies; + +public partial class GlobalResourceAdminClientProxy +{ +} 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 e20d5cc5c3..8f07233a0d 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 @@ -1115,6 +1115,107 @@ } } }, + "Volo.CmsKit.Admin.GlobalResources.GlobalResourceAdminController": { + "controllerName": "GlobalResourceAdmin", + "controllerGroupName": "GlobalResourceAdmin", + "type": "Volo.CmsKit.Admin.GlobalResources.GlobalResourceAdminController", + "interfaces": [ + { + "type": "Volo.CmsKit.Admin.GlobalResources.IGlobalResourceAdminAppService" + } + ], + "actions": { + "GetAsync": { + "uniqueName": "GetAsync", + "name": "GetAsync", + "httpMethod": "GET", + "url": "api/cms-kit-admin/global-resources", + "supportedVersions": [], + "parametersOnMethod": [], + "parameters": [], + "returnValue": { + "type": "Volo.CmsKit.Admin.GlobalResources.GlobalResourcesDto", + "typeSimple": "Volo.CmsKit.Admin.GlobalResources.GlobalResourcesDto" + }, + "allowAnonymous": false, + "implementFrom": "Volo.CmsKit.Admin.GlobalResources.IGlobalResourceAdminAppService" + }, + "SetGlobalStyleAsyncByInput": { + "uniqueName": "SetGlobalStyleAsyncByInput", + "name": "SetGlobalStyleAsync", + "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", + "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" + } + } + }, "Volo.CmsKit.Admin.Comments.CommentAdminController": { "controllerName": "CommentAdmin", "controllerGroupName": "CommentAdmin", 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 e769819438..2bb1541771 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 @@ -22,16 +22,21 @@ public class GlobalResourceAdminController: CmsKitAdminController, IGlobalResour _globalResourceAdminAppService = globalResourceAdminAppService; } + [HttpGet] public Task GetAsync() { return _globalResourceAdminAppService.GetAsync(); } + [HttpPost] + [Route("style")] public Task SetGlobalStyleAsync(GlobalResourceUpdateDto input) { return _globalResourceAdminAppService.SetGlobalStyleAsync(input); } + [HttpPost] + [Route("script")] public Task SetGlobalScriptAsync(GlobalResourceUpdateDto input) { return _globalResourceAdminAppService.SetGlobalScriptAsync(input); diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Menus/CmsKitAdminMenuContributor.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Menus/CmsKitAdminMenuContributor.cs index 190bcd286c..bc9bbfb310 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Menus/CmsKitAdminMenuContributor.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Menus/CmsKitAdminMenuContributor.cs @@ -83,7 +83,7 @@ public class CmsKitAdminMenuContributor : IMenuContributor CmsKitAdminMenus.GlobalResources.GlobalResourcesMenu, l["GlobalResources"], "/Cms/GlobalResources", - "fa fa-memo") + "fa fa-newspaper") .RequireGlobalFeatures(typeof(GlobalResourcesFeature)) .RequirePermissions(CmsKitAdminPermissions.GlobalResources.Default)); diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/GlobalResources/Index.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/GlobalResources/Index.cshtml index 0b0b654f0c..b67a147baa 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/GlobalResources/Index.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/GlobalResources/Index.cshtml @@ -19,6 +19,8 @@ @section scripts { + + } 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 127fe54f73..6af7bd5489 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,8 +4,8 @@ $(function (){ var service = volo.cmsKit.admin.globalResources.globalResourceAdmin; $('#SaveResourcesButton').on('click','',function(){ - service.setGlobalStyle($('#StyleContent').val()).then(function () { - service.setGlobalScript($('#ScriptContent').val()).then(function () { + service.setGlobalStyle({value:$('#StyleContent').val()}).then(function () { + service.setGlobalScript({value:$('#ScriptContent').val()}).then(function () { abp.message.success(l("SavedSuccessfully")); }); }); 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 2fcf8f4d4c..bff49911d5 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 @@ -223,6 +223,39 @@ })(); + // controller volo.cmsKit.admin.globalResources.globalResourceAdmin + + (function(){ + + abp.utils.createNamespace(window, 'volo.cmsKit.admin.globalResources.globalResourceAdmin'); + + volo.cmsKit.admin.globalResources.globalResourceAdmin.get = function(ajaxParams) { + return abp.ajax($.extend(true, { + url: abp.appPath + 'api/cms-kit-admin/global-resources', + type: 'GET' + }, ajaxParams)); + }; + + volo.cmsKit.admin.globalResources.globalResourceAdmin.setGlobalStyle = 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', + type: 'POST', + dataType: null, + data: JSON.stringify(input) + }, ajaxParams)); + }; + + })(); + // controller volo.cmsKit.admin.comments.commentAdmin (function(){ diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/GlobalResources/GlobalResourceConsts.cs b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/GlobalResources/GlobalResourceConsts.cs index 3485542969..47f20e1d72 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/GlobalResources/GlobalResourceConsts.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/GlobalResources/GlobalResourceConsts.cs @@ -4,7 +4,7 @@ public class GlobalResourceConsts { public const string GlobalStyleName = "GlobalStyle"; - public const string GlobalScriptName = "GlobalScripit"; + public const string GlobalScriptName = "GlobalScript"; public static int MaxNameLength { get; set; } = 128; 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 bb34fc3d29..65df3fdff4 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 @@ -47,7 +47,7 @@ "ExportCSV": "Export CSV", "Features": "Features", "GenericDeletionConfirmationMessage": "Are you sure to delete '{0}'?", - "IsActive" : "Active", + "IsActive": "Active", "LastModification": "Last Modification", "LastModificationTime": "Last Modification Time", "LoginToAddComment": "Login to add comment", @@ -159,6 +159,10 @@ "YourFullName": "Your full name", "YourMessage": "Your Message", "YourReply": "Your reply", - "MarkdownSupported": "Markdown supported." + "MarkdownSupported": "Markdown supported.", + "GlobalResources": "Global Resources", + "Script": "Script", + "Style": "Style", + "SavedSuccessfully": "Saved successfully" } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json index 24cf80fce8..95ef414c17 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json @@ -159,6 +159,10 @@ "YourFullName": "Tam adınız", "YourMessage": "Mesajınız", "YourReply": "Cevabınız", - "MarkdownSupported": "Markdown destekler." + "MarkdownSupported": "Markdown destekler.", + "GlobalResources": "Global Kaynaklar", + "Script": "Script", + "Style": "Style", + "SavedSuccessfully": "Başarıyla kaydedildi" } } 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 f1433e107a..3506a00cb1 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 @@ -43,7 +43,9 @@ public class GlobalResourceManager : DomainService resource.SetValue(value); - return await _globalResourceRepository.UpdateAsync(resource); + await _globalResourceRepository.UpdateAsync(resource); + + return resource; } protected virtual async Task GetOrCreateResourceAsync(string name)