From cd33ee06e8ecf6a633bdda2fa93fe98aecf5f908 Mon Sep 17 00:00:00 2001 From: Jedidiah Weller Date: Sun, 15 Jul 2018 16:55:10 -0400 Subject: [PATCH] fix(footer-flash): remove footer from flash issue Not a permanent fix, but removes footer from flash and keeps header involved. Also, clean up and refactor re #16 --- src/index.html | 7 ++- src/pages/app-about/app-about.tsx | 1 + src/pages/app-contact/app-contact.tsx | 3 +- src/pages/app-home/app-home.tsx | 1 + .../app-opportunities/app-opportunities.tsx | 1 + src/pages/app-services/app-services.tsx | 3 +- src/pages/open-forge-app/open-forge-app.tsx | 46 ++++++------------- src/styles/main.scss | 3 ++ stencil.config.js | 1 + 9 files changed, 29 insertions(+), 37 deletions(-) diff --git a/src/index.html b/src/index.html index ce26cf04..3ba03a16 100644 --- a/src/index.html +++ b/src/index.html @@ -17,13 +17,15 @@ - + + + @@ -40,7 +42,8 @@ --> - + + diff --git a/src/pages/app-about/app-about.tsx b/src/pages/app-about/app-about.tsx index f732af0b..c2a17a05 100644 --- a/src/pages/app-about/app-about.tsx +++ b/src/pages/app-about/app-about.tsx @@ -200,6 +200,7 @@ export class AppAbout { Want to work with us? Get in touch + ); } diff --git a/src/pages/app-contact/app-contact.tsx b/src/pages/app-contact/app-contact.tsx index 4e3e6e3e..8bfa3677 100644 --- a/src/pages/app-contact/app-contact.tsx +++ b/src/pages/app-contact/app-contact.tsx @@ -55,7 +55,7 @@ export class AppContact { @Listen('valueChange') valueChangeHandler(event) { const { field, value, target } = event.detail; - + this.formValues[field] = value; this.validateField(target); @@ -362,6 +362,7 @@ export class AppContact { ) : null} + ); } diff --git a/src/pages/app-home/app-home.tsx b/src/pages/app-home/app-home.tsx index d92c068e..96588706 100644 --- a/src/pages/app-home/app-home.tsx +++ b/src/pages/app-home/app-home.tsx @@ -346,6 +346,7 @@ export class AppHome { Ready to work with us? Get in touch + ); } diff --git a/src/pages/app-opportunities/app-opportunities.tsx b/src/pages/app-opportunities/app-opportunities.tsx index 1f646ed5..a7e49243 100644 --- a/src/pages/app-opportunities/app-opportunities.tsx +++ b/src/pages/app-opportunities/app-opportunities.tsx @@ -520,6 +520,7 @@ export class AppOpportunities { )} + ); } diff --git a/src/pages/app-services/app-services.tsx b/src/pages/app-services/app-services.tsx index 20d03e38..11940bec 100644 --- a/src/pages/app-services/app-services.tsx +++ b/src/pages/app-services/app-services.tsx @@ -7,7 +7,7 @@ import { Component } from '@stencil/core'; export class AppServices { render() { return ( -
+

What do we provide?

@@ -242,6 +242,7 @@ export class AppServices {
+
); } diff --git a/src/pages/open-forge-app/open-forge-app.tsx b/src/pages/open-forge-app/open-forge-app.tsx index 033b39b4..e788667a 100644 --- a/src/pages/open-forge-app/open-forge-app.tsx +++ b/src/pages/open-forge-app/open-forge-app.tsx @@ -1,46 +1,26 @@ import '@stencil/router'; import { Component } from '@stencil/core'; -import { polyfill } from 'smoothscroll-polyfill'; - -polyfill(); @Component({ tag: 'open-forge-app', styleUrl: 'open-forge-app.scss', }) export class OpenForgeApp { - /** - * Handle service worker updates correctly. - * This code will show a toast letting the - * user of the PWA know that there is a - * new version available. When they click the - * reload button it then reloads the page - * so that the new service worker can take over - * and serve the fresh content - */ - render() { + console.log('rendering open-forge-app'); return ( -
- - - - - - - - - - -
+ + + + + + + + ); } } diff --git a/src/styles/main.scss b/src/styles/main.scss index 79cca002..3c8ee64e 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -1,4 +1,7 @@ @import 'node_modules/bootstrap/scss/bootstrap'; +@import 'variables'; +@import 'mixins'; + // General h2 { diff --git a/stencil.config.js b/stencil.config.js index c270b696..016267e1 100644 --- a/stencil.config.js +++ b/stencil.config.js @@ -20,6 +20,7 @@ exports.config = { } } ], + globalStyle: 'src/styles/main.scss', copy: [ { src: 'robots.txt' } ]