Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Improve light/dark mode switcher, remove duplicate notes label

Leendert de Borstc134c2642a6e
diff --git a/apps/server/AliasVault.Client/Main/Components/Forms/EditFormRow.razor b/apps/server/AliasVault.Client/Main/Components/Forms/EditFormRow.razor
index a703f4ff7..6335cc0c1 100644
--- a/apps/server/AliasVault.Client/Main/Components/Forms/EditFormRow.razor
+++ b/apps/server/AliasVault.Client/Main/Components/Forms/EditFormRow.razor
@@ -1,4 +1,11 @@
-<label for="@Id" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">@Label</label>
+@if (LabelStyle == FormLabelStyle.Header)
+{
+ <label for="@Id" class="mb-4 text-xl font-semibold dark:text-white block">@Label</label>
+}
+else
+{
+ <label for="@Id" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">@Label</label>
+}
<div class="relative">
@if (Type == "textarea")
{
@@ -11,6 +18,21 @@
</div>
@code {
+ /// <summary>
+ /// Defines the style for the form label.
+ /// </summary>
+ public enum FormLabelStyle
+ {
+ /// <summary>
+ /// Default label style - small font, medium weight.
+ /// </summary>
+ Default,
+
+ /// <summary>
+ /// Header label style - large font, semibold weight.
+ /// </summary>
+ Header
+ }
/// <summary>
/// Id for the input field.
/// </summary>
@@ -53,6 +75,12 @@
[Parameter]
public string Placeholder { get; set; } = string.Empty;
+ /// <summary>
+ /// Style of the label.
+ /// </summary>
+ [Parameter]
+ public FormLabelStyle LabelStyle { get; set; } = FormLabelStyle.Default;
+
private async Task OnInputChanged(ChangeEventArgs e)
{
Value = e.Value?.ToString() ?? string.Empty;
diff --git a/apps/server/AliasVault.Client/Main/Layout/TopMenu.razor b/apps/server/AliasVault.Client/Main/Layout/TopMenu.razor
index 4a77355f7..bef1d17c0 100644
--- a/apps/server/AliasVault.Client/Main/Layout/TopMenu.razor
+++ b/apps/server/AliasVault.Client/Main/Layout/TopMenu.razor
@@ -84,7 +84,7 @@
</li>
<li>
<button id="theme-toggle" data-tooltip-target="tooltip-toggle" type="button" class="w-full text-start py-2 px-4 text-sm hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-400 dark:hover:text-white">
- @Localizer["ToggleDarkMode"]
+ @(IsDarkMode ? Localizer["EnableLightMode"] : Localizer["EnableDarkMode"])
<svg id="theme-toggle-dark-icon" class="hidden w-5 h-5 align-middle inline-block" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M17.293 13.293A8 8 0 016.707 2.707a8.001 8.001 0 1010.586 10.586z"></path></svg>
<svg id="theme-toggle-light-icon" class="hidden w-5 h-5 align-middle inline-block" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M10 2a1 1 0 011 1v1a1 1 0 11-2 0V3a1 1 0 011-1zm4 8a4 4 0 11-8 0 4 4 0 018 0zm-.464 4.95l.707.707a1 1 0 001.414-1.414l-.707-.707a1 1 0 00-1.414 1.414zm2.12-10.607a1 1 0 010 1.414l-.706.707a1 1 0 11-1.414-1.414l.707-.707a1 1 0 011.414 0zM17 11a1 1 0 100-2h-1a1 1 0 100 2h1zm-7 4a1 1 0 011 1v1a1 1 0 11-2 0v-1a1 1 0 011-1zM5.05 6.464A1 1 0 106.465 5.05l-.708-.707a1 1 0 00-1.414 1.414l.707.707zm1.414 8.486l-.707.707a1 1 0 01-1.414-1.414l.707-.707a1 1 0 011.414 1.414zM4 11a1 1 0 100-2H3a1 1 0 000 2h1z" fill-rule="evenodd" clip-rule="evenodd"></path></svg>
</button>
@@ -106,6 +106,7 @@
private bool IsUserMenuOpen { get; set; } = false;
private bool IsMobileMenuOpen { get; set; } = false;
private string Username { get; set; } = string.Empty;
+ private bool IsDarkMode { get; set; } = false;
/// <summary>
/// Close the menu.
@@ -127,6 +128,16 @@
StateHasChanged();
}
+ /// <summary>
+ /// Callback for theme changes from JavaScript.
+ /// </summary>
+ [JSInvokable]
+ public void OnThemeChanged(bool isDark)
+ {
+ IsDarkMode = isDark;
+ StateHasChanged();
+ }
+
/// <summary>
/// Dispose method.
/// </summary>
@@ -152,8 +163,9 @@
if (firstRender)
{
- await JsInteropService.InitTopMenu();
DotNetObjectReference<TopMenu> objRef = DotNetObjectReference.Create(this);
+ await JsInteropService.RegisterDarkModeCallback(objRef);
+ await JsInteropService.InitTopMenu();
await JsInteropService.TopMenuClickOutsideHandler(objRef);
}
}
diff --git a/apps/server/AliasVault.Client/Main/Pages/Credentials/AddEdit.razor b/apps/server/AliasVault.Client/Main/Pages/Credentials/AddEdit.razor
index 5a1737242..af1fbae06 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Credentials/AddEdit.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Credentials/AddEdit.razor
@@ -56,10 +56,9 @@ else
<div class="col-span-1 md:col-span-1 lg:col-span-1">
<div class="p-4 mb-4 bg-white border border-gray-200 rounded-lg shadow-sm 2xl:col-span-2 dark:border-gray-700 sm:p-6 dark:bg-gray-800">
- <h3 class="mb-4 text-xl font-semibold dark:text-white">@Localizer["NotesSectionHeader"]</h3>
<div class="grid gap-6">
<div class="col-span-6 sm:col-span-3">
- <EditFormRow Type="textarea" Id="notes" Label="@Localizer["NotesLabel"]" @bind-Value="Obj.Notes"></EditFormRow>
+ <EditFormRow Type="textarea" Id="notes" Label="@Localizer["NotesLabel"]" LabelStyle="EditFormRow.FormLabelStyle.Header" @bind-Value="Obj.Notes"></EditFormRow>
</div>
</div>
</div>
diff --git a/apps/server/AliasVault.Client/Resources/Layout/TopMenu.en.resx b/apps/server/AliasVault.Client/Resources/Layout/TopMenu.en.resx
index 6fe7b44b9..27770b3d0 100644
--- a/apps/server/AliasVault.Client/Resources/Layout/TopMenu.en.resx
+++ b/apps/server/AliasVault.Client/Resources/Layout/TopMenu.en.resx
@@ -49,9 +49,13 @@
</data>
<!-- Menu actions -->
- <data name="ToggleDarkMode">
- <value>Toggle dark mode</value>
- <comment>Button text for toggling dark/light theme</comment>
+ <data name="EnableLightMode">
+ <value>Switch to light mode</value>
+ <comment>Button text for switching to light theme</comment>
+ </data>
+ <data name="EnableDarkMode">
+ <value>Switch to dark mode</value>
+ <comment>Button text for switching to dark theme</comment>
</data>
<data name="LogOut">
<value>Log out</value>
diff --git a/apps/server/AliasVault.Client/Services/JsInterop/JsInteropService.cs b/apps/server/AliasVault.Client/Services/JsInterop/JsInteropService.cs
index e2266c3fc..ebe47653f 100644
--- a/apps/server/AliasVault.Client/Services/JsInterop/JsInteropService.cs
+++ b/apps/server/AliasVault.Client/Services/JsInterop/JsInteropService.cs
@@ -175,6 +175,16 @@ public sealed class JsInteropService(IJSRuntime jsRuntime)
where TComponent : class =>
await jsRuntime.InvokeVoidAsync("window.topMenuClickOutsideHandler", objRef);
+ /// <summary>
+ /// Registers a callback for dark mode theme changes.
+ /// </summary>
+ /// <typeparam name="TComponent">Component type.</typeparam>
+ /// <param name="objRef">DotNetObjectReference.</param>
+ /// <returns>Task.</returns>
+ public async Task RegisterDarkModeCallback<TComponent>(DotNetObjectReference<TComponent> objRef)
+ where TComponent : class =>
+ await jsRuntime.InvokeVoidAsync("window.registerDarkModeCallback", objRef);
+
/// <summary>
/// Generates a new RSA key pair.
/// </summary>
diff --git a/apps/server/AliasVault.Client/wwwroot/css/tailwind.css b/apps/server/AliasVault.Client/wwwroot/css/tailwind.css
index df4a67037..ac4ed1892 100644
--- a/apps/server/AliasVault.Client/wwwroot/css/tailwind.css
+++ b/apps/server/AliasVault.Client/wwwroot/css/tailwind.css
@@ -646,6 +646,10 @@ video {
left: 0px;
}
+.left-1\/2 {
+ left: 50%;
+}
+
.right-0 {
right: 0px;
}
@@ -666,6 +670,10 @@ video {
top: 0px;
}
+.top-2 {
+ top: 0.5rem;
+}
+
.top-20 {
top: 5rem;
}
@@ -682,14 +690,6 @@ video {
top: 100%;
}
-.left-1\/2 {
- left: 50%;
-}
-
-.top-2 {
- top: 0.5rem;
-}
-
.-z-10 {
z-index: -10;
}
diff --git a/apps/server/AliasVault.Client/wwwroot/js/utilities.js b/apps/server/AliasVault.Client/wwwroot/js/utilities.js
index 6e47cc429..4b4012e41 100644
--- a/apps/server/AliasVault.Client/wwwroot/js/utilities.js
+++ b/apps/server/AliasVault.Client/wwwroot/js/utilities.js
@@ -229,6 +229,8 @@ function initializeDarkMode() {
}
}
+window.darkModeCallback = null;
+
function initDarkModeSwitcher() {
const themeToggleDarkIcon = document.getElementById('theme-toggle-dark-icon');
const themeToggleLightIcon = document.getElementById('theme-toggle-light-icon');
@@ -238,13 +240,20 @@ function initDarkModeSwitcher() {
return;
}
- if (localStorage.getItem('color-theme') === 'dark' ||
- (!localStorage.getItem('color-theme') && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
+ const isDark = localStorage.getItem('color-theme') === 'dark' ||
+ (!localStorage.getItem('color-theme') && window.matchMedia('(prefers-color-scheme: dark)').matches);
+
+ if (isDark) {
themeToggleDarkIcon?.classList.remove('hidden');
} else {
themeToggleLightIcon?.classList.remove('hidden');
}
+ // Notify Blazor of initial state
+ if (window.darkModeCallback) {
+ window.darkModeCallback.invokeMethodAsync('OnThemeChanged', isDark);
+ }
+
let event = new Event('dark-mode');
themeToggleBtn.addEventListener('click', function () {
@@ -253,6 +262,7 @@ function initDarkModeSwitcher() {
themeToggleLightIcon.classList.toggle('hidden');
// toggle dark mode
+ const newIsDark = !document.documentElement.classList.contains('dark');
if (document.documentElement.classList.contains('dark')) {
document.documentElement.classList.remove('dark');
localStorage.setItem('color-theme', 'light');
@@ -261,10 +271,19 @@ function initDarkModeSwitcher() {
localStorage.setItem('color-theme', 'dark');
}
+ // Notify Blazor of theme change
+ if (window.darkModeCallback) {
+ window.darkModeCallback.invokeMethodAsync('OnThemeChanged', newIsDark);
+ }
+
document.dispatchEvent(event);
});
}
+window.registerDarkModeCallback = function(callback) {
+ window.darkModeCallback = callback;
+};
+
initializeDarkMode();
window.initTopMenu = function() {