j1-template 2021.1.9 → 2021.1.13

data/assets/themes/j1/modules/lunrSearch/js/quicksearch.js

@@ -154,7 +154,7 @@
       //
       if (docs.length > 0) {
         var logger =    log4javascript.getLogger("j1.searcher");
-        var log_text =  'cleanup tags and categories';
+        var log_text =  '\n' + 'cleanup tags and categories';
         logger.info(log_text);
         $('.sr-tags').each(function() {
           var sr_tags = $(this).html().replace(/^\s+(.*)(\s+·\s+$)/, "$1");

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

@@ -75,13 +75,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();
     },
 
@@ -125,10 +125,10 @@
       // detect|set user state cookie
       user_state_detected = j1.existsCookie ( 'j1.user.state' );
       if ( user_state_detected ) {
-        logger.debug('cookie found: j1.user.state');
+        logger.debug('\n' + 'cookie found: j1.user.state');
         j1_user_state = j1.readCookie(user_state_cookie_name);
       } else {
-        logger.error('cookie not found: j1.user.state');
+        logger.error('\n' + 'cookie not found: j1.user.state');
       }
 
       themeName           = j1_user_state.theme_name;
@@ -141,7 +141,7 @@
       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;
         }
@@ -165,8 +165,8 @@
         // reload current page (skip cache)
         location.reload(true);
       } else {
-        logger.warn('write to cookie : disabled');
-        logger.warn('selected theme not activated: ' + name);
+        logger.warn('\n' + 'write to cookie : disabled');
+        logger.warn('\n' + 'selected theme not activated: ' + name);
       } // END if saveToCookie
 
     }, // END switchTheme
@@ -177,7 +177,7 @@
     loadThemeFromCookie: function (options) {
 
       if ( typeof Cookies === 'undefined' ) {
-        logger.error('cookies library not present');
+        logger.error('\n' + 'cookies library not present');
         return false;
       }
 
@@ -187,10 +187,10 @@
       user_state_detected = j1.existsCookie ( 'j1.user.state' );
 
       if ( user_state_detected ) {
-        logger.info('cookie found: j1.user.state');
+        logger.info('\n' + 'cookie found: j1.user.state');
         j1_user_state = j1.readCookie(user_state_cookie_name);
       } else {
-        logger.error('cookie not found: j1.user.state');
+        logger.error('\n' + 'cookie not found: j1.user.state');
       }
 
       var themeName = j1_user_state.theme_name;
@@ -214,11 +214,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;
       }
 
@@ -256,16 +256,16 @@
         // detect|set user state cookie
         user_state_detected = j1.existsCookie ( 'j1.user.state' );
         if ( user_state_detected ) {
-          logger.debug('User state cookie found');
+          logger.debug('\n' + 'user state cookie found');
           j1_user_state = j1.readCookie(user_state_cookie_name);
         } else {
-          logger.error('User state NOT cookie found');
+          logger.error('\n' + 'user state NOT cookie found');
         }
 
         themeName = j1_user_state.theme_name;
 
         if ( debug === 'true' ) {
-          logger.debug('bootstrapThemeSelector: UL element selected');
+          logger.debug('\n' + 'bootstrapThemeSelector: UL element selected');
         }
         this.$element.empty();
 
@@ -305,7 +305,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;
@@ -327,8 +327,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
@@ -351,7 +351,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.9'
+  VERSION = '2021.1.13'
 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.13'
 
 # ------------------------------------------------------------------------------
 # 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.13
 
 # 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/_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/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