Merge branch 'arjunlatest' into 'master'
Arjunlatest
See merge request !73
Showing
| ... | @@ -39,18 +39,19 @@ | ... | @@ -39,18 +39,19 @@ |
| "cordova-android": "8.0.0", | "cordova-android": "8.0.0", | ||
| "cordova-plugin-device": "^2.0.3", | "cordova-plugin-device": "^2.0.3", | ||
| "cordova-plugin-geolocation": "^4.0.2", | "cordova-plugin-geolocation": "^4.0.2", | ||
| "cordova-plugin-googleplus": "^8.2.1", | "cordova-plugin-googleplus": "^8.4.0", | ||
| "cordova-plugin-ionic-keyboard": "^2.2.0", | "cordova-plugin-ionic-keyboard": "^2.2.0", | ||
| "cordova-plugin-ionic-webview": "^4.1.3", | "cordova-plugin-ionic-webview": "^4.1.3", | ||
| "cordova-plugin-nativegeocoder": "^3.2.2", | "cordova-plugin-nativegeocoder": "^3.2.2", | ||
| "cordova-plugin-splashscreen": "^5.0.3", | "cordova-plugin-splashscreen": "^5.0.3", | ||
| "cordova-plugin-statusbar": "^2.4.3", | "cordova-plugin-statusbar": "^2.4.3", | ||
| "cordova-plugin-whitelist": "^1.3.4", | "cordova-plugin-whitelist": "^1.3.4", | ||
| "cordova-plugin-x-socialsharing": "^5.6.3", | "cordova-plugin-x-socialsharing": "^5.6.4", | ||
| "cordova-sqlite-storage": "^3.4.1", | "cordova-sqlite-storage": "^3.4.1", | ||
| "core-js": "^2.6.11", | "core-js": "^2.6.11", | ||
| "es6-promise-plugin": "^4.2.2", | "es6-promise-plugin": "^4.2.2", | ||
| "firebase": "^6.6.2", | "firebase": "^6.6.2", | ||
| "mx.ferreyra.callnumber": "0.0.2", | |||
| "rxjs": "^6.5.4", | "rxjs": "^6.5.4", | ||
| "rxjs-compat": "^6.5.4", | "rxjs-compat": "^6.5.4", | ||
| "tslib": "^1.9.0", | "tslib": "^1.9.0", | ||
| ... | @@ -105,7 +106,8 @@ | ... | @@ -105,7 +106,8 @@ |
| "cordova-plugin-x-socialsharing": { | "cordova-plugin-x-socialsharing": { | ||
| "ANDROID_SUPPORT_V4_VERSION": "24.1.1+" | "ANDROID_SUPPORT_V4_VERSION": "24.1.1+" | ||
| }, | }, | ||
| "mx.ferreyra.callnumber": {} | "mx.ferreyra.callnumber": {}, | ||
| "call-number": {} | |||
| }, | }, | ||
| "platforms": [ | "platforms": [ | ||
| "android" | "android" | ||
| ... | ... |
| <div class="nav_header"> | <div class="nav_header"> | ||
| <ion-menu-toggle> | <ion-menu-toggle> | ||
| <button class="nav_btn nav_menu floatLeft"></button> | <button class="nav_btn nav_menu floatLeft"></button> | ||
| </ion-menu-toggle> | </ion-menu-toggle> | ||
| <div class="nav_title floatLeft"> | <div class="nav_title floatLeft"> | ||
| <img src="../../assets/Group [email protected]" /> | <img src="../../assets/Group [email protected]" /> | ||
| </div> | </div> | ||
| <div class="clear"></div> | <div class="clear"></div> | ||
| </div> | </div> | ||
| <ion-content> | <ion-content> | ||
| <div class="profile_wrapper" *ngIf="loggedUser"> | <div class="profile_wrapper" *ngIf="loggedUser"> | ||
| <div class="profile_banner"> | <div class="profile_banner"> | ||
| <!-- <div class="profile_circle"> | <!-- <div class="profile_circle"> | ||
| <div class="edit"></div> | <div class="edit"></div> | ||
| </div> --> | </div> --> | ||
| <div class="profile_circle"> | <div class="profile_circle"> | ||
| <img | <img [src]="loggedUser.profilePhoto" onerror="this.src='./../assets/asset_avatar.png'" /> | ||
| [src]="loggedUser.profilePhoto" | <div class="edit"></div> | ||
| onerror="this.src='./../assets/asset_avatar.png'" | <input type="file" accept="image/*" (change)="fileChange($event)" /> | ||
| /> | </div> | ||
| <div class="edit"></div> | |||
| <input type="file" accept="image/*" (change)="fileChange($event)" /> | |||
| </div> | |||
| <h5>{{loggedUser.name}}</h5> | <h5>{{loggedUser.name}}</h5> | ||
| <p (click)="istoggle()">LOGOUT</p> | <p (click)="istoggle()">LOGOUT</p> | ||
| </div> | </div> | ||
| <div class="account_wrapper"> | <div class="account_wrapper"> | ||
| <div class="account_header"> | <div class="account_header"> | ||
| <h5 class="floatLeft">ACCOUNT INFORMATION</h5> | <h5 class="floatLeft">ACCOUNT INFORMATION</h5> | ||
| <span | <span class="floatRight" (click)="goToPage('changedetails', user && user)"><img | ||
| class="floatRight" | src="../../assets/edit.png" /></span> | ||
| (click)="goToPage('changedetails', user && user)" | <div class="clear"></div> | ||
| ><img src="../../assets/edit.png" | </div> | ||
| /></span> | <div class="row"> | ||
| <div class="clear"></div> | <ion-row> | ||
| </div> | <ion-col class="textLeft p0"> | ||
| <div class="row"> | <p> | ||
| <ion-row> | Phone | ||
| <ion-col class="textLeft p0"> | </p> | ||
| <p> | </ion-col> | ||
| Phone | <ion-col class="textRight p0"> | ||
| </p> | <h6>{{loggedUser.phone}}</h6> | ||
| </ion-col> | <span class="ar-span" *ngIf="loggedUser.phoneVerified == true">Verified</span> | ||
| <ion-col class="textRight p0"> | <span class="ar-span" *ngIf="loggedUser.phoneVerified == false" (click)="goToPage('verficationnumber')">Not | ||
| <h6>{{loggedUser.phone}}</h6> | Verified yet</span> | ||
| <span class="ar-span" *ngIf="loggedUser.phoneVerified == true" | </ion-col> | ||
| >Verified</span | </ion-row> | ||
| > | </div> | ||
| <span class="ar-span" *ngIf="loggedUser.phoneVerified == false" | <div class="row"> | ||
| >Not Verified yet</span | <ion-row> | ||
| > | <ion-col class="textLeft p0"> | ||
| </ion-col> | <p> | ||
| </ion-row> | |||
| </div> | </p> | ||
| <div class="row"> | </ion-col> | ||
| <ion-row> | <ion-col class="textRight p0"> | ||
| <ion-col class="textLeft p0"> | <h6>{{loggedUser.emailId}}</h6> | ||
| <p> | <span class="ar-span" *ngIf="loggedUser.emailVerified == true">Verified</span> | ||
| <span class="ar-span" *ngIf="loggedUser.emailVerified == false">Not Verified yet</span> | |||
| </p> | </ion-col> | ||
| </ion-col> | </ion-row> | ||
| <ion-col class="textRight p0"> | </div> | ||
| <h6>{{loggedUser.emailId}}</h6> | <hr /> | ||
| <span class="ar-span" *ngIf="loggedUser.emailVerified == true" | <ion-row (click)="goToPage('wishlist')"> | ||
| >Verified</span | <ion-col class="textLeft p0"> | ||
| > | <p>Wishlist</p> | ||
| <span class="ar-span" *ngIf="loggedUser.emailVerified == false" | </ion-col> | ||
| >Not Verified yet</span | <ion-col class="textRight p0"> | ||
| > | <h6 *ngIf="wishService.whishItem"> | ||
| </ion-col> | ({{wishService.whishItem.length}}) | ||
| </ion-row> | </h6> | ||
| </div> | </ion-col> | ||
| <hr /> | </ion-row> | ||
| <ion-row (click)="goToPage('wishlist')"> | <hr /> | ||
| <ion-col class="textLeft p0"> | <ion-row (click)="goToPage('address')"> | ||
| <p>Wishlist</p> | <ion-col class="textLeft p0"> | ||
| </ion-col> | <p>Address</p> | ||
| <ion-col class="textRight p0"> | </ion-col> | ||
| <h6 *ngIf="wishService.whishItem"> | <ion-col class="textRight p0"> | ||
| ({{wishService.whishItem.length}}) | <h6 *ngIf="addressService.addList"> | ||
| </h6> | ({{addressService.addressList.length}}) | ||
| </ion-col> | </h6> | ||
| </ion-row> | </ion-col> | ||
| <hr /> | </ion-row> | ||
| <ion-row (click)="goToPage('address')"> | <hr /> | ||
| <ion-col class="textLeft p0"> | <!-- <ion-row> | ||
| <p>Address</p> | |||
| </ion-col> | |||
| <ion-col class="textRight p0"> | |||
| <h6 *ngIf="addressService.addList"> | |||
| ({{addressService.addressList.length}}) | |||
| </h6> | |||
| </ion-col> | |||
| </ion-row> | |||
| <hr /> | |||
| <!-- <ion-row> | |||
| <ion-col class="textLeft p0"> | <ion-col class="textLeft p0"> | ||
| <p>My Cards</p> | <p>My Cards</p> | ||
| </ion-col> | </ion-col> | ||
| ... | @@ -107,63 +94,60 @@ | ... | @@ -107,63 +94,60 @@ |
| </ion-col> | </ion-col> | ||
| </ion-row> | </ion-row> | ||
| <hr /> --> | <hr /> --> | ||
| <ion-row (click)="goToPage('myorder')"> | <ion-row (click)="goToPage('myorder')"> | ||
| <ion-col class="textLeft p0"> | <ion-col class="textLeft p0"> | ||
| <p>My Order</p> | <p>My Order</p> | ||
| </ion-col> | </ion-col> | ||
| <ion-col class="textRight p0"> | <ion-col class="textRight p0"> | ||
| <h6> | <h6> | ||
| <ion-icon name="arrow-forward"></ion-icon> | <ion-icon name="arrow-forward"></ion-icon> | ||
| </h6> | </h6> | ||
| </ion-col> | </ion-col> | ||
| </ion-row> | </ion-row> | ||
| <hr /> | <hr /> | ||
| <ion-row (click)="goToPage('preference')"> | <ion-row (click)="goToPage('preference')"> | ||
| <ion-col class="textLeft p0"> | <ion-col class="textLeft p0"> | ||
| <p>Preferences</p> | <p>Preferences</p> | ||
| </ion-col> | </ion-col> | ||
| <ion-col class="textRight p0"> | <ion-col class="textRight p0"> | ||
| <h6> | <h6> | ||
| <ion-icon name="arrow-forward"></ion-icon> | <ion-icon name="arrow-forward"></ion-icon> | ||
| </h6> | </h6> | ||
| </ion-col> | </ion-col> | ||
| </ion-row> | </ion-row> | ||
| <hr /> | <hr /> | ||
| <ion-row> | <ion-row> | ||
| <ion-col class="textLeft p0"> | <ion-col class="textLeft p0"> | ||
| <p>Currency</p> | <p>Currency</p> | ||
| </ion-col> | </ion-col> | ||
| <ion-col class="textRight p0"> | <ion-col class="textRight p0"> | ||
| <h6> | <h6> | ||
| <span>AUD</span> | <span>AUD</span> | ||
| </h6> | </h6> | ||
| </ion-col> | </ion-col> | ||
| </ion-row> | </ion-row> | ||
| </div> | </div> | ||
| <div class="logout-pop-wrapper" *ngIf="isShow" [@slideInOut]> | <div class="logout-pop-wrapper" *ngIf="isShow" [@slideInOut]> | ||
| <div class="logout_inner"> | <div class="logout_inner"> | ||
| <h4>Logout</h4> | <h4>Logout</h4> | ||
| <p>Are you sure to Logout ?</p> | <p>Are you sure to Logout ?</p> | ||
| <div class="logout_footer"> | <div class="logout_footer"> | ||
| <button class="btn-cancel floatLeft" (click)="istoggle();"> | <button class="btn-cancel floatLeft" (click)="istoggle();"> | ||
| Cancel | Cancel | ||
| </button> | </button> | ||
| <button | <button class="btn-logout floatRight" (click)="authService.SignOut(); istoggle()"> | ||
| class="btn-logout floatRight" | |||
| (click)="authService.SignOut(); istoggle()" | |||
| > | |||
| Logout | Logout | ||
| </button> | </button> | ||
| </div> | </div> | ||
| <div class="clear"></div> | <div class="clear"></div> | ||
| </div> | </div> | ||
| </div> | |||
| </div> | </div> | ||
| </div> | |||
| </ion-content> | </ion-content> | ||
| <div class="loader" *ngIf="loader"> | <div class="loader" *ngIf="loader"> | ||
| <div class="lds-ripple"> | <div class="lds-ripple"> | ||
| <div></div> | <div></div> | ||
| <div></div> | <div></div> | ||
| </div> | </div> | ||
| </div> | </div> | ||
| \ No newline at end of file |
Please
register
or
sign in
to comment