MYD-387/add the driver dashboard - login page for the driver and for the admin
Fusionnées MYD-387/add the driver dashboard - login page for the driver and for the admin
feature/MYD-387
dans
develop
4 fils de conversation non résolus
4 fils de conversation non résolus
Closes MYD-387
Rapports de requête de fusion
Activité
Filtrer l'activité
added 31 commits
-
12dd9cb2...d33b2a25 - 30 commits from branch
develop - 0c0f036b - resolve conflits
-
12dd9cb2...d33b2a25 - 30 commits from branch
assigned to @aymane.maghouti
@aymane.maghouti fix the merge conflicts
added 5 commits
-
d832727e...2d9e1abb - 4 commits from branch
develop - a881c3ea - Resolved merge conflict between feature/MYD-387 and develop
-
d832727e...2d9e1abb - 4 commits from branch
1 // import Box from '@mui/material/Box'; changed this line in version 5 of the diff
1 import OrderDetailsView from '@/shared/sections/driver/order/view/order-details-view'; 2 // import { _orders } from '../../../../../../shared/_mock/_order'; changed this line in version 6 of the diff
9 10 type Props = { 11 params: { 12 id: string; 13 }; 14 }; 15 16 export default function OrderDetailsPage({ params }: Props) { 17 const { id } = params; 18 19 return <OrderDetailsView id={id} />; 20 } 21 22 // export async function generateStaticParams() { 23 // return _orders.map((order: { id: any; }) => ({ 24 // id: order.id, changed this line in version 6 of the diff
mentioned in commit 6b951fd2
Veuillez vous inscrire ou vous connecter pour répondre