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.

Link level ui updates (#4537)

Marcus Farrell4ac21bea2034
diff --git a/apps/web/app/(ee)/app.dub.co/embed/referrals/page-client.tsx b/apps/web/app/(ee)/app.dub.co/embed/referrals/page-client.tsx
index cc0f604e9c..b0f87c52ad 100644
--- a/apps/web/app/(ee)/app.dub.co/embed/referrals/page-client.tsx
+++ b/apps/web/app/(ee)/app.dub.co/embed/referrals/page-client.tsx
@@ -788,6 +788,7 @@ function EmbedLinkRow({
type="button"
className="border-border-default text-content-default focus:border-border-emphasis bg-bg-default flex h-9 w-full min-w-0 items-center gap-2 rounded-lg border px-3 text-left text-sm outline-none focus:ring-0"
>
+ {selectedOption?.icon}
<span className="min-w-0 shrink grow truncate font-medium">
{displayText}
</span>
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/page-client.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/page-client.tsx
index 5132e3823c..eb54359223 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/page-client.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/page-client.tsx
@@ -18,7 +18,12 @@ import {
useRouterStuff,
} from "@dub/ui";
import { ChartTooltipSync } from "@dub/ui/charts";
-import { CursorRays, GridIcon, GridLayoutRows, Hyperlink } from "@dub/ui/icons";
+import {
+ CursorRays,
+ GridLayoutRows,
+ Hyperlink,
+ TableRows2,
+} from "@dub/ui/icons";
import { createContext, useContext, useEffect, useState } from "react";
import { PartnerLinkCard } from "./partner-link-card";
@@ -100,25 +105,19 @@ export function PartnerProgramLinksPageClient() {
<div className="flex items-center gap-3">
{!!showDetailedAnalytics && (
<ToggleGroup
- className="h-10 rounded-lg px-1"
- optionClassName="px-2 rounded-md"
- indicatorClassName="border-0 ring-1 ring-inset ring-neutral-200"
+ className="bg-bg-muted h-10 gap-0 rounded-lg p-0"
+ optionClassName="h-full rounded-md px-2.5 py-0"
+ // Selected pill bleeds 1px outward so its border sits on top of
+ // the track's border instead of doubling up beside it
+ indicatorClassName="bg-bg-default -left-px -top-px h-[calc(100%+2px)] w-[calc(100%+2px)]"
options={[
{
value: "full",
- label: (
- <div className="p-1">
- <GridIcon className="size-4" />
- </div>
- ),
+ label: <GridLayoutRows className="size-4" />,
},
{
value: "cards",
- label: (
- <div className="p-1">
- <GridLayoutRows className="size-4" />
- </div>
- ),
+ label: <TableRows2 className="size-4" />,
},
]}
selected={displayOption}
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-card.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-card.tsx
index fabd0f521c..fd49a495a3 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-card.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-card.tsx
@@ -93,8 +93,8 @@ export function PartnerLinkCard({ link }: { link: PartnerProfileLinkProps }) {
const isDeactivated = programEnrollment?.status === "deactivated";
const discountCodeSection = link.discountCode ? (
- <div className="hidden items-center gap-1.5 rounded-xl border border-neutral-200 py-1 pl-2 pr-1 sm:flex">
- <span className="text-sm leading-none text-neutral-500">
+ <div className="hidden h-8 items-center gap-1.5 rounded-lg border border-neutral-200 pl-2 pr-1.5 sm:flex">
+ <span className="text-xs font-medium leading-none tracking-tight text-neutral-500">
Discount code
</span>
<DiscountCodeBadge
@@ -110,7 +110,7 @@ export function PartnerLinkCard({ link }: { link: PartnerProfileLinkProps }) {
outerClassName="overflow-hidden"
innerClassName={cn("px-0 py-0 group/card", isDeactivated && "opacity-80")}
>
- <div className="p-4">
+ <div className="p-4 sm:px-[18px] sm:pr-5">
<div className="flex items-center justify-between gap-4">
<div className="flex min-w-0 items-center gap-3">
<div className="relative hidden shrink-0 items-center justify-center sm:flex">
@@ -136,7 +136,7 @@ export function PartnerLinkCard({ link }: { link: PartnerProfileLinkProps }) {
"truncate text-sm font-semibold leading-6 transition-colors",
isDeactivated
? "cursor-default text-neutral-400"
- : "text-neutral-700 hover:text-black",
+ : "text-neutral-900 hover:text-black",
)}
onClick={
isDeactivated ? (e) => e.preventDefault() : undefined
@@ -222,13 +222,13 @@ export function PartnerLinkCard({ link }: { link: PartnerProfileLinkProps }) {
</div>
</div>
</div>
+ {displayOption === "full" && <StatsCharts link={link} />}
<PartnerLinkRewardsPanel
rewards={rewards}
discount={discount}
showRewards={showRewards}
additionalCount={additionalCount}
/>
- {displayOption === "full" && <StatsCharts link={link} />}
</CardList.Card>
);
}
@@ -239,7 +239,7 @@ const StatsBadge = memo(({ link }: { link: PartnerProfileLinkProps }) => {
return (
<As
href={`/programs/${programEnrollment?.program.slug}/analytics?linkId=${link.id}`}
- className="flex items-center gap-0.5 rounded-md border border-neutral-200 bg-neutral-50 p-0.5 text-sm text-neutral-600"
+ className="flex h-[30px] items-center gap-[3px] rounded-md border border-neutral-200 bg-white px-1 text-xs font-medium text-neutral-900"
>
{[
{
@@ -266,7 +266,7 @@ const StatsBadge = memo(({ link }: { link: PartnerProfileLinkProps }) => {
<div
key={tab}
className={cn(
- "flex items-center gap-1 whitespace-nowrap rounded-md px-1 py-px transition-colors",
+ "flex items-center gap-1.5 whitespace-nowrap rounded px-[5px] py-[3px] transition-colors",
className,
)}
>
@@ -341,7 +341,10 @@ const StatsCharts = memo(({ link }: { link: PartnerProfileLinkProps }) => {
}, [timeseries]);
return (
- <div ref={ref} className="grid grid-cols-1 gap-4 p-4 pt-0 sm:grid-cols-3">
+ <div
+ ref={ref}
+ className="grid grid-cols-1 gap-4 p-4 pt-0 sm:grid-cols-3 sm:gap-5 sm:px-[18px] sm:pb-5"
+ >
{CHARTS.map((chart) => (
<Link
key={chart.key}
@@ -351,7 +354,7 @@ const StatsCharts = memo(({ link }: { link: PartnerProfileLinkProps }) => {
event: chart.key === "saleAmount" ? "sales" : chart.key,
},
)}`}
- className="group/chart relative isolate rounded-lg border border-neutral-200 px-2 py-1.5 lg:px-3"
+ className="group/chart relative isolate flex flex-col gap-4 rounded-lg border border-neutral-200 p-4 lg:p-5"
>
<div className="absolute right-2 top-2 overflow-hidden">
<div className="translate-x-full transition-transform duration-200 group-hover/chart:translate-x-0">
@@ -362,7 +365,7 @@ const StatsCharts = memo(({ link }: { link: PartnerProfileLinkProps }) => {
/>
</div>
</div>
- <div className="flex flex-col gap-1 pl-2 pt-3 lg:pl-1.5">
+ <div className="flex flex-col gap-1">
<div className="flex items-center gap-1.5">
<chart.icon
className={cn("h-4 w-4 shrink-0", chart.colorClassName)}
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-rewards.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-rewards.tsx
index 75c42744ed..b172bc221d 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-rewards.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-rewards.tsx
@@ -158,7 +158,7 @@ export function PartnerLinkRewardsPanel({
transition={{ duration: 0.2 }}
className="overflow-hidden"
>
- <div className="border-t border-neutral-200 px-4 py-2">
+ <div className="border-t border-neutral-200 bg-neutral-100 p-2">
<div className="flex flex-col gap-2 rounded-[10px] border border-neutral-200 bg-white p-3">
{items.map((item) => {
const ItemIcon = item.icon;
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/page-client.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/page-client.tsx
index 2e24035b29..d3556347b2 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/page-client.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/page-client.tsx
@@ -667,7 +667,7 @@ function getRewardLinkOptions({
}
const LINK_SELECTOR_BOX_CLASSNAME =
- "h-10 w-[241px] min-w-0 max-w-full rounded-lg border border-border-default bg-bg-default";
+ "h-10 w-[241px] min-w-0 max-w-full rounded-lg border border-border-subtle bg-bg-default";
function RewardList() {
const { programEnrollment } = useProgramEnrollment();
@@ -948,6 +948,13 @@ function RewardListItem({
"text-content-default focus:border-border-emphasis flex items-center gap-2 px-3 text-left text-sm outline-none focus:ring-0",
)}
>
+ {link.apexDomain && (
+ <LinkLogo
+ apexDomain={link.apexDomain}
+ className="size-4 shrink-0 sm:size-4"
+ imageProps={{ width: 16, height: 16 }}
+ />
+ )}
<span className="min-w-0 shrink grow truncate">
{link.displayText}
</span>
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/links/referral-links.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/links/referral-links.tsx
index 823fb84a88..c64c4e9164 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/links/referral-links.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/links/referral-links.tsx
@@ -90,6 +90,7 @@ function OverrideIndicator({
}) {
return (
<Tooltip
+ disableHoverableContent
content={
disabledTooltip ?? (
<div className="whitespace-nowrap px-3 py-2 text-sm text-neutral-600">
@@ -109,7 +110,7 @@ function OverrideIndicator({
>
<span className="relative flex">
{children}
- <RewardOverrideIcon />
+ <RewardOverrideIcon ringClassName="stroke-neutral-100 group-hover/override:stroke-neutral-200" />
</span>
</button>
</Tooltip>
@@ -126,7 +127,7 @@ function OverrideIndicatorGroup({
return (
<div
className={cn(
- "flex h-5 shrink-0 items-center gap-1 rounded-md bg-neutral-100 px-1 transition-colors",
+ "group/override flex h-5 shrink-0 items-center gap-1 rounded-md bg-neutral-100 px-1 transition-colors",
!disabled && "hover:bg-neutral-200",
)}
>
diff --git a/apps/web/ui/modals/add-partner-link-modal.tsx b/apps/web/ui/modals/add-partner-link-modal.tsx
index 0e420ea8cf..7cd41f6800 100644
--- a/apps/web/ui/modals/add-partner-link-modal.tsx
+++ b/apps/web/ui/modals/add-partner-link-modal.tsx
@@ -335,7 +335,7 @@ const AddPartnerLinkModal = ({
</div>
</div>
</div>
- <div className="flex items-center justify-end gap-2 border-t border-neutral-200 bg-neutral-50 p-4">
+ <div className="flex items-center justify-end gap-2 border-t border-neutral-200 bg-neutral-50 p-4 sm:rounded-b-2xl">
<Button
type="button"
variant="secondary"
diff --git a/apps/web/ui/partners/groups/custom-rewards-accordion.tsx b/apps/web/ui/partners/groups/custom-rewards-accordion.tsx
index 4b135dcba2..4322899f66 100644
--- a/apps/web/ui/partners/groups/custom-rewards-accordion.tsx
+++ b/apps/web/ui/partners/groups/custom-rewards-accordion.tsx
@@ -114,54 +114,53 @@ function ItemsAccordion<T extends AccordionRow>({
onSelect: (item: T) => void;
}) {
return (
- <AnimatedSizeContainer
- height
- className={cn(items.length > 0 && "relative z-10 -mt-px")}
- >
- {items.length > 0 ? (
- <motion.div
- initial={{ opacity: 0 }}
- animate={{ opacity: 1 }}
- transition={{ duration: 0.2, ease: "easeOut" }}
- className="px-2"
- >
- <Accordion
- type="single"
- collapsible
- className="rounded-b-lg border border-neutral-200 bg-white p-1"
+ <div className={cn("px-2", items.length > 0 && "relative z-10 -mt-px")}>
+ <AnimatedSizeContainer
+ height
+ className={cn(
+ items.length > 0 && "rounded-b-lg border border-neutral-200 bg-white",
+ )}
+ >
+ {items.length > 0 ? (
+ <motion.div
+ initial={{ opacity: 0 }}
+ animate={{ opacity: 1 }}
+ transition={{ duration: 0.2, ease: "easeOut" }}
>
- <AccordionItem value="items" className="border-none py-0">
- <AccordionTrigger
- onClick={(e) => e.stopPropagation()}
- className="h-7 py-0 pl-1.5 pr-2 text-xs font-medium tracking-tight text-neutral-600 hover:no-underline sm:text-xs [&>svg]:size-2.5 [&>svg]:text-neutral-600"
- >
- <span className="flex items-center gap-2">
- <Users className="size-3.5" />
- {label}
- </span>
- </AccordionTrigger>
- <AccordionContent className="pb-0 pt-0 text-xs text-neutral-600 sm:text-xs">
- <div className="flex flex-col">
- {items.map((item) => (
- <button
- key={item.id}
- type="button"
- onClick={(e) => {
- e.preventDefault();
- e.stopPropagation();
- onSelect(item);
- }}
- className="w-full rounded-md px-1.5 py-1.5 text-left text-xs text-neutral-600 hover:bg-neutral-50"
- >
- {renderItem(item)}
- </button>
- ))}
- </div>
- </AccordionContent>
- </AccordionItem>
- </Accordion>
- </motion.div>
- ) : null}
- </AnimatedSizeContainer>
+ <Accordion type="single" collapsible className="p-1">
+ <AccordionItem value="items" className="border-none py-0">
+ <AccordionTrigger
+ onClick={(e) => e.stopPropagation()}
+ className="h-7 py-0 pl-1.5 pr-2 text-xs font-medium tracking-tight text-neutral-600 hover:no-underline sm:text-xs [&>svg]:size-2.5 [&>svg]:text-neutral-600"
+ >
+ <span className="flex items-center gap-2">
+ <Users className="size-3.5" />
+ {label}
+ </span>
+ </AccordionTrigger>
+ <AccordionContent className="pb-0 pt-0 text-xs text-neutral-600 sm:text-xs">
+ <div className="flex flex-col">
+ {items.map((item) => (
+ <button
+ key={item.id}
+ type="button"
+ onClick={(e) => {
+ e.preventDefault();
+ e.stopPropagation();
+ onSelect(item);
+ }}
+ className="w-full rounded-md px-1.5 py-1.5 text-left text-xs text-neutral-600 hover:bg-neutral-50"
+ >
+ {renderItem(item)}
+ </button>
+ ))}
+ </div>
+ </AccordionContent>
+ </AccordionItem>
+ </Accordion>
+ </motion.div>
+ ) : null}
+ </AnimatedSizeContainer>
+ </div>
);
}
diff --git a/apps/web/ui/partners/program-reward-list.tsx b/apps/web/ui/partners/program-reward-list.tsx
index a3741559c5..58ce6f3609 100644
--- a/apps/web/ui/partners/program-reward-list.tsx
+++ b/apps/web/ui/partners/program-reward-list.tsx
@@ -84,7 +84,11 @@ export function ProgramRewardList({
key={reward.id}
icon={REWARD_EVENT_ICON[reward.event]}
iconClassName={iconClassName}
- isOverride={reward.isOverride}
+ overrideTooltip={
+ reward.isOverride
+ ? `This partner has a ${reward.event} reward override`
+ : undefined
+ }
action={
canEdit ? (
<EditAction
@@ -106,7 +110,11 @@ export function ProgramRewardList({
<Item
icon={Gift}
iconClassName={iconClassName}
- isOverride={discount.isOverride}
+ overrideTooltip={
+ discount.isOverride
+ ? "This partner has a discount override"
+ : undefined
+ }
action={
onEditDiscount ? (
<EditAction
@@ -157,20 +165,37 @@ const Item = ({
icon: Icon,
children,
iconClassName,
- isOverride,
+ overrideTooltip,
action,
}: PropsWithChildren<{
icon: Icon;
iconClassName?: string;
- isOverride?: boolean;
+ overrideTooltip?: string;
action?: ReactNode;
}>) => {
+ const icon = (
+ <div className="relative shrink-0 py-px">
+ <Icon className={cn("block size-4", iconClassName)} />
+ {overrideTooltip && <RewardOverrideIcon />}
+ </div>
+ );
+
return (
<li className="flex items-start gap-2">
- <div className="relative shrink-0 py-px">
- <Icon className={cn("block size-4", iconClassName)} />
- {isOverride && <RewardOverrideIcon />}
- </div>
+ {overrideTooltip ? (
+ <Tooltip
+ disableHoverableContent
+ content={
+ <div className="whitespace-nowrap px-3 py-2 text-sm text-neutral-600">
+ {overrideTooltip}
+ </div>
+ }
+ >
+ {icon}
+ </Tooltip>
+ ) : (
+ icon
+ )}
<div className="min-w-0 flex-1">{children}</div>
{action}
</li>
diff --git a/apps/web/ui/partners/rewards/reward-override-icon.tsx b/apps/web/ui/partners/rewards/reward-override-icon.tsx
index c1b93571a0..7e671e292c 100644
--- a/apps/web/ui/partners/rewards/reward-override-icon.tsx
+++ b/apps/web/ui/partners/rewards/reward-override-icon.tsx
@@ -1,4 +1,11 @@
-export function RewardOverrideIcon() {
+import { cn } from "@dub/utils";
+
+export function RewardOverrideIcon({
+ ringClassName = "stroke-white",
+}: {
+ /** Ring color around the dot; should match the background the icon sits on */
+ ringClassName?: string;
+}) {
return (
<span aria-hidden className="absolute right-0 top-0 size-1">
<svg
@@ -13,8 +20,8 @@ export function RewardOverrideIcon() {
cy="4"
r="3"
fill="#155DFC"
- stroke="white"
strokeWidth="2"
+ className={cn("transition-colors", ringClassName)}
/>
</svg>
</span>