j1-template 2020.0.0 → 2020.0.5

data/lib/j1_app/j1_auth_manager/config.rb

@@ -1,20 +1,24 @@
 module J1App
 
-  # set work dir to path
+  # set j1 project path
   #
-  def self.work_dir
-    unless ARGV.grep(/config.ru/)[0] == nil
-      # set work dir to path of ARGV argument for config.ru
-      # if app is called from commandline
+  def self.project_path
+    # set project folder to the path set by ENV var J1_PROJECT_HOME (preferred)
+    #
+    if ENV['J1_PROJECT_HOME'] != nil
+      ENV['J1_PROJECT_HOME']
+    elsif ARGV.grep(/config.ru/)[0] != nil
+      # set project folder to path of ARGV argument for config.ru if available.
+      # This will work, if the app is called from commandline (rackup)
       #
       File.dirname(ARGV.grep(/config.ru/)[0])
     else
-      # set work dir work dir if app is called from
-      # application manager (e.g. passenger)
+      # set project folder if app is called from application manager
+      # (e.g. passenger) to current work dir
       # NOTE:
       #   Unclear why File.join resolves the PATH correctly
-      #   but File.dirname doesn't
-      # File.dirname(Dir.pwd)
+      #   but File.dirname doesn't:
+      #     File.dirname(Dir.pwd)
       #
       File.join(Dir.pwd, "")
     end

data/lib/j1_app/j1_site_manager/static_site.rb

@@ -46,7 +46,7 @@ module J1App
     # Register static content
     # --------------------------------------------------------------------------
     register Sinatra::Index
-    root = File.expand_path(J1App.destination, J1App.work_dir)
+    root = File.expand_path(J1App.destination, J1App.project_path)
     set :public_folder, root
     use_static_index "index.html"
 

data/lib/starter_web/Gemfile

@@ -51,7 +51,7 @@ gem 'jekyll', '~> 4.0'
 
 # Theme Rubies, default: J1 Template
 #
-gem 'j1-template', '~> 2020.0.0'
+gem 'j1-template', '~> 2020.0.5'
 
 # ------------------------------------------------------------------------------
 # PRODUCTION: Gem needed for the Jekyll and J1 prod environment
@@ -110,7 +110,7 @@ group :jekyll_plugins do
 # gem 'jekyll-gist', '>= 1.5.0'
 # gem 'jekyll-sitemap', '>= 1.2.0'
 # gem 'jekyll-redirect-from', '>= 0.13.0'
-  gem 'j1-paginator', '>= 2020.0.0'
+  gem 'j1-paginator', '>= 2020.0.2'
   gem 'jekyll-sass-converter', '>= 1.5.1'
 end
 

data/lib/starter_web/_config.yml

@@ -44,16 +44,16 @@
 # ------------------------------------------------------------------------------
 # Sets the build environment of the website
 #
-#   values:                             development|test|production
+#   values:                             development|production
 #   default:                            development
 #
-environment:                            development
+environment:                            production
 
 # version
 # ------------------------------------------------------------------------------
 #   Sets the build version of J1 Template Gem
 #
-version:                                2020.0.0
+version:                                2020.0.5
 
 # version
 # ------------------------------------------------------------------------------
@@ -379,15 +379,15 @@ collections_dir:                        collections
 include:                                [ .htaccess ]
 exclude:                                [
                                           log, vendor, node_modules, utilsrv,
-                                          History.markdown, README.md, 
+                                          History.markdown, README.md,
                                           changelog.md, Rakefile,
                                           Gemfile, Gemfile.lock, Guardfile,
                                           yarn.lock, config.ru,
                                           package-lock.json, package.json,
-                                          '.sass-cache', '.vscode', 
+                                          '.sass-cache', '.vscode',
                                           '.idea', '*.ignore',
                                           '*.bat', '*.sh', '*.tmp', 'dot.*',
-                                          '*.txt', '*.log', '*.ppt*', 
+                                          '*.txt', '*.log', '*.ppt*',
                                           '*.zip', '*.7z', '*.tgz', '*.tar',
                                           '*.a2p', '*.asciidoc'
                                         ]
@@ -556,32 +556,6 @@ autopages:
     enabled:                            false
     layouts:                            [ paginator/autopage_collection.html ]
 
-# ------------------------------------------------------------------------------
-# COLLECTION settings
-# See: https://jekyllrb.com/docs/collections/#collections
-#
-collections:
-
-  # ----------------------------------------------------------------------------
-  # Featured articles
-  #
-  featured:
-    output:                             true
-    permalink:                          /collections/:collection/:name/
-
-  # ----------------------------------------------------------------------------
-  # Book shelf
-  #
-  biography:
-    output:                             true
-    permalink:                          /collections/premium/:collection/:name/
-  fantasy:
-    output:                             true
-    permalink:                          /collections/premium/:collection/:name/
-  romance:
-    output:                             true
-    permalink:                          /collections/premium/:collection/:name/
-
 
 # ------------------------------------------------------------------------------
 # FRONTMATTER defaults
