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>
41 lines
1.2 KiB
TypeScript
41 lines
1.2 KiB
TypeScript
// Server-only loader/action for /activities/new. See `home.server.ts`.
|
|
|
|
import { data, redirect } from "react-router";
|
|
import { requireSessionUser } from "~/lib/auth/session.server";
|
|
import { createActivity } from "~/lib/activities.server";
|
|
import { listRoutes } from "~/lib/routes.server";
|
|
|
|
export async function loadActivitiesNew(request: Request) {
|
|
const user = await requireSessionUser(request);
|
|
|
|
const userRoutes = await listRoutes(user.id);
|
|
return {
|
|
routes: userRoutes.map((r) => ({ id: r.id, name: r.name })),
|
|
};
|
|
}
|
|
|
|
export async function activitiesNewAction(request: Request) {
|
|
const user = await requireSessionUser(request);
|
|
|
|
const formData = await request.formData();
|
|
const name = formData.get("name") as string;
|
|
const description = formData.get("description") as string;
|
|
const routeId = formData.get("routeId") as string | null;
|
|
const gpxFile = formData.get("gpx") as File | null;
|
|
|
|
if (!name) return data({ error: "Name is required" }, { status: 400 });
|
|
|
|
let gpx: string | undefined;
|
|
if (gpxFile && gpxFile.size > 0) {
|
|
gpx = await gpxFile.text();
|
|
}
|
|
|
|
const activityId = await createActivity(user.id, {
|
|
name,
|
|
description,
|
|
gpx,
|
|
routeId: routeId || undefined,
|
|
});
|
|
|
|
return redirect(`/activities/${activityId}`);
|
|
}
|