Merge branch 'master' into adarsh

src/app/app-routing.module.ts

@@ -29,7 +29,8 @@ const routes: Routes = [
   { path: 'storelist', loadChildren: './storelist/storelist.module#StorelistPageModule' },
   { path: 'nearby', loadChildren: './nearby/nearby.module#NearbyPageModule' },
   { path: 'review', loadChildren: './review/review.module#ReviewPageModule' },
-  { path: 'delivery', loadChildren: './delivery/delivery.module#DeliveryPageModule' },
  { path: 'addcard', loadChildren: './addcard/addcard.module#AddcardPageModule' }
+  { path: 'delivery', loadChildren: './delivery/delivery.module#DeliveryPageModule' },
+  { path: 'addcard', loadChildren: './addcard/addcard.module#AddcardPageModule' }
 
 
   

src/app/app.component.html

@@ -45,3 +45,25 @@
         <ion-router-outlet main></ion-router-outlet>
     </ion-split-pane>
 </ion-app>
+<div class="common_tab">
+    <ul>
+        <li>
+            <div class="icon_sec m1_icon" [class.m1_icon_act]="sec_active1" (click)="setActive1()"></div>
+        </li>
+        <li>
+            <div class="icon_sec m2_icon" [class.m2_icon_act]="sec_active2" (click)="setActive2()"></div>
+        </li>
+        <li>
+            <div class="icon_sec m3_icon" [class.m3_icon_act]="sec_active3" (click)="setActive3()"></div>
+        </li>
+        <li>
+            <div class="icon_sec m4_icon" [class.m4_icon_act]="sec_active4" (click)="setActive4()"></div>
+        </li>
+        <li>
+            <div class="icon_sec m5_icon" [class.m5_icon_act]="sec_active5" (click)="setActive5()"></div>
+        </li>
+        <li>
+            <div class="icon_sec m6_icon" [class.m6_icon_act]="sec_active6" (click)="setActive6()"></div>
+        </li>
+    </ul>
+</div>
\ No newline at end of file

src/app/app.component.scss

@@ -84,3 +84,82 @@
         }
     }
 }
+
+.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: 16.666%;
+            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;
+        }
+    }
+}
\ No newline at end of file

src/app/app.component.ts

@@ -16,6 +16,16 @@ import { AuthService } from './../config/auth.service';
   styleUrls: ['app.component.scss']
 })
 export class AppComponent {
+
+  sec_active1 = true;
+  sec_active2 = false;
+  sec_active3 = false;
+  sec_active4 = false;
+  sec_active5 = false;
+  sec_active6 = false;
+
+  menuw:number;
+
     constructor(
     private platform: Platform,
     private splashScreen: SplashScreen,
@@ -46,6 +56,56 @@ export class AppComponent {
     return await modal.present();
   }
 
+  setActive1(){
+    this.sec_active1 = !this.sec_active1;
+    this.sec_active2 = false;
+    this.sec_active3 = false;
+    this.sec_active4 = false;
+    this.sec_active5 = false;
+    this.sec_active6 = false;
+  }
+  setActive2() {
+    this.sec_active2 = !this.sec_active2;
+    this.sec_active1 = false;
+    this.sec_active3 = false;
+    this.sec_active4 = false;
+    this.sec_active5 = false;
+    this.sec_active6 = false;
+  }
+  setActive3() {
+    this.sec_active3 = !this.sec_active3;
+    this.sec_active1 = false;
+    this.sec_active2 = false;
+    this.sec_active4 = false;
+    this.sec_active5 = false;
+    this.sec_active6 = false;
+  }
+  setActive4() {
+    this.sec_active4 = !this.sec_active4;
+    this.sec_active1 = false;
+    this.sec_active2 = false;
+    this.sec_active3 = false;
+    this.sec_active5 = false;
+    this.sec_active6 = false;
+  }
+  setActive5() {
+    this.sec_active5 = !this.sec_active5;
+    this.sec_active1 = false;
+    this.sec_active2 = false;
+    this.sec_active3 = false;
+    this.sec_active4 = false;
+    this.sec_active6 = false;
+  }
+  setActive6() {
+    this.sec_active6 = !this.sec_active6;
+    this.sec_active1 = false;
+    this.sec_active2 = false;
+    this.sec_active3 = false;
+    this.sec_active4 = false;
+    this.sec_active5 = false;
+    
+  }
+
   orderState() {
     console.log('called');
     const custId = 'WwHnLICVY2dvZGUHuKqasiTB91a2';

src/app/app.module.ts

@@ -32,9 +32,11 @@ import { FormsModule } from '@angular/forms';
 
 
 
+
 @NgModule({
   declarations: [AppComponent],
-  entryComponents: [],
+  entryComponents: [
+  ],
   imports: [BrowserModule,
      IonicModule.forRoot(),
      IonicStorageModule.forRoot(),

src/app/trackorder/trackorder.module.ts

@@ -9,6 +9,7 @@ import { TrackorderPage } from './trackorder.page';
 import { AgmCoreModule } from '@agm/core';
 import { AgmDirectionModule } from 'agm-direction';
 
+
 const routes: Routes = [
   {
     path: '',