Merge pull request #747 from escapade-mckv/tolt

Tolt

backend/services/billing.py

@@ -14,6 +14,8 @@ from services.supabase import DBConnection
 from utils.auth_utils import get_current_user_id_from_jwt
 from pydantic import BaseModel
 from utils.constants import MODEL_ACCESS_TIERS, MODEL_NAME_ALIASES
+import os
+
 # Initialize Stripe
 stripe.api_key = config.STRIPE_SECRET_KEY
 
@@ -37,6 +39,7 @@ class CreateCheckoutSessionRequest(BaseModel):
     price_id: str
     success_url: str
     cancel_url: str
+    tolt_referral: Optional[str] = None
 
 class CreatePortalSessionRequest(BaseModel):
     return_url: str
@@ -542,7 +545,6 @@ async def create_checkout_session(
                 logger.exception(f"Error updating subscription {existing_subscription.get('id') if existing_subscription else 'N/A'}: {str(e)}")
                 raise HTTPException(status_code=500, detail=f"Error updating subscription: {str(e)}")
         else:
-            # --- Create New Subscription via Checkout Session ---
             session = stripe.checkout.Session.create(
                 customer=customer_id,
                 payment_method_types=['card'],
@@ -552,7 +554,8 @@ async def create_checkout_session(
                 cancel_url=request.cancel_url,
                 metadata={
                         'user_id': current_user_id,
-                        'product_id': product_id
+                        'product_id': product_id,
+                        'tolt_referral': request.tolt_referral
                 },
                 allow_promotion_codes=True
             )

frontend/src/app/(dashboard)/(personalAccount)/settings/layout.tsx

@@ -3,6 +3,7 @@
 import { Separator } from '@/components/ui/separator';
 import Link from 'next/link';
 import { usePathname } from 'next/navigation';
+import Script from 'next/script';
 
 export default function PersonalAccountSettingsPage({
   children,
@@ -16,30 +17,30 @@ export default function PersonalAccountSettingsPage({
     { name: 'Billing', href: '/settings/billing' },
   ];
   return (
-    <div className="space-y-6 w-full">
+    <>
-      <Separator className="border-subtle dark:border-white/10" />
+      <div className="space-y-6 w-full">
-      <div className="flex flex-col space-y-8 lg:flex-row lg:space-x-12 lg:space-y-0 w-full max-w-6xl mx-auto px-4">
+        <Separator className="border-subtle dark:border-white/10" />
-        <aside className="lg:w-1/4 p-1">
+        <div className="flex flex-col space-y-8 lg:flex-row lg:space-x-12 lg:space-y-0 w-full max-w-6xl mx-auto px-4">
-          <nav className="flex flex-col space-y-1">
+          <aside className="lg:w-1/4 p-1">
-            {items.map((item) => (
+            <nav className="flex flex-col space-y-1">
-              <Link
+              {items.map((item) => (
-                key={item.href}
+                <Link
-                href={item.href}
+                  key={item.href}
-                className={`px-3 py-2 rounded-md text-sm font-medium transition-colors ${
+                  href={item.href}
-                  pathname === item.href
+                  className={`px-3 py-2 rounded-md text-sm font-medium transition-colors ${pathname === item.href
-                    ? 'bg-accent text-accent-foreground'
+                      ? 'bg-accent text-accent-foreground'
-                    : 'text-muted-foreground hover:bg-accent/50 hover:text-accent-foreground'
+                      : 'text-muted-foreground hover:bg-accent/50 hover:text-accent-foreground'}`}
-                }`}
+                >
-              >
+                  {item.name}
-                {item.name}
+                </Link>
-              </Link>
+              ))}
-            ))}
+            </nav>
-          </nav>
+          </aside>
-        </aside>
+          <div className="flex-1 bg-card-bg dark:bg-background-secondary p-6 rounded-2xl border border-subtle dark:border-white/10 shadow-custom">
-        <div className="flex-1 bg-card-bg dark:bg-background-secondary p-6 rounded-2xl border border-subtle dark:border-white/10 shadow-custom">
+            {children}
-          {children}
+          </div>
         </div>
       </div>
-    </div>
+    </>
   );
 }

frontend/src/app/layout.tsx

@@ -123,13 +123,12 @@ export default function RootLayout({
           'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
           })(window,document,'script','dataLayer','GTM-PCHSN4M2');`}
         </Script>
-        {/* End Google Tag Manager */}
+        <Script async src="https://cdn.tolt.io/tolt.js" data-tolt={process.env.NEXT_PUBLIC_TOLT_REFERRAL_ID}></Script>
       </head>
 
       <body
         className={`${geistSans.variable} ${geistMono.variable} antialiased font-sans bg-background`}
       >
-        {/* Google Tag Manager (noscript) */}
         <noscript>
           <iframe
             src="https://www.googletagmanager.com/ns.html?id=GTM-PCHSN4M2"

frontend/src/lib/api.ts

@@ -1500,6 +1500,7 @@ export interface CreateCheckoutSessionRequest {
   price_id: string;
   success_url: string;
   cancel_url: string;
+  referral_id?: string;
 }
 
 export interface CreatePortalSessionRequest {
@@ -1588,14 +1589,18 @@ export const createCheckoutSession = async (
     if (!session?.access_token) {
       throw new NoAccessTokenAvailableError();
     }
-
+    
+    
+    const requestBody = { ...request, tolt_referral: window.tolt_referral };
+    console.log('Tolt Referral ID:', requestBody.tolt_referral);
+    
     const response = await fetch(`${API_URL}/billing/create-checkout-session`, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
         Authorization: `Bearer ${session.access_token}`,
       },
-      body: JSON.stringify(request),
+      body: JSON.stringify(requestBody),
     });
 
     if (!response.ok) {