update website home and dashboard

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

@@ -23,6 +23,7 @@ import {
 import { useDashboardI18n } from '@/components/I18nProvider'
 import { marketplaceUrl } from '@/lib/urls'
 import { EMPLOYEE_PROFILE_KEY, EMPLOYEE_TOKEN_KEY, apiFetch } from '@/lib/api'
+import { SHARED_LANGUAGE_KEY, readCurrentUserScopedPreference } from '@/lib/preferences'
 
 interface BrandSettings {
   displayName: string
@@ -131,8 +132,13 @@ export default function Sidebar() {
         setUser(toSidebarUser(employee, dict.workspaceUser, dict.localAuth))
         if (employee.role) setRole(employee.role)
         if (employee.preferredLanguage === 'en' || employee.preferredLanguage === 'fr' || employee.preferredLanguage === 'ar') {
-          setLanguage(employee.preferredLanguage)
-          document.cookie = `rentaldrivego-language=${employee.preferredLanguage}; path=/; max-age=31536000; samesite=lax`
+          // Only apply the server-side preference when the employee has no local preference
+          // stored yet — avoids overriding a language the user manually switched to.
+          const existingPref = readCurrentUserScopedPreference(SHARED_LANGUAGE_KEY)
+          if (!existingPref) {
+            setLanguage(employee.preferredLanguage)
+            document.cookie = `rentaldrivego-language=${employee.preferredLanguage}; path=/; max-age=31536000; samesite=lax`
+          }
         }
       })
       .catch(() => {
@@ -190,7 +196,7 @@ export default function Sidebar() {
           open ? 'translate-x-0' : (isRtl ? 'translate-x-full' : '-translate-x-full'),
         ].join(' ')}
       >
-        <a href={marketplaceUrl} className="flex items-center gap-3 border-b border-slate-800 px-6 py-5">
+        <a href={marketplaceUrl} target="_top" className="flex items-center gap-3 border-b border-slate-800 px-6 py-5">
           <div className="flex h-8 w-8 flex-shrink-0 items-center justify-center rounded-lg bg-blue-500 overflow-hidden">
             {brand?.logoUrl ? (
               // eslint-disable-next-line @next/next/no-img-element