From 2d69cb413ab733d4b7429f1e34e36be9b6678c75 Mon Sep 17 00:00:00 2001
From: kj1352 <nikhilkj24@gmail.com>
Date: Thu, 15 Oct 2020 23:52:04 +0530
Subject: [PATCH] Mall Advertisment connection

---
 src/app/app.module.ts                         |  4 +-
 src/app/mall-details/mall-details.page.html   | 30 ++++-------
 src/app/mall-details/mall-details.page.scss   | 19 -------
 src/app/malls/malls.page.html                 | 17 +------
 src/app/malls/malls.page.scss                 | 50 -------------------
 src/app/malls/malls.page.ts                   |  2 +-
 src/app/mocks/url.ts                          |  4 +-
 .../services/advertisement.service.spec.ts    | 12 +++++
 src/app/services/advertisement.service.ts     | 24 +++++++++
 src/global.scss                               | 26 ++++++++++
 10 files changed, 78 insertions(+), 110 deletions(-)
 create mode 100644 src/app/services/advertisement.service.spec.ts
 create mode 100644 src/app/services/advertisement.service.ts

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index a8960eb..6dc8c61 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -16,6 +16,7 @@ import { AuthService } from './services/auth.service';
 import { MallService } from './services/mall.service';
 import { OrderService } from './services/order.service';
 import { ToastService } from './services/toast.service';
+import { AdvertisementService } from './services/advertisement.service';
 
 import { AppComponent } from './app.component';
 import { AppRoutingModule } from './app-routing.module';
@@ -43,7 +44,8 @@ import { Geolocation } from '@ionic-native/geolocation/ngx';
         MallService,
 		Geolocation,
 		ToastService,
-		OrderService,
+        OrderService,
+        AdvertisementService,
         { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }
     ],
     bootstrap: [AppComponent]
diff --git a/src/app/mall-details/mall-details.page.html b/src/app/mall-details/mall-details.page.html
index 92964e9..308d573 100644
--- a/src/app/mall-details/mall-details.page.html
+++ b/src/app/mall-details/mall-details.page.html
@@ -89,28 +89,18 @@
         </ion-item>
     </ion-list>
 
-    <div class="advertisement-slots">
-        <figure>
-            <img src="https://static.couponspy.in/picture/coupon/89472.jpg">
-        </figure>
-
-        <figure>
-            <img src="https://content.adidas.co.in/static/sign_up_popup/sign_up_popup.jpg">
-        </figure>
-
-        <figure>
-            <img src="https://fsmc.s3.amazonaws.com/a/90804/adidas.jpg">
-        </figure>
-
-        <figure>
-            <img src="https://static.couponspy.in/picture/coupon/89472.jpg">
-        </figure>
-
-        <figure>
-            <img src="https://static.couponspy.in/picture/coupon/89472.jpg">
-        </figure>
+    <div class="results-utilities-holder" *ngIf="mallDetails.mall.advertisement">
+        <h5> {{ mallDetails.mall.advertisement.length }} ADVERTISEMENTS </h5>
     </div>
 
+    <section class="common-advertisement-banner" *ngIf="mallDetails.mall.advertisement">
+        <a href="#" *ngFor="let advertisement of mallDetails.mall.advertisement">
+            <figure>
+                <img [src]="advertisement.image">
+            </figure>            
+        </a>
+    </section>
+
     <div class="common-semi-modal sort-holder" [ngClass]="{'active' : show_sort_popup }">
         <header>
             Sort / Filter <button (click)="togglePopup()"> Done </button>
diff --git a/src/app/mall-details/mall-details.page.scss b/src/app/mall-details/mall-details.page.scss
index a0b1866..faf9580 100644
--- a/src/app/mall-details/mall-details.page.scss
+++ b/src/app/mall-details/mall-details.page.scss
@@ -282,22 +282,3 @@
     }
 }
 
-.advertisement-slots {
-    white-space: nowrap;
-    width: 100%;
-    overflow-x: auto;
-
-    figure {
-        margin: 0;
-        display: inline-block;
-        width: 100px;
-        height: 100px;
-        margin: 0 5px;
-
-        img {
-            object-fit: cover;
-            width: 100%;
-            height: 100%;
-        }
-    }
-}
diff --git a/src/app/malls/malls.page.html b/src/app/malls/malls.page.html
index 06876dc..f3a10a5 100644
--- a/src/app/malls/malls.page.html
+++ b/src/app/malls/malls.page.html
@@ -79,22 +79,7 @@
                 </div>
             </ion-label>
         </ion-item>
-    </ion-list>
-
-    <section class="advertisement" *ngIf="tempMalls.length > 0">
-        <div *ngIf="tempMalls[0].mall.advertisement[0]">
-            <div class="heading-holder">
-                <img [src]="tempMalls[0].mall.advertisement[0].image">
-                <header>
-                    {{ tempMalls[0].mall.advertisement[0].mallname }} - <span> Get your food faster then any others </span>
-                </header>
-            </div>
-            <p class="description">
-                Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dicta eius molestiae ipsum fugit velit voluptatem vel ad ut debitis earum, nostrum numquam odio maxime eaque corporis! Non et cumque, dignissimos.
-            </p>
-            <a> Know More </a>
-        </div>
-    </section>
+    </ion-list>    
 
     <div class="common-semi-modal sort-holder" [ngClass]="{'active' : show_sort_popup }">
         <header>
