Merge branch 'amal' into 'master'

src/app/app-routing.module.ts

@@ -27,7 +27,8 @@ const routes: Routes = [
   { path: 'catagory', loadChildren: './catagory/catagory.module#CatagoryPageModule' },
   { path: 'trackorder', loadChildren: './trackorder/trackorder.module#TrackorderPageModule' },
   { path: 'storelist', loadChildren: './storelist/storelist.module#StorelistPageModule' },
  { path: 'nearby', loadChildren: './nearby/nearby.module#NearbyPageModule' },
-  { path: 'review', loadChildren: './review/review.module#ReviewPageModule' }
+  { path: 'review', loadChildren: './review/review.module#ReviewPageModule' },
+  { path: 'delivery', loadChildren: './delivery/delivery.module#DeliveryPageModule' }
 
   
 ];

src/app/delivery/delivery.module.ts

+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { Routes, RouterModule } from '@angular/router';
+
+import { IonicModule } from '@ionic/angular';
+
+import { DeliveryPage } from './delivery.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DeliveryPage
+  }
+];
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    RouterModule.forChild(routes)
+  ],
+  declarations: [DeliveryPage]
+})
+export class DeliveryPageModule {}

src/app/delivery/delivery.page.html

+<ion-content>
+    <div class="cart_wrapper">
+        <div class="cart_head">
+            <div class="nav_header">
+                <button class="nav_btn nav_back_white floatLeft" (click)="goBack()">
+          <img src="../assets/arrow_white.png">
+        </button>
+                <div class="nav_title floatLeft">
+                    <h4></h4>
+                </div>
+                <button class="nav_btn floatRight">
+        </button>
+                <div class="clear"></div>
+            </div>
+            <img src="../assets/white_tick.png">
+            <h4>RIDER HAS<br> DELIVERED YOUR ORDER </h4>
+            <p>June 26th 2019, 03:00 PM</p>
+        </div>
+    </div>
+</ion-content>
+<ion-footer padding>
+    <div class="row">
+        <button class="login_btn">I GOT MY ORDER</button>
+    </div>
+    <div class="row">
+        <button class="resend_btn">I DIDN'T GOT THE ORDER</button>
+    </div>
+    <div class="row">
+        <button class="cancel_btn">CANCEL THIS ORDER</button>
+    </div>
+</ion-footer>
\ No newline at end of file

src/app/delivery/delivery.page.scss

