j1-template 2022.6.2 → 2022.6.3

data/lib/starter_web/_plugins/index/lunr.rb

@@ -109,6 +109,14 @@ module Jekyll
         rebuild = @module_config['rebuild']
         index_file = index_dest + @module_config['index_file']
 
+        if plugin_disabled?
+          Jekyll.logger.info 'J1 Lunr:', 'disabled'
+          return
+        else
+          Jekyll.logger.info 'J1 Lunr:', 'enabled'
+          Jekyll.logger.info 'J1 Lunr:', 'generate search index'
+        end
+
         if @module_config['rebuild'] == false
           if File.exist?(index_file)
             Jekyll.logger.info 'J1 Lunr:', 'rebuild index disabled'
@@ -119,8 +127,6 @@ module Jekyll
           end
         end
 
-        Jekyll.logger.info 'J1 Lunr:', 'generate search index'
-
         # gather posts and pages
         #
         items = pages_to_index(site)
@@ -197,6 +203,22 @@ module Jekyll
 
       private
 
+      # Returns the plugin's config or an empty hash if not set
+      #
+      def config
+        @config ||= @module_config  || {}
+      end
+
+      # Check if plugin is enabled|disabled
+      #
+      def plugin_disabled?
+        if config['enabled']
+          false
+        else
+          true
+        end
+      end
+
       # load the stopwords (file)
       #
       def stopwords
@@ -372,6 +394,6 @@ end
 
 module Jekyll
   module J1LunrSearch
-    VERSION = '2022.6.2'
+    VERSION = '2022.6.3'
   end
 end

data/lib/starter_web/_plugins/seo/j1-feed.rb

@@ -45,29 +45,31 @@ module J1Feed
       @feed_output                      = @module_config['feed_output']
 
       if disabled_in_development?
-        Jekyll.logger.info "J1 Feed:", "generate feed skipped in mode development"
+        Jekyll.logger.info "J1 Feeds:", "skipped in mode development"
         return
       end
 
       if plugin_disabled?
-        Jekyll.logger.info "J1 Feed:", "generate feed: disabled"
+        Jekyll.logger.info "J1 Feeds:", "disabled"
         return
+      else
+        Jekyll.logger.info "J1 Feeds:", "enabled"
       end
 
       if @module_config['excerpt_only']
-        Jekyll.logger.info "J1 Feed:", "generate feed for: excerpts only"
+        Jekyll.logger.info "J1 Feeds:", "generate rss feeds for: excerpts only"
       end
 
       if @module_config['posts_limit'] < 100
-        Jekyll.logger.info "J1 Feed:", "generate feed for: #posts of #{@module_config['posts_limit']}"
+        Jekyll.logger.info "J1 Feeds:", "generate rss feeds for: #posts of #{@module_config['posts_limit']}"
       else
-        Jekyll.logger.info "J1 Feed:", "generate feed for: #posts of unlimited"
+        Jekyll.logger.info "J1 Feeds:", "generate rss feeds for: #posts of unlimited"
       end
 
       collections.each do |name, meta|
-        Jekyll.logger.info "J1 Feed:", "generate feed for: all #{name}"
+        Jekyll.logger.info "J1 Feeds:", "generate rss feeds for: all #{name}"
         (meta["categories"] + [nil]).each do |category|
-          Jekyll.logger.info "J1 Feed:", "generate feed for posts by category: #{category}" if category
+          Jekyll.logger.info "J1 Feeds:", "generate rss feeds for posts by category: #{category}" if category
           path = feed_path(:collection => name, :category => category)
 
           # rebuild the feed xml file?
@@ -75,7 +77,7 @@ module J1Feed
           unless @module_config['rebuild_feeds']
             path = feed_path(:collection => name, :category => category)
             if file_exists?(path)
-              Jekyll.logger.info "J1 Feed:", "feed already exist, skip rebuild"
+              Jekyll.logger.info "J1 Feeds:", "feed already exist, skip rebuild"
               next
             end
           end
@@ -164,7 +166,7 @@ module J1Feed
         # next if %r![^a-zA-Z0-9_]!.match?(tag)
         next if %r!\W!.match?(tag)
 
-        Jekyll.logger.info "J1 Feed:", "generate feed for posts by tag: #{tag}" if tag
+        Jekyll.logger.info "J1 Feeds:", "generate rss feeds for posts by tag: #{tag}" if tag
         path = "#{tags_path}#{tag.downcase}.xml"
         next if file_exists?(path)
 

data/lib/starter_web/_plugins/seo/j1-seo-tags.rb

@@ -16,6 +16,59 @@
 require "jekyll"
 
 module Jekyll
