fix frontend

2026-05-25 00:47:22 -04:00
parent 9bd0938951
commit 5ef9efb8a9
9 changed files with 95 additions and 73 deletions
@@ -1,5 +0,0 @@
-import WorkspaceFrame from '@/components/WorkspaceFrame'
-
-export default function SignInPage() {
-  return <WorkspaceFrame target="sign-in" />
-}
@@ -1,4 +1,5 @@
 import type { Metadata } from 'next'
+import { cookies } from 'next/headers'
 import MarketplaceShell from '@/components/MarketplaceShell'
 import { getMarketplaceLanguage } from '@/lib/i18n.server'
 import './globals.css'
@@ -15,6 +16,12 @@ export const metadata: Metadata = {

 export default function RootLayout({ children }: { children: React.ReactNode }) {
  const language = getMarketplaceLanguage()
+  const cookieStore = cookies()
+  const rawTheme =
+    cookieStore.get('rentaldrivego-theme')?.value ??
+    cookieStore.get('marketplace-theme')?.value
+  const theme = rawTheme === 'dark' ? 'dark' : 'light'
+
  return (
    <html lang={language} dir={language === 'ar' ? 'rtl' : 'ltr'} suppressHydrationWarning>
      <head>
@@ -27,7 +34,7 @@ export default function RootLayout({ children }: { children: React.ReactNode })
        />
      </head>
      <body suppressHydrationWarning>
-        <MarketplaceShell initialLanguage={language}>{children}</MarketplaceShell>
+        <MarketplaceShell initialLanguage={language} initialTheme={theme}>{children}</MarketplaceShell>
      </body>
    </html>
  )
@@ -0,0 +1,39 @@
+import { headers } from 'next/headers'
+import { redirect } from 'next/navigation'
+import { resolveServerAppUrl } from '@/lib/appUrls'
+
+type SearchParams = Record<string, string | string[] | undefined>
+
+function buildSearch(params: SearchParams): string {
+  const nextParams = new URLSearchParams()
+
+  for (const [key, value] of Object.entries(params)) {
+    if (typeof value === 'string') {
+      nextParams.set(key, value)
+      continue
+    }
+
+    if (Array.isArray(value)) {
+      for (const entry of value) nextParams.append(key, entry)
+    }
+  }
+
+  const search = nextParams.toString()
+  return search ? `?${search}` : ''
+}
+
+export default async function SignInPage({
+  searchParams,
+}: {
+  searchParams: SearchParams
+}) {
+  const requestHeaders = headers()
+  const dashboardUrl = resolveServerAppUrl(
+    process.env.NEXT_PUBLIC_DASHBOARD_URL ?? 'http://localhost:3000/dashboard',
+    requestHeaders.get('host'),
+    requestHeaders.get('x-forwarded-proto'),
+  )
+  const params = searchParams
+
+  redirect(`${dashboardUrl}/sign-in${buildSearch(params)}`)
+}