fix : script colors

izadoesdev · izadoesdev · commit 3a5d28ded62b · 2025-09-12T23:32:46.000+03:00
diff --git a/apps/dashboard/app/(main)/websites/[id]/_components/tabs/settings-tab.tsx b/apps/dashboard/app/(main)/websites/[id]/_components/tabs/settings-tab.tsx
diff --git a/apps/dashboard/app/(main)/websites/[id]/_components/tabs/tracking-setup-tab.tsx b/apps/dashboard/app/(main)/websites/[id]/_components/tabs/tracking-setup-tab.tsx
diff --git a/apps/dashboard/app/(main)/websites/[id]/_components/utils/code-generators.ts b/apps/dashboard/app/(main)/websites/[id]/_components/utils/code-generators.ts
@@ -124,3 +124,49 @@ export function generateNpmComponentCode(
 	return `<Databuddy
   clientId="${websiteId}"${propsString}/>`;
 }
+
+/**
+ * Generate NPM code for Vercel integration (auto-detects clientId)
+ */
+export function generateVercelNpmCode(
+	trackingOptions: TrackingOptions
+): string {
+	const meaningfulProps = Object.entries(trackingOptions)
+		.filter(([key, value]) => {
+			const actualDefault =
+				ACTUAL_LIBRARY_DEFAULTS[key as keyof TrackingOptions];
+			if (value === actualDefault) {
+				return false;
+			}
+			if (typeof value === 'boolean' && !value && !actualDefault) {
+				return false;
+			}
+			return true;
+		})
+		.map(([key, value]) => {
+			if (typeof value === 'boolean') {
+				return `        ${key}={${value}}`;
+			}
+			if (typeof value === 'string') {
+				return `        ${key}="${value}"`;
+			}
+			return `        ${key}={${value}}`;
+		});
+
+	const propsString =
+		meaningfulProps.length > 0 ? `\n${meaningfulProps.join('\n')}\n      ` : '';
+
+	return `import { Databuddy } from '@databuddy/sdk/react';
+
+export default function RootLayout({ children }) {
+  return (
+    <html>
+      <head>
+        {/* No clientId needed - auto-detected from env vars */}
+        <Databuddy${propsString}/>
+      </head>
+      <body>{children}</body>
+    </html>
+  );
+}`;
+}
diff --git a/packages/rpc/src/routers/websites.ts b/packages/rpc/src/routers/websites.ts
@@ -412,11 +412,35 @@ export const websitesRouter = createTRPCRouter({
 	isTrackingSetup: publicProcedure
 		.input(z.object({ websiteId: z.string() }))
 		.query(async ({ ctx, input }) => {
-			await authorizeWebsiteAccess(ctx, input.websiteId, 'read');
+			const website = await authorizeWebsiteAccess(
+				ctx,
+				input.websiteId,
+				'read'
+			);
+
+			// Check if website has Vercel integration (has NEXT_PUBLIC_DATABUDDY_CLIENT_ID env var)
+			const hasVercelIntegration = !!(website.integrations as any)?.vercel
+				?.environments;
+
+			// Always check for actual tracking events
 			const trackingCheckResult = await chQuery<{ count: number }>(
 				`SELECT COUNT(*) as count FROM analytics.events WHERE client_id = {websiteId:String} AND event_name = 'screen_view' LIMIT 1`,
 				{ websiteId: input.websiteId }
 			);
-			return { tracking_setup: (trackingCheckResult[0]?.count ?? 0) > 0 };
+
+			const hasTrackingEvents = (trackingCheckResult[0]?.count ?? 0) > 0;
+
+			// Determine integration type
+			let integrationType: 'vercel' | 'manual' | null = null;
+			if (hasVercelIntegration) {
+				integrationType = 'vercel';
+			} else if (hasTrackingEvents) {
+				integrationType = 'manual';
+			}
+
+			return {
+				tracking_setup: hasTrackingEvents,
+				integration_type: integrationType,
+			};
 		}),
 });
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@databuddy/sdk",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "Official Databuddy Analytics SDK",
   "main": "./dist/core/index.mjs",
   "types": "./dist/core/index.d.ts",
diff --git a/packages/sdk/src/core/index.ts b/packages/sdk/src/core/index.ts
@@ -1,3 +1,4 @@
+export { detectClientId } from '../utils';
 export * from './script';
 export * from './tracker';
 export * from './types';
