Merge branch with resolved conflicts - restructured features and added new modules

packages/chicken/lib/presentation/routes/global_binding.dart

@@ -1,10 +1,15 @@
-import 'package:rasadyar_chicken/features/common/profile/logic.dart';
+import 'package:rasadyar_chicken/features/common/presentation/page/profile/logic.dart';
+import 'package:rasadyar_chicken/presentation/widget/base_page/logic.dart';
 import 'package:rasadyar_core/core.dart';
 
 class GlobalBinding extends Bindings {
   @override
   void dependencies() {
-    Get.lazyPut(() => BaseLogic(), fenix: true);
+    // Register ChickenBaseLogic and also as BasePageLogic/BaseLogic for compatibility
+    // Since ChickenBaseLogic extends BasePageLogic, we can use the same instance
+    Get.lazyPut<ChickenBaseLogic>(() => ChickenBaseLogic(), fenix: true);
+    // Register the same instance as BasePageLogic/BaseLogic
+    Get.lazyPut<BasePageLogic>(() => Get.find<ChickenBaseLogic>(), fenix: true);
     Get.lazyPut(() => ProfileLogic(), fenix: true);
 
     //root logics

packages/chicken/lib/presentation/routes/pages.dart

@@ -1,237 +1,69 @@
-import 'package:rasadyar_chicken/features/common/auth/logic.dart';
-import 'package:rasadyar_chicken/features/common/auth/view.dart';
-import 'package:rasadyar_chicken/features/common/role/logic.dart';
-import 'package:rasadyar_chicken/features/common/role/view.dart';
+import 'package:rasadyar_chicken/features/common/common.dart';
 import 'package:rasadyar_chicken/features/kill_house/action/logic.dart';
 import 'package:rasadyar_chicken/features/kill_house/action/view.dart';
 import 'package:rasadyar_chicken/features/kill_house/root/logic.dart';
 import 'package:rasadyar_chicken/features/kill_house/root/view.dart';
 import 'package:rasadyar_chicken/features/kill_house/submit_request/logic.dart';
 import 'package:rasadyar_chicken/features/kill_house/submit_request/view.dart';
-import 'package:rasadyar_chicken/features/kill_house/warehouse_and_distribution/buy_in_province_entered/logic.dart';
 import 'package:rasadyar_chicken/features/poultry_farm_inspection/poultry_farm_inspection.dart';
-import 'package:rasadyar_chicken/features/poultry_science/active_hatching/logic.dart';
-import 'package:rasadyar_chicken/features/poultry_science/active_hatching/view.dart';
-import 'package:rasadyar_chicken/features/poultry_science/farm/logic.dart';
-import 'package:rasadyar_chicken/features/poultry_science/farm/view.dart';
-import 'package:rasadyar_chicken/features/poultry_science/genocide/logic.dart';
-import 'package:rasadyar_chicken/features/poultry_science/genocide/view.dart';
-import 'package:rasadyar_chicken/features/poultry_science/home/logic.dart';
-import 'package:rasadyar_chicken/features/poultry_science/inspection/logic.dart';
-import 'package:rasadyar_chicken/features/poultry_science/inspection/view.dart';
-import 'package:rasadyar_chicken/features/poultry_science/killing_registration/logic.dart';
-import 'package:rasadyar_chicken/features/poultry_science/killing_registration/view.dart';
-import 'package:rasadyar_chicken/features/poultry_science/poultry_action/logic.dart';
-import 'package:rasadyar_chicken/features/poultry_science/poultry_action/view.dart';
-import 'package:rasadyar_chicken/features/poultry_science/root/logic.dart';
-import 'package:rasadyar_chicken/features/poultry_science/root/view.dart';
+import 'package:rasadyar_chicken/features/poultry_science/poultry_science.dart';
 import 'package:rasadyar_chicken/features/steward/steward.dart';
-import 'package:rasadyar_chicken/features/kill_house/warehouse_and_distribution/warehouse_and_distribution.dart'
-    as warehouse;
+import 'package:rasadyar_chicken/features/province_operator/province_operator.dart';
+import 'package:rasadyar_chicken/features/province_inspector/province_inspector.dart';
+import 'package:rasadyar_chicken/features/city_jahad/city_jahad.dart';
+import 'package:rasadyar_chicken/features/vet_farm/vet_farm.dart';
+import 'package:rasadyar_chicken/features/super_admin/super_admin.dart';
+import 'package:rasadyar_chicken/features/province_supervisor/province_supervisor.dart';
+import 'package:rasadyar_chicken/features/jahad/jahad.dart';
 import 'package:rasadyar_chicken/presentation/routes/global_binding.dart';
 import 'package:rasadyar_chicken/presentation/routes/routes.dart';
 import 'package:rasadyar_chicken/presentation/widget/base_page/logic.dart';
-import 'package:rasadyar_chicken/presentation/widget/captcha/logic.dart';
 import 'package:rasadyar_core/core.dart';
+import 'package:rasadyar_chicken/features/kill_house/warehouse_and_distribution/warehouse_and_distribution.dart'
+    as warehouse;
 
 sealed class ChickenPages {
   ChickenPages._();
 
   static final pages = [
-    GetPage(
-      name: ChickenRoutes.auth,
-      page: () => AuthPage(),
-      binding: BindingsBuilder(() {
-        Get.lazyPut(() => AuthLogic());
-        Get.lazyPut(() => CaptchaWidgetLogic());
-        Get.lazyPut(() => ChickenBaseLogic(), fenix: true);
-      }),
-    ),
-
-    GetPage(
-      name: ChickenRoutes.role,
-      page: () => RolePage(),
-      binding: BindingsBuilder(() {
-        Get.lazyPut(() => RoleLogic());
-        Get.lazyPut(() => ChickenBaseLogic(), fenix: true);
-      }),
-    ),
+    //region Common Pages
+    ...CommonPages.pages,
+    //endregion
 
     //region Steward Pages
-    GetPage(
-      name: ChickenRoutes.initSteward,
-      page: () => StewardRootPage(),
-      middlewares: [AuthMiddleware()],
-      bindings: [
-        GlobalBinding(),
-        BindingsBuilder(() {
-          Get.lazyPut(() => ChickenBaseLogic(), fenix: true);
-          Get.lazyPut(() => StewardRootLogic());
-          Get.lazyPut(() => HomeLogic());
-          Get.lazyPut(() => BuyLogic());
-          Get.lazyPut(() => SaleLogic());
-          Get.lazyPut(() => SegmentationLogic());
-        }),
-      ],
-    ),
-
-    GetPage(
-      name: ChickenRoutes.homeSteward,
-      page: () => HomePage(),
-      middlewares: [AuthMiddleware()],
-      binding: BindingsBuilder(() {
-        Get.put(HomeLogic());
-        Get.lazyPut(() => ChickenBaseLogic());
-      }),
-    ),
-
-    //sales
-    GetPage(
-      name: ChickenRoutes.saleSteward,
-      page: () => SalePage(),
-      middlewares: [AuthMiddleware()],
-      binding: BindingsBuilder(() {
-        Get.lazyPut(() => SaleLogic());
-        Get.lazyPut(() => ChickenBaseLogic());
-        Get.lazyPut(() => SalesOutOfProvinceLogic());
-        Get.lazyPut(() => SalesOutOfProvinceBuyersLogic());
-        Get.lazyPut(() => StewardRootLogic());
-      }),
-    ),
-    GetPage(
-      name: ChickenRoutes.salesOutOfProvinceSteward,
-      page: () => SalesOutOfProvincePage(),
-      middlewares: [AuthMiddleware()],
-      binding: BindingsBuilder(() {
-        Get.lazyPut(() => SalesOutOfProvinceLogic());
-        Get.lazyPut(() => SalesOutOfProvinceBuyersLogic());
-        Get.lazyPut(() => SalesOutOfProvinceSalesListLogic());
-      }),
-    ),
-    GetPage(
-      name: ChickenRoutes.salesOutOfProvinceBuyerSteward,
-      page: () => SalesOutOfProvinceBuyersPage(),
-      middlewares: [AuthMiddleware()],
-      binding: BindingsBuilder(() {
-        Get.lazyPut(() => SalesOutOfProvinceLogic());
-        Get.lazyPut(() => SalesOutOfProvinceBuyersLogic());
-        Get.lazyPut(() => SalesOutOfProvinceSalesListLogic());
-      }),
-    ),
-    GetPage(
-      name: ChickenRoutes.salesInProvinceSteward,
-      page: () => SalesInProvincePage(),
-      middlewares: [AuthMiddleware()],
-      binding: BindingsBuilder(() {
-        Get.lazyPut(() => ChickenBaseLogic());
-        Get.lazyPut(() => SalesInProvinceLogic());
-      }),
-    ),
-
-    //buy
-    GetPage(
-      name: ChickenRoutes.buySteward,
-      page: () => BuyPage(),
-      middlewares: [AuthMiddleware()],
-      binding: BindingsBuilder(() {
-        Get.lazyPut(() => ChickenBaseLogic());
-        Get.lazyPut(() => BuyLogic());
-      }),
-    ),
-    GetPage(
-      name: ChickenRoutes.buysOutOfProvinceSteward,
-      page: () => BuyOutOfProvincePage(),
-      middlewares: [AuthMiddleware()],
-      binding: BindingsBuilder(() {
-        Get.lazyPut(() => ChickenBaseLogic());
-        Get.lazyPut(() => BuyOutOfProvinceLogic());
-      }),
-    ),
-    GetPage(
-      name: ChickenRoutes.buysInProvinceSteward,
-      page: () => BuyInProvincePage(),
-      middlewares: [AuthMiddleware()],
-      binding: BindingsBuilder(() {
-        Get.lazyPut(() => ChickenBaseLogic());
-        Get.lazyPut(() => BuyInProvinceLogic());
-        Get.lazyPut(() => BuyInProvinceWaitingLogic());
-        Get.lazyPut(() => BuyInProvinceAllLogic());
-      }),
-    ),
-
+    ...StewardPages.pages,
     //endregion
 
     //region Poultry science Pages
-    GetPage(
-      name: ChickenRoutes.initPoultryScience,
-      page: () => PoultryScienceRootPage(),
-      middlewares: [AuthMiddleware()],
-      bindings: [
-        GlobalBinding(),
-        BindingsBuilder(() {
-          Get.lazyPut(() => PoultryScienceRootLogic());
-          Get.lazyPut(() => PoultryScienceHomeLogic());
-          Get.lazyPut(() => PoultryActionLogic());
-        }),
-      ],
-    ),
+    ...PoultrySciencePages.pages,
+    //endregion
 
-    GetPage(
-      name: ChickenRoutes.inspectionPoultryScience,
-      page: () => InspectionPoultrySciencePage(),
-      middlewares: [AuthMiddleware()],
-      binding: BindingsBuilder(() {
-        Get.lazyPut(() => InspectionPoultryScienceLogic());
-      }),
-    ),
-    GetPage(
-      name: ChickenRoutes.actionPoultryScience,
-      page: () => PoultryActionPage(),
-      middlewares: [AuthMiddleware()],
-      binding: BindingsBuilder(() {
-        Get.lazyPut(() => PoultryActionLogic());
-      }),
-    ),
+    //region Province Operator Pages
+    ...ProvinceOperatorPages.pages,
+    //endregion
 
-    GetPage(
-      name: ChickenRoutes.farmPoultryScience,
-      page: () => FarmPage(),
-      middlewares: [AuthMiddleware()],
-      binding: BindingsBuilder(() {
-        Get.lazyPut(() => FarmLogic());
-        Get.lazyPut(() => PoultryScienceHomeLogic());
-        Get.lazyPut(() => PoultryScienceRootLogic());
-      }),
-    ),
-    GetPage(
-      name: ChickenRoutes.activeHatchingPoultryScience,
-      page: () => ActiveHatchingPage(),
-      middlewares: [AuthMiddleware()],
-      binding: BindingsBuilder(() {
-        Get.lazyPut(() => ActiveHatchingLogic());
-        Get.lazyPut(() => PoultryScienceRootLogic());
-      }),
-    ),
-    GetPage(
-      name: ChickenRoutes.genocidePoultryScience,
-      page: () => GenocidePage(),
-      middlewares: [AuthMiddleware()],
-      binding: BindingsBuilder(() {
-        Get.lazyPut(() => GenocideLogic());
-        Get.lazyPut(() => PoultryScienceRootLogic());
-        Get.lazyPut(() => KillingRegistrationLogic(), fenix: true);
-      }),
-    ),
-    GetPage(
-      name: ChickenRoutes.killingRegistrationPoultryScience,
-      page: () => KillingRegistrationPage(),
-      middlewares: [AuthMiddleware()],
-      binding: BindingsBuilder(() {
-        Get.lazyPut(() => KillingRegistrationLogic());
-        Get.lazyPut(() => GenocideLogic());
-        Get.lazyPut(() => PoultryScienceRootLogic());
-      }),
-    ),
+    //region Province Inspector Pages
+    ...ProvinceInspectorPages.pages,
+    //endregion
+
+    //region City Jahad Pages
+    ...CityJahadPages.pages,
+    //endregion
+
+    //region Vet Farm Pages
+    ...VetFarmPages.pages,
+    //endregion
+
+    //region Super Admin Pages
+    ...SuperAdminPages.pages,
+    //endregion
+
+    //region Province Supervisor Pages
+    ...ProvinceSupervisorPages.pages,
+    //endregion
+
+    //region Jahad Pages
+    ...JahadPages.pages,
     //endregion
 
     //region Poultry Farm Inspection

packages/chicken/lib/presentation/routes/routes.dart

@@ -1,39 +1,14 @@
+import 'package:rasadyar_chicken/features/common/presentation/routes/routes.dart';
+
 sealed class ChickenRoutes {
   ChickenRoutes._();
 
-  static const auth = '/AuthChicken';
   static const _base = '/chicken';
-  static const role = '$_base/role';
-  static const String profile = '$_base/profile';
+  static const auth = CommonRoutes.auth;
 
-  //region Steward Routes
-  static const _steward = '$_base/steward';
-  static const initSteward = '$_steward/';
-  static const homeSteward = '$_steward/home';
-  static const buySteward = '$_steward/buy';
-  static const saleSteward = '$_steward/sale';
-  static const segmentationSteward = '$_steward/segmentation';
 
-  //buys
-  static const buysOutOfProvinceSteward = '$buySteward/buyOutOfProvince';
-  static const buysInProvinceSteward = '$buySteward/buyInProvince';
 
-  //sales
-  static const salesInProvinceSteward = '$saleSteward/SalesInProvince';
-  static const salesOutOfProvinceSteward = '$saleSteward/saleOutOfProvince';
-  static const salesOutOfProvinceBuyerSteward = '$saleSteward/saleOutOfProvinceBuyer ';
 
-  //endregion
-
-  //region Poultry Science Routes
-  static const _poultryScience = '$_base/poultryScience';
-  static const initPoultryScience = '$_poultryScience/';
-  static const actionPoultryScience = '$_poultryScience/action';
-  static const inspectionPoultryScience = '$_poultryScience/inspection';
-  static const farmPoultryScience = '$_poultryScience/farm';
-  static const activeHatchingPoultryScience = '$_poultryScience/activeHatching';
-  static const genocidePoultryScience = '$_poultryScience/genocidePoultryScience';
-  static const killingRegistrationPoultryScience = '$genocidePoultryScience/KillingRegistration';
 
   //endregion