+
+  class J1SeoTag < Jekyll::Generator
+    safe true
+    priority :lowest
+
+    # Main plugin action, called by Jekyll-core
+    def generate(site)
+      @site = site
+
+      @mode                             = site.config['environment']
+      @template                         = site.config['theme']
+
+      @project_path                     = File.join(File.dirname(__FILE__)).sub('_plugins/seo', '')
+      @module_data_path                 = File.join(File.join(@project_path, '_data'))
+      @module_config_path               = File.join(File.join(@module_data_path, 'plugins'))
+      @module_template_path             = File.join(File.join(@module_data_path, 'templates'))
+      @module_config_default            = YAML::load(File.open(File.join(@module_config_path, 'defaults', 'seo-tags.yml')))
+      @module_config_user               = YAML::load(File.open(File.join(@module_config_path, 'seo-tags.yml')))
+
+      @module_config_default_settings   = @module_config_default['defaults']
+      @module_config_user_settings      = @module_config_user['settings']
+      @module_config                    = @module_config_default_settings.merge!(@module_config_user_settings)
+
+      if plugin_disabled?
+        Jekyll.logger.info "J1 Seo:", "disabled"
+        return
+      else
+        Jekyll.logger.info "J1 Seo:", "enabled"
+        Jekyll.logger.info "J1 Seo:", "generate seo tags"
+      end
+
+    end
+
+    private
+
+    # Returns the plugin's config or an empty hash if not set
+    #
+    def config
+      @config ||= @module_config  || {}
+    end
+
+    # Check if plugin is enabled|disabled
+    #
+    def plugin_disabled?
+      if config['enabled']
+        false
+      else
+        true
+      end
+    end
+
+  end
+
   class SeoTag < Liquid::Tag
     attr_accessor :context
 
@@ -102,6 +155,7 @@ module Jekyll
     end
 
   end
+
 end
 
 Liquid::Template.register_tag("seo", Jekyll::SeoTag)
@@ -198,7 +252,6 @@ module Jekyll
   end
 end
 
-
 module Jekyll
   class SeoTag
 
@@ -463,7 +516,6 @@ module Jekyll
   end
 end
 
-
 module Jekyll
   class SeoTag
     class Filters
@@ -477,7 +529,6 @@ module Jekyll
   end
 end
 
-
 module Jekyll
   class SeoTag
     # A drop representing the page image
@@ -559,7 +610,6 @@ module Jekyll
   end
 end
 
-
 module Jekyll
   class SeoTag
     class JSONLDDrop < Jekyll::Drops::Drop
@@ -662,56 +712,3 @@ module Jekyll
     end
   end
 end
-
-# module Jekyll
-#   class SeoTag
-#     # This module is deprecated, but is included in the Gem to avoid a breaking
-#     # change and should be removed at the next major version bump
-#     module JSONLD
-#       METHODS_KEYS = {
-#         :json_context   => "@context",
-#         :type           => "@type",
-#         :name           => "name",
-#         :page_title     => "headline",
-#         :json_author    => "author",
-#         :json_image     => "image",
-#         :date_published => "datePublished",
-#         :date_modified  => "dateModified",
-#         :description    => "description",
-#         :publisher      => "publisher",
-#         :main_entity    => "mainEntityOfPage",
-#         :links          => "sameAs",
-#         :canonical_url  => "url",
-#       }.freeze
-#
-#       # Self should be a Jekyll::SeoTag::Drop instance (when extending the module)
-#       def json_ld
-#         Jekyll.logger.warn "Jekyll::SeoTag::JSONLD is deprecated"
-#         @json_ld ||= JSONLDDrop.new(self)
-#       end
-#     end
-#   end
-# end
-
-
-# module Jekyll
-#   class SeoTag
-#     # Mixin to share common URL-related methods between class
-#     module UrlHelper
-#       private
-#
-#       # Determines if the given string is an absolute URL
-#       #
-#       # Returns true if an absolute URL
-#       # Returns false if it's a relative URL
-#       # Returns nil if it is not a string or can't be parsed as a URL
-#       def absolute_url?(string)
-#         return unless string
-#
-#         Addressable::URI.parse(string).absolute?
-#       rescue Addressable::URI::InvalidURIError
-#         nil
-#       end
-#     end
-#   end
-# end

data/lib/starter_web/_plugins/seo/j1-sitemap.rb

@@ -45,12 +45,13 @@ module Jekyll
       @sitemap_source_path ||= File.expand_path @sitemap_template_name, @template_source_folder
 
       if plugin_disabled?
-        Jekyll.logger.info "J1 Sitemap:", "generate sitemap files: disabled"
+        Jekyll.logger.info "J1 Sitemap:", "disabled"
         return
