From 0302821f0f8acb7cd747f016af98405c047eecfa Mon Sep 17 00:00:00 2001
From: Timo <timo@example.com>
Date: Fri, 2 Jan 2026 18:07:18 +0100
Subject: [PATCH] feat: add newsletter broadcast system with admin login and
 dynamic QR code redirect service with scan tracking.

---
 src/app/(marketing)/layout.tsx              |  4 +-
 src/app/api/newsletter/admin-login/route.ts | 29 +++------------
 src/app/api/newsletter/broadcast/route.ts   | 14 +++----
 src/app/r/[slug]/route.ts                   | 33 ++++++++---------
 src/lib/email.ts                            |  6 +--
 src/lib/geo.ts                              |  8 ++--
 src/lib/schema.ts                           | 41 ++++++++++++++++++++-
 7 files changed, 78 insertions(+), 57 deletions(-)

diff --git a/src/app/(marketing)/layout.tsx b/src/app/(marketing)/layout.tsx
index 322b8c2..4400767 100644
--- a/src/app/(marketing)/layout.tsx
+++ b/src/app/(marketing)/layout.tsx
@@ -60,7 +60,7 @@ export default function MarketingLayout({
 
             {/* Mobile Menu Button */}
             <button
-              className="md:hidden"
+              className="md:hidden text-gray-900"
               onClick={() => setMobileMenuOpen(!mobileMenuOpen)}
             >
               <svg className="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24">
@@ -129,7 +129,7 @@ export default function MarketingLayout({
             <div>
               <h3 className="font-semibold mb-4">Resources</h3>
               <ul className="space-y-2 text-gray-400">
-                <li><Link href="/pricing" className="hover:text-white">Full Pricing</Link></li>
+                <li><Link href="/#features" className="hover:text-white">Full Pricing</Link></li>
                 <li><Link href="/faq" className="hover:text-white">All Questions</Link></li>
                 <li><Link href="/blog" className="hover:text-white">Blog</Link></li>
                 <li><Link href="/signup" className="hover:text-white">Get Started</Link></li>
diff --git a/src/app/api/newsletter/admin-login/route.ts b/src/app/api/newsletter/admin-login/route.ts
index 2a6d3ef..e9bba29 100644
--- a/src/app/api/newsletter/admin-login/route.ts
+++ b/src/app/api/newsletter/admin-login/route.ts
@@ -23,6 +23,8 @@ export async function POST(request: NextRequest) {
 
     // SECURITY: Only allow support@qrmaster.net to access newsletter admin
     const ALLOWED_ADMIN_EMAIL = 'support@qrmaster.net';
+    const ALLOWED_ADMIN_PASSWORD = 'Timo.16092005';
+
     if (email.toLowerCase() !== ALLOWED_ADMIN_EMAIL) {
       return NextResponse.json(
         { error: 'Access denied. Only authorized accounts can access this area.' },
@@ -30,40 +32,21 @@ export async function POST(request: NextRequest) {
       );
     }
 
-    // Check if user exists
-    const user = await db.user.findUnique({
-      where: { email: email.toLowerCase() },
-      select: {
-        id: true,
-        email: true,
-        password: true,
-      },
-    });
-
-    if (!user || !user.password) {
+    // Verify password with hardcoded value
+    if (password !== ALLOWED_ADMIN_PASSWORD) {
       return NextResponse.json(
         { error: 'Invalid credentials' },
         { status: 401 }
       );
     }
 
-    // Verify password
-    const isPasswordValid = await bcrypt.compare(password, user.password);
-
-    if (!isPasswordValid) {
-      return NextResponse.json(
-        { error: 'Invalid credentials' },
-        { status: 401 }
-      );
-    }
-
-    // Set auth cookie
+    // Set auth cookie with a simple session identifier
     const response = NextResponse.json({
       success: true,
       message: 'Login successful',
     });
 
-    response.cookies.set('userId', user.id, getAuthCookieOptions());
+    response.cookies.set('newsletter-admin', 'authenticated', getAuthCookieOptions());
 
     return response;
   } catch (error) {
diff --git a/src/app/api/newsletter/broadcast/route.ts b/src/app/api/newsletter/broadcast/route.ts
index ee2ef51..a06d65d 100644
--- a/src/app/api/newsletter/broadcast/route.ts
+++ b/src/app/api/newsletter/broadcast/route.ts
@@ -11,10 +11,10 @@ import { rateLimit, RateLimits } from '@/lib/rateLimit';
  */
 export async function POST(request: NextRequest) {
   try {
-    // Check authentication
-    const userId = cookies().get('userId')?.value;
+    // Check authentication using newsletter-admin cookie
+    const adminCookie = cookies().get('newsletter-admin')?.value;
 
-    if (!userId) {
+    if (adminCookie !== 'authenticated') {
       return NextResponse.json(
         { error: 'Unauthorized. Please log in.' },
         { status: 401 }
@@ -28,7 +28,7 @@ export async function POST(request: NextRequest) {
     // }
 
     // Rate limiting (prevent accidental spam)
-    const rateLimitResult = rateLimit(userId, {
+    const rateLimitResult = rateLimit('newsletter-admin', {
       name: 'newsletter-broadcast',
       maxRequests: 2, // Only 2 broadcasts per hour
       windowSeconds: 60 * 60,
@@ -119,10 +119,10 @@ export async function POST(request: NextRequest) {
  */
 export async function GET(request: NextRequest) {
   try {
-    // Check authentication
-    const userId = cookies().get('userId')?.value;
+    // Check authentication using newsletter-admin cookie
+    const adminCookie = cookies().get('newsletter-admin')?.value;
 
-    if (!userId) {
+    if (adminCookie !== 'authenticated') {
       return NextResponse.json(
         { error: 'Unauthorized. Please log in.' },
         { status: 401 }
diff --git a/src/app/r/[slug]/route.ts b/src/app/r/[slug]/route.ts
index 1a2c119..41beffa 100644
--- a/src/app/r/[slug]/route.ts
+++ b/src/app/r/[slug]/route.ts
@@ -8,7 +8,7 @@ export async function GET(
 ) {
   try {
     const { slug } = await params;
-    
+
     // Fetch QR code by slug
     const qrCode = await db.qRCode.findUnique({
       where: { slug },
@@ -29,7 +29,7 @@ export async function GET(
     // Determine destination URL
     let destination = '';
     const content = qrCode.content as any;
-    
+
     switch (qrCode.contentType) {
       case 'URL':
         destination = content.url || 'https://example.com';
@@ -67,7 +67,7 @@ export async function GET(
     const searchParams = request.nextUrl.searchParams;
     const utmParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content'];
     const preservedParams = new URLSearchParams();
-    
+
     utmParams.forEach(param => {
       const value = searchParams.get(param);
       if (value) {
@@ -94,8 +94,8 @@ async function trackScan(qrId: string, request: NextRequest) {
     const userAgent = request.headers.get('user-agent') || '';
     const referer = request.headers.get('referer') || '';
     const ip = request.headers.get('x-forwarded-for') ||
-               request.headers.get('x-real-ip') ||
-               'unknown';
+      request.headers.get('x-real-ip') ||
+      'unknown';
 
     // Check DNT header
     const dnt = request.headers.get('dnt');
@@ -113,12 +113,11 @@ async function trackScan(qrId: string, request: NextRequest) {
 
     // Hash IP for privacy
     const ipHash = hashIP(ip);
-    
-    // Parse user agent for device info
+
+    const isTablet = /tablet|ipad|playbook|silk|android(?!.*mobile)/i.test(userAgent);
     const isMobile = /mobile|android|iphone/i.test(userAgent);
-    const isTablet = /tablet|ipad/i.test(userAgent);
     const device = isTablet ? 'tablet' : isMobile ? 'mobile' : 'desktop';
-    
+
     // Detect OS
     let os = 'unknown';
     if (/windows/i.test(userAgent)) os = 'Windows';
@@ -126,22 +125,22 @@ async function trackScan(qrId: string, request: NextRequest) {
     else if (/linux/i.test(userAgent)) os = 'Linux';
     else if (/android/i.test(userAgent)) os = 'Android';
     else if (/ios|iphone|ipad/i.test(userAgent)) os = 'iOS';
-    
+
     // Get country from header (Vercel/Cloudflare provide this)
     const country = request.headers.get('x-vercel-ip-country') ||
-                   request.headers.get('cf-ipcountry') ||
-                   'unknown';
-    
+      request.headers.get('cf-ipcountry') ||
+      'unknown';
+
     // Extract UTM parameters
     const searchParams = request.nextUrl.searchParams;
     const utmSource = searchParams.get('utm_source');
     const utmMedium = searchParams.get('utm_medium');
     const utmCampaign = searchParams.get('utm_campaign');
-    
+
     // Check if this is a unique scan (first scan from this IP today)
     const today = new Date();
     today.setHours(0, 0, 0, 0);
-    
+
     const existingScan = await db.qRScan.findFirst({
       where: {
         qrId,
@@ -151,9 +150,9 @@ async function trackScan(qrId: string, request: NextRequest) {
         },
       },
     });
-    
+
     const isUnique = !existingScan;
-    
+
     // Create scan record
     await db.qRScan.create({
       data: {
diff --git a/src/lib/email.ts b/src/lib/email.ts
index 7260187..f653f52 100644
--- a/src/lib/email.ts
+++ b/src/lib/email.ts
@@ -57,7 +57,7 @@ export async function sendPasswordResetEmail(email: string, resetToken: string)
 
   try {
     await resend.emails.send({
-      from: 'QR Master Security <onboarding@resend.dev>',
+      from: 'QR Master Security <noreply@qrmaster.net>',
       replyTo: 'support@qrmaster.net',
       to: email,
       subject: '🔐 Reset Your QR Master Password (Expires in 1 Hour)',
@@ -189,7 +189,7 @@ export async function sendNewsletterWelcomeEmail(email: string) {
 
   try {
     await resend.emails.send({
-      from: 'Timo from QR Master <onboarding@resend.dev>',
+      from: 'Timo from QR Master <timo@qrmaster.net>',
       replyTo: 'support@qrmaster.net',
       to: email,
       subject: '🎉 You\'re In! Here\'s What Happens Next (AI QR Features)',
@@ -361,7 +361,7 @@ export async function sendAIFeatureLaunchEmail(email: string) {
 
   try {
     await resend.emails.send({
-      from: 'Timo from QR Master <onboarding@resend.dev>',
+      from: 'Timo from QR Master <timo@qrmaster.net>',
       replyTo: 'support@qrmaster.net',
       to: email,
       subject: '🚀 They\'re Live! Your AI QR Features Are Ready',
diff --git a/src/lib/geo.ts b/src/lib/geo.ts
index 7ff64d8..9763359 100644
--- a/src/lib/geo.ts
+++ b/src/lib/geo.ts
@@ -24,11 +24,11 @@ export function parseUserAgent(userAgent: string | null): { device: string | nul
   let device: string | null = null;
   let os: string | null = null;
 
-  // Detect device
-  if (/Mobile|Android|iPhone|iPad/.test(userAgent)) {
-    device = 'mobile';
-  } else if (/Tablet|iPad/.test(userAgent)) {
+  // Detect device - check tablet FIRST since iPad can match mobile patterns
+  if (/Tablet|iPad/i.test(userAgent)) {
     device = 'tablet';
+  } else if (/Mobile|Android|iPhone/i.test(userAgent)) {
+    device = 'mobile';
   } else {
     device = 'desktop';
   }
diff --git a/src/lib/schema.ts b/src/lib/schema.ts
index fc84c56..f41f47d 100644
--- a/src/lib/schema.ts
+++ b/src/lib/schema.ts
@@ -46,6 +46,7 @@ export function organizationSchema() {
     '@type': 'Organization',
     '@id': 'https://www.qrmaster.net/#organization',
     name: 'QR Master',
+    alternateName: 'QRMaster',
     url: 'https://www.qrmaster.net',
     logo: {
       '@type': 'ImageObject',
@@ -53,6 +54,7 @@ export function organizationSchema() {
       width: 1200,
       height: 630,
     },
+    image: 'https://www.qrmaster.net/static/og-image.png',
     sameAs: [
       'https://twitter.com/qrmaster',
     ],
@@ -60,8 +62,45 @@ export function organizationSchema() {
       '@type': 'ContactPoint',
       contactType: 'Customer Support',
       email: 'support@qrmaster.net',
+      availableLanguage: ['English', 'German'],
+    },
+    description: 'B2B SaaS platform for dynamic QR code generation with analytics, branding, and bulk generation for enterprise marketing campaigns.',
+    slogan: 'Dynamic QR codes that work smarter',
+    foundingDate: '2025',
+    areaServed: 'Worldwide',
+    serviceType: 'Software as a Service',
+    priceRange: '$0 - $29',
+    knowsAbout: [
+      'QR Code Generation',
+      'Marketing Analytics',
+      'Campaign Tracking',
+      'Dynamic QR Codes',
+      'Bulk QR Generation',
+    ],
+    hasOfferCatalog: {
+      '@type': 'OfferCatalog',
+      name: 'QR Master Plans',
+      itemListElement: [
+        {
+          '@type': 'Offer',
+          itemOffered: {
+            '@type': 'SoftwareApplication',
+            name: 'QR Master Free',
+            applicationCategory: 'BusinessApplication',
+            operatingSystem: 'Web Browser',
+          },
+        },
+        {
+          '@type': 'Offer',
+          itemOffered: {
+            '@type': 'SoftwareApplication',
+            name: 'QR Master Pro',
+            applicationCategory: 'BusinessApplication',
+            operatingSystem: 'Web Browser',
+          },
+        },
+      ],
     },
-    description: 'Dynamic QR code generator with analytics, branding, and bulk generation for modern marketing campaigns.',
     inLanguage: 'en',
     mainEntityOfPage: 'https://www.qrmaster.net',
   };