Skip to content

D
dcarfixers_angular
Commit 57e1757d by Jansa Jose
Options

daily commit

parent 9be3f7a7
Showing with 57 additions and 24 deletions
angular.json
......@@ -29,11 +29,12 @@
"styles": [
"src/styles.scss",
"node_modules/bootstrap/dist/css/bootstrap.min.css",
"src/assets/css/responsive.scss"
"src/assets/css/responsive.scss",
"node_modules/ngx-bootstrap/datepicker/bs-datepicker.css"
],
"scripts": [
"node_modules/jquery/dist/jquery.min.js",
"node_modules/bootstrap/dist/js/bootstrap.min.js"
"node_modules/bootstrap/dist/js/bootstrap.min.js"
]
},
"configurations": {
......
package-lock.json
This source diff could not be displayed because it is too large. You can view the blob instead.
package.json
......@@ -13,11 +13,13 @@
"dependencies": {
"@agm/core": "^1.0.0-beta.5",
"@angular/animations": "~7.1.0",
"@angular/cdk": "^7.3.6",
"@angular/common": "~7.1.0",
"@angular/compiler": "~7.1.0",
"@angular/core": "~7.1.0",
"@angular/forms": "~7.1.0",
"@angular/http": "^7.2.0",
"@angular/material": "^7.3.6",
"@angular/platform-browser": "~7.1.0",
"@angular/platform-browser-dynamic": "~7.1.0",
"@angular/router": "~7.1.0",
......@@ -31,6 +33,7 @@
"mt-latlon": "^0.1.1",
"ng2-archwizard": "^2.1.0",
"ng2-file-upload": "^1.3.0",
"ngx-bootstrap": "^3.2.0",
"ngx-carousel": "^1.3.5",
"ngx-google-places-autocomplete": "^2.0.3",
"ngx-slick": "^0.2.1",
......@@ -42,9 +45,9 @@
"zone.js": "~0.8.26"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.11.4",
"@angular-devkit/build-angular": "^0.13.6",
"@angular/cli": "~7.1.2",
"@angular/compiler-cli": "~7.1.0",
"@angular/compiler-cli": "^7.2.10",
"@angular/language-service": "~7.1.0",
"@types/googlemaps": "^3.30.16",
"@types/jasmine": "~2.8.8",
......@@ -53,7 +56,7 @@
"codelyzer": "~4.5.0",
"jasmine-core": "~2.99.1",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~3.1.1",
"karma": "^4.0.1",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "~2.0.1",
"karma-jasmine": "~1.1.2",
......
src/app/app.module.ts
......@@ -20,7 +20,7 @@ import { HashLocationStrategy, LocationStrategy } from '@angular/common';
AppRoutingModule,
HomeModule,
ReactiveFormsModule,
HttpClientModule
HttpClientModule,
],
providers: [{provide: LocationStrategy, useClass: HashLocationStrategy}],
bootstrap: [AppComponent]
......
src/app/home/dashboard/dashboard.component.html
......@@ -663,10 +663,12 @@
<h5>{{mechanic.shop_name}}</h5>
<p>{{mechanic.shop_address}}</p>
<h6>{{mechanic.shop_phone}}</h6>
<p>{{mechanic.distance | number:'1.2-2'}}</p>
</div>
<ng-template #mechanicDetails>
<p>{{mechanic.address}}<br>{{mechanic.city+' , '+mechanic.state}}</p>
<h6>{{mechanic.phone}}</h6>
<p>{{mechanic.distance | number:'1.2-2'}}</p>
</ng-template>
<button (click)="scheduleNow(mechanic.mechanic_id,mechanic.estimate)"
[ngClass]="{'book_now':scheduleDateInit == true && scheduleMechanic == mechanic.mechanic_id,
......@@ -747,14 +749,19 @@
<div class="clear"></div>
</div>
<div class="service_map">
<agm-map #gm [latitude]="lat" [longitude]="lng">
<agm-map #gm [latitude]="lat" [longitude]="lng" [fitBounds]="true">
<agm-marker *ngFor="let mechanicLoc of mechanicData"
[latitude]="mechanicLoc.location_lat"
[longitude]="mechanicLoc.location_lat"
(mouseOver)="onMouseOver(infoWindow,gm)"
(mouseOut)="onMouseOut(gm)">
(mouseOut)="onMouseOut(gm)" [agmFitBounds]="true">
<agm-info-window [disableAutoPan]="false" #infoWindow>
<div>{{mechanicLoc.display_name}}</div>
<div style="width:130px;">
<img src="{{imageServer + mechanicLoc.profile_image}}" width="30px" height="30px" style="float: left;margin-right: 5px" onerror="this.src='assets/images/user_avatar.jpg'">
<div style="float: left">{{mechanicLoc.display_name}}</div>
<div>{{mechanicLoc.estimate}}</div>
</div>
</agm-info-window>
</agm-marker>
</agm-map>
......
src/app/home/dashboard/dashboard.component.ts
......@@ -17,7 +17,6 @@ declare const google: any;
styleUrls: ['./dashboard.component.scss']
})
export class DashboardComponent implements OnInit {
tab: any;
loader: boolean;
imageUrl: any;
......@@ -84,6 +83,7 @@ export class DashboardComponent implements OnInit {
imageDisp2: any;
imageDisp3: any;
imageDisp4: any;
//minRoute:any;
@ViewChild("closeWizard") public closeWizardRef: ElementRef;
@ViewChild("googleLocVin") public googleLocVinRef: ElementRef;
......@@ -117,7 +117,7 @@ export class DashboardComponent implements OnInit {
this.editProfileSubmitClick = false;
this.scheduleMechanic = false;
this.optionalDescription = '';
this.vehicleDetailsFormSubmitClick = false;
this.vehicleDetailsFormSubmitClick = false;
}
ngOnInit() {
......@@ -548,7 +548,7 @@ export class DashboardComponent implements OnInit {
this.dateSection.push(new Date(this.today.setDate(this.today.getDate())));
this.dateSection.push(new Date(this.today.setDate(this.today.getDate() + 1)));
this.loader = false;
} else {
this.loader = false;
......
src/app/home/home.module.ts
......@@ -9,6 +9,7 @@ import { StarRatingModule } from 'angular-star-rating';
import 'hammerjs';
import { DashboardComponent } from './dashboard/dashboard.component';
import { ReactiveFormsModule, FormsModule } from '@angular/forms';
import { BsDatepickerModule } from 'ngx-bootstrap';
@NgModule({
declarations: [
......@@ -23,6 +24,7 @@ import { ReactiveFormsModule, FormsModule } from '@angular/forms';
ArchwizardModule,
NgxCarouselModule,
ReactiveFormsModule,
BsDatepickerModule.forRoot(),
AgmCoreModule.forRoot({
apiKey: 'AIzaSyCcc-YDSJyDpehNE6qfntfWpEQ4uS4aq6A',
libraries: ["places"]
......
src/app/home/index/index.component.html
......@@ -5,7 +5,7 @@
<div class="title_banner_overlay">
<div class="title_banner">
<div class="container">
<h1>Auto service with Warranty<br> & Your interest is Ours.</h1>
<h1>Compare quotes and book<br> autoservice with warranty</h1>
<h5>Where is your car?</h5>
<div class="search_input_container" [ngClass]="{'input_error': searchLocError}">
<input #googleLocSearch placeholder="Enter Location" autocorrect="off" autocapitalize="off" spellcheck="off" type="text" (keyup)="searchLocError = false">
......@@ -290,6 +290,12 @@
</div>
</div>
<div class="row">
<div class="col-md-6">
<input formControlName="last_date" placeholder="LAST MAINTENANCE DATE" type="text" class="form-control date"
bsDatepicker name="dob" autocomplete="off">
</div>
</div>
<div class="row">
<div class="col-md-12">
<h6 class="pt10 textLeft"><strong>Note:</strong> 'Engine' and 'Trim' are optional... but providing them will improve your results and allow you to select a mileage-based maintenance service for your vehicle.</h6>
</div>
......@@ -489,10 +495,12 @@
<h5>{{mechanic.shop_name}}</h5>
<p>{{mechanic.shop_address}}</p>
<h6>{{mechanic.shop_phone}}</h6>
<p>{{mechanic.distance | number:'1.2-2' }}</p>
</div>
<ng-template #mechanicDetails>
<p>{{mechanic.address}}<br>{{mechanic.city+' , '+mechanic.state}}</p>
<h6>{{mechanic.phone}}</h6>
<p>{{mechanic.distance | number:'1.2-2' }}</p>
</ng-template>
<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)}">
......@@ -571,10 +579,11 @@
<div class="clear"></div>
</div>
<div class="service_map">
<agm-map #gm [latitude]="lat" [longitude]="lng">
<agm-marker *ngFor="let mechanicLoc of mechanicData" [latitude]="mechanicLoc.location_lat" [longitude]="mechanicLoc.location_lat" (mouseOver)="onMouseOver(infoWindow,gm)" (mouseOut)="onMouseOut(gm)">
<agm-map #gm [latitude]="lat" [longitude]="lng" [fitBounds]="true">
<agm-marker *ngFor="let mechanicLoc of mechanicData" [agmFitBounds]="true" [latitude]="mechanicLoc.location_lat" [longitude]="mechanicLoc.location_lat" (mouseOver)="onMouseOver(infoWindow,gm)" (mouseOut)="onMouseOut(gm)">
<agm-info-window [disableAutoPan]="false" #infoWindow>
<div>{{mechanicLoc.display_name}}</div>
<div>{{mechanicLoc.estimate}}</div>
</agm-info-window>
</agm-marker>
</agm-map>
......
src/app/home/index/index.component.ts
......@@ -12,6 +12,9 @@ import { formatDate } from '@angular/common';
declare var $;
declare const google: any;
@Component({
selector: 'app-index',
templateUrl: './index.component.html',
......@@ -23,7 +26,6 @@ export class IndexComponent implements OnInit {
public carouselTile: NgxCarousel;
@ViewChild('wizardModal') wizardModalTrrigerInput;
//Default Map Location
lat: number = 51.678418;
lng: number = 7.809007;
......@@ -101,6 +103,7 @@ export class IndexComponent implements OnInit {
ngOnInit() {
this.vehicleDataForm = new FormGroup({
trim: new FormControl(''), milage: new FormControl(''), emgine: new FormControl(''),
last_date: new FormControl(''),
maker: new FormControl('', [Validators.required]),
modelYear: new FormControl('', [Validators.required]),
modelName: new FormControl('', [Validators.required])
......
src/app/navbar/navbar.component.html
......@@ -20,10 +20,10 @@
<div class="collapse navbar-collapse" id="collapsibleNavbar">
<ul class="navbar-nav ml-auto">
<li class="nav-item">
<a class="nav-link" href="#">CAR OWNERS</a>
<a class="nav-link" href="#">CAR OWNERS<img src="assets/images/asset_down_small.png"></a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">AUTO REPAIR SHOP</a>
<a class="nav-link" href="#">AUTO SERVICE PROVIDER<img src="assets/images/asset_down_small.png"></a>
</li>
<li class="nav-item" *ngIf="!loginDetails">
<button (click)="resetForm()" class="sign_btn" data-toggle="modal" data-target="#login">
......
src/app/navbar/navbar.component.ts
......@@ -8,6 +8,7 @@ import { ImageStorage } from '../../environments/server.config';
declare var $;
declare const window: any;
@Component({
selector: 'app-navbar',
templateUrl: './navbar.component.html',
......@@ -83,12 +84,10 @@ export class NavbarComponent implements OnInit {
if ( response.status == '1') {
this.webService.setLocalStorageItem('userData', JSON.stringify(response.data));
this.subjectService.sendLoginData('logged_in');
this.loginModal.nativeElement.click();
} else {
response.status = 'error';
response.message = (response.message == '')?this.errorMsg.errorList.req_failure:response.message;
this.loginResponse = response;
}
},error => {
......
src/environments/server.config.ts
......@@ -5,12 +5,12 @@ let apiConfigUrl,imageStorageUrl;
// imageStorageUrl = 'http://localhost/dcarfixers/';
// // Techlabz
// apiConfigUrl = 'http://techlabz.in/dcarfixers/Webservices/';
// imageStorageUrl = 'http://techlabz.in/dcarfixers/';
apiConfigUrl = 'http://techlabz.in/dcarfixers/Webservices/';
imageStorageUrl = 'http://techlabz.in/dcarfixers/';
// carfixxers.com
apiConfigUrl = 'https://carfixxers.com/admin/Webservices/';
imageStorageUrl = 'https://carfixxers.com/admin/';
// apiConfigUrl = 'https://carfixxers.com/admin/Webservices/';
// imageStorageUrl = 'https://carfixxers.com/admin/';
export const apiConfig = apiConfigUrl;
export const ImageStorage = imageStorageUrl;
\ No newline at end of file
src/styles.scss
......@@ -532,3 +532,10 @@ section.module.parallax {
font-weight: 400 !important;
}
}
bs-datepicker-container{
z-index: 9999 !important;
background: #fff !important;
}
\ No newline at end of file
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