From 824c0a9f02aafc347d6790c363b6adb7a2176e83 Mon Sep 17 00:00:00 2001
From: Ignacio Pascual <4764217+ignapas@users.noreply.github.com>
Date: Tue, 7 Jun 2022 19:52:27 +0200
Subject: [PATCH 1/4] added newsletter archive

---
 nuxt.config.js                  | 13 +++++--------
 package.json                    |  1 +
 pages/news-and-events/index.vue | 22 ++++++++++++++++++++++
 plugins/postscribe.js           | 10 ++++++++++
 yarn.lock                       | 12 ++++++++++++
 5 files changed, 50 insertions(+), 8 deletions(-)
 create mode 100644 plugins/postscribe.js

diff --git a/nuxt.config.js b/nuxt.config.js
index 9686252b..7dcab9eb 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -148,16 +148,13 @@ export default {
    ** Plugins to load before mounting the App
    */
   plugins: [
-    '@/plugins/bootstrap', 
-    '@/plugins/contentful', 
+    '@/plugins/bootstrap',
+    '@/plugins/contentful',
     '@/plugins/amplify',
     '@/plugins/documentation-hub-redirects',
-    {
-      src: '@/plugins/system-design-components', mode: 'client'
-    },
-    {
-      src: '@/plugins/tsviewer', mode: 'client'
-    }
+    { src: '@/plugins/postscribe', mode: 'client' },
+    { src: '@/plugins/system-design-components', mode: 'client' },
+    { src: '@/plugins/tsviewer', mode: 'client' }
   ],
   /*
    ** Nuxt.js dev-modules
diff --git a/package.json b/package.json
index f19e8c63..a145b6dc 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "marked": "^0.7.0",
     "nuxt": "^2.12.1",
     "plyr": "^3.6.3",
+    "postscribe": "^2.0.8",
     "prettier": "^1.19.1",
     "ramda": "^0.26.1",
     "redirect-ssl": "^1.4.1",
diff --git a/pages/news-and-events/index.vue b/pages/news-and-events/index.vue
index 7b42447a..68d05daf 100644
--- a/pages/news-and-events/index.vue
+++ b/pages/news-and-events/index.vue
@@ -109,6 +109,16 @@
               <h3 class="mb-24">Sign up for the SPARC Newsletter</h3>
               <p class="mb-40">Keep up to date with all the latest news and events from the SPARC Portal.</p>
               <newsletter-form />
+              <div class="newsletter-archive">
+                <style type="text/css">
+                <!--
+                .campaign { margin-top: .5em; }
+                //-->
+                </style>
+                <h3 class="mb-24">View previous Newsletters</h3>
+                <div id="newsletter-archive" />
+                <a href="//us2.campaign-archive.com/home/?u=e60c48f231a30b544eed731ea&id=c81a347bd8" target="_blank">View all Newsletters</a>
+              </div>
             </el-col>
             <el-col :xs="24" :sm="12" class="twitter-wrap">
               <div v-twitter-widgets>
@@ -244,6 +254,10 @@ export default Vue.extend<Data, Methods, Computed, never>({
       const news = await fetchNews(client, this.$route.query.search as string, this.news.total, 2)
       this.news = { ...this.news, items: { ...this.news.items, ...news.items } }
     }
+  },
+
+  mounted() {
+    this.$injectNewsletterArchive('#newsletter-archive')
   }
 })
 </script>
@@ -364,4 +378,12 @@ h3 {
     text-decoration: underline;
   }
 }
+
+.newsletter-archive {
+  margin-top: 3em;
+  & > a {
+    display: inline-block;
+    margin-top: 1em;
+  }
+}
 </style>
diff --git a/plugins/postscribe.js b/plugins/postscribe.js
new file mode 100644
index 00000000..efec78ad
--- /dev/null
+++ b/plugins/postscribe.js
@@ -0,0 +1,10 @@
+import postscribe from 'postscribe'
+
+export default (_, inject) => {
+  inject('injectNewsletterArchive', elementSelector => {
+    postscribe(
+      elementSelector,
+      '<script language="javascript" src="//science.us2.list-manage.com/generate-js/?u=e60c48f231a30b544eed731ea&fid=46414&show=10" type="text/javascript"></script>'
+    )
+  })
+}
diff --git a/yarn.lock b/yarn.lock
index 8d167993..d2608d44 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12227,6 +12227,13 @@ postcss@7.x.x, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17,
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
+postscribe@^2.0.8:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/postscribe/-/postscribe-2.0.8.tgz#5b7a53aad4b690b6c2f75818fcefe74490f410d5"
+  integrity sha512-Sxt6pek38NKX85Vb/PbcritqVxsgPZQFLcuf4o0f7lXRb76jM0XP79SGwCBPRTuv+U2zqByQan8EzRjqquD73A==
+  dependencies:
+    prescribe ">=1.1.2"
+
 potpack@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/potpack/-/potpack-1.0.1.tgz#d1b1afd89e4c8f7762865ec30bd112ab767e2ebf"
@@ -12247,6 +12254,11 @@ prepend-http@^1.0.0:
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
   integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
 
+prescribe@>=1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/prescribe/-/prescribe-1.1.3.tgz#8d3122445f3fbaf4c4c5817ea527a17fc8139ee6"
+  integrity sha512-HEg0ElY5tmmCshST4tzl47+SirJO2cVo6j/+O4d6xIz+80ixNcN0GgPQsn76AgeTTIAQOrwq1rfoptubQuZ1Uw==
+
 prettier-linter-helpers@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"

From 99fa3eb8e467a6ba0ed118cb8d03fa33d5a57fb6 Mon Sep 17 00:00:00 2001
From: Ignacio Pascual <4764217+ignapas@users.noreply.github.com>
Date: Fri, 10 Jun 2022 11:13:38 +0200
Subject: [PATCH 2/4] Only listing last 5 newsletters

---
 plugins/postscribe.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/postscribe.js b/plugins/postscribe.js
index efec78ad..c0a908ce 100644
--- a/plugins/postscribe.js
+++ b/plugins/postscribe.js
@@ -4,7 +4,7 @@ export default (_, inject) => {
   inject('injectNewsletterArchive', elementSelector => {
     postscribe(
       elementSelector,
-      '<script language="javascript" src="//science.us2.list-manage.com/generate-js/?u=e60c48f231a30b544eed731ea&fid=46414&show=10" type="text/javascript"></script>'
+      '<script language="javascript" src="//science.us2.list-manage.com/generate-js/?u=e60c48f231a30b544eed731ea&fid=46414&show=5" type="text/javascript"></script>'
     )
   })
 }

From ff70cfe9ad177c22531cbae741a473993db52dfd Mon Sep 17 00:00:00 2001
From: Ignacio Pascual <4764217+ignapas@users.noreply.github.com>
Date: Fri, 10 Jun 2022 18:23:14 +0200
Subject: [PATCH 3/4] removed the word technical

---
 pages/contact-us/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/contact-us/index.vue b/pages/contact-us/index.vue
index 47b0f01c..632e12a2 100644
--- a/pages/contact-us/index.vue
+++ b/pages/contact-us/index.vue
@@ -48,9 +48,9 @@
 
         <div v-if="isBugSubmitted" class="msg-success">
           <p>
-            Thank you for letting us know about this error or technical issue.
-            If you requested a response, a member of the SPARC team will contact
-            you within two business days.
+            Thank you for letting us know about this error or issue. If you
+            requested a response, a member of the SPARC team will contact you
+            within two business days.
           </p>
           <a href="#" @click="resetForms">Submit another inquiry</a>
         </div>
@@ -111,7 +111,7 @@ export default {
           value: 'general'
         },
         {
-          label: 'I want to report an error or a technical issue',
+          label: 'I want to report an error or an issue',
           value: 'bug'
         }
       ],

From 7d1f89f25982a22a28036f5d78fee7919d046aec Mon Sep 17 00:00:00 2001
From: Ignacio Pascual <4764217+ignapas@users.noreply.github.com>
Date: Fri, 10 Jun 2022 18:53:33 +0200
Subject: [PATCH 4/4] removed lines

---
 pages/news-and-events/index.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pages/news-and-events/index.vue b/pages/news-and-events/index.vue
index 68d05daf..dd73ecc8 100644
--- a/pages/news-and-events/index.vue
+++ b/pages/news-and-events/index.vue
@@ -111,9 +111,7 @@
               <newsletter-form />
               <div class="newsletter-archive">
                 <style type="text/css">
-                <!--
-                .campaign { margin-top: .5em; }
-                //-->
+                  .campaign { margin-top: .5em; }
                 </style>
                 <h3 class="mb-24">View previous Newsletters</h3>
                 <div id="newsletter-archive" />