Email for professionals and teams
Improve Uis
Hieu Nguyen (Jack)e4903e923c64
diff --git a/.gitignore b/.gitignoreindex 84ee7e5..93d5076 100644--- a/.gitignore+++ b/.gitignore@@ -51,3 +51,4 @@ next-env.d.ts!.dev.vars.exampleyarn.lock+wrangler.prod.jsonc\ No newline at end of filediff --git a/src/app/(admin)/layout.tsx b/src/app/(admin)/layout.tsxindex a0ef10e..7e1d759 100644--- a/src/app/(admin)/layout.tsx+++ b/src/app/(admin)/layout.tsx@@ -9,6 +9,7 @@ import { MailboxProvider } from "@/components/mailbox-provider";import { MailboxSelector } from "@/components/mailbox-selector";import { LicenseIndicator } from "@/components/license-indicator";import { AdminNav } from "@/components/admin-nav";+import { SidebarProvider } from "@/components/sidebar-state";export default function DashboardLayout({children,@@ -17,9 +18,10 @@ export default function DashboardLayout({}) {return (<AuthGuard requireMailbox requireRole="admin">+ <SidebarProvider expandedWidth={256}><MailboxProvider><ComposeProvider>- <div className="grid h-dvh grid-cols-[256px_minmax(0,1fr)] overflow-hidden bg-[#eef3fb]">+ <div className="grid h-dvh grid-cols-[var(--sidebar-width)_minmax(0,1fr)] overflow-hidden bg-[#eef3fb] transition-[grid-template-columns] duration-200"><aside className="min-h-0 overflow-y-auto overscroll-contain px-3 py-4 scrollbar-gutter-stable"><AdminNav /></aside>@@ -36,6 +38,7 @@ export default function DashboardLayout({</div></ComposeProvider></MailboxProvider>+ </SidebarProvider></AuthGuard>);}diff --git a/src/app/login/login-client.tsx b/src/app/(auth)/login/login-client.tsxsimilarity index 100%rename from src/app/login/login-client.tsxrename to src/app/(auth)/login/login-client.tsxdiff --git a/src/app/login/page.tsx b/src/app/(auth)/login/page.tsxsimilarity index 100%rename from src/app/login/page.tsxrename to src/app/(auth)/login/page.tsxdiff --git a/src/app/login/types.d.ts b/src/app/(auth)/login/types.d.tssimilarity index 100%rename from src/app/login/types.d.tsrename to src/app/(auth)/login/types.d.tsdiff --git a/src/app/login/utils.ts b/src/app/(auth)/login/utils.tssimilarity index 100%rename from src/app/login/utils.tsrename to src/app/(auth)/login/utils.tsdiff --git a/src/app/onboarding/onboarding-client.tsx b/src/app/(auth)/onboarding/onboarding-client.tsxsimilarity index 100%rename from src/app/onboarding/onboarding-client.tsxrename to src/app/(auth)/onboarding/onboarding-client.tsxdiff --git a/src/app/onboarding/page.tsx b/src/app/(auth)/onboarding/page.tsxsimilarity index 100%rename from src/app/onboarding/page.tsxrename to src/app/(auth)/onboarding/page.tsxdiff --git a/src/app/onboarding/types.d.ts b/src/app/(auth)/onboarding/types.d.tssimilarity index 100%rename from src/app/onboarding/types.d.tsrename to src/app/(auth)/onboarding/types.d.tsdiff --git a/src/app/onboarding/utils.ts b/src/app/(auth)/onboarding/utils.tssimilarity index 100%rename from src/app/onboarding/utils.tsrename to src/app/(auth)/onboarding/utils.tsdiff --git a/src/app/register/page.tsx b/src/app/(auth)/register/page.tsxsimilarity index 100%rename from src/app/register/page.tsxrename to src/app/(auth)/register/page.tsxdiff --git a/src/app/register/register-client.tsx b/src/app/(auth)/register/register-client.tsxsimilarity index 100%rename from src/app/register/register-client.tsxrename to src/app/(auth)/register/register-client.tsxdiff --git a/src/app/register/types.d.ts b/src/app/(auth)/register/types.d.tssimilarity index 100%rename from src/app/register/types.d.tsrename to src/app/(auth)/register/types.d.tsdiff --git a/src/app/register/utils.ts b/src/app/(auth)/register/utils.tssimilarity index 100%rename from src/app/register/utils.tsrename to src/app/(auth)/register/utils.tsdiff --git a/src/app/setup/page.tsx b/src/app/(auth)/setup/page.tsxsimilarity index 88%rename from src/app/setup/page.tsxrename to src/app/(auth)/setup/page.tsxindex 87ea74e..691f71e 100644--- a/src/app/setup/page.tsx+++ b/src/app/(auth)/setup/page.tsx@@ -5,8 +5,8 @@ import { SESSION_COOKIE, getUserFromSession } from "@/lib/auth/session";import { hasAdminAccount } from "@/lib/auth/setup";import { getEnv } from "@/lib/cloudflare";import { getPrimaryDomain } from "@/lib/user";-import { OnboardingClient } from "@/app/onboarding/onboarding-client";-import { RegisterClient } from "@/app/register/register-client";+import { OnboardingClient } from "@/app/(auth)/onboarding/onboarding-client";+import { RegisterClient } from "@/app/(auth)/register/register-client";export const dynamic = "force-dynamic";diff --git a/src/app/(dashboard)/inbox/[messageId]/utils.ts b/src/app/(dashboard)/inbox/[messageId]/utils.tsindex d68c3bd..546711f 100644--- a/src/app/(dashboard)/inbox/[messageId]/utils.ts+++ b/src/app/(dashboard)/inbox/[messageId]/utils.ts@@ -1,4 +1,4 @@-import { authFetch } from "@/lib/auth/client";+import { fetchCachedMessageDetail } from "@/lib/messages/detail-cache";import { getEmailAddress } from "@/lib/email/address";import { getDisplayNameForAddress } from "@/lib/contacts/utils";import { htmlToReadableText, splitRepliedEmailContent } from "@/lib/email/reply-content-utils";@@ -6,8 +6,7 @@ import type { Message } from "@/hooks/types";import type { MessageAttachment, MessageBodyDisplay, MessageDetailResponse } from "./types";export async function fetchMessageDetail(messageId: string): Promise<MessageDetailResponse> {- const response = await authFetch(`/api/messages/${messageId}`);- return (await response.json()) as MessageDetailResponse;+ return (await fetchCachedMessageDetail(messageId)) as MessageDetailResponse;}export function getMessageHeaderParties(message: Message, currentAccountName?: string) {diff --git a/src/app/(dashboard)/layout.tsx b/src/app/(dashboard)/layout.tsxindex 37f1730..6b17f42 100644--- a/src/app/(dashboard)/layout.tsx+++ b/src/app/(dashboard)/layout.tsx@@ -11,6 +11,7 @@ import { MailboxProvider } from "@/components/mailbox-provider";import { MailboxSelector } from "@/components/mailbox-selector";import { LicenseIndicator } from "@/components/license-indicator";import { DashboardNav } from "@/components/dashboard-nav";+import { SidebarProvider } from "@/components/sidebar-state";export default function DashboardLayout({children,@@ -19,10 +20,11 @@ export default function DashboardLayout({}) {return (<AuthGuard>+ <SidebarProvider><MailboxProvider><ComposeProvider><MailSearchProvider>- <div className="grid h-[100dvh] grid-cols-[240px_minmax(0,1fr)] overflow-hidden bg-[#f6f8fc]">+ <div className="grid h-[100dvh] grid-cols-[var(--sidebar-width)_minmax(0,1fr)] overflow-hidden bg-[#f6f8fc] transition-[grid-template-columns] duration-200"><aside className="min-h-0 overflow-y-auto overscroll-contain px-3 py-4 [scrollbar-gutter:stable]"><DashboardNav /></aside>@@ -47,6 +49,7 @@ export default function DashboardLayout({</MailSearchProvider></ComposeProvider></MailboxProvider>+ </SidebarProvider></AuthGuard>);}diff --git a/src/app/(settings)/layout.tsx b/src/app/(settings)/layout.tsxindex 45a33c2..e1f45e8 100644--- a/src/app/(settings)/layout.tsx+++ b/src/app/(settings)/layout.tsx@@ -11,6 +11,7 @@ import { MailboxProvider } from "@/components/mailbox-provider";import { MailboxSelector } from "@/components/mailbox-selector";import { LicenseIndicator } from "@/components/license-indicator";import { DashboardNav } from "@/components/dashboard-nav";+import { SidebarProvider } from "@/components/sidebar-state";export default function DashboardLayout({children,@@ -19,10 +20,11 @@ export default function DashboardLayout({}) {return (<AuthGuard>+ <SidebarProvider><MailboxProvider><ComposeProvider><MailSearchProvider>- <div className="grid h-[100dvh] grid-cols-[240px_minmax(0,1fr)] overflow-hidden bg-[#f6f8fc]">+ <div className="grid h-[100dvh] grid-cols-[var(--sidebar-width)_minmax(0,1fr)] overflow-hidden bg-[#f6f8fc] transition-[grid-template-columns] duration-200"><aside className="min-h-0 overflow-y-auto overscroll-contain px-3 py-4 [scrollbar-gutter:stable]"><DashboardNav /></aside>@@ -47,6 +49,7 @@ export default function DashboardLayout({</MailSearchProvider></ComposeProvider></MailboxProvider>+ </SidebarProvider></AuthGuard>);}diff --git a/src/components/admin-nav.tsx b/src/components/admin-nav.tsxindex aaf005d..9da455c 100644--- a/src/components/admin-nav.tsx+++ b/src/components/admin-nav.tsx@@ -1,7 +1,5 @@"use client";-import Link from "next/link";-import { usePathname } from "next/navigation";import {DatabaseBackup,Globe2,@@ -16,6 +14,7 @@ import { cn } from "@/lib/utils";import { NavItem } from "./components-nav";import { SidebarFooter } from "./sidebar-footer";import { useBranding } from "./branding-provider";+import { SidebarHeader } from "./sidebar-header";const links = [{ href: "/admin", label: "Overview", icon: Settings },@@ -31,18 +30,11 @@ const links = [];export function AdminNav({ className }: { className?: string }) {- const pathname = usePathname();const branding = useBranding();return (<nav className={cn("flex min-h-full flex-col gap-1", className)}>- <Link- href="/inbox"- className="mb-3 flex h-10 items-center gap-3 px-3 text-neutral-600"- >- <img src={branding.iconUrl} height={28} width={28} alt="" />- <span className="text-lg font-semibold text-neutral-800">Admin</span>- </Link>+ <SidebarHeader href="/inbox" label="Admin" />{links.filter((link) => link.href !== "/branding" || branding.canCustomizeBranding).map((link) => <NavItem link={link} key={link.href} />)}diff --git a/src/components/auth/auth-shell.tsx b/src/components/auth/auth-shell.tsxindex 81ceb96..8f8ad29 100644--- a/src/components/auth/auth-shell.tsx+++ b/src/components/auth/auth-shell.tsx@@ -1,38 +1,90 @@+"use client";++import { useEffect, useState } from "react";+import { useBranding } from "@/components/branding-provider";import type { AuthShellProps } from "./types";-export function AuthShell({ icon: Icon, title, description, children, footer, steps }: AuthShellProps) {- return (- <div className="min-h-dvh bg-[#f6f8fc] p-4 text-neutral-900 sm:p-6">- <div className="mx-auto flex min-h-[calc(100dvh-32px)] max-w-6xl items-center sm:min-h-[calc(100dvh-48px)]">- <div className="mx-auto bg-white overflow-hidden rounded-4xl shadow-lg shadow-neutral-200/50">+export function AuthShell({+ icon: Icon,+ title,+ description,+ children,+ footer,+ steps,+}: AuthShellProps) {+ const branding = useBranding();+ const [iconUrl, setIconUrl] = useState(branding.iconUrl);+ const [iconFailed, setIconFailed] = useState(false);++ useEffect(() => {+ setIconUrl(branding.iconUrl);+ setIconFailed(false);+ }, [branding.iconUrl]);++ return (+ <div className="min-h-dvh bg-[#f1f4fa] px-4 py-6 text-neutral-900 sm:px-6 lg:flex lg:items-center lg:px-10 lg:py-10">+ <main className="mx-auto grid w-full max-w-6xl overflow-hidden rounded-[2rem] bg-white lg:grid-cols-[minmax(0,0.92fr)_minmax(0,1.08fr)]">+ <section className="flex flex-col p-7 sm:p-10 lg:p-14">+ <div className="flex items-center gap-2">+ <span className="flex items-center justify-center overflow-hidden">+ {iconFailed ? (+ <Icon className="h-8 w-8 text-blue-600" />+ ) : (+ <img+ src={iconUrl}+ onError={() => {+ if (iconUrl !== "/icon-96.png") setIconUrl("/icon-96.png");+ else setIconFailed(true);+ }}+ alt=""+ className="h-8 w-8 object-contain"+ />+ )}+ </span>+ <span className="truncate text-md font-semibold text-neutral-800">+ {branding.appName}+ </span>+ </div>++ <div className="mt-2 lg:mt-8">+ <h1 className="max-w-md text-xl font-medium leading-tight tracking-tight text-neutral-950 sm:text-4xl">+ {title}+ </h1>+ {description && (+ <p className="mt-5 max-w-md text-base leading-7 text-neutral-600">+ {description}+ </p>+ )}+ </div>+ </section>- <section className="flex flex-col justify-between p-6 sm:p-10">- <div>- <div className="mb-8">-- <h1 className="max-w-sm text-4xl font-semibold leading-tight tracking-tight text-neutral-950">- {title}- </h1>- {description && <p className="mt-4 max-w-md text-sm leading-6 text-neutral-600">{description}</p>}- </div>- {steps && (- <div className="mb-8 flex gap-2 text-xs font-semibold">- {steps.map((step, index) => (- <span key={step.label} className="flex items-center gap-2">- <span className={step.active ? "text-blue-700" : "text-neutral-400"}>- {index + 1} {step.label}- </span>- {index < steps.length - 1 && <span className="text-neutral-300">/</span>}- </span>- ))}- </div>- )}- {children}- </div>- <div className="mt-8 text-sm font-medium text-blue-700">{footer}</div>- </section>- </div>- </div>- </div>- );+ <section className="flex min-w-0 flex-col justify-center p-7 sm:p-10 lg:p-14">+ {steps && (+ <div className="mb-7 flex flex-wrap gap-2 text-xs font-semibold">+ {steps.map((step, index) => (+ <span key={step.label} className="flex items-center gap-2">+ <span+ className={+ step.active ? "text-blue-700" : "text-neutral-400"+ }+ >+ {index + 1} {step.label}+ </span>+ {index < steps.length - 1 && (+ <span className="text-neutral-300">/</span>+ )}+ </span>+ ))}+ </div>+ )}+ <div className="w-full">{children}</div>+ {footer && (+ <div className="mt-8 text-sm font-medium text-blue-700">+ {footer}+ </div>+ )}+ </section>+ </main>+ </div>+ );}diff --git a/src/components/auth/types.d.ts b/src/components/auth/types.d.tsindex 0aedaf0..b952f95 100644--- a/src/components/auth/types.d.ts+++ b/src/components/auth/types.d.ts@@ -11,6 +11,6 @@ export type AuthShellProps = {title: string;description?: ReactNode;children: ReactNode;- footer: ReactNode;+ footer?: ReactNode;steps?: AuthShellStep[];};diff --git a/src/components/components-nav.tsx b/src/components/components-nav.tsxindex 7a79844..95b045a 100644--- a/src/components/components-nav.tsx+++ b/src/components/components-nav.tsx@@ -7,6 +7,7 @@ import { cn } from "@/lib/utils";import { usePathname, useRouter } from "next/navigation";import { getMessageDragData } from "@/lib/messages/drag-utils";import { useSelectedMailbox } from "./mailbox-provider";+import { useSidebar } from "./sidebar-state";import { useCompose } from "./compose/compose-context";import { preloadMailboxPage, waitForNavigationProgress } from "./components-nav-utils";import type { NavLink } from "./components-nav-types";@@ -16,6 +17,7 @@ export function NavItem({ link }:{ link: NavLink }) {const router = useRouter();const { openComposer } = useCompose();const { selectedMailbox } = useSelectedMailbox();+ const { minimal } = useSidebar();const [dragOver, setDragOver] = useState(false);const [navigationProgress, setNavigationProgress] = useState<number | null>(null);@@ -35,10 +37,12 @@ export function NavItem({ link }:{ link: NavLink }) {const active = pathname === link.href || pathname.startsWith(`${link.href}/`);const classes = cn("flex h-9 items-center gap-3 rounded-r-full text-sm font-medium text-neutral-700 transition-colors hover:bg-blue-50",+ minimal && "mx-auto w-10 justify-center rounded-full px-0",active && "bg-blue-100 text-blue-900",dragOver && "bg-blue-50 text-blue-900 ring-1 ring-blue-200",link.primary &&"mb-3 h-12 w-fit rounded-2xl bg-blue-100 px-5 text-blue-950 shadow-sm hover:bg-blue-200",+ link.primary && minimal && "h-11 w-11 rounded-2xl px-0",);const dropProps = link.onMessageDrop? {@@ -64,11 +68,12 @@ export function NavItem({ link }:{ link: NavLink }) {type="button"onClick={openComposer}className={classes}+ title={minimal ? link.label : undefined}{...dropProps}><Icon className="h-4 w-4" style={{ color: link.iconColor }} />- <span className="flex-1">{link.label}</span>- {typeof link.count === "number" && link.count > 0 && (+ {!minimal && <span className="flex-1">{link.label}</span>}+ {!minimal && typeof link.count === "number" && link.count > 0 && (<span className="ml-auto mr-3 rounded-full px-2 py-0.5 text-sm font-semibold text-neutral-700">{link.count > 99 ? "99+" : link.count}</span>@@ -113,12 +118,13 @@ export function NavItem({ link }:{ link: NavLink }) {<Linkhref={link.href}onClick={navigate}- className={cn("-ml-3 pl-6", classes)}+ title={minimal ? link.label : undefined}+ className={cn(!minimal && "-ml-3 pl-6", classes)}{...dropProps}><Icon className="h-4 w-4" style={{ color: link.iconColor }} />- <span className="flex-1">{link.label}</span>- {typeof link.count === "number" && link.count > 0 && (+ {!minimal && <span className="flex-1">{link.label}</span>}+ {!minimal && typeof link.count === "number" && link.count > 0 && (<span className="ml-auto mr-3 rounded-full px-2 py-0.5 text-sm font-semibold text-neutral-700">{link.count > 99 ? "99+" : link.count}</span>diff --git a/src/components/dashboard-nav.tsx b/src/components/dashboard-nav.tsxindex 0f50434..fbf977f 100644--- a/src/components/dashboard-nav.tsx+++ b/src/components/dashboard-nav.tsx@@ -1,6 +1,5 @@"use client";-import Link from "next/link";import type { FormEvent } from "react";import { useEffect, useState } from "react";import {@@ -36,7 +35,8 @@ import type { NavLink } from "./components-nav-types";import type { CustomFolder } from "./dashboard-nav-types";import { getFolderNavCount, moveMessagesToCustomFolder, moveMessagesToSystemFolder } from "./dashboard-nav-utils";import { SidebarFooter } from "./sidebar-footer";-import { useBranding } from "./branding-provider";+import { SidebarHeader } from "./sidebar-header";+import { useSidebar } from "./sidebar-state";const links = [{ href: "/compose", label: "Compose", icon: MailPlus, primary: true },@@ -49,7 +49,7 @@ const links = [];export function DashboardNav({ className }: { className?: string }) {- const branding = useBranding();+ const { minimal } = useSidebar();const { selectedMailbox, isLoading } = useSelectedMailbox();const { counts } = useMessageCounts(selectedMailbox?.id, !isLoading);const [folders, setFolders] = useState<CustomFolder[]>([]);@@ -141,15 +141,9 @@ export function DashboardNav({ className }: { className?: string }) {return (<nav className={cn("flex min-h-full flex-col gap-1", className)}>- <Link- href="/inbox"- className="mb-3 flex h-10 items-center gap-3 px-3 text-neutral-600"- >- <img src={branding.iconUrl} height={28} width={28} alt="" />- <span className="truncate text-lg font-semibold text-neutral-800">{branding.appName}</span>- </Link>+ <SidebarHeader href="/inbox" />{linksWithCounts.map((link, i) => <NavItem link={link} key={`nav-${link.href || i}`} />)}- <div className="mt-2 flex h-8 items-center justify-between px-3">+ {!minimal && <div className="mt-2 flex h-8 items-center justify-between px-3"><span className="text-xs font-medium uppercase tracking-wide text-neutral-400">Folders</span>{selectedMailbox && (<Dialog open={folderDialogOpen} onOpenChange={setFolderDialogOpen}>@@ -207,8 +201,8 @@ export function DashboardNav({ className }: { className?: string }) {</DialogContent></Dialog>)}- </div>- {folders.length === 0 && (+ </div>}+ {!minimal && folders.length === 0 && (<div className="mx-3 rounded-lg border border-dashed border-neutral-200 px-3 py-3 text-xs text-neutral-400">No folders yet</div>diff --git a/src/components/messages/message-folder-page.tsx b/src/components/messages/message-folder-page.tsxindex 1a64a03..d8c3206 100644--- a/src/components/messages/message-folder-page.tsx+++ b/src/components/messages/message-folder-page.tsx@@ -15,6 +15,7 @@ import { useMessages } from "@/hooks/use-messages";import type { BulkMessageAction } from "@/app/api/messages/bulk/types";import { setMessageDragData } from "@/lib/messages/drag-utils";import { BulkMessageToolbar } from "./bulk-message-toolbar";+import { MessageNavigationProgress, useMessageNavigation } from "./message-navigation";import type { MessageFolderPageProps, MessageListRowProps } from "./types";import {formatMessageListTimestamp,@@ -46,6 +47,7 @@ function MessageListRow({const party = getMessageParty(message, config.folder, currentAccountName);const preview = getMessagePreview(message, config.folder);const href = `${config.hrefPrefix}/${message.id}`;+ const navigation = useMessageNavigation(href, message.id);if (compact && config.folder !== "drafts") {return (@@ -63,6 +65,7 @@ function MessageListRow({setMessageDragData(event.dataTransfer, { messageIds: dragMessageIds });}}>+ <MessageNavigationProgress progress={navigation.progress} /><inputtype="checkbox"checked={selected}@@ -70,7 +73,7 @@ function MessageListRow({className="mt-1 h-4 w-4 rounded border-neutral-300"aria-label={`Select message from ${party}`}/>- <Link href={href} className="min-w-0">+ <Link href={href} onClick={navigation.onNavigate} className="min-w-0"><span className="flex items-baseline justify-between gap-3"><span className={getMessagePartyClassName(message, config.folder)}>{party}@@ -147,6 +150,7 @@ function MessageListRow({setMessageDragData(event.dataTransfer, { messageIds: dragMessageIds });}}>+ <MessageNavigationProgress progress={navigation.progress} /><inputtype="checkbox"checked={selected}@@ -154,7 +158,7 @@ function MessageListRow({className="h-4 w-4 rounded border-neutral-300"aria-label="Select message"/>- <Link href={href} className="contents">+ <Link href={href} onClick={navigation.onNavigate} className="contents">{content}</Link></div>diff --git a/src/components/messages/message-navigation-types.d.ts b/src/components/messages/message-navigation-types.d.tsnew file mode 100644index 0000000..0855ddf--- /dev/null+++ b/src/components/messages/message-navigation-types.d.ts@@ -0,0 +1,6 @@+import type { MouseEvent } from "react";++export type MessageNavigationState = {+ progress: number | null;+ onNavigate(event: MouseEvent<HTMLAnchorElement>): Promise<void>;+};diff --git a/src/components/messages/message-navigation.tsx b/src/components/messages/message-navigation.tsxnew file mode 100644index 0000000..a74dd35--- /dev/null+++ b/src/components/messages/message-navigation.tsx@@ -0,0 +1,52 @@+"use client";++import { useEffect, useState } from "react";+import { usePathname, useRouter } from "next/navigation";+import type { MouseEvent } from "react";+import { waitForNavigationProgress } from "@/components/components-nav-utils";+import { fetchCachedMessageDetail } from "@/lib/messages/detail-cache";+import type { MessageNavigationState } from "./message-navigation-types";++export function useMessageNavigation(href: string, messageId: string): MessageNavigationState {+ const pathname = usePathname();+ const router = useRouter();+ const [progress, setProgress] = useState<number | null>(null);++ useEffect(() => {+ if (progress === null) return;+ setProgress(100);+ const timer = window.setTimeout(() => setProgress(null), 220);+ return () => window.clearTimeout(timer);+ }, [pathname]);++ async function onNavigate(event: MouseEvent<HTMLAnchorElement>) {+ if (event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return;+ event.preventDefault();+ setProgress(12);+ const timer = window.setInterval(() => {+ setProgress((current) => current === null ? 12 : Math.min(90, current + 8));+ }, 80);+ try {+ router.prefetch(href);+ await Promise.all([fetchCachedMessageDetail(messageId), waitForNavigationProgress()]);+ setProgress(100);+ await waitForNavigationProgress(160);+ router.push(href);+ } catch {+ setProgress(null);+ } finally {+ window.clearInterval(timer);+ }+ }++ return { progress, onNavigate };+}++export function MessageNavigationProgress({ progress }: { progress: number | null }) {+ if (progress === null) return null;+ return (+ <div className="fixed inset-x-0 top-0 z-[120] h-1 bg-blue-100">+ <div className="h-full bg-blue-600 transition-[width] duration-100 ease-out" style={{ width: `${progress}%` }} />+ </div>+ );+}diff --git a/src/components/providers.tsx b/src/components/providers.tsxindex 25dd115..47f24d6 100644--- a/src/components/providers.tsx+++ b/src/components/providers.tsx@@ -7,6 +7,7 @@ import { BrandingProvider } from "@/components/branding-provider";import { NewMessagePopup } from "@/components/new-message-popup";import { useMessagePolling } from "@/hooks/use-message-polling";import { clearMessageClientState } from "@/hooks/utils";+import { clearMessageDetailCache } from "@/lib/messages/detail-cache";import { AUTH_SESSION_CHANGED_EVENT } from "@/lib/auth/client";export function Providers({ children }: { children: React.ReactNode }) {@@ -31,6 +32,7 @@ export function Providers({ children }: { children: React.ReactNode }) {client.clear();clearMailboxClientState();clearMessageClientState();+ clearMessageDetailCache();}window.addEventListener(AUTH_SESSION_CHANGED_EVENT, resetUserScopedState);diff --git a/src/components/sidebar-footer.tsx b/src/components/sidebar-footer.tsxindex efc781f..29ca9d9 100644--- a/src/components/sidebar-footer.tsx+++ b/src/components/sidebar-footer.tsx@@ -1,6 +1,9 @@import packageJson from "../../package.json";+import { useSidebar } from "./sidebar-state";export function SidebarFooter() {+ const { minimal } = useSidebar();+ if (minimal) return null;return (<p className="px-3 pt-3 text-xs text-neutral-400">Powered by{" "}diff --git a/src/components/sidebar-header.tsx b/src/components/sidebar-header.tsxnew file mode 100644index 0000000..aeceddc--- /dev/null+++ b/src/components/sidebar-header.tsx@@ -0,0 +1,20 @@+"use client";++import Link from "next/link";+import { Menu } from "lucide-react";+import { useBranding } from "./branding-provider";+import { useSidebar } from "./sidebar-state";+import type { SidebarHeaderProps } from "./sidebar-state-types";++export function SidebarHeader({ href, label }: SidebarHeaderProps) {+ const branding = useBranding();+ const { minimal, toggle } = useSidebar();+ return (+ <div className={`mb-3 flex h-10 items-center ${minimal ? "justify-center" : "gap-2 px-1"}`}>+ <button type="button" onClick={toggle} className="flex h-10 w-10 shrink-0 items-center justify-center rounded-full text-neutral-600 hover:bg-neutral-200" aria-label={minimal ? "Expand menu" : "Collapse menu"}>+ <Menu className="h-5 w-5" />+ </button>+ {!minimal && <Link href={href} className="flex min-w-0 items-center gap-3"><img src={branding.iconUrl} height={28} width={28} alt="" /><span className="truncate text-lg font-semibold text-neutral-800">{label ?? branding.appName}</span></Link>}+ </div>+ );+}diff --git a/src/components/sidebar-state-types.d.ts b/src/components/sidebar-state-types.d.tsnew file mode 100644index 0000000..7ccee1d--- /dev/null+++ b/src/components/sidebar-state-types.d.ts@@ -0,0 +1,16 @@+import type { ReactNode } from "react";++export type SidebarState = {+ minimal: boolean;+ toggle(): void;+};++export type SidebarProviderProps = {+ children: ReactNode;+ expandedWidth?: number;+};++export type SidebarHeaderProps = {+ href: string;+ label?: string;+};diff --git a/src/components/sidebar-state.tsx b/src/components/sidebar-state.tsxnew file mode 100644index 0000000..80f15ed--- /dev/null+++ b/src/components/sidebar-state.tsx@@ -0,0 +1,42 @@+"use client";++import { createContext, useContext, useEffect, useState } from "react";+import type { SidebarProviderProps, SidebarState } from "./sidebar-state-types";++const SidebarContext = createContext<SidebarState>({ minimal: false, toggle: () => undefined });++export function SidebarProvider({ children, expandedWidth = 240 }: SidebarProviderProps) {+ const [minimal, setMinimal] = useState(false);+ const [storageKey, setStorageKey] = useState<string | null>(null);++ useEffect(() => {+ void fetch("/api/auth/me", { cache: "no-store" })+ .then((response) => response.json() as Promise<{ user?: { id?: string } }>)+ .then((data) => {+ if (!data.user?.id) return;+ const key = `mailflare-sidebar-minimal:${data.user.id}`;+ setStorageKey(key);+ setMinimal(localStorage.getItem(key) === "true");+ });+ }, []);++ function toggle() {+ setMinimal((current) => {+ const next = !current;+ if (storageKey) localStorage.setItem(storageKey, String(next));+ return next;+ });+ }++ return (+ <SidebarContext.Provider value={{ minimal, toggle }}>+ <div className="h-full" style={{ "--sidebar-width": `${minimal ? 72 : expandedWidth}px` } as React.CSSProperties}>+ {children}+ </div>+ </SidebarContext.Provider>+ );+}++export function useSidebar() {+ return useContext(SidebarContext);+}diff --git a/src/lib/messages/detail-cache-types.d.ts b/src/lib/messages/detail-cache-types.d.tsnew file mode 100644index 0000000..e286540--- /dev/null+++ b/src/lib/messages/detail-cache-types.d.ts@@ -0,0 +1,17 @@+import type { Message } from "@/hooks/types";++export type CachedMessageDetail = {+ message?: Message;+ body?: { htmlBody: string | null; textBody: string | null } | null;+ attachments?: Array<{+ contentId: string | null;+ disposition: "attachment" | "inline";+ filename: string;+ id: string;+ messageId: string;+ size: number;+ type: string;+ }>;+ unsubscribeUrl?: string | null;+ error?: string;+};diff --git a/src/lib/messages/detail-cache.ts b/src/lib/messages/detail-cache.tsnew file mode 100644index 0000000..a5922df--- /dev/null+++ b/src/lib/messages/detail-cache.ts@@ -0,0 +1,24 @@+import { authFetch } from "@/lib/auth/client";+import type { CachedMessageDetail } from "./detail-cache-types";++const detailCache = new Map<string, CachedMessageDetail>();+const detailRequests = new Map<string, Promise<CachedMessageDetail>>();++export function clearMessageDetailCache() {+ detailCache.clear();+ detailRequests.clear();+}++export async function fetchCachedMessageDetail(messageId: string, force = false): Promise<CachedMessageDetail> {+ if (!force && detailCache.has(messageId)) return detailCache.get(messageId) ?? {};+ if (!force && detailRequests.has(messageId)) return detailRequests.get(messageId) ?? {};+ const request = authFetch(`/api/messages/${messageId}`)+ .then((response) => response.json() as Promise<CachedMessageDetail>)+ .then((data) => {+ detailCache.set(messageId, data);+ return data;+ })+ .finally(() => detailRequests.delete(messageId));+ detailRequests.set(messageId, request);+ return request;+}