Merge pull request #780 from designsage8/fix/image-opt-billing-logger-750-767-768

feat: image optimization, billing management, and logger fixes (close…

Author: Emmzyemms

app/(dashboard)/billing/page.tsx

@@ -0,0 +1,254 @@
+"use client";
+
+import React, { useEffect, useState } from "react";
+import { useSearchParams } from "next/navigation";
+import { Check, Zap, Sparkles, Shield, ArrowRight, Loader2, AlertCircle, CheckCircle2 } from "lucide-react";
+import {
+  useUserStore,
+  selectUserPlan,
+  selectPlanUsage,
+  selectTransformQuotaRemaining,
+} from "@/app/store/userStore";
+import type { BillingPlan } from "@/app/api/billing/plans/route";
+
+export default function BillingPage() {
+  const searchParams = useSearchParams();
+  const currentPlan = useUserStore(selectUserPlan);
+  const planUsagePercent = useUserStore(selectPlanUsage);
+  const quotaRemaining = useUserStore(selectTransformQuotaRemaining);
+  const fetchUser = useUserStore((s) => s.fetchUser);
+
+  const [plans, setPlans] = useState<BillingPlan[]>([]);
+  const [loadingPlans, setLoadingPlans] = useState(true);
+  const [upgradingPlanId, setUpgradingPlanId] = useState<string | null>(null);
+  const [error, setError] = useState<string | null>(null);
+  const [successMessage, setSuccessMessage] = useState<string | null>(null);
+
+  const isSuccess = searchParams.get("success") === "true";
+  const upgradedPlanParam = searchParams.get("plan");
+
+  useEffect(() => {
+    fetchUser();
+    fetch("/api/billing/plans")
+      .then((res) => res.json())
+      .then((data) => {
+        if (data.plans) {
+          setPlans(data.plans);
+        }
+      })
+      .catch((err) => setError("Failed to load pricing plans."))
+      .finally(() => setLoadingPlans(false));
+  }, [fetchUser]);
+
+  useEffect(() => {
+    if (isSuccess && upgradedPlanParam) {
+      setSuccessMessage(
+        `Successfully upgraded to ${upgradedPlanParam.toUpperCase()} plan! Your transform quota has been updated.`
+      );
+      fetchUser();
+    }
+  }, [isSuccess, upgradedPlanParam, fetchUser]);
+
+  const handleUpgrade = async (planId: string) => {
+    if (planId === currentPlan) return;
+    setUpgradingPlanId(planId);
+    setError(null);
+
+    try {
+      const res = await fetch("/api/billing/checkout", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ planId }),
+      });
+
+      const data = await res.json();
+      if (!res.ok || !data.url) {
+        throw new Error(data.error || "Failed to initiate checkout");
+      }
+
+      // Redirect to checkout URL
+      window.location.href = data.url;
+    } catch (err) {
+      setError(err instanceof Error ? err.message : "Checkout error");
+      setUpgradingPlanId(null);
+    }
+  };
+
+  return (
+    <div className="max-w-[1200px] mx-auto space-y-10 py-6">
+      {/* Header */}
+      <div className="space-y-2">
+        <div className="inline-flex items-center gap-2 px-3 py-1 rounded-full bg-brand/10 border border-brand/20 text-brand text-xs font-bold uppercase tracking-wider">
+          <Zap className="w-3.5 h-3.5" />
+          Subscription & Billing
+        </div>
+        <h1 className="text-3xl md:text-4xl font-black text-white tracking-tight">
+          Manage Your Plan & Quotas
+        </h1>
+        <p className="text-muted text-base max-w-2xl">
+          Scale your viral video clip engine. Upgrade anytime to unlock higher AI transform quotas, 4K/8K export rendering, and priority GPU processing.
+        </p>
+      </div>
+
+      {/* Notifications */}
+      {successMessage && (
+        <div className="p-4 rounded-2xl bg-green-500/10 border border-green-500/20 text-green-400 flex items-center gap-3 text-sm font-semibold animate-in fade-in">
+          <CheckCircle2 className="w-5 h-5 shrink-0" />
+          <span>{successMessage}</span>
+        </div>
+      )}
+      {error && (
+        <div className="p-4 rounded-2xl bg-red-500/10 border border-red-500/20 text-red-400 flex items-center gap-3 text-sm font-semibold animate-in fade-in">
+          <AlertCircle className="w-5 h-5 shrink-0" />
+          <span>{error}</span>
+        </div>
+      )}
+
+      {/* Current Plan Summary Card */}
+      <div className="bg-surface border border-white/10 rounded-3xl p-6 md:p-8 space-y-6">
+        <div className="flex flex-col md:flex-row md:items-center justify-between gap-6 pb-6 border-b border-white/5">
+          <div className="space-y-1">
+            <span className="text-xs font-bold text-muted uppercase tracking-wider">Active Plan</span>
+            <div className="flex items-center gap-3">
+              <h2 className="text-2xl font-black text-white capitalize">{currentPlan} Plan</h2>
+              <span className="px-3 py-0.5 rounded-full bg-brand/10 border border-brand/20 text-brand text-xs font-bold uppercase">
+                Active
+              </span>
+            </div>
+          </div>
+
+          <div className="flex items-center gap-6">
+            <div className="text-right">
+              <span className="text-xs text-muted block">Remaining Quota</span>
+              <span className="text-xl font-extrabold text-brand">{quotaRemaining} Transforms</span>
+            </div>
+          </div>
+        </div>
+
+        {/* Live Usage Progress Bar */}
+        <div className="space-y-2">
+          <div className="flex justify-between items-center text-sm font-bold">
+            <span className="text-white">Monthly Quota Consumption</span>
+            <span className={planUsagePercent >= 90 ? "text-red-400" : "text-brand"}>
+              {planUsagePercent}% Used
+            </span>
+          </div>
+          <div className="relative h-3 w-full bg-input rounded-full overflow-hidden border border-white/5">
+            <div
+              className={`absolute top-0 left-0 h-full rounded-full transition-all duration-500 ${
+                planUsagePercent >= 90
+                  ? "bg-red-500 shadow-[0_0_12px_rgba(239,68,68,0.5)]"
+                  : planUsagePercent >= 70
+                  ? "bg-yellow-400 shadow-[0_0_12px_rgba(250,204,21,0.5)]"
+                  : "bg-brand shadow-[0_0_12px_rgba(0,229,143,0.5)]"
+              }`}
+              style={{ width: `${Math.min(100, Math.max(0, planUsagePercent))}%` }}
+            />
+          </div>
+          <p className="text-xs text-muted">
+            Quotas reset at the beginning of each billing cycle. Upgrading immediately adds new transform capacity.
+          </p>
+        </div>
+      </div>
+
+      {/* Plans Comparison Grid */}
+      <div className="space-y-6">
+        <h2 className="text-2xl font-extrabold text-white tracking-tight">Available Plans</h2>
+
+        {loadingPlans ? (
+          <div className="py-16 flex items-center justify-center">
+            <Loader2 className="w-8 h-8 text-brand animate-spin" />
+          </div>
+        ) : (
+          <div className="grid grid-cols-1 md:grid-cols-3 gap-6">
+            {plans.map((p) => {
+              const isCurrent = currentPlan === p.id;
+              const isUpgrading = upgradingPlanId === p.id;
+
+              return (
+                <div
+                  key={p.id}
+                  className={`relative bg-surface border rounded-3xl p-6 flex flex-col justify-between transition-all duration-200 ${
+                    p.popular
+                      ? "border-brand/50 shadow-[0_0_30px_rgba(0,229,143,0.15)] bg-surface/90"
+                      : "border-white/10 hover:border-white/20"
+                  }`}
+                >
+                  {p.popular && (
+                    <div className="absolute -top-3.5 left-1/2 -translate-x-1/2 bg-brand text-black font-extrabold text-[11px] uppercase tracking-wider px-3.5 py-1 rounded-full shadow-lg flex items-center gap-1">
+                      <Sparkles className="w-3 h-3 fill-black" /> Most Popular
+                    </div>
+                  )}
+
+                  <div className="space-y-5">
+                    <div>
+                      <h3 className="text-xl font-bold text-white mb-1">{p.name}</h3>
+                      <p className="text-muted text-xs min-h-[36px]">{p.description}</p>
+                    </div>
+
+                    <div className="flex items-baseline gap-1">
+                      <span className="text-4xl font-black text-white">${p.price}</span>
+                      <span className="text-muted text-xs font-semibold">/{p.interval}</span>
+                    </div>
+
+                    <div className="space-y-2.5 pt-2 border-t border-white/5">
+                      <span className="text-xs font-bold text-white/80 block">Included Features:</span>
+                      {p.features.map((feat, idx) => (
+                        <div key={idx} className="flex items-start gap-2 text-xs text-muted">
+                          <Check className="w-4 h-4 text-brand shrink-0 mt-0.5" />
+                          <span>{feat}</span>
+                        </div>
+                      ))}
+                    </div>
+                  </div>
+
+                  <div className="pt-6 mt-6 border-t border-white/5">
+                    {isCurrent ? (
+                      <button
+                        disabled
+                        className="w-full py-3 rounded-xl text-xs font-bold bg-white/5 text-white/50 border border-white/5 cursor-default flex items-center justify-center gap-2"
+                      >
+                        <Check className="w-4 h-4" /> Current Plan
+                      </button>
+                    ) : (
+                      <button
+                        onClick={() => handleUpgrade(p.id)}
+                        disabled={!!upgradingPlanId}
+                        className={`w-full py-3 rounded-xl text-xs font-bold transition-all flex items-center justify-center gap-2 ${
+                          p.popular
+                            ? "bg-brand text-black hover:bg-brand-hover shadow-[0_0_20px_rgba(0,229,143,0.3)]"
+                            : "bg-white/10 hover:bg-white/20 text-white border border-white/10"
+                        } disabled:opacity-50`}
+                      >
+                        {isUpgrading ? (
+                          <>
+                            <Loader2 className="w-4 h-4 animate-spin" /> Redirecting...
+                          </>
+                        ) : (
+                          <>
+                            Upgrade to {p.name} <ArrowRight className="w-4 h-4" />
+                          </>
+                        )}
+                      </button>
+                    )}
+                  </div>
+                </div>
+              );
+            })}
+          </div>
+        )}
+      </div>
+
+      {/* Security Guarantee */}
+      <div className="bg-input border border-white/5 rounded-2xl p-6 flex flex-col md:flex-row items-center gap-4 text-center md:text-left justify-between">
+        <div className="flex items-center gap-3">
+          <Shield className="w-6 h-6 text-brand shrink-0" />
+          <div className="text-xs text-muted">
+            <span className="font-bold text-white block">Secure Stripe Checkout</span>
+            Encrypted payment processing. Upgrade or cancel anytime from your billing dashboard.
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}

