j1_template_mde 2018.4.15 → 2018.4.16

data/lib/starter_web/_config.yml

@@ -60,7 +60,7 @@ environment:                            development
 #   anything here because version information is bumped-in by
 #   the build process
 #
-version:                                2018.4.15
+version:                                2018.4.16
 
 
 # ==============================================================================
@@ -378,12 +378,12 @@ include:                                [.htaccess]
 exclude:                                [
                                           vendor, node_modules, "package*",
                                           ".sass-cache",".vscode","*.ignore",
-                                          "*.bat*", "*.sh",
+                                          "*.bat*", "*.sh", "*.tmp",
                                           "*.ppt*", "*.zip","*.7z","*.a2p",
                                           "*.asciidoc", "History.markdown",
-                                          "README.md", "Rakefile",
-                                          "changelog.md", "Gemfile",
-                                          "Gemfile.lock", "*.log"
+                                          "README.md", "changelog.md",
+                                          "Rakefile", "Gemfile", "Guardfile",
+                                          "Gemfile.lock", "yarn.lock","*.log"
                                         ]
 keep_files:                             [ ".git", ".gitignore", node_modules, "package*" ]
 
@@ -532,90 +532,106 @@ asciidoctor:
 #
 # ---------------------------------------------------------------
 j1_auth:
-  enabled:                              true
+  enabled:                              false
   ssl:                                  false
 
   content:
     public:
-      - ^(\/assets)
-      - ^(\/\w+\/public)
+      - \W*((?i)assets(?-i))\W*
+      - \W*((?i)public(?-i))\W*
     private:
-      - ^(\/\w+\/private)
+      - \W*((?i)private(?-i))\W*
     premium:
-      - ^(\/\w+\/premium)
+      - \W*((?i)premium(?-i))\W*
 
-  provider:
+  providers:
     activated:                          [ disqus, github, patreon ]
-    home_url:
-      disqus:                           https://disqus.com
-      facebook:                         https://facebook.com
-      github:                           https://github.com
-      patreon:                          https://patreon.com
-      twitter:                          https://twitter.com
-    scope:
-      disqus:                           []
-      facebook:                         []
-      github:                           []
-      patreon:                          []
-      twitter:                          []
-    data:
-      disqus:                           []
-      facebook:                         []
-      github:                           []
-      patreon:                          []
-      twitter:                          []
-    user:
-      disqus:                           [ all ]
-      facebook:                         [ all ]
-      github:                           [ all ]
-      patreon:                          [ all ]
-      twitter:                          [ all ]
-    strategy:
-      disqus:                           member
-      facebook:                         member
-      github:                           member
-      patreon:                          member
-      twitter:                          member
-    permission:
-      disqus:                           [ private ]
-      facebook:                         [ private ]
-      github:                           [ private ]
-      patreon:                          [ private, premium ]
-      twitter:                          [ private ]
-    condition:
-      disqus:
-        private:
-          enabled:                      true
-        premium:
-          enabled:                      false
-      facebook:
+
+    disqus:
+      home_url:                         https://disqus.com
+      strategy:                         member
+      scope:                            []
+      users:                            [ all ]
+      permissions:                      [ private ]
+      data_fields:                      []
+      conditions:
         private:
           enabled:                      true
-        premium:
-          enabled:                      false
-      github:
+          users:
+            blacklist:                  []
+
+    facebook:
+      home_url:                         https://facebook.com
+      strategy:                         member
+      scope:                            []
+      users:                            [ all ]
+      permissions:                      [ private ]
+      data_fields:                      []
+      conditions:
         private:
           enabled:                      true
-        premium:
-          enabled:                      false
-      twitter:
+          users:
+            whitelist:                  [ all ]
+            blacklist:                  []
+
+    github:
+      home_url:                         https://github.com
+      strategy:                         member
+      scope:                            []
+      users:                            [ all ]
+      permissions:                      [ private ]
+      data_fields:                      []
+      conditions:
         private:
           enabled:                      true
