Merge pull request #211 from aeecleclair/spliting-for-web

Spliting for web
aeecleclair · Nov 18, 2023 · 8819bbc · 8819bbc
2 parents 0d33e7f + c0b7e07
commit 8819bbc
Show file tree

Hide file tree

Showing 19 changed files with 710 additions and 348 deletions.
diff --git a/lib/admin/router.dart b/lib/admin/router.dart
@@ -1,12 +1,18 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:myecl/admin/providers/is_admin.dart';
-import 'package:myecl/admin/ui/pages/add_association_page/add_association_page.dart';
-import 'package:myecl/admin/ui/pages/add_loaner_page/add_loaner_page.dart';
-import 'package:myecl/admin/ui/pages/edit_module_visibility/edit_module_visibility.dart';
-import 'package:myecl/admin/ui/pages/edit_page/edit_page.dart';
-import 'package:myecl/admin/ui/pages/main_page/main_page.dart';
+import 'package:myecl/admin/ui/pages/add_association_page/add_association_page.dart'
+    deferred as add_association_page;
+import 'package:myecl/admin/ui/pages/add_loaner_page/add_loaner_page.dart'
+    deferred as add_loaner_page;
+import 'package:myecl/admin/ui/pages/edit_module_visibility/edit_module_visibility.dart'
+    deferred as edit_module_visibility;
+import 'package:myecl/admin/ui/pages/edit_page/edit_page.dart'
+    deferred as edit_page;
+import 'package:myecl/admin/ui/pages/main_page/main_page.dart'
+    deferred as main_page;
 import 'package:myecl/tools/middlewares/admin_middleware.dart';
 import 'package:myecl/tools/middlewares/authenticated_middleware.dart';
+import 'package:myecl/tools/middlewares/deferred_middleware.dart';
 import 'package:qlevar_router/qlevar_router.dart';
 
 class AdminRouter {
@@ -20,21 +26,35 @@ class AdminRouter {
 
   QRoute route() => QRoute(
           path: AdminRouter.root,
-          builder: () => const AdminMainPage(),
+          builder: () => main_page.AdminMainPage(),
           middleware: [
             AuthenticatedMiddleware(ref),
-            AdminMiddleware(ref, isAdminProvider)
+            AdminMiddleware(ref, isAdminProvider),
+            DeferredLoadingMiddleware(main_page.loadLibrary)
           ],
           children: [
             QRoute(
                 path: addAssociation,
-                builder: () => const AddAssociationPage()),
-            QRoute(path: addLoaner, builder: () => const AddLoanerPage()),
+                builder: () => add_association_page.AddAssociationPage(),
+                middleware: [
+                  DeferredLoadingMiddleware(add_association_page.loadLibrary)
+                ]),
+            QRoute(
+                path: addLoaner,
+                builder: () => add_loaner_page.AddLoanerPage(),
+                middleware: [
+                  DeferredLoadingMiddleware(add_loaner_page.loadLibrary)
+                ]),
             QRoute(
                 path: editAssociation,
-                builder: () => const EditAssociationPage()),
+                builder: () => edit_page.EditAssociationPage(),
+                middleware: [DeferredLoadingMiddleware(edit_page.loadLibrary)]),
             QRoute(
                 path: editModuleVisibility,
-                builder: () => const EditModulesVisibilityPage()),
+                builder: () =>
+                    edit_module_visibility.EditModulesVisibilityPage(),
+                middleware: [
+                  DeferredLoadingMiddleware(edit_module_visibility.loadLibrary)
+                ]),
           ]);
 }
diff --git a/lib/advert/router.dart b/lib/advert/router.dart
@@ -3,14 +3,20 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:heroicons/heroicons.dart';
 import 'package:myecl/admin/providers/is_admin.dart';
 import 'package:myecl/advert/providers/is_advert_admin_provider.dart';
-import 'package:myecl/advert/ui/pages/admin_page/admin_page.dart';
-import 'package:myecl/advert/ui/pages/detail_page/detail.dart';
-import 'package:myecl/advert/ui/pages/form_page/add_edit_advert_page.dart';
-import 'package:myecl/advert/ui/pages/form_page/add_rem_announcer_page.dart';
-import 'package:myecl/advert/ui/pages/main_page/main_page.dart';
+import 'package:myecl/advert/ui/pages/admin_page/admin_page.dart'
+    deferred as admin_page;
+import 'package:myecl/advert/ui/pages/detail_page/detail.dart'
+    deferred as detail_page;
+import 'package:myecl/advert/ui/pages/form_page/add_edit_advert_page.dart'
+    deferred as add_edit_advert_page;
+import 'package:myecl/advert/ui/pages/form_page/add_rem_announcer_page.dart'
+    deferred as add_rem_announcer_page;
+import 'package:myecl/advert/ui/pages/main_page/main_page.dart'
+    deferred as main_page;
 import 'package:myecl/drawer/class/module.dart';
 import 'package:myecl/tools/middlewares/admin_middleware.dart';
 import 'package:myecl/tools/middlewares/authenticated_middleware.dart';
