Ec 78 update UI for order

.flutter-plugins-dependencies

@@ -0,0 +1 @@
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_ios","path":"D:\\\\Flutter\\\\flutter_windows_1.22.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_ios-2.0.9\\\\","dependencies":[]},{"name":"webview_flutter_wkwebview","path":"D:\\\\Flutter\\\\flutter_windows_1.22.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\webview_flutter_wkwebview-2.7.5\\\\","dependencies":[]}],"android":[{"name":"path_provider_android","path":"D:\\\\Flutter\\\\flutter_windows_1.22.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_android-2.0.14\\\\","dependencies":[]},{"name":"webview_flutter_android","path":"D:\\\\Flutter\\\\flutter_windows_1.22.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\webview_flutter_android-2.8.10\\\\","dependencies":[]}],"macos":[{"name":"path_provider_macos","path":"D:\\\\Flutter\\\\flutter_windows_1.22.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_macos-2.0.6\\\\","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"D:\\\\Flutter\\\\flutter_windows_1.22.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_linux-2.1.6\\\\","dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"D:\\\\Flutter\\\\flutter_windows_1.22.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_windows-2.0.6\\\\","dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_ios","path_provider_linux","path_provider_macos","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_ios","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"webview_flutter","dependencies":["webview_flutter_android","webview_flutter_wkwebview"]},{"name":"webview_flutter_android","dependencies":[]},{"name":"webview_flutter_wkwebview","dependencies":[]}],"date_created":"2022-06-23 15:27:58.328689","version":"2.10.4"}

android/app/build.gradle

@@ -32,7 +32,7 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 31
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -45,8 +45,8 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.int2.ecommerce_int2"
-        minSdkVersion 16
-        targetSdkVersion 28
+        minSdkVersion 19
+        targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

android/app/src/main/AndroidManifest.xml

@@ -21,13 +21,14 @@
                  until Flutter renders its first frame. It can be removed if
                  there is no splash screen (such as the default splash screen
                  defined in @style/LaunchTheme). -->
-            <meta-data
-                android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
-                android:value="true" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+            <meta-data
+    android:name="flutterEmbedding"
+    android:value="2" />
     </application>
+
 </manifest>

android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip

ios/Flutter/flutter_export_environment.sh

@@ -1,14 +1,13 @@
 #!/bin/sh
 # This is a generated file; do not edit or check into version control.
-export "FLUTTER_ROOT=/Users/macbooki9/Documents/flutter"
-export "FLUTTER_APPLICATION_PATH=/Users/macbooki9/Documents/personal/flutter_ecommerce_template"
+export "FLUTTER_ROOT=D:\Flutter\flutter_windows_1.22.5-stable\flutter"
+export "FLUTTER_APPLICATION_PATH=D:\Workspace\Flutter\do-an\flutter_ecommerce_template"
 export "COCOAPODS_PARALLEL_CODE_SIGN=true"
-export "FLUTTER_TARGET=/Users/macbooki9/Documents/personal/flutter_ecommerce_template/lib/main.dart"
+export "FLUTTER_TARGET=lib\main.dart"
 export "FLUTTER_BUILD_DIR=build"
 export "FLUTTER_BUILD_NAME=1.0.1"
 export "FLUTTER_BUILD_NUMBER=1.0.1"
-export "DART_DEFINES=Zmx1dHRlci5pbnNwZWN0b3Iuc3RydWN0dXJlZEVycm9ycz10cnVl,RkxVVFRFUl9XRUJfQVVUT19ERVRFQ1Q9dHJ1ZQ=="
 export "DART_OBFUSCATION=false"
-export "TRACK_WIDGET_CREATION=true"
+export "TRACK_WIDGET_CREATION=false"
 export "TREE_SHAKE_ICONS=false"
-export "PACKAGE_CONFIG=/Users/macbooki9/Documents/personal/flutter_ecommerce_template/.dart_tool/package_config.json"
+export "PACKAGE_CONFIG=.packages"

lib/data/models/address.model.dart

@@ -0,0 +1,36 @@
+class Address {
+  String? id;
+  String? address;
+  String? city;
+  String? country;
+  String? zipCode;
+  bool? isDefault;
+
+  Address(
+      {this.id,
+      this.address,
+      this.city,
+      this.country = "Viet Name",
+      this.zipCode = "+84",
+      this.isDefault = false});
+
+  Address.fromJson(Map<String, dynamic> json) {
+    id = json['_id'];
+    address = json['address'];
+    city = json['city'];
+    country = json['country'];
+    zipCode = json['zipCode'];
+    isDefault = json['isDefault'] ?? false;
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['id'] = this.id;
+    data['address'] = this.address;
+    data['city'] = this.city;
+    data['country'] = this.country;
+    data['zipCode'] = this.zipCode;
+    data['isDefault'] = this.isDefault;
+    return data;
+  }
+}

lib/data/models/cart.model.dart

