feat: update routing paths and improve UI components in order forms
This commit is contained in:
@@ -79,7 +79,7 @@ class ClientCreateOrderModule extends Module {
|
|||||||
@override
|
@override
|
||||||
void routes(RouteManager r) {
|
void routes(RouteManager r) {
|
||||||
r.child(
|
r.child(
|
||||||
'/',
|
ClientPaths.childRoute(ClientPaths.createOrder, ClientPaths.createOrder),
|
||||||
child: (BuildContext context) => const ClientCreateOrderPage(),
|
child: (BuildContext context) => const ClientCreateOrderPage(),
|
||||||
);
|
);
|
||||||
r.child(
|
r.child(
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ class HubManagerSelector extends StatelessWidget {
|
|||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
Text(
|
Text(
|
||||||
label,
|
label,
|
||||||
style: UiTypography.body1m.textPrimary,
|
style: UiTypography.body1r,
|
||||||
),
|
),
|
||||||
if (description != null) ...<Widget>[
|
if (description != null) ...<Widget>[
|
||||||
Text(description!, style: UiTypography.body2r.textSecondary),
|
Text(description!, style: UiTypography.body2r.textSecondary),
|
||||||
|
|||||||
@@ -105,20 +105,12 @@ class PermanentOrderForm extends StatelessWidget {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final TranslationsClientCreateOrderPermanentEn labels =
|
|
||||||
t.client_create_order.permanent;
|
|
||||||
final TranslationsClientCreateOrderOneTimeEn oneTimeLabels =
|
final TranslationsClientCreateOrderOneTimeEn oneTimeLabels =
|
||||||
t.client_create_order.one_time;
|
t.client_create_order.one_time;
|
||||||
|
|
||||||
return ListView(
|
return ListView(
|
||||||
padding: const EdgeInsets.all(UiConstants.space5),
|
padding: const EdgeInsets.all(UiConstants.space5),
|
||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
Text(
|
|
||||||
labels.title,
|
|
||||||
style: UiTypography.headline3m.textPrimary,
|
|
||||||
),
|
|
||||||
const SizedBox(height: UiConstants.space4),
|
|
||||||
|
|
||||||
PermanentOrderEventNameInput(
|
PermanentOrderEventNameInput(
|
||||||
label: 'ORDER NAME',
|
label: 'ORDER NAME',
|
||||||
value: eventName,
|
value: eventName,
|
||||||
|
|||||||
@@ -113,20 +113,12 @@ class RecurringOrderForm extends StatelessWidget {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final TranslationsClientCreateOrderRecurringEn labels =
|
|
||||||
t.client_create_order.recurring;
|
|
||||||
final TranslationsClientCreateOrderOneTimeEn oneTimeLabels =
|
final TranslationsClientCreateOrderOneTimeEn oneTimeLabels =
|
||||||
t.client_create_order.one_time;
|
t.client_create_order.one_time;
|
||||||
|
|
||||||
return ListView(
|
return ListView(
|
||||||
padding: const EdgeInsets.all(UiConstants.space5),
|
padding: const EdgeInsets.all(UiConstants.space5),
|
||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
Text(
|
|
||||||
labels.title,
|
|
||||||
style: UiTypography.headline3m.textPrimary,
|
|
||||||
),
|
|
||||||
const SizedBox(height: UiConstants.space4),
|
|
||||||
|
|
||||||
RecurringOrderEventNameInput(
|
RecurringOrderEventNameInput(
|
||||||
label: 'ORDER NAME',
|
label: 'ORDER NAME',
|
||||||
value: eventName,
|
value: eventName,
|
||||||
@@ -222,16 +214,13 @@ class RecurringOrderForm extends StatelessWidget {
|
|||||||
items: hubs.map((OrderHubUiModel hub) {
|
items: hubs.map((OrderHubUiModel hub) {
|
||||||
return DropdownMenuItem<OrderHubUiModel>(
|
return DropdownMenuItem<OrderHubUiModel>(
|
||||||
value: hub,
|
value: hub,
|
||||||
child: Text(
|
child: Text(hub.name, style: UiTypography.body2m.textPrimary),
|
||||||
hub.name,
|
|
||||||
style: UiTypography.body2m.textPrimary,
|
|
||||||
),
|
|
||||||
);
|
);
|
||||||
}).toList(),
|
}).toList(),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
const SizedBox(height: UiConstants.space4),
|
const SizedBox(height: UiConstants.space6),
|
||||||
|
|
||||||
HubManagerSelector(
|
HubManagerSelector(
|
||||||
label: oneTimeLabels.hub_manager_label,
|
label: oneTimeLabels.hub_manager_label,
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_modular/flutter_modular.dart';
|
import 'package:flutter_modular/flutter_modular.dart';
|
||||||
|
import 'package:krow_core/core.dart';
|
||||||
import 'package:krow_data_connect/krow_data_connect.dart';
|
import 'package:krow_data_connect/krow_data_connect.dart';
|
||||||
|
|
||||||
import 'data/repositories/view_orders_repository_impl.dart';
|
import 'data/repositories/view_orders_repository_impl.dart';
|
||||||
@@ -33,7 +34,7 @@ class ViewOrdersModule extends Module {
|
|||||||
@override
|
@override
|
||||||
void routes(RouteManager r) {
|
void routes(RouteManager r) {
|
||||||
r.child(
|
r.child(
|
||||||
'/',
|
ClientPaths.childRoute(ClientPaths.orders, ClientPaths.orders),
|
||||||
child: (BuildContext context) {
|
child: (BuildContext context) {
|
||||||
final Object? args = Modular.args.data;
|
final Object? args = Modular.args.data;
|
||||||
DateTime? initialDate;
|
DateTime? initialDate;
|
||||||
|
|||||||
Reference in New Issue
Block a user