Merge branch 'master' of github.com:ztimson/fhsons

src/app/about/about.component.html

@@ -0,0 +1,46 @@
+<div class="container">
+  <div class="row">
+    <div class="col-12 py-4">
+        <img src="http://via.placeholder.com/350x250" class="float-left mr-4">
+        <h2 class="mb-4">40 Years of Excellence</h2>
+        <strong>FH &amp; Sons</strong> has been in business for 40 years. We have been ISO 9001:2000 certified since May 2000.
+        Our company manufactures plastisol silk screen inks, plastisols for moulding and dipping applications,
+        as well as bulk pigment dispersions. We also distribute for several top end equipment and chemical
+        manufacturers. We strive to provide value in everything we sell, coupled with unmatched
+        customer service and guidance.
+    </div>
+  </div>
+</div>
+<div class="bg-light">
+  <div class="container">
+    <div class="row pt-4">
+      <div class="col-12">
+        <h2 class="mt-5 mb-4">Client Reviews</h2>
+      </div>
+      <div class="col-sm-6 col-md-4 mb-4">
+        <mat-card>
+          <a target="_blank" href="https://www.google.com/maps/contrib/107718425840210234234/reviews?hl=en-CA&sa=X&ved=2ahUKEwiklPiAwJjcAhVrxoMKHU8lAtgQvvQBegQIARAN">Sukhvinder Garcha</a><br />
+          Very good service and good price
+        </mat-card>
+      </div>
+      <div class="col-sm-6 col-md-4 mb-4">
+        <mat-card>
+          <a target="_blank" href="https://www.google.com/maps/contrib/106243032549545671075/reviews?hl=en-CA&sa=X&ved=2ahUKEwiklPiAwJjcAhVrxoMKHU8lAtgQvvQBegQIARAU">Cheyenne Gauthier</a><br />
+          Package received within 2 days of ordering. Super happy with the quality and service, will be ordering again. Thanks!
+        </mat-card>
+      </div>
+      <div class="col-sm-6 col-md-4 mb-4">
+        <mat-card>
+            <a target="_blank" href="https://www.google.com/maps/contrib/109255223742158550985/reviews?hl=en-CA&sa=X&ved=2ahUKEwiklPiAwJjcAhVrxoMKHU8lAtgQvvQBegQIARAb">Julia Henriques</a><br />
+            Great staff, very friendly, great service
+        </mat-card>
+      </div>
+      <div class="col-sm-6 col-md-4 mb-4 mx-auto">
+        <mat-card>
+          <a target="_blank" href="https://www.google.com/maps/contrib/111462598285081078982/reviews?hl=en-CA&sa=X&ved=2ahUKEwiklPiAwJjcAhVrxoMKHU8lAtgQvvQBegQIARAi">Jon Weizman</a><br />
+            Great ink, great service.
+        </mat-card>
+      </div>
+    </div>
+  </div>
+</div>

src/app/about/about.component.spec.ts

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

src/app/about/about.component.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-about',
+  templateUrl: './about.component.html',
+  styleUrls: ['./about.component.css']
+})
+export class AboutComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

src/app/app.module.ts

@@ -14,9 +14,10 @@ import {HomeComponent} from './home/home.component';
 import {ServiceWorkerModule} from '@angular/service-worker';
 import {FormulaManagerComponent} from './formulaManager/formulaManager.component';
 import {NgxElectronModule} from 'ngx-electron';
+import { AboutComponent } from './about/about.component';
 
 @NgModule({
-  declarations: [AppComponent, ConvertFromGPipe, ConvertToGPipe, FormulaManagerComponent, HomeComponent, ScalePipe],
+  declarations: [AppComponent, ConvertFromGPipe, ConvertToGPipe, FormulaManagerComponent, HomeComponent, ScalePipe, AboutComponent],
   imports: [
     AngularMaterialModule,
     AngularFireModule.initializeApp(environment.firebase),
@@ -28,6 +29,7 @@ import {NgxElectronModule} from 'ngx-electron';
     ReactiveFormsModule,
     RouterModule.forRoot([
       {path: 'formulaManager', component: FormulaManagerComponent},
+      {path: 'about', component: AboutComponent},
       {path: '**', component: HomeComponent}
     ]),
     ServiceWorkerModule.register('/ngsw-worker.js', {enabled: environment.production})