conflict fix
Showing
| <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/profile_banner.png'" /> | ||
| [src]="loggedUser.profilePhoto" | <div class="edit"></div> | ||
| onerror="this.src='./../../assets/profile_banner.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> | ||
| Phone | </ion-col> | ||
| <span *ngIf="loggedUser.phoneVerified == true">Verified</span> | <ion-col class="textRight p0"> | ||
| <span *ngIf="loggedUser.phoneVerified == false" | <h6>{{loggedUser.phone}}</h6> | ||
| >Not Verified yet</span | <span class="ar-span" *ngIf="loggedUser.phoneVerified == true">Verified</span> | ||
| > | <span class="ar-span" *ngIf="loggedUser.phoneVerified == false">Not Verified yet</span> | ||
| </p> | </ion-col> | ||
| </ion-col> | </ion-row> | ||
| <ion-col class="textRight p0"> | </div> | ||
| <h6>{{loggedUser.phone}}</h6> | <div class="row"> | ||
| </ion-col> | <ion-row> | ||
| </ion-row> | <ion-col class="textLeft p0"> | ||
| </div> | <p> | ||
| <div class="row"> | |||
| <ion-row> | </p> | ||
| <ion-col class="textLeft p0"> | </ion-col> | ||
| <p> | <ion-col class="textRight p0"> | ||
| Email<span *ngIf="userData && userData.emailVerified == true" | <h6>{{loggedUser.emailId}}</h6> | ||
| >Verified</span | <span class="ar-span" *ngIf="loggedUser.emailVerified == true">Verified</span> | ||
| > | <span class="ar-span" *ngIf="loggedUser.emailVerified == false">Not Verified yet</span> | ||
| <span *ngIf="loggedUser.emailVerified == false" | </ion-col> | ||
| >Not Verified yet</span | </ion-row> | ||
| > | </div> | ||
| </p> | <hr /> | ||
| </ion-col> | <ion-row (click)="goToPage('wishlist')"> | ||
| <ion-col class="textRight p0"> | <ion-col class="textLeft p0"> | ||
| <h6>{{loggedUser.emailId}}</h6> | <p>Wishlist</p> | ||
| </ion-col> | </ion-col> | ||
| </ion-row> | <ion-col class="textRight p0"> | ||
| </div> | <h6>(0)</h6> | ||
| <hr /> | </ion-col> | ||
| <ion-row (click)="goToPage('wishlist')"> | </ion-row> | ||
| <ion-col class="textLeft p0"> | <hr /> | ||
| <p>Wishlist</p> | <ion-row (click)="goToPage('address')"> | ||
| </ion-col> | <ion-col class="textLeft p0"> | ||
| <ion-col class="textRight p0"> | <p>Address</p> | ||
| <h6>(0)</h6> | </ion-col> | ||
| </ion-col> | <ion-col class="textRight p0"> | ||
| </ion-row> | <h6 *ngIf="addressService.addList"> | ||
| <hr /> | ({{addressService.addressList.length}}) | ||
| <ion-row (click)="goToPage('address')"> | </h6> | ||
| <ion-col class="textLeft p0"> | </ion-col> | ||
| <p>Address</p> | </ion-row> | ||
| </ion-col> | <hr /> | ||
| <ion-col class="textRight p0"> | <!-- <ion-row> | ||
| <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> | ||
| ... | @@ -102,46 +92,43 @@ | ... | @@ -102,46 +92,43 @@ |
| </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> | <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> | \ No newline at end of file |
Please
register
or
sign in
to comment