@@ -596,7 +570,7 @@ collections:
 # Instead of repeating this configuration each time a page is being
 # created, Jekyll provides a way to set these configuration items
 # as defaults in this site configuration (_config.yml).
-# 
+#
 defaults:
 
   # ----------------------------------------------------------------------------
@@ -673,43 +647,11 @@ defaults:
             collapseDepth:              2
 
   # ----------------------------------------------------------------------------
-  # PRIVATE - FEATURED
-  #
-  - scope:
-      path:                             posts/private/featured/_posts
-      type:                             posts
-
-    values:
-      layout:                           post
-      scrollbar:                        false
-      author:                           J1 Team
-      toc:                              true
-      resources:                        toccer
-      analytics:                        false
-      advertising:                      false
-      comments:                         true
-
-      robots:
-        index:                          true
-        follow:                         true
-
-      icons:
-  #     category-icon:                  comment-text-outline
-        family:                         MDI
-        color:                          md-indigo
-        size:                           5x
-
-      images:
-  #     category-image:                 img26.jpg
-        dir:                            /assets/images/collections/blog/featured
-
-
-  # ----------------------------------------------------------------------------
-  # SERIES
+  # PUBLIC - SERIES
   #
   - scope:
       type:                             posts
-      path:                             posts/premium/series/_posts
+      path:                             posts/public/series/_posts
 
     values:
       layout:                           post
@@ -737,11 +679,11 @@ defaults:
 
 
   # ----------------------------------------------------------------------------
-  # WIKIPEDIA
+  # PUBLIC - WIKIPEDIA
   #
   - scope:
       type:                             posts
-      path:                             posts/private/wikipedia/_posts
+      path:                             posts/public/wikipedia/_posts
 
     values:
       layout:                           post
@@ -768,75 +710,6 @@ defaults:
         category-image:
         dir:                            /assets/images/collections/blog/wikipedia
 
-  # ----------------------------------------------------------------------------
-  # Collections
-  #
-
-  # ----------------------------------------------------------------------------
-  # FEATURED Articles
-  #
-  - scope:
-      type:                             featured
-      path:                             collections/_featured
-
-    values:
-      layout:                           page
-      analytics:                        false
-      advertising:                      false
-      scrollbar:                        false
-
-      robots:
-        index:                          true
-        follow:                         true
-
-  # ----------------------------------------------------------------------------
-  # BIOGRAPHY (Book Shelf)
-  #
-  - scope:
-      type:                             biography
-      path:                             collections/_biography
-
-    values:
-      layout:                           page
-      analytics:                        false
-      advertising:                      false
-      scrollbar:                        false
-
-      robots:
-        index:                          true
-        follow:                         true
-
-  # ----------------------------------------------------------------------------
-  # FANTASY (Book Shelf)
-  #
-  - scope:
-      type:                             fantasy
-      path:                             collections/_fantasy
-
-    values:
-      layout:                           page
-      analytics:                        false
-      advertising:                      false
-      scrollbar:                        false
-
-  # ----------------------------------------------------------------------------
-  # ROMANCE (Book Shelf)
-  #
-  - scope:
-      type:                             romance
-      path:                             collections/_romance
-
-    values:
-      layout:                           page
-      analytics:                        false
-      advertising:                      false
-      scrollbar:                        false
-
-      robots:
-        index:                          true
-        follow:                         true
-
-
 # ==============================================================================
 # 6. LAYOUT configuration
 #
@@ -975,4 +848,4 @@ compress_html:
 
 
 # END config
-# ------------------------------------------------------------------------------
+# ------------------------------------------------------------------------------

data/lib/starter_web/_data/layouts/default.yml

@@ -191,9 +191,8 @@ lanes:
       class:
 
   # ------------------------------------------------------------------
-  #   SHIM loader (body-footer)
-  #
-  #   NOTE:
+  # SHIM loader (body-footer)
+  #   NOTE: UNUSED as it is moved to ???
   #
   # - lane:
   #     enabled:                          false
@@ -205,6 +204,8 @@ lanes:
 
   # ------------------------------------------------------------------
   # THEME loader (body-footer)
+  #   NOTE: UNUSED as it is moved to themer.js
+  #
   # - lane:
   #     enabled:                          false
   #     region:                           body-footer
@@ -227,6 +228,5 @@ lanes:
       path:                             layouts
       file:                             layout_module_generator.html
 
