fix design

src/app/addaddresss/addaddresss.page.css

+.login_wrapper {
+  width: 80%;
+  margin: 0 auto;
+  padding-top: 30px;
+}
+
+.login_wrapper .logo_wrapper {
+  width: 100%;
+  text-align: center;
+  padding-top: 50px;
+  padding-bottom: 30px;
+}
+
+.login_wrapper .logo_wrapper img {
+  width: 180px;
+}
+
+.login_wrapper h6 {
+  color: #29285b;
+  margin: 0px;
+}
+
+.login_wrapper h6 span {
+  position: relative;
+  top: 2px;
+}
+
+.login_wrapper h6 a {
+  color: #29285b;
+  text-decoration: none;
+  font-weight: 900;
+}
+
+.login_wrapper h6 .styled-checkbox {
+  position: absolute;
+  opacity: 0;
+}
+
+.login_wrapper h6 .styled-checkbox + label {
+  position: relative;
+  cursor: pointer;
+  padding: 0;
+}
+
+.login_wrapper h6 .styled-checkbox + label:before {
+  content: '';
+  margin-right: 10px;
+  display: inline-block;
+  vertical-align: text-top;
+  width: 20px;
+  height: 20px;
+  border-radius: 10px;
+  background: white;
+  border: 1px solid #d7d5e4;
+}
+
+.login_wrapper h6 .styled-checkbox:checked + label:before {
+  background: #29285b;
+}
+
+.login_wrapper h6 .styled-checkbox:disabled + label {
+  color: #b8b8b8;
+  cursor: auto;
+}
+
+.login_wrapper h6 .styled-checkbox:disabled + label:before {
+  -webkit-box-shadow: none;
+          box-shadow: none;
+  background: #ddd;
+}
+
+.login_wrapper h6 .styled-checkbox:checked + label:after {
+  content: '';
+  position: absolute;
+  left: 6px;
+  top: 11px;
+  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);
+}
+
+.login_wrapper .form_div .row {
+  margin-bottom: 20px;
+}
+
+.login_wrapper .form_div .row input {
+  border: 1px solid #d7d5e4;
+  background: transparent;
+  color: #d7d5e4;
+  width: 100%;
+  height: 45px;
+  text-align: left;
+  border-radius: 8px;
+  font-size: 16px;
+  padding-left: 15px;
+  padding-right: 15px;
+}
+
+.login_wrapper .form_div .row .login_btn {
+  width: 100%;
+  background-color: #29285b;
+  color: #fff;
+  border-radius: 8px;
+  height: 45px;
+  font-size: 16px;
+}
+
+.login_wrapper .form_div .row hr {
+  border: 1px solid #d7d5e4;
+  border-bottom: none;
+  margin-top: 30px;
+  margin-bottom: 10px;
+}
+
+.login_wrapper .form_div .row P {
+  text-align: center;
+  color: #3b394d;
+  margin: 0px;
+  position: relative;
+  bottom: 20px;
+}
+
+.login_wrapper .form_div .row P span {
+  background-color: #fff;
+  padding: 10px;
+  font-size: 18px;
+}
+
+.login_wrapper .form_div .row h4 {
+  color: #3b394d;
+  text-align: center;
+  margin: 0px;
+  padding-top: 15px;
+}
+
+.login_wrapper .form_div .row h6 {
+  color: #29285b;
+  margin: 0px;
+}
+
+.login_wrapper .form_div .row h6 span {
+  position: relative;
+  top: 5px;
+}
+
+.login_wrapper .form_div .row h6 a {
+  color: #29285b;
+  text-decoration: none;
+  font-weight: 900;
+}
+
+.login_wrapper .form_div .row h6 .styled-checkbox {
+  position: absolute;
+  opacity: 0;
+}
+
+.login_wrapper .form_div .row h6 .styled-checkbox + label {
+  position: relative;
+  cursor: pointer;
+  padding: 0;
+}
+
+.login_wrapper .form_div .row h6 .styled-checkbox + label:before {
+  content: '';
+  margin-right: 10px;
+  display: inline-block;
+  vertical-align: text-top;
+  width: 20px;
+  height: 20px;
+  border-radius: 10px;
+  background: white;
+  border: 1px solid #d7d5e4;
+}
+
+.login_wrapper .form_div .row h6 .styled-checkbox:checked + label:before {
+  background: #29285b;
+}
+
+.login_wrapper .form_div .row h6 .styled-checkbox:disabled + label {
+  color: #b8b8b8;
+  cursor: auto;
+}
+
+.login_wrapper .form_div .row h6 .styled-checkbox:disabled + label:before {
+  -webkit-box-shadow: none;
+          box-shadow: none;
+  background: #ddd;
+}
+
+.login_wrapper .form_div .row h6 .styled-checkbox:checked + label:after {
+  content: '';
+  position: absolute;
+  left: 10px;
+  top: 15px;
+  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);
+}
+
+.login_wrapper .form_div .row .social_div {
+  border: 1px solid #d7d5e4;
+  height: 45px;
+  border-radius: 20px;
+}
+
+.login_wrapper .form_div .row .social_div .social_btn {
+  display: inline-block;
+  width: 50%;
+  text-align: center;
+  height: 100%;
+  font-size: 18px;
+  padding: 9px;
+}
+/*# sourceMappingURL=addaddresss.page.css.map */
\ No newline at end of file

src/app/addaddresss/addaddresss.page.css.map

+{
+    "version": 3,
+    "mappings": "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",
+    "sources": [
+        "addaddresss.page.scss"
+    ],
+    "names": [],
+    "file": "addaddresss.page.css"
+}
\ No newline at end of file

src/app/addcard/addcard.page.css

+.login_wrapper {
+  width: 80%;
+  margin: 0 auto;
+  padding-top: 30px;
+}
+
+.login_wrapper .logo_wrapper {
+  width: 100%;
+  text-align: center;
+  padding-top: 50px;
+  padding-bottom: 30px;
+}
+
+.login_wrapper .logo_wrapper img {
+  width: 180px;
+}
+
+.login_wrapper h6 {
+  color: #29285b;
+  margin: 0px;
+}
+
+.login_wrapper h6 span {
+  position: relative;
+  top: 2px;
+}
+
+.login_wrapper h6 a {
+  color: #29285b;
+  text-decoration: none;
+  font-weight: 900;
+}
+
+.login_wrapper h6 .styled-checkbox {
+  position: absolute;
+  opacity: 0;
+}
+
+.login_wrapper h6 .styled-checkbox + label {
+  position: relative;
+  cursor: pointer;
+  padding: 0;
+}
+
+.login_wrapper h6 .styled-checkbox + label:before {
+  content: '';
+  margin-right: 10px;
+  display: inline-block;
+  vertical-align: text-top;
+  width: 20px;
+  height: 20px;
+  border-radius: 10px;
+  background: white;
+  border: 1px solid #d7d5e4;
+}
+
+.login_wrapper h6 .styled-checkbox:checked + label:before {
+  background: #29285b;
+}
+
+.login_wrapper h6 .styled-checkbox:disabled + label {
+  color: #b8b8b8;
+  cursor: auto;
+}
+
+.login_wrapper h6 .styled-checkbox:disabled + label:before {
+  -webkit-box-shadow: none;
+          box-shadow: none;
+  background: #ddd;
+}
+
+.login_wrapper h6 .styled-checkbox:checked + label:after {
+  content: '';
+  position: absolute;
+  left: 6px;
+  top: 11px;
+  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);
+}
+
+.login_wrapper .form_div .row {
+  margin-bottom: 20px;
+}
+
+.login_wrapper .form_div .row input {
+  border: 1px solid #d7d5e4;
+  background: transparent;
+  color: #d7d5e4;
+  width: 100%;
+  height: 45px;
+  text-align: left;
+  border-radius: 8px;
+  font-size: 16px;
+  padding-left: 15px;
+  padding-right: 15px;
+  text-align: center;
+}
+
+.login_wrapper .form_div .row .login_btn {
+  width: 100%;
+  background-color: #29285b;
+  color: #fff;
+  border-radius: 8px;
+  height: 45px;
+  font-size: 16px;
+}
+
+.login_wrapper .form_div .row hr {
+  border: 1px solid #d7d5e4;
+  border-bottom: none;
+  margin-top: 30px;
+  margin-bottom: 10px;
+}
+
+.login_wrapper .form_div .row P {
+  text-align: left;
+  color: #3b394d;
+  margin: 0px;
+  font-weight: 500;
+  padding-bottom: 10px;
+}
+
+.login_wrapper .form_div .row P span {
+  background-color: #fff;
+  padding: 10px;
+  font-size: 18px;
+}
+
+.login_wrapper .form_div .row h4 {
+  color: #3b394d;
+  text-align: center;
+  margin: 0px;
+  padding-top: 15px;
+}
+
+.login_wrapper .form_div .row h6 {
+  color: #29285b;
+  margin: 0px;
+}
+
+.login_wrapper .form_div .row h6 span {
+  position: relative;
+  top: 5px;
+}
+
+.login_wrapper .form_div .row h6 a {
+  color: #29285b;
+  text-decoration: none;
+  font-weight: 900;
+}
+
+.login_wrapper .form_div .row h6 .styled-checkbox {
+  position: absolute;
+  opacity: 0;
+}
+
+.login_wrapper .form_div .row h6 .styled-checkbox + label {
+  position: relative;
+  cursor: pointer;
+  padding: 0;
+}
+
+.login_wrapper .form_div .row h6 .styled-checkbox + label:before {
+  content: '';
+  margin-right: 10px;
+  display: inline-block;
+  vertical-align: text-top;
+  width: 20px;
+  height: 20px;
+  border-radius: 10px;
+  background: white;
+  border: 1px solid #d7d5e4;
+}
+
+.login_wrapper .form_div .row h6 .styled-checkbox:checked + label:before {
+  background: #29285b;
+}
+
+.login_wrapper .form_div .row h6 .styled-checkbox:disabled + label {
+  color: #b8b8b8;
+  cursor: auto;
+}
+
+.login_wrapper .form_div .row h6 .styled-checkbox:disabled + label:before {
+  -webkit-box-shadow: none;
+          box-shadow: none;
+  background: #ddd;
+}
+
+.login_wrapper .form_div .row h6 .styled-checkbox:checked + label:after {
+  content: '';
+  position: absolute;
+  left: 10px;
+  top: 15px;
+  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);
+}
+
+.login_wrapper .form_div .row .social_div {
+  border: 1px solid #d7d5e4;
+  height: 45px;
+  border-radius: 20px;
+}
+
+.login_wrapper .form_div .row .social_div .social_btn {
+  display: inline-block;
+  width: 50%;
+  text-align: center;
+  height: 100%;
+  font-size: 18px;
+  padding: 9px;
+}
+/*# sourceMappingURL=addcard.page.css.map */
\ No newline at end of file

src/app/addcard/addcard.page.css.map

+{
+    "version": 3,
+    "mappings": "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",
+    "sources": [
+        "addcard.page.scss"
+    ],
+    "names": [],
+    "file": "addcard.page.css"
+}
\ No newline at end of file

src/app/address/address.page.html

 <div class="nav_header">
-    <button class="nav_btn nav_back floatLeft" (click)="goBack()">
-    <img src="../assets/Group17_2.png">
+  <button class="nav_btn nav_back floatLeft" (click)="goBack()">
+    <img src="../assets/Group17_2.png" />
   </button>
-    <div class="nav_title floatLeft">
-        <h4>Address</h4>
-    </div>
-    <div class="clear"></div>
+  <div class="nav_title floatLeft">
+    <h4>Address</h4>
+  </div>
+  <div class="clear"></div>
 </div>
 
 <ion-content>
-    <div class="address-wrapper">
-        <ion-grid>
-            <ion-row>
-                <ion-col size="1">
-                    <input type="radio" class="address-radio" name="address" checked>
-                </ion-col>
-                <ion-col size="9">
-                    <h1>Shamjith KS</h1>
-                    <h1>+00 0000 888 888</h1>
-                    <p>Carnival Infopark, Infopark Kochi 682030, Kerala, India</p>
-                </ion-col>
-                <ion-col size="2"><button class="show-btn"><img src="../../assets/delete.png"></button></ion-col>
-            </ion-row>
-        </ion-grid>
-        <ion-grid>
-            <ion-row>
-                <ion-col size="1">
-                    <input type="radio" class="address-radio" name="address">
-                </ion-col>
-                <ion-col size="9">
-                    <h1>Shamjith KS</h1>
-                    <h1>+00 0000 888 888</h1>
-                    <p>Carnival Infopark, Infopark Kochi 682030, Kerala, India</p>
-                </ion-col>
-                <ion-col size="2"><button><img src="../../assets/delete.png"></button></ion-col>
-            </ion-row>
-        </ion-grid>
-        <div class="address-btn-wrapper"><button class="show-btn">Add New Address</button></div>
-
+  <div class="address-wrapper" *ngIf="addressService.addressList">
+    <ion-grid *ngFor="let address of addressService.addressList; let i = index">
+      <ion-row>
+        <ion-col size="1">
+          <input
+            type="radio"
+            id="address_{{i}}"
+            class="address-radio"
+            name="address"
+            [checked]="address.defaultVal == 1"
+          />
+        </ion-col>
+        <ion-col size="9">
+          <h1>{{address.addressType}}</h1>
+          <h1>{{address.address}}</h1>
+          <p>{{address.building}}, {{address.landmark}}</p>
+        </ion-col>
+        <ion-col size="2" [hidden]="address.defaultVal == 1"
+          ><button
+            class="show-btn"
+            (click)="addressService.deleteAddress(address.addressId)"
+          >
+            <img src="../../assets/delete.png" /></button
+        ></ion-col>
+      </ion-row>
+    </ion-grid>
+    <div class="address-btn-wrapper">
+      <button class="show-btn" (click)="goToPage('nearby')">
+        Add New Address
+      </button>
     </div>
-
-</ion-content>
+  </div>
+</ion-content>
\ No newline at end of file

src/app/address/address.page.ts

 import { Component, OnInit } from '@angular/core';
