Merge branch 'alen' into 'master'

src/app/app.component.ts

@@ -86,7 +86,7 @@ export class MyApp {
   initOnesignal() {
     this.oneSignal.startInit('', '');
 
-    this.oneSignal.inFocusDisplaying(this.oneSignal.OSInFocusDisplayOption.InAppAlert);
+    this.oneSignal.inFocusDisplaying(this.oneSignal.OSInFocusDisplayOption.Notification);
 
     this.oneSignal.handleNotificationReceived().subscribe(() => {
       // do something when notification is received

src/pages/ridedetail/ridedetail.html

@@ -39,7 +39,7 @@
 
   <div class="jr_search_bottom_bay jr_padding0" *ngIf="driver">
     <div class="jr_search_profile">
-      <img [src]=driver.image>
+      <img [src]=baseUrl+driver.image>
     </div>
     <div class="jr_search_profile_detail">
       <br>

src/pages/ridedetail/ridedetail.ts

@@ -26,6 +26,7 @@ export class RidedetailPage {
   drivers = []
   temp: boolean = false;
   lang: string = 'en';
+  baseUrl :string = this.myservice.base_url
 
   constructor(public navCtrl: NavController, public navParams: NavParams, private data: dataService, private zone: NgZone, private myservice: Myservice, private storage: Storage, public platform: Platform, public loadingCtrl: LoadingController, private alertCtrl: AlertController, private translate: TranslateService) {
   }

src/pages/ridesummary/ridesummary.html

@@ -47,7 +47,7 @@
     <span *ngIf="driver">
       <div class="jr_search_bottom_bay jr_padding0">
         <div class="jr_search_profile">
-          <img [src]=driver.image>
+          <img [src]=baseUrl+driver.image>
         </div>
         <div class="jr_search_profile_detail">
           <br>

src/pages/ridesummary/ridesummary.ts

@@ -22,6 +22,7 @@ export class RidesummaryPage {
   driver: any;
   ride: any;
   lang: string = 'en';
+  baseUrl:string = this.myservice.base_url
 
   constructor(public navCtrl: NavController, public navParams: NavParams, private data: dataService, private zone: NgZone, private myservice: Myservice, private storage: Storage, public platform: Platform, private translate: TranslateService) {
   }