@@ -0,0 +1,83 @@
+import 'package:ecommerce_int2/data/models/product.model.dart';
+
+class CartResponse {
+  bool? success;
+  String? message;
+  List<CartModel>? data;
+
+  CartResponse({this.success, this.message, this.data});
+
+  CartResponse.fromJson(Map<String, dynamic> json) {
+    success = json['success'];
+    message = json['message'];
+    if (json['data'] != null) {
+      data = <CartModel>[];
+      json['data'].forEach((v) {
+        data!.add(new CartModel.fromJson(v));
+      });
+    }
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['success'] = this.success;
+    data['message'] = this.message;
+    if (this.data != null) {
+      data['data'] = this.data!.map((v) => v.toJson()).toList();
+    }
+    return data;
+  }
+}
+
+class CartModel {
+  String? sId;
+  List<Product>? products;
+  String? user;
+  String? merchant;
+  int? total;
+  bool? isOrdered;
+  String? created;
+  int? iV;
+
+  CartModel(
+      {this.sId,
+      this.products,
+      this.user,
+      this.merchant,
+      this.total,
+      this.isOrdered,
+      this.created,
+      this.iV});
+
+  CartModel.fromJson(Map<String, dynamic> json) {
+    sId = json['_id'];
+    if (json['products'] != null) {
+      products = <Product>[];
+      json['products'].forEach((v) {
+        products!.add(new Product.fromJson(v));
+      });
+    }
+    user = json['user'];
+    merchant = json['merchant'] != null ? 
+        (json['merchant'] is String? ? json['merchant'] : json['merchant']['_id']) : '';
+    total = json['total'];
+    isOrdered = json['isOrdered'];
+    created = json['created'];
+    iV = json['__v'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['_id'] = this.sId;
+    if (this.products != null) {
+      data['products'] = this.products!.map((v) => v.toJson()).toList();
+    }
+    data['user'] = this.user;
+    data['merchant'] = this.merchant;
+    data['total'] = this.total;
+    data['isOrdered'] = this.isOrdered;
+    data['created'] = this.created;
+    data['__v'] = this.iV;
+    return data;
+  }
+}

lib/data/models/category.model.dart

@@ -0,0 +1,100 @@
+class CategoryList {
+  List<Category>? data;
+
+  CategoryList({this.data});
+
+  CategoryList.fromJson(Map<String, dynamic> json) {
+    if (json['data'] != null) {
+      data = <Category>[];
+      json['data'].forEach((v) {
+        data!.add(new Category.fromJson(v));
+      });
+    }
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    if (this.data != null) {
+      data['data'] = this.data!.map((v) => v.toJson()).toList();
+    }
+    return data;
+  }
+}
+
+class Category {
+  String? id;
+  String? name;
+  String? description;
+  List<SubCategory>? subcategories;
+
+  Category({this.id, this.name, this.description, this.subcategories});
+
+  Category.fromJson(Map<String, dynamic> json) {
+    id = json['_id'];
+    name = json['name'];
+    description = json['description'];
+    if (json['subcategories'] != null) {
+      subcategories = <SubCategory>[];
+      json['subcategories'].forEach((v) {
+        subcategories!.add(new SubCategory.fromJson(v));
+      });
+    }
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['_id'] = this.id;
+    data['name'] = this.name;
+    data['description'] = this.description;
+    if (this.subcategories != null) {
+      data['subcategories'] =
+          this.subcategories!.map((v) => v.toJson()).toList();
+    }
+    return data;
+  }
+}
+
+class SubCategory {
+  String? sId;
+  String? name;
+  String? description;
+  bool? isActive;
+  String? category;
+  String? created;
+  String? slug;
+  int? iV;
+
+  SubCategory(
+      {this.sId,
+      this.name,
+      this.description,
+      this.isActive,
+      this.category,
+      this.created,
+      this.slug,
+      this.iV});
+
+  SubCategory.fromJson(Map<String, dynamic> json) {
+    sId = json['_id'];
+    name = json['name'];
+    description = json['description'];
+    isActive = json['isActive'];
+    category = json['category'];
+    created = json['created'];
+    slug = json['slug'];
+    iV = json['__v'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['_id'] = this.sId;
+    data['name'] = this.name;
+    data['description'] = this.description;
+    data['isActive'] = this.isActive;
+    data['category'] = this.category;
+    data['created'] = this.created;
+    data['slug'] = this.slug;
+    data['__v'] = this.iV;
+    return data;
+  }
+}

lib/data/models/login.result.dart

@@ -0,0 +1,18 @@
+import 'package:ecommerce_int2/data/models/user.model.dart';
+import 'package:json_annotation/json_annotation.dart';
+part 'login.result.g.dart';
+
+@JsonSerializable(explicitToJson: true)
+class LoginResult {
+  final String token;
+  final bool success;
+  final UserModel data;
+
+  LoginResult(this.token, this.success, this.data);
+
+
+  factory LoginResult.fromJson(Map<String, dynamic> json) =>
+     _$LoginResultFromJson(json);
+
+  Map<String, dynamic> toJson() => _$LoginResultToJson(this);
+}