Merge branch 'master' into dev

kbowerma · kbowerma · commit 400c7b5fe5d0 · 2016-12-08T17:31:27.000-06:00
diff --git a/src/api/Mission.js b/src/api/Mission.js
@@ -45,6 +45,7 @@ class MissionApi {
         plannedHomePosition: homePosition,
         missionItems: items,
         missionName: name,
+        status:'waiting',
       })});
   }
 
@@ -58,6 +59,7 @@ class MissionApi {
         plannedHomePosition: homePosition,
         missionItems: items,
         missionName: name,
+        status:'waiting',
       })});
   }
 
diff --git a/src/api/User.js b/src/api/User.js
@@ -23,7 +23,7 @@ class UserApi {
   }
 
   login(email, password) {
-    const url = `${this.basePath}/api/v1/users/auth`;
+    const url = `${this.basePath}/api/v1/login`;
 
     return reqwest({ url: url, method: 'post', type: 'json',
       contentType: 'application/json',
@@ -34,19 +34,21 @@ class UserApi {
   }
 
   register(name, email, password) {
-    const url = `${this.basePath}/api/v1/users`;
+    const url = `${this.basePath}/api/v1/register`;
 
     return reqwest({ url: url, method: 'post', type: 'json',
       contentType: 'application/json',
       data: JSON.stringify({
-        name: name,
+        firstName: name,
+        lastName: name,
         email: email,
+        phone: "1",
         password: password,
       })});
   }
 
   registerSocialUser(name, email) {
-    const url = `${this.basePath}/api/v1/users/social`;
+    const url = `${this.basePath}/api/v1/login/social`;
 
     return reqwest({ url: url, method: 'post', type: 'json',
       contentType: 'application/json',
diff --git a/src/components/maps/GoogleMap.js b/src/components/maps/GoogleMap.js
@@ -35,7 +35,7 @@ class GoogleMap extends Component {
   getMarkerConfig(drone) {
     const google = window.google;
     const config = { clickable: false, crossOnDrag: false,
-      cursor: 'pointer', position: new google.maps.LatLng(drone.lat, drone.lng) };
+      cursor: 'pointer', position: new google.maps.LatLng(drone.currentLocation[0],drone.currentLocation[1]) };
     switch (drone.status) {
       case 'in-motion':
         config.icon = 'http://maps.google.com/mapfiles/ms/icons/blue-dot.png';
@@ -90,7 +90,7 @@ class GoogleMap extends Component {
     });
     // get a list of all the drones
     droneApi.getAll().then((drones) => {
-      _self.markers = drones.map((single) => {
+      _self.markers = drones.items.map((single) => {
         const marker = new google.maps.Marker(_self.getMarkerConfig(single));
         // set the marker id, to identify a drone uniquely
         marker.set('id', single.id);
@@ -110,7 +110,7 @@ class GoogleMap extends Component {
       // find a marker by id
       const marker = _.find(_self.markers, { id: data.id });
       if (marker) {
-        marker.setPosition(new google.maps.LatLng(data.lat, data.lng));
+        marker.setPosition(new google.maps.LatLng(data.currentLocation[0], data.currentLocation[1]));
         // repaint the cluster
         _self.markerCluster.repaint();
       }
diff --git a/src/components/mission/MissionPlannerList.js b/src/components/mission/MissionPlannerList.js
@@ -26,13 +26,13 @@ class MissionPlannerList extends Component {
 
   componentDidMount() {
     this.missionApi.getAll().then((missions) => {
-      this.setState({ missions: missions });
+      this.setState({ missions: missions.items });
     });
   }
 
   refresh() {
     this.missionApi.getAll().then((missions) => {
-      this.setState({ missions: missions });
+      this.setState({ missions: missions.items });
     });
   }
 

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ class MissionApi {`
`45`	`45`	`plannedHomePosition: homePosition,`
`46`	`46`	`missionItems: items,`
`47`	`47`	`missionName: name,`
	`48`	`+ status:'waiting',`
`48`	`49`	`})});`
`49`	`50`	`}`
`50`	`51`
`@@ -58,6 +59,7 @@ class MissionApi {`
`58`	`59`	`plannedHomePosition: homePosition,`
`59`	`60`	`missionItems: items,`
`60`	`61`	`missionName: name,`
	`62`	`+ status:'waiting',`
`61`	`63`	`})});`
`62`	`64`	`}`
`63`	`65`
Original file line number	Diff line number	Diff line change
`@@ -26,13 +26,13 @@ class MissionPlannerList extends Component {`
`26`	`26`
`27`	`27`	`componentDidMount() {`
`28`	`28`	`this.missionApi.getAll().then((missions) => {`
`29`		`- this.setState({ missions: missions });`
	`29`	`+ this.setState({ missions: missions.items });`
`30`	`30`	`});`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`refresh() {`
`34`	`34`	`this.missionApi.getAll().then((missions) => {`
`35`		`- this.setState({ missions: missions });`
	`35`	`+ this.setState({ missions: missions.items });`
`36`	`36`	`});`
`37`	`37`	`}`
`38`	`38`