Skip to content

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

Update web app general UI, settings menus, 2FA setup process, empty view behaviour (#2462)

Leendert de Borst96dd92498b3f
diff --git a/apps/web/src/App.tsx b/apps/web/src/App.tsx
index 54c5d6535..b936fad20 100644
--- a/apps/web/src/App.tsx
+++ b/apps/web/src/App.tsx
@@ -21,13 +21,16 @@ import NotFound from '@/pages/NotFound';
import AppsSettings from '@/pages/settings/Apps';
import FamilySharing from '@/pages/settings/FamilySharing';
import GeneralSettings from '@/pages/settings/General';
+import IdentityGeneratorSettings from '@/pages/settings/IdentityGenerator';
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 DeleteAccount from '@/pages/settings/security/DeleteAccount';
-import Disable2Fa from '@/pages/settings/security/Disable2Fa';
-import Enable2Fa from '@/pages/settings/security/Enable2Fa';
import SecuritySettings from '@/pages/settings/security/Security';
+import SessionsAndLogs from '@/pages/settings/security/SessionsAndLogs';
+import TwoFactor from '@/pages/settings/security/TwoFactor';
+import SettingsOverview from '@/pages/settings/Settings';
import StorageInsights from '@/pages/settings/StorageInsights';
import Sync from '@/pages/sync/Sync';
import Welcome from '@/pages/Welcome';
@@ -63,12 +66,17 @@ const App: React.FC = () => (
<Route path="/items/:manifestId/:id" element={<ItemView />} />
<Route path="/emails" element={<EmailsHome />} />
<Route path="/welcome" element={<Welcome />} />
+ <Route path="/settings" element={<SettingsOverview />} />
<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/change-password" element={<ChangePassword />} />
- <Route path="/settings/security/enable-2fa" element={<Enable2Fa />} />
- <Route path="/settings/security/disable-2fa" element={<Disable2Fa />} />
<Route path="/settings/security/delete-account" element={<DeleteAccount />} />
+ <Route path="/settings/sessions" element={<SessionsAndLogs />} />
+ <Route path="/settings/two-factor" element={<TwoFactor key="status" />} />
+ <Route path="/settings/two-factor/enable" element={<TwoFactor key="enable" mode="enable" />} />
+ <Route path="/settings/two-factor/disable" element={<TwoFactor key="disable" mode="disable" />} />
<Route path="/settings/storage-insights" element={<StorageInsights />} />
<Route path="/settings/family-sharing" element={<RequireCapability capability={CapabilityKeys.VaultSharing}><FamilySharing /></RequireCapability>} />
<Route path="/settings/import-export" element={<ImportExport />} />
diff --git a/apps/web/src/components/alerts/CriticalErrorPanel.tsx b/apps/web/src/components/alerts/CriticalErrorPanel.tsx
index 5b965122d..0a8f10f69 100644
--- a/apps/web/src/components/alerts/CriticalErrorPanel.tsx
+++ b/apps/web/src/components/alerts/CriticalErrorPanel.tsx
@@ -3,6 +3,7 @@ import { useTranslation } from 'react-i18next';
import AlertMessageError from '@/components/alerts/AlertMessageError';
import SupportContact from '@/components/alerts/SupportContact';
+import Button from '@/components/shared/Button';
type CriticalErrorPanelProps = {
report?: string | null;
@@ -66,9 +67,7 @@ const CriticalErrorPanel: React.FC<CriticalErrorPanelProps> = ({ report, title,
{!hideSupportContact && <SupportContact report={report} className="mt-3" />}
{onAction && (
- <button type="button" id="critical-error-action" onClick={onAction} className="mt-6 w-full px-5 py-2 text-base font-medium text-center text-white bg-primary-700 rounded-lg hover:bg-primary-800 focus:ring-4 focus:ring-primary-300 dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800">
- {actionLabel ?? t('common.back')}
- </button>
+ <Button id="critical-error-action" onClick={onAction} size="lg" additionalClasses="mt-6 w-full">{actionLabel ?? t('common.back')}</Button>
)}
</div>
diff --git a/apps/web/src/components/attachments/AttachmentViewer.tsx b/apps/web/src/components/attachments/AttachmentViewer.tsx
index 44fd20963..285d797df 100644
--- a/apps/web/src/components/attachments/AttachmentViewer.tsx
+++ b/apps/web/src/components/attachments/AttachmentViewer.tsx
@@ -4,6 +4,7 @@ import { useTranslation } from 'react-i18next';
import Card from '@/components/shared/Card';
import SectionTitle from '@/components/shared/SectionTitle';
+import Text from '@/components/shared/Text';
import type { Attachment } from '@aliasvault/models/vault';
@@ -89,7 +90,7 @@ const AttachmentViewer: React.FC<AttachmentViewerProps> = ({ attachments }) => {
})}
</div>
) : (
- <p className="text-gray-500 dark:text-gray-400">{t('items.noAttachments')}</p>
+ <Text variant="muted">{t('items.noAttachments')}</Text>
)}
</Card>
);
diff --git a/apps/web/src/components/forms/DraggableCustomFieldsList.tsx b/apps/web/src/components/forms/DraggableCustomFieldsList.tsx
index 47477bb18..8a1cef21c 100644
--- a/apps/web/src/components/forms/DraggableCustomFieldsList.tsx
+++ b/apps/web/src/components/forms/DraggableCustomFieldsList.tsx
@@ -3,8 +3,8 @@ import React, { useRef, useState } from 'react';
import CustomFieldLabel from '@/components/forms/CustomFieldLabel';
import CustomFieldModal from '@/components/forms/CustomFieldModal';
-import { EDIT_INPUT_CLASSES } from '@/components/forms/EditFormRow';
import EditPasswordFormRow from '@/components/forms/EditPasswordFormRow';
+import FormInput from '@/components/forms/FormInput';
import type { FieldEdit } from '@/models/ItemEdit';
type DraggableCustomFieldsListProps = {
@@ -118,7 +118,7 @@ const DraggableCustomFieldsList: React.FC<DraggableCustomFieldsListProps> = ({ c
{field.FieldType === FieldTypes.TextArea ? (
<div className="relative">
- <textarea id={inputId} style={{ height: '200px' }} className={EDIT_INPUT_CLASSES} value={field.Value} onChange={e => onValueChange(field.FieldKey, e.target.value)}></textarea>
+ <FormInput id={inputId} multiline value={field.Value} onValueChange={next => onValueChange(field.FieldKey, next)} />
</div>
) : field.FieldType === FieldTypes.Password ? (
<EditPasswordFormRow id={inputId} label="" value={field.Value} onChange={v => onValueChange(field.FieldKey, v)} showPassword={false} showGenerateButtons />
@@ -126,7 +126,7 @@ const DraggableCustomFieldsList: React.FC<DraggableCustomFieldsListProps> = ({ c
<EditPasswordFormRow id={inputId} label="" value={field.Value} onChange={v => onValueChange(field.FieldKey, v)} showPassword={false} showGenerateButtons={false} />
) : (
<div className="relative">
- <input type="text" id={inputId} autoComplete="off" className={EDIT_INPUT_CLASSES} value={field.Value} onChange={e => onValueChange(field.FieldKey, e.target.value)} autoCapitalize="off" autoCorrect="off" />
+ <FormInput id={inputId} value={field.Value} onValueChange={next => onValueChange(field.FieldKey, next)} />
</div>
)}
</div>
diff --git a/apps/web/src/components/forms/EditFormRow.tsx b/apps/web/src/components/forms/EditFormRow.tsx
index 78857aaa0..c3cb133ab 100644
--- a/apps/web/src/components/forms/EditFormRow.tsx
+++ b/apps/web/src/components/forms/EditFormRow.tsx
@@ -1,5 +1,6 @@
import React from 'react';
+import FormInput from '@/components/forms/FormInput';
import FormLabel from '@/components/shared/FormLabel';
import SectionTitle from '@/components/shared/SectionTitle';
@@ -14,9 +15,6 @@ type EditFormRowProps = {
labelStyle?: 'default' | 'header';
};
-/** Classes of every editable text input on the item form. */
-export const EDIT_INPUT_CLASSES = 'outline-0 shadow-sm bg-gray-50 border border-gray-300 text-gray-900 sm:text-sm rounded-lg block w-full p-2.5 pr-10 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white';
-
/**
* Labeled text input or textarea.
*/
@@ -26,11 +24,7 @@ const EditFormRow: React.FC<EditFormRowProps> = ({ id, label, type = 'text', val
? <SectionTitle htmlFor={id}>{label}</SectionTitle>
: <FormLabel htmlFor={id}>{label}</FormLabel>}
<div className="relative">
- {type === 'textarea' ? (
- <textarea id={id} style={{ height: '200px' }} className={EDIT_INPUT_CLASSES} value={value} onChange={e => onChange(e.target.value)} placeholder={placeholder} autoCapitalize="off" autoCorrect="off"></textarea>
- ) : (
- <input type="text" id={id} autoComplete="off" onFocus={onFocus} className={EDIT_INPUT_CLASSES} value={value} onChange={e => onChange(e.target.value)} placeholder={placeholder} autoCapitalize="off" autoCorrect="off" />
- )}
+ <FormInput id={id} multiline={type === 'textarea'} value={value} onValueChange={onChange} onFocus={onFocus} placeholder={placeholder} />
</div>
</>
);
diff --git a/apps/web/src/components/forms/EditPasswordFormRow.tsx b/apps/web/src/components/forms/EditPasswordFormRow.tsx
index 4cbcdbade..e3a1b7c2a 100644
--- a/apps/web/src/components/forms/EditPasswordFormRow.tsx
+++ b/apps/web/src/components/forms/EditPasswordFormRow.tsx
@@ -4,6 +4,7 @@ import { MAX_WORD_COUNT, MIN_WORD_COUNT } from '@aliasvault/models/defaults';
import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
+import FormInput from '@/components/forms/FormInput';
import PasswordSettingsPopup from '@/components/settings/PasswordSettingsPopup';
import FormLabel from '@/components/shared/FormLabel';
import { useDb } from '@/context/DbContext';
@@ -73,7 +74,7 @@ const EditPasswordFormRow: React.FC<EditPasswordFormRowProps> = ({ id, label, va
<FormLabel htmlFor={id}>{label}</FormLabel>
<div className="flex">
<div className="relative flex-grow">
- <input type={isVisible ? 'text' : 'password'} id={id} autoComplete="off" className="outline-0 shadow-sm bg-gray-50 border border-gray-300 text-gray-900 sm:text-sm rounded-l-lg block w-full p-2.5 pr-16 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white" value={value} onChange={e => onChange(e.target.value)} placeholder={placeholder} />
+ <FormInput type={isVisible ? 'text' : 'password'} id={id} attached="right" trailingSpace="lg" value={value} onValueChange={onChange} placeholder={placeholder} />
</div>
<div className="flex">
<button type="button" className={visibilityButtonClasses} onClick={() => setIsVisible(v => !v)}>
diff --git a/apps/web/src/components/forms/EditUsernameFormRow.tsx b/apps/web/src/components/forms/EditUsernameFormRow.tsx
index 1c2040382..9e2dd3db2 100644
--- a/apps/web/src/components/forms/EditUsernameFormRow.tsx
+++ b/apps/web/src/components/forms/EditUsernameFormRow.tsx
@@ -1,5 +1,6 @@
import React from 'react';
+import FormInput from '@/components/forms/FormInput';
import FormLabel from '@/components/shared/FormLabel';
type EditUsernameFormRowProps = {
@@ -19,7 +20,7 @@ const EditUsernameFormRow: React.FC<EditUsernameFormRowProps> = ({ id, label, va
<FormLabel htmlFor={id}>{label}</FormLabel>
<div className="flex">
<div className="relative flex-grow">
- <input type="text" id={id} autoComplete="off" className="outline-0 shadow-sm bg-gray-50 border border-gray-300 text-gray-900 sm:text-sm rounded-l-lg block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white" value={value} onChange={e => onChange(e.target.value)} placeholder={placeholder} />
+ <FormInput id={id} attached="right" trailingSpace="none" value={value} onValueChange={onChange} placeholder={placeholder} />
</div>
<button type="button" id="generate-username-button" className="px-3 text-gray-500 bg-gray-200 hover:bg-gray-300 focus:ring-4 focus:outline-none focus:ring-gray-300 font-medium rounded-r-lg text-sm dark:text-white dark:bg-gray-600 dark:hover:bg-gray-700 dark:focus:ring-gray-800" onClick={onGenerateNewUsername}>
<svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
diff --git a/apps/web/src/components/forms/EmailDomainField.tsx b/apps/web/src/components/forms/EmailDomainField.tsx
index 1c369952d..efc9f971c 100644
--- a/apps/web/src/components/forms/EmailDomainField.tsx
+++ b/apps/web/src/components/forms/EmailDomainField.tsx
@@ -1,6 +1,7 @@
import React, { useEffect, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
+import ToggleChip from '@/components/shared/ToggleChip';
import { getAppConfig } from '@/config/AppConfig';
import { useDb } from '@/context/DbContext';
import { vaultStore } from '@/vault/VaultStore';
@@ -165,11 +166,6 @@ const EmailDomainField: React.FC<EmailDomainFieldProps> = ({ id, value, onChange
onGenerateAlias?.();
};
- /**
- * Classes of a domain chip in the popup.
- */
- const domainButtonClasses = (domain: string): string => `px-3 py-1.5 text-sm rounded-md transition-colors ${selectedDomain === domain ? 'bg-primary-600 text-white hover:bg-primary-700' : 'bg-gray-100 dark:bg-gray-700 text-gray-700 dark:text-gray-300 hover:bg-gray-200 dark:hover:bg-gray-600 border border-gray-300 dark:border-gray-600'}`;
-
return (
<>
<div className="space-y-2">
@@ -224,7 +220,7 @@ const EmailDomainField: React.FC<EmailDomainFieldProps> = ({ id, value, onChange
</h4>
<p className="text-xs text-gray-500 dark:text-gray-400 mb-3">{t('items.privateEmailDescription')}</p>
<div className="flex flex-wrap gap-2">
- {privateDomains.map(domain => <button key={domain} type="button" onClick={() => selectDomain(domain)} className={domainButtonClasses(domain)}>{domain}</button>)}
+ {privateDomains.map(domain => <ToggleChip key={domain} selected={selectedDomain === domain} outlined onClick={() => selectDomain(domain)}>{domain}</ToggleChip>)}
</div>
</div>
)}
@@ -233,7 +229,7 @@ const EmailDomainField: React.FC<EmailDomainFieldProps> = ({ id, value, onChange
<h4 className="text-sm font-semibold text-gray-700 dark:text-gray-300 mb-2">{t('items.publicEmailTitle')}</h4>
<p className="text-xs text-gray-500 dark:text-gray-400 mb-3">{t('items.publicEmailDescription')}</p>
<div className="flex flex-wrap gap-2">
- {publicDomains.map(domain => <button key={domain} type="button" onClick={() => selectDomain(domain)} className={domainButtonClasses(domain)}>{domain}</button>)}
+ {publicDomains.map(domain => <ToggleChip key={domain} selected={selectedDomain === domain} outlined onClick={() => selectDomain(domain)}>{domain}</ToggleChip>)}
</div>
</div>
</div>
diff --git a/apps/web/src/components/forms/FormInput.tsx b/apps/web/src/components/forms/FormInput.tsx
new file mode 100644
index 000000000..ec732b19c
--- /dev/null
+++ b/apps/web/src/components/forms/FormInput.tsx
@@ -0,0 +1,25 @@
+import React from 'react';
+
+type FormInputProps = Omit<React.InputHTMLAttributes<HTMLInputElement>, 'onChange' | 'value' | 'className'> & {
+ id: string;
+ value: string;
+ onValueChange: (value: string) => void;
+ multiline?: boolean;
+ attached?: 'none' | 'right';
+ trailingSpace?: 'none' | 'sm' | 'lg';
+};
+
+/**
+ * Text input (or textarea) of the item form.
+ */
+const FormInput: React.FC<FormInputProps> = ({ id, value, onValueChange, multiline = false, attached = 'none', trailingSpace = 'sm', ...rest }) => {
+ const padding = trailingSpace === 'lg' ? 'pr-16' : trailingSpace === 'sm' ? 'pr-10' : '';
+ const className = `outline-0 shadow-sm bg-gray-50 border border-gray-300 text-gray-900 sm:text-sm ${attached === 'right' ? 'rounded-l-lg' : 'rounded-lg'} block w-full p-2.5 ${padding} dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white`;
+
+ if (multiline) {
+ return <textarea id={id} style={{ height: '200px' }} className={className} value={value} onChange={e => onValueChange(e.target.value)} placeholder={rest.placeholder} autoCapitalize="off" autoCorrect="off" />;
+ }
+ return <input type="text" id={id} autoComplete="off" autoCapitalize="off" autoCorrect="off" className={className} value={value} onChange={e => onValueChange(e.target.value)} {...rest} />;
+};
+
+export default FormInput;
diff --git a/apps/web/src/components/forms/MultiValueFormRow.tsx b/apps/web/src/components/forms/MultiValueFormRow.tsx
index 538d18ec6..de0440cae 100644
--- a/apps/web/src/components/forms/MultiValueFormRow.tsx
+++ b/apps/web/src/components/forms/MultiValueFormRow.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { EDIT_INPUT_CLASSES } from '@/components/forms/EditFormRow';
+import FormInput from '@/components/forms/FormInput';
import FormLabel from '@/components/shared/FormLabel';
type MultiValueFormRowProps = {
@@ -24,7 +24,7 @@ const MultiValueFormRow: React.FC<MultiValueFormRowProps> = ({ id, label, values
<div className="space-y-2">
{shown.map((value, index) => (
<div key={index} className="relative">
- <input type="text" id={`${id}-${index}`} autoComplete="off" className={EDIT_INPUT_CLASSES} value={value} onChange={e => onChange(shown.map((v, i) => i === index ? e.target.value : v))} onFocus={e => onFocus?.(index, e)} placeholder={placeholder} autoCapitalize="off" autoCorrect="off" />
+ <FormInput id={`${id}-${index}`} value={value} onValueChange={next => onChange(shown.map((v, i) => i === index ? next : v))} onFocus={e => onFocus?.(index, e)} placeholder={placeholder} />
{index === shown.length - 1 && (
<button type="button" id={`add-${id}`} onClick={() => onChange([...shown, ''])} className="absolute right-2 top-1/2 -translate-y-1/2 w-6 h-6 flex items-center justify-center text-gray-400 hover:text-primary-500 dark:hover:text-primary-400 transition-colors">
<svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
diff --git a/apps/web/src/components/items/AddFieldMenu.tsx b/apps/web/src/components/items/AddFieldMenu.tsx
index 38de62e47..98730b0d4 100644
--- a/apps/web/src/components/items/AddFieldMenu.tsx
+++ b/apps/web/src/components/items/AddFieldMenu.tsx
@@ -3,6 +3,7 @@ import React, { useState } from 'react';
import { useTranslation } from 'react-i18next';
import CustomFieldModal from '@/components/forms/CustomFieldModal';
+import MenuItem from '@/components/shared/MenuItem';
type AddFieldMenuProps = {
optionalSystemFields: SystemFieldDefinition[];
@@ -32,8 +33,6 @@ const FieldIcon: React.FC<{ category: string }> = ({ category }) => {
}
};
-const MENU_ITEM_CLASSES = 'w-full px-4 py-3 text-left hover:bg-gray-50 dark:hover:bg-gray-700 flex items-center gap-3 border-b border-gray-100 dark:border-gray-700 last:border-b-0 text-gray-700 dark:text-gray-300';
-
/**
* The "+" menu that adds optional fields and sections to the item form.
*/
@@ -54,57 +53,39 @@ const AddFieldMenu: React.FC<AddFieldMenuProps> = ({ optionalSystemFields, visib
{isOpen && (
<>
<div className="fixed inset-0 z-40 bg-black bg-opacity-50" onClick={() => setIsOpen(false)}></div>
- <div className="absolute bottom-full left-0 right-0 mb-1 z-50 bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-lg shadow-lg overflow-hidden max-h-64 overflow-y-auto">
+ <div className="absolute bottom-full left-0 right-0 mb-1 z-50 bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-lg shadow-lg overflow-hidden max-h-64 overflow-y-auto divide-y divide-gray-100 dark:divide-gray-700">
{optionalSystemFields.filter(f => !visibleFieldKeys.has(f.FieldKey)).map(field => (
- <button key={field.FieldKey} type="button" onClick={() => {
+ <MenuItem key={field.FieldKey} size="md" icon={<FieldIcon category={field.Category} />} label={t(`fieldLabels.${field.FieldKey}`, { defaultValue: field.FieldKey })} onClick={() => {
onAddSystemField(field.FieldKey);
setIsOpen(false);
- }} className={MENU_ITEM_CLASSES}>
- <span className="text-gray-500 dark:text-gray-400"><FieldIcon category={field.Category} /></span>
- <span>{t(`fieldLabels.${field.FieldKey}`, { defaultValue: field.FieldKey })}</span>
- </button>
+ }} />
))}
{!show2FA && hasLoginFields && (
- <button type="button" onClick={() => {
+ <MenuItem size="md" icon={<svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+ <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 15v2m-6 4h12a2 2 0 002-2v-6a2 2 0 00-2-2H6a2 2 0 00-2 2v6a2 2 0 002 2zm10-10V7a4 4 0 00-8 0v4h8z" />
+ </svg>} label={t('common.twoFactorAuthentication')} onClick={() => {
onAdd2FA();
setIsOpen(false);
- }} className={MENU_ITEM_CLASSES}>
- <span className="text-gray-500 dark:text-gray-400">
- <svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
- <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 15v2m-6 4h12a2 2 0 002-2v-6a2 2 0 00-2-2H6a2 2 0 00-2 2v6a2 2 0 002 2zm10-10V7a4 4 0 00-8 0v4h8z" />
- </svg>
- </span>
- <span>{t('common.twoFactorAuthentication')}</span>
- </button>
+ }} />
)}
{!showAttachments && (
- <button type="button" onClick={() => {
+ <MenuItem size="md" icon={<svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+ <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M15.172 7l-6.586 6.586a2 2 0 102.828 2.828l6.414-6.586a4 4 0 00-5.656-5.656l-6.415 6.585a6 6 0 108.486 8.486L20.5 13" />
+ </svg>} label={t('common.attachments')} onClick={() => {
onAddAttachments();
setIsOpen(false);
- }} className={MENU_ITEM_CLASSES}>
- <span className="text-gray-500 dark:text-gray-400">
- <svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
- <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M15.172 7l-6.586 6.586a2 2 0 102.828 2.828l6.414-6.586a4 4 0 00-5.656-5.656l-6.415 6.585a6 6 0 108.486 8.486L20.5 13" />
- </svg>
- </span>
- <span>{t('common.attachments')}</span>
- </button>
+ }} />
)}
- <button type="button" onClick={() => {
+ <MenuItem size="md" icon={<svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+ <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6" />
+ </svg>} label={t('itemTypes.addCustomField')} onClick={() => {
setCustomFieldLabel(t('items.addFieldMenu.defaultFieldLabel', { number: customFieldCount + 1 }));
setShowCustomFieldModal(true);
setIsOpen(false);
- }} className={MENU_ITEM_CLASSES}>
- <span className="text-gray-500 dark:text-gray-400">
- <svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
- <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6" />
- </svg>
- </span>
- <span>{t('itemTypes.addCustomField')}</span>
- </button>
+ }} />
</div>
</>
)}
diff --git a/apps/web/src/components/items/FieldHistoryModal.tsx b/apps/web/src/components/items/FieldHistoryModal.tsx
index 5c3431b18..00050f9c8 100644
--- a/apps/web/src/components/items/FieldHistoryModal.tsx
+++ b/apps/web/src/components/items/FieldHistoryModal.tsx
@@ -4,6 +4,7 @@ import { useTranslation } from 'react-i18next';
import CopyPasteFormRow from '@/components/forms/CopyPasteFormRow';
import CopyPastePasswordFormRow from '@/components/forms/CopyPastePasswordFormRow';
import Modal from '@/components/shared/Modal';
+import Text from '@/components/shared/Text';
import { useDb } from '@/context/DbContext';
import { useVaultMutate } from '@/hooks/useVaultMutate';
@@ -105,7 +106,7 @@ const FieldHistoryModal: React.FC<FieldHistoryModalProps> = ({ item, fieldKey, f
</svg>
</div>
) : records.length === 0 ? (
- <p className="text-gray-500 dark:text-gray-400 text-center py-8">{t('items.noHistoryAvailable')}</p>
+ <Text variant="muted" className="text-center py-8">{t('items.noHistoryAvailable')}</Text>
) : (
<div className="space-y-4">
{records.map((record) => {
diff --git a/apps/web/src/components/items/ItemCard.tsx b/apps/web/src/components/items/ItemCard.tsx
index 4c6f3c4a4..fc19e02d7 100644
--- a/apps/web/src/components/items/ItemCard.tsx
+++ b/apps/web/src/components/items/ItemCard.tsx
@@ -42,33 +42,35 @@ const ItemCard: React.FC<ItemCardProps> = ({ entry, onMutated }) => {
onContextMenu={(e) => {
e.preventDefault(); menuRef.current?.open(e.clientX, e.clientY);
}}
- className="credential-card relative group p-4 space-y-2 bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 dark:bg-gray-800 cursor-pointer hover:bg-gray-200 dark:hover:bg-gray-700 transition-colors duration-200">
- <div className="absolute top-2 right-2">
+ className="credential-card relative group px-3 py-2.5 md:p-4 md:space-y-2 bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 dark:bg-gray-800 cursor-pointer hover:bg-gray-200 dark:hover:bg-gray-700 transition-colors duration-200">
+ <div className="absolute inset-y-0 right-2 flex items-center md:inset-y-auto md:top-2 md:block">
<ItemContextMenu ref={menuRef} item={{ Id: entry.id, ManifestId: entry.manifestId }} itemName={entry.service} onMutated={onMutated} />
</div>
- <div className="px-4 py-2 text-gray-400 rounded text-center flex flex-col items-center">
- <div className="mb-2">
- <ItemIcon item={entry.item} altText={serviceName} sizeClass="w-12 h-12" />
+ <div className="flex flex-row items-center gap-3 pr-8 text-left md:flex-col md:gap-0 md:px-4 md:py-2 md:text-center text-gray-400 rounded">
+ <div className="flex-shrink-0 md:mb-2">
+ <ItemIcon item={entry.item} altText={serviceName} sizeClass="w-9 h-9 md:w-12 md:h-12" />
</div>
- <div className="flex items-center justify-center gap-1.5 w-full">
- <div className="text-gray-900 dark:text-gray-100 break-words truncate max-w-[150px]" title={serviceName}>{serviceName}</div>
- {entry.hasTotp && (
- <svg className="w-3.5 h-3.5 text-gray-500 dark:text-gray-400 flex-shrink-0" viewBox="0 -960 960 960" fill="currentColor" aria-label={t('items.hasTotp')}>
- <path d="M160-160q-33 0-56.5-23.5T80-240v-480q0-33 23.5-56.5T160-800h640q33 0 56.5 23.5T880-720v480q0 33-23.5 56.5T800-160H160Zm100-200h46v-240h-36l-70 50 24 36 36-26v180Zm124 0h156v-40h-94l-2-2q21-20 34.5-34t21.5-22q18-18 27-36t9-38q0-29-22-48.5T458-600q-26 0-47 15t-29 39l40 16q5-13 14.5-20.5T458-558q15 0 24.5 8t9.5 20q0 11-4 20.5T470-486l-32 32-54 54v40Zm296 0q36 0 58-20t22-52q0-18-10-32t-28-22v-2q14-8 22-20.5t8-29.5q0-27-21-44.5T678-600q-25 0-46.5 14.5T604-550l40 16q4-12 13-19t21-7q13 0 21.5 7.5T708-534q0 14-10 22t-26 8h-18v40h20q20 0 31 8t11 22q0 13-11 22.5t-25 9.5q-17 0-26-7.5T638-436l-40 16q7 29 28.5 44.5T680-360ZM160-240h640v-480H160v480Zm0 0v-480 480Z" />
- </svg>
- )}
- {entry.hasPasskey && (
- <svg className="w-3.5 h-3.5 text-gray-500 dark:text-gray-400 flex-shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" aria-label={t('items.hasPasskey')}>
- <path d="M21 2l-2 2m-7.61 7.61a5.5 5.5 0 1 1-7.778 7.778 5.5 5.5 0 0 1 7.777-7.777zm0 0L15.5 7.5m0 0l3 3L22 7l-3-3m-3.5 3.5L19 4" />
- </svg>
- )}
- {entry.hasAttachment && (
- <svg className="w-3.5 h-3.5 text-gray-500 dark:text-gray-400 flex-shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" aria-label={t('items.hasAttachments')}>
- <path d="M21.44 11.05l-9.19 9.19a6 6 0 0 1-8.49-8.49l9.19-9.19a4 4 0 0 1 5.66 5.66l-9.2 9.19a2 2 0 0 1-2.83-2.83l8.49-8.48" />
- </svg>
- )}
+ <div className="min-w-0 flex-1 md:w-full">
+ <div className="flex items-center justify-start md:justify-center gap-1.5 w-full">
+ <div className="text-gray-900 dark:text-gray-100 break-words truncate md:max-w-[150px]" title={serviceName}>{serviceName}</div>
+ {entry.hasTotp && (
+ <svg className="w-3.5 h-3.5 text-gray-500 dark:text-gray-400 flex-shrink-0" viewBox="0 -960 960 960" fill="currentColor" aria-label={t('items.hasTotp')}>
+ <path d="M160-160q-33 0-56.5-23.5T80-240v-480q0-33 23.5-56.5T160-800h640q33 0 56.5 23.5T880-720v480q0 33-23.5 56.5T800-160H160Zm100-200h46v-240h-36l-70 50 24 36 36-26v180Zm124 0h156v-40h-94l-2-2q21-20 34.5-34t21.5-22q18-18 27-36t9-38q0-29-22-48.5T458-600q-26 0-47 15t-29 39l40 16q5-13 14.5-20.5T458-558q15 0 24.5 8t9.5 20q0 11-4 20.5T470-486l-32 32-54 54v40Zm296 0q36 0 58-20t22-52q0-18-10-32t-28-22v-2q14-8 22-20.5t8-29.5q0-27-21-44.5T678-600q-25 0-46.5 14.5T604-550l40 16q4-12 13-19t21-7q13 0 21.5 7.5T708-534q0 14-10 22t-26 8h-18v40h20q20 0 31 8t11 22q0 13-11 22.5t-25 9.5q-17 0-26-7.5T638-436l-40 16q7 29 28.5 44.5T680-360ZM160-240h640v-480H160v480Zm0 0v-480 480Z" />
+ </svg>
+ )}
+ {entry.hasPasskey && (
+ <svg className="w-3.5 h-3.5 text-gray-500 dark:text-gray-400 flex-shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" aria-label={t('items.hasPasskey')}>
+ <path d="M21 2l-2 2m-7.61 7.61a5.5 5.5 0 1 1-7.778 7.778 5.5 5.5 0 0 1 7.777-7.777zm0 0L15.5 7.5m0 0l3 3L22 7l-3-3m-3.5 3.5L19 4" />
+ </svg>
+ )}
+ {entry.hasAttachment && (
+ <svg className="w-3.5 h-3.5 text-gray-500 dark:text-gray-400 flex-shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" aria-label={t('items.hasAttachments')}>
+ <path d="M21.44 11.05l-9.19 9.19a6 6 0 0 1-8.49-8.49l9.19-9.19a4 4 0 0 1 5.66 5.66l-9.2 9.19a2 2 0 0 1-2.83-2.83l8.49-8.48" />
+ </svg>
+ )}
+ </div>
+ <div className="text-gray-500 dark:text-gray-400 break-words w-full text-sm truncate" title={getDisplayText(entry)}>{getDisplayText(entry)}</div>
</div>
- <div className="text-gray-500 dark:text-gray-400 break-words w-full text-sm truncate" title={getDisplayText(entry)}>{getDisplayText(entry)}</div>
</div>
</div>
);
diff --git a/apps/web/src/components/layout/CreateNewIdentityWidget.tsx b/apps/web/src/components/items/QuickCreateDialog.tsx
similarity index 50%
rename from apps/web/src/components/layout/CreateNewIdentityWidget.tsx
rename to apps/web/src/components/items/QuickCreateDialog.tsx
index efd643884..a1eeea645 100644
--- a/apps/web/src/components/layout/CreateNewIdentityWidget.tsx
+++ b/apps/web/src/components/items/QuickCreateDialog.tsx
@@ -1,15 +1,14 @@
import { ItemTypes, type ItemType } from '@aliasvault/models/vault';
-import React, { useCallback, useEffect, useRef, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useLocation, useNavigate } from 'react-router-dom';
import FormLabel from '@/components/shared/FormLabel';
+import Modal from '@/components/shared/Modal';
import { useDb } from '@/context/DbContext';
import { useLoading } from '@/context/LoadingContext';
import { useNotifications } from '@/context/NotificationContext';
import { useWebApi } from '@/context/WebApiContext';
-import { useClickOutside } from '@/hooks/useClickOutside';
-import { useKeyboardShortcut } from '@/hooks/useKeyboardShortcut';
import { useSaveItem } from '@/hooks/useSaveItem';
import { createNewItemEdit, type ItemEdit, setFieldValue } from '@/models/ItemEdit';
import { generateIdentity } from '@/utils/IdentityGenerator';
@@ -30,11 +29,19 @@ const TYPE_ICON_PATHS: Record<ItemType, string> = {
const ALL_TYPES: ItemType[] = [ItemTypes.Login, ItemTypes.Alias, ItemTypes.CreditCard, ItemTypes.Note];
+type QuickCreateDialogProps = {
+ /** The type selected when the dialog opens. */
+ initialType: ItemType;
+ onClose: () => void;
+ /** `modal` centers it over the page; `popover` anchors it below its trigger (the parent is `relative`). */
+ variant?: 'modal' | 'popover';
+};
+
/**
- * The "+ New" button in the top bar with its quick create popup: an alias is created in place with a random
- * identity, the other types continue on the create page with the entered values.
+ * Quick create form, as a modal or a popover: an alias is created in place with a random identity, the other types
+ * continue on the create page with the entered values. New items land in the folder the user is looking at.
*/
-const CreateNewIdentityWidget: React.FC = () => {
+const QuickCreateDialog: React.FC<QuickCreateDialogProps> = ({ initialType, onClose, variant = 'modal' }) => {
const { t } = useTranslation();
const navigate = useNavigate();
const location = useLocation();
@@ -44,38 +51,30 @@ const CreateNewIdentityWidget: React.FC = () => {
const webApi = useWebApi();
const { saveItem } = useSaveItem();
const [isCreating, setIsCreating] = useState(false);
- const [isPopupVisible, setIsPopupVisible] = useState(false);
- const [itemType, setItemType] = useState<ItemType>(ItemTypes.Login);
+ const [itemType, setItemType] = useState<ItemType>(initialType);
const [serviceName, setServiceName] = useState('');
const [serviceUrl, setServiceUrl] = useState(DEFAULT_SERVICE_URL);
const [nameError, setNameError] = useState('');
- const containerRef = useRef<HTMLDivElement>(null);
const nameInputRef = useRef<HTMLInputElement>(null);
- /**
- * Close the popup.
- */
- const closePopup = useCallback((): void => setIsPopupVisible(false), []);
- useClickOutside([containerRef], closePopup, isPopupVisible);
-
- /**
- * Open the popup with a fresh form.
- */
- const showPopup = useCallback((): void => {
- setItemType(ItemTypes.Login);
- setServiceName('');
- setServiceUrl(DEFAULT_SERVICE_URL);
- setNameError('');
- setIsPopupVisible(true);
- }, []);
- useKeyboardShortcut('gc', showPopup);
+ useEffect(() => {
+ const timer = setTimeout(() => nameInputRef.current?.focus(), 50);
+ return (): void => clearTimeout(timer);
+ }, [itemType]);
useEffect(() => {
- if (isPopupVisible) {
- const timer = setTimeout(() => nameInputRef.current?.focus(), 100);
- return (): void => clearTimeout(timer);
- }
- }, [isPopupVisible, itemType]);
+ /**
+ * Escape closes the dialog.
+ */
+ const onKeyDown = (e: KeyboardEvent): void => {
+ if (e.key === 'Escape') {
+ e.stopPropagation();
+ onClose();
+ }
+ };
+ window.addEventListener('keydown', onKeyDown, true);
+ return (): void => window.removeEventListener('keydown', onKeyDown, true);
+ }, [onClose]);
/**
* The folder the user is looking at, if any.
@@ -111,7 +110,7 @@ const CreateNewIdentityWidget: React.FC = () => {
}
const saved = await saveItem(edit);
notifications.addSuccessMessage(t('items.toasts.itemCreated'));
- closePopup();
+ onClose();
navigate(itemRoute(saved));
} catch (error) {
console.error('Error creating alias:', error);
@@ -146,7 +145,7 @@ const CreateNewIdentityWidget: React.FC = () => {
params.set('folderId', folder.Id);
params.set('folderManifestId', folder.ManifestId);
}
- closePopup();
+ onClose();
navigate(`/items/create?${params.toString()}`);
};
@@ -186,81 +185,85 @@ const CreateNewIdentityWidget: React.FC = () => {
}
};
- const newAliasButtonText = t('items.quickCreate.newAliasButtonText');
-
- return (
- <div className="relative" ref={containerRef}>
- <button onClick={() => (isPopupVisible ? closePopup() : showPopup())} id="quickIdentityButton" className="px-4 py-2 text-sm font-medium text-white bg-gradient-to-r from-primary-500 to-primary-600 hover:from-primary-600 hover:to-primary-700 focus:outline-none dark:from-primary-400 dark:to-primary-500 dark:hover:from-primary-500 dark:hover:to-primary-600 rounded-md shadow-sm transition duration-150 ease-in-out transform hover:scale-105 active:scale-95 focus:shadow-outline">
- {t('items.quickCreate.newAliasButtonShort')} <span className="hidden md:inline">{newAliasButtonText.substring(1).trim()}</span>
- </button>
+ const form = (
+ <>
+ <div className="mb-4">
+ <div className="flex gap-1">
+ {ALL_TYPES.map(type => (
+ <button
+ key={type}
+ type="button"
+ id={`quickIdentityType_${type}`}
+ onClick={() => setItemType(type)}
+ className={`flex-1 px-2 py-2 text-xs font-medium rounded-md transition-colors flex flex-col items-center gap-1 ${itemType === type ? 'bg-primary-100 text-primary-700 dark:bg-primary-900/30 dark:text-primary-300 border border-primary-300 dark:border-primary-700' : 'bg-gray-100 text-gray-600 dark:bg-gray-700 dark:text-gray-300 hover:bg-gray-200 dark:hover:bg-gray-600 border border-transparent'}`}>
+ <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d={TYPE_ICON_PATHS[type]} /></svg>
+ <span>{getTypeDisplayName(type)}</span>
+ </button>
+ ))}
+ </div>
+ </div>
- {isPopupVisible && (
- <div id="quickIdentityPopup" className="absolute right-0 z-50 mt-2 p-4 bg-white rounded-lg shadow-xl border border-gray-300 dark:bg-gray-800 dark:border-gray-400" style={{ width: 'min(400px, calc(100vw - 20px))' }}>
+ <h3 className="text-lg font-semibold mb-4 text-gray-900 dark:text-white">{getPopupTitle()}</h3>
+ <form onSubmit={handleSubmit}>
+ <div className="mb-4">
+ <FormLabel htmlFor="serviceName">{t('items.itemName')}</FormLabel>
+ <input
+ ref={nameInputRef}
+ id="serviceName"
+ type="text"
+ value={serviceName}
+ onChange={(e) => {
+ setServiceName(e.target.value); setNameError('');
+ }}
+ placeholder={getNamePlaceholder()}
+ className="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-500 focus:border-primary-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-primary-500 dark:focus:border-primary-500" />
+ {nameError && <div className="validation-message text-sm mt-1">{nameError}</div>}
+ </div>
+ {(itemType === ItemTypes.Login || itemType === ItemTypes.Alias) && (
<div className="mb-4">
- <div className="flex gap-1">
- {ALL_TYPES.map(type => (
- <button
- key={type}
- type="button"
- id={`quickIdentityType_${type}`}
- onClick={() => setItemType(type)}
- className={`flex-1 px-2 py-2 text-xs font-medium rounded-md transition-colors flex flex-col items-center gap-1 ${itemType === type ? 'bg-primary-100 text-primary-700 dark:bg-primary-900/30 dark:text-primary-300 border border-primary-300 dark:border-primary-700' : 'bg-gray-100 text-gray-600 dark:bg-gray-700 dark:text-gray-300 hover:bg-gray-200 dark:hover:bg-gray-600 border border-transparent'}`}>
- <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d={TYPE_ICON_PATHS[type]} /></svg>
- <span>{getTypeDisplayName(type)}</span>
- </button>
- ))}
- </div>
+ <FormLabel htmlFor="serviceUrl">{t('fieldLabels.login.url')}</FormLabel>
+ <input
+ id="serviceUrl"
+ type="text"
+ value={serviceUrl}
+ onChange={(e) => setServiceUrl(e.target.value)}
+ onFocus={(e) => {
+ if (e.target.value === DEFAULT_SERVICE_URL) {
+ setTimeout(() => e.target.setSelectionRange(DEFAULT_SERVICE_URL.length, DEFAULT_SERVICE_URL.length), 1);
+ }
+ }}
+ className="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-500 focus:border-primary-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-primary-500 dark:focus:border-primary-500" />
</div>
-
- <h3 className="text-lg font-semibold mb-4 text-gray-900 dark:text-white">{getPopupTitle()}</h3>
- <form onSubmit={handleSubmit}>
- <div className="mb-4">
- <FormLabel htmlFor="serviceName">{t('items.itemName')}</FormLabel>
- <input
- ref={nameInputRef}
- id="serviceName"
- type="text"
- value={serviceName}
- onChange={(e) => {
- setServiceName(e.target.value); setNameError('');
- }}
- placeholder={getNamePlaceholder()}
- className="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-500 focus:border-primary-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-primary-500 dark:focus:border-primary-500" />
- {nameError && <div className="validation-message text-sm mt-1">{nameError}</div>}
- </div>
- {(itemType === ItemTypes.Login || itemType === ItemTypes.Alias) && (
- <div className="mb-4">
- <FormLabel htmlFor="serviceUrl">{t('fieldLabels.login.url')}</FormLabel>
- <input
- id="serviceUrl"
- type="text"
- value={serviceUrl}
- onChange={(e) => setServiceUrl(e.target.value)}
- onFocus={(e) => {
- if (e.target.value === DEFAULT_SERVICE_URL) {
- setTimeout(() => e.target.setSelectionRange(DEFAULT_SERVICE_URL.length, DEFAULT_SERVICE_URL.length), 1);
- }
- }}
- className="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-500 focus:border-primary-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-primary-500 dark:focus:border-primary-500" />
- </div>
+ )}
+ <div className="flex justify-between items-center">
+ <button id="quickIdentitySubmit" type="submit" className={`${itemType === ItemTypes.Alias ? 'bg-green-600 hover:bg-green-700' : 'bg-primary-600 hover:bg-primary-700'} text-white font-bold py-2 px-4 rounded flex items-center gap-2`}>
+ {itemType === ItemTypes.Alias ? t('common.create') : (
+ <>
+ {t('common.continue')}
+ <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+ <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M9 5l7 7-7 7" />
+ </svg>
+ </>
)}
- <div className="flex justify-between items-center">
- <button id="quickIdentitySubmit" type="submit" className={`${itemType === ItemTypes.Alias ? 'bg-green-600 hover:bg-green-700' : 'bg-primary-600 hover:bg-primary-700'} text-white font-bold py-2 px-4 rounded flex items-center gap-2`}>
- {itemType === ItemTypes.Alias ? t('common.create') : (
- <>
- {t('common.continue')}
- <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
- <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M9 5l7 7-7 7" />
- </svg>
- </>
- )}
- </button>
- </div>
- </form>
+ </button>
</div>
- )}
- </div>
+ </form>
+ </>
+ );
+
+ if (variant === 'popover') {
+ return (
+ <div id="quickIdentityPopup" className="absolute right-0 top-full z-50 mt-3 p-4 bg-white rounded-lg shadow-xl border border-gray-200 dark:bg-gray-800 dark:border-gray-600" style={{ width: 'min(400px, calc(100vw - 20px))' }}>
+ {form}
+ </div>
+ );
+ }
+
+ return (
+ <Modal id="quickIdentityPopup" position="top" panelClassName="p-4 sm:p-5 w-full max-w-md" onBackdropClick={onClose}>
+ {form}
+ </Modal>
);
};
-export default CreateNewIdentityWidget;
+export default QuickCreateDialog;
diff --git a/apps/web/src/components/layout/DbLockButton.tsx b/apps/web/src/components/layout/DbLockButton.tsx
index a2a104ce6..f198595bf 100644
--- a/apps/web/src/components/layout/DbLockButton.tsx
+++ b/apps/web/src/components/layout/DbLockButton.tsx
@@ -2,12 +2,14 @@ import React, { useCallback } from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
+import SettingsIcon from '@/components/settings/SettingsIcon';
+import MenuItem from '@/components/shared/MenuItem';
import { useDb } from '@/context/DbContext';
import { useKeyboardShortcut } from '@/hooks/useKeyboardShortcut';
import { vaultStore } from '@/vault/VaultStore';
/**
- * Lock the vault and redirect to the unlock page.
+ * Account menu row that locks the vault.
*/
const DbLockButton: React.FC = () => {
const { t } = useTranslation();
@@ -26,13 +28,7 @@ const DbLockButton: React.FC = () => {
useKeyboardShortcut('gl', lockFromShortcut);
return (
- <div className="ms-2 items-center hidden lg:flex">
- <button className="p-2 hover:bg-gray-200 rounded-2xl" onClick={onLockClick} title={t('common.lockVault')}>
- <svg xmlns="http://www.w3.org/2000/svg" className="h-4 w-4 text-gray-400" viewBox="0 0 20 20" fill="currentColor">
- <path fillRule="evenodd" d="M5 9V7a5 5 0 0110 0v2a2 2 0 012 2v5a2 2 0 01-2 2H5a2 2 0 01-2-2v-5a2 2 0 012-2zm8-2v2H7V7a3 3 0 016 0z" clipRule="evenodd" />
- </svg>
- </button>
- </div>
+ <MenuItem id="lockVaultButton" icon={<SettingsIcon name="lock" className="w-5 h-5" />} label={t('common.lockVault')} onClick={() => void onLockClick()} />
);
};
diff --git a/apps/web/src/components/layout/DbStatusIndicator.tsx b/apps/web/src/components/layout/DbStatusIndicator.tsx
index fa64ac2d6..b6e8977f8 100644
--- a/apps/web/src/components/layout/DbStatusIndicator.tsx
+++ b/apps/web/src/components/layout/DbStatusIndicator.tsx
@@ -14,9 +14,8 @@ import { vaultStore } from '@/vault/VaultStore';
const MIN_SPIN_MS = 600;
/**
- * Vault sync indicator in the top bar. Spins while syncing; otherwise a refresh button that pulls the latest vault,
- * marked with a red dot once a sync failed while the vault holds changes of the user the server does not have yet
- * (e.g. a background save that failed), so a click retries the push.
+ * Vault sync indicator in the top bar. Only visible when doing something: spins while syncing, and shows a
+ * retry button with a red dot once a sync failed while the vault holds changes of the user the server does not have yet.
*/
const DbStatusIndicator: React.FC = () => {
const { t } = useTranslation();
@@ -133,6 +132,10 @@ const DbStatusIndicator: React.FC = () => {
return t('common.syncVaultData');
};
+ if (!isSpinning && !showSyncError) {
+ return null;
+ }
+
return (
<div className="ms-1 items-center flex" id="vault-sync-indicator" data-syncing={isSpinning ? 'true' : 'false'}>
<SmallLoadingIndicator title={getStatusTitle()} spinning={isSpinning}>
diff --git a/apps/web/src/components/layout/NavBarLink.tsx b/apps/web/src/components/layout/NavBarLink.tsx
new file mode 100644
index 000000000..bcf47e5b6
--- /dev/null
+++ b/apps/web/src/components/layout/NavBarLink.tsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import { NavLink } from 'react-router-dom';
+
+/**
+ * A main navigation link in the top bar, highlighted while its route is active.
+ */
+const NavBarLink: React.FC<{ to: string; children: React.ReactNode }> = ({ to, children }) => (
+ <NavLink to={to} end className={({ isActive }) => `block ${isActive ? 'text-primary-700 dark:text-primary-500' : 'text-gray-700 hover:text-primary-700 dark:text-gray-400 dark:hover:text-white'}`}>
+ {children}
+ </NavLink>
+);
+
+export default NavBarLink;
diff --git a/apps/web/src/components/layout/SearchWidget.tsx b/apps/web/src/components/layout/SearchWidget.tsx
index 74b9dde07..1578d3f29 100644
--- a/apps/web/src/components/layout/SearchWidget.tsx
+++ b/apps/web/src/components/layout/SearchWidget.tsx
@@ -144,7 +144,7 @@ const SearchWidget: React.FC = () => {
type="text"
placeholder={t('items.searchPlaceholder')}
autoComplete="off"
- className="w-full px-4 py-2 text-gray-700 bg-white border rounded-lg focus:outline-none focus:ring-2 focus:ring-primary-500 dark:bg-gray-800 dark:text-gray-300 dark:border-gray-600 dark:focus:ring-primary-500"
+ className="w-full h-9 px-4 text-sm text-gray-700 bg-white border rounded-lg focus:outline-none focus:ring-2 focus:ring-primary-500 dark:bg-gray-800 dark:text-gray-300 dark:border-gray-600 dark:focus:ring-primary-500"
value={searchTerm}
onChange={(e) => onSearchTermChanged(e.target.value)}
onFocus={() => setShowPopup(true)}
diff --git a/apps/web/src/components/settings/PasswordSettingsPopup.tsx b/apps/web/src/components/settings/PasswordSettingsPopup.tsx
index 094a461a2..b843d7395 100644
--- a/apps/web/src/components/settings/PasswordSettingsPopup.tsx
+++ b/apps/web/src/components/settings/PasswordSettingsPopup.tsx
@@ -6,6 +6,8 @@ import { useTranslation } from 'react-i18next';
import CopyPasteFormRow from '@/components/forms/CopyPasteFormRow';
import Modal from '@/components/shared/Modal';
+import TabButton from '@/components/shared/TabButton';
+import ToggleChip from '@/components/shared/ToggleChip';
import { useDb } from '@/context/DbContext';
import { useLoading } from '@/context/LoadingContext';
import { useNotifications } from '@/context/NotificationContext';
@@ -34,22 +36,6 @@ const SALT_OPTIONS = ['None', 'Prefix', 'Sprinkle', 'Suffix'];
*/
const cycle = (options: string[], current: string | undefined): string => options[(options.indexOf(current ?? '') + 1) % options.length];
-/**
- * Classes of a character class toggle.
- */
-const toggleClasses = (enabled: boolean): string => {
- const base = 'flex items-center justify-center px-3 py-2 rounded-md text-sm font-medium transition-colors';
- return enabled ? `${base} bg-primary-600 text-white hover:bg-primary-700` : `${base} bg-gray-200 text-gray-700 hover:bg-gray-300 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600`;
-};
-
-/**
- * Classes of a passphrase option button.
- */
-const optionClasses = (customized: boolean): string => {
- const base = 'flex items-center justify-center px-2 py-2 rounded-md transition-colors';
- return customized ? `${base} bg-primary-600 text-white hover:bg-primary-700` : `${base} bg-gray-200 text-gray-700 hover:bg-gray-300 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600`;
-};
-
/**
* Glyph of a capitalization option.
*/
@@ -135,21 +121,14 @@ const PasswordSettingsPopup: React.FC<PasswordSettingsPopupProps> = ({ passwordS
return (): void => document.removeEventListener('keydown', onKeyDown);
});
- /**
- * Classes of a generator type tab.
- */
- const tabClasses = (type: string): string => {
- const active = (settings.Type && settings.Type.length > 0 ? settings.Type : 'basic') === type;
- const base = '-mb-px flex-1 border-b-2 px-3 py-3 text-sm font-medium transition-colors';
- return active ? `${base} border-primary-600 text-primary-600 dark:border-primary-500 dark:text-primary-500` : `${base} border-transparent text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200`;
- };
+ const activeType = settings.Type && settings.Type.length > 0 ? settings.Type : 'basic';
return (
<Modal id="passwordSettingsModal" onBackdropClick={onClose} panelClassName="p-5 pt-0 w-96 max-w-full">
<div className="m-2">
- <div className="flex border-b border-gray-200 dark:border-gray-700">
- <button type="button" onClick={() => handleSettingChange('Type', 'basic')} className={tabClasses('basic')}>{t('common.password')}</button>
- <button type="button" onClick={() => handleSettingChange('Type', 'diceware')} className={tabClasses('diceware')}>{t('items.passwordTypeDiceware')}</button>
+ <div className="flex border-b border-gray-200 dark:border-gray-700" role="tablist">
+ <TabButton active={activeType === 'basic'} onClick={() => handleSettingChange('Type', 'basic')}>{t('common.password')}</TabButton>
+ <TabButton active={activeType === 'diceware'} onClick={() => handleSettingChange('Type', 'diceware')}>{t('items.passwordTypeDiceware')}</TabButton>
</div>
<div className="mt-4 space-y-4">
@@ -177,10 +156,10 @@ const PasswordSettingsPopup: React.FC<PasswordSettingsPopupProps> = ({ passwordS
</div>
<div className="grid grid-cols-2 gap-2">
- <button type="button" className={toggleClasses(settings.UseLowercase)} title={t('items.passwordSettingsPopup.includeLowercaseLabel')} onClick={() => handleSettingChange('UseLowercase', !settings.UseLowercase)}><span className="font-mono text-base">a-z</span></button>
- <button type="button" className={toggleClasses(settings.UseUppercase)} title={t('items.passwordSettingsPopup.includeUppercaseLabel')} onClick={() => handleSettingChange('UseUppercase', !settings.UseUppercase)}><span className="font-mono text-base">A-Z</span></button>
- <button type="button" className={toggleClasses(settings.UseNumbers)} title={t('items.passwordSettingsPopup.includeNumbersLabel')} onClick={() => handleSettingChange('UseNumbers', !settings.UseNumbers)}><span className="font-mono text-base">0-9</span></button>
- <button type="button" className={toggleClasses(settings.UseSpecialChars)} title={t('items.passwordSettingsPopup.includeSpecialCharsLabel')} onClick={() => handleSettingChange('UseSpecialChars', !settings.UseSpecialChars)}><span className="font-mono text-base">!@#</span></button>
+ <ToggleChip selected={settings.UseLowercase} title={t('items.passwordSettingsPopup.includeLowercaseLabel')} onClick={() => handleSettingChange('UseLowercase', !settings.UseLowercase)}><span className="font-mono text-base">a-z</span></ToggleChip>
+ <ToggleChip selected={settings.UseUppercase} title={t('items.passwordSettingsPopup.includeUppercaseLabel')} onClick={() => handleSettingChange('UseUppercase', !settings.UseUppercase)}><span className="font-mono text-base">A-Z</span></ToggleChip>
+ <ToggleChip selected={settings.UseNumbers} title={t('items.passwordSettingsPopup.includeNumbersLabel')} onClick={() => handleSettingChange('UseNumbers', !settings.UseNumbers)}><span className="font-mono text-base">0-9</span></ToggleChip>
+ <ToggleChip selected={settings.UseSpecialChars} title={t('items.passwordSettingsPopup.includeSpecialCharsLabel')} onClick={() => handleSettingChange('UseSpecialChars', !settings.UseSpecialChars)}><span className="font-mono text-base">!@#</span></ToggleChip>
</div>
<div className="flex items-center">
@@ -199,15 +178,15 @@ const PasswordSettingsPopup: React.FC<PasswordSettingsPopupProps> = ({ passwordS
</div>
<div className="grid grid-cols-3 gap-2">
- <button type="button" className={optionClasses(settings.Capitalization !== DEFAULT_CAPITALIZATION)} title={optionLabel('Capitalization', settings.Capitalization ?? DEFAULT_CAPITALIZATION)} onClick={() => handleSettingChange('Capitalization', cycle(CAPITALIZATION_OPTIONS, settings.Capitalization))}>
+ <ToggleChip selected={settings.Capitalization !== DEFAULT_CAPITALIZATION} title={optionLabel('Capitalization', settings.Capitalization ?? DEFAULT_CAPITALIZATION)} onClick={() => handleSettingChange('Capitalization', cycle(CAPITALIZATION_OPTIONS, settings.Capitalization))}>
<span className="font-mono text-base">{capitalizationGlyph(settings.Capitalization)}</span>
- </button>
- <button type="button" className={optionClasses(settings.Separator !== DEFAULT_SEPARATOR)} title={`${t('items.separator')}: ${optionLabel('Separator', settings.Separator ?? DEFAULT_SEPARATOR)}`} onClick={() => handleSettingChange('Separator', cycle(SEPARATOR_OPTIONS, settings.Separator))}>
+ </ToggleChip>
+ <ToggleChip selected={settings.Separator !== DEFAULT_SEPARATOR} title={`${t('items.separator')}: ${optionLabel('Separator', settings.Separator ?? DEFAULT_SEPARATOR)}`} onClick={() => handleSettingChange('Separator', cycle(SEPARATOR_OPTIONS, settings.Separator))}>
<span className="font-mono text-base">{separatorGlyph(settings.Separator)}</span>
- </button>
- <button type="button" className={optionClasses(settings.Salt !== DEFAULT_SALT)} title={`${t('items.salt')}: ${optionLabel('Salt', settings.Salt ?? DEFAULT_SALT)}`} onClick={() => handleSettingChange('Salt', cycle(SALT_OPTIONS, settings.Salt))}>
+ </ToggleChip>
+ <ToggleChip selected={settings.Salt !== DEFAULT_SALT} title={`${t('items.salt')}: ${optionLabel('Salt', settings.Salt ?? DEFAULT_SALT)}`} onClick={() => handleSettingChange('Salt', cycle(SALT_OPTIONS, settings.Salt))}>
<span className="font-mono text-base">{saltGlyph(settings.Salt)}</span>
- </button>
+ </ToggleChip>
</div>
<div>
diff --git a/apps/web/src/components/settings/SettingsIcon.tsx b/apps/web/src/components/settings/SettingsIcon.tsx
new file mode 100644
index 000000000..f749bf394
--- /dev/null
+++ b/apps/web/src/components/settings/SettingsIcon.tsx
@@ -0,0 +1,39 @@
+import React from 'react';
+
+/**
+ * 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';
+
+/** The path data of each 24x24 outline icon. */
+const SETTINGS_ICON_PATHS: Record<SettingsIconName, string[]> = {
+ twoFactor: ['M12 18h.01M8 21h8a2 2 0 002-2V5a2 2 0 00-2-2H8a2 2 0 00-2 2v14a2 2 0 002 2z'],
+ security: ['M9 12l2 2 4-4m5.618-4.016A11.955 11.955 0 0112 2.944a11.955 11.955 0 01-8.618 3.04A12.02 12.02 0 003 9c0 5.591 3.824 10.29 9 11.622 5.176-1.332 9-6.03 9-11.622 0-1.042-.133-2.052-.382-3.016z'],
+ sessions: ['M9.75 17L9 20l-1 1h8l-1-1-.75-3M3 13h18M5 17h14a2 2 0 002-2V5a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z'],
+ passwordGenerator: ['M15 7a2 2 0 012 2m4 0a6 6 0 01-7.743 5.743L11 17H9v2H7v2H4a1 1 0 01-1-1v-2.586a1 1 0 01.293-.707l5.964-5.964A6 6 0 1121 9z'],
+ identityGenerator: ['M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z'],
+ importExport: ['M8 7h12m0 0l-4-4m4 4l-4 4m0 6H4m0 0l4 4m-4-4l4-4'],
+ storage: ['M4 7v10c0 2.21 3.582 4 8 4s8-1.79 8-4V7M4 7c0 2.21 3.582 4 8 4s8-1.79 8-4M4 7c0-2.21 3.582-4 8-4s8 1.79 8 4m0 5c0 2.21-3.582 4-8 4s-8-1.79-8-4'],
+ general: ['M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z', 'M15 12a3 3 0 11-6 0 3 3 0 016 0z'],
+ apps: ['M17 14v6m-3-3h6M6 10h2a2 2 0 002-2V6a2 2 0 00-2-2H6a2 2 0 00-2 2v2a2 2 0 002 2zm10 0h2a2 2 0 002-2V6a2 2 0 00-2-2h-2a2 2 0 00-2 2v2a2 2 0 002 2zM6 20h2a2 2 0 002-2v-2a2 2 0 00-2-2H6a2 2 0 00-2 2v2a2 2 0 002 2z'],
+ themeLight: ['M12 3v1m0 16v1m9-9h-1M4 12H3m15.364 6.364l-.707-.707M6.343 6.343l-.707-.707m12.728 0l-.707.707M6.343 17.657l-.707.707M16 12a4 4 0 11-8 0 4 4 0 018 0z'],
+ themeDark: ['M20.354 15.354A9 9 0 018.646 3.646 9.003 9.003 0 0012 21a9.003 9.003 0 008.354-5.646z'],
+ securityWarning: ['M12 9v3.75m0 3.75h.008M20.618 5.984A11.955 11.955 0 0112 2.944a11.955 11.955 0 01-8.618 3.04A12.02 12.02 0 003 9c0 5.591 3.824 10.29 9 11.622 5.176-1.332 9-6.03 9-11.622 0-1.042-.133-2.052-.382-3.016z'],
+ logout: ['M17 16l4-4m0 0l-4-4m4 4H7m6 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h4a3 3 0 013 3v1'],
+ warning: ['M12 9v3.75m-9.303 3.376c-.866 1.5.217 3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898 0L2.697 16.126zM12 15.75h.007v.008H12v-.008z'],
+ vault: ['M5 8h14M5 8a2 2 0 110-4h14a2 2 0 110 4M5 8v10a2 2 0 002 2h10a2 2 0 002-2V8m-9 4h4'],
+ emails: ['M3 8l7.89 5.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z'],
+ lock: ['M12 15v2m-6 4h12a2 2 0 002-2v-6a2 2 0 00-2-2H6a2 2 0 00-2 2v6a2 2 0 002 2zm10-10V7a4 4 0 00-8 0v4h8z'],
+ familySharing: ['M17 20h5v-2a3 3 0 00-5.356-1.857M17 20H7m10 0v-2c0-.656-.126-1.283-.356-1.857M7 20H2v-2a3 3 0 015.356-1.857M7 20v-2c0-.656.126-1.283.356-1.857m0 0a5.002 5.002 0 019.288 0M15 7a3 3 0 11-6 0 3 3 0 016 0zm6 3a2 2 0 11-4 0 2 2 0 014 0zM7 10a2 2 0 11-4 0 2 2 0 014 0z'],
+};
+
+/**
+ * A settings page icon.
+ */
+const SettingsIcon: React.FC<{ name: SettingsIconName; className?: string; strokeWidth?: number }> = ({ name, className = 'w-5 h-5', strokeWidth = 2 }) => (
+ <svg className={className} fill="none" stroke="currentColor" strokeWidth={strokeWidth} viewBox="0 0 24 24" aria-hidden="true">
+ {SETTINGS_ICON_PATHS[name].map((d) => <path key={d} strokeLinecap="round" strokeLinejoin="round" d={d} />)}
+ </svg>
+);
+
+export default SettingsIcon;
diff --git a/apps/web/src/components/settings/SettingsPageHeader.tsx b/apps/web/src/components/settings/SettingsPageHeader.tsx
new file mode 100644
index 000000000..a751f95df
--- /dev/null
+++ b/apps/web/src/components/settings/SettingsPageHeader.tsx
@@ -0,0 +1,57 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { Link } from 'react-router-dom';
+
+import SettingsIcon, { type SettingsIconName } from '@/components/settings/SettingsIcon';
+import Breadcrumb, { type BreadcrumbItem } from '@/components/shared/Breadcrumb';
+import H1 from '@/components/shared/H1';
+
+type SettingsPageHeaderProps = {
+ icon: SettingsIconName;
+ title: string;
+ description?: string;
+ breadcrumbItems?: BreadcrumbItem[];
+ titleSuffix?: React.ReactNode;
+ customActions?: React.ReactNode;
+ backTo?: { url: string; label: string };
+};
+
+/**
+ * Header of a settings page: breadcrumbs, then a back button and the page icon top-aligned next to the title and description.
+ */
+const SettingsPageHeader: React.FC<SettingsPageHeaderProps> = ({ icon, title, description, breadcrumbItems, titleSuffix, customActions, backTo }) => {
+ const { t } = useTranslation();
+ const items: BreadcrumbItem[] = [
+ { displayName: t('common.home'), url: '/', showHomeIcon: true },
+ { displayName: t('common.settings'), url: '/settings' },
+ ...(breadcrumbItems ?? [{ displayName: title }]),
+ ];
+ const back = backTo ?? { url: '/settings', label: t('common.settings') };
+
+ return (
+ <div className="px-4 pt-6 mb-4 dark:bg-gray-900">
+ <Breadcrumb items={items} />
+ <div className="flex flex-col sm:flex-row sm:items-center justify-between gap-4">
+ <div className="flex items-start gap-3 sm:gap-4 min-w-0">
+ <Link to={back.url} id="settingsBackButton" title={back.label} className="flex-shrink-0 flex items-center h-12 pl-2.5 pr-4 -ml-2 -mr-1.5 sm:-mr-2.5 rounded-xl text-gray-500 hover:text-gray-900 hover:bg-gray-200 dark:text-gray-400 dark:hover:text-white dark:hover:bg-gray-700 transition-colors">
+ <span className="sr-only">{back.label}</span>
+ <svg className="w-5 h-5" fill="none" stroke="currentColor" strokeWidth={2} viewBox="0 0 24 24" aria-hidden="true"><path strokeLinecap="round" strokeLinejoin="round" d="M15 19l-7-7 7-7" /></svg>
+ </Link>
+ <span className="flex-shrink-0 flex items-center justify-center w-12 h-12 rounded-xl bg-primary-50 text-primary-600 ring-1 ring-primary-100 dark:bg-primary-900/40 dark:text-primary-400 dark:ring-primary-900">
+ <SettingsIcon name={icon} className="w-6 h-6" />
+ </span>
+ <div className="min-w-0">
+ <div className="flex flex-wrap items-center gap-3">
+ <H1>{title}</H1>
+ {titleSuffix}
+ </div>
+ {description && <p className="mt-1 text-sm text-gray-600 dark:text-gray-400">{description}</p>}
+ </div>
+ </div>
+ {customActions && <div className="flex flex-wrap items-center gap-2">{customActions}</div>}
+ </div>
+ </div>
+ );
+};
+
+export default SettingsPageHeader;
diff --git a/apps/web/src/components/settings/importexport/ImportServiceCard.tsx b/apps/web/src/components/settings/importexport/ImportServiceCard.tsx
index 1be91a06f..e57ad640c 100644
--- a/apps/web/src/components/settings/importexport/ImportServiceCard.tsx
+++ b/apps/web/src/components/settings/importexport/ImportServiceCard.tsx
@@ -12,6 +12,7 @@ import { useNavigate } from 'react-router-dom';
import LoadingIndicator from '@/components/loading/LoadingIndicator';
import Button from '@/components/shared/Button';
import Modal from '@/components/shared/Modal';
+import Text from '@/components/shared/Text';
import { useDb } from '@/context/DbContext';
import { useNotifications } from '@/context/NotificationContext';
import { useWebApi } from '@/context/WebApiContext';
@@ -554,7 +555,7 @@ const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, desc
<strong>{t('importExport.serviceCard.supportedFormats')}:</strong> {acceptedFileExtensions.join(', ')}
</p>
<div className="mb-4 bg-amber-50 border border-amber-400 dark:bg-amber-800/30 dark:border-amber-500/50 rounded-lg p-4">
- <p className="mb-4 text-gray-700 dark:text-gray-200">{t('importExport.serviceCard.uploadExportFileText', { service: serviceName })}</p>
+ <Text className="mb-4">{t('importExport.serviceCard.uploadExportFileText', { service: serviceName })}</Text>
<input ref={fileInputRef} type="file" accept={fileAcceptTypes} onChange={e => void handleFileUpload(e)} className="text-gray-700 dark:text-gray-200 file:mr-4 file:py-2 file:px-4 file:rounded-lg file:border-0 file:text-sm file:font-semibold file:bg-primary-50 file:text-primary-700 hover:file:bg-primary-100 dark:file:bg-primary-900/40 dark:file:text-primary-300 dark:hover:file:bg-primary-800/60" />
</div>
<div className="flex justify-end mt-6 space-x-2">
@@ -573,12 +574,12 @@ const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, desc
{isImporting ? (
<div className="text-center">
<LoadingIndicator />
- <p className="mt-4 text-gray-700 dark:text-gray-300">{t('importExport.serviceCard.decryptingFile')}</p>
+ <Text className="mt-4">{t('importExport.serviceCard.decryptingFile')}</Text>
</div>
) : (
<>
<div className="mb-4">
- <p className="mb-4 text-gray-700 dark:text-gray-300">{t('importExport.serviceCard.encryptedFilePasswordPrompt')}</p>
+ <Text className="mb-4">{t('importExport.serviceCard.encryptedFilePasswordPrompt')}</Text>
<label htmlFor="decryptionPassword" className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">{t('importExport.serviceCard.decryptionPasswordLabel')}</label>
<input id="decryptionPassword" type="password" value={decryptionPassword} onChange={e => setDecryptionPassword(e.target.value)} onKeyDown={handlePasswordKeyDown} autoFocus autoComplete="off" className="bg-gray-50 border border-gray-300 text-gray-900 sm:text-sm rounded-lg focus:outline-none focus:ring-primary-500 focus:border-primary-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-primary-500 dark:focus:border-primary-500" />
</div>
@@ -654,7 +655,7 @@ const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, desc
</div>
) : (
<>
- <p className="mb-4 text-gray-700 dark:text-gray-300">{t('importExport.serviceCard.previewInstructions')}</p>
+ <Text className="mb-4">{t('importExport.serviceCard.previewInstructions')}</Text>
<table className="min-w-full divide-y divide-gray-200 dark:divide-gray-700">
<thead className="bg-gray-50 dark:bg-gray-700">
<tr>
@@ -706,7 +707,7 @@ const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, desc
isExtractingFavicons ? (
<div className="text-center">
<LoadingIndicator />
- <p className="mt-4 text-gray-700 dark:text-gray-300">{t('importExport.serviceCard.extractingFavicons', { current: faviconExtractionProgress, total: totalFaviconsToExtract })}</p>
+ <Text className="mt-4">{t('importExport.serviceCard.extractingFavicons', { current: faviconExtractionProgress, total: totalFaviconsToExtract })}</Text>
<div className="mt-4">
<Button onClick={cancelFaviconExtraction} color="secondary">{t('common.cancel')}</Button>
</div>
@@ -714,12 +715,12 @@ const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, desc
) : isSavingCredentials ? (
<div className="text-center">
<LoadingIndicator />
- <p className="mt-4 text-gray-700 dark:text-gray-300">{t('importExport.serviceCard.savingCredentials', { current: credentialSaveProgress, total: totalCredentialsToSave })}</p>
+ <Text className="mt-4">{t('importExport.serviceCard.savingCredentials', { current: credentialSaveProgress, total: totalCredentialsToSave })}</Text>
</div>
) : isSyncingVault ? (
<div className="text-center">
<LoadingIndicator />
- <p className="mt-4 text-gray-700 dark:text-gray-300">{t('importExport.serviceCard.syncingVault')}</p>
+ <Text className="mt-4">{t('importExport.serviceCard.syncingVault')}</Text>
</div>
) : (
<LoadingIndicator />
@@ -727,7 +728,7 @@ const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, desc
) : (
<>
<div className="mb-4">
- <p className="mb-4 text-gray-700 dark:text-gray-300">{t('importExport.serviceCard.confirmImportText', { count: importedCredentials.length })}</p>
+ <Text className="mb-4">{t('importExport.serviceCard.confirmImportText', { count: importedCredentials.length })}</Text>
{extractFavicons && (
<div className="p-4 mb-4 text-amber-700 bg-amber-100 rounded-lg dark:bg-amber-800/30 dark:text-amber-300" role="alert">
<p>{t('importExport.serviceCard.faviconExtractionNote')}</p>
diff --git a/apps/web/src/components/settings/importexport/ImportServices.tsx b/apps/web/src/components/settings/importexport/ImportServices.tsx
index 3a252e756..d9ebfabf7 100644
--- a/apps/web/src/components/settings/importexport/ImportServices.tsx
+++ b/apps/web/src/components/settings/importexport/ImportServices.tsx
@@ -25,6 +25,7 @@ import React from 'react';
import { useTranslation } from 'react-i18next';
import ImportServiceCard from '@/components/settings/importexport/ImportServiceCard';
+import Text from '@/components/shared/Text';
import { useNotifications } from '@/context/NotificationContext';
import type { ImportedCredential } from '@aliasvault/client/transfer/import/models/ImportedCredential';
@@ -34,7 +35,7 @@ import type { ImportFileResult } from '@aliasvault/client/transfer/import/models
* One paragraph of a service's import instructions.
*/
const Instruction: React.FC<{ children: React.ReactNode }> = ({ children }) => (
- <p className="text-gray-700 dark:text-gray-300 mb-4">{children}</p>
+ <Text className="mb-4">{children}</Text>
);
/**
diff --git a/apps/web/src/components/settings/importexport/ResetVaultSection.tsx b/apps/web/src/components/settings/importexport/ResetVaultSection.tsx
index 774e7da86..d79f0de00 100644
--- a/apps/web/src/components/settings/importexport/ResetVaultSection.tsx
+++ b/apps/web/src/components/settings/importexport/ResetVaultSection.tsx
@@ -4,6 +4,7 @@ import { useNavigate } from 'react-router-dom';
import Button from '@/components/shared/Button';
import Card from '@/components/shared/Card';
+import SectionTitle from '@/components/shared/SectionTitle';
/**
* Card linking to the vault reset page.
@@ -14,7 +15,7 @@ const ResetVaultSection: React.FC = () => {
return (
<Card>
- <h3 className="mb-2 text-lg font-medium text-gray-900 dark:text-white">{t('settings.resetVault.pageTitle')}</h3>
+ <SectionTitle className="mb-2">{t('settings.resetVault.pageTitle')}</SectionTitle>
<div className="mb-3 text-sm text-gray-600 dark:text-gray-400">{t('settings.resetVault.section.description')}</div>
<Button color="danger" onClick={() => navigate('/settings/import-export/reset-vault')}>{t('settings.resetVault.pageTitle')}</Button>
</Card>
diff --git a/apps/web/src/components/settings/security/ClipboardClearSection.tsx b/apps/web/src/components/settings/security/ClipboardClearSection.tsx
new file mode 100644
index 000000000..1f759dff8
--- /dev/null
+++ b/apps/web/src/components/settings/security/ClipboardClearSection.tsx
@@ -0,0 +1,54 @@
+import React, { useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import SecuritySection from '@/components/settings/security/SecuritySection';
+import FormLabel from '@/components/shared/FormLabel';
+import Select from '@/components/shared/Select';
+import { useDb } from '@/context/DbContext';
+import { useVaultMutate } from '@/hooks/useVaultMutate';
+
+/**
+ * How long copied secrets stay on the clipboard.
+ */
+const ClipboardClearSection: React.FC = () => {
+ const { t } = useTranslation();
+ const dbContext = useDb();
+ const { executeVaultMutationInBackground } = useVaultMutate();
+ const [clipboardClearSeconds, setClipboardClearSeconds] = useState('10');
+
+ useEffect(() => {
+ if (dbContext.sqliteClient) {
+ setClipboardClearSeconds(dbContext.sqliteClient.settings.getSetting('ClipboardClearSeconds', '10'));
+ }
+ }, [dbContext.sqliteClient]);
+
+ /**
+ * Store the new timeout in the vault.
+ */
+ const update = async (value: string): Promise<void> => {
+ setClipboardClearSeconds(value);
+ await executeVaultMutationInBackground(async () => {
+ dbContext.sqliteClient?.settings.updateSetting('ClipboardClearSeconds', value);
+ });
+ };
+
+ return (
+ <SecuritySection title={t('settings.clipboardClear')}>
+ <div className="mb-4">
+ <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>
+ <option value="5">{t('common.duration.5seconds')}</option>
+ <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>
+ <div className="mt-2 p-3 bg-yellow-50 border border-yellow-200 rounded-lg dark:bg-yellow-900/20 dark:border-yellow-800">
+ <p className="text-sm text-yellow-800 dark:text-yellow-200">{t('settings.general.clipboardClearLimitationNote')}</p>
+ </div>
+ </div>
+ </SecuritySection>
+ );
+};
+
+export default ClipboardClearSection;
diff --git a/apps/web/src/components/settings/security/SecuritySection.tsx b/apps/web/src/components/settings/security/SecuritySection.tsx
index 5fbc39ce2..4dce577f1 100644
--- a/apps/web/src/components/settings/security/SecuritySection.tsx
+++ b/apps/web/src/components/settings/security/SecuritySection.tsx
@@ -1,6 +1,7 @@
import React from 'react';
import Card from '@/components/shared/Card';
+import SectionTitle from '@/components/shared/SectionTitle';
/**
* What the security page can ask a section to do.
@@ -20,7 +21,7 @@ export const formatDateTime = (value: string): string => new Date(value).toLocal
*/
const SecuritySection: React.FC<{ title: string; children: React.ReactNode }> = ({ title, children }) => (
<Card>
- <h3 className="mb-2 text-lg font-medium text-gray-900 dark:text-white">{title}</h3>
+ <SectionTitle className="mb-2">{title}</SectionTitle>
{children}
</Card>
);
diff --git a/apps/web/src/components/settings/security/TwoFactorAuthenticationSection.tsx b/apps/web/src/components/settings/security/TwoFactorAuthenticationSection.tsx
deleted file mode 100644
index b6e34bef2..000000000
--- a/apps/web/src/components/settings/security/TwoFactorAuthenticationSection.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import React, { useCallback, useImperativeHandle, useState, forwardRef } from 'react';
-import { useTranslation } from 'react-i18next';
-import { useNavigate } from 'react-router-dom';
-
-import LoadingIndicator from '@/components/loading/LoadingIndicator';
-import SecuritySection, { type SectionHandle } from '@/components/settings/security/SecuritySection';
-import Button from '@/components/shared/Button';
-import { useWebApi } from '@/context/WebApiContext';
-
-/**
- * Two-factor status with links to enable or disable it.
- */
-const TwoFactorAuthenticationSection = forwardRef<SectionHandle>((_, ref) => {
- const { t } = useTranslation();
- const navigate = useNavigate();
- const webApi = useWebApi();
- const [isLoading, setIsLoading] = useState(true);
- const [enabled, setEnabled] = useState(false);
-
- const loadData = useCallback(async (): Promise<void> => {
- setIsLoading(true);
- try {
- const status = await webApi.get<{ twoFactorEnabled: boolean }>('TwoFactorAuth/status');
- setEnabled(status.twoFactorEnabled);
- } finally {
- setIsLoading(false);
- }
- }, [webApi]);
- useImperativeHandle(ref, () => ({ loadData }), [loadData]);
-
- return (
- <SecuritySection title={t('common.twoFactorAuthentication')}>
- {isLoading ? <LoadingIndicator /> : enabled ? (
- <>
- <div className="mb-3 text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.twoFactor.enabledMessage')}</div>
- <Button color="danger" onClick={() => navigate('/settings/security/disable-2fa')}>{t('settings.securitySettings.disable2fa.pageTitle')}</Button>
- </>
- ) : (
- <>
- <div className="mb-3 text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.twoFactor.disabledMessage')}</div>
- <Button color="success" onClick={() => navigate('/settings/security/enable-2fa')}>{t('settings.securitySettings.enable2fa.pageTitle')}</Button>
- </>
- )}
- </SecuritySection>
- );
-});
-TwoFactorAuthenticationSection.displayName = 'TwoFactorAuthenticationSection';
-
-export default TwoFactorAuthenticationSection;
diff --git a/apps/web/src/pages/settings/security/Disable2Fa.tsx b/apps/web/src/components/settings/twofactor/TwoFactorDisableStep.tsx
similarity index 53%
rename from apps/web/src/pages/settings/security/Disable2Fa.tsx
rename to apps/web/src/components/settings/twofactor/TwoFactorDisableStep.tsx
index fdd0f9b65..0e5586042 100644
--- a/apps/web/src/pages/settings/security/Disable2Fa.tsx
+++ b/apps/web/src/components/settings/twofactor/TwoFactorDisableStep.tsx
@@ -3,26 +3,24 @@ import React, { useEffect, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
-import AlertMessageError from '@/components/alerts/AlertMessageError';
import LoadingIndicator from '@/components/loading/LoadingIndicator';
-import Breadcrumb from '@/components/shared/Breadcrumb';
import Button from '@/components/shared/Button';
import Card from '@/components/shared/Card';
-import H1 from '@/components/shared/H1';
+import InputTextField from '@/components/shared/InputTextField';
+import SectionTitle from '@/components/shared/SectionTitle';
+import { useAccountNudges } from '@/context/AccountNudgeContext';
import { useNotifications } from '@/context/NotificationContext';
import { useWebApi } from '@/context/WebApiContext';
-import { usePageTitle } from '@/hooks/usePageTitle';
/**
- * The disable two-factor authentication page.
+ * Disable step of the two-factor page: confirm with an authenticator or recovery code.
*/
-const Disable2Fa: React.FC = () => {
+const TwoFactorDisableStep: React.FC = () => {
const { t } = useTranslation();
const navigate = useNavigate();
const webApi = useWebApi();
const notifications = useNotifications();
-
- usePageTitle(t('settings.securitySettings.disable2fa.pageTitle'));
+ const { refresh: refreshNudges } = useAccountNudges();
const [isLoading, setIsLoading] = useState(true);
const [code, setCode] = useState('');
const hasStarted = useRef(false);
@@ -34,14 +32,14 @@ const Disable2Fa: React.FC = () => {
hasStarted.current = true;
/**
- * Only show the page when two-factor is actually on.
+ * Only show the step when two-factor is actually on.
*/
const check = async (): Promise<void> => {
try {
const status = await webApi.get<{ twoFactorEnabled: boolean }>('TwoFactorAuth/status');
if (!status.twoFactorEnabled) {
notifications.addErrorMessage(t('settings.securitySettings.disable2fa.twoFactorNotEnabled'));
- navigate('/settings/security');
+ navigate('/settings/two-factor');
return;
}
} catch (error) {
@@ -60,7 +58,8 @@ const Disable2Fa: React.FC = () => {
try {
await webApi.post<string, unknown>('TwoFactorAuth/disable', code.trim(), false);
notifications.addSuccessMessage(t('settings.securitySettings.disable2fa.twoFactorDisabledSuccess'));
- navigate('/settings/security');
+ void refreshNudges();
+ navigate('/settings/two-factor');
} catch (error) {
console.error('Failed to disable 2FA:', error);
notifications.addErrorMessage(apiErrorMessage(error, t, t('settings.securitySettings.disable2fa.failedToDisable2Fa')), true);
@@ -72,25 +71,17 @@ const Disable2Fa: React.FC = () => {
}
return (
- <>
- <div className="grid grid-cols-1 px-4 pt-6 xl:grid-cols-3 xl:gap-4 dark:bg-gray-900">
- <div className="mb-4 col-span-full xl:mb-2">
- <Breadcrumb items={[{ displayName: t('common.home'), url: '/', showHomeIcon: true }, { displayName: t('settings.securitySettings.pageTitle'), url: '/settings/security' }, { displayName: t('settings.securitySettings.disable2fa.pageTitle') }]} />
- <H1>{t('settings.securitySettings.disable2fa.pageTitle')}</H1>
- <p className="mt-2 text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.disable2fa.pageDescription')}</p>
- </div>
- </div>
-
- <Card>
- <AlertMessageError hasTopMargin={false} message={t('settings.securitySettings.disable2fa.warningMessage')} />
- <div className="mb-3 mt-4 text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.disable2fa.statusMessage')}</div>
- <form onSubmit={disableTwoFactor} className="space-y-4" av-enable="true" av-suppress-save="true">
- <input id="disableCode" type="text" value={code} onChange={e => setCode(e.target.value)} className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 dark:bg-gray-700 dark:text-gray-200 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 dark:focus:ring-blue-400" placeholder={t('settings.securitySettings.enable2fa.verificationCodePlaceholder')} autoComplete="one-time-code" required />
+ <Card>
+ <SectionTitle className="mb-4">{t('settings.securitySettings.disable2fa.pageTitle')}</SectionTitle>
+ <form onSubmit={disableTwoFactor} className="space-y-3 max-w-sm" av-enable="true" av-suppress-save="true">
+ <InputTextField id="disableCode" value={code} onValueChange={setCode} placeholder={t('settings.securitySettings.enable2fa.verificationCodePlaceholder')} autoComplete="one-time-code" required />
+ <div className="flex flex-wrap gap-2">
<Button type="submit" color="danger">{t('settings.securitySettings.disable2fa.confirmDisableButton')}</Button>
- </form>
- </Card>
- </>
+ <Button color="outline" onClick={() => navigate('/settings/two-factor')}>{t('common.cancel')}</Button>
+ </div>
+ </form>
+ </Card>
);
};
-export default Disable2Fa;
+export default TwoFactorDisableStep;
diff --git a/apps/web/src/components/settings/twofactor/TwoFactorEnableStep.tsx b/apps/web/src/components/settings/twofactor/TwoFactorEnableStep.tsx
new file mode 100644
index 000000000..3aff1ed10
--- /dev/null
+++ b/apps/web/src/components/settings/twofactor/TwoFactorEnableStep.tsx
@@ -0,0 +1,133 @@
+import QRCode from 'qrcode';
+import React, { useEffect, useRef, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useNavigate } from 'react-router-dom';
+
+import LoadingIndicator from '@/components/loading/LoadingIndicator';
+import SettingsIcon from '@/components/settings/SettingsIcon';
+import Button from '@/components/shared/Button';
+import Card from '@/components/shared/Card';
+import InputTextField from '@/components/shared/InputTextField';
+import SectionTitle from '@/components/shared/SectionTitle';
+import Text from '@/components/shared/Text';
+import { useAccountNudges } from '@/context/AccountNudgeContext';
+import { useNotifications } from '@/context/NotificationContext';
+import { useWebApi } from '@/context/WebApiContext';
+
+/**
+ * The recovery codes, shown once right after two-factor authentication was enabled.
+ */
+const RecoveryCodes: React.FC<{ recoveryCodes: string[] }> = ({ recoveryCodes }) => {
+ const { t } = useTranslation();
+ const navigate = useNavigate();
+
+ return (
+ <Card>
+ <SectionTitle className="mb-2">{t('settings.securitySettings.recoveryCodes.title')}</SectionTitle>
+ <Text variant="muted" className="mb-4">{t('settings.securitySettings.recoveryCodes.description')}</Text>
+ <div className="flex items-start gap-3 mb-5 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" role="alert">
+ <SettingsIcon name="warning" className="flex-shrink-0 w-5 h-5 mt-0.5 text-amber-600 dark:text-amber-400" />
+ <div className="text-sm">
+ <p className="font-semibold">{t('settings.securitySettings.recoveryCodes.warningTitle')}</p>
+ <p>{t('settings.securitySettings.recoveryCodes.warningDescription')}</p>
+ </div>
+ </div>
+ <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-5 gap-2 mb-6" id="recovery-codes">
+ {recoveryCodes.map(code => (
+ <code key={code} className="block p-3 bg-gray-100 dark:bg-gray-700 dark:text-gray-200 rounded-lg border border-gray-200 dark:border-gray-600 font-mono text-center">{code}</code>
+ ))}
+ </div>
+ <Button onClick={() => navigate('/settings/two-factor')}>{t('common.continue')}</Button>
+ </Card>
+ );
+};
+
+/**
+ * Enable step of the two-factor page: scan the QR code (or type the secret), then confirm with a first code.
+ */
+const TwoFactorEnableStep: React.FC = () => {
+ const { t } = useTranslation();
+ const navigate = useNavigate();
+ const webApi = useWebApi();
+ const notifications = useNotifications();
+ const { refresh: refreshNudges } = useAccountNudges();
+ const [isLoading, setIsLoading] = useState(true);
+ const [qrCodeDataUrl, setQrCodeDataUrl] = useState('');
+ const [secret, setSecret] = useState('');
+ const [code, setCode] = useState('');
+ const [recoveryCodes, setRecoveryCodes] = useState<string[] | null>(null);
+ const hasStarted = useRef(false);
+
+ useEffect(() => {
+ if (hasStarted.current) {
+ return;
+ }
+ hasStarted.current = true;
+
+ /**
+ * Ask the server for a new authenticator secret and render it as a QR code.
+ */
+ const setup = async (): Promise<void> => {
+ try {
+ const result = await webApi.post<null, { secret: string; qrCodeUrl: string }>('TwoFactorAuth/enable', null);
+ // Spaces every four characters make the secret easier to type over.
+ setSecret((result.secret.match(/.{1,4}/g) ?? []).join(' ').toLowerCase());
+ setQrCodeDataUrl(await QRCode.toDataURL(result.qrCodeUrl, { width: 256, margin: 2 }));
+ } catch (error) {
+ console.error('Failed to start 2FA setup:', error);
+ notifications.addErrorMessage(t('settings.securitySettings.enable2fa.failedToEnable2Fa'), true);
+ } finally {
+ setIsLoading(false);
+ }
+ };
+ void setup();
+ }, [notifications, t, webApi]);
+
+ /**
+ * Verify the first code and switch two-factor on.
+ */
+ const verifySetup = async (e: React.FormEvent): Promise<void> => {
+ e.preventDefault();
+ try {
+ const result = await webApi.post<string, { recoveryCodes: string[] }>('TwoFactorAuth/verify', code);
+ notifications.addSuccessMessage(t('settings.securitySettings.enable2fa.twoFactorEnabledSuccess'), true);
+ setRecoveryCodes(result.recoveryCodes);
+ void refreshNudges();
+ } catch (error) {
+ console.error('Failed to verify 2FA code:', error);
+ notifications.addErrorMessage(t('settings.securitySettings.enable2fa.failedToEnable2Fa'), true);
+ }
+ };
+
+ if (isLoading) {
+ return <LoadingIndicator />;
+ }
+
+ if (recoveryCodes !== null) {
+ return <RecoveryCodes recoveryCodes={recoveryCodes} />;
+ }
+
+ return (
+ <Card>
+ <SectionTitle className="mb-4">{t('settings.securitySettings.enable2fa.pageTitle')}</SectionTitle>
+ <div className="flex flex-col md:flex-row gap-6 md:gap-8">
+ <div id="authenticator-uri" className="flex-shrink-0 self-center md:self-start p-2 bg-white rounded-lg border border-gray-200 dark:border-gray-600">
+ {qrCodeDataUrl.length > 0 && <img src={qrCodeDataUrl} alt={t('common.qrCode')} className="w-48 h-48 sm:w-56 sm:h-56" />}
+ </div>
+ <div className="flex-1 min-w-0 space-y-4">
+ <Text>{t('settings.securitySettings.enable2fa.qrCodeInstructions')}</Text>
+ <div className="font-mono text-base sm:text-lg break-all bg-gray-100 dark:bg-gray-700 dark:text-gray-200 p-3 rounded-lg border border-gray-200 dark:border-gray-600" id="authenticator-secret">{secret}</div>
+ <form onSubmit={verifySetup} className="space-y-3 max-w-sm" av-enable="true" av-suppress-save="true">
+ <InputTextField id="verificationCode" value={code} onValueChange={setCode} placeholder={t('settings.securitySettings.enable2fa.verificationCodePlaceholder')} autoComplete="one-time-code" />
+ <div className="flex flex-wrap gap-2">
+ <Button type="submit">{t('settings.securitySettings.enable2fa.verifyAndEnableButton')}</Button>
+ <Button color="outline" onClick={() => navigate('/settings/two-factor')}>{t('common.cancel')}</Button>
+ </div>
+ </form>
+ </div>
+ </div>
+ </Card>
+ );
+};
+
+export default TwoFactorEnableStep;
diff --git a/apps/web/src/components/shared/Button.tsx b/apps/web/src/components/shared/Button.tsx
index d7e506867..f40275e20 100644
--- a/apps/web/src/components/shared/Button.tsx
+++ b/apps/web/src/components/shared/Button.tsx
@@ -1,7 +1,10 @@
import React from 'react';
/** Button colors. */
-export type ButtonColor = 'primary' | 'secondary' | 'danger' | 'success';
+export type ButtonColor = 'primary' | 'secondary' | 'danger' | 'success' | 'outline';
+
+/** Button sizes: `md` for in-page actions, `lg` for the main action of the full-screen auth pages. */
+export type ButtonSize = 'md' | 'lg';
/** Direction of the arrow a button can show: forward after the label, back before it. */
export type ButtonArrowDirection = 'forward' | 'back';
@@ -12,6 +15,7 @@ type ButtonProps = {
isDisabled?: boolean;
type?: 'button' | 'submit' | 'reset';
color?: ButtonColor;
+ size?: ButtonSize;
additionalClasses?: string;
display?: 'inline' | 'flex';
id?: string;
@@ -19,8 +23,14 @@ type ButtonProps = {
};
/** Base classes shared by every button-styled element. */
-export const BUTTON_BASE_CLASSES = 'center items-center px-3 py-2 text-sm font-medium text-white rounded-lg focus:outline-none focus:ring-4';
-const DISABLED_CLASSES = 'bg-gray-400 cursor-not-allowed';
+export const BUTTON_BASE_CLASSES = 'items-center justify-center gap-2 text-center font-medium rounded-lg focus:outline-none focus:ring-4';
+
+/**
+ * The padding and text size of a button size.
+ * @param size - the size
+ */
+export const getButtonSizeClasses = (size: ButtonSize): string => size === 'lg' ? 'px-5 py-2 text-base' : 'px-3 py-2 text-sm';
+const DISABLED_CLASSES = 'text-white bg-gray-400 cursor-not-allowed';
/**
* The color classes of a button.
@@ -29,13 +39,16 @@ const DISABLED_CLASSES = 'bg-gray-400 cursor-not-allowed';
export const getButtonColorClasses = (color: ButtonColor): string => {
switch (color) {
case 'primary':
- return 'bg-primary-700 hover:bg-primary-800 focus:ring-primary-300 dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800';
+ return 'text-white bg-primary-700 hover:bg-primary-800 focus:ring-primary-300 dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800';
case 'danger':
- return 'bg-red-700 hover:bg-red-800 focus:ring-red-300 dark:bg-red-600 dark:hover:bg-red-700 dark:focus:ring-red-800';
+ return 'text-white bg-red-700 hover:bg-red-800 focus:ring-red-300 dark:bg-red-600 dark:hover:bg-red-700 dark:focus:ring-red-800';
case 'success':
- return 'bg-green-700 hover:bg-green-800 focus:ring-green-300 dark:bg-green-600 dark:hover:bg-green-700 dark:focus:ring-green-800';
+ return 'text-white bg-green-700 hover:bg-green-800 focus:ring-green-300 dark:bg-green-600 dark:hover:bg-green-700 dark:focus:ring-green-800';
+ case 'outline':
+ // A ring instead of a border, so the outline button is exactly as tall as the filled ones.
+ return 'text-gray-700 bg-white ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:ring-gray-200 dark:text-gray-200 dark:bg-gray-800 dark:ring-gray-600 dark:hover:bg-gray-700 dark:focus:ring-gray-700';
default:
- return 'bg-gray-700 hover:bg-gray-800 focus:ring-gray-300 dark:bg-gray-600 dark:hover:bg-gray-700 dark:focus:ring-gray-800';
+ return 'text-white bg-gray-700 hover:bg-gray-800 focus:ring-gray-300 dark:bg-gray-600 dark:hover:bg-gray-700 dark:focus:ring-gray-800';
}
};
@@ -67,8 +80,8 @@ export const ButtonLabel: React.FC<{ children: React.ReactNode; arrow?: ButtonAr
/**
* Generic button.
*/
-const Button: React.FC<ButtonProps> = ({ children, onClick, isDisabled = false, type = 'button', color = 'primary', additionalClasses = '', display = 'inline', id, arrow }) => {
- const classes = `${display} ${BUTTON_BASE_CLASSES} ${getButtonColorClasses(color)} ${isDisabled ? DISABLED_CLASSES : ''} ${additionalClasses}`.trim();
+const Button: React.FC<ButtonProps> = ({ children, onClick, isDisabled = false, type = 'button', color = 'primary', size = 'md', additionalClasses = '', display = 'inline', id, arrow }) => {
+ const classes = `${display} ${BUTTON_BASE_CLASSES} ${getButtonSizeClasses(size)} ${isDisabled ? DISABLED_CLASSES : getButtonColorClasses(color)} ${additionalClasses}`.trim();
return (
<button type={type} id={id} onClick={isDisabled ? undefined : onClick} disabled={isDisabled} className={classes}>
diff --git a/apps/web/src/components/shared/LinkButton.tsx b/apps/web/src/components/shared/LinkButton.tsx
index 3cd0d53af..5ae824f0f 100644
--- a/apps/web/src/components/shared/LinkButton.tsx
+++ b/apps/web/src/components/shared/LinkButton.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import { Link } from 'react-router-dom';
-import { BUTTON_BASE_CLASSES, type ButtonColor, getButtonColorClasses } from '@/components/shared/Button';
+import { BUTTON_BASE_CLASSES, type ButtonColor, getButtonColorClasses, getButtonSizeClasses } from '@/components/shared/Button';
type LinkButtonProps = {
href: string;
@@ -16,7 +16,7 @@ type LinkButtonProps = {
* A link styled as a button.
*/
const LinkButton: React.FC<LinkButtonProps> = ({ href, text, smallText = '', color = 'primary', additionalClasses = '' }) => (
- <Link to={href} className={`inline ${BUTTON_BASE_CLASSES} ${getButtonColorClasses(color)} ${additionalClasses}`.trim()}>
+ <Link to={href} className={`inline ${BUTTON_BASE_CLASSES} ${getButtonSizeClasses('md')} ${getButtonColorClasses(color)} ${additionalClasses}`.trim()}>
{smallText.length > 0 ? (
<>
<span className="md:hidden">{smallText}</span>
diff --git a/apps/web/src/components/shared/MenuItem.tsx b/apps/web/src/components/shared/MenuItem.tsx
new file mode 100644
index 000000000..6c7b625a0
--- /dev/null
+++ b/apps/web/src/components/shared/MenuItem.tsx
@@ -0,0 +1,35 @@
+import React from 'react';
+import { NavLink } from 'react-router-dom';
+
+type MenuItemProps = {
+ label: React.ReactNode;
+ icon?: React.ReactNode;
+ to?: string;
+ onClick?: () => void;
+ danger?: boolean;
+ size?: 'sm' | 'md';
+ id?: string;
+ children?: React.ReactNode;
+};
+
+/**
+ * One row in a dropdown menu, as a link or a button.
+ */
+const MenuItem: React.FC<MenuItemProps> = ({ label, icon, to, onClick, danger = false, size = 'sm', id, children }) => {
+ const className = `flex items-center gap-3 w-full px-4 ${size === 'md' ? 'py-3' : 'py-2'} text-sm text-left transition-colors hover:bg-gray-100 dark:hover:bg-white/10 ${danger ? 'text-red-600 dark:text-red-400' : 'text-gray-700 dark:text-gray-200'}`;
+ const content = (
+ <>
+ {icon && <span className={`flex-shrink-0 ${danger ? 'text-red-600 dark:text-red-400' : 'text-gray-500 dark:text-gray-400'}`}>{icon}</span>}
+ <span className="flex-1 min-w-0">{label}</span>
+ {children}
+ </>
+ );
+
+ return to ? (
+ <NavLink to={to} id={id} onClick={onClick} className={className}>{content}</NavLink>
+ ) : (
+ <button type="button" id={id} onClick={onClick} className={className}>{content}</button>
+ );
+};
+
+export default MenuItem;
diff --git a/apps/web/src/components/shared/RefreshButton.tsx b/apps/web/src/components/shared/RefreshButton.tsx
index e865de732..034418952 100644
--- a/apps/web/src/components/shared/RefreshButton.tsx
+++ b/apps/web/src/components/shared/RefreshButton.tsx
@@ -1,18 +1,17 @@
import React, { useCallback, useEffect, useRef, useState } from 'react';
-import Button, { type ButtonColor } from '@/components/shared/Button';
+import Button from '@/components/shared/Button';
type RefreshButtonProps = {
onClick: () => void | Promise<void>;
buttonText: string;
- color?: ButtonColor;
additionalClasses?: string;
};
/**
- * Refresh button that spins its icon for a moment after being clicked.
+ * Secondary (outline) refresh button that spins its icon for a moment after being clicked.
*/
-const RefreshButton: React.FC<RefreshButtonProps> = ({ onClick, buttonText, color = 'primary', additionalClasses = '' }) => {
+const RefreshButton: React.FC<RefreshButtonProps> = ({ onClick, buttonText, additionalClasses = '' }) => {
const [isRefreshing, setIsRefreshing] = useState(false);
const timerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
@@ -37,7 +36,7 @@ const RefreshButton: React.FC<RefreshButtonProps> = ({ onClick, buttonText, colo
}, [isRefreshing, onClick]);
return (
- <Button onClick={handleClick} isDisabled={isRefreshing} display="flex" color={color} additionalClasses={additionalClasses}>
+ <Button onClick={() => void handleClick()} display="flex" color="outline" additionalClasses={additionalClasses}>
<svg className={`w-4 h-4 ${isRefreshing ? 'animate-spin-ccw' : ''}`} fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15"></path>
</svg>
diff --git a/apps/web/src/components/shared/SectionTitle.tsx b/apps/web/src/components/shared/SectionTitle.tsx
index 919b7e696..64b1b8627 100644
--- a/apps/web/src/components/shared/SectionTitle.tsx
+++ b/apps/web/src/components/shared/SectionTitle.tsx
@@ -10,7 +10,7 @@ type SectionTitleProps = {
* Title of a section card on the item pages.
*/
const SectionTitle: React.FC<SectionTitleProps> = ({ children, className = 'mb-3', htmlFor }) => {
- const classes = `text-lg font-semibold dark:text-white ${className}`.trim();
+ const classes = `text-lg font-semibold text-gray-900 dark:text-white ${className}`.trim();
return htmlFor ? <label htmlFor={htmlFor} className={`block ${classes}`}>{children}</label> : <h3 className={classes}>{children}</h3>;
};
diff --git a/apps/web/src/components/shared/TabButton.tsx b/apps/web/src/components/shared/TabButton.tsx
new file mode 100644
index 000000000..f753f2a84
--- /dev/null
+++ b/apps/web/src/components/shared/TabButton.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+
+type TabButtonProps = {
+ active: boolean;
+ onClick: () => void;
+ children: React.ReactNode;
+};
+
+/**
+ * One tab of an underlined tab bar; the bar itself carries the bottom border.
+ */
+const TabButton: React.FC<TabButtonProps> = ({ active, onClick, children }) => (
+ <button type="button" role="tab" aria-selected={active} onClick={onClick} className={`-mb-px flex-1 border-b-2 px-3 py-3 text-sm font-medium transition-colors ${active ? 'border-primary-600 text-primary-600 dark:border-primary-500 dark:text-primary-500' : 'border-transparent text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200'}`}>
+ {children}
+ </button>
+);
+
+export default TabButton;
diff --git a/apps/web/src/components/shared/Text.tsx b/apps/web/src/components/shared/Text.tsx
new file mode 100644
index 000000000..6723bb1db
--- /dev/null
+++ b/apps/web/src/components/shared/Text.tsx
@@ -0,0 +1,25 @@
+import React from 'react';
+
+export type TextVariant = 'body' | 'muted';
+
+const VARIANT_CLASSES: Record<TextVariant, string> = {
+ body: 'text-sm text-gray-700 dark:text-gray-300',
+ muted: 'text-sm text-gray-500 dark:text-gray-400',
+};
+
+type TextProps = {
+ children: React.ReactNode;
+ variant?: TextVariant;
+ as?: 'p' | 'span' | 'div';
+ className?: string;
+ id?: string;
+};
+
+/**
+ * Paragraph text in one of the shared text styles, so text size and color stay the same across pages.
+ */
+const Text: React.FC<TextProps> = ({ children, variant = 'body', as: Tag = 'p', className = '', id }) => (
+ <Tag id={id} className={`${VARIANT_CLASSES[variant]} ${className}`.trim()}>{children}</Tag>
+);
+
+export default Text;
diff --git a/apps/web/src/components/shared/ToggleChip.tsx b/apps/web/src/components/shared/ToggleChip.tsx
new file mode 100644
index 000000000..fe021b59b
--- /dev/null
+++ b/apps/web/src/components/shared/ToggleChip.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+
+type ToggleChipProps = {
+ selected: boolean;
+ onClick: () => void;
+ children: React.ReactNode;
+ title?: string;
+ /** `outlined` gives the unselected chip a border, for chips on a busy background. */
+ outlined?: boolean;
+};
+
+/**
+ * A chip that is on or off, e.g. a character class of the password generator or a selectable domain.
+ */
+const ToggleChip: React.FC<ToggleChipProps> = ({ selected, onClick, children, title, outlined = false }) => (
+ <button type="button" title={title} aria-pressed={selected} onClick={onClick} className={`flex items-center justify-center px-3 py-2 rounded-md text-sm font-medium transition-colors ${selected ? 'bg-primary-600 text-white hover:bg-primary-700' : `bg-gray-200 text-gray-700 hover:bg-gray-300 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600 ${outlined ? 'border border-gray-300 dark:border-gray-600' : ''}`}`}>
+ {children}
+ </button>
+);
+
+export default ToggleChip;
diff --git a/apps/web/src/components/totp/TotpCodes.tsx b/apps/web/src/components/totp/TotpCodes.tsx
index 0f644e3c2..52f312a19 100644
--- a/apps/web/src/components/totp/TotpCodes.tsx
+++ b/apps/web/src/components/totp/TotpCodes.tsx
@@ -4,9 +4,11 @@ import QRCode from 'qrcode';
import React, { useEffect, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
+import Button from '@/components/shared/Button';
import Card from '@/components/shared/Card';
import FormLabel from '@/components/shared/FormLabel';
import FormModal from '@/components/shared/FormModal';
+import InputTextField from '@/components/shared/InputTextField';
import SectionTitle from '@/components/shared/SectionTitle';
import { useConfirmModal } from '@/context/ConfirmModalContext';
import { useNotifications } from '@/context/NotificationContext';
@@ -20,9 +22,6 @@ type TotpCodesProps = {
itemUsername: string;
};
-const INPUT_CLASSES = 'bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-500 focus:border-primary-500 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white';
-const SAVE_BUTTON_CLASSES = 'text-white bg-primary-700 hover:bg-primary-800 focus:ring-4 focus:outline-none focus:ring-primary-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800';
-
/**
* The secret, name and parameters of a TOTP entry from a raw secret or an otpauth URI.
*/
@@ -209,10 +208,10 @@ const TotpCodes: React.FC<TotpCodesProps> = ({ totpCodes, onTotpCodesChange, can
<p className="mb-4 text-sm text-gray-500 dark:text-gray-400">{t('totp.totpInstructions')}</p>
<div className="mb-4">
<FormLabel htmlFor="totp-secret">{t('totp.secretKey')}</FormLabel>
- <input id="totp-secret" type="text" value={newSecret} onChange={(e) => {
- setNewSecret(e.target.value);
+ <InputTextField id="totp-secret" type="text" value={newSecret} onValueChange={(value) => {
+ setNewSecret(value);
setSecretError('');
- }} className={INPUT_CLASSES} placeholder={t('totp.secretKeyPlaceholder')} />
+ }} placeholder={t('totp.secretKeyPlaceholder')} />
{secretError.length > 0 && <div className="text-red-600 dark:text-red-400 text-sm mt-1">{secretError}</div>}
</div>
{showNameField ? (
@@ -226,7 +225,7 @@ const TotpCodes: React.FC<TotpCodesProps> = ({ totpCodes, onTotpCodesChange, can
{removeIcon}
</button>
</div>
- <input id="totp-name" type="text" value={newName} onChange={e => setNewName(e.target.value)} className={INPUT_CLASSES} />
+ <InputTextField id="totp-name" type="text" value={newName} onValueChange={setNewName} />
</div>
) : (
<div className="mb-4">
@@ -236,7 +235,7 @@ const TotpCodes: React.FC<TotpCodesProps> = ({ totpCodes, onTotpCodesChange, can
</div>
)}
<div className="flex justify-end">
- <button id="save-totp-code" type="button" onClick={addTotpCode} className={SAVE_BUTTON_CLASSES}>{t('common.save')}</button>
+ <Button id="save-totp-code" onClick={addTotpCode}>{t('common.save')}</Button>
</div>
</div>
</div>
@@ -302,7 +301,7 @@ const TotpCodes: React.FC<TotpCodesProps> = ({ totpCodes, onTotpCodesChange, can
{removeIcon}
</button>
</div>
- <input type="text" value={editName} onChange={e => setEditName(e.target.value)} className="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-500 focus:border-primary-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:text-white" placeholder={t('totp.nameOptional')} />
+ <InputTextField id="totp-edit-name" type="text" value={editName} onValueChange={setEditName} placeholder={t('totp.nameOptional')} />
</div>
) : (
<button type="button" onClick={() => setShowEditNameField(true)} className="text-sm font-medium text-primary-700 hover:text-primary-800 dark:text-primary-500 dark:hover:text-primary-400">
@@ -310,7 +309,7 @@ const TotpCodes: React.FC<TotpCodesProps> = ({ totpCodes, onTotpCodesChange, can
</button>
)}
- <button type="button" onClick={saveEditedTotpCode} className={`w-full ${SAVE_BUTTON_CLASSES}`}>{t('common.save')}</button>
+ <Button onClick={saveEditedTotpCode} additionalClasses="w-full">{t('common.save')}</Button>
</div>
)}
</div>
diff --git a/apps/web/src/components/totp/TotpViewer.tsx b/apps/web/src/components/totp/TotpViewer.tsx
index 909957be9..1411e6d15 100644
--- a/apps/web/src/components/totp/TotpViewer.tsx
+++ b/apps/web/src/components/totp/TotpViewer.tsx
@@ -5,6 +5,7 @@ import { useTranslation } from 'react-i18next';
import Card from '@/components/shared/Card';
import SectionTitle from '@/components/shared/SectionTitle';
+import Text from '@/components/shared/Text';
import { useClipboardCopy } from '@/hooks/useClipboardCopy';
import type { ItemRef } from '@aliasvault/client/database/ItemRef';
@@ -84,7 +85,7 @@ const TotpViewer: React.FC<TotpViewerProps> = ({ totpCodes, item }) => {
{totpCodes.length === 0 ? (
<div className="flex flex-col justify-center">
- <p className="text-gray-500 dark:text-gray-400">{t('totp.viewer.noTotpCodesMessage')}</p>
+ <Text variant="muted">{t('totp.viewer.noTotpCodesMessage')}</Text>
</div>
) : (
<div className="grid grid-cols-1 gap-4 mt-4">
diff --git a/apps/web/src/hooks/useConfirmLogout.ts b/apps/web/src/hooks/useConfirmLogout.ts
new file mode 100644
index 000000000..24ab386d0
--- /dev/null
+++ b/apps/web/src/hooks/useConfirmLogout.ts
@@ -0,0 +1,24 @@
+import { hasUnsyncedUserChanges } from '@aliasvault/client/sync/VaultDirtyState';
+import { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useNavigate } from 'react-router-dom';
+
+import { useConfirmModal } from '@/context/ConfirmModalContext';
+
+/**
+ * Ask before logging out, with a stronger warning while the vault holds changes the server does not have yet.
+ */
+export const useConfirmLogout = (): (() => Promise<void>) => {
+ const { t } = useTranslation();
+ const navigate = useNavigate();
+ const { showConfirmation } = useConfirmModal();
+
+ return useCallback(async (): Promise<void> => {
+ const confirmed = await hasUnsyncedUserChanges()
+ ? await showConfirmation(t('logout.unsyncedChangesTitle'), t('logout.unsyncedChangesWarning'), t('logout.logoutAnyway'), t('common.cancel'))
+ : await showConfirmation(t('common.logout'), t('auth.logoutConfirm'), t('common.logout'), t('common.cancel'));
+ if (confirmed) {
+ navigate('/user/logout');
+ }
+ }, [navigate, showConfirmation, t]);
+};
diff --git a/apps/web/src/layouts/MainLayout.tsx b/apps/web/src/layouts/MainLayout.tsx
index f83662dee..6f03f4f34 100644
--- a/apps/web/src/layouts/MainLayout.tsx
+++ b/apps/web/src/layouts/MainLayout.tsx
@@ -7,8 +7,10 @@ import ClipboardCountdownBar from '@/components/layout/ClipboardCountdownBar';
import Footer from '@/components/layout/Footer';
import TopMenu from '@/components/layout/TopMenu';
import ConfirmModal from '@/components/shared/ConfirmModal';
+import { AccountNudgeProvider } from '@/context/AccountNudgeContext';
import { useAuth } from '@/context/AuthContext';
import { useDb } from '@/context/DbContext';
+import { QuickCreateProvider } from '@/context/QuickCreateContext';
import { useVaultLanguage } from '@/hooks/useVaultLanguage';
import { useVaultSync } from '@/hooks/useVaultSync';
import { setLocalPreference } from '@/utils/LocalPreferences';
@@ -85,22 +87,24 @@ const MainLayout: React.FC = () => {
}
return (
- <>
- <ClipboardCountdownBar />
- <TopMenu />
- <div className="flex pt-16 mb-4 lg:mb-16 overflow-x-hidden bg-gray-100 dark:bg-gray-900 relative">
- <div id="main-content" className="relative w-full max-w-screen-2xl mx-auto h-full overflow-y-auto bg-gray-100 dark:bg-gray-900 min-h-[300px]">
- <main>
- <GlobalNotificationDisplay />
- <Outlet />
- </main>
+ <AccountNudgeProvider>
+ <QuickCreateProvider>
+ <ClipboardCountdownBar />
+ <TopMenu />
+ <div className="flex pt-16 mb-4 lg:mb-16 overflow-x-hidden bg-gray-100 dark:bg-gray-900 relative">
+ <div id="main-content" className="relative w-full max-w-screen-2xl mx-auto h-full overflow-y-auto bg-gray-100 dark:bg-gray-900 min-h-[300px]">
+ <main>
+ <GlobalNotificationDisplay />
+ <Outlet />
+ </main>
+ </div>
</div>
- </div>
- <Footer />
- {syncError && (
- <ConfirmModal title={t('common.error')} message={syncError} confirmText={t('common.close')} onClose={() => void clearSyncError()} />
- )}
- </>
+ <Footer />
+ {syncError && (
+ <ConfirmModal title={t('common.error')} message={syncError} confirmText={t('common.close')} onClose={() => void clearSyncError()} />
+ )}
+ </QuickCreateProvider>
+ </AccountNudgeProvider>
);
};
diff --git a/apps/web/src/pages/NotFound.tsx b/apps/web/src/pages/NotFound.tsx
index 055217007..188ca2c7d 100644
--- a/apps/web/src/pages/NotFound.tsx
+++ b/apps/web/src/pages/NotFound.tsx
@@ -2,6 +2,7 @@ import React from 'react';
import { useTranslation } from 'react-i18next';
import Logo from '@/components/auth/Logo';
+import Text from '@/components/shared/Text';
/**
* Fallback for unknown routes.
@@ -12,7 +13,7 @@ const NotFound: React.FC = () => {
<div className="flex flex-col items-center justify-center px-6 pt-8 pb-8 mx-auto md:h-screen pt:mt-0 relative">
<Logo />
<div className="w-full max-w-xl p-6 sm:p-8 bg-white rounded-lg shadow dark:bg-gray-800">
- <p className="text-gray-500 dark:text-gray-400">{t('app.notFound.message')}</p>
+ <Text variant="muted">{t('app.notFound.message')}</Text>
</div>
</div>
);
diff --git a/apps/web/src/pages/auth/Login.tsx b/apps/web/src/pages/auth/Login.tsx
index df774bced..32f6126f2 100644
--- a/apps/web/src/pages/auth/Login.tsx
+++ b/apps/web/src/pages/auth/Login.tsx
@@ -13,6 +13,7 @@ import ServerValidationErrors from '@/components/alerts/ServerValidationErrors';
import MobileUnlockModal from '@/components/auth/MobileUnlockModal';
import PasswordInputField from '@/components/auth/PasswordInputField';
import FooterLogin from '@/components/layout/FooterLogin';
+import Button from '@/components/shared/Button';
import FormLabel from '@/components/shared/FormLabel';
import InputTextField from '@/components/shared/InputTextField';
import { getAppConfig } from '@/config/AppConfig';
@@ -242,9 +243,6 @@ const Login: React.FC = () => {
}
};
- const inputClass = 'bg-gray-50 border border-gray-300 text-gray-900 sm:text-sm rounded-lg focus:ring-primary-600 focus:border-primary-600 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';
- const submitClass = 'w-full text-white bg-primary-600 hover:bg-primary-700 focus:ring-4 focus:outline-none focus:ring-primary-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800';
-
// An update request blocks the app until the user loads the latest version.
const updateRequest = errors.find(asksForClientUpdate);
if (updateRequest) {
@@ -278,7 +276,7 @@ const Login: React.FC = () => {
<form onSubmit={handle2Fa} className="space-y-6" av-enable="true" av-suppress-save="true">
<div>
<FormLabel htmlFor="two-factor-code">{t('auth.loginForm.authenticatorCodeLabel')}</FormLabel>
- <input ref={twoFactorRef} id="two-factor-code" type="number" value={twoFactorCode} onChange={(e) => setTwoFactorCode(e.target.value)} className={inputClass} autoComplete="one-time-code" />
+ <InputTextField ref={twoFactorRef} id="two-factor-code" type="number" value={twoFactorCode} onValueChange={setTwoFactorCode} autoComplete="one-time-code" />
</div>
<div className="flex items-start">
<div className="flex items-center h-5">
@@ -288,7 +286,7 @@ const Login: React.FC = () => {
<label htmlFor="remember-machine" className="font-medium text-gray-900 dark:text-white">{t('auth.loginForm.rememberMachineLabel')}</label>
</div>
</div>
- <button type="submit" className={submitClass}>{t('auth.login')}</button>
+ <Button type="submit" size="lg" additionalClasses="w-full">{t('auth.login')}</Button>
</form>
</div>
<p className="mt-6 text-sm text-gray-700 dark:text-gray-300">
@@ -320,9 +318,9 @@ const Login: React.FC = () => {
<form onSubmit={handleRecoveryCode} className="space-y-6">
<div>
<FormLabel htmlFor="recovery-code">{t('auth.loginForm.recoveryCodeLabel')}</FormLabel>
- <input id="recovery-code" type="text" value={recoveryCode} onChange={(e) => setRecoveryCode(e.target.value)} className={inputClass} autoComplete="off" />
+ <InputTextField id="recovery-code" type="text" value={recoveryCode} onValueChange={setRecoveryCode} autoComplete="off" />
</div>
- <button type="submit" className={submitClass}>{t('auth.login')}</button>
+ <Button type="submit" size="lg" additionalClasses="w-full">{t('auth.login')}</Button>
</form>
</div>
<p className="mt-6 text-sm text-gray-700 dark:text-gray-300">
@@ -366,15 +364,13 @@ const Login: React.FC = () => {
</div>
<div className="flex flex-col gap-4">
- <button type="submit" id="login-button" className="w-full px-5 py-2 text-base font-medium text-center text-white bg-primary-700 rounded-lg hover:bg-primary-800 focus:ring-4 focus:ring-primary-300 dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800 flex items-center justify-center gap-2">
- {t('auth.login')}
- </button>
- <button type="button" id="mobile-login-button" onClick={() => setShowMobileLoginModal(true)} className="hidden md:flex w-full px-5 py-2 text-base font-medium text-center text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-100 focus:ring-4 focus:ring-gray-200 dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:ring-gray-700 items-center justify-center gap-2">
+ <Button type="submit" id="login-button" size="lg" display="flex" additionalClasses="w-full">{t('auth.login')}</Button>
+ <Button id="mobile-login-button" onClick={() => setShowMobileLoginModal(true)} color="outline" size="lg" display="flex" additionalClasses="hidden md:flex w-full">
<svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 18h.01M8 21h8a2 2 0 002-2V5a2 2 0 00-2-2H8a2 2 0 00-2 2v14a2 2 0 002 2z"></path>
</svg>
{t('auth.loginWithMobile')}
- </button>
+ </Button>
</div>
{getAppConfig().publicRegistrationEnabled && (
diff --git a/apps/web/src/pages/auth/Unlock.tsx b/apps/web/src/pages/auth/Unlock.tsx
index 85cea460f..2e64fea99 100644
--- a/apps/web/src/pages/auth/Unlock.tsx
+++ b/apps/web/src/pages/auth/Unlock.tsx
@@ -17,6 +17,7 @@ import MobileUnlockModal from '@/components/auth/MobileUnlockModal';
import PasswordInputField from '@/components/auth/PasswordInputField';
import FooterLogin from '@/components/layout/FooterLogin';
import BoldLoadingIndicator from '@/components/loading/BoldLoadingIndicator';
+import Button from '@/components/shared/Button';
import FormLabel from '@/components/shared/FormLabel';
import { useAuth } from '@/context/AuthContext';
import { useDb } from '@/context/DbContext';
@@ -304,20 +305,18 @@ const Unlock: React.FC = () => {
<PasswordInputField ref={passwordRef} id="password" value={password} onValueChange={setPassword} placeholder="••••••••" />
</div>
- <button type="submit" id="unlock-button" className="w-full px-5 py-2 text-base font-medium text-center text-white bg-primary-700 rounded-lg hover:bg-primary-800 focus:ring-4 focus:ring-primary-300 dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800 flex items-center justify-center gap-2">
- {t('auth.unlockPage.unlockButton')}
- </button>
+ <Button type="submit" id="unlock-button" size="lg" display="flex" additionalClasses="w-full">{t('auth.unlockPage.unlockButton')}</Button>
</form>
</>
)}
{!dbContext.isOffline && (
- <button type="button" id="mobile-unlock-button" onClick={() => setShowMobileUnlockModal(true)} className="hidden md:flex w-full px-5 py-2 text-base font-medium text-center text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-100 focus:ring-4 focus:ring-gray-200 dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:ring-gray-700 items-center justify-center gap-2 mt-4">
+ <Button id="mobile-unlock-button" onClick={() => setShowMobileUnlockModal(true)} color="outline" size="lg" display="flex" additionalClasses="hidden md:flex w-full mt-4">
<svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 18h.01M8 21h8a2 2 0 002-2V5a2 2 0 00-2-2H8a2 2 0 00-2 2v14a2 2 0 002 2z"></path>
</svg>
{t('auth.unlockPage.unlockWithMobileButton')}
- </button>
+ </Button>
)}
<div className="text-sm text-center font-medium text-gray-500 dark:text-gray-400 mt-6">
diff --git a/apps/web/src/pages/emails/Home.tsx b/apps/web/src/pages/emails/Home.tsx
index f7e0165a9..4a7930549 100644
--- a/apps/web/src/pages/emails/Home.tsx
+++ b/apps/web/src/pages/emails/Home.tsx
@@ -15,6 +15,7 @@ import PageContent from '@/components/shared/PageContent';
import PageHeader from '@/components/shared/PageHeader';
import RefreshButton from '@/components/shared/RefreshButton';
import ResponsivePaginator from '@/components/shared/ResponsivePaginator';
+import Text from '@/components/shared/Text';
import { getAppConfig } from '@/config/AppConfig';
import { useConfirmModal } from '@/context/ConfirmModalContext';
import { useDb } from '@/context/DbContext';
@@ -465,7 +466,7 @@ const EmailsHome: React.FC = () => {
) : noEmailClaims ? (
<div className="p-4 mx-4 mt-4 bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 dark:bg-gray-800">
<div className="px-4 py-2 text-gray-400 rounded">
- <p className="text-gray-500 dark:text-gray-400">{t('emails.home.noEmailClaimsMessage')}</p>
+ <Text variant="muted">{t('emails.home.noEmailClaimsMessage')}</Text>
</div>
</div>
) : (
diff --git a/apps/web/src/pages/items/AddEdit.tsx b/apps/web/src/pages/items/AddEdit.tsx
index 0466cbbbf..1bacace4c 100644
--- a/apps/web/src/pages/items/AddEdit.tsx
+++ b/apps/web/src/pages/items/AddEdit.tsx
@@ -6,10 +6,11 @@ import { useLocation, useNavigate, useParams } from 'react-router-dom';
import AttachmentUploader from '@/components/attachments/AttachmentUploader';
import DraggableCustomFieldsList from '@/components/forms/DraggableCustomFieldsList';
-import EditFormRow, { EDIT_INPUT_CLASSES } from '@/components/forms/EditFormRow';
+import EditFormRow from '@/components/forms/EditFormRow';
import EditPasswordFormRow from '@/components/forms/EditPasswordFormRow';
import EditUsernameFormRow from '@/components/forms/EditUsernameFormRow';
import EmailDomainField from '@/components/forms/EmailDomainField';
+import FormInput from '@/components/forms/FormInput';
import MultiValueFormRow from '@/components/forms/MultiValueFormRow';
import RemovableSection from '@/components/forms/RemovableSection';
import AddFieldMenu from '@/components/items/AddFieldMenu';
@@ -528,9 +529,9 @@ const ItemAddEditForm: React.FC = () => {
onFetchFromWebsite={() => void fetchLogoFromWebsite()}
/>
<div className="flex-1 min-w-0">
- <input type="text" id="service-name" autoComplete="off" className={EDIT_INPUT_CLASSES} value={edit.ServiceName} placeholder={t('items.addEdit.serviceNamePlaceholder')} autoCapitalize="off" autoCorrect="off" onChange={(e) => {
+ <FormInput id="service-name" value={edit.ServiceName} placeholder={t('items.addEdit.serviceNamePlaceholder')} onValueChange={(next) => {
setNameError('');
- update(current => ({ ...current, ServiceName: e.target.value }));
+ update(current => ({ ...current, ServiceName: next }));
}} />
{nameError.length > 0 && <div className="validation-message text-red-600 dark:text-red-400 text-sm mt-1">{nameError}</div>}
<FolderSelector selectedFolder={edit.FolderId ? { Id: edit.FolderId, ManifestId: edit.ManifestId } : null} onSelectedFolderChange={folder => update(current => setFolder(current, folder, dbContext.sqliteClient?.getPersonalManifestId() ?? null))} />
diff --git a/apps/web/src/pages/items/RecentlyDeleted.tsx b/apps/web/src/pages/items/RecentlyDeleted.tsx
index 4c5474c08..33346c7db 100644
--- a/apps/web/src/pages/items/RecentlyDeleted.tsx
+++ b/apps/web/src/pages/items/RecentlyDeleted.tsx
@@ -11,6 +11,7 @@ import LoadingIndicator from '@/components/loading/LoadingIndicator';
import FormModal from '@/components/shared/FormModal';
import PageContent from '@/components/shared/PageContent';
import PageHeader from '@/components/shared/PageHeader';
+import Text from '@/components/shared/Text';
import { useDb } from '@/context/DbContext';
import { useNotifications } from '@/context/NotificationContext';
import { usePageTitle } from '@/hooks/usePageTitle';
@@ -192,7 +193,7 @@ const RecentlyDeleted: React.FC = () => {
<PageContent className="mx-4">
<div className="p-4 mb-4 bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 dark:bg-gray-800">
{items.length === 0 ? (
- <p className="text-gray-500 dark:text-gray-400">{t('items.trash.noItems')}</p>
+ <Text variant="muted">{t('items.trash.noItems')}</Text>
) : (
<>
<p className="text-sm text-gray-500 dark:text-gray-400 mb-4">{t('items.trash.description')}</p>
diff --git a/apps/web/src/pages/settings/Apps.tsx b/apps/web/src/pages/settings/Apps.tsx
index ca3cb3cee..6aac34dd8 100644
--- a/apps/web/src/pages/settings/Apps.tsx
+++ b/apps/web/src/pages/settings/Apps.tsx
@@ -1,9 +1,10 @@
import React from 'react';
import { useTranslation } from 'react-i18next';
+import SettingsPageHeader from '@/components/settings/SettingsPageHeader';
import Card from '@/components/shared/Card';
import PageContent from '@/components/shared/PageContent';
-import PageHeader from '@/components/shared/PageHeader';
+import SectionTitle from '@/components/shared/SectionTitle';
import { usePageTitle } from '@/hooks/usePageTitle';
import { type AppInfo, BROWSER_EXTENSIONS, MOBILE_APPS } from '@/utils/AppDownloads';
@@ -36,12 +37,12 @@ const AppsSettings: React.FC = () => {
return (
<>
- <PageHeader breadcrumbItems={[{ displayName: t('settings.apps.pageTitle') }]} title={t('settings.apps.pageTitle')} description={t('settings.apps.pageDescription')} />
+ <SettingsPageHeader icon="apps" title={t('settings.apps.pageTitle')} description={t('settings.apps.pageDescription')} />
<PageContent>
<Card>
<div className="mb-6">
- <h3 className="text-lg font-medium text-gray-900 dark:text-white mb-2">{t('settings.apps.browserExtensionsTitle')}</h3>
+ <SectionTitle className="mb-2">{t('settings.apps.browserExtensionsTitle')}</SectionTitle>
<p className="text-sm text-gray-600 dark:text-gray-400">{t('settings.apps.browserExtensionsDescription')}</p>
</div>
@@ -52,7 +53,7 @@ const AppsSettings: React.FC = () => {
</div>
<div className="mb-6">
- <h3 className="text-lg font-medium text-gray-900 dark:text-white mb-2">{t('settings.apps.mobileAppsTitle')}</h3>
+ <SectionTitle className="mb-2">{t('settings.apps.mobileAppsTitle')}</SectionTitle>
<p className="text-sm text-gray-600 dark:text-gray-400">{t('settings.apps.mobileAppsDescription')}</p>
</div>
diff --git a/apps/web/src/pages/settings/FamilySharing.tsx b/apps/web/src/pages/settings/FamilySharing.tsx
index 2b5b74e74..9ad80e554 100644
--- a/apps/web/src/pages/settings/FamilySharing.tsx
+++ b/apps/web/src/pages/settings/FamilySharing.tsx
@@ -13,13 +13,14 @@ import AlertMessageSuccess from '@/components/alerts/AlertMessageSuccess';
import FolderIcon from '@/components/folders/FolderIcon';
import FolderModal from '@/components/folders/FolderModal';
import LoadingIndicator from '@/components/loading/LoadingIndicator';
+import SettingsPageHeader from '@/components/settings/SettingsPageHeader';
import Button from '@/components/shared/Button';
import Card from '@/components/shared/Card';
import InputTextField from '@/components/shared/InputTextField';
import PageContent from '@/components/shared/PageContent';
-import PageHeader from '@/components/shared/PageHeader';
import PasswordConfirmationModal from '@/components/shared/PasswordConfirmationModal';
import RefreshButton from '@/components/shared/RefreshButton';
+import SectionTitle from '@/components/shared/SectionTitle';
import SmallButton from '@/components/shared/SmallButton';
import { useAuth } from '@/context/AuthContext';
import { useConfirmModal } from '@/context/ConfirmModalContext';
@@ -352,8 +353,8 @@ const FamilySharing: React.FC = () => {
return (
<>
- <PageHeader
- breadcrumbItems={[{ displayName: familySharingText.title }]}
+ <SettingsPageHeader
+ icon="familySharing"
title={familySharingText.title}
description={familySharingText.description}
customActions={<RefreshButton onClick={refresh} buttonText={t('common.refresh')} />}
@@ -387,7 +388,7 @@ const FamilySharing: React.FC = () => {
{!isLoading && orphanInvitations.length > 0 && (
<section className="mx-4 mb-6">
- <h3 className="mb-4 text-lg font-semibold text-gray-900 dark:text-white">{familySharingText.invitations}</h3>
+ <SectionTitle className="mb-4">{familySharingText.invitations}</SectionTitle>
<div className="grid grid-cols-1 items-start gap-4 md:grid-cols-2 xl:grid-cols-3">
{orphanInvitations.map(invitationCard)}
</div>
@@ -408,7 +409,7 @@ const FamilySharing: React.FC = () => {
<section key={group.groupId} className="mx-4 mb-6 space-y-6">
{/* The family's members. */}
<Card variant="tile">
- <h3 className="mb-3 text-lg font-medium text-gray-900 dark:text-white">{familySharingText.members} ({group.members.length})</h3>
+ <SectionTitle className="mb-3">{familySharingText.members} ({group.members.length})</SectionTitle>
<ul className="flex flex-wrap gap-x-10 gap-y-3">
{group.members.map(member => (
<li key={member.userId} className="min-w-0">
@@ -420,7 +421,7 @@ const FamilySharing: React.FC = () => {
</Card>
<div className="min-w-0">
- <h3 className="text-lg font-semibold text-gray-900 dark:text-white">{familySharingText.sharedVaults}</h3>
+ <SectionTitle className="mb-0">{familySharingText.sharedVaults}</SectionTitle>
<p className="mt-1 mb-4 text-sm text-gray-500 dark:text-gray-400">{familySharingText.sharedVaultsHint}</p>
{/* One card per shared manifest, each with the members who can open it. */}
diff --git a/apps/web/src/pages/settings/PasswordGenerator.tsx b/apps/web/src/pages/settings/PasswordGenerator.tsx
new file mode 100644
index 000000000..4deb70c6c
--- /dev/null
+++ b/apps/web/src/pages/settings/PasswordGenerator.tsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+import DefaultPasswordSettings from '@/components/settings/DefaultPasswordSettings';
+import SettingsPageHeader from '@/components/settings/SettingsPageHeader';
+import Card from '@/components/shared/Card';
+import PageContent from '@/components/shared/PageContent';
+import { usePageTitle } from '@/hooks/usePageTitle';
+
+/**
+ * The password generator settings page: defaults for newly generated passwords.
+ */
+const PasswordGeneratorSettings: React.FC = () => {
+ const { t } = useTranslation();
+
+ usePageTitle(t('settings.passwordGenerator'));
+
+ return (
+ <>
+ <SettingsPageHeader icon="passwordGenerator" title={t('settings.passwordGenerator')} />
+
+ <PageContent>
+ <Card>
+ <DefaultPasswordSettings />
+ </Card>
+ </PageContent>
+ </>
+ );
+};
+
+export default PasswordGeneratorSettings;
diff --git a/apps/web/src/pages/settings/StorageInsights.tsx b/apps/web/src/pages/settings/StorageInsights.tsx
index b5f5cb883..cf2abfed6 100644
--- a/apps/web/src/pages/settings/StorageInsights.tsx
+++ b/apps/web/src/pages/settings/StorageInsights.tsx
@@ -5,11 +5,13 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
+import SettingsPageHeader from '@/components/settings/SettingsPageHeader';
import Button from '@/components/shared/Button';
import Card from '@/components/shared/Card';
import PageContent from '@/components/shared/PageContent';
-import PageHeader from '@/components/shared/PageHeader';
+import SectionTitle from '@/components/shared/SectionTitle';
import SortableTable, { SortableTableColumn, SortableTableRow, type TableColumn } from '@/components/shared/SortableTable';
+import Text from '@/components/shared/Text';
import { useConfirmModal } from '@/context/ConfirmModalContext';
import { useDb } from '@/context/DbContext';
import { useNotifications } from '@/context/NotificationContext';
@@ -264,11 +266,11 @@ const StorageInsights: React.FC = () => {
return (
<>
- <PageHeader breadcrumbItems={[{ displayName: t('settings.storageInsights.breadcrumbTitle') }]} title={t('settings.storageInsights.pageTitle')} description={t('settings.storageInsights.pageDescription')} />
+ <SettingsPageHeader icon="storage" breadcrumbItems={[{ displayName: t('settings.storageInsights.breadcrumbTitle') }]} title={t('settings.storageInsights.pageTitle')} description={t('settings.storageInsights.pageDescription')} />
<PageContent>
<Card>
- <h3 className="mb-2 text-lg font-medium text-gray-900 dark:text-white">{t('settings.storageInsights.serverTotalTitle')}</h3>
+ <SectionTitle className="mb-2">{t('settings.storageInsights.serverTotalTitle')}</SectionTitle>
{serverStatsFailed ? (
<p className="text-sm text-gray-500 dark:text-gray-400">{t('common.errorGeneric')}</p>
) : serverStats ? (
@@ -277,7 +279,7 @@ const StorageInsights: React.FC = () => {
<p className="mt-2 text-sm text-gray-500 dark:text-gray-400">{t('settings.storageInsights.serverTotalDescription')}</p>
</>
) : (
- <p className="text-gray-600 dark:text-gray-400">{t('common.loading')}</p>
+ <Text variant="muted">{t('common.loading')}</Text>
)}
</Card>
@@ -292,7 +294,7 @@ const StorageInsights: React.FC = () => {
<CountTile label={t('settings.storageInsights.breakdownLogosLabel')} value={localStats.counts.LogoCount} />
</div>
) : (
- <p className="text-gray-600 dark:text-gray-400">{t('common.loading')}</p>
+ <Text variant="muted">{t('common.loading')}</Text>
)}
</Card>
diff --git a/apps/web/src/pages/settings/importexport/ImportExport.tsx b/apps/web/src/pages/settings/importexport/ImportExport.tsx
index 41c5de093..6cb545cba 100644
--- a/apps/web/src/pages/settings/importexport/ImportExport.tsx
+++ b/apps/web/src/pages/settings/importexport/ImportExport.tsx
@@ -7,10 +7,10 @@ import { useTranslation } from 'react-i18next';
import ExportPasswordModal from '@/components/settings/importexport/ExportPasswordModal';
import ImportServices from '@/components/settings/importexport/ImportServices';
import ResetVaultSection from '@/components/settings/importexport/ResetVaultSection';
+import SettingsPageHeader from '@/components/settings/SettingsPageHeader';
import Button from '@/components/shared/Button';
import Card from '@/components/shared/Card';
import PageContent from '@/components/shared/PageContent';
-import PageHeader from '@/components/shared/PageHeader';
import PasswordConfirmationModal from '@/components/shared/PasswordConfirmationModal';
import { useAuth } from '@/context/AuthContext';
import { useConfirmModal } from '@/context/ConfirmModalContext';
@@ -209,7 +209,7 @@ const ImportExport: React.FC = () => {
return (
<>
- <PageHeader breadcrumbItems={[{ displayName: t('settings.importExport') }]} title={t('settings.importExport')} description={t('importExport.pageDescription')} />
+ <SettingsPageHeader icon="importExport" title={t('settings.importExport')} description={t('importExport.pageDescription')} />
<PageContent>
<Card className="2xl:col-span-2">
diff --git a/apps/web/src/pages/settings/importexport/ResetVault.tsx b/apps/web/src/pages/settings/importexport/ResetVault.tsx
index 865038485..9d369852a 100644
--- a/apps/web/src/pages/settings/importexport/ResetVault.tsx
+++ b/apps/web/src/pages/settings/importexport/ResetVault.tsx
@@ -3,11 +3,10 @@ import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
import MessageWarning from '@/components/alerts/MessageWarning';
-import Breadcrumb from '@/components/shared/Breadcrumb';
+import SettingsPageHeader from '@/components/settings/SettingsPageHeader';
import Button from '@/components/shared/Button';
import Card from '@/components/shared/Card';
import FormLabel from '@/components/shared/FormLabel';
-import H1 from '@/components/shared/H1';
import InputTextField from '@/components/shared/InputTextField';
import { useAuth } from '@/context/AuthContext';
import { useDb } from '@/context/DbContext';
@@ -104,12 +103,7 @@ const ResetVault: React.FC = () => {
return (
<>
- <div className="grid grid-cols-1 px-4 pt-6 xl:grid-cols-3 xl:gap-4 dark:bg-gray-900">
- <div className="mb-4 col-span-full xl:mb-2">
- <Breadcrumb items={[{ displayName: t('common.home'), url: '/', showHomeIcon: true }, { displayName: t('settings.importExport'), url: '/settings/import-export' }, { displayName: t('settings.resetVault.pageTitle') }]} />
- <H1>{t('settings.resetVault.pageTitle')}</H1>
- </div>
- </div>
+ <SettingsPageHeader icon="importExport" breadcrumbItems={[{ displayName: t('settings.importExport'), url: '/settings/import-export' }, { displayName: t('settings.resetVault.pageTitle') }]} title={t('settings.resetVault.pageTitle')} backTo={{ url: '/settings/import-export', label: t('settings.importExport') }} />
<Card>
{!showPasswordConfirm ? (
diff --git a/apps/web/src/pages/settings/security/ChangePassword.tsx b/apps/web/src/pages/settings/security/ChangePassword.tsx
index e00352d05..f82bb02f4 100644
--- a/apps/web/src/pages/settings/security/ChangePassword.tsx
+++ b/apps/web/src/pages/settings/security/ChangePassword.tsx
@@ -5,10 +5,9 @@ import React, { useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
import PasswordInputField from '@/components/auth/PasswordInputField';
-import Breadcrumb from '@/components/shared/Breadcrumb';
+import SettingsPageHeader from '@/components/settings/SettingsPageHeader';
import Card from '@/components/shared/Card';
import FormLabel from '@/components/shared/FormLabel';
-import H1 from '@/components/shared/H1';
import PasswordStrengthIndicator from '@/components/shared/PasswordStrengthIndicator';
import { useDb } from '@/context/DbContext';
import { useLoading } from '@/context/LoadingContext';
@@ -114,13 +113,7 @@ const ChangePassword: React.FC = () => {
return (
<>
- <div className="grid grid-cols-1 px-4 pt-6 xl:grid-cols-3 xl:gap-4 dark:bg-gray-900">
- <div className="mb-4 col-span-full xl:mb-2">
- <Breadcrumb items={[{ displayName: t('common.home'), url: '/', showHomeIcon: true }, { displayName: t('settings.securitySettings.pageTitle'), url: '/settings/security' }, { displayName: t('settings.securitySettings.changePassword.changePassword') }]} />
- <H1>{t('settings.securitySettings.changePassword.changePassword')}</H1>
- <p className="mt-2 text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.changePassword.headerText')}</p>
- </div>
- </div>
+ <SettingsPageHeader icon="security" breadcrumbItems={[{ displayName: t('settings.securitySettings.pageTitle'), url: '/settings/security' }, { displayName: t('settings.securitySettings.changePassword.changePassword') }]} title={t('settings.securitySettings.changePassword.changePassword')} description={t('settings.securitySettings.changePassword.headerText')} backTo={{ url: '/settings/security', label: t('settings.securitySettings.pageTitle') }} />
<Card>
<form onSubmit={changePassword} className="space-y-4">
diff --git a/apps/web/src/pages/settings/security/DeleteAccount.tsx b/apps/web/src/pages/settings/security/DeleteAccount.tsx
index d435f396e..fee404de3 100644
--- a/apps/web/src/pages/settings/security/DeleteAccount.tsx
+++ b/apps/web/src/pages/settings/security/DeleteAccount.tsx
@@ -5,11 +5,10 @@ import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
import MessageWarning from '@/components/alerts/MessageWarning';
-import Breadcrumb from '@/components/shared/Breadcrumb';
+import SettingsPageHeader from '@/components/settings/SettingsPageHeader';
import Button from '@/components/shared/Button';
import Card from '@/components/shared/Card';
import FormLabel from '@/components/shared/FormLabel';
-import H1 from '@/components/shared/H1';
import InputTextField from '@/components/shared/InputTextField';
import { useAuth } from '@/context/AuthContext';
import { useLoading } from '@/context/LoadingContext';
@@ -82,12 +81,7 @@ const DeleteAccount: React.FC = () => {
return (
<>
- <div className="grid grid-cols-1 px-4 pt-6 xl:grid-cols-3 xl:gap-4 dark:bg-gray-900">
- <div className="mb-4 col-span-full xl:mb-2">
- <Breadcrumb items={[{ displayName: t('common.home'), url: '/', showHomeIcon: true }, { displayName: t('settings.securitySettings.pageTitle'), url: '/settings/security' }, { displayName: t('settings.securitySettings.deleteAccount.deleteAccount') }]} />
- <H1>{t('settings.securitySettings.deleteAccount.deleteAccount')}</H1>
- </div>
- </div>
+ <SettingsPageHeader icon="security" breadcrumbItems={[{ displayName: t('settings.securitySettings.pageTitle'), url: '/settings/security' }, { displayName: t('settings.securitySettings.deleteAccount.deleteAccount') }]} title={t('settings.securitySettings.deleteAccount.deleteAccount')} backTo={{ url: '/settings/security', label: t('settings.securitySettings.pageTitle') }} />
<Card>
{!showPasswordConfirm ? (
diff --git a/apps/web/src/pages/settings/security/Enable2Fa.tsx b/apps/web/src/pages/settings/security/Enable2Fa.tsx
deleted file mode 100644
index 2565bfef1..000000000
--- a/apps/web/src/pages/settings/security/Enable2Fa.tsx
+++ /dev/null
@@ -1,132 +0,0 @@
-import QRCode from 'qrcode';
-import React, { useEffect, useRef, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-
-import LoadingIndicator from '@/components/loading/LoadingIndicator';
-import Breadcrumb from '@/components/shared/Breadcrumb';
-import Card from '@/components/shared/Card';
-import H1 from '@/components/shared/H1';
-import { useNotifications } from '@/context/NotificationContext';
-import { useWebApi } from '@/context/WebApiContext';
-import { usePageTitle } from '@/hooks/usePageTitle';
-
-/**
- * The recovery codes shown once after enabling two-factor authentication.
- */
-const ShowRecoveryCodes: React.FC<{ recoveryCodes: string[] }> = ({ recoveryCodes }) => {
- const { t } = useTranslation();
-
- return (
- <div className="max-w-2xl mx-auto px-4 lg:mt-8">
- <Card variant="plain">
- <h3 className="mb-4 text-lg font-medium text-gray-900 dark:text-white">{t('settings.securitySettings.recoveryCodes.title')}</h3>
- <div className="text-sm text-gray-600 dark:text-gray-400 mb-4">{t('settings.securitySettings.recoveryCodes.description')}</div>
- <div className="bg-primary-100 border-l-4 border-primary-500 text-primary-700 p-4 mb-4 dark:bg-gray-700 dark:border-primary-500 dark:text-gray-200">
- <p className="font-semibold">{t('settings.securitySettings.recoveryCodes.warningTitle')}</p>
- <p>{t('settings.securitySettings.recoveryCodes.warningDescription')}</p>
- </div>
- <div className="grid grid-cols-1 md:grid-cols-2 gap-2" id="recovery-codes">
- {recoveryCodes.map(code => (
- <div key={code}>
- <code className="block p-3 bg-gray-100 dark:bg-gray-700 dark:text-gray-200 rounded border font-mono text-center">{code}</code>
- </div>
- ))}
- </div>
- </Card>
- </div>
- );
-};
-
-/**
- * The enable two-factor authentication page.
- */
-const Enable2Fa: React.FC = () => {
- const { t } = useTranslation();
- const webApi = useWebApi();
- const notifications = useNotifications();
- usePageTitle(t('settings.securitySettings.enable2fa.pageTitle'));
-
- const [isLoading, setIsLoading] = useState(true);
- const [qrCodeDataUrl, setQrCodeDataUrl] = useState('');
- const [secret, setSecret] = useState('');
- const [code, setCode] = useState('');
- const [recoveryCodes, setRecoveryCodes] = useState<string[] | null>(null);
- const hasStarted = useRef(false);
-
- useEffect(() => {
- if (hasStarted.current) {
- return;
- }
- hasStarted.current = true;
-
- /**
- * Ask the server for a new authenticator secret and render it as a QR code.
- */
- const setup = async (): Promise<void> => {
- try {
- const result = await webApi.post<null, { secret: string; qrCodeUrl: string }>('TwoFactorAuth/enable', null);
- // Spaces every four characters make the secret easier to type over.
- setSecret((result.secret.match(/.{1,4}/g) ?? []).join(' ').toLowerCase());
- setQrCodeDataUrl(await QRCode.toDataURL(result.qrCodeUrl, { width: 256, margin: 2 }));
- } catch (error) {
- console.error('Failed to start 2FA setup:', error);
- notifications.addErrorMessage(t('settings.securitySettings.enable2fa.failedToEnable2Fa'), true);
- } finally {
- setIsLoading(false);
- }
- };
- void setup();
- }, [notifications, t, webApi]);
-
- /**
- * Verify the first code and switch two-factor on.
- */
- const verifySetup = async (e: React.FormEvent): Promise<void> => {
- e.preventDefault();
- try {
- const result = await webApi.post<string, { recoveryCodes: string[] }>('TwoFactorAuth/verify', code);
- notifications.addSuccessMessage(t('settings.securitySettings.enable2fa.twoFactorEnabledSuccess'), true);
- setRecoveryCodes(result.recoveryCodes);
- } catch (error) {
- console.error('Failed to verify 2FA code:', error);
- notifications.addErrorMessage(t('settings.securitySettings.enable2fa.failedToEnable2Fa'), true);
- }
- };
-
- return (
- <>
- <div className="grid grid-cols-1 px-4 pt-6 xl:grid-cols-3 xl:gap-4 dark:bg-gray-900">
- <div className="mb-4 col-span-full xl:mb-2">
- <Breadcrumb items={[{ displayName: t('common.home'), url: '/', showHomeIcon: true }, { displayName: t('settings.securitySettings.pageTitle'), url: '/settings/security' }, { displayName: t('settings.securitySettings.enable2fa.pageTitle') }]} />
- <H1>{t('settings.securitySettings.enable2fa.pageTitle')}</H1>
- <p className="mt-2 text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.enable2fa.pageDescription')}</p>
- </div>
- </div>
-
- {isLoading ? <LoadingIndicator /> : recoveryCodes !== null ? <ShowRecoveryCodes recoveryCodes={recoveryCodes} /> : (
- <div className="max-w-2xl mx-auto px-4 lg:mt-8">
- <Card variant="plain">
- <div className="space-y-6">
- <div id="authenticator-uri" className="flex justify-center">
- {qrCodeDataUrl.length > 0 && <img src={qrCodeDataUrl} alt={t('common.qrCode')} className="w-64 h-64" />}
- </div>
- <p className="text-sm text-gray-600 dark:text-gray-400 text-center">{t('settings.securitySettings.enable2fa.qrCodeInstructions')}</p>
- <div className="text-lg font-mono text-center bg-gray-100 dark:bg-gray-700 p-3 rounded border dark:text-gray-200" id="authenticator-secret">{secret}</div>
-
- <form onSubmit={verifySetup} className="space-y-4" av-enable="true" av-suppress-save="true">
- <div>
- <input id="verificationCode" type="text" value={code} onChange={e => setCode(e.target.value)} className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 dark:bg-gray-700 dark:text-gray-200 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 dark:focus:ring-blue-400" placeholder={t('settings.securitySettings.enable2fa.verificationCodePlaceholder')} autoComplete="one-time-code" />
- </div>
- <button type="submit" className="w-full bg-primary-500 text-white py-2 px-4 rounded-md hover:bg-primary-600 focus:outline-none focus:ring-2 focus:ring-primary-500 focus:ring-offset-2 transition duration-150 ease-in-out">
- {t('settings.securitySettings.enable2fa.verifyAndEnableButton')}
- </button>
- </form>
- </div>
- </Card>
- </div>
- )}
- </>
- );
-};
-
-export default Enable2Fa;
diff --git a/apps/web/src/pages/settings/security/Security.tsx b/apps/web/src/pages/settings/security/Security.tsx
index 135febcf4..37aa3aef1 100644
--- a/apps/web/src/pages/settings/security/Security.tsx
+++ b/apps/web/src/pages/settings/security/Security.tsx
@@ -1,16 +1,12 @@
-import React, { useCallback, useEffect, useRef } from 'react';
+import React from 'react';
import { useTranslation } from 'react-i18next';
-import ActiveSessionsSection from '@/components/settings/security/ActiveSessionsSection';
+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 RecentAuthLogsSection from '@/components/settings/security/RecentAuthLogsSection';
-import type { SectionHandle } from '@/components/settings/security/SecuritySection';
-import TwoFactorAuthenticationSection from '@/components/settings/security/TwoFactorAuthenticationSection';
+import SettingsPageHeader from '@/components/settings/SettingsPageHeader';
import PageContent from '@/components/shared/PageContent';
-import PageHeader from '@/components/shared/PageHeader';
-import RefreshButton from '@/components/shared/RefreshButton';
import { usePageTitle } from '@/hooks/usePageTitle';
/**
@@ -18,32 +14,17 @@ import { usePageTitle } from '@/hooks/usePageTitle';
*/
const SecuritySettings: React.FC = () => {
const { t } = useTranslation();
-
- usePageTitle(t('settings.securitySettings.pageTitle'));
- const twoFactorRef = useRef<SectionHandle>(null);
- const quickUnlockRef = useRef<SectionHandle>(null);
- const sessionsRef = useRef<SectionHandle>(null);
- const authLogsRef = useRef<SectionHandle>(null);
-
- /**
- * Reload every section at once.
- */
- const loadData = useCallback(async (): Promise<void> => {
- await Promise.all([twoFactorRef.current?.loadData(), quickUnlockRef.current?.loadData(), sessionsRef.current?.loadData(), authLogsRef.current?.loadData()]);
- }, []);
- useEffect(() => void loadData(), [loadData]);
+ usePageTitle(t('settings.securitySettings.pageTitle'));
return (
<>
- <PageHeader breadcrumbItems={[{ displayName: t('settings.securitySettings.pageTitle') }]} title={t('settings.securitySettings.pageTitle')} description={t('settings.securitySettings.pageDescription')} customActions={<RefreshButton onClick={() => void loadData()} buttonText={t('common.refresh')} />} />
+ <SettingsPageHeader icon="security" title={t('settings.securitySettings.pageTitle')} description={t('settings.securitySettings.pageDescription')} />
<PageContent>
<PasswordChangeSection />
- <TwoFactorAuthenticationSection ref={twoFactorRef} />
- <QuickVaultUnlockSection ref={quickUnlockRef} />
- <ActiveSessionsSection ref={sessionsRef} onSessionsChanged={loadData} />
- <RecentAuthLogsSection ref={authLogsRef} />
+ <ClipboardClearSection />
+ <QuickVaultUnlockSection />
<DeleteAccountSection />
</PageContent>
</>
diff --git a/apps/web/src/pages/settings/security/SessionsAndLogs.tsx b/apps/web/src/pages/settings/security/SessionsAndLogs.tsx
new file mode 100644
index 000000000..974f9a7d1
--- /dev/null
+++ b/apps/web/src/pages/settings/security/SessionsAndLogs.tsx
@@ -0,0 +1,43 @@
+import React, { useCallback, useEffect, useRef } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import ActiveSessionsSection from '@/components/settings/security/ActiveSessionsSection';
+import RecentAuthLogsSection from '@/components/settings/security/RecentAuthLogsSection';
+import type { SectionHandle } from '@/components/settings/security/SecuritySection';
+import SettingsPageHeader from '@/components/settings/SettingsPageHeader';
+import PageContent from '@/components/shared/PageContent';
+import RefreshButton from '@/components/shared/RefreshButton';
+import { usePageTitle } from '@/hooks/usePageTitle';
+
+/**
+ * Active sessions and recent login attempts of the account.
+ */
+const SessionsAndLogs: React.FC = () => {
+ const { t } = useTranslation();
+
+ usePageTitle(t('settings.sessionsAndLogs'));
+ const sessionsRef = useRef<SectionHandle>(null);
+ const authLogsRef = useRef<SectionHandle>(null);
+
+ /**
+ * Reload both sections at once.
+ */
+ const loadData = useCallback(async (): Promise<void> => {
+ await Promise.all([sessionsRef.current?.loadData(), authLogsRef.current?.loadData()]);
+ }, []);
+
+ useEffect(() => void loadData(), [loadData]);
+
+ return (
+ <>
+ <SettingsPageHeader icon="sessions" title={t('settings.sessionsAndLogs')} customActions={<RefreshButton onClick={() => void loadData()} buttonText={t('common.refresh')} />} />
+
+ <PageContent>
+ <ActiveSessionsSection ref={sessionsRef} onSessionsChanged={loadData} />
+ <RecentAuthLogsSection ref={authLogsRef} />
+ </PageContent>
+ </>
+ );
+};
+
+export default SessionsAndLogs;
diff --git a/apps/web/src/pages/settings/security/TwoFactor.tsx b/apps/web/src/pages/settings/security/TwoFactor.tsx
new file mode 100644
index 000000000..f511fbbe2
--- /dev/null
+++ b/apps/web/src/pages/settings/security/TwoFactor.tsx
@@ -0,0 +1,102 @@
+import React, { useCallback, useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useNavigate } from 'react-router-dom';
+
+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 Text from '@/components/shared/Text';
+import { useWebApi } from '@/context/WebApiContext';
+import { usePageTitle } from '@/hooks/usePageTitle';
+
+export type TwoFactorPageMode = 'status' | 'enable' | 'disable';
+
+/**
+ * Current two-factor status with the action to switch it.
+ */
+const TwoFactorStatus: React.FC = () => {
+ const { t } = useTranslation();
+ const navigate = useNavigate();
+ const webApi = useWebApi();
+ const [isLoading, setIsLoading] = useState(true);
+ const [enabled, setEnabled] = useState(false);
+
+ /**
+ * Read the two-factor status from the server.
+ */
+ const loadData = useCallback(async (): Promise<void> => {
+ setIsLoading(true);
+ try {
+ const status = await webApi.get<{ twoFactorEnabled: boolean }>('TwoFactorAuth/status');
+ setEnabled(status.twoFactorEnabled);
+ } finally {
+ setIsLoading(false);
+ }
+ }, [webApi]);
+
+ useEffect(() => void loadData(), [loadData]);
+
+ if (isLoading) {
+ return <LoadingIndicator />;
+ }
+
+ 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>
+ )}
+ <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>
+ <Text className="mt-3 mb-5">
+ {enabled ? t('settings.securitySettings.twoFactor.enabledMessage') : t('settings.securitySettings.twoFactor.disabledMessage')}
+ </Text>
+ {enabled ? (
+ <Button color="danger" onClick={() => navigate('/settings/two-factor/disable')}>{t('settings.securitySettings.disable2fa.pageTitle')}</Button>
+ ) : (
+ <Button color="success" onClick={() => navigate('/settings/two-factor/enable')}>{t('settings.securitySettings.enable2fa.pageTitle')}</Button>
+ )}
+ </Card>
+ </>
+ );
+};
+
+/**
+ * The two-factor authentication page. The enable and disable steps render below the same header,
+ * with the back button returning to the status.
+ */
+const TwoFactor: React.FC<{ mode?: TwoFactorPageMode }> = ({ mode = 'status' }) => {
+ const { t } = useTranslation();
+ const title = t('common.twoFactorAuthentication');
+ const stepTitle = mode === 'enable' ? t('settings.securitySettings.enable2fa.pageTitle') : t('settings.securitySettings.disable2fa.pageTitle');
+ const description = mode === 'enable' ? t('settings.securitySettings.enable2fa.pageDescription') : mode === 'disable' ? t('settings.securitySettings.disable2fa.pageDescription') : t('web.welcome.twoFactorTipContent');
+
+ usePageTitle(mode === 'status' ? title : stepTitle);
+
+ return (
+ <>
+ {mode === 'status' ? (
+ <SettingsPageHeader icon="twoFactor" title={title} description={description} />
+ ) : (
+ <SettingsPageHeader icon="twoFactor" title={title} description={description} breadcrumbItems={[{ displayName: title, url: '/settings/two-factor' }, { displayName: stepTitle }]} backTo={{ url: '/settings/two-factor', label: title }} />
+ )}
+
+ <PageContent>
+ {mode === 'enable' ? <TwoFactorEnableStep /> : mode === 'disable' ? <TwoFactorDisableStep /> : <TwoFactorStatus />}
+ </PageContent>
+ </>
+ );
+};
+
+export default TwoFactor;