diff --git a/packages/sdk/src/core/types.ts b/packages/sdk/src/core/types.ts
@@ -4,11 +4,12 @@
  */
 export interface DatabuddyConfig {
 	/**
-	 * Your Databuddy project client ID (required).
+	 * Your Databuddy project client ID.
+	 * If not provided, will automatically detect from NEXT_PUBLIC_DATABUDDY_CLIENT_ID environment variable.
 	 * Get this from your Databuddy dashboard.
 	 * Example: '3ed1fce1-5a56-4cbc-a917-66864f6d18e3'
 	 */
-	clientId: string;
+	clientId?: string;
 
 	/**
 	 * (Advanced) Your Databuddy client secret for server-side operations.
diff --git a/packages/sdk/src/react/Databuddy.ts b/packages/sdk/src/react/Databuddy.ts
@@ -1,15 +1,29 @@
 import { createScript, isScriptInjected } from '../core/script';
 import type { DatabuddyConfig } from '../core/types';
+import { detectClientId } from '../utils';
 
 /**
  * <Databuddy /> component for Next.js/React apps
  * Injects the databuddy.js script with all config as data attributes
  * Usage: <Databuddy clientId="..." trackScreenViews trackPerformance ... />
+ * Or simply: <Databuddy /> (auto-detects clientId from environment variables)
  */
 export function Databuddy(props: DatabuddyConfig) {
+	const clientId = detectClientId(props.clientId);
+
+	// Don't inject if no client ID is available
+	if (!clientId) {
+		if (typeof window !== 'undefined' && !props.disabled) {
+			console.warn(
+				'Databuddy: No client ID found. Please provide clientId prop or set NEXT_PUBLIC_DATABUDDY_CLIENT_ID environment variable.'
+			);
+		}
+		return null;
+	}
+
 	// Only inject script on client-side and if not already injected
 	if (typeof window !== 'undefined' && !props.disabled && !isScriptInjected()) {
-		const script = createScript(props);
+		const script = createScript({ ...props, clientId });
 		document.head.appendChild(script);
 	}
 
diff --git a/packages/sdk/src/utils.ts b/packages/sdk/src/utils.ts
@@ -4,3 +4,49 @@ export type IsOptional<T> = IsAny<T> extends true
 	: Extract<T, undefined> extends never
 		? false
 		: true;
+
+/**
+ * Auto-detect Databuddy client ID from environment variables
+ * Supports Next.js, Nuxt, and other frameworks
+ */
+export function detectClientId(providedClientId?: string): string | undefined {
+	if (providedClientId) {
+		return providedClientId;
+	}
+
+	// Try to get from environment variables
+	if (typeof process !== 'undefined' && process.env) {
+		return (
+			process.env.NEXT_PUBLIC_DATABUDDY_CLIENT_ID ||
+			process.env.NUXT_PUBLIC_DATABUDDY_CLIENT_ID ||
+			process.env.VITE_DATABUDDY_CLIENT_ID ||
+			process.env.REACT_APP_DATABUDDY_CLIENT_ID
+		);
+	}
+
+	// Fallback for browser environments where process.env might not be available
+	if (typeof window !== 'undefined') {
+		// Next.js runtime config
+		// @ts-expect-error - This might be injected by build tools
+		const nextEnv = window.__NEXT_DATA__?.env?.NEXT_PUBLIC_DATABUDDY_CLIENT_ID;
+		if (nextEnv) {
+			return nextEnv;
+		}
+
+		// Nuxt runtime config
+		// @ts-expect-error - This might be injected by build tools
+		const nuxtEnv = window.__NUXT__?.env?.NUXT_PUBLIC_DATABUDDY_CLIENT_ID;
+		if (nuxtEnv) {
+			return nuxtEnv;
+		}
+
+		// Vite/other build tools might inject env vars differently
+		// @ts-expect-error - This might be injected by build tools
+		const viteEnv = window.__VITE_ENV__?.VITE_DATABUDDY_CLIENT_ID;
+		if (viteEnv) {
+			return viteEnv;
+		}
+	}
+
+	return;
+}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@databuddy/sdk",`
`3`		`- "version": "2.0.0",`
	`3`	`+ "version": "2.1.0",`
`4`	`4`	`"description": "Official Databuddy Analytics SDK",`
`5`	`5`	`"main": "./dist/core/index.mjs",`
`6`	`6`	`"types": "./dist/core/index.d.ts",`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+export { detectClientId } from '../utils';`
`1`	`2`	`export * from './script';`
`2`	`3`	`export * from './tracker';`
`3`	`4`	`export * from './types';`