j1-template 2020.0.8 → 2020.0.13

data/lib/starter_web/_data/template_settings.yml

@@ -137,9 +137,8 @@ cookies:
 #
 #   NOTE: Used for developent mode ONLY
 #   NOTE: See ~/packages/300_template_src/_layouts/default.html
-#
 # ------------------------------------------------------------------------------
-flicker_timeout:                        150
+flicker_timeout:                        0
 
 # ------------------------------------------------------------------------------
 # HTML PrettyPrint
@@ -173,14 +172,126 @@ user:
 #
 # ------------------------------------------------------------------------------
 
+# ------------------------------------------------------------------------------
+# popovers.trigger (tooltips.trigger)
+#
+#   How a popover is triggered. You may pass multiple triggers.
+#   Separate them with a space. Trigger `manual` cannot be combined
+#   with any other trigger. 'manual' indicates that the popover will
+#   be triggered programmatically via the .popover('show'), .popover('hide')
+#   and .popover('toggle') methods.
+#
+#   default:                          hover
+#   values:                           click | hover | focus | manual
+#
+# ------------------------------------------------------------------------------
+
 # ------------------------------------------------------------------------------
 # BOOTSTRAP framework settings
 #
 bootstrap:
-  tooltips:                             true
-  popovers:                             true
   default_theme:                        uno
 
+  tooltips:
+    enabled:                            true
+    trigger:                            hover
+
+  popovers:
+    enabled:                            true
+    trigger:                            hover
+
+# ------------------------------------------------------------------------------
+# SEO settings (optimization)
+#
+
+# ------------------------------------------------------------------------------
+# PRELOAD settings
+# ------------------------------------------------------------------------------
+# NOTE:
+#   Specify resources that your page will need very soon, which you want
+#   to start loading early in the page lifecycle, before browsers' main
+#   rendering machinery starts. This may improve the performace for the RENDER
+#   phase to improve the FCP (First Contentful Paint). FCP marks the time
+#   at which the first text or image is shown to the user.
+# ------------------------------------------------------------------------------
+# NOTE:
+#   Preloading fonts,the crossorigin attribute is needed to handle
+#   CORS issues.
+# ------------------------------------------------------------------------------
+# NOTE:
+#   Preloading applies ONLY if the requested resource is NOT cached (304).
+#   If a resource is already cached (by the browser OR the web server), some
+#   browser (e.g. Chrome) issue WARNINGS, but can be ignored.
+# ------------------------------------------------------------------------------
+# INFO:
+#   https://stackoverflow.com/questions/1330825/preloading-font-face-fonts
+#   https://developer.mozilla.org/en-US/docs/Web/HTML/Preloading_content
+#   https://github.com/GoogleChromeLabs/critters/issues/18 (crossorigin)
+# ------------------------------------------------------------------------------
+# font:
+#   preload:                              true
+#   cors:                                 crossorigin
+#   fonts:                                [
+#                                           /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Thin.woff,
+#                                           /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Thin.woff2,
+#                                           /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Light.woff,
+#                                           /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Light.woff2,
+#                                           /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Regular.woff,
+#                                           /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Regular.woff2,
+#                                           /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Medium.woff,
+#                                           /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Medium.woff2,
+#                                           /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Bold.woff,
+#                                           /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Bold.woff2,
+#                                           /assets/themes/j1/core/fonts/materialdesign_icons/fonts/materialdesignicons-webfont.woff,
+#                                           /assets/themes/j1/core/fonts/materialdesign_icons/fonts/materialdesignicons-webfont.woff2
+#                                         ]
+
+font:
+  preload:                              true
+  cors:                                 crossorigin
+  fonts:                                [
+                                          /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Regular.woff,
+                                          /assets/themes/j1/core/fonts/materialdesign_icons/fonts/materialdesignicons-webfont.woff
+                                        ]
+css:
+  preload:                              true
+  css:                                  [
+                                          /assets/themes/j1/core/css/vendor,
+                                          /assets/themes/j1/core/css/globals
+                                        ]
+  files:                                []
+
+js:
+  preload:                              true
+  js:                                   [ /assets/themes/j1/core/js/template ]
+  files:                                [
+                                          /assets/themes/j1/adapter/js/mdb.js,
+                                          /assets/themes/j1/adapter/js/logger.js,
+                                          /assets/themes/j1/adapter/js/attic.js,
+                                          /assets/themes/j1/adapter/js/navigator.js
+                                        ]
+image:
+  preload:                              true
+  files:                                [
+                                          /assets/images/modules/icons/j1/j1-512x512.png,
+                                          /assets/images/modules/patterns/gridtile.png
+                                        ]
+
+# ------------------------------------------------------------------------------
+# PRECONNECT settings
+# ------------------------------------------------------------------------------
+# NOTE:
+#   Improve page load speed with preconnect|dns-prefetch for 3rd party
+#   origins. Establishing connections often involves significant time in
+#   slow networks (e.g. mobile 2|3G), particularly when it comes to secure
+#   connections (HTTPS), as it may involve DNS lookups, redirects, and
+#   several round trips to the final server that handles the user's request.
+# ------------------------------------------------------------------------------
+preconnect:
+  enabled:                              true
+  urls:                                 [ "https://bootswatch.com" ]
+
+
 # ------------------------------------------------------------------------------
 # Font AweSome settings
 #
