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

package-lock.json

@@ -415,12 +415,14 @@
             "balanced-match": {
               "version": "1.0.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "brace-expansion": {
               "version": "1.1.11",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -435,17 +437,20 @@
             "code-point-at": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "concat-map": {
               "version": "0.0.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "console-control-strings": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -562,7 +567,8 @@
             "inherits": {
               "version": "2.0.3",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "ini": {
               "version": "1.3.5",
@@ -574,6 +580,7 @@
               "version": "1.0.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -588,6 +595,7 @@
               "version": "3.0.4",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }
@@ -601,6 +609,7 @@
               "version": "2.3.5",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -699,7 +708,8 @@
             "number-is-nan": {
               "version": "1.0.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "object-assign": {
               "version": "4.1.1",
@@ -711,6 +721,7 @@
               "version": "1.4.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -832,6 +843,7 @@
               "version": "1.0.2",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",

src/app/home/home.module.ts

@@ -13,6 +13,7 @@ import { BsDatepickerModule } from 'ngx-bootstrap';
 import { MalihuScrollbarModule } from 'ngx-malihu-scrollbar';
 import { ForgotComponent } from './forgot/forgot.component';
 
+
 @NgModule({
   declarations: [
     IndexComponent,

src/app/home/index/index.component.html

@@ -636,7 +636,9 @@
                                     <h3>SUMMARY</h3>
                                     <div class="row">
                                         <div class="col-md-12">
-                                            <h6 class="pt10 textLeft">Issues</h6>
+                                            <div class="wizard_subhead">
+                                                Issues Spoted
+                                            </div>
                                         </div>
                                     </div>
                                     <div class="row">
@@ -644,17 +646,24 @@
                                             <div class="selected_services">
                                                 <ul>
                                                     <li *ngFor="let selIssue of selectedIssues">{{selIssue.issue_category}}<a (click)="removeSelectedItem(selIssue.issue_id,selIssue.sub_issue_id)">&times;</a></li>
+
+                                                    <a goToStep="1"><li class="add_more_services">Add more Services</li></a>
                                                 </ul>
                                             </div>
                                         </div>
                                     </div>
                                     <div class="row">
-                                        <div class="col-md-12">
-                                            <h6 class="pt10 textLeft"><a goToStep="1">Add more services</a></h6>
+                                            <div class="col-md-12">
+                                                <div class="wizard_subhead">
+                                                    Location
+                                                </div>
+                                            </div>
                                         </div>
-                                    </div>
+
                                     <div class="row">
-                                        <input #addressLocSearch placeholder="Enter Location" autocorrect="off" autocapitalize="off" spellcheck="off" type="text" [ngModel]="(wizardData && wizardData.pickup_data && wizardData.pickup_data.pickup_loc)?wizardData.pickup_data.pickup_loc:''" (keyup)="addresssearchLocError = false;" (ngModelChange)="get_newlocaion(addressLocSearch.value)" [attr.value]="(wizardData && wizardData.pickup_data && wizardData.pickup_data.pickup_loc)?wizardData.pickup_data.pickup_loc:''">
+                                        <div class="col-md-12">
+                                            <input #addressLocSearch placeholder="Enter Location" autocorrect="off" autocapitalize="off" spellcheck="off" type="text" [ngModel]="(wizardData && wizardData.pickup_data && wizardData.pickup_data.pickup_loc)?wizardData.pickup_data.pickup_loc:''" (keyup)="addresssearchLocError = false;" (ngModelChange)="get_newlocaion(addressLocSearch.value)" [attr.value]="(wizardData && wizardData.pickup_data && wizardData.pickup_data.pickup_loc)?wizardData.pickup_data.pickup_loc:''">
+                                        </div>
                                     </div>
                                     <div class="row">
                                         <div class="col-md-6">
@@ -666,8 +675,8 @@
                                     </div>
                                     <div class="row">
                                         <div class="col-md-12 textCenter">
-                                            <button *ngIf="!loginDetails" (click)="resetForm()" class="wizard_signin" type="button" data-toggle="modal" data-target="#login">SIGN IN</button>
-                                            <button (click)="getQuote()" class="wizard_quotes" type="button" data-toggle="modal" data-target="#quotes">VIEW SERVICE QUOTE</button>
+                                            <button *ngIf="!loginDetails" (click)="resetForm()" class="wizard_signin floatLeft" type="button" data-toggle="modal" data-target="#login">SIGN IN</button>
+                                            <button (click)="getQuote()" class="wizard_quotes floatRight" type="button" data-toggle="modal" data-target="#quotes">VIEW SERVICE QUOTE</button>
                                             <input type="hidden" #indexLoginModal data-toggle="modal" data-target="#login">
                                         </div>
                                     </div>
@@ -733,6 +742,10 @@
                                                             <div class="mechanic_photo">
                                                                 <img src="{{imageServer + mechanic.profile_image}}" onerror="this.src='assets/images/user_avatar.jpg'">
                                                             </div>
+                                                            <div class="mechanic_ratting">
+                                                                <p>4 Ratings</p>
+                                                                <h6>6 Reviews</h6>
+                                                            </div>
                                                         </div>
                                                         <div class="mechanic_detail">
                                                             <h4>{{mechanic.display_name}}</h4>

src/app/home/index/index.component.scss

@@ -654,9 +654,9 @@
             }
             .wizard_signin {
                 height: 40px;
-                width: 48%;
+                width: 49%;
                 display: inline-block;
-                border-radius: 25px;
+                border-radius: 10px;
                 color: #2655bf;
                 border: 2px solid #2655bf;
                 background: transparent;
@@ -664,17 +664,17 @@
                 font-weight: 500;
                 background-repeat: no-repeat;
                 background-size: 20px;
-                margin: 3px;
+                margin: 2px;
                 &:focus {
                     outline: none;
                 }
             }
             .wizard_quotes {
                 height: 40px;
-                width: 48%;
-                margin: 3px;
+                width: 49%;
+                margin: 2px;
                 display: inline-block;
-                border-radius: 25px;
+                border-radius: 10px;
                 color: #fff;
                 border: 2px solid #2655bf;
                 background: #2655bf;
@@ -883,6 +883,18 @@
     }
 }
 
+.wizard_subhead{
+    font-size: 20px;
+    font-weight: 600;
+}
+
+.add_more_services{
+    background: #2655bf;
+    color: #fff !important;
+    border:1px solid #2655bf !important;
+    
+}
+
 .quote_service_wrapper {
     width: 90%;
     background: #f5f5f5;
@@ -1005,11 +1017,23 @@
                                     object-position: center;
                                 }
                             }
-                            .rating {
-                                .star-container {
-                                    .star {
-                                        font-size: 16px;
-                                    }
+                            .mechanic_ratting{
+                                padding: 5px;
+                                p{
+                                    margin:0px;
+                                    padding:0px;
+                                    color: #a8a8a8;
+                                    font-size: 14px;
+                                    text-align: center;
+
+                                }
+                                h6{
+                                    margin: 0px;
+                                    padding:0px;
+                                    color: #a8a8a8;
+                                    font-size: 14px;
+                                    text-align: center;
+
                                 }
                             }
                         }