make markers vertical

frontend/src/pages/StreamControl.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import { Radio, Check, Bookmark, Scissors, Film, Activity, Loader2, X } from "lucide-react";
+import { Radio, Check, Bookmark, Scissors, Film, Activity, Loader2, Plus, X } from "lucide-react";
 import clsx from "clsx";
 import Box from "../components/Box.tsx";
 import PrimaryButton from "../components/buttons/PrimaryButton.tsx";
@@ -9,7 +9,7 @@ import { getMarkers, createMarker, deleteMarker } from "../utils/api/markers.ts"
 import { saveSectionByMarkers, clipSection } from "../utils/api/media.ts";
 import { getJob } from "../utils/api/jobs.ts";
 import type { StreamStatus, StreamHistoryItem, Marker, JobResponse } from "../utils/types.ts";
-import { formatTime, formatLocalDate, stringToDate } from "../utils/utils.ts";
+import { formatLocalDate, formatLocalTime, stringToDate } from "../utils/utils.ts";
 
 const inputClass = "border border-hairline bg-fields rounded-md w-full p-2 text-sm focus:outline-none focus:ring-2 focus:ring-muted transition-colors";
 const labelClass = "font-data text-[11px] text-muted uppercase tracking-[0.12em]";
@@ -59,11 +59,73 @@ const JobStatus = ({ job }: { job: TrackedJob }) => {
     );
 };
 
+type RailSegment = "none" | "plain" | "lit";
+
+type MarkerRowProps = {
+    marker: Marker;
+    role: "start" | "end" | "between" | null;
+    /** Rail segments above and below the dot — "lit" inside the chosen section. */
+    railAbove: RailSegment;
+    railBelow: RailSegment;
+    onSelect: () => void;
+    onDelete: () => void;
+};
+
+const railClass = (segment: RailSegment) => clsx(
+    "w-px",
+    segment === "lit" && "bg-terracotta",
+    segment === "plain" && "bg-inactive-strong/60",
+    segment === "none" && "bg-transparent"
+);
+
+const MarkerRow = ({ marker, role, railAbove, railBelow, onSelect, onDelete }: MarkerRowProps) => (
+    <li className="group relative flex gap-3">
+        {/* Timeline rail: a dot per marker, with the segment between the chosen
+            start and end lit so the selected section reads as one run. */}
+        <div className="flex w-2.5 flex-col items-center flex-shrink-0">
+            <span className={clsx("h-3.5 flex-shrink-0", railClass(railAbove))} />
+            <span className={clsx(
+                "h-2.5 w-2.5 rounded-full border-2 flex-shrink-0 transition-colors duration-150",
+                role === "start" && "border-terracotta bg-terracotta",
+                role === "end" && "border-olive bg-olive",
+                role === "between" && "border-terracotta bg-card",
+                role === null && "border-inactive-strong bg-card"
+            )} />
+            <span className={clsx("flex-1", railClass(railBelow))} />
+        </div>
+
+        <button
+            onClick={onSelect}
+            className={clsx(
+                "min-w-0 flex-1 rounded-md my-0.5 py-2 pl-2.5 pr-7 text-left transition-colors duration-150",
+                role === "start" && "bg-selected ring-1 ring-terracotta",
+                role === "end" && "bg-selected ring-1 ring-olive",
+                (role === "between" || role === null) && "hover:bg-hover"
+            )}
+        >
+            <p className="truncate text-sm font-medium text-text-strong">{marker.message}</p>
+            <p className="font-data text-[11px] text-muted tabular-nums">
+                {formatLocalTime(marker.timestamp)}
+                {role === "start" && <span className="font-medium text-terracotta"> · start</span>}
+                {role === "end" && <span className="font-medium text-olive"> · end</span>}
+            </p>
+        </button>
+
+        <button
+            onClick={onDelete}
+            title="Delete marker"
+            aria-label={`Delete marker ${marker.message}`}
+            className="absolute right-1 top-2.5 flex h-5 w-5 items-center justify-center rounded-md text-muted opacity-0 transition duration-150 hover:bg-hover hover:text-error focus-visible:opacity-100 group-hover:opacity-100"
+        >
+            <X size={12} />
+        </button>
+    </li>
+);
+
 const StreamControl = () => {
     const { user } = useAuth();
     const [streamStatus, setStreamStatus] = useState<StreamStatus | null>(null);
     const [streamDetails, setStreamDetails] = useState<StreamHistoryItem | null>(null);
-    const [now, setNow] = useState(Date.now());
 
     const [markers, setMarkers] = useState<Marker[]>([]);
     const [markerMessage, setMarkerMessage] = useState("");
@@ -103,16 +165,10 @@ const StreamControl = () => {
             .catch(() => {});
     }, [user, streamStatus?.id]);
 
