Merge pull request #259 from ember-learn/fix-nav-links

Fix navbar and footer link overrides

Author: MelSumner

addon/components/es-footer.js

@@ -8,16 +8,20 @@ import {
 } from '../constants/es-footer';
 
 export default class EsPageHeader extends Component {
-  currentYear = null
-
-  constructor() {
-    super();
-    this.currentYear = new Date().getUTCFullYear();
-  }
-
   socialLinks = socialLinks
 
   tagline = tagline
   contributorLinks = contributorLinks
-  infoLinks = infoLinks
+
+  get currentYear() {
+    return new Date().getUTCFullYear()
+  }
+
+  get infoLinks() {
+    if (this.args && this.args.infoLinks) {
+      return this.args.infoLinks;
+    }
+
+    return infoLinks;
+  }
 }

addon/components/es-header.js

@@ -15,8 +15,8 @@ export default class EsHeader extends Component {
   }
 
   get navLinks() {
-    if (this.links) {
-      return this.links;
+    if (this.args.links) {
+      return this.args.links;
     }
 
     return defaultLinks;

addon/constants/es-footer.js

@@ -51,10 +51,10 @@ const infoLinks = [{
   href: 'https://emberjs.com/security'
 }, {
   name: 'Legal',
-  href: 'https://emberjs.com/legal'
+  href: 'https://emberjs.com/about/legal'
 }, {
   name: 'Branding',
-  href: 'https://emberjs.com/brand',
+  href: 'https://emberjs.com/logos',
   lineBreak: true
 }, {
   name: 'Community Guidelines',

addon/templates/components/es-footer.hbs

@@ -1,15 +1,15 @@
 <footer class="es-footer" ...attributes>
   {{!--
     Pass footer properties to support
-    {{es-footer tagline="My custom tagline" contributorLinks=myLinks}}
+    <EsFooter @infoLinks={{someOtherLinks}} />
   --}}
-  {{es-footer/es-info infoLinks=infoLinks}}
+  <EsFooter::EsInfo @infoLinks={{this.infoLinks}} />
 
   <hr class="footer-hr">
 
-  {{es-footer/es-statement tagline=tagline socialLinks=socialLinks}}
+  <EsFooter::EsStatement @tagline={{tagline}} @socialLinks={{socialLinks}} />
 
   <hr class="footer-hr">
 
-  {{es-footer/es-contributions contributorLinks=contributorLinks}}
-</footer>
+  <EsFooter::EsContributions @contributorLinks={{contributorLinks}} />
+</footer>

addon/templates/components/es-header.hbs

@@ -15,7 +15,7 @@
     </button>
 
     <ul class="navbar-list">
-      {{#each navLinks as |link index|}}
+      {{#each this.navLinks as |link index|}}
         {{es-header/navbar-link link=link index=index}}
       {{/each}}
     </ul>

package-lock.json

@@ -29,6 +29,7 @@
     "@ember/render-modifiers": "^1.0.0",
     "broccoli-funnel": "^2.0.1",
     "broccoli-merge-trees": "^3.0.1",
+    "ember-angle-bracket-invocation-polyfill": "^2.0.2",
     "ember-cli-babel": "^7.7.3",
     "ember-cli-htmlbars": "^3.0.1",
     "ember-cli-postcss": "^4.2.0",