app/(dashboard)/transform/[id]/page.tsx

@@ -2,6 +2,7 @@
 
 import React, { useEffect, useRef, useState } from "react";
 import Link from "next/link";
+import Image from "next/image";
 import { useParams, useRouter } from "next/navigation";
 import {
   AlertCircle,
@@ -341,13 +342,13 @@ export default function TransformProgressPage() {
           <div className="bg-surface border border-white/5 rounded-3xl p-8 space-y-7">
             {/* Clip thumbnail placeholder */}
             <div className="flex items-center gap-4">
-              <div className="w-20 h-14 rounded-xl bg-input border border-white/5 flex items-center justify-center shrink-0">
+              <div className="relative w-20 h-14 rounded-xl bg-input border border-white/5 flex items-center justify-center shrink-0 overflow-hidden">
                 {previewUrl ? (
-                  // eslint-disable-next-line @next/next/no-img-element
-                  <img
+                  <Image
                     src={previewUrl}
                     alt="Latest preview frame"
-                    className="w-full h-full object-cover rounded-xl"
+                    fill
+                    className="object-cover rounded-xl"
                   />
                 ) : (
                   <Loader2 className="w-5 h-5 text-muted-foreground animate-spin" />
@@ -393,12 +394,12 @@ export default function TransformProgressPage() {
                 <p className="text-[11px] font-bold text-muted-foreground uppercase tracking-wider">
                   Latest Preview Frame
                 </p>
-                <div className="rounded-2xl overflow-hidden border border-white/10 bg-black aspect-video flex items-center justify-center">
-                  {/* eslint-disable-next-line @next/next/no-img-element */}
-                  <img
+                <div className="relative rounded-2xl overflow-hidden border border-white/10 bg-black aspect-video flex items-center justify-center">
+                  <Image
                     src={previewUrl}
                     alt="Preview frame from AI transformation"
-                    className="w-full h-full object-contain"
+                    fill
+                    className="object-contain"
                   />
                 </div>
               </div>

app/api/billing/checkout/route.ts

@@ -0,0 +1,97 @@
+import { NextRequest, NextResponse } from "next/server";
+import { getServerSession } from "next-auth";
+import { authOptions } from "@/app/lib/auth";
+import { checkCsrf } from "@/app/lib/csrf";
+import { parseRequestJson } from "@/app/lib/parseRequestJson";
+import { applyRateLimit } from "@/app/lib/serverRateLimit";
+import { logger } from "@/app/lib/logger";
+
+export async function POST(request: NextRequest) {
+  const rateLimited = await applyRateLimit(request, { limit: 10, windowMs: 60_000 });
+  if (rateLimited) return rateLimited;
+
+  const csrfError = checkCsrf(request);
+  if (csrfError) return csrfError;
+
+  const session = await getServerSession(authOptions);
+  if (!session?.user?.email) {
+    return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+  }
+
+  const parsed = await parseRequestJson(request);
+  if (!parsed.ok) return parsed.response;
+  const body = parsed.body as { planId?: string };
+
+  const planId = body?.planId;
+  if (!planId || !["pro", "enterprise"].includes(planId)) {
+    return NextResponse.json(
+      { error: "Invalid planId. Must be 'pro' or 'enterprise'." },
+      { status: 400 }
+    );
+  }
+
+  const stripeKey = process.env.STRIPE_SECRET_KEY;
+  const origin =
+    process.env.NEXTAUTH_URL?.replace(/\/$/, "") ??
+    `${request.nextUrl.protocol}//${request.nextUrl.host}`;
+
+  if (stripeKey) {
+    try {
+      // Dynamic import of Stripe to handle optional runtime dependency
+      const Stripe = (await import("stripe")).default;
+      const stripe = new Stripe(stripeKey, { apiVersion: "2023-10-16" as any });
+
+      const priceId =
+        planId === "pro"
+          ? process.env.STRIPE_PRO_PRICE_ID
+          : process.env.STRIPE_ENTERPRISE_PRICE_ID;
+
+      const checkoutSession = await stripe.checkout.sessions.create({
+        mode: "subscription",
+        payment_method_types: ["card"],
+        customer_email: session.user.email,
+        line_items: priceId
+          ? [{ price: priceId, quantity: 1 }]
+          : [
+              {
+                price_data: {
+                  currency: "usd",
+                  product_data: {
+                    name: `ClipsAI ${planId.toUpperCase()} Plan`,
+                    description: `Monthly subscription to ClipsAI ${planId} plan`,
+                  },
+                  unit_amount: planId === "pro" ? 2900 : 9900,
+                  recurring: { interval: "month" },
+                },
+                quantity: 1,
+              },
+            ],
+        metadata: {
+          userEmail: session.user.email,
+          plan: planId,
+        },
+        success_url: `${origin}/billing?success=true&plan=${planId}`,
+        cancel_url: `${origin}/billing?canceled=true`,
+      });
+
+      logger.info(`[billing] Created Stripe checkout session ${checkoutSession.id} for ${session.user.email}`);
+
+      return NextResponse.json({
+        url: checkoutSession.url,
+        sessionId: checkoutSession.id,
+      });
+    } catch (err) {
+      logger.error(`[billing] Stripe checkout session error: ${err instanceof Error ? err.message : String(err)}`);
+    }
+  }
+
+  // Fallback test/development response when Stripe key is not configured
+  logger.info(`[billing] Simulating checkout for plan ${planId} for user ${session.user.email}`);
+  const redirectUrl = `${origin}/billing?success=true&plan=${planId}&simulated=true`;
+
+  return NextResponse.json({
+    url: redirectUrl,
+    sessionId: `cs_simulated_${Date.now()}`,
+    simulated: true,
+  });
+}