+import 'package:myecl/tools/middlewares/deferred_middleware.dart';
 import 'package:qlevar_router/qlevar_router.dart';
 
 class AdvertRouter {
@@ -29,26 +35,39 @@ class AdvertRouter {
 
   QRoute route() => QRoute(
         path: AdvertRouter.root,
-        builder: () => const AdvertMainPage(),
-        middleware: [AuthenticatedMiddleware(ref)],
+        builder: () => main_page.AdvertMainPage(),
+        middleware: [
+          AuthenticatedMiddleware(ref),
+          DeferredLoadingMiddleware(main_page.loadLibrary)
+        ],
         children: [
           QRoute(
               path: admin,
-              builder: () => const AdvertAdminPage(),
+              builder: () => admin_page.AdvertAdminPage(),
               middleware: [
                 AdminMiddleware(ref, isAdvertAdminProvider),
+                DeferredLoadingMiddleware(admin_page.loadLibrary)
               ],
               children: [
                 QRoute(
                     path: addEditAdvert,
-                    builder: () => const AdvertAddEditAdvertPage()),
+                    builder: () =>
+                        add_edit_advert_page.AdvertAddEditAdvertPage(),
+                    middleware: [
+                      DeferredLoadingMiddleware(
+                          add_edit_advert_page.loadLibrary)
+                    ]),
               ]),
-          QRoute(path: detail, builder: () => const AdvertDetailPage()),
+          QRoute(
+              path: detail,
+              builder: () => detail_page.AdvertDetailPage(),
+              middleware: [DeferredLoadingMiddleware(detail_page.loadLibrary)]),
           QRoute(
             path: addRemAnnouncer,
-            builder: () => const AddRemAnnouncerPage(),
+            builder: () => add_rem_announcer_page.AddRemAnnouncerPage(),
             middleware: [
               AdminMiddleware(ref, isAdminProvider),
+              DeferredLoadingMiddleware(add_rem_announcer_page.loadLibrary)
             ],
           ),
         ],

diff --git a/lib/amap/router.dart b/lib/amap/router.dart
@@ -2,17 +2,26 @@ import 'package:either_dart/either.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:heroicons/heroicons.dart';
 import 'package:myecl/amap/providers/is_amap_admin_provider.dart';
-import 'package:myecl/amap/ui/pages/admin_page/admin_page.dart';
-import 'package:myecl/amap/ui/pages/delivery_pages/add_edit_delivery_cmd_page.dart';
-import 'package:myecl/amap/ui/pages/detail_delivery_page/detail_page.dart';
-import 'package:myecl/amap/ui/pages/detail_page/detail_page.dart';
-import 'package:myecl/amap/ui/pages/list_products_page/list_products_page.dart';
-import 'package:myecl/amap/ui/pages/main_page/main_page.dart';
-import 'package:myecl/amap/ui/pages/presentation_page/text.dart';
-import 'package:myecl/amap/ui/pages/product_pages/add_edit_product.dart';
+import 'package:myecl/amap/ui/pages/admin_page/admin_page.dart'
+    deferred as admin_page;
+import 'package:myecl/amap/ui/pages/delivery_pages/add_edit_delivery_cmd_page.dart'
+    deferred as add_edit_delivery_cmd_page;
+import 'package:myecl/amap/ui/pages/detail_delivery_page/detail_page.dart'
+    deferred as detail_delivery_page;
+import 'package:myecl/amap/ui/pages/detail_page/detail_page.dart'
+    deferred as detail_page;
+import 'package:myecl/amap/ui/pages/list_products_page/list_products_page.dart'
+    deferred as list_products_page;
+import 'package:myecl/amap/ui/pages/main_page/main_page.dart'
+    deferred as main_page;
+import 'package:myecl/amap/ui/pages/presentation_page/text.dart'
+    deferred as presentation_page;
+import 'package:myecl/amap/ui/pages/product_pages/add_edit_product.dart'
+    deferred as add_edit_product;
 import 'package:myecl/drawer/class/module.dart';
 import 'package:myecl/tools/middlewares/admin_middleware.dart';
 import 'package:myecl/tools/middlewares/authenticated_middleware.dart';
+import 'package:myecl/tools/middlewares/deferred_middleware.dart';
 import 'package:qlevar_router/qlevar_router.dart';
 
 class AmapRouter {
@@ -35,23 +44,58 @@ class AmapRouter {
 
   QRoute route() => QRoute(
         path: AmapRouter.root,
-        builder: () => const AmapMainPage(),
-        middleware: [AuthenticatedMiddleware(ref)],
+        builder: () => main_page.AmapMainPage(),
+        middleware: [
+          AuthenticatedMiddleware(ref),
+          DeferredLoadingMiddleware(main_page.loadLibrary)
+        ],
         children: [
-          QRoute(path: admin, builder: () => const AdminPage(), middleware: [
-            AdminMiddleware(ref, isAmapAdminProvider),
-          ], children: [
-            QRoute(
-                path: addEditDelivery,
-                builder: () => const AddEditDeliveryPage()),
-            QRoute(path: addEditProduct, builder: () => const AddEditProduct()),
-            QRoute(
-                path: detailDelivery,
-                builder: () => const DetailDeliveryPage()),
-          ]),
-          QRoute(path: listProduct, builder: () => const ListProductPage()),
-          QRoute(path: detailOrder, builder: () => const DetailPage()),
-          QRoute(path: presentation, builder: () => const PresentationPage()),
+          QRoute(
+              path: admin,
+              builder: () => admin_page.AdminPage(),
+              middleware: [
+                AdminMiddleware(ref, isAmapAdminProvider),
+                DeferredLoadingMiddleware(admin_page.loadLibrary)
+              ],
+              children: [
+                QRoute(
+                    path: addEditDelivery,
+                    builder: () =>
+                        add_edit_delivery_cmd_page.AddEditDeliveryPage(),
+                    middleware: [
+                      DeferredLoadingMiddleware(
+                          add_edit_delivery_cmd_page.loadLibrary)
+                    ]),
+                QRoute(
+                    path: addEditProduct,
+                    builder: () => add_edit_product.AddEditProduct(),
+                    middleware: [
+                      DeferredLoadingMiddleware(add_edit_product.loadLibrary)
+                    ]),
+                QRoute(
+                    path: detailDelivery,
+                    builder: () => detail_delivery_page.DetailDeliveryPage(),
+                    middleware: [
+                      DeferredLoadingMiddleware(
+                          detail_delivery_page.loadLibrary)
+                    ]),
+              ]),
+          QRoute(
+              path: listProduct,
+              builder: () => list_products_page.ListProductPage(),
+              middleware: [
+                DeferredLoadingMiddleware(list_products_page.loadLibrary)
+              ]),
+          QRoute(
+              path: detailOrder,
+              builder: () => detail_page.DetailPage(),
+              middleware: [DeferredLoadingMiddleware(detail_page.loadLibrary)]),
+          QRoute(
+              path: presentation,
+              builder: () => presentation_page.PresentationPage(),
+              middleware: [
+                DeferredLoadingMiddleware(presentation_page.loadLibrary)
+              ]),
         ],
       );
 }
diff --git a/lib/booking/router.dart b/lib/booking/router.dart
@@ -3,16 +3,24 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:heroicons/heroicons.dart';
 import 'package:myecl/booking/providers/is_admin_provider.dart';
 import 'package:myecl/booking/providers/is_manager_provider.dart';
-import 'package:myecl/booking/ui/pages/admin_pages/add_edit_manager_page.dart';
-import 'package:myecl/booking/ui/pages/detail_pages/detail_booking.dart';
-import 'package:myecl/booking/ui/pages/admin_pages/admin_page.dart';
-import 'package:myecl/booking/ui/pages/booking_pages/add_edit_booking_page.dart';
-import 'package:myecl/booking/ui/pages/main_page/main_page.dart';
-import 'package:myecl/booking/ui/pages/manager_page/manager_page.dart';
-import 'package:myecl/booking/ui/pages/admin_pages/add_edit_room_page.dart';
+import 'package:myecl/booking/ui/pages/admin_pages/add_edit_manager_page.dart'
+    deferred as add_edit_manager_page;
+import 'package:myecl/booking/ui/pages/detail_pages/detail_booking.dart'
+    deferred as detail_booking_page;
+import 'package:myecl/booking/ui/pages/admin_pages/admin_page.dart'
+    deferred as admin_page;
+import 'package:myecl/booking/ui/pages/booking_pages/add_edit_booking_page.dart'
+    deferred as add_edit_booking_page;
+import 'package:myecl/booking/ui/pages/main_page/main_page.dart'
+    deferred as main_page;
+import 'package:myecl/booking/ui/pages/manager_page/manager_page.dart'
+    deferred as manager_page;
+import 'package:myecl/booking/ui/pages/admin_pages/add_edit_room_page.dart'
+    deferred as add_edit_room_page;
 import 'package:myecl/drawer/class/module.dart';
 import 'package:myecl/tools/middlewares/admin_middleware.dart';
 import 'package:myecl/tools/middlewares/authenticated_middleware.dart';
+import 'package:myecl/tools/middlewares/deferred_middleware.dart';
 import 'package:qlevar_router/qlevar_router.dart';
 
 class BookingRouter {
@@ -32,51 +40,80 @@ class BookingRouter {
 
   QRoute route() => QRoute(
         path: BookingRouter.root,
-        builder: () => const BookingMainPage(),
-        middleware: [AuthenticatedMiddleware(ref)],
+        builder: () => main_page.BookingMainPage(),
+        middleware: [
+          AuthenticatedMiddleware(ref),
+          DeferredLoadingMiddleware(main_page.loadLibrary)
+        ],
         children: [
           QRoute(
             path: admin,
-            builder: () => const AdminPage(),
-            middleware: [AdminMiddleware(ref, isAdminProvider)],
+            builder: () => admin_page.AdminPage(),
+            middleware: [
+              AdminMiddleware(ref, isAdminProvider),
+              DeferredLoadingMiddleware(admin_page.loadLibrary)
+            ],
             children: [
               QRoute(
                 path: room,
-                builder: () => AddEditRoomPage(),
-                middleware: [AdminMiddleware(ref, isAdminProvider)],
+                builder: () => add_edit_room_page.AddEditRoomPage(),
+                middleware: [
+                  AdminMiddleware(ref, isAdminProvider),
+                  DeferredLoadingMiddleware(add_edit_room_page.loadLibrary)
+                ],
               ),
               QRoute(
                 path: manager,
-                builder: () => AddEditManagerPage(),
-                middleware: [AdminMiddleware(ref, isAdminProvider)],
+                builder: () => add_edit_manager_page.AddEditManagerPage(),
+                middleware: [
+                  AdminMiddleware(ref, isAdminProvider),
+                  DeferredLoadingMiddleware(add_edit_manager_page.loadLibrary)
+                ],
               )
             ],
           ),
           QRoute(
             path: manager,
-            builder: () => const ManagerPage(),
-            middleware: [AdminMiddleware(ref, isManagerProvider)],
+            builder: () => manager_page.ManagerPage(),
+            middleware: [
+              AdminMiddleware(ref, isManagerProvider),
+              DeferredLoadingMiddleware(manager_page.loadLibrary)
+            ],
             children: [
               QRoute(
                   path: detail,
-                  builder: () => const DetailBookingPage(isAdmin: true),
+                  builder: () =>
+                      detail_booking_page.DetailBookingPage(isAdmin: true),
                   middleware: [
                     AdminMiddleware(ref, isManagerProvider),
+                    DeferredLoadingMiddleware(detail_booking_page.loadLibrary)
                   ]),
               QRoute(
                 path: addEdit,
-                builder: () => const AddEditBookingPage(isAdmin: true),
-                middleware: [AdminMiddleware(ref, isManagerProvider)],
+                builder: () =>
+                    add_edit_booking_page.AddEditBookingPage(isAdmin: true),
+                middleware: [
+                  AdminMiddleware(ref, isManagerProvider),
+                  DeferredLoadingMiddleware(add_edit_booking_page.loadLibrary)
+                ],
               ),
             ],
           ),
           QRoute(
             path: addEdit,
-            builder: () => const AddEditBookingPage(isAdmin: false),
+            builder: () =>
+                add_edit_booking_page.AddEditBookingPage(isAdmin: false),
+            middleware: [
+              DeferredLoadingMiddleware(add_edit_booking_page.loadLibrary)
+            ],
           ),
           QRoute(
             path: detail,
-            builder: () => const DetailBookingPage(isAdmin: false),
+            builder: () =>
+                detail_booking_page.DetailBookingPage(isAdmin: false),
+            middleware: [
+              DeferredLoadingMiddleware(detail_booking_page.loadLibrary)
+            ],
           ),
         ],
       );