From c06c369cb379409366ae06b9c07d5461fe630df7 Mon Sep 17 00:00:00 2001 From: komekh Date: Fri, 6 Sep 2024 10:26:11 +0500 Subject: [PATCH] fixed login --- assets/locale/ru-RU.json | 5 +-- assets/locale/tr-TR.json | 5 +-- assets/logo/logo_login.png | Bin 0 -> 2599 bytes lib/core/constants/api.dart | 7 ++-- lib/core/constants/assets.dart | 1 + lib/data/models/order/order_model.dart | 36 ++++++++++++-------- lib/domain/entities/order/order.dart | 34 ++++++++++-------- lib/presentation/screens/login.dart | 11 +++--- lib/presentation/screens/order_details.dart | 21 +++++------- lib/presentation/widgets/info_card.dart | 4 +-- lib/presentation/widgets/order_card.dart | 2 +- lib/presentation/widgets/order_header.dart | 31 +++++++++-------- 12 files changed, 86 insertions(+), 71 deletions(-) create mode 100644 assets/logo/logo_login.png diff --git a/assets/locale/ru-RU.json b/assets/locale/ru-RU.json index 15bf430..6d2505e 100644 --- a/assets/locale/ru-RU.json +++ b/assets/locale/ru-RU.json @@ -26,7 +26,7 @@ "order": "Заказ", "order_info": "Информация о заказе", "route": "Маршруте", - "order_status": "Груз", + "order_status": "Статус", "order_carrier": "Автомашина №", "order_shop": "Магазин №", "order_from": "Откуда", @@ -50,5 +50,6 @@ "image_preview": "Предварительный просмотр", "error_message": "Что-то пошло не так. Пожалуйста, попробуйте еще раз.", "follow_orders_banner": "Отслеживайте ваш груз 24/7", - "order_empty": "У вас пока нет заказов" + "order_empty": "У вас пока нет заказов", + "deliver_all": "Довезём всё!" } diff --git a/assets/locale/tr-TR.json b/assets/locale/tr-TR.json index a9be830..f46f1b5 100644 --- a/assets/locale/tr-TR.json +++ b/assets/locale/tr-TR.json @@ -26,7 +26,7 @@ "order": "Sargyt", "order_info": "Sargyt barada maglumat", "route": "Gatnaw ýoly", - "order_status": "Ýük", + "order_status": "Ýagdaýy", "order_carrier": "Awtoulag №", "order_shop": "Dükan №", "order_from": "Nireden ugradyldy", @@ -50,5 +50,6 @@ "image_preview": "Surat", "error_message": "Näsazlyk ýüze çykdy. Täzeden synanşyp görmegiňizi haýyş edýäris.", "follow_orders_banner": "Ýükiňizi 24 sagadyň dowamynda yzarlamak indi elýeterli", - "order_empty": "Siziň entäk sargydyňyz ýok" + "order_empty": "Siziň entäk sargydyňyz ýok", + "deliver_all": "Ähli zady eltip bereris!" } diff --git a/assets/logo/logo_login.png b/assets/logo/logo_login.png new file mode 100644 index 0000000000000000000000000000000000000000..62836257c260545d62a00bc4b22e2c305f7183f4 GIT binary patch literal 2599 zcmV+?3fT3DP)lvVW4$$uT+w%)urE-ggvA0oIdK7s_ItVx^@4m)Br77v}n246M}j}Gf$Y6`uYm@2TKLD0z`ZNBUp z9yu`I*@cSHG(8=SG8VeCJ78LpJos9qr)hc`8dC+SOY+6XcTh2!rWZ#e5=$pbOVFqa zXqKJ{&8ULzH?N^l70@s}18R4-JOk35yEHtKCAkF^qiK3cs9$2cb0-t`2(D^dl1=hIbB3Hv(<_2%-7R-?4Aa5p z&mo;Xd6TPj)AS0UGR7(cVnY=`+@>F%9KmNquW*x45qO{yM%pPw9RBpxl`G&XAg!j> zA=<}pfBf!qpjQ-?Fjh&=VFHOhfA;W&(>K?(d%UL2TPI!tw-+}uP17rbsu-IfJ?uxm z_-PMvfZGrUf7kG&k1u{)e@J>|Fg0W8-}V}e+`i#a;cOC}Eg$i6os5(;DQcQtSxj%d zMsCk|zf3mi7Pq`iR2&w*N~KpedzFV?NmSq!V9#)~)D9@FJ6F7hCS53k)l_<1r#^b+ zFg;_DCKDeV)j(OeWLSb|KN!7|n4Yl&rh)zprQu$r(rB7qNz{|*el&XtWns-u>O9OC zXw~#8Ks}7TzAK+q>cFz$t^-ZdLztS`73f$)Cpy*&l*PSkFdUqbdMJ7&QH8|zC+?Vh z!@NL)t0QT?hoe^t(=*nx3>F!CboS>pC8m0;0Zr2@gKCVIWjxNq9slN>{`sfntm@t%7v_#2Ve9(A>6Ji*X~X3c^I}M0$%hJn2ZH(37ZHJJ%!q(gl6C9%ZTwa1` zeSj`pR4Fk{(`(V9MT-_KTC`}z-S z*L7bJ;;PEMdbt5aJmz-ZrL|vV?2^EVx0xH#==E^4b3JfB4TdhId@gy=%O&cOlrzyD z4&4)ZJ{*qZ3@dQCgUR}IqBAOIKiBm3^)}*TAKZ-I{4Hl&q<1*H-&|OjdB^pRyhCfMp2aiE*9(>q?+8$*18d}O zr`QO%%N@H~T*S9Yos$7_zI4<3;Y+%=Elujm%-G&$B!{RTQ<0H&m*a#10phRXWZS6dX+=Kzyl|fF5Lzb2%0%h9 zGjDsIO^I~z*hGcr3Y4VT@*U+IK4N7XYjODc2%W5QH#cBBk%G~-w^PJAb9+X8-tEF# z)Hd!yPRKZrb+G!`(}giKUaXkI#_#W~;;uvtkqacQifhX~<$5WQozaA2G6=p-_UnoO zKmka5Y(p;MC$>r4DP_}=CNl{gWMio|GP!P#FCOng#J0|kME7wjRdj^CqI8M}A^nbti9799Ohh#h>X^tF0+yEfRp*$4H% z0dbd$-7P05%L6&cA+-~@y@j8x4%7my;9P8gkg?>S8u4&_4UhR!NXLq#vLqZTpVDDn zwZ%SaKdC$$4=4kkoU5p&uVRY9G?}9By;f}~2=A_fEqVuq+Zj%9bcags4z$8=)A!7#vI1M>o z;vlaTNrIE*QHTeES??930M+ZB(neZX8ArG48eOy5*@&?&=Omy|XDB#<<9z*fBupV= zMQMvZR6l#7FSFW=M@_l=(t+H}FhSg=KnPg6GRdz!Ihew#Zy!##aV@I=9Su^ zpYO2!euQq9hxqx}y`aM`S^H^WqA+!Co*i`#f&D~G=$G1Q9g_)TH)#{5fD!^vQbcO+ z?x~*?CmZVA)|Bq*}H2Md5BcSm}N@bil6!-E79{tgQo~4pdH7&bk8oRz4w6ULL zh22I336`wXUp%K^7^pGb<}=w(woJoVRo>3(>v*ClJ#8qfH2>J$^CYGk{aDdC+~IXz z8ZVV{w)N-AKNW?)#~wgGxX%`QkLx-7b(3PJtyP_U4j9W}3@_qUh%c70%%qh({;Lk%f9A~F1+*B4FjbbceDXW<_ZyLWn6Z`edxh*_ z8GLP{+Y3RT-O_0P zD=k2f;H7Lvtqi_ciPa$tZ0(UF8GbfY{ic1-{{u81>gnqsevJSC002ov JPDHLkV1my(?6Cj< literal 0 HcmV?d00001 diff --git a/lib/core/constants/api.dart b/lib/core/constants/api.dart index bb6b4dd..a7be013 100644 --- a/lib/core/constants/api.dart +++ b/lib/core/constants/api.dart @@ -1,5 +1,6 @@ -// const String baseUrl = 'https://192.168.99.64:5001/api'; -const String baseUrl = 'https://cargo.tpsadvertising.com/api'; -const String imageUrl = 'https://cargo.tpsadvertising.com'; +const String baseUrl = 'https://192.168.99.64:5001/api'; +// const String baseUrl = 'https://cargo.tpsadvertising.com/api'; +// const String imageUrl = 'https://cargo.tpsadvertising.com'; +const String imageUrl = 'https://192.168.99.64:5001'; const String defaultApiKey = ''; const String defaultSources = ''; diff --git a/lib/core/constants/assets.dart b/lib/core/constants/assets.dart index 906eaea..8907fa3 100644 --- a/lib/core/constants/assets.dart +++ b/lib/core/constants/assets.dart @@ -7,6 +7,7 @@ sealed class AppAssets { ///png static const String logoPng = 'assets/logo/logo.png'; static const String logoTransparent = 'assets/logo/logo_transparent.png'; + static const String logoLogin = 'assets/logo/logo_login.png'; static const String boxesPng = 'assets/images/boxes.png'; static const String trucksPng = 'assets/images/trucks.png'; static const String header = 'assets/images/header.png'; diff --git a/lib/data/models/order/order_model.dart b/lib/data/models/order/order_model.dart index 33ab80f..98bf376 100644 --- a/lib/data/models/order/order_model.dart +++ b/lib/data/models/order/order_model.dart @@ -17,18 +17,21 @@ class OrderModel extends OrderEntity { required super.from, required super.to, required super.departedAt, - required super.arrivedAt, - required super.depth, - required super.width, - required super.height, - required super.image1, - required super.image2, - required super.image3, + // required super.arrivedAt, + // required super.depth, + // required super.width, + // required super.height, + // required super.image1, + // required super.image2, + // required super.image3, + required super.cargoState, + required super.invoice, + required super.image, }); // Factory method to create an instance of CargoEntity from JSON factory OrderModel.fromJson(Map json) { DateTime? departedAt = json['DepartedAt'] != null ? DateTime.parse(json['DepartedAt']) : null; - DateTime? arrivedAt = json['ArrivedAt'] != null ? DateTime.parse(json['ArrivedAt']) : null; + // DateTime? arrivedAt = json['ArrivedAt'] != null ? DateTime.parse(json['ArrivedAt']) : null; return OrderModel( oid: json['Oid'], clientId: json['ClientId'], @@ -43,13 +46,16 @@ class OrderModel extends OrderEntity { from: json['From'] ?? '', to: json['To'] ?? '', departedAt: DateUtil.formatDateTimeToDDMMYYYY(departedAt), - arrivedAt: DateUtil.formatDateTimeToDDMMYYYY(arrivedAt), - depth: json['Depth'].toDouble(), - width: json['Width'].toDouble(), - height: json['Height'].toDouble(), - image1: json['Image1'] ?? '', - image2: json['Image2'] ?? '', - image3: json['Image3'] ?? '', + // arrivedAt: DateUtil.formatDateTimeToDDMMYYYY(arrivedAt), + // depth: json['Depth'].toDouble(), + // width: json['Width'].toDouble(), + // height: json['Height'].toDouble(), + // image1: json['Image1'] ?? '', + // image2: json['Image2'] ?? '', + // image3: json['Image3'] ?? '', + cargoState: json['CargoState'], + invoice: json['Invoice'], + image: json['Image'], ); } diff --git a/lib/domain/entities/order/order.dart b/lib/domain/entities/order/order.dart index 6d328a0..715ff50 100644 --- a/lib/domain/entities/order/order.dart +++ b/lib/domain/entities/order/order.dart @@ -5,6 +5,7 @@ class OrderEntity extends Equatable { final String clientId; final String cargoId; final String state; + final String cargoState; final String no; final String name; final String shopNo; @@ -14,19 +15,22 @@ class OrderEntity extends Equatable { final String from; final String to; final String departedAt; - final String arrivedAt; - final double depth; - final double width; - final double height; - final String image1; - final String image2; - final String image3; + // final String arrivedAt; + // final double depth; + // final double width; + // final double height; + // final String image1; + // final String image2; + // final String image3; + final String invoice; + final String image; const OrderEntity({ required this.oid, required this.clientId, required this.cargoId, required this.state, + required this.cargoState, required this.no, required this.name, required this.shopNo, @@ -36,13 +40,15 @@ class OrderEntity extends Equatable { required this.from, required this.to, required this.departedAt, - required this.arrivedAt, - required this.depth, - required this.width, - required this.height, - required this.image1, - required this.image2, - required this.image3, + // required this.arrivedAt, + // required this.depth, + // required this.width, + // required this.height, + // required this.image1, + // required this.image2, + // required this.image3, + required this.invoice, + required this.image, }); @override diff --git a/lib/presentation/screens/login.dart b/lib/presentation/screens/login.dart index 7a9a5ca..137f393 100644 --- a/lib/presentation/screens/login.dart +++ b/lib/presentation/screens/login.dart @@ -58,18 +58,19 @@ class _LoginScreenState extends State { crossAxisAlignment: CrossAxisAlignment.stretch, children: [ Container( - padding: const EdgeInsets.only(top: 60, bottom: 20), + padding: const EdgeInsets.only(top: 20, bottom: 20), child: Column( children: [ // SvgPicture.asset( // AppAssets.logo, // height: AppDimensions.normalize(30), // ), + Space.yf(4), + Image.asset( - AppAssets.logoTransparent, - height: AppDimensions.normalize(50), + AppAssets.logoLogin, ), - Space.yf(0.80), + Space.yf(0.50), Text( appTitle, style: AppText.h1b?.copyWith( @@ -78,7 +79,7 @@ class _LoginScreenState extends State { ), Space.yf(0.30), Text( - 'Довезём всё!', + 'deliver_all'.tr(), style: AppText.b1?.copyWith( color: AppColors.yellow, ), diff --git a/lib/presentation/screens/order_details.dart b/lib/presentation/screens/order_details.dart index 7b7733e..2aa573b 100644 --- a/lib/presentation/screens/order_details.dart +++ b/lib/presentation/screens/order_details.dart @@ -20,7 +20,7 @@ class OrderDetailsScreen extends StatefulWidget { } class _OrderDetailsScreenState extends State { - bool _isFullScreen = false; // Track fullscreen mode + bool _isFullScreen = false; // Track fullScreen mode bool _showLocation = true; final List _images = []; @@ -40,14 +40,11 @@ class _OrderDetailsScreenState extends State { } void _setImages() { - if (widget.order.image1.isNotEmpty) { - _images.add(widget.order.image1); + if (widget.order.invoice.isNotEmpty) { + _images.add(widget.order.invoice); } - if (widget.order.image2.isNotEmpty) { - _images.add(widget.order.image2); - } - if (widget.order.image3.isNotEmpty) { - _images.add(widget.order.image3); + if (widget.order.image.isNotEmpty) { + _images.add(widget.order.image); } } @@ -56,10 +53,10 @@ class _OrderDetailsScreenState extends State { _isFullScreen = !_isFullScreen; if (_isFullScreen) { - // Enter fullscreen mode + // Enter fullScreen mode SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky); } else { - // Exit fullscreen mode + // Exit fullScreen mode SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge); } }); @@ -71,7 +68,7 @@ class _OrderDetailsScreenState extends State { return Scaffold( backgroundColor: AppColors.surface, appBar: _isFullScreen - ? null // Hide the app bar in fullscreen mode + ? null // Hide the app bar in fullScreen mode : AppBar( iconTheme: const IconThemeData( color: Colors.white, @@ -116,7 +113,7 @@ class _OrderDetailsScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - '${'order_info'.tr()} №${widget.order.no}', + '${'order_info'.tr()} № ${widget.order.no}', style: AppText.h2b, ), diff --git a/lib/presentation/widgets/info_card.dart b/lib/presentation/widgets/info_card.dart index efbdc55..0288500 100644 --- a/lib/presentation/widgets/info_card.dart +++ b/lib/presentation/widgets/info_card.dart @@ -33,10 +33,10 @@ class InfoCard extends StatelessWidget { Space.y!, RowTextWidget(title: '${'order_volume'.tr()}:', info: order.volume.toString()), Space.y!, - RowTextWidget( + /* RowTextWidget( title: '${'order_dimensions'.tr()}:', info: '${order.width}x${order.depth}x${order.height} ${'order_dimensions_desc'.tr()}'), - Space.y!, + Space.y!, */ RowTextWidget(title: '${'order_product_name'.tr()}:', info: order.name), // Space.y!, // RowTextWidget(title: 'Sargydyň bahasy:', info: order.price), diff --git a/lib/presentation/widgets/order_card.dart b/lib/presentation/widgets/order_card.dart index 0b766e6..1a761cb 100644 --- a/lib/presentation/widgets/order_card.dart +++ b/lib/presentation/widgets/order_card.dart @@ -31,7 +31,7 @@ class OrderCard extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - '№${order.no}', + '№ ${order.no}', style: AppText.b1b, ), GestureDetector( diff --git a/lib/presentation/widgets/order_header.dart b/lib/presentation/widgets/order_header.dart index 2bdb4c0..b44e515 100644 --- a/lib/presentation/widgets/order_header.dart +++ b/lib/presentation/widgets/order_header.dart @@ -10,7 +10,7 @@ class OrderHeader extends StatelessWidget { @override Widget build(BuildContext context) { return SizedBox( - height: AppDimensions.normalize(80), + height: AppDimensions.normalize(95), child: Stack( children: [ Image.asset( @@ -22,27 +22,28 @@ class OrderHeader extends StatelessWidget { top: 0, bottom: 0, left: AppDimensions.normalize(12), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - SizedBox( - width: MediaQuery.of(context).size.width * 0.50, - child: Text( + child: SizedBox( + width: MediaQuery.of(context).size.width * 0.50, + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( 'cargo_app'.tr(), style: AppText.h1b?.copyWith( color: Colors.white, ), textAlign: TextAlign.center, ), - ), - Space.yf(0.30), - Text( - 'follow_orders_banner'.tr(), - style: AppText.b1?.copyWith( - color: AppColors.yellow, + Space.yf(0.30), + Text( + 'follow_orders_banner'.tr(), + style: AppText.b1?.copyWith( + color: AppColors.yellow, + ), + textAlign: TextAlign.center, ), - ), - ], + ], + ), ), ), ],