j1-template 2021.2.11 → 2021.3.2

data/lib/j1/version.rb

@@ -1,3 +1,3 @@
 module J1
-  VERSION = '2021.2.11'
+  VERSION = '2021.3.2'
 end

data/lib/starter_web/Gemfile

@@ -53,7 +53,7 @@ gem 'jekyll', '~> 4.2'
 
 # Theme Rubies, default: J1 Template (NOT used for the development system)
 #
-gem 'j1-template', '~> 2021.2.11'
+gem 'j1-template', '~> 2021.3.2'
 
 # ------------------------------------------------------------------------------
 # PRODUCTION: Gem needed for the Jekyll and J1 prod environment
@@ -166,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', '>= 5.5.2'
 
 # ------------------------------------------------------------------------------
 # If J1 is transformed into a (Rack and Sinatra based) Web

data/lib/starter_web/_config.yml

@@ -53,7 +53,7 @@ environment:                            development
 # ------------------------------------------------------------------------------
 #   Sets the build version of J1 Template Gem
 #
-version:                                2021.2.11
+version:                                2021.3.2
 
 # version
 # ------------------------------------------------------------------------------
@@ -592,6 +592,7 @@ defaults:
     values:
       layout:                           page
       author:                           J1 Team
+      compress:                         true
 
       robots:
         index:                          true
@@ -636,6 +637,7 @@ defaults:
     values:
       layout:                           post
       author:                           J1 Team
+      compress:                         true
 
       robots:
         index:                          true
@@ -680,6 +682,7 @@ defaults:
     values:
       layout:                           post
       author:                           J1 Team
+      compress:                         true
 
       robots:
         index:                          true
@@ -722,6 +725,7 @@ defaults:
     values:
       layout:                           page
       sitemap:                          false
+      compress:                         true
 
       robots:
         index:                          false
@@ -735,7 +739,7 @@ defaults:
       advertising:                      false
       youtube:                          false
       vimeo:                            false
-
+      
 
 # ==============================================================================
 # 6. LAYOUT configuration

data/lib/starter_web/_data/{private.default.yml → _defaults/private.yml}

@@ -23,10 +23,19 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 global:
 
-  # used by J1 to encrypt cookies
+  # used by J1 for encryption
   session_secret:                       <your-secret-string>
 
 
+# ==============================================================================
+# Translator settings
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+translators:
+
+  deepl:
+    auth_key:                           <your-auth-key>
+
+
 # ==============================================================================
 # MODULE settings
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

data/lib/starter_web/_data/modules/{j1scroll.yml → scroller.yml}

@@ -1,6 +1,6 @@
 # ------------------------------------------------------------------------------
-# ~/_data/modules/j1Scroll.yml
-# User configuration for J1 infiniteScroll
+# ~/_data/modules/scroller.yml
+# User configuration for J1 Scroller API
 #
 # Product/Info:
 # https://jekyll.one
@@ -18,7 +18,7 @@ about_config:
 
   title:
   scope:                                User settings
-  location:                             _data/modules/j1Scroll.yml
+  location:                             _data/modules/scroller.yml
 
 # ------------------------------------------------------------------------------
 # User configuration settings
@@ -27,14 +27,38 @@ settings:
   enabled:                              true
 
   scrollers:
+
+    # --------------------------------------------------------------------------
+    # Intro Panel
+    #
+    - scroller:
+        enabled:                        true
+        type:                           showOnScroll
+        id:                             home_intro_panel
+        container:                      home_intro_panel
+        showDelay:                      700
+        scrollOffset:                   500
+
+    # --------------------------------------------------------------------------
+    # Service Panel
+    #
+    - scroller:
+        enabled:                        false
+        type:                           showOnScroll
+        id:                             home_service_panel
+        container:                      home_service_panel
+        showDelay:                      700
+        scrollOffset:                   200
+
     # --------------------------------------------------------------------------
     # News Panel
     #
     - scroller:
         enabled:                        true
+        type:                           infiniteScroll
         id:                             home_news_panel
         container:                      home_news_panel-scroll-group
-        path:                           /assets/data/news_panel_posts/page
+        pagePath:                       /assets/data/news_panel_posts/page
         elementScroll:                  true                                    # false = window, true = container
         scrollOffset:                   100
         lastPage:                       3
@@ -52,9 +76,10 @@ settings:
     #
     - scroller:
         enabled:                        true
+        type:                           infiniteScroll
         id:                             blog_navigator_preview
         container:                      timeline
-        path:                           /pages/public/blog/navigator/page
+        pagePath:                       /pages/public/blog/navigator/page
         elementScroll:                  true
         scrollOffset:                   200
         lastPage:                       4

