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

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/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

src/styles.scss

@@ -531,4 +531,4 @@ section.module.parallax {
         padding-bottom: 30px !important;
         font-weight: 400 !important;
     }
-}
+}
\ No newline at end of file