df562742e1
Completes the .server.ts split started in #418. Every route that mixes a default-export component with a server-only loader/action now has a sibling <route>.server.ts holding the data-fetching helpers; the route .tsx is a thin delegator. Routes converted (21): activities._index, activities.$id, activities.new, auth.accept-terms, auth.verify, explore, feed, notifications, routes._index, routes.$id, routes.$id.edit, routes.new, settings, settings.account, settings.connections.komoot, settings.profile, settings.security, sync.import.$provider, sync.import.komoot, users.$username.followers, users.$username.following Pattern (same as home.tsx / users.$username.tsx / settings.connections.tsx): - loader → `return data(await loadX(request, params?))` - action → `return await xAction(request, params?)` - All `getDb` / Drizzle schema / `~/lib/*.server` imports move to the .server.ts sibling. - `throw redirect(...)` and `throw data(...)` propagate through the delegator unchanged. No behavior changes — pure module-graph cleanup. Component modules no longer transitively import the DB client; Vite's tree-shake of server-only code is now backed by an explicit, file-local contract. Verified: - pnpm typecheck — green - pnpm lint — green - pnpm test — 181 passed, 31 integration-gated skipped - pnpm --filter @trails-cool/journal build — succeeds Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
61 lines
1.8 KiB
TypeScript
61 lines
1.8 KiB
TypeScript
import { Outlet } from "react-router";
|
|
import { Link, useLocation } from "react-router";
|
|
import { useTranslation } from "react-i18next";
|
|
import type { Route } from "./+types/settings";
|
|
import { loadSettingsLayout } from "./settings.server";
|
|
|
|
export function meta() {
|
|
return [{ title: "Settings — trails.cool" }];
|
|
}
|
|
|
|
export async function loader({ request }: Route.LoaderArgs) {
|
|
return await loadSettingsLayout(request);
|
|
}
|
|
|
|
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>
|
|
);
|
|
}
|