+      else
+        Jekyll.logger.info "J1 Sitemap:", "enabled"
+        Jekyll.logger.info "J1 Sitemap:", "generate sitemap files"
       end
-
-      Jekyll.logger.info "J1 Sitemap:", "generate map files"
-
+    
       @site.pages << sitemap unless file_exists?("sitemap.xml")
       @site.pages << robots unless file_exists?("robots.txt")
     end

data/lib/starter_web/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "j1",
-  "version": "2022.6.2",
+  "version": "2022.6.3",
   "description": "J1 Template Starter Web",
   "homepage": "https://your.site",
   "author": {

data/lib/starter_web/utilsrv/_defaults/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "utls",
-  "version": "2022.6.2",
+  "version": "2022.6.3",
   "description": "J1 Template Utility Server",
   "homepage": "https://jekyll.one",
   "author": {

data/lib/starter_web/utilsrv/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "utls",
-  "version": "2022.6.2",
+  "version": "2022.6.3",
   "description": "J1 Template Utility Server",
   "homepage": "https://jekyll.one",
   "author": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: j1-template
 version: !ruby/object:Gem::Version
-  version: 2022.6.2
+  version: 2022.6.3
 platform: ruby
 authors:
 - juergen_jekyll_one
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-24 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -377,6 +377,7 @@ files:
 - assets/themes/j1/adapter/js/lightbox.js
 - assets/themes/j1/adapter/js/logger.js
 - assets/themes/j1/adapter/js/lunr.js
+- assets/themes/j1/adapter/js/masonry.js
 - assets/themes/j1/adapter/js/masterslider.js
 - assets/themes/j1/adapter/js/mmenu.js
 - assets/themes/j1/adapter/js/navigator.js
@@ -957,21 +958,20 @@ files:
 - assets/themes/j1/core/fonts/fontawesome_5/metadata/shims.json
 - assets/themes/j1/core/fonts/fontawesome_5/metadata/shims.yml
 - assets/themes/j1/core/fonts/material_design_icons/LICENSE.txt
-- assets/themes/j1/core/fonts/material_design_icons/fonts/_versions/v3.3.92/eot/materialdesignicons-webfont.eot
-- assets/themes/j1/core/fonts/material_design_icons/fonts/_versions/v3.3.92/materialdesignicons-webfont.woff
-- assets/themes/j1/core/fonts/material_design_icons/fonts/_versions/v3.3.92/materialdesignicons-webfont.woff2
-- assets/themes/j1/core/fonts/material_design_icons/fonts/_versions/v3.3.92/svg/materialdesignicons-webfont.svg
-- assets/themes/j1/core/fonts/material_design_icons/fonts/_versions/v3.3.92/ttf/materialdesignicons-webfont.ttf
 - assets/themes/j1/core/fonts/material_design_icons/fonts/_versions/v5.9.55/eot/materialdesignicons-webfont.eot
 - assets/themes/j1/core/fonts/material_design_icons/fonts/_versions/v5.9.55/materialdesignicons-webfont.woff
 - assets/themes/j1/core/fonts/material_design_icons/fonts/_versions/v5.9.55/materialdesignicons-webfont.woff2
 - assets/themes/j1/core/fonts/material_design_icons/fonts/_versions/v5.9.55/preview.html
 - assets/themes/j1/core/fonts/material_design_icons/fonts/_versions/v5.9.55/svg/materialdesignicons-webfont.svg
 - assets/themes/j1/core/fonts/material_design_icons/fonts/_versions/v5.9.55/ttf/materialdesignicons-webfont.ttf
+- assets/themes/j1/core/fonts/material_design_icons/fonts/_versions/v7.0.96/eot/materialdesignicons-webfont.eot
+- assets/themes/j1/core/fonts/material_design_icons/fonts/_versions/v7.0.96/materialdesignicons-webfont.woff
+- assets/themes/j1/core/fonts/material_design_icons/fonts/_versions/v7.0.96/materialdesignicons-webfont.woff2
+- assets/themes/j1/core/fonts/material_design_icons/fonts/_versions/v7.0.96/preview.html
+- assets/themes/j1/core/fonts/material_design_icons/fonts/_versions/v7.0.96/ttf/materialdesignicons-webfont.ttf
 - assets/themes/j1/core/fonts/material_design_icons/fonts/eot/materialdesignicons-webfont.eot
 - assets/themes/j1/core/fonts/material_design_icons/fonts/materialdesignicons-webfont.woff
 - assets/themes/j1/core/fonts/material_design_icons/fonts/materialdesignicons-webfont.woff2
-- assets/themes/j1/core/fonts/material_design_icons/fonts/svg/materialdesignicons-webfont.svg
 - assets/themes/j1/core/fonts/material_design_icons/fonts/ttf/materialdesignicons-webfont.ttf
 - assets/themes/j1/core/fonts/material_design_icons/metadata/icons.json
 - assets/themes/j1/core/fonts/material_design_icons/metadata/icons.yml
@@ -1294,6 +1294,10 @@ files:
 - assets/themes/j1/modules/lunr/languages/lunr.vi.min.js
 - assets/themes/j1/modules/lunr/stopwords/de.txt
 - assets/themes/j1/modules/lunr/stopwords/en.txt
+- assets/themes/j1/modules/masonry/LICENSE
+- assets/themes/j1/modules/masonry/README.md
+- assets/themes/j1/modules/masonry/js/masonry.pkgd.js
+- assets/themes/j1/modules/masonry/js/masonry.pkgd.min.js
 - assets/themes/j1/modules/masterslider/LICENSE.txt
 - assets/themes/j1/modules/masterslider/README.txt
 - assets/themes/j1/modules/masterslider/css/blank.gif
@@ -1728,10 +1732,10 @@ files:
 - lib/starter_web/_data/blocks/panel.yml
 - lib/starter_web/_data/categories.yml
 - lib/starter_web/_data/colors.yml
-- lib/starter_web/_data/custom/readme
 - lib/starter_web/_data/font_sizes.yml
 - lib/starter_web/_data/j1_config.yml
 - lib/starter_web/_data/layouts/collection.yml
+- lib/starter_web/_data/layouts/custom/readme
 - lib/starter_web/_data/layouts/default.yml
 - lib/starter_web/_data/layouts/home.yml
 - lib/starter_web/_data/layouts/news_panel_posts.yml
@@ -1788,6 +1792,7 @@ files:
 - lib/starter_web/_data/modules/defaults/log4javascript.yml
 - lib/starter_web/_data/modules/defaults/log4r.yml
 - lib/starter_web/_data/modules/defaults/lunr.yml
+- lib/starter_web/_data/modules/defaults/masonry.yml
 - lib/starter_web/_data/modules/defaults/masterslider.yml
 - lib/starter_web/_data/modules/defaults/navigator.yml
 - lib/starter_web/_data/modules/defaults/nbinteract.yml
@@ -1807,6 +1812,7 @@ files:
 - lib/starter_web/_data/modules/log4javascript.yml
 - lib/starter_web/_data/modules/log4r.yml
 - lib/starter_web/_data/modules/lunr.yml
+- lib/starter_web/_data/modules/masonry.yml
 - lib/starter_web/_data/modules/masterslider.yml
 - lib/starter_web/_data/modules/navigator.yml
 - lib/starter_web/_data/modules/navigator_menu.yml
@@ -2025,6 +2031,7 @@ files:
 - lib/starter_web/assets/images/modules/attics/1920x1280/fly-d.jpg
 - lib/starter_web/assets/images/modules/attics/1920x1280/guillaume-bolduc.jpg
 - lib/starter_web/assets/images/modules/attics/1920x1280/harpal-singh.jpg
+- lib/starter_web/assets/images/modules/attics/1920x1280/hayden-mills-2.jpg
 - lib/starter_web/assets/images/modules/attics/1920x1280/john-schnobrich-2.jpg
 - lib/starter_web/assets/images/modules/attics/1920x1280/josh-liu.jpg
 - lib/starter_web/assets/images/modules/attics/1920x1280/kristopher-roller.jpg
@@ -2054,6 +2061,7 @@ files:
 - lib/starter_web/assets/images/modules/attics/franck-1920x1280.jpg
 - lib/starter_web/assets/images/modules/attics/giammarco-boscaro-1920x1280.jpg
 - lib/starter_web/assets/images/modules/attics/ideas-start-here-1920x1280-bw.jpg
+- lib/starter_web/assets/images/modules/attics/ideas-start-here-1920x1280.jpg
 - lib/starter_web/assets/images/modules/attics/jessica-ruscello-1920x1280.jpg
 - lib/starter_web/assets/images/modules/attics/joanna-kosinska-1920x1280.jpg
 - lib/starter_web/assets/images/modules/attics/katie-moum-1920x1280.jpg
@@ -2347,6 +2355,7 @@ files:
 - lib/starter_web/assets/images/quotes/people.jpg
 - lib/starter_web/assets/images/sticker/600x600/sticker-new-version.png
 - lib/starter_web/assets/images/sticker/scalable/readme
+- lib/starter_web/assets/images/triangles-bg.png
 - lib/starter_web/assets/videos/gallery/dailymotion/meditation.jpg
 - lib/starter_web/assets/videos/gallery/dailymotion/pilates.jpg
 - lib/starter_web/assets/videos/gallery/html5/video1.mp4