Merge branch 'alen' into 'master'

package.json

@@ -94,4 +94,4 @@
             "android"
         ]
     }
-}
+}
\ No newline at end of file

src/app/app.component.ts

@@ -16,8 +16,8 @@ import { TranslateService } from '@ngx-translate/core';
 export class MyApp {
   @ViewChild(Nav) nav: Nav;
 
-  rootPage: string ;
-  local:user;
+  rootPage: string;
+  local: user;
   lang: string = 'en';
   title: string
   msg: string
@@ -31,9 +31,9 @@ export class MyApp {
   initializeApp() {
     this.platform.ready().then(() => {
 
-      this.storage.get('user_data').then(data=>{
+      this.storage.get('user_data').then(data => {
         console.log(data)
-        if(data){
+        if (data) {
           this.rootPage = 'HomePage'
           this.local = data
           // console.log(this.local)
@@ -55,9 +55,9 @@ export class MyApp {
         }
       })
 
-    this.statusBar.styleDefault();
-    this.splashScreen.hide();
-      // this.enableLoc();
+      this.statusBar.styleDefault();
+      this.splashScreen.hide();
+      this.enableLoc();
 
       this.network.onDisconnect().subscribe(() => {
 
@@ -99,47 +99,47 @@ export class MyApp {
     this.oneSignal.endInit();
   }
 
-  enableLoc(){
+  enableLoc() {
     this.locationAccuracy.canRequest().then((canRequest: boolean) => {
 
       // if (canRequest) {
-        // the accuracy option will be ignored by iOS
-        this.locationAccuracy.request(this.locationAccuracy.REQUEST_PRIORITY_HIGH_ACCURACY).then(
-          () => console.log('Request successful'),
-          error => console.log('Error requesting location permissions', error)
-        );
+      // the accuracy option will be ignored by iOS
+      this.locationAccuracy.request(this.locationAccuracy.REQUEST_PRIORITY_HIGH_ACCURACY).then(
+        () => console.log('Request successful'),
+        error => console.log('Error requesting location permissions', error)
+      );
       // }
 
     });
   }
 
-  open_page(page){
-    if (page =='LandingPage'){
+  open_page(page) {
+    if (page == 'LandingPage') {
       this.storage.remove('user_data');
       this.nav.setRoot(page);
       this.events.publish('user:profile', '');
     }
-    else if (page == 'MytripsPage'){
+    else if (page == 'MytripsPage') {
       this.myservice.show_loader()
       this.nav.setRoot(page);
     }
     else
-   this.nav.setRoot(page);
- }
+      this.nav.setRoot(page);
+  }
 
   languageTrans() {
     var This = this;
     setTimeout(function () {
-    This.storage.get('lang').then(data => {
-      if (data) {
-        This.translate.use(data);
-        This.lang = data;
-      }
-      else {
-        This.translate.setDefaultLang('en');
-      }
-      This.lang_trans()
-    })
+      This.storage.get('lang').then(data => {
+        if (data) {
+          This.translate.use(data);
+          This.lang = data;
+        }
+        else {
+          This.translate.setDefaultLang('en');
+        }
+        This.lang_trans()
+      })
     }, 500)
   }
 

src/app/app.html

@@ -15,9 +15,7 @@
         <ul>
           <li menuClose class="book" (click)="open_page('HomePage')">{{'sidemenu.Book Ride'|translate}}</li>
           <li menuClose class="trip" (click)="open_page('MytripsPage')">{{'sidemenu.My Trips'|translate}}</li>
-          <!-- <li menuClose class="settings" (click)="open_page('SettingsPage')">Settings</li> -->
           <li menuClose class="logout" (click)="open_page('LandingPage')">{{'sidemenu.Logout'|translate}}</li>
-          <!-- <li menuClose class="langtr" (click)="presentPopover()">{{'sidemenu.Language'|translate}}</li> -->
         </ul>
       </div>
     </div>

src/pages/ridedetail/ridedetail.html

@@ -12,7 +12,7 @@
     <button ion-button class="nav_btn theme_color floatLeft" (click)="back()">
        <ion-icon name="ios-arrow-back"></ion-icon>
     </button>
-    <div class="nav_header_title floatLeft">{{'ride.Quickride Details|translate'}}</div>
+    <div class="nav_header_title floatLeft">{{'ride.Quickride Details'|translate}}</div>
     <div class="clear"></div>
   </ion-header>
 

src/pages/ridedetail/ridedetail.ts

@@ -121,7 +121,7 @@ export class RidedetailPage {
             })
           }
           else if (This.temp == false) {
-            var bdata = { 'book_date': This.book.date, 'drop_area': This.book.dropArea, 'pickup_area': This.book.pickArea, 'taxi_type': This.book.carDetails.car_type, 'amount': '', 'km': '', 'promocode': This.book.promocode, 'token': This.local.token, 'userid': This.local.id, 'type': 'now', 'drivers': [], 'discount': This.book.discount ? This.book.discount : 0, 'pickup_latlng': this.book.pickLat + ',' + this.book.pickLng, 'drop_latlng': this.book.dropLat + ',' + this.book.dropLng }
+            var bdata = { 'book_date': This.book.date, 'drop_area': This.book.dropArea, 'pickup_area': This.book.pickArea, 'taxi_type': This.book.carDetails.car_type, 'amount': '', 'km': '', 'promocode': This.book.promocode, 'token': This.local.token, 'userid': This.local.id, 'type': 'now', 'drivers': [], 'discount': This.book.discount ? This.book.discount : 0, 'pickup_latlng': This.book.pickLat + ',' + This.book.pickLng, 'drop_latlng': This.book.dropLat + ',' + This.book.dropLng }
 
             bdata.drivers = This.drivers;
 
@@ -202,11 +202,6 @@ export class RidedetailPage {
           clearInterval(intrvl)
           This.loader.dismissAll();
         }
-        else{
-          This.translate.get(['ride.' + resp.message]).subscribe(value => {
-            This.myservice.show_alert('', value['ride.' + resp.message])
-          })
-        }
       })
       if (This.count == 12) {
         clearInterval(intrvl)

src/pages/searchride/searchride.html

@@ -3,7 +3,7 @@
       <ion-icon name="ios-arrow-back"></ion-icon>
   </button>
   <div class="nav_header_title floatLeft">{{'search.Search Results'|translate}}</div>
-  <button class="nav_btn floatRight"></button>
+  <!-- <button class="nav_btn floatRight"></button> -->
   <div class="clear"></div>
   <div class="cab_footer_location theme_dark_bg">
 	<input class="cab_location_input cab_search" placeholder="{{'search.Search'|translate}}" [(ngModel)]="searchText">
@@ -18,6 +18,10 @@
 				<h6>{{search.location}}</h6>
 			</li>
 		</ul>
+		{{(searches | search: searchText).length}}
+				<div class="no_rslt" *ngIf="(searches | search: searchText).length === 0">
+					No Results Found
+				</div>
 	</div>
 
 </ion-content>

src/pages/searchride/searchride.scss

@@ -6,4 +6,13 @@ page-searchride {
   .cab_search_result_page p{color:#fff;margin:0px;font-size: 18px;font-weight:300;padding: 10px;letter-spacing: 4px;}
   .cab_search_result_page ul li h5{color:#ff9000;margin:0px;padding:0px;padding-bottom: 5px;font-size: 14px;letter-spacing: 1px;font-weight: 400;}
   .cab_search_result_page ul li h6{color:#929292;margin:0px;padding:0px;font-weight: 400;}
+
+  .cab_location_input{width:100%;height:45px;font-weight:300;border:none;color:#fff;font-size: 18px;background: transparent;background-position: right !important;background-repeat: no-repeat !important;background-size: 23px !important;}
+.cab_location_input::-webkit-input-placeholder {color:#fff;}
+.cab_location_input::-moz-placeholder {color:#fff;}
+.cab_location_input:-ms-input-placeholder {color:#fff;}
+.cab_location_input:-moz-placeholder {color:#fff;}
+.cab_search{background-image: url("../assets/img/search.png") !important;background-position: right;background-repeat: no-repeat;}
+.cab_footer_location{width: 100%;padding:10px;}
+.no_rslt{text-align: center;color: #ff9000;font-size: 16px;}
 }