-    useEffect(() => {
-        if (!streamDetails?.startDate) return;
-        const interval = setInterval(() => setNow(Date.now()), 1000);
-        return () => clearInterval(interval);
-    }, [streamDetails?.startDate]);
-
     const refreshMarkers = () => {
         getMarkers()
             .then((data) => setMarkers(data
-                .sort((a, b) => stringToDate(a.timestamp).getTime() - stringToDate(b.timestamp).getTime())))
+                .sort((a, b) => stringToDate(b.timestamp).getTime() - stringToDate(a.timestamp).getTime())))
             .catch(() => {});
     };
 
@@ -179,7 +235,7 @@ const StreamControl = () => {
     const handleSaveByMarkers = async () => {
         setMarkerSaveError(null);
         if (!startMarkerId || !endMarkerId) {
-            setMarkerSaveError("Tap two markers above to pick a start and end");
+            setMarkerSaveError("Pick a start and an end marker from the timeline");
             return;
         }
         try {
@@ -228,13 +284,23 @@ const StreamControl = () => {
         );
     }
 
-    const elapsed = streamDetails?.startDate
-        ? formatTime((now - stringToDate(streamDetails.startDate).getTime()) / 1000)
-        : null;
-
     const startMarker = markers.find((m) => String(m.id) === startMarkerId);
     const endMarker = markers.find((m) => String(m.id) === endMarkerId);
 
+    // Markers are listed newest first, and either of the two may have been
+    // picked first, so the lit run is bounded by whichever indices come
+    // first/last rather than by start/end.
+    const startIndex = markers.findIndex((m) => String(m.id) === startMarkerId);
+    const endIndex = markers.findIndex((m) => String(m.id) === endMarkerId);
+    const hasRange = startIndex !== -1 && endIndex !== -1;
+    const rangeFrom = hasRange ? Math.min(startIndex, endIndex) : -1;
+    const rangeTo = hasRange ? Math.max(startIndex, endIndex) : -1;
+    // The rail segment sitting between marker `i` and the one after it.
+    const railSegment = (i: number): "none" | "plain" | "lit" => {
+        if (i < 0 || i >= markers.length - 1) return "none";
+        return hasRange && i >= rangeFrom && i < rangeTo ? "lit" : "plain";
+    };
+
     return (
         <div className="px-8 py-10 max-w-5xl mx-auto flex flex-col gap-5">
             <h1 className="text-4xl font-heading text-text-primary">Stream Control</h1>
@@ -259,22 +325,23 @@ const StreamControl = () => {
                     </div>
                 </div>
 
-                {isStreaming && elapsed ? (
+                <Radio size={28} className={isStreaming ? "text-live" : "text-inactive"} />
-                    <div className="text-right">
-                        <p className="text-2xl font-data text-text-primary tabular-nums">{elapsed}</p>
-                        <p className={labelClass}>elapsed</p>
-                    </div>
-                ) : (
-                    <Radio size={28} className="text-inactive" />
-                )}
             </Box>
 
             {isStreaming && (
-                <>
+                <div className="grid grid-cols-1 lg:grid-cols-[minmax(0,1fr)_20rem] gap-5 items-start">
-                    {/* Quick mark toolbar */}
+                    {/* Marker timeline. First on narrow screens, where marking
-                    <Box className="p-4 flex flex-col gap-3">
+                        something as it happens beats the action forms for urgency. */}
-                        <div className="flex items-center gap-3">
+                    <Box className="lg:order-last lg:sticky lg:top-6 p-5 flex flex-col gap-4">
-                            <Bookmark size={18} className="text-olive flex-shrink-0" />
+                        <div className="flex items-center justify-between gap-3">
+                            <CardHeader icon={Bookmark} title="Markers" accent="accent" />
+                            {markers.length > 0 && (
+                                <span className="font-data text-[11px] text-muted tabular-nums">{markers.length}</span>
+                            )}
+                        </div>
+
+                        <div className="flex flex-col gap-2">
+                            <div className="flex gap-2">
                                 <input
                                     type="text"
                                     value={markerMessage}
@@ -283,51 +350,44 @@ const StreamControl = () => {
                                     placeholder="What just happened?"
                                     className={inputClass}
                                 />
-                            <PrimaryButton onClick={handleAddMarker} disabled={markerBusy || !markerMessage.trim()} className="whitespace-nowrap">
+                                <PrimaryButton
-                                Add Marker
+                                    onClick={handleAddMarker}
+                                    disabled={markerBusy || !markerMessage.trim()}
+                                    className="flex items-center gap-1.5 px-3 whitespace-nowrap"
+                                >
+                                    <Plus size={15} />
+                                    Add
                                 </PrimaryButton>
                             </div>
                             {markerError && <p className="text-sm text-error">{markerError}</p>}
+                        </div>
 
-                        {markers.length > 0 && (
+                        {markers.length === 0 ? (
-                            <div className="flex gap-2 overflow-x-auto pb-0.5 -mx-1 px-1 pt-1.5">
+                            <p className="text-sm text-muted">
-                                {markers.map((m) => {
+                                Nothing marked yet. Markers stack up here, newest first — pick two to save the section between them.
-                                    const isStart = startMarkerId === String(m.id);
+                            </p>
-                                    const isEnd = endMarkerId === String(m.id);
+                        ) : (
-                                    return (
+                            <ul className="-mr-1 flex max-h-[26rem] flex-col overflow-y-auto py-0.5 pr-1">
-                                        <div key={m.id} className="group relative flex-shrink-0">
+                                {markers.map((m, i) => (
-                                            <button
+                                    <MarkerRow
-                                                onClick={() => handleChipClick(m.id)}
+                                        key={m.id}
-                                                className={clsx(
+                                        marker={m}
-                                                    "flex flex-col items-start gap-0.5 rounded-lg border px-3 py-1.5 text-left transition-colors duration-150",
+                                        role={String(m.id) === startMarkerId ? "start"
-                                                    isStart && "border-terracotta bg-selected ring-1 ring-terracotta",
+                                            : String(m.id) === endMarkerId ? "end"
-                                                    isEnd && "border-olive bg-selected ring-1 ring-olive",
+                                            : hasRange && i > rangeFrom && i < rangeTo ? "between"
-                                                    !isStart && !isEnd && "border-hairline hover:border-ring hover:bg-hover"
+                                            : null}
-                                                )}
+                                        railAbove={railSegment(i - 1)}
-                                            >
+                                        railBelow={railSegment(i)}
-                                                <span className="text-xs font-medium text-text-strong max-w-40 truncate">{m.message}</span>
+                                        onSelect={() => handleChipClick(m.id)}
-                                                <span className="font-data text-[11px] text-muted">
+                                        onDelete={() => handleDeleteMarker(m.id)}
-                                                    {formatLocalDate(m.timestamp, { hour: "2-digit", minute: "2-digit", second: "2-digit" })}
+                                    />
-                                                    {isStart && <span className="text-terracotta font-medium"> · start</span>}
+                                ))}
-                                                    {isEnd && <span className="text-olive font-medium"> · end</span>}
+                            </ul>
-                                                </span>
-                                            </button>
-                                            <button
-                                                onClick={(e) => { e.stopPropagation(); handleDeleteMarker(m.id); }}
-                                                title="Delete marker"
-                                                className="hidden group-hover:flex items-center justify-center absolute -top-1.5 -right-1.5 w-4 h-4 rounded-full bg-muted hover:bg-error text-on-accent transition-colors duration-150"
-                                            >
-                                                <X size={10} />
-                                            </button>
-                                        </div>
-                                    );
-                                })}
-                            </div>
                         )}
                     </Box>
 
                     {/* Forefront actions */}
-                    <div className="grid grid-cols-1 lg:grid-cols-2 gap-5 items-stretch">
+                    <div className="flex flex-col gap-5">
                         <Box className="p-6 flex flex-col gap-3">
                             <CardHeader icon={Scissors} title="Clip the last few seconds" />
                             <div className="flex flex-col gap-1.5">
@@ -349,7 +409,7 @@ const StreamControl = () => {
                         <Box className="p-6 flex flex-col gap-3">
                             <CardHeader icon={Film} title="Save between two markers" accent="accent" />
                             {markers.length < 2 ? (
-                                <p className="text-sm text-muted">Add at least two markers above to save a section between them.</p>
+                                <p className="text-sm text-muted">Add at least two markers to save a section between them.</p>
                             ) : (
                                 <>
                                     <div className="flex items-center gap-2 flex-wrap">
@@ -374,7 +434,6 @@ const StreamControl = () => {
                             )}
                             <PrimaryButton onClick={handleSaveByMarkers} disabled={markers.length < 2} className="self-start mt-auto">Save</PrimaryButton>
                         </Box>
-                    </div>
 
                         <Box className="p-5 flex flex-col gap-3">
                             <CardHeader icon={Activity} title="Recent actions" />
@@ -386,7 +445,8 @@ const StreamControl = () => {
                                 </div>
                             )}
                         </Box>
-                </>
+                    </div>
+                </div>
             )}
         </div>
     );

frontend/src/utils/utils.ts

@@ -21,6 +21,12 @@ function formatLocalDate(dateString: string, options?: Intl.DateTimeFormatOption
     return stringToDate(dateString).toLocaleDateString(undefined, options ?? { year: "numeric", month: "long", day: "numeric" });
 }
 
+// Clock time only, no date — markers within a stream are all from the same day,
+// so the date would just be noise beside them.
+function formatLocalTime(dateString: string): string {
+    return stringToDate(dateString).toLocaleTimeString(undefined, { hour: "2-digit", minute: "2-digit", second: "2-digit" });
+}
+
 function dateToTimeAgo(date: Date): string {
     const secondsAgo = Math.floor((Date.now() - date.getTime()) / 1000);
     const units: [number, string][] = [
@@ -40,4 +46,4 @@ function dateToTimeAgo(date: Date): string {
     return `${s} second${s !== 1 ? 's' : ''} ago`;
 }
 
-export { formatTime, stringToDate, dateToTimeAgo, formatLocalDate };
+export { formatTime, stringToDate, dateToTimeAgo, formatLocalDate, formatLocalTime };