Doormile/Doormilexpress_console
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updates on the login page and order page and fixed on the logo and the date validation

Browse Source
This commit is contained in:
dharaneesh-r
2026-07-02 11:11:48 +05:30
parent 39e97c3041
commit b4cf2be556
2 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/pages/nearle/login.js
View File

@@ -163,7 +163,7 @@ const Login = () => {
overflow: 'hidden',
flexBasis: '46%',
flexDirection: 'column',
justifyContent: 'space-between',
justifyContent: 'center',
color: '#fff',
p: 6,
background: 'linear-gradient(150deg, #4D1C61 0%, #662582 52%, #9255AB 100%)'
@@ -193,54 +193,39 @@ const Login = () => {
}}
/>
<Box sx={{ position: 'relative' }}>
<Box
sx={{
bgcolor: '#fff',
borderRadius: 2,
px: 1.5,
py: 0.75,
display: 'inline-flex',
boxShadow: '0 8px 20px rgba(0,0,0,0.18)'
}}
>
<img src={logo} alt="NearlExpress" style={{ height: 30, display: 'block' }} />
</Box>
</Box>
<Box sx={{ position: 'relative' }}>
<Box sx={{ position: 'relative', maxWidth: 430 }}>
<Typography sx={{ fontSize: 34, fontWeight: 700, lineHeight: 1.18, letterSpacing: '-0.02em', mb: 2 }}>
Operate your dispatch,
<br />
end to end.
</Typography>
<Typography sx={{ fontSize: 16, color: 'rgba(255,255,255,0.82)', maxWidth: 430, lineHeight: 1.6 }}>
<Typography sx={{ fontSize: 16, color: 'rgba(255,255,255,0.82)', mb: 4, lineHeight: 1.6 }}>
Orders, AI route optimisation, live rider tracking and billing — all in the NearlExpress operator console.
</Typography>
</Box>
<Stack spacing={1.25} sx={{ position: 'relative' }}>
{['Real-time fleet visibility', 'AI-optimised dispatch routes', 'Tenant, pricing & invoice control'].map((t) => (
<Stack key={t} direction="row" spacing={1.25} alignItems="center">
<Box
sx={{
width: 22,
height: 22,
borderRadius: '50%',
bgcolor: 'rgba(255,255,255,0.18)',
display: 'inline-flex',
alignItems: 'center',
justifyContent: 'center',
fontSize: 13,
fontWeight: 700
}}
>
✓
</Box>
<Typography sx={{ fontSize: 14.5, color: 'rgba(255,255,255,0.9)' }}>{t}</Typography>
</Stack>
))}
</Stack>
<Stack spacing={1.5} sx={{ display: 'inline-flex', textAlign: 'left' }}>
{['Real-time fleet visibility', 'AI-optimised dispatch routes', 'Tenant, pricing & invoice control'].map((t) => (
<Stack key={t} direction="row" spacing={1.25} alignItems="center">
<Box
sx={{
width: 22,
height: 22,
borderRadius: '50%',
bgcolor: 'rgba(255,255,255,0.18)',
display: 'inline-flex',
alignItems: 'center',
justifyContent: 'center',
fontSize: 13,
fontWeight: 700
}}
>
✓
</Box>
<Typography sx={{ fontSize: 14.5, color: 'rgba(255,255,255,0.9)' }}>{t}</Typography>
</Stack>
))}
</Stack>
</Box>
</Box>
{/* ---- Right form panel ---- */}

14
src/pages/nearle/orders/orders.js
View File

@@ -206,6 +206,16 @@ const ORDERS_STATUS_TABS = [
{ idx: 3, status: 'cancelled', label: 'Cancelled', color: '#ef4444', icon: MdCancel, countKey: 'cancelled' }
];
const formatOrderDate = (row) => {
const dateCandidates = [row.pickupslot, row.deliverydate, row.orderdate];
for (const candidate of dateCandidates) {
if (candidate && dayjs(candidate).isValid()) {
return `${dayjs(candidate).utc().format('DD/MM/YYYY')} ${dayjs(candidate).format('hh:mm A')}`;
}
}
return '—';
};
const Orders = () => {
const theme = useTheme();
const isMobile = useMediaQuery(theme.breakpoints.down('md'));
@@ -1469,7 +1479,7 @@ const Orders = () => {
{`${row.locationname}-(${row.locationsuburb})`}
</Typography>
<Typography variant="caption" sx={{ color: DT.textSecondary }}>
{row.orderid} · {dayjs(row.pickupslot).utc().format('DD/MM/YYYY')} {dayjs(row.pickupslot).format('hh:mm A')}
{row.orderid} · {formatOrderDate(row)}
</Typography>
</MobileField>
<MobileField label="Pickup">
@@ -1691,7 +1701,7 @@ const Orders = () => {
</Tooltip>
<Tooltip title="Pickup Slot">
<Typography noWrap sx={{ fontSize: '12px' }}>
{dayjs(row.pickupslot).utc().format('DD/MM/YYYY')} {dayjs(row.pickupslot).format('hh:mm A')}
{formatOrderDate(row)}
</Typography>
</Tooltip>
</TableCell>