-        premium:
-          enabled:                      false
-      patreon:
+          users:
+            whitelist:                  [ all ]
+            blacklist:                  []
+
+    patreon:
+      home_url:                         https://github.com
+      strategy:                         member
+      scope:                            [ users, pledges-to-me ]
+      users:                            [ all ]
+      permissions:                      [ private, premium ]
+      data_fields:                      [
+                                          email, name, first_name, nickname,
+                                          amount_cents, created_at, declined_since
+                                        ]
+      conditions:
         private:
           enabled:                      true
+          users:
+            blacklist:                  []
         premium:
           enabled:                      true
+          users:
+            whitelist:                  [ "@jekyll-one.com" ]
+            blacklist:                  []
           payment:
+            activated:                  [ "Premium Content", "Value Content" ]
             tiers:
-              - { subscription: {
-                    amount:             100,
-                    period:             1m,
-                    state:              paid                                    # paid, paused, subscribed
-                  }
-                }
+              - tier:
+                  name:                 "Premium Content"
+                  amount:               500,
+                  state:                paid
+              - tier:
+                  name:                 "Value Content"
+                  amount:               100,
+                  state:                paid
+
+    twitter:
+      home_url:                         https://twitter.com
+      strategy:                         member
+      scope:                            []
+      users:                            [ all ]
+      permissions:                      [ private, premium ]
+      data_fields:                      []
+      conditions:
+        private:
+          enabled:                      true
+          users:
+            blacklist:                  []
 
 # ---------------------------------------------------------------
 # SAFEMODE

data/lib/starter_web/_data/j1_resources.yml

@@ -629,3 +629,18 @@ resources:
                                             remote: "https://cdn.datatables.net/v/jszip-3.1.3/pdfmake-0.1.27/dt-1.10.15/af-2.2.0/b-1.3.1/b-colvis-1.3.1/b-html5-1.3.1/b-print-1.3.1/cr-1.3.3/fc-3.2.2/fh-3.1.2/kt-2.2.1/r-2.1.1/rg-1.0.0/rr-1.2.0/sc-1.4.2/se-1.2.2/datatables"
                                           }
                                         ]
+
+  # -----------------------------------------------------------------------
+  # Livereload
+  #
+  - resource:
+      enabled:                          false
+      id:                               livereload
+      comment:                          JS Client for livereload
+      region:                           head
+      layout:                           all
+      required:                         always
+      script_load:                      sync
+      data:
+
+        files:                          extensions/livereload/js/livereload.js

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

@@ -104,11 +104,10 @@ defaults:
 
   nav_sidebar:
     enabled:                            false
-    display_user_info:                  true
-    display_theme:                      true
+    width:                              380
     icon_family:                        Material Design Icons
     icon_color:                         md_white
-    icon_size:                          xxxlarge
+    icon_size:                          mdi-1x
     sidebar_icon:                       dots-vertical
     close_icon:                         close
     background_color:                   md_grey_800
@@ -145,7 +144,7 @@ nav_topsearch:
   enabled:                              true
 
 # ------------------------------------------------------------------------------
-# 5. Auth client settings
+# 5. J1 Auth CLIENT settings
 #
 nav_authclient:
   enabled:                              true
@@ -199,21 +198,89 @@ nav_authclient:
                                         to the provider you're currently authenticated. From your
                                         home page at the provider, you can sign out completely.    
 
-
 # ------------------------------------------------------------------------------
 # 6. Navigation sidebar settings
 #
 nav_sidebar:
   enabled:                              true
+
   boxes:
 
     - box:
