add: NEXT_PUBLIC_STOREFRONT_URL and NEXT_PUBLIC_HOMEPAGE_URL. Remove NEXT_PUBLIC_MARKETPLACE_URL.

apps/dashboard/src/app/forgot-password/ForgotPasswordPageClient.tsx

@@ -6,7 +6,7 @@ import { useState } from "react";
 import { useDashboardI18n } from "@/components/I18nProvider";
 import PublicShell from "@/components/layout/PublicShell";
 import { API_BASE } from "@/lib/api";
-import { marketplaceUrl } from "@/lib/urls";
+import { storefrontUrl } from "@/lib/urls";
 
 const DASHBOARD_LOGO_SRC = "/dashboard/rentaldrivego.png";
 
@@ -97,7 +97,7 @@ export default function ForgotPasswordPageClient({
         <div className="w-full max-w-md">
           <div className="mb-8 text-center">
             <div className="flex justify-center">
-              <a href={marketplaceUrl} target="_top">
+              <a href={storefrontUrl} target="_top">
                 <Image
                   src={DASHBOARD_LOGO_SRC}
                   alt="RentalDriveGo"

apps/dashboard/src/app/onboarding/page.tsx

@@ -5,7 +5,7 @@ import { useState } from 'react'
 import { useRouter } from 'next/navigation'
 import { apiFetch } from '@/lib/api'
 import PublicShell from '@/components/layout/PublicShell'
-import { marketplaceUrl } from '@/lib/urls'
+import { storefrontUrl } from '@/lib/urls'
 
 type Step = 1 | 2 | 3
 
@@ -97,7 +97,7 @@ export default function OnboardingPage() {
       <main className="flex items-center justify-center px-4 py-12">
         <div className="w-full max-w-lg">
         <div className="mb-8 text-center">
-          <a href={marketplaceUrl} className="text-xs font-semibold uppercase tracking-widest text-blue-600">RentalDriveGo</a>
+          <a href={storefrontUrl} className="text-xs font-semibold uppercase tracking-widest text-blue-600">RentalDriveGo</a>
           <h1 className="mt-2 text-3xl font-bold text-slate-900">Set up your account</h1>
           <p className="mt-1 text-sm text-slate-500">Step {step} of 3</p>
         </div>

apps/dashboard/src/app/sign-in/[[...sign-in]]/SignInPageClient.tsx

@@ -6,7 +6,7 @@ import { useEffect, useRef, useState } from "react";
 import { usePathname, useRouter, useSearchParams } from "next/navigation";
 import { useDashboardI18n } from "@/components/I18nProvider";
 import PublicShell from "@/components/layout/PublicShell";
-import { adminUrl, marketplaceUrl } from "@/lib/urls";
+import { adminUrl, storefrontUrl } from "@/lib/urls";
 import { API_BASE, EMPLOYEE_PROFILE_KEY } from "@/lib/api";
 import { toPublicDashboardPath } from "@/lib/dashboardPaths";
 
@@ -177,7 +177,7 @@ export default function SignInPageClient({
         <div className="w-full max-w-md">
           <div className="mb-8 text-center">
             <div className="flex justify-center">
-              <a href={marketplaceUrl} target="_top">
+              <a href={storefrontUrl} target="_top">
                 <Image
                   src={DASHBOARD_LOGO_SRC}
                   alt="RentalDriveGo"

apps/dashboard/src/app/sign-up/[[...sign-up]]/SignUpForm.tsx

@@ -6,7 +6,7 @@ import { usePathname, useRouter, useSearchParams } from "next/navigation";
 import { apiFetch } from "@/lib/api";
 import PublicShell from "@/components/layout/PublicShell";
 import { useDashboardI18n } from "@/components/I18nProvider";
-import { marketplaceUrl } from "@/lib/urls";
+import { storefrontUrl } from "@/lib/urls";
 
 const DASHBOARD_LOGO_SRC = "/dashboard/rentaldrivego.png";
 
@@ -281,7 +281,7 @@ export default function SignUpForm({
         <div className="w-full max-w-md">
           <div className="mb-8 text-center">
             <div className="flex justify-center">
-              <a href={marketplaceUrl} target="_top">
+              <a href={storefrontUrl} target="_top">
                 <Image
                   src={DASHBOARD_LOGO_SRC}
                   alt="RentalDriveGo"

apps/dashboard/src/components/layout/PublicFooter.tsx

@@ -7,7 +7,7 @@ import {
   type DashboardLanguage,
   useDashboardI18n,
 } from '@/components/I18nProvider'
-import { marketplaceUrl } from '@/lib/urls'
+import { storefrontUrl } from '@/lib/urls'
 
 type FooterItem = {
   label: string
@@ -15,9 +15,9 @@ type FooterItem = {
 }
 
 const appPrivacyHref = {
-  en: `${marketplaceUrl}/app-privacy-en`,
-  fr: `${marketplaceUrl}/app-privacy-fr`,
-  ar: `${marketplaceUrl}/app-privacy-ar`,
+  en: `${storefrontUrl}/app-privacy-en`,
+  fr: `${storefrontUrl}/app-privacy-fr`,
+  ar: `${storefrontUrl}/app-privacy-ar`,
 } as const
 
 const localeOptions: Array<{ value: DashboardLanguage; label: string; flag: string }> = [
@@ -36,17 +36,17 @@ function getFooterContent(language: DashboardLanguage): {
     case 'fr':
       return {
         primary: [
-          { label: 'À propos de nous', href: `${marketplaceUrl}/footer/about-us` },
-          { label: 'Conditions d’utilisation', href: `${marketplaceUrl}/footer/terms-of-service` },
-          { label: 'Sécurité', href: `${marketplaceUrl}/footer/security` },
-          { label: 'Conformité', href: `${marketplaceUrl}/footer/compliance` },
+          { label: 'À propos de nous', href: `${storefrontUrl}/footer/about-us` },
+          { label: 'Conditions d’utilisation', href: `${storefrontUrl}/footer/terms-of-service` },
+          { label: 'Sécurité', href: `${storefrontUrl}/footer/security` },
+          { label: 'Conformité', href: `${storefrontUrl}/footer/compliance` },
           { label: 'Politique de confidentialité', href: appPrivacyHref.fr },
-          { label: 'Politique relative aux cookies', href: `${marketplaceUrl}/footer/cookie-policy` },
+          { label: 'Politique relative aux cookies', href: `${storefrontUrl}/footer/cookie-policy` },
         ],
         secondary: [
-          { label: 'Newsletter', href: `${marketplaceUrl}/footer/newsletter` },
-          { label: 'Contacter les ventes', href: `${marketplaceUrl}/footer/contact-sales` },
-          { label: 'Conditions générales', href: `${marketplaceUrl}/footer/general-conditions` },
+          { label: 'Newsletter', href: `${storefrontUrl}/footer/newsletter` },
+          { label: 'Contacter les ventes', href: `${storefrontUrl}/footer/contact-sales` },
+          { label: 'Conditions générales', href: `${storefrontUrl}/footer/general-conditions` },
         ],
         localeLabel: 'Europe (French)',
         rightsLabel: 'Tous droits réservés.',
@@ -54,17 +54,17 @@ function getFooterContent(language: DashboardLanguage): {
     case 'ar':
       return {
         primary: [
-          { label: 'من نحن', href: `${marketplaceUrl}/footer/about-us` },
-          { label: 'شروط الاستخدام', href: `${marketplaceUrl}/footer/terms-of-service` },
-          { label: 'الأمان', href: `${marketplaceUrl}/footer/security` },
-          { label: 'الامتثال', href: `${marketplaceUrl}/footer/compliance` },
+          { label: 'من نحن', href: `${storefrontUrl}/footer/about-us` },
+          { label: 'شروط الاستخدام', href: `${storefrontUrl}/footer/terms-of-service` },
+          { label: 'الأمان', href: `${storefrontUrl}/footer/security` },
+          { label: 'الامتثال', href: `${storefrontUrl}/footer/compliance` },
           { label: 'سياسة الخصوصية', href: appPrivacyHref.ar },
-          { label: 'سياسة ملفات تعريف الارتباط', href: `${marketplaceUrl}/footer/cookie-policy` },
+          { label: 'سياسة ملفات تعريف الارتباط', href: `${storefrontUrl}/footer/cookie-policy` },
         ],
         secondary: [
-          { label: 'النشرة الإخبارية', href: `${marketplaceUrl}/footer/newsletter` },
-          { label: 'تواصل مع المبيعات', href: `${marketplaceUrl}/footer/contact-sales` },
-          { label: 'الشروط العامة', href: `${marketplaceUrl}/footer/general-conditions` },
+          { label: 'النشرة الإخبارية', href: `${storefrontUrl}/footer/newsletter` },
+          { label: 'تواصل مع المبيعات', href: `${storefrontUrl}/footer/contact-sales` },
+          { label: 'الشروط العامة', href: `${storefrontUrl}/footer/general-conditions` },
         ],
         localeLabel: 'North Africa (Arabic)',
         rightsLabel: 'جميع الحقوق محفوظة.',
@@ -73,17 +73,17 @@ function getFooterContent(language: DashboardLanguage): {
     default:
       return {
         primary: [
-          { label: 'About Us', href: `${marketplaceUrl}/footer/about-us` },
-          { label: 'Terms of Service', href: `${marketplaceUrl}/footer/terms-of-service` },
-          { label: 'Security', href: `${marketplaceUrl}/footer/security` },
-          { label: 'Compliance', href: `${marketplaceUrl}/footer/compliance` },
+          { label: 'About Us', href: `${storefrontUrl}/footer/about-us` },
+          { label: 'Terms of Service', href: `${storefrontUrl}/footer/terms-of-service` },
+          { label: 'Security', href: `${storefrontUrl}/footer/security` },
+          { label: 'Compliance', href: `${storefrontUrl}/footer/compliance` },
           { label: 'Privacy Policy', href: appPrivacyHref.en },
-          { label: 'Cookie Policy', href: `${marketplaceUrl}/footer/cookie-policy` },
+          { label: 'Cookie Policy', href: `${storefrontUrl}/footer/cookie-policy` },
         ],
         secondary: [
-          { label: 'Newsletter', href: `${marketplaceUrl}/footer/newsletter` },
-          { label: 'Contact Sales', href: `${marketplaceUrl}/footer/contact-sales` },
-          { label: 'General Conditions', href: `${marketplaceUrl}/footer/general-conditions` },
+          { label: 'Newsletter', href: `${storefrontUrl}/footer/newsletter` },
+          { label: 'Contact Sales', href: `${storefrontUrl}/footer/contact-sales` },
+          { label: 'General Conditions', href: `${storefrontUrl}/footer/general-conditions` },
         ],
         localeLabel: 'Global (English)',
         rightsLabel: 'All rights reserved.',

apps/dashboard/src/components/layout/PublicHeader.tsx

@@ -4,7 +4,7 @@ import { ChevronDown } from "lucide-react";
 import Image from "next/image";
 import { useEffect, useRef, useState } from "react";
 import { useDashboardI18n } from "@/components/I18nProvider";
-import { marketplaceUrl } from "@/lib/urls";
+import { storefrontUrl } from "@/lib/urls";
 
 const BRAND_LOGO_SRC = "/dashboard/rentaldrivego.png";
 
@@ -84,16 +84,16 @@ export default function PublicHeader({
     setThemeMenuOpen((open) => !open);
   }
 
-  const signInHref = `${marketplaceUrl}/${language}#signin`;
+  const signInHref = `${storefrontUrl}/${language}#signin`;
 
-  const signUpHref = `${marketplaceUrl}/${language}#demo`;
+  const signUpHref = `${storefrontUrl}/${language}#demo`;
 
   return (
     <header className="sticky top-0 z-50 border-b border-stone-200/80 bg-white/78 backdrop-blur-xl shadow-[0_10px_30px_rgba(15,23,42,0.08)] transition-colors dark:border-blue-900 dark:bg-blue-950/76 dark:shadow-[0_10px_30px_rgba(0,0,0,0.32)]">
       <div className="mx-auto flex min-h-14 max-w-7xl flex-col gap-1.5 px-4 py-1.5 sm:px-6 lg:flex-row lg:items-center lg:justify-between lg:gap-3 lg:px-8 lg:py-2">
         <div className="flex items-center justify-between gap-3">
           <a
-            href={`${marketplaceUrl}/${language}`}
+            href={`${storefrontUrl}/${language}`}
             className="flex items-center gap-1.5 text-[11px] font-bold uppercase tracking-[0.14em] text-stone-900 no-underline sm:text-sm sm:tracking-[0.2em] dark:text-stone-100"
             aria-label="RentalDriveGo home"
           >

apps/dashboard/src/components/layout/Sidebar.tsx

@@ -24,7 +24,7 @@ import {
   AlertTriangle,
 } from 'lucide-react'
 import { DashboardLanguageSwitcher, DashboardThemeSwitcher, useDashboardI18n } from '@/components/I18nProvider'
-import { marketplaceUrl } from '@/lib/urls'
+import { storefrontUrl } from '@/lib/urls'
 import { EMPLOYEE_PROFILE_KEY, apiFetch } from '@/lib/api'
 import { toDashboardAppPath } from '@/lib/dashboardPaths'
 import { SHARED_LANGUAGE_KEY, readCurrentUserScopedPreference } from '@/lib/preferences'
@@ -351,7 +351,7 @@ export default function Sidebar() {
     void fetch('/dashboard/api/v1/auth/employee/logout', { method: 'POST', credentials: 'include' })
     window.dispatchEvent(new CustomEvent('rentaldrivego:auth-changed'))
     notifyParent({ type: 'rentaldrivego:employee-logout' })
-    window.location.href = marketplaceUrl
+    window.location.href = storefrontUrl
   }
 
   return (
@@ -388,7 +388,7 @@ export default function Sidebar() {
         ].join(' ')}
       >
         <a
-          href={marketplaceUrl}
+          href={storefrontUrl}
           target="_top"
           className="flex items-center gap-3 border-b border-blue-200/70 px-5 py-5 transition-colors dark:border-blue-400/10"
         >

apps/dashboard/src/lib/urls.test.ts

@@ -9,7 +9,7 @@ function installWindow(hostname: string, protocol = 'https:') {
 
 async function loadUrls(env: Record<string, string | undefined> = {}) {
   vi.resetModules()
-  for (const key of ['NEXT_PUBLIC_MARKETPLACE_URL', 'NEXT_PUBLIC_ADMIN_URL']) {
+  for (const key of ['NEXT_PUBLIC_STOREFRONT_URL', 'NEXT_PUBLIC_ADMIN_URL']) {
     if (env[key] === undefined) {
       delete process.env[key]
     } else {
@@ -21,44 +21,44 @@ async function loadUrls(env: Record<string, string | undefined> = {}) {
 
 afterEach(() => {
   Reflect.deleteProperty(globalThis, 'window')
-  delete process.env.NEXT_PUBLIC_MARKETPLACE_URL
+  delete process.env.NEXT_PUBLIC_STOREFRONT_URL
   delete process.env.NEXT_PUBLIC_ADMIN_URL
   vi.resetModules()
 })
 
 describe('dashboard cross-app URLs', () => {
   it('uses default marketplace and admin bases on the server', async () => {
-    const { marketplaceUrl, adminUrl } = await loadUrls()
+    const { storefrontUrl, adminUrl } = await loadUrls()
 
-    expect(marketplaceUrl).toBe('http://localhost:3000')
+    expect(storefrontUrl).toBe('http://localhost:3000')
     expect(adminUrl).toBe('http://localhost:3000/admin')
   })
 
   it('strips trailing slashes from configured absolute URLs', async () => {
-    const { marketplaceUrl, adminUrl } = await loadUrls({
-      NEXT_PUBLIC_MARKETPLACE_URL: 'https://market.example.com/',
+    const { storefrontUrl, adminUrl } = await loadUrls({
+      NEXT_PUBLIC_STOREFRONT_URL: 'https://market.example.com/',
       NEXT_PUBLIC_ADMIN_URL: 'https://ops.example.com/admin/',
     })
 
-    expect(marketplaceUrl).toBe('https://market.example.com')
+    expect(storefrontUrl).toBe('https://market.example.com')
     expect(adminUrl).toBe('https://ops.example.com/admin')
   })
 
   it('rewrites local browser fallbacks onto the current production host', async () => {
     installWindow('tenant.rentaldrivego.com', 'https:')
-    const { marketplaceUrl, adminUrl } = await loadUrls()
+    const { storefrontUrl, adminUrl } = await loadUrls()
 
-    expect(marketplaceUrl).toBe('https://tenant.rentaldrivego.com')
+    expect(storefrontUrl).toBe('https://tenant.rentaldrivego.com')
     expect(adminUrl).toBe('https://tenant.rentaldrivego.com/admin')
   })
 
   it('preserves non-URL values after normalizing their trailing slash', async () => {
-    const { marketplaceUrl, adminUrl } = await loadUrls({
-      NEXT_PUBLIC_MARKETPLACE_URL: '/marketplace/',
+    const { storefrontUrl, adminUrl } = await loadUrls({
+      NEXT_PUBLIC_STOREFRONT_URL: '/marketplace/',
       NEXT_PUBLIC_ADMIN_URL: '/admin/',
     })
 
-    expect(marketplaceUrl).toBe('/marketplace')
+    expect(storefrontUrl).toBe('/marketplace')
     expect(adminUrl).toBe('/admin')
   })
 })

apps/dashboard/src/lib/urls.ts

@@ -9,8 +9,8 @@ function toAppBase(url: string): string {
   }
 }
 
-export const marketplaceUrl = toAppBase(
-  resolveBrowserAppUrl(process.env.NEXT_PUBLIC_MARKETPLACE_URL ?? 'http://localhost:3000'),
+export const storefrontUrl = toAppBase(
+  resolveBrowserAppUrl(process.env.NEXT_PUBLIC_STOREFRONT_URL ?? 'http://localhost:3000'),
 )
 
 export const adminUrl = toAppBase(

apps/dashboard/src/middleware.test.ts

@@ -37,9 +37,9 @@ function request(input: string, options: { token?: string; headers?: Record<stri
   }
 }
 
-async function loadMiddleware(marketplaceUrl = 'https://market.example.com') {
+async function loadMiddleware(storefrontUrl = 'https://market.example.com') {
   vi.resetModules()
-  process.env.NEXT_PUBLIC_MARKETPLACE_URL = marketplaceUrl
+  process.env.NEXT_PUBLIC_STOREFRONT_URL = storefrontUrl
   return import('./middleware')
 }
 
@@ -49,7 +49,7 @@ beforeEach(() => {
 })
 
 afterEach(() => {
-  delete process.env.NEXT_PUBLIC_MARKETPLACE_URL
+  delete process.env.NEXT_PUBLIC_STOREFRONT_URL
   vi.resetModules()
 })
 

apps/dashboard/src/middleware.ts

@@ -1,7 +1,7 @@
 import { NextResponse } from 'next/server'
 import type { NextRequest } from 'next/server'
 
-const MARKETPLACE_URL = process.env.NEXT_PUBLIC_MARKETPLACE_URL ?? 'http://localhost:3000'
+const STOREFRONT_URL = process.env.NEXT_PUBLIC_STOREFRONT_URL ?? 'http://localhost:3000'
 const DASHBOARD_BASE_PATH = '/dashboard'
 
 function toDashboardAppPath(pathname: string): string {
@@ -32,7 +32,7 @@ function deduplicatePublicDashboardPath(pathname: string): string | null {
 function resolveProxyUrl(req: NextRequest, pathname: string): URL {
   const forwardedHost = req.headers.get('x-forwarded-host')
   const forwardedProto = req.headers.get('x-forwarded-proto')
-  const marketplaceOrigin = new URL(MARKETPLACE_URL)
+  const storefrontOrigin = new URL(STOREFRONT_URL)
 
   const url = new URL(pathname, req.nextUrl.origin)
   if (forwardedHost && !isInternalHost(forwardedHost)) {
@@ -42,8 +42,8 @@ function resolveProxyUrl(req: NextRequest, pathname: string): URL {
     url.host = req.nextUrl.host
     url.protocol = req.nextUrl.protocol
   } else {
-    url.host = marketplaceOrigin.host
-    url.protocol = marketplaceOrigin.protocol
+    url.host = storefrontOrigin.host
+    url.protocol = storefrontOrigin.protocol
   }
   return url
 }
@@ -51,7 +51,7 @@ function resolveProxyUrl(req: NextRequest, pathname: string): URL {
 function isInternalHost(host: string | null): boolean {
   if (!host) return false
   const hostname = host.split(':')[0]?.toLowerCase()
-  return ['host.docker.internal', 'dashboard', 'admin', 'api', 'marketplace'].includes(hostname)
+  return ['host.docker.internal', 'dashboard', 'admin', 'api', 'homepage', 'storefront'].includes(hostname)
 }
 
 function isProtectedRoute(req: NextRequest) {