Add product page

tarikultopofstack · tarikultopofstack · commit a6e4f44b9eba · 2020-04-13T10:36:21.000+06:00
diff --git a/lib/common_widget/AppBarWidget.dart b/lib/common_widget/AppBarWidget.dart
@@ -0,0 +1,27 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_ecommerce_app/components/AppSignIn.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+
+Widget appBarWidget(context) {
+  return AppBar(
+    elevation: 0.0,
+    centerTitle: true,
+    title: Image.asset(
+      "assets/images/ic_app_icon.png",
+      width: 80,
+      height: 40,
+    ),
+    actions: <Widget>[
+      IconButton(
+        onPressed: () {
+          Navigator.push(
+            context,
+            MaterialPageRoute(builder: (context) => AppSignIn()),
+          );
+        },
+        icon: Icon(FontAwesomeIcons.user),
+        color: Color(0xFF323232),
+      ),
+    ],
+  );
+}
diff --git a/lib/common_widget/DrawerWidget.dart b/lib/common_widget/DrawerWidget.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_ecommerce_app/main.dart';
 import 'package:flutter_ecommerce_app/screens/WishListScreen.dart';
-import 'package:flutter_ecommerce_app/sign_in_up/SignIn.dart';
+import 'package:flutter_ecommerce_app/components/AppSignIn.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
 class DrawerWidget extends StatefulWidget {
diff --git a/lib/common_widget/GridTilesCategory.dart b/lib/common_widget/GridTilesCategory.dart
@@ -1,27 +1,44 @@
 import 'dart:developer';
 import 'package:flutter/material.dart';
-import 'package:flutter_ecommerce_app/category/SubCategoryPage.dart';
+import 'package:flutter_ecommerce_app/screens/ProductsScreen.dart';
+import 'package:flutter_ecommerce_app/screens/SubCategoryScreen.dart';
 
 class GridTilesCategory extends StatelessWidget {
   String name;
   String imageUrl;
   String slug;
+  bool fromSubProducts = false;
 
   GridTilesCategory(
       {Key key,
       @required this.name,
       @required this.imageUrl,
-      @required this.slug})
+      @required this.slug,
+      this.fromSubProducts})
       : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     return InkWell(
       onTap: () {
-        Navigator.push(
-          context,
-          MaterialPageRoute(builder: (context) => SubCategoryPage(slug: slug,)),
-        );
+        if (fromSubProducts) {
+          Navigator.push(
+            context,
+            MaterialPageRoute(
+                builder: (context) => ProductsScreen(
+                      slug: "products/?page=1&limit=12&category=" + slug,
+                      name: name,
+                    )),
+          );
+        } else {
+          Navigator.push(
+            context,
+            MaterialPageRoute(
+                builder: (context) => SubCategoryScreen(
+                      slug: slug,
+                    )),
+          );
+        }
       },
       child: Card(
           color: Colors.white,
diff --git a/lib/common_widget/GridTilesProducts.dart b/lib/common_widget/GridTilesProducts.dart
@@ -0,0 +1,93 @@
+import 'dart:developer';
+import 'package:flutter/material.dart';
+import 'package:flutter_ecommerce_app/screens/ProductsScreen.dart';
+import 'package:flutter_ecommerce_app/screens/SubCategoryScreen.dart';
+
+class GridTilesProducts extends StatelessWidget {
+  String name;
+  String imageUrl;
+  String slug;
+  String price;
+  bool fromSubProducts = false;
+
+  GridTilesProducts(
+      {Key key,
+      @required this.name,
+      @required this.imageUrl,
+      @required this.slug,
+      @required this.price,
+      this.fromSubProducts})
+      : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return InkWell(
+      onTap: () {
+        /* if (fromSubProducts) {
+          Navigator.push(
+            context,
+            MaterialPageRoute(
+                builder: (context) => ProductsScreen(
+                      slug: "products/?page=1&limit=12&category=" + slug,
+                      name: name,
+                    )),
+          );
+        } else {
+          Navigator.push(
+            context,
+            MaterialPageRoute(
+                builder: (context) => SubCategoryScreen(
+                      slug: slug,
+                    )),
+          );
+        }*/
+      },
+      child: Container(
+        padding: EdgeInsets.only(top: 5),
+        child: Card(
+            color: Colors.white,
+            shape: RoundedRectangleBorder(
+              borderRadius: const BorderRadius.all(
+                Radius.circular(8.0),
+              ),
+            ),
+            elevation: 0,
+            child: Center(
+              child: Column(
+                children: <Widget>[
+                  Image.network(
+                    imageUrl,
+                    width: 150,
+                    height: 150,
+                  ),
+                  Container(
+                    alignment: Alignment.center,
+                    padding: EdgeInsets.only(left: 10, right: 10, top: 15),
+                    child: Text(
+                        (name.length <= 40 ? name : name.substring(0, 40)),
+                        textAlign: TextAlign.left,
+                        style: TextStyle(
+                            color: Color(0xFF444444),
+                            fontFamily: 'Roboto-Light.ttf',
+                            fontSize: 15,
+                            fontWeight: FontWeight.w400)),
+                  ),
+                  Container(
+                    alignment: Alignment.bottomLeft,
+                    padding: EdgeInsets.only(left: 10, right: 10, top: 10),
+                    child: Text("৳  ${(price != null) ? price : 'Unavailable'}",
+                        style: TextStyle(
+                            color: (price != null)
+                                ? Color(0xFFf67426)
+                                : Color(0xFF0dc2cd),
+                            fontFamily: 'Roboto-Light.ttf',
+                            fontSize: 20,
+                            fontWeight: FontWeight.w500)),
+                  )
+                ],
+              ),
+            )),
+      ),
+    );
+  }
+}
diff --git a/lib/components/AppSignIn.dart b/lib/components/AppSignIn.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
-import 'package:flutter_ecommerce_app/sign_in_up/SignUp.dart';
+import 'package:flutter_ecommerce_app/components/AppSingUp.dart';
 
 class AppSignIn extends StatefulWidget {
   @override
diff --git a/lib/components/AppSingUp.dart b/lib/components/AppSingUp.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_ecommerce_app/sign_in_up/SignIn.dart';
+import 'package:flutter_ecommerce_app/components/AppSignIn.dart';
 
 class AppSingUp extends StatelessWidget {
   @override
diff --git a/lib/components/BrandHomePage.dart b/lib/components/BrandHomePage.dart
@@ -6,7 +6,7 @@ import 'package:flutter_ecommerce_app/common_widget/GridTilesCategory.dart';
 import 'package:flutter_ecommerce_app/utils/Urls.dart';
 import 'package:http/http.dart';
 
-import 'BrandModel.dart';
+import '../models/BrandModel.dart';
 
 BrandModel brandModel;
 
diff --git a/lib/components/CategorySlider.dart b/lib/components/CategorySlider.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 import 'package:flutter/material.dart';
-import 'package:flutter_ecommerce_app/category/CategoryModel.dart';
+import 'package:flutter_ecommerce_app/models/CategoryModel.dart';
 import 'package:flutter_ecommerce_app/common_widget/CircularProgress.dart';
 import 'package:flutter_ecommerce_app/common_widget/GridTilesCategory.dart';
 import 'package:flutter_ecommerce_app/utils/Urls.dart';
@@ -11,6 +11,7 @@ List<CategoryModel> categories;
 class CategoryPage extends StatefulWidget {
   String slug;
   bool isSubList;
+
   CategoryPage({Key key, this.slug, this.isSubList = false}) : super(key: key);
 
   @override
@@ -36,14 +37,15 @@ class _CategoryPageState extends State<CategoryPage> {
             if (snapshot.hasError)
               return Text('Error: ${snapshot.error}');
             else
-              return createListView(context, snapshot);
+              return createListView(context, snapshot, widget.isSubList);
         }
       },
     );
   }
 }
 
