Merge pull request #25 from Subhash23jan/subhash

final

index.js

@@ -1,12 +1,14 @@
-const express=require('express');
+const express = require('express');
+const http=require('http')
 const mongoose=require('mongoose');
 const authRouter = require('./server/routes/auth');
 const userRouter = require('./server/routes/user_router');
 const adminRouter = require('./server/routes/admin_router');
 const productRouter = require('./server/routes/product_router');
 const DB='mongodb+srv://xxxxxxxx@cluster0.wgtypza.mongodb.net/?retryWrites=true&w=majority';
 console.log("subhash");
-const app=express();
+const app = express();
+
 const PORT=3000;
 app.set("connection", "close");
 app.use(express.json());

lib/constants/global_variables.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-const String uri = "http://192.168.1.5:3000/";
+const String uri = "http://192.168.1.8:3000/";
 
 class GlobalVariables {
   static const appBarGradient = LinearGradient(

lib/pages/homeScreen/screens/home_screen_page.dart

@@ -77,7 +77,7 @@ class _HomepageScreenState extends State<HomepageScreen> {
                           ),
                         ),
                         prefixIcon:const Icon(Icons.search,color: Colors.grey,size: 26,),
-                        hintText: "Search in Amazon.in",
+                        hintText: "Search in our app",
                         hintStyle: TextStyle(color: Colors.black54,fontWeight: FontWeight.w500,fontSize: 14)
                     ),
                   ),
@@ -117,7 +117,7 @@ class _HomepageScreenState extends State<HomepageScreen> {
         shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(50)),
         elevation: 16,
           onPressed: (){
-          showSnackBar("sorry!! It is not real amazon app..🙅", context);
+          showSnackBar("sorry!! It is not real  app..🙅", context);
           },child: ClipRRect(
         borderRadius: BorderRadius.circular(50),
           child: Image.network("https://cdn.icon-icons.com/icons2/2108/PNG/512/amazon_alexa_icon_130998.png",width: 120,height: 120,)), ),

lib/pages/homeScreen/widgets/addressBox.dart

@@ -2,22 +2,26 @@ import 'package:flutter/material.dart';
 
 import '../../../constants/global_variables.dart';
 
-Container addressBox()
-{
+Container addressBox() {
   return Container(
     height: 30,
-    padding: const EdgeInsets.only(bottom: 15,left: 2,right: 2),
-    decoration: const BoxDecoration(
-        gradient: GlobalVariables.appBarGradient
-    ),
+    padding: const EdgeInsets.only(bottom: 15, left: 2, right: 2),
+    decoration: const BoxDecoration(gradient: GlobalVariables.appBarGradient),
     child: const Row(
       mainAxisAlignment: MainAxisAlignment.spaceBetween,
-      children:  [
-        Icon(Icons.location_on,size: 18,),
+      children: [
+        Icon(
+          Icons.location_on,
+          size: 18,
+        ),
         Flexible(
-          child: Text(" Deliver to : Subhash Uttarahalli Bcm Hostel,Bengaluru 560061,karnataka",style:TextStyle(fontSize: 14.6,fontWeight: FontWeight.w400),overflow: TextOverflow.ellipsis,
+          child: Text(
+            " Deliver to : BMSCE,Bengaluru 560019,karnataka",
+            style: TextStyle(fontSize: 14.6, fontWeight: FontWeight.w400),
+            overflow: TextOverflow.ellipsis,
             softWrap: true,
-            maxLines: 1,),
+            maxLines: 1,
+          ),
         ),
         Icon(Icons.arrow_drop_down)
       ],

lib/pages/order_history.dart

@@ -41,7 +41,6 @@ class _MyOrdersState extends State<MyOrders> {
     return Scaffold(
       backgroundColor: Colors.black,
       appBar: AppBar(
-
         title: Text("Your Orders",style: GoogleFonts.aBeeZee(color: Colors.white),),
         // centerTitle: true,
         backgroundColor:GlobalVariables.secondaryColor,
@@ -85,7 +84,7 @@ class _MyOrdersState extends State<MyOrders> {
                 alignment: Alignment.center,
                 shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(15),),
                 shadowColor: Colors.white,
-                side:  BorderSide(width: 1,style: BorderStyle.solid)
+                side:  const BorderSide(width: 1,style: BorderStyle.solid)
               ),
 
               onPressed: (){

lib/products/product_page.dart

@@ -362,9 +362,7 @@ class _ProductPageState extends State<ProductPage> {
   DropdownButtonHideUnderline selectItemCount(BuildContext context){
     return DropdownButtonHideUnderline(
       child: DropdownButton2<String>(
-
         hint: const Text("1"),
-
         items: items
             .map((String item) => DropdownMenuItem<String>(
           value: item,

lib/products/screens/all_products.dart

@@ -79,7 +79,7 @@ class _AllProductsState extends State<AllProducts> {
                             ),
                           ),
                           prefixIcon:const Icon(Icons.search,color: Colors.grey,size: 26,),
-                          hintText: "Search in Amazon.in",
+                          hintText: "Search in app",
                           hintStyle: const TextStyle(color: Colors.black54,fontWeight: FontWeight.w500,fontSize: 14)
                       ),
                     ),

lib/services/auth_services.dart

@@ -1,6 +1,7 @@
 // ignore_for_file: use_build_context_synchronously
 import 'package:amazon_clone_flutter/main.dart';
 import 'package:amazon_clone_flutter/provider/user_provider.dart';
+import 'package:flutter/foundation.dart';
 import 'package:provider/provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'dart:convert';
@@ -50,6 +51,9 @@ class AuthService {
           });
     } catch (e) {
       showSnackBar(e.toString(), context);
+      if (kDebugMode) {
+        print(e.toString());
+      }
     }
   }