Merge branch 'alen' into 'master'

src/app/app.component.ts

@@ -154,6 +154,6 @@ export class MyApp {
 
   changeLang(lang) {
     this.storage.set('lang', lang);
-    this.events.publish('driver:lang', lang);
+    this.events.publish('user:lang', lang);
   }
 }
\ No newline at end of file

src/app/app.html

 <ion-menu [content]="content">
-  <ion-content class="cab_sidemenu_bg">
+  <ion-content class="cab_sidemenu_bg" [ngClass]="lang=='ar' ? 'ar' : ''">
     <div class="cab_sidemenu_wrapper">
       <select [(ngModel)]="lang" (change)="changeLang(lang)">
         <option value="en">EN</option>

src/app/app.scss

@@ -38,3 +38,106 @@
 .cab_sidemenu_list ul .logout{background: url("../assets/img/logout.png");}
 .cab_sidemenu_list ul .langtr{background: url("../assets/img/menu6.png");}
 // @import "../assets/css/essential.scss";
+
+.ar {
+    .cab_login_wrapper h4 {
+        text-align: right !important;
+    }
+    .cab_login_wrapper hr {
+        margin-left: auto !important;
+        margin-right: 0px !important;
+    }
+    .floatLeft {
+        float: right !important;
+    }
+    .floatRight {
+        float: left !important;
+    }
+    .cab_phone_input {
+        text-align: right;
+    }
+    .cab_pass {
+        background-position: left !important;
+    }
+    .cab_phone_input {
+        background-position: left !important;
+    }
+    .label {
+        text-align: right;
+    }
+    .cab_sidemenu_list {
+        width: 100%;
+        padding-right: 30px;
+        padding-left: 0px;
+        padding-top: 30px;
+    }
+    .cab_sidemenu_list ul li {
+        text-align: right;
+        padding-right: 35px;
+        padding-left: 0px;
+        background-position: right !important;
+    }
+    .cab_location_input {
+        padding-left: 30px;
+        padding-right: 0px;
+        text-align: right;
+        background-position: left !important;
+    }
+    .nav_header_title {
+        text-align: right;
+    }
+    .cab_location_input1 {
+        text-align: right;
+    }
+    .cab_search_result_page p {
+        text-align: right;
+    }
+    .cab_search_result_page ul li h5 {
+        text-align: right;
+    }
+    .cab_trip_content ul li {
+        width: 100%;
+        height: 100%;
+        background: url(../assets/img/trip_yellow.png);
+        position: relative;
+        background-position: top 15px right 10px !important;
+        background-repeat: no-repeat !important;
+        background-size: 20px;
+        padding-right: 40px;
+        padding-left: 50px;
+        padding-top: 10px;
+        padding-bottom: 10px;
+        text-align: right;
+        border-bottom: 1px solid #e4e4e4;
+    }
+    .cab_trip_content ul li ion-icon {
+        float: left;
+        color: #f7941e;
+        position: absolute;
+        left: 20px;
+        top: 35%;
+        right: auto;
+    }
+    .textRight {
+        text-align: left !important;
+    }
+    .textLeft {
+        text-align: right !important;
+    }
+    .cab_trip_detail_wrapper h4 {
+        text-align: right;
+    }
+    .cab_pop_details {
+        padding-right: 10px;
+    }
+    .cab_pop_detail_left {
+        padding-right: 10px;
+    }
+    .cab_coupon_content li .child {
+        text-align: right !important;
+    }
+    .cab_coupon_content p {
+        text-align: right;
+    }
+        select{text-align-last: right;}
+}
\ No newline at end of file

src/pages/addcoupon/addcoupon.html

-<ion-header class="theme_dark_bg">
+<ion-header class="theme_dark_bg" [ngClass]="lang=='ar' ? 'ar' : ''">
   <button ion-button class="nav_btn theme_color floatLeft" (click)="goBack()">
      <ion-icon name="ios-arrow-back"></ion-icon>
   </button>
@@ -6,7 +6,7 @@
   <div class="clear"></div>
 </ion-header>
 
