fix signin signout and apply the new style

apps/marketplace/src/app/(public)/company-workspace/page.tsx

@@ -1,5 +1,5 @@
 import { redirect } from 'next/navigation'
 
 export default function CompanyWorkspacePage() {
-  redirect('/sign-in')
+  redirect('/')
 }

apps/marketplace/src/app/(public)/explore/ExploreSearchForm.tsx

@@ -8,6 +8,9 @@ type ExploreSearchFormDict = {
   searchTitle: string
   pickupLocation: string
   dropoffLocation: string
+  sameDropoff: string
+  differentDropoff: string
+  sameAsPickup: string
   pickupDate: string
   returnDate: string
   hour: string
@@ -29,6 +32,7 @@ const selectBase = 'w-full border-0 bg-white dark:bg-[#162038] py-4 text-sm text
 export default function ExploreSearchForm({
   pickupLocation,
   dropoffLocation,
+  dropoffMode,
   pickupDate,
   pickupTime,
   returnDate,
@@ -40,6 +44,7 @@ export default function ExploreSearchForm({
 }: {
   pickupLocation: string
   dropoffLocation: string
+  dropoffMode: 'same' | 'different'
   pickupDate: string
   pickupTime: string
   returnDate: string
@@ -55,6 +60,7 @@ export default function ExploreSearchForm({
   const [filters, setFilters] = useState({
     pickupLocation,
     dropoffLocation,
+    dropoffMode,
     pickupDate,
     pickupTime: pickupTime || '10:00',
     returnDate,
@@ -73,14 +79,19 @@ export default function ExploreSearchForm({
 
     const query = new URLSearchParams()
     const normalizedPickup = filters.pickupLocation.trim()
-    const normalizedDropoff = filters.dropoffLocation.trim()
+    const normalizedDropoff = filters.dropoffMode === 'different'
+      ? filters.dropoffLocation.trim()
+      : normalizedPickup
     const normalizedPromo = filters.promoCode.trim()
 
     if (normalizedPickup) {
       query.set('pickupLocation', normalizedPickup)
       query.set('city', normalizedPickup)
     }
-    if (normalizedDropoff) query.set('dropoffLocation', normalizedDropoff)
+    query.set('dropoffMode', filters.dropoffMode)
+    if (filters.dropoffMode === 'different' && normalizedDropoff) {
+      query.set('dropoffLocation', normalizedDropoff)
+    }
     if (filters.pickupDate) query.set('pickupDate', filters.pickupDate)
     if (filters.pickupTime) query.set('pickupTime', filters.pickupTime)
     if (filters.returnDate) query.set('returnDate', filters.returnDate)
@@ -116,20 +127,56 @@ export default function ExploreSearchForm({
               ))}
             </select>
           </label>
-          <label className="flex items-center gap-3 bg-white dark:bg-[#162038] px-4">
-            <MapPin className="h-5 w-5 text-stone-300 dark:text-stone-500" />
-            <select
-              name="dropoffLocation"
-              value={filters.dropoffLocation}
-              onChange={(event) => updateFilter('dropoffLocation', event.target.value)}
-              className={selectBase}
-            >
-              <option value="">{dict.dropoffLocation}</option>
-              {cityOptions.map((city) => (
-                <option key={`dropoff-${city}`} value={city}>{city}</option>
-              ))}
-            </select>
-          </label>
+          <div className="bg-white dark:bg-[#162038] px-4 py-3">
+            <div className="flex items-center justify-between gap-3">
+              <span className="text-xs font-semibold uppercase tracking-[0.14em] text-stone-400 dark:text-stone-500">{dict.dropoffLocation}</span>
+              <div className="inline-flex rounded-full border border-stone-200 dark:border-blue-800 bg-stone-100 dark:bg-[#0d1b38] p-1">
+                <button
+                  type="button"
+                  onClick={() => setFilters((current) => ({ ...current, dropoffMode: 'same', dropoffLocation: '' }))}
+                  className={`rounded-full px-3 py-1.5 text-xs font-semibold transition ${
+                    filters.dropoffMode === 'same'
+                      ? 'bg-stone-900 text-white dark:bg-orange-400 dark:text-stone-900'
+                      : 'text-stone-500 dark:text-stone-400'
+                  }`}
+                >
+                  {dict.sameDropoff}
+                </button>
+                <button
+                  type="button"
+                  onClick={() => setFilters((current) => ({ ...current, dropoffMode: 'different' }))}
+                  className={`rounded-full px-3 py-1.5 text-xs font-semibold transition ${
+                    filters.dropoffMode === 'different'
+                      ? 'bg-stone-900 text-white dark:bg-orange-400 dark:text-stone-900'
+                      : 'text-stone-500 dark:text-stone-400'
+                  }`}
+                >
+                  {dict.differentDropoff}
+                </button>
+              </div>
+            </div>
+            {filters.dropoffMode === 'different' ? (
+              <label className="mt-3 flex items-center gap-3">
+                <MapPin className="h-5 w-5 text-stone-300 dark:text-stone-500" />
+                <select
+                  name="dropoffLocation"
+                  value={filters.dropoffLocation}
+                  onChange={(event) => updateFilter('dropoffLocation', event.target.value)}
+                  className={selectBase}
+                >
+                  <option value="">{dict.dropoffLocation}</option>
+                  {cityOptions.map((city) => (
+                    <option key={`dropoff-${city}`} value={city}>{city}</option>
+                  ))}
+                </select>
+              </label>
+            ) : (
+              <div className="mt-3 flex items-center gap-3 rounded-2xl bg-stone-50 px-4 py-4 text-sm font-medium text-stone-500 dark:bg-[#0d1b38] dark:text-stone-300">
+                <MapPin className="h-5 w-5 text-stone-300 dark:text-stone-500" />
+                <span>{filters.pickupLocation || dict.sameAsPickup}</span>
+              </div>
+            )}
+          </div>
         </div>
 
         <div className="grid gap-px overflow-hidden rounded-[1.35rem] border border-stone-200 dark:border-blue-800 bg-stone-200 dark:bg-stone-700 md:grid-cols-4">

apps/marketplace/src/app/(public)/explore/[slug]/vehicles/[id]/page.tsx

@@ -16,6 +16,9 @@ interface VehicleDetail {
   features: string[]
   dailyRate: number
   photos: string[]
+  pickupLocations: string[]
+  allowDifferentDropoff: boolean
+  dropoffLocations: string[]
   availability: boolean
   availabilityStatus: 'AVAILABLE' | 'RESERVED' | 'MAINTENANCE' | 'UNAVAILABLE'
   nextAvailableAt: string | null
@@ -259,6 +262,9 @@ export default async function VehicleDetailPage({ params }: { params: { slug: st
                   vehicleId={vehicle.id}
                   companySlug={params.slug}
                   dailyRate={vehicle.dailyRate}
+                  pickupLocations={vehicle.pickupLocations}
+                  allowDifferentDropoff={vehicle.allowDifferentDropoff}
+                  dropoffLocations={vehicle.dropoffLocations}
                 />
               )}
 

apps/marketplace/src/app/(public)/explore/page.tsx

@@ -12,6 +12,9 @@ interface Vehicle {
   category: string
   dailyRate: number
   photos: string[]
+  pickupLocations: string[]
+  allowDifferentDropoff: boolean
+  dropoffLocations: string[]
   availability?: boolean | null
   availabilityStatus?: 'AVAILABLE' | 'RESERVED' | 'MAINTENANCE' | 'UNAVAILABLE'
   nextAvailableAt?: string | null
@@ -73,6 +76,9 @@ export default async function ExplorePage({ searchParams }: { searchParams?: Rec
       searchTitle: 'Find a vehicle',
       pickupLocation: 'Pick-up location',
       dropoffLocation: 'Drop-off location',
+      sameDropoff: 'Same drop-off',
+      differentDropoff: 'Different drop-off',
+      sameAsPickup: 'Return to the same location',
       pickupDate: 'Start date',
       returnDate: 'Return date',
       hour: 'Hour',
@@ -116,6 +122,9 @@ export default async function ExplorePage({ searchParams }: { searchParams?: Rec
       searchTitle: 'Trouver un véhicule',
       pickupLocation: 'Lieu de départ',
       dropoffLocation: "Lieu de retour",
+      sameDropoff: 'Même retour',
+      differentDropoff: 'Retour différent',
+      sameAsPickup: 'Retour au même lieu',
       pickupDate: 'Date de départ',
       returnDate: 'Date de retour',
       hour: 'Heure',
@@ -159,6 +168,9 @@ export default async function ExplorePage({ searchParams }: { searchParams?: Rec
       searchTitle: 'احجز سيارة',
       pickupLocation: 'موقع الاستلام',
       dropoffLocation: 'موقع الإرجاع',
+      sameDropoff: 'نفس موقع الإرجاع',
+      differentDropoff: 'موقع إرجاع مختلف',
+      sameAsPickup: 'الإرجاع في نفس موقع الاستلام',
       pickupDate: 'تاريخ البدء',
       returnDate: 'تاريخ الإرجاع',
       hour: 'الساعة',
@@ -200,6 +212,7 @@ export default async function ExplorePage({ searchParams }: { searchParams?: Rec
   const city = typeof searchParams?.city === 'string' ? searchParams.city : ''
   const pickupLocation = typeof searchParams?.pickupLocation === 'string' ? searchParams.pickupLocation : city
   const dropoffLocation = typeof searchParams?.dropoffLocation === 'string' ? searchParams.dropoffLocation : ''
+  const dropoffMode = searchParams?.dropoffMode === 'different' ? 'different' : 'same'
   const pickupDate = typeof searchParams?.pickupDate === 'string' ? searchParams.pickupDate : ''
   const pickupTime = typeof searchParams?.pickupTime === 'string' ? searchParams.pickupTime : '10:00'
   const returnDate = typeof searchParams?.returnDate === 'string' ? searchParams.returnDate : ''
@@ -215,6 +228,9 @@ export default async function ExplorePage({ searchParams }: { searchParams?: Rec
 
   const query = new URLSearchParams()
   if (pickupLocation) query.set('city', pickupLocation)
+  if (pickupLocation) query.set('pickupLocation', pickupLocation)
+  query.set('dropoffMode', dropoffMode)
+  if (dropoffMode === 'different' && dropoffLocation) query.set('dropoffLocation', dropoffLocation)
   if (startDate) query.set('startDate', startDate)
   if (endDate) query.set('endDate', endDate)
   if (category) query.set('category', category)
@@ -246,6 +262,7 @@ export default async function ExplorePage({ searchParams }: { searchParams?: Rec
           <ExploreSearchForm
             pickupLocation={pickupLocation}
             dropoffLocation={dropoffLocation}
+            dropoffMode={dropoffMode}
             pickupDate={pickupDate}
             pickupTime={pickupTime}
             returnDate={returnDate}

apps/marketplace/src/app/(public)/platform-operations/page.tsx

@@ -1,5 +1,5 @@
 import { redirect } from 'next/navigation'
 
 export default function PlatformOperationsPage() {
-  redirect('/sign-in')
+  redirect('/')
 }

apps/marketplace/src/app/(public)/pricing/PricingClient.tsx

@@ -82,7 +82,7 @@ const copy = {
     perMonth: '/mo',
     billedAs: 'Billed as',
     getStarted: 'Get started',
-    footer: 'All plans include a 14-day free trial. No credit card required.',
+    footer: 'All plans include a 90-day free trial. No credit card required.',
   },
   fr: {
     monthly: 'Mensuel',
@@ -94,7 +94,7 @@ const copy = {
     perMonth: '/mois',
     billedAs: 'Facturé à',
     getStarted: 'Commencer',
-    footer: "Toutes les formules incluent un essai gratuit de 14 jours. Aucune carte bancaire n'est requise.",
+    footer: "Toutes les formules incluent un essai gratuit de 90 jours. Aucune carte bancaire n'est requise.",
   },
   ar: {
     monthly: 'شهري',

apps/marketplace/src/app/(public)/pricing/PricingPageContent.tsx

@@ -7,7 +7,7 @@ const copy = {
   en: {
     kicker: 'Pricing',
     title: 'One platform, every fleet size.',
-    body: 'Start free for 14 days, then choose the plan that grows with your business. Switch plans or cancel at any time.',
+    body: 'Start free for 90 days, then choose the plan that grows with your business. Switch plans or cancel at any time.',
     faq: 'Frequently asked',
     items: [
       ['Can I change plans later?', 'Yes. Upgrade or downgrade at any time — changes take effect on your next billing cycle.'],
@@ -19,7 +19,7 @@ const copy = {
   fr: {
     kicker: 'Tarifs',
     title: 'Une seule plateforme pour toutes les tailles de flotte.',
-    body: 'Commencez gratuitement pendant 14 jours, puis choisissez la formule qui accompagne votre activité. Vous pouvez changer de formule ou annuler à tout moment.',
+    body: 'Commencez gratuitement pendant 90 jours, puis choisissez la formule qui accompagne votre activité. Vous pouvez changer de formule ou annuler à tout moment.',
     faq: 'Questions fréquentes',
     items: [
       ['Puis-je changer de formule plus tard ?', 'Oui. Vous pouvez passer à une formule supérieure ou inférieure à tout moment. Les changements prennent effet au cycle de facturation suivant.'],

apps/marketplace/src/app/renter/dashboard/page.tsx

@@ -115,7 +115,7 @@ export default function RenterDashboardPage() {
   useEffect(() => {
     const token = localStorage.getItem('renter_token')
     if (!token) {
-      router.replace('/renter/sign-in')
+      router.replace('/')
       return
     }
 
@@ -127,7 +127,7 @@ export default function RenterDashboardPage() {
         if (!res.ok) {
           if (res.status === 401) {
             localStorage.removeItem('renter_token')
-            router.replace('/renter/sign-in')
+            router.replace('/')
           } else {
             setErrorMsg(json?.message ?? dict.loadProfile)
             setStatus('error')

apps/marketplace/src/app/renter/notifications/page.tsx

@@ -65,7 +65,7 @@ export default function RenterNotificationsPage() {
       .then((items) => setNotifications(items))
       .catch((err) => {
         if (err instanceof RenterAuthError) {
-          router.replace('/renter/sign-in')
+          router.replace('/')
           return
         }
         setErrorMsg(err instanceof Error ? err.message : dict.load)

apps/marketplace/src/app/renter/profile/page.tsx

@@ -126,7 +126,7 @@ export default function RenterProfilePage() {
       })
       .catch((err) => {
         if (err instanceof RenterAuthError) {
-          router.replace('/renter/sign-in')
+          router.replace('/')
           return
         }
         setErrorMsg(err instanceof Error ? err.message : dict.loadFailed)

apps/marketplace/src/app/renter/saved-companies/page.tsx

@@ -50,7 +50,7 @@ export default function RenterSavedCompaniesPage() {
       .then((profile) => setCompanies(profile.savedCompanies ?? []))
       .catch((err) => {
         if (err instanceof RenterAuthError) {
-          router.replace('/renter/sign-in')
+          router.replace('/')
           return
         }
         setErrorMsg(err instanceof Error ? err.message : dict.load)