Implements the activity-stats change (specs/activity-stats): - gpx: `movingTime(tracks)` — moving seconds from trackpoint timestamps, excluding stationary spans + long gaps; null when no timestamps. - stats.ts: pure formatters (distance/elevation/duration/speed/pace), sport-aware `deriveRate` (pace for foot sports, speed otherwise, speed default), and `activityStatItems` encoding the canonical order (distance · time · [moving] · pace/speed · ascent · descent; compact subset). - StatRow: one shared presentational component (size sm/lg), adopted on the activity detail (full set; loader derives moving time), route detail (distance/ascent/descent), feed card + profile list (compact). - i18n: journal.stats.* in en + de. Tests: movingTime (stationary/gap exclusion, moving ≤ elapsed), deriveRate, formatters, activityStatItems ordering + compact, StatRow render (jsdom). typecheck + lint + unit (gpx 63, journal 311) green. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
169 lines
5.8 KiB
TypeScript
169 lines
5.8 KiB
TypeScript
import { data } from "react-router";
|
|
import { Link } from "react-router";
|
|
import { useTranslation } from "react-i18next";
|
|
import type { Route } from "./+types/feed";
|
|
import { ClientDate } from "~/components/ClientDate";
|
|
import { ClientMap } from "~/components/ClientMap";
|
|
import { SportBadge } from "~/components/SportBadge";
|
|
import { StatRow } from "~/components/StatRow";
|
|
import { activityStatItems } from "~/lib/stats";
|
|
import { loadFeed } from "./feed.server";
|
|
|
|
export async function loader({ request }: Route.LoaderArgs) {
|
|
return data(await loadFeed(request));
|
|
}
|
|
|
|
export function meta({ data: loaderData }: Route.MetaArgs) {
|
|
const view = loaderData?.view ?? "followed";
|
|
const title = view === "public" ? "Public — trails.cool" : "Following — trails.cool";
|
|
return [{ title }];
|
|
}
|
|
|
|
function ToggleLink({
|
|
to,
|
|
active,
|
|
label,
|
|
}: {
|
|
to: string;
|
|
active: boolean;
|
|
label: string;
|
|
}) {
|
|
return (
|
|
<Link
|
|
to={to}
|
|
className={`-mb-px inline-flex items-center border-b-2 px-1 py-3 text-sm font-medium ${
|
|
active
|
|
? "border-blue-600 text-blue-600"
|
|
: "border-transparent text-gray-600 hover:text-gray-900"
|
|
}`}
|
|
>
|
|
{label}
|
|
</Link>
|
|
);
|
|
}
|
|
|
|
export default function Feed({ loaderData }: Route.ComponentProps) {
|
|
const { view, activities } = loaderData;
|
|
const { t } = useTranslation("journal");
|
|
|
|
const heading =
|
|
view === "public"
|
|
? t("social.feed.public.heading")
|
|
: t("social.feed.heading");
|
|
|
|
const emptyMessage =
|
|
view === "public"
|
|
? t("social.feed.public.empty")
|
|
: t("social.feed.empty");
|
|
|
|
return (
|
|
<div className="mx-auto max-w-4xl px-4 py-8">
|
|
<h1 className="text-2xl font-bold text-gray-900">{heading}</h1>
|
|
|
|
<div className="mt-4 flex gap-6 border-b border-gray-200">
|
|
<ToggleLink
|
|
to="/feed"
|
|
active={view === "followed"}
|
|
label={t("social.feed.toggle.followed")}
|
|
/>
|
|
<ToggleLink
|
|
to="/feed?view=public"
|
|
active={view === "public"}
|
|
label={t("social.feed.toggle.public")}
|
|
/>
|
|
</div>
|
|
|
|
{activities.length === 0 ? (
|
|
<div className="mt-12 text-center">
|
|
<p className="text-gray-500">{emptyMessage}</p>
|
|
{view === "followed" && (
|
|
<Link
|
|
to="/feed?view=public"
|
|
className="mt-3 inline-block text-sm text-blue-600 hover:underline"
|
|
>
|
|
{t("social.feed.seePublic")}
|
|
</Link>
|
|
)}
|
|
{view === "followed" && (
|
|
<Link
|
|
to="/follows/outgoing"
|
|
className="mt-1 block text-sm text-blue-600 hover:underline"
|
|
>
|
|
{t("social.feed.followRemote")}
|
|
</Link>
|
|
)}
|
|
</div>
|
|
) : (
|
|
<ul className="mt-6 space-y-4">
|
|
{activities.map((a) => (
|
|
<li key={a.id}>
|
|
<a
|
|
// Remote (federated) activities link to their canonical
|
|
// page on the origin instance — there is no local detail
|
|
// page for them.
|
|
href={a.remote && a.externalUrl ? a.externalUrl : `/activities/${a.id}`}
|
|
{...(a.remote ? { target: "_blank", rel: "noopener noreferrer" } : {})}
|
|
className="block rounded-lg border border-gray-200 p-4 hover:bg-gray-50"
|
|
>
|
|
<div className="flex gap-4">
|
|
<div className="w-40 shrink-0">
|
|
{a.geojson ? (
|
|
<ClientMap geojson={a.geojson} />
|
|
) : (
|
|
<div className="flex h-28 w-full items-center justify-center rounded bg-gray-100 text-xs text-gray-400">
|
|
{t("routes.noMapPreview")}
|
|
</div>
|
|
)}
|
|
</div>
|
|
<div className="flex flex-1 flex-col justify-between">
|
|
<div>
|
|
<div className="flex items-center gap-2">
|
|
<h3 className="text-base font-medium text-gray-900">{a.name}</h3>
|
|
<SportBadge sportType={a.sportType} />
|
|
</div>
|
|
<div className="mt-1 text-sm text-gray-500">
|
|
{a.remote ? (
|
|
<span>
|
|
{a.ownerDisplayName ?? a.ownerUsername ?? a.ownerDomain}
|
|
{a.ownerUsername && a.ownerDomain && (
|
|
<span className="text-gray-400"> @{a.ownerUsername}@{a.ownerDomain}</span>
|
|
)}
|
|
</span>
|
|
) : (
|
|
<a
|
|
href={`/users/${a.ownerUsername}`}
|
|
className="hover:text-gray-700 hover:underline"
|
|
onClick={(e) => e.stopPropagation()}
|
|
>
|
|
{a.ownerDisplayName ?? a.ownerUsername}
|
|
</a>
|
|
)}
|
|
{a.sportType && (
|
|
<span> {t(`activities.sport.verb.${a.sportType}`)}</span>
|
|
)}
|
|
{" · "}
|
|
<ClientDate iso={a.startedAt ?? a.createdAt} />
|
|
</div>
|
|
<StatRow
|
|
className="mt-1"
|
|
items={activityStatItems(
|
|
{
|
|
distance: a.distance,
|
|
durationSec: a.duration,
|
|
sportType: a.sportType,
|
|
},
|
|
t,
|
|
{ compact: true },
|
|
)}
|
|
/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</a>
|
|
</li>
|
|
))}
|
|
</ul>
|
|
)}
|
|
</div>
|
|
);
|
|
}
|