Skip to content

E
Enoch
Commit 5cc9814d by Jansa Jose
Options

intial commit

parent ddeb41dd
Showing with 210 additions and 126 deletions
config.xml
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
<plugin name="cordova-plugin-x-socialsharing" spec="^5.4.1" /> <plugin name="cordova-plugin-x-socialsharing" spec="^5.4.1" />
<plugin name="ionic-plugin-keyboard" spec="^2.2.1" /> <plugin name="ionic-plugin-keyboard" spec="^2.2.1" />
<plugin name="mx.ferreyra.callnumber" spec="~0.0.2" /> <plugin name="mx.ferreyra.callnumber" spec="~0.0.2" />
<plugin name="onesignal-cordova-plugin" spec="^2.2.2" />
<plugin name="cordova-plugin-x-toast" spec="~2.7.2" /> <plugin name="cordova-plugin-x-toast" spec="~2.7.2" />
<engine name="android" spec="~7.1.4" /> <plugin name="onesignal-cordova-plugin" spec="~2.4.6" />
<engine name="android" spec="~6.3.0" />
</widget> </widget>
package.json
...@@ -64,6 +64,7 @@ ...@@ -64,6 +64,7 @@
"cordova-plugin-telerik-imagepicker": "^2.1.8", "cordova-plugin-telerik-imagepicker": "^2.1.8",
"cordova-plugin-whitelist": "^1.3.1", "cordova-plugin-whitelist": "^1.3.1",
"cordova-plugin-x-socialsharing": "^5.4.1", "cordova-plugin-x-socialsharing": "^5.4.1",
"cordova-plugin-x-toast": "~2.7.2",
"es6-promise-plugin": "^4.2.2", "es6-promise-plugin": "^4.2.2",
"firebase": "^4.4.0", "firebase": "^4.4.0",
"ionic-angular": "3.4.2", "ionic-angular": "3.4.2",
...@@ -71,12 +72,12 @@ ...@@ -71,12 +72,12 @@
"ionicons": "3.0.0", "ionicons": "3.0.0",
"jquery": "^3.2.1", "jquery": "^3.2.1",
"mx.ferreyra.callnumber": "~0.0.2", "mx.ferreyra.callnumber": "~0.0.2",
"onesignal-cordova-plugin": "^2.2.2", "onesignal-cordova-plugin": "~2.4.6",
"promise-polyfill": "8.0.0", "promise-polyfill": "8.0.0",
"rxjs": "^5.5.2", "rxjs": "^5.5.2",
"sw-toolbox": "3.6.0", "sw-toolbox": "3.6.0",
"zone.js": "0.8.12", "zone.js": "0.8.12",
"cordova-android": "~7.1.4" "cordova-android": "~6.3.0"
}, },
"devDependencies": { "devDependencies": {
"@ionic/app-scripts": "1.3.8", "@ionic/app-scripts": "1.3.8",
...@@ -99,7 +100,6 @@ ...@@ -99,7 +100,6 @@
"cordova-plugin-file-transfer": {}, "cordova-plugin-file-transfer": {},
"mx.ferreyra.callnumber": {}, "mx.ferreyra.callnumber": {},
"cordova-plugin-geolocation": {}, "cordova-plugin-geolocation": {},
"onesignal-cordova-plugin": {},
"cordova-plugin-network-information": {}, "cordova-plugin-network-information": {},
"cordova-plugin-request-location-accuracy": {}, "cordova-plugin-request-location-accuracy": {},
"cordova-plugin-compat": {}, "cordova-plugin-compat": {},
...@@ -112,7 +112,8 @@ ...@@ -112,7 +112,8 @@
}, },
"cordova-plugin-x-socialsharing": {}, "cordova-plugin-x-socialsharing": {},
"cordova-plugin-datepicker": {}, "cordova-plugin-datepicker": {},
"cordova-plugin-x-toast": {} "cordova-plugin-x-toast": {},
"onesignal-cordova-plugin": {}
}, },
"platforms": [ "platforms": [
"android" "android"
......
src/app/app.component.ts
import { Component, ViewChild } from '@angular/core'; import { Component, ViewChild, NgZone } from '@angular/core';
import { Nav, Platform, Events, IonicApp, AlertController,ModalController,ToastController } from 'ionic-angular'; import { Nav, Platform, Events, IonicApp, AlertController,ModalController,ToastController } from 'ionic-angular';
import { Storage } from '@ionic/storage'; import { Storage } from '@ionic/storage';
import { StatusBar } from '@ionic-native/status-bar'; import { StatusBar } from '@ionic-native/status-bar';
...@@ -11,6 +11,8 @@ import * as arabi from '../language/ar.json'; ...@@ -11,6 +11,8 @@ import * as arabi from '../language/ar.json';
import { Geolocation } from '@ionic-native/geolocation'; import { Geolocation } from '@ionic-native/geolocation';
import {Myservice} from '../providers/myservice'; import {Myservice} from '../providers/myservice';
import {FirebaseService} from '../providers/firebase.service'; import {FirebaseService} from '../providers/firebase.service';
// import { SubjectService } from '../providers/subject.service';
@Component({ @Component({
...@@ -19,7 +21,6 @@ import {FirebaseService} from '../providers/firebase.service'; ...@@ -19,7 +21,6 @@ import {FirebaseService} from '../providers/firebase.service';
export class MyApp { export class MyApp {
@ViewChild(Nav) nav: Nav; @ViewChild(Nav) nav: Nav;
rootPage: any = 'Landing'; rootPage: any = 'Landing';
userdata :any; userdata :any;
userid :any; userid :any;
...@@ -28,6 +29,7 @@ export class MyApp { ...@@ -28,6 +29,7 @@ export class MyApp {
newdata:any newdata:any
user_id:any; user_id:any;
toast:any; toast:any;
appdata:string;
push:any; push:any;
banner_vals:any; banner_vals:any;
...@@ -39,8 +41,41 @@ export class MyApp { ...@@ -39,8 +41,41 @@ export class MyApp {
chat_user_id:any; chat_user_id:any;
newpushdata:any; newpushdata:any;
location:any; location:any;
constructor(public platform:Platform,public modalCtrl:ModalController,private geolocation: Geolocation,public statusBar:StatusBar,private ionicApp:IonicApp,public splashScreen:SplashScreen,public alertCtrl:AlertController,public events:Events,public storage:Storage,private network:Network,private toastCtrl:ToastController,public oneSignal:OneSignal,private locationAccuracy:LocationAccuracy,private myservice: Myservice,public firebaseService:FirebaseService){ constructor(public platform:Platform,
this.storage.set('app', 'joyride'); // public subjectService: SubjectService,
private zone: NgZone,
public modalCtrl:ModalController,
private geolocation: Geolocation,
public statusBar:StatusBar,
private ionicApp:IonicApp,
public splashScreen:SplashScreen,
public alertCtrl:AlertController,
public events:Events,
public storage:Storage,
private network:Network,
private toastCtrl:ToastController,
public oneSignal:OneSignal,
private locationAccuracy:LocationAccuracy,
private myservice: Myservice,
public firebaseService:FirebaseService){
this.appdata = '';
// this.subjectService.getCurrentApp().subscribe(locData => {
events.subscribe('app', data => {
console.log(data);
if( data === 'truebus' ){
this.appdata = 'truebus';
} else if ( data === 'joyride' ) {
this.appdata = 'joyride';
}
});
// this.storage.get('app').then((data) => {
// if( data == 'truebus' ){
// this.appdata = 'truebus';
// } else if ( data == 'joyride' ) {
// this.appdata = 'joyride';
// }
// });
// });
this.lang_val['en']= eng; this.lang_val['en']= eng;
this.lang_val['ar']= arabi; this.lang_val['ar']= arabi;
...@@ -53,10 +88,11 @@ export class MyApp { ...@@ -53,10 +88,11 @@ export class MyApp {
}) })
this.storage.get('userdata').then((userdata) => { this.storage.get('userdata').then((userdata) => {
console.log('ghfh 1');
console.log(userdata); console.log(userdata);
this.userdata=userdata; this.userdata=userdata;
this.userid = userdata.id;
if(this.userdata){ if(this.userdata){
this.userid = userdata.id;
setInterval(() => { setInterval(() => {
this.get_crnt_location(); this.get_crnt_location();
}, 5000); }, 5000);
...@@ -139,7 +175,9 @@ export class MyApp { ...@@ -139,7 +175,9 @@ export class MyApp {
events.subscribe('user:update_profile', userdata => { events.subscribe('user:update_profile', userdata => {
if(userdata !== undefined && userdata !== ""){ if(userdata !== undefined && userdata !== ""){
this.storage.set('userdata', userdata); this.storage.set('userdata', userdata);
console.log('ghfh 2');
this.userdata = userdata; this.userdata = userdata;
console.log(this.userdata)
this.userid = userdata.id; this.userid = userdata.id;
console.log("profile", this.userdata); console.log("profile", this.userdata);
} }
...@@ -374,6 +412,7 @@ chatlisting(){ ...@@ -374,6 +412,7 @@ chatlisting(){
} }
login() { login() {
console.log('enter login');
this.nav.setRoot('Login'); this.nav.setRoot('Login');
} }
......
src/app/app.html
<ion-menu [content]="mymenu" *ngIf="app == 'joyride'"> <ion-menu [content]="mymenu" *ngIf="appdata === 'joyride'">
<ion-content class="jr_sidemenu_bg"> <ion-content class="jr_sidemenu_bg">
<div class="jr_inside_bg" *ngIf="language_value" > <div class="jr_inside_bg" *ngIf="language_value" >
<div class="jr_sidemenu_bg"> <div class="jr_sidemenu_bg">
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<!-------------------------truebus app html page(down)------------------------------> <!-------------------------truebus app html page(down)------------------------------>
<ion-menu [content]="content" [ngClass]="lang=='ar' ? 'ar' : ''" *ngIf="app == 'truebus'"> <ion-menu [content]="content" [ngClass]="lang=='ar' ? 'ar' : ''" *ngIf="appdata === 'truebus'">
<ion-content class="relative"> <ion-content class="relative">
<!-- <ion-item class="language"> <!-- <ion-item class="language">
<ion-label>Language to AR</ion-label> <ion-label>Language to AR</ion-label>
...@@ -68,22 +68,22 @@ ...@@ -68,22 +68,22 @@
</div> </div>
<ul> <ul>
<li menuClose (click)="home()"> <li menuClose (click)="home()">
<ion-icon name="home"></ion-icon>{{'menu.Home' | translate}} <ion-icon name="home"></ion-icon>Home
</li> </li>
<li menuClose (click)="trip_list()"> <li menuClose (click)="trip_list()">
<ion-icon name="bus"></ion-icon>{{'menu.My Trip' | translate}} <ion-icon name="bus"></ion-icon>My Trip
</li> </li>
<li menuClose (click)="notification()"> <li menuClose (click)="notification()">
<ion-icon name="cash"></ion-icon>{{'menu.Notification' | translate}} <ion-icon name="cash"></ion-icon>Notification
</li> </li>
<li menuClose (click)="cancelticket()"> <li menuClose (click)="cancelticket()">
<ion-icon name="backspace"></ion-icon>{{'menu.Cancel ticket' | translate}} <ion-icon name="backspace"></ion-icon>Cancel ticket
</li> </li>
<li menuClose (click)="changepass()"> <li menuClose (click)="changepass()">
<ion-icon name="key"></ion-icon>{{'menu.Change Password' | translate}} <ion-icon name="key"></ion-icon>Change Password
</li> </li>
<li menuClose (click)="login()"> <li menuClose (click)="login()">
<ion-icon name="log-out"></ion-icon>{{'menu.Logout' | translate}} <ion-icon name="log-out"></ion-icon>Logout
</li> </li>
</ul> </ul>
</div> </div>
...@@ -97,16 +97,16 @@ ...@@ -97,16 +97,16 @@
</div> </div>
<ul> <ul>
<li menuClose (click)="home()"> <li menuClose (click)="home()">
<ion-icon name="home"></ion-icon>{{'menu.Home' | translate}} <ion-icon name="home"></ion-icon>Home
</li> </li>
<li menuClose (click)="signin()"> <li menuClose (click)="signin()">
<ion-icon name="md-log-in"></ion-icon>{{'menu.Sign In' | translate}} <ion-icon name="md-log-in"></ion-icon>Sign In
</li> </li>
<li menuClose (click)="signup()"> <li menuClose (click)="signup()">
<ion-icon name="md-log-out"></ion-icon>{{'menu.Sign up' | translate}} <ion-icon name="md-log-out"></ion-icon>Sign up
</li> </li>
<li menuClose (click)="forgot()"> <li menuClose (click)="forgot()">
<ion-icon name="md-help"></ion-icon>{{'menu.Forgot Password' | translate}} <ion-icon name="md-help"></ion-icon>Forgot Password
</li> </li>
</ul> </ul>
</div> </div>
......
src/app/app.module.ts
...@@ -40,6 +40,7 @@ import { SocialSharing } from '@ionic-native/social-sharing'; ...@@ -40,6 +40,7 @@ import { SocialSharing } from '@ionic-native/social-sharing';
import { DatePicker } from '@ionic-native/date-picker'; import { DatePicker } from '@ionic-native/date-picker';
import { TruebusMyApp } from './truebusapp.component'; import { TruebusMyApp } from './truebusapp.component';
export function HttpLoaderFactory(http: Http) { export function HttpLoaderFactory(http: Http) {
return new TranslateHttpLoader(http, './assets/i18n/', '.json'); return new TranslateHttpLoader(http, './assets/i18n/', '.json');
} }
...@@ -100,6 +101,7 @@ export const firebaseConfig = { ...@@ -100,6 +101,7 @@ export const firebaseConfig = {
Toast, Toast,
DatePicker, DatePicker,
GooglePlus, GooglePlus,
Storage,
{provide: ErrorHandler, useClass: IonicErrorHandler} {provide: ErrorHandler, useClass: IonicErrorHandler}
] ]
}) })
......
src/app/truebusapp.component.ts
...@@ -38,6 +38,7 @@ export class TruebusMyApp { ...@@ -38,6 +38,7 @@ export class TruebusMyApp {
private translate: TranslateService, private translate: TranslateService,
public oneSignal: OneSignal public oneSignal: OneSignal
) { ) {
console.log('truebuss');
this.initializeApp(); this.initializeApp();
this.translate.setDefaultLang('ar'); this.translate.setDefaultLang('ar');
this.translate.use('ar'); this.translate.use('ar');
......
src/pages/editid/editid.html
...@@ -6,41 +6,25 @@ ...@@ -6,41 +6,25 @@
<button ion-button class="jr_right jr_header_btn"></button> <button ion-button class="jr_right jr_header_btn"></button>
<div class="jr_clear"></div> <div class="jr_clear"></div>
</ion-header> </ion-header>
<ion-content> <ion-content>
<div class="jr_profile_wrapper"> <div class="jr_profile_wrapper">
<div class="jr_profile_banner"> <div class="jr_profile_banner">
<img src="assets/img/jr_chooseid.png" class="jr_chooseid"> <img src="assets/img/jr_chooseid.png" class="jr_chooseid">
</div> </div>
<div class="jr_profile_content"> <div class="jr_profile_content">
<div class="jr_text_center"> <div class="jr_text_center">
<div class="jr_edit_row jr_text_center"> <div class="jr_edit_row jr_text_center">
<h4 class="jr_padding0 jr_margin0"> {{language_value.choose_type}}</h4> <h4 class="jr_padding0 jr_margin0"> {{language_value.choose_type}}</h4>
<h3 class="jr_margintop0">{{language_value.govt_id}}</h3> <h3 class="jr_margintop0">{{language_value.govt_id}}</h3>
<hr> <hr>
</div> </div>
<div class="jr_edit_row "> <div class="jr_edit_row ">
<div class="jr_proofs_list">
<div class="jr_proofs_list">
<li [class.verified]="passpot_status=='1'"><ion-radio ng-model="choice1" ng-value="'A'" class="jr_radio_id" (click)="passportidupload()" *ngIf="passpot_status==0 ||passpot_status==3" name="proof"></ion-radio><span *ngIf="passpot_status==1"></span><span *ngIf="passpot_status==2"></span><span *ngIf="passpot_status==3"></span><p>{{language_value.Passport}}</p><div class="jr_clear"></div></li> <li [class.verified]="passpot_status=='1'"><ion-radio ng-model="choice1" ng-value="'A'" class="jr_radio_id" (click)="passportidupload()" *ngIf="passpot_status==0 ||passpot_status==3" name="proof"></ion-radio><span *ngIf="passpot_status==1"></span><span *ngIf="passpot_status==2"></span><span *ngIf="passpot_status==3"></span><p>{{language_value.Passport}}</p><div class="jr_clear"></div></li>
<li [class.verified]="aadhar_status=='1'"><ion-radio ng-model="choice2" ng-value="'B'" class="jr_radio_id" (click)="idupload()" *ngIf="aadhar_status==0 ||aadhar_status==3" name="proof"></ion-radio><span *ngIf="aadhar_status==1"></span><span *ngIf="aadhar_status==2"></span><span *ngIf="aadhar_status==3"></span><p>{{language_value.aadhaar}}</p><div class="jr_clear"></div></li> <li [class.verified]="aadhar_status=='1'"><ion-radio ng-model="choice2" ng-value="'B'" class="jr_radio_id" (click)="idupload()" *ngIf="aadhar_status==0 ||aadhar_status==3" name="proof"></ion-radio><span *ngIf="aadhar_status==1"></span><span *ngIf="aadhar_status==2"></span><span *ngIf="aadhar_status==3"></span><p>{{language_value.aadhaar}}</p><div class="jr_clear"></div></li>
<li [class.verified]="pancard_status=='1'"><ion-radio ng-model="choice3" ng-value="'C'" class="jr_radio_id" (click)="panidupload()" *ngIf="pancard_status==0 ||pancard_status==3" name="proof"></ion-radio><span *ngIf="pancard_status==1"></span><span *ngIf="pancard_status==2"></span><span *ngIf="pancard_status==3"></span><p>{{language_value.pan}}</p><div class="jr_clear"></div></li> <li [class.verified]="pancard_status=='1'"><ion-radio ng-model="choice3" ng-value="'C'" class="jr_radio_id" (click)="panidupload()" *ngIf="pancard_status==0 ||pancard_status==3" name="proof"></ion-radio><span *ngIf="pancard_status==1"></span><span *ngIf="pancard_status==2"></span><span *ngIf="pancard_status==3"></span><p>{{language_value.pan}}</p><div class="jr_clear"></div></li>
</div> </div>
</div>
</div>
</div> </div>
<div class="jr_confidential"> <div class="jr_confidential">
<div class="jr_confidential_left"> <div class="jr_confidential_left">
...@@ -53,10 +37,9 @@ ...@@ -53,10 +37,9 @@
</div> </div>
</div> </div>
<hr> <hr>
<div class="jr_bottom_button_bay"> <div class="jr_bottom_button_bay">
<!-- <button ion-button class="jr_offer_ride2" (click)="idupload()">Continue</button> <!-- <button ion-button class="jr_offer_ride2" (click)="idupload()">Continue</button>
--> </div> --> </div>
</div> </div>
</ion-content>
</ion-content>
\ No newline at end of file
src/pages/error/error.html
<ion-content class="jr_transparent jr_text_center" *ngIf="app == 'joyride'"> <ion-content class="jr_transparent jr_text_center" *ngIf="app === 'joyride'">
<div class="jr_book_pop_up_wrapper"> <div class="jr_book_pop_up_wrapper">
<img src="assets/img/jr_error.png" style="width: 50px;margin-bottom: 10px;"> <img src="assets/img/jr_error.png" style="width: 50px;margin-bottom: 10px;">
<h3 class="jr_margintop0">Error !</h3> <h3 class="jr_margintop0">Error !</h3>
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
<!----------------- Error page in truebus(down) -------------------> <!----------------- Error page in truebus(down) ------------------->
<ion-header *ngIf="app=='truebus'"> <ion-header *ngIf="app==='truebus'">
<ion-navbar> <ion-navbar>
<ion-title>{{'others.ErrorPage' | translate}}</ion-title> <ion-title>ErrorPage</ion-title>
</ion-navbar> </ion-navbar>
</ion-header> </ion-header>
<ion-content padding> <ion-content padding>
......
src/pages/error/error.ts
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams,ViewController } from 'ionic-angular'; import { IonicPage, Events, NavController, NavParams,ViewController } from 'ionic-angular';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { Storage } from '@ionic/storage'; import { Storage } from '@ionic/storage';
...@@ -10,9 +10,9 @@ import { Storage } from '@ionic/storage'; ...@@ -10,9 +10,9 @@ import { Storage } from '@ionic/storage';
}) })
export class ErrorPage { export class ErrorPage {
app:string; app:string;
constructor(public navCtrl: NavController, public navParams: NavParams,public viewCtrl: ViewController, public storage: Storage, public translate: TranslateModule) { constructor(public navCtrl: NavController,public events: Events, public navParams: NavParams,public viewCtrl: ViewController, public storage: Storage, public translate: TranslateModule) {
this.app =''; this.app ='';
this.storage.get('app').then((data) => { events.subscribe('app', data => {
this.app = data; this.app = data;
}); });
} }
......
src/pages/filter/filter.ts
...@@ -45,7 +45,7 @@ export class Filter { ...@@ -45,7 +45,7 @@ export class Filter {
'pets':['0',], 'pets':['0',],
'price':['asc', ] 'price':['asc', ]
}); });
this.storage.get('app').then((data) => { events.subscribe('app', data => {
this.app = data; this.app = data;
}); });
if(this.app === 'truebus'){ if(this.app === 'truebus'){
...@@ -82,7 +82,7 @@ export class Filter { ...@@ -82,7 +82,7 @@ export class Filter {
} }
ionViewDidLoad() { ionViewDidLoad() {
this.storage.get('app').then((data) => { this.events.subscribe('app', data => {
this.app = data; this.app = data;
}); });
......
src/pages/home/home.html
<ion-header class="theme1 nav_header" *ngIf="app == 'joyride'"> <ion-header class="theme1 nav_header" *ngIf="app === 'joyride'">
<button menuToggle ion-button class="nav_btn jr_sidemenu_icon floatLeft"></button> <button menuToggle ion-button class="nav_btn jr_sidemenu_icon floatLeft"></button>
<div class="jr_header_title"> <div class="jr_header_title">
<h4 *ngIf="language_value" >{{language_value.pg_name}} </h4> <h4 *ngIf="language_value" >{{language_value.pg_name}} </h4>
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<!---------------------true bus home page html(down)-----------------------------> <!---------------------true bus home page html(down)----------------------------->
<ion-content padding class="background ar relative" *ngIf="app == 'truebus'"> <ion-content padding class="background ar relative" *ngIf="app === 'truebus'">
<button class="nav_btn floatLeft" menuToggle> <button class="nav_btn floatLeft" menuToggle>
<ion-icon name="menu"></ion-icon> <ion-icon name="menu"></ion-icon>
</button> </button>
...@@ -49,14 +49,14 @@ ...@@ -49,14 +49,14 @@
<ion-list> <ion-list>
<ion-item> <ion-item>
<ion-icon name="locate"></ion-icon> <ion-icon name="locate"></ion-icon>
<ion-input type="text" placeholder="{{'home.Boarding Point' | translate}}" [(ngModel)]="search_form.board_point" (keyup)='search_board($event.target.value)'></ion-input> <ion-input type="text" placeholder=".Boarding Point" [(ngModel)]="search_form.board_point" (keyup)='search_board($event.target.value)'></ion-input>
</ion-item> </ion-item>
<ul *ngIf="board_flag" class="suggestion_list"> <ul *ngIf="board_flag" class="suggestion_list">
<li *ngFor="let point of board_point_item" (click)="assign_board(point.board_point)">{{point.board_point}}</li> <li *ngFor="let point of board_point_item" (click)="assign_board(point.board_point)">{{point.board_point}}</li>
</ul> </ul>
<ion-item class="borderNone"> <ion-item class="borderNone">
<ion-icon name="pin"></ion-icon> <ion-icon name="pin"></ion-icon>
<ion-input type="text" placeholder="{{'home.Destination Point' | translate}}" [(ngModel)]="search_form.drop_point" (keyup)='search_drop($event.target.value)'></ion-input> <ion-input type="text" placeholder="Destination Point" [(ngModel)]="search_form.drop_point" (keyup)='search_drop($event.target.value)'></ion-input>
</ion-item> </ion-item>
<ul *ngIf="drop_flag" class="suggestion_list"> <ul *ngIf="drop_flag" class="suggestion_list">
<li *ngFor="let point of drop_point_item" (click)="assign_drop(point.drop_point)">{{point.drop_point}}</li> <li *ngFor="let point of drop_point_item" (click)="assign_drop(point.drop_point)">{{point.drop_point}}</li>
...@@ -67,13 +67,13 @@ ...@@ -67,13 +67,13 @@
<ion-list> <ion-list>
<ion-item class="borderNone"> <ion-item class="borderNone">
<ion-icon name="calendar"></ion-icon> <ion-icon name="calendar"></ion-icon>
<ion-datetime displayFormat="DD-MM-YYYY" placeholder="{{'home.Date of Travel' | translate}}" [(ngModel)]="search_form.myDate" [min]="search_form.myDate"></ion-datetime> <ion-datetime displayFormat="DD-MM-YYYY" placeholder="Date of Travel" [(ngModel)]="search_form.myDate" [min]="search_form.myDate"></ion-datetime>
</ion-item> </ion-item>
</ion-list> </ion-list>
</ion-card> </ion-card>
<div class="textCenter"> <div class="textCenter">
<button ion-button class="login_btn" [disabled]="check_validate()" (click)="search_bus()"> <button ion-button class="login_btn" [disabled]="check_validate()" (click)="search_bus()">
{{'home.Search Bus' | translate}} Search Bus
</button> </button>
</div> </div>
</ion-content> </ion-content>
\ No newline at end of file
src/pages/home/home.ts
...@@ -39,8 +39,14 @@ export class Home { ...@@ -39,8 +39,14 @@ export class Home {
constructor(public navCtrl: NavController,public navParams: NavParams,private translate: TranslateService,public events: Events,public modalCtrl: ModalController,public myservice:Myservice, public storage: Storage,public popoverCtrl: PopoverController,private platform: Platform, private geolocation: Geolocation) { constructor(public navCtrl: NavController,public navParams: NavParams,private translate: TranslateService,public events: Events,public modalCtrl: ModalController,public myservice:Myservice, public storage: Storage,public popoverCtrl: PopoverController,private platform: Platform, private geolocation: Geolocation) {
this.app =''; this.app ='';
this.storage.get('app').then((data) => { events.subscribe('app', data => {
this.app = data; console.log(data);
if( data === 'truebus'){
this.app = 'truebus';
} else if ( data === 'joyride' ) {
this.app = 'joyride';
}
}); });
this.storage.get('userdata').then((userdata) => { this.storage.get('userdata').then((userdata) => {
this.userdata=userdata; this.userdata=userdata;
...@@ -66,14 +72,18 @@ export class Home { ...@@ -66,14 +72,18 @@ export class Home {
ionViewDidLoad() { ionViewDidLoad() {
this.app =''; this.app ='';
this.events.subscribe('app', data => {
this.app = data;
})
this.storage.get('app').then((data) => { this.storage.get('app').then((data) => {
this.app = data; this.app = data;
}); });
console.log(this.app)
if(this.app === 'joyride'){ if(this.app === 'joyride'){
this.tab = "active"; this.tab = "active";
}else{ }else{
console.log('ionViewDidLoad HomePage'); console.log('ionViewDidLoad HomePage');
this.langTrans(); // this.langTrans();
} }
} }
// get_crnt_location(){ // get_crnt_location(){
......
src/pages/landing/landing.html
<ion-content class="jr_landing_bg" *ngIf="app == 'joyride'"> <ion-content class="jr_landing_bg" >
<ion-slides pager="true" #mySlider (ionSlideDidChange)="slideChanged()"> <ion-slides pager="true" #mySlider (ionSlideDidChange)="slideChanged()">
<ion-slide class="jr_slide jr_landing_overlay"> <ion-slide class="jr_slide jr_landing_overlay">
<div (click)="truebuspage()">Truebus</div>
<div (click)="joyridepage()">Joyride</div>
</ion-slide>
<ion-slide class="jr_slide jr_landing_overlay">
<div class="jr_slider_inner"> <div class="jr_slider_inner">
<h4>Welcome to</h4> <h4>Welcome to</h4>
<h3><strong>Smart Connect</strong></h3> <h3><strong>Smart Connect</strong></h3>
...@@ -65,11 +69,11 @@ ...@@ -65,11 +69,11 @@
</ion-content> </ion-content>
<!---------------------------------landing page html truebus(down)------------------> <!---------------------------------landing page html truebus(down)------------------>
<!--
<ion-header *ngIf="app == 'truebus'"> <ion-header *ngIf="app == 'truebus'">
<ion-navbar> <ion-navbar>
<ion-title>landing</ion-title> <ion-title>landing</ion-title>
</ion-navbar> </ion-navbar>
</ion-header> </ion-header>
<ion-content padding></ion-content> <ion-content padding *ngIf="app == 'truebus'">
</ion-content> -->
\ No newline at end of file
src/pages/landing/landing.ts
import { Component,ViewChild } from '@angular/core'; import { Component,ViewChild } from '@angular/core';
import { IonicPage,Nav,NavController,ModalController,Slides,NavParams} from 'ionic-angular'; import { IonicPage,Nav,NavController,ModalController,Slides,NavParams} from 'ionic-angular';
import { Storage } from '@ionic/storage'; import { Storage } from '@ionic/storage';
import { Events } from 'ionic-angular';
import { SubjectService } from '../../providers/subject.service';
@IonicPage() @IonicPage()
@Component({ @Component({
...@@ -15,10 +17,17 @@ export class Landing { ...@@ -15,10 +17,17 @@ export class Landing {
msg_push:any; msg_push:any;
app:string; app:string;
msgpushdata:any; msgpushdata:any;
constructor(public navCtrl: NavController,public nav: Nav,public modalCtrl: ModalController,public storage: Storage,public navParams: NavParams) { constructor(public navCtrl: NavController,
// public subjectService: SubjectService,
public nav: Nav,
public modalCtrl: ModalController,
public storage: Storage,
public navParams: NavParams,
public events: Events) {
this.app=''; this.app='';
this.storage.get('app').then((data) => { this.storage.get('app').then((data) => {
this.app = data; this.app = data;
console.log(this.app);
}); });
if(this.app === 'joyride'){ if(this.app === 'joyride'){
this.currentIndex = 0; this.currentIndex = 0;
...@@ -34,7 +43,6 @@ export class Landing { ...@@ -34,7 +43,6 @@ export class Landing {
this.nav.setRoot('Home'); this.nav.setRoot('Home');
} }
}) })
} }
},1000) },1000)
console.log(this.currentIndex); console.log(this.currentIndex);
...@@ -59,11 +67,27 @@ export class Landing { ...@@ -59,11 +67,27 @@ export class Landing {
console.log(this.currentIndex); console.log(this.currentIndex);
} }
truebuspage(){
this.events.publish('app', 'truebus', Date.now());
this.storage.set('app', 'truebus');
this.nav.setRoot('Home');
}
joyridepage(){
console.log('joyride enter');
this.events.publish('app', 'joyride', Date.now());
this.storage.set('app', 'joyride');
this.slider.slideNext();
this.slider.getActiveIndex();
}
home() { home() {
this.navCtrl.push('Home'); this.navCtrl.push('Home');
} }
login() { login() {
console.log('login')
this.navCtrl.push('Login'); this.navCtrl.push('Login');
} }
......
src/pages/login/login.html
<ion-content class="jr_login_bg" *ngIf="apps == 'joyride'"> <ion-content class="jr_login_bg" *ngIf="apps === 'joyride'">
<div class="jr_profile_content"> <div class="jr_profile_content">
<div class="jr_login_wrapper"> <div class="jr_login_wrapper">
<div class="jr_logo"> <div class="jr_logo">
...@@ -30,35 +30,35 @@ ...@@ -30,35 +30,35 @@
<!-----------------------------------truebus login Html page(down) -------------------------------------------------> <!-----------------------------------truebus login Html page(down) ------------------------------------------------->
<ion-content class="background" padding *ngIf="apps == 'truebus'"> <ion-content class="background" padding *ngIf="apps === 'truebus'">
<h5>Login to your<br> myBus account</h5> <h5>Login to your<br> myBus account</h5>
<ion-card> <ion-card>
<form [formGroup]="loginForm"> <form [formGroup]="loginForm">
<ion-list> <ion-list>
<ion-item> <ion-item>
<ion-input formControlName="phone_no" type="number" placeholder="{{'login.Mobile Number' | translate}}"></ion-input> <ion-input formControlName="phone_no" type="number" placeholder="Mobile Number"></ion-input>
</ion-item> </ion-item>
<div class="alert error" *ngIf="loginForm.controls.phone_no.invalid && (loginForm.get('phone_no').dirty || loginForm.get('phone_no').touched)"> <div class="alert error" *ngIf="loginForm.controls.phone_no.invalid && (loginForm.get('phone_no').dirty || loginForm.get('phone_no').touched)">
{{'login.Invalid phone number' | translate}} Invalid phone number
</div> </div>
<div class="clear"></div> <div class="clear"></div>
<ion-item class="borderNone"> <ion-item class="borderNone">
<ion-input formControlName="password" type="password" placeholder="{{'login.Password' | translate}}"></ion-input> <ion-input formControlName="password" type="password" placeholder="Password"></ion-input>
</ion-item> </ion-item>
<div class="alert error" *ngIf="loginForm.controls.password.invalid && (loginForm.get('password').dirty || loginForm.get('password').touched)"> <div class="alert error" *ngIf="loginForm.controls.password.invalid && (loginForm.get('password').dirty || loginForm.get('password').touched)">
{{'login.Minimum 6 characters required' | translate}} Minimum 6 characters required
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</ion-list> </ion-list>
</form> </form>
</ion-card> </ion-card>
<div class="textCenter"> <div class="textCenter">
<button ion-button class="login_btn" (click)="login_user()" [disabled]="loginForm.invalid">{{'login.Login' | translate}}</button> <button ion-button class="login_btn" (click)="login_user()" [disabled]="loginForm.invalid">Login</button>
</div> </div>
<div class="textCenter"> <div class="textCenter">
<button ion-button class="social_btn fb_icon"><ion-icon name="logo-facebook" (click)="fb_login()"></ion-icon></button> <button ion-button class="social_btn fb_icon"><ion-icon name="logo-facebook" (click)="fb_login()"></ion-icon></button>
<button ion-button class="social_btn google_icon"><ion-icon name="logo-google" (click)="google_login()"></ion-icon></button> <button ion-button class="social_btn google_icon"><ion-icon name="logo-google" (click)="google_login()"></ion-icon></button>
</div> </div>
<p (click)="signup()">{{'login.Add a new account' | translate}}</p> <p (click)="signup()">Add a new account</p>
<p (click)="forgot()">{{'login.Forgot Password ?' | translate}}</p> <p (click)="forgot()">Forgot Password ?</p>
</ion-content> </ion-content>
\ No newline at end of file
src/pages/login/login.ts
...@@ -46,10 +46,14 @@ export class Login { ...@@ -46,10 +46,14 @@ export class Login {
var This=this; var This=this;
this.apps =''; this.apps ='';
this.storage.get('app').then(data => { events.subscribe('app', data => {
this.apps = data; this.apps = data;
}); });
console.log(this.apps);
this.storage.get('app').then((data) => {
this.apps = data;
})
console.log(this.apps);
if(this.apps === 'truebus'){ if(this.apps === 'truebus'){
this.loginForm = this.formBuilder.group({ this.loginForm = this.formBuilder.group({
phone_no: ['', Validators.compose([Validators.required, this.myservice.checkLimit(10000000, 999999999999999)])], phone_no: ['', Validators.compose([Validators.required, this.myservice.checkLimit(10000000, 999999999999999)])],
...@@ -82,9 +86,10 @@ export class Login { ...@@ -82,9 +86,10 @@ export class Login {
} }
ionViewDidLoad() { ionViewDidLoad() {
this.storage.get('app').then(data => { this.events.subscribe('app', data => {
this.apps = data; this.apps = data;
}); });
console.log(this.apps);
if(this.apps === 'truebus'){ if(this.apps === 'truebus'){
this.storage.get('get_deviceId').then(data => { this.storage.get('get_deviceId').then(data => {
console.log(data); console.log(data);
......
src/pages/notification/notification.ts
...@@ -21,7 +21,7 @@ export class Notification { ...@@ -21,7 +21,7 @@ export class Notification {
userdata: any; userdata: any;
constructor(public navCtrl: NavController,public navParams: NavParams,public events: Events,private myservice: Myservice, public storage: Storage,public translate: TranslateService, public viewCtrl: ViewController,private toastCtrl: ToastController) { constructor(public navCtrl: NavController,public navParams: NavParams,public events: Events,private myservice: Myservice, public storage: Storage,public translate: TranslateService, public viewCtrl: ViewController,private toastCtrl: ToastController) {
this.app = ''; this.app = '';
this.storage.get('app').then((data) => { events.subscribe('app', data => {
this.app = data; this.app = data;
}); });
......
src/pages/signup/signup.html
<ion-content class="jr_login_bg" *ngIf= "app == 'joyride'"> <ion-content class="jr_login_bg" *ngIf= "appdata == 'joyride'">
<div class="jr_profile_content" *ngIf="language_value" > <div class="jr_profile_content" *ngIf="language_value" >
<div class="jr_login_detail"> <div class="jr_login_detail">
<h5>{{language_value.ur}}</h5> <h5>{{language_value.ur}}</h5>
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<!------------------------------Truebus signup html page (down)----------------------------------> <!------------------------------Truebus signup html page (down)---------------------------------->
<ion-content class="background" padding *ngIf="app == 'truebus'"> <ion-content class="background" padding *ngIf="appdata == 'truebus'">
<h5>Signup<br>to booking your ride</h5> <h5>Signup<br>to booking your ride</h5>
<ion-card> <ion-card>
<ion-list> <ion-list>
......
src/pages/signup/signup.ts
...@@ -34,6 +34,7 @@ export class Signup { ...@@ -34,6 +34,7 @@ export class Signup {
pop_cls:any; pop_cls:any;
phonedata:any; phonedata:any;
app:string; app:string;
appdata:string;
public base64Image : string; public base64Image : string;
//language translation declarations //language translation declarations
language_value:any; language_value:any;
...@@ -45,11 +46,14 @@ export class Signup { ...@@ -45,11 +46,14 @@ export class Signup {
private toastCtrl: ToastController,public navParams: NavParams,private platform: Platform, private geolocation: Geolocation,public actionSheetCtrl: ActionSheetController,private camera: Camera,private googlePlus: GooglePlus, private toastCtrl: ToastController,public navParams: NavParams,private platform: Platform, private geolocation: Geolocation,public actionSheetCtrl: ActionSheetController,private camera: Camera,private googlePlus: GooglePlus,
private fb: Facebook, public translate: TranslateModule, private events: Events) { private fb: Facebook, public translate: TranslateModule, private events: Events) {
this.app =''; this.appdata ='';
this.storage.get('app').then(data => { events.subscribe('app', data => {
this.app = data; this.appdata = data;
}); });
if(this.app == 'truebus'){ this.storage.get('app').then((data) => {
this.appdata = data;
})
if(this.appdata == 'truebus'){
this.signupForm = this.formBuilder.group({ this.signupForm = this.formBuilder.group({
phone_no: ['', Validators.compose([Validators.required, this.myservice.checkLimit(10000000, 999999999999999)])], phone_no: ['', Validators.compose([Validators.required, this.myservice.checkLimit(10000000, 999999999999999)])],
email_id: ['', Validators.compose([Validators.required, Validators.pattern("[a-zA-Z0-9.-_]{1,}@[a-zA-Z.-]{2,}[.]{1}[a-zA-Z]{2,}")])], email_id: ['', Validators.compose([Validators.required, Validators.pattern("[a-zA-Z0-9.-_]{1,}@[a-zA-Z.-]{2,}[.]{1}[a-zA-Z]{2,}")])],
...@@ -131,7 +135,7 @@ export class Signup { ...@@ -131,7 +135,7 @@ export class Signup {
this.app = data; this.app = data;
}); });
if(this.app == 'joyride'){ if(this.appdata == 'joyride'){
console.log('ionViewDidLoad SignupPage'); console.log('ionViewDidLoad SignupPage');
//alert("hi"); //alert("hi");
this.http.get('Country_List.json') this.http.get('Country_List.json')
......
src/providers/myservice.ts
...@@ -3,28 +3,14 @@ import { Http,RequestOptions ,Headers} from '@angular/http'; ...@@ -3,28 +3,14 @@ import { Http,RequestOptions ,Headers} from '@angular/http';
import { Observable } from 'rxjs/Rx'; import { Observable } from 'rxjs/Rx';
import 'rxjs/add/operator/map'; import 'rxjs/add/operator/map';
import { AbstractControl, ValidatorFn } from '@angular/forms' import { AbstractControl, ValidatorFn } from '@angular/forms'
import { Storage } from '@ionic/storage';
import { LoadingController, AlertController, Events ,ToastController } from 'ionic-angular'; import { LoadingController, AlertController, Events ,ToastController } from 'ionic-angular';
//import {Transfer} from '@ionic-native/transfer'; //import {Transfer} from '@ionic-native/transfer';
@Injectable() @Injectable()
export class Myservice { export class Myservice {
// webservice_url = 'http://techlabz.in/client/smartconnect/Webservices/';
// webservice_url = 'http://18.221.23.228/backend/Webservices/';
// webservice_url = 'http://192.168.140.41/tukkibi/Webservices/';
//webservice_url = 'http://192.168.140.24/mywork/enoch/Webservices/';
webservice_url = 'http://techlabz.in/client/smartconnect/Webservices/';
loader : any; loader : any;
alert : any; alert : any;
...@@ -32,10 +18,32 @@ export class Myservice { ...@@ -32,10 +18,32 @@ export class Myservice {
data : any; data : any;
result:any; result:any;
get_url:any; get_url:any;
webservice_url:any;
constructor(public http: Http, public loadingCtrl: LoadingController, private toastCtrl: ToastController, public alertCtrl: AlertController, public events: Events ) { constructor(public http: Http,public storage:Storage, public loadingCtrl: LoadingController, private toastCtrl: ToastController, public alertCtrl: AlertController, public events: Events ) {
console.log('constructor');
this.webservice_url = 'http://techlabz.in/client/enoch/truebus/index.php/';
events.subscribe('app', (appType, time) => {
// user and time are the same arguments passed in `events.publish(user, time)`
console.log('Welcome', appType, 'at', time);
if(appType === 'truebus'){
console.log('true')
this.webservice_url = 'http://techlabz.in/client/enoch/truebus/index.php/';
return this.webservice_url;
} else {
console.log('false')
this.webservice_url = 'http://techlabz.in/client/enoch/joyride/Webservices/';
return this.webservice_url;
}
});
//const fileTransfer: TransferObject = this.transfer.create(); //const fileTransfer: TransferObject = this.transfer.create();
} }
show_toast(message){//show toast message show_toast(message){//show toast message
let toast = this.toastCtrl.create({ let toast = this.toastCtrl.create({
message: message, message: message,
...@@ -67,23 +75,23 @@ export class Myservice { ...@@ -67,23 +75,23 @@ export class Myservice {
} }
load_post(post_data, fn_name) { load_post(post_data, fn_name) {
post_data = JSON.stringify(post_data);
this.post_url = this.webservice_url + fn_name;
console.log(this.post_url);
let headers = new Headers();
headers.append('X_API_KEY','key_test');
let options = new RequestOptions({ headers });
return this.http.post(`${this.post_url}`, `${post_data}`, options).map(res => res.json());
post_data = JSON.stringify(post_data);
this.post_url = this.webservice_url + fn_name;
let headers = new Headers();
headers.append('X_API_KEY','key_test');
let options = new RequestOptions({ headers });
return this.http.post(`${this.post_url}`, `${post_data}`, options) .map(res => res.json());
// return this.http.post(`${this.post_url}`, `${post_data}`,options) // return this.http.post(`${this.post_url}`, `${post_data}`,options)
// .map(res => res.json()); // .map(res => res.json());
} }
load_get( fn_name) { load_get( fn_name) {
this.get_url = this.webservice_url + fn_name; this.get_url = this.webservice_url + fn_name;
console.log(this.get_url);
let headers = new Headers(); let headers = new Headers();
headers.append('X_API_KEY', 'key_test'); headers.append('X_API_KEY', 'key_test');
let options = new RequestOptions({ headers }); let options = new RequestOptions({ headers });
...@@ -144,7 +152,8 @@ export class Myservice { ...@@ -144,7 +152,8 @@ export class Myservice {
toast.present(); toast.present();
} }
web_post(url,data){ web_post(url,data){
console.log(this.webservice_url);
return this.http.post(this.webservice_url+url, JSON.stringify(data)).map(res=>res.json()); return this.http.post(this.webservice_url+url, JSON.stringify(data)).map(res=>res.json());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment