Cleaning up

screens/main/Cita.js

@@ -12,14 +12,39 @@ import { connect } from 'react-redux'
 import { bindActionCreators } from 'redux' 
 import { fetchUser } from '../../redux/actions/index'
 
-import Constants from 'expo-constants';
-import * as Notifications from 'expo-notifications';
 
+export function Cita({navigation, route}) {
+   /*const [threads, setThreads] = useState([]);  
+    const [loading, setLoading] = useState(true);
+  useEffect(() => { 
+    const fire = firebase.firestore()
+    .collection('THREADS')
+    .where("cita", "==", route.params.appointment_id)
+    .onSnapshot(querySnapshot => {
+      const threads = querySnapshot.docs.map(documentSnapshot => {
+        return{
+          _id:documentSnapshot.id,
+          name:'',
+          ...documentSnapshot.data()
+        };
+      });
 
+      setThreads(threads);
+      console.log(threads);
 
-export function Cita({navigation}) {
-   
+      if(loading){
+        setLoading(false);
+      }
+    });
 
+    return () => {
+      fire();
+    }
+  }, []);*/
+    
+    
+    
+  
   
 
   const dimensions = Dimensions.get('window');

screens/main/Confirm.js

@@ -45,26 +45,6 @@ export function Confirm({navigation}) {
       navigation.navigate('Search');
     });
 
-    const fire = firebase.firestore()
-    .collection('THREADS')
-    .where("members", "array-contains", firebase.auth().currentUser.uid)
-    .onSnapshot(querySnapshot => {
-      const threads = querySnapshot.docs.map(documentSnapshot => {
-        return{
-          _id:documentSnapshot.id,
-          name:'',
-          ...documentSnapshot.data()
-        };
-      });
-
-      setThreads(threads);
-      console.log(threads);
-
-      if(loading){
-        setLoading(false);
-      }
-    });
-
     const cita = firebase.firestore().collection('APPOINTMENTS').where("new", "==", 'true').onSnapshot(snapShot => {
       const appointments = snapShot.docs.map(docSnap => {
         return{
@@ -81,20 +61,19 @@ export function Confirm({navigation}) {
       });
       setAppointments(appointments);
       console.log("appointment", appointments);
-      //console.log(appointments.Day);
     });
       
     return () => {
       Notifications.removeNotificationSubscription(notificationListener.current);
       Notifications.removeNotificationSubscription(responseListener.current);
-      fire();
+      //fire();
       cita();
     }
   }, []);
   
-  if (loading) {
+ /* if (loading) {
     return <Loading />;
-  }
+  }*/
 
 
   function crearChat(cliente, citaID) {
@@ -142,8 +121,8 @@ export function Confirm({navigation}) {
           ItemSeparatorComponent={() => <Divider />}
           renderItem = {({item}) => (
           <TouchableOpacity
-          onPress={async () => {
-            await sendPushNotification(expoPushToken); //item.push_token
+          onPress={() => {
+            console.log("date");
           }}
           >
             <List.Item

screens/main/Home_page.js

@@ -170,6 +170,26 @@ export function Home_page({navigation}) {
         </TouchableOpacity>
       )}
           />
+          <FlatList style={{
+             flex: 1,
+             width: screenWidth,
+         }}
+          data={appointments}
+          keyExtractor = {item => item._id}
+          ItemSeparatorComponent={() => <Divider />}
+          renderItem={({ item }) => {
+            if(item.new){
+            return (
+              <Button
+              title ='Pedir Cita'
+              onPress={ async () => {
+                await sendPushNotification(item.i_token);
+                }
+              }
+            /> 
+            )
+          }}}
+            />
         <Button
           title ='Hacer Busqueda'
           onPress= {() => navigation.navigate('Search')}
@@ -226,22 +246,21 @@ export function Home_page({navigation}) {
             <FlatList style={{
              flex: 1,
              width: screenWidth,
-         }}
-          data={appointments}
-          keyExtractor = {item => item._id}
-          ItemSeparatorComponent={() => <Divider />}
-          renderItem={({ item }) => {
-            if(item.new){
+            }}
+            data={appointments}
+            keyExtractor = {item => item._id}
+            renderItem={({ item }) => {
+            if(item.new == true){
             return (
               <Button
-              title ='Pedir Cita'
-              onPress={ async () => {
-                await sendPushNotification(item.i_token);
+                title ='Pedir Cita'
+                onPress={ async () => {
+                  await sendPushNotification(item.i_token);
+                  }
                 }
-              }
-            /> 
+              /> 
             )
-          }}}
+            }}}
             />