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.

rearrange analytics internal backlink

Steven Tey5973a95eb250
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/commissions-menu-popover.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/commissions-menu-popover.tsx
index 24e2a2f160..403514daf4 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/commissions-menu-popover.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/commissions-menu-popover.tsx
@@ -1,26 +1,19 @@
"use client";
-import useWorkspace from "@/lib/swr/use-workspace";
import { useExportCommissionsModal } from "@/ui/modals/export-commissions-modal";
import { ThreeDots } from "@/ui/shared/icons";
import {
Button,
- ChartLine,
Download,
IconMenu,
Popover,
Refresh2,
- useRouterStuff,
} from "@dub/ui";
-import Link from "next/link";
import { useState } from "react";
import { useCreateClawbackSheet } from "./create-clawback-sheet";
export function CommissionsMenuPopover() {
const [openPopover, setOpenPopover] = useState(false);
- const { slug } = useWorkspace();
- const { getQueryString } = useRouterStuff();
-
const { createClawbackSheet, setIsOpen: setClawbackSheetOpen } =
useCreateClawbackSheet({});
@@ -47,27 +40,6 @@ export function CommissionsMenuPopover() {
icon={<Refresh2 className="size-4" />}
/>
</button>
- <Link
- href={`/${slug}/program/analytics/commissions${getQueryString(
- undefined,
- {
- include: [
- "interval",
- "start",
- "end",
- "partnerId",
- "groupId",
- "type",
- ],
- },
- )}`}
- className="w-full rounded-md p-2 hover:bg-neutral-100 active:bg-neutral-200"
- >
- <IconMenu
- text="View analytics"
- icon={<ChartLine className="size-4" />}
- />
- </Link>
</div>
<div className="border-t border-neutral-200" />
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/commissions-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/commissions-table.tsx
index 86132c0ba2..ce2cd019f4 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/commissions-table.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/commissions-table.tsx
@@ -21,6 +21,7 @@ import SimpleDateRangePicker from "@/ui/shared/simple-date-range-picker";
import {
AnimatedSizeContainer,
Button,
+ ChartLine,
EditColumnsButton,
Filter,
StatusBadge,
@@ -28,6 +29,7 @@ import {
TimestampTooltip,
Tooltip,
useColumnVisibility,
+ useMediaQuery,
usePagination,
useRouterStuff,
useTable,
@@ -40,6 +42,7 @@ import {
formatDateTimeSmart,
nFormatter,
} from "@dub/utils";
+import Link from "next/link";
import { useRouter } from "next/navigation";
import { useMemo } from "react";
import useSWR from "swr";
@@ -435,6 +438,9 @@ export function CommissionsTable() {
}
function CommissionsFilters() {
+ const { slug } = useWorkspace();
+ const { getQueryString } = useRouterStuff();
+ const { isMobile } = useMediaQuery();
const {
filters,
activeFilters,
@@ -449,7 +455,7 @@ function CommissionsFilters() {
return (
<div>
- <div className="flex flex-col gap-3 md:flex-row md:items-center">
+ <div className="flex w-full flex-col items-center gap-2 min-[550px]:flex-row min-[550px]:items-center">
<Filter.Select
className="w-full md:w-fit"
filters={filters}
@@ -460,10 +466,36 @@ function CommissionsFilters() {
onSearchChange={setSearch}
isAdvancedFilter
/>
- <SimpleDateRangePicker
- className="w-full sm:min-w-[200px] md:w-fit"
- defaultInterval="all"
- />
+ <div className="flex w-full grow items-center gap-2 md:w-auto">
+ <SimpleDateRangePicker
+ className="w-full min-w-0 sm:min-w-[200px] md:w-fit"
+ defaultInterval="all"
+ />
+ <div className="flex grow justify-end gap-2">
+ <Link
+ href={`/${slug}/program/analytics/commissions${getQueryString(
+ undefined,
+ {
+ include: [
+ "interval",
+ "start",
+ "end",
+ "partnerId",
+ "groupId",
+ "type",
+ ],
+ },
+ )}`}
+ >
+ <Button
+ variant="secondary"
+ className="w-fit"
+ icon={<ChartLine className="h-4 w-4 text-neutral-600" />}
+ text={isMobile ? undefined : "View Analytics"}
+ />
+ </Link>
+ </div>
+ </div>
</div>
<AnimatedSizeContainer height>
<div>
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-menu-popover.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-menu-popover.tsx
index 6c333bc52e..cf2fce9873 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-menu-popover.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-menu-popover.tsx
@@ -7,12 +7,10 @@ import { useExportApplicationsModal } from "@/ui/modals/export-applications-moda
import { ThreeDots } from "@/ui/shared/icons";
import {
Button,
- ChartLine,
Download,
IconMenu,
Popover,
useMediaQuery,
- useRouterStuff,
UserXmark,
} from "@dub/ui";
import Link from "next/link";
@@ -21,7 +19,6 @@ import { useState } from "react";
export function ApplicationsMenuPopover() {
const { slug: workspaceSlug } = useWorkspace();
const { program } = useProgram();
- const { getQueryString } = useRouterStuff();
const [openPopover, setOpenPopover] = useState(false);
@@ -59,16 +56,6 @@ export function ApplicationsMenuPopover() {
/>
</button>
</Link>
- <Link
- href={`/${workspaceSlug}/program/analytics/applications${getQueryString(undefined, { include: ["country"] })}`}
- onClick={() => setOpenPopover(false)}
- className="w-full rounded-md p-2 hover:bg-neutral-100 active:bg-neutral-200"
- >
- <IconMenu
- text="View analytics"
- icon={<ChartLine className="size-4" />}
- />
- </Link>
</div>
<div className="border-t border-neutral-200" />
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsx
index 3a70e64d53..6435bc10d4 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsx
@@ -22,12 +22,14 @@ import { PlatformType } from "@dub/prisma/client";
import {
AnimatedSizeContainer,
Button,
+ ChartLine,
EditColumnsButton,
Filter,
MenuItem,
Popover,
Table,
useColumnVisibility,
+ useMediaQuery,
usePagination,
useRouterStuff,
useTable,
@@ -36,6 +38,7 @@ import { Dots, UserCheck, Users, UserXmark } from "@dub/ui/icons";
import { COUNTRIES, fetcher, formatDate } from "@dub/utils";
import { Row } from "@tanstack/react-table";
import { Command } from "cmdk";
+import Link from "next/link";
import { useEffect, useMemo, useState } from "react";
import useSWR from "swr";
import { usePartnerFilters } from "../use-partner-filters";
@@ -63,9 +66,10 @@ const applicationsColumns = {
};
export function ProgramPartnersApplicationsPageClient() {
- const { id: workspaceId } = useWorkspace();
+ const { id: workspaceId, slug } = useWorkspace();
const { queryParams, searchParams, searchParamsObj, getQueryString } =
useRouterStuff();
+ const { isMobile } = useMediaQuery();
const sortBy = searchParams.get("sortBy") || "createdAt";
const sortOrder = searchParams.get("sortOrder") === "asc" ? "asc" : "desc";
@@ -452,7 +456,7 @@ export function ProgramPartnersApplicationsPageClient() {
<BulkRejectPartnersModal />
<div>
- <div className="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">
+ <div className="flex w-full flex-col items-center gap-2 min-[550px]:flex-row min-[550px]:items-center">
<Filter.Select
className="w-full md:w-fit"
filters={filters}
@@ -460,10 +464,29 @@ export function ProgramPartnersApplicationsPageClient() {
onSelect={onSelect}
onRemove={onRemove}
/>
- <SearchBoxPersisted
- placeholder="Search by name, email, or company"
- inputClassName="md:w-80"
- />
+ <div className="flex w-full grow items-center gap-2 md:w-auto">
+ <div className="min-w-0 flex-1">
+ <SearchBoxPersisted
+ placeholder="Search by name, email, or company"
+ inputClassName="w-full md:w-80"
+ />
+ </div>
+ <div className="flex shrink-0 justify-end gap-2">
+ <Link
+ href={`/${slug}/program/analytics/applications${getQueryString(
+ undefined,
+ { include: ["country"] },
+ )}`}
+ >
+ <Button
+ variant="secondary"
+ className="w-fit"
+ icon={<ChartLine className="h-4 w-4 text-neutral-600" />}
+ text={isMobile ? undefined : "View Analytics"}
+ />
+ </Link>
+ </div>
+ </div>
</div>
<AnimatedSizeContainer height>
<div>