+import { AddressService } from './../../config/address.service';
+import { Router, ActivatedRoute } from '@angular/router';
+import { Location } from '@angular/common';
 
 @Component({
   selector: 'app-address',
   templateUrl: './address.page.html',
-  styleUrls: ['./address.page.scss'],
+  styleUrls: ['./address.page.scss']
 })
 export class AddressPage implements OnInit {
+  constructor(
+    private location: Location,
+    public addressService: AddressService,
+    public router: Router
+  ) {}
 
-  constructor() { }
+  ngOnInit() {}
 
-  ngOnInit() {
+  goBack() {
+    this.location.back();
   }
 
+  goToPage(path, data = null) {
+    this.router.navigateByUrl(path, { queryParams: data });
+    document.body.scrollTop = document.documentElement.scrollTop = 0;
+  }
 }

src/app/app.component.css

+@import url("https://fonts.googleapis.com/css?family=Abel&display=swap");
+@import url(//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css);
+* {
+  font-family: 'Abel', sans-serif;
+  -webkit-font-smoothing: antialiased;
+}
+
+.side_menu_wrapper {
+  background: #29285b;
+  width: 100%;
+  height: 100vh;
+  padding-left: 20px;
+  padding-top: 20px;
+  padding-right: 10px;
+}
+
+.side_menu_wrapper .top_banner .top_image {
+  width: 60px;
+  height: 60px;
+  float: left;
+  background-color: #fff;
+  border-radius: 50%;
+}
+
+.side_menu_wrapper .top_banner .top_image img {
+  width: 100%;
+  height: 100%;
+  -o-object-fit: cover;
+     object-fit: cover;
+  -o-object-position: center;
+     object-position: center;
+  border-radius: 50%;
+}
+
+.side_menu_wrapper .top_banner .top_detail {
+  width: calc(100% - 60px);
+  float: left;
+  padding: 7px;
+  padding-left: 15px;
+}
+
+.side_menu_wrapper .top_banner .top_detail h4 {
+  margin: 0px;
+  padding: 0px;
+  color: #fff;
+}
+
+.side_menu_wrapper .top_banner .top_detail p {
+  margin: 0px;
+  padding: 0px;
+  color: #fff;
+  color: #b0aec7;
+}
+
+.side_menu_wrapper .sidemenu_list {
+  padding-top: 30px;
+}
+
+.side_menu_wrapper .sidemenu_list ul {
+  margin: 0px;
+  padding: 0px;
+}
+
+.side_menu_wrapper .sidemenu_list ul li {
+  list-style: none;
+  color: #fff;
+  font-weight: 200;
+  font-size: 15px;
+  padding: 10px;
+  font-size: 16px;
+}
+
+.side_menu_wrapper .sidemenu_list ul li:focus {
+  background-color: #282458;
+}
+
+.side_menu_wrapper .sidemenu_list ul li:hover {
+  background-color: #282458;
+}
+
+.side_menu_wrapper .sidemenu_list ul li .version {
+  color: #b0aec7;
+  font-size: 14px;
+}
+
+.side_menu_wrapper .sidemenu_list ul .sub_menu {
+  padding-left: 25px;
+  margin-bottom: 40px;
+  padding-top: 10px;
+}
+
+.side_menu_wrapper .sidemenu_list ul .sub_menu ul {
+  margin: 0px;
+  padding: 0px;
+}
+
+.side_menu_wrapper .sidemenu_list ul .sub_menu ul li {
+  list-style: none;
+  color: #b0aec7;
+}
+
+.common_tab {
+  position: fixed;
+  bottom: 0px;
+  left: 0px;
+  right: 0px;
+  width: 100%;
+  height: 50px;
+  background-color: #fff;
+  -webkit-box-shadow: 0px 0px 5px 7px rgba(215, 213, 228, 0.5);
+  box-shadow: 0px 0px 5px 7px rgba(215, 213, 228, 0.5);
+}
+
+.common_tab ul {
+  margin: 0px;
+  padding: 0px;
+  width: 100%;
+  height: 100%;
+}
+
+.common_tab ul li {
+  list-style: none;
+  display: inline-block;
+  width: 20%;
+  height: 100%;
+  text-align: center;
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: 25px;
+}
+
+.common_tab ul .icon_sec {
+  width: 50px;
+  height: 50px;
+  background-image: url("../assets/icon_sprite.png");
+  margin: 0 auto;
+  background-repeat: no-repeat;
+  background-size: 450px;
+}
+
+.common_tab ul .m1_icon {
+  background-position: top -6px left -249px;
+}
+
+.common_tab ul .m1_icon_act {
+  background-image: url("../assets/icon_sprite_active.png") !important;
+  background-position: top -6px left -249px;
+}
+
+.common_tab ul .m2_icon {
+  background-position: top -3px left -88px;
+}
+
+.common_tab ul .m2_icon_act {
+  background-image: url("../assets/icon_sprite_active.png") !important;
+  background-position: top -3px left -88px;
+}
+
+.common_tab ul .m3_icon {
+  background-position: top -6px left -167px;
+}
+
+.common_tab ul .m3_icon_act {
+  background-image: url("../assets/icon_sprite_active.png") !important;
+  background-position: top -6px left -167px;
+}
+
+.common_tab ul .m4_icon {
+  background-position: top -6px left -5px;
+}
+
+.common_tab ul .m4_icon_act {
+  background-image: url("../assets/icon_sprite_active.png") !important;
+  background-position: top -6px left -5px;
+}
+
+.common_tab ul .m5_icon {
+  background-position: top -6px left -325px;
+}
+
+.common_tab ul .m5_icon_act {
+  background-image: url("../assets/icon_sprite_active.png") !important;
+  background-position: top -6px left -325px;
+}
+
+.common_tab ul .m6_icon {
+  background-position: top -6px left -398px;
+}
+
+.common_tab ul .m6_icon_act {
+  background-image: url("../assets/icon_sprite_active.png") !important;
+  background-position: top -6px left -398px;
+}
+/*# sourceMappingURL=app.component.css.map */
\ No newline at end of file

src/app/app.component.css.map

+{
+    "version": 3,
+    "mappings": "AAAA,OAAO,CAAC,gEAAI;AACZ,OAAO,CAAC,sEAAI;AACZ,AAAA,CAAC,CAAC;EACA,WAAW,EAAE,kBAAkB;EAC/B,sBAAsB,EAAE,WAAW;CACpC;;AAED,AAAA,kBAAkB,CAAC;EACjB,UAAU,EAAE,OAAmB;EAC/B,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,KAAK;EACb,YAAY,EAAE,IAAI;EAClB,WAAW,EAAE,IAAI;EACjB,aAAa,EAAE,IAAI;CAwEpB;;AA9ED,AAQI,kBARc,CAOhB,WAAW,CACT,UAAU,CAAC;EACT,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,IAAI;EACX,gBAAgB,EAAE,IAAI;EACtB,aAAa,EAAE,GAAG;CAQnB;;AArBL,AAcM,kBAdY,CAOhB,WAAW,CACT,UAAU,CAMR,GAAG,CAAC;EACF,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,UAAU,EAAE,KAAK;EACjB,eAAe,EAAE,MAAM;EACvB,aAAa,EAAE,GAAG;CACnB;;AApBP,AAsBI,kBAtBc,CAOhB,WAAW,CAeT,WAAW,CAAC;EACV,KAAK,EAAE,iBAAiB;EACxB,KAAK,EAAE,IAAI;EACX,OAAO,EAAE,GAAG;EACZ,YAAY,EAAE,IAAI;CAYnB;;AAtCL,AA2BM,kBA3BY,CAOhB,WAAW,CAeT,WAAW,CAKT,EAAE,CAAC;EACD,MAAM,EAAE,GAAG;EACX,OAAO,EAAE,GAAG;EACZ,KAAK,EAAE,IAAI;CACZ;;AA/BP,AAgCM,kBAhCY,CAOhB,WAAW,CAeT,WAAW,CAUT,CAAC,CAAC;EACA,MAAM,EAAE,GAAG;EACX,OAAO,EAAE,GAAG;EACZ,KAAK,EAAE,IAAI;EACX,KAAK,EAAE,OAAsB;CAC9B;;AArCP,AAwCE,kBAxCgB,CAwChB,cAAc,CAAC;EACb,WAAW,EAAE,IAAI;CAoClB;;AA7EH,AA0CI,kBA1Cc,CAwChB,cAAc,CAEZ,EAAE,CAAC;EACD,MAAM,EAAE,GAAG;EACX,OAAO,EAAE,GAAG;CAgCb;;AA5EL,AA6CM,kBA7CY,CAwChB,cAAc,CAEZ,EAAE,CAGA,EAAE,CAAC;EACD,UAAU,EAAE,IAAI;EAChB,KAAK,EAAE,IAAI;EACX,WAAW,EAAE,GAAG;EAChB,SAAS,EAAE,IAAI;EACf,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,IAAI;CAWhB;;AA9DP,AAoDQ,kBApDU,CAwChB,cAAc,CAEZ,EAAE,CAGA,EAAE,AAOC,MAAM,CAAC;EACN,gBAAgB,EAAE,OAAmB;CACtC;;AAtDT,AAuDQ,kBAvDU,CAwChB,cAAc,CAEZ,EAAE,CAGA,EAAE,AAUC,MAAM,CAAC;EACN,gBAAgB,EAAE,OAAmB;CACtC;;AAzDT,AA0DQ,kBA1DU,CAwChB,cAAc,CAEZ,EAAE,CAGA,EAAE,CAaA,QAAQ,CAAC;EACP,KAAK,EAAE,OAAsB;EAC7B,SAAS,EAAE,IAAI;CAChB;;AA7DT,AA+DM,kBA/DY,CAwChB,cAAc,CAEZ,EAAE,CAqBA,SAAS,CAAC;EACR,YAAY,EAAE,IAAI;EAClB,aAAa,EAAE,IAAI;EACnB,WAAW,EAAE,IAAI;CASlB;;AA3EP,AAmEQ,kBAnEU,CAwChB,cAAc,CAEZ,EAAE,CAqBA,SAAS,CAIP,EAAE,CAAC;EACD,MAAM,EAAE,GAAG;EACX,OAAO,EAAE,GAAG;CAKb;;AA1ET,AAsEU,kBAtEQ,CAwChB,cAAc,CAEZ,EAAE,CAqBA,SAAS,CAIP,EAAE,CAGA,EAAE,CAAC;EACD,UAAU,EAAE,IAAI;EAChB,KAAK,EAAE,OAAsB;CAC9B;;AAOX,AAAA,WAAW,CAAC;EACV,QAAQ,EAAE,KAAK;EACf,MAAM,EAAE,GAAG;EACX,IAAI,EAAE,GAAG;EACT,KAAK,EAAE,GAAG;EACV,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,gBAAgB,EAAE,IAAI;EACtB,kBAAkB,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,wBAAwB;EAC5D,eAAe,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,wBAAwB;EACzD,UAAU,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,wBAAwB;CAmErD;;AA7ED,AAWE,WAXS,CAWT,EAAE,CAAC;EACD,MAAM,EAAE,GAAG;EACX,OAAO,EAAE,GAAG;EACZ,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;CA6Db;;AA5EH,AAgBI,WAhBO,CAWT,EAAE,CAKA,EAAE,CAAC;EACD,UAAU,EAAE,IAAI;EAChB,OAAO,EAAE,YAAY;EACrB,KAAK,EAAE,GAAG;EACV,MAAM,EAAE,IAAI;EACZ,UAAU,EAAE,MAAM;EAClB,iBAAiB,EAAE,SAAS;EAC5B,mBAAmB,EAAE,MAAM;EAC3B,eAAe,EAAE,IAAI;CACtB;;AAzBL,AA0BI,WA1BO,CAWT,EAAE,CAeA,SAAS,CAAC;EACR,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,gBAAgB,EAAE,gCAAgC;EAClD,MAAM,EAAE,MAAM;EACd,iBAAiB,EAAE,SAAS;EAC5B,eAAe,EAAE,KAAK;CACvB;;AAjCL,AAkCI,WAlCO,CAWT,EAAE,CAuBA,QAAQ,CAAC;EACP,mBAAmB,EAAE,oBAAoB;CAC1C;;AApCL,AAqCI,WArCO,CAWT,EAAE,CA0BA,YAAY,CAAC;EACX,gBAAgB,EAAE,uCAAuC,CAAC,UAAU;EACpE,mBAAmB,EAAE,oBAAoB;CAC1C;;AAxCL,AAyCI,WAzCO,CAWT,EAAE,CA8BA,QAAQ,CAAC;EACP,mBAAmB,EAAE,mBAAmB;CACzC;;AA3CL,AA4CI,WA5CO,CAWT,EAAE,CAiCA,YAAY,CAAC;EACX,gBAAgB,EAAE,uCAAuC,CAAC,UAAU;EACpE,mBAAmB,EAAE,mBAAmB;CACzC;;AA/CL,AAgDI,WAhDO,CAWT,EAAE,CAqCA,QAAQ,CAAC;EACP,mBAAmB,EAAE,oBAAoB;CAC1C;;AAlDL,AAmDI,WAnDO,CAWT,EAAE,CAwCA,YAAY,CAAC;EACX,gBAAgB,EAAE,uCAAuC,CAAC,UAAU;EACpE,mBAAmB,EAAE,oBAAoB;CAC1C;;AAtDL,AAuDI,WAvDO,CAWT,EAAE,CA4CA,QAAQ,CAAC;EACP,mBAAmB,EAAE,kBAAkB;CACxC;;AAzDL,AA0DI,WA1DO,CAWT,EAAE,CA+CA,YAAY,CAAC;EACX,gBAAgB,EAAE,uCAAuC,CAAC,UAAU;EACpE,mBAAmB,EAAE,kBAAkB;CACxC;;AA7DL,AA8DI,WA9DO,CAWT,EAAE,CAmDA,QAAQ,CAAC;EACP,mBAAmB,EAAE,oBAAoB;CAC1C;;AAhEL,AAiEI,WAjEO,CAWT,EAAE,CAsDA,YAAY,CAAC;EACX,gBAAgB,EAAE,uCAAuC,CAAC,UAAU;EACpE,mBAAmB,EAAE,oBAAoB;CAC1C;;AApEL,AAqEI,WArEO,CAWT,EAAE,CA0DA,QAAQ,CAAC;EACP,mBAAmB,EAAE,oBAAoB;CAC1C;;AAvEL,AAwEI,WAxEO,CAWT,EAAE,CA6DA,YAAY,CAAC;EACX,gBAAgB,EAAE,uCAAuC,CAAC,UAAU;EACpE,mBAAmB,EAAE,oBAAoB;CAC1C",
+    "sources": [
+        "app.component.scss"
+    ],
+    "names": [],
+    "file": "app.component.css"
+}
\ No newline at end of file

src/app/app.component.html

 <ion-app>
-    <ion-split-pane>
-        <ion-menu>
-            <ion-content>
-                <div class="side_menu_wrapper">
-                    <ion-menu-toggle>
-                        <div class="top_banner">
-                            <div class="top_image">
-                                <img src="../assets/asset_avatar.png">
-                            </div>
-                            <div class="top_detail">
-                                <h4>John Doe</h4>
-                                <p>[email protected]</p>
-                            </div>
-                            <div class="clear"></div>
-                        </div>
-                    </ion-menu-toggle>
-                    <div class="sidemenu_list">
-                        <ul>
-                            <ion-menu-toggle>
-                                <li (click)="vieworder('home')">Shop</li>
-                            </ion-menu-toggle>
-                            <li>About us</li>
-                            <ion-menu-toggle>
-                                <li (click)="vieworder('myorder')">View Order</li>
-                            </ion-menu-toggle>
+  <ion-split-pane>
+    <ion-menu>
+      <ion-content>
+        <div class="side_menu_wrapper">
+          <ion-menu-toggle *ngIf="userData">
+            <div class="top_banner">
+              <div class="top_image">
+                <img [src]="userData.profilePhoto" />
+              </div>
+              <div class="top_detail">
+                <h4>{{ userData.name }}</h4>
+                <p>{{ userData.emailId }}</p>
+              </div>
+              <div class="clear"></div>
+            </div>
+          </ion-menu-toggle>
+          <div class="sidemenu_list">
+            <ul>
+              <ion-menu-toggle>
+                <li (click)="vieworder('home')">Shop</li>
+              </ion-menu-toggle>
+              <!-- <li>About us</li> -->
+              <ion-menu-toggle>
+                <li (click)="vieworder('myorder')">View Order</li>
+              </ion-menu-toggle>
 
-                            <div class="sub_menu">
-                                <ul *ngIf="categoryService.activecategories">
-                                    <ion-menu-toggle>
-                                        <li *ngFor="let category of categoryService.activecategories" (click)="goToPage('catstorelist', category)">
-                                            {{ category.catName }}
-                                        </li>
-                                    </ion-menu-toggle>
-                                    <!-- <li>Women's Fashion</li>
+              <div class="sub_menu">
+                <ul *ngIf="categoryService.activecategories">
+                  <ion-menu-toggle>
+                    <li
+                      *ngFor="let category of categoryService.activecategories"
+                      (click)="goToPage('catstorelist', category)"
+                    >
+                      {{ category.catName }}
+                    </li>
+                  </ion-menu-toggle>
+                  <!-- <li>Women's Fashion</li>
                                     <li>Features</li>
                                     <li>Bags</li>
                                     <li>Shoes</li>
                                     <li>Electronics</li> -->
-                                </ul>
-                            </div>
-                            <li>Complaints & Feedback</li>
-                            <li>
-                                <span class="floatLeft" (click)="authService.SignOut()">Logout</span>
-                                <span class="floatRight version">Version 0.1.0.2</span>
-                                <div class="clear"></div>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            </ion-content>
-        </ion-menu>
-        <ion-router-outlet main></ion-router-outlet>
-    </ion-split-pane>
+                </ul>
+              </div>
+              <ion-menu-toggle>
+                <li (click)="vieworder('feedback')">Complaints & Feedback</li>
+              </ion-menu-toggle>
+              <li>
+                <span class="floatLeft" (click)="authService.SignOut()"
+                  >Logout</span
+                >
+                <span class="floatRight version">Version 0.1.0.2</span>
+                <div class="clear"></div>
+              </li>
+            </ul>
+          </div>
+        </div>
+      </ion-content>
+    </ion-menu>
+    <ion-router-outlet main></ion-router-outlet>
+  </ion-split-pane>
 </ion-app>
 
-<div class="common_tab" [hidden]="fetchCase() === true">
-    <ul>
-        <li (click)="goToPage('home')">
-            <div class="icon_sec m1_icon" [class.m1_icon_act]="sec_active1" (click)="setActive1()"></div>
-        </li>
-        <li (click)="goToPage('catagory')">
-            <div class="icon_sec m2_icon" [class.m2_icon_act]="sec_active2" (click)="setActive2()"></div>
-        </li>
-        <li (click)="searchModal()">
-            <div class="icon_sec m3_icon" [class.m3_icon_act]="sec_active3" (click)="setActive3()"></div>
-        </li>
-        <!-- <li (click)="goToPage('cart')">
+<div class="common_tab" [hidden]="fetchCase() === true" *ngIf="!isSearchOpen">
+  <ul>
+    <li (click)="goToPage('home')">
+      <div
+        class="icon_sec m1_icon"
+        [class.m1_icon_act]="sec_active1"
+        (click)="setActive1()"
+      ></div>
+    </li>
+    <li (click)="goToPage('catagory')">
+      <div
+        class="icon_sec m2_icon"
+        [class.m2_icon_act]="sec_active2"
+        (click)="setActive2()"
+      ></div>
+    </li>
+    <li (click)="searchModal()">
+      <div
+        class="icon_sec m3_icon"
+        [class.m3_icon_act]="sec_active3"
+        (click)="setActive3()"
+      ></div>
+    </li>
+    <!-- <li (click)="goToPage('cart')">
             <div class="icon_sec m4_icon" [class.m4_icon_act]="sec_active4" (click)="setActive4()"></div>
         </li> -->
-        <li (click)="goToPage('myorder')">
-            <div class="icon_sec m5_icon" [class.m5_icon_act]="sec_active5" (click)="setActive5()"></div>
-        </li>
-        <li (click)="goToPage('profile')">
-            <div class="icon_sec m6_icon" [class.m6_icon_act]="sec_active6" (click)="setActive6()" menuClose></div>
-        </li>
-    </ul>
-</div>
+    <li (click)="goToPage('myorder')">
+      <div
+        class="icon_sec m5_icon"
+        [class.m5_icon_act]="sec_active5"
+        (click)="setActive5()"
+      ></div>
+    </li>
+    <li (click)="goToPage('profile')">
\ No newline at end of file
+      <div
+        class="icon_sec m6_icon"
+        [class.m6_icon_act]="sec_active6"
+        (click)="setActive6()"
+        menuClose
+      ></div>
+    </li>
+  </ul>
+</div>

src/app/app.component.scss

 @import url('https://fonts.googleapis.com/css?family=Abel&display=swap');
 @import url(//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css);
 * {
-    font-family: 'Abel', sans-serif;
-    -webkit-font-smoothing: antialiased;
+  font-family: 'Abel', sans-serif;
+  -webkit-font-smoothing: antialiased;
 }
 
 .side_menu_wrapper {
-    background: rgba(41, 40, 91, 1);
-    width: 100%;
-    height: 100vh;
-    padding-left: 20px;
-    padding-top: 20px;
-    padding-right: 10px;
-    .top_banner {
-        .top_image {
-            width: 60px;
-            height: 60px;
-            float: left;
-            border-radius: 50%;
-            background-color: #fff;
-            img {
-                width: 100%;
-                height: 100%;
-                object-fit: cover;
-                object-position: center;
-                border-radius: 50%;
-            }
-        }
-        .top_detail {
-            width: calc(100% - 60px);
-            float: left;
-            padding: 7px;
-            padding-left: 15px;
-            h4 {
-                margin: 0px;
-                padding: 0px;
-                color: #fff;
-            }
-            p {
-                margin: 0px;
-                padding: 0px;
-                color: #fff;
-                color: rgba(176, 174, 199, 1);
-            }
-        }
+  background: rgba(41, 40, 91, 1);
+  width: 100%;
+  height: 100vh;
+  padding-left: 20px;
+  padding-top: 20px;
+  padding-right: 10px;
+  .top_banner {
+    .top_image {
+      width: 60px;
+      height: 60px;
+      float: left;
+      border-radius: 50%;
+      background-color: #fff;
+      img {
+        width: 100%;
+        height: 100%;
+        object-fit: cover;
+        object-position: center;
+        border-radius: 50%;
+      }
     }
-    .sidemenu_list {
-        padding-top: 30px;
-        ul {
-            margin: 0px;
-            padding: 0px;
-            li {
-                list-style: none;
-                color: #fff;
-                font-weight: 200;
-                font-size: 15px;
-                padding: 10px;
-                font-size: 16px;
-                &:focus {
-                    background-color: rgba(40, 36, 88, 1);
-                }
-                &:hover {
-                    background-color: rgba(40, 36, 88, 1);
-                }
-                .version {
-                    color: rgba(176, 174, 199, 1);
-                    font-size: 14px;
-                }
-            }
-            .sub_menu {
-                padding-left: 25px;
-                margin-bottom: 40px;
-                padding-top: 10px;
-                ul {
-                    margin: 0px;
-                    padding: 0px;
-                    li {
-                        list-style: none;
-                        color: rgba(176, 174, 199, 1);
-                    }
-                }
-            }
-        }
+    .top_detail {
+      width: calc(100% - 60px);
+      float: left;
+      padding: 7px;
+      padding-left: 15px;
+      h4 {
+        margin: 0px;
+        padding: 0px;
+        color: #fff;
+      }
+      p {
+        margin: 0px;
+        padding: 0px;
+        color: #fff;
+        color: rgba(176, 174, 199, 1);
+      }
     }
+  }
 }
-
-.common_tab {
-    position: fixed;
-    bottom: 0px;
-    left: 0px;
-    right: 0px;
-    width: 100%;
-    height: 50px;
-    background-color: #fff;
-    -webkit-box-shadow: 0px 0px 5px 7px rgba(215, 213, 228, 0.5);
-    -moz-box-shadow: 0px 0px 5px 7px rgba(215, 213, 228, 0.5);
-    box-shadow: 0px 0px 5px 7px rgba(215, 213, 228, 0.5);
-    ul {
+.sidemenu_list {
+  padding-top: 30px;
+  ul {
+    margin: 0px;
+    padding: 0px;
+    li {
+      list-style: none;
+      color: #fff;
+      font-weight: 200;
+      font-size: 15px;
+      padding: 10px;
+      font-size: 16px;
+      &:focus {
+        background-color: rgba(40, 36, 88, 1);
+      }
+      &:hover {
+        background-color: rgba(40, 36, 88, 1);
+      }
+      .version {
+        color: rgba(176, 174, 199, 1);
+        font-size: 14px;
+      }
+    }
+    .sub_menu {
+      padding-left: 25px;
+      margin-bottom: 40px;
+      padding-top: 10px;
+      ul {
         margin: 0px;
         padding: 0px;
-        width: 100%;
-        height: 100%;
         li {
-            list-style: none;
-            display: inline-block;
-            width: 20%;
-            height: 100%;
-            text-align: center;
-            background-repeat: no-repeat;
-            background-position: center;
-            background-size: 25px;
-        }
-        .icon_sec {
-            width: 50px;
-            height: 50px;
-            background-image: url("../assets/icon_sprite.png");
-            margin: 0 auto;
-            background-repeat: no-repeat;
-            background-size: 450px;
-        }
-        .m1_icon {
-            background-position: top -6px left -249px;
-        }
-        .m1_icon_act {
-            background-image: url("../assets/icon_sprite_active.png") !important;
-            background-position: top -6px left -249px;
-        }
-        .m2_icon {
-            background-position: top -3px left -88px;
-        }
-        .m2_icon_act {
-            background-image: url("../assets/icon_sprite_active.png") !important;
-            background-position: top -3px left -88px;
-        }
-        .m3_icon {
-            background-position: top -6px left -167px;
-        }
-        .m3_icon_act {
-            background-image: url("../assets/icon_sprite_active.png") !important;
-            background-position: top -6px left -167px;
-        }
-        .m4_icon {
-            background-position: top -6px left -5px;
-        }
-        .m4_icon_act {
-            background-image: url("../assets/icon_sprite_active.png") !important;
-            background-position: top -6px left -5px;
-        }
-        .m5_icon {
-            background-position: top -6px left -325px;
-        }
-        .m5_icon_act {
-            background-image: url("../assets/icon_sprite_active.png") !important;
-            background-position: top -6px left -325px;
-        }
-        .m6_icon {
-            background-position: top -6px left -398px;
-        }
-        .m6_icon_act {
-            background-image: url("../assets/icon_sprite_active.png") !important;
-            background-position: top -6px left -398px;
+          list-style: none;
+          color: rgba(176, 174, 199, 1);
         }
+      }
+    }
+  }
+}
+
+.common_tab {
+  position: fixed;
+  bottom: 0px;
+  left: 0px;
+  right: 0px;
+  width: 100%;
+  height: 50px;
+  background-color: #fff;
+  -webkit-box-shadow: 0px 0px 5px 7px rgba(215, 213, 228, 0.5);
+  -moz-box-shadow: 0px 0px 5px 7px rgba(215, 213, 228, 0.5);
+  box-shadow: 0px 0px 5px 7px rgba(215, 213, 228, 0.5);
+  ul {
+    margin: 0px;
+    padding: 0px;
+    width: 100%;
+    height: 100%;
+    li {
+      list-style: none;
+      display: inline-block;
+      width: 20%;
+      height: 100%;
+      text-align: center;
+      background-repeat: no-repeat;
+      background-position: center;
+      background-size: 25px;
+    }
+    .icon_sec {
+      width: 50px;
+      height: 50px;
+      background-image: url('../assets/icon_sprite.png');
+      margin: 0 auto;
+      background-repeat: no-repeat;
+      background-size: 450px;
+    }
+    .m1_icon {
+      background-position: top -6px left -249px;
     }
-}
+    .m1_icon_act {
\ No newline at end of file
+      background-image: url('../assets/icon_sprite_active.png') !important;
+      background-position: top -6px left -249px;
+    }
+    .m2_icon {
+      background-position: top -3px left -88px;
+    }
+    .m2_icon_act {
+      background-image: url('../assets/icon_sprite_active.png') !important;
+      background-position: top -3px left -88px;
+    }
+    .m3_icon {
+      background-position: top -6px left -167px;
+    }
+    .m3_icon_act {
+      background-image: url('../assets/icon_sprite_active.png') !important;
+      background-position: top -6px left -167px;
+    }
+    .m4_icon {
+      background-position: top -6px left -5px;
+    }
+    .m4_icon_act {
+      background-image: url('../assets/icon_sprite_active.png') !important;
+      background-position: top -6px left -5px;
+    }
+    .m5_icon {
+      background-position: top -6px left -325px;
+    }
+    .m5_icon_act {
+      background-image: url('../assets/icon_sprite_active.png') !important;
+      background-position: top -6px left -325px;
+    }
+    .m6_icon {
+      background-position: top -6px left -398px;
+    }
+    .m6_icon_act {
+      background-image: url('../assets/icon_sprite_active.png') !important;
+      background-position: top -6px left -398px;
+    }
+  }
+}

src/app/app.component.ts

@@ -23,6 +23,8 @@ import { SearchmodalPage } from './searchmodal/searchmodal.page';
   styleUrls: ['app.component.scss']
 })
 export class AppComponent {
+  isSearchOpen = false;
+
   sec_active1 = true;
   sec_active2 = false;
   sec_active3 = false;
@@ -31,6 +33,9 @@ export class AppComponent {
   sec_active6 = false;
   state: boolean;
 
+  // Customer Info
+  // user: User;
+
   menuw: number;
   userData: any;
 
@@ -53,7 +58,7 @@ export class AppComponent {
       this.state = loginData;
     });
 
-    this.service.get('userData').then(userData => {
+    this.subjectService.getUserData().subscribe(userData => {
       if (userData) {
         this.userData = JSON.parse(userData);
         console.log(userData);
@@ -106,7 +111,7 @@ export class AppComponent {
   }
 
   setActive1() {
-    this.sec_active1 = !this.sec_active1;
+    this.sec_active1 = true;
     this.sec_active2 = false;
     this.sec_active3 = false;
     this.sec_active4 = false;
@@ -114,7 +119,7 @@ export class AppComponent {
     this.sec_active6 = false;
   }
   setActive2() {
-    this.sec_active2 = !this.sec_active2;
+    this.sec_active2 = true;
     this.sec_active1 = false;
     this.sec_active3 = false;
     this.sec_active4 = false;
@@ -122,7 +127,7 @@ export class AppComponent {
     this.sec_active6 = false;
   }
   setActive3() {
-    this.sec_active3 = !this.sec_active3;
+    this.sec_active3 = true;
     this.sec_active1 = false;
     this.sec_active2 = false;
     this.sec_active4 = false;
@@ -130,7 +135,7 @@ export class AppComponent {
     this.sec_active6 = false;
   }
   setActive4() {
-    this.sec_active4 = !this.sec_active4;
+    this.sec_active4 = true;
     this.sec_active1 = false;
     this.sec_active2 = false;
     this.sec_active3 = false;
@@ -138,7 +143,7 @@ export class AppComponent {
     this.sec_active6 = false;
   }
   setActive5() {
-    this.sec_active5 = !this.sec_active5;
+    this.sec_active5 = true;
     this.sec_active1 = false;
     this.sec_active2 = false;
     this.sec_active3 = false;
@@ -146,7 +151,7 @@ export class AppComponent {
     this.sec_active6 = false;
   }
   setActive6() {
-    this.sec_active6 = !this.sec_active6;
+    this.sec_active6 = true;
     this.sec_active1 = false;
     this.sec_active2 = false;
     this.sec_active3 = false;
@@ -196,10 +201,19 @@ export class AppComponent {
   }
 
   async searchModal() {
+    // Hides Bottom navbar items
+    this.isSearchOpen = true;
     const modal = await this.modalController.create({
       component: SearchmodalPage
     });
-    modal.onDidDismiss().then(dataReturned => {});
+    // modal.onDidDismiss().then(dataReturned => {
+    //
+    // });
+
+    // Shows bottom navbar items on component unmount
+    modal.onWillDismiss().then(() => {
+      this.isSearchOpen = false;
+    });
     return await modal.present();
   }
 }

src/app/catstorelist/catstorelist.page.ts

@@ -3,6 +3,7 @@ import { Router } from "@angular/router";
 import { Location } from "@angular/common";
 import { ServiceService } from "./../../config/service.service";
 import { ShoppersService } from "./../../config/shopper.service";
+import { SearchService } from "../../config/search.service";
 import { trigger, transition, animate, style } from "@angular/animations";
 
 @Component({
@@ -28,19 +29,12 @@ export class CatStorelistPage implements OnInit {
   };
   data: any;
 
-  clickSearch() {
-    this.searchShow = true;
-  }
-
-  searchClose() {
-    this.searchShow = false;
-  }
-
   constructor(
     public router: Router,
     public location: Location,
     public service: ServiceService,
-    public shopperService: ShoppersService
+    public shopperService: ShoppersService,
+    private searchService: SearchService
   ) {
     this.service.get("params").then(val => {
       this.data = val;
@@ -48,6 +42,14 @@ export class CatStorelistPage implements OnInit {
     });
   }
 
+  clickSearch() {
+    this.searchShow = true;
+    this.searchService.searchList = [];
+  }
+
+  searchClose() {
+    this.searchShow = false;
+  }
   ngOnInit() {}
 
   goToPage(path, data = null) {

src/app/changedetails/changedetails.page.css

+.login_wrapper {
+  width: 80%;
+  margin: 0 auto;
+  padding-top: 10px;
+}
+
+.login_wrapper .logo_wrapper {
+  width: 100%;
+  text-align: center;
+  padding-top: 50px;
+  padding-bottom: 30px;
+}
+
+.login_wrapper .logo_wrapper img {
+  width: 180px;
+}
+
+.login_wrapper .form_div .row {
+  margin-bottom: 20px;
+}
+
+.login_wrapper .form_div .row h6 {
+  color: #3b394d !important;
+  text-align: left;
+  font-weight: 900;
+}
+
+.login_wrapper .form_div .row input {
+  border: 1px solid #d7d5e4;
+  background: transparent;
+  color: #d7d5e4;
+  width: 100%;
+  height: 45px;
+  text-align: center;
+  border-radius: 8px;
+  font-size: 16px;
+  padding-left: 15px;
+  padding-right: 15px;
+}
+
+.login_wrapper .form_div .row .login_btn {
+  width: 100%;
+  background-color: #29285b;
+  color: #fff;
+  border-radius: 8px;
+  height: 45px;
+  font-size: 16px;
+}
+
+.login_wrapper .form_div .row hr {
+  border: 1px solid #d7d5e4;
+  border-bottom: none;
+  margin-top: 30px;
+  margin-bottom: 10px;
+}
+
+.login_wrapper .form_div .row P {
+  text-align: center;
+  color: #3b394d;
+  margin: 0px;
+  position: relative;
+  bottom: 20px;
+}
+
+.login_wrapper .form_div .row P span {
+  background-color: #fff;
+  padding: 10px;
+  font-size: 18px;
+}
+
+.login_wrapper .form_div .row h4 {
+  color: #3b394d;
+  text-align: center;
+  margin: 0px;
+  padding-top: 15px;
+}
+
+.login_wrapper .form_div .row h6 {
+  color: #29285b;
+}
+
+.login_wrapper .form_div .row h6 span {
+  position: relative;
+  top: 5px;
+}
+
+.login_wrapper .form_div .row h6 a {
+  color: #29285b;
+  text-decoration: none;
+  font-weight: 900;
+}
+
+.login_wrapper .form_div .row h6 .styled-checkbox {
+  position: absolute;
+  opacity: 0;
+}
+
+.login_wrapper .form_div .row h6 .styled-checkbox + label {
+  position: relative;
+  cursor: pointer;
+  padding: 0;
+}
+
+.login_wrapper .form_div .row h6 .styled-checkbox + label:before {
+  content: '';
+  margin-right: 10px;
+  display: inline-block;
+  vertical-align: text-top;
+  width: 30px;
+  height: 30px;
+  border-radius: 10px;
+  background: white;
+  border: 1px solid #d7d5e4;
+}
+
+.login_wrapper .form_div .row h6 .styled-checkbox:checked + label:before {
+  background: #29285b;
+}
+
+.login_wrapper .form_div .row h6 .styled-checkbox:disabled + label {
+  color: #b8b8b8;
+  cursor: auto;
+}
+
+.login_wrapper .form_div .row h6 .styled-checkbox:disabled + label:before {
+  -webkit-box-shadow: none;
+          box-shadow: none;
+  background: #ddd;
+}
+
+.login_wrapper .form_div .row h6 .styled-checkbox:checked + label:after {
+  content: '';
+  position: absolute;
+  left: 10px;
+  top: 15px;
+  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);
+}
+
+.login_wrapper .form_div .row .social_div {
+  border: 1px solid #d7d5e4;
+  height: 45px;
+  border-radius: 20px;
+}
+
+.login_wrapper .form_div .row .social_div .social_btn {
+  display: inline-block;
+  width: 50%;
+  text-align: center;
+  height: 100%;
+  font-size: 18px;
+  padding: 9px;
+}
+/*# sourceMappingURL=changedetails.page.css.map */
\ No newline at end of file

src/app/changedetails/changedetails.page.css.map

+{
+    "version": 3,
+    "mappings": "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",
+    "sources": [
+        "changedetails.page.scss"
+    ],
+    "names": [],
+    "file": "changedetails.page.css"
+}
\ No newline at end of file

src/app/changedetails/changedetails.page.html

@@ -15,12 +15,13 @@
       </div>
       <div class="row">
         <input
+          [(value)]="userData && userData.name"
           name="name"
           required
           class=""
           type="text"
-          [(ngModel)]="updateData.name"
-          placeholder="John Doe"
+          [(ngModel)]="userData && userData.name"
+          [(placeholder)]="userData && userData.name"
           #name="ngModel"
         />
         <div
@@ -33,38 +34,26 @@
       </div>
       <div class="row">
         <input
-          required
+          [(value)]="userData && userData.emailId"
+          readonly
           class=""
           name="emailId"
           type="mail"
-          [(ngModel)]="updateData.emailId"
-          placeholder="[email protected]"
-          pattern="[a-zA-Z0-9.-_]{1,}@[a-zA-Z.-]{2,}[.]{1}[a-zA-Z]{2,}"
-          #emailId="ngModel"
+          [(placeholder)]="userData && userData.emailId"
         />
-        <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 class="row">
         <input
+          [(value)]="userData && userData.phone"
           required
           class=""
           name="phone"
           type="number"
           pattern="(\(+61\)|\+61|\(0[1-9]\)|0[1-9])?( ?-?[0-9]){6,9}"
           maxlength="10"
-          [(ngModel)]="updateData.phone"
-          placeholder="+00 9851 5871 6985"
+          [(ngModel)]="userData && userData.phone"
+          [(placeholder)]="userData && userData.phone"
           #phone="ngModel"
         />
         <div
@@ -79,18 +68,42 @@
           </div>
         </div>
       </div>
-      <div class="row">
-        <h6>Change Password</h6>
-      </div>
-      <div class="row">
+      <div *ngIf="userData && userData.loginType == 0">
+        <div class="row">
+          <h6>Change Password</h6>
+        </div>
+        <!-- <div class="row">
         <input class="" type="password" placeholder="Current Password" />
+      </div> -->
+        <div class="row">
+          <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 class="row">
+          <input
+            class=""
+            #confirmPassword="ngModel"
+            [(ngModel)]="updatePassword.confirmPassword"
+            name="confirmPassword"
+            type="password"
+            placeholder="Confirm Password"
+          />
+          <div *ngIf="">
+            Password should match
+          </div>
+        </div>
       </div>
-      <div class="row">
-        <input class="" type="password" placeholder="New Password" />
-      </div>
-      <div class="row">
-        <input class="" type="password" placeholder="Confirm Password" />
-      </div>
+
       <div class="row">
         <button class="login_btn" (click)="onFormSubmit(updateForm)">
           UPDATE

src/app/changedetails/changedetails.page.ts

-import { Component, OnInit } from "@angular/core";
-import { Location } from "@angular/common";
-import { Router, ActivatedRoute } from "@angular/router";
-import { UpdateUserDetails } from "../../config/services/user";
-import { UpdateService } from "../../config/update.service";
-import { ServiceService } from "../../config/service.service";
-import { NgForm } from "@angular/forms";
+import { Component, OnInit } from '@angular/core';
+import { Location } from '@angular/common';
+import { Router, ActivatedRoute } from '@angular/router';
+import { UpdateUserDetails, UpdatePassword } from '../../config/services/user';
+import { UpdateService } from '../../config/update.service';
+import { ServiceService } from '../../config/service.service';
+import { NgForm } from '@angular/forms';
 
 @Component({
-  selector: "app-changedetails",
-  templateUrl: "./changedetails.page.html",
-  styleUrls: ["./changedetails.page.scss"]
+  selector: 'app-changedetails',
+  templateUrl: './changedetails.page.html',
+  styleUrls: ['./changedetails.page.scss']
 })
 export class ChangedetailsPage implements OnInit {
   userData: any;
   updateData: UpdateUserDetails = {
-    emailId: "",
-    name: "",
-    phone: ""
+    name: '',
+    phone: ''
+  };
+
+  updatePassword: UpdatePassword = {
+    password: '',
+    confirmPassword: ''
   };
   submitted = false;
 
@@ -27,8 +31,10 @@ export class ChangedetailsPage implements OnInit {
     public register: UpdateService,
     private service: ServiceService
   ) {
-    this.service.get("params").then(val => {
+    // Gets userdata
+    this.service.get('params').then(val => {
       this.userData = val;
+      console.log(val);
     });
   }
 
@@ -45,9 +51,21 @@ export class ChangedetailsPage implements OnInit {
 
   onFormSubmit(form: NgForm) {
     this.submitted = true;
+    console.log(form.value);
     if (form.valid) {
-      console.log("valid form values", form.value);
-      this.register.updateData(form.value, this.userData.uid);
+      // Change Password
+      if (
+        form.value.password &&
+        form.value.password != form.value.confirmPassword
+      ) {
+        // this.register.updatePassword(form.value.password);
+      } else {
+        alert('Password should match');
+      }
+
+      // Calls update user data fn
+      // this.register.updateData(form.value, this.userData.uid);
+      console.log('valid form values', form.value);
     }
   }
 }

src/app/changepass/changepass.page.css

+.verification_div {
+  width: 80%;
+  margin: 0 auto;
+}
+
+.verification_div .form_div {
+  padding-top: 60%;
+}
+
+.verification_div .form_div .row {
+  margin-bottom: 20px;
+}
+
+.verification_div .form_div .row input {
+  border: 1px solid #d7d5e4;
+  background: transparent;
+  color: #d7d5e4;
+  width: 100%;
+  height: 45px;
+  text-align: center;
+  border-radius: 8px;
+  font-size: 16px;
+}
+
+.verification_div .form_div .row .login_btn {
+  width: 100%;
+  background-color: #29285b;
+  color: #fff;
+  border-radius: 8px;
+  height: 45px;
+  font-size: 16px;
+}
+
+.verification_div .form_div .row .resend_btn {
+  width: 100%;
+  background-color: transparent;
+  color: #29285b;
+  border-radius: 8px;
+  height: 45px;
+  font-size: 16px;
+  font-weight: 900;
+}
+
+.verification_div .form_div .row hr {
+  border: 1px solid #d7d5e4;
+  border-bottom: none;
+  margin-top: 30px;
+  margin-bottom: 10px;
+}
+
+.verification_div .form_div .row P {
+  text-align: center;
+  color: #3b394d;
+  margin: 0px;
+  text-align: center;
+}
+
+.verification_div .form_div .row P span {
+  background-color: #fff;
+  padding: 10px;
+  font-size: 18px;
+}
+
+.verification_div .form_div .row h4 {
+  color: #3b394d;
+  text-align: center;
+  margin: 0px;
+  padding-top: 15px;
+}
+
+.verification_div .form_div .row h6 {
+  color: #29285b;
+  text-align: center;
+  font-weight: bold;
+  padding-bottom: 20%;
+  font-size: 25px;
+}
+
+.verification_div .form_div .row h6 .styled-checkbox {
+  position: absolute;
+  opacity: 0;
+}
+
+.verification_div .form_div .row h6 .styled-checkbox + label {
+  position: relative;
+  cursor: pointer;
+  padding: 0;
+}
+
+.verification_div .form_div .row h6 .styled-checkbox + label:before {
+  content: '';
+  margin-right: 10px;
+  display: inline-block;
+  vertical-align: text-top;
+  width: 30px;
+  height: 30px;
+  border-radius: 10px;
+  background: white;
+  border: 1px solid #d7d5e4;
+}
+
+.verification_div .form_div .row h6 .styled-checkbox:checked + label:before {
+  background: #29285b;
+}
+
+.verification_div .form_div .row h6 .styled-checkbox:disabled + label {
+  color: #b8b8b8;
+  cursor: auto;
+}
+
+.verification_div .form_div .row h6 .styled-checkbox:disabled + label:before {
+  -webkit-box-shadow: none;
+          box-shadow: none;
+  background: #ddd;
+}
+
+.verification_div .form_div .row h6 .styled-checkbox:checked + label:after {
+  content: '';
+  position: absolute;
+  left: 10px;
+  top: 15px;
+  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);
+}
+
+.verification_div .form_div .row .social_div {
+  border: 1px solid #d7d5e4;
+  height: 45px;
+  border-radius: 20px;
+}
+
+.verification_div .form_div .row .social_div .social_btn {
+  display: inline-block;
+  width: 50%;
+  text-align: center;
+  height: 100%;
+  font-size: 18px;
+  padding: 9px;
+}
+/*# sourceMappingURL=changepass.page.css.map */
\ No newline at end of file

src/app/changepass/changepass.page.css.map

+{
+    "version": 3,
+    "mappings": "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",
+    "sources": [
+        "changepass.page.scss"
+    ],
+    "names": [],
+    "file": "changepass.page.css"
+}
\ No newline at end of file

src/app/feedback/feedback.page.ts

 import { Component, OnInit } from '@angular/core';
+import { Location } from '@angular/common';
 
 @Component({
   selector: 'app-feedback',
   templateUrl: './feedback.page.html',
-  styleUrls: ['./feedback.page.scss'],
+  styleUrls: ['./feedback.page.scss']
 })
 export class FeedbackPage implements OnInit {
+  constructor(private location: Location) {}
 
-  constructor() { }
+  ngOnInit() {}
 
-  ngOnInit() {
+  goBack() {
+    this.location.back();
   }
-
 }

src/app/forgot/forgot.page.css

+.verification_div {
+  width: 80%;
+  margin: 0 auto;
+}
+
+.verification_div .form_div {
+  padding-top: 60%;
+}
+
+.verification_div .form_div .row {
+  margin-bottom: 20px;
+}
+
+.verification_div .form_div .row input {
+  border: 1px solid #d7d5e4;
+  background: transparent;
+  color: #d7d5e4;
+  width: 100%;
+  height: 45px;
+  text-align: center;
+  border-radius: 8px;
+  font-size: 16px;
+}
+
+.verification_div .form_div .row .login_btn {
+  width: 100%;
+  background-color: #29285b;
+  color: #fff;
+  border-radius: 8px;
+  height: 45px;
+  font-size: 16px;
+}
+
+.verification_div .form_div .row .resend_btn {
+  width: 100%;
+  background-color: transparent;
+  color: #29285b;
+  border-radius: 8px;
+  height: 45px;
+  font-size: 16px;
+  font-weight: 900;
+}
+
+.verification_div .form_div .row hr {
+  border: 1px solid #d7d5e4;
+  border-bottom: none;
+  margin-top: 30px;
+  margin-bottom: 10px;
+}
+
+.verification_div .form_div .row P {
+  text-align: center;
+  color: #3b394d;
+  margin: 0px;
+  text-align: center;
+}
+
+.verification_div .form_div .row P span {
+  background-color: #fff;
+  padding: 10px;
+  font-size: 18px;
+}
+
+.verification_div .form_div .row h4 {
+  color: #3b394d;
+  text-align: center;
+  margin: 0px;
+  padding-top: 15px;
+}
+
+.verification_div .form_div .row h6 {
+  color: #29285b;
+  text-align: center;
+  font-weight: bold;
+  padding-bottom: 20%;
+  font-size: 25px;
+}
+
+.verification_div .form_div .row h6 .styled-checkbox {
+  position: absolute;
+  opacity: 0;
+}
+
+.verification_div .form_div .row h6 .styled-checkbox + label {
+  position: relative;
+  cursor: pointer;
+  padding: 0;
+}
+
+.verification_div .form_div .row h6 .styled-checkbox + label:before {
+  content: '';
+  margin-right: 10px;
+  display: inline-block;
+  vertical-align: text-top;
+  width: 30px;
+  height: 30px;
+  border-radius: 10px;
+  background: white;
+  border: 1px solid #d7d5e4;
+}
+
+.verification_div .form_div .row h6 .styled-checkbox:checked + label:before {
+  background: #29285b;
+}
+
+.verification_div .form_div .row h6 .styled-checkbox:disabled + label {
+  color: #b8b8b8;
+  cursor: auto;
+}
+
+.verification_div .form_div .row h6 .styled-checkbox:disabled + label:before {
+  -webkit-box-shadow: none;
+          box-shadow: none;
+  background: #ddd;
+}
+
+.verification_div .form_div .row h6 .styled-checkbox:checked + label:after {
+  content: '';
+  position: absolute;
+  left: 10px;
+  top: 15px;
+  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);
+}
+
+.verification_div .form_div .row .social_div {
+  border: 1px solid #d7d5e4;
+  height: 45px;
+  border-radius: 20px;
+}
+
+.verification_div .form_div .row .social_div .social_btn {
+  display: inline-block;
+  width: 50%;
+  text-align: center;
+  height: 100%;
+  font-size: 18px;
+  padding: 9px;
+}
+/*# sourceMappingURL=forgot.page.css.map */
\ No newline at end of file

src/app/forgot/forgot.page.css.map

+{
+    "version": 3,
+    "mappings": "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",
+    "sources": [
+        "forgot.page.scss"
+    ],
+    "names": [],
+    "file": "forgot.page.css"
+}
\ No newline at end of file

src/app/landing/landing.page.css

+.start_wizard_wrapper {
+  padding-top: 30px;
+}
+
+.start_wizard_wrapper ion-slides .wizard_inner_wrapper {
+  width: 100%;
+}
+
+.start_wizard_wrapper ion-slides .wizard_inner_wrapper .wizard_textarea {
+  width: 100%;
+  padding: 15px;
+  padding-top: 0px;
+  padding-bottom: 30px;
+}
+
+.start_wizard_wrapper ion-slides .wizard_inner_wrapper .wizard_textarea h3 {
+  color: #3b394d;
+  font-size: 20px;
+  margin: 0px;
+  padding: 0px;
+  font-weight: 800;
+  padding-bottom: 10px;
+}
+
+.start_wizard_wrapper ion-slides .wizard_inner_wrapper .wizard_textarea p {
+  color: #4e4961;
+  margin: 0px;
+  padding: 0px;
+  font-size: 16px;
+  padding-bottom: 20px;
+}
+
+.start_wizard_wrapper ion-slides .swiper-pagination .swiper-pagination-bullet {
+  background: #282438 !important;
+}
+
+.start_wizard_wrapper .btn_row {
+  text-align: center;
+  padding: 10px;
+}
+
+.start_wizard_wrapper .btn_row .btn_bay {
+  display: inline-block;
+  border-radius: 20px;
+}
+
+.start_wizard_wrapper .btn_row .btn_bay .btn_next {
+  background-color: #29285b;
+  display: inline-block;
+  padding: 10px;
+  padding-left: 30px;
+  padding-right: 30px;
+  cursor: pointer;
+  border-radius: 8px;
+  color: #fff;
+  font-size: 18px;
+  letter-spacing: 2px;
+}
+
+.start_wizard_wrapper .btn_row .btn_bay .btn_getstarted {
+  width: 100%;
+  background-color: #29285b;
+  display: inline-block;
+  padding: 10px;
+  padding-left: 50px;
+  padding-right: 50px;
+  cursor: pointer;
+  border-radius: 8px;
+  color: #fff;
+}
+/*# sourceMappingURL=landing.page.css.map */
\ No newline at end of file

src/app/landing/landing.page.css.map

+{
+    "version": 3,
+    "mappings": "AAAA,AAAA,qBAAqB,CAAC;EAClB,WAAW,EAAE,IAAI;CA+DpB;;AAhED,AAGQ,qBAHa,CAEjB,UAAU,CACN,qBAAqB,CAAC;EAClB,KAAK,EAAE,IAAI;CAsBd;;AA1BT,AAKY,qBALS,CAEjB,UAAU,CACN,qBAAqB,CAEjB,gBAAgB,CAAC;EACb,KAAK,EAAE,IAAI;EACX,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,IAAI;CAgBvB;;AAzBb,AAUgB,qBAVK,CAEjB,UAAU,CACN,qBAAqB,CAEjB,gBAAgB,CAKZ,EAAE,CAAC;EACC,KAAK,EAAE,OAAmB;EAC1B,SAAS,EAAE,IAAI;EACf,MAAM,EAAE,GAAG;EACX,OAAO,EAAE,GAAG;EACZ,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,IAAI;CACvB;;AAjBjB,AAkBgB,qBAlBK,CAEjB,UAAU,CACN,qBAAqB,CAEjB,gBAAgB,CAaZ,CAAC,CAAC;EACE,KAAK,EAAE,OAAO;EACd,MAAM,EAAE,GAAG;EACX,OAAO,EAAE,GAAG;EACZ,SAAS,EAAE,IAAI;EACf,cAAc,EAAE,IAAI;CACvB;;AAxBjB,AA4BY,qBA5BS,CAEjB,UAAU,CAyBN,kBAAkB,CACd,yBAAyB,CAAC;EACtB,UAAU,EAAE,kBAAkB;CACjC;;AA9Bb,AAiCI,qBAjCiB,CAiCjB,QAAQ,CAAC;EACL,UAAU,EAAE,MAAM;EAClB,OAAO,EAAE,IAAI;CA4BhB;;AA/DL,AAoCQ,qBApCa,CAiCjB,QAAQ,CAGJ,QAAQ,CAAC;EACL,OAAO,EAAE,YAAY;EACrB,aAAa,EAAE,IAAI;CAwBtB;;AA9DT,AAuCY,qBAvCS,CAiCjB,QAAQ,CAGJ,QAAQ,CAGJ,SAAS,CAAC;EACN,gBAAgB,EAAE,OAAO;EACzB,OAAO,EAAE,YAAY;EACrB,OAAO,EAAE,IAAI;EACb,YAAY,EAAE,IAAI;EAClB,aAAa,EAAE,IAAI;EACnB,MAAM,EAAE,OAAO;EACf,aAAa,EAAE,GAAG;EAClB,KAAK,EAAE,IAAI;EACX,SAAS,EAAE,IAAI;EACf,cAAc,EAAE,GAAG;CACtB;;AAlDb,AAmDY,qBAnDS,CAiCjB,QAAQ,CAGJ,QAAQ,CAeJ,eAAe,CAAC;EACZ,KAAK,EAAE,IAAI;EACX,gBAAgB,EAAE,OAAO;EACzB,OAAO,EAAE,YAAY;EACrB,OAAO,EAAE,IAAI;EACb,YAAY,EAAE,IAAI;EAClB,aAAa,EAAE,IAAI;EACnB,MAAM,EAAE,OAAO;EACf,aAAa,EAAE,GAAG;EAClB,KAAK,EAAE,IAAI;CACd",
+    "sources": [
+        "landing.page.scss"
+    ],
+    "names": [],
+    "file": "landing.page.css"
+}
\ No newline at end of file

src/app/login/login.page.css

+.login_wrapper {
+  width: 80%;
+  margin: 0 auto;
+}
+
+.login_wrapper .logo_wrapper {
+  width: 100%;
+  text-align: center;
+  padding-top: 50px;
+  padding-bottom: 30px;
+}
+
+.login_wrapper .logo_wrapper img {
+  width: 180px;
+}
+
+.login_wrapper .form_div .row {
+  margin-bottom: 20px;
+}
+
+.login_wrapper .form_div .row input {
+  border: 1px solid #d7d5e4;
+  background: transparent;
+  color: #d7d5e4;
+  width: 100%;
+  height: 45px;
+  text-align: center;
+  border-radius: 8px;
+  font-size: 16px;
+}
+
+.login_wrapper .form_div .row .login_btn {
+  width: 100%;
+  background-color: #29285b;
+  color: #fff;
+  border-radius: 8px;
+  height: 45px;
+  font-size: 16px;
+}
+
+.login_wrapper .form_div .row hr {
+  border: 1px solid #d7d5e4;
+  border-bottom: none;
+  margin-top: 30px;
+  margin-bottom: 10px;
+}
+
+.login_wrapper .form_div .row P {
+  text-align: center;
+  color: #3b394d;
+  margin: 0px;
+  position: relative;
+  bottom: 20px;
+}
+
+.login_wrapper .form_div .row P span {
+  background-color: #fff;
+  padding: 10px;
+  font-size: 18px;
+}
+
+.login_wrapper .form_div .row h4 {
+  color: #3b394d;
+  text-align: center;
+  margin: 0px;
+  padding-top: 15px;
+}
+
+.login_wrapper .form_div .row .social_div {
+  border: 1px solid #d7d5e4;
+  height: 45px;
+  border-radius: 20px;
+}
+
+.login_wrapper .form_div .row .social_div .social_btn {
+  display: inline-block;
+  width: 50%;
+  text-align: center;
+  height: 100%;
+  font-size: 18px;
+  padding: 9px;
+}
+/*# sourceMappingURL=login.page.css.map */
\ No newline at end of file

src/app/login/login.page.css.map

+{
+    "version": 3,
+    "mappings": "AAAA,AAAA,cAAc,CAAC;EACX,KAAK,EAAE,GAAG;EACV,MAAM,EAAE,MAAM;CAsEjB;;AAxED,AAGI,cAHU,CAGV,aAAa,CAAC;EACV,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,MAAM;EAClB,WAAW,EAAE,IAAI;EACjB,cAAc,EAAE,IAAI;CAIvB;;AAXL,AAQQ,cARM,CAGV,aAAa,CAKT,GAAG,CAAC;EACA,KAAK,EAAE,KAAK;CACf;;AAVT,AAaQ,cAbM,CAYV,SAAS,CACL,IAAI,CAAC;EACD,aAAa,EAAE,IAAI;CAwDtB;;AAtET,AAeY,cAfE,CAYV,SAAS,CACL,IAAI,CAEA,KAAK,CAAC;EACF,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,OAAsB;EACxC,UAAU,EAAE,WAAW;EACvB,KAAK,EAAE,OAAsB;EAC7B,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,UAAU,EAAE,MAAM;EAClB,aAAa,EAAE,GAAG;EAClB,SAAS,EAAE,IAAI;CAClB;;AAxBb,AAyBY,cAzBE,CAYV,SAAS,CACL,IAAI,CAYA,UAAU,CAAC;EACP,KAAK,EAAE,IAAI;EACX,gBAAgB,EAAE,OAAO;EACzB,KAAK,EAAE,IAAI;EACX,aAAa,EAAE,GAAG;EAClB,MAAM,EAAE,IAAI;EACZ,SAAS,EAAE,IAAI;CAClB;;AAhCb,AAiCY,cAjCE,CAYV,SAAS,CACL,IAAI,CAoBA,EAAE,CAAC;EACC,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,OAAsB;EACxC,aAAa,EAAE,IAAI;EACnB,UAAU,EAAE,IAAI;EAChB,aAAa,EAAE,IAAI;CACtB;;AAtCb,AAuCY,cAvCE,CAYV,SAAS,CACL,IAAI,CA0BA,CAAC,CAAC;EACE,UAAU,EAAE,MAAM;EAClB,KAAK,EAAE,OAAmB;EAC1B,MAAM,EAAE,GAAG;EACX,QAAQ,EAAE,QAAQ;EAClB,MAAM,EAAE,IAAI;CAMf;;AAlDb,AA6CgB,cA7CF,CAYV,SAAS,CACL,IAAI,CA0BA,CAAC,CAMG,IAAI,CAAC;EACD,gBAAgB,EAAE,IAAI;EACtB,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,IAAI;CAClB;;AAjDjB,AAmDY,cAnDE,CAYV,SAAS,CACL,IAAI,CAsCA,EAAE,CAAC;EACC,KAAK,EAAE,OAAmB;EAC1B,UAAU,EAAE,MAAM;EAClB,MAAM,EAAE,GAAG;EACX,WAAW,EAAE,IAAI;CACpB;;AAxDb,AAyDY,cAzDE,CAYV,SAAS,CACL,IAAI,CA4CA,WAAW,CAAC;EACR,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,OAAsB;EACxC,MAAM,EAAE,IAAI;EACZ,aAAa,EAAE,IAAI;CAStB;;AArEb,AA6DgB,cA7DF,CAYV,SAAS,CACL,IAAI,CA4CA,WAAW,CAIP,WAAW,CAAC;EACR,OAAO,EAAE,YAAY;EACrB,KAAK,EAAE,GAAG;EACV,UAAU,EAAE,MAAM;EAClB,MAAM,EAAE,IAAI;EACZ,SAAS,EAAE,IAAI;EACf,OAAO,EAAE,GAAG;CACf",
+    "sources": [
+        "login.page.scss"
+    ],
+    "names": [],
+    "file": "login.page.css"
+}
\ No newline at end of file

src/app/myorder/myorder.page.css

+.myorder_wrapper ul {
+  margin: 0px;
+  padding: 10px;
+}
+
+.myorder_wrapper ul li {
+  list-style: none;
+  padding: 10px;
+  padding-bottom: 15px;
+}
+
+.myorder_wrapper ul li .order_info {
+  padding-top: 10px;
+  padding-bottom: 10px;
+}
+
+.myorder_wrapper ul li .order_info h5 {
+  margin: 0px;
+  padding: 0px;
+}
+
+.myorder_wrapper ul li .order_info .order_track {
+  background-color: #35cbab;
+  color: #fff;
+  border-radius: 3px;
+  padding: 3px;
+  padding-left: 10px;
+  padding-right: 10px;
+}
+
+.myorder_wrapper ul li .order_image {
+  width: 90px;
+  height: 90px;
+  float: left;
+  border-radius: 8px;
+  background-color: #a8a8a8;
+}
+
+.myorder_wrapper ul li .order_image img {
+  width: 100%;
+  height: 100%;
+  -o-object-fit: cover;
+     object-fit: cover;
+  -o-object-position: center;
+     object-position: center;
+}
+
+.myorder_wrapper ul li .order_detail {
+  width: calc(100% - 190px);
+  float: left;
+  padding-left: 20px;
+}
+
+.myorder_wrapper ul li .order_detail h5 {
+  margin: 0px;
+  padding: 0px;
+  color: #b0aec7;
+  font-size: 16px;
+  padding-top: 3px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 100%;
+}
+
+.myorder_wrapper ul li .order_detail h5 span {
+  color: #29285b;
+}
+
+.myorder_wrapper ul li .order_detail h6 {
+  margin: 0px;
+  padding: 0px;
+  color: #b0aec7;
+  font-size: 12px;
+  padding-top: 9px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.myorder_wrapper ul li .order_detail p {
+  margin: 0px;
+  padding: 0px;
+  color: #3b394d;
+  font-weight: 900;
+  padding-top: 10px;
+  font-size: 20px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.myorder_wrapper ul li .order_other {
+  width: 100px;
+  float: right;
+}
+
+.myorder_wrapper ul li .order_other h6 {
+  margin: 0px;
+  padding: 0px;
+  color: #b0aec7;
+  font-size: 12px;
+  padding-top: 9px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  padding-bottom: 10px;
+}
+
+.myorder_wrapper ul li .order_other h5 {
+  margin: 0px;
+  padding: 0px;
+  color: #ce994c;
+  font-size: 16px;
+  font-weight: bold;
+}
+
+.myorder_wrapper ul li .order_other .track_btn {
+  background: #29285b;
+  color: #FFF;
+  float: right;
+  padding: 12px;
+  font-size: 18px;
+  border-radius: 5px;
+  padding-left: 15px;
+  padding-right: 15px;
+}
+/*# sourceMappingURL=myorder.page.css.map */
\ No newline at end of file

src/app/myorder/myorder.page.css.map

+{
+    "version": 3,
+    "mappings": "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",
+    "sources": [
+        "myorder.page.scss"
+    ],
+    "names": [],
+    "file": "myorder.page.css"
+}
\ No newline at end of file

src/app/nearby/nearby.page.css

+.nearby_map {
+  width: 100%;
+  height: 100vh;
+}
+
+.nearby_map .overlay {
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  right: 0px;
+  bottom: 0px;
+  background: rgba(29, 27, 130, 0.2);
+}
+
+.nearby_map agm-map {
+  width: 100%;
+  height: 100%;
+  position: relative;
+}
+
+.nearby_map .click_marker {
+  min-width: 200px;
+  padding: 10px;
+}
+
+.nearby_map .click_marker h5 {
+  margin: 0px;
+  padding: 0px;
+}
+
+.nearby_map .click_marker p {
+  margin: 0px;
+  padding: 0px;
+}
+
+.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);
+}
+
+.add_address_wrapper h5 {
+  color: #29285b;
+  margin: 0px;
+  padding: 0px;
+  font-weight: 800;
+}
+
+.add_address_wrapper input {
+  width: 100%;
+  height: 45px;
+  border: 1px solid #E1E0EB;
+  border-radius: 4px;
+  padding-left: 10px;
+  padding-right: 10px;
+  margin-bottom: 20px;
+}
+
+.add_address_wrapper .add_btn {
+  width: 100%;
+  height: 45px;
+  background-color: #29285B;
+  color: #fff;
+  border-radius: 4px;
+}
+
+.styled-checkbox {
+  position: absolute;
+  opacity: 0;
+}
+
+.styled-checkbox + label {
+  position: relative;
+  cursor: pointer;
+  padding: 0;
+}
+
+.styled-checkbox + label:before {
+  content: '';
+  margin-right: 10px;
+  display: inline-block;
+  vertical-align: text-top;
+  width: 20px;
+  height: 20px;
+  border-radius: 10px;
+  background: white;
+  border: 1px solid #d7d5e4;
+}
+
+.styled-checkbox:checked + label:before {
+  background: #29285b;
+}
+
+.styled-checkbox:disabled + label {
+  color: #b8b8b8;
+  cursor: auto;
+}
+
+.styled-checkbox:disabled + label:before {
+  -webkit-box-shadow: none;
+          box-shadow: none;
+  background: #ddd;
+}
+
+.styled-checkbox:checked + label:after {
+  content: '';
+  position: absolute;
+  left: 6px;
+  top: 11px;
+  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=nearby.page.css.map */
\ No newline at end of file

src/app/nearby/nearby.page.css.map

+{
+    "version": 3,
+    "mappings": "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",
+    "sources": [
+        "nearby.page.scss"
+    ],
+    "names": [],
+    "file": "nearby.page.css"
+}
\ No newline at end of file

src/app/orderdelivered/orderdelivered.page.css

+/* No CSS *//*# sourceMappingURL=orderdelivered.page.css.map */
\ No newline at end of file

src/app/orderdelivered/orderdelivered.page.css.map

+{
+    "version": 3,
+    "mappings": "",
+    "sources": [
+        "orderdelivered.page.scss"
+    ],
+    "names": [],
+    "file": "orderdelivered.page.css"
+}
\ No newline at end of file

src/app/productlist/productlist.page.css

+.product_list {
+  padding-bottom: 50px;
+}
+
+.product_list .product_title {
+  padding: 10px;
+  padding-bottom: 20px;
+  padding-top: 20px;
+  font-size: 24px;
+  font-weight: bold;
+  color: #29285b;
+}
+
+.product_list .product_taskbar {
+  border-bottom: 1px solid rgba(0, 0, 0, 0.16);
+  height: 45px;
+  width: calc(100% - 20px);
+  margin: 0 auto;
+  background-image: url("../../assets/Group109_2.png");
+  background-position: left;
+  background-repeat: no-repeat;
+  background-size: 12px;
+}
+
+.product_list .product_taskbar .filter {
+  width: 45px;
+  height: 45px;
+  cursor: pointer;
+}
+
+.product_list .product_taskbar .viewset {
+  width: 45px;
+  height: 45px;
+  cursor: pointer;
+}
+
+.product_list .product_taskbar .viewset .grid_view {
+  width: 50%;
+  height: 100%;
+  cursor: pointer;
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: 15px;
+  background-image: url("../../assets/Group111_2.png");
+}
+
+.product_list .product_taskbar .viewset .line_view {
+  background-image: url("../../assets/Group110_2.png");
+  cursor: pointer;
+}
+
+.product_list .grid_view li {
+  width: 100%;
+  -webkit-transition-timing-function: ease-in-out;
+          transition-timing-function: ease-in-out;
+  -webkit-transition: 1s;
+  transition: 1s;
+  -webkit-transform: translateX(0);
+          transform: translateX(0);
+}
+
+.product_list .grid_view li .product_image {
+  height: 390px;
+}
+
+.product_list ul {
+  padding: 10px;
+  padding-bottom: 0px;
+  padding-top: 0px;
+  margin: 0px;
+}
+
+.product_list ul li {
+  width: calc(100% - 50%);
+  display: inline-block;
+  border: 10px solid #fff;
+  border-top: none;
+  border-bottom: none;
+  margin-bottom: 20px;
+  -webkit-transition-timing-function: ease-in-out;
+          transition-timing-function: ease-in-out;
+  -webkit-transform: translateX(2%);
+          transform: translateX(2%);
+  -webkit-transition: 1s;
+  transition: 1s;
+}
+
+.product_list ul li .product_image {
+  height: 235px;
+  position: relative;
+}
+
+.product_list ul li .product_image .featured_badge {
+  position: absolute;
+  top: 20px;
+  left: 0px;
+  color: #fff;
+  background-color: #29285b;
+  padding: 2px;
+  padding-left: 10px;
+  padding-right: 10px;
+  font-size: 13px;
+}
+
+.product_list ul li .product_image .fav_icon {
+  position: absolute;
+  top: 10px;
+  right: 10px;
+  font-size: 27px;
+  width: 30px;
+  height: 30px;
+  background-image: url("../../assets/Group32_2.png");
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: 24px;
+}
+
+.product_list ul li .product_image .fav_fill {
+  position: absolute;
+  top: 10px;
+  right: 10px;
+  font-size: 27px;
+  width: 30px;
+  height: 30px;
+  background-image: url("../../assets/fav_fill.png");
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: 24px;
+}
+
+.product_list ul li .product_image img {
+  width: 100%;
+  height: 100%;
+  -o-object-fit: cover;
+     object-fit: cover;
+  -o-object-position: center;
+     object-position: center;
+}
+
+.product_list ul li h5 {
+  margin: 0px;
+  padding: 0px;
+  color: #3b394d;
+  padding-top: 5px;
+  padding-bottom: 5px;
+}
+
+.product_list ul li p {
+  margin: 0px;
+  padding: 0px;
+  color: #b0aec7;
+}
+
+.product_list ul li p span {
+  text-decoration: line-through;
+  margin-left: 10px;
+  color: #d7d5e4;
+}
+
+.product_list ul li p .offer {
+  color: #fff;
+  background-color: #29285b;
+  border-radius: 4px;
+  text-decoration: none;
+  padding: 3px;
+  font-size: 13px;
+}
+
+.product_list .ellipse {
+  white-space: nowrap;
+  width: 180px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.sort_wrappper {
+  height: 100vh;
+  width: 100%;
+  position: fixed;
+  top: 0px;
+  left: 0px;
+  right: 0px;
+  bottom: 0px;
+  background: rgba(0, 0, 0, 0.6);
+  z-index: 99;
+}
+
+.sort_wrappper .sort_inner {
+  margin: 0 auto;
+  width: 280px;
+  padding: 10px;
+  padding-left: 15px;
+  padding-right: 15px;
+  padding-bottom: 15px;
+  background-color: #fff;
+  position: relative;
+  -webkit-box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.3);
+  box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.3);
+  top: 25%;
+  border-radius: 10px;
+}
+
+.sort_wrappper .sort_inner h4 {
+  text-align: center;
+  color: #3b394d;
+  margin: 0px;
+  font-weight: bold;
+  padding: 10px;
+  font-size: 18px;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.16);
+  padding-bottom: 20px;
+}
+
+.sort_wrappper .sort_inner ul {
+  margin: 0px;
+  padding: 0px;
+}
+
+.sort_wrappper .sort_inner ul li {
+  list-style: none;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.16);
+  padding-top: 10px;
+  padding-bottom: 10px;
+}
+
+.sort_wrappper .sort_inner ul li .styled-checkbox {
+  position: absolute;
+  opacity: 0;
+}
+
+.sort_wrappper .sort_inner ul li .styled-checkbox + label {
+  position: relative;
+  cursor: pointer;
+  padding: 0;
+  width: 100%;
+}
+
+.sort_wrappper .sort_inner ul li .styled-checkbox + label:before {
+  content: '';
+  margin-right: 10px;
+  display: inline-block;
+  vertical-align: text-top;
+  width: 20px;
+  height: 20px;
+  border-radius: 5px;
+  background: white;
+  border: 1px solid #d7d5e4;
+}
+
+.sort_wrappper .sort_inner ul li .styled-checkbox:checked + label:before {
+  background: #29285b;
+}
+
+.sort_wrappper .sort_inner ul li .styled-checkbox:disabled + label {
+  color: #b8b8b8;
+  cursor: auto;
+}
+
+.sort_wrappper .sort_inner ul li .styled-checkbox:disabled + label:before {
+  -webkit-box-shadow: none;
+          box-shadow: none;
+  background: #ddd;
+}
+
+.sort_wrappper .sort_inner 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);
+}
+
+.sort_wrappper .sort_inner .sort_footer {
+  padding-top: 10px;
+}
+
+.sort_wrappper .sort_inner .sort_footer button {
+  border-radius: 8px;
+  height: 40px;
+  width: 48%;
+  color: #fff;
+  font-size: 15px;
+  font-weight: lighter;
+}
+
+.sort_wrappper .sort_inner .sort_footer .submit {
+  background-color: #29285b;
+}
+
+.sort_wrappper .sort_inner .sort_footer .cancel {
+  background-color: #d7d5e4;
+}
+/*# sourceMappingURL=productlist.page.css.map */
\ No newline at end of file

src/app/productlist/productlist.page.css.map

+{
+    "version": 3,
+    "mappings": "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",
+    "sources": [
+        "productlist.page.scss"
+    ],
+    "names": [],
+    "file": "productlist.page.css"
+}
\ No newline at end of file

src/app/productlist/productlist.page.html

 <div class="nav_header">
     <button class="nav_btn nav_back floatLeft" (click)="goBack()">
-        <img src="../assets/Group17_2.png">
-    </button>
+    <img src="../assets/Group17_2.png" />
+  </button>
     <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>
-    <button class="nav_btn nav_search floatRight" *ngIf="!searchShow">
-    </button>
-    <button class="nav_btn nav_close floatRight" *ngIf="searchShow" (click)="searchClose()">
-    </button>
+    <button class="nav_btn nav_search floatRight" *ngIf="!searchShow" (click)="clickSearch()"></button>
+    <button class="nav_btn nav_close floatRight" *ngIf="searchShow" (click)="searchClose()"></button>
     <div class="clear"></div>
 </div>
 <ion-content>
@@ -43,39 +41,69 @@
             </li>
         </ul>
     </div>
-    <div class="sort_wrappper" *ngIf="isShow" [@slideInOut]>
-        <div class="sort_inner">
-            <h4>Sort By</h4>
-            <ul>
-                <!-- <li>
+    <ul [class.grid_view]="onGrid" *ngIf="prodService.product && prodService.product.length > 0">
+        <li *ngFor="let product of prodService.product; let i = index">
+            <div class="product_image">
+                <img [src]="product.image" 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>
+            <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>
+      </li>
+    </ul>
+  </div>
+  <div class="sort_wrappper" *ngIf="isShow" [@slideInOut]>
+    <div class="sort_inner">
+      <h4>Sort By</h4>
+      <ul>
+        <!-- <li>
                     <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>
                 </li> -->
-                <!-- <li>
+        <!-- <li>
                     <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>
                 </li> -->
-                <li>
-                    <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>
-                </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-3"
+            type="radio"
+            value="low"
+            name="sort"
+            (click)="setValue($event.target.value)"
+          />
+          <label for="styled-checkbox-3">Price Low - High</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>
                     <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>
                 </li> -->
-            </ul>
-            <div class="sort_footer">
-                <button class="cancel floatLeft" (click)="istoggle()">CANCEL</button>
-                <button class="submit floatRight" (click)="istoggle(); submit()">SUBMIT</button>
-                <div class="clear"></div>
-            </div>
-        </div>
-
+      </ul>
+      <div class="sort_footer">
+        <button class="cancel floatLeft" (click)="istoggle()">CANCEL</button>
+        <button class="submit floatRight" (click)="istoggle(); submit()">
+          SUBMIT
+        </button>
+        <div class="clear"></div>
+      </div>
     </div>
+  </div>
 </ion-content>
 <div class="search_item_list" *ngIf="searchShow" [@slideInOut]>
     <ul *ngIf="searchService.searchList">

src/app/productlist/productlist.page.ts

-import { Component, OnInit } from '@angular/core';
-import { Location } from '@angular/common';
-import { trigger, transition, animate, style } from '@angular/animations';
-import { Router, ActivatedRoute, NavigationExtras } from '@angular/router';
-import { ProductsService } from './../../config/products.service';
-import { ServiceService } from './../../config/service.service';
-import { SearchService } from './../../config/search.service';
+import { Component, OnInit } from "@angular/core";
+import { Location } from "@angular/common";
+import { trigger, transition, animate, style } from "@angular/animations";
+import { Router, ActivatedRoute, NavigationExtras } from "@angular/router";
+import { ProductsService } from "./../../config/products.service";
+import { ServiceService } from "./../../config/service.service";
+import { SearchService } from "./../../config/search.service";
 
 @Component({
-  selector: 'app-productlist',
-  templateUrl: './productlist.page.html',
-  styleUrls: ['./productlist.page.scss'],
+  selector: "app-productlist",
+  templateUrl: "./productlist.page.html",
+  styleUrls: ["./productlist.page.scss"],
   animations: [
-    trigger('slideInOut', [
-      transition(':enter', [
-        style({ transform: 'translateY(100%)' }),
-        animate('200ms ease-in', style({ transform: 'translateY(0%)' }))
+    trigger("slideInOut", [
+      transition(":enter", [
+        style({ transform: "translateY(100%)" }),
+        animate("200ms ease-in", style({ transform: "translateY(0%)" }))
       ]),
-      transition(':leave', [
-        animate('200ms ease-out', style({ transform: 'translateY(100%)' }))
+      transition(":leave", [
+        animate("200ms ease-out", style({ transform: "translateY(100%)" }))
       ])
     ])
   ]
@@ -37,7 +37,7 @@ export class ProductlistPage implements OnInit {
     public service: ServiceService,
     public searchService: SearchService
   ) {
-    this.service.get('params').then(val => {
+    this.service.get("params").then(val => {
       this.data = val;
       console.log(this.data);
       this.prodService.prodList(this.data.uid);
@@ -66,6 +66,7 @@ export class ProductlistPage implements OnInit {
 
   clickSearch() {
     this.searchShow = true;
+    this.searchService.searchList = [];
   }
 
   searchClose() {
@@ -74,7 +75,7 @@ export class ProductlistPage implements OnInit {
 
   prodDetails(index: number) {
     this.prodService.setProd(this.prodService.product[index]);
-    this.router.navigateByUrl('productdetail');
+    this.router.navigateByUrl("productdetail");
     document.body.scrollTop = document.documentElement.scrollTop = 0;
   }
 
@@ -84,10 +85,10 @@ export class ProductlistPage implements OnInit {
     console.log(this.prodService.fav);
     if (state > -1) {
       this.prodService.fav.splice(state, 1);
-      this.prodService.changeFav(index, 'yes');
+      this.prodService.changeFav(index, "yes");
     } else {
       this.prodService.fav.push(index);
-      this.prodService.changeFav(index, 'no');
+      this.prodService.changeFav(index, "no");
     }
     return;
     console.log(this.prodService.fav);
@@ -105,7 +106,7 @@ export class ProductlistPage implements OnInit {
 
   checkFavStatus(index) {
     const state = this.prodService.fav.findIndex(x => x === index);
-    return state > -1 ? 'fav_fill' : 'fav_icon';
+    return state > -1 ? "fav_fill" : "fav_icon";
   }
 
   searchFun(data: string) {
@@ -116,19 +117,19 @@ export class ProductlistPage implements OnInit {
     console.log(datas);
     let data;
     let url;
-    if (datas.type === 'shopper') {
+    if (datas.type === "shopper") {
       data = datas.data;
-      this.service.set('params', data);
-      url = 'productlist';
-    } else if (datas.type === 'category') {
+      this.service.set("params", data);
+      url = "productlist";
+    } else if (datas.type === "category") {
       data = datas.data;
-      this.service.set('params', data);
-      url = 'catstorelist';
+      this.service.set("params", data);
+      url = "catstorelist";
     } else {
       data = datas.data;
       data.size = this.service.splitSep(data.size);
       data.tag = this.service.splitSep(data.tag);
-      (data.color = this.service.splitSep(data.color)), (url = 'productdetail');
+      (data.color = this.service.splitSep(data.color)), (url = "productdetail");
       this.prodService.setProd(data);
     }
     this.searchClose();

src/app/profile/profile.page.css

+.profile_wrapper .profile_banner {
+  width: 100%;
+  background-image: url("../../assets/profile_banner.png");
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: cover;
+  text-align: center;
+  padding-top: 40px;
+}
+
+.profile_wrapper .profile_banner .profile_circle {
+  width: 100px;
+  height: 100px;
+  background-color: #fff;
+  border-radius: 50%;
+  position: relative;
+  margin: 0 auto;
+}
+
+.profile_wrapper .profile_banner .profile_circle img {
+  width: 100%;
+  height: 100%;
+  -o-object-fit: cover;
+     object-fit: cover;
+  -o-object-position: center;
+     object-position: center;
+  border-radius: 50%;
+}
+
+.profile_wrapper .profile_banner .profile_circle .edit {
+  width: 30px;
+  height: 30px;
+  border-radius: 50%;
+  -o-object-fit: cover;
+     object-fit: cover;
+  -o-object-position: center;
+     object-position: center;
+  background-color: #000;
+  background-image: url("../../assets/edit_icon.png");
+  background-size: cover;
+  cursor: pointer;
+  position: absolute;
+  top: 0px;
+  right: 0px;
+}
+
+.profile_wrapper .profile_banner h5 {
+  text-align: center;
+  color: #fff;
+  margin: 0px;
+  padding-top: 15px;
+  font-weight: 600;
+  padding-bottom: 5px;
+}
+
+.profile_wrapper .profile_banner p {
+  color: #ce994c;
+  text-align: center;
+  margin: 0px;
+  padding-bottom: 20px;
+  font-weight: 700;
+}
+
+.profile_wrapper .account_wrapper {
+  width: calc(100% - 40px);
+  margin: 0 auto;
+  padding-top: 20px;
+  padding-bottom: 100px;
+}
+
+.profile_wrapper .account_wrapper .account_header {
+  padding-bottom: 15px;
+}
+
+.profile_wrapper .account_wrapper .account_header h5 {
+  margin: 0px;
+  padding: 0px;
+  color: #3b394d;
+  font-weight: 900;
+}
+
+.profile_wrapper .account_wrapper .account_header span {
+  color: #3b394d;
+}
+
+.profile_wrapper .account_wrapper .account_header span img {
+  width: 20px;
+}
+
+.profile_wrapper .account_wrapper p {
+  margin: 0px;
+  padding: 0px;
+  color: #b0aec7;
+  font-size: 18px;
+}
+
+.profile_wrapper .account_wrapper p span {
+  color: #ce994c;
+  margin-left: 10px;
+}
+
+.profile_wrapper .account_wrapper h6 {
+  margin: 0px;
+  padding: 0px;
+  color: #3b394d;
+  font-size: 18px;
+}
+
+.profile_wrapper .account_wrapper h6 ion-icon {
+  color: #b0aec7;
+}
+
+.profile_wrapper .account_wrapper .row {
+  padding-bottom: 20px;
+}
+
+.profile_wrapper .account_wrapper hr {
+  border-bottom: 1px solid rgba(176, 174, 199, 0.5);
+  height: 0px;
+  border-top: none;
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+/*# sourceMappingURL=profile.page.css.map */
\ No newline at end of file

src/app/profile/profile.page.css.map

+{
+    "version": 3,
+    "mappings": "AAAA,AACI,gBADY,CACZ,eAAe,CAAC;EACZ,KAAK,EAAE,IAAI;EACX,gBAAgB,EAAE,sCAAsC;EACxD,mBAAmB,EAAE,MAAM;EAC3B,iBAAiB,EAAE,SAAS;EAC5B,eAAe,EAAE,KAAK;EACtB,UAAU,EAAE,MAAM;EAClB,WAAW,EAAE,IAAI;CA6CpB;;AArDL,AASQ,gBATQ,CACZ,eAAe,CAQX,eAAe,CAAC;EACZ,KAAK,EAAE,KAAK;EACZ,MAAM,EAAE,KAAK;EACb,gBAAgB,EAAE,IAAI;EACtB,aAAa,EAAE,GAAG;EAClB,QAAQ,EAAE,QAAQ;EAClB,MAAM,EAAE,MAAM;CAsBjB;;AArCT,AAgBY,gBAhBI,CACZ,eAAe,CAQX,eAAe,CAOX,GAAG,CAAC;EACA,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,UAAU,EAAE,KAAK;EACjB,eAAe,EAAE,MAAM;EACvB,aAAa,EAAE,GAAG;CACrB;;AAtBb,AAuBY,gBAvBI,CACZ,eAAe,CAQX,eAAe,CAcX,KAAK,CAAC;EACF,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,aAAa,EAAE,GAAG;EAClB,UAAU,EAAE,KAAK;EACjB,eAAe,EAAE,MAAM;EACvB,gBAAgB,EAAE,IAAI;EACtB,gBAAgB,EAAE,iCAAiC;EACnD,eAAe,EAAE,KAAK;EACtB,MAAM,EAAE,OAAO;EACf,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,GAAG;EACR,KAAK,EAAE,GAAG;CACb;;AApCb,AAsCQ,gBAtCQ,CACZ,eAAe,CAqCX,EAAE,CAAC;EACC,UAAU,EAAE,MAAM;EAClB,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,GAAG;EACX,WAAW,EAAE,IAAI;EACjB,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,GAAG;CACtB;;AA7CT,AA8CQ,gBA9CQ,CACZ,eAAe,CA6CX,CAAC,CAAC;EACE,KAAK,EAAE,OAAqB;EAC5B,UAAU,EAAE,MAAM;EAClB,MAAM,EAAE,GAAG;EACX,cAAc,EAAE,IAAI;EACpB,WAAW,EAAE,GAAG;CACnB;;AApDT,AAsDI,gBAtDY,CAsDZ,gBAAgB,CAAC;EACb,KAAK,EAAE,iBAAiB;EACxB,MAAM,EAAE,MAAM;EACd,WAAW,EAAE,IAAI;EACjB,cAAc,EAAE,KAAK;CA6CxB;;AAvGL,AA2DQ,gBA3DQ,CAsDZ,gBAAgB,CAKZ,eAAe,CAAC;EACZ,cAAc,EAAE,IAAI;CAavB;;AAzET,AA6DY,gBA7DI,CAsDZ,gBAAgB,CAKZ,eAAe,CAEX,EAAE,CAAC;EACC,MAAM,EAAE,GAAG;EACX,OAAO,EAAE,GAAG;EACZ,KAAK,EAAE,OAAmB;EAC1B,WAAW,EAAE,GAAG;CACnB;;AAlEb,AAmEY,gBAnEI,CAsDZ,gBAAgB,CAKZ,eAAe,CAQX,IAAI,CAAC;EACD,KAAK,EAAE,OAAmB;CAI7B;;AAxEb,AAqEgB,gBArEA,CAsDZ,gBAAgB,CAKZ,eAAe,CAQX,IAAI,CAEA,GAAG,CAAC;EACA,KAAK,EAAE,IAAI;CACd;;AAvEjB,AA0EQ,gBA1EQ,CAsDZ,gBAAgB,CAoBZ,CAAC,CAAC;EACE,MAAM,EAAE,GAAG;EACX,OAAO,EAAE,GAAG;EACZ,KAAK,EAAE,OAAsB;EAC7B,SAAS,EAAE,IAAI;CAKlB;;AAnFT,AA+EY,gBA/EI,CAsDZ,gBAAgB,CAoBZ,CAAC,CAKG,IAAI,CAAC;EACD,KAAK,EAAE,OAAqB;EAC5B,WAAW,EAAE,IAAI;CACpB;;AAlFb,AAoFQ,gBApFQ,CAsDZ,gBAAgB,CA8BZ,EAAE,CAAC;EACC,MAAM,EAAE,GAAG;EACX,OAAO,EAAE,GAAG;EACZ,KAAK,EAAE,OAAmB;EAC1B,SAAS,EAAE,IAAI;CAIlB;;AA5FT,AAyFY,gBAzFI,CAsDZ,gBAAgB,CA8BZ,EAAE,CAKE,QAAQ,CAAC;EACL,KAAK,EAAE,OAAsB;CAChC;;AA3Fb,AA6FQ,gBA7FQ,CAsDZ,gBAAgB,CAuCZ,IAAI,CAAC;EACD,cAAc,EAAE,IAAI;CACvB;;AA/FT,AAgGQ,gBAhGQ,CAsDZ,gBAAgB,CA0CZ,EAAE,CAAC;EACC,aAAa,EAAE,GAAG,CAAC,KAAK,CAAC,wBAAuB;EAChD,MAAM,EAAE,GAAG;EACX,UAAU,EAAE,IAAI;EAChB,UAAU,EAAE,IAAI;EAChB,aAAa,EAAE,IAAI;CACtB",
+    "sources": [
+        "profile.page.scss"
+    ],
+    "names": [],
+    "file": "profile.page.css"
+}
\ No newline at end of file

src/app/profile/profile.page.html

@@ -128,4 +128,5 @@
             </div>
         </div>
     </div>
+    </div>
 </ion-content>
\ No newline at end of file

src/app/profile/profile.page.ts

-import { Component, OnInit } from "@angular/core";
-import { User } from "../../config/services/user";
-import { UserService } from "../../config/user.service";
-import { ServiceService } from "../../config/service.service";
-import { AuthService } from "../../config/auth.service";
-import { Router, ActivatedRoute } from "@angular/router";
-import { finalize, tap } from "rxjs/operators";
+import { Component, OnInit } from '@angular/core';
+import { User } from '../../config/services/user';
+import { UserService } from '../../config/user.service';
+import { ServiceService } from '../../config/service.service';
+import { AuthService } from '../../config/auth.service';
+import { Router, ActivatedRoute } from '@angular/router';
+import { finalize, tap } from 'rxjs/operators';
+import { Location } from '@angular/common';
+import { AddressService } from './../../config/address.service';
 import {
   AngularFireStorage,
   AngularFireStorageReference,
   AngularFireUploadTask
-} from "@angular/fire/storage";
-import { trigger, transition, animate, style } from "@angular/animations";
+} from '@angular/fire/storage';
+import { trigger, transition, animate, style } from '@angular/animations';
 
 @Component({
-  selector: "app-profile",
-  templateUrl: "./profile.page.html",
-  styleUrls: ["./profile.page.scss"],
+  selector: 'app-profile',
+  templateUrl: './profile.page.html',
+  styleUrls: ['./profile.page.scss'],
   animations: [
-    trigger("slideInOut", [
-      transition(":enter", [
-        style({ transform: "translateY(100%)" }),
-        animate("200ms ease-in", style({ transform: "translateY(0%)" }))
+    trigger('slideInOut', [
+      transition(':enter', [
+        style({ transform: 'translateY(100%)' }),
+        animate('200ms ease-in', style({ transform: 'translateY(0%)' }))
       ]),
-      transition(":leave", [
-        animate("200ms ease-out", style({ transform: "translateY(100%)" }))
+      transition(':leave', [
+        animate('200ms ease-out', style({ transform: 'translateY(100%)' }))
       ])
     ])
   ]
@@ -43,16 +45,18 @@ export class ProfilePage implements OnInit {
     private storage: AngularFireStorage,
     private useService: UserService,
     private service: ServiceService,
-    private authService: AuthService
+    private authService: AuthService,
+    private addressService: AddressService,
+    private location: Location
   ) {
-    this.service.get("user").then(data => {
+    this.service.get('user').then(data => {
       if (data) {
         this.userData = JSON.parse(data);
         console.log(this.userData);
       }
     });
 
-    this.service.get("userData").then(data => {
+    this.service.get('userData').then(data => {
       if (data) {
         this.loggedUser = JSON.parse(data);
       }
@@ -69,7 +73,7 @@ export class ProfilePage implements OnInit {
     setTimeout(() => {
       this.user = this.useService.users;
       // console.log('[users]', this.user);
-      this.service.set("params", this.user);
+      this.service.set('params', this.user);
     }, 500);
   }
 
@@ -77,6 +81,10 @@ export class ProfilePage implements OnInit {
     this.isShow = !this.isShow;
   }
 
+  goBack() {
+    this.location.back();
+  }
+
   async fileChange(event) {
     const fileList: FileList = event.target.files;
     if (fileList.length > 0) {
@@ -92,8 +100,8 @@ export class ProfilePage implements OnInit {
       reader.readAsDataURL(event.target.files[0]);
 
       const file = fileList[0];
-      const ext = file.name.split(".").pop();
-      if (ext === "jpg" || ext === "jpeg" || ext === "png") {
+      const ext = file.name.split('.').pop();
+      if (ext === 'jpg' || ext === 'jpeg' || ext === 'png') {
         const path = file.name; // + Date.now();
         const ref = this.storage.ref(path);
         const task = this.storage

src/app/searchmodal/searchmodal.page.css

+/* No CSS *//*# sourceMappingURL=searchmodal.page.css.map */
\ No newline at end of file

src/app/searchmodal/searchmodal.page.css.map

+{
+    "version": 3,
+    "mappings": "",
+    "sources": [
+        "searchmodal.page.scss"
+    ],
+    "names": [],
+    "file": "searchmodal.page.css"
+}
\ No newline at end of file

src/app/searchmodal/searchmodal.page.html

 <div class="nav_header">
-    <button class="nav_btn nav_back floatLeft" (click)="closeModal()">
-    </button>
-    <div class="nav_title floatLeft relative">
-        <input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..." (click)="clickSearch()" (input)="searchFun($event.target.value)" #searchText>
-    </div>
-    <button class="nav_btn nav_close floatRight" (click)="closeModal()">
-    </button>
-    <div class="clear"></div>
+  <button class="nav_btn nav_back floatLeft" (click)="closeModal()"></button>
+  <div class="nav_title floatLeft relative">
+    <input
+      class="search_bar"
+      placeholder="Search here.. eg:shirts, retailers etc..."
+      (click)="clickSearch()"
+      (input)="searchFun($event.target.value)"
+      #searchText
+    />
+  </div>
+  <button class="nav_btn nav_close floatRight" (click)="closeModal()"></button>
+  <div class="clear"></div>
 </div>
 <div class="search_item_list">
-    <ul *ngIf="searchService.searchList">
-        <li *ngFor="let search of searchService.searchList" (click)="viewPage(search)">{{search.text}} </li>
-    </ul>
-</div>
+  <ul *ngIf="searchService.searchList">
+    <li
+      *ngFor="let search of searchService.searchList"
+      (click)="viewPage(search)"
\ No newline at end of file
+    >
+      {{search.text}}
+    </li>
+  </ul>
+</div>

src/app/signup/signup.page.css

+.login_wrapper {
+  width: 80%;
+  margin: 0 auto;
+}
+
+.login_wrapper .logo_wrapper {
+  width: 100%;
+  text-align: center;
+  padding-top: 50px;
+  padding-bottom: 30px;
+}
+
+.login_wrapper .logo_wrapper img {
+  width: 180px;
+}
+
+.login_wrapper .form_div .row {
+  margin-bottom: 20px;
+}
+
+.login_wrapper .form_div .row input {
+  border: 1px solid #d7d5e4;
+  background: transparent;
+  color: #d7d5e4;
+  width: 100%;
+  height: 45px;
+  text-align: center;
+  border-radius: 8px;
+  font-size: 16px;
+}
+
+.login_wrapper .form_div .row ion-datetime {
+  border: 1px solid #d7d5e4;
+  background: transparent;
+  color: #d7d5e4;
+  width: 100%;
+  height: 45px;
+  text-align: center;
+  border-radius: 8px;
+  font-size: 16px;
+  padding-left: 0px;
+}
+
+.login_wrapper .form_div .row .login_btn {
+  width: 100%;
+  background-color: #29285b;
+  color: #fff;
+  border-radius: 8px;
+  height: 45px;
+  font-size: 16px;
+}
+
+.login_wrapper .form_div .row hr {
+  border: 1px solid #d7d5e4;
+  border-bottom: none;
+  margin-top: 30px;
+  margin-bottom: 10px;
+}
+
+.login_wrapper .form_div .row P {
+  text-align: center;
+  color: #3b394d;
+  margin: 0px;
+  position: relative;
+  bottom: 20px;
+}
+
+.login_wrapper .form_div .row P span {
+  background-color: #fff;
+  padding: 10px;
+  font-size: 18px;
+}
+
+.login_wrapper .form_div .row h4 {
+  color: #3b394d;
+  text-align: center;
+  margin: 0px;
+  padding-top: 15px;
+}
+
+.login_wrapper .form_div .row h6 {
+  color: #29285b;
+}
+
+.login_wrapper .form_div .row h6 span {
+  position: relative;
+  top: 5px;
+}
+
+.login_wrapper .form_div .row h6 a {
+  color: #29285b;
+  text-decoration: none;
+  font-weight: 900;
+}
+
+.login_wrapper .form_div .row h6 .styled-checkbox {
+  position: absolute;
+  opacity: 0;
+}
+
+.login_wrapper .form_div .row h6 .styled-checkbox + label {
+  position: relative;
+  cursor: pointer;
+  padding: 0;
+}
+
+.login_wrapper .form_div .row h6 .styled-checkbox + label:before {
+  content: '';
+  margin-right: 10px;
+  display: inline-block;
+  vertical-align: text-top;
+  width: 30px;
+  height: 30px;
+  border-radius: 10px;
+  background: white;
+  border: 1px solid #d7d5e4;
+}
+
+.login_wrapper .form_div .row h6 .styled-checkbox:checked + label:before {
+  background: #29285b;
+}
+
+.login_wrapper .form_div .row h6 .styled-checkbox:disabled + label {
+  color: #b8b8b8;
+  cursor: auto;
+}
+
+.login_wrapper .form_div .row h6 .styled-checkbox:disabled + label:before {
+  -webkit-box-shadow: none;
+          box-shadow: none;
+  background: #ddd;
+}
+
+.login_wrapper .form_div .row h6 .styled-checkbox:checked + label:after {
+  content: '';
+  position: absolute;
+  left: 10px;
+  top: 15px;
+  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);
+}
+
+.login_wrapper .form_div .row .social_div {
+  border: 1px solid #d7d5e4;
+  height: 45px;
+  border-radius: 20px;
+}
+
+.login_wrapper .form_div .row .social_div .social_btn {
+  display: inline-block;
+  width: 50%;
+  text-align: center;
+  height: 100%;
+  font-size: 18px;
+  padding: 9px;
+}
+
+.terms_wrapper {
+  background-color: rgba(41, 40, 91, 0.6);
+  color: #fff;
+  position: fixed;
+  top: 0px;
+  bottom: 0px;
+  left: 0px;
+  right: 0px;
+  z-index: 9999;
+}
+
+.terms_wrapper .terms_inner {
+  background-color: #fff;
+  border-radius: 10px;
+  width: calc(100% - 20px);
+  margin: 0 auto;
+  padding: 20px;
+  padding-top: 10px;
+  position: relative;
+  top: 50px;
+}
+
+.terms_wrapper .terms_inner h5 {
+  margin: 0px;
+  border-bottom: 1px solid #a8a8a8;
+  padding-top: 10px;
+  padding-bottom: 10px;
+  text-align: center;
+  color: #29285b;
+}
+
+.terms_wrapper .terms_inner p {
+  color: #a8a8a8;
+  text-align: justify;
+  padding-top: 10px;
+  padding-bottom: 10px;
+  height: 300px;
+  overflow: scroll;
+}
+
+.terms_wrapper .terms_inner .accept {
+  width: 100%;
+  height: 35px;
+  background-color: #29285b;
+  color: #fff;
+  text-align: center;
+  border-radius: 2px;
+}
+/*# sourceMappingURL=signup.page.css.map */
\ No newline at end of file

src/app/signup/signup.page.css.map

+{
+    "version": 3,
+    "mappings": "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",
+    "sources": [
+        "signup.page.scss"
+    ],
+    "names": [],
+    "file": "signup.page.css"
+}
\ No newline at end of file

src/app/sortby/sortby.page.css

+/* No CSS *//*# sourceMappingURL=sortby.page.css.map */
\ No newline at end of file

src/app/sortby/sortby.page.css.map

+{
+    "version": 3,
+    "mappings": "",
+    "sources": [
+        "sortby.page.scss"
+    ],
+    "names": [],
+    "file": "sortby.page.css"
+}
\ No newline at end of file

src/app/storelist/storelist.page.html

 <div class="nav_header">
-    <button class="nav_btn nav_back floatLeft" (click)="goBack()">
-    </button>
-    <div class="nav_title floatLeft">
-        <input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..." (click)="clickSearch()">
-    </div>
-    <button class="nav_btn nav_search floatRight" *ngIf="!searchShow">
-    </button>
-    <button class="nav_btn nav_close floatRight" *ngIf="searchShow" (click)="searchClose()">
-    </button>
-    <div class="clear"></div>
+  <button class="nav_btn nav_back floatLeft" (click)="goBack()"></button>
+  <div class="nav_title floatLeft">
+    <input
+      class="search_bar"
+      placeholder="Search here.. eg:shirts, retailers etc..."
+      (click)="clickSearch()"
+    />
+  </div>
+  <button
+    class="nav_btn nav_search floatRight"
+    *ngIf="!searchShow"
+    (click)="clickSearch()"
+  ></button>
+  <button
+    class="nav_btn nav_close floatRight"
+    *ngIf="searchShow"
+    (click)="searchClose()"
+  ></button>
+  <div class="clear"></div>
 </div>
 <ion-content>
-    <div class="home_wrapper">
-        <div class="home_sub_header">
-            Featured Stores
-        </div>
-        <div class="featured_slider">
-            <ion-slides pager="false" [options]="slideOpts" *ngIf="shopperService.activeshoppers && shopperService.activeshoppers.length > 0">
-                <ion-slide *ngFor="let shopper of shopperService.activeshoppers">
-                    <div class="feature_product" (click)="goToPage('productlist', shopper)">
-                        <img [src]="shopper.featuredImage" onerror="this.src='./../../assets/getmi_malls/featured/featured1.png'">
-                        <div class="feature_overlay">
-                            <h5>{{shopper.name}}</h5>
-                            <p>{{shopper.caption}}</p>
-                        </div>
-                    </div>
-                </ion-slide>
-            </ion-slides>
-        </div>
-        <div class="home_sub_header" *ngIf="data">
-            {{data.centerName}}
-        </div>
-        <div class="nearby_shop_list">
-            <ul *ngIf="shopperService.shoppers && shopperService.shoppers.length > 0">
-                <li *ngFor="let shopper of shopperService.shoppers" (click)="goToPage('productlist', shopper)">
-                    <div class="nearby_image">
-                        <img [src]="shopper.profilePic" onerror="this.src='./../../assets/getmi_malls/store298/stores1.png'">
-                    </div>
-                    <div class="nearby_detail">
-                        <h5>
-                            <span class="floatLeft">{{shopper.name}}</span>
-                            <span class="floatRight">0
-                                <img src="../assets/Path61_2.png">
-                            </span>
-                            <div class="clear"></div>
-                        </h5>
-                        <p>{{shopper.caption}}</p>
-                    </div>
-                    <div class="clear"></div>
-                </li>
-            </ul>
-        </div>
+  <div class="home_wrapper">
+    <div class="home_sub_header">
+      Featured Stores
     </div>
-
+    <div class="featured_slider">
+      <ion-slides
+        pager="false"
+        [options]="slideOpts"
+        *ngIf="shopperService.activeshoppers && shopperService.activeshoppers.length > 0"
+      >
+        <ion-slide *ngFor="let shopper of shopperService.activeshoppers">
+          <div
+            class="feature_product"
+            (click)="goToPage('productlist', shopper)"
+          >
+            <img
+              [src]="shopper.featuredImage"
+              onerror="this.src='./../../assets/getmi_malls/featured/featured1.png'"
+            />
+            <div class="feature_overlay">
+              <h5>{{shopper.name}}</h5>
+              <p>{{shopper.caption}}</p>
+            </div>
+          </div>
+        </ion-slide>
+      </ion-slides>
+    </div>
+    <div class="home_sub_header" *ngIf="data">
+      {{data.centerName}}
+    </div>
+    <div class="nearby_shop_list">
+      <ul *ngIf="shopperService.shoppers && shopperService.shoppers.length > 0">
+        <li
+          *ngFor="let shopper of shopperService.shoppers"
+          (click)="goToPage('productlist', shopper)"
+        >
+          <div class="nearby_image">
+            <img
+              [src]="shopper.profilePic"
+              onerror="this.src='./../../assets/getmi_malls/store298/stores1.png'"
+            />
+          </div>
+          <div class="nearby_detail">
+            <h5>
+              <span class="floatLeft">{{shopper.name}}</span>
+              <span class="floatRight"
+                >0
+                <img src="../assets/Path61_2.png" />
+              </span>
+              <div class="clear"></div>
+            </h5>
+            <p>{{shopper.caption}}</p>
+          </div>
+          <div class="clear"></div>
+        </li>
+      </ul>
+    </div>
+  </div>
 </ion-content>
 
 <div class="search_item_list" *ngIf="searchShow" [@slideInOut]>
-    <ul>
-        <li>sample</li>
-    </ul>
-</div>
+  <ul>
+    <li>sample</li>
+  </ul>
+</div>
\ No newline at end of file

src/app/storelist/storelist.page.ts

@@ -4,7 +4,7 @@ import { Router } from "@angular/router";
 import { Location } from "@angular/common";
 import { ServiceService } from "./../../config/service.service";
 import { ShoppersService } from "./../../config/shopper.service";
-
+import { SearchService } from "../../config/search.service";
 @Component({
   selector: "app-storelist",
   templateUrl: "./storelist.page.html",
@@ -32,7 +32,8 @@ export class StorelistPage implements OnInit {
     public router: Router,
     public location: Location,
     public service: ServiceService,
-    public shopperService: ShoppersService
+    public shopperService: ShoppersService,
+    private searchService: SearchService
   ) {
     this.service.get("params").then(val => {
       this.data = val;
@@ -54,6 +55,7 @@ export class StorelistPage implements OnInit {
 
   clickSearch() {
     this.searchShow = true;
+    this.searchService.searchList = [];
   }
 
   searchClose() {

src/app/tab1/tab1.page.css

+.welcome-card img {
+  max-height: 35vh;
+  overflow: hidden;
+}
+/*# sourceMappingURL=tab1.page.css.map */
\ No newline at end of file

src/app/tab1/tab1.page.css.map

+{
+    "version": 3,
+    "mappings": "AAAA,AAAA,aAAa,CAAC,GAAG,CAAC;EAChB,UAAU,EAAE,IAAI;EAChB,QAAQ,EAAE,MAAM;CACjB",
+    "sources": [
+        "tab1.page.scss"
+    ],
+    "names": [],
+    "file": "tab1.page.css"
+}
\ No newline at end of file

src/app/tab2/tab2.page.css

+/* No CSS *//*# sourceMappingURL=tab2.page.css.map */
\ No newline at end of file

src/app/tab2/tab2.page.css.map

+{
+    "version": 3,
+    "mappings": "",
+    "sources": [
+        "tab2.page.scss"
+    ],
+    "names": [],
+    "file": "tab2.page.css"
+}
\ No newline at end of file

src/app/tab3/tab3.page.css

+/* No CSS *//*# sourceMappingURL=tab3.page.css.map */
\ No newline at end of file

src/app/tab3/tab3.page.css.map

+{
+    "version": 3,
+    "mappings": "",
+    "sources": [
+        "tab3.page.scss"
+    ],
+    "names": [],
+    "file": "tab3.page.css"
+}
\ No newline at end of file

src/app/tabs/tabs.page.css

+/* No CSS *//*# sourceMappingURL=tabs.page.css.map */
\ No newline at end of file

src/app/tabs/tabs.page.css.map

+{
+    "version": 3,
+    "mappings": "",
+    "sources": [
+        "tabs.page.scss"
+    ],
+    "names": [],
+    "file": "tabs.page.css"
+}
\ No newline at end of file

src/app/trackorder/trackorder.page.css

+.trackorder_div {
+  width: 100%;
+  height: 100vh;
+  position: relative;
+}
+
+.trackorder_div .overlay {
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  right: 0px;
+  bottom: 0px;
+  background-color: rgba(68, 67, 151, 0.2);
+}
+
+.trackorder_div agm-map {
+  width: 100%;
+  height: 100%;
+}
+
+.rider_footer {
+  position: fixed;
+  bottom: 0px;
+  left: 0px;
+  padding: 15px;
+  right: 0px;
+  background-color: #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);
+  border-top-left-radius: 15px;
+  border-top-right-radius: 15px;
+}
+
+.rider_footer .rider_image {
+  width: 50px;
+  height: 50px;
+  border-radius: 50%;
+  float: left;
+  background-color: #a8a8a8;
+}
+
+.rider_footer .rider_image img {
+  width: 100%;
+  height: 100%;
+  -o-object-fit: cover;
+     object-fit: cover;
+  -o-object-position: center;
+     object-position: center;
+  border-radius: 50%;
+}
+
+.rider_footer .rider_detail {
+  float: left;
+  padding: 5px;
+  padding-left: 10px;
+  width: calc(100% - 265px);
+}
+
+.rider_footer .rider_detail h5 {
+  margin: 0px;
+  padding: 0px;
+  color: #3b394d;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.rider_footer .rider_detail p {
+  margin: 0px;
+  padding: 0px;
+  color: #b0aec7;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.rider_footer .rider_time {
+  float: left;
+  width: 110px;
+  font-size: 35px;
+  font-weight: 900;
+  color: #3b394d;
+  padding: 5px;
+  padding-left: 15px;
+}
+
+.rider_footer .rider_time span {
+  color: #b0aec7;
+  font-size: 16px;
+  padding-left: 5px;
+  font-weight: 400;
+}
+
+.rider_footer .rider_call {
+  background-color: #35cbab;
+  color: #fff;
+  float: right;
+  height: 50px;
+  padding: 14px;
+  font-size: 16px;
+  width: 100px;
+  border-radius: 5px;
+  font-weight: 700;
+  padding-left: 20px;
+  padding-right: 20px;
+  text-align: center;
+}
+/*# sourceMappingURL=trackorder.page.css.map */
\ No newline at end of file

src/app/trackorder/trackorder.page.css.map

+{
+    "version": 3,
+    "mappings": "AAAA,AAAA,eAAe,CAAC;EACZ,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,KAAK;EACb,QAAQ,EAAE,QAAQ;CAarB;;AAhBD,AAII,eAJW,CAIX,QAAQ,CAAC;EACL,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,GAAG;EACR,IAAI,EAAE,GAAG;EACT,KAAK,EAAE,GAAG;EACV,MAAM,EAAE,GAAG;EACX,gBAAgB,EAAE,sBAAsB;CAC3C;;AAXL,AAYI,eAZW,CAYX,OAAO,CAAC;EACJ,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;CACf;;AAGL,AAAA,aAAa,CAAC;EACV,QAAQ,EAAE,KAAK;EACf,MAAM,EAAE,GAAG;EACX,IAAI,EAAE,GAAG;EACT,OAAO,EAAE,IAAI;EACb,KAAK,EAAE,GAAG;EACV,gBAAgB,EAAE,IAAI;EACtB,kBAAkB,EAAE,GAAG,CAAE,IAAG,CAAC,GAAG,CAAC,GAAG,CAAC,kBAAkB;EACvD,eAAe,EAAE,GAAG,CAAE,IAAG,CAAC,GAAG,CAAC,GAAG,CAAC,kBAAkB;EACpD,UAAU,EAAE,GAAG,CAAE,IAAG,CAAC,GAAG,CAAC,GAAG,CAAC,kBAAkB;EAC/C,sBAAsB,EAAE,IAAI;EAC5B,uBAAuB,EAAE,IAAI;CAkEhC;;AA7ED,AAYI,aAZS,CAYT,YAAY,CAAC;EACT,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,aAAa,EAAE,GAAG;EAClB,KAAK,EAAE,IAAI;EACX,gBAAgB,EAAE,OAAO;CAQ5B;;AAzBL,AAkBQ,aAlBK,CAYT,YAAY,CAMR,GAAG,CAAC;EACA,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,UAAU,EAAE,KAAK;EACjB,eAAe,EAAE,MAAM;EACvB,aAAa,EAAE,GAAG;CACrB;;AAxBT,AA0BI,aA1BS,CA0BT,aAAa,CAAC;EACV,KAAK,EAAE,IAAI;EACX,OAAO,EAAE,GAAG;EACZ,YAAY,EAAE,IAAI;EAClB,KAAK,EAAE,kBAAkB;CAiB5B;;AA/CL,AA+BQ,aA/BK,CA0BT,aAAa,CAKT,EAAE,CAAC;EACC,MAAM,EAAE,GAAG;EACX,OAAO,EAAE,GAAG;EACZ,KAAK,EAAE,OAAmB;EAC1B,WAAW,EAAE,MAAM;EACnB,QAAQ,EAAE,MAAM;EAChB,aAAa,EAAE,QAAQ;CAC1B;;AAtCT,AAuCQ,aAvCK,CA0BT,aAAa,CAaT,CAAC,CAAC;EACE,MAAM,EAAE,GAAG;EACX,OAAO,EAAE,GAAG;EACZ,KAAK,EAAE,OAAsB;EAC7B,WAAW,EAAE,MAAM;EACnB,QAAQ,EAAE,MAAM;EAChB,aAAa,EAAE,QAAQ;CAC1B;;AA9CT,AAgDI,aAhDS,CAgDT,WAAW,CAAC;EACR,KAAK,EAAE,IAAI;EACX,KAAK,EAAE,KAAK;EACZ,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,GAAG;EAChB,KAAK,EAAE,OAAmB;EAC1B,OAAO,EAAE,GAAG;EACZ,YAAY,EAAE,IAAI;CAOrB;;AA9DL,AAwDQ,aAxDK,CAgDT,WAAW,CAQP,IAAI,CAAC;EACD,KAAK,EAAE,OAAsB;EAC7B,SAAS,EAAE,IAAI;EACf,YAAY,EAAE,GAAG;EACjB,WAAW,EAAE,GAAG;CACnB;;AA7DT,AA+DI,aA/DS,CA+DT,WAAW,CAAC;EACR,gBAAgB,EAAE,OAAqB;EACvC,KAAK,EAAE,IAAI;EACX,KAAK,EAAE,KAAK;EACZ,MAAM,EAAE,IAAI;EACZ,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,IAAI;EACf,KAAK,EAAE,KAAK;EACZ,aAAa,EAAE,GAAG;EAClB,WAAW,EAAE,GAAG;EAChB,YAAY,EAAE,IAAI;EAClB,aAAa,EAAE,IAAI;EACnB,UAAU,EAAE,MAAM;CACrB",
+    "sources": [
+        "trackorder.page.scss"
+    ],
+    "names": [],
+    "file": "trackorder.page.css"
+}
\ No newline at end of file

src/app/verification/verification.page.css

+.verification_div {
+  width: 80%;
+  margin: 0 auto;
+}
+
+.verification_div .form_div {
+  padding-top: 30%;
+}
+
+.verification_div .form_div .row {
+  margin-bottom: 20px;
+}
+
+.verification_div .form_div .row input {
+  border: 1px solid #d7d5e4;
+  background: transparent;
+  color: #d7d5e4;
+  width: 100%;
+  height: 45px;
+  text-align: center;
+  border-radius: 8px;
+  font-size: 16px;
+}
+
+.verification_div .form_div .row .login_btn {
+  width: 100%;
+  background-color: #29285b;
+  color: #fff;
+  border-radius: 8px;
+  height: 45px;
+  font-size: 16px;
+}
+
+.verification_div .form_div .row .resend_btn {
+  width: 100%;
+  background-color: transparent;
+  color: #29285b;
+  border-radius: 8px;
+  height: 45px;
+  font-size: 16px;
+  font-weight: 900;
+}
+
+.verification_div .form_div .row hr {
+  border: 1px solid #d7d5e4;
+  border-bottom: none;
+  margin-top: 30px;
+  margin-bottom: 10px;
+}
+
+.verification_div .form_div .row P {
+  text-align: center;
+  color: #3b394d;
+  margin: 0px;
+  text-align: center;
+}
+
+.verification_div .form_div .row P span {
+  background-color: #fff;
+  padding: 10px;
+  font-size: 18px;
+}
+
+.verification_div .form_div .row h4 {
+  color: #3b394d;
+  text-align: center;
+  margin: 0px;
+  padding-top: 15px;
+}
+
+.verification_div .form_div .row h6 {
+  color: #29285b;
+  text-align: center;
+  font-weight: bold;
+  padding-bottom: 20%;
+  font-size: 25px;
+}
+
+.verification_div .form_div .row h6 .styled-checkbox {
+  position: absolute;
+  opacity: 0;
+}
+
+.verification_div .form_div .row h6 .styled-checkbox + label {
+  position: relative;
+  cursor: pointer;
+  padding: 0;
+}
+
+.verification_div .form_div .row h6 .styled-checkbox + label:before {
+  content: '';
+  margin-right: 10px;
+  display: inline-block;
+  vertical-align: text-top;
+  width: 30px;
+  height: 30px;
+  border-radius: 10px;
+  background: white;
+  border: 1px solid #d7d5e4;
+}
+
+.verification_div .form_div .row h6 .styled-checkbox:checked + label:before {
+  background: #29285b;
+}
+
+.verification_div .form_div .row h6 .styled-checkbox:disabled + label {
+  color: #b8b8b8;
+  cursor: auto;
+}
+
+.verification_div .form_div .row h6 .styled-checkbox:disabled + label:before {
+  -webkit-box-shadow: none;
+          box-shadow: none;
+  background: #ddd;
+}
+
+.verification_div .form_div .row h6 .styled-checkbox:checked + label:after {
+  content: '';
+  position: absolute;
+  left: 10px;
+  top: 15px;
+  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);
+}
+
+.verification_div .form_div .row .social_div {
+  border: 1px solid #d7d5e4;
+  height: 45px;
+  border-radius: 20px;
+}
+
+.verification_div .form_div .row .social_div .social_btn {
+  display: inline-block;
+  width: 50%;
+  text-align: center;
+  height: 100%;
+  font-size: 18px;
+  padding: 9px;
+}
+/*# sourceMappingURL=verification.page.css.map */
\ No newline at end of file

src/app/verification/verification.page.css.map

+{
+    "version": 3,
+    "mappings": "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",
+    "sources": [
+        "verification.page.scss"
+    ],
+    "names": [],
+    "file": "verification.page.css"
+}
\ No newline at end of file

src/app/wishlist/wishlist.page.css

+/* No CSS *//*# sourceMappingURL=wishlist.page.css.map */
\ No newline at end of file

src/app/wishlist/wishlist.page.css.map

+{
+    "version": 3,
+    "mappings": "",
+    "sources": [
+        "wishlist.page.scss"
+    ],
+    "names": [],
+    "file": "wishlist.page.css"
+}
\ No newline at end of file

src/app/wishlist/wishlist.page.ts

 import { Component, OnInit } from '@angular/core';
+import { Location } from '@angular/common';
 
 @Component({
   selector: 'app-wishlist',
   templateUrl: './wishlist.page.html',
-  styleUrls: ['./wishlist.page.scss'],
+  styleUrls: ['./wishlist.page.scss']
 })
 export class WishlistPage implements OnInit {
+  constructor(private location: Location) {}
 
-  constructor() { }
+  ngOnInit() {}
 
-  ngOnInit() {
+  goBack() {
+    this.location.back();
   }
-
 }

src/config/address.service.ts

 import { Injectable } from '@angular/core';
-import { AngularFirestore, AngularFirestoreCollection } from '@angular/fire/firestore';
+import {
+  AngularFirestore,
+  AngularFirestoreCollection
+} from '@angular/fire/firestore';
 import { take } from 'rxjs/operators';
 import { Address, AddressList } from './services/address';
 
@@ -18,27 +21,27 @@ export class AddressService {
       ref => ref.where('status', '==', state).where('uid', '==', userId)
     );
     orderRef.valueChanges().subscribe(value => {
-        this.addressList = [];
-        const res = value;
-        if (res.length > 0) {
-          res.forEach(item => {
-            // console.log(item);
-            const address: AddressList = {
-              address: item.address,
-              addressType: item.addressType,
-              latLng: item.latLng,
-              defaultVal: item.defaultVal,
-              building: item.building,
-              landmark: item.landmark,
-              addressId: item.addressId
-            };
-            this.addressList.push(address);
-          });
-          console.log(this.addressList);
-        } else {
-          // alert('No Orders Found');
-        }
-      });
+      this.addressList = [];
+      const res = value;
+      if (res.length > 0) {
+        res.forEach(item => {
+          // console.log(item);
+          const address: AddressList = {
+            address: item.address,
+            addressType: item.addressType,
+            latLng: item.latLng,
+            defaultVal: item.defaultVal,
+            building: item.building,
+            landmark: item.landmark,
+            addressId: item.addressId
+          };
+          this.addressList.push(address);
+        });
+        console.log(this.addressList);
+      } else {
+        // alert('No Orders Found');
+      }
+    });
   }
 
   addressCreate(data: Address) {
@@ -71,13 +74,19 @@ export class AddressService {
     setTimeout(() => {
       console.log(addId);
       this.afs
+        .collection('address')
+        .doc(addId)
+        .update({ defaultVal: 1 })
+        .then(() => {
+          console.log('Address updated Successfully');
+        });
+    }, 1000);
+  }
+
+  deleteAddress(addId: string) {
+    this.afs
       .collection('address')
       .doc(addId)
-      .update({ defaultVal: 1 })
-      .then(() => {
-         console.log('Address updated Successfully');
-      });
-    }, 1000);
-    
+      .delete();
   }
 }

src/config/auth.service.ts

@@ -150,6 +150,7 @@ export class AuthService {
       };
       this.loggedUser = userData;
       this.service.set("userData", JSON.stringify(this.loggedUser));
+      this.subjectService.sendUserData(JSON.stringify(this.loggedUser));
       console.log(this.loggedUser);
     });
   }
@@ -281,10 +282,3 @@ export class AuthService {
     return false;
   }
 }
-
-/*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/config/cart.service.ts

-import { Injectable } from "@angular/core";
+import { Injectable } from '@angular/core';
 import {
   AngularFirestore,
   AngularFirestoreDocument,
   AngularFirestoreCollection
-} from "@angular/fire/firestore";
-import { Router, ActivatedRoute } from "@angular/router";
-import { Products } from "./services/product";
-import { Cart, CartItem } from "./services/cart";
-import { ServiceService } from "./service.service";
-import * as firebase from "firebase";
-import { take } from "rxjs/operators";
-import { User } from "./services/user";
-import { from } from "rxjs";
+} from '@angular/fire/firestore';
+import { Router, ActivatedRoute } from '@angular/router';
+import { Products } from './services/product';
+import { Cart, CartItem } from './services/cart';
+import { ServiceService } from './service.service';
+import * as firebase from 'firebase';
+import { take } from 'rxjs/operators';
+import { User } from './services/user';
+import { from } from 'rxjs';
 
 @Injectable({
-  providedIn: "root"
+  providedIn: 'root'
 })
 export class CartsService {
   size: string;
@@ -31,9 +31,9 @@ export class CartsService {
     public router: Router,
     public service: ServiceService
   ) {
-    this.custId = "";
+    this.custId = '';
     this.carts = [];
-    const users = this.service.get("user").then(data => {
+    const users = this.service.get('user').then(data => {
       if (data) {
         data = JSON.parse(data);
         this.custId = data.uid;
@@ -46,20 +46,20 @@ export class CartsService {
     this.prodId = product.prodId;
     const prodRef = firebase
       .firestore()
-      .collection("products")
+      .collection('products')
       .doc(this.prodId);
 
     this.size = this.size === undefined ? product.size[0] : this.size;
     this.color = this.color === undefined ? product.color[0] : this.color;
 
     const cartRef: AngularFirestoreCollection<any> = this.afs.collection(
-      "carts",
+      'carts',
       ref =>
         ref
-          .where("size", "==", this.size)
-          .where("color", "==", this.color)
-          .where("custId", "==", this.custId)
-          .where("product", "==", prodRef)
+          .where('size', '==', this.size)
+          .where('color', '==', this.color)
+          .where('custId', '==', this.custId)
+          .where('product', '==', prodRef)
     );
     cartRef
       .valueChanges()
@@ -69,7 +69,7 @@ export class CartsService {
         if (value.length === 0) {
           product.image =
             product.image === undefined
-              ? "../assets/[email protected]"
+              ? '../assets/[email protected]'
               : product.image;
           const cart: Cart = {
             color: this.color,
@@ -86,12 +86,12 @@ export class CartsService {
           };
           // console.log(cart);
           this.afs
-            .collection("carts")
+            .collection('carts')
             .add(cart)
             .then(docRef => {
               const neworderId = docRef.id;
               this.afs
-                .collection("carts")
+                .collection('carts')
                 .doc(neworderId)
                 .update({ cartId: docRef.id })
                 .then(() => {
@@ -100,7 +100,7 @@ export class CartsService {
                 });
             })
             .catch(error => {
-              console.error("Error adding document: ", error);
+              console.error('Error adding document: ', error);
             });
         } else {
           // console.log(value);
@@ -109,7 +109,7 @@ export class CartsService {
           // tslint:disable-next-line:radix
           const qty = parseInt(value[0].qty) + 1;
           this.afs
-            .collection("carts")
+            .collection('carts')
             .doc(cartId)
             .update({ qty: `${qty}` })
             .then(() => {
@@ -122,8 +122,8 @@ export class CartsService {
 
   public async cartList() {
     const cartRef: AngularFirestoreCollection<any> = this.afs.collection(
-      "carts",
-      ref => ref.where("custId", "==", this.custId)
+      'carts',
+      ref => ref.where('custId', '==', this.custId)
     );
     cartRef.valueChanges().subscribe(value => {
       this.carts = [];
@@ -181,7 +181,7 @@ export class CartsService {
     this.carts[index].qty = qty;
     // console.log(this.carts[index].qty);
     this.afs
-      .collection("carts")
+      .collection('carts')
       .doc(this.carts[index].cartId)
       .update({
         qty: this.carts[index].qty
@@ -193,7 +193,7 @@ export class CartsService {
     this.cartTotal = 0;
     this.carts[index].qty = qty;
     this.afs
-      .collection("carts")
+      .collection('carts')
       .doc(this.carts[index].cartId)
       .update({
         qty: this.carts[index].qty
@@ -202,7 +202,7 @@ export class CartsService {
 
   removeItem(index) {
     this.afs
-      .collection("carts")
+      .collection('carts')
       .doc(this.carts[index].cartId)
       .delete();
   }
@@ -211,9 +211,9 @@ export class CartsService {
     // console.log(promoCode);
     const state = true;
     const promoRef: AngularFirestoreCollection<any> = this.afs.collection(
-      "promocode",
+      'promocode',
       ref =>
-        ref.where("promoCode", "==", promoCode).where("status", "==", state)
+        ref.where('promoCode', '==', promoCode).where('status', '==', state)
     );
     return promoRef.valueChanges();
   }

src/config/category.service.ts

-import { Injectable } from "@angular/core";
+import { Injectable } from '@angular/core';
 import {
   AngularFirestore,
   AngularFirestoreDocument,
   AngularFirestoreCollection
-} from "@angular/fire/firestore";
-import { Category } from "./services/category";
-import * as firebase from "firebase";
-import { ServiceService } from "./service.service";
+} from '@angular/fire/firestore';
+import { Category } from './services/category';
+import * as firebase from 'firebase';
+import { ServiceService } from './service.service';
 
 @Injectable({
-  providedIn: "root"
+  providedIn: 'root'
 })
 export class CategoriesService {
   categories: Category[] = [];
@@ -22,7 +22,7 @@ export class CategoriesService {
   public async categoryList() {
     const This = this;
     const orderRef: AngularFirestoreCollection<any> = this.afs.collection(
-      "shopcategory"
+      'shopcategory'
     );
     orderRef.valueChanges().subscribe(value => {
       this.categories = [];
@@ -50,8 +50,8 @@ export class CategoriesService {
     const This = this;
     const state = true;
     const orderRef: AngularFirestoreCollection<any> = this.afs.collection(
-      "shopcategory",
-      ref => ref.where("status", "==", state)
+      'shopcategory',
+      ref => ref.where('status', '==', state)
     );
     orderRef.valueChanges().subscribe(value => {
       this.activecategories = [];

src/config/myorder.service.ts

-import { Injectable } from "@angular/core";
+import { Injectable } from '@angular/core';
 import {
   AngularFirestore,
   AngularFirestoreDocument,
   AngularFirestoreCollection
-} from "@angular/fire/firestore";
-import { Myorder } from "./services/myorder";
-import { ServiceService } from "./../config/service.service";
-import * as firebase from "firebase";
-import { take } from "rxjs/operators";
-import { Observable, of } from "rxjs";
+} from '@angular/fire/firestore';
+import { Myorder } from './services/myorder';
+import { ServiceService } from './../config/service.service';
+import * as firebase from 'firebase';
+import { take } from 'rxjs/operators';
+import { Observable, of } from 'rxjs';
 
 @Injectable({
-  providedIn: "root"
+  providedIn: 'root'
 })
 export class MyordersService {
   product: Myorder[] = [];
@@ -20,7 +20,7 @@ export class MyordersService {
   selItem: Myorder;
 
   constructor(public afs: AngularFirestore, public service: ServiceService) {
-    const users = this.service.get("user").then(data => {
+    const users = this.service.get('user').then(data => {
       if (data) {
         data = JSON.parse(data);
         this.custId = data.uid;
@@ -29,7 +29,7 @@ export class MyordersService {
           // this.orderState();
         }
       } else {
-        this.custId = "WwHnLICVY2dvZGUHuKqasiTB91a2";
+        this.custId = 'WwHnLICVY2dvZGUHuKqasiTB91a2';
       }
     });
   }
@@ -85,8 +85,8 @@ export class MyordersService {
     const This = this;
     this.orders = [];
     const orderRef: AngularFirestoreCollection<any> = this.afs.collection(
-      "orders",
-      ref => ref.where("custId", "==", custId).orderBy("bookDate", "desc")
+      'orders',
+      ref => ref.where('custId', '==', custId).orderBy('bookDate', 'desc')
     );
     orderRef.stateChanges().subscribe(value => {
       // console.log(value);
@@ -105,14 +105,14 @@ export class MyordersService {
             deliveryLocation: item.deliveryLocation,
             pickupLocation: item.pickupLocation,
             deliveryAddress: item.deliveryAddress,
-            riderName: "John",
+            riderName: 'John',
             orderId: item.orderId,
             orderCode: item.orderCode,
             product: this.service.key2Array(item.product),
-            time: "60"
+            time: '60'
           };
           // console.log(order);
-          if (items.type === "added") {
+          if (items.type === 'added') {
             this.orders.push(order);
           } else {
             // console.log(orderId);

src/config/services/user.ts

@@ -28,11 +28,13 @@ export interface Signup {
 // Model for Change Details page
 export interface UpdateUserDetails {
   name: string;
-  emailId: string;
   phone: string;
 }
 // Model to Update Password
-export interface UpdateUserDetails {}
+export interface UpdatePassword {
+  password: string;
+  confirmPassword: string;
+}
 
 export interface Otp {
   uid: string;

src/config/subject.service.ts

@@ -6,13 +6,22 @@ import { BehaviorSubject } from 'rxjs/BehaviorSubject';
   providedIn: 'root'
 })
 export class SubjectService {
-    private loginState = new BehaviorSubject<any>(null);
+  private loginState = new BehaviorSubject<any>(null);
+  private DataState = new BehaviorSubject<any>(null);
 
-    sendLoginData(state: any) {
-      this.loginState.next(state);
-    }
+  sendLoginData(state: any) {
+    this.loginState.next(state);
+  }
 
-    getLoginData(): Observable<any> {
-      return this.loginState.asObservable();
-    }
+  getLoginData(): Observable<any> {
+    return this.loginState.asObservable();
+  }
+
+  sendUserData(state: any) {
+    this.DataState.next(state);
+  }
+
+  getUserData(): Observable<any> {
+    return this.DataState.asObservable();
+  }
 }

src/config/update.service.ts

-import { Injectable } from "@angular/core";
-import { User, UpdateUserDetails, Address } from "./services/user";
-import { auth } from "firebase/app";
-import { Router, ActivatedRoute } from "@angular/router";
-import { AngularFireAuth } from "@angular/fire/auth";
+import { Injectable } from '@angular/core';
+import { User, UpdateUserDetails, 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 { ServiceService } from "./../config/service.service";
-import { GooglePlus } from "@ionic-native/google-plus/ngx";
-import { take } from "rxjs/operators";
-import { from } from "rxjs";
+} from '@angular/fire/firestore';
+import { ServiceService } from './../config/service.service';
+import { GooglePlus } from '@ionic-native/google-plus/ngx';
+import { take } from 'rxjs/operators';
+import { from } from 'rxjs';
 
 @Injectable({
-  providedIn: "root"
+  providedIn: 'root'
 })
 export class UpdateService {
   userData: any;
@@ -52,18 +52,17 @@ export class UpdateService {
 
     const postData: UpdateUserDetails = {
       phone: userData.phone,
-      name: userData.name,
-      emailId: userData.emailId
+      name: userData.name
     };
     this.userPostData = postData;
 
     this.afs
-      .collection("customers")
+      .collection('customers')
       .doc(uid)
       .update(postData)
       .then(() => {
-        console.log("success");
-        this.router.navigateByUrl("profile");
+        console.log('success');
+        this.router.navigateByUrl('profile');
       })
       .catch(error => {
         console.log(error);

src/theme/variables.css

+/** Ionic CSS Variables **/
+:root {
+  /** primary **/
+  --ion-color-primary: #3880ff;
+  --ion-color-primary-rgb: 56, 128, 255;
+  --ion-color-primary-contrast: #ffffff;
+  --ion-color-primary-contrast-rgb: 255, 255, 255;
+  --ion-color-primary-shade: #3171e0;
+  --ion-color-primary-tint: #4c8dff;
+  /** secondary **/
+  --ion-color-secondary: #0cd1e8;
+  --ion-color-secondary-rgb: 12, 209, 232;
+  --ion-color-secondary-contrast: #ffffff;
+  --ion-color-secondary-contrast-rgb: 255, 255, 255;
+  --ion-color-secondary-shade: #0bb8cc;
+  --ion-color-secondary-tint: #24d6ea;
+  /** tertiary **/
+  --ion-color-tertiary: #7044ff;
+  --ion-color-tertiary-rgb: 112, 68, 255;
+  --ion-color-tertiary-contrast: #ffffff;
+  --ion-color-tertiary-contrast-rgb: 255, 255, 255;
+  --ion-color-tertiary-shade: #633ce0;
+  --ion-color-tertiary-tint: #7e57ff;
+  /** success **/
+  --ion-color-success: #10dc60;
+  --ion-color-success-rgb: 16, 220, 96;
+  --ion-color-success-contrast: #ffffff;
+  --ion-color-success-contrast-rgb: 255, 255, 255;
+  --ion-color-success-shade: #0ec254;
+  --ion-color-success-tint: #28e070;
+  /** warning **/
+  --ion-color-warning: #ffce00;
+  --ion-color-warning-rgb: 255, 206, 0;
+  --ion-color-warning-contrast: #ffffff;
+  --ion-color-warning-contrast-rgb: 255, 255, 255;
+  --ion-color-warning-shade: #e0b500;
+  --ion-color-warning-tint: #ffd31a;
+  /** danger **/
+  --ion-color-danger: #f04141;
+  --ion-color-danger-rgb: 245, 61, 61;
+  --ion-color-danger-contrast: #ffffff;
+  --ion-color-danger-contrast-rgb: 255, 255, 255;
+  --ion-color-danger-shade: #d33939;
+  --ion-color-danger-tint: #f25454;
+  /** dark **/
+  --ion-color-dark: #222428;
+  --ion-color-dark-rgb: 34, 34, 34;
+  --ion-color-dark-contrast: #ffffff;
+  --ion-color-dark-contrast-rgb: 255, 255, 255;
+  --ion-color-dark-shade: #1e2023;
+  --ion-color-dark-tint: #383a3e;
+  /** medium **/
+  --ion-color-medium: #989aa2;
+  --ion-color-medium-rgb: 152, 154, 162;
+  --ion-color-medium-contrast: #ffffff;
+  --ion-color-medium-contrast-rgb: 255, 255, 255;
+  --ion-color-medium-shade: #86888f;
+  --ion-color-medium-tint: #a2a4ab;
+  /** light **/
+  --ion-color-light: #f4f5f8;
+  --ion-color-light-rgb: 244, 244, 244;
+  --ion-color-light-contrast: #000000;
+  --ion-color-light-contrast-rgb: 0, 0, 0;
+  --ion-color-light-shade: #d7d8da;
+  --ion-color-light-tint: #f5f6f9;
+}
+/*# sourceMappingURL=variables.css.map */
\ No newline at end of file

src/theme/variables.css.map

+{
+    "version": 3,
+    "mappings": "AAGA,2BAA2B;AAC3B,AAAA,KAAK,CAAC;EACJ,eAAe;EACf,mBAAmB,CAAA,QAAC;EACpB,uBAAuB,CAAA,aAAC;EACxB,4BAA4B,CAAA,QAAC;EAC7B,gCAAgC,CAAA,cAAC;EACjC,yBAAyB,CAAA,QAAC;EAC1B,wBAAwB,CAAA,QAAC;EAEzB,iBAAiB;EACjB,qBAAqB,CAAA,QAAC;EACtB,yBAAyB,CAAA,aAAC;EAC1B,8BAA8B,CAAA,QAAC;EAC/B,kCAAkC,CAAA,cAAC;EACnC,2BAA2B,CAAA,QAAC;EAC5B,0BAA0B,CAAA,QAAC;EAE3B,gBAAgB;EAChB,oBAAoB,CAAA,QAAC;EACrB,wBAAwB,CAAA,aAAC;EACzB,6BAA6B,CAAA,QAAC;EAC9B,iCAAiC,CAAA,cAAC;EAClC,0BAA0B,CAAA,QAAC;EAC3B,yBAAyB,CAAA,QAAC;EAE1B,eAAe;EACf,mBAAmB,CAAA,QAAC;EACpB,uBAAuB,CAAA,YAAC;EACxB,4BAA4B,CAAA,QAAC;EAC7B,gCAAgC,CAAA,cAAC;EACjC,yBAAyB,CAAA,QAAC;EAC1B,wBAAwB,CAAA,QAAC;EAEzB,eAAe;EACf,mBAAmB,CAAA,QAAC;EACpB,uBAAuB,CAAA,YAAC;EACxB,4BAA4B,CAAA,QAAC;EAC7B,gCAAgC,CAAA,cAAC;EACjC,yBAAyB,CAAA,QAAC;EAC1B,wBAAwB,CAAA,QAAC;EAEzB,cAAc;EACd,kBAAkB,CAAA,QAAC;EACnB,sBAAsB,CAAA,YAAC;EACvB,2BAA2B,CAAA,QAAC;EAC5B,+BAA+B,CAAA,cAAC;EAChC,wBAAwB,CAAA,QAAC;EACzB,uBAAuB,CAAA,QAAC;EAExB,YAAY;EACZ,gBAAgB,CAAA,QAAC;EACjB,oBAAoB,CAAA,WAAC;EACrB,yBAAyB,CAAA,QAAC;EAC1B,6BAA6B,CAAA,cAAC;EAC9B,sBAAsB,CAAA,QAAC;EACvB,qBAAqB,CAAA,QAAC;EAEtB,cAAc;EACd,kBAAkB,CAAA,QAAC;EACnB,sBAAsB,CAAA,cAAC;EACvB,2BAA2B,CAAA,QAAC;EAC5B,+BAA+B,CAAA,cAAC;EAChC,wBAAwB,CAAA,QAAC;EACzB,uBAAuB,CAAA,QAAC;EAExB,aAAa;EACb,iBAAiB,CAAA,QAAC;EAClB,qBAAqB,CAAA,cAAC;EACtB,0BAA0B,CAAA,QAAC;EAC3B,8BAA8B,CAAA,QAAC;EAC/B,uBAAuB,CAAA,QAAC;EACxB,sBAAsB,CAAA,QAAC;CACxB",
+    "sources": [
+        "variables.scss"
+    ],
+    "names": [],
+    "file": "variables.css"
+}
\ No newline at end of file