Merge branch 'amal' into 'master'

src/app/app-routing.module.ts

@@ -80,7 +80,8 @@ const routes: Routes = [
   { path: 'productbooking', loadChildren: './productbooking/productbooking.module#ProductbookingPageModule' },
   { path: 'addaddress', loadChildren: './addaddress/addaddress.module#AddaddressPageModule' },
  { path: 'deliveryaddress', loadChildren: './deliveryaddress/deliveryaddress.module#DeliveryaddressPageModule' },
   { path: 'partproduct', loadChildren: './partproduct/partproduct.module#PartproductPageModule' },
-  { path: 'orderdetails', loadChildren: './orderdetails/orderdetails.module#OrderdetailsPageModule' }
+  { path: 'orderdetails', loadChildren: './orderdetails/orderdetails.module#OrderdetailsPageModule' },
+  { path: 'listingservice', loadChildren: './listingservice/listingservice.module#ListingservicePageModule' }
 
 ];
 

src/app/booking/booking.page.ts

@@ -2,8 +2,7 @@ import { Component } from '@angular/core';
 import { Router,ActivatedRoute } from '@angular/router';
 import { Location } from '@angular/common';
 import { trigger, transition, animate, style } from '@angular/animations';
-// import { ModalController } from '@ionic/angular';
-// import { ReviewPage} from '../review/review.page';
+import { ReviewPage} from '../review/review.page';
 
 @Component({
   selector: 'app-booking',
@@ -58,15 +57,6 @@ export class BookingPage{
   }
 
 
-  //  async settings() {
-  //   const modal = await this.modalController.create({
-  //     component: ReviewPage,
-  //     componentProps: { website: 'edupala.com' },
-  //     backdropDismiss: false,
-  //   });
-
-  //   modal.present();
-  // }
 
 
 

src/app/listingservice/listingservice.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 { ListingservicePage } from './listingservice.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: ListingservicePage
+  }
+];
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    RouterModule.forChild(routes)
+  ],
+  declarations: [ListingservicePage]
+})
+export class ListingservicePageModule {}

src/app/listingservice/listingservice.page.html

+<ion-header>
+    <div class="app_header relative">
+        <button class="nav_btn back_btn floatLeft" (click)="goBack()">
+    </button>
+        <div class="nav_title floatLeft">
+            <h4>Select your services</h4>
+        </div>
+        <button class="nav_btn nav_btn_text floatRight">
+
+    </button>
+        <div class="clear"></div>
+        <div class="seach_bar_outer">
+            <div class="search_bar">
+                <input class="" placeholder="Services or Problems...">
+            </div>
+        </div>
+    </div>
+</ion-header>
+<ion-content>
+    <div class="select_services_wrapper">
+        <div class="home_main_stack_menu">
+            <ul>
+                <li>
+                    <img src="../../assets/img/asset_menu4.png">
+                    <p>Heating & Airconditioning</p>
+                    <div class="clear"></div>
+                </li>
+                <li>
+                    <img src="../../assets/img/asset_menu5.png">
+                    <p>Electrical & Lighting</p>
+                    <div class="clear"></div>
+                </li>
+                <li>
+                    <img src="../../assets/img/asset_menu6.png">
+                    <p>Clutch & Transmission</p>
+                    <div class="clear"></div>
+                </li>
+                <li>
+                    <img src="../../assets/img/asset_menu7.png">
+                    <p>Braking System</p>
+                    <div class="clear"></div>
+                </li>
+                <li>
+                    <img src="../../assets/img/asset_menu8.png">
+                    <p>Drive train Suspension</p>
+                    <div class="clear"></div>
+                </li>
+                <li>
+                    <img src="../../assets/img/asset_menu9.png">
+                    <p>Fuel System</p>
+                    <div class="clear"></div>
+                </li>
+                <li>
+                    <img src="../../assets/img/asset_menu10.png">
+                    <p>Interior & Exterior</p>
+                    <div class="clear"></div>
+                </li>
+                <li>
+                    <img src="../../assets/img/asset_menu11.png">
+                    <p>Engine Components</p>
+                    <div class="clear"></div>
+                </li>
+                <li>
+                    <img src="../../assets/img/asset_menu12.png">
+                    <p>Body Parts & Hardware</p>
+                    <div class="clear"></div>
+                </li>
+                <li>
+                    <img src="../../assets/img/asset_menu13.png">
+                    <p>Electronic Devices </p>
+                    <div class="clear"></div>
+                </li>
+                <li>
+                    <img src="../../assets/img/asset_menu14.png">
+                    <p>Parts Purchase</p>
+                    <div class="clear"></div>
+                </li>
+                <li>
+                    <img src="../../assets/img/asset_menu15.png">
+                    <p>Parts Purchase</p>
+                    <div class="clear"></div>
+                </li>
+            </ul>
+        </div>
+    </div>
+    <!-- <div class="select_footer">
+        <ion-row>
+            <ion-col>
+                <h6>2 Services</h6>
+                <h6>Rolls Royce Ghost</h6>
+                <h6>....</h6>
+            </ion-col>
+            <ion-col>
+                <button class="next_btn floatRight" (click)="goToPage('date')">Next</button>
+                <div class="clear"></div>
+            </ion-col>
+        </ion-row>
+    </div> -->
+</ion-content>
\ No newline at end of file

