j1-template 2021.1.4 → 2021.1.9

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

@@ -143,6 +143,7 @@ about_config:
 defaults:
 
   enabled:                              false
+
   retries:                              30                                      # retry to load theme list from API
   saveToCookie:                         true
   debug:                                false
@@ -151,7 +152,7 @@ defaults:
   menu_icon_color:                      "#9E9E9E"
   menu_icon_size:                       mdi-sm
   cssThemeLink:                         bootstrapTheme
-  defaultCssFile:                       https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css
+  defaultCssFile:                       https://cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/css/bootstrap.min.css
   bootswatchApiUrl:                     https://bootswatch.com/api
   bootswatchApiVersion:                 4
   loadFromBootswatch:                   true

data/lib/starter_web/_data/pages/builder.yml

@@ -75,13 +75,13 @@ generators:
       title:                        Mansonry grid layout of Justified Gallery
       tagline:
 
-        css:                        [
-                                      {
-                                        local:  "modules/cookiebar/css/cookiebar",
-                                        remote: "https://cdnjs.cloudflare.com/ajax/libs/jquery-cookiebar/1.0.5/jquery.cookiebar"
-                                      }
-                                    ]
+        # css:                        [
+        #                               {
+        #                                 local:  "modules/cookiebar/css/cookiebar",
+        #                                 remote: "https://cdnjs.cloudflare.com/ajax/libs/jquery-cookiebar/1.0.5/jquery.cookiebar"
+        #                               }
+        #                             ]
 
 
 # ------------------------------------------------------------------------------
-# END config
+# END config

data/lib/starter_web/_data/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/private.yml

@@ -64,8 +64,8 @@ util_srv:
       strategy:                       members
       members:                        all
 
-    site_url:                         http://localhost:40010
-    site_redirect_url:                http://localhost:40010/auth/github/callback
+    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>
@@ -91,8 +91,8 @@ middleware:
         name:                           <your-disqus-config-name>
         user:                           <your-disqus-user>
 
-      client_url:                       http://localhost:40010
-      client_redirect_url:              http://localhost:40010/auth/disqus/callback
+      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>
 
@@ -110,8 +110,8 @@ middleware:
         strategy:                       members
         members:                        all
 
-      client_url:                       http://localhost:40010
-      client_redirect_url:              http://localhost:40010/auth/github/callback
+      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>
 

data/lib/starter_web/_data/resources.yml

@@ -365,6 +365,8 @@ resources:
                                           modules/util/js/js.cookie.js,
                                           modules/util/js/lite-url.js,
                                           modules/util/js/platform.js,
