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
| .cart_wrapper { | |||
| width: 100%; | |||
| } | |||
| .cart_wrapper .cart_head { | |||
| width: 100%; | |||
| height: 220px; | |||
| background-image: url("../../assets/[email protected]"); | |||
| background-position: center bottom; | |||
| background-repeat: no-repeat; | |||
| background-size: cover; | |||
| } | |||
| .cart_wrapper .cart_head .nav_header { | |||
| position: static; | |||
| background-color: transparent; | |||
| } | |||
| .cart_wrapper .cart_head .nav_header .nav_title h4 { | |||
| color: #FFF; | |||
| } | |||
| .cart_wrapper .cart_head .cart_menu_header { | |||
| padding: 20px; | |||
| } | |||
| .cart_wrapper .cart_head .cart_menu_header ul { | |||
| margin: 0px; | |||
| padding: 10px; | |||
| background-color: rgba(255, 255, 255, 0.1); | |||
| border-radius: 10px; | |||
| } | |||
| .cart_wrapper .cart_head .cart_menu_header ul li { | |||
| list-style: none; | |||
| color: #b0aec7; | |||
| width: 20%; | |||
| display: inline-block; | |||
| font-weight: 700; | |||
| font-size: 13px; | |||
| } | |||
| .cart_wrapper .cart_head .cart_menu_header ul li hr { | |||
| height: 0px; | |||
| border-top: none; | |||
| width: 90%; | |||
| margin-top: 0px; | |||
| margin-bottom: 0px; | |||
| position: relative; | |||
| margin: 0 auto; | |||
| border-bottom: 2px dashed #b0aec7; | |||
| bottom: 4px; | |||
| } | |||
| .cart_wrapper .cart_head .cart_menu_header ul .active { | |||
| color: #FFF; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content { | |||
| width: calc(100% - 40px); | |||
| margin: 0 auto; | |||
| height: calc(100vh - 220px); | |||
| border-radius: 10px; | |||
| background-color: #fff; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list { | |||
| width: 100%; | |||
| padding: 15px; | |||
| height: calc(100vh - 180px); | |||
| overflow: scroll; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list .payment_method { | |||
| width: 100%; | |||
| padding-bottom: 15px; | |||
| padding-top: 15px; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list .payment_method [type="radio"]:checked, | |||
| .cart_wrapper .cart_head .cart_content .checkout_list .payment_method [type="radio"]:not(:checked) { | |||
| position: absolute; | |||
| left: -9999px; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list .payment_method [type="radio"]:checked + label, | |||
| .cart_wrapper .cart_head .cart_content .checkout_list .payment_method [type="radio"]:not(:checked) + label { | |||
| position: relative; | |||
| padding-left: 28px; | |||
| width: 100%; | |||
| cursor: pointer; | |||
| line-height: 20px; | |||
| display: inline-block; | |||
| color: #666; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list .payment_method [type="radio"]:checked + label:before, | |||
| .cart_wrapper .cart_head .cart_content .checkout_list .payment_method [type="radio"]:not(:checked) + label:before { | |||
| content: ''; | |||
| position: absolute; | |||
| left: 0; | |||
| top: 0; | |||
| width: 18px; | |||
| height: 18px; | |||
| border: 2px solid #29285b; | |||
| border-radius: 100%; | |||
| background: #fff; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list .payment_method [type="radio"]:checked + label:after, | |||
| .cart_wrapper .cart_head .cart_content .checkout_list .payment_method [type="radio"]:not(:checked) + label:after { | |||
| content: ''; | |||
| width: 12px; | |||
| height: 12px; | |||
| background: #29285b; | |||
| position: absolute; | |||
| top: 5px; | |||
| left: 5px; | |||
| border-radius: 100%; | |||
| -webkit-transition: all 0.2s ease; | |||
| transition: all 0.2s ease; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list .payment_method [type="radio"]:not(:checked) + label:after { | |||
| opacity: 0; | |||
| -webkit-transform: scale(0); | |||
| transform: scale(0); | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list .payment_method [type="radio"]:checked + label:after { | |||
| opacity: 1; | |||
| -webkit-transform: scale(1); | |||
| transform: scale(1); | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list h5 { | |||
| color: #3b394d; | |||
| margin: 0px; | |||
| padding: 0px; | |||
| font-weight: bolder; | |||
| font-size: 18px; | |||
| padding-bottom: 15px; | |||
| padding-top: 10px; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list p { | |||
| margin: 0px; | |||
| text-align: left; | |||
| color: #29285b; | |||
| padding-left: 10px; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list h6 { | |||
| margin: 0px; | |||
| padding: 0px; | |||
| color: #b0aec7; | |||
| white-space: nowrap; | |||
| overflow: hidden; | |||
| text-overflow: ellipsis; | |||
| text-align: left; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list h6 strong { | |||
| color: #3b394d; | |||
| font-weight: 400; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list ion-row { | |||
| padding-bottom: 10px; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list hr { | |||
| border-top: none; | |||
| height: 0px; | |||
| border-bottom: 1px solid #b0aec7; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list .card_div { | |||
| border: 1px solid #b0aec7; | |||
| height: 50px; | |||
| border-radius: 5px; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list .card_div input { | |||
| border: none; | |||
| height: 100%; | |||
| background-color: transparent; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list .card_div .card_no { | |||
| width: calc(100% - 80px); | |||
| height: 100%; | |||
| padding-left: 20px; | |||
| border-right: 1px solid #b0aec7; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list .card_div .cv_number { | |||
| width: 80px; | |||
| height: 100%; | |||
| text-align: center; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list .after_pay { | |||
| height: 60px; | |||
| border-top: 1px solid #b0aec7; | |||
| border-bottom: 1px solid #b0aec7; | |||
| color: #b0aec7; | |||
| text-align: left; | |||
| padding-top: 17px; | |||
| margin-top: 25px; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list .delivery_time { | |||
| width: 100%; | |||
| padding-top: 30px; | |||
| padding-bottom: 20px; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list .delivery_time ul { | |||
| margin: 0px; | |||
| padding: 0px; | |||
| text-align: left; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list .delivery_time ul li { | |||
| padding: 0px; | |||
| list-style: none; | |||
| display: inline-block; | |||
| font-size: 12px; | |||
| margin-right: 10px; | |||
| text-align: center; | |||
| border: 1px solid #b0aec7; | |||
| border-radius: 4px; | |||
| padding: 5px; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list .delivery_time ul li strong { | |||
| color: #3b394d; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list .coupon_code { | |||
| padding-top: 20px; | |||
| padding-bottom: 50px; | |||
| border-bottom: 1px solid #b0aec7; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list .coupon_code input { | |||
| width: calc(100% - 50px); | |||
| border: 1px solid #b0aec7; | |||
| border-radius: 20px; | |||
| height: 35px; | |||
| padding-left: 20px; | |||
| font-weight: 900; | |||
| color: #d7d5e4; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list .coupon_code input::-webkit-input-placeholder { | |||
| color: #d7d5e4; | |||
| outline: none; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list .coupon_code input:-ms-input-placeholder { | |||
| color: #d7d5e4; | |||
| outline: none; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list .coupon_code input::-ms-input-placeholder { | |||
| color: #d7d5e4; | |||
| outline: none; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list .coupon_code input::placeholder { | |||
| color: #d7d5e4; | |||
| outline: none; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list .coupon_code input:focus { | |||
| color: #d7d5e4; | |||
| outline: none; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list .coupon_code .add_btn { | |||
| color: #29285b; | |||
| width: 50px; | |||
| height: 35px; | |||
| background: transparent; | |||
| font-size: 17px; | |||
| font-weight: bolder; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .checkout_list .total_div p { | |||
| margin: 0px; | |||
| padding: 0px; | |||
| color: #29285b; | |||
| font-weight: bolder; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .cart_list { | |||
| width: 100%; | |||
| height: calc(100vh - 200px); | |||
| overflow: scroll; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .cart_list ul { | |||
| margin: 0px; | |||
| padding: 10px; | |||
| width: 100%; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .cart_list ul li { | |||
| list-style: none; | |||
| width: 100%; | |||
| padding-right: 10px; | |||
| position: relative; | |||
| padding-left: 25px; | |||
| border-bottom: 1px solid #d7d5e4; | |||
| padding-bottom: 20px; | |||
| padding-top: 20px; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .cart_list ul li .close { | |||
| background-image: url("../../assets/close.png"); | |||
| width: 15px; | |||
| height: 15px; | |||
| background-position: center; | |||
| background-repeat: no-repeat; | |||
| position: absolute; | |||
| top: 55px; | |||
| left: 0px; | |||
| background-size: cover; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .cart_list ul li .cart_image { | |||
| width: 90px; | |||
| height: 90px; | |||
| background-color: #a8a8a8; | |||
| border-radius: 8px; | |||
| float: left; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .cart_list ul li .cart_image img { | |||
| width: 100%; | |||
| height: 100%; | |||
| -o-object-fit: cover; | |||
| object-fit: cover; | |||
| -o-object-position: center; | |||
| object-position: center; | |||
| border-radius: 8px; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .cart_list ul li .cart_detail { | |||
| float: left; | |||
| width: calc(100% - 120px); | |||
| padding-left: 15px; | |||
| padding-top: 5px; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .cart_list ul li .cart_detail h4 { | |||
| margin: 0px; | |||
| padding: 0px; | |||
| color: #b0aec7; | |||
| text-align: left; | |||
| font-size: 16px; | |||
| overflow: hidden; | |||
| white-space: nowrap; | |||
| text-overflow: ellipsis; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .cart_list ul li .cart_detail h5 { | |||
| margin: 0px; | |||
| padding: 0px; | |||
| color: #3b394d; | |||
| text-align: left; | |||
| font-weight: bolder; | |||
| font-size: 20px; | |||
| padding-top: 10px; | |||
| overflow: hidden; | |||
| white-space: nowrap; | |||
| text-overflow: ellipsis; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .cart_list ul li .cart_count { | |||
| width: 30px; | |||
| float: left; | |||
| height: 90px; | |||
| padding-top: 35px; | |||
| padding-bottom: 35px; | |||
| border: 1px solid #d7d5e4; | |||
| border-radius: 20px; | |||
| color: #d7d5e4; | |||
| font-size: 20px; | |||
| position: relative; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .cart_list ul li .cart_count .add { | |||
| position: absolute; | |||
| top: 0px; | |||
| left: 0px; | |||
| right: 0px; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .cart_list ul li .cart_count .remove { | |||
| position: absolute; | |||
| bottom: 0px; | |||
| left: 0px; | |||
| right: 0px; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .cart_list ul li .cart_count .count { | |||
| color: #29285b; | |||
| font-size: 16px; | |||
| font-weight: 900; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .cart_list .total_div p { | |||
| margin: 0px; | |||
| padding: 0px; | |||
| color: #29285b; | |||
| font-weight: bolder; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .order_placed_div { | |||
| width: 100%; | |||
| padding: 10px; | |||
| padding-top: 30px; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .order_placed_div img { | |||
| width: 80px; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .order_placed_div h4 { | |||
| color: #29285b; | |||
| font-weight: bolder; | |||
| margin-bottom: 5px; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .order_placed_div p { | |||
| color: #29285b; | |||
| margin: 0px; | |||
| padding: 0px; | |||
| font-size: 14px; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .order_placed_div h3 { | |||
| color: #b0aec7; | |||
| font-size: 18px; | |||
| padding-top: 20px; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .order_placed_div h1 { | |||
| color: #3b394d; | |||
| font-weight: bolder; | |||
| font-size: 35px; | |||
| margin: 0px; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .order_placed_div .view_order { | |||
| height: 45px; | |||
| border-radius: 10px; | |||
| padding-left: 20px; | |||
| padding-right: 20px; | |||
| background-color: #29285b; | |||
| color: #FFF; | |||
| margin-top: 30px; | |||
| font-size: 18px; | |||
| font-weight: 400; | |||
| } | |||
| .cart_wrapper .cart_head .cart_content .order_placed_div .home_btn { | |||
| height: 45px; | |||
| color: #29285b; | |||
| background-color: transparent; | |||
| padding-left: 20px; | |||
| padding-right: 20px; | |||
| margin-top: 30px; | |||
| font-size: 18px; | |||
| font-weight: 900; | |||
| } | |||
| .footer_btn { | |||
| width: 100%; | |||
| z-index: 999; | |||
| left: 0px; | |||
| right: 0px; | |||
| -webkit-box-shadow: 0px -2px 3px -1px rgba(0, 0, 0, 0.34); | |||
| box-shadow: 0px -2px 3px -1px rgba(0, 0, 0, 0.34); | |||
| background-color: #29285b; | |||
| text-align: center; | |||
| color: #fff; | |||
| font-size: 18px; | |||
| padding: 15px; | |||
| font-weight: 300; | |||
| border-top-left-radius: 15px; | |||
| border-top-right-radius: 15px; | |||
| } | |||
| .footer_btnbay { | |||
| width: 100%; | |||
| -webkit-box-shadow: 0px -2px 3px -1px rgba(0, 0, 0, 0.34); | |||
| box-shadow: 0px -2px 3px -1px rgba(0, 0, 0, 0.34); | |||
| z-index: 999; | |||
| left: 0px; | |||
| right: 0px; | |||
| border-radius: 15px; | |||
| } | |||
| .footer_btnbay .continue { | |||
| width: 50%; | |||
| border-top-left-radius: 15px; | |||
| text-align: center; | |||
| font-size: 18px; | |||
| padding: 15px; | |||
| font-weight: 300; | |||
| float: left; | |||
| border-top: 1px solid #d7d5e4; | |||
| border-left: 1px solid #d7d5e4; | |||
| } | |||
| .footer_btnbay .checkout { | |||
| width: 50%; | |||
| border-top-right-radius: 15px; | |||
| background-color: #29285b; | |||
| border: 1px solid #29285b; | |||
| text-align: center; | |||
| color: #fff; | |||
| font-size: 18px; | |||
| padding: 15px; | |||
| font-weight: 300; | |||
| float: right; | |||
| } | |||
| .sort_wrappper { | |||
| height: 100vh; | |||
| width: 100%; | |||
| background: #fff; | |||
| top: 0px; | |||
| left: 0px; | |||
| right: 0px; | |||
| bottom: 0px; | |||
| z-index: 99; | |||
| } | |||
| .sort_wrappper agm-map { | |||
| width: 100%; | |||
| height: 100vh; | |||
| } | |||
| .sort_wrappper .add_address_wrapper { | |||
| position: fixed; | |||
| bottom: 0px; | |||
| left: 0px; | |||
| right: 0px; | |||
| padding: 20px; | |||
| border-top-left-radius: 15px; | |||
| border-top-right-radius: 15px; | |||
| background: #fff; | |||
| -webkit-box-shadow: 0px -2px 5px 0px rgba(0, 0, 0, 0.2); | |||
| box-shadow: 0px -2px 5px 0px rgba(0, 0, 0, 0.2); | |||
| } | |||
| .sort_wrappper .add_address_wrapper h5 { | |||
| color: #29285b; | |||
| margin: 0px; | |||
| padding: 0px; | |||
| font-weight: 800; | |||
| } | |||
| .sort_wrappper .add_address_wrapper ul { | |||
| margin: 0px; | |||
| padding: 0px; | |||
| padding-top: 30px; | |||
| } | |||
| .sort_wrappper .add_address_wrapper ul li { | |||
| list-style: none; | |||
| margin-bottom: 15px; | |||
| } | |||
| .sort_wrappper .add_address_wrapper ul li p { | |||
| margin: 0px; | |||
| padding: 0px; | |||
| color: #b0aec7; | |||
| padding-top: 5px; | |||
| padding-bottom: 5px; | |||
| } | |||
| .sort_wrappper .add_address_wrapper ul li .styled-checkbox { | |||
| position: absolute; | |||
| opacity: 0; | |||
| } | |||
| .sort_wrappper .add_address_wrapper ul li .styled-checkbox + label { | |||
| position: relative; | |||
| cursor: pointer; | |||
| padding: 0; | |||
| width: 100%; | |||
| } | |||
| .sort_wrappper .add_address_wrapper ul li .styled-checkbox + label:before { | |||
| content: ''; | |||
| margin-right: 10px; | |||
| display: inline-block; | |||
| vertical-align: text-top; | |||
| width: 20px; | |||
| height: 20px; | |||
| border-radius: 50%; | |||
| background: white; | |||
| border: 1px solid #d7d5e4; | |||
| } | |||
| .sort_wrappper .add_address_wrapper ul li .styled-checkbox:checked + label:before { | |||
| background: #29285b; | |||
| } | |||
| .sort_wrappper .add_address_wrapper ul li .styled-checkbox:disabled + label { | |||
| color: #b8b8b8; | |||
| cursor: auto; | |||
| } | |||
| .sort_wrappper .add_address_wrapper ul li .styled-checkbox:disabled + label:before { | |||
| -webkit-box-shadow: none; | |||
| box-shadow: none; | |||
| background: #ddd; | |||
| } | |||
| .sort_wrappper .add_address_wrapper ul li .styled-checkbox:checked + label:after { | |||
| content: ''; | |||
| position: absolute; | |||
| left: 6px; | |||
| top: 10px; | |||
| background: white; | |||
| width: 2px; | |||
| height: 2px; | |||
| -webkit-box-shadow: 2px 0 0 white, 4px 0 0 white, 4px -2px 0 white, 4px -4px 0 white, 4px -6px 0 white, 4px -8px 0 white; | |||
| box-shadow: 2px 0 0 white, 4px 0 0 white, 4px -2px 0 white, 4px -4px 0 white, 4px -6px 0 white, 4px -8px 0 white; | |||
| -webkit-transform: rotate(45deg); | |||
| transform: rotate(45deg); | |||
| } | |||
| /*# sourceMappingURL=cart.page.css.map */ | |||
| \ No newline at end of file |
src/app/cart/cart.page.css.map
0 → 100644
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
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