diff --git a/src/pages/Login.jsx b/src/pages/Login.jsx index 91a4ece..f966d06 100644 --- a/src/pages/Login.jsx +++ b/src/pages/Login.jsx @@ -1,4 +1,4 @@ -import React, { useState } from 'react'; +import React, { useEffect, useState } from 'react'; import { useLocation, useNavigate } from 'react-router-dom'; import { AlertCircle, Check, Loader2, Eye, EyeOff, CheckCircle2 } from 'lucide-react'; import { DOORMILE_WORDMARK_URL } from '@/assets/brand'; @@ -28,10 +28,18 @@ const FEATURES = ['Real-time fleet visibility', 'AI-optimised dispatch routes', export default function Login() { const navigate = useNavigate(); const location = useLocation(); - const { login } = useAuth(); + const { login, isAuthenticated } = useAuth(); const from = location.state?.from; - const returnTo = typeof from === 'string' && from.startsWith('/doormile') ? from : '/doormile/control-x'; + const returnTo = typeof from === 'string' && from.startsWith('/doormile') && from !== '/doormile/control-x' + ? from + : '/doormile/home'; + + useEffect(() => { + if (isAuthenticated) { + navigate('/doormile/home', { replace: true }); + } + }, [isAuthenticated, navigate]); const [form, setForm] = useState({ email: '', password: '', remember: true }); const [showPassword, setShowPassword] = useState(false); diff --git a/src/pages/doormile/dispatch/Dispatch.css b/src/pages/doormile/dispatch/Dispatch.css index 185b40a..bd97456 100644 --- a/src/pages/doormile/dispatch/Dispatch.css +++ b/src/pages/doormile/dispatch/Dispatch.css @@ -553,50 +553,46 @@ Design language: matches the Compare-button family — soft white card, indigo border + halo on hover/focus, subtle lift on interaction. ──────────────────────────────────────────────────────────────── */ +/* Date picker chip - compact (32px), single-row, responsive */ .dispatch-container .date-chip { position: relative; - /* anchors .date-cal-popover */ display: inline-flex; - align-items: stretch; + align-items: center; gap: 0; + height: 32px; + max-height: 32px; background: #ffffff; - border: 1px solid rgba(15, 23, 42, 0.08); - border-radius: 5px; - box-shadow: 0 1px 2px rgba(15, 23, 42, 0.04), - 0 4px 12px rgba(15, 23, 42, 0.06); - transition: border-color 0.18s ease, box-shadow 0.18s ease, - transform 0.18s ease; + border: 1px solid rgba(15, 23, 42, 0.12); + border-radius: 8px; + box-shadow: 0 1px 2px rgba(15, 23, 42, 0.04); + transition: border-color 0.18s ease, box-shadow 0.18s ease, transform 0.18s ease; + flex-shrink: 0; + box-sizing: border-box; } .dispatch-container .date-chip.is-open { border-color: #000000; - box-shadow: 0 0 0 3px rgba(0, 0, 0, 0.2), - 0 12px 30px rgba(0, 0, 0, 0.22); + box-shadow: 0 0 0 2px rgba(0, 0, 0, 0.15), 0 8px 20px rgba(0, 0, 0, 0.14); } .dispatch-container .date-chip:hover { - border-color: rgba(0, 0, 0, 0.45); - box-shadow: 0 2px 4px rgba(15, 23, 42, 0.06), - 0 8px 22px rgba(0, 0, 0, 0.15); - transform: translateY(-1px); + border-color: rgba(0, 0, 0, 0.35); + box-shadow: 0 2px 5px rgba(15, 23, 42, 0.06); } .dispatch-container .date-chip:focus-within { border-color: #000000; - box-shadow: 0 0 0 3px rgba(0, 0, 0, 0.2), - 0 8px 22px rgba(0, 0, 0, 0.22); + box-shadow: 0 0 0 2px rgba(0, 0, 0, 0.15); } -/* Center card — visible chrome the operator reads. Renders as a - {shouldFetchLive && viewMode !== 'rider-info' && (