Skip to content

D
dcarfixers_angular
Commit f5a9006e by amal
Options

29/1/2019

parent 8a5e0a43
Showing with 88 additions and 40 deletions
package-lock.json
...@@ -4063,12 +4063,14 @@ ...@@ -4063,12 +4063,14 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -4083,17 +4085,20 @@ ...@@ -4083,17 +4085,20 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -4210,7 +4215,8 @@ ...@@ -4210,7 +4215,8 @@
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -4222,6 +4228,7 @@ ...@@ -4222,6 +4228,7 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -4236,6 +4243,7 @@ ...@@ -4236,6 +4243,7 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
...@@ -4243,12 +4251,14 @@ ...@@ -4243,12 +4251,14 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.2.4", "version": "2.2.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.1", "safe-buffer": "^5.1.1",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -4267,6 +4277,7 @@ ...@@ -4267,6 +4277,7 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -4347,7 +4358,8 @@ ...@@ -4347,7 +4358,8 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -4359,6 +4371,7 @@ ...@@ -4359,6 +4371,7 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -4480,6 +4493,7 @@ ...@@ -4480,6 +4493,7 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
......
src/app/home/index/index.component.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="container"> <div class="container">
<h1>Auto service with Warranty<br> & Your interest is Ours.</h1> <h1>Auto service with Warranty<br> & Your interest is Ours.</h1>
<h5>Where is your car?</h5> <h5>Where is your car?</h5>
<div class="search_input_container" [ngClass]="{'input_error': searchLocError}" > <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"> <input #googleLocSearch placeholder="Enter Location" autocorrect="off" autocapitalize="off" spellcheck="off" type="text" (keyup)="searchLocError = false">
<button class="get_started_btn" (click)="getVehicleLoc(googleLocSearch.value)">GET STARTED</button> <button class="get_started_btn" (click)="getVehicleLoc(googleLocSearch.value)">GET STARTED</button>
</div> </div>
...@@ -257,24 +257,21 @@ ...@@ -257,24 +257,21 @@
<h3>VEHICLE INFORMATION</h3> <h3>VEHICLE INFORMATION</h3>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<select formControlName="modelYear" <select formControlName="modelYear" [ngClass]="{'input_error': !vehicleDataForm.controls['modelYear'].valid && vehicleDataFormSubmit}">
[ngClass]="{'input_error': !vehicleDataForm.controls['modelYear'].valid && vehicleDataFormSubmit}">
<option value="" class="hide">YEAR</option> <option value="" class="hide">YEAR</option>
<option *ngFor="let date of modelDates">{{date}}</option> <option *ngFor="let date of modelDates">{{date}}</option>
</select> </select>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<select (change)="get_model($event.target.value)" formControlName="maker" <select (change)="get_model($event.target.value)" formControlName="maker" [ngClass]="{'input_error': !vehicleDataForm.controls['maker'].valid && vehicleDataFormSubmit}">
[ngClass]="{'input_error': !vehicleDataForm.controls['maker'].valid && vehicleDataFormSubmit}">
<option value="" class="hide">MAKE</option> <option value="" class="hide">MAKE</option>
<option *ngFor="let car_date of carSearchJsonData; let key = index" value="{{key}}">{{car_date.brand}}</option> <option *ngFor="let car_date of carSearchJsonData; let key = index" value="{{key}}">{{car_date.brand}}</option>
</select> </select>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6" > <div class="col-md-6">
<select formControlName="modelName" <select formControlName="modelName" [ngClass]="{'input_error': !vehicleDataForm.controls['modelName'].valid && vehicleDataFormSubmit}">
[ngClass]="{'input_error': !vehicleDataForm.controls['modelName'].valid && vehicleDataFormSubmit}">
<option value="" class="hide">MODEL</option> <option value="" class="hide">MODEL</option>
<option *ngFor="let car_models of carModel">{{car_models}}</option> <option *ngFor="let car_models of carModel">{{car_models}}</option>
</select> </select>
...@@ -300,7 +297,7 @@ ...@@ -300,7 +297,7 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<button class="log_btn prev_btn floatLeft" type="button" data-dismiss="modal">PREVIOUS</button> <button class="log_btn prev_btn floatLeft" type="button" data-dismiss="modal">PREVIOUS</button>
<button [ngClass]="{'log_btn_diabled':vehicleDataForm.invalid}" type="submit" class="log_btn next_btn floatRight" (click)="jumpToStep1()">NEXT</button> <button [ngClass]="{'log_btn_diabled':vehicleDataForm.invalid}" type="submit" class="log_btn next_btn floatRight" (click)="jumpToStep1()">NEXT</button>
</div> </div>
</div> </div>
</form> </form>
...@@ -348,7 +345,7 @@ ...@@ -348,7 +345,7 @@
</wizard-step> </wizard-step>
<wizard-step stepTitle="Title of step 3"> <wizard-step stepTitle="Title of step 3">
<h3>DESCRIPTION</h3> <h3>DESCRIPTION</h3>
<div class="row"> <div class="row m0">
<div class="col-md-12"> <div class="col-md-12">
<h6 class="pt10 textLeft">Add notes for General Diagnosis (Please provide description in notes section) (optional) *</h6> <h6 class="pt10 textLeft">Add notes for General Diagnosis (Please provide description in notes section) (optional) *</h6>
</div> </div>
...@@ -358,7 +355,7 @@ ...@@ -358,7 +355,7 @@
<textarea class="textarea_input" rows="5" placeholder="Additional Informations you may can gave" [(ngModel)]='optionalDescription'></textarea> <textarea class="textarea_input" rows="5" placeholder="Additional Informations you may can gave" [(ngModel)]='optionalDescription'></textarea>
</div> </div>
</div> </div>
<div class="row"> <div class="row m0">
<h6 class="pt10 textLeft">Add Images (Optional)</h6> <h6 class="pt10 textLeft">Add Images (Optional)</h6>
<!-- Add Images or Videos (Optional) --> <!-- Add Images or Videos (Optional) -->
<hr> <hr>
...@@ -394,7 +391,7 @@ ...@@ -394,7 +391,7 @@
</div> </div>
</div> </div>
</wizard-step> </wizard-step>
<wizard-step stepTitle="Title of step 4"> <wizard-step stepTitle="Title of step 4">
<h3>SUMMARY</h3> <h3>SUMMARY</h3>
<div class="row"> <div class="row">
...@@ -468,7 +465,7 @@ ...@@ -468,7 +465,7 @@
<li>{{ dateSection[0] | date:'MMM dd-MM-yyyy' }}</li> <li>{{ dateSection[0] | date:'MMM dd-MM-yyyy' }}</li>
<li>{{ dateSection[1] | date:'MMM dd-MM-yyyy' }}</li> <li>{{ dateSection[1] | date:'MMM dd-MM-yyyy' }}</li>
</ul> </ul>
</div> </div>
<button [ngClass]="{'invisible': !showRightArrow}" class="quote_arrow right floatRight" (click)="next($event)"></button> <button [ngClass]="{'invisible': !showRightArrow}" class="quote_arrow right floatRight" (click)="next($event)"></button>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
...@@ -497,8 +494,7 @@ ...@@ -497,8 +494,7 @@
<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>
</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,
'book_now_disabled':scheduleDateInit == false || (scheduleDateInit == true && scheduleMechanic != mechanic.mechanic_id)}"> 'book_now_disabled':scheduleDateInit == false || (scheduleDateInit == true && scheduleMechanic != mechanic.mechanic_id)}">
{{loginDetails ? 'Book now' : 'Login and Continue' }} {{loginDetails ? 'Book now' : 'Login and Continue' }}
</button> </button>
...@@ -509,11 +505,10 @@ ...@@ -509,11 +505,10 @@
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h4 class="panel-title"> <h4 class="panel-title">
<a data-toggle="collapse" data-parent="#accordion" href="#estimate_{{mechanic.mechanic_id}}"> <a data-toggle="collapse" data-parent="#accordion" href="#estimate_{{mechanic.mechanic_id}}">
<div class="row"> <div class="row">
<div class="col-md-8">Estimated Price</div> <div class="col-md-7 col-sm-7 col-xs-7">Estimated Price</div>
<div class="col-md-1"></div> <div class="col-md-5 col-sm-5 col-xs-5 textRight"><strong>{{mechanic.estimate}}</strong></div>
<div class="col-md-2 textRight"><strong>{{mechanic.estimate}}</strong></div>
</div> </div>
</a> </a>
</h4> </h4>
...@@ -521,9 +516,9 @@ ...@@ -521,9 +516,9 @@
<div id="estimate_{{mechanic.mechanic_id}}" class="panel-collapse collapse in"> <div id="estimate_{{mechanic.mechanic_id}}" class="panel-collapse collapse in">
<div class="panel-body" *ngFor="let sub_issues of mechanic.sub_issues"> <div class="panel-body" *ngFor="let sub_issues of mechanic.sub_issues">
<div class="row"> <div class="row">
<div class="col-md-8">{{sub_issues.issue_category}}</div> <div class="col-md-7 col-sm-7 col-xs-7">{{sub_issues.issue_category}}</div>
<div class="col-md-1">:</div> <div class="col-md-1 col-sm-1 col-xs-1">:</div>
<div class="col-md-3 textRight"><strong>{{sub_issues.service_fee}}</strong></div> <div class="col-md-4 col-sm-4 col-xs-4 textRight"><strong>{{sub_issues.service_fee}}</strong></div>
</div> </div>
</div> </div>
</div> </div>
...@@ -569,7 +564,7 @@ ...@@ -569,7 +564,7 @@
<h4>Services</h4> <h4>Services</h4>
<div *ngFor="let selIssue of selectedIssues; let key = index"> <div *ngFor="let selIssue of selectedIssues; let key = index">
<p *ngIf="key != 0">|</p> <p *ngIf="key != 0">|</p>
<p>{{selIssue.issue_category}}</p> <p>{{selIssue.issue_category}}</p>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
<p>Estimated Price : <strong>{{estimatedPrice}}</strong></p> <p>Estimated Price : <strong>{{estimatedPrice}}</strong></p>
...@@ -577,11 +572,7 @@ ...@@ -577,11 +572,7 @@
</div> </div>
<div class="service_map"> <div class="service_map">
<agm-map #gm [latitude]="lat" [longitude]="lng"> <agm-map #gm [latitude]="lat" [longitude]="lng">
<agm-marker *ngFor="let mechanicLoc of mechanicData" <agm-marker *ngFor="let mechanicLoc of mechanicData" [latitude]="mechanicLoc.location_lat" [longitude]="mechanicLoc.location_lat" (mouseOver)="onMouseOver(infoWindow,gm)" (mouseOut)="onMouseOut(gm)">
[latitude]="mechanicLoc.location_lat"
[longitude]="mechanicLoc.location_lat"
(mouseOver)="onMouseOver(infoWindow,gm)"
(mouseOut)="onMouseOut(gm)">
<agm-info-window [disableAutoPan]="false" #infoWindow> <agm-info-window [disableAutoPan]="false" #infoWindow>
<div>{{mechanicLoc.display_name}}</div> <div>{{mechanicLoc.display_name}}</div>
</agm-info-window> </agm-info-window>
...@@ -596,4 +587,4 @@ ...@@ -596,4 +587,4 @@
</div> </div>
</div> </div>
<!-- QUOTES-MODAL-ENDS--> <!-- QUOTES-MODAL-ENDS-->
\ No newline at end of file
src/app/home/index/index.component.scss
...@@ -397,6 +397,7 @@ ...@@ -397,6 +397,7 @@
width: 100%; width: 100%;
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
padding-bottom: 10px;
} }
.search { .search {
background: url("/assets/images/asset_search.png"); background: url("/assets/images/asset_search.png");
...@@ -547,6 +548,7 @@ ...@@ -547,6 +548,7 @@
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
text-align: center; text-align: center;
padding-bottom: 30px;
li { li {
list-style: none; list-style: none;
width: 80px; width: 80px;
...@@ -574,7 +576,8 @@ ...@@ -574,7 +576,8 @@
right: 0px; right: 0px;
bottom: 0px; bottom: 0px;
opacity: 0; opacity: 0;
height: 120px; height: 90px;
padding: 0px;
} }
} }
} }
...@@ -598,6 +601,7 @@ ...@@ -598,6 +601,7 @@
background-position: right 5px top 2px; background-position: right 5px top 2px;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 30px; background-size: 30px;
padding-right: 35px;
} }
.service_list { .service_list {
ul { ul {
...@@ -926,7 +930,6 @@ ...@@ -926,7 +930,6 @@
padding-left: 15px; padding-left: 15px;
padding-right: 15px; padding-right: 15px;
background-color: #2655bf; background-color: #2655bf;
background-image: url("/assets/images/asset_double_right.png");
background-position: right 10px top 8px; background-position: right 10px top 8px;
background-repeat: no-repeat; background-repeat: no-repeat;
.panel-title { .panel-title {
......
src/assets/css/responsive.scss
...@@ -36,6 +36,29 @@ ...@@ -36,6 +36,29 @@
/* 01. Smartphones (portrait and landscape) ----------- */ /* 01. Smartphones (portrait and landscape) ----------- */
@media only screen and (min-device-width: 320px) and (max-device-width: 480px) { @media only screen and (min-device-width: 320px) and (max-device-width: 480px) {
.navbar {
padding: 20px;
background: rgba(0, 0, 0, 0.5);
.container-fluid {
max-width: 100% !important;
.navbar-nav {
li {
a {
padding: 15px !important;
}
}
}
}
}
.leftRs {
display: none !important;
}
.rightRs {
display: none !important;
}
.service_map {
display: none;
}
.login_modal_wrapper { .login_modal_wrapper {
.modal_close { .modal_close {
display: none !important; display: none !important;
...@@ -43,11 +66,13 @@ ...@@ -43,11 +66,13 @@
} }
.main_wrapper { .main_wrapper {
.title_banner_overlay { .title_banner_overlay {
padding-top: 90px; padding-top: 120px;
padding-bottom: 30px; padding-bottom: 30px;
.title_banner { .title_banner {
h1 { h1 {
font-size: 24px; font-size: 24px;
line-height: 35px;
font-weight: 400 !important;
} }
} }
} }
...@@ -80,8 +105,11 @@ ...@@ -80,8 +105,11 @@
} }
} }
} }
.testmonial_div { .testimonial_div {
padding: 0px !important; padding: 0px !important;
.container-fluid {
max-width: 100% !important;
}
} }
.login_modal_content { .login_modal_content {
padding: 15px !important; padding: 15px !important;
...@@ -90,6 +118,14 @@ ...@@ -90,6 +118,14 @@
h3 { h3 {
padding-bottom: 25px !important; padding-bottom: 25px !important;
} }
.login_modal_inner {
select {
margin-bottom: 15px;
}
input {
margin-bottom: 15px;
}
}
} }
.log_btn { .log_btn {
width: 135px !important; width: 135px !important;
...@@ -103,6 +139,9 @@ ...@@ -103,6 +139,9 @@
.book_now { .book_now {
width: 100% !important; width: 100% !important;
} }
.book_now_disabled {
width: 100% !important;
}
} }
} }
.login_modal_inner { .login_modal_inner {
......
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