+.nav_header {
+    box-shadow: none;
+}
+
+.cart_wrapper {
+    width: 100%;
+    .cart_head {
+        width: 100%;
+        height: 240px;
+        text-align: center;
+        background-image: url("../../assets/Group63@3x.png");
+        background-position: center bottom;
+        background-repeat: no-repeat;
+        background-size: cover;
+        .nav_header {
+            position: static;
+            background-color: transparent;
+            .nav_title {
+                h4 {
+                    color: #FFF;
+                }
+            }
+        }
+        img {
+            width: 70px;
+        }
+        h4 {
+            color: #fff;
+            font-weight: bolder;
+            margin-bottom: 5px;
+            text-align: center;
+        }
+        p {
+            color: rgba(215, 213, 228, 1);
+            margin: 0px;
+            padding: 0px;
+            font-size: 14px;
+            text-align: center;
+        }
+    }
+    .order_status {
+        width: 100%;
+        padding: 20px;
+        .track_btn {
+            border-radius: 5px;
+            height: 40px;
+            background-color: #29285b;
+            color: #FFF;
+            font-size: 18px;
+            font-weight: lighter;
+            padding-left: 20px;
+            padding-right: 20px;
+        }
+        .status_div {
+            margin-bottom: 10px;
+            margin-top: 10px;
+            h4 {
+                margin: 0px;
+                padding: 0px;
+                color: rgba(215, 213, 228, 1);
+            }
+            h6 {
+                margin: 0px;
+                padding: 0px;
+                color: rgba(215, 213, 228, 1);
+            }
+        }
+        .go_green {
+            h4 {
+                color: rgba(53, 203, 171, 1);
+            }
+        }
+        .go_green.status_gap {
+            border-left: 2px dashed rgba(53, 203, 171, 1);
+        }
+        .status_gap {
+            border-left: 2px dashed rgba(215, 213, 228, 1);
+            height: 30px;
+        }
+    }
+    .nearby_shop_list {
+        ul {
+            margin: 0px;
+            padding-left: 10px;
+            padding-right: 10px;
+            li {
+                list-style: none;
+                padding-bottom: 10px;
+                .nearby_image {
+                    width: 120px;
+                    height: 120px;
+                    float: left;
+                    background-color: #a8a8a8;
+                    border-radius: 8px;
+                    img {
+                        width: 100%;
+                        height: 100%;
+                        object-fit: cover;
+                        object-position: center;
+                    }
+                }
+                .nearby_detail {
+                    width: calc(100% - 120px);
+                    float: left;
+                    padding-left: 20px;
+                    padding-top: 40px;
+                    h5 {
+                        margin: 0px;
+                        padding: 0px;
+                        color: rgba(59, 57, 77, 1);
+                        font-weight: 900;
+                        padding-bottom: 2px;
+                        img {
+                            width: 16px;
+                        }
+                    }
+                    p {
+                        margin: 0px;
+                        padding: 0px;
+                        color: rgba(176, 174, 199);
+                    }
+                }
+            }
+        }
+    }
+    .product_detail {
+        padding: 10px;
+        hr {
+            border-bottom: 1px solid rgba(176, 174, 199);
+            height: 0px;
+            border-top: none;
+        }
+        h6 {
+            margin: 0px;
+            padding: 0px;
+            color: #29285b;
+            font-size: 18px;
+            padding-bottom: 15px;
+        }
+        h5 {
+            margin: 0px;
+            padding: 0px;
+            color: rgba(176, 174, 199, 1);
+            font-size: 18px;
+            line-height: 25px;
+            padding-bottom: 15px;
+            strong {
+                color: rgba(41, 40, 91, 1);
+            }
+            span {
+                color: rgba(41, 40, 91, 1);
+            }
+            .afterpay {
+                color: rgba(206, 153, 76, 1);
+                padding-left: 10px;
+            }
+        }
+        h4 {
+            color: rgba(41, 40, 91, 1);
+            margin: 0px;
+            font-weight: 900;
+            font-size: 18px;
+            padding-top: 20px;
+            padding-bottom: 10px;
+        }
+        .cancel_btn {
+            border-radius: 8px;
+            height: 45px;
+            width: 100%;
+            background-color: #29285b;
+            color: #FFF;
+            font-size: 18px;
+            font-weight: lighter;
+            padding-left: 20px;
+            padding-right: 20px;
+            margin-bottom: 20px;
+            margin-top: 20px;
+        }
+    }
+    .related_product_slider {
+        h5 {
+            color: rgba(41, 40, 91, 1);
+            margin: 0px;
+            padding: 10px;
+            font-weight: 900;
+            font-size: 18px;
+        }
+        p {
+            color: rgba(59, 57, 77, 1);
+            padding: 10px;
+            text-align: justify;
+            margin: 0px;
+            font-size: 18px;
+        }
+        ul {
+            padding: 10px;
+            padding-bottom: 0px;
+            padding-top: 0px;
+            margin: 0px;
+            li {
+                width: 100%;
+                display: inline-block;
+                border-top: none;
+                border-bottom: none;
+                margin-bottom: 10px;
+                .product_image {
+                    height: 235px;
+                    position: relative;
+                    .featured_badge {
+                        position: absolute;
+                        top: 20px;
+                        left: 0px;
+                        color: #fff;
+                        background-color: rgba(41, 40, 91, 1);
+                        padding: 2px;
+                        padding-left: 10px;
+                        padding-right: 10px;
+                        font-size: 13px;
+                    }
+                    .fav_icon {
+                        position: absolute;
+                        top: 10px;
+                        right: 10px;
+                        font-size: 27px;
+                        width: 30px;
+                        height: 30px;
+                        background-image: url("../../assets/Group32_2.png");
+                        background-position: center;
+                        background-repeat: no-repeat;
+                        background-size: 24px;
+                    }
+                    img {
+                        width: 100%;
+                        height: 100%;
+                        object-fit: cover;
+                        object-position: center;
+                    }
+                }
+                h5 {
+                    margin: 0px;
+                    padding: 0px;
+                    color: rgba(59, 57, 77, 1);
+                    padding-top: 5px;
+                    padding-bottom: 5px;
+                    font-weight: 500;
+                    text-align: left;
+                    font-size: 16px;
+                    white-space: nowrap;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                }
+                p {
+                    margin: 0px;
+                    padding: 0px;
+                    color: rgba(176, 174, 199, 1);
+                    font-size: 12px;
+                    text-align: left;
+                    span {
+                        text-decoration: line-through;
+                        margin-left: 10px;
+                        color: rgba(215, 213, 228, 1)
+                    }
+                    .offer {
+                        color: #fff;
+                        background-color: rgba(41, 40, 91, 1);
+                        border-radius: 4px;
+                        text-decoration: none;
+                        padding: 3px;
+                        font-size: 13px;
+                    }
+                }
+            }
+        }
+    }
+}
+
+.row {
+    margin-bottom: 30px;
+}
+
+.login_btn {
+    width: 100%;
+    background-color: #29285b;
+    color: #fff;
+    border-radius: 8px;
+    height: 45px;
+    font-size: 16px;
+}
+
+.resend_btn {
+    width: 100%;
+    background-color: transparent;
+    color: #29285b;
+    border-radius: 8px;
+    height: 45px;
+    font-size: 16px;
+    font-weight: 900;
+    border: 1px solid rgba(176, 174, 199, 1);
+}
+
+.cancel_btn {
+    width: 100%;
+    background-color: transparent;
+    color: rgba(176, 174, 199, 1);
+    border-radius: 8px;
+    height: 45px;
+    font-size: 16px;
+    font-weight: 900;
+}
\ No newline at end of file

src/app/delivery/delivery.page.spec.ts

+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DeliveryPage } from './delivery.page';
+
+describe('DeliveryPage', () => {
+  let component: DeliveryPage;
+  let fixture: ComponentFixture<DeliveryPage>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DeliveryPage ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DeliveryPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/delivery/delivery.page.ts

+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-delivery',
+  templateUrl: './delivery.page.html',
+  styleUrls: ['./delivery.page.scss'],
+})
+export class DeliveryPage implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

src/global.scss

@@ -390,6 +390,10 @@ app-ordercancelled {
     padding: 0px !important;
 }
 
+app-delivery {
+    padding: 0px !important;
+}
+
 .nav_header {
     position: fixed;
     top: 0px;