Merge branch 'Freehand' of https://git.ccom.uprrp.edu/ccorrada/ErEduGilMor into Freehand

screens/main/Confirm.js

@@ -63,6 +63,10 @@ export function Confirm({route, navigation}) {
       });
       setAppointments(appointments);
       console.log("appointment query de confirm", appointments);
+
+      if(loading){
+        setLoading(false);
+      }
     });
       
     return () => {
@@ -73,9 +77,9 @@ export function Confirm({route, navigation}) {
     }
   }, []);
   
- /* if (loading) {
+  if (loading) {
     return <Loading />;
-  }*/
+  };
 
 
   function crearChat(cliente, citaID) {

screens/main/Home_page.js

@@ -52,8 +52,8 @@ export function Home_page({navigation}) {
 
     responseListener.current = Notifications.addNotificationResponseReceivedListener(response => {
       if (response.notification.request.content.body == 'Le solicitan una cita'){
-        console.log("response appointments ", appointments[0])
-        navigation.navigate('Confirm',{x})
+        console.log("response appointments ", response)
+        navigation.navigate('Confirm',{x: response.notification.request.content.data.someData})
       } 
     });
 
@@ -238,9 +238,10 @@ export function Home_page({navigation}) {
               <Button
               title ='Pedir Cita'
               onPress={ async () => {
-                await sendPushNotification(item.i_token);
-                citaId(item._id);
                 x = item._id;
+                await sendPushNotification(item.i_token, x);
+                citaId(item._id);
+                //x = item._id;
                 }
               }
             /> 
@@ -312,6 +313,31 @@ 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 == 'true'){
+            return (
+              <Button
+              title ='Pedir Cita'
+              onPress={ async () => {
+                x = item._id;
+                await sendPushNotification(item.i_token, x);
+                citaId(item._id);
+                //x = item._id;
+                console.log(x);
+                console.log("en pedir cita, appointments", appointments[0])
+                }
+              }
+            /> 
+            )
+          }}}
+            />
           <Button
           title ='Availability'
           onPress= {() => navigation.navigate('Availability')}
@@ -325,13 +351,13 @@ export function Home_page({navigation}) {
       }
   }
 // Can use this function below, OR use Expo's Push Notification Tool-> https://expo.dev/notifications
-async function sendPushNotification(expoPushToken) {
+async function sendPushNotification(expoPushToken, x) {
   const message = {
     to: expoPushToken,
     sound: 'default',
     title: 'Freehand',
     body: 'Le solicitan una cita',
-    data: { someData: 'goes here' },
+    data: { someData: x },
   };
 
   await fetch('https://exp.host/--/api/v2/push/send', {