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.

improve discount sheet

Steven Tey9d16fba1c0a8
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/discounts/group-discounts.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/discounts/group-discounts.tsx
index ef2af294a6..8f4efcc0d1 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/discounts/group-discounts.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/discounts/group-discounts.tsx
@@ -5,15 +5,49 @@ import type { DiscountProps, GroupProps } from "@/lib/types";
import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";
import { useDiscountSheet } from "@/ui/partners/discounts/add-edit-discount-sheet";
import { ProgramRewardDescription } from "@/ui/partners/program-reward-description";
-import { Button } from "@dub/ui";
+import { Button, useRouterStuff } from "@dub/ui";
import { cn, isClickOnInteractiveChild } from "@dub/utils";
import { BadgePercent } from "lucide-react";
+import Link from "next/link";
+import { useParams } from "next/navigation";
+import { useEffect, useState } from "react";
export const GroupDiscounts = () => {
const { group, loading } = useGroup();
+ const { searchParams } = useRouterStuff();
+
+ const [discountSheetState, setDiscountSheetState] = useState<
+ { open: false; discountId: string | null } | { open: true; discountId: string }
+ >({ open: false, discountId: null });
+
+ useEffect(() => {
+ const discountId = searchParams.get("discountId");
+
+ if (discountId) {
+ setDiscountSheetState({ open: true, discountId });
+ } else {
+ setDiscountSheetState({ open: false, discountId: null });
+ }
+ }, [searchParams]);
+
+ const currentDiscount =
+ discountSheetState.discountId &&
+ group?.discount?.id === discountSheetState.discountId
+ ? group.discount
+ : undefined;
+ const isNewDiscount = discountSheetState.discountId === "new";
+ const { DiscountSheet, setIsOpen: setDiscountSheetOpen } = useDiscountSheet({
+ ...(currentDiscount && { discount: currentDiscount }),
+ });
+
+ useEffect(() => {
+ setDiscountSheetOpen(discountSheetState.open);
+ }, [discountSheetState.open, setDiscountSheetOpen]);
return (
<div>
+ {discountSheetState.discountId && (currentDiscount || isNewDiscount) && DiscountSheet}
+
{loading || !group ? (
<DiscountSkeleton />
) : (
@@ -30,57 +64,67 @@ const DiscountItem = ({
discount?: DiscountProps | null;
group: GroupProps;
}) => {
- const { DiscountSheet, setIsOpen } = useDiscountSheet({
- ...(discount && { discount }),
- });
+ const { slug } = useParams();
+ const { queryParams } = useRouterStuff();
+ const As = discount ? Link : "div";
return (
- <>
- {DiscountSheet}
- <div
- className={cn(
- "flex cursor-pointer flex-col gap-4 rounded-lg p-6 transition-all md:flex-row md:items-center",
- discount && "border border-neutral-200 hover:border-neutral-300",
- !discount && "bg-neutral-50 hover:bg-neutral-100",
- )}
- onClick={(e) => {
- if (isClickOnInteractiveChild(e)) return;
- setIsOpen(true);
- }}
- >
- <div className="flex size-10 items-center justify-center rounded-full border border-neutral-200 bg-white">
- <BadgePercent className="size-4 text-neutral-600" />
- </div>
- <div className="flex flex-1 flex-col justify-between gap-y-4 md:flex-row md:items-center">
- <div className="flex items-center gap-2">
- <span className="text-sm font-normal">
- {discount ? (
- <ProgramRewardDescription discount={discount} />
- ) : (
- <span className="text-sm font-normal text-neutral-600">
- No referral discount created
- </span>
- )}
- </span>
- </div>
-
- <div className="flex flex-col-reverse items-center gap-2 md:flex-row">
- {!discount && group.slug !== DEFAULT_PARTNER_GROUP.slug && (
- <CopyDefaultDiscountButton />
+ <As
+ href={discount ? `/${slug}/program/groups/${group.slug}/discounts?discountId=${discount.id}` : ""}
+ scroll={false}
+ className={cn(
+ "flex cursor-pointer flex-col gap-4 rounded-lg p-6 transition-all md:flex-row md:items-center",
+ discount && "border border-neutral-200 hover:border-neutral-300",
+ !discount && "bg-neutral-50 hover:bg-neutral-100",
+ )}
+ onClick={(e) => {
+ if (isClickOnInteractiveChild(e)) return;
+ queryParams({
+ set: {
+ discountId: discount?.id ?? "new",
+ },
+ scroll: false,
+ });
+ }}
+ >
+ <div className="flex size-10 items-center justify-center rounded-full border border-neutral-200 bg-white">
+ <BadgePercent className="size-4 text-neutral-600" />
+ </div>
+ <div className="flex flex-1 flex-col justify-between gap-y-4 md:flex-row md:items-center">
+ <div className="flex items-center gap-2">
+ <span className="text-sm font-normal">
+ {discount ? (
+ <ProgramRewardDescription discount={discount} />
+ ) : (
+ <span className="text-sm font-normal text-neutral-600">
+ No referral discount created
+ </span>
)}
- <Button
- text={discount ? "Edit" : "Create"}
- variant={discount ? "secondary" : "primary"}
- className="h-9 w-full rounded-lg md:w-fit"
- onClick={(e) => {
- e.preventDefault();
- setIsOpen(true);
- }}
- />
- </div>
+ </span>
+ </div>
+
+ <div className="flex flex-col-reverse items-center gap-2 md:flex-row">
+ {!discount && group.slug !== DEFAULT_PARTNER_GROUP.slug && (
+ <CopyDefaultDiscountButton />
+ )}
+ <Button
+ text={discount ? "Edit" : "Create"}
+ variant={discount ? "secondary" : "primary"}
+ className="h-9 w-full rounded-lg md:w-fit"
+ onClick={(e) => {
+ e.preventDefault();
+ e.stopPropagation();
+ queryParams({
+ set: {
+ discountId: discount?.id ?? "new",
+ },
+ scroll: false,
+ });
+ }}
+ />
</div>
</div>
- </>
+ </As>
);
};
diff --git a/apps/web/ui/partners/discounts/add-edit-discount-sheet.tsx b/apps/web/ui/partners/discounts/add-edit-discount-sheet.tsx
index 980fe9de88..2a6d82829a 100644
--- a/apps/web/ui/partners/discounts/add-edit-discount-sheet.tsx
+++ b/apps/web/ui/partners/discounts/add-edit-discount-sheet.tsx
@@ -11,6 +11,7 @@ import useWorkspace from "@/lib/swr/use-workspace";
import { DiscountProps } from "@/lib/types";
import { createDiscountSchema } from "@/lib/zod/schemas/discount";
import { RECURRING_MAX_DURATIONS } from "@/lib/zod/schemas/misc";
+import { Shopify } from "@/ui/guides/icons/shopify";
import { X } from "@/ui/shared/icons";
import {
InlineBadgePopover,
@@ -18,7 +19,7 @@ import {
} from "@/ui/shared/inline-badge-popover";
import { UpgradeRequiredToast } from "@/ui/shared/upgrade-required-toast";
import { DiscountProvider } from "@dub/prisma/client";
-import { Button, InfoTooltip, Sheet, Switch } from "@dub/ui";
+import { Button, InfoTooltip, Sheet, Switch, useRouterStuff } from "@dub/ui";
import { CircleCheckFill, StripeIcon, Tag } from "@dub/ui/icons";
import { capitalize, cn, pluralize } from "@dub/utils";
import { useAction } from "next-safe-action/hooks";
@@ -424,7 +425,11 @@ function DiscountSheetContent({
)}
title={
<>
- <StripeIcon className="size-7" />
+ {provider === DiscountProvider.shopify ? (
+ <Shopify className="h-7 w-auto" />
+ ) : (
+ <StripeIcon className="size-7" />
+ )}
<span className="leading-relaxed">
Discount a{" "}
<InlineBadgePopover
@@ -639,8 +644,15 @@ export function DiscountSheet({
isOpen: boolean;
nested?: boolean;
}) {
+ const { queryParams } = useRouterStuff();
+
return (
- <Sheet open={isOpen} onOpenChange={rest.setIsOpen} nested={nested}>
+ <Sheet
+ open={isOpen}
+ onOpenChange={rest.setIsOpen}
+ nested={nested}
+ onClose={() => queryParams({ del: "discountId", scroll: false })}
+ >
<DiscountSheetContent {...rest} />
</Sheet>
);