+                                          modules/util/js/domready.js,
+                                          modules/util/js/gtag-opt-in.js,
                                           adapter/js/j1.js
                                         ]
         js:                             [
@@ -460,9 +462,9 @@ resources:
         init_function:                  [ j1.adapter.navigator.init ]
 
   # ----------------------------------------------------------------------------
-  # MMenu Light
+  # Mobile Menu (Light)
   #
-  - name:                               Mobile Menu
+  - name:                               MMenu
     resource:
       id:                               mmenu
       enabled:                          true
@@ -476,8 +478,8 @@ resources:
       pass_init_data:                   false
       data:
         css:                            [
-                                          modules/mmenuLight/css/mmenu,
-                                          modules/mmenuLight/css/theme/uno
+                                          modules/mmenuLight/css/mmenu-light,
+                                          modules/mmenuLight/css/theme/uno/mmenu
                                         ]
         files:                          [
                                           modules/mmenuLight/js/mmenu.js,
@@ -549,13 +551,13 @@ resources:
         init_function:                  [ j1.adapter.back2top.init ]
 
   # ----------------------------------------------------------------------------
-  # CookieBar
+  #  GDPR compatible Cookie Consent for J1 Template
   #
-  - name:                               CookieBar
+  - name:                               J1 CookieConsent
     resource:
-      id:                               cookiebar
+      id:                               cookieConsent
       enabled:                          true
-      comment:                          module cookiebar
+      comment:                          module cookieConsent
       region:                           head
       layout:                           [ all ]
       required:                         always
@@ -565,9 +567,9 @@ resources:
       pass_init_data:                   false
       data:
         css:                            []
-        files:                          [ adapter/js/cookiebar.js ]
-        js:                             []
-        init_function:                  [ j1.adapter.cookiebar.init ]
+        files:                          [ adapter/js/cookieConsent.js ]
+        js:                             [ modules/cookieConsent/js/cookieConsent ]
+        init_function:                  [ j1.adapter.cookieConsent.init ]
 
   # ----------------------------------------------------------------------------
   # jqMouseWheel, jQuery plugin to add cross-browser mouse wheel support
@@ -676,7 +678,7 @@ resources:
       dependencies:                     false
       pass_init_data:                   false
       data:
-        css:                            [ modules/rtable/css/theme/uno ]
+        css:                            [ modules/rtable/css/theme/uno/rtable ]
         files:                          [ adapter/js/rtable.js ]
         js:                             [ modules/rtable/js/rtable ]
         init_function:                  [ j1.adapter.rtable.init ]
@@ -1180,9 +1182,8 @@ resources:
       dependencies:                     false
       pass_init_data:                   true
       data:
-        css:                            []
+        css:                            [ modules/fam/css/theme/uno/fam ]             # styles for (J1) theme Uno]
         files:                          [
-                                          modules/fam/css/uno/fam.css,          # styles for (J1) theme Uno
 #                                         modules/cash/js/cash.js,              # current version|s of Cash NOT usable
                                           modules/materialize/js/cash.js,       # adapted|old (1.3.5) version from Materialize
                                           modules/fam/js/fam.js,                # modified version for J1 (former: button.js)

data/lib/starter_web/_includes/attributes.asciidoc

@@ -113,6 +113,9 @@ tag::urls[]
 
 :url-execjs--gh-repo:                             https://github.com/rails/execjs
 
+:url-facebook--privacy-policy-en:                 https://www.facebook.com/policy.php
+:url-facebook--privacy-policy-de:                 https://de-de.facebook.com/policy.php
+
 :url-filamentgroup--home:                         https://www.filamentgroup.com/
 
 :url-fontawesome--home:                           https://fontawesome.com/
@@ -137,6 +140,8 @@ tag::urls[]
 :url-gdpr-eu--home:                               https://gdpr.eu/
 
 :url-google-material-design-icons--gh-repo:       https://github.com/google/material-design-icons
+:url-google--deactivate-ga-en:                    http://tools.google.com/dlpage/gaoptout?hl=en
+:url-google--privacy-policy-en:                   https://www.google.de/intl/en/policies/privacy
 
 :url-heroku--home:                                https://www.heroku.com/home
 
@@ -145,6 +150,8 @@ tag::urls[]
 :url-iconify--medical-icons:                      https://iconify.design/icon-sets/medical-icon/
 :url-iconify--brand-icons:                        https://iconify.design/icon-sets/logos/
 
+:url-instagram--privacy-policy:                   http://instagram.com/about/legal/privacy/
+
 :url-iframe-resizer--gh-repo:                     https://github.com/davidjbradshaw/iframe-resizer
 
 :url-j1--home:                                    https://jekyll.one/
@@ -304,6 +311,8 @@ tag::urls[]
 
 :url-twitter-emoji--gh-repo:                      https://github.com/twitter/twemoji
 :url-twitter-emoji-picker--gh-repo:               https://github.com/xLs51/Twemoji-Picker
+:url-twitter--privacy-en:                         https://twitter.com/en/privacy
+:url-twitter--login:                              https://twitter.com/login
 
 :url-uglifier--gh-repo:                           https://github.com/lautis/uglifier
 
@@ -403,7 +412,7 @@ end::tables[]
 // -----------------------------------------------------------------------------
 tag::products[]
 :j1--license:                                     MIT License
-:j1--version:                                     2021.1.4
+:j1--version:                                     2021.1.9
 :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.4'
+    VERSION = '2021.1.9'
   end
 end

data/lib/starter_web/collections/posts/public/featured/_posts/2020-01-01-about-cookies.adoc

@@ -5,7 +5,7 @@ tagline:                                good to know
 categories:                             [ Featured, Post ]
 tags:                                   [ Cookies ]
 
-image:                                  /assets/images/modules/attics/cookies-1920x1200-bw.jpg
+image:                                  /assets/images/modules/attics/cookies-1920x1200.jpg
 
 regenerate:                             false
 
@@ -16,7 +16,7 @@ resource_options:
       padding_bottom:                   50
       opacity:                          0.5
       slides:
-        - url:                          /assets/images/modules/attics/cookies-1920x1200-bw.jpg
+        - url:                          /assets/images/modules/attics/cookies-1920x1200.jpg
           alt:                          Photo by Miroslava on Unsplash
 #         caption:
 #           text:                       Photo by Miroslava on Unsplash

data/lib/starter_web/dot.gitignore

@@ -14,7 +14,7 @@ Gemfile.lock
 
 Passengerfile.json
 
-google*.html
+/google*.html
 
 tmp/
 

data/lib/starter_web/index.html

@@ -18,9 +18,9 @@ robots:
   index:                                true
   follow:                               true
 
-analytics:                              true
-advertising:                            false
-comments:                               false
+# analytics:                            false
+# advertising:                          false
+# comments:                             false
 
 fam_menu_id:                            default
 scrollbar:                              false

data/lib/starter_web/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "j1_starter",
-  "version": "2021.1.4",
+  "version": "2021.1.9",
   "description": "J1 Template Starter Web",
   "homepage": "https://your.site",
   "author": {
@@ -91,7 +91,7 @@
     "rebuild:do": "cross-env SINATRA_ACTIVESUPPORT_WARNING=false bundle exec jekyll b --incremental",
     "post-rebuild": "run-s -s postrebuild:*",
     "post-rebuild:finished": "echo .. rebuild finished.",
-    "post-rebuild:hint": "echo To open the site, run: yarn site.",
+    "post-rebuild:hint": "echo To open the site, run: yarn site",
 
     "clean": "run-s -s clean-site && run-s clean:*",
     "clean-site": "echo Clean up site files .. && bundle exec jekyll clean",

data/lib/starter_web/pages/public/blog/navigator/archive.html

@@ -42,6 +42,7 @@ resource_options:
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign view_config         = site.data.builder.blog_navigator.archive_view %}
+{% assign truncate_words      = site.excerpt_truncate_words %}
 {% assign view_description    = view_config.description %}
 {% assign defaults            = site.data.builder.blog_navigator.defaults %}
 
@@ -80,7 +81,7 @@ resource_options:
 
   <!-- ul class="list-unstyled link-news" -->
   {% for post in site.posts %}
-    {% assign excerpt = post.excerpt|truncatewords:50|replace:'...',' ...'|strip_html|strip_newlines|strip %}
+    {% assign excerpt = post.excerpt|truncatewords:truncate_words|replace:'...',' ...'|strip_html|strip_newlines|strip %}
 
     <!-- Collect comment provider details -->
     {% for sharing in builder_config.sharing_provider %}
@@ -145,10 +146,11 @@ resource_options:
     var user_state                  = j1.readCookie(user_state_cookie_name);
     var user_state_last_page        = "{{browser_page_url}}";
     user_state.last_page            = user_state_last_page;
-//  j1.setUserState( {last_page:user_state_last_page} );
+
     j1.writeCookie({
       name: user_state_cookie_name,
-      data: user_state
+      data: user_state,
+      samesite: 'Strict'
     });
     logger.info('Saved current Post Browser page to cookie: {{browser_page_url}}');
   }

data/lib/starter_web/pages/public/blog/navigator/archive/categoryview.html

@@ -190,10 +190,11 @@ resource_options:
     var user_state                  = j1.readCookie(user_state_cookie_name);
     var user_state_last_page        = "{{browser_page_url}}";
     user_state.last_page            = user_state_last_page;
-//  j1.setUserState( {last_page:user_state_last_page} );
+
     j1.writeCookie({
       name: user_state_cookie_name,
-      data: user_state
+      data: user_state,
+      samesite: 'Strict'
     });
     logger.info('Saved current Post Browser page to cookie: {{browser_page_url}}');
   }

data/lib/starter_web/pages/public/blog/navigator/archive/dateview.html

@@ -41,7 +41,8 @@ resource_options:
 
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign view_config         = site.data.builder.blog_navigator.date_view %}
+{% assign view_config         = site.data.builder.blog_navigator.category_view %}
+{% assign truncate_words      = site.excerpt_truncate_words %}
 {% assign view_description    = view_config.description %}
 {% assign defaults            = site.data.builder.blog_navigator.defaults %}
 
@@ -112,7 +113,7 @@ resource_options:
     {% endfor %}
 
     {% capture link %}
-      {% assign excerpt = post.excerpt|truncatewords:50|replace:'...',' ...'|strip_html|strip_newlines|strip %}
+      {% assign excerpt = post.excerpt|truncatewords:truncate_words|replace:'...',' ...'|strip_html|strip_newlines|strip %}
       <li>
         <article class="card raised-z3 mb-5">
           <h4 id="{{100000|rand}}" class="card-header bg-primary">{{post.title}}</h4>
@@ -177,10 +178,11 @@ resource_options:
     var user_state                  = j1.readCookie(user_state_cookie_name);
     var user_state_last_page        = "{{browser_page_url}}";
     user_state.last_page            = user_state_last_page;
-//  j1.setUserState( {last_page:user_state_last_page} );
+
     j1.writeCookie({
       name: user_state_cookie_name,
-      data: user_state
+      data: user_state,
+      samesite: 'Strict'
     });
     logger.info('Saved current Post Browser page to cookie: {{browser_page_url}}');
   }