Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Refactor browser extension setting pages back button titles and header titles (#1695)
Leendert de Borstc919e7217857
diff --git a/apps/browser-extension/src/entrypoints/popup/App.tsx b/apps/browser-extension/src/entrypoints/popup/App.tsxindex 4dae542f8..80708853b 100644--- a/apps/browser-extension/src/entrypoints/popup/App.tsx+++ b/apps/browser-extension/src/entrypoints/popup/App.tsx@@ -197,14 +197,14 @@ const App: React.FC = () => {{ path: '/emails', element: <EmailsList />, showBackButton: false },{ path: '/emails/:id', element: <EmailDetails />, showBackButton: true, title: t('emails.title') },{ path: '/settings', element: <Settings />, showBackButton: false },- { path: '/settings/unlock-method', element: <VaultUnlockSettings />, showBackButton: true, title: t('settings.unlockMethod.title') },- { path: '/settings/autofill', element: <AutofillSettings />, showBackButton: true, title: t('settings.autofillSettings') },- { path: '/settings/context-menu', element: <ContextMenuSettings />, showBackButton: true, title: t('settings.contextMenuSettings') },- { path: '/settings/clipboard', element: <ClipboardSettings />, showBackButton: true, title: t('settings.clipboardSettings') },- { path: '/settings/language', element: <LanguageSettings />, showBackButton: true, title: t('settings.language') },- { path: '/settings/auto-lock', element: <AutoLockSettings />, showBackButton: true, title: t('settings.autoLockTimeout') },- { path: '/settings/passkeys', element: <PasskeySettings />, showBackButton: true, title: t('settings.passkeySettings') },- { path: '/settings/identity-generator', element: <IdentityGeneratorSettings />, showBackButton: true, title: t('settings.identityGenerator') },+ { path: '/settings/unlock-method', element: <VaultUnlockSettings />, showBackButton: true, title: t('common.settings') },+ { path: '/settings/autofill', element: <AutofillSettings />, showBackButton: true, title: t('common.settings') },+ { path: '/settings/context-menu', element: <ContextMenuSettings />, showBackButton: true, title: t('common.settings') },+ { path: '/settings/clipboard', element: <ClipboardSettings />, showBackButton: true, title: t('common.settings') },+ { path: '/settings/language', element: <LanguageSettings />, showBackButton: true, title: t('common.settings') },+ { path: '/settings/auto-lock', element: <AutoLockSettings />, showBackButton: true, title: t('common.settings') },+ { path: '/settings/passkeys', element: <PasskeySettings />, showBackButton: true, title: t('common.settings') },+ { path: '/settings/identity-generator', element: <IdentityGeneratorSettings />, showBackButton: true, title: t('common.settings') },], [t]);useEffect(() => {diff --git a/apps/browser-extension/src/entrypoints/popup/components/PageTitle.tsx b/apps/browser-extension/src/entrypoints/popup/components/PageTitle.tsxnew file mode 100644index 000000000..c32dbf48a--- /dev/null+++ b/apps/browser-extension/src/entrypoints/popup/components/PageTitle.tsx@@ -0,0 +1,29 @@+import React from 'react';++/**+ * Props for the PageTitle component.+ */+interface IPageTitleProps {+ /**+ * The title text to display.+ */+ children: React.ReactNode;+ /**+ * Optional additional CSS classes.+ */+ className?: string;+}++/**+ * Shared page title component with consistent styling.+ * Uses the standard title style: text-gray-900 dark:text-white text-xl+ */+const PageTitle: React.FC<IPageTitleProps> = ({ children, className = '' }) => {+ return (+ <h1 className={`text-gray-900 dark:text-white text-xl ${className}`}>+ {children}+ </h1>+ );+};++export default PageTitle;diff --git a/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailsList.tsx b/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailsList.tsxindex c9b0e7312..204c8de76 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailsList.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailsList.tsx@@ -5,6 +5,7 @@ import { Link } from 'react-router-dom';import HeaderButton from '@/entrypoints/popup/components/HeaderButton';import { HeaderIconType } from '@/entrypoints/popup/components/Icons/HeaderIcons';import LoadingSpinner from '@/entrypoints/popup/components/LoadingSpinner';+import PageTitle from '@/entrypoints/popup/components/PageTitle';import ReloadButton from '@/entrypoints/popup/components/ReloadButton';import { useDb } from '@/entrypoints/popup/context/DbContext';import { useHeaderButtons } from '@/entrypoints/popup/context/HeaderButtonsContext';@@ -159,7 +160,7 @@ const EmailsList: React.FC = () => {return (<div><div className="flex justify-between items-center mb-4">- <h2 className="text-gray-900 dark:text-white text-xl">{t('emails.title')}</h2>+ <PageTitle>{t('emails.title')}</PageTitle></div><div className="text-gray-500 dark:text-gray-400 space-y-2"><p className="text-sm">@@ -174,7 +175,7 @@ const EmailsList: React.FC = () => {return (<div><div className="flex justify-between items-center mb-4">- <h2 className="text-gray-900 dark:text-white text-xl">{t('emails.title')}</h2>+ <PageTitle>{t('emails.title')}</PageTitle><ReloadButton onClick={loadEmails} /></div><div className="text-gray-500 dark:text-gray-400 space-y-2">@@ -189,7 +190,7 @@ const EmailsList: React.FC = () => {return (<div><div className="flex justify-between items-center mb-4">- <h2 className="text-gray-900 dark:text-white text-xl">{t('emails.title')}</h2>+ <PageTitle>{t('emails.title')}</PageTitle><ReloadButton onClick={loadEmails} /></div><div className="space-y-2">diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemDetails.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemDetails.tsxindex e47a0d3c3..38bedc986 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemDetails.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemDetails.tsx@@ -119,7 +119,7 @@ const ItemDetails: React.FC = (): React.ReactElement => {}}- return () => setBackButtonTitle(null);+ return (): void => setBackButtonTitle(null);}, [item, dbContext?.sqliteClient, setBackButtonTitle, t]);if (!item) {diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsxindex 3cd96b5aa..e16ef5f2e 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx@@ -393,7 +393,7 @@ const ItemsList: React.FC = () => {}}- return () => setBackButtonTitle(null);+ return (): void => setBackButtonTitle(null);}, [folderIdParam, dbContext?.sqliteClient, setBackButtonTitle, t]);/**diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/RecentlyDeleted.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/RecentlyDeleted.tsxindex 664dca89b..3ed31c4d0 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/items/RecentlyDeleted.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/RecentlyDeleted.tsx@@ -3,6 +3,7 @@ import { useTranslation } from 'react-i18next';import ConfirmDeleteModal from '@/entrypoints/popup/components/Dialogs/ConfirmDeleteModal';import LoadingSpinner from '@/entrypoints/popup/components/LoadingSpinner';+import PageTitle from '@/entrypoints/popup/components/PageTitle';import { useDb } from '@/entrypoints/popup/context/DbContext';import { useHeaderButtons } from '@/entrypoints/popup/context/HeaderButtonsContext';import { useVaultMutate } from '@/entrypoints/popup/hooks/useVaultMutate';@@ -144,10 +145,10 @@ const RecentlyDeleted: React.FC = () => {return (<div><div className="flex justify-between items-center mb-4">- <h2 className="flex items-baseline gap-1.5 text-gray-900 dark:text-white text-xl">+ <PageTitle className="flex items-baseline gap-1.5">{t('recentlyDeleted.title')}<span className="text-sm text-gray-500 dark:text-gray-400">({items.length})</span>- </h2>+ </PageTitle>{items.length > 0 && (<buttononClick={() => setShowConfirmEmptyAll(true)}diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/AutoLockSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/AutoLockSettings.tsxindex 733299942..9ec7344f3 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/AutoLockSettings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/AutoLockSettings.tsx@@ -3,6 +3,7 @@ import { useTranslation } from 'react-i18next';import { sendMessage } from 'webext-bridge/popup';import HelpModal from '@/entrypoints/popup/components/Dialogs/HelpModal';+import PageTitle from '@/entrypoints/popup/components/PageTitle';import { useLoading } from '@/entrypoints/popup/context/LoadingContext';import { LocalPreferencesService } from '@/utils/LocalPreferencesService';@@ -40,8 +41,8 @@ const AutoLockSettings: React.FC = () => {return (<div className="space-y-6">+ <PageTitle>{t('settings.autoLockTimeout')}</PageTitle><section>- <h3 className="text-md font-semibold text-gray-900 dark:text-white mb-3">{t('settings.autoLockTimeout')}</h3><div className="bg-white dark:bg-gray-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700"><div className="p-4"><div>diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/AutofillSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/AutofillSettings.tsxindex 75687b59f..e867f070c 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/AutofillSettings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/AutofillSettings.tsx@@ -1,6 +1,7 @@import React, { useEffect, useState, useCallback } from 'react';import { useTranslation } from 'react-i18next';+import PageTitle from '@/entrypoints/popup/components/PageTitle';import { useLoading } from '@/entrypoints/popup/context/LoadingContext';import { AutofillMatchingMode, LocalPreferencesService } from '@/utils/LocalPreferencesService';@@ -192,6 +193,8 @@ const AutofillSettings: React.FC = () => {return (<div className="space-y-6">+ <PageTitle>{t('settings.autofillSettings')}</PageTitle>+{/* Autofill Popup Settings Section */}<section><div className="bg-white dark:bg-gray-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700">diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/ClipboardSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/ClipboardSettings.tsxindex fd35e2fd2..a208f34e8 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/ClipboardSettings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/ClipboardSettings.tsx@@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react';import { useTranslation } from 'react-i18next';import { sendMessage } from 'webext-bridge/popup';+import PageTitle from '@/entrypoints/popup/components/PageTitle';import { useLoading } from '@/entrypoints/popup/context/LoadingContext';import { LocalPreferencesService } from '@/utils/LocalPreferencesService';@@ -39,8 +40,8 @@ const ClipboardSettings: React.FC = () => {return (<div className="space-y-6">+ <PageTitle>{t('settings.clipboardSettings')}</PageTitle><section>- <h3 className="text-md font-semibold text-gray-900 dark:text-white mb-3">{t('settings.clipboardSettings')}</h3><div className="bg-white dark:bg-gray-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700"><div className="p-4"><div>diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/ContextMenuSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/ContextMenuSettings.tsxindex e3b3ae828..655b6d2b8 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/ContextMenuSettings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/ContextMenuSettings.tsx@@ -2,6 +2,7 @@ import React, { useEffect, useState, useCallback } from 'react';import { useTranslation } from 'react-i18next';import { sendMessage } from 'webext-bridge/popup';+import PageTitle from '@/entrypoints/popup/components/PageTitle';import { useLoading } from '@/entrypoints/popup/context/LoadingContext';import { LocalPreferencesService } from '@/utils/LocalPreferencesService';@@ -41,8 +42,8 @@ const ContextMenuSettings: React.FC = () => {return (<div className="space-y-6">+ <PageTitle>{t('settings.contextMenuSettings')}</PageTitle><section>- <h3 className="text-md font-semibold text-gray-900 dark:text-white mb-3">{t('settings.contextMenu')}</h3><div className="bg-white dark:bg-gray-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700"><div className="p-4"><div className="flex items-center justify-between">diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/IdentityGeneratorSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/IdentityGeneratorSettings.tsxindex 3bda71ac2..7d47c64c5 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/IdentityGeneratorSettings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/IdentityGeneratorSettings.tsx@@ -1,6 +1,7 @@import React, { useEffect, useState, useCallback } from 'react';import { useTranslation } from 'react-i18next';+import PageTitle from '@/entrypoints/popup/components/PageTitle';import { useDb } from '@/entrypoints/popup/context/DbContext';import { useLoading } from '@/entrypoints/popup/context/LoadingContext';import { useVaultMutate } from '@/entrypoints/popup/hooks/useVaultMutate';@@ -89,6 +90,7 @@ const IdentityGeneratorSettings: React.FC = () => {return (<div className="space-y-6">+ <PageTitle>{t('settings.identityGenerator')}</PageTitle>{/* Language Section */}<section><h3 className="text-md font-semibold text-gray-900 dark:text-white mb-3">diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/LanguageSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/LanguageSettings.tsxindex 20f7d8fb2..63e368f23 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/LanguageSettings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/LanguageSettings.tsx@@ -2,6 +2,7 @@ import React, { useEffect } from 'react';import { useTranslation } from 'react-i18next';import LanguageSwitcher from '@/entrypoints/popup/components/LanguageSwitcher';+import PageTitle from '@/entrypoints/popup/components/PageTitle';import { useLoading } from '@/entrypoints/popup/context/LoadingContext';/**@@ -18,8 +19,8 @@ const LanguageSettings: React.FC = () => {return (<div className="space-y-6">+ <PageTitle>{t('settings.language')}</PageTitle><section>- <h3 className="text-md font-semibold text-gray-900 dark:text-white mb-3">{t('settings.language')}</h3><div className="bg-white dark:bg-gray-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700"><div className="p-4"><div>diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/PasskeySettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/PasskeySettings.tsxindex cf2b5e068..87e106964 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/PasskeySettings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/PasskeySettings.tsx@@ -1,6 +1,7 @@import React, { useEffect, useState, useCallback } from 'react';import { useTranslation } from 'react-i18next';+import PageTitle from '@/entrypoints/popup/components/PageTitle';import { useLoading } from '@/entrypoints/popup/context/LoadingContext';import { extractDomain } from '@/utils/itemMatcher/ItemMatcher';@@ -124,6 +125,7 @@ const PasskeySettings: React.FC = () => {return (<div className="space-y-6">+ <PageTitle>{t('settings.passkeySettings')}</PageTitle>{/* Global Settings Section */}<section><h3 className="text-md font-semibold text-gray-900 dark:text-white mb-3">{t('settings.globalSettings')}</h3>diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsxindex 1266e3825..388febb2d 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsx@@ -6,6 +6,7 @@ import { sendMessage } from 'webext-bridge/popup';import LogoutConfirmModal from '@/entrypoints/popup/components/Dialogs/LogoutConfirmModal';import HeaderButton from '@/entrypoints/popup/components/HeaderButton';import { HeaderIconType } from '@/entrypoints/popup/components/Icons/HeaderIcons';+import PageTitle from '@/entrypoints/popup/components/PageTitle';import { useApp } from '@/entrypoints/popup/context/AppContext';import { useAuth } from '@/entrypoints/popup/context/AuthContext';import { useHeaderButtons } from '@/entrypoints/popup/context/HeaderButtonsContext';@@ -210,7 +211,7 @@ const Settings: React.FC = () => {<div className="space-y-6"><div className="flex justify-between items-center mb-4">- <h2 className="text-gray-900 dark:text-white text-xl">{t('common.settings')}</h2>+ <PageTitle>{t('common.settings')}</PageTitle></div>{/* User Menu Section */}diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/VaultUnlockSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/VaultUnlockSettings.tsxindex 0d735e889..3af928c47 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/VaultUnlockSettings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/VaultUnlockSettings.tsx@@ -4,6 +4,7 @@ import { useTranslation } from 'react-i18next';import AlertMessage from '@/entrypoints/popup/components/AlertMessage';import Button from '@/entrypoints/popup/components/Button';import HelpModal from '@/entrypoints/popup/components/Dialogs/HelpModal';+import PageTitle from '@/entrypoints/popup/components/PageTitle';import { useDb } from '@/entrypoints/popup/context/DbContext';import { useLoading } from '@/entrypoints/popup/context/LoadingContext';@@ -167,6 +168,7 @@ const VaultUnlockSettings: React.FC = () => {return (<>+ <PageTitle>{t('settings.unlockMethod.title')}</PageTitle><div className="flex items-start gap-2"><p className="text-sm text-gray-600 dark:text-gray-400">{t('settings.unlockMethod.introText')}