Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

💄 Restyle the create poll page with sticky header actions and a guest footer (#2824)

Luke Vellae94e0219d637
diff --git a/apps/web/public/locales/en/app.json b/apps/web/public/locales/en/app.json
index dfdde300f..d1c96b3aa 100644
--- a/apps/web/public/locales/en/app.json
+++ b/apps/web/public/locales/en/app.json
@@ -163,10 +163,14 @@
"createEventTypeTitle": "Create Event Type",
"createNewPoll": "Create new poll",
"createPoll": "Create Poll",
+ "createPollFooterCreated": "Created",
+ "createPollFooterCreating": "Creating…",
+ "createPollGuestModeDescription": "Guest polls can only be managed from the browser they were created in. Log in to manage them from any device.",
+ "createPollGuestModeLogin": "Log in",
+ "createPollGuestModeTitle": "Guest mode",
"createPollPollCreated": "Poll created",
"createSpace": "Create Space",
"createSpaceDescription": "Create a new space to organize your polls and events.",
- "creatingPoll": "Creating poll...",
"cropPreview": "Crop preview",
"currentlyUsing": "Currently using {usedSeats} of {currentSeats} seats",
"currentPassword": "Current Password",
diff --git a/apps/web/src/app/[locale]/(optional-space)/new/page.tsx b/apps/web/src/app/[locale]/(optional-space)/new/page.tsx
index 95ab950a5..3d425ec7e 100644
--- a/apps/web/src/app/[locale]/(optional-space)/new/page.tsx
+++ b/apps/web/src/app/[locale]/(optional-space)/new/page.tsx
@@ -13,7 +13,6 @@ import { redirect } from "next/navigation";
import { BrandStyle } from "@/features/branding/components/brand-style";
import { CreatePoll } from "@/features/poll/components/create-poll";
import { getActiveSpaceForUser } from "@/features/space/data";
-import { UserDropdown } from "@/features/user/components/user-dropdown";
import { Trans } from "@/i18n/client";
import { getTranslation } from "@/i18n/server";
import { getSession } from "@/lib/auth";
@@ -33,43 +32,31 @@ export default async function Page() {
space?.showBranding && space.primaryColor ? space.primaryColor : null;
return (
- <div className="page-bg-gray-100 absolute inset-0 h-dvh overflow-auto dark:bg-gray-900">
+ <div className="page-bg-gray-100 absolute inset-0 h-dvh scroll-pt-16 overflow-auto dark:bg-gray-900">
{primaryColor ? <BrandStyle primaryColor={primaryColor} /> : null}
- <div className="sticky top-0 z-20 border-b bg-gray-100/90 p-3 backdrop-blur-md sm:grid-cols-3 dark:bg-gray-900/90">
- <div className="mx-auto flex items-center justify-between gap-x-2">
- <div className="sm:flex-1">
- <Breadcrumb>
- <BreadcrumbList>
- <BreadcrumbItem>
- <BreadcrumbLink
- render={<Link href="/polls" />}
- className="flex items-center gap-x-2"
- >
- <BarChart2Icon className="size-4" />
- <Trans i18nKey="polls" defaults="Polls" />
- </BreadcrumbLink>
- </BreadcrumbItem>
- <BreadcrumbSeparator />
- <BreadcrumbItem>
- <BreadcrumbPage>
- <Trans i18nKey="newPoll" defaults="New Poll" />
- </BreadcrumbPage>
- </BreadcrumbItem>
- </BreadcrumbList>
- </Breadcrumb>
- </div>
- <div className="flex flex-1 justify-end">
- <UserDropdown />
- </div>
- </div>
- </div>
- <main
- id="main-content"
- tabIndex={-1}
- className="mx-auto max-w-4xl p-3 sm:px-6 sm:py-5"
- >
- <CreatePoll />
- </main>
+ <CreatePoll
+ nav={
+ <Breadcrumb>
+ <BreadcrumbList>
+ <BreadcrumbItem>
+ <BreadcrumbLink
+ render={<Link href="/polls" />}
+ className="flex items-center gap-x-2"
+ >
+ <BarChart2Icon className="size-4" />
+ <Trans i18nKey="polls" defaults="Polls" />
+ </BreadcrumbLink>
+ </BreadcrumbItem>
+ <BreadcrumbSeparator />
+ <BreadcrumbItem>
+ <BreadcrumbPage>
+ <Trans i18nKey="newPoll" defaults="New Poll" />
+ </BreadcrumbPage>
+ </BreadcrumbItem>
+ </BreadcrumbList>
+ </Breadcrumb>
+ }
+ />
</div>
);
}
diff --git a/apps/web/src/features/poll/components/create-poll.tsx b/apps/web/src/features/poll/components/create-poll.tsx
index 4682d1d2a..bcbe3fe48 100644
--- a/apps/web/src/features/poll/components/create-poll.tsx
+++ b/apps/web/src/features/poll/components/create-poll.tsx
@@ -1,6 +1,7 @@
"use client";
import { posthog } from "@rallly/posthog/client";
-import { buttonVariants } from "@rallly/ui";
+import { buttonVariants, cn } from "@rallly/ui";
+import { badgeVariants } from "@rallly/ui/badge";
import { Button } from "@rallly/ui/button";
import {
Card,
@@ -24,14 +25,15 @@ import {
InputGroupButton,
InputGroupInput,
} from "@rallly/ui/input-group";
+import { Popover, PopoverContent, PopoverTrigger } from "@rallly/ui/popover";
import { toast } from "@rallly/ui/sonner";
import { shortUrl } from "@rallly/utils/absolute-url";
import { CheckIcon, CopyIcon } from "lucide-react";
import Link from "next/link";
import React from "react";
-import { useForm } from "react-hook-form";
+import { useForm, useFormContext } from "react-hook-form";
import useFormPersist from "react-hook-form-persist";
-import { useCopyToClipboard, useUnmount } from "react-use";
+import { useCopyToClipboard } from "react-use";
import { PollDetailsForm } from "@/features/poll/components/forms/poll-details-form";
import PollOptionsForm from "@/features/poll/components/forms/poll-options-form/poll-options-form";
import { PollSettingsForm } from "@/features/poll/components/forms/poll-settings";
@@ -49,16 +51,81 @@ const required = <T,>(v: T | undefined): T => {
return v;
};
-export interface CreatePollPageProps {
- title?: string;
- location?: string;
- description?: string;
- view?: "week" | "month";
-}
+const GuestModeBadge = () => {
+ return (
+ <Popover>
+ <PopoverTrigger
+ render={
+ <button
+ type="button"
+ className={cn(
+ badgeVariants(),
+ "cursor-pointer hover:bg-card-accent focus:ring-0 focus:ring-offset-0 focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
+ )}
+ />
+ }
+ >
+ <Trans i18nKey="guest" defaults="Guest" />
+ </PopoverTrigger>
+ <PopoverContent align="end" className="max-w-xs">
+ <div>
+ <h3 className="font-medium text-sm">
+ <Trans i18nKey="createPollGuestModeTitle" defaults="Guest mode" />
+ </h3>
+ <p className="mt-1 text-pretty text-muted-foreground text-sm">
+ <Trans
+ i18nKey="createPollGuestModeDescription"
+ defaults="Guest polls can only be managed from the browser they were created in. Log in to manage them from any device."
+ />
+ </p>
+ </div>
+ <Link
+ href="/login?redirectTo=/new"
+ className={cn(buttonVariants(), "mt-3 w-full")}
+ >
+ <Trans i18nKey="createPollGuestModeLogin" defaults="Log in" />
+ </Link>
+ </PopoverContent>
+ </Popover>
+ );
+};
+
+const CreatePollActions = ({
+ createdPollId,
+}: {
+ createdPollId: string | null;
+}) => {
+ const form = useFormContext<NewEventData>();
+
+ if (createdPollId) {
+ return (
+ <output className="flex h-9 items-center gap-x-1.5 rounded-lg bg-green-600/10 px-2.5 font-medium text-green-600 text-sm dark:bg-green-500/10 dark:text-green-500">
+ <CheckIcon className="size-4 shrink-0" />
+ <Trans i18nKey="createPollFooterCreated" defaults="Created" />
+ </output>
+ );
+ }
+
+ return (
+ <Button
+ form="create-poll"
+ loading={form.formState.isSubmitting}
+ type="submit"
+ variant="primary"
+ >
+ {form.formState.isSubmitting ? (
+ <Trans i18nKey="createPollFooterCreating" defaults="Creating…" />
+ ) : (
+ <Trans i18nKey="create" defaults="Create" />
+ )}
+ </Button>
+ );
+};
-export const CreatePoll: React.FunctionComponent = () => {
+export const CreatePoll = ({ nav }: { nav?: React.ReactNode }) => {
const { t } = useTranslation();
- const { createGuestIfNeeded } = useUser();
+ const { user, createGuestIfNeeded } = useUser();
+ const isLoggedIn = !!user && !user.isGuest;
const [createdPollId, setCreatedPollId] = React.useState<string | null>(null);
const [, copy] = useCopyToClipboard();
const [didCopy, setDidCopy] = React.useState(false);
@@ -84,97 +151,101 @@ export const CreatePoll: React.FunctionComponent = () => {
setValue: form.setValue,
});
- useUnmount(clear);
-
const makePoll = trpc.polls.make.useMutation();
return (
<Form {...form}>
- <form
- onSubmit={form.handleSubmit(async (formData) => {
- const title = required(formData?.title.trim());
- await createGuestIfNeeded();
- const res = await makePoll.mutateAsync({
- title: title,
- location: formData?.location?.trim(),
- description: formData?.description?.trim(),
- // Attach a time zone (times convert per viewer) unless the organizer
- // locked it to a single wall-clock time or the poll is all-day.
- // Fall back to the organizer's zone so a converting poll is always
- // anchored to a concrete zone.
- timeZone:
- !formData?.lockTimeZone && !formData?.allDay
- ? formData?.timeZone || getBrowserTimeZone()
- : null,
- hideParticipants: formData?.hideParticipants,
- disableComments: !formData?.enableComments,
- hideScores: formData?.hideScores,
- requireParticipantEmail: formData?.requireParticipantEmail,
- options: required(formData?.options).map((option) => ({
- startDate: option.type === "date" ? option.date : option.start,
- endDate: option.type === "timeSlot" ? option.end : undefined,
- })),
- });
+ <header className="sticky top-0 z-20 bg-gray-100/90 p-3 backdrop-blur-md dark:bg-gray-900/90">
+ <div className="flex items-center justify-between gap-x-4">
+ <div className="flex min-w-0 flex-1 items-center">{nav}</div>
+ <div className="flex shrink-0 items-center gap-x-4">
+ {!isLoggedIn ? <GuestModeBadge /> : null}
+ <CreatePollActions createdPollId={createdPollId} />
+ </div>
+ </div>
+ </header>
+ <main
+ id="main-content"
+ tabIndex={-1}
+ className="mx-auto max-w-4xl px-3 pb-8 lg:pt-6"
+ >
+ <form
+ id="create-poll"
+ onSubmit={form.handleSubmit(async (formData) => {
+ const title = required(formData?.title.trim());
+ await createGuestIfNeeded();
+ const res = await makePoll.mutateAsync({
+ title: title,
+ location: formData?.location?.trim(),
+ description: formData?.description?.trim(),
+ // Attach a time zone (times convert per viewer) unless the organizer
+ // locked it to a single wall-clock time or the poll is all-day.
+ // Fall back to the organizer's zone so a converting poll is always
+ // anchored to a concrete zone.
+ timeZone:
+ !formData?.lockTimeZone && !formData?.allDay
+ ? formData?.timeZone || getBrowserTimeZone()
+ : null,
+ hideParticipants: formData?.hideParticipants,
+ disableComments: !formData?.enableComments,
+ hideScores: formData?.hideScores,
+ requireParticipantEmail: formData?.requireParticipantEmail,
+ options: required(formData?.options).map((option) => ({
+ startDate: option.type === "date" ? option.date : option.start,
+ endDate: option.type === "timeSlot" ? option.end : undefined,
+ })),
+ });
- if (res.ok) {
- setCreatedPollId(res.data.id);
- } else {
- toast.error(
- t("inappropriateContent", {
- defaultValue: "Inappropriate content",
- }),
- {
- action: {
- label: t("learnMore", { defaultValue: "Learn more" }),
- onClick: () => {
- window.open(
- "https://support.rallly.co/guide/content-moderation",
- "_blank",
- );
+ if (res.ok) {
+ // The persist hook re-saves on every render, so clearing storage
+ // alone is not enough — reset the form so defaults get persisted
+ clear();
+ form.reset();
+ setCreatedPollId(res.data.id);
+ } else {
+ toast.error(
+ t("inappropriateContent", {
+ defaultValue: "Inappropriate content",
+ }),
+ {
+ action: {
+ label: t("learnMore", { defaultValue: "Learn more" }),
+ onClick: () => {
+ window.open(
+ "https://support.rallly.co/guide/content-moderation",
+ "_blank",
+ );
+ },
},
},
- },
- );
- }
- })}
- >
- <div className="space-y-4">
- <Card>
- <CardHeader>
- <CardTitle>
- <Trans i18nKey="event" defaults="Event" />
- </CardTitle>
- <CardDescription>
- <Trans
- i18nKey="describeYourEvent"
- defaults="Describe what your event is about"
- />
- </CardDescription>
- </CardHeader>
- <CardContent className="space-y-4">
- <PollDetailsForm />
- </CardContent>
- </Card>
+ );
+ }
+ })}
+ >
+ <div className="space-y-4">
+ <Card>
+ <CardHeader>
+ <CardTitle>
+ <Trans i18nKey="event" defaults="Event" />
+ </CardTitle>
+ <CardDescription>
+ <Trans
+ i18nKey="describeYourEvent"
+ defaults="Describe what your event is about"
+ />
+ </CardDescription>
+ </CardHeader>
+ <CardContent className="space-y-4">
+ <PollDetailsForm />
+ </CardContent>
+ </Card>
- <PollOptionsForm />
+ <PollOptionsForm />
- <PollSettingsForm />
- <hr />
- <Button
- loading={form.formState.isSubmitting}
- size="xl"
- type="submit"
- className="w-full"
- variant="primary"
- >
- {form.formState.isSubmitting ? (
- <Trans i18nKey="creatingPoll" defaults="Creating poll..." />
- ) : (
- <Trans i18nKey="createPoll" defaults="Create poll" />
- )}
- </Button>
- </div>
- </form>
+ <PollSettingsForm />
+ </div>
+ </form>
+ </main>
<Dialog open={!!createdPollId}>
<DialogContent showCloseButton={false}>
<DialogHeader>
diff --git a/apps/web/tests/new-poll-page.ts b/apps/web/tests/new-poll-page.ts
index d5704319d..33089a194 100644
--- a/apps/web/tests/new-poll-page.ts
+++ b/apps/web/tests/new-poll-page.ts
@@ -56,7 +56,7 @@ export class NewPollPage {
await page.getByRole("switch", { name: /comments/i }).click();
}
- await page.getByRole("button", { name: /create poll/i }).click();
+ await page.getByRole("button", { name: /^create$/i }).click();
const successDialog = new CreatePollSuccessDialog(page);
await successDialog.dialog.waitFor({ state: "visible" });
diff --git a/packages/ui/src/popover.tsx b/packages/ui/src/popover.tsx
index 4c383bc37..949d74e8d 100644
--- a/packages/ui/src/popover.tsx
+++ b/packages/ui/src/popover.tsx
@@ -37,7 +37,7 @@ function PopoverContent({
<PopoverPrimitive.Popup
data-slot="popover-content"
className={cn(
- "data-closed:fade-out-0 data-open:fade-in-0 data-closed:zoom-out-95 data-open:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-[side=inline-start]:slide-in-from-right-2 data-[side=inline-end]:slide-in-from-left-2 z-50 flex w-72 origin-(--transform-origin) flex-col gap-2.5 rounded-lg bg-popover p-2.5 text-popover-foreground text-sm shadow-md outline-hidden ring-1 ring-foreground/10 duration-100 data-closed:animate-out data-open:animate-in",
+ "data-closed:fade-out-0 data-open:fade-in-0 data-closed:zoom-out-95 data-open:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-[side=inline-start]:slide-in-from-right-2 data-[side=inline-end]:slide-in-from-left-2 z-50 flex w-72 origin-(--transform-origin) flex-col gap-2.5 rounded-xl bg-popover p-3 text-popover-foreground text-sm shadow-md outline-hidden ring-1 ring-foreground/10 duration-100 data-closed:animate-out data-open:animate-in",
className,
)}
{...props}