Merge branch 'arjunlatest' into 'master'
Android design fix
See merge request !85
Showing
| ... | @@ -38,11 +38,11 @@ | ... | @@ -38,11 +38,11 @@ |
| "@types/googlemaps": "^3.39.2", | "@types/googlemaps": "^3.39.2", | ||
| "agm-direction": "^0.7.9", | "agm-direction": "^0.7.9", | ||
| "call-number": "^1.0.1", | "call-number": "^1.0.1", | ||
| "cordova-android": "^8.1.0", | "cordova-android": "8.1.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.4.0", | "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-navigationbar": "^1.0.31", | "cordova-plugin-navigationbar": "^1.0.31", | ||
| ... | @@ -119,4 +119,4 @@ | ... | @@ -119,4 +119,4 @@ |
| "android" | "android" | ||
| ] | ] | ||
| } | } | ||
| } | } | ||
| \ No newline at end of file |
| <div class="nav_header"> | <ion-header> | ||
| <button class="nav_btn nav_back floatLeft" (click)="goBack()"> | <div class="nav_header"> | ||
| <img src="../assets/Group17_2.png" /> | <button class="nav_btn nav_back floatLeft" (click)="goBack()"> | ||
| </button> | <img src="../assets/Group17_2.png" /> | ||
| <div class="nav_title floatLeft"> | </button> | ||
| <input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..." | <div class="nav_title floatLeft"> | ||
| (click)="goToPage('searchmodal')" /> | <input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..." (click)="goToPage('searchmodal')" /> | ||
| </div> | </div> | ||
| <button class="nav_btn nav_search floatRight" *ngIf="!searchShow" (click)="goToPage('searchmodal')"></button> | <button class="nav_btn nav_search floatRight" *ngIf="!searchShow" (click)="goToPage('searchmodal')"></button> | ||
| <button class="nav_btn nav_close floatRight" *ngIf="searchShow" (click)="searchClose()"></button> | <button class="nav_btn nav_close floatRight" *ngIf="searchShow" (click)="searchClose()"></button> | ||
| <div class="clear"></div> | |||
| </div> | |||
| <ion-content> | |||
| <div class="product_list"> | |||
| <div class="product_taskbar"> | |||
| <div class="filter floatLeft" (click)="istoggle()"></div> | |||
| <div class="viewset floatRight"> | |||
| <div class="grid_view grid_act floatRight" (click)="gridToggle()" [class.line_view]="onGrid"></div> | |||
| <div class="clear"></div> | <div class="clear"></div> | ||
| </div> | |||
| <div class="clear"></div> | |||
| </div> | </div> | ||
| <div class="product_title" *ngIf="data"> | </ion-header> | ||
| {{data.shopName}} | <ion-content> | ||
| </div> | <div class="product_list"> | ||
| <ul [class.grid_view]="onGrid" *ngIf="prodService.product && prodService.product.length > 0"> | <div class="product_taskbar"> | ||
| <li *ngFor="let product of prodService.product; let i = index"> | <div class="filter floatLeft" (click)="istoggle()"></div> | ||
| <div class="product_image"> | <div class="viewset floatRight"> | ||
| <div class="load-back"> | <div class="grid_view grid_act floatRight" (click)="gridToggle()" [class.line_view]="onGrid"></div> | ||
| <img [src]="product.image" onerror="this.src='../assets/[email protected]'" (click)="prodDetails(i)" /> | <div class="clear"></div> | ||
| </div> | </div> | ||
| <div [ngClass]="checkFavStatus(product.prodId)" (click)="changeFav(product.prodId)"></div> | <div class="clear"></div> | ||
| <div class="featured_badge" *ngIf="product.featured">Featured</div> | </div> | ||
| <div class="product_title" *ngIf="data"> | |||
| {{data.shopName}} | |||
| </div> | </div> | ||
| <h5 class="ellipse" (click)="prodDetails(i)" [innerHTML]="unEscape(product.prodName)"></h5> | <ul [class.grid_view]="onGrid" *ngIf="prodService.product && prodService.product.length > 0"> | ||
| <p (click)="prodDetails(i)"> | <li *ngFor="let product of prodService.product; let i = index"> | ||
| A$ {{service.formatNumber(product.price)}}<span class="offer" | <div class="product_image"> | ||
| *ngIf="product.discount > 0">-{{product.discount}}%</span> | <div class="load-back"> | ||
| </p> | <img [src]="product.image" onerror="this.src='../assets/[email protected]'" (click)="prodDetails(i)" /> | ||
| </li> | </div> | ||
| </ul> | <div [ngClass]="checkFavStatus(product.prodId)" (click)="changeFav(product.prodId)"></div> | ||
| </div> | <div class="featured_badge" *ngIf="product.featured">Featured</div> | ||
| <!-- <ul | </div> | ||
| <h5 class="ellipse" (click)="prodDetails(i)" [innerHTML]="unEscape(product.prodName)"></h5> | |||
| <p (click)="prodDetails(i)"> | |||
| A$ {{service.formatNumber(product.price)}}<span class="offer" *ngIf="product.discount > 0">-{{product.discount}}%</span> | |||
| </p> | |||
| </li> | |||
| </ul> | |||
| </div> | |||
| <!-- <ul | |||
| [class.grid_view]="onGrid" | [class.grid_view]="onGrid" | ||
| *ngIf="prodService.product && prodService.product.length > 0" | *ngIf="prodService.product && prodService.product.length > 0" | ||
| > | > | ||
| ... | @@ -66,62 +66,58 @@ | ... | @@ -66,62 +66,58 @@ |
| </li> | </li> | ||
| </ul> --> | </ul> --> | ||
| <div class="no-result-wrapper" *ngIf="prodService.product.length === 0"> | <div class="no-result-wrapper" *ngIf="prodService.product.length === 0"> | ||
| <img src="../../assets/basket.png" /> | <img src="../../assets/basket.png" /> | ||
| <h1>No result found</h1> | <h1>No result found</h1> | ||
| <button (click)="goToPage('home')">home</button> | <button (click)="goToPage('home')">home</button> | ||
| </div> | </div> | ||
| <div class="sort_wrappper" *ngIf="isShow" [@slideInOut]> | <div class="sort_wrappper" *ngIf="isShow" [@slideInOut]> | ||
| <div class="sort_inner"> | <div class="sort_inner"> | ||
| <h4>Sort By</h4> | <h4>Sort By</h4> | ||
| <ul> | <ul> | ||
| <!-- <li> | <!-- <li> | ||
| <input class="styled-checkbox" id="styled-checkbox-1" type="radio" value="popular" name="sort" (click)="setValue($event.target.value)"> | <input class="styled-checkbox" id="styled-checkbox-1" type="radio" value="popular" name="sort" (click)="setValue($event.target.value)"> | ||
| <label for="styled-checkbox-1">Popularity</label> | <label for="styled-checkbox-1">Popularity</label> | ||
| </li> --> | </li> --> | ||
| <!-- <li> | <!-- <li> | ||
| <input class="styled-checkbox" id="styled-checkbox-2" type="radio" value="relevance" name="sort" (click)="setValue($event.target.value)"> | <input class="styled-checkbox" id="styled-checkbox-2" type="radio" value="relevance" name="sort" (click)="setValue($event.target.value)"> | ||
| <label for="styled-checkbox-2">Relevence</label> | <label for="styled-checkbox-2">Relevence</label> | ||
| </li> --> | </li> --> | ||
| <li> | <li> | ||
| <input class="styled-checkbox" id="styled-checkbox-1" type="radio" value="newest" name="sort" | <input class="styled-checkbox" id="styled-checkbox-1" type="radio" value="newest" name="sort" (click)="setValue($event.target.value)" /> | ||
| (click)="setValue($event.target.value)" /> | <label for="styled-checkbox-1">Newest First</label> | ||
| <label for="styled-checkbox-1">Newest First</label> | </li> | ||
| </li> | <li> | ||
| <li> | <input class="styled-checkbox" id="styled-checkbox-5" type="radio" value="a-z" name="sort" (click)="setValue($event.target.value)" /> | ||
| <input class="styled-checkbox" id="styled-checkbox-5" type="radio" value="a-z" name="sort" | <label for="styled-checkbox-5">Name A - Z</label> | ||
| (click)="setValue($event.target.value)" /> | </li> | ||
| <label for="styled-checkbox-5">Name A - Z</label> | <li> | ||
| </li> | <input class="styled-checkbox" id="styled-checkbox-3" type="radio" value="low" name="sort" (click)="setValue($event.target.value)" /> | ||
| <li> | <label for="styled-checkbox-3">Price Low - High</label> | ||
| <input class="styled-checkbox" id="styled-checkbox-3" type="radio" value="low" name="sort" | </li> | ||
| (click)="setValue($event.target.value)" /> | <li> | ||
| <label for="styled-checkbox-3">Price Low - High</label> | <input class="styled-checkbox" id="styled-checkbox-4" type="radio" value="high" name="sort" (click)="setValue($event.target.value)" /> | ||
| </li> | <label for="styled-checkbox-4">Price High - Low</label> | ||
| <li> | </li> | ||
| <input class="styled-checkbox" id="styled-checkbox-4" type="radio" value="high" name="sort" | |||
| (click)="setValue($event.target.value)" /> | |||
| <label for="styled-checkbox-4">Price High - Low</label> | |||
| </li> | |||
| <!-- <li> | <!-- <li> | ||
| <input class="styled-checkbox" id="styled-checkbox-5" type="radio" value="rate" name="sort" (click)="setValue($event.target.value)"> | <input class="styled-checkbox" id="styled-checkbox-5" type="radio" value="rate" name="sort" (click)="setValue($event.target.value)"> | ||
| <label for="styled-checkbox-5">Rating</label> | <label for="styled-checkbox-5">Rating</label> | ||
| </li> --> | </li> --> | ||
| </ul> | </ul> | ||
| <div class="sort_footer"> | <div class="sort_footer"> | ||
| <button class="cancel floatLeft" (click)="istoggle()">CANCEL</button> | <button class="cancel floatLeft" (click)="istoggle()">CANCEL</button> | ||
| <button class="submit floatRight" (click)="istoggle(); submit()"> | <button class="submit floatRight" (click)="istoggle(); submit()"> | ||
| SUBMIT | SUBMIT | ||
| </button> | </button> | ||
| <div class="clear"></div> | <div class="clear"></div> | ||
| </div> | </div> | ||
| </div> | |||
| </div> | </div> | ||
| </div> | <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> | |||
| </ion-content> | </ion-content> | ||
| \ No newline at end of file |
| <div class="nav_header"> | <ion-header> | ||
| <ion-menu-toggle> | <div class="nav_header"> | ||
| <button class="nav_btn nav_menu floatLeft"></button> | <ion-menu-toggle> | ||
| </ion-menu-toggle> | <button class="nav_btn nav_menu floatLeft"></button> | ||
| <div class="nav_title floatLeft"> | </ion-menu-toggle> | ||
| <img src="../../assets/Group [email protected]" /> | <div class="nav_title floatLeft"> | ||
| <img src="../../assets/Group [email protected]" /> | |||
| </div> | |||
| <div class="clear"></div> | |||
| </div> | </div> | ||
| <div class="clear"></div> | |||
| </div> | </ion-header> | ||
| <ion-content> | <ion-content> | ||
| <div class="profile_wrapper" *ngIf="loggedUser"> | <div class="profile_wrapper" *ngIf="loggedUser"> | ||
| ... | @@ -27,8 +30,8 @@ | ... | @@ -27,8 +30,8 @@ |
| <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 class="floatRight" (click)="goToPage('changedetails', user && user)"><img src="../../assets/edit.png" | <span class="floatRight" (click)="goToPage('changedetails', user && user)"><img | ||
| /></span> | src="../../assets/edit.png" /></span> | ||
| <div class="clear"></div> | <div class="clear"></div> | ||
| </div> | </div> | ||
| <div class="row"> | <div class="row"> | ||
| ... | @@ -40,56 +43,49 @@ | ... | @@ -40,56 +43,49 @@ |
| </ion-col> | </ion-col> | ||
| <ion-col class="textRight p0"> | <ion-col class="textRight p0"> | ||
| <h6>{{loggedUser.phone}}</h6> | <h6>{{loggedUser.phone}}</h6> | ||
| <span class="ar-span" *ngIf="loggedUser.phoneVerified == true">Verified</span | <span class="ar-span" *ngIf="loggedUser.phoneVerified == true">Verified</span> | ||
| > | <span class="ar-span" *ngIf="loggedUser.phoneVerified == false">Not Verified yet</span> | ||
| <span class="ar-span" *ngIf="loggedUser.phoneVerified == false" | </ion-col> | ||
| >Not Verified yet</span | </ion-row> | ||
| > | </div> | ||
| </ion-col> | <div class="row"> | ||
| </ion-row> | <ion-row> | ||
| </div> | <ion-col class="textLeft p0"> | ||
| <div class="row"> | <p> | ||
| <ion-row> | |||
| <ion-col class="textLeft p0"> | </p> | ||
| <p> | </ion-col> | ||
| <ion-col class="textRight p0"> | |||
| </p> | <h6>{{loggedUser.emailId}}</h6> | ||
| </ion-col> | <span class="ar-span" *ngIf="loggedUser.emailVerified == true">Verified</span> | ||
| <ion-col class="textRight p0"> | <span class="ar-span" *ngIf="loggedUser.emailVerified == false">Not Verified yet</span> | ||
| <h6>{{loggedUser.emailId}}</h6> | </ion-col> | ||
| <span class="ar-span" *ngIf="loggedUser.emailVerified == true" | </ion-row> | ||
| >Verified</span | </div> | ||
| > | <hr /> | ||
| <span class="ar-span" *ngIf="loggedUser.emailVerified == false" | <ion-row (click)="goToPage('wishlist')"> | ||
| >Not Verified yet</span | <ion-col class="textLeft p0"> | ||
| > | <p>Wishlist</p> | ||
| </ion-col> | </ion-col> | ||
| </ion-row> | <ion-col class="textRight p0"> | ||
| </div> | <h6 *ngIf="wishService.whishItem"> | ||
| <hr /> | ({{wishService.whishItem.length}}) | ||
| <ion-row (click)="goToPage('wishlist')"> | </h6> | ||
| <ion-col class="textLeft p0"> | </ion-col> | ||
| <p>Wishlist</p> | </ion-row> | ||
| </ion-col> | <hr /> | ||
| <ion-col class="textRight p0"> | <ion-row (click)="goToPage('address')"> | ||
| <h6 *ngIf="wishService.whishItem"> | <ion-col class="textLeft p0"> | ||
| ({{wishService.whishItem.length}}) | <p>Address</p> | ||
| </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> | ||
| ... | @@ -100,56 +96,56 @@ | ... | @@ -100,56 +96,56 @@ |
| </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 class="btn-logout floatRight" (click)="authService.SignOut(); istoggle()"> | <button class="btn-logout floatRight" (click)="authService.SignOut(); istoggle()"> | ||
| Logout | Logout | ||
| </button> | </button> | ||
| </div> | |||
| <div class="clear"></div> | |||
| </div> | </div> | ||
| <div class="clear"></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"> | ||
| ... | ... |
Please
register
or
sign in
to comment