Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,6 @@ const timelineLabel = (key: string): string => {
return t`Scanned the QR`;
case "terms":
return t`Accepted terms`;
case "mic_ok":
return t`Mic checked`;
case "mic_skipped":
return t`Skipped mic check`;
case "mic_blocked":
return t`Mic blocked`;
case "profile":
return t`Entered details`;
case "created":
Expand Down
3 changes: 0 additions & 3 deletions echo/frontend/src/components/conversation/FunnelCanvas.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import { isFinishedSession, isOnRecordingPage } from "./monitorGrouping";
// Mantine theme so the funnel stays in sync with the rest of the monitor.
const FALLBACK_COLORS = {
backgrounded: "#868e96",
blocked: "#fa5252",
finished: "#868e96",
recording: "#fa5252",
// Matches the yellow StatePill for paused / away / left.
Expand Down Expand Up @@ -50,7 +49,6 @@ const resolveColors = (): typeof FALLBACK_COLORS => {
"--mantine-color-gray-6",
FALLBACK_COLORS.backgrounded,
),
blocked: readCssVar("--mantine-color-red-6", FALLBACK_COLORS.blocked),
finished: readCssVar("--mantine-color-gray-6", FALLBACK_COLORS.finished),
recording: readCssVar("--mantine-color-red-6", FALLBACK_COLORS.recording),
recordingPage: readCssVar(
Expand Down Expand Up @@ -103,7 +101,6 @@ const colorOf = (node: NodeDatum): string => {
return colors.backgrounded;
return colors.recording;
}
if (node.data.stage === "mic_blocked") return colors.blocked;
if (node.data.stage === "scanned") return colors.scanned;
return colors.setup;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,6 @@ const relativeTime = (stamp: string | null): string => {
const STAGE_TIMELINE_ORDER: { stage: FunnelStage; label: string }[] = [
{ label: t`Scanned the QR`, stage: "scanned" },
{ label: t`Accepted terms`, stage: "terms" },
{ label: t`Mic checked`, stage: "mic_ok" },
{ label: t`Skipped mic check`, stage: "mic_skipped" },
{ label: t`Mic blocked`, stage: "mic_blocked" },
{ label: t`Entered details`, stage: "profile" },
];

Expand Down
122 changes: 63 additions & 59 deletions echo/frontend/src/components/layout/ParticipantHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,66 +67,70 @@ export const ParticipantHeader = () => {
onClose={closeShare}
project={projectQuery.data}
/>
<Group
component="header"
justify="space-between"
wrap="nowrap"
className="relative px-4 py-2 shadow-sm"
{...testId("portal-header")}
>
<Box className="min-w-0">
{showBackButton ? (
<Button
size="md"
variant="subtle"
px={0}
leftSection={<IconArrowLeft size={16} />}
onClick={handleBack}
{...testId("portal-header-back-button")}
>
<Trans id="participant.button.back">Back</Trans>
</Button>
) : showCancelButton ? (
<Button
size="md"
variant="subtle"
px={0}
onClick={handleCancel}
{...testId("portal-header-cancel-button")}
>
<Trans id="participant.concrete.instructions.button.cancel">
Cancel
</Trans>
</Button>
) : (
<Logo h="36px" />
{/* The shadow runs edge to edge; the contents keep to the same column
as the page below, so on a wide screen the logo and the actions
line up with the text rather than the window. */}
<Box component="header" className="shadow-sm">
<Group
justify="space-between"
wrap="nowrap"
className="container relative mx-auto max-w-2xl px-4 py-2"
{...testId("portal-header")}
>
<Box className="min-w-0">
{showBackButton ? (
<Button
size="md"
variant="subtle"
px={0}
leftSection={<IconArrowLeft size={16} />}
onClick={handleBack}
{...testId("portal-header-back-button")}
>
<Trans id="participant.button.back">Back</Trans>
</Button>
) : showCancelButton ? (
<Button
size="md"
variant="subtle"
px={0}
onClick={handleCancel}
{...testId("portal-header-cancel-button")}
>
<Trans id="participant.concrete.instructions.button.cancel">
Cancel
</Trans>
</Button>
) : (
<Logo h="36px" />
)}
</Box>
{!hideHeaderActions && (
<Group gap="lg" wrap="nowrap">
<ActionIcon
size="xl"
variant="transparent"
onClick={openShare}
title={t`Share portal`}
aria-label={t`Share portal`}
{...testId("portal-header-share-button")}
>
<IconQrcode size={30} color="gray" />
</ActionIcon>
<ActionIcon
size="xl"
variant="transparent"
onClick={openSettings}
title={t`Settings`}
aria-label={t`Settings`}
{...testId("portal-header-settings-button")}
>
<GearSixIcon size={30} color="gray" />
</ActionIcon>
</Group>
)}
</Box>
{!hideHeaderActions && (
<Group gap="lg" wrap="nowrap">
<ActionIcon
size="xl"
variant="transparent"
onClick={openShare}
title={t`Share portal`}
aria-label={t`Share portal`}
{...testId("portal-header-share-button")}
>
<IconQrcode size={30} color="gray" />
</ActionIcon>
<ActionIcon
size="xl"
variant="transparent"
onClick={openSettings}
title={t`Settings`}
aria-label={t`Settings`}
{...testId("portal-header-settings-button")}
>
<GearSixIcon size={30} color="gray" />
</ActionIcon>
</Group>
)}
</Group>
</Group>
</Box>
</>
);
};
8 changes: 4 additions & 4 deletions echo/frontend/src/components/participant/DembraneEventCta.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,17 @@ export const DembraneEventCta = ({ projectId }: { projectId: string }) => {
of the viewport until the page runs out and it settles in place. */}
<Box
bg="var(--app-background)"
className="sticky bottom-0 z-10 mt-6 border-t border-slate-300 p-4"
className="sticky bottom-0 z-10 mt-auto flex justify-center border-t border-slate-300 p-4 pt-6"
{...testId("portal-finish-event-cta")}
>
<Button
component="a"
href={href}
rel="noopener noreferrer"
target="_blank"
// Tertiary on purpose. The page's job is done; this is a quiet
// offer, not a call to action, and it is already always in view.
variant="subtle"
// Secondary: the page's job is done and this is an offer, not a
// call to action, but it is the one thing left to do here.
variant="outline"
size="lg"
fullWidth
rightSection={<IconArrowRight size={18} />}
Expand Down
Loading
Loading