From 0588a002b6ee4fcb1b28b59f7513d1acb051f334 Mon Sep 17 00:00:00 2001
From: Felix Zapata <fzberlinches@gmail.com>
Date: Thu, 16 Feb 2017 09:04:27 +0100
Subject: [PATCH 1/9] fix(news-imag.html): add default value to the alt
 property

---
 src/news-img.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/news-img.html b/src/news-img.html
index d26b3daa..fc7468e0 100644
--- a/src/news-img.html
+++ b/src/news-img.html
@@ -58,6 +58,7 @@
     </style>
 
     <img id="img" alt$="[[alt]]" on-load="_onImgLoad" on-error="_onImgError">
+    
 
   </template>
 
@@ -69,7 +70,10 @@
 
       properties: {
 
-        alt: String,
+        alt: {
+          type: String,
+          value: ''
+        },
 
         src: {
           type: String,

From 5b3f59588611c0b8618d71e598387dacf69042d7 Mon Sep 17 00:00:00 2001
From: Felix Zapata <fzberlinches@gmail.com>
Date: Sun, 19 Feb 2017 18:10:34 +0100
Subject: [PATCH 2/9] fix(news-drawer.html): add aria-label attribute

---
 src/news-drawer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/news-drawer.html b/src/news-drawer.html
index 5a5e212c..4750b364 100644
--- a/src/news-drawer.html
+++ b/src/news-drawer.html
@@ -51,7 +51,7 @@
     </style>
 
     <app-drawer opened="{{drawerOpened}}" swipe-open tabindex="0">
-      <paper-icon-button icon="close" on-click="_closeDrawer"></paper-icon-button>
+      <paper-icon-button icon="close" on-click="_closeDrawer" aria-label="Close main navigation"></paper-icon-button>
       <iron-selector role="navigation" class="drawer-list" selected="[[category.name]]" attr-for-selected="name">
         <template is="dom-repeat" items="[[categories]]" as="category" initial-count="9">
           <a name="[[category.name]]" href="/list/[[category.name]]">[[category.title]]</a>

From 7ff9eb45417a7f028ac87e058a856934d5c59172 Mon Sep 17 00:00:00 2001
From: Monica Dinculescu <noms@google.com>
Date: Mon, 9 Oct 2017 14:18:38 -0700
Subject: [PATCH 3/9] set open graph/twitter card metadata

---
 .gitignore        |  1 +
 src/news-app.html | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/.gitignore b/.gitignore
index 81ed5909..dafb76b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 bower_components/
+node_modules/
 build/
 *.pyc
diff --git a/src/news-app.html b/src/news-app.html
index 56734ee5..07a76c96 100644
--- a/src/news-app.html
+++ b/src/news-app.html
@@ -315,6 +315,32 @@
       // Response by a11y announcing the section and syncronizing the category.
       _updateDocumentTitle(page, categoryTitle, articleHeadline, appTitle) {
         document.title = (page === 'list' ? categoryTitle : articleHeadline) + ' - ' + appTitle;
+        this._setPageMetadata(articleHeadline);
+      }
+
+      _setPageMetadata(description) {
+        let image = this.articleId ? `/images/${this.articleId}.jpg` : 'images/news-icon-128.png';
+        // Set open graph metadata
+        this._setMeta('property', 'og:title', document.title);
+        this._setMeta('property', 'og:description', description || document.title);
+        this._setMeta('property', 'og:url', document.location.href);
+        this._setMeta('property', 'og:image', this.baseURI + image);
+
+        // Set twitter card metadata
+        this._setMeta('property', 'twitter:title', document.title);
+        this._setMeta('property', 'twitter:description', description || document.title);
+        this._setMeta('property', 'twitter:url', document.location.href);
+        this._setMeta('property', 'twitter:image:src', this.baseURI + image);
+      }
+
+      _setMeta(attrName, attrValue, content) {
+        let element = document.head.querySelector(`meta[${attrName}="${attrValue}"]`);
+        if (!element) {
+          element = document.createElement('meta');
+          element.setAttribute(attrName, attrValue);
+          document.head.appendChild(element);
+        }
+        element.setAttribute('content', content || '');
       }
 
       _refreshData() {

From bfee812e0d703035ef20598fe2e8103dbdd53b74 Mon Sep 17 00:00:00 2001
From: Monica Dinculescu <noms@google.com>
Date: Mon, 9 Oct 2017 14:39:18 -0700
Subject: [PATCH 4/9] fix article vs list metadata

---
 src/news-app.html | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/news-app.html b/src/news-app.html
index 07a76c96..a9f39e15 100644
--- a/src/news-app.html
+++ b/src/news-app.html
@@ -315,11 +315,16 @@
       // Response by a11y announcing the section and syncronizing the category.
       _updateDocumentTitle(page, categoryTitle, articleHeadline, appTitle) {
         document.title = (page === 'list' ? categoryTitle : articleHeadline) + ' - ' + appTitle;
-        this._setPageMetadata(articleHeadline);
+        if (page === 'list') {
+          this._setPageMetadata(categoryTitle, null);
+        } else {
+          this._setPageMetadata(articleHeadline, this.articleId);
+        }
       }
 
-      _setPageMetadata(description) {
-        let image = this.articleId ? `/images/${this.articleId}.jpg` : 'images/news-icon-128.png';
+      _setPageMetadata(description, articleId) {
+        let image = articleId ? `/images/${articleId}.jpg` : 'images/news-icon-128.png';
+
         // Set open graph metadata
         this._setMeta('property', 'og:title', document.title);
         this._setMeta('property', 'og:description', description || document.title);

From 4ac838000897234c53504f10d8771bcbfb959395 Mon Sep 17 00:00:00 2001
From: Keanu Lee <keanulee@google.com>
Date: Thu, 19 Oct 2017 11:05:23 -0700
Subject: [PATCH 5/9] Add news-gpt-ad element

---
 src/ads/a9.html         |  26 ----------
 src/ads/demo/index.html |  36 --------------
 src/lazy-resources.html |   1 +
 src/news-article.html   |   8 ++--
 src/news-gpt-ad.html    |  38 +++++++++++++++
 src/news-iframe.html    | 104 ----------------------------------------
 src/news-list.html      |   8 ++--
 7 files changed, 49 insertions(+), 172 deletions(-)
 delete mode 100644 src/ads/a9.html
 delete mode 100644 src/ads/demo/index.html
 create mode 100644 src/news-gpt-ad.html
 delete mode 100644 src/news-iframe.html

diff --git a/src/ads/a9.html b/src/ads/a9.html
deleted file mode 100644
index 65234daf..00000000
--- a/src/ads/a9.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-@license
-Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
--->
-
-<!doctype html>
-<head>
-  <meta charset="utf-8">
-  <meta name="robots" content="noindex">
-</head>
-<body style="margin: 0; overflow: hidden;">
-  <div style="position:absolute; top:0; left:0; bottom:0; right:0;">
-    <script>
-      window['aax_size'] = '300x250';
-      window['aax_pubname'] = 'abc123';
-      window['aax_src'] = '302';
-    </script>
-    <script src="https://c.amazon-adsystem.com/aax2/assoc.js"></script>
-  </div>
-</body>
-</html>
diff --git a/src/ads/demo/index.html b/src/ads/demo/index.html
deleted file mode 100644
index 3086e539..00000000
--- a/src/ads/demo/index.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-@license
-Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
--->
-
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
-  <title></title>
-
-  <link rel="import" href="../../news-iframe.html">
-
-  <style>
-
-    news-iframe {
-      width: 300px;
-      height: 250px;
-    }
-
-  </style>
-
-</head>
-<body>
-
-  <h2>a9</h2>
-  <news-iframe src="/src/ads/a9.html"></news-iframe>
-
-</body>
-</html>
diff --git a/src/lazy-resources.html b/src/lazy-resources.html
index e0b2f6b2..24ff9853 100644
--- a/src/lazy-resources.html
+++ b/src/lazy-resources.html
@@ -11,6 +11,7 @@
 <link rel="import" href="news-icons.html">
 <link rel="import" href="news-analytics.html">
 <link rel="import" href="news-drawer.html">
+<link rel="import" href="news-gpt-ad.html">
 <link rel="import" href="news-network-warning.html">
 <link rel="import" href="news-snackbar.html">
 
diff --git a/src/news-article.html b/src/news-article.html
index 407c8554..a1c02c10 100644
--- a/src/news-article.html
+++ b/src/news-article.html
@@ -13,7 +13,6 @@
 <link rel="import" href="../bower_components/iron-icon/iron-icon.html">
 
 <link rel="import" href="news-article-cover.html">
-<link rel="import" href="news-iframe.html">
 <link rel="import" href="news-side-list.html">
 
 <dom-module id="news-article">
@@ -84,7 +83,8 @@
         margin-bottom: 32px;
       }
 
-      news-iframe {
+      news-gpt-ad {
+        display: block;
         width: 300px;
         height: 250px;
       }
@@ -173,7 +173,9 @@
 
       <aside>
         <div class="ad-container">
-          <news-iframe src="//rcm-na.amazon-adsystem.com/e/cm?o=1&p=12&l=ur1&f=ifr"></news-iframe>
+          <news-gpt-ad id="ad_slot_2"
+              ad-unit-path="/6355419/Travel/Europe/France/Paris"
+              ad-width="300" ad-height="250"></news-gpt-ad>
         </div>
         <a href="#" class="share-link" aria-label="Send by email">
           <iron-icon icon="mail"></iron-icon> Email
diff --git a/src/news-gpt-ad.html b/src/news-gpt-ad.html
new file mode 100644
index 00000000..36506c88
--- /dev/null
+++ b/src/news-gpt-ad.html
@@ -0,0 +1,38 @@
+<!--
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+
+<script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
+<script>
+  window.googletag = window.googletag || {};
+  window.googletag.cmd = window.googletag.cmd || [];
+
+  class NewsGptAd extends HTMLElement {
+    connectedCallback() {
+      var elem = this;
+      var adUnitPath = this.getAttribute('ad-unit-path');
+      var w = parseInt(this.getAttribute('ad-width'), 10);
+      var h = parseInt(this.getAttribute('ad-height'), 10);
+      var id = this.id;
+      
+      if (!adUnitPath || !w || !h || !id) {
+        console.warn('news-gpt-ad missing required attribute', this);
+        return;
+      }
+
+      window.googletag.cmd.push(function() {
+        googletag.defineSlot(adUnitPath, [w, h], id).addService(googletag.pubads());
+        googletag.enableServices();
+        googletag.display(elem);
+      });
+    }
+  }
+
+  customElements.define('news-gpt-ad', NewsGptAd);
+</script>
diff --git a/src/news-iframe.html b/src/news-iframe.html
deleted file mode 100644
index a4200c5a..00000000
--- a/src/news-iframe.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<!--
-@license
-Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
--->
-
-<link rel="import" href="../bower_components/polymer/polymer-element.html">
-
-<dom-module id="news-iframe">
-
-  <template>
-
-    <style>
-
-      :host {
-        display: inline-block;
-        position: relative;
-        overflow: hidden;
-      }
-
-      iframe {
-        position: absolute;
-        top: 0;
-        right: 0;
-        bottom: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-        border: 0;
-      }
-
-    </style>
-
-  </template>
-
-  <script>
-
-    class NewsIframe extends Polymer.Element {
-
-      static get is() { return 'news-iframe'; }
-
-      static get properties() { return {
-
-        src: String,
-
-        _iframeCreated: Boolean
-
-      }}
-
-      static get observers() { return [
-        '_srcChanged(src, _iframeCreated)'
-      ]}
-
-      connectedCallback() {
-        super.connectedCallback();
-        if ('IntersectionObserver' in window) {
-          this._io = new IntersectionObserver(this._createIframe.bind(this));
-          this._io.observe(this);
-        } else {
-          // Intersection Observer is not available, so just create the iframe
-          // after a bit of a delay.
-          window.setTimeout(this._createIframe.bind(this), 100);
-        }
-      }
-
-      disconnectedCallback() {
-        super.disconnectedCallback();
-        this._removeIntersectionObserver();
-      }
-
-      _removeIntersectionObserver() {
-        if (this._io) {
-          this._io.disconnect();
-          this._io = null;
-        }
-      }
-
-      _createIframe() {
-        this._removeIntersectionObserver();
-        if (this._iframe) {
-          return;
-        }
-        this._iframe = document.createElement('iframe');
-        this.root.appendChild(this._iframe);
-        this._iframeCreated = true;
-      }
-
-      _srcChanged(src) {
-        if (this._iframe) {
-          this._iframe.src = src;
-        }
-      }
-
-    }
-
-    customElements.define(NewsIframe.is, NewsIframe);
-
-  </script>
-
-</dom-module>
diff --git a/src/news-list.html b/src/news-list.html
index 98eb1fcf..6f3cb604 100644
--- a/src/news-list.html
+++ b/src/news-list.html
@@ -12,7 +12,6 @@
 <link rel="import" href="../bower_components/app-route/app-route.html">
 <link rel="import" href="../bower_components/app-layout/app-grid/app-grid-style.html">
 
-<link rel="import" href="news-iframe.html">
 <link rel="import" href="news-list-featured-item.html">
 <link rel="import" href="news-list-item.html">
 <link rel="import" href="news-side-list.html">
@@ -68,7 +67,8 @@
         margin-bottom: 32px;
       }
 
-      news-iframe {
+      news-gpt-ad {
+        display: block;
         width: 300px;
         height: 250px;
       }
@@ -176,7 +176,9 @@ <h3>Opinions</h3>
 
       <aside>
         <div class="ad-container">
-          <news-iframe src="//rcm-na.amazon-adsystem.com/e/cm?o=1&p=12&l=ur1&f=ifr"></news-iframe>
+          <news-gpt-ad id="ad_slot_1"
+              ad-unit-path="/6355419/Travel/Europe/France/Paris"
+              ad-width="300" ad-height="250"></news-gpt-ad>
         </div>
         <news-side-list class="fade-in" items="[[_slice(category.items, 0, 3)]]">
           Most Read

From 211cbdac363ff496edccc0c391fea29bcf1cff7d Mon Sep 17 00:00:00 2001
From: Keanu Lee <keanulee@google.com>
Date: Tue, 24 Oct 2017 14:24:11 -0700
Subject: [PATCH 6/9] Fix meta tags for Twitter

---
 index.html        | 4 ++++
 src/news-app.html | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/index.html b/index.html
index 6954019d..49db3932 100644
--- a/index.html
+++ b/index.html
@@ -18,6 +18,10 @@
   <title>NEWS</title>
 
   <link rel="shortcut icon" sizes="32x32" href="images/news-icon-32.png">
+  <meta name="twitter:card" content="summary">
+  <meta name="twitter:site" content="@Polymer">
+  <meta property="og:type" content="website">
+  <meta property="og:site_name" content="NEWS">
   <meta name="theme-color" content="#000">
   <link rel="manifest" href="manifest.json">
 
diff --git a/src/news-app.html b/src/news-app.html
index a9f39e15..9da94d3a 100644
--- a/src/news-app.html
+++ b/src/news-app.html
@@ -318,12 +318,12 @@
         if (page === 'list') {
           this._setPageMetadata(categoryTitle, null);
         } else {
-          this._setPageMetadata(articleHeadline, this.articleId);
+          this._setPageMetadata(articleHeadline, this.article);
         }
       }
 
-      _setPageMetadata(description, articleId) {
-        let image = articleId ? `/images/${articleId}.jpg` : 'images/news-icon-128.png';
+      _setPageMetadata(description, article) {
+        let image = article ? article.imageUrl : 'images/news-icon-128.png';
 
         // Set open graph metadata
         this._setMeta('property', 'og:title', document.title);

From 2588b653aad98b018f073d2abd1cef7326081a2a Mon Sep 17 00:00:00 2001
From: Frankie Fu <ffu@google.com>
Date: Tue, 5 Jun 2018 12:14:29 -0700
Subject: [PATCH 7/9] Update link in footer

---
 src/news-app.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/news-app.html b/src/news-app.html
index 9da94d3a..adaf7b68 100644
--- a/src/news-app.html
+++ b/src/news-app.html
@@ -147,7 +147,7 @@
     </iron-pages>
 
     <footer>
-      <a href="https://www.polymer-project.org/1.0/toolbox/">Made by Polymer</a>
+      <a href="https://www.polymer-project.org/2.0/toolbox/">Made by Polymer</a>
     </footer>
 
   </template>

From ccc002d60032b3348b190fca3200d83882054de4 Mon Sep 17 00:00:00 2001
From: Felix Zapata <fzberlinches@gmail.com>
Date: Wed, 6 Jun 2018 08:35:24 +0200
Subject: [PATCH 8/9] style(news-img.html): remove extra line

---
 src/news-img.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/news-img.html b/src/news-img.html
index fc7468e0..6096249a 100644
--- a/src/news-img.html
+++ b/src/news-img.html
@@ -58,7 +58,6 @@
     </style>
 
     <img id="img" alt$="[[alt]]" on-load="_onImgLoad" on-error="_onImgError">
-    
 
   </template>
 

From 6f3fc095f1ebbea8b70166243e1ea66e593a3feb Mon Sep 17 00:00:00 2001
From: Sam Li <samli@google.com>
Date: Wed, 6 Jun 2018 12:43:32 -0700
Subject: [PATCH 9/9] Create CODEOWNERS

---
 .github/CODEOWNERS | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .github/CODEOWNERS

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000..a1694e10
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @keanulee @frankiefu