Merge pull request #21 from eersnington/polar-to-dodopayments

Polar to dodopayments

Author: eersnington

apps/web/.env.example

@@ -2,11 +2,6 @@
 RESEND_API_KEY="re_"
 RESEND_SENDER_EMAIL_AUTH="[email protected]"
 
-# Polar
-POLAR_ORGANIZATION_TOKEN=""
-POLAR_WEBHOOK_SECRET=""
-POLAR_ENVIRONMENT="sandbox"
-
 # Databuddy Analytics
 NEXT_PUBLIC_DATABUDDY_CLIENT_ID=""
 

apps/web/package.json

@@ -8,13 +8,11 @@
     "start": "next start"
   },
   "dependencies": {
-    "@diff0/analytics": "workspace:*",
     "@diff0/ai": "workspace:*",
+    "@diff0/analytics": "workspace:*",
     "@diff0/backend": "workspace:*",
     "@diff0/sandbox": "workspace:*",
     "@hookform/resolvers": "^5.2.2",
-    "@polar-sh/nextjs": "^0.4.9",
-    "@polar-sh/sdk": "^0.35.4",
     "@radix-ui/react-accordion": "^1.2.12",
     "@radix-ui/react-alert-dialog": "^1.1.15",
     "@radix-ui/react-aspect-ratio": "^1.1.7",

apps/web/src/app/(dashboard)/billing/billing-content.tsx

@@ -1,9 +1,9 @@
 "use client";
 
-import { api } from "@diff0/backend/convex/_generated/api";
+import type { api } from "@diff0/backend/convex/_generated/api";
 import { authClient } from "@diff0/backend/lib/auth-client";
 import type { Preloaded } from "convex/react";
-import { useAction, usePreloadedQuery } from "convex/react";
+import { usePreloadedQuery } from "convex/react";
 import { Beaker, CreditCard, Loader2, TrendingUp } from "lucide-react";
 import Link from "next/link";
 import { useState } from "react";
@@ -61,17 +61,13 @@ export function BillingContent({ preloadedBillingData }: BillingContentProps) {
       day: "numeric",
     });
 
-  const ensurePolarCustomer = useAction(api.polarHelpers.ensurePolarCustomer);
-
   const handlePurchase = async (slug: string) => {
     setLoadingSlug(slug);
     toast.loading("Just a sec", {
       description: "Consulting the Orb 🔮 to summon your user essence...",
     });
     try {
-      await ensurePolarCustomer();
-
-      await authClient.checkout({
+      await authClient.dodopayments.checkout({
         slug,
       });
     } catch (_error) {
@@ -238,7 +234,7 @@ export function BillingContent({ preloadedBillingData }: BillingContentProps) {
               ))}
             </div>
             <p className="mt-4 text-muted-foreground text-sm">
-              Payment processing via Polar. Credits expire in 1 year.
+              Payment processing via Dodopayments. Credits expire in 1 year.
             </p>
           </CardContent>
         </Card>

apps/web/src/app/(dashboard)/billing/loading.tsx

@@ -1,5 +1,5 @@
 import { Skeleton } from "@/components/ui/skeleton";
 
 export default function Loading() {
-  return <Skeleton className="flex h-full m-2" />
+  return <Skeleton className="m-2 flex h-full" />;
 }

apps/web/src/app/(dashboard)/billing/success/loading.tsx

@@ -1,5 +1,5 @@
 import { Skeleton } from "@/components/ui/skeleton";
 
 export default function Loading() {
-  return <Skeleton className="flex h-full m-2" />
+  return <Skeleton className="m-2 flex h-full" />;
 }

apps/web/src/app/(dashboard)/billing/success/success-content.tsx

@@ -18,21 +18,19 @@ const CENTS_TO_CURRENCY_UNIT = 100;
 
 export function SuccessContent() {
   const searchParams = useSearchParams();
-  const checkoutId = searchParams.get("checkout_id");
+  const paymentId = searchParams.get("payment_id");
 
-  const checkoutDetails = useQuery(
-    api.polar.queries.getCheckoutDetails,
-    checkoutId ? { checkoutId } : "skip"
+  const paymentDetails = useQuery(
+    api.payments.queries.getPaymentDetails,
+    paymentId ? { paymentId } : "skip"
   );
 
-  if (!checkoutId) {
+  if (!paymentId) {
     return (
       <Card className="w-full max-w-md">
         <CardHeader className="text-center">
           <CardTitle className="text-2xl">Invalid Request</CardTitle>
-          <CardDescription>
-            No checkout ID provided in the URL
-          </CardDescription>
+          <CardDescription>No payment ID provided in the URL</CardDescription>
         </CardHeader>
         <CardContent>
           <Button asChild className="w-full">
@@ -43,7 +41,7 @@ export function SuccessContent() {
     );
   }
 
-  if (checkoutDetails === undefined) {
+  if (paymentDetails === undefined) {
     return (
       <Card className="w-full max-w-md">
         <CardHeader className="text-center">
@@ -59,13 +57,13 @@ export function SuccessContent() {
     );
   }
 
-  if (!checkoutDetails) {
+  if (!paymentDetails) {
     return (
       <Card className="w-full max-w-md">
         <CardHeader className="text-center">
           <CardTitle className="text-2xl">Order Not Found</CardTitle>
           <CardDescription>
-            We couldn't find an order with this checkout ID
+            We couldn't find an order with this payment ID
           </CardDescription>
         </CardHeader>
         <CardContent>
@@ -77,7 +75,7 @@ export function SuccessContent() {
     );
   }
 
-  const { order, credits } = checkoutDetails;
+  const { order, credits } = paymentDetails;
 
   return (
     <Card className="w-full max-w-md">

apps/web/src/app/(dashboard)/dashboard/loading.tsx

@@ -1,5 +1,5 @@
 import { Skeleton } from "@/components/ui/skeleton";
 
 export default function Loading() {
-  return <Skeleton className="flex h-full m-2" />
+  return <Skeleton className="m-2 flex h-full" />;
 }

apps/web/src/app/(dashboard)/settings/loading.tsx

@@ -1,5 +1,5 @@
 import { Skeleton } from "@/components/ui/skeleton";
 
 export default function Loading() {
-  return <Skeleton className="flex h-full m-2" />
+  return <Skeleton className="m-2 flex h-full" />;
 }

apps/web/src/app/(dashboard)/settings/profile/loading.tsx

@@ -1,5 +1,5 @@
 import { Skeleton } from "@/components/ui/skeleton";
 
 export default function Loading() {
-  return <Skeleton className="flex h-full m-2" />
+  return <Skeleton className="m-2 flex h-full" />;
 }