sfc-utils 1.3.25 → 1.3.28

package/README.md

@@ -35,16 +35,18 @@ You can still install what's on master by running `npm i git+https://github.com/
 
 ## Updating utils
 
-Ask Evan for the npm credentials for publishing. Once you have them, these are the steps:
+Create an npm account and ask Evan to add you as a maintainer. You MUST enable two-factor on your account to push updates. Once you are all set, these are the steps:
 
 1. Make sure you've incremented the version number in package.json.
 
 1. Update the master branch with changes you want to push.
 
-1. Log in to npm via the terminal with `npm login`.
+1. Log in to npm via the terminal with `npm login` (this only needs to be done once).
 
 1. Run `npm publish`.
 
+If you want to publish a version of utils that should only be `beta`, not the default install version, then run `npm publish --tag beta` instead. Then when installing, you must target the new version directly: `npm i sfc-utils@1.3.24` 
+
 
 ## Import the functions
 

package/accountswap.js

@@ -12,9 +12,10 @@ const pollForAccount = function(i){
   if (window && window.treg && window.treg.identity && window.treg.identity.id){
     // We got a valid entitlement! Let's see if the button exists and swap our new one in
     const subButton = document.querySelector('#nav2-sub-box')
+    const subButtonText = subButton.querySelector('div')
     if (subButton){
       subButton.setAttribute("href", accountURL)
-      subButton.innerText = "Account"
+      subButtonText.innerText = "Account"
     }
   } else {
     if (i > 10){
@@ -26,4 +27,4 @@ const pollForAccount = function(i){
   }
 }
 
-module.exports = { pollForAccount }
+module.exports = { pollForAccount }

package/copy/c2p_sheet.js

@@ -17,24 +17,24 @@ var path = require("path");
 // let configData = JSON.parse(config)
 
 let googleAuth = (configData) => {
-  var auth = null;
-  authObj
-    .authenticate({ fallback: false })
-    .then((resp) => {
+  return new Promise(resolve => {
+    var auth = null;
+    authObj.authenticate({ fallback: false }).then((resp) => {
       auth = resp;
-      createSheet(auth, false, configData).catch(() => {
+      createSheet(auth, false, configData).then(() => {resolve()}).catch(() => {
         // If the first attempt failed, then make another req using the fallback
         authObj.authenticate({ fallback: true }).then((resp) => {
           auth = resp;
-          createSheet(auth, true, configData);
+          createSheet(auth, true, configData).then(() => {resolve()});
         });
       });
     })
     .catch(() => {
       // Failure if we fall back but there's no token
       auth = authObj.task();
-      createSheet(auth, true, configData);
+      createSheet(auth, true, configData).then(() => {resolve()});
     });
+  })
 };
 
 let createSheet = (auth, fallback, configData) => {

package/css/nav2.less

@@ -70,7 +70,7 @@
   }
   #nav2-sub-box {
     border: none;
-    color:white;
+    color: white;
     text-transform: none;
     text-decoration: underline white;
   }

package/example/.prettierrc

@@ -0,0 +1,5 @@
+{
+  "semi": false,
+  "singleQuote": true,
+  "trailingComma": "es5"
+}

package/example/README.md

@@ -0,0 +1,8 @@
+# {%= app_slug %}
+
+{%= github_desc %}
+
+View the live project: [{%= project_url %}]({%= project_url %})
+
+This project was built with the SFC Newsapp template. For instructions on how to use this template, refer to [the template README](https://github.com/sfchronicle/gatsby-newsapp))
+

package/example/gatsby-config.js

@@ -0,0 +1,131 @@
+// Add SFC utils
+const { getBrands, getNav, getFooter } = require('../index')
+const { getSettings } = require('./tempsettings')
+const { DateTime } = require('luxon');
+
+let settings = getSettings()
+
+let marketKeyArray = [
+  {"markets": ["SFC"], "zone": "America/Los_Angeles"},
+  {"markets": ["Houston","SanAntonio","Texcom"], "zone": "America/Chicago"},
+  {"markets": ["Albany","CT","Midcom"], "zone": "America/New_York"},
+]
+
+let currentZone
+// Find the current market in the array
+for (let region in marketKeyArray){
+  let thisRegion = marketKeyArray[region]
+  if (thisRegion.markets.includes(settings.PROJECT.MARKET_KEY)){
+    currentZone = thisRegion.zone
+  }
+}
+// If we don't have a match, that means we have an invalid market key
+if (!currentZone){
+  console.error("Invalid or undefined MARKET_KEY! See the _key_explainer in project-config to see valid values.")
+  process.exit(1)
+}
+
+// Create computer pub and mod dates
+const dt = DateTime.fromFormat(
+  settings.PROJECT.DATE,
+  'MMMM d, y h:mm a',
+  {zone: currentZone}
+)
+// Convert date to computer-readable time
+const computerPubDate = dt.toISO()
+settings.PROJECT.ISO_PUBDATE = computerPubDate
+
+// If MOD_DATE does not exist, set var to pubdate
+let computerModDate = ""
+if (typeof settings.PROJECT.MOD_DATE !== 'undefined' && settings.PROJECT.MOD_DATE) {
+  const dt2 = DateTime.fromFormat(
+    settings.PROJECT.MOD_DATE,
+    'MMMM d, y h:mm a',
+    {zone: currentZone}
+  )
+    computerModDate = dt2.toISO()
+} else {
+  // Fallback to creation date
+  computerModDate = computerPubDate
+}
+settings.PROJECT.ISO_MODDATE = computerModDate
+
+//Set get the current env var
+const currentEnv = process.env.GATSBY_DEPLOY_ENV
+console.log('Current environment: ' + currentEnv)
+
+// Handle test prefix
+// TODO: Once we embrace the new URL, we can delete this check and hardcode /projects
+let projectsPrefix = ""
+if (settings.PROJECT.SUBFOLDER.toString().indexOf("projects/") === 0){
+  projectsPrefix = "/projects"
+}
+// Set the path prefix for the given deploy (ignored for dev)
+let pathPrefix = '/projects/test-proj/' + settings.PROJECT.SLUG
+if (currentEnv === 'development') {
+  pathPrefix = '/'
+}
+if (currentEnv === 'app') {
+  pathPrefix = projectsPrefix + '/app/' + settings.PROJECT.SLUG
+}
+if (currentEnv === 'production') {
+  pathPrefix =
+    '/' +
+    settings.PROJECT.SUBFOLDER +
+    settings.PROJECT.OPT_SLASH +
+    settings.PROJECT.SLUG
+}
+
+let plugins = [
+  'gatsby-plugin-react-helmet',
+  'gatsby-transformer-json',
+  {
+    resolve: 'gatsby-plugin-less',
+    options: {
+      lessOptions: {
+        modifyVars: getBrands(settings.PROJECT.MARKET_KEY).styles,
+      },
+    },
+  },
+  {
+    resolve: 'gatsby-plugin-html-attributes',
+    options: {
+      lang: 'en',
+    },
+  },
+  {
+    resolve: `gatsby-source-filesystem`,
+    options: {
+      name: `projectData`,
+      path: `${__dirname}/src/data/`,
+    },
+  },
+  {
+    resolve: 'gatsby-plugin-webpack-bundle-analyser-v2',
+    options: {
+      production: true,
+      disable: !process.env.ANALYZE_BUNDLE_SIZE,
+      generateStatsFile: true,
+      analyzerMode: 'static',
+    },
+  },
+  // this (optional) plugin enables Progressive Web App + Offline functionality
+  // To learn more, visit: https://gatsby.app/offline
+  // 'gatsby-plugin-offline',
+]
+
+// Enable preact for the prod build
+if (currentEnv !== "development"){
+  plugins.push("gatsby-plugin-preact")
+}
+
+// TK builds get weird redirect loops with htaccess plugin, so don't use it
+if (settings.PROJECT.MARKET_KEY !== "TK"){
+  plugins.push("gatsby-plugin-htaccess")
+}
+
+module.exports = {
+  siteMetadata: settings,
+  pathPrefix: pathPrefix,
+  plugins: plugins
+}

package/example/gatsby-node.js

@@ -0,0 +1,45 @@
+/**
+ * Implement Gatsby's Node APIs in this file.
+ *
+ * See: https://www.gatsbyjs.org/docs/node-apis/
+ */
+
+ var {requestImage} = require("./tasks/node-helpers");
+
+// Import all the WCM photos you'd like to use in this project
+// NOTE: Leave this as an empty array if you aren't importing any WCM photos, but you won't be able to use the WCMImage component
+const wcmPhotos = [20374215]
+
+// Create nodes so GraphQL can access
+exports.sourceNodes = async ({
+  actions,
+  createNodeId,
+  createContentDigest,
+}) => {
+  const { createNode } = actions
+
+  // Request and push photo data into an array
+  const photoData = [];
+  wcmPhotos.forEach((url) => {
+    photoData.push(requestImage(url))
+  })
+
+  // Take the ratios/ids turn them into graphql nodes
+  await Promise.all(photoData).then((values) => {
+    values.forEach((photo) => {
+      const type = "wcmPhotos";
+      createNode({
+        photo,
+        id: createNodeId(`${type}${photo.wcmid}`),
+        parent: null,
+        children: [],
+        internal: {
+          contentDigest: createContentDigest(photo),
+          type,
+        },
+      })
+    })
+    return
+  })
+  return
+}