j1-template 2021.1.10 → 2021.1.14

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.10'
+  VERSION = '2021.1.14'
 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.10'
+gem 'j1-template', '~> 2021.1.14'
 
 # ------------------------------------------------------------------------------
 # 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.10
+version:                                2021.1.14
 
 # version
 # ------------------------------------------------------------------------------
@@ -597,9 +597,13 @@ defaults:
         index:                          false
         follow:                         false
 
-      analytics:                        false
+      personalization:                  false
+
+      analytics:                        true
+      comments:                         true
       advertising:                      false
-      comments:                         false
+      youtube:                          true
+      vimeo:                            true
 
       toc:                              true
       fam_menu_id:                      page_ctrl_simple
@@ -625,7 +629,7 @@ defaults:
   # PUBLIC - FEATURED
   #
   - scope:
-      path:                             posts/public/featured/_posts
+      path:                             posts/public/featured
       type:                             posts
 
     values:
@@ -636,9 +640,13 @@ defaults:
         index:                          false
         follow:                         false
 
-      analytics:                        false
+      personalization:                  false
+
+      analytics:                        true
+      comments:                         true
       advertising:                      false
-      comments:                         false
+      youtube:                          true
+      vimeo:                            true
 
       series:                           false
 
@@ -647,13 +655,13 @@ defaults:
       scrollbar:                        false
 
       icons:
-#       category-icon:                  comment-text-outline
+        category-icon:                  false                                   # comment-text-outline
         family:                         MDI
         color:                          md-blue
         size:                           5x
 
       images:
-#       category-image:                 img26.jpg
+        category-image:                 false                                   # img26.jpg
         dir:                            /assets/images/collections/blog/featured
 
       resource_options:
@@ -665,7 +673,7 @@ defaults:
   #
   - scope:
       type:                             posts
-      path:                             posts/public/series/_posts
+      path:                             posts/public/series
 
     values:
       layout:                           post
@@ -675,24 +683,22 @@ defaults:
         index:                          false
         follow:                         false
 
-      analytics:                        false
-      advertising:                      false
-      comments:                         false
+      personalization:                  false
 
-      series:                           true
-
-      toc:                              true
-      fam_menu_id:                      page_ctrl_simple
-      scrollbar:                        false
+      analytics:                        true
+      comments:                         true
+      advertising:                      false
+      youtube:                          true
+      vimeo:                            true
 
       icons:
-#       category-icon:                  dots-horizontal-circle
+        category-icon:                  false                                   # dots-horizontal-circle
         family:                         MDI
         color:                          md-indigo
         size:                           5x
 
       images:
-#       category-image:                 img26.jpg
+        category-image:                 false                                   # img26.jpg
         dir:                            /assets/images/collections/blog/series
 
   # ----------------------------------------------------------------------------
@@ -700,7 +706,7 @@ defaults:
   #
   - scope:
       type:                             posts
-      path:                             posts/public/wikipedia/_posts
+      path:                             posts/public/wikipedia
 
     values:
       layout:                           post
@@ -710,9 +716,13 @@ defaults:
         index:                          false
         follow:                         false
 
-      analytics:                        false
-      advertising:                      false
+      personalization:                  false
+
+      analytics:                        true
       comments:                         false
+      advertising:                      false
+      youtube:                          false
+      vimeo:                            false
 
       series:                           false
 
@@ -721,13 +731,13 @@ defaults:
       scrollbar:                        false
 
       icons:
-#       category-icon:                  wikipedia
+        category-icon:                  false                                   # wikipedia
         family:                         MDI
         color:                          md-indigo
         size:                           5x
 
       images:
-        category-image:
+        category-image:                 false
         dir:                            /assets/images/collections/blog/wikipedia
 
   # ----------------------------------------------------------------------------
@@ -749,6 +759,14 @@ defaults:
         index:                          false
         follow:                         false
 
+      personalization:                  false
+
+      analytics:                        false
+      comments:                         false
+      advertising:                      false
+      youtube:                          false
+      vimeo:                            false
+
 # ==============================================================================
 # 6. LAYOUT configuration
 #

data/lib/starter_web/_data/j1_config.yml

@@ -384,19 +384,30 @@ body:
 # ------------------------------------------------------------------------------
 comments:
   enabled:                              false
-  provider:                             disqus
+  
+  xhr_data_path:                        /assets/data
+  provider:                             hyvor                                   # hyvor | disqus
 
-  disqus:
-    short_name:                         '<your-site-id>'
-
-# facebook:                                                                     # currently NOT supported
-#   appid:                              123
-#   num_posts:                          5
-#   width:                              580
-#   colorscheme:                        light
+  hyvor:
+    site_id:                            'hyvor-site-id'
 
-# custom:                                                                       # currently NOT supported
-#   custom_data:
+  disqus:
+    site_id:                            '<your-site-short-name>'
+
+  # commento:                                                                   # currently NOT supported
+  #   site_id:                            'commento-site-id'
+  #
+  # just-comments:                                                              # currently NOT supported
+  #   site_id:                            'just-comments-site-id'
+
+  # facebook:                                                                   # currently NOT supported
+  #   appid:                              'facebook-app-id'
+  #   num_posts:                          5
+  #   width:                              580
+  #   colorscheme:                        light
+
+  # custom:                                                                     # currently NOT supported
+  #   custom_data:
 
 # ------------------------------------------------------------------------------
 # ANALYTICS settings