+        enabled:                        true
+        type:                           user_info
+        title:                          User Info        
+        links:
+          - title:                      Provider
+            value:                      ??provider-name
+            href:                       ??provider-url
+            target:                     blank
+            icon:                       domain
+          - title:                      User
+            value:                      ??user-name
+            href:                       javascript:void(0)
+            target:                     blank
+            icon:                       account
+          - title:                      State
+            value:                      ??user-state
+            href:                       javascript:void(0)
+            target:                     blank
+            icon:                       account-alert
+          - title:                      Permisions
+            value:                      ??provider-permissions
+            href:                       javascript:void(0)
+            target:                     blank
+            icon:                       account-check
+          - title:                      Membership
+            value:                      ??provider-membership
+            href:                       ??provider-member-url
+            target:                     blank
+            icon:                       account-settings
+
+    - box:
+        enabled:                        true
+        type:                           theme_info
+        title:                          Theme Info
+        links:
+          - title:                      Theme
+            value:                      ??theme-name
+            href:                       /pages/public/previewer/theme/
+            target:                     blank
+            icon:                       face
+          - title:                      Author
+            value:                      Jekyll-One
+            href:                       https://support.jekyll-one.com/
+            target:                     blank
+            icon:                       grease-pencil
+          - title:                      Version
+            value:                      V4
+            href:                       http://getbootstrap.com/
+            target:                     blank
+            icon:                       numeric
+
+    - box:
+        enabled:                        true
+        type:                           site_info
         title:                          Site Info
-        type:                           linkbox
         links:
-          About:                        /pages/about/
-          Impress:                      /pages/public/legal/en/impress/
-          Terms of Use:                 /pages/public/legal/en/terms_of_use/
-          Privacy:                      /pages/public/legal/en/privacy/
-          License Agreements:           /pages/public/legal/en/license_agreement/
-          Contact:                      mailto:contact@jekyll.one
+          - title:                      About
+            href:                       /pages/public/about/
+            icon:                       home-outline
+          - title:                      Become a Patron
+            href:                       /pages/public/about/become_a_patron/
+            icon:                       patreon
+          - title:                      Impress
+            href:                       /pages/public/legal/en/impress/
+            icon:                       alert-outline
+          - title:                      Terms of Use
+            href:                       /pages/public/legal/en/terms_of_use/
+            icon:                       compass-outline
+          - title:                      Privacy
+            href:                       /pages/public/legal/en/privacy/
+            icon:                       heart-off
+          - title:                      License Agreement
+            href:                       /pages/public/legal/en/license_agreement/
+            icon:                       checkbox-multiple-marked-circle-outline
+          - title:                      Contact
+            href:                       mailto:contact@jekyll.one
+            icon:                       contact-mail

data/lib/starter_web/_rack/Guardfile

