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.

update filter design

Steven Teyf67c60dc60e5
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/page-client.tsx
index 2372f89da4..5fd4f54dbd 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/page-client.tsx
@@ -6,14 +6,27 @@ import useWorkspace from "@/lib/swr/use-workspace";
import { NetworkPartnerProps } from "@/lib/types";
import { PARTNER_NETWORK_MAX_PAGE_SIZE } from "@/lib/zod/schemas/partner-network";
import { NetworkPartnerSheet } from "@/ui/partners/partner-network/network-partner-sheet";
+import { PlatformType } from "@dub/prisma/client";
import {
AnimatedSizeContainer,
+ Button,
Filter,
PaginationControls,
- Switch,
+ ToggleGroup,
usePagination,
useRouterStuff,
} from "@dub/ui";
+import {
+ Globe,
+ Instagram,
+ LinkedIn,
+ Star,
+ StarFill,
+ TikTok,
+ Twitter,
+ User,
+ YouTube,
+} from "@dub/ui/icons";
import { cn, fetcher } from "@dub/utils";
import { useAction } from "next-safe-action/hooks";
import { useEffect, useMemo, useState } from "react";
@@ -38,6 +51,19 @@ const tabs = [
},
] as const;
+const PLATFORM_TOGGLE_OPTIONS: {
+ value: PlatformType | "all";
+ icon: typeof User;
+}[] = [
+ { value: "all", icon: User },
+ { value: "website", icon: Globe },
+ { value: "youtube", icon: YouTube },
+ { value: "twitter", icon: Twitter },
+ { value: "linkedin", icon: LinkedIn },
+ { value: "instagram", icon: Instagram },
+ { value: "tiktok", icon: TikTok },
+];
+
type ProgramPartnerNetworkPageClientProps = {
variant?: "default" | "ignored";
};
@@ -86,8 +112,18 @@ export function ProgramPartnerNetworkPageClient({
PARTNER_NETWORK_MAX_PAGE_SIZE,
);
- const { filters, activeFilters, onSelect, onRemove, onRemoveAll } =
- usePartnerNetworkFilters({ status });
+ const {
+ filters,
+ activeFilters,
+ isFiltered,
+ onSelect,
+ onRemove,
+ onRemoveAll,
+ } = usePartnerNetworkFilters({ status });
+
+ const isStarred = searchParams.get("starred") === "true";
+ const selectedPlatform =
+ (searchParams.get("platform") as PlatformType | null) ?? "all";
const [detailsSheetState, setDetailsSheetState] = useState<
| { open: false; partnerId: string | null }
@@ -187,28 +223,58 @@ export function ProgramPartnerNetworkPageClient({
{status === "discover" && (
<div className="mt-[17px]">
- <div className="xs:flex-row xs:items-center flex flex-col gap-4">
+ <div className="flex flex-col items-center gap-4 md:flex-row">
<Filter.Select
- className="h-9 w-full rounded-lg md:w-fit"
+ className="h-10 w-full shrink-0 rounded-lg md:w-fit"
filters={filters}
activeFilters={activeFilters}
onSelect={onSelect}
onRemove={onRemove}
/>
- <label className="flex items-center gap-2">
- <Switch
- checked={searchParams.get("starred") == "true"}
- fn={(checked) => {
+ <div className="flex items-center gap-4">
+ <ToggleGroup
+ className="h-10 w-full rounded-lg border-neutral-200 bg-neutral-50 p-0 md:w-fit"
+ optionClassName="rounded-lg px-3 py-2.5"
+ indicatorClassName="rounded-lg bg-white border-none shadow-[0_0_0_1px_rgba(0,0,0,0.02),0_1px_3px_0_rgba(0,0,0,0.08)]"
+ options={PLATFORM_TOGGLE_OPTIONS.map(
+ ({ value, icon: Icon }) => ({
+ value,
+ label: <Icon className="size-4" />,
+ }),
+ )}
+ selected={selectedPlatform}
+ selectAction={(option) => {
+ if (option === "all") {
+ queryParams({
+ del: ["platform", "page"],
+ });
+ } else {
+ queryParams({
+ set: { platform: option },
+ del: "page",
+ });
+ }
+ }}
+ />
+ <Button
+ type="button"
+ variant="secondary"
+ onClick={() => {
queryParams({
- set: checked ? { starred: "true" } : undefined,
- del: ["page", ...(!checked ? ["starred"] : [])],
+ set: !isStarred ? { starred: "true" } : undefined,
+ del: ["page", ...(!isStarred ? [] : ["starred"])],
});
}}
+ icon={
+ isStarred ? (
+ <StarFill className="size-4 text-amber-500" />
+ ) : (
+ <Star className="text-content-subtle size-4" />
+ )
+ }
+ className="size-10 shrink-0 rounded-lg"
/>
- <span className="text-content-emphasis text-sm font-medium">
- Starred
- </span>
- </label>
+ </div>
</div>
<AnimatedSizeContainer height>
{activeFilters.length > 0 && (
@@ -309,12 +375,8 @@ export function ProgramPartnerNetworkPageClient({
</div>
) : (
<NetworkEmptyState
- isFiltered={activeFilters.length > 0}
- isStarred={
- variant === "ignored"
- ? false
- : searchParams.get("starred") == "true"
- }
+ isFiltered={isFiltered}
+ isStarred={variant === "ignored" ? false : isStarred}
onClearAllFilters={onRemoveAll}
variant={variant === "ignored" ? "ignored" : "default"}
/>
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/use-partner-network-filters.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/use-partner-network-filters.tsx
index 161538a7c5..88175e61f6 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/use-partner-network-filters.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/use-partner-network-filters.tsx
@@ -1,18 +1,7 @@
import useNetworkPartnersCount from "@/lib/swr/use-network-partners-count";
import { CountryFlag } from "@/ui/shared/country-flag";
-import { PlatformType } from "@dub/prisma/client";
import { useRouterStuff } from "@dub/ui";
-import {
- FlagWavy,
- Globe,
- Instagram,
- LinkedIn,
- Megaphone,
- ShieldCheck,
- TikTok,
- Twitter,
- YouTube,
-} from "@dub/ui/icons";
+import { FlagWavy } from "@dub/ui/icons";
import { COUNTRIES, nFormatter } from "@dub/utils";
import { useCallback, useMemo } from "react";
@@ -37,59 +26,6 @@ export function usePartnerNetworkFilters({
excludeParams: ["country"],
});
- const { data: platformsCount } = useNetworkPartnersCount<
- | {
- platform: PlatformType;
- _count: number;
- }[]
- | undefined
- >({
- query: {
- status,
- groupBy: "platform",
- },
- excludeParams: ["platform"],
- });
-
- const { data: subscribersCount } = useNetworkPartnersCount<
- | {
- subscribers: string;
- _count: number;
- }[]
- | undefined
- >({
- query: {
- status,
- groupBy: "subscribers",
- },
- excludeParams: ["subscribers"],
- });
-
- const platformIcons: Record<PlatformType, typeof YouTube> = {
- youtube: YouTube,
- twitter: Twitter,
- instagram: Instagram,
- tiktok: TikTok,
- linkedin: LinkedIn,
- website: Globe,
- };
-
- const platformLabels: Record<PlatformType, string> = {
- youtube: "YouTube",
- twitter: "X/Twitter",
- instagram: "Instagram",
- tiktok: "TikTok",
- linkedin: "LinkedIn",
- website: "Website",
- };
-
- const subscriberLabels: Record<string, string> = {
- "<5000": "< 5,000",
- "5000-25000": "5,000 - 25,000",
- "25000-100000": "25,000 - 100,000",
- "100000+": "100,000+",
- };
-
const filters = useMemo(
() => [
{
@@ -109,43 +45,14 @@ export function usePartnerNetworkFilters({
right: nFormatter(_count, { full: true }),
})) ?? [],
},
- {
- key: "platform",
- icon: ShieldCheck,
- label: "Verified social platform",
- getOptionIcon: (value: PlatformType) => {
- const Icon = platformIcons[value] || YouTube;
- return <Icon className="size-4" />;
- },
- getOptionLabel: (value: PlatformType) => platformLabels[value] || value,
- options:
- platformsCount?.map(({ platform, _count }) => ({
- value: platform,
- label: platformLabels[platform] || platform,
- right: nFormatter(_count, { full: true }),
- })) ?? [],
- },
- {
- key: "subscribers",
- icon: Megaphone,
- label: "Verified subscriber count",
- getOptionIcon: () => <Megaphone className="size-4" />,
- getOptionLabel: (value: string) => subscriberLabels[value] || value,
- options:
- subscribersCount?.map(({ subscribers, _count }) => ({
- value: subscribers,
- label: subscriberLabels[subscribers] || subscribers,
- right: nFormatter(_count, { full: true }),
- })) ?? [],
- },
],
- [countriesCount, platformsCount, subscribersCount],
+ [countriesCount],
);
const multiFilters = useMemo(() => ({}), []) as Record<string, string[]>;
const activeFilters = useMemo(() => {
- const { country, platform, subscribers } = searchParamsObj;
+ const { country } = searchParamsObj;
return [
...Object.entries(multiFilters)
@@ -153,8 +60,6 @@ export function usePartnerNetworkFilters({
.filter(({ value }) => value.length > 0),
...(country ? [{ key: "country", value: country }] : []),
- ...(platform ? [{ key: "platform", value: platform }] : []),
- ...(subscribers ? [{ key: "subscribers", value: subscribers }] : []),
];
}, [searchParamsObj, multiFilters]);
@@ -197,12 +102,15 @@ export function usePartnerNetworkFilters({
const onRemoveAll = useCallback(
() =>
queryParams({
- del: ["country", "starred", "platform", "subscribers"],
+ del: ["country", "starred", "platform"],
}),
[queryParams],
);
- const isFiltered = activeFilters.length > 0 || searchParamsObj.search;
+ const isFiltered =
+ activeFilters.length > 0 ||
+ !!searchParamsObj.platform ||
+ !!searchParamsObj.search;
return {
filters,