Skip to content

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

Update web app settings page UI

Leendert de Borst3f26ff242087
diff --git a/apps/web/src/App.tsx b/apps/web/src/App.tsx
index b936fad20..9886187b9 100644
--- a/apps/web/src/App.tsx
+++ b/apps/web/src/App.tsx
@@ -1,6 +1,6 @@
import { CapabilityKeys } from '@aliasvault/models/webapi';
import React from 'react';
-import { BrowserRouter, Route, Routes } from 'react-router-dom';
+import { BrowserRouter, Navigate, Route, Routes } from 'react-router-dom';
import { RequireCapability } from '@/context/CapabilityContext';
import AuthLayout from '@/layouts/AuthLayout';
@@ -26,10 +26,11 @@ import ImportExport from '@/pages/settings/importexport/ImportExport';
import ResetVault from '@/pages/settings/importexport/ResetVault';
import PasswordGeneratorSettings from '@/pages/settings/PasswordGenerator';
import ChangePassword from '@/pages/settings/security/ChangePassword';
+import Clipboard from '@/pages/settings/security/Clipboard';
import DeleteAccount from '@/pages/settings/security/DeleteAccount';
-import SecuritySettings from '@/pages/settings/security/Security';
import SessionsAndLogs from '@/pages/settings/security/SessionsAndLogs';
import TwoFactor from '@/pages/settings/security/TwoFactor';
+import VaultUnlock from '@/pages/settings/security/VaultUnlock';
import SettingsOverview from '@/pages/settings/Settings';
import StorageInsights from '@/pages/settings/StorageInsights';
import Sync from '@/pages/sync/Sync';
@@ -70,8 +71,10 @@ const App: React.FC = () => (
<Route path="/settings/general" element={<GeneralSettings />} />
<Route path="/settings/password-generator" element={<PasswordGeneratorSettings />} />
<Route path="/settings/identity-generator" element={<IdentityGeneratorSettings />} />
- <Route path="/settings/security" element={<SecuritySettings />} />
+ <Route path="/settings/security" element={<Navigate to="/settings" replace />} />
<Route path="/settings/security/change-password" element={<ChangePassword />} />
+ <Route path="/settings/security/vault-unlock" element={<VaultUnlock />} />
+ <Route path="/settings/security/clipboard" element={<Clipboard />} />
<Route path="/settings/security/delete-account" element={<DeleteAccount />} />
<Route path="/settings/sessions" element={<SessionsAndLogs />} />
<Route path="/settings/two-factor" element={<TwoFactor key="status" />} />
diff --git a/apps/web/src/components/settings/DefaultPasswordSettings.tsx b/apps/web/src/components/settings/DefaultPasswordSettings.tsx
index fe37e2d7e..4eecde6b7 100644
--- a/apps/web/src/components/settings/DefaultPasswordSettings.tsx
+++ b/apps/web/src/components/settings/DefaultPasswordSettings.tsx
@@ -21,12 +21,12 @@ const DefaultPasswordSettings: React.FC = () => {
}, [dbContext.sqliteClient]);
return (
- <div className="mb-4">
+ <div>
<FormLabel htmlFor="password-generator-settings-modal">{t('settings.passwordGeneratorSettings.passwordGeneratorSettingsLabel')}</FormLabel>
<button type="button" id="password-generator-settings-modal" className="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={() => setIsVisible(true)}>
{t('settings.passwordGeneratorSettings.configureButton')}
</button>
- <span className="block text-sm font-normal text-gray-500 truncate dark:text-gray-400 mt-2">{t('settings.passwordGeneratorSettings.description')}</span>
+ <span className="block mt-2 text-sm text-gray-500 dark:text-gray-400">{t('settings.passwordGeneratorSettings.description')}</span>
{isVisible && settings && (
<PasswordSettingsPopup passwordSettings={settings} isTemporary={false} onSaveSettings={(saved) => setSettings(saved)} onClose={() => setIsVisible(false)} />
diff --git a/apps/web/src/components/settings/SettingsIcon.tsx b/apps/web/src/components/settings/SettingsIcon.tsx
index c7473230c..78dc167d6 100644
--- a/apps/web/src/components/settings/SettingsIcon.tsx
+++ b/apps/web/src/components/settings/SettingsIcon.tsx
@@ -7,12 +7,16 @@ import type { UiIconName } from '@aliasvault/models/icons';
/**
* The icons of the settings pages, shared by the settings overview rows and the page headers.
*/
-export type SettingsIconName = 'twoFactor' | 'security' | 'sessions' | 'passwordGenerator' | 'identityGenerator' | 'importExport' | 'storage' | 'general' | 'apps' | 'themeLight' | 'themeDark' | 'lock' | 'securityWarning' | 'logout' | 'warning' | 'vault' | 'emails' | 'familySharing';
+export type SettingsIconName = 'twoFactor' | 'security' | 'changePassword' | 'vaultUnlock' | 'clipboard' | 'deleteAccount' | 'sessions' | 'passwordGenerator' | 'identityGenerator' | 'importExport' | 'storage' | 'general' | 'apps' | 'themeLight' | 'themeDark' | 'lock' | 'securityWarning' | 'logout' | 'warning' | 'vault' | 'emails' | 'familySharing';
/** The catalog icon of each settings icon. */
const SETTINGS_ICONS: Record<SettingsIconName, UiIconName> = {
twoFactor: 'device-mobile',
security: 'shield-check',
+ changePassword: 'lock-closed',
+ vaultUnlock: 'shield-check',
+ clipboard: 'clipboard',
+ deleteAccount: 'trash',
sessions: 'desktop-computer',
passwordGenerator: 'key',
identityGenerator: 'user',
diff --git a/apps/web/src/components/settings/security/ClipboardClearSection.tsx b/apps/web/src/components/settings/security/ClipboardClearSection.tsx
index b27bd6ae5..4c0c9c14d 100644
--- a/apps/web/src/components/settings/security/ClipboardClearSection.tsx
+++ b/apps/web/src/components/settings/security/ClipboardClearSection.tsx
@@ -35,7 +35,7 @@ const ClipboardClearSection: React.FC = () => {
return (
<SecuritySection title={t('settings.clipboardClear')}>
- <div className="mb-4">
+ <div>
<FormLabel htmlFor="clipboardClearSeconds">{t('settings.general.clipboardClearSecondsLabel')}</FormLabel>
<Select id="clipboardClearSeconds" value={clipboardClearSeconds} onChange={(e) => void update(e.target.value)}>
<option value="0">{t('common.disabled')}</option>
@@ -43,8 +43,8 @@ const ClipboardClearSection: React.FC = () => {
<option value="10">{t('settings.clipboardClearOptions.10seconds')}</option>
<option value="15">{t('common.duration.15seconds')}</option>
</Select>
- <span className="block text-sm font-normal text-gray-500 dark:text-gray-400">{t('settings.general.clipboardClearSecondsDescription')}</span>
- <WarningBox className="mt-2">
+ <span className="block mt-2 text-sm text-gray-500 dark:text-gray-400">{t('settings.general.clipboardClearSecondsDescription')}</span>
+ <WarningBox className="mt-3">
<p>{t('settings.general.clipboardClearLimitationNote')}</p>
</WarningBox>
</div>
diff --git a/apps/web/src/components/settings/security/DeleteAccountSection.tsx b/apps/web/src/components/settings/security/DeleteAccountSection.tsx
deleted file mode 100644
index 72a629fe7..000000000
--- a/apps/web/src/components/settings/security/DeleteAccountSection.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import { useNavigate } from 'react-router-dom';
-
-import SecuritySection from '@/components/settings/security/SecuritySection';
-import Button from '@/components/shared/Button';
-
-/**
- * Link to the delete account page.
- */
-const DeleteAccountSection: React.FC = () => {
- const { t } = useTranslation();
- const navigate = useNavigate();
-
- return (
- <SecuritySection title={t('settings.securitySettings.deleteAccount.deleteAccount')}>
- <div className="mb-3 text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.deleteAccountSection.description')}</div>
- <Button color="danger" onClick={() => navigate('/settings/security/delete-account')}>{t('settings.securitySettings.deleteAccount.deleteAccount')}</Button>
- </SecuritySection>
- );
-};
-
-export default DeleteAccountSection;
diff --git a/apps/web/src/components/settings/security/PasswordChangeSection.tsx b/apps/web/src/components/settings/security/PasswordChangeSection.tsx
deleted file mode 100644
index 4fe5198f1..000000000
--- a/apps/web/src/components/settings/security/PasswordChangeSection.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import { useNavigate } from 'react-router-dom';
-
-import SecuritySection from '@/components/settings/security/SecuritySection';
-import Button from '@/components/shared/Button';
-
-/**
- * Link to the change password page.
- */
-const PasswordChangeSection: React.FC = () => {
- const { t } = useTranslation();
- const navigate = useNavigate();
-
- return (
- <SecuritySection title={t('settings.securitySettings.changeMasterPassword')}>
- <div className="mb-3 text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.changePassword.headerText')}</div>
- <Button onClick={() => navigate('/settings/security/change-password')}>{t('settings.securitySettings.changePassword.changePassword')}</Button>
- </SecuritySection>
- );
-};
-
-export default PasswordChangeSection;
diff --git a/apps/web/src/components/settings/security/QuickVaultUnlockSection.tsx b/apps/web/src/components/settings/security/QuickVaultUnlockSection.tsx
index 96b06962a..ca41659f1 100644
--- a/apps/web/src/components/settings/security/QuickVaultUnlockSection.tsx
+++ b/apps/web/src/components/settings/security/QuickVaultUnlockSection.tsx
@@ -1,8 +1,11 @@
-import React, { useCallback, useImperativeHandle, useState, forwardRef } from 'react';
+import React, { useState } from 'react';
import { useTranslation } from 'react-i18next';
-import SecuritySection, { type SectionHandle } from '@/components/settings/security/SecuritySection';
import Button from '@/components/shared/Button';
+import Card from '@/components/shared/Card';
+import Icon from '@/components/shared/Icon';
+import StatusPill from '@/components/shared/StatusPill';
+import Text from '@/components/shared/Text';
import { useAuth } from '@/context/AuthContext';
import { useNotifications } from '@/context/NotificationContext';
import { WebAuthnNotSupportedError, WebAuthnService } from '@/utils/WebAuthnService';
@@ -11,17 +14,12 @@ import { WebAuthnNotSupportedError, WebAuthnService } from '@/utils/WebAuthnServ
* Passkey quick unlock for this local browser session only.
* TODO: this will be replaced by a fully integrated passkey PRF unlock feature, which is technically possible once 0.31.0+ is released.
*/
-const QuickVaultUnlockSection = forwardRef<SectionHandle>((_, ref) => {
+const QuickVaultUnlockSection: React.FC = () => {
const { t } = useTranslation();
const auth = useAuth();
const notifications = useNotifications();
const [enabled, setEnabled] = useState(() => WebAuthnService.isEnabled());
- const loadData = useCallback(async (): Promise<void> => {
- setEnabled(WebAuthnService.isEnabled());
- }, []);
- useImperativeHandle(ref, () => ({ loadData }), [loadData]);
-
/**
* Create a passkey and encrypt the Account Key with it.
*/
@@ -38,35 +36,41 @@ const QuickVaultUnlockSection = forwardRef<SectionHandle>((_, ref) => {
}
return;
}
- await loadData();
+ setEnabled(WebAuthnService.isEnabled());
};
/**
* Forget the passkey.
*/
- const disable = async (): Promise<void> => {
+ const disable = (): void => {
WebAuthnService.disable();
notifications.addSuccessMessage(t('settings.securitySettings.passkeyUnlock.successDisabledMessage'), true);
- await loadData();
+ setEnabled(WebAuthnService.isEnabled());
};
return (
- <SecuritySection title={t('settings.securitySettings.passkeyUnlock.title')}>
+ <Card>
+ <div className="flex items-center justify-between gap-3 mb-3">
+ <div className="flex items-center gap-3 min-w-0">
+ <Icon name="key" className="flex-shrink-0 w-5 h-5 text-primary-600 dark:text-primary-400" />
+ <h3 className="text-lg font-semibold text-gray-900 dark:text-white">{t('settings.securitySettings.passkeyUnlock.title')}</h3>
+ </div>
+ <StatusPill id="passkey-unlock-status" enabled={enabled} size="md" />
+ </div>
{enabled ? (
<>
- <div className="mb-3 text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.passkeyUnlock.enabledDescription')}</div>
- <Button color="danger" onClick={() => void disable()}>{t('settings.securitySettings.passkeyUnlock.disableButton')}</Button>
+ <Text variant="muted" className="mb-4">{t('settings.securitySettings.passkeyUnlock.enabledDescription')}</Text>
+ <Button color="danger" onClick={disable}>{t('settings.securitySettings.passkeyUnlock.disableButton')}</Button>
</>
) : (
<>
- <div className="mb-3 text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.passkeyUnlock.disabledDescription')}</div>
- <div className="mb-3 text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.passkeyUnlock.experimentalWarning')}</div>
+ <Text variant="muted" className="mb-3">{t('settings.securitySettings.passkeyUnlock.disabledDescription')}</Text>
+ <Text variant="muted" className="mb-4">{t('settings.securitySettings.passkeyUnlock.experimentalWarning')}</Text>
<Button color="success" onClick={() => void enable()}>{t('settings.securitySettings.passkeyUnlock.enableButton')}</Button>
</>
)}
- </SecuritySection>
+ </Card>
);
-});
-QuickVaultUnlockSection.displayName = 'QuickVaultUnlockSection';
+};
export default QuickVaultUnlockSection;
diff --git a/apps/web/src/components/shared/StatusPill.tsx b/apps/web/src/components/shared/StatusPill.tsx
index 992174e65..28098b432 100644
--- a/apps/web/src/components/shared/StatusPill.tsx
+++ b/apps/web/src/components/shared/StatusPill.tsx
@@ -1,32 +1,35 @@
import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+type StatusPillColor = 'green' | 'amber' | 'red' | 'gray';
type StatusPillProps = {
enabled: boolean;
textTrue?: string;
textFalse?: string;
- color?: 'green' | 'yellow' | 'red' | 'gray';
+ /** Color override; by default green when enabled and red when not. */
+ color?: StatusPillColor;
+ size?: 'sm' | 'md';
+ id?: string;
+};
+
+/** Tint, ring and text per color, in both themes. */
+const COLOR_CLASSES: Record<StatusPillColor, string> = {
+ green: 'bg-green-100 text-green-800 ring-green-300 dark:bg-green-500/15 dark:text-green-100 dark:ring-green-500/40',
+ amber: 'bg-amber-100 text-amber-900 ring-amber-300 dark:bg-amber-500/15 dark:text-amber-100 dark:ring-amber-500/40',
+ red: 'bg-red-100 text-red-800 ring-red-300 dark:bg-red-500/15 dark:text-red-100 dark:ring-red-500/40',
+ gray: 'bg-gray-100 text-gray-800 ring-gray-300 dark:bg-gray-500/15 dark:text-gray-100 dark:ring-gray-500/40',
};
/**
* Small colored status label.
*/
-const StatusPill: React.FC<StatusPillProps> = ({ enabled, textTrue = 'Enabled', textFalse = 'Disabled', color }) => {
- /**
- * The color classes of the pill.
- */
- const pillClass = (): string => {
- if (color) {
- switch (color) {
- case 'green': return 'bg-green-100 text-green-800';
- case 'yellow': return 'bg-yellow-100 text-yellow-800';
- case 'red': return 'bg-red-100 text-red-800';
- default: return 'bg-gray-100 text-gray-800';
- }
- }
- return enabled ? 'bg-green-100 text-green-800' : 'bg-red-100 text-red-800';
- };
+const StatusPill: React.FC<StatusPillProps> = ({ enabled, textTrue, textFalse, color, size = 'sm', id }) => {
+ const { t } = useTranslation();
+ const tone = color ?? (enabled ? 'green' : 'red');
+ const sizeClasses = size === 'md' ? 'px-2.5 py-0.5 text-sm font-semibold' : 'px-2 py-0.5 text-xs font-medium';
- return <span className={`${pillClass()} px-2 py-1 text-xs font-medium rounded-full`}>{enabled ? textTrue : textFalse}</span>;
+ return <span id={id} className={`inline-flex items-center rounded-full ring-1 ring-inset ${sizeClasses} ${COLOR_CLASSES[tone]}`}>{enabled ? textTrue ?? t('common.enabled') : textFalse ?? t('common.disabled')}</span>;
};
export default StatusPill;
diff --git a/apps/web/src/pages/settings/General.tsx b/apps/web/src/pages/settings/General.tsx
index 820b65abd..3d1cf788d 100644
--- a/apps/web/src/pages/settings/General.tsx
+++ b/apps/web/src/pages/settings/General.tsx
@@ -12,12 +12,6 @@ import { usePageTitle } from '@/hooks/usePageTitle';
import { useVaultMutate } from '@/hooks/useVaultMutate';
import { AVAILABLE_LANGUAGES } from '@/i18n/config';
import { changeLanguage } from '@/i18n/i18n';
-import { vaultStore } from '@/vault/VaultStore';
-
-/**
- * Whether the private domain list holds a usable domain.
- */
-const hasValidPrivateDomains = (domains: string[]): boolean => domains.length > 0 && !(domains.length === 1 && (domains[0].trim().length === 0 || domains[0] === 'DISABLED.TLD'));
/**
* The general settings page.
@@ -26,12 +20,9 @@ const GeneralSettings: React.FC = () => {
const { t, i18n } = useTranslation();
const dbContext = useDb();
const { executeVaultMutationInBackground } = useVaultMutate();
-
+
usePageTitle(t('settings.general.pageTitle'));
- const [privateDomains, setPrivateDomains] = useState<string[]>([]);
- const [publicDomains, setPublicDomains] = useState<string[]>([]);
- const [defaultEmailDomain, setDefaultEmailDomain] = useState('');
const [autoEmailRefresh, setAutoEmailRefresh] = useState(true);
const [appLanguage, setAppLanguage] = useState(i18n.language);
@@ -46,36 +37,9 @@ const GeneralSettings: React.FC = () => {
useEffect(() => {
const client = dbContext.sqliteClient;
- if (!client) {
- return;
- }
- let cancelled = false;
-
- /**
- * Load the email domains and the current settings.
- */
- const load = async (): Promise<void> => {
- const metadata = await vaultStore.getVaultMetadata();
- const hidden = metadata?.hiddenPrivateEmailDomains ?? [];
- const privateList = (metadata?.privateEmailDomains ?? []).filter(d => !hidden.includes(d));
- const publicList = metadata?.publicEmailDomains ?? [];
- if (cancelled) {
- return;
- }
-
- setPrivateDomains(privateList);
- setPublicDomains(publicList);
- let domain = client.settings.getDefaultEmailDomain();
- if (domain.length === 0 || hidden.includes(domain)) {
- domain = hasValidPrivateDomains(privateList) ? privateList[0] : publicList[0] ?? '';
- }
- setDefaultEmailDomain(domain);
+ if (client) {
setAutoEmailRefresh(client.settings.getSetting('AutoEmailRefresh', 'True').toLowerCase() === 'true');
- };
- void load();
- return (): void => {
- cancelled = true;
- };
+ }
}, [dbContext.sqliteClient]);
/**
@@ -94,38 +58,18 @@ const GeneralSettings: React.FC = () => {
<PageContent>
<Card>
<SectionTitle className="mb-4">{t('settings.general.appLanguageTitle')}</SectionTitle>
- <div className="mb-4">
+ <div>
<FormLabel htmlFor="appLanguage">{t('settings.language')}</FormLabel>
<Select id="appLanguage" value={appLanguage} onChange={e => void updateAppLanguage(e.target.value)}>
{AVAILABLE_LANGUAGES.map(language => <option key={language.code} value={language.code}>{language.flag} {language.nativeName}</option>)}
</Select>
- <span className="block text-sm font-normal text-gray-500 truncate dark:text-gray-400">{t('settings.general.appLanguageDescription')}</span>
+ <span className="block mt-2 text-sm text-gray-500 dark:text-gray-400">{t('settings.general.appLanguageDescription')}</span>
</div>
</Card>
<Card>
<SectionTitle className="mb-4">{t('settings.general.emailSettingsTitle')}</SectionTitle>
- <div className="mb-4">
- <FormLabel htmlFor="defaultEmailDomain">{t('settings.general.defaultEmailDomainLabel')}</FormLabel>
- <Select id="defaultEmailDomain" value={defaultEmailDomain} onChange={(e) => {
- setDefaultEmailDomain(e.target.value);
- void updateSetting('DefaultEmailDomain', e.target.value);
- }}>
- <optgroup label={t('settings.general.privateDomainsLabel')}>
- {hasValidPrivateDomains(privateDomains)
- ? privateDomains.map(domain => <option key={domain} value={domain}>{domain}</option>)
- : <option disabled value="_">{t('settings.general.privateDomainsDisabledLabel')}</option>}
- </optgroup>
- <optgroup label={t('settings.general.publicDomainsLabel')}>
- {publicDomains.map(domain => <option key={domain} value={domain}>{domain}</option>)}
- </optgroup>
- </Select>
- <span className="block text-sm font-normal text-gray-500 dark:text-gray-400 mt-2">
- {t('settings.general.defaultEmailDomainDescription')} {t('settings.general.defaultEmailDomainDescriptionNote')} <a href="https://docs.aliasvault.com/misc/private-vs-public-email.html" className="text-primary-500 hover:text-primary-700 hover:underline" target="_blank" rel="noopener noreferrer">{t('settings.general.defaultEmailDomainLearnMore')}</a>.
- </span>
- </div>
-
- <div className="flex items-center mb-4">
+ <div className="flex items-center">
<input id="autoEmailRefresh" type="checkbox" checked={autoEmailRefresh} onChange={(e) => {
setAutoEmailRefresh(e.target.checked);
void updateSetting('AutoEmailRefresh', e.target.checked ? 'True' : 'False');
@@ -133,7 +77,6 @@ const GeneralSettings: React.FC = () => {
<label htmlFor="autoEmailRefresh" className="ml-2 text-sm font-medium text-gray-900 dark:text-gray-300">{t('settings.general.autoEmailRefreshLabel')}</label>
</div>
</Card>
-
</PageContent>
</>
);
diff --git a/apps/web/src/pages/settings/IdentityGenerator.tsx b/apps/web/src/pages/settings/IdentityGenerator.tsx
index fbf3120e1..0b9c8a364 100644
--- a/apps/web/src/pages/settings/IdentityGenerator.tsx
+++ b/apps/web/src/pages/settings/IdentityGenerator.tsx
@@ -7,13 +7,20 @@ import SettingsPageHeader from '@/components/settings/SettingsPageHeader';
import Card from '@/components/shared/Card';
import FormLabel from '@/components/shared/FormLabel';
import PageContent from '@/components/shared/PageContent';
+import SectionTitle from '@/components/shared/SectionTitle';
import Select from '@/components/shared/Select';
import { useDb } from '@/context/DbContext';
import { usePageTitle } from '@/hooks/usePageTitle';
import { useVaultMutate } from '@/hooks/useVaultMutate';
+import { vaultStore } from '@/vault/VaultStore';
/**
- * The identity generator settings page: defaults for newly generated identities.
+ * Whether the private domain list holds a usable domain.
+ */
+const hasValidPrivateDomains = (domains: string[]): boolean => domains.length > 0 && !(domains.length === 1 && (domains[0].trim().length === 0 || domains[0] === 'DISABLED.TLD'));
+
+/**
+ * The identity generator settings page: defaults for newly generated identities, including their email domain.
*/
const IdentityGeneratorSettings: React.FC = () => {
const { t, i18n } = useTranslation();
@@ -27,6 +34,9 @@ const IdentityGeneratorSettings: React.FC = () => {
const [identityLanguage, setIdentityLanguage] = useState('');
const [identityGender, setIdentityGender] = useState('random');
const [identityAgeRange, setIdentityAgeRange] = useState('random');
+ const [privateDomains, setPrivateDomains] = useState<string[]>([]);
+ const [publicDomains, setPublicDomains] = useState<string[]>([]);
+ const [defaultEmailDomain, setDefaultEmailDomain] = useState('');
/**
* Write a vault setting and push it.
@@ -45,11 +55,15 @@ const IdentityGeneratorSettings: React.FC = () => {
let cancelled = false;
/**
- * Load the identity options and the current settings.
+ * Load the identity options, the email domains and the current settings.
*/
const load = async (): Promise<void> => {
const languages = (await getIdentityLanguages()).sort((a, b) => getLanguageInfo(a).label.localeCompare(getLanguageInfo(b).label));
const ranges = await getIdentityAgeRanges();
+ const metadata = await vaultStore.getVaultMetadata();
+ const hidden = metadata?.hiddenPrivateEmailDomains ?? [];
+ const privateList = (metadata?.privateEmailDomains ?? []).filter(d => !hidden.includes(d));
+ const publicList = metadata?.publicEmailDomains ?? [];
if (cancelled) {
return;
}
@@ -61,6 +75,14 @@ const IdentityGeneratorSettings: React.FC = () => {
setIdentityLanguage(explicit.trim().length > 0 ? explicit : resolveDefaultLanguage(i18n.language, languages));
setIdentityGender(client.settings.getDefaultIdentityGender());
setIdentityAgeRange(client.settings.getDefaultIdentityAgeRange());
+
+ setPrivateDomains(privateList);
+ setPublicDomains(publicList);
+ let domain = client.settings.getDefaultEmailDomain();
+ if (domain.length === 0 || hidden.includes(domain)) {
+ domain = hasValidPrivateDomains(privateList) ? privateList[0] : publicList[0] ?? '';
+ }
+ setDefaultEmailDomain(domain);
};
void load();
return (): void => {
@@ -73,8 +95,8 @@ const IdentityGeneratorSettings: React.FC = () => {
<SettingsPageHeader icon="identityGenerator" title={t('settings.identityGenerator')} description={t('settings.identityGeneratorSettings.description')} />
<PageContent>
- <Card>
- <div className="mb-4">
+ <Card className="space-y-5">
+ <div>
<FormLabel htmlFor="defaultIdentityLanguage">{t('settings.language')}</FormLabel>
<Select id="defaultIdentityLanguage" value={identityLanguage} onChange={(e) => {
setIdentityLanguage(e.target.value);
@@ -82,10 +104,10 @@ const IdentityGeneratorSettings: React.FC = () => {
}}>
{identityLanguages.map(code => <option key={code} value={code}>{getLanguageInfo(code).flag} {getLanguageInfo(code).label}</option>)}
</Select>
- <span className="block text-sm font-normal text-gray-500 truncate dark:text-gray-400">{t('settings.general.aliasGenerationLanguageDescription')}</span>
+ <span className="block mt-2 text-sm text-gray-500 dark:text-gray-400">{t('settings.general.aliasGenerationLanguageDescription')}</span>
</div>
- <div className="mb-4">
+ <div>
<FormLabel htmlFor="defaultIdentityGender">{t('fieldLabels.alias.gender')}</FormLabel>
<Select id="defaultIdentityGender" value={identityGender} onChange={(e) => {
setIdentityGender(e.target.value);
@@ -95,10 +117,10 @@ const IdentityGeneratorSettings: React.FC = () => {
<option value="male">{t('settings.identityGeneratorSettings.genderOptions.male')}</option>
<option value="female">{t('settings.identityGeneratorSettings.genderOptions.female')}</option>
</Select>
- <span className="block text-sm font-normal text-gray-500 truncate dark:text-gray-400">{t('settings.general.aliasGenerationGenderDescription')}</span>
+ <span className="block mt-2 text-sm text-gray-500 dark:text-gray-400">{t('settings.general.aliasGenerationGenderDescription')}</span>
</div>
- <div className="mb-4">
+ <div>
<FormLabel htmlFor="defaultIdentityAgeRange">{t('settings.identityGeneratorSettings.ageRangeSection')}</FormLabel>
<Select id="defaultIdentityAgeRange" value={identityAgeRange} onChange={(e) => {
setIdentityAgeRange(e.target.value);
@@ -106,7 +128,30 @@ const IdentityGeneratorSettings: React.FC = () => {
}}>
{ageRanges.map(range => <option key={range} value={range}>{range === 'random' ? t('settings.identityGeneratorSettings.genderOptions.random') : range}</option>)}
</Select>
- <span className="block text-sm font-normal text-gray-500 truncate dark:text-gray-400">{t('settings.general.aliasGenerationAgeRangeDescription')}</span>
+ <span className="block mt-2 text-sm text-gray-500 dark:text-gray-400">{t('settings.general.aliasGenerationAgeRangeDescription')}</span>
+ </div>
+ </Card>
+
+ <Card>
+ <SectionTitle className="mb-4">{t('settings.general.emailSettingsTitle')}</SectionTitle>
+ <div>
+ <FormLabel htmlFor="defaultEmailDomain">{t('settings.general.defaultEmailDomainLabel')}</FormLabel>
+ <Select id="defaultEmailDomain" value={defaultEmailDomain} onChange={(e) => {
+ setDefaultEmailDomain(e.target.value);
+ void updateSetting('DefaultEmailDomain', e.target.value);
+ }}>
+ <optgroup label={t('settings.general.privateDomainsLabel')}>
+ {hasValidPrivateDomains(privateDomains)
+ ? privateDomains.map(domain => <option key={domain} value={domain}>{domain}</option>)
+ : <option disabled value="_">{t('settings.general.privateDomainsDisabledLabel')}</option>}
+ </optgroup>
+ <optgroup label={t('settings.general.publicDomainsLabel')}>
+ {publicDomains.map(domain => <option key={domain} value={domain}>{domain}</option>)}
+ </optgroup>
+ </Select>
+ <span className="block text-sm font-normal text-gray-500 dark:text-gray-400 mt-2">
+ {t('settings.general.defaultEmailDomainDescription')} {t('settings.general.defaultEmailDomainDescriptionNote')} <a href="https://docs.aliasvault.com/misc/private-vs-public-email.html" className="text-primary-500 hover:text-primary-700 hover:underline" target="_blank" rel="noopener noreferrer">{t('settings.general.defaultEmailDomainLearnMore')}</a>.
+ </span>
</div>
</Card>
</PageContent>
diff --git a/apps/web/src/pages/settings/Settings.tsx b/apps/web/src/pages/settings/Settings.tsx
index bc2035da0..1f0912a10 100644
--- a/apps/web/src/pages/settings/Settings.tsx
+++ b/apps/web/src/pages/settings/Settings.tsx
@@ -1,4 +1,3 @@
-import { AppInfo } from '@aliasvault/client/platform/AppInfo';
import { familySharingText } from '@aliasvault/client/sharing/FamilySharingView';
import { CapabilityKeys } from '@aliasvault/models/webapi';
import React from 'react';
@@ -8,6 +7,7 @@ import { Link } from 'react-router-dom';
import SettingsIcon, { type SettingsIconName } from '@/components/settings/SettingsIcon';
import PageContent from '@/components/shared/PageContent';
import PageHeader from '@/components/shared/PageHeader';
+import { useAccountReminders } from '@/context/AccountReminderContext';
import { useAuth } from '@/context/AuthContext';
import { useCapabilities } from '@/context/CapabilityContext';
import { useConfirmLogout } from '@/hooks/useConfirmLogout';
@@ -21,13 +21,15 @@ type SettingsRow = {
description: string;
icon: SettingsIconName;
to: string;
+ danger?: boolean;
+ reminder?: boolean;
};
/**
- * A titled group of rows on the settings overview.
+ * A group of rows on the settings overview, with an optional title.
*/
type SettingsGroup = {
- title: string;
+ title?: string;
rows: SettingsRow[];
};
@@ -36,11 +38,12 @@ type SettingsGroup = {
*/
const RowContent: React.FC<{ row: SettingsRow }> = ({ row }) => (
<>
- <SettingsIcon name={row.icon} className="flex-shrink-0 w-5 h-5 mt-0.5 text-primary-600 dark:text-primary-400" />
- <span className="min-w-0">
- <span className="block text-base font-medium text-gray-900 dark:text-white">{row.label}</span>
+ <SettingsIcon name={row.icon} className={`flex-shrink-0 w-5 h-5 mt-0.5 ${row.danger ? 'text-red-600 dark:text-red-400' : 'text-primary-600 dark:text-primary-400'}`} />
+ <span className="min-w-0 flex-1">
+ <span className={`block text-base font-medium ${row.danger ? 'text-red-600 dark:text-red-400' : 'text-gray-900 dark:text-white'}`}>{row.label}</span>
<span className="block text-sm text-gray-500 dark:text-gray-400 line-clamp-2" title={row.description}>{row.description}</span>
</span>
+ {row.reminder && <span className="flex-shrink-0 w-2 h-2 mt-2 rounded-full bg-primary-500" aria-hidden="true" />}
</>
);
@@ -52,47 +55,67 @@ const Row: React.FC<{ row: SettingsRow }> = ({ row }) => (
);
/**
- * Settings overview: the same groups and order as the browser extension and mobile app settings.
+ * A card holding one group of rows.
+ */
+const Group: React.FC<{ group: SettingsGroup; className?: string }> = ({ group, className = '' }) => (
+ <section className={`bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 dark:bg-gray-800 overflow-hidden ${className}`.trim()}>
+ {group.title && <h2 className="px-4 pt-3 pb-2.5 text-xs font-semibold uppercase tracking-wide text-gray-500 dark:text-gray-400">{group.title}</h2>}
+ <div className="divide-y divide-gray-200 dark:divide-gray-700">
+ {group.rows.map((row) => <Row key={row.label} row={row} />)}
+ </div>
+ </section>
+);
+
+/**
+ * Settings overview.
*/
const Settings: React.FC = () => {
const { t } = useTranslation();
const { username } = useAuth();
const hasCapability = useCapabilities();
const confirmLogout = useConfirmLogout();
+ const { reminders } = useAccountReminders();
usePageTitle(t('common.settings'));
- const groups: SettingsGroup[] = [
- {
- title: t('settings.security'),
- rows: [
- { to: '/settings/two-factor', label: t('common.twoFactorAuthentication'), description: t('settings.securitySettings.enable2fa.pageDescription'), icon: 'twoFactor' },
- { to: '/settings/sessions', label: t('settings.sessionsAndLogs'), description: t('settings.sessionsAndLogsDescription'), icon: 'sessions' },
- { to: '/settings/security', label: t('settings.securitySettings.pageTitle'), description: t('settings.securitySettings.description'), icon: 'security' },
- ],
- },
- {
- title: t('settings.groups.generators'),
- rows: [
- { to: '/settings/password-generator', label: t('settings.passwordGenerator'), description: t('settings.passwordGeneratorSettings.description'), icon: 'passwordGenerator' },
- { to: '/settings/identity-generator', label: t('settings.identityGenerator'), description: t('settings.identityGeneratorSettings.description'), icon: 'identityGenerator' },
- ],
- },
- {
- title: t('navigation.vault'),
- rows: [
- { to: '/settings/import-export', label: t('settings.importExport'), description: t('importExport.pageDescription'), icon: 'importExport' },
- { to: '/settings/storage-insights', label: t('settings.storageInsights.breadcrumbTitle'), description: t('settings.storageInsights.pageDescription'), icon: 'storage' },
- ],
- },
- {
- title: t('settings.groups.general'),
- rows: [
- { to: '/settings/general', label: t('settings.general.pageTitle'), description: t('settings.general.pageDescription'), icon: 'general' },
- { to: '/settings/apps', label: t('settings.apps.pageTitle'), description: t('settings.apps.pageDescription'), icon: 'apps' },
- ],
- },
- ];
+ const security: SettingsGroup = {
+ title: t('settings.security'),
+ rows: [
+ { to: '/settings/security/change-password', label: t('settings.securitySettings.changeMasterPassword'), description: t('settings.securitySettings.changePassword.description'), icon: 'changePassword' },
+ { to: '/settings/two-factor', label: t('common.twoFactorAuthentication'), description: t('settings.securitySettings.enable2fa.pageDescription'), icon: 'twoFactor', reminder: reminders.enableTwoFactor },
+ { to: '/settings/sessions', label: t('settings.sessionsAndLogs'), description: t('settings.sessionsAndLogsDescription'), icon: 'sessions' },
+ { to: '/settings/security/vault-unlock', label: t('settings.vaultUnlock'), description: t('settings.vaultUnlockSettings.description'), icon: 'vaultUnlock' },
+ { to: '/settings/security/clipboard', label: t('settings.clipboardClear'), description: t('settings.clipboardClearDescription'), icon: 'clipboard' },
+ ],
+ };
+ const dangerZone: SettingsGroup = {
+ rows: [
+ { to: '/settings/security/delete-account', label: t('settings.securitySettings.deleteAccount.deleteAccount'), description: t('settings.securitySettings.deleteAccountSection.description'), icon: 'deleteAccount', danger: true },
+ ],
+ };
+ const generators: SettingsGroup = {
+ title: t('settings.groups.generators'),
+ rows: [
+ { to: '/settings/password-generator', label: t('settings.passwordGenerator'), description: t('settings.passwordGeneratorSettings.description'), icon: 'passwordGenerator' },
+ { to: '/settings/identity-generator', label: t('settings.identityGenerator'), description: t('settings.identityGeneratorSettings.description'), icon: 'identityGenerator' },
+ ],
+ };
+ const vault: SettingsGroup = {
+ title: t('navigation.vault'),
+ rows: [
+ { to: '/settings/import-export', label: t('settings.importExport'), description: t('importExport.pageDescription'), icon: 'importExport' },
+ { to: '/settings/storage-insights', label: t('settings.storageInsights.breadcrumbTitle'), description: t('settings.storageInsights.pageDescription'), icon: 'storage' },
+ ],
+ };
+ const general: SettingsGroup = {
+ title: t('settings.groups.general'),
+ rows: [
+ { to: '/settings/general', label: t('settings.general.pageTitle'), description: t('settings.general.pageDescription'), icon: 'general' },
+ { to: '/settings/apps', label: t('settings.apps.pageTitle'), description: t('settings.apps.pageDescription'), icon: 'apps' },
+ ],
+ };
+
+ const preferences: SettingsGroup[] = [generators, vault, general];
return (
<>
@@ -124,19 +147,13 @@ const Settings: React.FC = () => {
</button>
</div>
</section>
-
- <div className="grid grid-cols-1 md:grid-cols-2 gap-4 items-start">
- {groups.map((group) => (
- <section key={group.title} className="bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 dark:bg-gray-800 overflow-hidden">
- <h2 className="px-4 pt-3 pb-2.5 text-xs font-semibold uppercase tracking-wide text-gray-500 dark:text-gray-400">{group.title}</h2>
- <div className="divide-y divide-gray-200 dark:divide-gray-700">
- {group.rows.map((row) => <Row key={row.label} row={row} />)}
- </div>
- </section>
- ))}
+ <div className="grid grid-cols-1 md:grid-cols-2 md:grid-rows-[auto_1fr] gap-4 items-start">
+ <Group group={security} className="md:col-start-1 md:row-start-1" />
+ <div className="space-y-4 md:col-start-2 md:row-start-1 md:row-span-2">
+ {preferences.map((group) => <Group key={group.title} group={group} />)}
+ </div>
+ <Group group={dangerZone} className="md:col-start-1 md:row-start-2" />
</div>
-
- <p className="text-center text-sm text-gray-400 dark:text-gray-500"><span className="font-bold">{t('settings.appVersion')}:</span> {AppInfo.VERSION}</p>
</div>
</PageContent>
</>
diff --git a/apps/web/src/pages/settings/importexport/ImportExport.tsx b/apps/web/src/pages/settings/importexport/ImportExport.tsx
index 53503928d..c0455b207 100644
--- a/apps/web/src/pages/settings/importexport/ImportExport.tsx
+++ b/apps/web/src/pages/settings/importexport/ImportExport.tsx
@@ -223,11 +223,11 @@ const ImportExport: React.FC = () => {
<p className="text-sm text-gray-500 dark:text-gray-400 mb-4">{t('importExport.exportSectionDescription')}</p>
<div className="space-y-3">
- <div className="flex items-center justify-between p-3 border-2 border-amber-200 dark:border-amber-800 rounded-lg bg-amber-50 dark:bg-amber-900/20">
+ <div className="flex items-center justify-between p-3 border-2 border-amber-300 dark:border-amber-500/40 rounded-lg bg-amber-50 dark:bg-amber-500/10">
<div className="flex-1 min-w-0 mr-4">
<div className="flex items-center gap-2 mb-1">
<h4 className="text-sm font-semibold text-gray-900 dark:text-white">{t('importExport.exportAvexTitle')}</h4>
- <span className="px-1.5 py-0.5 text-xs font-medium text-amber-700 dark:text-amber-300 bg-amber-100 dark:bg-amber-900 rounded">{t('importExport.recommendedLabel')}</span>
+ <span className="px-1.5 py-0.5 text-xs font-medium text-amber-900 dark:text-amber-100 bg-amber-100 dark:bg-amber-500/20 rounded">{t('importExport.recommendedLabel')}</span>
</div>
<p className="text-sm text-gray-600 dark:text-gray-300">{t('importExport.exportAvexDescription')}</p>
</div>
diff --git a/apps/web/src/pages/settings/security/ChangePassword.tsx b/apps/web/src/pages/settings/security/ChangePassword.tsx
index e1d1c1c08..343faf057 100644
--- a/apps/web/src/pages/settings/security/ChangePassword.tsx
+++ b/apps/web/src/pages/settings/security/ChangePassword.tsx
@@ -29,7 +29,7 @@ const ChangePassword: React.FC = () => {
const { showLoading, hideLoading } = useLoading();
const { syncVault } = useVaultSync();
- usePageTitle(t('settings.securitySettings.changePassword.changePassword'));
+ usePageTitle(t('settings.securitySettings.changeMasterPassword'));
const [currentPassword, setCurrentPassword] = useState('');
const [newPassword, setNewPassword] = useState('');
@@ -113,7 +113,7 @@ const ChangePassword: React.FC = () => {
return (
<>
- <SettingsPageHeader icon="security" title={t('settings.securitySettings.changePassword.changePassword')} description={t('settings.securitySettings.changePassword.headerText')} backTo={{ url: '/settings/security', label: t('settings.securitySettings.pageTitle') }} />
+ <SettingsPageHeader icon="changePassword" title={t('settings.securitySettings.changeMasterPassword')} description={t('settings.securitySettings.changePassword.headerText')} />
<Card>
<form onSubmit={changePassword} className="space-y-4">
diff --git a/apps/web/src/pages/settings/security/Clipboard.tsx b/apps/web/src/pages/settings/security/Clipboard.tsx
new file mode 100644
index 000000000..7831aabb2
--- /dev/null
+++ b/apps/web/src/pages/settings/security/Clipboard.tsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+import ClipboardClearSection from '@/components/settings/security/ClipboardClearSection';
+import SettingsPageHeader from '@/components/settings/SettingsPageHeader';
+import PageContent from '@/components/shared/PageContent';
+import { usePageTitle } from '@/hooks/usePageTitle';
+
+/**
+ * The clipboard page: how long copied secrets stay on the clipboard.
+ */
+const Clipboard: React.FC = () => {
+ const { t } = useTranslation();
+
+ usePageTitle(t('settings.clipboardClear'));
+
+ return (
+ <>
+ <SettingsPageHeader icon="clipboard" title={t('settings.clipboardClear')} description={t('settings.clipboardClearDescription')} />
+
+ <PageContent>
+ <ClipboardClearSection />
+ </PageContent>
+ </>
+ );
+};
+
+export default Clipboard;
diff --git a/apps/web/src/pages/settings/security/DeleteAccount.tsx b/apps/web/src/pages/settings/security/DeleteAccount.tsx
index b3487cfa4..3d7282990 100644
--- a/apps/web/src/pages/settings/security/DeleteAccount.tsx
+++ b/apps/web/src/pages/settings/security/DeleteAccount.tsx
@@ -81,7 +81,7 @@ const DeleteAccount: React.FC = () => {
return (
<>
- <SettingsPageHeader icon="security" title={t('settings.securitySettings.deleteAccount.deleteAccount')} backTo={{ url: '/settings/security', label: t('settings.securitySettings.pageTitle') }} />
+ <SettingsPageHeader icon="deleteAccount" title={t('settings.securitySettings.deleteAccount.deleteAccount')} description={t('settings.securitySettings.deleteAccountSection.description')} />
<Card>
{!showPasswordConfirm ? (
diff --git a/apps/web/src/pages/settings/security/Security.tsx b/apps/web/src/pages/settings/security/Security.tsx
deleted file mode 100644
index 37aa3aef1..000000000
--- a/apps/web/src/pages/settings/security/Security.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-
-import ClipboardClearSection from '@/components/settings/security/ClipboardClearSection';
-import DeleteAccountSection from '@/components/settings/security/DeleteAccountSection';
-import PasswordChangeSection from '@/components/settings/security/PasswordChangeSection';
-import QuickVaultUnlockSection from '@/components/settings/security/QuickVaultUnlockSection';
-import SettingsPageHeader from '@/components/settings/SettingsPageHeader';
-import PageContent from '@/components/shared/PageContent';
-import { usePageTitle } from '@/hooks/usePageTitle';
-
-/**
- * The security settings page.
- */
-const SecuritySettings: React.FC = () => {
- const { t } = useTranslation();
-
- usePageTitle(t('settings.securitySettings.pageTitle'));
-
- return (
- <>
- <SettingsPageHeader icon="security" title={t('settings.securitySettings.pageTitle')} description={t('settings.securitySettings.pageDescription')} />
-
- <PageContent>
- <PasswordChangeSection />
- <ClipboardClearSection />
- <QuickVaultUnlockSection />
- <DeleteAccountSection />
- </PageContent>
- </>
- );
-};
-
-export default SecuritySettings;
diff --git a/apps/web/src/pages/settings/security/TwoFactor.tsx b/apps/web/src/pages/settings/security/TwoFactor.tsx
index 05441c136..7721317a6 100644
--- a/apps/web/src/pages/settings/security/TwoFactor.tsx
+++ b/apps/web/src/pages/settings/security/TwoFactor.tsx
@@ -2,15 +2,17 @@ import React, { useCallback, useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
+import WarningBox from '@/components/alerts/WarningBox';
import LoadingIndicator from '@/components/loading/LoadingIndicator';
-import SettingsIcon from '@/components/settings/SettingsIcon';
import SettingsPageHeader from '@/components/settings/SettingsPageHeader';
import TwoFactorDisableStep from '@/components/settings/twofactor/TwoFactorDisableStep';
import TwoFactorEnableStep from '@/components/settings/twofactor/TwoFactorEnableStep';
import Button from '@/components/shared/Button';
import Card from '@/components/shared/Card';
import PageContent from '@/components/shared/PageContent';
+import StatusPill from '@/components/shared/StatusPill';
import Text from '@/components/shared/Text';
+import { useAccountReminders } from '@/context/AccountReminderContext';
import { useWebApi } from '@/context/WebApiContext';
import { usePageTitle } from '@/hooks/usePageTitle';
@@ -25,6 +27,7 @@ const TwoFactorStatus: React.FC = () => {
const { t } = useTranslation();
const navigate = useNavigate();
const webApi = useWebApi();
+ const { twoFactorReminderDismissed, dismissTwoFactorReminder } = useAccountReminders();
const [isLoading, setIsLoading] = useState(true);
const [enabled, setEnabled] = useState(false);
@@ -49,18 +52,13 @@ const TwoFactorStatus: React.FC = () => {
return (
<>
- {!enabled && (
- <div id="two-factor-warning" role="alert" className="flex items-start gap-3 mx-4 mb-4 p-4 rounded-lg border border-amber-300 bg-amber-50 text-amber-900 dark:border-amber-700 dark:bg-amber-900/20 dark:text-amber-200">
- <span className="flex-shrink-0 flex items-center justify-center w-8 h-8 rounded-full bg-amber-100 text-amber-600 dark:bg-amber-900/40 dark:text-amber-400">
- <SettingsIcon name="warning" className="w-5 h-5" />
- </span>
- <p className="text-sm pt-1.5">{t('settings.securitySettings.twoFactor.notEnabledWarning')}</p>
- </div>
+ {!enabled && !twoFactorReminderDismissed && (
+ <WarningBox id="two-factor-warning" icon="exclamation" className="mx-4 mb-4" actions={<Button id="two-factor-warning-dismiss" color="outline" onClick={() => void dismissTwoFactorReminder()}>{t('common.dismiss')}</Button>}>
+ <p>{t('settings.securitySettings.twoFactor.notEnabledWarning')}</p>
+ </WarningBox>
)}
<Card>
- <span id="two-factor-status" className={`inline-flex items-center px-2.5 py-0.5 text-sm font-semibold rounded-full ${enabled ? 'bg-green-100 text-green-800 dark:bg-green-900/50 dark:text-green-300' : 'bg-amber-100 text-amber-800 dark:bg-amber-900/50 dark:text-amber-300'}`}>
- {enabled ? t('common.enabled') : t('common.disabled')}
- </span>
+ <StatusPill id="two-factor-status" enabled={enabled} size="md" />
<Text className="mt-3 mb-5">
{enabled ? t('settings.securitySettings.twoFactor.enabledMessage') : t('settings.securitySettings.twoFactor.disabledMessage')}
</Text>
diff --git a/apps/web/src/pages/settings/security/VaultUnlock.tsx b/apps/web/src/pages/settings/security/VaultUnlock.tsx
new file mode 100644
index 000000000..22bb79979
--- /dev/null
+++ b/apps/web/src/pages/settings/security/VaultUnlock.tsx
@@ -0,0 +1,43 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+import QuickVaultUnlockSection from '@/components/settings/security/QuickVaultUnlockSection';
+import SettingsPageHeader from '@/components/settings/SettingsPageHeader';
+import Card from '@/components/shared/Card';
+import Icon from '@/components/shared/Icon';
+import PageContent from '@/components/shared/PageContent';
+import StatusPill from '@/components/shared/StatusPill';
+import Text from '@/components/shared/Text';
+import { usePageTitle } from '@/hooks/usePageTitle';
+
+/**
+ * The vault unlock method page.
+ */
+const VaultUnlock: React.FC = () => {
+ const { t } = useTranslation();
+
+ usePageTitle(t('settings.vaultUnlock'));
+
+ return (
+ <>
+ <SettingsPageHeader icon="vaultUnlock" title={t('settings.vaultUnlock')} description={t('settings.vaultUnlockSettings.description')} />
+
+ <PageContent>
+ <QuickVaultUnlockSection />
+
+ <Card className="bg-gray-50 dark:bg-gray-800/60">
+ <div className="flex items-center justify-between gap-3 mb-3">
+ <div className="flex items-center gap-3 min-w-0">
+ <Icon name="lock-closed" className="flex-shrink-0 w-5 h-5 text-gray-500 dark:text-gray-400" />
+ <h3 className="text-lg font-semibold text-gray-900 dark:text-white">{t('auth.masterPassword')}</h3>
+ </div>
+ <StatusPill id="master-password-unlock-status" enabled size="md" />
+ </div>
+ <Text variant="muted">{t('settings.vaultUnlockSettings.passwordHelp')}</Text>
+ </Card>
+ </PageContent>
+ </>
+ );
+};
+
+export default VaultUnlock;