diff --git a/lib/main.dart b/lib/main.dart index 146d1f0..37a1c83 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,46 +1,8 @@ -import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; import 'package:flutter_downloader/flutter_downloader.dart'; -import 'package:rcapp/pages/BlueL.dart'; -import 'package:rcapp/pages/Cart.dart'; -import 'package:rcapp/pages/CategoryMenuList/Accompaniment_Menu.dart'; -import 'package:rcapp/pages/CategoryMenuList/All_Menu.dart'; -import 'package:rcapp/pages/CategoryMenuList/Biryani_MenuList.dart'; -import 'package:rcapp/pages/CategoryMenuList/Bread_Menu.dart'; -import 'package:rcapp/pages/CategoryMenuList/Breakfast_Menu.dart'; -import 'package:rcapp/pages/CategoryMenuList/Burger_Menu.dart'; -import 'package:rcapp/pages/CategoryMenuList/Chinese_Menu.dart'; -import 'package:rcapp/pages/CategoryMenuList/FriedRiceAndNoodles_Menu.dart'; -import 'package:rcapp/pages/CategoryMenuList/MainCourse_Menu.dart'; -import 'package:rcapp/pages/CategoryMenuList/Pasta_Menu.dart'; -import 'package:rcapp/pages/CategoryMenuList/Pizza_Menu.dart'; -import 'package:rcapp/pages/CategoryMenuList/Roll_Menu.dart'; -import 'package:rcapp/pages/CategoryMenuList/Sandwich_Menu.dart'; -import 'package:rcapp/pages/CategoryMenuList/Snacks_Menu.dart'; -import 'package:rcapp/pages/CategoryMenuList/Soup_Menu.dart'; -import 'package:rcapp/pages/CategoryMenuList/Starter_Menu.dart'; -import 'package:rcapp/pages/CategoryMenuList/Tandoori_Menu.dart'; -import 'package:rcapp/pages/Coluseum.dart'; -import 'package:rcapp/pages/Food.dart'; -import 'package:rcapp/pages/Milan.dart'; -import 'package:rcapp/pages/MilapL.dart'; -import 'package:rcapp/pages/NavigationBar.dart'; -import 'package:rcapp/pages/YellowL.dart'; -import 'package:rcapp/pages/add_event.dart'; -import 'package:rcapp/pages/address.dart'; -import 'package:rcapp/pages/adminBooking.dart'; -import 'package:rcapp/pages/admin_order_confirm.dart'; -import 'package:rcapp/pages/booking_calendar.dart'; -import 'package:rcapp/pages/confirmOrder.dart'; -import 'package:rcapp/pages/mainhall.dart'; -import 'package:rcapp/pages/orderdetails.dart'; -import 'package:rcapp/pages/previousBooking.dart'; -import 'package:rcapp/pages/previousOrder.dart'; -import 'package:rcapp/pages/uploadImage.dart'; -import 'package:rcapp/pages/uploadPdf.dart'; import 'package:rcapp/pages/welcome.dart'; +import 'package:rcapp/routes/routes.dart'; import 'package:rcapp/services/auth.dart'; -import 'pages/wrapper.dart'; import 'package:provider/provider.dart'; import 'package:rcapp/models/user.dart'; @@ -61,52 +23,7 @@ class MyApp extends StatelessWidget { child: MaterialApp( debugShowCheckedModeBanner: false, home: welcome(), - routes: { - '/navigationbar': (context) => NavigationBar(), - '/bookingcalendar': (context) => Calendar(), - '/cart': (context) => Cart(), - '/adminorder': (context) => AdminOrder(), - // '/orderdetails': (context) => OrderDetails(), - '/wrapper': (context) => Wrapper(), - "/add_event": (context) => AddEventPage(), - "/address": (context) => AddressForm(), - "/previousOrder": (context) => PreviousOrder(), - "/previousBooking": (context) => PreviousBooking(), - "/adminBooking": (context) => AdminBooking(), - // "/previousOrder": (context) => PreviousOrderDetails(), - - //routes for different categories of food - "/allmenu": (context) => AllMenu(), - "/biryanimenu": (context) => Biryani_MenuList(), - "/breadmenu": (context) => Bread_MenuList(), - "/breakfastmenu": (context) => Breakfast_MenuList(), - "/burgermenu": (context) => Burger_MenuList(), - "/chinesemenu": (context) => ChineseMenuList(), - "/friedriceandnoodlesmenu": (context) => - FriedRiceAndNoodles_MenuList(), - "/maincoursemenu": (context) => MainCourse_MenuList(), - "/pastamenu": (context) => Pasta_MenuList(), - "/pizzamenu": (context) => Pizza_MenuList(), - "/rollmenu": (context) => Roll_MenuList(), - "/sandwichmenu": (context) => Sandwich_MenuList(), - "/snacksmenu": (context) => Snacks_MenuList(), - "/soupmenu": (context) => Soup_MenuList(), - "/startermenu": (context) => StarterMenuList(), - "/tandoorimenu": (context) => Tandoori_MenuList(), - "/accompanimentmenu": (context) => Accompaniment_Menu(), - - // lounge routes - "/bluelounge": (context) => BlueLounge(), - "/yellowlounge": (context) => YellowLounge(), - "/milanlounge": (context) => MilanLounge(), - "/milaplounge": (context) => MilapLounge(), - "/coluseum": (context) => Coluseum(), - "/mainhall" : (context) => MainHall(), - - //Routes for admin - "/uploadImage": (context) => UploadImage(), - "/uploadPdf": (context) => UploadPdf() - }, + routes: routes, ), ); } diff --git a/lib/pages/NavigationBar.dart b/lib/pages/NavigationBar.dart index a283f00..b74b8d5 100644 --- a/lib/pages/NavigationBar.dart +++ b/lib/pages/NavigationBar.dart @@ -34,18 +34,18 @@ class _NavigationBarState extends State { items: [ BottomNavigationBarItem( icon: Icon(Icons.home), - title: Text('Home'), + label: 'Home', backgroundColor: Colors.deepOrange, ), BottomNavigationBarItem( icon: Icon(Icons.fastfood), - title: Text('Food'), + label: 'Food', backgroundColor: Colors.deepOrange, activeIcon: Icon(Icons.fastfood, color: Colors.deepOrange), ), BottomNavigationBarItem( icon: Icon(Icons.book), - title: Text('Booking'), + label: 'Booking', backgroundColor: Colors.deepOrange, ), ], diff --git a/lib/routes/routes.dart b/lib/routes/routes.dart new file mode 100644 index 0000000..791196e --- /dev/null +++ b/lib/routes/routes.dart @@ -0,0 +1,81 @@ +import '../pages/BlueL.dart'; +import '../pages/Cart.dart'; +import '../pages/CategoryMenuList/Accompaniment_Menu.dart'; +import '../pages/CategoryMenuList/All_Menu.dart'; +import '../pages/CategoryMenuList/Biryani_MenuList.dart'; +import '../pages/CategoryMenuList/Bread_Menu.dart'; +import '../pages/CategoryMenuList/Breakfast_Menu.dart'; +import '../pages/CategoryMenuList/Burger_Menu.dart'; +import '../pages/CategoryMenuList/Chinese_Menu.dart'; +import '../pages/CategoryMenuList/FriedRiceAndNoodles_Menu.dart'; +import '../pages/CategoryMenuList/MainCourse_Menu.dart'; +import '../pages/CategoryMenuList/Pasta_Menu.dart'; +import '../pages/CategoryMenuList/Pizza_Menu.dart'; +import '../pages/CategoryMenuList/Roll_Menu.dart'; +import '../pages/CategoryMenuList/Sandwich_Menu.dart'; +import '../pages/CategoryMenuList/Snacks_Menu.dart'; +import '../pages/CategoryMenuList/Soup_Menu.dart'; +import '../pages/CategoryMenuList/Starter_Menu.dart'; +import '../pages/CategoryMenuList/Tandoori_Menu.dart'; +import '../pages/Coluseum.dart'; +import '../pages/Milan.dart'; +import '../pages/MilapL.dart'; +import '../pages/NavigationBar.dart'; +import '../pages/YellowL.dart'; +import '../pages/add_event.dart'; +import '../pages/address.dart'; +import '../pages/adminBooking.dart'; +import '../pages/admin_order_confirm.dart'; +import '../pages/booking_calendar.dart'; +import '../pages/mainhall.dart'; +import '../pages/previousBooking.dart'; +import '../pages/previousOrder.dart'; +import '../pages/uploadImage.dart'; +import '../pages/uploadPdf.dart'; +import '../pages/wrapper.dart'; + +final routes = { + '/navigationbar': (context) => NavigationBar(), + '/bookingcalendar': (context) => Calendar(), + '/cart': (context) => Cart(), + '/adminorder': (context) => AdminOrder(), + // '/orderdetails': (context) => OrderDetails(), + '/wrapper': (context) => Wrapper(), + "/add_event": (context) => AddEventPage(), + "/address": (context) => AddressForm(), + "/previousOrder": (context) => PreviousOrder(), + "/previousBooking": (context) => PreviousBooking(), + "/adminBooking": (context) => AdminBooking(), + // "/previousOrder": (context) => PreviousOrderDetails(), + + //routes for different categories of food + "/allmenu": (context) => AllMenu(), + "/biryanimenu": (context) => Biryani_MenuList(), + "/breadmenu": (context) => Bread_MenuList(), + "/breakfastmenu": (context) => Breakfast_MenuList(), + "/burgermenu": (context) => Burger_MenuList(), + "/chinesemenu": (context) => ChineseMenuList(), + "/friedriceandnoodlesmenu": (context) => FriedRiceAndNoodles_MenuList(), + "/maincoursemenu": (context) => MainCourse_MenuList(), + "/pastamenu": (context) => Pasta_MenuList(), + "/pizzamenu": (context) => Pizza_MenuList(), + "/rollmenu": (context) => Roll_MenuList(), + "/sandwichmenu": (context) => Sandwich_MenuList(), + "/snacksmenu": (context) => Snacks_MenuList(), + "/soupmenu": (context) => Soup_MenuList(), + "/startermenu": (context) => StarterMenuList(), + "/tandoorimenu": (context) => Tandoori_MenuList(), + "/accompanimentmenu": (context) => Accompaniment_Menu(), + + // lounge routes + "/bluelounge": (context) => BlueLounge(), + "/yellowlounge": (context) => YellowLounge(), + "/milanlounge": (context) => MilanLounge(), + "/milaplounge": (context) => MilapLounge(), + "/coluseum": (context) => Coluseum(), + "/mainhall" : (context) => MainHall(), + + //Routes for admin + "/uploadImage": (context) => UploadImage(), + "/uploadPdf": (context) => UploadPdf() +}; \ No newline at end of file