From c4f1cfecfc3ae4bd43d5168cad18af26327dab2d Mon Sep 17 00:00:00 2001 From: kj1352 Date: Tue, 13 Aug 2019 20:04:33 +0530 Subject: [PATCH] Food outlets page --- src/app/app.component.html | 4 +- src/app/app.component.ts | 12 +- src/app/login/login.page.ts | 5 + src/app/mall-details/mall-details.page.scss | 2 +- src/app/mall-details/mall-details.page.ts | 1 - src/app/malls/malls.page.html | 52 +- src/app/malls/malls.page.scss | 6 +- src/app/malls/malls.page.ts | 1 - src/app/onboarding/onboarding.page.scss | 2 +- src/app/onboarding/onboarding.page.ts | 5 + .../outlet-details/outlet-details.page.html | 25 +- .../outlet-details/outlet-details.page.scss | 160 +- src/app/outlet-details/outlet-details.page.ts | 25 +- src/app/services/mall.service.ts | 10 +- src/assets/custom/background-3.svg | 30451 ++++++++++++++++ src/assets/custom/background-5.svg | 8156 +++++ src/global.scss | 6 +- src/theme/variables.scss | 1 - 18 files changed, 38859 insertions(+), 65 deletions(-) create mode 100644 src/assets/custom/background-3.svg create mode 100644 src/assets/custom/background-5.svg diff --git a/src/app/app.component.html b/src/app/app.component.html index 99a9c08..59466e6 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,6 +1,6 @@
- + @@ -13,7 +13,7 @@ - - - - -
Food Types
SEE ALL @@ -151,4 +116,21 @@ + + diff --git a/src/app/malls/malls.page.scss b/src/app/malls/malls.page.scss index d87a046..52cc567 100644 --- a/src/app/malls/malls.page.scss +++ b/src/app/malls/malls.page.scss @@ -1,5 +1,5 @@ .top-bar-holder { - background-image: url('../../assets/custom/background-2.svg'); + background-image: url('../../assets/custom/background-5.svg'); background-size: cover; background-repeat: no-repeat; background-position: left top; @@ -12,7 +12,7 @@ justify-content: space-between; padding: 20px; align-items: center; - background-image: url('../../assets/custom/background-2.svg'); + background-image: url('../../assets/custom/background-5.svg'); background-size: cover; background-repeat: no-repeat; background-position: left top; @@ -64,7 +64,7 @@ .advertisement { height: 150px; - background-image: url('../../assets/custom/background-2.svg'); + background-image: url('../../assets/custom/background-5.svg'); background-size: cover; background-repeat: no-repeat; background-position: left center; diff --git a/src/app/malls/malls.page.ts b/src/app/malls/malls.page.ts index 93b7d45..36a7f98 100644 --- a/src/app/malls/malls.page.ts +++ b/src/app/malls/malls.page.ts @@ -1,6 +1,5 @@ import { Component, OnInit } from '@angular/core'; import { MallService, Mall } from '../services/mall.service'; -import { MallDetailsPage } from '../mall-details/mall-details.page'; import { Router } from '@angular/router'; @Component({ diff --git a/src/app/onboarding/onboarding.page.scss b/src/app/onboarding/onboarding.page.scss index 1ed27b1..d9f2e68 100644 --- a/src/app/onboarding/onboarding.page.scss +++ b/src/app/onboarding/onboarding.page.scss @@ -258,7 +258,7 @@ ion-slide { } .page7 { - background-image: url('../../assets/custom/background-2.svg'); + background-image: url('../../assets/custom/background-5.svg'); background-size: cover; background-repeat: no-repeat; diff --git a/src/app/onboarding/onboarding.page.ts b/src/app/onboarding/onboarding.page.ts index a6c9c79..c5c93c2 100644 --- a/src/app/onboarding/onboarding.page.ts +++ b/src/app/onboarding/onboarding.page.ts @@ -22,6 +22,10 @@ export class OnboardingPage implements OnInit { private router: Router ) { } + ionViewDidEnter() { + document.querySelector('.menu-icon-holder').classList.add('hide'); + } + ngOnInit() { this.slideOpts = { initialSlide: 0, @@ -73,6 +77,7 @@ export class OnboardingPage implements OnInit { enterMalls() { this.router.navigate(['/malls']); + document.querySelector('.menu-icon-holder').classList.remove('hide'); } } diff --git a/src/app/outlet-details/outlet-details.page.html b/src/app/outlet-details/outlet-details.page.html index 67f0762..2768b6b 100644 --- a/src/app/outlet-details/outlet-details.page.html +++ b/src/app/outlet-details/outlet-details.page.html @@ -7,7 +7,7 @@
{{ outlet_details.rating }}
-
+
@@ -20,7 +20,7 @@
- @@ -46,10 +46,11 @@