Skip to content

D
dcarfixers_angular
Commit e8dbdecb by Tobin
Options

daily commit

parent 4e8dbccc
Showing with 27 additions and 259 deletions
src/app/home/index/index.component.html
...@@ -437,6 +437,7 @@ ...@@ -437,6 +437,7 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="quote_service_wrapper"> <div class="quote_service_wrapper">
<div class="loader_overlay" *ngIf="loader"></div>
<div class="row"> <div class="row">
<div class="col-md-8"> <div class="col-md-8">
<div class="quote_header"> <div class="quote_header">
...@@ -455,7 +456,6 @@ ...@@ -455,7 +456,6 @@
<ul> <ul>
<li>Mon 28-12-2018</li> <li>Mon 28-12-2018</li>
<li>Mon 29-12-2018</li> <li>Mon 29-12-2018</li>
<li>Mon 30-12-2018</li>
</ul> </ul>
</div> <button class="quote_arrow right floatRight"> </div> <button class="quote_arrow right floatRight">
</button> </button>
...@@ -465,229 +465,27 @@ ...@@ -465,229 +465,27 @@
</div> </div>
<div class="quote_schedule_list"> <div class="quote_schedule_list">
<ul> <ul>
<li> <li *ngFor="let mechanic of mechanicData">
<div class="row">
<div class="col-md-6">
<div class="mechanic_profile">
<div class="mechanic_profile_inner">
<div class="mechanic_photo_wrapper">
<div class="mechanic_photo">
<img src="assets/images/asset_m1.png">
</div>
<!-- <star-rating-comp [starType]="'svg'" [rating]="2.63"></star-rating-comp> -->
</div>
<div class="mechanic_detail">
<h4>Rooney Walker</h4>
<h5>Light motor vechicle</h5>
<p>14 North West Avenue Morgrel<br> South Ampton</p>
<h6>+00961 96542584</h6>
<button class="view_profile">View Profile</button>
<button class="book_now">Book now</button>
</div>
<div class="clear"></div>
</div>
</div>
</div>
<div class="col-md-6">
<div class="scheduletiming_listing">
<ul>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
</ul>
<ul>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
</ul>
<ul>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
</ul>
</div>
<div class="scheduletiming_btm_btns">
<div class="btm_btns"></div>
<div class="btm_btns"></div>
<div class="btm_btns"></div>
</div>
</div>
</div>
</li>
<li>
<div class="row">
<div class="col-md-6">
<div class="mechanic_profile">
<div class="mechanic_profile_inner">
<div class="mechanic_photo_wrapper">
<div class="mechanic_photo">
<img src="assets/images/asset_m1.png">
</div>
<!-- <star-rating-comp [starType]="'svg'" [rating]="2.63"></star-rating-comp> -->
</div>
<div class="mechanic_detail">
<h4>Rooney Walker</h4>
<h5>Light motor vechicle</h5>
<p>14 North West Avenue Morgrel<br> South Ampton</p>
<h6>+00961 96542584</h6>
<button class="view_profile">View Profile</button>
<button class="book_now">Book now</button>
</div>
<div class="clear"></div>
</div>
</div>
</div>
<div class="col-md-6">
<div class="scheduletiming_listing">
<ul>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
</ul>
<ul>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
</ul>
<ul>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
</ul>
</div>
<div class="scheduletiming_btm_btns">
<div class="btm_btns"></div>
<div class="btm_btns"></div>
<div class="btm_btns"></div>
</div>
</div>
</div>
</li>
<li>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="mechanic_profile"> <div class="mechanic_profile">
<div class="mechanic_profile_inner"> <div class="mechanic_profile_inner">
<div class="mechanic_photo_wrapper"> <div class="mechanic_photo_wrapper">
<div class="mechanic_photo"> <div class="mechanic_photo">
<img src="assets/images/asset_m1.png"> <img src="{{imageServer + mechanic.profile_image}}" onerror="this.src='assets/images/user_avatar.jpg'">
</div> </div>
<!-- <star-rating-comp [starType]="'svg'" [rating]="2.63"></star-rating-comp> -->
</div> </div>
<div class="mechanic_detail"> <div class="mechanic_detail">
<h4>Rooney Walker</h4> <h4>{{mechanic.display_name}}</h4>
<h5>Light motor vechicle</h5> <div *ngIf="mechanic.shop_id != 0; else mechanicDetails">
<p>14 North West Avenue Morgrel<br> South Ampton</p> <h5>{{mechanic.shop_name}}</h5>
<h6>+00961 96542584</h6> <p>{{mechanic.shop_address}}</p>
<button class="view_profile">View Profile</button> <h6>{{mechanic.shop_phone}}</h6>
<button class="book_now">Book now</button>
</div>
<div class="clear"></div>
</div>
</div>
</div>
<div class="col-md-6">
<div class="scheduletiming_listing">
<ul>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
</ul>
<ul>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
</ul>
<ul>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
</ul>
</div>
<div class="scheduletiming_btm_btns">
<div class="btm_btns"></div>
<div class="btm_btns"></div>
<div class="btm_btns"></div>
</div>
</div>
</div>
</li>
<li>
<div class="row">
<div class="col-md-6">
<div class="mechanic_profile">
<div class="mechanic_profile_inner">
<div class="mechanic_photo_wrapper">
<div class="mechanic_photo">
<img src="assets/images/asset_m1.png">
</div> </div>
<!-- <star-rating-comp [starType]="'svg'" [rating]="2.63"></star-rating-comp> --> <ng-template #mechanicDetails>
</div> <p>{{mechanic.address}}<br>{{mechanic.city+' , '+mechanic.state}}</p>
<div class="mechanic_detail"> <h6>{{mechanic.phone}}</h6>
<h4>Rooney Walker</h4> </ng-template>
<h5>Light motor vechicle</h5>
<p>14 North West Avenue Morgrel<br> South Ampton</p>
<h6>+00961 96542584</h6>
<button class="view_profile">View Profile</button> <button class="view_profile">View Profile</button>
<button class="book_now">Book now</button> <button class="book_now">Book now</button>
</div> </div>
...@@ -697,46 +495,13 @@ ...@@ -697,46 +495,13 @@
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="scheduletiming_listing"> <div class="scheduletiming_listing">
<ul> <ul *ngFor="let days of [1,2]">
<li>09:30 AM</li> <li *ngFor="let time of mechanic.scheduleTiming">{{time}}</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
</ul>
<ul>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
</ul>
<ul>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
<li>09:30 AM</li>
</ul> </ul>
</div> </div>
<div class="scheduletiming_btm_btns"> <div class="scheduletiming_btm_btns">
<div class="btm_btns"></div> <div class="btm_btns"></div>
<div class="btm_btns"></div> <div class="btm_btns"></div>
<div class="btm_btns"></div>
</div> </div>
</div> </div>
</div> </div>
...@@ -747,13 +512,10 @@ ...@@ -747,13 +512,10 @@
<div class="col-md-4"> <div class="col-md-4">
<div class="service_list"> <div class="service_list">
<h4>Services</h4> <h4>Services</h4>
<p>Steering suspension</p> <div *ngFor="let selIssue of selectedIssues; let key = index">
<p>|</p> <p *ngIf="key != 0">|</p>
<p>Tire Pressure</p> <p>{{selIssue.issue_category}}</p>
<p>|</p> </div>
<p>Exhaust Manifold</p>
<p>|</p>
<p>Oil filter change</p>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div class="service_map"> <div class="service_map">
......
src/app/home/index/index.component.ts
...@@ -5,6 +5,9 @@ import { NgxCarousel } from 'ngx-carousel'; ...@@ -5,6 +5,9 @@ import { NgxCarousel } from 'ngx-carousel';
import { MapsAPILoader } from '@agm/core'; import { MapsAPILoader } from '@agm/core';
import { SubjectService } from '../../provider/subject.service'; import { SubjectService } from '../../provider/subject.service';
import { FormGroup, FormControl, Validators, ValidationErrors } from '@angular/forms'; import { FormGroup, FormControl, Validators, ValidationErrors } from '@angular/forms';
import { google } from '@google/maps';
import { ImageStorage } from '../../../environments/server.config';
declare var $; declare var $;
declare const google: any; declare const google: any;
...@@ -46,7 +49,8 @@ export class IndexComponent implements OnInit { ...@@ -46,7 +49,8 @@ export class IndexComponent implements OnInit {
selectedIssues: any[] = new Array(); selectedIssues: any[] = new Array();
//Quote Page //Quote Page
imageServer: string;
mechanicData: any;
carModel: any; carModel: any;
carSearchJsonData: any; carSearchJsonData: any;
...@@ -58,6 +62,7 @@ export class IndexComponent implements OnInit { ...@@ -58,6 +62,7 @@ export class IndexComponent implements OnInit {
public webService : WebService, public webService : WebService,
public mapsAPILoader : MapsAPILoader, public mapsAPILoader : MapsAPILoader,
public subjectService : SubjectService) { public subjectService : SubjectService) {
this.imageServer = ImageStorage;
this.loginDetails = false; this.loginDetails = false;
this.searchLocError = false; this.searchLocError = false;
this.vehicleDataFormSubmit = false; this.vehicleDataFormSubmit = false;
...@@ -212,7 +217,8 @@ export class IndexComponent implements OnInit { ...@@ -212,7 +217,8 @@ export class IndexComponent implements OnInit {
this.webService.post_data('getNearByMechanics',this.wizardData.pickup_data).subscribe(response => { this.webService.post_data('getNearByMechanics',this.wizardData.pickup_data).subscribe(response => {
this.loader = false; this.loader = false;
if(response.status == '1'){ if(response.status == '1'){
this.issuesData = response.issue_data; this.mechanicData = response.mechanic_data;
console.log(this.mechanicData);
} else { } else {
this.router.navigate(["index"]); this.router.navigate(["index"]);
} }
......
src/app/navbar/navbar.component.html
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
Welcome back,&nbsp;&nbsp;{{ loginDetails.first_name | titlecase }} Welcome back,&nbsp;&nbsp;{{ loginDetails.first_name | titlecase }}
</div> </div>
<div class="account_pic"> <div class="account_pic">
<img src="{{imageServer + loginDetails.profile_image}}" onerror="this.src='./../assets/images/user_avatar.jpg';"> <img src="{{imageServer + loginDetails.profile_image}}" onerror="this.src='assets/images/user_avatar.jpg'">
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment