Merge pull request #58 from tinybirdco/fixes02

Fixes02

Author: alrocar

.gitignore

@@ -2,3 +2,6 @@
 .venv
 .tinyb
 .tmp
+.tb_error*
+tinybird/fixtures
+

TEMPLATE.md

@@ -6,6 +6,6 @@ Fork the GitHub repository and deploy the data project to Tinybird.
 
 ## Set up the dashboard
 
-Deploy the dashboard to Vercel or use the hosted dashboard at https://dsat.tinybird.co/ using the Workspace admin [token](https://app.tinybird.co/tokens).
+Deploy the dashboard to Vercel or use the hosted dashboard at https://dsat.tinybird.app/ using the Workspace admin [token](https://app.tinybird.co/tokens).
 
 Configure webhooks for the services you want to ingest. See instructions in the [README](https://github.com/tinybirdco/dev-stack-analytics-template/blob/main/README.md).

apps/web/src/app/api/datasources/route.ts

@@ -8,7 +8,7 @@ export async function GET(request: Request) {
     return NextResponse.json({ error: 'Token is required' }, { status: 400 });
   }
 
-  const response = await fetch('https://api.tinybird.co/v0/datasources', {
+  const response = await fetch(`${process.env.NEXT_PUBLIC_TINYBIRD_API_HOST}/v0/datasources`, {
     headers: {
       'Authorization': `Bearer ${token}`,
     },

apps/web/src/app/api/pipes/route.ts

@@ -1,6 +1,6 @@
 import { NextRequest, NextResponse } from "next/server";
 
-const TINYBIRD_API_URL = "https://api.tinybird.co/v0/pipes";
+const TINYBIRD_API_URL = `${process.env.NEXT_PUBLIC_TINYBIRD_API_HOST}/v0/pipes`;
 
 export async function GET(request: NextRequest) {
   const searchParams = request.nextUrl.searchParams;

apps/web/src/app/api/query/route.ts

@@ -9,7 +9,7 @@ export async function GET(request: Request) {
     return NextResponse.json({ error: 'Token and query are required' }, { status: 400 });
   }
 
-  const url = new URL('https://api.tinybird.co/v0/sql');
+  const url = new URL(`${process.env.NEXT_PUBLIC_TINYBIRD_API_HOST}/v0/sql`);
   url.searchParams.set('q', query);
 
   const response = await fetch(url.toString(), {

apps/web/src/lib/constants.ts

@@ -1,8 +1,19 @@
 import dynamic from 'next/dynamic';
 
-export const baseURL = process.env.NEXT_PUBLIC_VERCEL_URL
-    ? `https://${process.env.NEXT_PUBLIC_VERCEL_URL}`
-    : 'http://localhost:3000';
+export const baseURL = (() => {
+    // Preview deployments
+    if (process.env.NEXT_PUBLIC_VERCEL_ENV === 'preview') {
+        return `https://${process.env.NEXT_PUBLIC_VERCEL_BRANCH_URL}`;
+    }
+
+    // Production URL
+    if (process.env.NEXT_PUBLIC_VERCEL_URL) {
+        return `https://${process.env.NEXT_PUBLIC_VERCEL_URL}`;
+    }
+    
+    // Local development
+    return 'http://localhost:3000';
+})();
 
 export type ToolState = 'available' | 'installed' | 'configured';