Skip to content

D
dcarfixers_angular
Commit 9be3f7a7 by Tobin
Options

Merge branch 'master' of https://gitlab.techware.co.in/tobin/dcarfixers_angular into tobin

# Conflicts: # src/app/home/dashboard/dashboard.component.html # src/styles.scss
parents af0f06d1 5ba2e708
Showing with 205 additions and 107 deletions
package-lock.json
......@@ -646,6 +646,14 @@
"tslib": "^1.9.0"
}
},
"@angular/http": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/@angular/http/-/http-7.2.0.tgz",
"integrity": "sha512-CoEwfh9LSpyXUh/077nvy1Hheo6mmIFKOmnyo9V7JaesGJYkYpEIVFYFP1hYg7f8snKHclT3gqfQX+BynNhExQ==",
"requires": {
"tslib": "^1.9.0"
}
},
"@angular/language-service": {
"version": "7.1.3",
"resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-7.1.3.tgz",
......@@ -836,6 +844,14 @@
}
}
},
"@google/maps": {
"version": "0.5.5",
"resolved": "https://registry.npmjs.org/@google/maps/-/maps-0.5.5.tgz",
"integrity": "sha512-RSZriyE2XViVhXgdEcQaEu3jMYh2A/jS0VahLHXqGO0VfPyEbDac4PAn7/hBJiTavWpxchKfe5OI9inJofFWxA==",
"requires": {
"uuid": ">=2.2.1"
}
},
"@ngtools/webpack": {
"version": "7.1.4",
"resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-7.1.4.tgz",
......@@ -6702,6 +6718,19 @@
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
"dev": true
},
"mt-geo": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/mt-geo/-/mt-geo-1.0.1.tgz",
"integrity": "sha1-7HSEZb5amqKO6fzZUDXIoSAILzo="
},
"mt-latlon": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/mt-latlon/-/mt-latlon-0.1.1.tgz",
"integrity": "sha1-rMKNKZVjm4Vkp0DTzKPoaLILgA4=",
"requires": {
"mt-geo": "1.0.1"
}
},
"multicast-dns": {
"version": "6.2.3",
"resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
......@@ -6765,6 +6794,11 @@
"resolved": "https://registry.npmjs.org/ng2-archwizard/-/ng2-archwizard-2.1.0.tgz",
"integrity": "sha1-3queX3IRRizO+oggdmBGPN9eStI="
},
"ng2-file-upload": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/ng2-file-upload/-/ng2-file-upload-1.3.0.tgz",
"integrity": "sha512-Pudxik6LWYsT8hNiEW7RfjgGWAnvfQywxwJYMdt1snTUe+KnlRc/QqPv3QEQW6plXTanuLkYz/TbqilSfSHOsw=="
},
"ngx-carousel": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/ngx-carousel/-/ngx-carousel-1.3.5.tgz",
......
package.json
......@@ -17,16 +17,20 @@
"@angular/compiler": "~7.1.0",
"@angular/core": "~7.1.0",
"@angular/forms": "~7.1.0",
"@angular/http": "^7.2.0",
"@angular/platform-browser": "~7.1.0",
"@angular/platform-browser-dynamic": "~7.1.0",
"@angular/router": "~7.1.0",
"@google/maps": "^0.5.5",
"angular-star-rating": "^4.0.0-beta.3",
"angular-wizard-form": "^0.4.1",
"bootstrap": "^4.1.3",
"core-js": "^2.5.4",
"hammerjs": "^2.0.8",
"jquery": "^3.3.1",
"mt-latlon": "^0.1.1",
"ng2-archwizard": "^2.1.0",
"ng2-file-upload": "^1.3.0",
"ngx-carousel": "^1.3.5",
"ngx-google-places-autocomplete": "^2.0.3",
"ngx-slick": "^0.2.1",
......
src/app/app-routing.module.ts
......@@ -6,7 +6,7 @@ const routes: Routes = [
];
@NgModule({
imports: [RouterModule.forRoot(routes, { useHash: true })],
imports: [RouterModule.forRoot(routes, { useHash: false })],
exports: [RouterModule]
})
export class AppRoutingModule { }
src/app/home/dashboard/dashboard.component.html
......@@ -768,3 +768,17 @@
</div>
<!-- QUOTES-MODAL-ENDS-->
<!-- BOOKING-SUCCESS-MODAL-STARTS -->
<div class="modal" id="success">
<div class="modal-dialog modal-full">
<div class="modal-content login_modal_wrapper">
GDGDG
</div>
</div>
</div>
<!-- BOOKING-SUCCESS-MODAL-ENDS -->
src/app/home/index/index.component.html
......@@ -7,7 +7,7 @@
<div class="container">
<h1>Auto service with Warranty<br> & Your interest is Ours.</h1>
<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">
<button class="get_started_btn" (click)="getVehicleLoc(googleLocSearch.value)">GET STARTED</button>
</div>
......@@ -257,24 +257,21 @@
<h3>VEHICLE INFORMATION</h3>
<div class="row">
<div class="col-md-6">
<select formControlName="modelYear"
[ngClass]="{'input_error': !vehicleDataForm.controls['modelYear'].valid && vehicleDataFormSubmit}">
<select formControlName="modelYear" [ngClass]="{'input_error': !vehicleDataForm.controls['modelYear'].valid && vehicleDataFormSubmit}">
<option value="" class="hide">YEAR</option>
<option *ngFor="let date of modelDates">{{date}}</option>
</select>
</div>
<div class="col-md-6">
<select (change)="get_model($event.target.value)" formControlName="maker"
[ngClass]="{'input_error': !vehicleDataForm.controls['maker'].valid && vehicleDataFormSubmit}">
<select (change)="get_model($event.target.value)" formControlName="maker" [ngClass]="{'input_error': !vehicleDataForm.controls['maker'].valid && vehicleDataFormSubmit}">
<option value="" class="hide">MAKE</option>
<option *ngFor="let car_date of carSearchJsonData; let key = index" value="{{key}}">{{car_date.brand}}</option>
</select>
</div>
</div>
<div class="row">
<div class="col-md-6" >
<select formControlName="modelName"
[ngClass]="{'input_error': !vehicleDataForm.controls['modelName'].valid && vehicleDataFormSubmit}">
<div class="col-md-6">
<select formControlName="modelName" [ngClass]="{'input_error': !vehicleDataForm.controls['modelName'].valid && vehicleDataFormSubmit}">
<option value="" class="hide">MODEL</option>
<option *ngFor="let car_models of carModel">{{car_models}}</option>
</select>
......@@ -348,7 +345,7 @@
</wizard-step>
<wizard-step stepTitle="Title of step 3">
<h3>DESCRIPTION</h3>
<div class="row">
<div class="row m0">
<div class="col-md-12">
<h6 class="pt10 textLeft">Add notes for General Diagnosis (Please provide description in notes section) (optional) *</h6>
</div>
......@@ -358,7 +355,7 @@
<textarea class="textarea_input" rows="5" placeholder="Additional Informations you may can gave" [(ngModel)]='optionalDescription'></textarea>
</div>
</div>
<div class="row">
<div class="row m0">
<h6 class="pt10 textLeft">Add Images (Optional)</h6>
<!-- Add Images or Videos (Optional) -->
<hr>
......@@ -497,8 +494,7 @@
<p>{{mechanic.address}}<br>{{mechanic.city+' , '+mechanic.state}}</p>
<h6>{{mechanic.phone}}</h6>
</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)}">
{{loginDetails ? 'Book now' : 'Login and Continue' }}
</button>
......@@ -511,9 +507,8 @@
<h4 class="panel-title">
<a data-toggle="collapse" data-parent="#accordion" href="#estimate_{{mechanic.mechanic_id}}">
<div class="row">
<div class="col-md-8">Estimated Price</div>
<div class="col-md-1"></div>
<div class="col-md-2 textRight"><strong>{{mechanic.estimate}}</strong></div>
<div class="col-md-7 col-sm-7 col-xs-7">Estimated Price</div>
<div class="col-md-5 col-sm-5 col-xs-5 textRight"><strong>{{mechanic.estimate}}</strong></div>
</div>
</a>
</h4>
......@@ -521,9 +516,9 @@
<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="row">
<div class="col-md-8">{{sub_issues.issue_category}}</div>
<div class="col-md-1">:</div>
<div class="col-md-3 textRight"><strong>{{sub_issues.service_fee}}</strong></div>
<div class="col-md-7 col-sm-7 col-xs-7">{{sub_issues.issue_category}}</div>
<div class="col-md-1 col-sm-1 col-xs-1">:</div>
<div class="col-md-4 col-sm-4 col-xs-4 textRight"><strong>{{sub_issues.service_fee}}</strong></div>
</div>
</div>
</div>
......@@ -577,11 +572,7 @@
</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-marker *ngFor="let mechanicLoc of mechanicData" [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>
</agm-info-window>
......
src/app/home/index/index.component.scss
......@@ -397,6 +397,7 @@
width: 100%;
margin: 0px;
padding: 0px;
padding-bottom: 10px;
}
.search {
background: url("/assets/images/asset_search.png");
......@@ -474,7 +475,7 @@
outline: none;
}
}
.log_btn_diabled{
.log_btn_diabled {
cursor: not-allowed;
background: #929292;
}
......@@ -490,7 +491,7 @@
font-weight: 500;
background-repeat: no-repeat;
background-size: 20px;
margin:3px;
margin: 3px;
&:focus {
outline: none;
}
......@@ -498,7 +499,7 @@
.wizard_quotes {
height: 40px;
width: 48%;
margin:3px;
margin: 3px;
display: inline-block;
border-radius: 25px;
color: #fff;
......@@ -547,6 +548,7 @@
margin: 0px;
padding: 0px;
text-align: center;
padding-bottom: 30px;
li {
list-style: none;
width: 80px;
......@@ -574,22 +576,23 @@
right: 0px;
bottom: 0px;
opacity: 0;
height: 120px;
height: 90px;
padding: 0px;
}
}
}
}
.service_methods{
.service_methods {
max-height: 200px;
overflow: scroll;
ul{
padding:0px;
margin:0px;
li{
ul {
padding: 0px;
margin: 0px;
li {
list-style: none;
width: 100%;
color: #060708;
border:1px dashed #929292;
border: 1px dashed #929292;
cursor: pointer;
padding: 5px;
margin-bottom: 10px;
......@@ -598,6 +601,7 @@
background-position: right 5px top 2px;
background-repeat: no-repeat;
background-size: 30px;
padding-right: 35px;
}
.service_list {
ul {
......@@ -611,7 +615,7 @@
min-width: 100%;
margin: 0px;
padding: 0px;
border:none;
border: none;
background-image: none;
margin-bottom: 5px;
#custom_check_button {
......@@ -655,7 +659,7 @@
#custom_check_button input:checked+p {
background-color: #58b19f;
color: #fff;
border-radius:0px !important;
border-radius: 0px !important;
margin: 0px;
}
}
......@@ -663,7 +667,6 @@
}
}
}
.textarea_input {
width: 100%;
border: 1px solid #1e1e1e;
......@@ -883,7 +886,7 @@
}
}
.book_now {
float:right;
float: right;
border: 1px solid #2655bf;
color: #2655bf;
background: transparent;
......@@ -897,8 +900,8 @@
outline: none;
}
}
.book_now_disabled{
float:right;
.book_now_disabled {
float: right;
border: 1px solid #808080;
color: #808080;
background: transparent;
......@@ -917,47 +920,39 @@
}
}
}
.offer{
.offer {
color: #a8a8a8;
text-align: justify;
font-size: 12px;
.panel-heading{
.panel-heading {
padding: 10px;
margin-bottom: 5px;
padding-left: 15px;
padding-right: 15px;
background-color: #2655bf;
background-image: url("/assets/images/asset_double_right.png");
background-position: right 10px top 8px;
background-repeat: no-repeat;
.panel-title{
.panel-title {
padding: 0px;
margin:0px;
a{
margin: 0px;
a {
color: #fff;
font-weight: 300;
font-size: 15px;
}
}
}
.panel-collapse{
.panel-collapse {
background-color: #f5f5f5;
.panel-body{
.panel-body {
font-size: 15px;
font-weight: 400;
.row{
padding:10px;
.row {
padding: 10px;
border-bottom: 1px solid #fff;
}
}
}
}
}
.scheduletiming_listing {
......@@ -975,89 +970,47 @@
display: inline-block;
position: relative;
#custom_check_button {
border-radius: 0px !important;
overflow: auto;
position: relative;
outline: none;
color: #908d8d;
-webkit-border-radius: 0px !important;
-moz-border-radius: 0px !important;
-ms-border-radius: 0px !important;
-o-border-radius: 0px !important;
}
#custom_check_button p {
margin: 0px;
position: absolute;
color: #908d8d;
left: 0px;
right: 0px;
top: 0px;
bottom: 0px;
padding: 5px;
cursor: pointer;
}
#custom_check_button label {
width: 100%;
}
#custom_check_button label span {
text-align: center;
display: block;
}
#custom_check_button label input {
position: absolute;
top: -20px;
}
#custom_check_button input:checked+p {
background-color: #ef5958;
color: #fff;
border-radius: 0px !important;
margin: 0px;
-webkit-border-radius: 0px !important;
-moz-border-radius: 0px !important;
-ms-border-radius: 0px !important;
-o-border-radius: 0px !important;
}
li {
width: 100%;
......
src/app/provider/web.service.ts
......@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
import { HttpClient, HttpHeaders, HttpErrorResponse } from '@angular/common/http';
import { Observable } from 'rxjs';
import { map, catchError } from 'rxjs/operators';
import { apiConfig, serverApiDev } from '../../environments/server.config';
import { apiConfig } from '../../environments/server.config';
const httpOptions = {
headers: new HttpHeaders({
......@@ -51,9 +51,6 @@ export class WebService {
localStorage.removeItem(data);
localStorage.clear();
}
online_service(url: string ) {
return this.http.post(`${serverApiDev + url}`, null).pipe(map((response: any) => response));
}
get_stored_json(json_file: string) {
return this.http.get("assets/json_data/" + json_file);
}
......
src/assets/css/responsive.scss
......@@ -36,6 +36,48 @@
/* 01. Smartphones (portrait and landscape) ----------- */
@media only screen and (min-device-width: 320px) and (max-device-width: 480px) {
.navbar {
padding: 20px;
background: #2655bf !important;
.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 {
.modal_close {
// display: none !important;
color:#333 !important;
}
}
.main_wrapper {
.title_banner_overlay {
// padding-top: 120px;
// padding-bottom: 30px;
.title_banner {
h1 {
font-size: 24px;
line-height: 35px;
font-weight: 400 !important;
}
}
}
}
.search_input_container {
width: 100% !important;
}
......@@ -52,9 +94,13 @@
}
.modal-body{
padding:0px !important;
padding:5px !important;
.vehicle_input_select{
margin-bottom: 10px;
}
}
.wizard_quotes{
width:100% !important;
}
......@@ -93,6 +139,51 @@
}
}
}
.testimonial_div {
padding: 0px !important;
.container-fluid {
max-width: 100% !important;
}
}
.login_modal_content {
padding: 15px !important;
padding-top: 40px !important;
top: 0px !important;
h3 {
padding-bottom: 25px !important;
}
.login_modal_inner {
select {
margin-bottom: 15px;
}
input {
margin-bottom: 15px;
}
}
}
.log_btn {
width: 135px !important;
}
.wizard_quotes {
width: 80% !important;
}
.quote_service_wrapper {
width: 100% !important;
.mechanic_detail {
.book_now {
width: 100% !important;
}
.book_now_disabled {
width: 100% !important;
}
}
}
.login_modal_inner {
width: 100% !important;
}
.scheduletiming_listing {
width: 100% !important;
}
}
......
src/environments/server.config.ts
export const apiConfig = 'http://localhost/dcarfixers/Webservices/';
export const ImageStorage = 'http://localhost/dcarfixers/';
export const serverApiDev = 'http://devapp.ticketgoose.com/bookbustickets/rest/json/2.0/';
let apiConfigUrl,imageStorageUrl;
// // Localhost
// apiConfigUrl = 'http://localhost/dcarfixers/Webservices/';
// imageStorageUrl = 'http://localhost/dcarfixers/';
// // Techlabz
// apiConfigUrl = 'http://techlabz.in/dcarfixers/Webservices/';
// imageStorageUrl = 'http://techlabz.in/dcarfixers/';
// carfixxers.com
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
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