Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
♻️ Migrate button to base ui (#2259)
Luke Vellaed96e4377b00
diff --git a/apps/landing/src/app/[locale]/(main)/blog/[slug]/page.tsx b/apps/landing/src/app/[locale]/(main)/blog/[slug]/page.tsxindex e2f05bc84..6b2f716cb 100644--- a/apps/landing/src/app/[locale]/(main)/blog/[slug]/page.tsx+++ b/apps/landing/src/app/[locale]/(main)/blog/[slug]/page.tsx@@ -1,4 +1,4 @@-import { Button } from "@rallly/ui/button";+import { buttonVariants } from "@rallly/ui";import { absoluteUrl } from "@rallly/utils/absolute-url";import { ArrowLeftIcon } from "lucide-react";import type { Metadata } from "next";@@ -24,11 +24,9 @@ export default async function Page(props: {return (<div><nav className="mb-4">- <Button asChild variant="ghost">- <Link href="/blog">- <ArrowLeftIcon className="size-4" /> All Posts- </Link>- </Button>+ <Link href="/blog" className={buttonVariants({ variant: "ghost" })}>+ <ArrowLeftIcon className="size-4" /> All Posts+ </Link></nav><article className="space-y-4"><PostHeader title={post.title} date={post.date} />diff --git a/apps/landing/src/app/[locale]/(main)/layout.tsx b/apps/landing/src/app/[locale]/(main)/layout.tsxindex 3858a9dd3..0dfc4b3fa 100644--- a/apps/landing/src/app/[locale]/(main)/layout.tsx+++ b/apps/landing/src/app/[locale]/(main)/layout.tsx@@ -1,4 +1,5 @@import languages from "@rallly/languages";+import { buttonVariants } from "@rallly/ui";import { Button } from "@rallly/ui/button";import {DropdownMenu,@@ -99,16 +100,24 @@ export default async function Root(props: {</DropdownMenuItem><DropdownMenuSeparator /><DropdownMenuLabel className="space-y-2">- <Button variant="default" className="w-full" asChild>- <LinkBase href={linkToApp("/login")}>- <Trans t={t} i18nKey="login" defaults="Login" />- </LinkBase>- </Button>- <Button variant="primary" className="w-full" asChild>- <LinkBase href={linkToApp("/register")}>- <Trans t={t} i18nKey="signUp" defaults="Sign up" />- </LinkBase>- </Button>+ <LinkBase+ href={linkToApp("/login")}+ className={buttonVariants({+ variant: "default",+ className: "w-full",+ })}+ >+ <Trans t={t} i18nKey="login" defaults="Login" />+ </LinkBase>+ <LinkBase+ href={linkToApp("/register")}+ className={buttonVariants({+ variant: "primary",+ className: "w-full",+ })}+ >+ <Trans t={t} i18nKey="signUp" defaults="Sign up" />+ </LinkBase></DropdownMenuLabel></DropdownMenuContent></DropdownMenu>diff --git a/apps/landing/src/app/[locale]/(main)/nav-link.tsx b/apps/landing/src/app/[locale]/(main)/nav-link.tsxindex 69a172b1f..4a021bdeb 100644--- a/apps/landing/src/app/[locale]/(main)/nav-link.tsx+++ b/apps/landing/src/app/[locale]/(main)/nav-link.tsx@@ -1,7 +1,6 @@"use client";-import { cn } from "@rallly/ui";-import { Button } from "@rallly/ui/button";+import { buttonVariants, cn } from "@rallly/ui";import { usePathname } from "next/navigation";import { LinkBase } from "@/i18n/client/link";@@ -12,12 +11,13 @@ export const NavLink = ({const pathname = usePathname();const isActive = pathname === props.href;return (- <Button- className={cn(isActive ? "bg-gray-200 text-foreground" : "", className)}- asChild- variant="ghost"- >- <LinkBase {...props} />- </Button>+ <LinkBase+ className={cn(+ buttonVariants({ variant: "ghost" }),+ isActive ? "bg-gray-200 text-foreground" : "",+ className,+ )}+ {...props}+ />);};diff --git a/apps/landing/src/app/[locale]/(main)/pricing/pricing-table.tsx b/apps/landing/src/app/[locale]/(main)/pricing/pricing-table.tsxindex eaa2a0c46..b09bb4d70 100644--- a/apps/landing/src/app/[locale]/(main)/pricing/pricing-table.tsx+++ b/apps/landing/src/app/[locale]/(main)/pricing/pricing-table.tsx@@ -1,6 +1,7 @@"use client";import { PLAN_NAMES, pricingData } from "@rallly/billing";+import { buttonVariants } from "@rallly/ui";import { Badge } from "@rallly/ui/badge";import {BillingPlan,@@ -12,7 +13,6 @@ import {BillingPlanPrice,BillingPlanTitle,} from "@rallly/ui/billing-plan";-import { Button } from "@rallly/ui/button";import { Tabs, TabsContent, TabsList, TabsTrigger } from "@rallly/ui/tabs";import Link from "next/link";import React from "react";@@ -71,16 +71,17 @@ export function PriceTables() {</BillingPlanPeriod></div><hr />- <Button asChild className="w-full">- <Link href={linkToApp("/")}>- <Trans- t={t}- ns="common"- i18nKey="getStarted"- defaults="Get started"- />- </Link>- </Button>+ <Link+ href={linkToApp("/")}+ className={buttonVariants({ className: "w-full" })}+ >+ <Trans+ t={t}+ ns="common"+ i18nKey="getStarted"+ defaults="Get started"+ />+ </Link><BillingPlanPerks><BillingPlanPerk><Trans@@ -152,16 +153,20 @@ export function PriceTables() {</BillingPlanPeriod></TabsContent><hr />- <Button asChild variant="primary" className="w-full">- <Link href={linkToApp("/settings/billing")}>- <Trans- t={t}- ns="pricing"- i18nKey="upgrade"- defaults="Go to billing"- />- </Link>- </Button>+ <Link+ href={linkToApp("/settings/billing")}+ className={buttonVariants({+ variant: "primary",+ className: "w-full",+ })}+ >+ <Trans+ t={t}+ ns="pricing"+ i18nKey="upgrade"+ defaults="Go to billing"+ />+ </Link><BillingPlanPerks><BillingPlanPerk pro={true}><Transdiff --git a/apps/landing/src/components/error-page.tsx b/apps/landing/src/components/error-page.tsxindex bc0503c88..5f7b9d561 100644--- a/apps/landing/src/components/error-page.tsx+++ b/apps/landing/src/components/error-page.tsx@@ -1,6 +1,6 @@"use client";-import { Button } from "@rallly/ui/button";+import { buttonVariants } from "@rallly/ui";import { FileSearchIcon } from "lucide-react";import type * as React from "react";import { LinkBase } from "@/i18n/client/link";@@ -29,12 +29,12 @@ const ErrorPage: React.FunctionComponent<ComponentProps> = ({<p className="text-gray-600">{description}</p></div><div className="flex justify-center space-x-3">- <Button variant="primary" asChild>- <LinkBase href="/">{t("goToHome")}</LinkBase>- </Button>- <Button asChild>- <a href="https://support.rallly.co">{t("support")}</a>- </Button>+ <LinkBase href="/" className={buttonVariants({ variant: "primary" })}>+ {t("goToHome")}+ </LinkBase>+ <a href="https://support.rallly.co" className={buttonVariants()}>+ {t("support")}+ </a></div></div></div>diff --git a/apps/landing/src/components/home/hero.tsx b/apps/landing/src/components/home/hero.tsxindex 425dd61d4..a97061175 100644--- a/apps/landing/src/components/home/hero.tsx+++ b/apps/landing/src/components/home/hero.tsx@@ -1,8 +1,7 @@"use client";import { usePostHog } from "@rallly/posthog/client";-import { cn } from "@rallly/ui";+import { buttonVariants, cn } from "@rallly/ui";import { Badge } from "@rallly/ui/badge";-import { Button } from "@rallly/ui/button";import { ChevronRightIcon } from "lucide-react";import * as m from "motion/react-m";import Image from "next/image";@@ -114,17 +113,20 @@ export const MarketingHero = ({{description}</h2><div className="mt-8 flex flex-col items-center justify-center gap-4">- <Button- size="lg"- className="transition-all hover:shadow-md active:translate-y-1 active:shadow-none"- variant="primary"+ <Link+ href={linkToApp("/new")}+ className={buttonVariants({+ size: "lg",+ variant: "primary",+ className:+ "transition-all hover:shadow-md active:translate-y-1 active:shadow-none",+ })}onClick={() => {posthog.capture("landing:hero_button_click");}}- asChild>- <Link href={linkToApp("/new")}>{callToAction}</Link>- </Button>+ {callToAction}+ </Link><pclassName={cn("whitespace-nowrap text-center text-gray-600 text-xs",diff --git a/apps/landing/src/components/login-button.tsx b/apps/landing/src/components/login-button.tsxindex ccba8a081..40043b445 100644--- a/apps/landing/src/components/login-button.tsx+++ b/apps/landing/src/components/login-button.tsx@@ -1,7 +1,7 @@"use client";import { usePostHog } from "@rallly/posthog/client";-import { Button } from "@rallly/ui/button";+import { buttonVariants } from "@rallly/ui";import Link from "next/link";import { Trans } from "@/i18n/client/trans";import { linkToApp } from "@/lib/linkToApp";@@ -9,16 +9,14 @@ import { linkToApp } from "@/lib/linkToApp";export const LoginButton = () => {const posthog = usePostHog();return (- <Button- variant="ghost"+ <Link+ href={linkToApp("/login")}+ className={buttonVariants({ variant: "ghost" })}onClick={() => {posthog.capture("landing:login_button_click");}}- asChild>- <Link href={linkToApp("/login")}>- <Trans i18nKey="login" defaults="Login" />- </Link>- </Button>+ <Trans i18nKey="login" defaults="Login" />+ </Link>);};diff --git a/apps/landing/src/components/sign-up-button.tsx b/apps/landing/src/components/sign-up-button.tsxindex 564ad46ae..9fba3008d 100644--- a/apps/landing/src/components/sign-up-button.tsx+++ b/apps/landing/src/components/sign-up-button.tsx@@ -1,7 +1,7 @@"use client";import { usePostHog } from "@rallly/posthog/client";-import { Button } from "@rallly/ui/button";+import { buttonVariants } from "@rallly/ui";import Link from "next/link";import { Trans } from "@/i18n/client/trans";import { linkToApp } from "@/lib/linkToApp";@@ -9,16 +9,14 @@ import { linkToApp } from "@/lib/linkToApp";export function SignUpButton() {const posthog = usePostHog();return (- <Button- variant="primary"+ <Link+ href={linkToApp("/register")}+ className={buttonVariants({ variant: "primary" })}onClick={() => {posthog.capture("landing:sign_up_button_click");}}- asChild>- <Link href={linkToApp("/register")}>- <Trans i18nKey="signUp" defaults="Sign up" />- </Link>- </Button>+ <Trans i18nKey="signUp" defaults="Sign up" />+ </Link>);}diff --git a/apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/edit-details/page.tsx b/apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/edit-details/page.tsxindex e780c851d..6b9e4d6a5 100644--- a/apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/edit-details/page.tsx+++ b/apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/edit-details/page.tsx@@ -1,4 +1,5 @@"use client";+import { buttonVariants } from "@rallly/ui";import { Button } from "@rallly/ui/button";import {Card,@@ -72,11 +73,9 @@ const Page = () => {<PollDetailsForm /></CardContent><CardFooter className="justify-between">- <Button asChild>- <Link href={pollLink}>- <Trans i18nKey="cancel" />- </Link>- </Button>+ <Link href={pollLink} className={buttonVariants()}>+ <Trans i18nKey="cancel" />+ </Link><Button type="submit" loading={isUpdating} variant="primary"><Trans i18nKey="save" /></Button>diff --git a/apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/edit-options/page.tsx b/apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/edit-options/page.tsxindex 3bb6b67ca..6b1757cae 100644--- a/apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/edit-options/page.tsx+++ b/apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/edit-options/page.tsx@@ -1,4 +1,5 @@"use client";+import { buttonVariants } from "@rallly/ui";import { Button } from "@rallly/ui/button";import { CardFooter } from "@rallly/ui/card";import { Form } from "@rallly/ui/form";@@ -144,11 +145,9 @@ const Page = () => {><PollOptionsForm disableTimeZoneChange={true}><CardFooter className="justify-between">- <Button asChild>- <Link href={pollLink}>- <Trans i18nKey="cancel" />- </Link>- </Button>+ <Link href={pollLink} className={buttonVariants()}>+ <Trans i18nKey="cancel" />+ </Link><Button type="submit" loading={isUpdating} variant="primary"><Trans i18nKey="save" /></Button>diff --git a/apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/edit-settings/page.tsx b/apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/edit-settings/page.tsxindex c45f9e5c4..a155b3348 100644--- a/apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/edit-settings/page.tsx+++ b/apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/edit-settings/page.tsx@@ -1,4 +1,5 @@"use client";+import { buttonVariants } from "@rallly/ui";import { Button } from "@rallly/ui/button";import { CardFooter } from "@rallly/ui/card";import { Form } from "@rallly/ui/form";@@ -49,11 +50,9 @@ const Page = () => {><PollSettingsForm><CardFooter className="justify-between">- <Button asChild>- <Link href={pollLink}>- <Trans i18nKey="cancel" />- </Link>- </Button>+ <Link href={pollLink} className={buttonVariants()}>+ <Trans i18nKey="cancel" />+ </Link><Button type="submit" variant="primary"><Trans i18nKey="save" /></Button>diff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/password-setup-alert.tsx b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/password-setup-alert.tsxindex b2269362c..9ffe90761 100644--- a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/password-setup-alert.tsx+++ b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/password-setup-alert.tsx@@ -1,5 +1,6 @@"use client";import { usePostHog } from "@rallly/posthog/client";+import { buttonVariants } from "@rallly/ui";import { Alert, AlertDescription, AlertTitle } from "@rallly/ui/alert";import { Button } from "@rallly/ui/button";import { KeyRoundIcon } from "lucide-react";@@ -46,22 +47,20 @@ function PasswordSetupAlertInner() {/></p><div className="mt-4 flex items-center gap-2">- <Button- variant="primary"+ <Link+ href="/settings/security"+ className={buttonVariants({ variant: "primary" })}onClick={() => {posthog.capture("space_dashboard:password_setup_button_click",);}}- asChild>- <Link href="/settings/security">- <Trans- i18nKey="setupPasswordButton"- defaults="Set up password"- />- </Link>- </Button>+ <Trans+ i18nKey="setupPasswordButton"+ defaults="Set up password"+ />+ </Link><Buttonvariant="ghost"onClick={() => {diff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/polls-page.tsx b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/polls-page.tsxindex cec233961..595f58235 100644--- a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/polls-page.tsx+++ b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/polls-page.tsx@@ -1,6 +1,6 @@"use client";-import { Button } from "@rallly/ui/button";+import { buttonVariants } from "@rallly/ui";import { Icon } from "@rallly/ui/icon";import { InboxIcon, PlusIcon } from "lucide-react";import Link from "next/link";@@ -44,11 +44,9 @@ function PollsEmptyState() {/></EmptyStateDescription><EmptyStateFooter>- <Button asChild>- <Link href="/new">- <Trans i18nKey="createPoll" defaults="Create Poll" />- </Link>- </Button>+ <Link href="/new" className={buttonVariants()}>+ <Trans i18nKey="createPoll" defaults="Create Poll" />+ </Link></EmptyStateFooter></EmptyState>);@@ -72,14 +70,12 @@ export function PollsPage() {</PageTitle></PageHeaderContent><PageHeaderActions>- <Button variant="primary" asChild>- <Link href="/new">- <Icon>- <PlusIcon />- </Icon>- <Trans i18nKey="newPoll" defaults="New Poll" />- </Link>- </Button>+ <Link href="/new" className={buttonVariants({ variant: "primary" })}>+ <Icon>+ <PlusIcon />+ </Icon>+ <Trans i18nKey="newPoll" defaults="New Poll" />+ </Link></PageHeaderActions></PageHeader><PageContent>diff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/billing/page-client.tsx b/apps/web/src/app/[locale]/(app)/(space)/settings/billing/page-client.tsxindex 6a7779abd..7599e4f71 100644--- a/apps/web/src/app/[locale]/(app)/(space)/settings/billing/page-client.tsx+++ b/apps/web/src/app/[locale]/(app)/(space)/settings/billing/page-client.tsx@@ -1,6 +1,7 @@"use client";import { usePostHog } from "@rallly/posthog/client";+import { buttonVariants } from "@rallly/ui";import { Alert, AlertDescription, AlertTitle } from "@rallly/ui/alert";import { Button } from "@rallly/ui/button";import { DialogTrigger } from "@rallly/ui/dialog";@@ -127,24 +128,23 @@ function BillingPageContent({ tier }: { tier: SpaceTier }) {<div>{subscription ? (<div className="flex justify-between gap-2">- <Button+ <a+ href="/api/stripe/portal"+ className={buttonVariants()}onClick={() => {posthog?.capture("space_billing:billing_portal_button_click",);}}- asChild>- <a href="/api/stripe/portal">- <Icon>- <CreditCardIcon />- </Icon>- <Trans- i18nKey="manageSubscription"- defaults="Manage Subscription"- />- </a>- </Button>+ <Icon>+ <CreditCardIcon />+ </Icon>+ <Trans+ i18nKey="manageSubscription"+ defaults="Manage Subscription"+ />+ </a><ManageSeatsDialogusedSeats={seats.used}currentSeats={seats.total}@@ -213,19 +213,18 @@ function BillingPageContent({ tier }: { tier: SpaceTier }) {</PageSectionDescription></PageSectionHeader><PageSectionContent>- <Button+ <a+ href="mailto:[email protected]"+ className={buttonVariants()}onClick={() => {posthog?.capture("space_billing:support_button_click");}}- asChild>- <a href="mailto:[email protected]">- <Icon>- <SendIcon />- </Icon>- <Trans i18nKey="contactSupport" defaults="Contact Support" />- </a>- </Button>+ <Icon>+ <SendIcon />+ </Icon>+ <Trans i18nKey="contactSupport" defaults="Contact Support" />+ </a></PageSectionContent></PageSection></PageSectionGroup>diff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/layout.tsx b/apps/web/src/app/[locale]/(app)/(space)/settings/layout.tsxindex ec96fbe37..bb154719c 100644--- a/apps/web/src/app/[locale]/(app)/(space)/settings/layout.tsx+++ b/apps/web/src/app/[locale]/(app)/(space)/settings/layout.tsx@@ -1,4 +1,4 @@-import { Button } from "@rallly/ui/button";+import { buttonVariants } from "@rallly/ui";import { Icon } from "@rallly/ui/icon";import {Sidebar,@@ -47,13 +47,17 @@ export default async function Layout({<SidebarGroupContent><SidebarMenu><SidebarMenuItem className="flex items-center gap-3">- <Button variant="ghost" size="icon" asChild>- <Link href="/">- <Icon>- <ArrowLeftIcon />- </Icon>- </Link>- </Button>+ <Link+ href="/"+ className={buttonVariants({+ variant: "ghost",+ size: "icon",+ })}+ >+ <Icon>+ <ArrowLeftIcon />+ </Icon>+ </Link><span className="font-medium text-sm"><Trans i18nKey="settings" defaults="Settings" /></span>diff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/preferences/components/language-preference.tsx b/apps/web/src/app/[locale]/(app)/(space)/settings/preferences/components/language-preference.tsxindex 3b2cea718..3bce4d0c5 100644--- a/apps/web/src/app/[locale]/(app)/(space)/settings/preferences/components/language-preference.tsx+++ b/apps/web/src/app/[locale]/(app)/(space)/settings/preferences/components/language-preference.tsx@@ -1,4 +1,5 @@import { zodResolver } from "@hookform/resolvers/zod";+import { buttonVariants } from "@rallly/ui";import { Button } from "@rallly/ui/button";import {Form,@@ -67,15 +68,14 @@ export const LanguagePreference = () => {><Trans i18nKey="save" /></Button>- <Button asChild variant="ghost">- <Link- target="_blank"- href="https://support.rallly.co/contribute/translations"- >- <Trans i18nKey="becomeATranslator" defaults="Help translate" />- <ArrowUpRight className="size-4" />- </Link>- </Button>+ <Link+ target="_blank"+ href="https://support.rallly.co/contribute/translations"+ className={buttonVariants({ variant: "ghost" })}+ >+ <Trans i18nKey="becomeATranslator" defaults="Help translate" />+ <ArrowUpRight className="size-4" />+ </Link></div></form></Form>diff --git a/apps/web/src/app/[locale]/(auth)/login/verify/page.tsx b/apps/web/src/app/[locale]/(auth)/login/verify/page.tsxindex e7d6926b2..3cfdc7f15 100644--- a/apps/web/src/app/[locale]/(auth)/login/verify/page.tsx+++ b/apps/web/src/app/[locale]/(auth)/login/verify/page.tsx@@ -1,4 +1,4 @@-import { Button } from "@rallly/ui/button";+import { buttonVariants } from "@rallly/ui";import type { Metadata } from "next";import { cookies } from "next/headers";import Link from "next/link";@@ -49,11 +49,16 @@ export default async function VerifyPage() {</AuthPageHeader><AuthPageContent><OTPForm email={email} />- <Button size="lg" variant="link" className="w-full" asChild>- <Link href="/login">- <Trans t={t} ns="app" i18nKey="back" defaults="Back" />- </Link>- </Button>+ <Link+ href="/login"+ className={buttonVariants({+ size: "lg",+ variant: "link",+ className: "w-full",+ })}+ >+ <Trans t={t} ns="app" i18nKey="back" defaults="Back" />+ </Link></AuthPageContent></AuthPageContainer>);diff --git a/apps/web/src/app/[locale]/admin-setup/page.tsx b/apps/web/src/app/[locale]/admin-setup/page.tsxindex d520970e3..6f77de2f8 100644--- a/apps/web/src/app/[locale]/admin-setup/page.tsx+++ b/apps/web/src/app/[locale]/admin-setup/page.tsx@@ -1,4 +1,4 @@-import { Button } from "@rallly/ui/button";+import { buttonVariants } from "@rallly/ui";import { CrownIcon } from "lucide-react";import type { Metadata } from "next";import Link from "next/link";@@ -44,11 +44,9 @@ export default async function AdminSetupPage() {/></EmptyStateDescription><EmptyStateFooter className="flex gap-2">- <Button asChild>- <Link href="/">- <Trans i18nKey="cancel" defaults="Cancel" />- </Link>- </Button>+ <Link href="/" className={buttonVariants()}>+ <Trans i18nKey="cancel" defaults="Cancel" />+ </Link><MakeMeAdminButton /></EmptyStateFooter></EmptyState>diff --git a/apps/web/src/app/[locale]/control-panel/license/page.tsx b/apps/web/src/app/[locale]/control-panel/license/page.tsxindex 9d8a86be6..01143ade9 100644--- a/apps/web/src/app/[locale]/control-panel/license/page.tsx+++ b/apps/web/src/app/[locale]/control-panel/license/page.tsx@@ -1,3 +1,4 @@+import { buttonVariants } from "@rallly/ui";import { Badge } from "@rallly/ui/badge";import { Button } from "@rallly/ui/button";import { Card, CardContent, CardHeader, CardTitle } from "@rallly/ui/card";@@ -183,21 +184,17 @@ export default async function LicensePage() {/></EmptyStateDescription><EmptyStateFooter className="flex gap-2">- <Button asChild>- <a- target="_blank"- rel="noreferrer"- href="https://support.rallly.co/self-hosting/licensing"- >- <Icon>- <ShoppingBagIcon />- </Icon>- <Trans- i18nKey="purchaseLicense"- defaults="Purchase license"- />- </a>- </Button>+ <a+ target="_blank"+ rel="noreferrer"+ href="https://support.rallly.co/self-hosting/licensing"+ className={buttonVariants()}+ >+ <Icon>+ <ShoppingBagIcon />+ </Icon>+ <Trans i18nKey="purchaseLicense" defaults="Purchase license" />+ </a><Dialog><DialogTrigger asChild><Button variant="primary">diff --git a/apps/web/src/app/[locale]/error.tsx b/apps/web/src/app/[locale]/error.tsxindex 21da31b6a..6e5f92cc8 100644--- a/apps/web/src/app/[locale]/error.tsx+++ b/apps/web/src/app/[locale]/error.tsx@@ -1,5 +1,6 @@"use client";+import { buttonVariants } from "@rallly/ui";import { Button } from "@rallly/ui/button";import * as Sentry from "@sentry/nextjs";import { GithubIcon, HomeIcon, LifeBuoyIcon, PlusIcon } from "lucide-react";@@ -56,11 +57,9 @@ export default function LocaleErrorBoundary({<Button variant="primary" onClick={() => reset()}><Trans i18nKey="errorTryAgain" defaults="Try again" /></Button>- <Button asChild>- <Link href="/">- <Trans i18nKey="errorBackToHome" defaults="Back to home" />- </Link>- </Button>+ <Link href="/" className={buttonVariants()}>+ <Trans i18nKey="errorBackToHome" defaults="Back to home" />+ </Link></>}>diff --git a/apps/web/src/app/[locale]/not-found.tsx b/apps/web/src/app/[locale]/not-found.tsxindex 194f0bf8b..113a10b22 100644--- a/apps/web/src/app/[locale]/not-found.tsx+++ b/apps/web/src/app/[locale]/not-found.tsx@@ -1,4 +1,4 @@-import { Button } from "@rallly/ui/button";+import { buttonVariants } from "@rallly/ui";import { GithubIcon, HomeIcon, LifeBuoyIcon, PlusIcon } from "lucide-react";import Link from "next/link";@@ -19,11 +19,9 @@ export default async function NotFoundPage() {"Sorry, we couldn't find the page you're looking for. Here are some helpful links instead.",})}actions={- <Button variant="primary" asChild>- <Link href="/">- {t("errorBackToHome", { defaultValue: "Back to home" })}- </Link>- </Button>+ <Link href="/" className={buttonVariants({ variant: "primary" })}>+ {t("errorBackToHome", { defaultValue: "Back to home" })}+ </Link>}><ErrorPageLinkItemdiff --git a/apps/web/src/app/[locale]/quick-create/page.tsx b/apps/web/src/app/[locale]/quick-create/page.tsxindex 962b1b525..70c66ea31 100644--- a/apps/web/src/app/[locale]/quick-create/page.tsx+++ b/apps/web/src/app/[locale]/quick-create/page.tsx@@ -1,4 +1,4 @@-import { Button } from "@rallly/ui/button";+import { buttonVariants } from "@rallly/ui";import { Card } from "@rallly/ui/card";import { Icon } from "@rallly/ui/icon";import { LogInIcon } from "lucide-react";@@ -28,14 +28,15 @@ export default async function QuickCreatePage() {</div></div><div className="flex justify-center gap-4">- <Button className="rounded-full" asChild>- <Link href="/login" className="flex items-center gap-2">- <Icon>- <LogInIcon />- </Icon>- {t("login")}- </Link>- </Button>+ <Link+ href="/login"+ className={buttonVariants({ className: "rounded-full" })}+ >+ <Icon>+ <LogInIcon />+ </Icon>+ {t("login")}+ </Link></div></Card></div>diff --git a/apps/web/src/components/invite-dialog.tsx b/apps/web/src/components/invite-dialog.tsxindex 10abb03c7..d6f17daa0 100644--- a/apps/web/src/components/invite-dialog.tsx+++ b/apps/web/src/components/invite-dialog.tsx@@ -1,3 +1,4 @@+import { buttonVariants } from "@rallly/ui";import { Button } from "@rallly/ui/button";import {Dialog,@@ -86,11 +87,13 @@ export const InviteDialog = () => {<div className="flex gap-2"><CopyInviteLinkButton /><div className="shrink-0">- <Button asChild>- <Link target="_blank" href={`/invite/${poll.id}`}>- <ArrowUpRightIcon className="size-4" />- </Link>- </Button>+ <Link+ target="_blank"+ href={`/invite/${poll.id}`}+ className={buttonVariants()}+ >+ <ArrowUpRightIcon className="size-4" />+ </Link></div></div></div>diff --git a/apps/web/src/components/layouts/poll-layout.tsx b/apps/web/src/components/layouts/poll-layout.tsxindex 25f8bf8b9..af83f890b 100644--- a/apps/web/src/components/layouts/poll-layout.tsx+++ b/apps/web/src/components/layouts/poll-layout.tsx@@ -1,5 +1,5 @@"use client";-import { Button } from "@rallly/ui/button";+import { buttonVariants } from "@rallly/ui";import { Icon } from "@rallly/ui/icon";import { ArrowLeftIcon } from "lucide-react";import Link from "next/link";@@ -31,27 +31,29 @@ const Layout = ({ children }: React.PropsWithChildren) => {<div className="mx-auto flex max-w-4xl justify-between"><div className="flex min-w-0 items-center gap-x-2.5">{pathname === pollLink ? (- <Button variant="ghost" asChild>- <Link href="/polls">- <Icon>- <ArrowLeftIcon />- </Icon>- <span>- <Trans i18nKey="back" defaults="Back" />- </span>- </Link>- </Button>+ <Link+ href="/polls"+ className={buttonVariants({ variant: "ghost" })}+ >+ <Icon>+ <ArrowLeftIcon />+ </Icon>+ <span>+ <Trans i18nKey="back" defaults="Back" />+ </span>+ </Link>) : (- <Button variant="ghost" asChild>- <Link href={pollLink}>- <Icon>- <ArrowLeftIcon />- </Icon>- <span>- <Trans i18nKey="back" defaults="Back" />- </span>- </Link>- </Button>+ <Link+ href={pollLink}+ className={buttonVariants({ variant: "ghost" })}+ >+ <Icon>+ <ArrowLeftIcon />+ </Icon>+ <span>+ <Trans i18nKey="back" defaults="Back" />+ </span>+ </Link>)}</div><div>diff --git a/apps/web/src/components/user-dropdown.tsx b/apps/web/src/components/user-dropdown.tsxindex eaedb011e..c29626cb4 100644--- a/apps/web/src/components/user-dropdown.tsx+++ b/apps/web/src/components/user-dropdown.tsx@@ -1,6 +1,6 @@"use client";import { usePostHog } from "@rallly/posthog/client";-import { cn } from "@rallly/ui";+import { buttonVariants, cn } from "@rallly/ui";import { Button } from "@rallly/ui/button";import {DropdownMenu,@@ -48,17 +48,19 @@ export const UserDropdown = ({ className }: { className?: string }) => {if (!user) {return (<div className="flex items-center gap-x-2">- <Button variant="ghost" asChild>- <Link href={`/login?redirectTo=${encodeURIComponent("/new")}`}>- <Trans i18nKey="login" defaults="Login" />- </Link>- </Button>+ <Link+ href={`/login?redirectTo=${encodeURIComponent("/new")}`}+ className={buttonVariants({ variant: "ghost" })}+ >+ <Trans i18nKey="login" defaults="Login" />+ </Link>{isRegistrationEnabled ? (- <Button variant="primary" asChild>- <Link href={`/register?redirectTo=${encodeURIComponent("/new")}`}>- <Trans i18nKey="signUp" defaults="Sign up" />- </Link>- </Button>+ <Link+ href={`/register?redirectTo=${encodeURIComponent("/new")}`}+ className={buttonVariants({ variant: "primary" })}+ >+ <Trans i18nKey="signUp" defaults="Sign up" />+ </Link>) : null}</div>);diff --git a/apps/web/src/features/quick-create/quick-create-button.tsx b/apps/web/src/features/quick-create/quick-create-button.tsxindex 83ab3a465..b65cf69d2 100644--- a/apps/web/src/features/quick-create/quick-create-button.tsx+++ b/apps/web/src/features/quick-create/quick-create-button.tsx@@ -1,4 +1,4 @@-import { Button } from "@rallly/ui/button";+import { buttonVariants } from "@rallly/ui";import { Icon } from "@rallly/ui/icon";import { ZapIcon } from "lucide-react";import Link from "next/link";@@ -9,13 +9,14 @@ import { getTranslation } from "@/i18n/server";export async function QuickCreateButton() {const { t } = await getTranslation();return (- <Button className="rounded-full" asChild>- <Link href="/quick-create">- <Icon>- <ZapIcon className="size-4" />- </Icon>- <Trans t={t} ns="app" i18nKey="quickCreate" defaults="Quick Create" />- </Link>- </Button>+ <Link+ href="/quick-create"+ className={buttonVariants({ className: "rounded-full" })}+ >+ <Icon>+ <ZapIcon className="size-4" />+ </Icon>+ <Trans t={t} ns="app" i18nKey="quickCreate" defaults="Quick Create" />+ </Link>);}diff --git a/apps/web/src/features/quick-create/quick-create-widget.tsx b/apps/web/src/features/quick-create/quick-create-widget.tsxindex 2f34f4404..58f0b32ce 100644--- a/apps/web/src/features/quick-create/quick-create-widget.tsx+++ b/apps/web/src/features/quick-create/quick-create-widget.tsx@@ -1,4 +1,4 @@-import { Button } from "@rallly/ui/button";+import { buttonVariants } from "@rallly/ui";import { Icon } from "@rallly/ui/icon";import { CheckIcon, PlusIcon, ZapIcon } from "lucide-react";import Link from "next/link";@@ -68,19 +68,20 @@ export async function QuickCreateWidget() {</div>) : null}<div>- <Button asChild size="lg" className="w-full">- <Link href="/new">- <Icon size="lg">- <PlusIcon />- </Icon>- <Trans- t={t}- ns="app"- i18nKey="quickCreateGroupPoll"- defaults="Create Group Poll"- />- </Link>- </Button>+ <Link+ href="/new"+ className={buttonVariants({ size: "lg", className: "w-full" })}+ >+ <Icon size="lg">+ <PlusIcon />+ </Icon>+ <Trans+ t={t}+ ns="app"+ i18nKey="quickCreateGroupPoll"+ defaults="Create Group Poll"+ />+ </Link></div></div><div className="space-y-4">diff --git a/packages/ui/package.json b/packages/ui/package.jsonindex 17a80fb04..6105015d3 100644--- a/packages/ui/package.json+++ b/packages/ui/package.json@@ -11,12 +11,13 @@"type-check": "tsc --noEmit"},"exports": {- ".": "./src/lib/utils.ts",+ ".": "./src/index.ts","./*": "./src/*.tsx","./hooks/*": "./src/hooks/*.ts","./style.css": "./src/style.css"},"dependencies": {+ "@base-ui/react": "^1.2.0","@radix-ui/react-accordion": "^1.1.2","@radix-ui/react-avatar": "^1.1.0","@radix-ui/react-checkbox": "^1.0.4",diff --git a/packages/ui/src/button-variants.ts b/packages/ui/src/button-variants.tsnew file mode 100644index 000000000..275ec9f94--- /dev/null+++ b/packages/ui/src/button-variants.ts@@ -0,0 +1,41 @@+import { cva } from "class-variance-authority";++import { cn } from "./lib/utils";++export const buttonVariants = cva(+ cn(+ "inline-flex shrink-0 items-center justify-center gap-2 whitespace-nowrap font-normal text-sm outline-none transition-opacity focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 active:opacity-90 active:shadow-none disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",+ ),+ {+ variants: {+ variant: {+ primary: "bg-primary text-primary-foreground hover:bg-primary/90",+ destructive:+ "bg-destructive text-destructive-foreground shadow-xs hover:bg-destructive/90",+ default:+ "border border-input-border bg-input shadow-xs hover:bg-accent",+ ghost:+ "border-transparent bg-transparent text-foreground hover:bg-accent data-[state=open]:bg-accent",+ actionBar:+ "border-transparent bg-action-bar text-action-bar-foreground hover:bg-action-bar-foreground/10 data-[state=open]:bg-action-bar-foreground/20",+ link: "border-transparent text-primary underline-offset-4 hover:underline",+ },+ size: {+ default: "h-8 gap-x-1.5 rounded-lg px-2 text-sm",+ sm: "h-7 gap-x-1.5 rounded-md px-1.5 text-sm",+ md: "h-9 gap-x-2 rounded-md px-2 text-sm",+ lg: "h-12 gap-x-3 rounded-lg px-4 text-base",+ icon: "size-7 gap-x-1.5 rounded-lg text-sm",+ "icon-lg": "size-8 rounded-full",+ "icon-xs":+ "size-6 in-data-[slot=button-group]:rounded-lg rounded-[min(var(--radius-md),10px)] [&_svg:not([class*='size-'])]:size-3",+ "icon-sm":+ "size-7 in-data-[slot=button-group]:rounded-lg rounded-[min(var(--radius-md),12px)]",+ },+ },+ defaultVariants: {+ variant: "default",+ size: "default",+ },+ },+);diff --git a/packages/ui/src/button.tsx b/packages/ui/src/button.tsxindex de877a215..c732c796b 100644--- a/packages/ui/src/button.tsx+++ b/packages/ui/src/button.tsx@@ -1,91 +1,50 @@"use client";-import { Slot } from "@radix-ui/react-slot";+import { Button as ButtonPrimitive } from "@base-ui/react/button";import type { VariantProps } from "class-variance-authority";-import { cva } from "class-variance-authority";import { Loader2Icon } from "lucide-react";-import * as React from "react";+import type * as React from "react";+import { buttonVariants } from "./button-variants";import { cn } from "./lib/utils";-const buttonVariants = cva(- cn(- "inline-flex shrink-0 items-center justify-center gap-2 whitespace-nowrap font-normal text-sm outline-none transition-opacity focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 active:opacity-90 active:shadow-none disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",- ),- {- variants: {- variant: {- primary: "bg-primary text-primary-foreground hover:bg-primary/90",- destructive:- "bg-destructive text-destructive-foreground shadow-xs hover:bg-destructive/90",- default:- "border border-input-border bg-input shadow-xs hover:bg-accent",- ghost:- "border-transparent bg-transparent text-foreground hover:bg-accent data-[state=open]:bg-accent",- actionBar:- "border-transparent bg-action-bar text-action-bar-foreground hover:bg-action-bar-foreground/10 data-[state=open]:bg-action-bar-foreground/20",- link: "border-transparent text-primary underline-offset-4 hover:underline",- },- size: {- default: "h-8 gap-x-1.5 rounded-lg px-2 text-sm",- sm: "h-7 gap-x-1.5 rounded-md px-1.5 text-sm",- md: "h-9 gap-x-2 rounded-md px-2 text-sm",- lg: "h-12 gap-x-3 rounded-lg px-4 text-base",- icon: "size-7 gap-x-1.5 rounded-lg text-sm",- "icon-lg": "size-8 rounded-full",- },- },- defaultVariants: {- variant: "default",- size: "default",- },- },-);+export type { VariantProps };export interface ButtonPropsextends React.ButtonHTMLAttributes<HTMLButtonElement>,VariantProps<typeof buttonVariants> {- asChild?: boolean;loading?: boolean;}-const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(- (- {- className,- loading,- children,- variant,- type = "button",- size,- asChild = false,- ...props- },- ref,- ) => {- const Comp = asChild ? Slot : "button";- return (- <Comp- className={cn(- "group",- buttonVariants({ variant, size }),- {- "pointer-events-none": loading,- },- className,- )}- ref={ref}- type={type}- {...props}- >- {loading ? (- <Loader2Icon className="size-4 animate-spin opacity-75" />- ) : (- children- )}- </Comp>- );- },-);+const Button = ({+ className,+ loading,+ children,+ variant,+ size,+ ...props+}: ButtonPrimitive.Props &+ VariantProps<typeof buttonVariants> & { loading?: boolean }) => {+ return (+ <ButtonPrimitive+ className={cn(+ "group",+ buttonVariants({ variant, size }),+ {+ "pointer-events-none": loading,+ },+ className,+ )}+ {...props}+ >+ {loading ? (+ <Loader2Icon className="size-4 animate-spin opacity-75" />+ ) : (+ children+ )}+ </ButtonPrimitive>+ );+};+Button.displayName = "Button";-export { Button, buttonVariants };+export { Button };diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.tsindex 3b8868856..be7d3aa4f 100644--- a/packages/ui/src/index.ts+++ b/packages/ui/src/index.ts@@ -1 +1,2 @@+export { buttonVariants } from "./button-variants";export { cn } from "./lib/utils";diff --git a/packages/ui/src/select.tsx b/packages/ui/src/select.tsxindex 12129f000..231805911 100644--- a/packages/ui/src/select.tsx+++ b/packages/ui/src/select.tsx@@ -4,7 +4,7 @@ import * as SelectPrimitive from "@radix-ui/react-select";import { CheckIcon, ChevronsUpDownIcon } from "lucide-react";import * as React from "react";-import { buttonVariants } from "./button";+import { buttonVariants } from "./button-variants";import { Icon } from "./icon";import { cn } from "./lib/utils";diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 94452ac5d..68af3a560 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -768,6 +768,9 @@ importers:packages/ui:dependencies:+ '@base-ui/react':+ specifier: ^1.2.0'@radix-ui/react-accordion':specifier: ^1.1.2version: 1.2.12(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])@@ -1692,6 +1695,27 @@ packages:resolution: {integrity: sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==}engines: {node: '>=6.9.0'}+ '@base-ui/[email protected]':+ resolution: {integrity: sha512-O6aEQHcm+QyGTFY28xuwRD3SEJGZOBDpyjN2WvpfWYFVhg+3zfXPysAILqtM0C1kWC82MccOE/v1j+GHXE4qIw==}+ engines: {node: '>=14.0.0'}+ peerDependencies:+ '@types/react': ^17 || ^18 || ^19+ react: ^17 || ^18 || ^19+ react-dom: ^17 || ^18 || ^19+ peerDependenciesMeta:+ '@types/react':+ optional: true++ '@base-ui/[email protected]':+ resolution: {integrity: sha512-oYC7w0gp76RI5MxprlGLV0wze0SErZaRl3AAkeP3OnNB/UBMb6RqNf6ZSIlxOc9Qp68Ab3C2VOcJQyRs7Xc7Vw==}+ peerDependencies:+ '@types/react': ^17 || ^18 || ^19+ react: ^17 || ^18 || ^19+ react-dom: ^17 || ^18 || ^19+ peerDependenciesMeta:+ '@types/react':+ optional: true+'@better-auth/[email protected]':resolution: {integrity: sha512-q+awYgC7nkLEBdx2sW0iJjkzgSHlIxGnOpsN1r/O1+a4m7osJNHtfK2mKJSL1I+GfNyIlxJF8WvD/NLuYMpmcg==}peerDependencies:@@ -9296,6 +9320,9 @@ packages:resolution: {integrity: sha512-QT7FVMXfWOYFbeRBF6nu+I6tr2Tf3u0q8RIEjNob/heKY/nh7drD/k7eeMFmSQgnTtCzLDcCu/XEnpW2wk4xCQ==}engines: {node: '>=9.3.0 || >=8.10.0 <9.0.0'}+ resolution: {integrity: sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==}+resolution: {integrity: sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==}@@ -9837,6 +9864,9 @@ packages:resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}+ resolution: {integrity: sha512-05PUHKSNE8ou2dwIxTngl4EzcnsCDZGJ/iCLtDflR/SHB/ny14rXc+qU5P4mG9JkusiV7EivzY9Mhm55AzAvCg==}+resolution: {integrity: sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==}engines: {node: '>=20'}@@ -12056,6 +12086,30 @@ snapshots:'@babel/helper-string-parser': 7.27.1'@babel/helper-validator-identifier': 7.28.5+ '@base-ui/[email protected](@types/[email protected])([email protected]([email protected]))([email protected])':+ dependencies:+ '@babel/runtime': 7.28.6+ '@base-ui/utils': 0.2.5(@types/[email protected])([email protected]([email protected]))([email protected])+ '@floating-ui/utils': 0.2.10+ react: 19.2.4+ react-dom: 19.2.4([email protected])+ tabbable: 6.4.0+ use-sync-external-store: 1.6.0([email protected])+ optionalDependencies:+ '@types/react': 19.2.13++ '@base-ui/[email protected](@types/[email protected])([email protected]([email protected]))([email protected])':+ dependencies:+ '@babel/runtime': 7.28.6+ '@floating-ui/utils': 0.2.10+ react: 19.2.4+ react-dom: 19.2.4([email protected])+ reselect: 5.1.1+ use-sync-external-store: 1.6.0([email protected])+ optionalDependencies:+ '@types/react': 19.2.13+'@better-auth/[email protected](@better-auth/[email protected])(@better-fetch/[email protected])([email protected]([email protected]))([email protected])([email protected])([email protected])':dependencies:'@better-auth/utils': 0.3.0@@ -20892,6 +20946,8 @@ snapshots:transitivePeerDependencies:- supports-color+ [email protected]: {}+@@ -21590,6 +21646,8 @@ snapshots:+ [email protected]: {}+diff --git a/turbo.json b/turbo.jsonindex bb04c2e43..83b4b88b5 100644--- a/turbo.json+++ b/turbo.json@@ -33,6 +33,7 @@"cache": false},"type-check": {+ "dependsOn": ["^type-check"],"outputs": []},"dev": {