From 56bdf072162668f63cd1524c42466d7117f13bbc Mon Sep 17 00:00:00 2001
From: null <koga.industries@gmail.com>
Date: Sun, 17 May 2026 16:10:10 -0500
Subject: [PATCH] =?UTF-8?q?fix:=20close=20issues=20#12=20#15=20#17=20#18?=
 =?UTF-8?q?=20=E2=80=94=20CSP=20nonce,=20API=20retry,=20input=20debounce,?=
 =?UTF-8?q?=20caching=20verified=20(batch=200.6.1)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                     |   2 +-
 server/index.js                  |   2 +-
 src/components/layout/Header.jsx |  10 +--
 src/hooks/useDebounce.js         |  25 +++++++
 src/lib/api.js                   | 115 +++++++++++++++++++++----------
 src/pages/Contact.jsx            |  19 ++---
 src/pages/Support.jsx            |  19 ++---
 7 files changed, 134 insertions(+), 58 deletions(-)
 create mode 100644 src/hooks/useDebounce.js

diff --git a/package.json b/package.json
index 7b56828..02565b5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "queuenorth-website",
   "private": true,
-  "version": "0.6.0",
+  "version": "0.6.1",
   "type": "module",
   "scripts": {
     "dev": "concurrently \"vite\" \"node server/index.js\"",
diff --git a/server/index.js b/server/index.js
index 14d95aa..97f0bc7 100644
--- a/server/index.js
+++ b/server/index.js
@@ -66,7 +66,7 @@ const apiLimiter = rateLimit({
 const cspDirectives = {
   defaultSrc: ["'self'"],
   scriptSrc: ["'self'"],
-  styleSrc: ["'self'", "'unsafe-inline'", 'https://fonts.googleapis.com'],
+  styleSrc: ["'self'", 'https://fonts.googleapis.com'],
   fontSrc: ["'self'", 'https://fonts.gstatic.com'],
   imgSrc: ["'self'", 'data:'],
   connectSrc: ["'self'"],
diff --git a/src/components/layout/Header.jsx b/src/components/layout/Header.jsx
index 8346e4d..11f00f2 100644
--- a/src/components/layout/Header.jsx
+++ b/src/components/layout/Header.jsx
@@ -110,7 +110,7 @@ const Header = () => {
                       <ul className="space-y-2">
                         {navLinks.map((link) => (
                           <li key={link.name}>
-                            <Link to={link.href} onClick={closeMobileMenu} className={`block text-base font-medium py-2 ${isActive(link.href) ? 'text-white' : 'text-white/70 hover:text-white'} transition-colors`}>
+                            <Link to={link.href} onClick={closeMobileMenu} className={`block text-base font-medium py-2 ${isActive(link.href) ? 'text-white font-semibold' : 'text-white/70 hover:text-white'} transition-colors`}>
                               {link.name}
                             </Link>
                           </li>
@@ -119,11 +119,11 @@ const Header = () => {
                     </div>
 
                     <div>
-                      <h4 className="text-xs font-semibold uppercase tracking-wider text-navy-light mb-3">Services</h4>
+                      <h4 className="text-xs font-semibold uppercase tracking-wider text-white/60 mb-3">Services</h4>
                       <ul className="space-y-2">
                         {serviceLinks.map((service) => (
                           <li key={service.name}>
-                            <Link to={service.href} onClick={closeMobileMenu} className={`block text-sm py-2 border-b border-white/10 last:border-0 transition-colors ${isActive(service.href) ? 'text-white font-semibold' : 'text-navy-light hover:text-white'}`}>
+                            <Link to={service.href} onClick={closeMobileMenu} className={`block text-sm py-2 border-b border-white/10 last:border-0 transition-colors ${isActive(service.href) ? 'text-white font-semibold' : 'text-white/70 hover:text-white'}`}>
                               {service.name}
                             </Link>
                           </li>
@@ -132,11 +132,11 @@ const Header = () => {
                     </div>
 
                     <div>
-                      <h4 className="text-xs font-semibold uppercase tracking-wider text-navy-light mb-3">Industries</h4>
+                      <h4 className="text-xs font-semibold uppercase tracking-wider text-white/60 mb-3">Industries</h4>
                       <ul className="space-y-2">
                         {industryLinks.map((industry) => (
                           <li key={industry.name}>
-                            <Link to={industry.href} onClick={closeMobileMenu} className={`block text-sm py-2 border-b border-white/10 last:border-0 transition-colors ${isActive(industry.href) ? 'text-white font-semibold' : 'text-navy-light hover:text-white'}`}>
+                            <Link to={industry.href} onClick={closeMobileMenu} className={`block text-sm py-2 border-b border-white/10 last:border-0 transition-colors ${isActive(industry.href) ? 'text-white font-semibold' : 'text-white/70 hover:text-white'}`}>
                               {industry.name}
                             </Link>
                           </li>
diff --git a/src/hooks/useDebounce.js b/src/hooks/useDebounce.js
new file mode 100644
index 0000000..7618367
--- /dev/null
+++ b/src/hooks/useDebounce.js
@@ -0,0 +1,25 @@
+import { useState, useEffect } from 'react'
+
+/**
+ * Debounce hook - delays updating the value until after the specified delay
+ * @param {any} value - The value to debounce
+ * @param {number} delay - The debounce delay in milliseconds
+ * @returns {any} - The debounced value
+ */
+export function useDebounce(value, delay) {
+  const [debouncedValue, setDebouncedValue] = useState(value)
+
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      setDebouncedValue(value)
+    }, delay)
+
+    return () => {
+      clearTimeout(timer)
+    }
+  }, [value, delay])
+
+  return debouncedValue
+}
+
+export default useDebounce
diff --git a/src/lib/api.js b/src/lib/api.js
index 8cdafec..ff60e63 100644
--- a/src/lib/api.js
+++ b/src/lib/api.js
@@ -2,49 +2,94 @@ import { queryClient } from './queryClient'
 
 const API_BASE_URL = import.meta.env.VITE_API_URL || 'http://localhost:3001/api'
 
+// Exponential backoff retry helper
+const retryFetch = async (fn, { maxRetries = 3, baseDelay = 1000 } = {}) => {
+  let lastError
+  for (let attempt = 0; attempt <= maxRetries; attempt++) {
+    try {
+      return await fn()
+    } catch (err) {
+      lastError = err
+      // Don't retry on client errors (except 429), only server errors and network failures
+      if (err instanceof TypeError && err.message === 'Failed to fetch') {
+        // Network failure - retry
+      } else if (err.response && err.response.status >= 500) {
+        // 5xx server error - retry
+      } else if (err.response && err.response.status === 429) {
+        // 429 Too Many Requests - check Retry-After header
+        const retryAfter = err.response.headers.get('Retry-After')
+        if (retryAfter) {
+          const delay = parseInt(retryAfter, 10) * 1000
+          await new Promise(resolve => setTimeout(resolve, delay))
+          continue
+        }
+      } else {
+        // Other errors (4xx except 429) - don't retry
+        throw err
+      }
+      // Wait with exponential backoff before retry
+      if (attempt < maxRetries) {
+        const delay = baseDelay * Math.pow(2, attempt)
+        await new Promise(resolve => setTimeout(resolve, delay))
+      }
+    }
+  }
+  throw lastError
+}
+
 export const api = {
   get: async (endpoint) => {
-    let response
-    try {
-      response = await fetch(`${API_BASE_URL}${endpoint}`)
-    } catch (err) {
-      if (err instanceof TypeError && err.message === 'Failed to fetch') {
-        throw new Error('Unable to reach the server. This may be a network or CORS issue.')
+    return await retryFetch(async () => {
+      let response
+      try {
+        response = await fetch(`${API_BASE_URL}${endpoint}`)
+      } catch (err) {
+        if (err instanceof TypeError && err.message === 'Failed to fetch') {
+          throw new Error('Unable to reach the server. This may be a network or CORS issue.')
+        }
+        throw new Error(`Network error: ${err.message}`)
       }
-      throw new Error(`Network error: ${err.message}`)
-    }
-    if (!response.ok) {
-      throw new Error(`API error: ${response.statusText}`)
-    }
-    return response.json()
+      if (!response.ok) {
+        const errorData = new Error(`API error: ${response.statusText}`)
+        errorData.response = { status: response.status, statusText: response.statusText }
+        throw errorData
+      }
+      return response.json()
+    }, { maxRetries: 3, baseDelay: 1000 })
   },
 
   post: async (endpoint, data) => {
-    let response
-    try {
-      response = await fetch(`${API_BASE_URL}${endpoint}`, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify(data),
-      })
-    } catch (err) {
-      if (err instanceof TypeError && err.message === 'Failed to fetch') {
-        throw new Error('Unable to reach the server. This may be a network or CORS issue.')
-      }
-      throw new Error(`Network error: ${err.message}`)
-    }
-    if (!response.ok) {
-      let errorData
+    return await retryFetch(async () => {
+      let response
       try {
-        errorData = await response.json()
-      } catch {
-        throw new Error(`Server error (${response.status}): ${response.statusText}`)
+        response = await fetch(`${API_BASE_URL}${endpoint}`, {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify(data),
+        })
+      } catch (err) {
+        if (err instanceof TypeError && err.message === 'Failed to fetch') {
+          throw new Error('Unable to reach the server. This may be a network or CORS issue.')
+        }
+        throw new Error(`Network error: ${err.message}`)
       }
-      throw new Error(errorData.error || `API error: ${response.statusText}`)
-    }
-    return response.json()
+      if (!response.ok) {
+        let errorData
+        try {
+          errorData = await response.json()
+        } catch {
+          const err = new Error(`Server error (${response.status}): ${response.statusText}`)
+          err.response = { status: response.status, statusText: response.statusText }
+          throw err
+        }
+        const error = new Error(errorData.error || `API error: ${response.statusText}`)
+        error.response = { status: response.status }
+        throw error
+      }
+      return response.json()
+    }, { maxRetries: 3, baseDelay: 1000 })
   },
 }
 
diff --git a/src/pages/Contact.jsx b/src/pages/Contact.jsx
index e4c15bf..d7ae851 100644
--- a/src/pages/Contact.jsx
+++ b/src/pages/Contact.jsx
@@ -6,6 +6,7 @@ import { Input } from '@/components/ui/Input'
 import { Textarea } from '@/components/ui/Textarea'
 import { Select } from '@/components/ui/Select'
 import { api } from '@/lib/api'
+import { useDebounce } from '@/hooks/useDebounce'
 
 const Contact = () => {
   const [formState, setFormState] = useState({
@@ -23,6 +24,8 @@ const Contact = () => {
     email: '',
     message: '',
   })
+  // Debounce validation errors so they don't flash on every keystroke
+  const debouncedErrors = useDebounce(errors, 300)
 
   const mutation = useMutation({
     mutationFn: (data) => api.post('/leads', data),
@@ -187,8 +190,8 @@ const Contact = () => {
                 placeholder="Your company name"
                 className={errors.company ? 'border-red-500 focus-visible:ring-red-500' : ''}
               />
-              {errors.company && (
-                <p className="text-xs text-red-600 mt-1">{errors.company}</p>
+              {debouncedErrors.company && (
+                <p className="text-xs text-red-600 mt-1">{debouncedErrors.company}</p>
               )}
             </div>
 
@@ -206,8 +209,8 @@ const Contact = () => {
                 placeholder="Your full name"
                 className={errors.name ? 'border-red-500 focus-visible:ring-red-500' : ''}
               />
-              {errors.name && (
-                <p className="text-xs text-red-600 mt-1">{errors.name}</p>
+              {debouncedErrors.name && (
+                <p className="text-xs text-red-600 mt-1">{debouncedErrors.name}</p>
               )}
             </div>
 
@@ -225,8 +228,8 @@ const Contact = () => {
                 placeholder="your.email@example.com"
                 className={errors.email ? 'border-red-500 focus-visible:ring-red-500' : ''}
               />
-              {errors.email && (
-                <p className="text-xs text-red-600 mt-1">{errors.email}</p>
+              {debouncedErrors.email && (
+                <p className="text-xs text-red-600 mt-1">{debouncedErrors.email}</p>
               )}
             </div>
 
@@ -293,8 +296,8 @@ const Contact = () => {
                 rows={5}
                 className={`flex min-h-[80px] w-full rounded-md border bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 ${errors.message ? 'border-red-500 focus-visible:ring-red-500' : ''}`}
               />
-              {errors.message && (
-                <p className="text-xs text-red-600 mt-1">{errors.message}</p>
+              {debouncedErrors.message && (
+                <p className="text-xs text-red-600 mt-1">{debouncedErrors.message}</p>
               )}
             </div>
 
diff --git a/src/pages/Support.jsx b/src/pages/Support.jsx
index e2368ac..dc54bec 100644
--- a/src/pages/Support.jsx
+++ b/src/pages/Support.jsx
@@ -6,6 +6,7 @@ import { Input } from '@/components/ui/Input'
 import { Textarea } from '@/components/ui/Textarea'
 import { Select } from '@/components/ui/Select'
 import { api } from '@/lib/api'
+import { useDebounce } from '@/hooks/useDebounce'
 
 const Support = () => {
   const [formState, setFormState] = useState({
@@ -22,6 +23,8 @@ const Support = () => {
     email: '',
     issue: '',
   })
+  // Debounce validation errors so they don't flash on every keystroke
+  const debouncedErrors = useDebounce(errors, 300)
 
   const mutation = useMutation({
     mutationFn: (data) => api.post('/support', data),
@@ -209,8 +212,8 @@ const Support = () => {
                 placeholder="Your full name"
                 className={errors.name ? 'border-red-500 focus-visible:ring-red-500' : ''}
               />
-              {errors.name && (
-                <p className="text-xs text-red-600 mt-1">{errors.name}</p>
+              {debouncedErrors.name && (
+                <p className="text-xs text-red-600 mt-1">{debouncedErrors.name}</p>
               )}
             </div>
 
@@ -228,8 +231,8 @@ const Support = () => {
                 placeholder="Your company name"
                 className={errors.company ? 'border-red-500 focus-visible:ring-red-500' : ''}
               />
-              {errors.company && (
-                <p className="text-xs text-red-600 mt-1">{errors.company}</p>
+              {debouncedErrors.company && (
+                <p className="text-xs text-red-600 mt-1">{debouncedErrors.company}</p>
               )}
             </div>
 
@@ -247,8 +250,8 @@ const Support = () => {
                 placeholder="your.email@example.com"
                 className={errors.email ? 'border-red-500 focus-visible:ring-red-500' : ''}
               />
-              {errors.email && (
-                <p className="text-xs text-red-600 mt-1">{errors.email}</p>
+              {debouncedErrors.email && (
+                <p className="text-xs text-red-600 mt-1">{debouncedErrors.email}</p>
               )}
             </div>
 
@@ -296,8 +299,8 @@ const Support = () => {
                 rows={5}
                 className={`flex min-h-[80px] w-full rounded-md border bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 ${errors.issue ? 'border-red-500 focus-visible:ring-red-500' : ''}`}
               />
-              {errors.issue && (
-                <p className="text-xs text-red-600 mt-1">{errors.issue}</p>
+              {debouncedErrors.issue && (
+                <p className="text-xs text-red-600 mt-1">{debouncedErrors.issue}</p>
               )}
             </div>