Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
✨ Add public event page at /e/[id] (RAL-1199) (#2403)
Luke Vellac871ea7c91fe
diff --git a/apps/web/public/locales/en/app.json b/apps/web/public/locales/en/app.jsonindex 99166af0c..4c41f2565 100644--- a/apps/web/public/locales/en/app.json+++ b/apps/web/public/locales/en/app.json@@ -666,5 +666,9 @@"signupSheetsEmptyTitle": "No sign-up sheets yet","signupSheetsEmptyDescription": "Create a sign-up sheet so people can book the time slots you offer.","newSignupSheet": "New Sign-up Sheet",- "eventTypesDescription": "Reusable event configurations."+ "eventTypesDescription": "Reusable event configurations.",+ "eventHostedBy": "Hosted by {name}",+ "eventStatusCanceled": "Canceled",+ "eventStatusPast": "Past",+ "eventStatusUpcoming": "Upcoming"}diff --git a/apps/web/src/app/[locale]/e/[id]/event-date-time.tsx b/apps/web/src/app/[locale]/e/[id]/event-date-time.tsxnew file mode 100644index 000000000..362aacdea--- /dev/null+++ b/apps/web/src/app/[locale]/e/[id]/event-date-time.tsx@@ -0,0 +1,36 @@+"use client";++import { CalendarIcon, ClockIcon } from "lucide-react";+import { EventMetaItem } from "@/components/event-meta";+import { dayjs } from "@/lib/dayjs";++export function EventDateTime({+ start,+ end,+ allDay,+ timezone,+}: {+ start: Date;+ end: Date;+ allDay: boolean;+ timezone: string;+}) {+ const startD = dayjs(start).tz(timezone);+ const endD = dayjs(end).tz(timezone);+ const date = startD.format("dddd, LL");++ return (+ <>+ <EventMetaItem>+ <CalendarIcon />+ {date}+ </EventMetaItem>+ {allDay ? null : (+ <EventMetaItem>+ <ClockIcon />+ <span>{`${startD.format("LT")} - ${endD.format("LT z")}`}</span>+ </EventMetaItem>+ )}+ </>+ );+}diff --git a/apps/web/src/app/[locale]/e/[id]/page.tsx b/apps/web/src/app/[locale]/e/[id]/page.tsxnew file mode 100644index 000000000..68c21521e--- /dev/null+++ b/apps/web/src/app/[locale]/e/[id]/page.tsx@@ -0,0 +1,211 @@+import { prisma } from "@rallly/database";+import { buttonVariants } from "@rallly/ui";+import { Badge } from "@rallly/ui/badge";+import { Icon } from "@rallly/ui/icon";+import { absoluteUrl } from "@rallly/utils/absolute-url";+import { ArrowLeftIcon, MapPinIcon } from "lucide-react";+import type { Metadata } from "next";+import Link from "next/link";+import { notFound } from "next/navigation";+import { cache, Suspense } from "react";+import { getCurrentUser } from "@/auth/data";+import { AddToCalendarButton } from "@/components/add-to-calendar-button";+import {+ EventMetaDescription,+ EventMetaItem,+ EventMetaList,+ EventMetaTitle,+} from "@/components/event-meta";+import { PollFooter } from "@/components/poll/poll-footer";+import { RandomGradientBar } from "@/components/random-gradient-bar";+import { BrandingStyle } from "@/features/branding/branding-style";+import { isScheduledEventEnabled } from "@/features/scheduled-event/constants";+import { SpaceIcon } from "@/features/space/components/space-icon";+import { Trans } from "@/i18n/client";+import { EventDateTime } from "./event-date-time";++const getScheduledEvent = cache(async (id: string) => {+ const event = await prisma.scheduledEvent.findUnique({+ where: { id },+ select: {+ id: true,+ title: true,+ description: true,+ location: true,+ start: true,+ end: true,+ allDay: true,+ timeZone: true,+ status: true,+ deletedAt: true,+ user: {+ select: {+ name: true,+ },+ },+ space: {+ select: {+ name: true,+ image: true,+ showBranding: true,+ primaryColor: true,+ },+ },+ },+ });++ if (!event || event.deletedAt) {+ notFound();+ }++ return event;+});++async function EventsBackLink() {+ const user = await getCurrentUser();+ if (!user) {+ return null;+ }+ return (+ <Link+ href="/events"+ className={buttonVariants({ variant: "ghost", size: "sm" })}+ >+ <Icon>+ <ArrowLeftIcon />+ </Icon>+ <Trans i18nKey="events" defaults="Events" />+ </Link>+ );+}++function StatusBadge({+ status,+ hasEnded,+}: {+ status: "confirmed" | "canceled" | "unconfirmed";+ hasEnded: boolean;+}) {+ if (status === "canceled") {+ return (+ <Badge variant="destructive">+ <Trans i18nKey="eventStatusCanceled" defaults="Canceled" />+ </Badge>+ );+ }+ if (hasEnded) {+ return (+ <Badge variant="default">+ <Trans i18nKey="eventStatusPast" defaults="Past" />+ </Badge>+ );+ }+ return (+ <Badge variant="green">+ <Trans i18nKey="eventStatusUpcoming" defaults="Upcoming" />+ </Badge>+ );+}++export default async function EventPage({+ params,+}: {+ params: Promise<{ id: string }>;+}) {+ if (!isScheduledEventEnabled) {+ notFound();+ }+ const { id } = await params;+ const event = await getScheduledEvent(id);++ const isBranded = event.space.showBranding && !!event.space.image;+ const brandingColor =+ event.space.showBranding && event.space.primaryColor+ ? event.space.primaryColor+ : null;+ const hasEnded = event.end < new Date();++ return (+ <div className="page-bg-gray-100 relative flex min-h-dvh flex-col overflow-auto sm:dark:bg-gray-900">+ {brandingColor ? <BrandingStyle primaryColor={brandingColor} /> : null}+ <div className="p-3">+ <Suspense fallback={null}>+ <EventsBackLink />+ </Suspense>+ </div>+ <div className="flex-1 px-2 md:flex md:items-center md:justify-center">+ <div className="w-full max-w-md gap-4 overflow-hidden rounded-2xl border bg-card">+ <RandomGradientBar />+ <div className="relative p-4">+ <div className="absolute top-3 right-3">+ <StatusBadge status={event.status} hasEnded={hasEnded} />+ </div>+ <div>+ {isBranded ? (+ <div className="mb-4">+ <SpaceIcon+ name={event.space.name}+ src={event.space.image ?? undefined}+ size="xl"+ />+ <p className="mt-2 font-medium text-muted-foreground text-sm">+ {event.space.name}+ </p>+ </div>+ ) : null}+ <EventMetaTitle className="pr-24">{event.title}</EventMetaTitle>+ {event.user?.name ? (+ <p className="mt-1 text-muted-foreground text-sm">+ <Trans+ i18nKey="eventHostedBy"+ defaults="Hosted by {name}"+ values={{ name: event.user.name }}+ />+ </p>+ ) : null}+ {event.description ? (+ <EventMetaDescription className="mt-4">+ {event.description}+ </EventMetaDescription>+ ) : null}+ <EventMetaList className="mt-6">+ <EventDateTime+ start={event.start}+ end={event.end}+ allDay={event.allDay}+ timezone={event.timeZone || "UTC"}+ />+ {event.location ? (+ <EventMetaItem>+ <MapPinIcon />+ {event.location}+ </EventMetaItem>+ ) : null}+ </EventMetaList>+ <div className="mt-6">+ <AddToCalendarButton eventId={event.id} />+ </div>+ </div>+ </div>+ </div>+ </div>+ <div className="mt-auto py-6">+ <PollFooter />+ </div>+ </div>+ );+}++export async function generateMetadata({+ params,+}: {+ params: Promise<{ id: string }>;+}): Promise<Metadata> {+ const { id } = await params;+ const event = await getScheduledEvent(id);++ return {+ title: event.title,+ metadataBase: new URL(absoluteUrl()),+ };+}diff --git a/apps/web/src/components/add-to-calendar-button.tsx b/apps/web/src/components/add-to-calendar-button.tsxindex 0c03f91ab..eab057c4f 100644--- a/apps/web/src/components/add-to-calendar-button.tsx+++ b/apps/web/src/components/add-to-calendar-button.tsx@@ -26,7 +26,7 @@ export function AddToCalendarButton({ eventId }: { eventId: string }) {<Trans i18nKey="addToCalendar" defaults="Add to Calendar" /></Button></DropdownMenuTrigger>- <DropdownMenuContent forceMount={true} align="start">+ <DropdownMenuContent align="start"><DropdownMenuItem asChild><ahref={`/api/event/${eventId}/google-calendar`}diff --git a/apps/web/src/components/event-meta.tsx b/apps/web/src/components/event-meta.tsxindex 4d5303a70..4133948e6 100644--- a/apps/web/src/components/event-meta.tsx+++ b/apps/web/src/components/event-meta.tsx@@ -27,7 +27,7 @@ export function EventMetaDescription({<pclassName={cn(className,- "min-w-0 whitespace-pre-wrap text-pretty text-muted-foreground text-sm leading-relaxed",+ "min-w-0 whitespace-pre-wrap text-pretty text-foreground text-sm leading-relaxed opacity-90",)}><TruncatedLinkify>{children}</TruncatedLinkify>@@ -56,7 +56,7 @@ export function EventMetaItem({<liclassName={cn(className,- "flex flex-wrap items-center gap-1.5 text-sm [&_svg]:size-4 [&_svg]:shrink-0",+ "flex flex-wrap items-center gap-1.5 text-sm [&_svg]:size-4 [&_svg]:shrink-0 [&_svg]:text-muted-foreground",)}>{children}diff --git a/apps/web/src/components/poll/poll-footer.tsx b/apps/web/src/components/poll/poll-footer.tsxindex 7067c00b4..d86dfca8e 100644--- a/apps/web/src/components/poll/poll-footer.tsx+++ b/apps/web/src/components/poll/poll-footer.tsx@@ -11,7 +11,7 @@ export function PollFooter() {}return (- <div className="pt-4 pb-12 text-center text-muted-foreground text-sm">+ <div className="text-center text-muted-foreground text-sm"><Transdefaults="Powered by <a>{name}</a>"i18nKey="poweredByRallly"diff --git a/apps/web/src/features/branding/branding-style.tsx b/apps/web/src/features/branding/branding-style.tsxnew file mode 100644index 000000000..b5ae6b34d--- /dev/null+++ b/apps/web/src/features/branding/branding-style.tsx@@ -0,0 +1,17 @@+import { getPrimaryColorVars } from "@/features/branding/color";++export function BrandingStyle({ primaryColor }: { primaryColor: string }) {+ const v = getPrimaryColorVars(primaryColor);+ return (+ <style>{`+ .light {+ --primary: ${v.light};+ --primary-foreground: ${v.lightForeground};+ }+ .dark {+ --primary: ${v.dark};+ --primary-foreground: ${v.darkForeground};+ }+ `}</style>+ );+}diff --git a/apps/web/src/features/scheduled-event/components/scheduled-event-list.tsx b/apps/web/src/features/scheduled-event/components/scheduled-event-list.tsxindex 04d1ff53b..254d869be 100644--- a/apps/web/src/features/scheduled-event/components/scheduled-event-list.tsx+++ b/apps/web/src/features/scheduled-event/components/scheduled-event-list.tsx@@ -22,9 +22,12 @@ import {} from "@rallly/ui/dropdown-menu";import { Icon } from "@rallly/ui/icon";import { Tooltip, TooltipContent, TooltipTrigger } from "@rallly/ui/tooltip";+import { shortUrl } from "@rallly/utils/absolute-url";import { MoreVerticalIcon } from "lucide-react";+import { CopyLinkButton } from "@/components/copy-link-button";import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";import { StackedList } from "@/components/stacked-list";+import { isScheduledEventEnabled } from "@/features/scheduled-event/constants";import { Trans } from "@/i18n/client";import { FormattedDateTime } from "@/lib/timezone/client/formatted-date-time";import { trpc } from "@/trpc/client";@@ -64,13 +67,13 @@ export function ScheduledEventListItem({<div className="flex items-center gap-4 text-sm"><div className="flex flex-1 items-center gap-2"><div className="flex flex-col gap-1">- <div+ <spanclassName={cn("font-medium", {"line-through": status === "canceled",})}>{title}- </div>+ </span><div className="text-muted-foreground text-sm">{invites.length > 0 ? (<Tooltip>@@ -155,6 +158,9 @@ export function ScheduledEventListItem({<TooltipContent>{createdBy.name}</TooltipContent></Tooltip></div>+ {isScheduledEventEnabled && (+ <CopyLinkButton href={shortUrl(`/e/${eventId}`)} />+ )}{status !== "canceled" ? (<DropdownMenu><DropdownMenuTrigger asChild>diff --git a/apps/web/src/features/scheduled-event/constants.ts b/apps/web/src/features/scheduled-event/constants.tsnew file mode 100644index 000000000..ec56a9ef2--- /dev/null+++ b/apps/web/src/features/scheduled-event/constants.ts@@ -0,0 +1 @@+export const isScheduledEventEnabled = process.env.NODE_ENV === "development";