j1-template 2021.1.9 → 2021.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97a2ffad558d631cb06dbbac5033bbd4acd2a0fd98d7008418521e49c012e463
-  data.tar.gz: 853ef7944411765e0c17fa317a313ce32a1d0942b64fc6a210add62929eb1a78
+  metadata.gz: ae5b79c95e56c200832abdfc497c3ed788f54303351ea239554c9fbad3fa7f48
+  data.tar.gz: db7b40a09194fc449699ff6f4a21a4b432c7fd2a94e05cff88c598ef6e2ab175
 SHA512:
-  metadata.gz: 3f16a6a99c5c13cee200aa184bb54804f1d7f4f41f32bf301198d44a896c70ebadc5aa7aa148f5a99d135aef24d4367f215f76943c1d65983be35863a10326e4
-  data.tar.gz: 4a29e5243834485b4c7a35174777614e6e31ff17a20b24619069772c60c6cc9ca9b27faf66fec5ce91a4de9de065a7405bc38ce20360d635147aa1c7cf835506
+  metadata.gz: 4315042ef6c11323174b561b7c28bf4ea98fe317b35cfe2ad58ed3856fe3c09a929aa5e2cdb3bd2f9e600c3d6b250a3a21b65e33cd6423e0f22901cc1cdf1961
+  data.tar.gz: 9783b9f09b8e669fb94dc49fe0cae9f5cb23d822591a4371d8f70eee2dadafaaf57c25968b33a0a2d00f3141fcc73ddcd9093402adb72dd2bb09c683aa1fa0c3

data/assets/error_pages/HTTP204.html

@@ -51,7 +51,7 @@ sitemap:                                false
 
 {% if language == 'en' %}
   {% assign title             = "No Content" %}
-  {% assign reason            = "The request processed successfully. <br/> he page has been disabled for technical reasons." %}
+  {% assign reason            = "The request processed successfully. <br/> This page has been disabled for technical reasons." %}
   {% assign contact_issue     = "Technical Contact" %}
 {% endif %}
 

data/assets/themes/j1/adapter/js/cookieConsent.js

@@ -28,14 +28,16 @@ regenerate:                             true
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign environment         = site.environment %}
+{% assign blocks              = site.data.blocks %}
 {% assign modules             = site.data.modules %}
+{% assign template_config     = site.data.j1_config %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign consent_defaults    = modules.defaults.cookieconsent.defaults %}
 {% assign consent_settings    = modules.cookieconsent.settings %}
-{% assign tracking_enabled    = site.data.j1_config.analytics.enabled %}
-{% assign tracking_id         = site.data.j1_config.analytics.google.tracking_id %}
+{% assign tracking_enabled    = template_config.analytics.enabled %}
+{% assign tracking_id         = template_config.analytics.google.tracking_id %}
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -225,20 +227,25 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
         $('#quickLinksCookieButton').css('display', 'block');
       }
 
+      // jadams, 2021-07-11: moded to j1 adapter (displayPage)
+      //
       // NOTE: Warning needs to be moved to another module
       // because page is reloaded after selection
       //
-      if (tracking_enabled && !tracking_id_valid) {
-        logger.warn('tracking enabled, but invalid tracking id found: ' + tracking_id);
+      // if (tracking_enabled && !tracking_id_valid) {
+      //   logger.error('tracking enabled, but invalid tracking id found: ' + tracking_id);
+      // } else {
+      //   logger.warn('tracking enabled, tracking id found: ' + tracking_id);
+      // }
+
+      // for development only
+      if (environment === 'development') {
+        gaCookies.forEach(item => console.log('cookieConsent: ' + item));
       }
 
-      // local adapter
-
-      // for debugging
-      // gaCookies.forEach(item => console.log('cookieConsent: ' + item));
-
       if (user_agent.includes('iPad'))  {
         logger.warn('Product detected : ' + platform.product);
+        logger.warn('Skip deleting (unwanted) cookies for this platform');
       }
 
       // Manage Google Analytics OptIn/Out

data/assets/themes/j1/adapter/js/j1.js

@@ -41,9 +41,9 @@ regenerate:                             true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config         = site.data.j1_config %}
 {% assign blocks                  = site.data.blocks %}
 {% assign modules                 = site.data.modules %}
