1 files changed, 15 insertions, 75 deletions
diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart
index 5fd2374..f40a6ca 100644
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -1,9 +1,11 @@
+import 'package:carpool/drawer.dart';
+import 'package:carpool/ride_request.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/material.dart';
 import 'firebase_options.dart';
 import 'routes.dart';
 import 'login.dart';
-import 'cart.dart';
+// import 'cart.dart';
 import 'payement_order.dart';
 import 'signup.dart';
 import 'order_history.dart';
@@ -30,13 +32,17 @@ class MyApp extends StatelessWidget {
         '/routes': (context) => RoutesPage(),
         '/order_history': (context) => OrderHistoryPage(),
         '/payment': (context) => PaymentOrderTrackingPage(),
-        '/cart': (context) => CartPage(
-                selectedRide: Ride(
-              name: 'Sample Ride',
-              startLocation: 'Sample Start',
-              endLocation: 'Sample End',
-              time: 'Sample Time',
-            )),
+        '/request_ride': (context) => RequestRidePage(
+            selectedRide: Ride(
+                name: "",
+                startLocation: "",
+                endLocation: "",
+                carModel: "",
+                carBrand: "",
+                carColor: "",
+                plateNumber: "",
+                status: "",
+                orderTime: DateTime.now())),
       },
     );
   }
@@ -49,73 +55,7 @@ class HomePage extends StatelessWidget {
       appBar: AppBar(
         title: const Text('Home'),
       ),
-      drawer: Drawer(
-        child: ListView(
-          padding: EdgeInsets.zero,
-          children: <Widget>[
-            const DrawerHeader(
-              decoration: BoxDecoration(
-                color: Colors.blue,
-              ),
-              child: Text(
-                'Menu',
-                style: TextStyle(
-                  color: Colors.white,
-                  fontSize: 24,
-                ),
-              ),
-            ),
-            _buildDrawerItem(
-              icon: Icons.app_registration_rounded,
-              text: 'Signup',
-              onTap: () {
-                Navigator.pop(context);
-                Navigator.pushNamed(context, '/signup');
-              },
-            ),
-            _buildDrawerItem(
-              icon: Icons.login,
-              text: 'Login',
-              onTap: () {
-                Navigator.pop(context);
-                Navigator.pushNamed(context, '/login');
-              },
-            ),
-            _buildDrawerItem(
-              icon: Icons.map,
-              text: 'Routes',
-              onTap: () {
-                Navigator.pop(context);
-                Navigator.pushNamed(context, '/routes');
-              },
-            ),
-            _buildDrawerItem(
-              icon: Icons.shopping_cart,
-              text: 'Cart',
-              onTap: () {
-                Navigator.pop(context);
-                Navigator.pushNamed(context, '/cart');
-              },
-            ),
-            _buildDrawerItem(
-              icon: Icons.history,
-              text: 'Order History',
-              onTap: () {
-                Navigator.pop(context);
-                Navigator.pushNamed(context, '/order_history');
-              },
-            ),
-            _buildDrawerItem(
-              icon: Icons.payment,
-              text: 'Payment & Order Tracking',
-              onTap: () {
-                Navigator.pop(context);
-                Navigator.pushNamed(context, '/payment');
-              },
-            ),
-          ],
-        ),
-      ),
+      drawer: CustomDrawer(),
       body: Center(
         child: Column(
           mainAxisAlignment: MainAxisAlignment.start,