Skip to content

[pull] main from dubinc:main #784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
May 8, 2026
Merged

[pull] main from dubinc:main #784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions apps/web/app/api/domains/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,9 @@ export const POST = withWorkspace(
slug: slug,
projectId: workspace.id,
primary: totalDomains === 0,
...(slug.endsWith(".dub.link") && {
verified: true,
}),
...(placeholder && { placeholder }),
expiredUrl,
notFoundUrl,
Expand Down
234 changes: 161 additions & 73 deletions apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/domain/default-domain-selector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
"use client";

import { OnboardingStep } from "@/lib/onboarding/types";
import { BoltFill, Button, Crown, Icon } from "@dub/ui";
import { capitalize } from "@dub/utils";
import {
BoltFill,
Button,
CircleCheckFill,
Crown,
CursorRays,
Flask,
Globe,
type Icon,
} from "@dub/ui";
import { capitalize, cn } from "@dub/utils";
import { usePlausible } from "next-plausible";
import Image from "next/image";
import { useSearchParams } from "next/navigation";
Expand All @@ -19,54 +28,88 @@ export function DefaultDomainSelector() {
return (
<>
<div className="animate-fade-in mx-auto grid w-full gap-4 sm:max-w-[600px] sm:grid-cols-2">
<DomainOption
step="domain/custom"
icon="https://assets.dub.co/icons/domain-sign.webp"
bannerIcon={CircleCheckFill}
bannerText="Recommended setup"
bannerVariant="recommended"
title="Connect a custom domain"
description={
product === "links"
? "Already have a domain? Connect it to your Dub workspace."
: undefined
}
features={
product === "partners"
? [
{
icon: CursorRays,
text: (
<>
<a
href="https://dub.co/blog/custom-domains"
target="_blank"
className="underline decoration-dotted underline-offset-2 transition-colors hover:text-neutral-700"
>
Higher click-through rates
</a>
</>
),
},
{
icon: Globe,
text: (
<>
Requires a{" "}
<a
href="https://dub.co/help/article/choosing-a-custom-domain"
target="_blank"
className="underline decoration-dotted underline-offset-2 transition-colors hover:text-neutral-700"
>
dedicated domain
</a>
</>
),
},
]
: undefined
}
cta="Connect domain"
/>
{product === "partners" && (
<DomainOption
step="domain/subdomain"
icon="https://assets.dub.co/icons/gift.webp"
bannerIcon={BoltFill}
bannerText="Instant setup"
title={
<>
Free{" "}
<span className="rounded border border-neutral-800/10 bg-neutral-100 px-1 py-0.5 font-mono text-xs">
.dub.link
</span>{" "}
subdomain
</>
}
description={
<>
Get a free custom domain like{" "}
<span className="font-mono font-semibold text-neutral-900">
{workspaceSlug && workspaceSlug.length < 8
? workspaceSlug
: "company"}
.dub.link
</span>{" "}
for your links.
Use <DomainChip>.dub.link</DomainChip> subdomain
</>
}
cta="Claim .dub.link subdomain"
bannerIcon={BoltFill}
bannerText="Instant setup"
features={[
{
icon: Flask,
text: "Best for testing purposes",
},
{
icon: BoltFill,
text: "Instant subdomain setup",
},
]}
cta="Use .dub.link subdomain"
/>
)}
<DomainOption
step="domain/custom"
icon="https://assets.dub.co/icons/domain-sign.webp"
title="Connect a custom domain"
description="Already have a domain? Connect it to your Dub workspace."
cta="Connect domain"
/>
{product === "links" && (
<DomainOption
step="domain/register"
icon="https://assets.dub.co/icons/gift.webp"
bannerIcon={Crown}
bannerText="Paid plan required"
title={
<>
Claim a free{" "}
<span className="rounded border border-neutral-800/10 bg-neutral-100 px-1 py-0.5 font-mono text-xs">
.link
</span>{" "}
domain
Claim a free <DomainChip>.link</DomainChip> domain
</>
}
description={
Expand All @@ -82,8 +125,6 @@ export function DefaultDomainSelector() {
</>
}
cta="Claim .link domain"
bannerIcon={Crown}
bannerText="Paid plan required"
/>
)}
</div>
Expand All @@ -101,60 +142,107 @@ function DomainOption({
icon,
title,
description,
features,
cta,
bannerIcon: BannerIcon,
bannerText,
bannerVariant = "default",
}: {
step: OnboardingStep;
icon: string;
title: ReactNode;
description: ReactNode;
description?: ReactNode;
features?: {
icon: Icon;
text: ReactNode;
}[];
cta: string;
bannerIcon?: Icon;
bannerText?: string;
bannerVariant?: "default" | "recommended";
}) {
const plausible = usePlausible();
const { continueTo, isLoading, isSuccessful } = useOnboardingProgress();
return (
<div className="relative flex h-full flex-col items-center gap-6 rounded-xl border border-neutral-300 p-6 pt-12 transition-all">
{BannerIcon && bannerText && (
<div className="absolute inset-x-2 top-2 flex items-center justify-center gap-2 rounded-md border border-neutral-200 bg-neutral-100 px-2.5 py-1 text-xs font-medium text-neutral-600">
<BannerIcon className="size-3" />
{bannerText}
<div className="relative flex h-full flex-col items-center rounded-xl border border-neutral-200 bg-white p-3 transition-all">
<div className="relative flex h-52 w-full items-center justify-center rounded-xl bg-neutral-50">
{BannerIcon && bannerText && (
<div
className={cn(
"absolute inset-x-2 top-2 flex h-6 items-center justify-center gap-2 rounded-lg border text-xs font-semibold",
bannerVariant === "recommended"
? "border-green-200 bg-green-100 text-green-700"
: "border-neutral-200 bg-white text-neutral-700",
)}
>
<BannerIcon
className={cn(
"size-3.5",
bannerVariant === "recommended"
? "text-green-700"
: "text-neutral-900",
)}
/>
{bannerText}
</div>
)}
<div className="relative mt-8 size-32">
<Image
src={icon}
alt=""
fill
className="object-contain"
fetchPriority="high"
/>
</div>
)}
<div className="relative size-36">
<Image
src={icon}
alt=""
fill
className="object-contain"
fetchPriority="high"
/>
</div>
<div className="space-y-2 text-center">
<span className="text-base font-semibold text-neutral-900">
{title}
</span>
<p className="text-balance text-sm text-neutral-500">{description}</p>
</div>
<div className="flex w-full grow flex-col justify-end gap-2">
<Button
type="button"
variant="primary"
className="rounded-lg"
onClick={() => {
plausible("Selected Domain", {
props: {
domainType: capitalize(step.replace("domain/", "")),
},
});
continueTo(step);
}}
loading={isLoading || isSuccessful}
text={cta}
/>
<div className="flex w-full flex-col p-2">
<div className="mt-2 space-y-3 text-center">
<span className="text-base font-semibold text-neutral-900">
{title}
</span>
{description && (
<p className="text-balance text-sm leading-snug text-neutral-500">
{description}
</p>
)}
{features && (
<div className="mx-auto inline-flex flex-col items-start space-y-2 text-left text-sm text-neutral-500">
{features.map(({ icon: FeatureIcon, text }, idx) => (
<div key={idx} className="flex items-center gap-2">
<FeatureIcon className="size-4 shrink-0 text-neutral-500" />
<div>{text}</div>
</div>
))}
</div>
)}
</div>
<div className="mt-6 flex w-full grow flex-col justify-end">
<Button
type="button"
variant="primary"
className="h-10 rounded-lg text-sm"
onClick={() => {
plausible("Selected Domain", {
props: {
domainType: capitalize(step.replace("domain/", "")),
},
});
continueTo(step);
}}
loading={isLoading || isSuccessful}
text={cta}
/>
</div>
</div>
</div>
);
}

function DomainChip({ children }: { children: ReactNode }) {
return (
<span className="rounded border border-neutral-800/10 bg-neutral-100 px-1 py-0.5 font-mono text-xs">
{children}
</span>
);
}
45 changes: 33 additions & 12 deletions apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/domain/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,44 @@
import { StepPage } from "../step-page";
import { DefaultDomainSelector } from "./default-domain-selector";

export default function Domain() {
export default async function Domain({
searchParams,
}: {
searchParams: Promise<{ product?: string }>;
}) {
const { product } = await searchParams;
const isPartners = product !== "links";

return (
<StepPage
title="Add a custom domain"
description={
<>
Make your links stand out and{" "}
<a
href="https://dub.co/blog/custom-domains"
target="_blank"
className="cursor-help font-medium underline decoration-dotted underline-offset-2 transition-colors hover:text-neutral-700"
>
boost click-through rates by 30%
</a>
</>
isPartners ? (
<>
A{" "}
<a
href="https://dub.co/help/article/choosing-a-custom-domain"
target="_blank"
className="cursor-help font-medium underline decoration-dotted underline-offset-2 transition-colors hover:text-neutral-700"
>
dedicated domain
</a>{" "}
is required for Dub Partner programs, and can be changed at anytime.
</>
) : (
<>
Make your links stand out and{" "}
<a
href="https://dub.co/blog/custom-domains"
target="_blank"
className="cursor-help font-medium underline decoration-dotted underline-offset-2 transition-colors hover:text-neutral-700"
>
boost click-through rates by 30%
</a>
</>
)
}
className="max-w-none"
className="max-w-none [&>div:first-of-type]:max-w-[640px]"
>
<DefaultDomainSelector />
</StepPage>
Expand Down
Loading
Loading