From cabb4eb2f3894fa1aac0dafb15f3eb5b77fc9379 Mon Sep 17 00:00:00 2001 From: Zak Timson Date: Wed, 11 Jul 2018 22:41:41 -0400 Subject: [PATCH 1/2] Made footer slightly better --- src/app/app.component.html | 20 +++++++++++++++----- src/app/app.component.ts | 9 +++++++-- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/src/app/app.component.html b/src/app/app.component.html index 0677c36..fd0c896 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -38,9 +38,9 @@
-
+
MAIN MENU
-
    +
    • About
    • @@ -52,11 +52,21 @@
-
+
PRODUCTS
+
-
-
REVIEWS
+
+
CONTACT
+

+ Toll Free:1-888-422-7737 +
Local: 416-744-2723 +
Fax: 416-744-4078 +

diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 8658d03..9bb67c2 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -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']); } } From 1538458e8a5782612d98bfbb23814bf6ef58ec31 Mon Sep 17 00:00:00 2001 From: Zak Timson Date: Wed, 11 Jul 2018 22:45:33 -0400 Subject: [PATCH 2/2] Make card lines match --- src/app/home/home.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index 110ec0b..7f0f972 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -8,7 +8,7 @@ help_outline

About Us

- +

Learn more about us and our 30+ years experience!

@@ -18,7 +18,7 @@ local_grocery_store

Store

- +

Buy equipment, ink and anything else you might need!

@@ -28,7 +28,7 @@ opacity

Formula Manager

- +

Check out our browser formula manager!