j1-template 2021.1.13 → 2021.1.18

data/assets/themes/j1/modules/themeSwitcher/js/switcher.js

@@ -47,16 +47,21 @@
 
   var old = $.fn.bootstrapThemeSwitcher;
 
-  var cookie_names              = j1.getCookieNames();
-  const user_state_cookie_name  = cookie_names.user_state;
+  var cookie_names      = j1.getCookieNames();
+  var gaCookies         = j1.findCookie('_ga');
+  var j1Cookies         = j1.findCookie('j1');
+  var url               = new liteURL(window.location.href);
+  var hostname          = url.hostname;
+  var domain            = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
+  var secure            = (url.protocol.includes('https')) ? true : false;
 
   var logger = log4javascript.getLogger('j1.core.switcher');
   var logText;
 
   var user_state_detected;
-  var j1_user_state = {};
-  var j1_user_state_json;
-  var j1_user_state_cookie;
+  var user_state = {};
+  var user_state_json;
+  var user_state_cookie;
 
   // Constructor
   // ---------------------------------------------------------------------------
@@ -112,27 +117,29 @@
     // -------------------------------------------------------------------------
     switchTheme: function (name, cssFile) {
 
-      var $this             = $(this);
-      var settings          = $.extend({}, $.fn.bootstrapThemeSwitcher.defaults, $this.data('bootstrapThemeSwitcher'));
+      var $this      = $(this);
+      var settings   = $.extend({}, $.fn.bootstrapThemeSwitcher.defaults, $this.data('bootstrapThemeSwitcher'));
+      var id         = settings.cssThemeLink;
+      var debug      = settings.debug;
+      var includeCSS = this.settings.includeBootswatch;
       var themeName;
       var theme_css;
-      var theme_extension_css;
-
-      var id                = settings.cssThemeLink;
-      var debug             = settings.debug;
-      var includeCSS        = this.settings.includeBootswatch;
 
       // detect|set user state cookie
-      user_state_detected = j1.existsCookie ( 'j1.user.state' );
+      user_state_detected = j1.existsCookie (cookie_names.user_state);
       if ( user_state_detected ) {
-        logger.debug('\n' + 'cookie found: j1.user.state');
-        j1_user_state = j1.readCookie(user_state_cookie_name);
+        logger.debug('\n' + 'cookie found: ' + cookie_names.user_state);
+        user_state = j1.readCookie(cookie_names.user_state);
       } else {
-        logger.error('\n' + 'cookie not found: j1.user.state');
+        logger.error('\n' + 'cookie not found: ' + cookie_names.user_state);
+        logger.debug('\n' + 'j1 cookies found:' + j1Cookies.length);
+        j1Cookies.forEach(item => console.log('j1.core.switcher: ' + item));
+        logger.debug('\n' + 'ga cookies found:' + gaCookies.length);
+        gaCookies.forEach(item => console.log('j1.core.switcher: ' + item));
       }
 
-      themeName           = j1_user_state.theme_name;
-      theme_css           = j1_user_state.theme_css;
+      themeName = user_state.theme_name;
+      theme_css = user_state.theme_css;
 
       if (typeof cssFile === 'undefined') { cssFile = this.settings.defaultCssFile; }
       if (typeof name === 'undefined') { name = cssFile; }
@@ -146,26 +153,30 @@
           return false;
         }
 
-        j1_user_state.theme_name  = name;
-        j1_user_state.theme_css   = cssFile;
+        user_state.theme_name  = name;
+        user_state.theme_css   = cssFile;
 
