sfc-utils 1.4.76 → 1.4.78

package/brands3.js

@@ -0,0 +1,224 @@
+
+// Set brand object to override CSS based on this market's styles
+let getBrands3 = function(market){
+	// We can add any Hearst global overrides here:
+	let defaultObj = {
+		styles: {
+			"@alert-red": "#d20000",
+			// Defaults
+			"@display": '"Archivo", Arial, sans-serif',
+			"@body": '"Mulish", Verdana, sans-serif',
+			"@secondary": '"Rubik", Arial, sans-serif',
+			//backwards compatible
+			"@hed": '"Archivo", Arial, sans-serif',
+			"@hed-alt": '"Archivo", Arial, sans-serif',
+			"@serif": '"Mulish", Verdana, sans-serif',
+			"@sans": '"Rubik", Arial, sans-serif',
+			"@sans-alt": '"Rubik", Arial, sans-serif',
+
+			// Icons
+			"@sub-icon": `url('data:image/svg+xml, <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" fill="white"><path d="M160 416H96c-17.67 0-32-14.33-32-32V128c0-17.67 14.33-32 32-32h64c17.67 0 32-14.33 32-32S177.7 32 160 32H96C42.98 32 0 74.98 0 128v256c0 53.02 42.98 96 96 96h64c17.67 0 32-14.33 32-32S177.7 416 160 416zM502.6 233.4l-128-128c-12.51-12.51-32.76-12.49-45.25 0c-12.5 12.5-12.5 32.75 0 45.25L402.8 224H192C174.3 224 160 238.3 160 256s14.31 32 32 32h210.8l-73.38 73.38c-12.5 12.5-12.5 32.75 0 45.25s32.75 12.5 45.25 0l128-128C515.1 266.1 515.1 245.9 502.6 233.4z"/></svg>')`,
+		},
+		attributes: {
+			"subscribeLink": "https://www.hearst.com/newspapers?projects=true"
+		}
+	}
+
+	// Handle market-specific styles here:
+	let marketObj = {
+		/* San Franicsco Chronicle */
+		SFC: {
+			styles: {
+				"@brand": "#26A0A5",
+				"@brand-secondary": "#FFBC30",
+				"@display": '"Tiempos Headline", "Baskerville", Georgia, serif',
+				"@body": '"Tiempos", "Baskerville", Georgia, serif',
+				"@secondary": '"National", Arial, Helvetica, sans-serif',
+				//backwards compatible
+				"@hed": '"Tiempos Headline", "Baskerville", Georgia, serif',
+				"@hed-alt": '"Tiempos Headline", "Baskerville", Georgia, serif',
+				"@serif": '"Tiempos", "Baskerville", Georgia, serif',
+				"@sans": '"National", Arial, Helvetica, sans-serif',
+				"@sans-alt": '"National", Arial, Helvetica, sans-serif'
+			},
+			attributes: {
+				"marketPrefix": "sf",
+				"siteName": "The San Francisco Chronicle",
+				"twitter": "sfchronicle",
+				"gaAccount": "UA-1616916-26",
+				"subscribeLink": "https://www.sfchronicle.com/subproject",
+				"sailCustomer": "fca2a0390286f0e53120a668534d9529",
+				"sailSiteName": "san-francisco-chronicle",
+				"siteId": 35,
+			}
+		},
+
+		/* Houston Chronicle */
+		Houston: {
+			styles: {
+				"@brand": "#CB0024",
+				"@brand-secondary": "#1C2146"
+			},
+			attributes: {
+				"marketPrefix": "hc",
+				"siteName": "The Houston Chronicle",
+				"twitter": "HoustonChron",
+				"invert": true,
+				"gaAccount": "UA-1616916-24",
+				"subscribeLink": "https://www.houstonchronicle.com/subproject",
+				"sailCustomer": "48e30b5083cf6bf47c519651453c9e8a",
+				"sailSiteName": "houston-chronicle",
+				"siteId": 33
+			}
+		},
+
+		/* Albany Times Union */
+		Albany: {
+			styles: {
+				"@brand": "#006FBA",
+				"@brand-secondary": "#E5A72C"
+			},
+			attributes: {
+				"marketPrefix": "tu",
+				"siteName": "Times Union",
+				"twitter": "timesunion",
+				"invert": true,
+				"gaAccount": "UA-1616916-7",
+				"subscribeLink": "https://www.timesunion.com/subproject",
+				"sailCustomer": "5bb9eee089bdc2e27cbd265535ad1f90",
+				"sailSiteName": "times-union",
+				"siteId": 3
+			}
+		},
+
+		/* San Antonio Express News */
+		SanAntonio: {
+			styles: {
+				"@brand": "#BA142D",
+				"@brand-secondary": "#189196"
+			},
+			attributes: {
+				"marketPrefix": "sa",
+				"siteName": "Express-News",
+				"twitter": "ExpressNews",
+				"invert": true,
+				"gaAccount": "UA-1616916-27",
+				"subscribeLink": "https://www.expressnews.com/subproject",
+				"sailCustomer": "aec52c4681ed63b5beab139a2584f0d4",
+				"sailSiteName": "san-antonio-express-news",
+				"siteId": 36
+			}
+		},
+
+		/* Connecticut */
+		CT: {
+			styles: {
+				"@brand": "#1A98FF",
+				"@brand-secondary": "#FFBC30"
+			},
+			attributes: {
+				"marketPrefix": "in",
+				"siteName": "CTInsider",
+				"twitter": "insider_ct",
+				"invert": true,
+				"gaAccount": "UA-1616916-99",
+				"subscribeLink": "https://www.ctinsider.com/subproject",
+				"sailCustomer": "9b21160afa226c9f84d27b47c3d52364",
+				"sailSiteName": "ct-insider",
+				"siteId": 61
+			}
+		},
+
+		/* Communities */
+		Texcom: {
+			styles: {
+				"@brand": "#900900",
+				"@brand-secondary": "#189196"
+			},
+			attributes: {
+				"marketPrefix": "texcom/mrt",
+				"siteName": "Midland Reporter-Telegram",
+				"twitter": "mwtnews",
+				"invert": true,
+				"gaAccount": "UA-1616916-99",
+				"subscribeLink": "/subproject",
+				"sailCustomer": "4a181de0b63a131cf27f8ea9485e5e1c",
+				"sailSiteName": "midland-reporter-telegram",
+				"siteId": 57
+			}
+		},
+		Midcom: {
+			styles: {
+				"@brand": "#900900",
+				"@brand-secondary": "#189196"
+			},
+			attributes: {
+				"marketPrefix": "midcom/mid",
+				"siteName": "Midland Daily News",
+				"twitter": "MDN",
+				"invert": true,
+				"gaAccount": "UA-1616916-99",
+				"subscribeLink": "/subproject",
+				"sailCustomer": "4a181de0b63a131cf27f8ea9485e5e1c",
+				"sailSiteName": "midland-daily-news",
+				"siteId": 61
+			}
+		},
+		Conroe: {
+			styles: {
+				"@brand": "#900900",
+				"@brand-secondary": "#189196"
+			},
+			attributes: {
+				"marketPrefix": "conroe",
+				"siteName": "Conroe Courier",
+				"twitter": "ConroeCourier",
+				"invert": true,
+				"gaAccount": "UA-1616916-99",
+				"subscribeLink": "https://www.yourconroenews.com/subproject",
+				"sailCustomer": "4a181de0b63a131cf27f8ea9485e5e1c",
+				"sailSiteName": "the-courier-of-montgomery-county",
+				"siteId": 68
+			}
+		},
+		Seattle: {
+			styles: {
+				"@brand": "#3F8395",
+				"@brand-secondary": "#189196"
+			},
+			attributes: {
+				"marketPrefix": "seattle",
+				"siteName": "Seattle PI",
+				"twitter": "seattlepi",
+				"invert": true,
+				"gaAccount": "UA-1616916-99",
+				"subscribeLink": "",
+				"sailCustomer": "da30899589786517b0c0cead37a48b06",
+				"sailSiteName": "seattle-post-intelligencer",
+				"siteId": 20
+			}
+		},
+		/* Misc */
+		TK: {
+			styles: {
+				"@brand": "#900900",
+				"@brand-secondary": "#189196"
+			},
+			attributes: {
+				"marketPrefix": "tk",
+				"siteName": "Hearst Digital News",
+				"twitter": "Hearst",
+				"invert": true,
+			}
+		}
+	}
+
+	// Combine global and market styles to return the final object
+	let combinedStyles = {
+		styles: Object.assign(defaultObj.styles, marketObj[market].styles),
+		attributes: Object.assign(defaultObj.attributes, marketObj[market].attributes)
+	}
+	return combinedStyles
+}
+
+module.exports = { getBrands3 }

