The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Redesign the partner program cards for the Programs grid
Rafi402dad3e6bfa
diff --git a/apps/web/ui/partners/program-card.tsx b/apps/web/ui/partners/program-card.tsxindex b68dc47568..9bb4dd7865 100644--- a/apps/web/ui/partners/program-card.tsx+++ b/apps/web/ui/partners/program-card.tsx@@ -2,8 +2,11 @@import { constructPartnerLink } from "@/lib/partners/construct-partner-link";import { getProgramApplicationRejectionReasonLabel } from "@/lib/program-applications/program-application-rejection";-import { usePartnerEarningsTimeseries } from "@/lib/swr/use-partner-earnings-timeseries";-import { ProgramEnrollmentProps } from "@/lib/types";+import { usePartnerProfileEarningsTimeseries } from "@/lib/swr/use-partner-profile-earnings";+import {+ PartnerProfileProgramEnrollmentProps,+ ProgramEnrollmentProps,+} from "@/lib/types";import {BlurImage,CalendarIcon,@@ -14,6 +17,7 @@ import {Note,} from "@dub/ui";import {+ cn,formatDate,getPrettyUrl,OG_AVATAR_URL,@@ -102,26 +106,95 @@ function rejectedApplicationTooltipContent();}-function ProgramCardNonApprovedStatus({+// statuses that keep the earnings on the card+const EARNINGS_STATUSES = ["approved", "banned", "deactivated", "archived"];++export function ProgramCard({+ programEnrollment,+}: {+ programEnrollment: PartnerProfileProgramEnrollmentProps;+}) {+ const { program, status, group, totalCommissions } = programEnrollment;++ const defaultLink = programEnrollment.links?.[0];++ return (+ <Link+ href={`/programs/${program.slug}`}+ className="hover:drop-shadow-card-hover flex h-full flex-col overflow-hidden rounded-xl border border-neutral-200 bg-white p-5 transition-[filter]"+ >+ <BlurImage+ width={96}+ height={96}+ src={program.logo || `${OG_AVATAR_URL}${program.name}`}+ alt={program.name}+ className="size-8 rounded-full border border-black/10"+ />+ <span className="mt-3 text-base font-semibold text-neutral-800">+ {program.name}+ </span>+ {EARNINGS_STATUSES.includes(status) && (+ <NumberFlow+ className={cn(+ "text-base font-medium",+ totalCommissions > 0 ? "text-neutral-800" : "text-neutral-500",+ )}+ value={totalCommissions / 100}+ format={{+ notation: totalCommissions > 100000 ? "compact" : "standard",+ style: "currency",+ currency: "USD",+ // @ts-ignore - trailingZeroDisplay is a valid option but TS is outdated+ trailingZeroDisplay: "stripIfInteger",+ }}+ />+ )}+ {status === "approved" ? (+ <div className="mt-auto flex flex-col gap-4 pt-4">+ <ProgramCardActivity programId={programEnrollment.programId} />+ {defaultLink && (+ <div className="flex items-center gap-1.5 text-neutral-700">+ <Link4 className="size-3 shrink-0" />+ <span className="min-w-0 truncate text-sm font-medium">+ {getPrettyUrl(+ constructPartnerLink({ group, link: defaultLink }),+ )}+ </span>+ </div>+ )}+ </div>+ ) : (+ <div className="mt-4 flex grow items-center justify-center rounded-lg bg-neutral-50 p-5 text-center text-sm text-neutral-500">+ <ProgramCardStatus programEnrollment={programEnrollment} />+ </div>+ )}+ </Link>+ );+}++function ProgramCardStatus({programEnrollment,- statusDescription,}: {- programEnrollment: ProgramEnrollmentProps;- statusDescription: string | undefined;+ programEnrollment: PartnerProfileProgramEnrollmentProps;}) {const router = useRouter();- const { status, createdAt, program, application } = programEnrollment;+ const { status, createdAt, program, application, reapplicationTimeframe } =+ programEnrollment;if (status === "pending") {- return `Applied ${formatDate(createdAt)}`;+ return `Applied ${formatDate(createdAt, { month: "short" })}`;}if (status === "rejected") {const tipContent = rejectedApplicationTooltipContent(application);const body = (<>- {statusDescription} You can re-apply in {STANDARD_REAPPLICATION_DAYS}{" "}- days.+ Your application has been{" "}+ <span className="font-semibold text-neutral-700">rejected</span>.+ <br />+ {reapplicationTimeframe === "never"+ ? "You cannot re-apply to this program."+ : `You can re-apply in ${STANDARD_REAPPLICATION_DAYS} days.`}</>);@@ -140,154 +213,87 @@ function ProgramCardNonApprovedStatus({);}- return body;- }-- if (statusDescription) {- return (- <p>- {statusDescription}{" "}- <button- onClick={(e) => {- e.preventDefault();- e.stopPropagation();- router.push(`/messages/${program.slug}`);- }}- className="text-neutral-400 underline decoration-dotted underline-offset-2 hover:text-neutral-700"- >- Reach out to the {program.name} team- </button>{" "}- if you have any questions.- </p>- );+ return <div>{body}</div>;}- return null;-}--export function ProgramCard({- programEnrollment,-}: {- programEnrollment: ProgramEnrollmentProps;-}) {- const { program, status, createdAt, group } = programEnrollment;+ const inactiveDescriptions: Partial<Record<typeof status, ReactNode>> = {+ banned: (+ <>+ You've been{" "}+ <span className="font-semibold text-neutral-700">banned</span> from this+ program.+ </>+ ),+ deactivated: (+ <>+ Your partnership has been{" "}+ <span className="font-semibold text-neutral-700">deactivated</span>.+ </>+ ),+ archived: (+ <>+ Your partnership has been{" "}+ <span className="font-semibold text-neutral-700">archived</span>.+ </>+ ),+ };- const defaultLink = programEnrollment.links?.[0];+ const description = inactiveDescriptions[status];- const statusDescriptions = {- banned: "You're banned from this program.",- rejected: "Your application has been rejected.",- deactivated: "Your partnership has been deactivated.",- };- const statusDescription = statusDescriptions[status];+ if (!description) {+ return null;+ }return (- <Link- href={`/programs/${program.slug}`}- className="hover:drop-shadow-card-hover flex h-full flex-col justify-between rounded-xl border border-neutral-200 bg-white p-5 transition-[filter]"- >- <div>- <BlurImage- width={96}- height={96}- src={program.logo || `${OG_AVATAR_URL}${program.name}`}- alt={program.name}- className="size-8 rounded-full border border-black/10"- />- <div className="mt-3 flex flex-col">- <span className="text-base font-semibold text-neutral-800">- {program.name}- </span>- <div className="flex items-center gap-1 text-neutral-500">- <Link4 className="size-3 shrink-0" />- <span className="min-w-0 truncate text-sm font-medium">- {getPrettyUrl(- constructPartnerLink({- group,- link: defaultLink,- }),- ) || program.domain}- </span>- </div>- </div>- </div>- {status === "approved" ? (- <ProgramCardEarnings programEnrollment={programEnrollment} />- ) : (- <div className="mt-4 flex h-20 items-center justify-center text-balance rounded-md border border-neutral-200 bg-neutral-50 p-5 text-center text-sm text-neutral-500">- <ProgramCardNonApprovedStatus- programEnrollment={programEnrollment}- statusDescription={statusDescription}- />- </div>- )}- </Link>+ <p>+ {description}+ <br />+ {/* a span, because a button cannot wrap inline with the text around it */}+ <span+ role="button"+ tabIndex={0}+ onClick={(e) => {+ e.preventDefault();+ e.stopPropagation();+ router.push(`/messages/${program.slug}`);+ }}+ onKeyDown={(e) => {+ if (e.key === "Enter" || e.key === " ") {+ e.preventDefault();+ e.stopPropagation();+ router.push(`/messages/${program.slug}`);+ }+ }}+ className="cursor-pointer underline decoration-dotted underline-offset-2 hover:text-neutral-700"+ >+ Reach out to the {program.name} team+ </span>{" "}+ if you have any questions.+ </p>);}-function ProgramCardEarnings({- programEnrollment,-}: {- programEnrollment: ProgramEnrollmentProps;-}) {- const { program, totalCommissions } = programEnrollment;-- const { data: timeseries } = usePartnerEarningsTimeseries({- programId: program.id,+// the activity chart for one program, from the earnings of all programs in one+// request (SWR dedupes it across the cards)+function ProgramCardActivity({ programId }: { programId: string }) {+ const { data: timeseries } = usePartnerProfileEarningsTimeseries({+ groupBy: "programId",interval: "1y",- enabled: totalCommissions > 0,- } as Parameters<typeof usePartnerEarningsTimeseries>[0]);-- const chartData = useMemo(() => {- if (totalCommissions === 0) {- // Generate dummy data (straight line at 0) for the past year- const now = new Date();- const oneYearAgo = new Date(now);- oneYearAgo.setFullYear(now.getFullYear() - 1);+ });- // Generate 12 data points (monthly)- const dummyData: { date: Date; value: number }[] = [];- for (let i = 0; i < 12; i++) {- const date = new Date(oneYearAgo);- date.setMonth(oneYearAgo.getMonth() + i);- dummyData.push({- date,- value: 0,- });- }- return dummyData;- }-- return (- timeseries?.map((d) => ({- date: new Date(d.start),- value: d.earnings,- })) ?? []- );- }, [timeseries, totalCommissions]);+ const chartData = useMemo(+ () =>+ timeseries?.map(({ start, data }) => ({+ date: new Date(start),+ value: data?.[programId] ?? 0,+ })),+ [timeseries, programId],+ );return (- <div className="mt-4 grid grid-cols-[min-content,minmax(0,1fr)] gap-4 rounded-md border border-neutral-200 bg-neutral-50">- <div className="py-3 pl-4">- <div className="whitespace-nowrap text-sm text-neutral-500">- Earnings- </div>- <NumberFlow- className="text-xl font-medium text-neutral-800"- value={totalCommissions / 100}- format={{- notation: totalCommissions > 100000 ? "compact" : "standard",- style: "currency",- currency: "USD",- // @ts-ignore – trailingZeroDisplay is a valid option but TS is outdated- trailingZeroDisplay: "stripIfInteger",- }}- />- </div>+ <div className="-mx-5 h-16">{chartData && (- <div className="relative h-full px-3">- <MiniAreaChart data={chartData} padding={{ top: 16, bottom: 16 }} />- </div>+ <MiniAreaChart data={chartData} padding={{ top: 8, bottom: 8 }} />)}</div>);@@ -295,13 +301,12 @@ function ProgramCardEarnings({export function ProgramCardSkeleton() {return (- <div className="rounded-xl border border-neutral-200 p-5">+ <div className="flex flex-col rounded-xl border border-neutral-200 bg-white p-5"><div className="size-8 rounded-full bg-neutral-200" />- <div className="mt-3 flex flex-col">- <div className="my-0.5 h-5 w-24 min-w-0 rounded-md bg-neutral-200" />- <div className="my-0.5 h-4 w-20 animate-pulse rounded-md bg-neutral-200" />- </div>- <div className="mt-4 h-[72px] animate-pulse rounded-md bg-neutral-100" />+ <div className="mt-3 h-5 w-24 rounded-md bg-neutral-200" />+ <div className="mt-1 h-5 w-16 animate-pulse rounded-md bg-neutral-200" />+ <div className="mt-4 h-16 animate-pulse rounded-md bg-neutral-100" />+ <div className="mt-4 h-4 w-32 animate-pulse rounded-md bg-neutral-100" /></div>);}diff --git a/apps/web/ui/partners/program-invite-card.tsx b/apps/web/ui/partners/program-invite-card.tsxindex b41abdb18a..a326227a12 100644--- a/apps/web/ui/partners/program-invite-card.tsx+++ b/apps/web/ui/partners/program-invite-card.tsx@@ -1,7 +1,7 @@import { ProgramEnrollmentProps } from "@/lib/types";import { ProgramInviteActions } from "@/ui/partners/program-invite-actions";import { ProgramRewardDescription } from "@/ui/partners/program-reward-description";-import { BlurImage, Envelope, StatusBadge } from "@dub/ui";+import { BlurImage, CircleCheck, StatusBadge } from "@dub/ui";import { formatDateSmart, OG_AVATAR_URL } from "@dub/utils";export function ProgramInviteCard({@@ -15,41 +15,44 @@ export function ProgramInviteCard({const discount = programEnrollment.discount;return (- <div className="hover:drop-shadow-card-hover relative flex flex-col rounded-xl border border-neutral-200 bg-neutral-50 p-5 transition-[filter]">+ <div className="hover:drop-shadow-card-hover relative flex flex-col rounded-xl border border-neutral-200 bg-white p-5 transition-[filter]"><div className="flex justify-between gap-2"><BlurImagewidth={64}height={64}src={program.logo || `${OG_AVATAR_URL}${program.name}`}alt={program.name}- className="size-8 rounded-full"+ className="size-8 rounded-full border border-black/10"/>- <StatusBadge variant="new" icon={Envelope} className="py-0.5">- Invited {formatDateSmart(programEnrollment.createdAt)}+ <StatusBadge variant="new" icon={CircleCheck} className="py-0.5">+ Invited{" "}+ {formatDateSmart(programEnrollment.createdAt, { month: "short" })}</StatusBadge></div>- <p className="mt-3 font-medium text-neutral-900">{program.name}</p>+ <p className="mt-3 text-base font-semibold text-neutral-800">+ {program.name}+ </p>- <div className="my-2 flex flex-col gap-0.5 text-balance text-xs text-neutral-600">+ <div className="flex flex-col gap-0.5 text-balance text-sm text-neutral-500"><div><ProgramRewardDescriptionreward={reward}- amountClassName="font-light"- periodClassName="font-light"+ amountClassName="font-normal"+ periodClassName="font-normal"/></div><div><ProgramRewardDescriptiondiscount={discount}- amountClassName="font-light"- periodClassName="font-light"+ amountClassName="font-normal"+ periodClassName="font-normal"/></div></div>- <div className="mt-2 flex grow flex-col justify-end">+ <div className="mt-4 flex grow flex-col justify-end"><ProgramInviteActions programEnrollment={programEnrollment} /></div></div>