-        if (!(j1_user_state.theme_name.includes('Uno') || j1_user_state.theme_name == 'Bootstrap')) {
-          j1_user_state.theme_author        = 'Bootswatch';
-          j1_user_state.theme_author_url    = 'https://bootswatch.com/';
+        if (!(user_state.theme_name.includes('Uno') || user_state.theme_name == 'Bootstrap')) {
+          user_state.theme_author        = 'Bootswatch';
+          user_state.theme_author_url    = 'https://bootswatch.com/';
         } else {
-          j1_user_state.theme_author        = 'J1 Team';
-          j1_user_state.theme_author_url    = 'https://jekyll.one/';
+          user_state.theme_author        = 'J1 Team';
+          user_state.theme_author_url    = 'https://jekyll.one/';
         }
 
+        logger.debug('\n' + 'write to cookie : ' + cookie_names.user_state);
         j1.writeCookie({
-          name: user_state_cookie_name,
-          data: j1_user_state
+          name: cookie_names.user_state,
+          data: user_state,
+          samesite: 'Strict',
+          secure:   secure,
+          expires:  365
         });
 
         // reload current page (skip cache)
         location.reload(true);
       } else {
-        logger.warn('\n' + 'write to cookie : disabled');
+        logger.debug('\n' + 'write to cookie : disabled');
         logger.warn('\n' + 'selected theme not activated: ' + name);
       } // END if saveToCookie
 
@@ -184,17 +195,21 @@
       var settings = $.extend({}, $.fn.bootstrapThemeSwitcher.defaults, options);
 
       // detect|set user state cookie
-      user_state_detected = j1.existsCookie ( 'j1.user.state' );
+      user_state_detected = j1.existsCookie (cookie_names.user_state);
 
       if ( user_state_detected ) {
-        logger.info('\n' + 'cookie found: j1.user.state');
-        j1_user_state = j1.readCookie(user_state_cookie_name);
+        logger.info('\n' + 'cookie found: ' + cookie_names.user_state);
+        user_state = j1.readCookie(cookie_names.user_state);
       } else {
-        logger.error('\n' + 'cookie not found: j1.user.state');
+        logger.error('\n' + 'cookie not found: ' + cookie_names.user_state);
+        logger.debug('\n' + 'j1 cookies found:' + j1Cookies.length);
+        j1Cookies.forEach(item => console.log('j1.core.switcher: ' + item));
+        logger.debug('\n' + 'ga cookies found:' + gaCookies.length);
+        gaCookies.forEach(item => console.log('j1.core.switcher: ' + item));
       }
 
-      var themeName = j1_user_state.theme_name;
-      var themeCss  = j1_user_state.theme_css;
+      var themeName = user_state.theme_name;
+      var themeCss  = user_state.theme_css;
       this.switchTheme(themeName, themeCss);
 
     }, // END loadThemeFromCookie