-
 # ------------------------------------------------------------------------------
-# END config
+# END config

data/lib/starter_web/_data/modules/authentication.yml

@@ -133,7 +133,7 @@ settings:
     #       users:
     #         whitelist:                [ all ]
     #         blacklist:                []
-    # 
+    #
     # github:
     #   provider_url:                   https://github.com
     #   strategy:                       member
@@ -147,7 +147,7 @@ settings:
     #       users:
     #         whitelist:                [ all ]
     #         blacklist:                []
-    # 
+    #
     # patreon:
     #   provider_url:                   https://patreon.com
     #   strategy:                       member
@@ -179,7 +179,7 @@ settings:
     #               name:               "Value Content"
     #               amount:             100,
     #               state:              paid
-    # 
+    #
     # twitter:
     #   provider_url:                   https://twitter.com
     #   strategy:                       member
@@ -251,4 +251,4 @@ settings:
 
 
 # ------------------------------------------------------------------------------
-# END config
+# END config

data/lib/starter_web/_data/modules/cookie_consent.yml

@@ -28,16 +28,16 @@ settings:
 
   modal_type:                           full
   modal_position:                       top
-  stop_scrolling:                       true  
+  stop_scrolling:                       true
   consent_modals_title:                 Privacy
-  whitelisted_pages:                    [
-                                          /,
-                                          /pages/public/about/site/,
-                                          /pages/public/about/become_a_patron/
-                                          /pages/public/legal/en/impress/,
-                                          /pages/public/legal/en/privacy/,
-                                          /pages/public/legal/en/license_agreement/
-                                        ]
+# whitelisted_pages:                    [
+#                                         /,
+#                                         /pages/public/about/site/,
+#                                         /pages/public/about/become_a_patron/
+#                                         /pages/public/legal/en/impress/,
+#                                         /pages/public/legal/en/privacy/,
+#                                         /pages/public/legal/en/license_agreement/
+#                                       ]
 
   strict:                               false                                   # all pages requires a consent (currently NOT supported)
   show_consent_icon:                    true                                    # show the consent icon (in quicklinks)
@@ -125,4 +125,4 @@ settings:
                                         relevant to you.
 
 # END config
-# ------------------------------------------------------------------------------
+# ------------------------------------------------------------------------------

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

@@ -1,6 +1,6 @@
 # ------------------------------------------------------------------------------
 # ~/_data/apps/j1_navigator.yml
-# Default configuration settings of the J1 NAV Module for all sub-modules 
+# Default configuration settings of the J1 NAV Module for all sub-modules
 # except the main navigation bar
 #
 # Product/Info:
@@ -40,7 +40,7 @@ defaults:
     xhr_container_id:                   navigator_nav_navbar
 
     media_breakpoint:                   lg
-    brand_position:                     right
+    brand_position:                     right                                   # left|right
     brand_type:                         image
     brand_type_collapsed:               text
     fixed:                              true
@@ -54,7 +54,27 @@ defaults:
     background_color_scrolled:          bg-primary
 
   # ----------------------------------------------------------------------------
-  # NavMenu
+  # NavMenu (Mobile)
+  #
+  nav_mmenu:
+    enabled:                            false
+
+    mmenu_plugin:
+      node:                             "null"
+      mediaQuery:                       all
+      max_width:                        100000                                  # set media breakpoint to infinite
+
+    mmenu_navigator:
+      selected:                         Selected
+      slidingSubmenus:                  true
+      title:                            Starter Web
+      theme:                            dark
+
+    mmenu_drawer:
+      position:                         right
+
+  # ----------------------------------------------------------------------------
+  # NavMenu (Desktop)
   #
   nav_menu:
     enabled:                            false
@@ -110,8 +130,7 @@ defaults:
 
     translator_icon:                    flag-variant
 
-    sidebar:                            true
-    sidebar_icon:                       dots-vertical
+    toc_icon:                           wrap
 
     home_icon:                          home-variant
     home_url:                           none
@@ -152,23 +171,5 @@ defaults:
     search_heading_lead:                ""
     result_heading_lead:                ""
 
-  # ----------------------------------------------------------------------------
-  # NavSidebar
-  #
-  nav_sidebar:
-    enabled:                            false
-
-    xhr_container_id:                   navigator_nav_sidebar
-    xhr_data_path:                      /assets/data/sidebar/index.html
-
-    width:                              380
-    icon_family:                        MDI
-    icon_color:                         md_white
-    icon_size:                          mdi-1x
-    sidebar_icon:                       dots-vertical
-    close_icon:                         close
-    background_color:                   md_grey_900
-
-
 # END config
-# ------------------------------------------------------------------------------
+# ------------------------------------------------------------------------------