@@ -252,8 +363,8 @@ analytics:
 # Set 'provider' to the analytics provider you want to use
 #
 advertising:
-  enabled:                              false
-  provider:                             google
+  enabled:                              true
+  provider:                             custom
   google:
     publisher_id:                       ca-pub-6537273267695855
   custom:

data/lib/starter_web/_plugins/asciidoctor-extensions/fab-icon-inline.rb

@@ -19,7 +19,7 @@ Asciidoctor::Extensions.register do
     use_dsl
     named :fab
     name_positional_attributes 'size', 'modifier'
-    default_attrs 'size' => '1x', 'modifier' => 'md-grey'
+    default_attrs 'size' => '1x', 'modifier' => ''
 
     def process parent, target, attributes
       doc = parent.document

data/lib/starter_web/_plugins/asciidoctor-extensions/fas-icon-inline.rb

@@ -19,14 +19,14 @@ Asciidoctor::Extensions.register do
     use_dsl
     named :fas
     name_positional_attributes 'size', 'modifier'
-    default_attrs 'size' => '1x', 'modifier' => 'md-grey'
+    default_attrs 'size' => '1x', 'modifier' => ''
 
     def process parent, target, attributes
       doc = parent.document
       size_class = (size = attributes['size']) ? %(fa-#{size}) : nil
       modifier_class = (modifier = attributes['modifier']) ? %(#{modifier}) : nil
       icon_name = target.tr '_', '-'
-      %(<i class="fas #{size_class} #{modifier} fa-#{icon_name}"></i>)
+      %(<i class="fas fa-#{icon_name} #{size_class} #{modifier}"></i>)
     end
   end
   inline_macro FasIconInlineMacro

data/lib/starter_web/_plugins/asciidoctor-extensions/iconify-icon-inline.rb

@@ -19,7 +19,7 @@ Asciidoctor::Extensions.register do
     use_dsl
     named :iconify
     name_positional_attributes 'size', 'modifier'
-    default_attrs 'size' => '1x', 'modifier' => 'md-grey'
+    default_attrs 'size' => '1x', 'modifier' => ''
 
     def process parent, target, attributes
       doc = parent.document
@@ -30,4 +30,4 @@ Asciidoctor::Extensions.register do
     end
   end
   inline_macro IconifyIconInlineMacro
-end
+end

data/lib/starter_web/_plugins/asciidoctor-extensions/mdi-icon-inline.rb

@@ -19,7 +19,7 @@ Asciidoctor::Extensions.register do
     use_dsl
     named :mdi
     name_positional_attributes 'size', 'modifier'
-    default_attrs 'size' => '1x', 'modifier' => 'md-grey'
+    default_attrs 'size' => '1x', 'modifier' => ''
 
     def process parent, target, attributes
       doc = parent.document
@@ -30,4 +30,4 @@ Asciidoctor::Extensions.register do
     end
   end
   inline_macro MdiIconInlineMacro
-end
+end

data/lib/starter_web/_plugins/asciidoctor-extensions/twitter-emoji-inline.rb

@@ -22,7 +22,7 @@ Asciidoctor::Extensions.register do
     use_dsl
     named :emoji
     name_positional_attributes 'size', 'modifier'
-    default_attrs 'size' => '1x', 'modifier' => 'no-modifier'
+    default_attrs 'size' => '1x', 'modifier' => ''
 
     def process parent, target, attributes
       doc = parent.document
@@ -34,4 +34,4 @@ Asciidoctor::Extensions.register do
     end
   end
   inline_macro EmojiInlineMacro
-end
+end

data/lib/starter_web/_plugins/minifyJS.rb

@@ -0,0 +1,54 @@
+# ------------------------------------------------------------------------------
+# ~/_plugins/uglify.rb
+# Liquid filter for J1 Template to uglify JS
+#
+# Product/Info:
+# http://jekyll.one
+#
+# Copyright (C) 2020 Juergen Adams
+#
+# J1 Template is licensed under the MIT License.
+# See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
+# ------------------------------------------------------------------------------
+# => Uglifier.compile(File.read(input))
+# ------------------------------------------------------------------------------
+#  NOTE:
+#  CustomFilters cannot be used in SAFE mode (e.g not usable for
+#  rendering pages with Jekyll on GitHub
+#
+#  USAGE:
+#    {% capture cache_name %}
+#
+#      liquid code to generate HTML output goes here
+#
+#    {% endcapture %}
+#    {{ cache_name | uglify }}
+# ------------------------------------------------------------------------------
+# noinspection SpellCheckingInspection
+# rubocop:disable Lint/UnneededDisable
+# rubocop:disable Style/Documentation
+# rubocop:disable Metrics/LineLength
+# rubocop:disable Layout/TrailingWhitespace
+# rubocop:disable Layout/SpaceAroundOperators
+# rubocop:disable Layout/ExtraSpacing
+# rubocop:disable Metrics/AbcSize
+# ------------------------------------------------------------------------------
+require 'uglifier'
+
+module Jekyll
+  module MinifyJS
+    def minifyJS(input)
+      # see: https://github.com/mishoo/UglifyJS/issues/495
+      # quote_style 3 -- always use the original quotes
+      minified = Uglifier.compile(input,
+                    harmony: true,
+                    :output => {
+                        :quote_style => 3
+                    }
+                 )
+      input = minified
+    end
+  end
+end
+
+Liquid::Template.register_filter(Jekyll::MinifyJS)

data/lib/starter_web/_plugins/{uglify.rb → minifyJSON.rb}

@@ -12,7 +12,6 @@
 # ------------------------------------------------------------------------------
 # => Uglifier.compile(File.read(input))
 # ------------------------------------------------------------------------------
-#
 #  NOTE:
 #  CustomFilters cannot be used in SAFE mode (e.g not usable for
 #  rendering pages with Jekyll on GitHub
@@ -24,18 +23,25 @@
 #
 #    {% endcapture %}
 #    {{ cache_name | uglify }}
-#
 # ------------------------------------------------------------------------------
-require 'uglifier'
+# noinspection SpellCheckingInspection
+# rubocop:disable Lint/UnneededDisable
+# rubocop:disable Style/Documentation
+# rubocop:disable Metrics/LineLength
+# rubocop:disable Layout/TrailingWhitespace
+# rubocop:disable Layout/SpaceAroundOperators
+# rubocop:disable Layout/ExtraSpacing
+# rubocop:disable Metrics/AbcSize
+# ------------------------------------------------------------------------------
+require 'json/minify'
 
 module Jekyll
-  module UglifyJS
-    def uglify(input)
-      site_config = @context.scopes[0]["site_config"]
-      path = @context.registers[:page]["url"]
-      Uglifier.compile(File.read("X:/j1/github/j1-template/packages/400_template_site/_site/assets/themes/j1/adapter/js/toccer.js"))
+  module MinifyJSON
+    def minifyJSON(input)
+      minified = JSON.minify(input)
+      input = minified
     end
   end
 end
 
-Liquid::Template.register_filter(Jekyll::UglifyJS)
+Liquid::Template.register_filter(Jekyll::MinifyJSON)

data/lib/starter_web/index.html

@@ -1,6 +1,6 @@
 ---
 layout:                                 home
-regenerate:                             true 
+regenerate:                             true
 
 title:                                  J1
 tagline:                                create your web
@@ -11,7 +11,7 @@ index:                                  []
 categories:                             []
 indexed:                                false
 
-debug:                                  false          
+debug:                                  false
 debug2:                                 false
 
 analytics:                              false
@@ -19,6 +19,10 @@ advertising:                            false
 comments:                               false
 toc:                                    false
 
+robots:
+  index:                                true
+  follow:                               true
+
 #permalink:                             /
 scrollbar:                              false
 
@@ -27,20 +31,17 @@ resource_options:
   - attic:
       padding_top:                      400
       padding_bottom:                   50
-      opacity:                          0.5 
+      opacity:                          0.5
       slides:
         - url:                          /assets/images/modules/attics/alex-holyoake-1920x1280.jpg
           alt:                          Photo by Alex Holyoake on Unsplash
-#         caption:                      
-#           text:                       Photo by Alex Holyoake on Unsplash
-#           href:                       https://unsplash.com/@stairhopper
           badge:
             type:                       unsplash
             author:                     Alex Holyoake
             href:                       https://unsplash.com/@stairhopper
 ---
 
-<pre> 
+<pre>
 
   This page is created by the layout: {{ page.layout }}.
 
@@ -53,7 +54,7 @@ resource_options:
   (inheritance) is correct.
 
   If you see this page within the J1 Template DEVELOPMENT system,
-  re-run a site built running: 
+  re-run a site built running:
 
     yarn rebuilt site