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
openforge · Jul 15, 2018 · cd33ee0 · cd33ee0
1 parent d955d4a
commit cd33ee0
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 37 deletions.
diff --git a/src/index.html b/src/index.html
@@ -17,13 +17,15 @@
   <meta property="og:site_name" content="OpenForge" />
   <meta http-equiv="x-ua-compatible" content="IE=Edge"/>
 
-  <script src="/build/app.js"></script>
+
 
   <link rel="apple-touch-icon" href="/assets/icon/icon.png">
   <link rel="icon" type="image/x-icon" href="/assets/icon/favicon.ico">
   <link rel="manifest" href="/manifest.json">
+  <script src="/build/app.js"></script>
   <link href='https://fonts.googleapis.com/css?family=Muli:300,400,600,700' rel='stylesheet'>
   <link href='https://fonts.googleapis.com/css?family=Roboto:700' rel='stylesheet'>
+  <link rel='stylesheet' href="/build/app.css">
 
   <!-- In case JavaScript is not available -->
   <noscript>Your browser does not support JavaScript!</noscript>
@@ -40,7 +42,8 @@
   </script> -->
 
 </head>
-
+<body>
+  <app-nav-header />
   <open-forge-app></open-forge-app>
 
   <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>

diff --git a/src/pages/app-about/app-about.tsx b/src/pages/app-about/app-about.tsx
@@ -200,6 +200,7 @@ export class AppAbout {
           <span slot="header">Want to work with us?</span>
           <span slot="link">Get in touch</span>
         </app-cta>
+        <app-footer />
       </div>
     );
   }

diff --git 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}
           </div>
         </section>
+        <app-footer />
       </div>
     );
   }

diff --git a/src/pages/app-home/app-home.tsx b/src/pages/app-home/app-home.tsx
@@ -346,6 +346,7 @@ export class AppHome {
           <span slot="header">Ready to work with us?</span>
           <span slot="link">Get in touch</span>
         </app-cta>
+        <app-footer />
       </div>
     );
   }

diff --git a/src/pages/app-opportunities/app-opportunities.tsx b/src/pages/app-opportunities/app-opportunities.tsx
@@ -520,6 +520,7 @@ export class AppOpportunities {
             </div>
           )}
         </section>
+        <app-footer />
       </div>
     );
   }

diff --git 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 (
-      <section id="services" class="services">
+      <section class="services">
         <div class="">
           <div class="services--header">
             <h2>What do we provide?</h2>
@@ -242,6 +242,7 @@ export class AppServices {
             </div>
           </div>
         </div>
+        <app-footer />
       </section>
     );
   }

diff --git 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 (
-      <div>
-        <app-nav-header />
-        <stencil-router scrollTopOffset={0}>
-          <stencil-route-switch>
-            <stencil-route url="/" component="app-home" exact={true} />
-            <stencil-route
-              url="/contact"
-              component="app-contact"
-              exact={true}
-            />
-            <stencil-route
-              url="/opportunities"
-              component="app-opportunities"
-              exact={true}
-            />
-            <stencil-route url="/about" component="app-about" exact={true} />
-          </stencil-route-switch>
-        </stencil-router>
-        <app-footer />
-      </div>
+      <stencil-router scrollTopOffset={0}>
+        <stencil-route-switch>
+          <stencil-route url="/" component="app-home" exact={true} />
+          <stencil-route url="/contact" component="app-contact" exact={true} />
+          <stencil-route
+            url="/opportunities"
+            component="app-opportunities"
+            exact={true}
+          />
+          <stencil-route url="/about" component="app-about" exact={true} />
+        </stencil-route-switch>
+      </stencil-router>
     );
   }
 }
diff --git 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
@@ -20,6 +20,7 @@ exports.config = {
       }
     }
   ],
+  globalStyle: 'src/styles/main.scss',
   copy: [
     { src: 'robots.txt' }
   ]
-Original file line number
+Diff line change
@@ Expand Up / @@ -520,6 +520,7 @@ export class AppOpportunities { @@
                 </div>
               )}
             </section>
+            <app-footer />
           </div>
         );
       }
@@ Expand Down @@