data/lib/starter_web/_data/private.yml

@@ -23,10 +23,19 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 global:
 
-  # used by J1 to encrypt cookies
+  # used by J1 for encryption
   session_secret:                       <your-secret-string>
 
 
+# ==============================================================================
+# Translator settings
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+translators:
+
+  deepl:
+    auth_key:                           <your-auth-key>
+
+
 # ==============================================================================
 # MODULE settings
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

data/lib/starter_web/_data/resources.yml

@@ -1247,13 +1247,13 @@ resources:
         init_function:                  [ j1.adapter.rtextResizer.init ]
 
   # ----------------------------------------------------------------------------
-  # showOnScroll, JS API to animate container elements
+  # scroller, JS API to implement infinite scroll
   #
-  - name:                               showOnScroll
+  - name:                               scroller
     resource:
-      id:                               showonscroll
+      id:                               scroller
       enabled:                          true
-      comment:                          J1 showOnScroll
+      comment:                          scroller
       region:                           head
       layout:                           [ home, page, post, collection, blog_archive ]
       required:                         ondemand                                # always | ondemand
@@ -1262,40 +1262,19 @@ resources:
       dependencies:                     false
       pass_init_data:                   false
       data:
-        css:                            []
-        files:                          []
-        js:                             [ modules/showOnScroll/js/showOnScroll ]
-        init_function:                  []
-
-  # ----------------------------------------------------------------------------
-  # j1Scroll, JS API to implement smooth scrolling pages
-  #
-  - name:                               j1Scroll
-    resource:
-      id:                               j1scroll
-      enabled:                          true
-      comment:                          j1Scroll
-      region:                           head
-      layout:                           [ home, page, post, collection, blog_archive ]
-      required:                         ondemand                                # always | ondemand
-      preload:                          false                                   # property currently unused
-      script_load:                      defer
-      dependencies:                     false
-      pass_init_data:                   false
-      data:
-        css:                            [ modules/j1Scroll/css/theme/uno ]
-        files:                          [ adapter/js/j1scroll.js ]
-        js:                             [ modules/j1Scroll/js/j1scroll ]
-        init_function:                  [ j1.adapter.j1Scroll.init ]
+        css:                            [ modules/scroller/css/theme/uno ]
+        files:                          [ adapter/js/scroller.js ]
+        js:                             [ modules/scroller/js/scroller ]
+        init_function:                  [ j1.adapter.scroller.init ]
 
   # ----------------------------------------------------------------------------
-  # j1Deepl, JS Wrapper for the Deepl API
+  # deeplAPI, JS Wrapper for the DeepL API
   #
-  - name:                               j1Deepl
+  - name:                               deeplAPI
     resource:
-      id:                               j1deepl
+      id:                               deeplAPI
       enabled:                          true
-      comment:                          j1Deepl
+      comment:                          deeplAPI
       region:                           head
       layout:                           [ home, page, post, collection, blog_archive ]
       required:                         ondemand
@@ -1306,11 +1285,11 @@ resources:
       data:
         css:                            []
         files:                          []
-        js:                             [ modules/j1Deepl/js/j1deepl ]
+        js:                             [ modules/deeplAPI/js/deeplAPI ]
         init_function:                  []
 
   # ----------------------------------------------------------------------------
-  # msDropdown, JS API to create themeable HTML <select> elements
+  # msDropdown, JS API to create themeable HTML <select> elements (dropdowns)
   #
   - name:                               msDropdown
     resource:

data/lib/starter_web/_includes/attributes.asciidoc

@@ -433,7 +433,7 @@ end::tables[]
 // -----------------------------------------------------------------------------
 tag::products[]
 :j1--license:                                     MIT License
-:j1--version:                                     2021.2.11
+:j1--version:                                     2021.3.2
 :j1--site-name:                                   Jekyll One
 end::products[]
 

data/lib/starter_web/_plugins/lunr_index.rb

@@ -364,6 +364,6 @@ end
 
 module Jekyll
   module J1LunrSearch
-    VERSION = '2021.2.11'
+    VERSION = '2021.3.2'
   end
 end

data/lib/starter_web/index.html

@@ -1,5 +1,6 @@
 ---
 layout:                                 home
+compress:                               true
 
 title:                                  Jekyll One
 tagline:                                starter web
@@ -31,7 +32,7 @@ toc:                                    false
 
 regenerate:                             true
 
-resources:                              [ animate, j1scroll, showonscroll ]
+resources:                              [ animate, scroller ]
 resource_options:
   - attic:
       padding_top:                      400