-<ion-content padding class="cab_coupon_bg">
+<ion-content padding class="cab_coupon_bg" [ngClass]="lang=='ar' ? 'ar' : ''">
   <div class="cab_coupon_wrapper">
 		<form [formGroup]="promoForm">
 	<div class="cab_coupon_box">

src/pages/confirmride/confirmride.html

-<ion-header class="theme_dark_bg">
+<ion-header class="theme_dark_bg" [ngClass]="lang=='ar' ? 'ar' : ''">
 	<button ion-button class="nav_btn theme_color floatLeft"(click)="dismiss()">
       <ion-icon name="close"></ion-icon>
   </button>
   <div class="nav_header_title floatLeft">{{'confirm.Success'|translate}}</div>
   <div class="clear"></div>
 </ion-header>
-<ion-content padding class="theme_dark_bg">
+<ion-content padding class="theme_dark_bg" [ngClass]="lang=='ar' ? 'ar' : ''">
     <div class="cab_logo" style="padding-bottom: 20%;">
       <img src="assets/img/booking.png">
     </div>

src/pages/forgot/forgot.html

-<ion-header>
+<ion-header [ngClass]="lang=='ar' ? 'ar' : ''">
     <button class="nav_btn" (click)="back()">
         <ion-icon name="ios-arrow-back-outline"></ion-icon>
     </button>
 </ion-header>
-<ion-content padding class="themelogin_background">
+<ion-content padding class="themelogin_background" [ngClass]="lang=='ar' ? 'ar' : ''">
   <div class="cab_login_wrapper">
     <h4>{{'forgot.Forgot Password'|translate}}</h4>
     <hr>

src/pages/home/home.html

-<ion-content>
+<ion-content [ngClass]="lang=='ar' ? 'ar' : ''">
   <div class="theme_transparent_bg cab_home_custom_header">
     <button ion-button class="nav_btn theme_color floatLeft" menuToggle>
        <ion-icon name="ios-menu"></ion-icon>
@@ -11,7 +11,7 @@
   </div>
   <button ion-button class="cab_button_search theme_bgcolor" (click)="searchride()"><ion-icon name="search"></ion-icon></button>
 </ion-content>
-<ion-footer>
+<ion-footer [ngClass]="lang=='ar' ? 'ar' : ''">
   <form [formGroup]="locForm">
   <div class="cab_footer_location theme_bgcolor">
     <input class="cab_location_input cab_current" placeholder="{{'home.Pickup Location'|translate}}" id="pickUp" formControlName="pickLoc">

src/pages/landing/landing.html

-<ion-content class="themelogin_background">
+<ion-content class="themelogin_background" [ngClass]="lang=='ar' ? 'ar' : ''">
   <div class="cab_landing_wrapper">
     <div class="cab_logo">
       <img src="assets/img/logo.png">
@@ -16,7 +16,7 @@
     </div>
   </div>
 </ion-content>
-<ion-footer>
+<ion-footer [ngClass]="lang=='ar' ? 'ar' : ''">
   <div class="cab_footer">
     <p>{{'landing.Or Sign in with'|translate}}</p>
     <li (click)="signInWithFB()"><ion-icon name="logo-facebook"></ion-icon></li>

src/pages/login/login.html

-<ion-header>
-    <button class="nav_btn" (click)="back()">
+<ion-header [ngClass]="lang=='ar' ? 'ar' : ''">
+    <button class="nav_btn floatLeft" (click)="back()">
         <ion-icon name="ios-arrow-back-outline"></ion-icon>
     </button>
 </ion-header>
-<ion-content padding class="themelogin_background">
+<ion-content padding class="themelogin_background" [ngClass]="lang=='ar' ? 'ar' : ''">
   <div class="cab_login_wrapper">
 	<div class="cab_logo">
       <img src="assets/img/cab_logo.png" style="width: 120px;">

src/pages/map/map.html

 
-<ion-header class="theme_dark_bg">
+<ion-header class="theme_dark_bg" [ngClass]="lang=='ar' ? 'ar' : ''">
     <button ion-button class="nav_btn theme_color floatLeft" (click)="back()">
        <ion-icon name="ios-arrow-back"></ion-icon>
     </button>
@@ -10,7 +10,7 @@
 
 
 
