From d90c50f17facf9109378d4c5e91b5fa494821fb4 Mon Sep 17 00:00:00 2001
From: Berkan Sasmaz <berkansasmazz@gmail.com>
Date: Thu, 30 May 2024 18:07:19 +0300
Subject: [PATCH] Refactor settings widget

---
 .../Admin/Comments/CommentAdminAppService.cs  |  2 +-
 .../Comments/CommentSettingPageContributor.cs |  2 +-
 .../Shared/Components/Comments/Default.cshtml | 45 ++++++++++---------
 .../Shared/Components/Comments/default.js     |  2 +-
 .../CmsKit/Localization/Resources/en.json     |  4 +-
 5 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Comments/CommentAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Comments/CommentAdminAppService.cs
index 2196e60ccc..232ff579fa 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Comments/CommentAdminAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Comments/CommentAdminAppService.cs
@@ -103,7 +103,7 @@ public class CommentAdminAppService : CmsKitAdminAppServiceBase, ICommentAdminAp
     [Authorize(CmsKitAdminPermissions.Comments.SettingManagement)]
     public async Task<CommentSettingsDto> GetSettingsAsync()
     {
-	    var isRequireApprovementEnabled = bool.Parse(await SettingManager.GetOrNullGlobalAsync(CmsKitSettings.Comments.RequireApprovement));
+        var isRequireApprovementEnabled = bool.Parse(await SettingManager.GetOrNullGlobalAsync(CmsKitSettings.Comments.RequireApprovement));
 
         return new CommentSettingsDto {CommentRequireApprovement = isRequireApprovementEnabled};
     }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/CommentSettingPageContributor.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/CommentSettingPageContributor.cs
index 9a96c37eb2..28c0fe5b98 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/CommentSettingPageContributor.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/CommentSettingPageContributor.cs
@@ -20,7 +20,7 @@ public class CommentSettingPageContributor : SettingPageContributorBase
         var l = context.ServiceProvider.GetRequiredService<IStringLocalizer<CmsKitResource>>();
         context.Groups.Add(
             new SettingPageGroup(
-                "Volo.Abp.CmsKitPro",
+                "Volo.Abp.CmsKit",
                 l["Settings:Menu:CmsKit"],
                 typeof(CommentSettingViewComponent)
             )
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/Default.cshtml
index 6bbb657205..05a18105da 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/Default.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/Default.cshtml
@@ -6,26 +6,31 @@
         <abp-script src="/Pages/CmsKit/Shared/Components/Comments/default.js"></abp-script>
     </abp-script-bundle>
 }
+
 @{
     @inject IHtmlLocalizer<CmsKitResource> L
 
-    <abp-form id="deneme1" form="CmsKitCommentSettingsForm">
-        <h4>@L["CmsKitCommentOptions:Title"].Value</h4>
-        <hr />
-        <div class="form-group">
-            <div class="form-check">
-                <input type="checkbox" id="RequireApprovementCheckbox" class="form-check-input"/>
-                <label for="checkbox" class="form-check-label">@L["CmsKitCommentOptions:RequireApprovement"].Value</label>
-            </div>
-            <small id="checkboxHelp" class="form-text text-muted">@L["CmsKitCommentOptions:RequireApprovementDescription"].Value</small>
-        </div>
-
-        <div style="float:right" class="text-right mt-3">
-            <abp-button id="save" type="submit" class="btn btn-primary">
-                @L["SaveChanges"].Value
-            </abp-button>
-        </div>
-    </abp-form>
-}
-
-
+    <abp-tabs>
+        <abp-tab active="true" title="@L["CmsKit:Comment"].Value">
+            <abp-form id="CmsKitCommentSettingsForm">
+                <abp-row>
+                    <abp-column size-md="_12">
+                        <div class="form-group">
+                            <div class="form-check">
+                                <input type="checkbox" id="RequireApprovementCheckbox" class="form-check-input"/>
+                                <label for="RequireApprovementCheckbox" class="form-check-label">@L["CmsKitCommentOptions:RequireApprovement"].Value</label>
+                            </div>
+                            <small class="form-text text-muted">@L["CmsKitCommentOptions:RequireApprovementDescription"].Value</small>
+                            <hr class="my-4"/>
+                            <div>
+                                <abp-button id="Save" button-type="Primary" type="submit">
+                                    <i class="fa fa-save"></i> @L["Save"]
+                                </abp-button>
+                            </div>
+                        </div>
+                    </abp-column>
+                </abp-row>
+            </abp-form>
+        </abp-tab>
+    </abp-tabs>
+}
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/default.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/default.js
index 6c8d4f674b..5d6802e1cd 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/default.js
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/default.js
@@ -14,7 +14,7 @@
         };
 
         var _bindEvents = function () {
-            $('#save').click(function () {
+            $('#Save').click(function () {
                 var isChecked = $('#RequireApprovementCheckbox').prop('checked');
                 _service.updateSettings({ commentRequireApprovement: isChecked }).then(function (response) {
                     abp.notify.success(l("SavedSuccessfully"));
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 effa8f4708..c53165cd36 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
@@ -229,7 +229,7 @@
         "ThisPartOfContentCouldntBeLoaded": "This part of content couldn't be loaded.",
         "DuplicateCommentAttemptMessage": "Duplicate comment post attempt detected. Your comment has already been submitted.",
         "NoBlogPostYet": "No blog post yet!",
-        "CmsKitCommentOptions:Title": "Comment Settings.",
+        "CmsKit:Comment": "Comment",
         "CmsKitCommentOptions:RequireApprovement": "Require approval for comments",
         "CmsKitCommentOptions:RequireApprovementDescription": "When enabled, comments will require approval before being published.",
         "CommentFilter:ApproveState":"Approve State",
@@ -242,6 +242,6 @@
         "Approve":"Approve",
         "Disapproved":"Disapproved",
         "CommentAlertMessage":"There are {0} comments waiting for approval",
-        "Settings:Menu:CmsKit":"CmsKit Comment Options"
+        "Settings:Menu:CmsKit":"CMS"
     }
 }
\ No newline at end of file