diff --git a/src/app/malls/malls.page.scss b/src/app/malls/malls.page.scss
index d0a5f20..5ebcdeb 100644
--- a/src/app/malls/malls.page.scss
+++ b/src/app/malls/malls.page.scss
@@ -77,56 +77,6 @@
     }
 }
 
-.advertisement {
-    background-image: url('../../assets/custom/background-5.svg');
-    background-size: cover;
-    background-repeat: no-repeat;
-    background-position: left center;
-    color: white;
-    padding: 15px;
-    width: 100%;
-    margin-bottom: 20px;
-
-    .heading-holder {
-        display: flex;
-        width: 100%;
-        align-items: center;
-
-        img {
-            width: 45px;
-            background-color: white;
-            height: 45px;
-            border-radius: 50%;
-            padding: 1px;
-        }
-
-        header {
-            margin-left: 15px;
-            font-size: 14px;
-            font-weight: 500;
-
-            span {
-                font-weight: 400;
-                font-size: 12px;
-            }
-        }
-    }
-
-    .description {
-        font-size: 12px;
-        text-overflow: ellipsis;
-        overflow: hidden;
-        white-space: nowrap;
-        margin-top: 5px;
-    }
-
-    a {
-        font-size: 12px;
-        text-decoration: underline;
-        color: white;
-    }
-}
-
 .food-types-holder{
     display: flex;
     width: 100%;
diff --git a/src/app/malls/malls.page.ts b/src/app/malls/malls.page.ts
index b90ef0a..71f570f 100644
--- a/src/app/malls/malls.page.ts
+++ b/src/app/malls/malls.page.ts
@@ -30,7 +30,7 @@ export class MallsPage implements OnInit {
             this.tempMalls = JSON.parse(localStorage.allMalls);
         } else {
             this.getMallsByLocation()
-        }     
+        }
     }
 
     doRefresh(e: any) {
diff --git a/src/app/mocks/url.ts b/src/app/mocks/url.ts
index be0ba85..0ece066 100644
--- a/src/app/mocks/url.ts
+++ b/src/app/mocks/url.ts
@@ -1,3 +1 @@
-export const URL: string = 'https://mallapi.maiora.co/mall-aggregator';
-
-export const TOKEN: string = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c';
+export const URL: string = 'https://mallapi.maiora.co/mall-aggregator';
\ No newline at end of file
diff --git a/src/app/services/advertisement.service.spec.ts b/src/app/services/advertisement.service.spec.ts
new file mode 100644
index 0000000..ccbfef7
--- /dev/null
+++ b/src/app/services/advertisement.service.spec.ts
@@ -0,0 +1,12 @@
+import { TestBed } from '@angular/core/testing';
+
+import { AdvertisementService } from './advertisement.service';
+
+describe('AdvertisementService', () => {
+  beforeEach(() => TestBed.configureTestingModule({}));
+
+  it('should be created', () => {
+    const service: AdvertisementService = TestBed.get(AdvertisementService);
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src/app/services/advertisement.service.ts b/src/app/services/advertisement.service.ts
new file mode 100644
index 0000000..db3bd48
--- /dev/null
+++ b/src/app/services/advertisement.service.ts
@@ -0,0 +1,24 @@
+import { Injectable } from '@angular/core';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { URL } from '../mocks/url';
+
+@Injectable({
+    providedIn: 'root'
+})
+export class AdvertisementService {
+    constructor(
+		private http: HttpClient
+    ) { }
+    
+    async getAdvertisement(adv_id: any) {
+		const httpOptions = {
+			headers: new HttpHeaders({
+				'Access-Control-Allow-Origin': '*',
+				'Content-Type': 'application/json',
+				'Authorization': 'Bearer ' + localStorage.access_Token
+			})
+		};
+
+		return await this.http.get(URL + '/api/maioraservice/advertisement/v1/adv_id/' + adv_id, httpOptions).toPromise();
+	}
+}
diff --git a/src/global.scss b/src/global.scss
index 90736ac..ddb133b 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -282,3 +282,29 @@ figure {
 		}
 	}
 }
+
+
+.common-advertisement-banner {    
+    width: 90%;
+    margin: 15px auto;
+
+    a {
+        display: block;
+        border: 2px solid var(--brand-grey);
+        border-radius: 5px;
+        overflow: hidden;
+    }
+
+    figure {
+        display: block;
+        width: 100%;
+        height: 100px;
+
+        img {
+            display: block;
+            width: 100%;
+            height: 100%;
+            object-fit: cover;
+        }
+    }
+}
\ No newline at end of file