-<ion-content>
+<ion-content [ngClass]="lang=='ar' ? 'ar' : ''">
     <div #map id="map"></div>
     <div class="jr_bottom_distance_card" *ngIf="temp">
       <div class="jr_bottom_inside">

src/pages/mytrips/mytrips.html

-<ion-header class="theme_dark_bg">
+<ion-header class="theme_dark_bg" [ngClass]="lang=='ar' ? 'ar' : ''">
   <button ion-button class="nav_btn theme_color floatLeft" menuToggle>
      <ion-icon name="ios-menu"></ion-icon>
   </button>
@@ -6,7 +6,7 @@
   <button class="nav_btn floatRight"></button>
   <div class="clear"></div>
 </ion-header>
-<ion-content class="themelogin_background">
+<ion-content class="themelogin_background" [ngClass]="lang=='ar' ? 'ar' : ''">
   <div class="cab_mytrips_wrapper">
     <div class="cab_trip_tabs_bay">
       <ul>

src/pages/payment/payment.html

-<ion-header class="theme_dark_bg">
+<ion-header class="theme_dark_bg" [ngClass]="lang=='ar' ? 'ar' : ''">
   <button ion-button class="nav_btn theme_color floatLeft"(click)="dismiss()">
      <ion-icon name="ios-arrow-back"></ion-icon>
   </button>
   <div class="nav_header_title floatLeft">{{'payment.Payment Details'|translate}}</div>
   <div class="clear"></div>
 </ion-header>
-<ion-content padding class="cab_coupon_bg">
+<ion-content padding class="cab_coupon_bg" [ngClass]="lang=='ar' ? 'ar' : ''">
 	<div class="cab_trip_detail_wrapper">
 			<h4 class="text_white">{{'payment.Pickup Point'|translate}}</h4>
 			<p class="floatLeft textLeft width50">{{loc?.from}}</p>

src/pages/popover/popover.html

-<ion-content>
-  <!-- [ngClass]="lang=='ar' ? 'ar' : ''" -->
-  <div class="popover_wrapper">
-    <ul>
-      <li id={{lang.code}} *ngFor="let lang of languages" (click)="changeLang(lang.code)">{{lang.name}}</li>
-    </ul>
-  </div>
-</ion-content>
\ No newline at end of file

src/pages/popover/popover.module.ts

-import { NgModule } from '@angular/core';
-import { IonicPageModule } from 'ionic-angular';
-import { PopoverPage } from './popover';
-import { TranslateModule } from "@ngx-translate/core";
-
-@NgModule({
-  declarations: [
-    PopoverPage,
-  ],
-  imports: [
-    IonicPageModule.forChild(PopoverPage),
-    TranslateModule,
-  ],
-})
-export class PopoverPageModule {}

src/pages/popover/popover.scss

-page-popover {
-  .popover_wrapper{
-    ul{
-      padding:0px;
-      margin:0px;
-      li{
-        width: 100%;
-        list-style: none;
-        padding: 10px;
-        font-size:18px;
-        color: #797979;
-        &:hover{
-          background:#91195b;
-          color: #fff;
-        }
-      }
-    }
-  }
-}

src/pages/popover/popover.ts

-import { Component } from '@angular/core';
-import { IonicPage, NavController, NavParams, ViewController, ModalController, Events } from 'ionic-angular';
-import { Storage } from '@ionic/storage'
-import { Myservice } from '../../providers/myservice'
-import { TranslateService } from '@ngx-translate/core';
-
-@IonicPage()
-@Component({
-  selector: 'page-popover',
-  templateUrl: 'popover.html',
-})
-export class PopoverPage {
-  languages = [{ 'name': 'English', 'code': 'en' }]//code will be same as filename of lang
-  lang: string = 'en';
-
-  constructor(public navCtrl: NavController, public navParams: NavParams, public viewCtrl: ViewController, public modalCtrl: ModalController, public storage: Storage, public events: Events, private myservice: Myservice, private translate: TranslateService) {
-  }
-
-  ionViewDidEnter() {
-    this.storage.get('lang').then(lang => {
-      if (lang) {
-        this.lang = lang
-        document.getElementById(lang).style.background = '#91195b';
-        document.getElementById(lang).style.color = '#fff';
-      }
-    })
-  }
-
-  changeLang(lang) {
-    this.myservice.show_loader()
-    this.storage.set('lang', lang);
-    var This = this;
-    setTimeout(function () {
-      This.events.publish('patient:lang', lang);
-      This.myservice.hide_loader()
-      This.close();
-    }, 500)
-  }
-
-  close() {
-    this.viewCtrl.dismiss();
-  }
-
-
-}