-Widget createListView(BuildContext context, AsyncSnapshot snapshot) {
+Widget createListView(
+    BuildContext context, AsyncSnapshot snapshot, bool isSubList) {
   List<CategoryModel> values = snapshot.data;
   return GridView.count(
     crossAxisCount: 3,
@@ -53,9 +55,11 @@ Widget createListView(BuildContext context, AsyncSnapshot snapshot) {
     children: List<Widget>.generate(values.length, (index) {
       return GridTile(
           child: GridTilesCategory(
-              name: values[index].name,
-              imageUrl: values[index].imageUrl,
-              slug: values[index].slug));
+        name: values[index].name,
+        imageUrl: values[index].imageUrl,
+        slug: values[index].slug,
+        fromSubProducts: isSubList,
+      ));
     }),
   );
 }
diff --git a/lib/components/ShopHomePage.dart b/lib/components/ShopHomePage.dart
@@ -4,7 +4,7 @@ import 'dart:developer';
 import 'package:flutter/material.dart';
 import 'package:flutter_ecommerce_app/common_widget/CircularProgress.dart';
 import 'package:flutter_ecommerce_app/common_widget/GridTilesCategory.dart';
-import 'package:flutter_ecommerce_app/shop/ShopModel.dart';
+import 'package:flutter_ecommerce_app/models/ShopModel.dart';
 import 'package:flutter_ecommerce_app/utils/Urls.dart';
 import 'package:http/http.dart';
 
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,11 +1,12 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_ecommerce_app/common_widget/AppBarWidget.dart';
 import 'package:flutter_ecommerce_app/common_widget/BottomNavBarWidget.dart';
 import 'package:flutter_ecommerce_app/common_widget/DrawerWidget.dart';
 import 'package:flutter_ecommerce_app/screens/HomeScreen.dart';
 import 'package:flutter_ecommerce_app/screens/ShoppingCartScreen.dart';
 import 'package:flutter_ecommerce_app/screens/WishListScreen.dart';