src/app/listingservice/listingservice.page.scss

+.seach_bar_outer {
+    position: absolute;
+    width: 100%;
+    .search_bar {
+        width: 90%;
+        margin: 0 auto;
+        background-color: #fff;
+        border-radius: 100px;
+        -webkit-box-shadow: 0px 5px 20px 1px rgba(158, 151, 186, 0.5);
+        -moz-box-shadow: 0px 5px 20px 1px rgba(158, 151, 186, 0.5);
+        box-shadow: 0px 5px 20px 1px rgba(158, 151, 186, 0.5);
+        input {
+            width: 100%;
+            border: none;
+            height: 45px;
+            border-radius: 100px;
+            background-image: url("../../assets/img/asset_search.png");
+            background-position: right 15px top 10px;
+            background-repeat: no-repeat;
+            background-size: 20px;
+            padding-left: 20px;
+            padding-right: 20px;
+            font-weight: 300;
+            &::placeholder {
+                font-weight: 300;
+                color: #9e97ba;
+            }
+        }
+    }
+}
+
+.select_services_wrapper {
+    background-image: linear-gradient(to bottom, #e7e5f1, #edebf5, #f3f2f8, #f9f8fc, #ffffff);
+    .home_main_stack_menu {
+        padding: 15px;
+        padding-top: 50px;
+        ul {
+            margin: 0px;
+            padding: 0px;
+            .active {
+                border: 2px solid #8769f4;
+                border-radius: 30px;
+                -webkit-box-shadow: 0px 5px 20px 1px rgba(158, 151, 186, 0.5);
+                -moz-box-shadow: 0px 5px 20px 1px rgba(158, 151, 186, 0.5);
+                box-shadow: 0px 5px 20px 1px rgba(158, 151, 186, 0.5);
+            }
+            li {
+                list-style: none;
+                padding-top: 3px;
+                padding-bottom: 3px;
+                border: 2px solid transparent;
+                padding-left: 15px;
+                padding-right: 15px;
+                &:hover {
+                    border: 2px solid #8769f4;
+                    border-radius: 30px;
+                    -webkit-box-shadow: 0px 5px 20px 1px rgba(158, 151, 186, 0.5);
+                    -moz-box-shadow: 0px 5px 20px 1px rgba(158, 151, 186, 0.5);
+                    box-shadow: 0px 5px 20px 1px rgba(158, 151, 186, 0.5);
+                }
+                img {
+                    float: left;
+                    width: 35px;
+                    border: 2px solid transparent;
+                    border-radius: 20px;
+                }
+                p {
+                    text-align: left;
+                    color: #4e4961;
+                    width: calc(100% - 35px);
+                    float: left;
+                    margin: 0px;
+                    padding: 8px;
+                    padding-left: 15px;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file

src/app/listingservice/listingservice.page.spec.ts

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

src/app/listingservice/listingservice.page.ts

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