From c6384051f85afe9f800ba419cb2eca5bfe068487 Mon Sep 17 00:00:00 2001
From: otdoges <otdoges@proton.me>
Date: Mon, 7 Jul 2025 01:33:59 -0500
Subject: [PATCH 1/3] Refactor authentication and routing logic: Simplify
 middleware for user redirection based on authentication status, enhance
 layout metadata for SEO, and streamline auth button functionality. Update
 page components to improve user experience and maintain consistent styling
 across the application.

---
 app/auth/page.tsx           |   9 +-
 app/layout.tsx              |  84 ++++++++++---
 app/page.tsx                | 227 +++++++++++-------------------------
 app/sitemap.ts              |  15 +++
 components/auth-buttons.tsx | 104 +++++++++--------
 middleware.ts               |  24 ++--
 public/robots.txt           |   9 ++
 7 files changed, 229 insertions(+), 243 deletions(-)
 create mode 100644 app/sitemap.ts
 create mode 100644 public/robots.txt

diff --git a/app/auth/page.tsx b/app/auth/page.tsx
index 3fe7048f..dfe81e0f 100644
--- a/app/auth/page.tsx
+++ b/app/auth/page.tsx
@@ -26,6 +26,13 @@ function AuthContent() {
   const authError = searchParams.get('error');
   const authSuccess = searchParams.get('success');
 
+  // Redirect if user is already logged in
+  useEffect(() => {
+    if (user) {
+      router.replace(redirectTo);
+    }
+  }, [user, router, redirectTo]);
+
   // Check if Supabase is configured
   const supabaseUrl = process.env.NEXT_PUBLIC_SUPABASE_URL;
   const supabaseAnonKey = process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY;
@@ -69,7 +76,7 @@ NEXT_PUBLIC_SUPABASE_ANON_KEY=your_key`}
     );
   }
 
-  if (loading || user) {
+  if (loading) {
     return (
       <div className="flex min-h-screen items-center justify-center bg-[#0D0D10]">
         <div className="text-center text-white">
diff --git a/app/layout.tsx b/app/layout.tsx
index 9a1df371..d7eb8f84 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -22,34 +22,73 @@ export const viewport: Viewport = {
 };
 
 export const metadata: Metadata = {
-  title: 'ZapDev - Build Amazing Apps with AI',
+  metadataBase: new URL('https://zapdev.link'),
+  title: {
+    default: 'ZapDev: AI-Powered Development Platform to Build and Deploy Web Apps',
+    template: '%s | ZapDev',
+  },
   description:
-    'The most powerful AI-driven development platform. Generate, preview, and deploy beautiful applications in seconds.',
+    'ZapDev is an innovative AI-driven platform that empowers you to generate, preview, and deploy stunning web applications in seconds. Turn your ideas into reality with our cutting-edge AI assistant and WebContainer technology.',
   generator: 'ZapDev',
   applicationName: 'ZapDev',
-  keywords: ['AI development', 'web apps', 'code generation', 'WebContainer', 'AI assistant'],
-  authors: [{ name: 'ZapDev Team' }],
-  metadataBase: new URL('https://zapdev.link'),
+  keywords: [
+    'AI development',
+    'web apps',
+    'code generation',
+    'WebContainer',
+    'AI assistant',
+    'AI developer tools',
+    'no-code',
+    'low-code',
+    'application builder',
+    'deploy web apps',
+    'AI website builder',
+  ],
+  authors: [{ name: 'ZapDev Team', url: 'https://zapdev.link' }],
+  creator: 'ZapDev',
+  publisher: 'ZapDev',
   openGraph: {
-    type: 'website',
-    locale: 'en_US',
-    title: 'ZapDev - Build Amazing Apps with AI',
+    title: 'ZapDev: AI-Powered Development Platform',
     description:
-      'The most powerful AI-driven development platform. Generate, preview, and deploy beautiful applications in seconds.',
+      'Generate, preview, and deploy stunning web applications in seconds with our AI-driven development platform.',
+    url: 'https://zapdev.link',
     siteName: 'ZapDev',
+    images: [
+      {
+        url: 'https://zapdev.link/og-image.png',
+        width: 1200,
+        height: 630,
+        alt: 'ZapDev AI-Powered Development Platform',
+      },
+    ],
+    locale: 'en_US',
+    type: 'website',
   },
   twitter: {
     card: 'summary_large_image',
-    title: 'ZapDev - Build Amazing Apps with AI',
+    title: 'ZapDev: AI-Powered Development Platform',
     description:
-      'The most powerful AI-driven development platform. Generate, preview, and deploy beautiful applications in seconds.',
+      'Generate, preview, and deploy stunning web applications in seconds with our AI-driven development platform.',
+    creator: '@zapdev',
+    images: ['https://zapdev.link/twitter-image.png'],
+  },
+  robots: {
+    index: true,
+    follow: true,
+    googleBot: {
+      index: true,
+      follow: true,
+      'max-video-preview': -1,
+      'max-image-preview': 'large',
+      'max-snippet': -1,
+    },
   },
   icons: {
+    icon: '/favicon.svg',
     shortcut: '/favicon.svg',
+    apple: '/apple-touch-icon.png',
   },
-  formatDetection: {
-    telephone: false,
-  },
+  manifest: '/site.webmanifest',
 };
 
 const inter = Inter({
@@ -60,8 +99,6 @@ const inter = Inter({
   fallback: ['system-ui', 'arial'],
 });
 
-
-
 export default function RootLayout({
   children,
 }: Readonly<{
@@ -71,6 +108,21 @@ export default function RootLayout({
     <html lang="en" className={`${inter.variable} font-sans`} suppressHydrationWarning>
       <head>
         <meta name="format-detection" content="telephone=no, date=no, email=no, address=no" />
+        <script
+          type="application/ld+json"
+          dangerouslySetInnerHTML={{
+            __html: JSON.stringify({
+              '@context': 'https://schema.org',
+              '@type': 'Organization',
+              name: 'ZapDev',
+              url: 'https://zapdev.link',
+              logo: 'https://zapdev.link/logo.png',
+              sameAs: [
+                'https://twitter.com/zapdev',
+              ],
+            }),
+          }}
+        />
       </head>
       <body
         className="m-0 flex min-h-screen w-full flex-col overflow-x-hidden bg-[#0D0D10] p-0 text-[#EAEAEA]"
diff --git a/app/page.tsx b/app/page.tsx
index 8822831c..a8cfb4ed 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -7,7 +7,7 @@ import { useEffect, useState } from 'react';
 import Hero from '@/components/hero';
 import FinalCTA from '@/components/final-cta';
 import Pricing from '@/components/pricing';
-import { useSupabase } from '@/components/SupabaseProvider';
+import { AuthButtons } from '@/components/auth-buttons';
 import { CrossBrowserButton } from '@/components/ui/cross-browser-button';
 
 const FeaturesShowcase = dynamic(() => import('@/components/features-showcase'), {
@@ -55,7 +55,6 @@ export default function Home() {
   const [showFloatingCTA, setShowFloatingCTA] = useState(false);
   const [mounted, setMounted] = useState(false);
   const { scrollY } = useScroll();
-  const { user, loading } = useSupabase();
 
   // Ensure component is mounted before complex interactions
   useEffect(() => {
@@ -89,111 +88,6 @@ export default function Home() {
     return () => unsubscribe();
   }, [scrollY, showFloatingCTA, mounted]);
 
-  // Simple auth buttons that don't cause re-renders
-  const AuthButtons = () => {
-    if (loading) {
-      return (
-        <div className="flex items-center gap-4">
-          <div className="h-8 w-20 animate-pulse rounded-lg bg-white/10 px-4 py-2"></div>
-          <div className="h-8 w-16 animate-pulse rounded-lg bg-white/10 px-4 py-2"></div>
-        </div>
-      );
-    }
-
-    if (user) {
-      return (
-        <div className="flex items-center gap-4">
-          <CrossBrowserButton
-            onClick={goToChat}
-            className="cross-browser-button gradient-button-primary rounded-lg px-4 py-2 text-sm font-medium"
-            motionProps={{
-              whileHover: { scale: 1.05 },
-              whileTap: { scale: 0.95 }
-            }}
-          >
-            Chat
-          </CrossBrowserButton>
-          <CrossBrowserButton
-            onClick={goToPricingPage}
-            className="cross-browser-button gradient-button-secondary rounded-lg px-4 py-2 text-sm font-medium"
-            motionProps={{
-              whileHover: { scale: 1.05 },
-              whileTap: { scale: 0.95 }
-            }}
-          >
-            Subscribe
-          </CrossBrowserButton>
-        </div>
-      );
-    }
-
-    return (
-      <div className="flex items-center gap-4">
-        <CrossBrowserButton
-          onClick={goToAuth}
-          className="cross-browser-button gradient-button-primary rounded-lg px-4 py-2 text-sm font-medium"
-          motionProps={{
-            whileHover: { scale: 1.05 },
-            whileTap: { scale: 0.95 }
-          }}
-        >
-          Sign In
-        </CrossBrowserButton>
-        <CrossBrowserButton
-          onClick={goToAuth}
-          className="cross-browser-button gradient-button-secondary rounded-lg px-4 py-2 text-sm font-medium"
-          motionProps={{
-            whileHover: { scale: 1.05 },
-            whileTap: { scale: 0.95 }
-          }}
-        >
-          Sign Up
-        </CrossBrowserButton>
-      </div>
-    );
-  };
-
-  // Simplified floating CTA
-  const FloatingCTA = () => {
-    const buttonText = user ? 'Go to Chat' : 'Sign In';
-    const targetRoute = user ? '/chat' : '/auth';
-
-    return (
-      <CrossBrowserButton
-        onClick={() => router.push(targetRoute)}
-        className="cross-browser-button gradient-button-primary flex items-center gap-2 rounded-full px-6 py-3 font-medium text-white shadow-lg shadow-purple-900/20"
-        motionProps={{
-          whileHover: { scale: 1.05 },
-          whileTap: { scale: 0.95 }
-        }}
-      >
-        <span>{buttonText}</span>
-        <svg
-          width="16"
-          height="16"
-          viewBox="0 0 16 16"
-          fill="none"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M3.33337 8H12.6667"
-            stroke="currentColor"
-            strokeWidth="1.5"
-            strokeLinecap="round"
-            strokeLinejoin="round"
-          />
-          <path
-            d="M8.66663 4L12.6666 8L8.66663 12"
-            stroke="currentColor"
-            strokeWidth="1.5"
-            strokeLinecap="round"
-            strokeLinejoin="round"
-          />
-        </svg>
-      </CrossBrowserButton>
-    );
-  };
-
   // Don't render complex interactions until mounted
   if (!mounted) {
     return (
@@ -204,74 +98,87 @@ export default function Home() {
   }
 
   return (
-    <div className="min-h-screen bg-[#0D0D10] text-white">
-      {/* Auth buttons */}
-      <motion.div
+    <div className="w-full bg-[#0D0D10] text-[#EAEAEA]">
+      <motion.header
+        initial={{ y: -100, opacity: 0 }}
+        animate={{ y: 0, opacity: 1 }}
+        variants={{ visible: { opacity: 1, y: 0 }, hidden: { opacity: 0, y: -20 } }}
+        transition={{ duration: 0.5 }}
         className="fixed right-4 top-4 z-50 flex gap-4"
-        initial={{ opacity: 0, y: -20 }}
-        animate={{ opacity: 1, y: 0 }}
-        transition={{ delay: 0.3 }}
       >
-        <AuthButtons />
-      </motion.div>
+        <motion.div
+          initial={{ opacity: 0, y: -20 }}
+          animate={{ opacity: 1, y: 0 }}
+          transition={{ delay: 0.3 }}
+          className="flex items-center gap-4"
+        >
+          <AuthButtons />
+        </motion.div>
+      </motion.header>
 
-      {/* Main CTA button */}
+      {/* Floating CTA */}
       <motion.div
-        className="fixed bottom-8 right-8 z-50"
-        initial={{ opacity: 0, scale: 0.9 }}
-        animate={{ opacity: 1, scale: 1 }}
-        transition={{ delay: 0.5 }}
+        initial={{ y: 100, opacity: 0 }}
+        animate={{ y: showFloatingCTA ? 0 : 100, opacity: showFloatingCTA ? 1 : 0 }}
+        transition={{ type: 'spring', stiffness: 200, damping: 30 }}
+        className="fixed bottom-8 left-1/2 z-50 -translate-x-1/2"
       >
         <FloatingCTA />
       </motion.div>
 
-      {/* Floating CTA for subscribing */}
-      {showFloatingCTA && (
-        <motion.div
-          className="fixed bottom-8 left-8 z-50"
-          initial={{ opacity: 0, x: -50 }}
-          animate={{ opacity: 1, x: 0 }}
-          exit={{ opacity: 0, x: -50 }}
-          transition={{ duration: 0.3 }}
-        >
-          <CrossBrowserButton
-            onClick={user ? goToPricingPage : goToAuth}
-            className="cross-browser-button gradient-button-secondary flex items-center gap-2 rounded-full px-6 py-3 font-medium text-white shadow-lg shadow-purple-900/20"
-            motionProps={{
-              whileHover: { scale: 1.05 },
-              whileTap: { scale: 0.95 }
-            }}
-          >
-            <span>{user ? 'Subscribe' : 'Sign Up'}</span>
-            <svg
-              width="16"
-              height="16"
-              viewBox="0 0 16 16"
-              fill="none"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                d="M8 3v10M3 8h10"
-                stroke="currentColor"
-                strokeWidth="1.5"
-                strokeLinecap="round"
-              />
-            </svg>
-          </CrossBrowserButton>
-        </motion.div>
-      )}
-
-      {/* Main content */}
-      <main>
+      <main className="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
         <Hero />
         <FeaturesShowcase />
         <VisualShowcase />
         <VibeToReality />
         <Audience />
-        <Testimonials />
         <Pricing />
-        <FinalCTA />
+        <Testimonials />
       </main>
+      <FinalCTA />
     </div>
   );
 }
+
+// Simplified floating CTA
+const FloatingCTA = () => {
+  const router = useRouter();
+  const { user } = useSupabase();
+  const buttonText = user ? 'Go to Chat' : 'Sign In';
+  const targetRoute = user ? '/chat' : '/auth';
+
+  return (
+    <CrossBrowserButton
+      onClick={() => router.push(targetRoute)}
+      className="cross-browser-button gradient-button-primary flex items-center gap-2 rounded-full px-6 py-3 font-medium text-white shadow-lg shadow-purple-900/20"
+      motionProps={{
+        whileHover: { scale: 1.05 },
+        whileTap: { scale: 0.95 },
+      }}
+    >
+      <span>{buttonText}</span>
+      <svg
+        width="16"
+        height="16"
+        viewBox="0 0 16 16"
+        fill="none"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M3.33337 8H12.6667"
+          stroke="currentColor"
+          strokeWidth="1.5"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+        <path
+          d="M8.66663 4L12.6666 8L8.66663 12"
+          stroke="currentColor"
+          strokeWidth="1.5"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+      </svg>
+    </CrossBrowserButton>
+  );
+};
diff --git a/app/sitemap.ts b/app/sitemap.ts
new file mode 100644
index 00000000..6f4f54b0
--- /dev/null
+++ b/app/sitemap.ts
@@ -0,0 +1,15 @@
+import { MetadataRoute } from 'next';
+
+export default function sitemap(): MetadataRoute.Sitemap {
+  const baseUrl = 'https://zapdev.link';
+
+  // Update this list with your actual pages
+  const staticPages = ['/', '/auth', '/pricing', '/chat'];
+
+  return staticPages.map((path) => ({
+    url: `${baseUrl}${path}`,
+    lastModified: new Date(),
+    changeFrequency: 'weekly',
+    priority: path === '/' ? 1 : 0.8,
+  }));
+} 
\ No newline at end of file
diff --git a/components/auth-buttons.tsx b/components/auth-buttons.tsx
index bcd398d5..0988cee4 100644
--- a/components/auth-buttons.tsx
+++ b/components/auth-buttons.tsx
@@ -1,86 +1,92 @@
 'use client';
 
+import { useRouter } from 'next/navigation';
+import { motion } from 'framer-motion';
 import { useSupabase } from '@/components/SupabaseProvider';
-import { Button } from '@/components/ui/button';
 import { CrossBrowserButton } from '@/components/ui/cross-browser-button';
-import { useState, useEffect } from 'react';
-import { AUTH_COOKIES, hasAuthCookies } from '@/lib/auth-constants';
-import { errorLogger, ErrorCategory } from '@/lib/error-logger';
 
 export function AuthButtons() {
-  const { user, loading, signOut } = useSupabase();
-  const [isLoading, setIsLoading] = useState(false);
-  const [cookieAuth, setCookieAuth] = useState<boolean | null>(null);
+  const router = useRouter();
+  const { user, loading } = useSupabase();
 
-  // Quick cookie check for instant feedback
-  useEffect(() => {
-    if (typeof window !== 'undefined') {
-      setCookieAuth(hasAuthCookies(document.cookie));
-    }
-  }, []);
+  const goToPricingPage = () => {
+    router.push('/pricing');
+  };
 
-  const handleSignOut = async () => {
-    setIsLoading(true);
-    try {
-      await signOut();
-      setCookieAuth(false); // Update cookie state immediately
-    } catch (error) {
-      errorLogger.error(ErrorCategory.GENERAL, 'Sign out error:', error);
-    } finally {
-      setIsLoading(false);
-    }
+  const goToAuth = () => {
+    router.push('/auth');
   };
 
-  // Use user data if available, otherwise fall back to cookie check
-  const isAuthenticated = !loading && user !== undefined ? !!user : cookieAuth;
+  const goToChat = () => {
+    router.push('/chat');
+  };
 
-  // Show loading placeholder only if we have no information at all
-  if (loading && cookieAuth === null) {
+  if (loading) {
     return (
-      <div className="flex items-center gap-2">
-        <div className="h-8 w-16 animate-pulse rounded bg-zinc-800"></div>
-        <div className="h-8 w-20 animate-pulse rounded bg-zinc-800"></div>
+      <div className="flex items-center gap-4">
+        <div className="h-8 w-20 animate-pulse rounded-lg bg-white/10 px-4 py-2"></div>
+        <div className="h-8 w-16 animate-pulse rounded-lg bg-white/10 px-4 py-2"></div>
       </div>
     );
   }
 
-  if (isAuthenticated) {
+  if (user) {
     return (
-      <div className="flex items-center gap-2">
-        <span className="text-sm text-zinc-300">{user?.email || 'Authenticated'}</span>
+      <div className="flex items-center gap-4">
+        <CrossBrowserButton
+          onClick={goToChat}
+          className="cross-browser-button gradient-button-primary rounded-lg px-4 py-2 text-sm font-medium"
+          motionProps={{
+            initial: { opacity: 0, y: -10 },
+            animate: { opacity: 1, y: 0 },
+            transition: { duration: 0.3, delay: 0.1 },
+            whileHover: { scale: 1.05, y: -2 },
+            whileTap: { scale: 0.95 },
+          }}
+        >
+          Chat
+        </CrossBrowserButton>
         <CrossBrowserButton
-          onClick={handleSignOut}
-          disabled={isLoading}
-          className="cross-browser-button text-zinc-300 hover:bg-zinc-800 hover:text-white"
+          onClick={goToPricingPage}
+          className="cross-browser-button gradient-button-secondary rounded-lg px-4 py-2 text-sm font-medium"
           motionProps={{
-            whileHover: { scale: 1.02 },
-            whileTap: { scale: 0.98 }
+            initial: { opacity: 0, y: -10 },
+            animate: { opacity: 1, y: 0 },
+            transition: { duration: 0.3, delay: 0.2 },
+            whileHover: { scale: 1.05, y: -2 },
+            whileTap: { scale: 0.95 },
           }}
         >
-          {isLoading ? 'Signing out...' : 'Sign Out'}
+          Subscribe
         </CrossBrowserButton>
       </div>
     );
   }
 
   return (
-    <div className="flex items-center gap-2">
+    <div className="flex items-center gap-4">
       <CrossBrowserButton
-        onClick={() => (window.location.href = '/auth')}
-        className="cross-browser-button text-zinc-300 hover:bg-zinc-800 hover:text-white"
+        onClick={goToAuth}
+        className="cross-browser-button gradient-button-primary rounded-lg px-4 py-2 text-sm font-medium"
         motionProps={{
-          whileHover: { scale: 1.02 },
-          whileTap: { scale: 0.98 }
+          initial: { opacity: 0, y: -10 },
+          animate: { opacity: 1, y: 0 },
+          transition: { duration: 0.3, delay: 0.1 },
+          whileHover: { scale: 1.05, y: -2 },
+          whileTap: { scale: 0.95 },
         }}
       >
-        Login
+        Sign In
       </CrossBrowserButton>
       <CrossBrowserButton
-        onClick={() => (window.location.href = '/auth')}
-        className="cross-browser-button gradient-button-primary"
+        onClick={goToAuth}
+        className="cross-browser-button gradient-button-secondary rounded-lg px-4 py-2 text-sm font-medium"
         motionProps={{
-          whileHover: { scale: 1.02 },
-          whileTap: { scale: 0.98 }
+          initial: { opacity: 0, y: -10 },
+          animate: { opacity: 1, y: 0 },
+          transition: { duration: 0.3, delay: 0.2 },
+          whileHover: { scale: 1.05, y: -2 },
+          whileTap: { scale: 0.95 },
         }}
       >
         Sign Up
diff --git a/middleware.ts b/middleware.ts
index 2f7f7d72..d381fd02 100644
--- a/middleware.ts
+++ b/middleware.ts
@@ -83,28 +83,18 @@ export async function middleware(request: NextRequest) {
   } = await supabase.auth.getUser()
 
   const { pathname } = request.nextUrl
-  const isAuthPage = pathname === '/auth'
 
-  // If the user is on the auth page, allow it to be rendered
-  if (isAuthPage) {
-    // But if they are logged in, redirect them away from the auth page
-    if (user) {
-      const nextUrl = request.nextUrl.searchParams.get('next')
-      const redirectTo = nextUrl && nextUrl.startsWith('/') ? nextUrl : '/chat'
-      const url = new URL(redirectTo, request.url)
-      url.searchParams.delete('next')
-      return NextResponse.redirect(url)
-    }
-    return response
-  }
-  
-  // If user is not logged in and tries to access chat, redirect to auth page
-  // preserving the originally requested path
+  // Protect the /chat route
   if (!user && pathname.startsWith('/chat')) {
     const url = new URL('/auth', request.url)
-    url.searchParams.set('next', pathname)
+    url.searchParams.set('redirectTo', pathname)
     return NextResponse.redirect(url)
   }
+  
+  // If a logged-in user tries to access the /auth page, redirect them to /chat
+  if (user && pathname === '/auth') {
+    return NextResponse.redirect(new URL('/chat', request.url))
+  }
 
   return response
 }
diff --git a/public/robots.txt b/public/robots.txt
new file mode 100644
index 00000000..b0629da5
--- /dev/null
+++ b/public/robots.txt
@@ -0,0 +1,9 @@
+# Allow all user agents to crawl the site
+User-agent: *
+Allow: /
+
+# Disallow crawling of specific routes that don't provide value to search engines
+Disallow: /auth/callback
+
+# Point to the sitemap
+Sitemap: https://zapdev.link/sitemap.xml 
\ No newline at end of file

From 5e575fbaa368b303007eda684c94570db9665f11 Mon Sep 17 00:00:00 2001
From: otdoges <otdoges@proton.me>
Date: Mon, 7 Jul 2025 02:10:03 -0500
Subject: [PATCH 2/3] Refactor Content Security Policy and layout metadata:
 Simplify CSP configuration for development and production environments,
 ensuring better security practices. Update layout metadata by removing unused
 fields and enhancing descriptions for improved SEO. Replace AnalyticsScripts
 component with static buttons for user authentication testing.

---
 app/layout.tsx          | 18 +-----------------
 app/page.tsx            | 19 ++++++++++++++++++-
 next.config.mjs         | 38 +++++++++++---------------------------
 public/site.webmanifest | 16 ++++++++++++++++
 4 files changed, 46 insertions(+), 45 deletions(-)
 create mode 100644 public/site.webmanifest

diff --git a/app/layout.tsx b/app/layout.tsx
index d7eb8f84..58937ff9 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -12,7 +12,6 @@ import { Analytics } from '@vercel/analytics/react';
 import './globals.css';
 import { CookieConsentBanner } from '@/components/ui/cookie-consent-banner';
 import { QueryProvider } from '@/lib/query-client';
-import { AnalyticsScripts } from '@/components/analytics-scripts';
 
 export const viewport: Viewport = {
   themeColor: '#0D0D10',
@@ -53,14 +52,6 @@ export const metadata: Metadata = {
       'Generate, preview, and deploy stunning web applications in seconds with our AI-driven development platform.',
     url: 'https://zapdev.link',
     siteName: 'ZapDev',
-    images: [
-      {
-        url: 'https://zapdev.link/og-image.png',
-        width: 1200,
-        height: 630,
-        alt: 'ZapDev AI-Powered Development Platform',
-      },
-    ],
     locale: 'en_US',
     type: 'website',
   },
@@ -69,8 +60,6 @@ export const metadata: Metadata = {
     title: 'ZapDev: AI-Powered Development Platform',
     description:
       'Generate, preview, and deploy stunning web applications in seconds with our AI-driven development platform.',
-    creator: '@zapdev',
-    images: ['https://zapdev.link/twitter-image.png'],
   },
   robots: {
     index: true,
@@ -86,7 +75,6 @@ export const metadata: Metadata = {
   icons: {
     icon: '/favicon.svg',
     shortcut: '/favicon.svg',
-    apple: '/apple-touch-icon.png',
   },
   manifest: '/site.webmanifest',
 };
@@ -116,10 +104,7 @@ export default function RootLayout({
               '@type': 'Organization',
               name: 'ZapDev',
               url: 'https://zapdev.link',
-              logo: 'https://zapdev.link/logo.png',
-              sameAs: [
-                'https://twitter.com/zapdev',
-              ],
+              description: 'AI-Powered Development Platform to Build and Deploy Web Apps',
             }),
           }}
         />
@@ -144,7 +129,6 @@ export default function RootLayout({
                   <Toaster />
                   <CookieConsentBanner />
                   <Analytics />
-                  <AnalyticsScripts />
                 </RealtimeProvider>
               </AuthProvider>
             </SentryProvider>
diff --git a/app/page.tsx b/app/page.tsx
index a8cfb4ed..766b7db3 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -7,6 +7,7 @@ import { useEffect, useState } from 'react';
 import Hero from '@/components/hero';
 import FinalCTA from '@/components/final-cta';
 import Pricing from '@/components/pricing';
+import { useSupabase } from '@/components/SupabaseProvider';
 import { AuthButtons } from '@/components/auth-buttons';
 import { CrossBrowserButton } from '@/components/ui/cross-browser-button';
 
@@ -112,7 +113,23 @@ export default function Home() {
           transition={{ delay: 0.3 }}
           className="flex items-center gap-4"
         >
-          <AuthButtons />
+          {/* Debug: Simple static buttons to confirm they show */}
+          <div className="flex items-center gap-4 rounded-lg bg-black/20 px-4 py-2 backdrop-blur-sm border border-white/10">
+            <button
+              onClick={() => router.push('/auth')}
+              className="gradient-button-primary rounded-lg px-4 py-2 text-sm font-medium text-white"
+            >
+              Sign In
+            </button>
+            <button
+              onClick={() => router.push('/auth')}
+              className="gradient-button-secondary rounded-lg px-4 py-2 text-sm font-medium text-white"
+            >
+              Sign Up
+            </button>
+          </div>
+          {/* Uncomment this after we confirm the basic buttons work */}
+          {/* <AuthButtons /> */}
         </motion.div>
       </motion.header>
 
diff --git a/next.config.mjs b/next.config.mjs
index 53b94412..0a4eda69 100644
--- a/next.config.mjs
+++ b/next.config.mjs
@@ -90,39 +90,23 @@ const nextConfig = {
   async headers() {
     const isDev = process.env.NODE_ENV === 'development';
     
-    // More permissive CSP for development, strict for production
-    const csp = isDev 
-      ? [
-          "default-src 'self' 'unsafe-inline' 'unsafe-eval'",
-          "script-src 'self' 'unsafe-inline' 'unsafe-eval' *",
-          "connect-src 'self' * ws: wss:",
-          "img-src 'self' data: blob: *",
-          "style-src 'self' 'unsafe-inline' *",
-          "frame-src 'self' *",
-          "font-src 'self' data: *",
-          "worker-src 'self' blob:",
-          "child-src 'self' blob:",
-        ].join('; ')
-      : [
-          "default-src 'self'",
-          "script-src 'self' 'unsafe-eval' 'unsafe-inline' https://funky-humpback-59.clerk.accounts.dev https://js.clerk.com https://clerk.accounts.dev https://cdn.jsdelivr.net https://plausible.io https://cloud.umami.is https://cdn.databuddy.cc",
-          "connect-src 'self' http://localhost:* https://api.github.com https://funky-humpback-59.clerk.accounts.dev https://cdn.jsdelivr.net wss://original-meerkat-657.convex.cloud https://fonts.googleapis.com https://fonts.gstatic.com https://*.supabase.co https://*.supabase.com wss://*.supabase.co wss://*.supabase.com https://plausible.io https://cloud.umami.is https://cdn.databuddy.cc",
-          "img-src 'self' data: blob:",
-          "style-src 'self' 'unsafe-inline' https://fonts.googleapis.com",
-          "frame-src 'self' https://clerk.accounts.dev",
-          "font-src 'self' data: https://cdn.jsdelivr.net https://fonts.gstatic.com",
-          "worker-src 'self' blob:",
-          "child-src 'self' blob:",
-        ].join('; ');
-
     return [
-      // Only apply CSP in production or when explicitly enabled
+      // Disable CSP in development to prevent blocking issues
       ...(isDev ? [] : [{
         source: '/:path*',
         headers: [
           {
             key: 'Content-Security-Policy',
-            value: csp,
+            value: [
+              "default-src 'self'",
+              "script-src 'self' 'unsafe-eval' 'unsafe-inline' https://cdn.jsdelivr.net https://plausible.io https://cloud.umami.is https://cdn.databuddy.cc",
+              "connect-src 'self' https://*.supabase.co https://*.supabase.com wss://*.supabase.co wss://*.supabase.com https://plausible.io https://cloud.umami.is https://cdn.databuddy.cc",
+              "img-src 'self' data: blob:",
+              "style-src 'self' 'unsafe-inline' https://fonts.googleapis.com",
+              "font-src 'self' data: https://fonts.gstatic.com",
+              "worker-src 'self' blob:",
+              "child-src 'self' blob:",
+            ].join('; '),
           },
         ],
       }]),
diff --git a/public/site.webmanifest b/public/site.webmanifest
new file mode 100644
index 00000000..b9eaa750
--- /dev/null
+++ b/public/site.webmanifest
@@ -0,0 +1,16 @@
+{
+  "name": "ZapDev",
+  "short_name": "ZapDev",
+  "description": "AI-Powered Development Platform",
+  "start_url": "/",
+  "display": "standalone",
+  "background_color": "#0D0D10",
+  "theme_color": "#6C52A0",
+  "icons": [
+    {
+      "src": "/favicon.svg",
+      "sizes": "any",
+      "type": "image/svg+xml"
+    }
+  ]
+} 
\ No newline at end of file

From 8a3a6639a949d62f1e9d5812191bd0a55579500e Mon Sep 17 00:00:00 2001
From: otdoges <otdoges@proton.me>
Date: Mon, 7 Jul 2025 04:12:01 -0500
Subject: [PATCH 3/3] I need to switch branches

---
 next.config.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/next.config.mjs b/next.config.mjs
index 0a4eda69..6f90edb3 100644
--- a/next.config.mjs
+++ b/next.config.mjs
@@ -99,7 +99,7 @@ const nextConfig = {
             key: 'Content-Security-Policy',
             value: [
               "default-src 'self'",
-              "script-src 'self' 'unsafe-eval' 'unsafe-inline' https://cdn.jsdelivr.net https://plausible.io https://cloud.umami.is https://cdn.databuddy.cc",
+              "script-src 'self' 'unsafe-eval' 'unsafe-inline' https://cdn.jsdelivr.net https://plausible.io https://cloud.umami.is https://cdn.databuddy.cc https://static.cloudflareinsights.com",
               "connect-src 'self' https://*.supabase.co https://*.supabase.com wss://*.supabase.co wss://*.supabase.com https://plausible.io https://cloud.umami.is https://cdn.databuddy.cc",
               "img-src 'self' data: blob:",
               "style-src 'self' 'unsafe-inline' https://fonts.googleapis.com",