Merge branch 'master' of github.com:anchetaWern/BLE-Pusher-Attendance

anchetaWern · Oct 11, 2017 · 8caa80c · 8caa80c
2 parents 275358c + 3495eae
commit 8caa80c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/app/index.android.js b/app/index.android.js
@@ -114,9 +114,9 @@ export default class pusherBLEAttendance extends Component {
 
     var channel = pusher.subscribe('attendance-channel');
     channel.bind('attendance-event', (data) => {
-      if(data.length > 1){
+      if(data.is_attendees){
         this.setState({
-          attendees: data
+          attendees: data.attendees
         });
       }else{
         ToastAndroid.show(`${data.full_name} just entered the room!`, ToastAndroid.LONG);

diff --git a/server/attendance.js b/server/attendance.js
@@ -72,7 +72,12 @@ bleno.on('advertisingStart', function(error){
     }
 });
 
+
 bleno.on('accept', function(clientAddress){
   console.log('client address: ', clientAddress);
-  pusher.trigger('attendance-channel', 'attendance-event', attendees);
+  var data = {
+    is_attendees: true,
+    attendees: attendees
+  };
+  pusher.trigger('attendance-channel', 'attendance-event', data);
 });