added image upload option

pm020202pm · Jul 16, 2023 · 5428444 · 5428444
1 parent 5b0671a
commit 5428444
Show file tree

Hide file tree

Showing 9 changed files with 300 additions and 166 deletions.
diff --git a/lib/accepted_tab.dart b/lib/accepted_tab.dart
@@ -21,11 +21,6 @@ class _AcceptedTabState extends State<AcceptedTab> {
     acceptUsers();
   }
 
-  Future<void> _refreshAcceptedUsers() async {
-    await Future.delayed(
-        const Duration(seconds: 1));
-    acceptUsers();
-  }
 
   Future<void> acceptUsers () async {
     QuerySnapshot querySnapshot = await FirebaseFirestore.instance.collection('Users').get();
@@ -59,26 +54,22 @@ class _AcceptedTabState extends State<AcceptedTab> {
 
   @override
   Widget build(BuildContext context) {
-    return RefreshIndicator(
-      onRefresh: _refreshAcceptedUsers,
-      child: FutureBuilder<List<QueryDocumentSnapshot>>(
-        future: fetchFirestoreDocuments(),
-        builder: (BuildContext context,
-            AsyncSnapshot<List<QueryDocumentSnapshot>> snapshot) {
-          if (snapshot.connectionState == ConnectionState.waiting) { return const Text("Loading..."); }
-          if (snapshot.hasError) {return Text('Error: ${snapshot.error}');}
-          List<QueryDocumentSnapshot> documents = snapshot.data!;
-
-          return ListView.builder(
-            itemCount: documents.length,
-            itemBuilder: (BuildContext context, int index) {
-              var name = documents[index].get('Name');
-              var time = documents[index].get('Time');
-              return UserCard(color: Colors.green, name: name, time: time, isMatched: true);
-            },
-          );
-        },
-      )
+    return FutureBuilder<List<QueryDocumentSnapshot>>(
+      future: fetchFirestoreDocuments(),
+      builder: (BuildContext context,
+          AsyncSnapshot<List<QueryDocumentSnapshot>> snapshot) {
+        if (snapshot.connectionState == ConnectionState.waiting) { return const Text("Loading..."); }
+        if (snapshot.hasError) {return Text('Error: ${snapshot.error}');}
+        List<QueryDocumentSnapshot> documents = snapshot.data!;
+        return ListView.builder(
+          itemCount: documents.length,
+          itemBuilder: (BuildContext context, int index) {
+            var name = documents[index].get('Name');
+            var time = documents[index].get('Time');
+            return UserCard(color: Colors.green, name: name, time: time, isMatched: true, imageUrl: 'assets/avatar.png',);
+          },
+        );
+      },
     );
   }
 }
diff --git a/lib/catalogue_tab.dart b/lib/catalogue_tab.dart
@@ -23,11 +23,9 @@ class _CatalogueTabState extends State<CatalogueTab> {
             children: [
               const Padding(
                 padding: EdgeInsets.fromLTRB(10, 5, 0, 0),
-                child: Text('My Request', style: TextStyle(), textAlign: TextAlign.left,),
-              ),
-              Container(
-                child: MyCard(),
+                child: Text('My Request'),
               ),
+              MyCard(),
             ],
           ),
           const SizedBox(height: 20,),
@@ -43,14 +41,14 @@ class _CatalogueTabState extends State<CatalogueTab> {
                 if (snapshot.connectionState == ConnectionState.waiting) { return const Text('Loading...'); }
                 if (snapshot.hasError) {return Text('Error: ${snapshot.error}');}
                 List<QueryDocumentSnapshot> documents = snapshot.data!;
-
                 return ListView.builder(
                   itemCount: documents.length,
                   itemBuilder: (BuildContext context, int index) {
                     var name = documents[index].get('Name');
                     var time = documents[index].get('Time');
                     var isMatched = documents[index].get('isMatched');
-                    return UserCard(color: isMatched? Colors.green : null, name: name, time: time, isMatched: false);
+                    var imageUrl = documents[index].get('imageUrl');
+                    return UserCard(color: isMatched? Colors.green : null, name: name, time: time, isMatched: false, imageUrl: imageUrl,);
                   },
                 );
               },

diff --git a/lib/constants.dart b/lib/constants.dart
@@ -2,11 +2,10 @@ import 'package:cloud_firestore/cloud_firestore.dart';
 
 late String userUid;
 bool myList=false;
+
+/////CHECK FOR MULTIPLE REQUEST FROM SINGLE USER
 Future<bool> duplicates() async {
-  QuerySnapshot querySnapshot = await FirebaseFirestore.instance
-      .collection('Users')
-      .where("Uid", isEqualTo: userUid)
-      .get();
+  QuerySnapshot querySnapshot = await FirebaseFirestore.instance.collection('Users').where("Uid", isEqualTo: userUid).get();
   if (querySnapshot.docs.isNotEmpty) {
     return true;
   }
@@ -15,20 +14,20 @@ Future<bool> duplicates() async {
   }
 }
 
+////RETRIEVING DATA OF DOCUMENT EXCEPT USER's DOCUMENT
 Future<List<QueryDocumentSnapshot>> fetchFirestoreDocuments() async {
-  QuerySnapshot querySnapshot = await FirebaseFirestore.instance.collection('Users').get();
-  // Access the documents in the query snapshot
+  final querySnapshot = await FirebaseFirestore.instance.collection('Users').where('Uid', isNotEqualTo: userUid).get();
   List<QueryDocumentSnapshot> documents = querySnapshot.docs;
   return documents;
 }
 
+
 void deleteContact(String documentId) {
-  FirebaseFirestore.instance.collection('Users').doc(documentId).delete()
-      .then((value) {
+  FirebaseFirestore.instance.collection('Users').doc(documentId).delete().then((value) {
     print('Contact deleted successfully.');
-  })
-      .catchError((error) {
+  }).catchError((error) {
     print('Failed to delete contact: $error');
   });
 }
 
+
diff --git a/lib/login_page.dart b/lib/login_page.dart
@@ -13,6 +13,7 @@ class _LoginPageState extends State<LoginPage> {
   final TextEditingController emailController = TextEditingController();
   final TextEditingController passwordController = TextEditingController();
 
+  /////REGISTER WITH EMAIL AND PASSWORD
   void registerWithEmailAndPassword(String email, String password) async {
     try {
       UserCredential userCredential = await FirebaseAuth.instance.createUserWithEmailAndPassword(
@@ -25,6 +26,7 @@ class _LoginPageState extends State<LoginPage> {
     }
   }
 
+  /////SIGN IN WITH EMAIL AND PASSWORD
   void signInWithEmailAndPassword(String email, String password) async {
     try {
       UserCredential userCredential = await FirebaseAuth.instance.signInWithEmailAndPassword(
@@ -41,9 +43,8 @@ class _LoginPageState extends State<LoginPage> {
             myList=true;
           });
         }
-        print('YOUR LIST BOOL : $myList');
+        print('MY LIST BOOL : $myList');
         Navigator.push(context, MaterialPageRoute(builder: (context)=> MyHomePage()));
-
       }
     }
     catch (e) {
@@ -59,21 +60,15 @@ class _LoginPageState extends State<LoginPage> {
         child: Center(
           child: Column(
               children: [
-                TextField(
-                  controller: emailController,
-                ),
+                TextField(controller: emailController,),
                 const SizedBox(height: 30,),
-                TextField(
-                  controller: passwordController,
-                ),
+                TextField(controller: passwordController,),
                 TextButton(
                     onPressed: (){registerWithEmailAndPassword(emailController.text, passwordController.text);},
                     child: const Text('Register')
                 ),
                 TextButton(
-                    onPressed: (){
-                      signInWithEmailAndPassword(emailController.text, passwordController.text);
-                      },
+                    onPressed: (){signInWithEmailAndPassword(emailController.text, passwordController.text);},
                     child: const Text('Login')
                 ),
               ],

diff --git a/lib/main.dart b/lib/main.dart
@@ -14,7 +14,7 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) {
     return MaterialApp(
       routes:{
-        '/homepage' : (context) => MyHomePage(),
+        '/homepage' : (context) => const MyHomePage(),
       },
       title: 'TravelDost',
       theme: ThemeData(