From e6ebae60e443af48c9690eb55c2a3e8296be6859 Mon Sep 17 00:00:00 2001 From: Achintha Isuru Date: Tue, 10 Mar 2026 13:32:39 -0400 Subject: [PATCH] feat: update routing paths and improve UI components in order forms --- .../lib/src/create_order_module.dart | 2 +- .../widgets/hub_manager_selector.dart | 2 +- .../permanent_order/permanent_order_form.dart | 8 -------- .../recurring_order/recurring_order_form.dart | 17 +++-------------- .../view_orders/lib/src/view_orders_module.dart | 3 ++- 5 files changed, 7 insertions(+), 25 deletions(-) diff --git a/apps/mobile/packages/features/client/orders/create_order/lib/src/create_order_module.dart b/apps/mobile/packages/features/client/orders/create_order/lib/src/create_order_module.dart index b5491474..8afdfcb2 100644 --- a/apps/mobile/packages/features/client/orders/create_order/lib/src/create_order_module.dart +++ b/apps/mobile/packages/features/client/orders/create_order/lib/src/create_order_module.dart @@ -79,7 +79,7 @@ class ClientCreateOrderModule extends Module { @override void routes(RouteManager r) { r.child( - '/', + ClientPaths.childRoute(ClientPaths.createOrder, ClientPaths.createOrder), child: (BuildContext context) => const ClientCreateOrderPage(), ); r.child( diff --git a/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/hub_manager_selector.dart b/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/hub_manager_selector.dart index f6d05571..4dfd6b0f 100644 --- a/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/hub_manager_selector.dart +++ b/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/hub_manager_selector.dart @@ -32,7 +32,7 @@ class HubManagerSelector extends StatelessWidget { children: [ Text( label, - style: UiTypography.body1m.textPrimary, + style: UiTypography.body1r, ), if (description != null) ...[ Text(description!, style: UiTypography.body2r.textSecondary), diff --git a/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/permanent_order/permanent_order_form.dart b/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/permanent_order/permanent_order_form.dart index a9185ce3..36d7ba08 100644 --- a/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/permanent_order/permanent_order_form.dart +++ b/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/permanent_order/permanent_order_form.dart @@ -105,20 +105,12 @@ class PermanentOrderForm extends StatelessWidget { @override Widget build(BuildContext context) { - final TranslationsClientCreateOrderPermanentEn labels = - t.client_create_order.permanent; final TranslationsClientCreateOrderOneTimeEn oneTimeLabels = t.client_create_order.one_time; return ListView( padding: const EdgeInsets.all(UiConstants.space5), children: [ - Text( - labels.title, - style: UiTypography.headline3m.textPrimary, - ), - const SizedBox(height: UiConstants.space4), - PermanentOrderEventNameInput( label: 'ORDER NAME', value: eventName, diff --git a/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/recurring_order/recurring_order_form.dart b/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/recurring_order/recurring_order_form.dart index 7a0421d9..2bc274bc 100644 --- a/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/recurring_order/recurring_order_form.dart +++ b/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/recurring_order/recurring_order_form.dart @@ -100,7 +100,7 @@ class RecurringOrderForm extends StatelessWidget { /// Called when a position at [index] is updated with new values. final void Function(int index, OrderPositionUiModel position) - onPositionUpdated; + onPositionUpdated; /// Called when a position at [index] is removed. final void Function(int index) onPositionRemoved; @@ -113,20 +113,12 @@ class RecurringOrderForm extends StatelessWidget { @override Widget build(BuildContext context) { - final TranslationsClientCreateOrderRecurringEn labels = - t.client_create_order.recurring; final TranslationsClientCreateOrderOneTimeEn oneTimeLabels = t.client_create_order.one_time; return ListView( padding: const EdgeInsets.all(UiConstants.space5), children: [ - Text( - labels.title, - style: UiTypography.headline3m.textPrimary, - ), - const SizedBox(height: UiConstants.space4), - RecurringOrderEventNameInput( label: 'ORDER NAME', value: eventName, @@ -222,16 +214,13 @@ class RecurringOrderForm extends StatelessWidget { items: hubs.map((OrderHubUiModel hub) { return DropdownMenuItem( value: hub, - child: Text( - hub.name, - style: UiTypography.body2m.textPrimary, - ), + child: Text(hub.name, style: UiTypography.body2m.textPrimary), ); }).toList(), ), ), ), - const SizedBox(height: UiConstants.space4), + const SizedBox(height: UiConstants.space6), HubManagerSelector( label: oneTimeLabels.hub_manager_label, diff --git a/apps/mobile/packages/features/client/orders/view_orders/lib/src/view_orders_module.dart b/apps/mobile/packages/features/client/orders/view_orders/lib/src/view_orders_module.dart index 7229767c..ec20567d 100644 --- a/apps/mobile/packages/features/client/orders/view_orders/lib/src/view_orders_module.dart +++ b/apps/mobile/packages/features/client/orders/view_orders/lib/src/view_orders_module.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_modular/flutter_modular.dart'; +import 'package:krow_core/core.dart'; import 'package:krow_data_connect/krow_data_connect.dart'; import 'data/repositories/view_orders_repository_impl.dart'; @@ -33,7 +34,7 @@ class ViewOrdersModule extends Module { @override void routes(RouteManager r) { r.child( - '/', + ClientPaths.childRoute(ClientPaths.orders, ClientPaths.orders), child: (BuildContext context) { final Object? args = Modular.args.data; DateTime? initialDate;