data/lib/starter_web/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "j1_starter",
-  "version": "2021.2.11",
+  "version": "2021.3.2",
   "description": "J1 Template Starter Web",
   "homepage": "https://your.site",
   "author": {
@@ -57,7 +57,7 @@
     "app": "run-p -s app:*",
     "app:rackup": "cross-env SINATRA_ACTIVESUPPORT_WARNING=false WEBSERVER=$npm_package_jekyll_opt_webserver INTERFACE=$npm_package_jekyll_opt_interface PORT=$npm_package_jekyll_opt_app_port j1 rackup",
     "app:jekyll": "cross-var cross-env JEKYLL_ENV=$npm_package_config_mode BUNDLE_GEMFILE=$npm_package_ruby_gemfile bundle exec jekyll b -c $npm_package_jekyll_configfile $npm_package_jekyll_opt_incremental --watch",
-    "app:open": "npm run delay-3s && cross-var opn $npm_package_jekyll_opt_app_url",
+    "app:open": "npm run delay-3s && cross-var open-cli $npm_package_jekyll_opt_app_url",
 
     "delay-1s": "node ./node_modules/npm-delay 1000",
     "delay-2s": "node ./node_modules/npm-delay 2000",
@@ -111,7 +111,7 @@
 
     "setup": "npm --silent run setup-start && npm --silent run setup-base && run-s -s setup:*",
     "setup-start": "echo Setup project for first use ..",
-    "setup-base": "echo Bootstrap base modules .. && echo J1 Project Base modules: > install.log && npm --silent i lnk-cli shx npm-run-all cross-var cross-env -D >> install.log && echo done.",
+    "setup-base": "echo Bootstrap base modules .. && echo J1 Project Base modules: > install.log && npm --silent install shx npm-run-all cross-var cross-env >> install.log && echo done.",
     "setup:env": "echo Configure environment .. && run-s -s set-env:*",
     "set-env:loglevel": "cross-var cross-env npm config set jekyll_one_com:loglevel  $npm_package_config_loglevel",
     "set-env:mode": "cross-var cross-env npm config set jekyll_one_com:mode $npm_package_config_mode && echo done.",
@@ -121,6 +121,7 @@
     "setup:create-etc-folder": "echo Create etc folder .. && shx mkdir ./etc && echo done.",
     "setup:node-modules-base": "echo Bootstrap project modules .. && echo J1 Project modules: >> install.log && npm --silent install >> install.log",
     "setup:node-modules-utilsrv": "echo Bootstrap utility server modules .. && echo J1 Utility Server modules: >> install.log && cd utilsrv && npm --silent install >> ../install.log && cd .. && echo done.",
+    "setup:private-config": "shx cp -f _data/_defaults/private.yml _data/private.yml",
     "setup:detect-os": "echo Detect OS .. && cross-env if-env OS=Windows_NT && cross-var echo \"OS detected: $OS\" || OS=$(echo $(getos)) && echo \"OS detected: $OS\" && echo done.",
     "setup:site": "run-s -s build",
 
@@ -142,12 +143,5 @@
     "j1-cli": "^2019.0.3",
     "npm-delay": "^1.0.4",
     "opn-cli": "^5.0.0"
-  },
-  "devDependencies": {
-    "cross-env": "^7.0.3",
-    "cross-var": "^1.1.0",
-    "lnk-cli": "^1.0.1",
-    "npm-run-all": "^4.1.5",
-    "shx": "^0.3.3"
   }
 }

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

@@ -23,7 +23,7 @@ comments:                               false
 
 regenerate:                             true                                    # needed to update pagination pages
 
-resources:                              [ animate, j1scroll ]
+resources:                              [ animate, scroller ]
 resource_options:
   - attic:
       padding_top:                      400

data/lib/starter_web/pages/public/learn/roundtrip/600_quicksearch.adoc

@@ -424,9 +424,9 @@ roundtrip. More details of the most common elements of Bootstrap can be found
 on the previewer for a theme. Have a look at the
 link:{url-previewer--theme}[Theme previewer].
 
-To make things real for your new site, go for *Web in a day*. This tutorial
-guides you through all the steps on how to build a website. Your site using
-Jekyll and the template system J1. It's a pleasant journey to learn what
-modern static webs can offer today.
-
-Start your journey from here: link:{url-j1-kickstarter--web-in-a-day}[Web in a day, {browser-window--new}].
+// To make things real for your new site, go for *Web in a day*. This tutorial
+// guides you through all the steps on how to build a website. Your site using
+// Jekyll and the template system J1. It's a pleasant journey to learn what
+// modern static webs can offer today.
+//
+// Start your journey from here: link:{url-j1-kickstarter--web-in-a-day}[Web in a day, {browser-window--new}].