package/components/helpers/utilfunctions.mjs

@@ -1,5 +1,5 @@
 import { getBlueconic } from "../../blueconic"
-import { getBrands2 } from "../../brands2"
+import { getBrands3 } from "../../brands3"
 import { appCheck, blendHDN } from "../../index"
 
 /** Used for resizing the WCM Image */
@@ -51,7 +51,7 @@ function appendLayoutScripts(isEmbedded, isAdRemoved, marketKey) {
 
       // Init sailthru
       if (window && window.Sailthru && marketKey) {
-        window.Sailthru.init({ customerId: getBrands2(marketKey).attributes.sailCustomer })
+        window.Sailthru.init({ customerId: getBrands3(marketKey).attributes.sailCustomer })
       }
     }
   }, 5000)
@@ -59,7 +59,7 @@ function appendLayoutScripts(isEmbedded, isAdRemoved, marketKey) {
 
 function formatHDN(isEmbedded, url_add, meta) {
   const isApp = appCheck();
-  const thisBrand = getBrands2(meta.PROJECT.MARKET_KEY);
+  const thisBrand = getBrands3(meta.PROJECT.MARKET_KEY);
 
   // Combine our settings with what Hearst puts on page
   let stringHDN = ''

package/components/layout/layouthelmet.mjs

@@ -1,9 +1,15 @@
-import React from 'react'
+import React from "react";
 
-import { Helmet } from 'react-helmet'
-import { appCheck, getBrands2 } from "../../index"
+import { Helmet } from "react-helmet";
+import { appCheck, getBrands2, getBrands3 } from "../../index";
 
-const LayoutHelmet = ({ meta, url_add, noindex=false, schemaOverride={} }) => {
+const LayoutHelmet = ({
+  meta,
+  url_add,
+  noindex = false,
+  schemaOverride = {},
+  brandsVer = 2,
+}) => {
   let {
     EMBEDDED,
     MAIN_DOMAIN,
@@ -21,69 +27,82 @@ const LayoutHelmet = ({ meta, url_add, noindex=false, schemaOverride={} }) => {
       MARKET_KEY,
       CANONICAL_URL,
       ANALYTICS_CREDIT,
-      SECTION
+      SECTION,
     },
-  } = meta
+  } = meta;
 
-  const isApp = appCheck()
-  const thisBrand = getBrands2(MARKET_KEY);
-
-  // Get stylesheet id from market key
-  let styleSheetID
-  if ((MARKET_KEY === "SFC") || (MARKET_KEY === "Houston") || (MARKET_KEY === "Albany")) {
-    styleSheetID = MARKET_KEY
-  }
-  else {
-    styleSheetID = "default"
+  // Handle style sheet on brands2 vs brands3
+  const isApp = appCheck();
+  let styleSheetID;
+  let thisBrand;
+  if (brandsVer === 2) {
+    thisBrand = getBrands2(MARKET_KEY);
+    if (
+      MARKET_KEY === "SFC" ||
+      MARKET_KEY === "Houston" ||
+      MARKET_KEY === "Albany"
+    ) {
+      styleSheetID = MARKET_KEY;
+    } else {
+      styleSheetID = "default";
+    }
+  } else {
+    thisBrand = getBrands3(MARKET_KEY);
+    if (MARKET_KEY === "SFC") {
+      styleSheetID = "plat-styles/" + MARKET_KEY;
+    } else {
+      styleSheetID = "plat-styles/default";
+    }
   }
 
   // Handle author data
-  let authorObj = []
-  let newAuthor = {}
+  let authorObj = [];
+  let newAuthor = {};
   try {
-    if (!ANALYTICS_CREDIT){
+    if (!ANALYTICS_CREDIT) {
       // If we have authors (not analytics credit), use those
-      AUTHORS.forEach(author => {
+      AUTHORS.forEach((author) => {
         newAuthor = {
-          '@type': 'Person',
+          "@type": "Person",
           name: author.AUTHOR_NAME,
           url: author.AUTHOR_PAGE,
-        }
-        authorObj.push(newAuthor)
-      })
+        };
+        authorObj.push(newAuthor);
+      });
     } else {
       // If we have analytics credit, use that
-      const creditList = ANALYTICS_CREDIT.split(",")
-      creditList.forEach(credit => {
+      const creditList = ANALYTICS_CREDIT.split(",");
+      creditList.forEach((credit) => {
         newAuthor = {
-          '@type': 'Person',
+          "@type": "Person",
           name: credit,
-          url: MAIN_DOMAIN // Not ideal to not have the actual author page, but we don't have it
-        }
-        authorObj.push(newAuthor)
-      })
+          url: MAIN_DOMAIN, // Not ideal to not have the actual author page, but we don't have it
+        };
+        authorObj.push(newAuthor);
+      });
     }
   } catch (err) {
     // If it errored, just set to neutral default
     authorObj = {
-      '@type': 'Person',
+      "@type": "Person",
       name: thisBrand.attributes.siteName,
       url: MAIN_DOMAIN,
-    }
+    };
   }
 
   // Handle special favicon logic
-  let favHref = "/favicon.ico"
-  if (MARKET_KEY === "TK"){
-    favHref = "https://files.sfchronicle.com/devhub-logos/DHlogos-sm.png"
-  } else if (MARKET_KEY === "Seattle"){
-    favHref = "https://www.seattlepi.com/sites/seattlepi/apple-touch-icon-196x196.png"
+  let favHref = "/favicon.ico";
+  if (MARKET_KEY === "TK") {
+    favHref = "https://files.sfchronicle.com/devhub-logos/DHlogos-sm.png";
+  } else if (MARKET_KEY === "Seattle") {
+    favHref =
+      "https://www.seattlepi.com/sites/seattlepi/apple-touch-icon-196x196.png";
   }
 
   // Set section with fallback
-  let articleSection = "Local"
+  let articleSection = "Local";
   if (SECTION) {
-    articleSection = SECTION
+    articleSection = SECTION;
   }
 
   // Set the default schema that will be used as a fallback
@@ -114,21 +133,20 @@ const LayoutHelmet = ({ meta, url_add, noindex=false, schemaOverride={} }) => {
     },
     "articleSection": "${articleSection}",
     "description": "${DESCRIPTION}"
-  }`
+  }`;
 
   return (
     <Helmet>
       <title>{TITLE}</title>
       <meta name="description" content={DESCRIPTION} />
+      <link rel="shortcut icon" href={favHref} type="image/x-icon" />
+      <link rel="canonical" href={`${CANONICAL_URL}/${url_add}`} />
       <link
-        rel="shortcut icon"
-        href={favHref}
-        type="image/x-icon"
+        rel="stylesheet"
+        href={`https://files.sfchronicle.com/brand-styles/${styleSheetID}.css`}
       />
-      <link rel="canonical" href={`${CANONICAL_URL}/${url_add}`} />
-      <link rel="stylesheet" href={`https://files.sfchronicle.com/brand-styles/${styleSheetID}.css`} />
 
-      {(isApp || EMBEDDED || noindex) ? (
+      {isApp || EMBEDDED || noindex ? (
         <meta name="robots" content="noindex, nofollow" />
       ) : (
         <meta name="robots" content="max-image-preview:large" />
@@ -147,14 +165,21 @@ const LayoutHelmet = ({ meta, url_add, noindex=false, schemaOverride={} }) => {
       <meta property="og:type" content="article" />
       <meta property="og:title" content={SOCIAL_TITLE} />
       <meta property="og:site_name" content={thisBrand.attributes.siteName} />
-      <meta property="og:url" content={`${MAIN_DOMAIN}/${SUBFOLDER}${OPT_SLASH}${SLUG}/${url_add}`} />
+      <meta
+        property="og:url"
+        content={`${MAIN_DOMAIN}/${SUBFOLDER}${OPT_SLASH}${SLUG}/${url_add}`}
+      />
       <meta property="og:image" content={IMAGE} />
       <meta property="og:description" content={DESCRIPTION} />
 
-      <script data-schema={schemaOverride.type || "NewsArticle"} type="application/ld+json">{schemaOverride.content || schemaContent}</script>
-      
+      <script
+        data-schema={schemaOverride.type || "NewsArticle"}
+        type="application/ld+json"
+      >
+        {schemaOverride.content || schemaContent}
+      </script>
     </Helmet>
-  )
-}
+  );
+};
 
-export default LayoutHelmet
+export default LayoutHelmet;

package/copy/sheets.js

@@ -12,9 +12,19 @@ var { google } = require("googleapis");
 var api = google.sheets("v4");
 var writeFile = require("write");
 var authObj = require("./googleauth");
+// Try to import story_settings.sheet.json
+let languageSwap;
+try {
+  const storySettings = require("../../../src/data/story_settings.sheet.json");
+  if (storySettings) {
+    languageSwap = storySettings[0].Language_Swap;
+  }
+} catch (err) {
+  // It's ok
+}
 
 var cast = function (str, forceStr) {
-  if (!forceStr){
+  if (!forceStr) {
     if (typeof str !== "string") {
       if (typeof str.value == "string") {
         str = str.value;
@@ -30,37 +40,45 @@ var cast = function (str, forceStr) {
     if (str.toLowerCase() == "true" || str.toLowerCase() == "false") {
       return str.toLowerCase() == "true" ? true : false;
     }
-  } 
+  }
   // To force string, just return string
 
   return str;
 };
 
 let googleAuth = (project, directory = null, forceStr = false) => {
-  return new Promise(resolveFinal => {
+  return new Promise((resolveFinal) => {
     var auth = null;
-    authObj.authenticate({ fallback: false }).then((resp) => {
-      auth = resp;
-      grabSheets(auth, project, directory, forceStr).then(() => resolveFinal()).catch(() => {
-        // If the first attempt failed, then make another req using the fallback
-        authObj.authenticate({ fallback: true }).then((resp) => {
-          auth = resp;
-          grabSheets(auth, project, directory, forceStr).then(() => resolveFinal());
-        });
+    authObj
+      .authenticate({ fallback: false })
+      .then((resp) => {
+        auth = resp;
+        grabSheets(auth, project, directory, forceStr)
+          .then(() => resolveFinal())
+          .catch(() => {
+            // If the first attempt failed, then make another req using the fallback
+            authObj.authenticate({ fallback: true }).then((resp) => {
+              auth = resp;
+              grabSheets(auth, project, directory, forceStr).then(() =>
+                resolveFinal()
+              );
+            });
+          });
+      })
+      .catch(() => {
+        // Failure if we fall back but there's no token
+        auth = authObj.task();
+        grabSheets(auth, project, directory, forceStr).then(() =>
+          resolveFinal()
+        );
       });
-    })
-    .catch(() => {
-      // Failure if we fall back but there's no token
-      auth = authObj.task();
-      grabSheets(auth, project, directory, forceStr).then(() => resolveFinal());
-    });
-  })
+  });
 };
 
 let grabSheets = (auth, project, directory, forceStr) => {
   return new Promise((resolveAll, rejectAll) => {
     var sheetKeys = project.GOOGLE_SHEETS;
-    if (!sheetKeys){
+    if (!sheetKeys) {
       // Try the old way
       sheetKeys = project.sheets;
     }
@@ -91,7 +109,14 @@ let grabSheets = (auth, project, directory, forceStr) => {
   });
 };
 
-let getSheet = async (resolve, reject, auth, spreadsheetId, directory, forceStr) => {
+let getSheet = async (
+  resolve,
+  reject,
+  auth,
+  spreadsheetId,
+  directory,
+  forceStr
+) => {
   let output = await api.spreadsheets
     .get({
       auth,
@@ -116,6 +141,20 @@ let getSheet = async (resolve, reject, auth, spreadsheetId, directory, forceStr)
     });
     var { values } = response.data;
     var header = values.shift();
+    var swapIndexes = [];
+    if (languageSwap) {
+      for (var i = 0; i < header.length; i++) {
+        var lastIndex = header[i].lastIndexOf("_");
+        if (lastIndex > -1) {
+          // It has an underscore! Check for match
+          var substring = header[i].substring(lastIndex + 1).toLowerCase();
+          if (substring === languageSwap) {
+            // Match! Save the swap index
+            swapIndexes.push(i - 1);
+          }
+        }
+      }
+    }
     var isKeyed = header.indexOf("key") > -1;
     var isValued = header.indexOf("value") > -1;
     var out = isKeyed ? {} : [];
@@ -126,8 +165,20 @@ let getSheet = async (resolve, reject, auth, spreadsheetId, directory, forceStr)
       var rowSkip = true;
       row.forEach(function (value, i) {
         var key = header[i];
+        // Handle language swap
+        if (swapIndexes.indexOf(i) > -1) {
+          // If we have a swap index, swap the value
+          // NOTE: This assumes the translation is ALWAYS one cell to the right
+          try {
+            if (row[i + 1]) {
+              value = row[i + 1];
+            }
+          } catch (err) {
+            // Not great but ok
+          }
+        }
         obj[key] = cast(value, forceStr);
-        if (value && value !== "FALSE"){
+        if (value && value !== "FALSE") {
           rowSkip = false;
         }
       });

package/css/nav2.less

@@ -1,5 +1,5 @@
 // TODO: move file into styles
-// NOTE: This relies on variables that are updated in brands2.js
+// NOTE: This relies on variables that are updated in brands3.js
 // Styles for the nav
 .nav2-container {
   width: 100%;

package/example/gatsby-config.js

@@ -1,5 +1,5 @@
 // Add SFC utils
-const { getBrands2 } = require('../index')
+const { getBrands3 } = require('../index')
 const { getSettings } = require('./tempsettings')
 const { DateTime } = require('luxon');
 
@@ -83,7 +83,7 @@ let plugins = [
     resolve: 'gatsby-plugin-less',
     options: {
       lessOptions: {
-        modifyVars: getBrands2(settings.PROJECT.MARKET_KEY).styles,
+        modifyVars: getBrands3(settings.PROJECT.MARKET_KEY).styles,
       },
     },
   },

package/index.js

@@ -251,6 +251,7 @@ let blendHDN = function (meta) {
 // Grab neighbor files
 let { getBrands } = require("./brands");
 let { getBrands2 } = require("./brands2");
+let { getBrands3 } = require("./brands3");
 let { getSettings } = require("./settings");
 let { getNav } = require("./nav");
 let { getNav2 } = require("./nav2");
@@ -266,6 +267,7 @@ module.exports = {
   getSettings,
   getBrands,
   getBrands2,
+  getBrands3,
   getNav,
   getNav2,
   getSpecialNav,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sfc-utils",
-  "version": "1.4.76",
+  "version": "1.4.78",
   "author": "ewagstaff <evanjwagstaff@gmail.com>",
   "dependencies": {
     "archieml": "^0.4.2",

package/styles/brandStylesCommon.less

@@ -21,7 +21,7 @@ h1 {
 //could the next three classes be moved into byline module?
 .byline-wrapper {
   max-width: @lg;
-  border-bottom: 1px solid @grey-75;
+  border-bottom: 1px solid @grey-25;
   margin: @s16 auto @s24;
   padding-bottom: @s8;
   display: flex;
@@ -43,6 +43,10 @@ h1 {
   font-weight: 700;
 }
 
+.topper-dateline {
+  color: @grey-50;
+}
+
 .byline {
   text-align: left;
   display: inline-block;
@@ -214,7 +218,7 @@ h1 {
     font-family: @sans;
     font-size: @s14;
     font-weight: 700;
-    color: @grey-50;
+    color: @grey-75;
   }
 
   @media @tablet {
@@ -223,7 +227,7 @@ h1 {
       font-family: @sans;
       font-size: @s14;
       font-weight: 700;
-      color: @grey-50;
+      color: @grey-75;
     }
   }
 }