conflix
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,12 +3,17 @@ |
| <ion-menu> | ||
| <ion-content> | ||
| <div class="side_menu_wrapper"> | ||
| <<<<<<< HEAD | ||
| <ion-menu-toggle> | ||
| <div class="top_banner" (click)="goToPage('profile')"> | ||
| ======= | ||
| <ion-menu-toggle *ngIf="userData"> | ||
| <div class="top_banner"> | ||
| >>>>>>> b35f226916e6e5b4feacc30b355445f087230416 | ||
| <div class="top_image"></div> | ||
| <div class="top_detail"> | ||
| <h4>John Doe</h4> | ||
| <p>[email protected]</p> | ||
| <h4>{{userData.name}}</h4> | ||
| <p>{{userData.emailId}}</p> | ||
| </div> | ||
| <div class="clear"></div> | ||
| </div> | ||
| ... | ... | @@ -95,7 +100,7 @@ |
| class="icon_sec m6_icon" | ||
| [class.m6_icon_act]="sec_active6" | ||
| (click)="setActive6()" | ||
| ></div> | ||
| menuClose></div> | ||
| </li> | ||
| </ul> | ||
| </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
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
| ... | ... | @@ -3,21 +3,19 @@ |
| <div class="cart_head"> | ||
| <div class="nav_header"> | ||
| <button class="nav_btn nav_back_white floatLeft" (click)="goBack()"> | ||
| <img src="../assets/arrow_white.png"> | ||
| <img src="../assets/arrow_white.png" /> | ||
| </button> | ||
| <div class="nav_title floatLeft"> | ||
| <h4></h4> | ||
| </div> | ||
| <button class="nav_btn floatRight"> | ||
| </button> | ||
| <button class="nav_btn floatRight"></button> | ||
| <div class="clear"></div> | ||
| </div> | ||
| <img src="../assets/white_tick.png"> | ||
| <img src="../assets/white_tick.png" /> | ||
| <h4>ORDER IS PLACED</h4> | ||
| <p>{{ data.bookDate.seconds * 1000 | date:'MMMM dd, y' }}</p> | ||
| </div> | ||
| <div class="order_status"> | ||
| <div class="clear"></div> | ||
| <div class="status_div go_green"> | ||
| <h4>Order Placed</h4> | ||
| ... | ... | @@ -61,33 +59,48 @@ |
| <ul> | ||
| <li (click)="goToPage('productlist')"> | ||
| <div class="nearby_image"> | ||
| <img src="../assets/[email protected]"> | ||
| <img | ||
| [src]="data.product[0].image" | ||
| onerror="this.src='../assets/[email protected]'" | ||
| /> | ||
| </div> | ||
| <div class="nearby_detail"> | ||
| <h5> | ||
| <span class="floatLeft">{{data.shopperName}}</span> | ||
| <span class="floatRight">0 | ||
| <img src="../assets/Path61_2.png"> | ||
| <span class="floatRight" | ||
| >{{data.product[0].qty}} | ||
| <img src="../assets/Path61_2.png" /> | ||
| </span> | ||
| <div class="clear"></div> | ||
| </h5> | ||
| <p>Men's & Women's Fashion</p> | ||
| <p class="prodName">{{data.product[0].prodName}}</p> | ||
| </div> | ||
| <div class="clear"></div> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| <div class="product_detail" *ngFor="let product of data.product"> | ||
| <h6>{{product.color}}, {{product.size}}</h6> | ||
| <h6> | ||
| <span *ngIf="product.color !== 'No-Color'">{{product.color}}, </span> | ||
| <span *ngIf="product.size !== 'Any-Size'">{{product.size}}</span> | ||
| </h6> | ||
| <h5>Quantity : <span>{{product.qty}}</span></h5> | ||
| <h5>Amount : <strong>A$ {{product.price}}</strong><span class="afterpay">COD</span></h5> | ||
| <h5>Delivery time : <span>Delivery in 1 hour</span></h5> | ||
| <h4>DELIVERY</h4> | ||
| <h5> | ||
| {{deliveryAddress}} | ||
| Amount : <strong>A$ {{product.price}}</strong | ||
| ><span class="afterpay">COD</span> | ||
| </h5> | ||
| <button class="cancel_btn" (click)="goToPage('ordercancelled')">CANCEL THIS ORDER</button> | ||
| <hr> | ||
| <h5>Delivery time : <span>{{deliveryTime}}</span></h5> | ||
| <h4>DELIVERY</h4> | ||
| <h5 *ngIf="data.deliveryAddress"> | ||
| {{data.deliveryAddress.addressType}},<br />{{data.deliveryAddress.address}}, | ||
| <br /> | ||
| {{data.deliveryAddress.building}}, <br /> | ||
| {{data.deliveryAddress.landmark}} | ||
| </h5> | ||
| <button class="cancel_btn" (click)="goToPage('ordercancelled')"> | ||
| CANCEL THIS ORDER | ||
| </button> | ||
| <hr /> | ||
| </div> | ||
| <!-- <div class="related_product_slider"> | ||
| ... | ... |
| ... | ... | @@ -4,7 +4,7 @@ |
| width: 100%; | ||
| height: 240px; | ||
| text-align: center; | ||
| background-image: url("../../assets/[email protected]"); | ||
| background-image: url('../../assets/[email protected]'); | ||
| background-position: center bottom; | ||
| background-repeat: no-repeat; | ||
| background-size: cover; | ||
| ... | ... | @@ -13,7 +13,7 @@ |
| background-color: transparent; | ||
| .nav_title { | ||
| h4 { | ||
| color: #FFF; | ||
| color: #fff; | ||
| } | ||
| } | ||
| } | ||
| ... | ... | @@ -41,7 +41,7 @@ |
| border-radius: 5px; | ||
| height: 40px; | ||
| background-color: #29285b; | ||
| color: #FFF; | ||
| color: #fff; | ||
| font-size: 18px; | ||
| font-weight: lighter; | ||
| padding-left: 20px; | ||
| ... | ... | @@ -164,7 +164,7 @@ |
| height: 45px; | ||
| width: 100%; | ||
| background-color: #29285b; | ||
| color: #FFF; | ||
| color: #fff; | ||
| font-size: 18px; | ||
| font-weight: lighter; | ||
| padding-left: 20px; | ||
| ... | ... | @@ -220,7 +220,7 @@ |
| font-size: 27px; | ||
| width: 30px; | ||
| height: 30px; | ||
| background-image: url("../../assets/Group32_2.png"); | ||
| background-image: url('../../assets/Group32_2.png'); | ||
| background-position: center; | ||
| background-repeat: no-repeat; | ||
| background-size: 24px; | ||
| ... | ... | @@ -254,7 +254,7 @@ |
| span { | ||
| text-decoration: line-through; | ||
| margin-left: 10px; | ||
| color: rgba(215, 213, 228, 1) | ||
| color: rgba(215, 213, 228, 1); | ||
| } | ||
| .offer { | ||
| color: #fff; | ||
| ... | ... | @@ -269,3 +269,10 @@ |
| } | ||
| } | ||
| } | ||
| .prodName { | ||
| white-space: nowrap; | ||
| width: 200px; | ||
| overflow: hidden; | ||
| text-overflow: ellipsis; | ||
| } |
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
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
| ... | ... | @@ -3,7 +3,11 @@ import { User, Signup, Address } from './services/user'; |
| import { auth } from 'firebase/app'; | ||
| import { Router, ActivatedRoute } from '@angular/router'; | ||
| import { AngularFireAuth } from '@angular/fire/auth'; | ||
| import { AngularFirestore, AngularFirestoreDocument, AngularFirestoreCollection } from '@angular/fire/firestore'; | ||
| import { | ||
| AngularFirestore, | ||
| AngularFirestoreDocument, | ||
| AngularFirestoreCollection | ||
| } from '@angular/fire/firestore'; | ||
| import { ServiceService } from './../config/service.service'; | ||
| import { SubjectService } from './../config/subject.service'; | ||
| import { GooglePlus } from '@ionic-native/google-plus/ngx'; | ||
| ... | ... | @@ -14,10 +18,6 @@ import { from } from 'rxjs'; |
| providedIn: 'root' | ||
| }) | ||
| export class AuthService { | ||
| userData: any; | ||
| type: number; | ||
| userPostData: any; | ||
| constructor( | ||
| public afs: AngularFirestore, | ||
| public afAuth: AngularFireAuth, | ||
| ... | ... | @@ -33,6 +33,7 @@ export class AuthService { |
| this.userData = user; | ||
| console.log(this.userData); | ||
| this.service.set('user', JSON.stringify(this.userData)); | ||
| this.SetUserData(user); | ||
| if (this.type === 1) { | ||
| this.router.navigateByUrl('home'); | ||
| } else { | ||
| ... | ... | @@ -47,12 +48,25 @@ export class AuthService { |
| }); | ||
| } | ||
| get isLoggedIn(): boolean { | ||
| const user = JSON.parse(localStorage.getItem('user')); | ||
| return user !== null && user.emailVerified !== false ? true : false; | ||
| } | ||
| userData: any; | ||
| type: number; | ||
| userPostData: any; | ||
| loggedUser: any; | ||
| public asyc; | ||
| public async SignIn(email: string, password: string) { | ||
| return this.afAuth.auth.signInWithEmailAndPassword(email, password).then((result) => { | ||
| return this.afAuth.auth | ||
| .signInWithEmailAndPassword(email, password) | ||
| .then(result => { | ||
| console.log('success'); | ||
| document.body.scrollTop = document.documentElement.scrollTop = 0; | ||
| this.SetUserData(result.user); | ||
| }).catch((error) => { | ||
| }) | ||
| .catch(error => { | ||
| window.alert(error.message); | ||
| }); | ||
| } | ||
| ... | ... | @@ -61,49 +75,66 @@ export class AuthService { |
| console.log(this.userData.uid, otp); | ||
| // tslint:disable-next-line:radix | ||
| // const otpnew = parseInt(otp); | ||
| const custRef: AngularFirestoreCollection<any> = this.afs.collection('customers', ref => ref.where('otp', '==', otp) | ||
| .where('uid', '==', this.userData.uid) | ||
| const custRef: AngularFirestoreCollection<any> = this.afs.collection( | ||
| 'customers', | ||
| ref => ref.where('otp', '==', otp).where('uid', '==', this.userData.uid) | ||
| ); | ||
| custRef.valueChanges().pipe(take(1)).subscribe((value: User[]) => { | ||
| custRef | ||
| .valueChanges() | ||
| .pipe(take(1)) | ||
| .subscribe((value: User[]) => { | ||
| if (value.length > 0) { | ||
| this.afs.collection('customers').doc(this.userData.uid).update({otp: ''}); | ||
| this.afs | ||
| .collection('customers') | ||
| .doc(this.userData.uid) | ||
| .update({ otp: '', phoneVerified: true }); | ||
| this.service.set('type', 1); | ||
| this.router.navigateByUrl('nearby'); | ||
| } else { | ||
| window.alert('Please input valid OTP'); | ||
| } | ||
| }); | ||
| } | ||
| profilePic(pic) { | ||
| this.afs | ||
| .collection('customers') | ||
| .doc(this.userData.uid) | ||
| .update({ profilePhoto: pic }); | ||
| } | ||
| public async google(type: number) { | ||
| this.type = type; | ||
| // this.googlePlus.login({}).then(res => console.log(res)).catch(err => console.error(err)); | ||
| this.afAuth.auth.signInWithPopup(new auth.GoogleAuthProvider()).then((result) => { | ||
| this.afAuth.auth | ||
| .signInWithPopup(new auth.GoogleAuthProvider()) | ||
| .then(result => { | ||
| console.log('success'); | ||
| console.log(result); | ||
| console.log(result.additionalUserInfo.isNewUser); | ||
| if ( | ||
| result.additionalUserInfo && | ||
| result.additionalUserInfo.isNewUser === true | ||
| ) { | ||
| this.socialSignUp(result); | ||
| } | ||
| }); | ||
| } | ||
| public async facebook(type: number) { | ||
| this.type = type; | ||
| this.afAuth.auth.signInWithPopup(new auth.FacebookAuthProvider()).then((result) => { | ||
| this.afAuth.auth | ||
| .signInWithPopup(new auth.FacebookAuthProvider()) | ||
| .then(result => { | ||
| console.log('success'); | ||
| console.log(result); | ||
| }); | ||
| } | ||
| get isLoggedIn(): boolean { | ||
| const user = JSON.parse(localStorage.getItem('user')); | ||
| return(user !== null && user.emailVerified !== false) ? true : false; | ||
| } | ||
| SetUserData(user: any) { | ||
| const userRef: AngularFirestoreDocument<any> = this.afs.doc(`customers/${user.uid}`); | ||
| userRef.valueChanges().subscribe((value) => { | ||
| const userRef: AngularFirestoreDocument<any> = this.afs.doc( | ||
| `customers/${user.uid}` | ||
| ); | ||
| userRef.valueChanges().subscribe(value => { | ||
| const userData: User = { | ||
| uid: value.uid, | ||
| emailId: value.emailId, | ||
| ... | ... | @@ -117,7 +148,9 @@ export class AuthService { |
| otp: value.otp, | ||
| loginType: value.loginType | ||
| }; | ||
| console.log(userData); | ||
| this.loggedUser = userData; | ||
| this.service.set('userData', JSON.stringify(this.loggedUser)); | ||
| console.log(this.loggedUser); | ||
| }); | ||
| } | ||
| ... | ... | @@ -154,7 +187,11 @@ export class AuthService { |
| }; | ||
| this.userPostData = postData; | ||
| console.log(postData); | ||
| this.afs.collection('customers').doc(userData.uid).set(postData).then(() => { | ||
| this.afs | ||
| .collection('customers') | ||
| .doc(userData.uid) | ||
| .set(postData) | ||
| .then(() => { | ||
| console.log('successs'); | ||
| }); | ||
| } | ||
| ... | ... | @@ -163,7 +200,9 @@ export class AuthService { |
| this.type = 2; | ||
| console.log(userData); | ||
| const otp = Math.floor(1000 + Math.random() * 9000); | ||
| this.afAuth.auth.createUserWithEmailAndPassword(userData.emailId, userData.password).then((result) => { | ||
| this.afAuth.auth | ||
| .createUserWithEmailAndPassword(userData.emailId, userData.password) | ||
| .then(result => { | ||
| console.log(result.user); | ||
| this.afAuth.auth.currentUser.sendEmailVerification(); | ||
| const currencyData = { | ||
| ... | ... | @@ -187,10 +226,15 @@ export class AuthService { |
| }; | ||
| this.userPostData = postData; | ||
| console.log(postData); | ||
| this.afs.collection('customers').doc(custData.uid).set(postData).then(() => { | ||
| this.afs | ||
| .collection('customers') | ||
| .doc(custData.uid) | ||
| .set(postData) | ||
| .then(() => { | ||
| console.log('successs'); | ||
| }); | ||
| }).catch((error) => { | ||
| }) | ||
| .catch(error => { | ||
| window.alert(error.message); | ||
| }); | ||
| } | ||
| ... | ... | @@ -199,9 +243,12 @@ export class AuthService { |
| console.log(addressData); | ||
| console.log(this.userData.uid); | ||
| this.afs.collection('address').add({ | ||
| this.afs | ||
| .collection('address') | ||
| .add({ | ||
| uid: this.userData.uid | ||
| }).then((docRef) => { | ||
| }) | ||
| .then(docRef => { | ||
| console.log(docRef); | ||
| const addrData = { | ||
| uid: this.userData.uid, | ||
| ... | ... | @@ -220,7 +267,11 @@ export class AuthService { |
| }; | ||
| const neworderId = docRef.id; | ||
| console.log(addrData); | ||
| this.afs.collection('address').doc(neworderId).set(addrData).then(() => { | ||
| this.afs | ||
| .collection('address') | ||
| .doc(neworderId) | ||
| .set(addrData) | ||
| .then(() => { | ||
| console.log('Address add Successfully'); | ||
| this.service.set('user', JSON.stringify(this.userData)); | ||
| this.router.navigateByUrl('home'); | ||
| ... | ... | @@ -231,14 +282,9 @@ export class AuthService { |
| } | ||
| } | ||
| /*displayName: "Adarsh Techware" | ||
| email: "[email protected]" | ||
| emailVerified: true | ||
| : "https://lh4.googleusercontent.com/-h0rs2pE-Azw/AAAAAAAAAAI/AAAAAAAAAAA/ACHi3rcjNtapRhKoG09NKifQsv_lQPC_2A/photo.jpg" | ||
| : "vT498Fz6X0Z6l5l5iNn5hxfwz692" | ||
| providerData: [Gl]*/ | ||
src/theme/variables.css
0 → 100644
src/theme/variables.css.map
0 → 100644
Please
register
or
sign in
to comment