Merge branch 'muhsin' into 'master'
Muhsin
See merge request !46
Showing
src/app/addaddresss/addaddresss.page.css
0 → 100644
src/app/addaddresss/addaddresss.page.css.map
0 → 100644
src/app/addcard/addcard.page.css
0 → 100644
src/app/addcard/addcard.page.css.map
0 → 100644
src/app/app.component.css
0 → 100644
src/app/app.component.css.map
0 → 100644
| ... | @@ -3,14 +3,14 @@ | ... | @@ -3,14 +3,14 @@ |
| <ion-menu> | <ion-menu> | ||
| <ion-content> | <ion-content> | ||
| <div class="side_menu_wrapper"> | <div class="side_menu_wrapper"> | ||
| <ion-menu-toggle> | <ion-menu-toggle *ngIf="userData"> | ||
| <div class="top_banner"> | <div class="top_banner"> | ||
| <div class="top_image"> | <div class="top_image"> | ||
| <img src="../assets/asset_avatar.png"> | <img [src]="userData.profilePhoto" /> | ||
| </div> | </div> | ||
| <div class="top_detail"> | <div class="top_detail"> | ||
| <h4>John Doe</h4> | <h4>{{ userData.name }}</h4> | ||
| <p>[email protected]</p> | <p>{{ userData.emailId }}</p> | ||
| </div> | </div> | ||
| <div class="clear"></div> | <div class="clear"></div> | ||
| </div> | </div> | ||
| ... | @@ -28,7 +28,10 @@ | ... | @@ -28,7 +28,10 @@ |
| <div class="sub_menu"> | <div class="sub_menu"> | ||
| <ul *ngIf="categoryService.activecategories"> | <ul *ngIf="categoryService.activecategories"> | ||
| <ion-menu-toggle> | <ion-menu-toggle> | ||
| <li *ngFor="let category of categoryService.activecategories" (click)="goToPage('catstorelist', category)"> | <li | ||
| *ngFor="let category of categoryService.activecategories" | |||
| (click)="goToPage('catstorelist', category)" | |||
| > | |||
| {{ category.catName }} | {{ category.catName }} | ||
| </li> | </li> | ||
| </ion-menu-toggle> | </ion-menu-toggle> | ||
| ... | @@ -41,7 +44,9 @@ | ... | @@ -41,7 +44,9 @@ |
| </div> | </div> | ||
| <li>Complaints & Feedback</li> | <li>Complaints & Feedback</li> | ||
| <li> | <li> | ||
| <span class="floatLeft" (click)="authService.SignOut()">Logout</span> | <span class="floatLeft" (click)="authService.SignOut()" | ||
| >Logout</span | |||
| > | |||
| <span class="floatRight version">Version 0.1.0.2</span> | <span class="floatRight version">Version 0.1.0.2</span> | ||
| <div class="clear"></div> | <div class="clear"></div> | ||
| </li> | </li> | ||
| ... | @@ -54,25 +59,46 @@ | ... | @@ -54,25 +59,46 @@ |
| </ion-split-pane> | </ion-split-pane> | ||
| </ion-app> | </ion-app> | ||
| <div class="common_tab" [hidden]="fetchCase() === true"> | <div class="common_tab" [hidden]="fetchCase() === true" *ngIf="!isSearchOpen"> | ||
| <ul> | <ul> | ||
| <li (click)="goToPage('home')"> | <li (click)="goToPage('home')"> | ||
| <div class="icon_sec m1_icon" [class.m1_icon_act]="sec_active1" (click)="setActive1()"></div> | <div | ||
| class="icon_sec m1_icon" | |||
| [class.m1_icon_act]="sec_active1" | |||
| (click)="setActive1()" | |||
| ></div> | |||
| </li> | </li> | ||
| <li (click)="goToPage('catagory')"> | <li (click)="goToPage('catagory')"> | ||
| <div class="icon_sec m2_icon" [class.m2_icon_act]="sec_active2" (click)="setActive2()"></div> | <div | ||
| class="icon_sec m2_icon" | |||
| [class.m2_icon_act]="sec_active2" | |||
| (click)="setActive2()" | |||
| ></div> | |||
| </li> | </li> | ||
| <li (click)="searchModal()"> | <li (click)="searchModal()"> | ||
| <div class="icon_sec m3_icon" [class.m3_icon_act]="sec_active3" (click)="setActive3()"></div> | <div | ||
| class="icon_sec m3_icon" | |||
| [class.m3_icon_act]="sec_active3" | |||
| (click)="setActive3()" | |||
| ></div> | |||
| </li> | </li> | ||
| <!-- <li (click)="goToPage('cart')"> | <!-- <li (click)="goToPage('cart')"> | ||
| <div class="icon_sec m4_icon" [class.m4_icon_act]="sec_active4" (click)="setActive4()"></div> | <div class="icon_sec m4_icon" [class.m4_icon_act]="sec_active4" (click)="setActive4()"></div> | ||
| </li> --> | </li> --> | ||
| <li (click)="goToPage('myorder')"> | <li (click)="goToPage('myorder')"> | ||
| <div class="icon_sec m5_icon" [class.m5_icon_act]="sec_active5" (click)="setActive5()"></div> | <div | ||
| class="icon_sec m5_icon" | |||
| [class.m5_icon_act]="sec_active5" | |||
| (click)="setActive5()" | |||
| ></div> | |||
| </li> | </li> | ||
| <li (click)="goToPage('profile')"> | <li (click)="goToPage('profile')"> | ||
| <div class="icon_sec m6_icon" [class.m6_icon_act]="sec_active6" (click)="setActive6()" menuClose></div> | <div | ||
| class="icon_sec m6_icon" | |||
| [class.m6_icon_act]="sec_active6" | |||
| (click)="setActive6()" | |||
| menuClose | |||
| ></div> | |||
| </li> | </li> | ||
| </ul> | </ul> | ||
| </div> | </div> |
src/app/cart/cart.page.css
0 → 100644
This diff is collapsed.
Click to expand it.
src/app/cart/cart.page.css.map
0 → 100644
This diff is collapsed.
Click to expand it.
src/app/changedetails/changedetails.page.css
0 → 100644
| ... | @@ -15,12 +15,13 @@ | ... | @@ -15,12 +15,13 @@ |
| </div> | </div> | ||
| <div class="row"> | <div class="row"> | ||
| <input | <input | ||
| [(value)]="userData && userData.name" | |||
| name="name" | name="name" | ||
| required | required | ||
| class="" | class="" | ||
| type="text" | type="text" | ||
| [(ngModel)]="updateData.name" | [(ngModel)]="userData && userData.name" | ||
| placeholder="John Doe" | [(placeholder)]="userData && userData.name" | ||
| #name="ngModel" | #name="ngModel" | ||
| /> | /> | ||
| <div | <div | ||
| ... | @@ -33,38 +34,26 @@ | ... | @@ -33,38 +34,26 @@ |
| </div> | </div> | ||
| <div class="row"> | <div class="row"> | ||
| <input | <input | ||
| required | [(value)]="userData && userData.emailId" | ||
| readonly | |||
| class="" | class="" | ||
| name="emailId" | name="emailId" | ||
| type="mail" | type="mail" | ||
| [(ngModel)]="updateData.emailId" | [(placeholder)]="userData && userData.emailId" | ||
| placeholder="[email protected]" | |||
| pattern="[a-zA-Z0-9.-_]{1,}@[a-zA-Z.-]{2,}[.]{1}[a-zA-Z]{2,}" | |||
| #emailId="ngModel" | |||
| /> | /> | ||
| <div | |||
| class="md-errors-spacer" | |||
| [hidden]="emailId.valid || submitted == false" | |||
| > | |||
| <div *ngIf="emailId.errors && emailId.errors.required"> | |||
| Email is required | |||
| </div> | |||
| <div *ngIf="emailId.errors && emailId.errors.pattern"> | |||
| Email is invalid | |||
| </div> | |||
| </div> | |||
| </div> | </div> | ||
| <div class="row"> | <div class="row"> | ||
| <input | <input | ||
| [(value)]="userData && userData.phone" | |||
| required | required | ||
| class="" | class="" | ||
| name="phone" | name="phone" | ||
| type="number" | type="number" | ||
| pattern="(\(+61\)|\+61|\(0[1-9]\)|0[1-9])?( ?-?[0-9]){6,9}" | pattern="(\(+61\)|\+61|\(0[1-9]\)|0[1-9])?( ?-?[0-9]){6,9}" | ||
| maxlength="10" | maxlength="10" | ||
| [(ngModel)]="updateData.phone" | [(ngModel)]="userData && userData.phone" | ||
| placeholder="+00 9851 5871 6985" | [(placeholder)]="userData && userData.phone" | ||
| #phone="ngModel" | #phone="ngModel" | ||
| /> | /> | ||
| <div | <div | ||
| ... | @@ -79,18 +68,42 @@ | ... | @@ -79,18 +68,42 @@ |
| </div> | </div> | ||
| </div> | </div> | ||
| </div> | </div> | ||
| <div *ngIf="userData && userData.loginType == 0"> | |||
| <div class="row"> | <div class="row"> | ||
| <h6>Change Password</h6> | <h6>Change Password</h6> | ||
| </div> | </div> | ||
| <div class="row"> | <!-- <div class="row"> | ||
| <input class="" type="password" placeholder="Current Password" /> | <input class="" type="password" placeholder="Current Password" /> | ||
| </div> | </div> --> | ||
| <div class="row"> | <div class="row"> | ||
| <input class="" type="password" placeholder="New Password" /> | <input | ||
| class="" | |||
| [(ngModel)]="updatePassword.password" | |||
| name="password" | |||
| type="password" | |||
| placeholder="New Password" | |||
| minlength="6" | |||
| #password="ngModel" | |||
| /> | |||
| <div *ngIf="password.errors && password.errors.minlength"> | |||
| Password must be at least 6 characters | |||
| </div> | |||
| </div> | </div> | ||
| <div class="row"> | <div class="row"> | ||
| <input class="" type="password" placeholder="Confirm Password" /> | <input | ||
| class="" | |||
| #confirmPassword="ngModel" | |||
| [(ngModel)]="updatePassword.confirmPassword" | |||
| name="confirmPassword" | |||
| type="password" | |||
| placeholder="Confirm Password" | |||
| /> | |||
| <div *ngIf=""> | |||
| Password should match | |||
| </div> | |||
| </div> | </div> | ||
| </div> | |||
| <div class="row"> | <div class="row"> | ||
| <button class="login_btn" (click)="onFormSubmit(updateForm)"> | <button class="login_btn" (click)="onFormSubmit(updateForm)"> | ||
| UPDATE | UPDATE | ||
| ... | ... |
src/app/changepass/changepass.page.css
0 → 100644
src/app/changepass/changepass.page.css.map
0 → 100644
src/app/forgot/forgot.page.css
0 → 100644
src/app/forgot/forgot.page.css.map
0 → 100644
src/app/landing/landing.page.css
0 → 100644
src/app/landing/landing.page.css.map
0 → 100644
src/app/login/login.page.css
0 → 100644
src/app/login/login.page.css.map
0 → 100644
src/app/myorder/myorder.page.css
0 → 100644
src/app/myorder/myorder.page.css.map
0 → 100644
src/app/nearby/nearby.page.css
0 → 100644
src/app/nearby/nearby.page.css.map
0 → 100644
src/app/productdetail/productdetail.page.css
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
src/app/productlist/productlist.page.css
0 → 100644
src/app/productlist/productlist.page.css.map
0 → 100644
| <div class="nav_header"> | <div class="nav_header"> | ||
| <button class="nav_btn nav_back floatLeft" (click)="goBack()"> | <button class="nav_btn nav_back floatLeft" (click)="goBack()"> | ||
| <img src="../assets/Group17_2.png"> | <img src="../assets/Group17_2.png" /> | ||
| </button> | </button> | ||
| <div class="nav_title floatLeft"> | <div class="nav_title floatLeft"> | ||
| <input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..." (click)="clickSearch()"> | <input | ||
| class="search_bar" | |||
| placeholder="Search here.. eg:shirts, retailers etc..." | |||
| (click)="clickSearch()" | |||
| /> | |||
| </div> | </div> | ||
| <button class="nav_btn nav_search floatRight" *ngIf="!searchShow"> | <button | ||
| </button> | class="nav_btn nav_search floatRight" | ||
| <button class="nav_btn nav_close floatRight" *ngIf="searchShow" (click)="searchClose()"> | *ngIf="!searchShow" | ||
| </button> | (click)="clickSearch()" | ||
| ></button> | |||
| <button | |||
| class="nav_btn nav_close floatRight" | |||
| *ngIf="searchShow" | |||
| (click)="searchClose()" | |||
| ></button> | |||
| <div class="clear"></div> | <div class="clear"></div> | ||
| </div> | </div> | ||
| <ion-content> | <ion-content> | ||
| <div class="product_list"> | <div class="product_list"> | ||
| <div class="product_taskbar"> | <div class="product_taskbar"> | ||
| <div class="filter floatLeft" (click)="istoggle()"> | <div class="filter floatLeft" (click)="istoggle()"></div> | ||
| </div> | |||
| <div class="viewset floatRight"> | <div class="viewset floatRight"> | ||
| <div class="grid_view grid_act floatRight" (click)="gridToggle()" [class.line_view]="onGrid"> | <div | ||
| </div> | class="grid_view grid_act floatRight" | ||
| (click)="gridToggle()" | |||
| [class.line_view]="onGrid" | |||
| ></div> | |||
| <div class="clear"></div> | <div class="clear"></div> | ||
| </div> | </div> | ||
| <div class="clear"></div> | <div class="clear"></div> | ||
| ... | @@ -28,16 +38,29 @@ | ... | @@ -28,16 +38,29 @@ |
| <div class="product_title" *ngIf="data"> | <div class="product_title" *ngIf="data"> | ||
| {{data.shopName}} | {{data.shopName}} | ||
| </div> | </div> | ||
| <ul [class.grid_view]="onGrid" *ngIf="prodService.product && prodService.product.length > 0"> | <ul | ||
| [class.grid_view]="onGrid" | |||
| *ngIf="prodService.product && prodService.product.length > 0" | |||
| > | |||
| <li *ngFor="let product of prodService.product; let i = index"> | <li *ngFor="let product of prodService.product; let i = index"> | ||
| <div class="product_image"> | <div class="product_image"> | ||
| <img [src]="product.image" onerror="this.src='../assets/[email protected]'" (click)="prodDetails(i)"> | <img | ||
| <div [ngClass]="checkFavStatus(product.prodId)" (click)="changeFav(product.prodId)"> | [src]="product.image" | ||
| </div> | onerror="this.src='../assets/[email protected]'" | ||
| (click)="prodDetails(i)" | |||
| /> | |||
| <div | |||
| [ngClass]="checkFavStatus(product.prodId)" | |||
| (click)="changeFav(product.prodId)" | |||
| ></div> | |||
| <div class="featured_badge" *ngIf="product.featured">Featured</div> | <div class="featured_badge" *ngIf="product.featured">Featured</div> | ||
| </div> | </div> | ||
| <h5 class="ellipse" (click)="prodDetails(i)">{{product.prodName}}</h5> | <h5 class="ellipse" (click)="prodDetails(i)">{{product.prodName}}</h5> | ||
| <p (click)="prodDetails(i)">A$ {{product.price}}<span class="offer" *ngIf="product.discount > 0">-{{product.discount}}%</span></p> | <p (click)="prodDetails(i)"> | ||
| A$ {{product.price}}<span class="offer" *ngIf="product.discount > 0" | |||
| >-{{product.discount}}%</span | |||
| > | |||
| </p> | |||
| </li> | </li> | ||
| </ul> | </ul> | ||
| </div> | </div> | ||
| ... | @@ -54,11 +77,25 @@ | ... | @@ -54,11 +77,25 @@ |
| <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-3" type="radio" value="low" name="sort" (click)="setValue($event.target.value)"> | <input | ||
| class="styled-checkbox" | |||
| id="styled-checkbox-3" | |||
| type="radio" | |||
| value="low" | |||
| name="sort" | |||
| (click)="setValue($event.target.value)" | |||
| /> | |||
| <label for="styled-checkbox-3">Price Low - High</label> | <label for="styled-checkbox-3">Price Low - High</label> | ||
| </li> | </li> | ||
| <li> | <li> | ||
| <input class="styled-checkbox" id="styled-checkbox-4" type="radio" value="high" name="sort" (click)="setValue($event.target.value)"> | <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> | <label for="styled-checkbox-4">Price High - Low</label> | ||
| </li> | </li> | ||
| <!-- <li> | <!-- <li> | ||
| ... | @@ -68,15 +105,21 @@ | ... | @@ -68,15 +105,21 @@ |
| </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()">SUBMIT</button> | <button class="submit floatRight" (click)="istoggle(); submit()"> | ||
| SUBMIT | |||
| </button> | |||
| <div class="clear"></div> | <div class="clear"></div> | ||
| </div> | </div> | ||
| </div> | </div> | ||
| </div> | </div> | ||
| </ion-content> | </ion-content> | ||
| <div class="search_item_list" *ngIf="searchShow" [@slideInOut]> | <div class="search_item_list" *ngIf="searchShow" [@slideInOut]> | ||
| <ul *ngIf="searchService.searchList"> | <ul *ngIf="searchService.searchList"> | ||
| <li *ngFor="let search of searchService.searchList" (click)="viewPage(search)">{{search.text}}</li> | <li | ||
| *ngFor="let search of searchService.searchList" | |||
| (click)="viewPage(search)" | |||
| > | |||
| {{search.text}} | |||
| </li> | |||
| </ul> | </ul> | ||
| </div> | </div> | ||
| \ No newline at end of file |
src/app/profile/profile.page.css
0 → 100644
src/app/profile/profile.page.css.map
0 → 100644
src/app/searchmodal/searchmodal.page.css
0 → 100644
src/app/searchmodal/searchmodal.page.css.map
0 → 100644
src/app/signup/signup.page.css
0 → 100644
src/app/signup/signup.page.css.map
0 → 100644
src/app/sortby/sortby.page.css
0 → 100644
src/app/sortby/sortby.page.css.map
0 → 100644
src/app/tab1/tab1.page.css
0 → 100644
src/app/tab1/tab1.page.css.map
0 → 100644
src/app/tab2/tab2.page.css
0 → 100644
src/app/tab2/tab2.page.css.map
0 → 100644
src/app/tab3/tab3.page.css
0 → 100644
src/app/tab3/tab3.page.css.map
0 → 100644
src/app/tabs/tabs.page.css
0 → 100644
src/app/tabs/tabs.page.css.map
0 → 100644
src/app/trackorder/trackorder.page.css
0 → 100644
src/app/trackorder/trackorder.page.css.map
0 → 100644
src/app/verification/verification.page.css
0 → 100644
src/app/wishlist/wishlist.page.css
0 → 100644
src/app/wishlist/wishlist.page.css.map
0 → 100644
src/theme/variables.css
0 → 100644
src/theme/variables.css.map
0 → 100644
Please
register
or
sign in
to comment