Merge pull request #60 from jwade1327/new-footer

Update AM and AME-LFTE footer block to go to my.auntminnie preference center
parameter1 · Jan 26, 2024 · 5be6454 · 5be6454
2 parents bd72786 + 0efc8e5
commit 5be6454
Show file tree

Hide file tree

Showing 12 changed files with 56 additions and 18 deletions.
diff --git a/...on/components/blocks/am-lfte-footer.marko → .../common/components/blocks/am-footer.marko b/...on/components/blocks/am-lfte-footer.marko → .../common/components/blocks/am-footer.marko
@@ -8,6 +8,8 @@ $ const { newsletter } = input;
 $ const newsletterConfig = config.get(newsletter.alias);
 $ const tagline = get(newsletterConfig, "tagline");
 $ const subscribeLink = get(newsletterConfig, "subscribeLink");
+$ const subtitle = get(newsletterConfig, "subtitle");
+$ const subID = get(newsletterConfig, "subID");
 $ const publicationName = get(newsletterConfig, "publicationName");
 $ const footerWidth = defaultValue(get(newsletterConfig, "logo.footerWidth"), 130);
 $ const url = buildLinkUrl(website.get("origin"));
@@ -19,8 +21,8 @@ $ const preferenceCenterUrl = buildLinkUrl(
   {
     email: '{{${email_address} | url_encode }}',
     id: '{{${user_id}}}',
-    subtitle: 'AuntMinnie Daily Newsletter',
-    subID: '6bbda052-75b3-4c48-bbbe-a943a1b7beac',
+    subtitle,
+    subID,
     subFlag: '0',
     mode: 'edit',
   }

diff --git a/packages/common/components/blocks/marko.json b/packages/common/components/blocks/marko.json
@@ -21,7 +21,7 @@
   "<common-external-api-block>": {
     "template": "./external-api.marko"
   },
-  "<common-am-lfte-footer-block>": {
-    "template": "am-lfte-footer.marko"
+  "<common-am-footer-block>": {
+    "template": "am-footer.marko"
   }
 }
diff --git a/packages/common/components/layouts/breaking-news.marko b/packages/common/components/layouts/breaking-news.marko
@@ -17,7 +17,7 @@ $ const nativeX = config.getAsObject("nativeX");
     <common-head-block />
   </@head>
   <@body style="padding:0; margin:0;font-family: 'Roboto', Arial, sans-serif; -webkit-text-size-adjust:100%;">
-    <common-body-wrapper-block newsletter=newsletter date=date>
+    <common-body-wrapper-block newsletter=newsletter date=date footer=input.footer>
       <@body>
 
         <!-- Content list block -->

diff --git a/packages/common/components/layouts/insider.marko b/packages/common/components/layouts/insider.marko
@@ -18,7 +18,7 @@ $ const nativeX = config.getAsObject("nativeX");
     <common-head-block />
   </@head>
   <@body style="padding:0; margin:0;font-family: 'Roboto', Arial, sans-serif; -webkit-text-size-adjust:100%;">
-    <common-body-wrapper-block newsletter=newsletter date=date>
+    <common-body-wrapper-block newsletter=newsletter date=date footer=input.footer>
       <@body>
 
         <!-- Community Logo -->

diff --git a/packages/common/components/layouts/senl.marko b/packages/common/components/layouts/senl.marko
@@ -19,7 +19,7 @@ $ const { id, alias, name, pageNode } = input;
     <common-head-block />
   </@head>
   <@body style="padding:0; margin:0;font-family: 'Roboto', Arial, sans-serif; -webkit-text-size-adjust:100%;">
-    <common-body-wrapper-block newsletter=newsletter date=date>
+    <common-body-wrapper-block newsletter=newsletter date=date footer=input.footer>
       <@body>
 
         <!-- Content list block -->

diff --git a/tenants/all/config/core.js b/tenants/all/config/core.js
@@ -110,6 +110,8 @@ const config = {
       footerWidth: 200,
     },
     preferenceCenter: 'https://my.auntminnie.com/unsubscribe-from-newsletter/',
+    subtitle: 'AuntMinnie Daily Newsletter',
+    subID: '6bbda052-75b3-4c48-bbbe-a943a1b7beac',
     caseBlock: true,
   },
   'am-breaking-news': {
@@ -119,7 +121,9 @@ const config = {
       src: '/files/base/smg/all/image/static/am/auntminnie-Breaking-News.png',
       footerWidth: 200,
     },
-    preferenceCenter: 'https://www.auntminnie.com/user/subscribe',
+    preferenceCenter: 'https://my.auntminnie.com/unsubscribe-from-newsletter/',
+    subtitle: 'AuntMinnie Daily Newsletter',
+    subID: '6bbda052-75b3-4c48-bbbe-a943a1b7beac',
   },
   'am-community-insider': {
     ...brands.am,
@@ -128,7 +132,9 @@ const config = {
       src: '/files/base/smg/all/image/static/am/auntminnie-Insider.png',
       footerWidth: 200,
     },
-    preferenceCenter: 'https://www.auntminnie.com/user/subscribe',
+    preferenceCenter: 'https://my.auntminnie.com/unsubscribe-from-newsletter/',
+    subtitle: 'AuntMinnie Daily Newsletter',
+    subID: '6bbda052-75b3-4c48-bbbe-a943a1b7beac',
   },
   'am-case-of-the-week': {
     ...brands.am,
@@ -137,7 +143,9 @@ const config = {
       src: '/files/base/smg/all/image/static/am/auntminnie-case.png',
       footerWidth: 200,
     },
-    preferenceCenter: 'https://www.auntminnie.com/user/subscribe',
+    preferenceCenter: 'https://my.auntminnie.com/unsubscribe-from-newsletter/',
+    subtitle: 'AuntMinnie Daily Newsletter',
+    subID: '6bbda052-75b3-4c48-bbbe-a943a1b7beac',
   },
   'am-radcast': {
     ...brands.am,
@@ -155,7 +163,9 @@ const config = {
       src: '/files/base/smg/all/image/static/am/auntminnie-SpecialEditionNewsletter.png',
       footerWidth: 200,
     },
-    preferenceCenter: 'https://www.auntminnie.com/user/subscribe',
+    preferenceCenter: 'https://my.auntminnie.com/unsubscribe-from-newsletter/',
+    subtitle: 'AuntMinnie Daily Newsletter',
+    subID: '6bbda052-75b3-4c48-bbbe-a943a1b7beac',
   },
   'am-rsna': {
     ...brands.am,
@@ -218,7 +228,9 @@ const config = {
       src: '/files/base/smg/all/image/static/ame/AuntMinnieEurope-LFTE.png',
       footerWidth: 200,
     },
-    preferenceCenter: 'https://www.auntminnieeurope.com/user/subscribe',
+    preferenceCenter: 'https://my.auntminnie.com/unsubscribe-from-newsletter/',
+    subtitle: 'AuntMinnieEurope Daily Newsletter',
+    subID: 'be37c68c-c7b7-491c-a8a5-b325026fc852',
   },
   'ame-radcast': {
     ...brands.ame,

diff --git a/tenants/all/templates/am-breaking-news.marko b/tenants/all/templates/am-breaking-news.marko
@@ -1 +1,7 @@
-<common-breaking-news-layout data=data />
+$ const { newsletter } = data;
+
+<common-breaking-news-layout data=data>
+  <@footer>
+    <common-am-footer-block newsletter=newsletter />
+  </@footer>
+</common-breaking-news-layout>
diff --git a/tenants/all/templates/am-case-of-the-week.marko b/tenants/all/templates/am-case-of-the-week.marko
@@ -31,7 +31,7 @@ $ const resolvedToNodesConverter = ({ resolved }) => (resolved.map((node) => ({
     <common-head-block />
   </@head>
   <@body style="padding:0; margin:0;font-family: 'Roboto', Arial, sans-serif; -webkit-text-size-adjust:100%;">
-    <common-body-wrapper-block newsletter=newsletter date=date>
+    <common-body-wrapper-block newsletter=newsletter date=date footer=input.footer>
       <@body>
 
         <common-ad-wrapper-block
@@ -58,6 +58,9 @@ $ const resolvedToNodesConverter = ({ resolved }) => (resolved.map((node) => ({
         />
 
       </@body>
+      <@footer>
+        <common-am-footer-block newsletter=newsletter />
+      </@footer>
     </common-body-wrapper-block>
   </@body>
 </marko-newsletter-root>
diff --git a/tenants/all/templates/am-community-insider.marko b/tenants/all/templates/am-community-insider.marko
@@ -1 +1,7 @@
-<common-insider-layout data=data display-limit=16/>
+$ const { newsletter } = data;
+
+<common-insider-layout data=data display-limit=16>
+  <@footer>
+    <common-am-footer-block newsletter=newsletter />
+  </@footer>
+</common-insider-layout>
diff --git a/tenants/all/templates/am-lfte.marko b/tenants/all/templates/am-lfte.marko
@@ -147,7 +147,7 @@ $ const resolvedToNodesConverter = ({ resolved }) => (resolved.map((node) => ({
 
       </@body>
       <@footer>
-        <common-am-lfte-footer-block newsletter=newsletter />
+        <common-am-footer-block newsletter=newsletter />
       </@footer>
     </common-body-wrapper-block>
   </@body>

diff --git a/tenants/all/templates/am-senl.marko b/tenants/all/templates/am-senl.marko
@@ -1 +1,7 @@
-<common-senl-layout data=data />
+$ const { newsletter } = data;
+
+<common-senl-layout data=data>
+  <@footer>
+    <common-am-footer-block newsletter=newsletter />
+  </@footer>
+</common-senl-layout>
diff --git a/tenants/all/templates/ame-lfte.marko b/tenants/all/templates/ame-lfte.marko
@@ -32,7 +32,7 @@ $ const resolvedToNodesConverter = ({ resolved }) => (resolved.map((node) => ({
     <common-head-block />
   </@head>
   <@body style="padding:0; margin:0;font-family: 'Roboto', Arial, sans-serif; -webkit-text-size-adjust:100%;">
-    <common-body-wrapper-block newsletter=newsletter date=date>
+    <common-body-wrapper-block newsletter=newsletter date=date footer=input.footer>
       <@body>
 
         <!-- Content list block -->
@@ -146,6 +146,9 @@ $ const resolvedToNodesConverter = ({ resolved }) => (resolved.map((node) => ({
         />
 
       </@body>
+      <@footer>
+        <common-am-footer-block newsletter=newsletter />
+      </@footer>
     </common-body-wrapper-block>
   </@body>
 </marko-newsletter-root>