+{% assign template_config         = site.data.j1_config %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -56,6 +56,8 @@ regenerate:                             true
 {% assign toccer_settings         = modules.toccer.settings %}
 {% assign themer_defaults         = modules.defaults.themer.defaults %}
 {% assign themer_settings         = modules.themer.settings %}
+{% assign tracking_enabled        = template_config.analytics.enabled %}
+{% assign tracking_id             = template_config.analytics.google.tracking_id %}
 
 {% assign authentication_defaults = modules.defaults.authentication.defaults %}
 {% assign authentication_settings = modules.authentication.settings %}
@@ -122,6 +124,11 @@ var j1 = (function () {
   var state                     = 'not_started';
   var mode                      = 'not_detected';
 
+  // Tracking information (GA)
+  var tracking_enabled          = ('{{tracking_enabled}}' === 'true') ? true: false;
+  var tracking_id               = '{{tracking_id}}';
+  var tracking_id_valid         = (tracking_id.includes('tracking-id')) ? false : true;
+
   var current_user_data;
   var current_page;
   var previous_page;
@@ -157,14 +164,13 @@ var j1 = (function () {
   var baseUrl;
   var referrer;
 
+  // initial cookie values
   var cookie_names = {
     'app_session':  '{{template_config.cookies.app_session}}',
     'user_session': '{{template_config.cookies.user_session}}',
     'user_state':   '{{template_config.cookies.user_state}}',
     'user_consent': '{{template_config.cookies.user_consent}}'
   };
-
-  // user SESSION cookie (initial values)
   var user_session = {
     'mode':                 'web',
     'writer':               'web',
@@ -182,7 +188,6 @@ var j1 = (function () {
     'previous_page':        'na',
     'last_pager':           '/pages/public/blog/navigator/'
   };
-
   var user_state = {
     'theme_css':            '',
     'theme_name':           '',
@@ -191,8 +196,7 @@ var j1 = (function () {
     'session_active':       false,
     'last_session_ts':      ''
   };
-
-  var user_consent;
+  var user_consent = {};
 
   // ---------------------------------------------------------------------------
   // helper functions
@@ -223,12 +227,12 @@ var j1 = (function () {
       // -----------------------------------------------------------------------
       // global var (function)
       // -----------------------------------------------------------------------
-      var logger        = log4javascript.getLogger('j1.init');
-      var url           = new liteURL(window.location.href);
-      var baseUrl       = url.origin;
-      var date          = new Date();
-      var timestamp_now = date.toISOString();
-      var curr_state    = 'started';
+      var logger            = log4javascript.getLogger('j1.init');
+      var url               = new liteURL(window.location.href);
+      var baseUrl           = url.origin;
+      var date              = new Date();
+      var timestamp_now     = date.toISOString();
+      var curr_state        = 'started';
 
       // -----------------------------------------------------------------------
       // options loader
@@ -312,7 +316,15 @@ var j1 = (function () {
                             expires:  365
                           });
 
-      user_state.session_active = true;
+      // jadams, 2021-07-11: Found situation that user_state NOT initialized
+      // correctly (user_state == false).
+      // TODO: Check if/why user state (cookie NOT created?) NOT initialized
+      // for what reason.
+      if (!user_state) {
+        logger.warn('user session cookie NOT found');
+        user_state = j1.readCookie(cookie_names.user_state);
+        user_state.session_active = true;
+      }
 
       if (!user_consent.analyses || !user_consent.personalization)  {
         // expire consent|state cookies to session
@@ -821,6 +833,15 @@ var j1 = (function () {
             // display page
             $('#no_flicker').css('display', 'block');
 
+            // NOTE: Placed tracking warning/info here because page may reloaded
+            // after cookie consent selection
+            //
+            if (tracking_enabled && !tracking_id_valid) {
+              logger.error('tracking enabled, but invalid tracking id found: ' + tracking_id);
+            } else {
+              logger.warn('tracking enabled, tracking id found: ' + tracking_id);
+            }
+
             // show|hide cookie icon (should MOVED to Cookiebar ???)
             if (j1.existsCookie(cookie_names.user_consent)) {
               // Display cookie icon
@@ -898,6 +919,15 @@ var j1 = (function () {
           // display page
           $('#no_flicker').css('display', 'block');
 
+          // NOTE: Placed tracking warning/info here because page may reloaded
+          // after cookie consent selection
+          //
+          if (tracking_enabled && !tracking_id_valid) {
+            logger.error('tracking enabled, but invalid tracking id found: ' + tracking_id);
+          } else {
+            logger.warn('tracking enabled, tracking id found: ' + tracking_id);
+          }
+
           logger.info('mode detected: web');
           logger.info('hide signin icon');
           $('#quickLinksSignInOutButton').css('display', 'none');

data/assets/themes/j1/modules/cookieConsent/js/cookieConsent.min.js

@@ -24,278 +24,4 @@
  #  outside of J1 Template!
  # -----------------------------------------------------------------------------
 */
-'use strict';
-
-// -----------------------------------------------------------------------------
-// ESLint shimming
-// -----------------------------------------------------------------------------
-/* eslint indent: "off"                                                       */
-/* eslint no-unused-vars: "off"                                               */
-/* eslint no-undef: "off"                                                     */
-/* eslint no-redeclare: "off"                                                 */
-/* eslint indent: "off"                                                       */
-/* eslint JSUnfilteredForInLoop: "off"                                        */
-// -----------------------------------------------------------------------------
-
-function BootstrapCookieConsent(props) {
-  var logText;
-  var current_page;
-  var whitelisted;
-  var logger                = log4javascript.getLogger('j1.core.bsCookieConsent');
-  var modalId               = "bccs-modal"
-  var self                  = this
-  var detailedSettingsShown = false
-
-  logger.info('Initializing core module: started');
-  logger.info('state: started');
-
-  this.props = {
-    autoShowDialog:         true,                                               // disable autoShowModal on the privacy policy and legal notice pages, to make these pages readable
-    language:               navigator.language,                                 // the language, in which the modal is shown
-    languages:              ["en", "de"],                                       // supported languages (in ./content/), defaults to first in array
-    contentURL:             "./content",                                        // this URL must contain the dialogs content in the needed languages
-    cookieName:             "cookie-consent-settings",                          // the name of the cookie in which the configuration is stored as JSON
-    cookieStorageDays:      365,                                                // the duration the cookie configuration is stored on the client
-    postSelectionCallback:  undefined,                                          // callback function, called after the user has made his selection
-    whitelisted:            [],                                                 // pages NO consent modal page is issued
-    xhr_data_element:       ""                                                  // container for the language-specific consent modal taken from /assets/data/cookieconsent.html
-  }
-
-  for (var property in props) {
-    this.props[property] = props[property];
-  }
-
-  this.language = this.props.language
-  if (this.language.indexOf("-") !== -1) {
-    this.language = this.language.split("-")[0];
-  }
-
-  if (!this.props.languages.includes(this.language)) {
-    this.language = this.props.languages[0];                                    // fallback on default language
-  }
-
-  var Cookie = {
-    set: function (name, value, days) {
-      var value_encoded = window.btoa(value);
-      var expires = "";
-      if (days) {
-        var date = new Date();
-        date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
-        expires = "; expires=" + date.toUTCString();
-      }
-      document.cookie = name + "=" + (value_encoded || "") + expires + "; Path=/; SameSite=Strict;";
-    },
-    get: function (name) {
-    var nameEQ = name + "=";
-    var ca = document.cookie.split(';');
-    for (var i = 0; i < ca.length; i++) {
-      var c = ca[i];
-      while (c.charAt(0) === ' ') {
-        c = c.substring(1, c.length);
-      }
-      if (c.indexOf(nameEQ) === 0) {
-        var value_encoded = c.substring(nameEQ.length, c.length);
-        var value         = window.atob(value_encoded);
-        return value;
-      }
-    }
-    return undefined
-    }
-  }
-
-  var Events = {
-    documentReady: function (onDocumentReady) {
-      if (document.readyState !== 'loading') {
-        onDocumentReady();
-      } else {
-        document.addEventListener('DOMContentLoaded', onDocumentReady);
-      }
-    }
-  }
-
-  function showDialog(options) {
-    Events.documentReady(function () {
-
-      self.modal = document.getElementById(modalId);
-      if (!self.modal) {
-        logger.info('Load consent modal');
-        self.modal = document.createElement("div");
-        self.modal.id = modalId;
-        self.modal.setAttribute("class", "modal fade");
-        self.modal.setAttribute("tabindex", "-1");
-        self.modal.setAttribute("role", "dialog");
-        self.modal.setAttribute("aria-labelledby", modalId);
-        document.body.append(self.modal);
-        self.$modal = $(self.modal);
-
-        if (self.props.postSelectionCallback) {
-          self.$modal.on("hidden.bs.modal", function () {
-            self.props.postSelectionCallback();
-          });
-        }
-
-        // load modal content
-        //
-        var templateUrl = self.props.contentURL + '/' + 'index.html';
-        $.get(templateUrl)
-        .done(function (data) {
-          logger.info('Loading Consent modal: successfully');
-          self.modal.innerHTML = data;
-          self.modal.innerHTML = $('#' + self.props.xhr_data_element).eq(0).html();
-
-          $(self.modal).modal({
-            backdrop: "static",
-            keyboard: false
-          });
-
-          self.$buttonDoNotAgree = $("#bccs-buttonDoNotAgree");
-          self.$buttonAgree = $("#bccs-buttonAgree");
-          self.$buttonSave = $("#bccs-buttonSave");
-          self.$buttonAgreeAll = $("#bccs-buttonAgreeAll");
-
-          logger.info('Load/Initialze options from cookie');
-
-          updateButtons();
-          updateOptionsFromCookie();
-
-          $("#bccs-options").on("hide.bs.collapse", function () {
-            detailedSettingsShown = false;
-            updateButtons();
-          }).on("show.bs.collapse", function () {
-            detailedSettingsShown = true;
-            updateButtons();
-          });
-
-          logger.info('Initialze event handler');
-
-          self.$buttonDoNotAgree.click(function () {
-            doNotAgree();
-          });
-          self.$buttonAgree.click(function () {
-            agreeAll();
-          });
-          self.$buttonSave.click(function () {
-            $("#bccs-options").collapse('hide');
-            saveSettings();
-            updateOptionsFromCookie();
-          });
-          self.$buttonAgreeAll.click(function () {
-            $("#bccs-options").collapse('hide');
-            agreeAll();
-            updateOptionsFromCookie();
-          });
-        })
-        .fail(function () {
-          logger.error('Loading Consent modal: failed');
-          logger.info('Probably no `contentURL` set');
-        })
-      } else {
-        self.$modal.modal("show")
-      }
-    }.bind(this))
-  }
-
-  function updateOptionsFromCookie() {
-    var settings = self.getSettings();
-    if (settings) {
-      for (var setting in settings) {
-        var $checkbox = self.$modal.find("#bccs-options .bccs-option[data-name='" + setting + "'] input[type='checkbox']");
-        $checkbox.prop("checked", settings[setting]);
-      }
-    }
-  }
-
-  function updateButtons() {
-    if (detailedSettingsShown) {
-      self.$buttonDoNotAgree.hide();
-      self.$buttonAgree.hide();
-      self.$buttonSave.show();
-      self.$buttonAgreeAll.show();
-    } else {
-      self.$buttonDoNotAgree.show();
-      self.$buttonAgree.show();
-      self.$buttonSave.hide();
-      self.$buttonAgreeAll.hide();
-    }
-  }
-
-  function gatherOptions(setAllExceptNecessary) {
-    var $options = self.$modal.find("#bccs-options .bccs-option");
-    var options = {};
-    for (var i = 0; i < $options.length; i++) {
-      var option = $options[i];
-      var name = option.getAttribute("data-name");
-      if (name === "necessary") {
-        options[name] = true;
-      } else if (setAllExceptNecessary === undefined) {
-        var $checkbox = $(option).find("input[type='checkbox']");
-        options[name] = $checkbox.prop("checked");
-      } else {
-        options[name] = !!setAllExceptNecessary;
-      }
-    }
-    return options
-  }
-
-  function agreeAll() {
-    Cookie.set(self.props.cookieName, JSON.stringify(gatherOptions(true)), self.props.cookieStorageDays);
-    self.$modal.modal("hide");
-  }
-
-  function doNotAgree() {
-    Cookie.set(self.props.cookieName, JSON.stringify(gatherOptions(false)), self.props.cookieStorageDays);
-    logger.warn('delete cookie: j1.user.consent');
-//  j1.deleteCookie('j1.user.consent');
-    j1.deleteCookie('all');
-    self.$modal.modal('hide')
-    j1.goHome();
-  }
-
-  function saveSettings() {
-    Cookie.set(self.props.cookieName, JSON.stringify(gatherOptions()), self.props.cookieStorageDays);
-    self.$modal.modal("hide");
-  }
-
-  // call consent dialog if no cookie found (except pages whitelisted)
-  //
-  whitelisted  = (this.props.whitelisted.indexOf(window.location.pathname) > -1);
-  if (Cookie.get(this.props.cookieName) === undefined && this.props.autoShowDialog && !whitelisted) {
-    showDialog();
-  }
-
-  // API functions
-  // ---------------------------------------------------------------------------
-
-  logger.info('Initializing core module finished');
-  logger.info('state: finished');
-
-  // show the consent dialog (modal)
-  // ---------------------------------------------------------------------------
-  this.showDialog = function () {
-    whitelisted  = (this.props.whitelisted.indexOf(window.location.pathname) > -1);
-    if (!whitelisted) {
-      showDialog();
-    }
-  }
-
-  // collect settings from consent cookie
-  // ---------------------------------------------------------------------------
-  this.getSettings = function (optionName) {
-    var cookie = Cookie.get(self.props.cookieName);
-    if (cookie) {
-      var settings = JSON.parse(Cookie.get(self.props.cookieName));
-      if (optionName === undefined) {
-          return settings;
-      } else {
-        if (settings) {
-          return settings[optionName];
-        } else {
-          return false;
-        }
-      }
-    } else {
-      return undefined;
-    }
-  } // END getSettings
-
-} // END BootstrapCookieConsent
+"use strict";function BootstrapCookieConsent(c){var g;var e;var q;var r=log4javascript.getLogger("j1.core.bsCookieConsent");var p="bccs-modal";var l=this;var n=false;r.info("Initializing core module: started");r.info("state: started");this.props={autoShowDialog:true,language:navigator.language,languages:["en","de"],contentURL:"./content",cookieName:"cookie-consent-settings",cookieStorageDays:365,postSelectionCallback:undefined,whitelisted:[],xhr_data_element:""};for(var d in c){this.props[d]=c[d]}this.language=this.props.language;if(this.language.indexOf("-")!==-1){this.language=this.language.split("-")[0]}if(!this.props.languages.includes(this.language)){this.language=this.props.languages[0]}var f={set:function(u,v,x){var w=window.btoa(v);var s="";if(x){var t=new Date();t.setTime(t.getTime()+(x*24*60*60*1000));s="; expires="+t.toUTCString()}document.cookie=u+"="+(w||"")+s+"; Path=/; SameSite=Strict;"},get:function(t){var w=t+"=";var s=document.cookie.split(";");for(var u=0;u<s.length;u++){var y=s[u];while(y.charAt(0)===" "){y=y.substring(1,y.length)}if(y.indexOf(w)===0){var x=y.substring(w.length,y.length);var v=window.atob(x);return v}}return undefined}};var k={documentReady:function(s){if(document.readyState!=="loading"){s()}else{document.addEventListener("DOMContentLoaded",s)}}};function j(s){k.documentReady(function(){l.modal=document.getElementById(p);if(!l.modal){r.info("Load consent modal");l.modal=document.createElement("div");l.modal.id=p;l.modal.setAttribute("class","modal fade");l.modal.setAttribute("tabindex","-1");l.modal.setAttribute("role","dialog");l.modal.setAttribute("aria-labelledby",p);document.body.append(l.modal);l.$modal=$(l.modal);if(l.props.postSelectionCallback){l.$modal.on("hidden.bs.modal",function(){l.props.postSelectionCallback()})}var t=l.props.contentURL+"/index.html";$.get(t).done(function(u){r.info("Loading Consent modal: successfully");l.modal.innerHTML=u;l.modal.innerHTML=$("#"+l.props.xhr_data_element).eq(0).html();$(l.modal).modal({backdrop:"static",keyboard:false});l.$buttonDoNotAgree=$("#bccs-buttonDoNotAgree");l.$buttonAgree=$("#bccs-buttonAgree");l.$buttonSave=$("#bccs-buttonSave");l.$buttonAgreeAll=$("#bccs-buttonAgreeAll");r.info("Load/Initialze options from cookie");i();h();$("#bccs-options").on("hide.bs.collapse",function(){n=false;i()}).on("show.bs.collapse",function(){n=true;i()});r.info("Initialze event handler");l.$buttonDoNotAgree.click(function(){b()});l.$buttonAgree.click(function(){m()});l.$buttonSave.click(function(){$("#bccs-options").collapse("hide");o();h()});l.$buttonAgreeAll.click(function(){$("#bccs-options").collapse("hide");m();h()})}).fail(function(){r.error("Loading Consent modal: failed");r.info("Probably no `contentURL` set")})}else{l.$modal.modal("show")}}.bind(this))}function h(){var u=l.getSettings();if(u){for(var t in u){var s=l.$modal.find("#bccs-options .bccs-option[data-name='"+t+"'] input[type='checkbox']");s.prop("checked",u[t])}}}function i(){if(n){l.$buttonDoNotAgree.hide();l.$buttonAgree.hide();l.$buttonSave.show();l.$buttonAgreeAll.show()}else{l.$buttonDoNotAgree.show();l.$buttonAgree.show();l.$buttonSave.hide();l.$buttonAgreeAll.hide()}}function a(t){var s=l.$modal.find("#bccs-options .bccs-option");var v={};for(var w=0;w<s.length;w++){var y=s[w];var u=y.getAttribute("data-name");if(u==="necessary"){v[u]=true}else{if(t===undefined){var x=$(y).find("input[type='checkbox']");v[u]=x.prop("checked")}else{v[u]=!!t}}}return v}function m(){f.set(l.props.cookieName,JSON.stringify(a(true)),l.props.cookieStorageDays);l.$modal.modal("hide")}function b(){f.set(l.props.cookieName,JSON.stringify(a(false)),l.props.cookieStorageDays);r.warn("delete cookie: j1.user.consent");j1.deleteCookie("all");l.$modal.modal("hide");j1.goHome()}function o(){f.set(l.props.cookieName,JSON.stringify(a()),l.props.cookieStorageDays);l.$modal.modal("hide")}q=(this.props.whitelisted.indexOf(window.location.pathname)>-1);if(f.get(this.props.cookieName)===undefined&&this.props.autoShowDialog&&!q){j()}r.info("Initializing core module finished");r.info("state: finished");this.showDialog=function(){q=(this.props.whitelisted.indexOf(window.location.pathname)>-1);if(!q){j()}};this.getSettings=function(t){var s=f.get(l.props.cookieName);if(s){var u=JSON.parse(f.get(l.props.cookieName));if(t===undefined){return u}else{if(u){return u[t]}else{return false}}}else{return undefined}}};

data/lib/j1/version.rb

@@ -1,3 +1,3 @@
 module J1
-  VERSION = '2021.1.9'
+  VERSION = '2021.1.10'
 end

data/lib/starter_web/Gemfile

@@ -54,7 +54,7 @@ gem 'jekyll', '~> 4.2'
 
 # Theme Rubies, default: J1 Template (NOT used for the development system)
 #
-gem 'j1-template', '~> 2021.1.9'
+gem 'j1-template', '~> 2021.1.10'
 
 # ------------------------------------------------------------------------------
 # PRODUCTION: Gem needed for the Jekyll and J1 prod environment

data/lib/starter_web/_config.yml

@@ -53,7 +53,7 @@ environment:                            production
 # ------------------------------------------------------------------------------
 #   Sets the build version of J1 Template Gem
 #
-version:                                2021.1.9
+version:                                2021.1.10
 
 # version
 # ------------------------------------------------------------------------------

data/lib/starter_web/_data/_defaults/private.default.yml

@@ -0,0 +1,119 @@
+# ------------------------------------------------------------------------------
+# ~/_data/private.yml
+# The private.yml file is used to set sensitive private data used by
+# J1 components to configure security and authentication settings
+#
+# Product/Info:
+# https://jekyll.one
+#
+# Copyright (C) 2019 Juergen Adams
+#
+# J1 Template is licensed under the MIT License.
+# See: https://github.com/jekyll-one-org/j1_template/blob/master/LICENSE
+# ------------------------------------------------------------------------------
+# NOTE:
+#   As this file contains very confidential data, a productive private.yml
+#   file should ALWAYS be excluded from ANY source published to the public
+#   (e.g. a repo at Github)
+# ------------------------------------------------------------------------------
+
+
+# ==============================================================================
+# GLOBAL settings
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+global:
+
+  # used by J1 to encrypt cookies
+  session_secret:                       <your-secret-string>
+
+
+# ==============================================================================
+# MODULE settings
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+modules:
+
+  # J1 Webhook
+  # NOTE:
+  # ----------------------------------------------------------------------------
+  webhook:
+
+    comment:
+      name:                             <your-config-name>
+      user:                             <your-gh-user>
+      repo:                             <your-gh-repo>
+      server_url:                       <your-gh-webhook-url>
+
+    secret:                             <your-gh-secret>                        # secret used at GH Webhooks
+    payload_url:                        <your-payload-url>                      # payload url (e.g channel at smee.io)
+
+
+# ==============================================================================
+# # J1 Utility Server
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+util_srv:
+
+  oauth:
+
+    # GH OAuth settings used for J1 Control Center (NetlifyCMS) for the
+    # external OAuth client (base_url)
+    # --------------------------------------------------------------------------
+    comment:
+      name:                           <your-config-name>
+      user:                           <your-gh-user>
+      user_url:                       <your-user-url>
+      strategy:                       members
+      members:                        all
+
+    site_url:                         http://localhost:41010
+    site_redirect_url:                http://localhost:41010/auth/github/callback
+    client_scope:                     repo, user
+    client_id:                        <your-client-id>
+    client_secret:                    <your-client-secret>
+
+
+# ==============================================================================
+# MIDDLEWARE settings
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+middleware:
+
+  # OAuth settings (J1 Auth Client)
+  # ----------------------------------------------------------------------------
+  oauth:
+
+    # --------------------------------------------------------------------------
+    # DISQUS credentials
+    # ==========================================================================
+    disqus:
+
+      # J1 Auth client (mode APP, development system)
+      # ------------------------------------------------------------------------
+      comment:
+        name:                           <your-disqus-config-name>
+        user:                           <your-disqus-user>
+
+      client_url:                       http://localhost:41010
+      client_redirect_url:              http://localhost:41010/auth/disqus/callback
+      client_id:                        <your-disqus-client-id>
+      client_secret:                    <your-disqus-client-secret>
+
+    # --------------------------------------------------------------------------
+    # GITHUB credentials
+    # ==========================================================================
+    github:
+
+      # J1 Auth client (mode APP, development system)
+      # ------------------------------------------------------------------------
+      comment:
+        name:                           <your-gh-config-name>
+        user:                           <your-gh-user>
+        org:                            <your-gh-org>
+        strategy:                       members
+        members:                        all
+
+      client_url:                       http://localhost:41010
+      client_redirect_url:              http://localhost:41010/auth/github/callback
+      client_id:                        <your-gh-client-id>
+      client_secret:                    <your-gh-client-secret>
+
+# ------------------------------------------------------------------------------
+# END

data/lib/starter_web/_data/modules/defaults/cookieconsent.yml

@@ -27,7 +27,7 @@ defaults:
   enabled:                              false
 
   autoShowDialog:                       true                                    # show consent dialog if NO consent cookie found
-  language:                             de                                      # language of the modal is shown. Default: navigator.language
+  language:                             en                                      # language of the modal is shown. Default: navigator.language
   languages:                            [en, de]                                # supported languages, defaults to FIRST language defined by languages
   contentURL:                           /assets/data/cookieconsent              # dialogs content for all languages
   cookieName:                           j1.user.consent                         # name of the consent cookie

data/lib/starter_web/_includes/attributes.asciidoc

@@ -412,7 +412,7 @@ end::tables[]
 // -----------------------------------------------------------------------------
 tag::products[]
 :j1--license:                                     MIT License
-:j1--version:                                     2021.1.9
+:j1--version:                                     2021.1.10
 :j1--site-name:                                   Jekyll One
 end::products[]
 

data/lib/starter_web/_plugins/lunr_index.rb

@@ -360,6 +360,6 @@ end
 
 module Jekyll
   module J1LunrSearch
-    VERSION = '2021.1.9'
+    VERSION = '2021.1.10'
   end
 end

data/lib/starter_web/dot.gitignore

@@ -42,7 +42,7 @@ tmp/
 # Never publish your sensitive personal and/or OAuth
 # data to any repo - not to public, not to any private.
 # ------------------------------------------------------------------------------
-private.yml
+# private.yml
 
 
 # Unneeded files for the generated site

data/lib/starter_web/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "j1_starter",
-  "version": "2021.1.9",
+  "version": "2021.1.10",
   "description": "J1 Template Starter Web",
   "homepage": "https://your.site",
   "author": {

data/lib/starter_web/utilsrv/_defaults/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "utls",
-  "version": "2021.1.9",
+  "version": "2021.1.10",
   "description": "J1 Template Utility Server",
   "homepage": "https://jekyll.one",
   "author": {

data/lib/starter_web/utilsrv/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "utls",
-  "version": "2021.1.9",
+  "version": "2021.1.10",
   "description": "J1 Template Utility Server",
   "homepage": "https://jekyll.one",
   "author": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: j1-template
 version: !ruby/object:Gem::Version
-  version: 2021.1.9
+  version: 2021.1.10
 platform: ruby
 authors:
 - juergen_jekyll_one
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-10 00:00:00.000000000 Z
+date: 2021-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -890,6 +890,7 @@ files:
 - lib/starter_web/_data/_defaults/colors.yml
 - lib/starter_web/_data/_defaults/font_sizes.yml
 - lib/starter_web/_data/_defaults/j1_config.yml
+- lib/starter_web/_data/_defaults/private.default.yml
 - lib/starter_web/_data/_defaults/resources.yml
 - lib/starter_web/_data/apps/carousel.yml
 - lib/starter_web/_data/apps/defaults/carousel.yml