src/pages/profile/profile.html

-<ion-header class="theme_dark_bg">
+<ion-header class="theme_dark_bg" [ngClass]="lang=='ar' ? 'ar' : ''">
   <button ion-button class="nav_btn theme_color floatLeft" menuToggle>
        <ion-icon name="ios-menu"></ion-icon>
     </button>
   <div class="nav_header_title floatLeft">{{'profile.Edit Profile'|translate}}</div>
   <div class="clear"></div>
 </ion-header>
-<ion-content padding class="themelogin_background">
+<ion-content padding class="themelogin_background" [ngClass]="lang=='ar' ? 'ar' : ''">
 	<div class="cab_edit_profile_wrapper">
 		<div class="cab_edit_profilepic_edit">
 			<div class="edit_circle">
@@ -79,6 +79,6 @@
 		</div>
 	</div>
 </ion-content>
-<ion-footer>
+<ion-footer [ngClass]="lang=='ar' ? 'ar' : ''">
 	<button ion-button class="cab_footer_btn width100 text_white" (click)="update()" [disabled]="profileForm.invalid">{{'profile.UPDATE'|translate}}</button>
 </ion-footer>

src/pages/ratecard/ratecard.html

 
-<ion-content class="bg_transparent">
+<ion-content class="bg_transparent" [ngClass]="lang=='ar' ? 'ar' : ''">
  <div class="cab_ride_pop">
     <div class="cab_ride_inner theme_bgcolor">
 	<div class="cab_ride_down_arrow theme_bgcolor">
@@ -45,6 +45,6 @@
     </div>
 	</div>
 </ion-content>
-<ion-footer>
+<ion-footer [ngClass]="lang=='ar' ? 'ar' : ''">
 <button ion-button class="cab_footer_btn width100" (click)="dismiss()">{{'ratecard.OKAY'|translate}}</button>
 </ion-footer>
\ No newline at end of file

src/pages/ratting/ratting.html

 
-<ion-content padding class="theme_dark_transparent">
+<ion-content padding class="theme_dark_transparent" [ngClass]="lang=='ar' ? 'ar' : ''">
   <div class="wrapper">
       <div class="log_div">
         <ion-card>

src/pages/ridedetail/ridedetail.html

@@ -8,7 +8,7 @@
   </style>
 
 
-<ion-header class="theme_dark_bg">
+<ion-header class="theme_dark_bg" [ngClass]="lang=='ar' ? 'ar' : ''">
     <button ion-button class="nav_btn theme_color floatLeft" (click)="back()">
        <ion-icon name="ios-arrow-back"></ion-icon>
     </button>
@@ -17,7 +17,7 @@
   </ion-header>
 
 
-<ion-content padding>
+<ion-content padding [ngClass]="lang=='ar' ? 'ar' : ''">
 <div class="jr_profile_content1">
   <div class="jr_from_to">
     <li>

src/pages/ridenow/ridenow.html

-<ion-content class="bg_transparent">
+<ion-content class="bg_transparent" [ngClass]="lang=='ar' ? 'ar' : ''">
   <div class="cab_ride_pop">
     <div class="cab_ride_inner theme_bgcolor">
 		<div class="cab_ride_down_arrow theme_bgcolor">
@@ -34,7 +34,7 @@
     </div>
   </div>
 </ion-content>
-<ion-footer>
+<ion-footer [ngClass]="lang=='ar' ? 'ar' : ''">
   <div class="cab_footer_btn_bay">
     <button ion-button class="cab_footer_btn floatRight" (click)="addcoupon()">{{'ridenow.CONFIRM RIDE'|translate}}</button>
     <button ion-button class="cab_footer_btn floatLeft"  (click)="dismiss()">{{'ridenow.CANCEL RIDE'|translate}}</button>

src/pages/ridepop/ridepop.html

