Merge branch 'master' of git.cs.usask.ca:nzc174/team-37

.vscode/launch.json

@@ -5,6 +5,7 @@
     "version": "0.2.0",
     "configurations": [
     
+    
         {
             "name": "food_app",
             "program": "lib/main.dart",

android/app/google-services.json

@@ -13,6 +13,14 @@
         }
       },
       "oauth_client": [
+        {
+          "client_id": "458093853085-boin3qthi2f9vgpgl2rucdt2mlmskcfd.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.example.food_app",
+            "certificate_hash": "9539a1d7b0cbab7e7b058810527babc4b9727c34"
+          }
+        },
         {
           "client_id": "458093853085-g6rmbug37s8665jmdpevskn3j0qq6qjj.apps.googleusercontent.com",
           "client_type": 1,

lib/providers/product_provider.dart

@@ -33,8 +33,14 @@ class ProductProvider with ChangeNotifier {
   fetchFreshProductData() async {
     List<ProductModel> newList = [];
 
+<<<<<<< HEAD
     QuerySnapshot value =
         await FirebaseFirestore.instance.collection("FreshFruitsProduct").get();
+=======
+    QuerySnapshot value = await FirebaseFirestore.instance
+        .collection("FreshFruitsProduct")
+        .get();
+>>>>>>> 95e38171cd5f6398b312c66d03f92cc596d97998
 
     value.docs.forEach(
       (element) {