Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
💄 Switch to breadcrumb component on admin page
Luke Vella7c9cd229af8d
diff --git a/apps/web/src/app/[locale]/(app)/(optional-space)/new/page.tsx b/apps/web/src/app/[locale]/(app)/(optional-space)/new/page.tsxindex 029732447..64acc7243 100644--- a/apps/web/src/app/[locale]/(app)/(optional-space)/new/page.tsx+++ b/apps/web/src/app/[locale]/(app)/(optional-space)/new/page.tsx@@ -8,6 +8,7 @@ import {} from "@rallly/ui/breadcrumb";import { BarChart2Icon } from "lucide-react";import type { Metadata } from "next";+import Link from "next/link";import { CreatePoll } from "@/components/create-poll";import { UserDropdown } from "@/components/user-dropdown";import { isQuickCreateEnabled } from "@/features/quick-create";@@ -34,7 +35,7 @@ export default async function Page() {<BreadcrumbList><BreadcrumbItem><BreadcrumbLink- href="/polls"+ render={<Link href="/polls" />}className="flex items-center gap-x-2"><BarChart2Icon className="size-4" />diff --git a/apps/web/src/components/invite-dialog.tsx b/apps/web/src/components/invite-dialog.tsxindex a4a7d7934..14f26ef11 100644--- a/apps/web/src/components/invite-dialog.tsx+++ b/apps/web/src/components/invite-dialog.tsx@@ -58,7 +58,9 @@ export const InviteDialog = () => {<DialogTrigger asChild={true}><Button variant="primary"><Share2Icon data-icon="inline-start" />- <Trans i18nKey="share" defaults="Share" />+ <span className="sr-only sm:not-sr-only">+ <Trans i18nKey="share" defaults="Share" />+ </span></Button></DialogTrigger><DialogContent data-testid="invite-participant-dialog">diff --git a/apps/web/src/components/layouts/poll-layout.tsx b/apps/web/src/components/layouts/poll-layout.tsxindex d1fa48a73..3794ea137 100644--- a/apps/web/src/components/layouts/poll-layout.tsx+++ b/apps/web/src/components/layouts/poll-layout.tsx@@ -1,11 +1,16 @@"use client";-import { buttonVariants } from "@rallly/ui";-import { Icon } from "@rallly/ui/icon";-import { ArrowLeftIcon } from "lucide-react";+import {+ Breadcrumb,+ BreadcrumbItem,+ BreadcrumbLink,+ BreadcrumbList,+ BreadcrumbPage,+ BreadcrumbSeparator,+} from "@rallly/ui/breadcrumb";+import { BarChart2Icon } from "lucide-react";import Link from "next/link";import { useParams, usePathname } from "next/navigation";import type React from "react";-import { InviteDialog } from "@/components/invite-dialog";import ManagePoll from "@/components/poll/manage-poll";import { NotificationToggle } from "@/components/poll/notification-toggle";@@ -30,33 +35,36 @@ const Layout = ({ children }: React.PropsWithChildren) => {return (<div className="h-dvh overflow-auto overscroll-none bg-gray-100 dark:bg-gray-900"><div className="sticky top-0 z-40 border-b bg-gray-100/90 p-3 backdrop-blur-lg sm:flex-row dark:bg-gray-900/90">- <div className="mx-auto flex max-w-4xl justify-between">+ <div className="flex justify-between"><div className="flex min-w-0 items-center gap-x-2.5">- {pathname === pollLink ? (- <Link- href="/polls"- className={buttonVariants({ variant: "ghost" })}- >- <Icon>- <ArrowLeftIcon />- </Icon>- <span>- <Trans i18nKey="back" defaults="Back" />- </span>- </Link>- ) : (- <Link- href={pollLink}- className={buttonVariants({ variant: "ghost" })}- >- <Icon>- <ArrowLeftIcon />- </Icon>- <span>- <Trans i18nKey="back" defaults="Back" />- </span>- </Link>- )}+ <Breadcrumb className="min-w-0">+ <BreadcrumbList className="flex-nowrap">+ <BreadcrumbItem className="shrink-0">+ <BreadcrumbLink+ className="flex items-center gap-x-2"+ render={<Link href="/polls" />}+ >+ <BarChart2Icon className="size-4" />+ <Trans i18nKey="polls" defaults="Polls" />+ </BreadcrumbLink>+ </BreadcrumbItem>+ <BreadcrumbSeparator className="shrink-0" />+ <BreadcrumbItem className="min-w-0">+ {pathname === pollLink ? (+ <BreadcrumbPage className="truncate">+ {poll.title}+ </BreadcrumbPage>+ ) : (+ <BreadcrumbLink+ className="truncate"+ render={<Link href={pollLink} />}+ >+ {poll.title}+ </BreadcrumbLink>+ )}+ </BreadcrumbItem>+ </BreadcrumbList>+ </Breadcrumb></div><div><AdminControls />diff --git a/apps/web/src/components/poll/desktop-poll/participant-row.tsx b/apps/web/src/components/poll/desktop-poll/participant-row.tsxindex 48dc008d6..7a6deb3a8 100644--- a/apps/web/src/components/poll/desktop-poll/participant-row.tsx+++ b/apps/web/src/components/poll/desktop-poll/participant-row.tsx@@ -3,7 +3,7 @@ import { cn } from "@rallly/ui";import { Badge } from "@rallly/ui/badge";import { Button } from "@rallly/ui/button";import { Icon } from "@rallly/ui/icon";-import { MoreHorizontalIcon } from "lucide-react";+import { MoreVerticalIcon } from "lucide-react";import type * as React from "react";import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";@@ -144,9 +144,9 @@ const ParticipantRow: React.FunctionComponent<ParticipantRowProps> = ({align="start"onEdit={() => onChangeEditMode?.(true)}>- <Button size="icon" variant="ghost">+ <Button size="icon-xs" variant="ghost"><Icon>- <MoreHorizontalIcon />+ <MoreVerticalIcon /></Icon></Button></ParticipantDropdown>diff --git a/apps/web/src/components/poll/manage-poll.tsx b/apps/web/src/components/poll/manage-poll.tsxindex ad61b9109..c83693056 100644--- a/apps/web/src/components/poll/manage-poll.tsx+++ b/apps/web/src/components/poll/manage-poll.tsx@@ -19,7 +19,6 @@ import {PencilIcon,PlayIcon,Settings2Icon,- SettingsIcon,TableIcon,TrashIcon,} from "lucide-react";@@ -134,8 +133,7 @@ const ManagePoll: React.FunctionComponent<{<DropdownMenu modal={false}><DropdownMenuTrigger asChild={true}><Button variant="ghost" disabled={disabled}>- <SettingsIcon data-icon="inline-start" />- <span className="hidden sm:block">+ <span><Trans i18nKey="manage" /></span><ChevronDownIcon data-icon="inline-end" />diff --git a/packages/ui/src/breadcrumb.tsx b/packages/ui/src/breadcrumb.tsxindex 763852ce1..7e8022e40 100644--- a/packages/ui/src/breadcrumb.tsx+++ b/packages/ui/src/breadcrumb.tsx@@ -47,7 +47,7 @@ function BreadcrumbLink({defaultTagName: "a",props: mergeProps<"a">({- className: cn("transition-colors hover:text-foreground", className),+ className: cn("hover:text-foreground", className),},props,),