-<ion-content class="bg_transparent">
+<ion-content class="bg_transparent" [ngClass]="lang=='ar' ? 'ar' : ''">
   <div class="cab_ride_pop">
     <div class="cab_ride_inner theme_bgcolor" *ngIf="carTypes">
       <div class="cab_ride_down_arrow theme_bgcolor">
@@ -33,7 +33,7 @@
     </div>
   </div>
 </ion-content>
-<ion-footer>
+<ion-footer [ngClass]="lang=='ar' ? 'ar' : ''">
   <div class="cab_footer_btn_bay">
     <button ion-button class="cab_footer_btn floatRight" (click)="bookNow()">{{'ridepop.RIDE NOW'|translate}}
     </button>

src/pages/ridesummary/ridesummary.html

@@ -9,7 +9,7 @@
 </style>
 
 
-<ion-header class="jr_theme_color jr_header">
+<ion-header class="jr_theme_color jr_header" [ngClass]="lang=='ar' ? 'ar' : ''">
   <button ion-button class="jr_left jr_header_btn jr_back_icon" (click)="goBack()"></button>
   <div class="jr_header_title">
     <h4>{{'ridesummary.Quickride Details'|translate}}</h4>
@@ -19,7 +19,7 @@
 </ion-header>
 
 
-<ion-content padding>
+<ion-content padding [ngClass]="lang=='ar' ? 'ar' : ''">
   <div class="jr_profile_content1">
     <div class="jr_from_to">
       <li>

src/pages/searchride/searchride.html

-<ion-header class="theme_dark_bg">
+<ion-header class="theme_dark_bg" [ngClass]="lang=='ar' ? 'ar' : ''">
   <button ion-button class="nav_btn theme_color floatLeft" (click)="dismiss()">
       <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> -->
   <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">
-  </div>
+  <!-- <div class="cab_footer_location theme_dark_bg"> -->
+	<input class="cab_location_input1 cab_search" placeholder="{{'search.Search'|translate}}" [(ngModel)]="searchText">
+  <!-- </div> -->
 </ion-header>
-<ion-content class="themedark_theme">
+<ion-content class="themedark_theme" [ngClass]="lang=='ar' ? 'ar' : ''">
 	<div class="cab_search_result_page">
 		<p>{{'search.Popular Search'|translate}}</p>
 		<ul>

src/pages/searchride/searchride.scss

@@ -7,12 +7,12 @@ page-searchride {
   .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;}
+ .cab_location_input1 {
+        width: 100%;
+        height: 40px;
+        padding-left: 20px;
+        padding-right: 20px;
+        border: none;
+    }
 .no_rslt{text-align: center;color: #ff9000;font-size: 16px;}
 }

src/pages/signup/signup.html

-<ion-header>
-    <button class="nav_btn" (click)="back()">
+<ion-header [ngClass]="lang=='ar' ? 'ar' : ''">
+    <button class="nav_btn floatLeft" (click)="back()">
         <ion-icon name="ios-arrow-back-outline"></ion-icon>
     </button>
 </ion-header>
-<ion-content padding class="themelogin_background">
+<ion-content padding class="themelogin_background" [ngClass]="lang=='ar' ? 'ar' : ''">
   <div class="cab_login_wrapper">
     <h4>{{'signup.Sign Up'|translate}}</h4>
     <hr>

src/pages/tripdetails/tripdetails.html

-<ion-header class="theme_dark_bg">
+<ion-header class="theme_dark_bg" [ngClass]="lang=='ar' ? 'ar' : ''">
   <button ion-button class="nav_btn theme_color floatLeft" (click)="back()">
       <ion-icon name="ios-arrow-back"></ion-icon>
   </button>
@@ -6,7 +6,7 @@
   <button class="nav_btn floatRight"></button>
   <div class="clear"></div>
 </ion-header>
-<ion-content class="cab_dark_bg" padding>
+<ion-content class="cab_dark_bg" padding [ngClass]="lang=='ar' ? 'ar' : ''">
   <div class="cab_trip_detail_wrapper">
     <h4>{{'trip.Pickup Point'|translate}}</h4>
     <p class="floatLeft textLeft width50">{{details.pickup_area}}</p>