@@ -0,0 +1,75 @@
+# ------------------------------------------------------------------------------
+#  ~/Guardfile
+#  Provides watcher information for Guard used to livereload 
+#  for J1 App development
+#
+#  Product/Info:
+#  https://jekyll-one.com
+#
+#  Copyright (C) 2019 Juergen Adams
+#
+#  J1 Template is licensed under the MIT License.
+#  See: https://github.com/jekyll-one/j1_template_mde/blob/master/LICENSE
+#
+# ------------------------------------------------------------------------------
+# Based on the sample Guardfile created by
+#   bundle exec guard init livereload
+#
+# More info at https://github.com/guard/guard#readme
+#
+# ------------------------------------------------------------------------------
+
+# Uncomment and set this to only include directories you want to watch
+#
+# directories %w(app lib config test spec features) \
+#  .select{|d| Dir.exist?(d) ? d : UI.warning("Directory #{d} does not exist")}
+
+## Note: if you are using the `directories` clause above and you are not
+## watching the project directory ('.'), then you will want to move
+## the Guardfile to a watched dir and symlink it back, e.g.
+#
+#  $ mkdir config
+#  $ mv Guardfile config/
+#  $ ln -s config/Guardfile .
+#
+# and, you'll have to watch "config/Guardfile" instead of "Guardfile" 
+
+guard 'livereload' do
+  extensions = {
+    css: :css,
+    scss: :css,
+    sass: :css,
+    js: :js,
+    coffee: :js,
+    html: :html,
+    png: :png,
+    gif: :gif,
+    jpg: :jpg,
+    jpeg: :jpeg,
+    # less: :less, # uncomment if you want LESS stylesheets done in browser
+  }
+
+  rails_view_exts = %w(erb haml slim)
+
+  # file types LiveReload may optimize refresh for
+  compiled_exts = extensions.values.uniq
+  watch(%r{public/.+\.(#{compiled_exts * '|'})})
+
+  extensions.each do |ext, type|
+    watch(%r{
+          (?:app|vendor)
+          (?:/assets/\w+/(?<path>[^.]+) # path+base without extension
+           (?<ext>\.#{ext})) # matching extension (must be first encountered)
+          (?:\.\w+|$) # other extensions
+          }x) do |m|
+      path = m[1]
+      "/assets/#{path}.#{type}"
+    end
+  end
+
+  # file needing a full reload of the page anyway
+  watch(%r{app/views/.+\.(#{rails_view_exts * '|'})$})
+  watch(%r{app/helpers/.+\.rb})
+  watch(%r{config/locales/.+\.yml})
+end
+

data/lib/starter_web/assets/data/authclient.html

@@ -42,8 +42,8 @@ regenerate:                             true
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign authclient_options          = nav_authclient_default | merge: nav_authclient_config %}
-{% assign providers                   = site.j1_auth.provider.activated %}
-{% assign active_provider             = site.j1_auth.provider.activated[0] %}
+{% assign providers                   = site.j1_auth.providers.activated %}
+{% assign active_provider             = site.j1_auth.providers.activated[0] %}
 
 
 {% comment %} Liquid var initialization
@@ -136,7 +136,7 @@ regenerate:                             true
         <div class="modal-header">
           <p class="lead">{{signin_modal_title}}</p>
           <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <i class="mdi mdi-close mdi-light mdi-48px"></i>
+          <i class="mdi mdi-close mdi-dark mdi-48px"></i>
           </button>
         </div>
 
@@ -240,7 +240,7 @@ regenerate:                             true
         <!-- Footer -->
         <div class="modal-footer justify-content-right">
           <a type="button" id="signInButton" class="btn btn-primary-modal mr-2" data-dismiss="modal">
-            <i class="mdi mdi-18px mdi-light mdi-login"></i>
+            <i class="mdi mdi-18px mdi-dark mdi-login"></i>
             Yes, please
           </a>
           <a type="button" id="exitButton" class="btn btn-outline-secondary-modal" data-dismiss="modal">
@@ -265,7 +265,7 @@ regenerate:                             true
         <div class="modal-header">
           <p class="lead">{{signout_modal_title}}</p>
           <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-            <i class="mdi mdi-close mdi-light mdi-48px"></i>
+            <i class="mdi mdi-close mdi-dark mdi-48px"></i>
           </button>
         </div>
         <!-- Body -->
@@ -302,7 +302,10 @@ regenerate:                             true
 
         <!-- Footer -->
         <div class="modal-footer">
-          <a type="button" id="signOutButton" class="btn btn-primary-modal mr-2" data-dismiss="modal">Yes, please</a>
+          <a type="button" id="signOutButton" class="btn btn-primary-modal mr-2" data-dismiss="modal">
+            <i class="mdi mdi-18px mdi-dark mdi-logout"></i>
+            Yes, please
+          </a>
           <a type="button" id="exitButton" class="btn btn-outline-secondary-modal" data-dismiss="modal">No, thanks</a>
         </div>
       </div>
@@ -321,7 +324,7 @@ regenerate:                             true
         <div class="modal-header">
           <p class="lead">Info</p>
           <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-            <i class="mdi mdi-close mdi-light mdi-48px"></i>
+            <i class="mdi mdi-close mdi-dark mdi-48px"></i>
           </button>
         </div>
         <!-- Body -->