diff --git a/src/app/pages/browse/category-list/category-list.component.html b/src/app/pages/browse/category-list/category-list.component.html index 58e1c29..7e461a3 100644 --- a/src/app/pages/browse/category-list/category-list.component.html +++ b/src/app/pages/browse/category-list/category-list.component.html @@ -1,7 +1,14 @@ - +

-
\ No newline at end of file + + + + + + + + \ No newline at end of file diff --git a/src/app/pages/browse/merchant-list/merchant-list.component.html b/src/app/pages/browse/merchant-list/merchant-list.component.html index 2218741..ef4f0bd 100644 --- a/src/app/pages/browse/merchant-list/merchant-list.component.html +++ b/src/app/pages/browse/merchant-list/merchant-list.component.html @@ -1,4 +1,4 @@ - + - \ No newline at end of file + + + + + + +
+ +
+ + + +
+
+
+ + + +
+ +
+ + + +
+
+
+
+
\ No newline at end of file diff --git a/src/app/pages/browse/merchant-list/merchant-list.component.ts b/src/app/pages/browse/merchant-list/merchant-list.component.ts index 01148c4..b50bdde 100644 --- a/src/app/pages/browse/merchant-list/merchant-list.component.ts +++ b/src/app/pages/browse/merchant-list/merchant-list.component.ts @@ -11,9 +11,12 @@ import { LocationService } from "src/app/services/location/location.service"; styleUrls: ["./merchant-list.component.scss"] }) export class MerchantListComponent implements OnInit { + loading: boolean; merchants: Array; location: LocationInterface; - constructor(private locSvc: LocationService, private api: ApiService) {} + constructor(private locSvc: LocationService, private api: ApiService) { + this.loading = true; + } ngOnInit() { this.locSvc.getLocation().subscribe((location: LocationInterface) => { @@ -52,6 +55,7 @@ export class MerchantListComponent implements OnInit { } else { this.merchants = merchants; } + this.loading = false; }); }); }