b9aac2859a
Two cleanups in one pass: 1. Update import paths app-wide from `~/lib/auth.server` to `~/lib/auth/session.server` for the four session helpers (sessionStorage, createSession, getSessionUser, destroySession). ~40 files: 33 simple path swaps where the file imported only session symbols, 5 splits where it also imported per-method auth functions (auth.verify.tsx, api.settings.email.ts, activities.\$id.tsx, routes.\$id.tsx, auth.accept-terms.tsx) — those keep one import from auth.server (for verifyMagicToken, canView, recordTermsAcceptance, etc.) and gain a second import from auth/session.server. Two more files used relative paths and were missed by the first grep pass (lib/oauth.server.ts and routes/oauth.authorize.tsx) — migrated too. The @deprecated re-exports block in auth.server.ts is gone. 2. Rename the new auth files to follow the project's `.server.ts` convention so Vite/React Router treat them as server-only (they read process.env.SESSION_SECRET, hit the DB, etc. — must NOT enter the client bundle): - auth/session.ts → auth/session.server.ts - auth/completion.ts → auth/completion.server.ts - auth/completion.test.ts → auth/completion.server.test.ts Done with `git mv` so blame is preserved. Verified: typecheck + lint green; 126 unit tests pass. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
63 lines
1.9 KiB
TypeScript
63 lines
1.9 KiB
TypeScript
import { Outlet, redirect } from "react-router";
|
|
import { Link, useLocation } from "react-router";
|
|
import { useTranslation } from "react-i18next";
|
|
import type { Route } from "./+types/settings";
|
|
import { getSessionUser } from "~/lib/auth/session.server";
|
|
|
|
export function meta() {
|
|
return [{ title: "Settings — trails.cool" }];
|
|
}
|
|
|
|
export async function loader({ request }: Route.LoaderArgs) {
|
|
const user = await getSessionUser(request);
|
|
if (!user) throw redirect("/auth/login");
|
|
return { username: user.username };
|
|
}
|
|
|
|
interface NavItem {
|
|
to: string;
|
|
labelKey: string;
|
|
}
|
|
|
|
const NAV: NavItem[] = [
|
|
{ to: "/settings/profile", labelKey: "settings.nav.profile" },
|
|
{ to: "/settings/account", labelKey: "settings.nav.account" },
|
|
{ to: "/settings/security", labelKey: "settings.nav.security" },
|
|
{ to: "/settings/connections", labelKey: "settings.nav.connections" },
|
|
];
|
|
|
|
export default function SettingsLayout() {
|
|
const { t } = useTranslation("journal");
|
|
const location = useLocation();
|
|
|
|
return (
|
|
<div className="mx-auto max-w-4xl px-4 py-8">
|
|
<h1 className="text-2xl font-bold text-gray-900">{t("settings.title")}</h1>
|
|
|
|
<div className="mt-6 grid gap-8 md:grid-cols-[200px_1fr]">
|
|
<nav className="flex flex-col gap-1 border-r border-gray-200 md:pr-4">
|
|
{NAV.map((item) => {
|
|
const active = location.pathname === item.to;
|
|
return (
|
|
<Link
|
|
key={item.to}
|
|
to={item.to}
|
|
className={`rounded-md px-3 py-2 text-sm font-medium ${
|
|
active
|
|
? "bg-blue-50 text-blue-700"
|
|
: "text-gray-700 hover:bg-gray-50 hover:text-gray-900"
|
|
}`}
|
|
>
|
|
{t(item.labelKey)}
|
|
</Link>
|
|
);
|
|
})}
|
|
</nav>
|
|
|
|
<div>
|
|
<Outlet />
|
|
</div>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|