From 2dc36cea11ea46578916d9ff6b043fbc9400c9dc Mon Sep 17 00:00:00 2001
From: Leendert de Borst <ldeborst@xivisoft.com>
Date: Tue, 18 Mar 2025 14:17:49 +0100
Subject: [PATCH] Add password settings to general settings page (#167)

---
 .../Settings/DefaultPasswordSettings.razor     | 18 ++++++++----------
 .../Settings/PasswordSettingsPopup.razor       |  4 ++--
 .../Main/Pages/Settings/General.razor          |  8 +++++++-
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/AliasVault.Client/Main/Components/Settings/DefaultPasswordSettings.razor b/src/AliasVault.Client/Main/Components/Settings/DefaultPasswordSettings.razor
index d911451cd..6a8c52f36 100644
--- a/src/AliasVault.Client/Main/Components/Settings/DefaultPasswordSettings.razor
+++ b/src/AliasVault.Client/Main/Components/Settings/DefaultPasswordSettings.razor
@@ -1,15 +1,13 @@
 @inject DbService DbService
 
-<div class="bg-white dark:bg-gray-800 shadow rounded-lg p-6">
-    <div class="flex justify-between items-center mb-4">
-        <h3 class="text-lg font-medium text-gray-900 dark:text-white">Default Password Generation Settings</h3>
-        <button type="button" class="px-4 py-2 bg-primary-600 text-white rounded-md hover:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-primary-500 dark:bg-primary-700 dark:hover:bg-primary-600" @onclick="OpenSettings">
-            Configure
-        </button>
-    </div>
-    <div class="text-sm text-gray-500 dark:text-gray-400">
-        Configure the default settings used when generating new passwords. These settings will be used unless overridden for specific entries.
-    </div>
+<div class="mb-4">
+    <label for="defaultEmailDomain" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Default password generator settings</label>
+    <button type="button" class="px-4 py-2 bg-primary-600 text-white rounded-md hover:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-primary-500 dark:bg-primary-700 dark:hover:bg-primary-600" @onclick="OpenSettings">
+        Configure
+    </button>
+    <span class="block text-sm font-normal text-gray-500 truncate dark:text-gray-400 mt-2">
+        Configure the default settings used when generating new passwords. These settings will be used for all new passwords unless overridden for specific entries.
+    </span>
 </div>
 
 @if (IsSettingsVisible)
diff --git a/src/AliasVault.Client/Main/Components/Settings/PasswordSettingsPopup.razor b/src/AliasVault.Client/Main/Components/Settings/PasswordSettingsPopup.razor
index 682ab86cd..a5cd5d484 100644
--- a/src/AliasVault.Client/Main/Components/Settings/PasswordSettingsPopup.razor
+++ b/src/AliasVault.Client/Main/Components/Settings/PasswordSettingsPopup.razor
@@ -4,7 +4,7 @@
 @inject GlobalNotificationService GlobalNotificationService
 
 <ClickOutsideHandler OnClose="OnClose" ContentId="passwordSettingsModal">
-    <ModalWrapper OnEnter="HandleEnterKey" CssClass="fixed inset-0 z-50 overflow-auto bg-gray-500 bg-opacity-75 flex items-center justify-center">
+    <ModalWrapper OnEnter="HandleEnterKey">
         <div id="passwordSettingsModal" class="relative top-20 mx-auto p-5 shadow-lg rounded-md bg-white dark:bg-gray-800 border-2 border-gray-300 dark:border-gray-400">
             <div class="m-2">
                 <h3 class="text-lg leading-6 font-medium text-gray-900 dark:text-white">Change password generator settings</h3>
@@ -166,7 +166,7 @@
         var settingsJson = System.Text.Json.JsonSerializer.Serialize(_workingSettings);
         await DbService.Settings.SetSettingAsync("PasswordGenerationSettings", settingsJson);
         GlobalLoadingService.Hide();
-        GlobalNotificationService.AddSuccessMessage("Password generation settings saved globally.", true);
+        GlobalNotificationService.AddSuccessMessage("Password generation settings updated globally.", true);
 
         // Notify parent with both settings and the generated password.
         await OnSaveSettings.InvokeAsync((_workingSettings, _previewPassword));
diff --git a/src/AliasVault.Client/Main/Pages/Settings/General.razor b/src/AliasVault.Client/Main/Pages/Settings/General.razor
index e651985f7..43be060c5 100644
--- a/src/AliasVault.Client/Main/Pages/Settings/General.razor
+++ b/src/AliasVault.Client/Main/Pages/Settings/General.razor
@@ -13,7 +13,7 @@
     <h3 class="mb-4 text-lg font-medium text-gray-900 dark:text-white">Email Settings</h3>
 
     <div class="mb-4">
-        <label for="defaultEmailDomain" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Default Email Domain</label>
+        <label for="defaultEmailDomain" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Default email domain</label>
         <select @bind="DefaultEmailDomain" @bind:after="UpdateDefaultEmailDomain" id="defaultEmailDomain" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500">
             @if (ShowPrivateDomains)
             {
@@ -57,6 +57,12 @@
     </div>
 </div>
 
+<div class="p-4  mx-4 mb-4 bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 sm:p-6 dark:bg-gray-800">
+    <h3 class="mb-4 text-lg font-medium text-gray-900 dark:text-white">Password Settings</h3>
+
+    <DefaultPasswordSettings />
+</div>
+
 @code {
     private List<string> PrivateDomains => Config.PrivateEmailDomains;
     private List<string> PublicDomains => Config.PublicEmailDomains;