fix the booking and contract

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

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { toDashboardAppPath, toPublicDashboardPath } from './dashboardPaths'
+import { buildHomepageSignInPath, toDashboardAppPath, toPublicDashboardPath } from './dashboardPaths'
 
 describe('dashboard path normalization', () => {
   it('collapses empty and root values to the app root', () => {
@@ -19,4 +19,10 @@ describe('dashboard path normalization', () => {
     expect(toPublicDashboardPath('/dashboard/fleet')).toBe('/dashboard/fleet')
     expect(toPublicDashboardPath('customers')).toBe('/dashboard/customers')
   })
+
+  it('builds the canonical homepage sign-in URL with a dashboard return path', () => {
+    expect(buildHomepageSignInPath('/reservations')).toBe('/en/light/sign-in?redirect=%2Fdashboard%2Freservations')
+    expect(buildHomepageSignInPath('/dashboard/fleet', { locale: 'fr', theme: 'dark' })).toBe('/fr/dark/sign-in?redirect=%2Fdashboard%2Ffleet')
+    expect(buildHomepageSignInPath()).toBe('/en/light/sign-in')
+  })
 })

apps/dashboard/src/lib/dashboardPaths.ts

@@ -1,4 +1,6 @@
 const DASHBOARD_BASE_PATH = '/dashboard'
+const DEFAULT_SIGN_IN_LOCALE = 'en'
+const DEFAULT_SIGN_IN_THEME = 'light'
 
 export function toDashboardAppPath(path?: string | null): string {
   const value = (path ?? '').trim()
@@ -17,3 +19,21 @@ export function toPublicDashboardPath(path?: string | null): string {
   const appPath = toDashboardAppPath(path)
   return appPath === '/' ? DASHBOARD_BASE_PATH : `${DASHBOARD_BASE_PATH}${appPath}`
 }
+
+export function buildHomepageSignInPath(
+  currentPath?: string | null,
+  options: { locale?: string | null; theme?: string | null } = {},
+): string {
+  const locale = options.locale === 'fr' || options.locale === 'ar' || options.locale === 'en'
+    ? options.locale
+    : DEFAULT_SIGN_IN_LOCALE
+  const theme = options.theme === 'dark' || options.theme === 'light'
+    ? options.theme
+    : DEFAULT_SIGN_IN_THEME
+  const params = new URLSearchParams()
+
+  if (currentPath) params.set('redirect', toPublicDashboardPath(currentPath))
+
+  const query = params.toString()
+  return `/${locale}/${theme}/sign-in${query ? `?${query}` : ''}`
+}