Merge branch 'amal' into 'master'

angular.json

@@ -23,7 +23,7 @@
                         "polyfills": "src/polyfills.ts",
                         "tsConfig": "src/tsconfig.app.json",
                         "assets": [
-                            "src/favicon.ico",
+                            "src/favicon.png",
                             "src/assets"
                         ],
                         "styles": [
@@ -91,7 +91,7 @@
                         ],
                         "scripts": [],
                         "assets": [
-                            "src/favicon.ico",
+                            "src/favicon.png",
                             "src/assets"
                         ]
                     }

src/app/app.module.ts

@@ -9,12 +9,14 @@ import { FooterComponent } from './footer/footer.component';
 import { ReactiveFormsModule } from '@angular/forms';
 import { HashLocationStrategy, LocationStrategy } from '@angular/common';
 import { MalihuScrollbarModule } from 'ngx-malihu-scrollbar';
+import { ForgotComponent } from './forgot/forgot.component';
 
 @NgModule({
   declarations: [
     AppComponent,
     NavbarComponent,
-    FooterComponent
+    FooterComponent,
+    ForgotComponent
   ],
   imports: [
     BrowserModule,

src/app/forgot/forgot.component.html

+<p>
+  forgot works!
+</p>

src/app/forgot/forgot.component.spec.ts

+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ForgotComponent } from './forgot.component';
+
+describe('ForgotComponent', () => {
+  let component: ForgotComponent;
+  let fixture: ComponentFixture<ForgotComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ForgotComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ForgotComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/forgot/forgot.component.ts

+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-forgot',
+  templateUrl: './forgot.component.html',
+  styleUrls: ['./forgot.component.scss']
+})
+export class ForgotComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

src/app/home/forgot/forgot.component.html

+<p>
+  forgot works!
+</p>

src/app/home/forgot/forgot.component.spec.ts

+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ForgotComponent } from './forgot.component';
+
+describe('ForgotComponent', () => {
+  let component: ForgotComponent;
+  let fixture: ComponentFixture<ForgotComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ForgotComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ForgotComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/home/forgot/forgot.component.ts

+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-forgot',
+  templateUrl: './forgot.component.html',
+  styleUrls: ['./forgot.component.scss']
+})
+export class ForgotComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

src/app/home/home.module.ts

@@ -11,11 +11,13 @@ import { DashboardComponent } from './dashboard/dashboard.component';
 import { ReactiveFormsModule, FormsModule } from '@angular/forms';
 import { BsDatepickerModule } from 'ngx-bootstrap';
 import { MalihuScrollbarModule } from 'ngx-malihu-scrollbar';
+import { ForgotComponent } from './forgot/forgot.component';
 
 @NgModule({
   declarations: [
     IndexComponent,
-     DashboardComponent
+     DashboardComponent,
+     ForgotComponent
     ],
   imports: [
     FormsModule,

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

@@ -317,7 +317,7 @@
                                     </div>
                                     <div class="row">
                                         <div class="col-md-12">
-                                            <div class="service_methods">
+                                            <div class="service_methods" malihu-scrollbar [scrollbarOptions]="scrollbarOptions">
                                                 <p *ngIf="!issuesData; else listIssues">No Record Found</p>
                                                 <ng-template #listIssues>
                                                     <ul>
@@ -445,7 +445,7 @@
 
 <div class="modal" id="quotes">
     <div class="modal-dialog modal-full">
-        <div class="modal-content login_modal_wrapper">
+        <div class="modal-content login_modal_wrapper" malihu-scrollbar [scrollbarOptions]="scrollbarOptions">
             <div #closeQuoteWizard class="modal_close" data-dismiss="modal" (click)="scheduleDateInit = false; scheduleMechanic = false">
                 &times;
             </div>
@@ -461,7 +461,7 @@
                             </div>
                             <div class="quote_schedule_header">
                                 <div class="row">
-                                    <div class="col-md-6">
+                                    <div class="col-md-6 pr0">
                                         <h4>Select your day and date</h4>
                                     </div>
                                     <div class="col-md-6">

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

@@ -35,9 +35,13 @@
                 input {
                     height: 40px;
                     width: calc(100% - 120px);
+                    padding-right: 10px;
                     background: transparent;
                     border: none !important;
                     padding-left: 15px;
+                    white-space: nowrap;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
                     &:focus {
                         border: none;
                         box-shadow: none;
@@ -395,7 +399,7 @@
                 text-transform: uppercase;
                 color: #1e1e1e;
                 font-weight: 600;
-                padding-bottom: 10px;
+                padding-bottom: 30px;
             }
             .facebook_btn {
                 background-color: #3b5998;
@@ -767,11 +771,14 @@
         }
     }
     .quote_schedule_header {
-        background: #f9f7f7;
-        border: 1px solid #e8e8e8;
+        
+        border: 2px solid #2655bf;
+        
+
         h4 {
             margin: 0px;
-            color: #1e1e1e;
+            background: #2655bf;
+            color: #fff;
             font-size: 18px;
             padding: 10px;
         }
@@ -795,7 +802,7 @@
             background-image: url("/assets/images/asset_quote_right.png");
         }
         .schedule_dates {
-            width: calc(100% - 45px);
+            width: calc(100% - 80px);
             height: 35px;
             ul {
                 padding: 0px;
@@ -819,7 +826,7 @@
         }
     }
     .quote_schedule_list {
-        border: 1px solid #e8e8e8;
+        border: 2px solid #2655bf;
         background: #ffffff;
         ul {
             margin: 0px;
@@ -984,7 +991,7 @@
                 }
                 .scheduletiming_listing {
                     
-                    width: calc(100% - 45px);
+                    width: calc(100% - 80px);
                     margin: 0 auto;
                     height: 200px;
                     position: relative;
@@ -1052,7 +1059,7 @@
                     }
                 }
                 .scheduletiming_btm_btns {
-                    width: calc(100% - 45px);
+                    width: calc(100% - 80px);
                     position: relative;
                     left: 5px;
                     margin: 0 auto;

src/index.html

@@ -7,7 +7,7 @@
   <base href="/">
 
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="icon" type="image/x-icon" href="favicon.ico">
+  <link rel="icon" type="image/x-icon" href="favicon.png">
 </head>
 <body>
   <app-root></app-root>

src/styles.scss

@@ -542,4 +542,40 @@ section.module.parallax {
 bs-datepicker-container{
     z-index: 9999 !important; 
     background: #fff !important;
-}
\ No newline at end of file
+    .bs-datepicker-container{
+        padding:0px;
+        .bs-datepicker-head{
+            background: #2655bf;
+        }
+        .bs-datepicker-body{
+            table{
+                thead{
+                    tr{
+                        th{
+                        padding:5px;
+                        }
+                    }
+                }
+                tbody{
+                    tr{
+                        td{
+                            padding:5px;
+                            span{
+                                border-radius: 0px;
+                                font-size: 16px;
+                            }
+                            .selected{
+                                background: #2655bf;
+                            }
+                        }
+                        td.week span{
+                            color: #2655bf;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+