v3: src/ gets one layout rule and keeps to it — each layer holds one kind of module, and every layer is split into the same domains — the previous pass sorted components into folders but left hooks, helpers and a barrel inside them, kept hooks/, utils/ and contexts/ flat, and still grouped most tests by theme. The rule: components/ holds only components (.tsx), contexts/ holds FooContext.ts + FooProvider.tsx pairs, hooks/ every hook, utils/ every non-React module, pages/ one component per route and nothing else. Each of components/, contexts/, hooks/ and utils/ is split into the same domains — auth, category, chat, comment, dump, editor, feed, form, layout, player, playlist, profile, social, theme, ws — plus shared/ for what belongs to no one domain, so the chat is components/chat, contexts/chat, hooks/chat and utils/chat. components/ui becomes components/shared to match. Out of components/: useApiForm goes to hooks/form, chat's message.ts and time.ts to utils/chat (with chatDraft and chatText, now draft.ts and text.ts), the emoji skin tone to utils/editor, the remembered volume to utils/player; player/icons.tsx is PlayerIcons.tsx. components/form/index.ts is gone: everything is imported from its own file, FormProvider straight from react-hook-form, and expectOk sits beside friendlyFetchError in utils/shared/api.ts (apiError.ts), since pages that have no form used it too. Out of pages/: the index's feed views, tab bar and presence row move to components/feed; HotFeed and NewFeed, identical but for the sort, are one DumpFeed with an order prop, which also takes over MainFeedProps from pages/index/types.ts. App is a named export like everything else. Tests mirror the tree one file per module — test/<layer>/<domain>/<Module>.test.tsx — so the themed files (hooks/misc, data, editor, sync; utils/misc, text, storage, remote, journal; contexts/providers; pages/auth and UserSubpages; layout/Fabs) are split by subject, the setup each piece needs kept and the rest dropped; the floating-button test becomes one test per button, 627 tests now. The README states the rule. No behaviour changes; the catalogues only move their source references.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

src/test/pages/ResetPassword.test.tsx

@@ -0,0 +1,75 @@
+import { describe, expect, test } from "vitest";
+import { screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { Route } from "react-router";
+import { ResetPassword } from "../../pages/ResetPassword.tsx";
+import { calls, fail, route } from "../fetch.ts";
+import { renderWithContexts } from "../render.tsx";
+
+describe("ResetPassword", () => {
+  function setup(search = "?token=rst") {
+    const user = userEvent.setup();
+    renderWithContexts(<ResetPassword />, {
+      route: `/reset-password${search}`,
+      path: "/reset-password",
+      extraRoutes: <Route path="/login" element={<p>login page</p>} />,
+    });
+    return user;
+  }
+
+  test("no token: an invalid link", () => {
+    setup("");
+    expect(screen.getByRole("heading", { name: "Invalid link" }))
+      .toBeInTheDocument();
+    expect(screen.getByRole("link", { name: "Back to login" })).toHaveAttribute(
+      "href",
+      "/login",
+    );
+  });
+
+  test("the two passwords must match", async () => {
+    const user = setup();
+    await user.type(screen.getByPlaceholderText("New password"), "longenough");
+    await user.type(
+      screen.getByPlaceholderText("Confirm new password"),
+      "different",
+    );
+    expect(await screen.findByText("Passwords do not match"))
+      .toBeInTheDocument();
+    await user.click(screen.getByRole("button", { name: "Set new password" }));
+    expect(calls("POST /api/users/reset-password")).toHaveLength(0);
+  });
+
+  test("sets the password, then offers login", async () => {
+    route("POST /api/users/reset-password", () => ({}));
+    const user = setup();
+    await user.type(screen.getByPlaceholderText("New password"), "longenough");
+    await user.type(
+      screen.getByPlaceholderText("Confirm new password"),
+      "longenough{Enter}",
+    );
+    await screen.findByRole("heading", { name: "Password updated" });
+    expect(calls("POST /api/users/reset-password")[0].body).toEqual({
+      token: "rst",
+      newPassword: "longenough",
+    });
+    await user.click(screen.getByRole("button", { name: "Go to login" }));
+    expect(screen.getByText("login page")).toBeInTheDocument();
+  });
+
+  test("an expired token is reported", async () => {
+    route(
+      "POST /api/users/reset-password",
+      () => fail("Reset link expired", 400),
+    );
+    const user = setup();
+    await user.type(screen.getByPlaceholderText("New password"), "longenough");
+    await user.type(
+      screen.getByPlaceholderText("Confirm new password"),
+      "longenough{Enter}",
+    );
+    expect(await screen.findByRole("alert")).toHaveTextContent(
+      "Reset link expired",
+    );
+  });
+});