Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

more UI improvements

Steven Tey2833fba0aac0
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/[programSlug]/page-client.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/[programSlug]/page-client.tsx
index 4cae1b89c7..aa39f60325 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/[programSlug]/page-client.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/[programSlug]/page-client.tsx
@@ -5,20 +5,16 @@ import { mutatePrefix } from "@/lib/swr/mutate";
import { NetworkProgramExtendedProps, NetworkProgramProps } from "@/lib/types";
import { PageContent } from "@/ui/layout/page-content";
import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
-import { REWARD_EVENTS } from "@/ui/partners/constants";
-import { formatDiscountDescription } from "@/ui/partners/format-discount-description";
-import { formatRewardDescription } from "@/ui/partners/format-reward-description";
import { BLOCK_COMPONENTS } from "@/ui/partners/lander/blocks";
import { LanderHero } from "@/ui/partners/lander/lander-hero";
import { LanderRewards } from "@/ui/partners/lander/lander-rewards";
import { ProgramNetworkStatusBadges } from "@/ui/partners/partner-status-badges";
import { useProgramApplicationSheet } from "@/ui/partners/program-application-sheet";
import { ProgramCategory } from "@/ui/partners/program-network/program-category";
-import { ProgramRewardIcon } from "@/ui/partners/program-network/program-reward-icon";
+import { ProgramRewardsDisplay } from "@/ui/partners/program-network/program-rewards-display";
import {
Button,
ChevronRight,
- Gift,
Shop,
StatusBadge,
Tooltip,
@@ -186,7 +182,7 @@ export function MarketplaceProgramPageClient() {
<img
src={program.logo || `${OG_AVATAR_URL}${program.name}`}
alt={program.name}
- className="size-16 rounded-full border-2 border-white/20"
+ className="size-16 rounded-full border border-white/20"
/>
) : (
<div className="size-16 animate-pulse rounded-full bg-neutral-200" />
@@ -225,25 +221,13 @@ export function MarketplaceProgramPageClient() {
>
Rewards
</span>
- <div className="mt-1 flex items-center gap-1.5">
- {program.rewards?.map((reward) => (
- <ProgramRewardIcon
- key={reward.id}
- icon={REWARD_EVENTS[reward.event].icon}
- description={formatRewardDescription(reward)}
- className={cn(isDarkImage && "text-content-inverted")}
- />
- ))}
- {program.discount && (
- <ProgramRewardIcon
- icon={Gift}
- description={formatDiscountDescription(
- program.discount,
- )}
- className={cn(isDarkImage && "text-content-inverted")}
- />
- )}
- </div>
+ <ProgramRewardsDisplay
+ rewards={program.rewards}
+ discount={program.discount}
+ isDarkImage={isDarkImage}
+ className="mt-1"
+ descriptionClassName="max-w-[240px]"
+ />
</div>
)}
{Boolean(program.categories?.length) && (
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/featured-program-card.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/featured-program-card.tsx
index 51c3d1b919..75affb768c 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/featured-program-card.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/featured-program-card.tsx
@@ -1,12 +1,8 @@
import { NetworkProgramProps } from "@/lib/types";
-import { REWARD_EVENTS } from "@/ui/partners/constants";
-import { formatDiscountDescription } from "@/ui/partners/format-discount-description";
-import { formatRewardDescription } from "@/ui/partners/format-reward-description";
import { ProgramNetworkStatusBadges } from "@/ui/partners/partner-status-badges";
import { ProgramCategory } from "@/ui/partners/program-network/program-category";
-import { ProgramRewardIcon } from "@/ui/partners/program-network/program-reward-icon";
+import { ProgramRewardsDisplay } from "@/ui/partners/program-network/program-rewards-display";
import {
- Gift,
StatusBadge,
Tooltip,
useClickHandlers,
@@ -51,7 +47,7 @@ export function FeaturedProgramCard({
<img
src={program.logo || `${OG_AVATAR_URL}${program.name}`}
alt={program.name}
- className="size-12 rounded-full"
+ className="size-12 rounded-full border border-white/20"
/>
) : (
<div className="size-12 animate-pulse rounded-full bg-neutral-200" />
@@ -106,50 +102,33 @@ export function FeaturedProgramCard({
>
Rewards
</span>
- <div className="mt-2 flex items-center gap-1.5">
- {program.rewards?.map((reward) => (
- <ProgramRewardIcon
- key={reward.id}
- icon={REWARD_EVENTS[reward.event].icon}
- description={formatRewardDescription(reward)}
- onClick={() =>
- queryParams({
- set: {
- rewardType: reward.event,
- },
- del: "page",
- })
- }
- className={cn(
- "hover:bg-bg-default/10 active:bg-bg-default/20",
- darkImage && "text-content-inverted",
- )}
- />
- ))}
- {program.discount && (
- <ProgramRewardIcon
- icon={Gift}
- description={formatDiscountDescription(
- program.discount,
- )}
- onClick={() =>
- queryParams({
- set: {
- rewardType: "discount",
- },
- del: "page",
- })
- }
- className={cn(
- "hover:bg-bg-default/10 active:bg-bg-default/20",
- darkImage && "text-content-inverted",
- )}
- />
- )}
- </div>
+ <ProgramRewardsDisplay
+ rewards={program.rewards}
+ discount={program.discount}
+ isDarkImage={darkImage}
+ onRewardClick={(reward) =>
+ queryParams({
+ set: {
+ rewardType: reward.event,
+ },
+ del: "page",
+ })
+ }
+ onDiscountClick={() =>
+ queryParams({
+ set: {
+ rewardType: "discount",
+ },
+ del: "page",
+ })
+ }
+ className="hover:bg-bg-default/10 active:bg-bg-default/20 mt-2"
+ iconClassName="hover:bg-bg-default/10 active:bg-bg-default/20"
+ descriptionClassName="max-w-[240px]"
+ />
</div>
)}
- {Boolean(program?.categories?.length) && (
+ {Boolean(program.categories.length) && (
<div className="min-w-0">
<span
className={cn(
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/program-card.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/program-card.tsx
index c11e1a9631..fd71165c58 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/program-card.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/program-card.tsx
@@ -1,12 +1,8 @@
import { NetworkProgramProps } from "@/lib/types";
-import { REWARD_EVENTS } from "@/ui/partners/constants";
-import { formatDiscountDescription } from "@/ui/partners/format-discount-description";
-import { formatRewardDescription } from "@/ui/partners/format-reward-description";
import { ProgramNetworkStatusBadges } from "@/ui/partners/partner-status-badges";
import { ProgramCategory } from "@/ui/partners/program-network/program-category";
-import { ProgramRewardIcon } from "@/ui/partners/program-network/program-reward-icon";
+import { ProgramRewardsDisplay } from "@/ui/partners/program-network/program-rewards-display";
import {
- Gift,
StatusBadge,
Tooltip,
useClickHandlers,
@@ -69,50 +65,38 @@ export function ProgramCard({ program }: { program?: NetworkProgramProps }) {
)}
</div>
- <div className="mt-4 flex gap-8">
+ <div className="mt-4 flex gap-4">
{program ? (
<>
- {Boolean(program?.rewards?.length || program?.discount) && (
+ {Boolean(program.rewards?.length || program.discount) && (
<div>
<span className="text-content-muted block text-xs font-medium">
Rewards
</span>
- <div className="mt-1 flex items-center gap-1.5">
- {program.rewards?.map((reward) => (
- <ProgramRewardIcon
- key={reward.id}
- icon={REWARD_EVENTS[reward.event].icon}
- description={formatRewardDescription(reward)}
- onClick={() =>
- queryParams({
- set: {
- rewardType: reward.event,
- },
- del: "page",
- })
- }
- />
- ))}
- {program.discount && (
- <ProgramRewardIcon
- icon={Gift}
- description={formatDiscountDescription(
- program.discount,
- )}
- onClick={() =>
- queryParams({
- set: {
- rewardType: "discount",
- },
- del: "page",
- })
- }
- />
- )}
- </div>
+ <ProgramRewardsDisplay
+ rewards={program.rewards}
+ discount={program.discount}
+ onRewardClick={(reward) =>
+ queryParams({
+ set: {
+ rewardType: reward.event,
+ },
+ del: "page",
+ })
+ }
+ onDiscountClick={() =>
+ queryParams({
+ set: {
+ rewardType: "discount",
+ },
+ del: "page",
+ })
+ }
+ className="mt-1"
+ />
</div>
)}
- {Boolean(program?.categories?.length) && (
+ {Boolean(program.categories.length) && (
<div className="min-w-0">
<span className="text-content-muted block text-xs font-medium">
Category
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/use-program-network-filters.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/use-program-network-filters.tsx
index c84c938e59..342fec305d 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/use-program-network-filters.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/use-program-network-filters.tsx
@@ -10,19 +10,19 @@ import { useCallback, useMemo } from "react";
const REWARD_TYPES = {
sale: {
icon: REWARD_EVENTS.sale.icon,
- label: "Sales (CPS)",
+ label: "Sale reward (CPS)",
},
lead: {
icon: REWARD_EVENTS.lead.icon,
- label: "Leads (CPL)",
+ label: "Lead reward (CPL)",
},
click: {
icon: REWARD_EVENTS.click.icon,
- label: "Clicks (CPC)",
+ label: "Click reward (CPC)",
},
discount: {
icon: Gift,
- label: "Discount",
+ label: "Dual-sided incentives",
},
};
diff --git a/apps/web/ui/partners/program-network/program-category.tsx b/apps/web/ui/partners/program-network/program-category.tsx
index 52cc3545d4..a82b53c0b4 100644
--- a/apps/web/ui/partners/program-network/program-category.tsx
+++ b/apps/web/ui/partners/program-network/program-category.tsx
@@ -24,7 +24,7 @@ export const ProgramCategory = ({
<As
{...(onClick && { type: "button", onClick })}
className={cn(
- "text-content-default flex h-6 min-w-0 items-center gap-1 rounded-md px-1",
+ "text-content-default -ml-1 flex h-6 min-w-0 items-center gap-1 rounded-md px-1",
onClick && "hover:bg-bg-subtle active:bg-bg-emphasis",
className,
)}
diff --git a/apps/web/ui/partners/program-network/program-rewards-display.tsx b/apps/web/ui/partners/program-network/program-rewards-display.tsx
new file mode 100644
index 0000000000..393f3d5f44
--- /dev/null
+++ b/apps/web/ui/partners/program-network/program-rewards-display.tsx
@@ -0,0 +1,129 @@
+import { DiscountProps, RewardProps } from "@/lib/types";
+import { REWARD_EVENTS } from "@/ui/partners/constants";
+import { formatDiscountDescription } from "@/ui/partners/format-discount-description";
+import { formatRewardDescription } from "@/ui/partners/format-reward-description";
+import { Gift, Icon } from "@dub/ui";
+import { cn } from "@dub/utils";
+import * as HoverCard from "@radix-ui/react-hover-card";
+import { ProgramRewardIcon } from "./program-reward-icon";
+
+type RewardItem = {
+ id: string;
+ icon: Icon;
+ description: string;
+ onClick?: () => void;
+};
+
+interface ProgramRewardsDisplayProps {
+ rewards?: RewardProps[] | null;
+ discount?: DiscountProps | null;
+ isDarkImage?: boolean;
+ className?: string;
+ onRewardClick?: (reward: RewardProps) => void;
+ onDiscountClick?: (discount: DiscountProps) => void;
+ iconClassName?: string;
+ descriptionClassName?: string;
+}
+
+export function ProgramRewardsDisplay({
+ rewards,
+ discount,
+ isDarkImage = false,
+ className,
+ onRewardClick,
+ onDiscountClick,
+ iconClassName,
+ descriptionClassName,
+}: ProgramRewardsDisplayProps) {
+ // Concatenate rewards and discount into a single array
+ const items: RewardItem[] = [];
+
+ // Add rewards
+ if (rewards) {
+ rewards.forEach((reward) => {
+ items.push({
+ id: reward.id,
+ icon: REWARD_EVENTS[reward.event].icon,
+ description: formatRewardDescription(reward),
+ onClick: onRewardClick ? () => onRewardClick(reward) : undefined,
+ });
+ });
+ }
+
+ // Add discount if present
+ if (discount) {
+ items.push({
+ id: "discount",
+ icon: Gift,
+ description: formatDiscountDescription(discount),
+ onClick: onDiscountClick ? () => onDiscountClick(discount) : undefined,
+ });
+ }
+
+ // shouldn't happen, but just in case
+ if (items.length === 0) return null;
+
+ // If there's only one item, show the full description
+ if (items.length === 1) {
+ const item = items[0];
+ const As = item.onClick ? "button" : "div";
+ return (
+ <HoverCard.Root openDelay={100}>
+ <HoverCard.Portal>
+ <HoverCard.Content
+ side="bottom"
+ sideOffset={8}
+ className="animate-slide-up-fade z-[99] flex items-center gap-2 overflow-hidden rounded-xl border border-neutral-200 bg-white p-2 text-xs text-neutral-700 shadow-sm"
+ >
+ <item.icon className="text-content-default size-4" />
+ <span>{item.description}</span>
+ </HoverCard.Content>
+ </HoverCard.Portal>
+ <HoverCard.Trigger>
+ <As
+ {...(item.onClick && { type: "button", onClick: item.onClick })}
+ className={cn(
+ "-ml-1 flex items-center gap-1",
+ item.onClick &&
+ "hover:bg-bg-subtle active:bg-bg-emphasis rounded-md transition-colors",
+ className,
+ )}
+ >
+ <div
+ className={cn(
+ "text-content-default flex size-6 items-center justify-center rounded-md",
+ isDarkImage && "text-content-inverted",
+ )}
+ >
+ <item.icon className="size-4" />
+ </div>
+ <span
+ className={cn(
+ "max-w-[160px] truncate text-sm font-medium",
+ isDarkImage && "text-content-inverted",
+ descriptionClassName,
+ )}
+ >
+ {item.description}
+ </span>
+ </As>
+ </HoverCard.Trigger>
+ </HoverCard.Root>
+ );
+ }
+
+ // If there are multiple items, show icons with tooltips
+ return (
+ <div className={cn("-ml-1 flex items-center gap-1.5", className)}>
+ {items.map((item) => (
+ <ProgramRewardIcon
+ key={item.id}
+ icon={item.icon}
+ description={item.description}
+ onClick={item.onClick}
+ className={cn(isDarkImage && "text-content-inverted", iconClassName)}
+ />
+ ))}
+ </div>
+ );
+}