-import 'package:flutter_ecommerce_app/sign_in_up/SignIn.dart';
+import 'package:flutter_ecommerce_app/components/AppSignIn.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
 void main() => runApp(MyApp());
@@ -48,27 +49,7 @@ class _MyHomePageNewState extends State<MyHomePage> {
     return DefaultTabController(
       length: 3,
       child: Scaffold(
-        appBar: AppBar(
-          elevation: 0.0,
-          centerTitle: true,
-          title: Image.asset(
-            "assets/images/ic_app_icon.png",
-            width: 80,
-            height: 40,
-          ),
-          actions: <Widget>[
-            IconButton(
-              onPressed: () {
-                Navigator.push(
-                  context,
-                  MaterialPageRoute(builder: (context) => AppSignIn()),
-                );
-              },
-              icon: Icon(FontAwesomeIcons.user),
-              color: Color(0xFF323232),
-            ),
-          ],
-        ),
+        appBar: appBarWidget(context),
         drawer: DrawerWidget(),
         body: IndexedStack(
           index: currentIndex,
diff --git a/lib/models/BrandModel.dart b/lib/models/BrandModel.dart
diff --git a/lib/models/CategoryModel.dart b/lib/models/CategoryModel.dart
diff --git a/lib/models/ProductsModel.dart b/lib/models/ProductsModel.dart
@@ -0,0 +1,72 @@
+class ProductsModels {
+  int count;
+  String next;
+  Null previous;
+  List<Results> results;
+
+  ProductsModels({this.count, this.next, this.previous, this.results});
+
+  ProductsModels.fromJson(Map<String, dynamic> json) {
+    count = json['count'];
+    next = json['next'];
+    previous = json['previous'];
+    if (json['results'] != null) {
+      results = new List<Results>();
+      json['results'].forEach((v) {
+        results.add(new Results.fromJson(v));
+      });
+    }
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['count'] = this.count;
+    data['next'] = this.next;
+    data['previous'] = this.previous;
+    if (this.results != null) {
+      data['results'] = this.results.map((v) => v.toJson()).toList();
+    }
+    return data;
+  }
+}
+
+class Results {
+  String name;
+  String slug;
+  List<String> imageUrls;
+  String priceType;
+  String maxPrice;
+  String minPrice;
+  String minDiscountedPrice;
+
+  Results(
+      {this.name,
+      this.slug,
+      this.imageUrls,
+      this.priceType,
+      this.maxPrice,
+      this.minPrice,
+      this.minDiscountedPrice});
+
+  Results.fromJson(Map<String, dynamic> json) {
+    name = json['name'];
+    slug = json['slug'];
+    imageUrls = json['image_urls'].cast<String>();
+    priceType = json['price_type'];
+    maxPrice = json['max_price'];
+    minPrice = json['min_price'];
+    minDiscountedPrice = json['min_discounted_price'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['name'] = this.name;
+    data['slug'] = this.slug;
+    data['image_urls'] = this.imageUrls;
+    data['price_type'] = this.priceType;
+    data['max_price'] = this.maxPrice;
+    data['min_price'] = this.minPrice;
+    data['min_discounted_price'] = this.minDiscountedPrice;
+    return data;
+  }
+}
diff --git a/lib/models/ShopModel.dart b/lib/models/ShopModel.dart
diff --git a/lib/screens/HomeScreen.dart b/lib/screens/HomeScreen.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_ecommerce_app/brands/BrandHomePage.dart';
-import 'package:flutter_ecommerce_app/category/CategorySlider.dart';
+import 'package:flutter_ecommerce_app/components/BrandHomePage.dart';
+import 'package:flutter_ecommerce_app/components/CategorySlider.dart';
 import 'package:flutter_ecommerce_app/common_widget/PopularMenu.dart';
 import 'package:flutter_ecommerce_app/common_widget/SearchWidget.dart';
 import 'package:flutter_ecommerce_app/common_widget/TopPromoSlider.dart';
-import 'package:flutter_ecommerce_app/shop/ShopHomePage.dart';
+import 'package:flutter_ecommerce_app/components/ShopHomePage.dart';
 
 class HomeScreen extends StatefulWidget {
   @override
diff --git a/lib/screens/ProductsScreen.dart b/lib/screens/ProductsScreen.dart
diff --git a/lib/screens/SubCategoryScreen.dart b/lib/screens/SubCategoryScreen.dart
