j1-template 2020.0.22 → 2021.0.2

data/lib/starter_web/collections/posts/public/series/_posts/_includes/tables/debug_variables.asciidoc

@@ -1,48 +1,47 @@
-ifeval::["{debug}" == "true"]
-.Liquid variables
-[cols="2,4,6a, options="header", role="table-responsive, full-width"]
-|===============================================================================
-|name |value |description 
-
-|`page.path`
-|{{ page.path }}
-|The path to the raw post or page. Example usage: Linking back to the page 
-or post's source on GitHub. This can be overridden in the `YAML Front Matter`.
-
-|`site.collections_dir`
-|{{ site.collections_dir }}
-|lorem:sentences[1]
-
-|`page.images.dir`
-|{{ page.images.dir }}
-|Image path set pagewise. See FRONTMATTER defaults in `_config.yml` for the 
-images path specified by: `images.dir` for specific page *type*. See the 
-example below for a page of type *pages*.
-[source, yaml]
-----
-defaults:
-  - scope:
-      path:          pages
-      type:          pages
-
-    values:
-      images:
-        dir:        /assets/images/pages
-----
-
-|`page-imagesdir`
-|{{ page-imagesdir }}
-| Images path set in the page by `:page-imagesdir:`. 
-
-|`template`
-|{{ site.template.name }}
-|Name of the template used for rendering a page. Settings are taken from 
-sitewide configuration defined by `_config.yml`.
-
-|`includedir`
-|{{ includedir }}
-|lorem:sentences[1]
-
-|===============================================================================
-endif::[]
-
+ifeval::["{debug}" == "true"]
+.Liquid variables
+[cols="2,4,6a, options="header", role="table-responsive, full-width"]
+|===============================================================================
+|name |value |description
+
+|`page.path`
+|{{ page.path }}
+|The path to the raw post or page. Example usage: Linking back to the page
+or post's source on GitHub. This can be overridden in the `YAML Front Matter`.
+
+|`site.collections_dir`
+|{{ site.collections_dir }}
+|lorem:sentences[1]
+
+|`page.images.dir`
+|{{ page.images.dir }}
+|Image path set pagewise. See FRONTMATTER defaults in `_config.yml` for the
+images path specified by: `images.dir` for specific page *type*. See the
+example below for a page of type *pages*.
+[source, yaml]
+----
+defaults:
+  - scope:
+      path:          pages
+      type:          pages
+
+    values:
+      images:
+        dir:        /assets/images/pages
+----
+
+|`page-imagesdir`
+|{{ page-imagesdir }}
+| Images path set in the page by `:page-imagesdir:`.
+
+|`template`
+|{{ site.template.name }}
+|Name of the template used for rendering a page. Settings are taken from
+sitewide configuration defined by `_config.yml`.
+
+|`includedir`
+|{{ includedir }}
+|lorem:sentences[1]
+
+|===============================================================================
+endif::[]

data/lib/starter_web/collections/posts/public/wikipedia/_posts/2016-11-20-minneapolis.adoc

@@ -6,9 +6,8 @@ description:                            Largest City in the state of Minnesota
 date:                                   2016-11-20 19:16:49 +0100
 series:
 
-tags:                                   [ Wikipedia ]
-index:                                  [ USA, Minnesota, City, Minneapolis ]
-categories:                             []
+tags:                                   [ USA, Minnesota, City, Minneapolis ]
+categories:                             [ Wikipedia ]
 
 regenerate:                             false
 

data/lib/starter_web/collections/posts/public/wikipedia/_posts/2016-11-24-narcisse-snake-dens.adoc

@@ -6,13 +6,8 @@ description:                            Largest snake population
 date:                                   2016-11-24 00:00:00 +0100
 series:
 
-tags:                                   [ Wikipedia ]
-index:                                  [
-                                          Canada, Geography, Narcisse, Manitoba,
-                                          Cities, Snakes, Largest population,
-                                          Wikipedia
-                                        ]
-categories:                             []
+tags:                                   [ Canada, Cities ]
+categories:                             [ Wikipedia ]
 
 regenerate:                             false
 

data/lib/starter_web/collections/posts/public/wikipedia/_posts/2016-11-26-columbia-river.adoc

@@ -6,12 +6,8 @@ description:                            Rivers of the Pacific Northwest region
 date:                                   2016-11-26 00:00:00 +0100
 series:
 
-tags:                                   [ Wikipedia ]
-index:                                  [
-                                          USA, Northwest Region, Rocky
-                                          Mountains, Rivers
-                                        ]
-categories:                             []
+tags:                                   [ USA, Rivers ]
+categories:                             [ Wikipedia ]
 
 regenerate:                             false
 

data/lib/starter_web/config.ru

@@ -1,24 +1,23 @@
-# ------------------------------------------------------------------------------
-# ~/config.ru
-#
-# Transforms a J1 based site into a web application based on Rack and
-# Sinatra using the OmniAuth software stack (for authentication) managed 
-# by Warden (for session managemnent) for a secured static web
-#
-# Product/Info:
-# https://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
-# ------------------------------------------------------------------------------
-
-# load base|app gem
-# ------------------------------------------------------------------------------
-require 'j1_app'
-
-# run the app
-# ------------------------------------------------------------------------------
-run J1App.site
-
+# ------------------------------------------------------------------------------
+# ~/config.ru
+#
+# Transforms a J1 based site into a web application based on Rack and
+# Sinatra using the OmniAuth software stack (for authentication) managed
+# by Warden (for session managemnent) for a secured static web
+#
+# Product/Info:
+# https://jekyll.one
+#
+# Copyright (C) 2021 Juergen Adams
+#
+# J1 Template is licensed under the MIT License.
+# See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
+# ------------------------------------------------------------------------------
+
+# load base|app gem
+# ------------------------------------------------------------------------------
+require 'j1_app'
+
+# run the app
+# ------------------------------------------------------------------------------
+run J1App.site

data/lib/starter_web/dot.gitattributes

@@ -5,7 +5,7 @@
 # Product/Info:
 # https://jekyll.one
 #
-# Copyright (C) 2020 Juergen Adams
+# Copyright (C) 2021 Juergen Adams
 #
 # J1 Template is licensed under the MIT License.
 # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE

data/lib/starter_web/dot.nojekyll

@@ -1,19 +1,19 @@
-# ------------------------------------------------------------------------------
-# ~/.nojekyll
-# Semaphor to completely bypass Jekyll processing for J1 Template based 
-# websites on GitHub Pages (only _site is deployed)
-#
-# Product/Info:
-# https://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
-#
-# ------------------------------------------------------------------------------
-# NOTE:
-#   It's possible to completely bypass Jekyll processing on GitHub Pages 
-#   by creating a file named .nojekyll in the root of your pages repo and 
-#   pushing it to GitHub. 
-# ------------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
+# ~/.nojekyll
+# Semaphor to completely bypass Jekyll processing for J1 Template based
+# websites on GitHub Pages (only _site is deployed)
+#
+# Product/Info:
+# https://jekyll.one
+#
+# Copyright (C) 2021 Juergen Adams
+#
+# J1 Template is licensed under the MIT License.
+# See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
+#
+# ------------------------------------------------------------------------------
+# NOTE:
+#   It's possible to completely bypass Jekyll processing on GitHub Pages
+#   by creating a file named .nojekyll in the root of your pages repo and
+#   pushing it to GitHub.
+# ------------------------------------------------------------------------------

data/lib/starter_web/index.html

@@ -4,29 +4,35 @@ regenerate:                             true
 
 title:                                  J1
 tagline:                                create your web
-description:                            Jekyll One Template. Gem-based template made for Jekyll.
-
-tags:                                   [ Template, Jekyll, Clean, Responsive, Featured, Gem-Based ]
-index:                                  []
-categories:                             []
-indexed:                                false
+description: >
+                                        Jekyll One Template. Gem-based template made for Jekyll.
+                                        J1 meets Jekyll and Bootstrap. And makes a lot of friends.
+                                        The template system combines the best of free software for
+                                        the web.
+                                        Jekyll One Template is OpenSource and the modules included
+                                        are free to use as well.
 
 debug:                                  false
 debug2:                                 false
 
+tags:                                   []
+categories:                             []
+
 analytics:                              false
 advertising:                            false
 comments:                               false
+
+fam_menu_id:                            default
+scrollbar:                              false
 toc:                                    false
+indexed:                                false
+exclude_from_search:                    true
 
 robots:
   index:                                true
   follow:                               true
 
-#permalink:                             /
-scrollbar:                              false
-
-resources:                              [ back2top, animate ]
+resources:                              [ animate, lunr ]
 resource_options:
   - attic:
       padding_top:                      400

data/lib/starter_web/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "j1_starter",
-  "version": "2020.0.22",
+  "version": "2021.0.2",
   "description": "J1 Template Starter Web",
   "homepage": "https://your.site",
   "author": {
@@ -30,9 +30,12 @@
     "Web",
     "Site"
   ],
+  "ruby": {
+    "gemfile": "Gemfile",
+    "userize": "true"
+  },
   "jekyll": {
     "configfile": "_config.yml",
-    "gemfile": "Gemfile",
     "metadata": ".jekyll-metadata",
     "opt_incremental": "--incremental",
     "opt_skip_initial_build": "--skip-initial-build",
@@ -40,13 +43,12 @@
     "opt_interface": "0.0.0.0",
     "opt_web_port": "4000",
     "opt_web_url": "http://localhost:4000/",
-    "opt_app_port": "5000",
-    "opt_app_url": "http://localhost:5000/",
+    "opt_app_port": "8000",
+    "opt_app_url": "http://localhost:8000/",
     "opt_profile": "",
     "opt_watch": "--watch",
     "opt_livereload": "--livereload",
-    "vendor_path": "./vendor",
-    "vendorize": "false"
+    "opt_livereload_port": "44000"
   },
   "algolia": {
     "admin_key": "your-algolia-admin-key"
@@ -54,68 +56,82 @@
   "scripts": {
     "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",
+    "delay-1s": "node ./node_modules/npm-delay 1000",
+    "delay-2s": "node ./node_modules/npm-delay 2000",
+    "delay-3s": "node ./node_modules/npm-delay 3000",
+    "delay-5s": "node ./node_modules/npm-delay 5000",
+
     "algolia": "cross-var cross-env ALGOLIA_API_KEY=$npm_package_algolia_admin_key bundle exec jekyll algolia",
     "algolia-check": "cross-var cross-env ALGOLIA_API_KEY=$npm_package_algolia_admin_key bundle exec jekyll algolia --dry-run --verbose",
-    "build": "run-p -s build:*",
+
+    "build": "run-s -s build:*",
     "build:info": "echo Build site incremental ..",
     "build:do": "cross-env SINATRA_ACTIVESUPPORT_WARNING=false bundle exec jekyll b --incremental",
-    "bundle": "shx rm -f Gemfile.lock && cross-env if-env BUNDLE_VENDORIZE=true && run-s bundle_vendor || run-s bundle_global",
-    "bundle_global": "cross-var cross-env BUNDLE_GEMFILE=$npm_package_jekyll_gemfile bundle install",
-    "bundle_vendor": "cross-var cross-env BUNDLE_GEMFILE=$npm_package_jekyll_gemfile bundle install --path $npm_package_jekyll_vendor_path",
-    "rebuild": "run-p -s rebuild:*",
-    "rebuild:info": "echo Build site from scratch ..",
+    "postbuild": "run-s -s postbuild:*",
+    "postbuild:finished": "echo .. build finished.",
+    "postbuild:hint": "echo To open the site, run: yarn site",
+
+    "bundle": "run-s -s bundler:*",
+    "bundler:info": "echo Create bundle ..",
+    "bundler:clean": "shx rm -f Gemfile.lock",
+    "bundler:check": "cross-var cross-env BUNDLE_VENDORIZE=$npm_package_ruby_vendorize if-env BUNDLE_VENDORIZE=true && run-s -s bundle_vendor:* || run-s -s bundle_system:*",
+    "bundle_system:info": "echo Bundle Rubies using system path ..",
+    "bundle_system:set-path": "bundle config set --local system true",
+    "bundle_system:bundle": "cross-var cross-env BUNDLE_GEMFILE=$npm_package_ruby_gemfile bundle install",
+    "bundle_vendor:info": "echo Bundle Rubies using vendor path ..",
+    "bundle_vendor:set-path": "bundle config set --local path ./vendor",
+    "bundle_vendor:bundle": "bundle install",
+
+    "rebuild": "run-s -s rebuild:* && run-s -s post-rebuild:*",
+    "rebuild:info": "echo Rebuild site incremental ..",
     "rebuild:clean": "echo Clean up site files .. && bundle exec jekyll clean",
     "rebuild:do": "cross-env SINATRA_ACTIVESUPPORT_WARNING=false bundle exec jekyll b --incremental",
-    "delay-1s": "node ./node_modules/npm-delay 1000",
-    "delay-2s": "node ./node_modules/npm-delay 2000",
-    "delay-3s": "node ./node_modules/npm-delay 3000",
-    "delay-5s": "node ./node_modules/npm-delay 5000",
-    "clean": "run-s -s clean-site && run-p -s clean:*",
+    "post-rebuild": "run-s -s postrebuild:*",
+    "post-rebuild:finished": "echo .. rebuild finished.",
+    "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",
     "clean:start": "echo Clean up projects files ..",
-    "clean:log-folder": "echo Remove log folder .. && shx rm -rf ./log",
-    "clean:etc-folder": "echo Remove etc folder .. && shx rm -rf ./etc",
+    "clean:bundle-config-folder": "echo Remove bundle config folder .. && shx rm -rf .bundle",
+    "clean:log-folder": "echo Remove log folder .. && shx rm -rf log",
+    "clean:etc-folder": "echo Remove etc folder .. && shx rm -rf etc",
     "clean:logfiles": "echo Remove various log files .. && shx rm -f *.log",
     "clean:locks": "echo Remove lock files .. && shx rm -f *.lock && shx rm -f package-lock.json",
-    "_clean:links": "echo Remove shared resources .. && shx rm -f _data/modules/cc.yml",
-    "credentials": "run-s -s credential:*",
-    "credential:echo": "echo Store username and password ..",
-    "credential:set": "git config credential.helper store && echo done.",
+
     "reset": "run-s -s reset:*",
     "reset:start": "echo Reset project to factory state ..",
     "reset:base-clean-files": "echo Clean up base modules .. && npm --silent run clean",
     "reset:utilsrv-clean-files": "echo Clean up utility server .. && npm --prefix ./utilsrv --silent run clean",
     "reset:utilsrv-clean-modules": "shx rm -rf ./utilsrv/node_modules",
     "reset:finished": "echo done.",
+
     "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: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.",
     "setup:create-folders": "echo Create project folders ..",
     "setup:create-log-folder": "echo Create log folder .. && shx mkdir ./log",
     "setup:create-log-archived-folder": "echo Create archived log folder .. && shx mkdir ./log/archived",
     "setup:create-etc-folder": "echo Create etc folder .. && shx mkdir ./etc && echo done.",
-    "_setup:links": "echo Link shared resources .. && lnk -s apps/public/cc/cc.yml _data/modules && echo done.",
-    "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.",
     "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: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",
-    "site": "run-p -s site:*",
-    "site:jekyll": "echo Startup the site .. && cross-env SINATRA_ACTIVESUPPORT_WARNING=false bundle exec jekyll s --incremental --livereload --open",
+
+    "site": "run-s site:*",
+    "site:jekyll": "echo Startup the site .. && cross-env SINATRA_ACTIVESUPPORT_WARNING=false bundle exec jekyll s --incremental --livereload --livereload-port $npm_package_jekyll_opt_livereload_port --open",
     "site:utilsrv": "npm --prefix ./utilsrv --silent run utilsrv",
-    "deploy": "echo Add, commit, push and deploy changed files to remotes && run-s -s git:*",
-    "git:add": "git add .",
-    "git:commit": "echo Commit files .. && git commit -a",
-    "git:github": "echo Push files to Github .. && git push github master",
-    "git:j1git": "echo Push files to J1 Git Server .. && git push",
+
     "bump": "run-s -s ver && run-s -s bump:* && run-s -s ver",
     "ver": "cross-var cross-env echo \"Project version: $npm_package_version\"",
     "bump:project": "cross-var cross-env npm version $npm_package_config_bumplevel",
     "bump-no-git": "cross-var cross-env npm --no-git-tag-version version $npm_package_config_bumplevel",
-    "get_version": "run-p -s get_version:*",
+    "get_version": "run-s get_version:*",
     "get_version:jekyll": "cross-var cross-env JEKYLL_ENV=$npm_package_config_mode BUNDLE_GEMFILE=$npm_package_jekyll_gemfile bundle exec jekyll --version"
   },
   "dependencies": {
@@ -131,6 +147,6 @@
     "cross-var": "^1.1.0",
     "lnk-cli": "^1.0.1",
     "npm-run-all": "^4.1.5",
-    "shx": "^0.2.2"
+    "shx": "^0.3.3"
   }
 }

data/lib/starter_web/pages/public/about/about_site.adoc

@@ -2,10 +2,8 @@
 title:                                  J1 Template
 tagline:                                about
 description:                            Things you should know about this site
-categories:                             [ pages ]
 
 tags:                                   [ About ]
-index:                                  []
 categories:                             [ pages ]
 
 permalink:                              /pages/public/about/site/
@@ -37,4 +35,6 @@ lorem:sentences[5]
 
 == Hall of fame
 
+Bratze
+
 lorem:sentences[5]