From ff108963a4abb089dfbc83d6bf691a0e11a88ed3 Mon Sep 17 00:00:00 2001
From: pmgasset <david@pmgasset.com>
Date: Wed, 15 Apr 2026 11:10:44 -0400
Subject: [PATCH] Use R2 for public image assets

---
 .env.example                               |  5 ++++
 next.config.ts                             | 34 +++++++++++++++++++++-
 src/components/sections/FounderSection.tsx |  3 +-
 src/components/sections/HeroSection.tsx    |  3 +-
 src/lib/assets.ts                          | 33 +++++++++++++++++++++
 src/lib/constants.ts                       | 18 ++++++++----
 6 files changed, 87 insertions(+), 9 deletions(-)
 create mode 100644 src/lib/assets.ts

diff --git a/.env.example b/.env.example
index edbf78f..6e037e9 100644
--- a/.env.example
+++ b/.env.example
@@ -27,3 +27,8 @@ AUTH_URL=http://localhost:3000
 # https://console.cloud.google.com/apis/credentials
 AUTH_GOOGLE_ID=
 AUTH_GOOGLE_SECRET=
+
+# Cloudflare R2 public image origin
+# Use a custom domain or R2 public development URL with no trailing slash.
+# Upload site assets under /images, for example /images/hero-rv-sunset.jpg.
+NEXT_PUBLIC_R2_PUBLIC_URL=
diff --git a/next.config.ts b/next.config.ts
index 862135b..6dc0968 100644
--- a/next.config.ts
+++ b/next.config.ts
@@ -1,8 +1,40 @@
 import type { NextConfig } from "next";
 
+function getR2PublicUrl(): URL | null {
+  const publicUrl = process.env.NEXT_PUBLIC_R2_PUBLIC_URL?.trim();
+
+  if (!publicUrl) {
+    return null;
+  }
+
+  try {
+    const url = new URL(publicUrl);
+
+    if (url.protocol !== "https:" && url.protocol !== "http:") {
+      return null;
+    }
+
+    return url;
+  } catch {
+    return null;
+  }
+}
+
+const r2PublicUrl = getR2PublicUrl();
+
 const nextConfig: NextConfig = {
   images: {
-    remotePatterns: [],
+    remotePatterns: r2PublicUrl
+      ? [
+          {
+            protocol: r2PublicUrl.protocol.replace(":", "") as "http" | "https",
+            hostname: r2PublicUrl.hostname,
+            port: r2PublicUrl.port,
+            pathname: "/**",
+          },
+        ]
+      : [],
+    unoptimized: Boolean(r2PublicUrl),
   },
 };
 
diff --git a/src/components/sections/FounderSection.tsx b/src/components/sections/FounderSection.tsx
index 1577a3e..91e39dd 100644
--- a/src/components/sections/FounderSection.tsx
+++ b/src/components/sections/FounderSection.tsx
@@ -1,6 +1,7 @@
 import Image from "next/image";
 import SectionWrapper from "@/components/ui/SectionWrapper";
 import Button from "@/components/ui/Button";
+import { assetUrl } from "@/lib/assets";
 
 export default function FounderSection() {
   return (
@@ -10,7 +11,7 @@ export default function FounderSection() {
         <div className="relative">
           <div className="relative rounded-2xl overflow-hidden aspect-[4/5] bg-slate-100 shadow-xl">
             <Image
-              src="/images/david.jpg"
+              src={assetUrl("/images/david.jpg")}
               alt="David, Founder of TechSolve Travel, working from his RV with a Starlink and Peplink setup"
               fill
               className="object-cover object-top"
diff --git a/src/components/sections/HeroSection.tsx b/src/components/sections/HeroSection.tsx
index ce62d36..1606fd8 100644
--- a/src/components/sections/HeroSection.tsx
+++ b/src/components/sections/HeroSection.tsx
@@ -1,12 +1,13 @@
 import Image from "next/image";
 import Button from "@/components/ui/Button";
+import { assetUrl } from "@/lib/assets";
 
 export default function HeroSection() {
   return (
     <section className="relative min-h-[90vh] flex items-center">
       {/* Background image */}
       <Image
-        src="/images/hero-rv-sunset.jpg"
+        src={assetUrl("/images/hero-rv-sunset.jpg")}
         alt="RV parked at sunset with Starlink dish and enterprise networking hardware"
         fill
         priority
diff --git a/src/lib/assets.ts b/src/lib/assets.ts
new file mode 100644
index 0000000..c93e35e
--- /dev/null
+++ b/src/lib/assets.ts
@@ -0,0 +1,33 @@
+const assetBaseUrl = getAssetBaseUrl();
+
+function getAssetBaseUrl(): string {
+  const rawUrl = process.env.NEXT_PUBLIC_R2_PUBLIC_URL?.trim();
+
+  if (!rawUrl) {
+    return "";
+  }
+
+  try {
+    const url = new URL(rawUrl);
+
+    if (url.protocol !== "https:" && url.protocol !== "http:") {
+      return "";
+    }
+
+    url.search = "";
+    url.hash = "";
+
+    return url.href.replace(/\/$/, "");
+  } catch {
+    return "";
+  }
+}
+
+export function assetUrl(path: string): string {
+  if (!assetBaseUrl) {
+    return path;
+  }
+
+  const normalizedPath = path.startsWith("/") ? path : `/${path}`;
+  return `${assetBaseUrl}${normalizedPath}`;
+}
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 85f7bd3..cf0d6a8 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -1,4 +1,5 @@
 import type { PricingTier, ProcessStep, TrustLogo } from "@/types";
+import { assetUrl } from "@/lib/assets";
 
 export const PROCESS_STEPS: ProcessStep[] = [
   {
@@ -98,34 +99,39 @@ export const PRICING_TIERS: PricingTier[] = [
 ];
 
 export const TRUST_LOGOS: TrustLogo[] = [
-  { name: "Peplink", src: "/images/logo-peplink.svg", width: 120, height: 40 },
+  {
+    name: "Peplink",
+    src: assetUrl("/images/logo-peplink.svg"),
+    width: 120,
+    height: 40,
+  },
   {
     name: "GL.iNet",
-    src: "/images/logo-gliinet.svg",
+    src: assetUrl("/images/logo-gliinet.svg"),
     width: 100,
     height: 40,
   },
   {
     name: "Ubiquiti UniFi",
-    src: "/images/logo-ubiquiti-unifi.svg",
+    src: assetUrl("/images/logo-ubiquiti-unifi.svg"),
     width: 110,
     height: 40,
   },
   {
     name: "WireGuard",
-    src: "/images/logo-wireguard.svg",
+    src: assetUrl("/images/logo-wireguard.svg"),
     width: 120,
     height: 40,
   },
   {
     name: "Fortinet",
-    src: "/images/logo-fortinet.svg",
+    src: assetUrl("/images/logo-fortinet.svg"),
     width: 110,
     height: 40,
   },
   {
     name: "Starlink",
-    src: "/images/logo-starlink.svg",
+    src: assetUrl("/images/logo-starlink.svg"),
     width: 110,
     height: 40,
   },