- Sort / Filter
+ Sort / Filter
diff --git a/src/app/malls/malls.page.scss b/src/app/malls/malls.page.scss
index 52cc567..29df184 100644
--- a/src/app/malls/malls.page.scss
+++ b/src/app/malls/malls.page.scss
@@ -27,6 +27,21 @@
margin: 0;
}
+ input {
+ background-color: transparent;
+ border: 0px;
+ border-bottom: 2px solid white;
+ font-size: 14px;
+ letter-spacing: 0.5px;
+ padding: 5px 10px;
+ width: calc(100% - 60px);
+ color: white;
+
+ &::placeholder {
+ color: rgba(white, 0.8);
+ }
+ }
+
button {
margin: 0;
border-radius: 50%;
diff --git a/src/app/malls/malls.page.ts b/src/app/malls/malls.page.ts
index 34289e5..5e5c8d1 100644
--- a/src/app/malls/malls.page.ts
+++ b/src/app/malls/malls.page.ts
@@ -10,8 +10,11 @@ import { Router } from '@angular/router';
export class MallsPage implements OnInit {
selected_tab: string = 'you';
malls: any = [];
+ allMalls: any = [];
show_sort_popup: boolean = false;
+ showSearchBar: boolean = false;
selected_sort: string = null;
+ searchTerm: string = '';
constructor(
private mallService: MallService,
@@ -19,24 +22,45 @@ export class MallsPage implements OnInit {
) { }
ngOnInit() {
- if (navigator.geolocation) {
- navigator.geolocation.getCurrentPosition((position) => {
- this.fetchMallsByLocation(position.coords.latitude, position.coords.longitude);
- });
- }
+ this.fetchMallsByLocation();
+ this.storeAllMalls();
}
- ionViewDidEnter() {
+ fetchMallsByLocation() {
+ if (navigator.geolocation) {
+ navigator.geolocation.getCurrentPosition((position) => {
+ // position.coords.latitude, position.coords.longitude;
+ this.mallService.mallsByLocation(28.6569551, 77.2122032).then((response) => {
+ this.malls = response;
+ console.log(this.malls);
+ }, (error) => {
+ console.log(error);
+ });
+ });
+ } else {
+ console.log("Could not fetch the malls");
+ }
+ }
+ searchAllMalls() {
+ if (this.searchTerm.trim().length > 0) {
+ this.malls = this.allMalls.filter((mall) => {
+ return mall.mall_name.toLowerCase().includes(this.searchTerm.toLowerCase());
+ });
+ } else {
+ this.fetchMallsByLocation();
+ }
}
- fetchMallsByLocation(lat: number, lng: number) {
- this.mallService.mallsByLocation(28.6569551, 77.2122032).then((response) => {
- this.malls = response;
- }, (error) => {
- console.log(error);
- });
- }
+ storeAllMalls() {
+ this.mallService.allMalls().then((response) => {
+ localStorage.allMalls = JSON.stringify(response);
+ this.allMalls = JSON.parse(localStorage.allMalls);
+ console.log(this.allMalls);
+ }, (error) => {
+ console.log(error)
+ });
+ }
showMallDetails(mall: any) {
this.router.navigate(['/mall-details', { mall: JSON.stringify(mall) }]);
@@ -60,8 +84,4 @@ export class MallsPage implements OnInit {
}
}
- togglePopup() {
- this.show_sort_popup = !this.show_sort_popup;
- }
-
}
diff --git a/src/app/services/mall.service.ts b/src/app/services/mall.service.ts
index 0c0b423..4f6ea20 100644
--- a/src/app/services/mall.service.ts
+++ b/src/app/services/mall.service.ts
@@ -16,7 +16,7 @@ export class MallService {
constructor(
private offerService: OfferService,
private outletService: OutletService,
- private http: HttpClient
+ private http: HttpClient
) {
this.fetchMalls();
}
@@ -30,9 +30,21 @@ export class MallService {
})
};
- return await this.http.get('http://13.126.110.70:8080/mall-aggregator/api/maioraservice/mall/v1/latitude/28.6569551/longitude/77.2122032/check/', httpOptions).toPromise();
+ return await this.http.get(URL + '/api/maioraservice/mall/v1/latitude/28.6569551/longitude/77.2122032/check/', httpOptions).toPromise();
}
+ async allMalls() {
+ const httpOptions = {
+ headers: new HttpHeaders({
+ 'Access-Control-Allow-Origin': '*',
+ 'Content-Type': 'application/json',
+ 'Authorization': 'Token ' + TOKEN
+ })
+ };
+
+ return await this.http.get(URL + '/api/maioraservice/mall/getallmalls/', httpOptions).toPromise();
+ }
+
private getDenormalizedMall = async (mall: Mall) => {
const offers = await Promise.all(mall.offers.map(offer_id => this.offerService.getOfferByID(offer_id)));
const outlets = await Promise.all(mall.outlets.map(outlet_id => this.outletService.getOutletByID(outlet_id)));