Skip to content

Commit 9356da8

Browse files
committed
Merge branch 'app-program-marketplace-categories' into external-program-marketplace
2 parents 4d934fe + 27f5733 commit 9356da8

1,147 files changed

Lines changed: 1498 additions & 1686 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

apps/web/app/(ee)/admin.dub.co/(dashboard)/partners/fraud/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import { adminFraudAlertSchema } from "@/lib/zod/schemas/admin";
44
import { PartnerAvatar } from "@/ui/partners/partner-avatar";
5-
import { FraudAlertStatus } from "@dub/prisma/client";
65
import {
76
Filter,
87
StatusBadge,
@@ -14,6 +13,7 @@ import {
1413
} from "@dub/ui";
1514
import { CircleDotted, GridIcon } from "@dub/ui/icons";
1615
import { fetcher, formatDate, formatDateTime, OG_AVATAR_URL } from "@dub/utils";
16+
import { FraudAlertStatus } from "@prisma/client";
1717
import { Suspense, useCallback, useMemo, useState } from "react";
1818
import useSWR from "swr";
1919
import * as z from "zod/v4";

apps/web/app/(ee)/admin.dub.co/(dashboard)/partners/fraud/review-fraud-alert-sheet.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import {
1414
} from "@/lib/zod/schemas/programs";
1515
import { PartnerAvatar } from "@/ui/partners/partner-avatar";
1616
import { PayoutStatusBadges } from "@/ui/partners/payout-status-badges";
17-
import { FraudAlertStatus } from "@dub/prisma/client";
1817
import {
1918
Button,
2019
LoadingSpinner,
@@ -33,6 +32,7 @@ import {
3332
formatDateTimeSmart,
3433
OG_AVATAR_URL,
3534
} from "@dub/utils";
35+
import { FraudAlertStatus } from "@prisma/client";
3636
import Link from "next/link";
3737
import { useState } from "react";
3838
import { toast } from "sonner";

apps/web/app/(ee)/admin.dub.co/(dashboard)/partners/network/network-partner-application-sheet.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { PartnerInfoCards } from "@/ui/partners/partner-info-cards";
99
import { PartnerStatusBadges } from "@/ui/partners/partner-status-badges";
1010
import { CountryFlag } from "@/ui/shared/country-flag";
1111
import { X } from "@/ui/shared/icons";
12-
import { ProgramEnrollmentStatus } from "@dub/prisma/client";
1312
import {
1413
Button,
1514
ChevronLeft,
@@ -24,6 +23,7 @@ import {
2423
Users,
2524
} from "@dub/ui";
2625
import { cn, COUNTRIES, currencyFormatter, OG_AVATAR_URL } from "@dub/utils";
26+
import { ProgramEnrollmentStatus } from "@prisma/client";
2727
import { LayoutGroup, motion } from "motion/react";
2828
import Link from "next/link";
2929
import { useEffect, useId, useState } from "react";

apps/web/app/(ee)/admin.dub.co/(dashboard)/partners/network/network-partner-change-history-item.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import { AdminNetworkPartner } from "@/lib/types";
44
import { NetworkStatusBadges } from "@/ui/partners/partner-network/network-status-badges";
55
import { getPayoutMethodLabel } from "@/ui/partners/payouts/payout-method-config";
66
import { CountryFlag } from "@/ui/shared/country-flag";
7-
import { PartnerPayoutMethod } from "@dub/prisma/client";
87
import { StatusBadge, TimestampTooltip } from "@dub/ui";
98
import { capitalize, COUNTRIES, formatDate } from "@dub/utils";
9+
import { PartnerPayoutMethod } from "@prisma/client";
1010

1111
type PartnerChangeLogEntry = NonNullable<
1212
AdminNetworkPartner["changeHistoryLog"]

apps/web/app/(ee)/admin.dub.co/(dashboard)/partners/network/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { PartnerRowItem } from "@/ui/partners/partner-row-item";
77
import { PartnerSocialColumn } from "@/ui/partners/partner-social-column";
88
import { CountryFlag } from "@/ui/shared/country-flag";
99
import { SearchBoxPersisted } from "@/ui/shared/search-box";
10-
import { PartnerNetworkStatus, PlatformType } from "@dub/prisma/client";
1110
import {
1211
Filter,
1312
StatusBadge,
@@ -19,6 +18,7 @@ import {
1918
} from "@dub/ui";
2019
import { CircleDotted, FlagWavy } from "@dub/ui/icons";
2120
import { cn, COUNTRIES, fetcher, formatDate } from "@dub/utils";
21+
import { PartnerNetworkStatus, PlatformType } from "@prisma/client";
2222
import { Row } from "@tanstack/react-table";
2323
import { useEffect, useMemo, useState } from "react";
2424
import { toast } from "sonner";

apps/web/app/(ee)/admin.dub.co/(dashboard)/partners/trusted/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import { PARTNER_PLATFORM_FIELDS } from "@/lib/partners/partner-platforms";
44
import { useConfirmModal } from "@/ui/modals/confirm-modal";
55
import { PartnerAvatar } from "@/ui/partners/partner-avatar";
6-
import { PlatformType } from "@dub/prisma/client";
76
import { Button, CopyText, Sheet, TimestampTooltip, Tooltip } from "@dub/ui";
87
import {
98
BadgeCheck2Fill,
@@ -15,6 +14,7 @@ import {
1514
YouTube,
1615
} from "@dub/ui/icons";
1716
import { cn, fetcher, formatDateSmart } from "@dub/utils";
17+
import { PlatformType } from "@prisma/client";
1818
import Link from "next/link";
1919
import { FormEvent, useCallback, useEffect, useMemo, useState } from "react";
2020
import { toast } from "sonner";

apps/web/app/(ee)/admin.dub.co/(dashboard)/payouts/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { AnalyticsLoadingSpinner } from "@/ui/analytics/analytics-loading-spinne
55
import { PayoutStatusBadges } from "@/ui/partners/payout-status-badges";
66
import { FilterButtonTableRow } from "@/ui/shared/filter-button-table-row";
77
import SimpleDateRangePicker from "@/ui/shared/simple-date-range-picker";
8-
import { InvoiceStatus } from "@dub/prisma/client";
98
import {
109
Badge,
1110
Button,
@@ -26,6 +25,7 @@ import {
2625
OG_AVATAR_URL,
2726
} from "@dub/utils";
2827
import NumberFlow from "@number-flow/react";
28+
import { InvoiceStatus } from "@prisma/client";
2929
import Link from "next/link";
3030
import { Fragment, Suspense, useCallback, useMemo } from "react";
3131
import useSWR from "swr";

apps/web/app/(ee)/admin.dub.co/(dashboard)/programs/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
"use client";
22

33
import { useConfirmModal } from "@/ui/modals/confirm-modal";
4-
import { Category } from "@dub/prisma/client";
54
import {
65
Button,
76
CrownSmall,
@@ -13,6 +12,7 @@ import {
1312
} from "@dub/ui";
1413
import { Xmark } from "@dub/ui/icons";
1514
import { cn, fetcher, getDomainWithoutWWW, OG_AVATAR_URL } from "@dub/utils";
15+
import { Category } from "@prisma/client";
1616
import {
1717
ProgramCategoriesList,
1818
UpdateProgramCategoriesModal,

apps/web/app/(ee)/admin.dub.co/(dashboard)/programs/program-categories-list.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import {
33
PROGRAM_CATEGORIES,
44
PROGRAM_CATEGORIES_MAP,
55
} from "@/lib/network/program-categories";
6-
import { Category } from "@dub/prisma/client";
76
import { Button, Checkbox, Modal, Tag, Tooltip, TruncatedList } from "@dub/ui";
87
import { cn } from "@dub/utils";
8+
import { Category } from "@prisma/client";
99
import {
1010
Dispatch,
1111
SetStateAction,

apps/web/app/(ee)/api/admin/ban/route.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { deleteWorkspaceAdmin } from "@/lib/api/workspaces/delete-workspace";
22
import { withAdmin } from "@/lib/auth";
33
import { updateConfig } from "@/lib/edge-config";
4+
import { prisma } from "@/lib/prisma";
45
import { isStored, storage } from "@/lib/storage";
5-
import { prisma } from "@dub/prisma";
66
import { R2_URL } from "@dub/utils";
77
import { waitUntil } from "@vercel/functions";
88
import { NextResponse } from "next/server";

0 commit comments

Comments
 (0)