Skip to content

D
dcarfixers_angular
Commit fb5b9e2a by Jansa Jose
Options

back button issue

parent 7b75b916
Showing with 54 additions and 26 deletions
src/app/app-routing.module.ts
...@@ -6,7 +6,7 @@ const routes: Routes = [ ...@@ -6,7 +6,7 @@ const routes: Routes = [
]; ];
@NgModule({ @NgModule({
imports: [RouterModule.forRoot(routes, { useHash: false })], imports: [RouterModule.forRoot(routes)],
exports: [RouterModule] exports: [RouterModule]
}) })
export class AppRoutingModule { } export class AppRoutingModule { }
src/app/home/dashboard/dashboard.component.html
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<li class="nav-item"> <li class="nav-item">
<a class="nav-link time" data-toggle="tab" href="#service" #serviceHistoryTab> <a class="nav-link time" data-toggle="tab" href="#service" #serviceHistoryTab>
Service History Service History
<!-- <div class="notification">02</div> --> <div class="notification" *ngIf="bookingDetails">{{ bookingDetails?.length || '0' }}</div>
</a> </a>
</li> </li>
</ul> </ul>
...@@ -647,7 +647,7 @@ ...@@ -647,7 +647,7 @@
<div class="modal" id="quotes"> <div class="modal" id="quotes">
<div class="modal-dialog modal-full"> <div class="modal-dialog modal-full">
<div class="modal-content login_modal_wrapper"> <div class="modal-content login_modal_wrapper" malihu-scrollbar [scrollbarOptions]="scrollbarOptions">
<div #closeQuoteWizard class="modal_close" data-dismiss="modal" (click)="scheduleDateInit = false; scheduleMechanic = false"> <div #closeQuoteWizard class="modal_close" data-dismiss="modal" (click)="scheduleDateInit = false; scheduleMechanic = false">
&times; &times;
</div> </div>
...@@ -680,7 +680,7 @@ ...@@ -680,7 +680,7 @@
</div> </div>
</div> </div>
<div class="quote_schedule_list"> <div class="quote_schedule_list">
<ul> <ul malihu-scrollbar [scrollbarOptions]="scrollbarOptions">
<li *ngFor="let mechanic of mechanicData; let i = index;"> <li *ngFor="let mechanic of mechanicData; let i = index;">
<div class="row"> <div class="row">
<div class="col-md-6 pr0"> <div class="col-md-6 pr0">
...@@ -692,7 +692,7 @@ ...@@ -692,7 +692,7 @@
</div> </div>
<div class="mechanic_ratting"> <div class="mechanic_ratting">
<p *ngIf="mechanic.rating > 0">{{mechanic.rating}} Ratings</p> <p *ngIf="mechanic.rating > 0">{{mechanic.rating}} Ratings</p>
<h6>6 Reviews</h6>
</div> </div>
</div> </div>
<div class="mechanic_detail"> <div class="mechanic_detail">
...@@ -701,12 +701,12 @@ ...@@ -701,12 +701,12 @@
<h5>{{mechanic.shop_name}}</h5> <h5>{{mechanic.shop_name}}</h5>
<p>{{mechanic.shop_address}}</p> <p>{{mechanic.shop_address}}</p>
<h6>{{mechanic.shop_phone}}</h6> <h6>{{mechanic.shop_phone}}</h6>
<p>{{mechanic.distance | number:'1.2-2'}} Away from you</p> <p>{{mechanic.distance | number:'1.2-2'}} miles away from you</p>
</div> </div>
<ng-template #mechanicDetails> <ng-template #mechanicDetails>
<p>{{mechanic.address}}<br>{{mechanic.city+' , '+mechanic.state}}</p> <p>{{mechanic.address}}<br>{{mechanic.city+' , '+mechanic.state}}</p>
<h6>{{mechanic.phone}}</h6> <h6>{{mechanic.phone}}</h6>
<p>{{mechanic.distance | number:'1.2-2'}}</p> <p>{{mechanic.distance | number:'1.2-2'}} miles away from you</p>
</ng-template> </ng-template>
<button (click)="scheduleNow(mechanic.mechanic_id,mechanic.estimate)" <button (click)="scheduleNow(mechanic.mechanic_id,mechanic.estimate)"
[ngClass]="{'book_now':scheduleDateInit == true && scheduleMechanic == mechanic.mechanic_id, [ngClass]="{'book_now':scheduleDateInit == true && scheduleMechanic == mechanic.mechanic_id,
...@@ -799,7 +799,7 @@ ...@@ -799,7 +799,7 @@
<div style="float:right;width:calc(100% - 30px); white-space: nowrap; <div style="float:right;width:calc(100% - 30px); white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis;padding-left: 5px;">{{mechanicLoc.display_name}}<br> text-overflow: ellipsis;padding-left: 5px;">{{mechanicLoc.display_name}}<br>
{{mechanicLoc.estimate}} Price : {{mechanicLoc.estimate}}
</div> </div>
</div> </div>
......
src/app/home/dashboard/dashboard.component.scss
...@@ -1125,11 +1125,13 @@ ...@@ -1125,11 +1125,13 @@
} }
} }
.quote_schedule_header { .quote_schedule_header {
background: #f9f7f7;
border: 1px solid #e8e8e8;
border: 1px solid #2655bf;
h4 { h4 {
background: #2655bf;
margin: 0px; margin: 0px;
color: #1e1e1e; color: #fff;
font-size: 18px; font-size: 18px;
padding: 10px; padding: 10px;
} }
...@@ -1262,7 +1264,7 @@ ...@@ -1262,7 +1264,7 @@
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
color: #767676; color: #767676;
font-size: 16px; font-size: 14px;
line-height: 20px; line-height: 20px;
padding-top: 5px; padding-top: 5px;
} }
...@@ -1281,7 +1283,8 @@ ...@@ -1281,7 +1283,8 @@
border: 1px solid #898989; border: 1px solid #898989;
color: #898989; color: #898989;
background: transparent; background: transparent;
margin: 5px; margin: 0px;
margin-top: 15px;
padding-left: 15px; padding-left: 15px;
padding-right: 15px; padding-right: 15px;
border-radius: 20px; border-radius: 20px;
...@@ -1296,26 +1299,31 @@ ...@@ -1296,26 +1299,31 @@
border: 1px solid #2655bf; border: 1px solid #2655bf;
color: #2655bf; color: #2655bf;
background: transparent; background: transparent;
margin: 5px; margin: 0px;
padding-left: 15px; padding-left: 15px;
padding-right: 15px; padding-right: 15px;
border-radius: 20px; border-radius: 20px;
height: 35px; height: 35px;
width:100%;
font-size: 14px; font-size: 14px;
margin-top: 15px;
&:focus { &:focus {
outline: none; outline: none;
} }
} }
.book_now_disabled { .book_now_disabled {
float: right; float: right;
margin-top:10px;
border: 1px solid #808080; border: 1px solid #808080;
color: #808080; color: #808080;
background: transparent; background: transparent;
margin: 5px; margin: 0px;
padding-left: 15px; padding-left: 15px;
padding-right: 15px; padding-right: 15px;
border-radius: 20px; border-radius: 20px;
height: 35px; height: 35px;
margin-top: 15px;
width:100%;
font-size: 14px; font-size: 14px;
&:focus { &:focus {
outline: none; outline: none;
......
src/app/home/dashboard/dashboard.component.ts
...@@ -115,6 +115,7 @@ export class DashboardComponent implements OnInit { ...@@ -115,6 +115,7 @@ export class DashboardComponent implements OnInit {
this.activeTab = 'profile'; this.activeTab = 'profile';
this.errMessage = false; this.errMessage = false;
this.vehDetails = false; this.vehDetails = false;
this.imageServer = ImageStorage;
this.searchLocError = false; this.searchLocError = false;
this.showLeftArrow = false; this.showLeftArrow = false;
this.showRightArrow = true; this.showRightArrow = true;
...@@ -192,6 +193,10 @@ export class DashboardComponent implements OnInit { ...@@ -192,6 +193,10 @@ export class DashboardComponent implements OnInit {
}); });
}); });
this.nextDate.setDate(this.nextDate.getDate() + 1); this.nextDate.setDate(this.nextDate.getDate() + 1);
$('.modal-backdrop').remove();
$('body').attr('class','');
$('body').attr('style','');
} }
getCustBookDetails(){ getCustBookDetails(){
......
src/app/home/index/index.component.html
...@@ -528,12 +528,12 @@ ...@@ -528,12 +528,12 @@
<h5>{{mechanic.shop_name}}</h5> <h5>{{mechanic.shop_name}}</h5>
<p>{{mechanic.shop_address}}</p> <p>{{mechanic.shop_address}}</p>
<h6>{{mechanic.shop_phone}}</h6> <h6>{{mechanic.shop_phone}}</h6>
<p>{{mechanic.distance | number:'1.2-2' }} Away from you</p> <p>{{mechanic.distance | number:'1.2-2' }} miles away from you</p>
</div> </div>
<ng-template #mechanicDetails> <ng-template #mechanicDetails>
<p>{{mechanic.address}}<br>{{mechanic.city+' , '+mechanic.state}}</p> <p>{{mechanic.address}}<br>{{mechanic.city+' , '+mechanic.state}}</p>
<h6>{{mechanic.phone}}</h6> <h6>{{mechanic.phone}}</h6>
<p>{{mechanic.distance | number:'1.2-2' }}</p> <p>{{mechanic.distance | number:'1.2-2' }} miles away from you</p>
</ng-template> </ng-template>
<button (click)="scheduleNow(mechanic.mechanic_id,mechanic.estimate)" [ngClass]="{'book_now':scheduleDateInit == true && scheduleMechanic == mechanic.mechanic_id, <button (click)="scheduleNow(mechanic.mechanic_id,mechanic.estimate)" [ngClass]="{'book_now':scheduleDateInit == true && scheduleMechanic == mechanic.mechanic_id,
'book_now_disabled':scheduleDateInit == false || (scheduleDateInit == true && scheduleMechanic != mechanic.mechanic_id)}"> 'book_now_disabled':scheduleDateInit == false || (scheduleDateInit == true && scheduleMechanic != mechanic.mechanic_id)}">
...@@ -622,7 +622,7 @@ ...@@ -622,7 +622,7 @@
<div style="float:right;width:calc(100% - 30px); white-space: nowrap; <div style="float:right;width:calc(100% - 30px); white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis;padding-left: 5px;">{{mechanicLoc.display_name}}<br> text-overflow: ellipsis;padding-left: 5px;">{{mechanicLoc.display_name}}<br>
{{mechanicLoc.estimate}} Price : {{mechanicLoc.estimate}}
</div> </div>
</div> </div>
</agm-info-window> </agm-info-window>
......
src/app/home/index/index.component.scss
...@@ -1065,7 +1065,7 @@ ...@@ -1065,7 +1065,7 @@
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
color: #767676; color: #767676;
font-size: 16px; font-size: 14px;
line-height: 20px; line-height: 20px;
padding-top: 5px; padding-top: 5px;
} }
...@@ -1084,12 +1084,13 @@ ...@@ -1084,12 +1084,13 @@
border: 1px solid #898989; border: 1px solid #898989;
color: #898989; color: #898989;
background: transparent; background: transparent;
margin: 5px; margin: 0px;
padding-left: 15px; padding-left: 15px;
padding-right: 15px; padding-right: 15px;
border-radius: 20px; border-radius: 20px;
height: 35px; height: 35px;
font-size: 14px; font-size: 14px;
margin-top: 15px;
&:focus { &:focus {
outline: none; outline: none;
} }
...@@ -1099,11 +1100,13 @@ ...@@ -1099,11 +1100,13 @@
border: 1px solid #2655bf; border: 1px solid #2655bf;
color: #2655bf; color: #2655bf;
background: transparent; background: transparent;
margin: 5px; margin: 0px;
padding-left: 15px; padding-left: 15px;
padding-right: 15px; padding-right: 15px;
border-radius: 20px; border-radius: 20px;
height: 35px; height: 35px;
width:100%;
margin-top: 15px;
font-size: 14px; font-size: 14px;
&:focus { &:focus {
outline: none; outline: none;
...@@ -1114,12 +1117,14 @@ ...@@ -1114,12 +1117,14 @@
border: 1px solid #808080; border: 1px solid #808080;
color: #808080; color: #808080;
background: transparent; background: transparent;
margin: 5px; margin: 0px;
padding-left: 15px; padding-left: 15px;
padding-right: 15px; padding-right: 15px;
border-radius: 20px; border-radius: 20px;
height: 35px; height: 35px;
width:100%;
font-size: 14px; font-size: 14px;
margin-top: 15px;
&:focus { &:focus {
outline: none; outline: none;
} }
......
src/app/home/index/index.component.ts
...@@ -145,6 +145,10 @@ export class IndexComponent implements OnInit { ...@@ -145,6 +145,10 @@ export class IndexComponent implements OnInit {
this.featuredOn = {grid: {xs: 1, sm: 2 , md: 5, lg: 6, all: 0},slide: 1, speed: 400, animation: 'lazy',point: { visible: false },load: 2, touch: true, easing: 'ease'} this.featuredOn = {grid: {xs: 1, sm: 2 , md: 5, lg: 6, all: 0},slide: 1, speed: 400, animation: 'lazy',point: { visible: false },load: 2, touch: true, easing: 'ease'}
this.carouselTile = {grid: {xs: 1, sm: 2 , md: 3, lg: 3, all: 0},slide: 1, speed: 400, animation: 'lazy',point: { visible: false },load: 2, touch: true, easing: 'ease'} this.carouselTile = {grid: {xs: 1, sm: 2 , md: 3, lg: 3, all: 0},slide: 1, speed: 400, animation: 'lazy',point: { visible: false },load: 2, touch: true, easing: 'ease'}
this.nextDate.setDate(this.nextDate.getDate() + 1); this.nextDate.setDate(this.nextDate.getDate() + 1);
$('.modal-backdrop').remove();
$('body').attr('class','');
$('body').attr('style','');
} }
get_model(event) { get_model(event) {
......
src/app/navbar/navbar.component.ts
...@@ -174,24 +174,30 @@ export class NavbarComponent implements OnInit { ...@@ -174,24 +174,30 @@ export class NavbarComponent implements OnInit {
let funcName = 'service_provider_registration'; let funcName = 'service_provider_registration';
this.webService.post_data(funcName,data).subscribe(response => { this.webService.post_data(funcName,data).subscribe(response => {
this.loader = false; this.loader = false;
console.log(response);
if(response.status == '1'){ if(response.status == '1'){
response.status = 'success'; response.status = 'success';
response.message = 'Your Account has been created, Whenever it Activates will inform you.'; response.message = 'Your Account has been created, Whenever it Activates will inform you.';
this.spSignupResponse = response; this.spSignupResponse = response;
setTimeout( function() {
This.spSignupResponse = false;
This.spModal.nativeElement.click();
This.resetForm();
}, 3000);
}else{ }else{
response.status = 'error'; response.status = 'error';
response.message = (response.message == '')?this.errorMsg.errorList.req_failure:response.message; response.message = (response.message == '')?this.errorMsg.errorList.req_failure:response.message;
this.spSignupResponse = response; this.spSignupResponse = response;
setTimeout( function() {
This.spSignupResponse = false;
}, 3000);
} }
},error => { },error => {
this.spSignupResponse = {'status':'error','message':this.errorMsg.errorList.req_failure}; this.spSignupResponse = {'status':'error','message':this.errorMsg.errorList.req_failure};
},() => {
setTimeout( function() { setTimeout( function() {
This.spSignupResponse = false; This.spSignupResponse = false;
This.spModal.nativeElement.click(); }, 3000);
}, 4000)
}); });
} }
......
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