@@ -247,22 +262,26 @@
       var base = this;
 
       if (this.$element.is('ul')) {
-        var $this             = $(this);
-        var settings          = $.extend({}, $.fn.bootstrapThemeSwitcher.defaults, $this.data('bootstrapThemeSwitcher'));
-        var id                = settings.cssThemeLink;
+        var $this    = $(this);
+        var settings = $.extend({}, $.fn.bootstrapThemeSwitcher.defaults, $this.data('bootstrapThemeSwitcher'));
+        var id       = settings.cssThemeLink;
+        var debug    = settings.debug;
         var themeName;
-        var debug             = settings.debug;
 
         // detect|set user state cookie
-        user_state_detected = j1.existsCookie ( 'j1.user.state' );
+        user_state_detected = j1.existsCookie (cookie_names.user_state);
         if ( user_state_detected ) {
           logger.debug('\n' + 'user state cookie found');
-          j1_user_state = j1.readCookie(user_state_cookie_name);
+          user_state = j1.readCookie(cookie_names.user_state);
         } else {
           logger.error('\n' + 'user state NOT cookie found');
+          logger.debug('\n' + 'j1 cookies found:' + j1Cookies.length);
+          j1Cookies.forEach(item => console.log('j1.core.switcher: ' + item));
+          logger.debug('\n' + 'ga cookies found:' + gaCookies.length);
+          gaCookies.forEach(item => console.log('j1.core.switcher: ' + item));
         }
 
-        themeName = j1_user_state.theme_name;
+        themeName = user_state.theme_name;
 
         if ( debug === 'true' ) {
           logger.debug('\n' + 'bootstrapThemeSelector: UL element selected');

data/assets/themes/j1/modules/themeSwitcher/js/switcher.min.js

@@ -47,16 +47,21 @@
 
   var old = $.fn.bootstrapThemeSwitcher;
 
-  var cookie_names              = j1.getCookieNames();
-  const user_state_cookie_name  = cookie_names.user_state;
+  var cookie_names      = j1.getCookieNames();
+  var gaCookies         = j1.findCookie('_ga');
+  var j1Cookies         = j1.findCookie('j1');
+  var url               = new liteURL(window.location.href);
+  var hostname          = url.hostname;
+  var domain            = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
+  var secure            = (url.protocol.includes('https')) ? true : false;
 
   var logger = log4javascript.getLogger('j1.core.switcher');
   var logText;
 
   var user_state_detected;
-  var j1_user_state = {};
-  var j1_user_state_json;
-  var j1_user_state_cookie;
+  var user_state = {};
+  var user_state_json;
+  var user_state_cookie;
 
   // Constructor
   // ---------------------------------------------------------------------------
@@ -75,13 +80,13 @@
   // ---------------------------------------------------------------------------
   BootstrapThemeSwitcher.prototype = {
     clear: function () {
-      logger.debug('bootstrapThemeSwitcher.clear');
+      logger.debug('\n' + 'bootstrapThemeSwitcher.clear');
       return this.$element.each(function () {
         this.$element.empty();
       });
     },
     update: function () {
-      logger.debug('bootstrapThemeSwitcher.update');
+      logger.debug('\n' + 'bootstrapThemeSwitcher.update');
       this.getThemes();
     },
 
@@ -112,27 +117,29 @@
     // -------------------------------------------------------------------------
     switchTheme: function (name, cssFile) {
 
-      var $this             = $(this);
-      var settings          = $.extend({}, $.fn.bootstrapThemeSwitcher.defaults, $this.data('bootstrapThemeSwitcher'));
+      var $this      = $(this);
+      var settings   = $.extend({}, $.fn.bootstrapThemeSwitcher.defaults, $this.data('bootstrapThemeSwitcher'));
+      var id         = settings.cssThemeLink;
+      var debug      = settings.debug;
+      var includeCSS = this.settings.includeBootswatch;
       var themeName;
       var theme_css;
-      var theme_extension_css;
-
-      var id                = settings.cssThemeLink;
-      var debug             = settings.debug;
-      var includeCSS        = this.settings.includeBootswatch;
 
       // detect|set user state cookie
-      user_state_detected = j1.existsCookie ( 'j1.user.state' );
+      user_state_detected = j1.existsCookie (cookie_names.user_state);
       if ( user_state_detected ) {
-        logger.debug('cookie found: j1.user.state');
-        j1_user_state = j1.readCookie(user_state_cookie_name);
+        logger.debug('\n' + 'cookie found: ' + cookie_names.user_state);
+        user_state = j1.readCookie(cookie_names.user_state);
       } else {
-        logger.error('cookie not found: j1.user.state');
+        logger.error('\n' + 'cookie not found: ' + cookie_names.user_state);
+        logger.debug('\n' + 'j1 cookies found:' + j1Cookies.length);
+        j1Cookies.forEach(item => console.log('j1.core.switcher: ' + item));
+        logger.debug('\n' + 'ga cookies found:' + gaCookies.length);
+        gaCookies.forEach(item => console.log('j1.core.switcher: ' + item));
       }
 
-      themeName           = j1_user_state.theme_name;
-      theme_css           = j1_user_state.theme_css;
+      themeName = user_state.theme_name;
+      theme_css = user_state.theme_css;
 
       if (typeof cssFile === 'undefined') { cssFile = this.settings.defaultCssFile; }
       if (typeof name === 'undefined') { name = cssFile; }
@@ -141,33 +148,36 @@
       if (settings.saveToCookie) {
         if ( typeof Cookies === 'undefined' ) {
           if ( debug === 'true' ) {
-            logger.error('cookies library not present');
+            logger.error('\n' + 'cookies library not present');
           }
           return false;
         }
 
-        j1_user_state.theme_name  = name;
-        j1_user_state.theme_css   = cssFile;
+        user_state.theme_name  = name;
+        user_state.theme_css   = cssFile;
 
-        if (!(j1_user_state.theme_name.includes('Uno') || j1_user_state.theme_name == 'Bootstrap')) {
-          j1_user_state.theme_author        = 'Bootswatch';
-          j1_user_state.theme_author_url    = 'https://bootswatch.com/';
+        if (!(user_state.theme_name.includes('Uno') || user_state.theme_name == 'Bootstrap')) {
+          user_state.theme_author        = 'Bootswatch';
+          user_state.theme_author_url    = 'https://bootswatch.com/';
         } else {
-          j1_user_state.theme_author        = 'J1 Team';
-          j1_user_state.theme_author_url    = 'https://jekyll.one/';
+          user_state.theme_author        = 'J1 Team';
+          user_state.theme_author_url    = 'https://jekyll.one/';
         }
 
+        logger.debug('\n' + 'write to cookie : ' + cookie_names.user_state);
         j1.writeCookie({
-          name: user_state_cookie_name,
-          data: j1_user_state
+          name: cookie_names.user_state,
+          data: user_state,
+          samesite: 'Strict',
+          secure:   secure,
+          expires:  365
         });
 
-        // force reload the page from the server (skip cache)
-        // and detect selected theme from cookie
+        // reload current page (skip cache)
         location.reload(true);
       } else {
-        logger.warn('write to cookie : disabled');
-        logger.warn('selected theme not activated: ' + name);
+        logger.debug('\n' + 'write to cookie : disabled');
+        logger.warn('\n' + 'selected theme not activated: ' + name);
       } // END if saveToCookie
 
     }, // END switchTheme
@@ -178,24 +188,28 @@
     loadThemeFromCookie: function (options) {
 
       if ( typeof Cookies === 'undefined' ) {
-        logger.error('cookies library not present');
+        logger.error('\n' + 'cookies library not present');
         return false;
       }
 
       var settings = $.extend({}, $.fn.bootstrapThemeSwitcher.defaults, options);
 
       // detect|set user state cookie
-      user_state_detected = j1.existsCookie ( 'j1.user.state' );
+      user_state_detected = j1.existsCookie (cookie_names.user_state);
 
       if ( user_state_detected ) {
-        logger.info('cookie found: j1.user.state');
-        j1_user_state = j1.readCookie(user_state_cookie_name);
+        logger.info('\n' + 'cookie found: ' + cookie_names.user_state);
+        user_state = j1.readCookie(cookie_names.user_state);
       } else {
-        logger.error('cookie not found: j1.user.state');
+        logger.error('\n' + 'cookie not found: ' + cookie_names.user_state);
+        logger.debug('\n' + 'j1 cookies found:' + j1Cookies.length);
+        j1Cookies.forEach(item => console.log('j1.core.switcher: ' + item));
+        logger.debug('\n' + 'ga cookies found:' + gaCookies.length);
+        gaCookies.forEach(item => console.log('j1.core.switcher: ' + item));
       }
 
-      var themeName = j1_user_state.theme_name;
-      var themeCss  = j1_user_state.theme_css;
+      var themeName = user_state.theme_name;
+      var themeCss  = user_state.theme_css;
       this.switchTheme(themeName, themeCss);
 
     }, // END loadThemeFromCookie
@@ -215,11 +229,11 @@
     // -------------------------------------------------------------------------
     addThemesToControl: function() {
       if (typeof this.$element === 'undefined') {
-        logger.error('bootstrapThemeSelector|addThemesToControl: Element is undefined');
+        logger.error('\n' + 'bootstrapThemeSelector|addThemesToControl: Element is undefined');
         return false;
       }
       if (typeof this.themesList === 'undefined') {
-        logger.error('bootstrapThemeSelector|addThemesToControl: Themes is undefined');
+        logger.error('\n' + 'bootstrapThemeSelector|addThemesToControl: Themes is undefined');
         return false;
       }
 
@@ -248,25 +262,29 @@
       var base = this;
 
       if (this.$element.is('ul')) {
-        var $this             = $(this);
-        var settings          = $.extend({}, $.fn.bootstrapThemeSwitcher.defaults, $this.data('bootstrapThemeSwitcher'));
-        var id                = settings.cssThemeLink;
+        var $this    = $(this);
+        var settings = $.extend({}, $.fn.bootstrapThemeSwitcher.defaults, $this.data('bootstrapThemeSwitcher'));
+        var id       = settings.cssThemeLink;
+        var debug    = settings.debug;
         var themeName;
-        var debug             = settings.debug;
 
         // detect|set user state cookie
-        user_state_detected = j1.existsCookie ( 'j1.user.state' );
+        user_state_detected = j1.existsCookie (cookie_names.user_state);
         if ( user_state_detected ) {
-          logger.debug('User state cookie found');
-          j1_user_state = j1.readCookie(user_state_cookie_name);
+          logger.debug('\n' + 'user state cookie found');
+          user_state = j1.readCookie(cookie_names.user_state);
         } else {
-          logger.error('User state NOT cookie found');
+          logger.error('\n' + 'user state NOT cookie found');
+          logger.debug('\n' + 'j1 cookies found:' + j1Cookies.length);
+          j1Cookies.forEach(item => console.log('j1.core.switcher: ' + item));
+          logger.debug('\n' + 'ga cookies found:' + gaCookies.length);
+          gaCookies.forEach(item => console.log('j1.core.switcher: ' + item));
         }
 
-        themeName = j1_user_state.theme_name;
+        themeName = user_state.theme_name;
 
         if ( debug === 'true' ) {
-          logger.debug('bootstrapThemeSelector: UL element selected');
+          logger.debug('\n' + 'bootstrapThemeSelector: UL element selected');
         }
         this.$element.empty();
 
@@ -306,7 +324,7 @@
         });
 
       } else if (this.$element.is('select')) {
-        logger.debug('bootstrapThemeSelector: SELECT element selected');
+        logger.debug('\n' + 'bootstrapThemeSelector: SELECT element selected');
         this.$element.empty();
 
         var optionSelectedMarker;
@@ -328,8 +346,8 @@
 
       } else {
         // no container found to add Theme list
-        logger.info('bootstrapThemeSelector: no UL or SELECT element found');
-        logger.error('bootstrapThemeSelector: failed');
+        logger.info('\n' + 'bootstrapThemeSelector: no UL or SELECT element found');
+        logger.error('\n' + 'bootstrapThemeSelector: failed');
         // console.warn('bootstrapThemeSelector only works with ul or select elements');
       }
     }, // END addThemesToControl
@@ -352,7 +370,7 @@
             base.addThemesToControl();
           },
           error: function (jqXHR, textStatus, errorThrown) {
-            logger.error('Failed to retrieve the local feed from: \'' + base.settings.localFeed + '\'');
+            logger.error('\n' + 'failed to retrieve the local feed from: \'' + base.settings.localFeed + '\'');
           }
         });
       } else {

data/lib/j1/version.rb

@@ -1,3 +1,3 @@
 module J1
-  VERSION = '2021.1.13'
+  VERSION = '2021.1.18'
 end

data/lib/starter_web/Gemfile

@@ -32,8 +32,7 @@
 #         gem cleanup
 #
 # ------------------------------------------------------------------------------
-source "https://rubygems.org"
-ruby RUBY_VERSION
+source 'https://rubygems.org'
 
 # ------------------------------------------------------------------------------
 # Jekyll
@@ -54,7 +53,7 @@ gem 'jekyll', '~> 4.2'
 
 # Theme Rubies, default: J1 Template (NOT used for the development system)
 #
-gem 'j1-template', '~> 2021.1.13'
+gem 'j1-template', '~> 2021.1.18'
 
 # ------------------------------------------------------------------------------
 # PRODUCTION: Gem needed for the Jekyll and J1 prod environment
@@ -121,7 +120,7 @@ group :jekyll_plugins do
 # gem 'jekyll-redirect-from', '>= 0.16.0'                                       # Useful ???
 # gem 'jekyll-sass-converter', '>= 2.1.0'                                       # Used if SASS (file) conversion is enabled
   gem 'jekyll-sitemap', '>= 1.2.0'
-  gem 'j1-paginator', '>= 2021.1.0'                                             # New version !!!
+  gem 'j1-paginator', '>= 2021.1.1'                                             # New version !!!
 end
 
 # ------------------------------------------------------------------------------
@@ -167,7 +166,7 @@ end
 # running # tasks defined by a Rakefile prior running the app|web.
 #
 # gem 'passenger', '>= 5.3'
-gem "puma", '>= 4.3.1'
+gem 'puma', '>= 4.3.1'
 
 # ------------------------------------------------------------------------------
 # If J1 is transformed into a (Rack and Sinatra based) Web