@mjhls/mjh-framework 1.0.604-hamMagazine-v5 → 1.0.604-hamMagazine-v7

package/dist/cjs/Auth.js

@@ -22,8 +22,8 @@ var asyncToGenerator = require('./asyncToGenerator-8e707718.js');
 require('./_set-species-4458e975.js');
 var reactBootstrap = require('react-bootstrap');
 var util = require('./util-f2c1b65b.js');
+var index$4 = require('./index-bd6c9f56.js');
 var useSWR = _interopDefault(require('swr'));
-var cookie = require('cookie');
 var Local = _interopDefault(require('passport-local'));
 var mysql = _interopDefault(require('mysql'));
 
@@ -1215,7 +1215,7 @@ var MAX_AGE = 60 * 60 * 8; // 8 hours
 
 function setTokenCookie(res, token, eKey) {
   var cookies_serailized = [];
-  cookies_serailized.push(cookie.serialize(TOKEN_NAME, token, {
+  cookies_serailized.push(index$4.serialize_1(TOKEN_NAME, token, {
     //maxAge: MAX_AGE,  // we want login cookie to expire when browser
     //expires: new Date(Date.now() + MAX_AGE * 1000),
     //httpOnly: true,
@@ -1224,7 +1224,7 @@ function setTokenCookie(res, token, eKey) {
     //sameSite: 'lax',
   }));
 
-  cookies_serailized.push(cookie.serialize('eKey', eKey, {
+  cookies_serailized.push(index$4.serialize_1('eKey', eKey, {
     //maxAge: MAX_AGE,  // we want login cookie to expire when browser
     //expires: new Date(Date.now() + MAX_AGE * 1000),
     //httpOnly: true,
@@ -1238,12 +1238,12 @@ function setTokenCookie(res, token, eKey) {
 
 function removeTokenCookie(res) {
   var cookies_serailized = [];
-  cookies_serailized.push(cookie.serialize(TOKEN_NAME, '', {
+  cookies_serailized.push(index$4.serialize_1(TOKEN_NAME, '', {
     maxAge: -1,
     expires: new Date(Date.now() - MAX_AGE * 1000),
     path: '/'
   }));
-  cookies_serailized.push(cookie.serialize('eKey', '', {
+  cookies_serailized.push(index$4.serialize_1('eKey', '', {
     maxAge: -1,
     expires: new Date(Date.now() - MAX_AGE * 1000),
     path: '/'
@@ -1257,8 +1257,8 @@ function parseCookies(req) {
   if (req.cookies) return req.cookies;
 
   // For pages we do need to parse the cookies.
-  var cookie$1 = req.headers ? req.headers.cookie : null;
-  return cookie.parse(cookie$1 || '');
+  var cookie = req.headers ? req.headers.cookie : null;
+  return index$4.parse_1(cookie || '');
 }
 
 function getTokenCookie(req) {

package/dist/cjs/HamMagazine.js

@@ -100,6 +100,11 @@ var HamMagazine = function HamMagazine(props) {
       searchKey = _useState12[0],
       setSearchKey = _useState12[1];
 
+  var _useState13 = React.useState(0),
+      _useState14 = slicedToArray._slicedToArray(_useState13, 2),
+      topHeight = _useState14[0],
+      setTopHeight = _useState14[1];
+
   React.useEffect(function () {
     // handling the top mast component
     var topNavHeight = document.querySelector('.top-nav-secondary') && document.querySelector('.top-nav-secondary').offsetHeight;
@@ -155,18 +160,15 @@ var HamMagazine = function HamMagazine(props) {
   React.useEffect(function () {
     var navOffsetTop = document.getElementById('navbar-ham') && document.getElementById('navbar-ham').offsetTop;
     var adSection = document.querySelector('.AD728x90');
+    var mastHeadHeight = document.querySelector('.nav-brands') && document.querySelector('.nav-brands').offsetHeight ? document.querySelector('.nav-brands').offsetHeight : 0;
+    setTopHeight(mastHeadHeight);
     if (window.pageYOffset > navOffsetTop) {
       if (navRef.current && navRef.current.style) {
         topNavRef.current.style.paddingBottom = navRef.current.offsetHeight + 'px';
         navRef.current.style.position = 'fixed';
-        navRef.current.style.top = 0;
+        if (mastHeadHeight) navRef.current.style.top = mastHeadHeight + 'px';
         navRef.current.style.width = '100%';
         navRef.current.style.zIndex = '99999';
-        // // Making the search Sticky on scroll
-        // searchRef.current.style.position = 'fixed'
-        // searchRef.current.style.top = `${navRef.current.offsetHeight + 1}px`
-        // searchRef.current.style.zIndex = '99999'
-        // searchRef.current.style.width = '100%'
       }
     }
     var stickyNav = window.addEventListener('scroll', function () {
@@ -177,17 +179,14 @@ var HamMagazine = function HamMagazine(props) {
           navRef.current.style.top = 0;
           navRef.current.style.width = '100%';
           navRef.current.style.zIndex = '99999';
-          // // Making the search Sticky on scroll
-          // searchRef.current.style.position = 'fixed'
-          // searchRef.current.style.top = `${navRef.current.offsetHeight + 1}px`
-          // searchRef.current.style.zIndex = '99999'
-          // searchRef.current.style.width = '100%'
         }
       } else {
         if (navRef.current && navRef.current.style) {
+          var _mastHeadHeight = document.querySelector('.nav-brands') && document.querySelector('.nav-brands').offsetHeight ? document.querySelector('.nav-brands').offsetHeight : 0;
+
           topNavRef.current.style.paddingBottom = '0';
           navRef.current.style.position = 'relative';
-          navRef.current.style.top = '';
+          if (_mastHeadHeight) navRef.current.style.top = _mastHeadHeight + 'px';
           if (adSection) adSection.style.marginTop = '';
         }
       }
@@ -200,6 +199,8 @@ var HamMagazine = function HamMagazine(props) {
   var trackScrolling = function trackScrolling() {
     var offsetTop = navRef.current.getBoundingClientRect().top;
     var navLinks = document.getElementById('nav-links');
+    var mastHeadHeight = document.querySelector('.nav-brands') && document.querySelector('.nav-brands').offsetHeight;
+    if (mastHeadHeight) offsetTop = offsetTop - mastHeadHeight;
     if (offsetTop <= 0) {
       setIsSticky(true);
       navLinks.style.margin = 'auto';
@@ -469,7 +470,7 @@ var HamMagazine = function HamMagazine(props) {
     ),
     React__default.createElement(
       Navbar,
-      { id: 'navbar-ham', variant: 'dark', expand: 'xl', bg: 'primary', ref: navRef, style: { width: '100%', display: 'flex' } },
+      { id: 'navbar-ham', variant: 'dark', expand: 'xl', bg: 'primary', ref: navRef, style: { width: '100%', display: 'flex', top: topHeight } },
       React__default.createElement(
         Container,
         { className: 'mobile-nav' },
@@ -503,9 +504,9 @@ var HamMagazine = function HamMagazine(props) {
               { jsx: 'true' },
               '\n                @media screen and (max-width: 1199px) {\n                  .site-logo-wrapper {\n                    display: block !important;\n                    margin: auto;\n                  }\n                  .site-logo-wrapper img {\n                    object-fit: contain;\n                    max-height: 45px;\n                  }\n                  .nav-mobile-logo {\n                    display: none !important;\n                  }\n                }\n                @media screen and (max-width: 767px) {\n                  .site-logo-wrapper {\n                    padding-right: 10%;\n                  }\n                }\n                @media screen and (max-width: 420px) {\n                  .site-logo-wrapper img {\n                    max-width: 200px;\n                  }\n                }\n              '
             )
-          ),
-          socialSearchComponent('mobile')
+          )
         ),
+        socialSearchComponent('mobile'),
         React__default.createElement(
           'div',
           { className: 'hamburger-menu-list', style: { width: '100%', maxHeight: '80vh' } },

package/dist/cjs/View.js

@@ -56,9 +56,9 @@ var keys$1 = require('./keys-a586b7a0.js');
 require('react-bootstrap/Dropdown');
 var getKeywords = require('./getKeywords.js');
 var getSeriesDetail = require('./getSeriesDetail.js');
-require('nookies');
-var getQuery = require('./getQuery.js');
+require('./index-bd6c9f56.js');
 var getRelatedArticle = require('./getRelatedArticle.js');
+var getQuery = require('./getQuery.js');
 var getTargeting = require('./getTargeting-5a0b8ee4.js');
 var urlFor = require('./urlFor.js');
 

package/dist/cjs/getRelatedArticle.js

@@ -1,6 +1,6 @@
 'use strict';
 
-require('./_commonjsHelpers-06173234.js');
+var _commonjsHelpers = require('./_commonjsHelpers-06173234.js');
 require('./_to-object-329a650b.js');
 require('./core.get-iterator-method-41e87ec1.js');
 require('./_library-dd23b178.js');
@@ -8,9 +8,358 @@ require('./_iter-detect-4d0352f8.js');
 require('./web.dom.iterable-43c3e277.js');
 var asyncToGenerator = require('./asyncToGenerator-8e707718.js');
 require('./_set-species-4458e975.js');
-var nookies = require('nookies');
+var index$4 = require('./index-bd6c9f56.js');
 var getQuery = require('./getQuery.js');
 
+var defaultParseOptions = {
+  decodeValues: true,
+  map: false,
+  silent: false,
+};
+
+function isNonEmptyString(str) {
+  return typeof str === "string" && !!str.trim();
+}
+
+function parseString(setCookieValue, options) {
+  var parts = setCookieValue.split(";").filter(isNonEmptyString);
+  var nameValue = parts.shift().split("=");
+  var name = nameValue.shift();
+  var value = nameValue.join("="); // everything after the first =, joined by a "=" if there was more than one part
+
+  options = options
+    ? Object.assign({}, defaultParseOptions, options)
+    : defaultParseOptions;
+
+  var cookie = {
+    name: name, // grab everything before the first =
+    value: options.decodeValues ? decodeURIComponent(value) : value, // decode cookie value
+  };
+
+  parts.forEach(function (part) {
+    var sides = part.split("=");
+    var key = sides.shift().trimLeft().toLowerCase();
+    var value = sides.join("=");
+    if (key === "expires") {
+      cookie.expires = new Date(value);
+    } else if (key === "max-age") {
+      cookie.maxAge = parseInt(value, 10);
+    } else if (key === "secure") {
+      cookie.secure = true;
+    } else if (key === "httponly") {
+      cookie.httpOnly = true;
+    } else if (key === "samesite") {
+      cookie.sameSite = value;
+    } else {
+      cookie[key] = value;
+    }
+  });
+
+  return cookie;
+}
+
+function parse(input, options) {
+  options = options
+    ? Object.assign({}, defaultParseOptions, options)
+    : defaultParseOptions;
+
+  if (!input) {
+    if (!options.map) {
+      return [];
+    } else {
+      return {};
+    }
+  }
+
+  if (input.headers && input.headers["set-cookie"]) {
+    // fast-path for node.js (which automatically normalizes header names to lower-case
+    input = input.headers["set-cookie"];
+  } else if (input.headers) {
+    // slow-path for other environments - see #25
+    var sch =
+      input.headers[
+        Object.keys(input.headers).find(function (key) {
+          return key.toLowerCase() === "set-cookie";
+        })
+      ];
+    // warn if called on a request-like object with a cookie header rather than a set-cookie header - see #34, 36
+    if (!sch && input.headers.cookie && !options.silent) {
+      console.warn(
+        "Warning: set-cookie-parser appears to have been called on a request object. It is designed to parse Set-Cookie headers from responses, not Cookie headers from requests. Set the option {silent: true} to suppress this warning."
+      );
+    }
+    input = sch;
+  }
+  if (!Array.isArray(input)) {
+    input = [input];
+  }
+
+  options = options
+    ? Object.assign({}, defaultParseOptions, options)
+    : defaultParseOptions;
+
+  if (!options.map) {
+    return input.filter(isNonEmptyString).map(function (str) {
+      return parseString(str, options);
+    });
+  } else {
+    var cookies = {};
+    return input.filter(isNonEmptyString).reduce(function (cookies, str) {
+      var cookie = parseString(str, options);
+      cookies[cookie.name] = cookie;
+      return cookies;
+    }, cookies);
+  }
+}
+
+/*
+  Set-Cookie header field-values are sometimes comma joined in one string. This splits them without choking on commas
+  that are within a single set-cookie field-value, such as in the Expires portion.
+
+  This is uncommon, but explicitly allowed - see https://tools.ietf.org/html/rfc2616#section-4.2
+  Node.js does this for every header *except* set-cookie - see https://github.com/nodejs/node/blob/d5e363b77ebaf1caf67cd7528224b651c86815c1/lib/_http_incoming.js#L128
+  React Native's fetch does this for *every* header, including set-cookie.
+
+  Based on: https://github.com/google/j2objc/commit/16820fdbc8f76ca0c33472810ce0cb03d20efe25
+  Credits to: https://github.com/tomball for original and https://github.com/chrusart for JavaScript implementation
+*/
+function splitCookiesString(cookiesString) {
+  if (Array.isArray(cookiesString)) {
+    return cookiesString;
+  }
+  if (typeof cookiesString !== "string") {
+    return [];
+  }
+
+  var cookiesStrings = [];
+  var pos = 0;
+  var start;
+  var ch;
+  var lastComma;
+  var nextStart;
+  var cookiesSeparatorFound;
+
+  function skipWhitespace() {
+    while (pos < cookiesString.length && /\s/.test(cookiesString.charAt(pos))) {
+      pos += 1;
+    }
+    return pos < cookiesString.length;
+  }
+
+  function notSpecialChar() {
+    ch = cookiesString.charAt(pos);
+
+    return ch !== "=" && ch !== ";" && ch !== ",";
+  }
+
+  while (pos < cookiesString.length) {
+    start = pos;
+    cookiesSeparatorFound = false;
+
+    while (skipWhitespace()) {
+      ch = cookiesString.charAt(pos);
+      if (ch === ",") {
+        // ',' is a cookie separator if we have later first '=', not ';' or ','
+        lastComma = pos;
+        pos += 1;
+
+        skipWhitespace();
+        nextStart = pos;
+
+        while (pos < cookiesString.length && notSpecialChar()) {
+          pos += 1;
+        }
+
+        // currently special character
+        if (pos < cookiesString.length && cookiesString.charAt(pos) === "=") {
+          // we found cookies separator
+          cookiesSeparatorFound = true;
+          // pos is inside the next cookie, so back up and return it.
+          pos = nextStart;
+          cookiesStrings.push(cookiesString.substring(start, lastComma));
+          start = pos;
+        } else {
+          // in param ',' or param separator ';',
+          // we continue from that comma
+          pos = lastComma + 1;
+        }
+      } else {
+        pos += 1;
+      }
+    }
+
+    if (!cookiesSeparatorFound || pos >= cookiesString.length) {
+      cookiesStrings.push(cookiesString.substring(start, cookiesString.length));
+    }
+  }
+
+  return cookiesStrings;
+}
+
+var setCookie = parse;
+var parse_1 = parse;
+var parseString_1 = parseString;
+var splitCookiesString_1 = splitCookiesString;
+setCookie.parse = parse_1;
+setCookie.parseString = parseString_1;
+setCookie.splitCookiesString = splitCookiesString_1;
+
+var dist = _commonjsHelpers.createCommonjsModule(function (module, exports) {
+var __assign = (_commonjsHelpers.commonjsGlobal && _commonjsHelpers.commonjsGlobal.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.destroyCookie = exports.setCookie = exports.parseCookies = void 0;
+
+
+var isBrowser = function () { return typeof window !== 'undefined'; };
+function hasSameProperties(a, b) {
+    var aProps = Object.getOwnPropertyNames(a);
+    var bProps = Object.getOwnPropertyNames(b);
+    if (aProps.length !== bProps.length) {
+        return false;
+    }
+    for (var i = 0; i < aProps.length; i++) {
+        var propName = aProps[i];
+        if (a[propName] !== b[propName]) {
+            return false;
+        }
+    }
+    return true;
+}
+/**
+ * Compare the cookie and return true if the cookies has equivalent
+ * options and the cookies would be overwritten in the browser storage.
+ *
+ * @param a first Cookie for comparison
+ * @param b second Cookie for comparison
+ */
+function areCookiesEqual(a, b) {
+    var sameSiteSame = a.sameSite === b.sameSite;
+    if (typeof a.sameSite === 'string' && typeof b.sameSite === 'string') {
+        sameSiteSame = a.sameSite.toLowerCase() === b.sameSite.toLowerCase();
+    }
+    return (hasSameProperties(__assign(__assign({}, a), { sameSite: undefined }), __assign(__assign({}, b), { sameSite: undefined })) && sameSiteSame);
+}
+/**
+ * Create an instance of the Cookie interface
+ *
+ * @param name name of the Cookie
+ * @param value value of the Cookie
+ * @param options Cookie options
+ */
+function createCookie(name, value, options) {
+    var sameSite = options.sameSite;
+    if (sameSite === true) {
+        sameSite = 'strict';
+    }
+    if (sameSite === undefined || sameSite === false) {
+        sameSite = 'lax';
+    }
+    var cookieToSet = __assign(__assign({}, options), { sameSite: sameSite });
+    delete cookieToSet.encode;
+    return __assign({ name: name, value: value }, cookieToSet);
+}
+/**
+ *
+ * Parses cookies.
+ *
+ * @param ctx
+ * @param options
+ */
+function parseCookies(ctx, options) {
+    if (ctx && ctx.req && ctx.req.headers && ctx.req.headers.cookie) {
+        return index$4.cookie.parse(ctx.req.headers.cookie, options);
+    }
+    if (isBrowser()) {
+        return index$4.cookie.parse(document.cookie, options);
+    }
+    return {};
+}
+exports.parseCookies = parseCookies;
+/**
+ *
+ * Sets a cookie.
+ *
+ * @param ctx
+ * @param name
+ * @param value
+ * @param options
+ */
+function setCookie$1(ctx, name, value, options) {
+    if (ctx && ctx.res && ctx.res.getHeader && ctx.res.setHeader) {
+        var cookies = ctx.res.getHeader('Set-Cookie') || [];
+        if (typeof cookies === 'string')
+            cookies = [cookies];
+        if (typeof cookies === 'number')
+            cookies = [];
+        var parsedCookies = setCookie.parse(cookies);
+        var cookiesToSet_1 = [];
+        parsedCookies.forEach(function (parsedCookie) {
+            if (!areCookiesEqual(parsedCookie, createCookie(name, value, options))) {
+                cookiesToSet_1.push(index$4.cookie.serialize(parsedCookie.name, parsedCookie.value, __assign({ encode: function (val) { return val; } }, parsedCookie)));
+            }
+        });
+        cookiesToSet_1.push(index$4.cookie.serialize(name, value, options));
+        if (!ctx.res.finished) {
+            ctx.res.setHeader('Set-Cookie', cookiesToSet_1);
+        }
+    }
+    if (isBrowser()) {
+        if (options && options.httpOnly) {
+            throw new Error('Can not set a httpOnly cookie in the browser.');
+        }
+        document.cookie = index$4.cookie.serialize(name, value, options);
+    }
+    return {};
+}
+exports.setCookie = setCookie$1;
+/**
+ *
+ * Destroys a cookie with a particular name.
+ *
+ * @param ctx
+ * @param name
+ * @param options
+ */
+function destroyCookie(ctx, name, options) {
+    var opts = __assign(__assign({}, (options || {})), { maxAge: -1 });
+    if (ctx && ctx.res && ctx.res.setHeader && ctx.res.getHeader) {
+        var cookies = ctx.res.getHeader('Set-Cookie') || [];
+        if (typeof cookies === 'string')
+            cookies = [cookies];
+        if (typeof cookies === 'number')
+            cookies = [];
+        cookies.push(index$4.cookie.serialize(name, '', opts));
+        ctx.res.setHeader('Set-Cookie', cookies);
+    }
+    if (isBrowser()) {
+        document.cookie = index$4.cookie.serialize(name, '', opts);
+    }
+    return {};
+}
+exports.destroyCookie = destroyCookie;
+exports.default = {
+    set: setCookie$1,
+    get: parseCookies,
+    destroy: destroyCookie,
+};
+
+});
+
+_commonjsHelpers.unwrapExports(dist);
+var dist_1 = dist.destroyCookie;
+var dist_2 = dist.setCookie;
+var dist_3 = dist.parseCookies;
+
 var _this = undefined;
 
 var getRelatedArticle = function () {
@@ -63,13 +412,13 @@ var getRelatedArticle = function () {
             conditions = '';
 
             if (ctx && url) {
-              cookies = nookies.parseCookies(ctx);
+              cookies = dist_3(ctx);
               prevSlugs = cookies['prevSlugs'];
 
               if (!!prevSlugs) {
-                nookies.setCookie(ctx, 'prevSlugs', prevSlugs + ',"' + url + '"', {});
+                dist_2(ctx, 'prevSlugs', prevSlugs + ',"' + url + '"', {});
                 conditions = '&& !(url.current in [' + prevSlugs + '])';
-              } else nookies.setCookie(ctx, 'prevSlugs', '"' + url + '"', {});
+              } else dist_2(ctx, 'prevSlugs', '"' + url + '"', {});
             }
             relatedArticleQuery = getQuery('related', conditions, '', articleCount);
             _context.next = 12;