Merge branch 'master' of https://github.com/ztimson/fhsons
This commit is contained in:
		@@ -38,9 +38,9 @@
 | 
			
		||||
    <div class="container-fluid bg-light">
 | 
			
		||||
        <div class="container">
 | 
			
		||||
            <div class="d-inline-block py-3">
 | 
			
		||||
                <div class="d-inline-block mr-5">
 | 
			
		||||
                <div class="align-top d-inline-block mr-5">
 | 
			
		||||
                    <h5>MAIN MENU</h5>
 | 
			
		||||
                    <ul style="padding-left: 20px;">
 | 
			
		||||
                    <ul style="list-style-type: none; padding-left: 0;">
 | 
			
		||||
                        <li>
 | 
			
		||||
                            <a [routerLink]="['/about']">About</a>
 | 
			
		||||
                        </li>
 | 
			
		||||
@@ -52,11 +52,21 @@
 | 
			
		||||
                        </li>
 | 
			
		||||
                    </ul>
 | 
			
		||||
                </div>
 | 
			
		||||
                <div class="d-inline-block mx-5">
 | 
			
		||||
                <div class="align-top d-inline-block mr-5">
 | 
			
		||||
                    <h5>PRODUCTS</h5>
 | 
			
		||||
                    <ul style="list-style-type: none; padding-left: 0; columns: 3;">
 | 
			
		||||
                        <li *ngFor="let c of categories | async">
 | 
			
		||||
                            <a [routerLink]="['/store', c.name]">{{c.name}}</a>
 | 
			
		||||
                        </li>
 | 
			
		||||
                    </ul>
 | 
			
		||||
                </div>
 | 
			
		||||
                <div class="d-inline-block ml-5">
 | 
			
		||||
                    <h5>REVIEWS</h5>
 | 
			
		||||
                <div class="align-top d-inline-block">
 | 
			
		||||
                    <h5>CONTACT</h5>
 | 
			
		||||
                    <p>
 | 
			
		||||
                        Toll Free:1-888-422-7737
 | 
			
		||||
                        <br> Local: 416-744-2723
 | 
			
		||||
                        <br> Fax: 416-744-4078
 | 
			
		||||
                    </p>
 | 
			
		||||
                </div>
 | 
			
		||||
            </div>
 | 
			
		||||
        </div>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,16 +1,21 @@
 | 
			
		||||
import {Component, OnInit} from '@angular/core';
 | 
			
		||||
import {Router} from '@angular/router';
 | 
			
		||||
import {ElectronService} from 'ngx-electron';
 | 
			
		||||
import {AngularFirestore} from 'angularfire2/firestore';
 | 
			
		||||
 | 
			
		||||
@Component({
 | 
			
		||||
  selector: 'app-root',
 | 
			
		||||
  templateUrl: 'app.component.html'
 | 
			
		||||
})
 | 
			
		||||
export class AppComponent implements OnInit {
 | 
			
		||||
  constructor(private router: Router, public electron: ElectronService) {}
 | 
			
		||||
  categories;
 | 
			
		||||
 | 
			
		||||
  constructor(private router: Router, private db: AngularFirestore, public electron: ElectronService) {
 | 
			
		||||
    this.categories = this.db.collection('categories').valueChanges();
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  ngOnInit() {
 | 
			
		||||
    if(this.electron.isElectronApp) {
 | 
			
		||||
    if (this.electron.isElectronApp) {
 | 
			
		||||
      this.router.navigate(['/formulaManager']);
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 
 | 
			
		||||
@@ -8,7 +8,7 @@
 | 
			
		||||
                    <mat-card class="dark-hover" style="min-height: 320px;">
 | 
			
		||||
                        <mat-icon class="my-5" style="transform: scale(4); color: #87a9cd;">help_outline</mat-icon>
 | 
			
		||||
                        <h3 class="text-dark mb-4">About Us</h3>
 | 
			
		||||
                        <mat-divider></mat-divider>
 | 
			
		||||
                        <mat-divider class="custom-line"></mat-divider>
 | 
			
		||||
                        <p class="text-black-50 mt-5">Learn more about us and our 30+ years experience!</p>
 | 
			
		||||
                    </mat-card>
 | 
			
		||||
                </a>
 | 
			
		||||
@@ -18,7 +18,7 @@
 | 
			
		||||
                    <mat-card class="dark-hover" style="min-height: 320px;">
 | 
			
		||||
                        <mat-icon class="my-5" style="transform: scale(4); color: #87a9cd;">local_grocery_store</mat-icon>
 | 
			
		||||
                        <h3 class="text-dark mb-4">Store</h3>
 | 
			
		||||
                        <mat-divider></mat-divider>
 | 
			
		||||
                        <mat-divider class="custom-line"></mat-divider>
 | 
			
		||||
                        <p class="text-black-50 mt-5">Buy equipment, ink and anything else you might need!</p>
 | 
			
		||||
                    </mat-card>
 | 
			
		||||
                </a>
 | 
			
		||||
@@ -28,7 +28,7 @@
 | 
			
		||||
                    <mat-card class="dark-hover" style="min-height: 320px;">
 | 
			
		||||
                        <mat-icon class="my-5" style="transform: scale(4); color: #87a9cd;">opacity</mat-icon>
 | 
			
		||||
                        <h3 class="text-dark mb-4">Formula Manager</h3>
 | 
			
		||||
                        <mat-divider></mat-divider>
 | 
			
		||||
                        <mat-divider class="custom-line"></mat-divider>
 | 
			
		||||
                        <p class="text-black-50 mt-5">Check out our browser formula manager!</p>
 | 
			
		||||
                    </mat-card>
 | 
			
		||||
                </a>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user