j1-template 2020.0.18 → 2020.0.19

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

@@ -65,7 +65,7 @@ defaults:
   icon_color:                           mdi-grey
   icon_size:                            mdi-sm
 
-  nav_primary_color:                    "#0D47A1"                               # md-blue-900, general color for navbar and nav-menus
+  nav_primary_color:                    "#2196F3"                               # md-blue, general color for navbar and nav-menus
 
   # ----------------------------------------------------------------------------
   # NavBar
@@ -85,9 +85,9 @@ defaults:
     position:                           left
     bottom_line_height:                 1
     bottom_line_color:                  "#EEEEEE"                               # md-grey-200
-    background_color_full:              rgba(0, 0, 0, 0.4)                      # rgba-darken-400
-    background_color_collapsed:         "#3F51B5"                               # md-indigo, was: md-blue-grey
-    background_color_scrolled:          "#3F51B5"                               # md-indigo, was: md-blue-grey
+    background_color_full:              rgba(0, 0, 0, 0.4)                      # darken-400
+    background_color_collapsed:         "#2196F3"                               # md-blue
+    background_color_scrolled:          "#2196F3"                               # md-blue
 
   # ----------------------------------------------------------------------------
   # NavMenu (Mobile)

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

@@ -159,8 +159,9 @@ defaults:
   bootswatchApiVersion:                 4
   loadFromBootswatch:                   true
   localFeed:                            /assets/data/themes.json
+  localThemes:                          /assets/data/themes.json
   excludeBootswatch:                    default, lux, sketchy
-  includeBootswatch:                    /assets/themes/j1/core/css/theme_extensions.css
+  includeBootswatch:                    /assets/themes/j1/core/css/theme-extensions.css
   skipIncludeBootswatch:                Uno
 
 # ------------------------------------------------------------------------------

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

@@ -138,8 +138,9 @@ settings:
   bootswatchApiVersion:                 4
   loadFromBootswatch:                   true
   localFeed:                            /assets/data/themes.json
+  localThemes:                          /assets/data/themes.json
   excludeBootswatch:                    default,Default,Lux,Sketchy
-  includeBootswatch:                    /assets/themes/j1/core/css/theme_extensions.css
+  includeBootswatch:                    /assets/themes/j1/core/css/theme-extensions.css
   skipIncludeBootswatch:                Uno
 
 # ------------------------------------------------------------------------------

data/lib/starter_web/_data/private.yml

@@ -1,30 +1,29 @@
 # ------------------------------------------------------------------------------
 # ~/_data/private.yml
-# The private.yml file is used to set sensitive private data used by
-# J1 components to configure security and authentication settings
+# The private.yml file is used to set private data used by several J1 apps
+# and modules to configure e.g. security and/or authentication settings.
 #
 # Product/Info:
 # https://jekyll.one
 #
-# Copyright (C) 2019 Juergen Adams
+# 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:
-#   As this file contains very confidential data, a productive private.yml
-#   file should ALWAYS be excluded from ANY source published to the public
-#   (e.g. a repo at Github)
+#   As this file contains highly confidential data, never publish this
+#   file to the public. A productive private.yml file should ALWAYS be
+#   excluded from ANY source published to the public (e.g. a repo at Github).
 # ------------------------------------------------------------------------------
 
-
 # ==============================================================================
 # GLOBAL settings
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 global:
 
-  # used by J1 to encrypt cookies
-  session_secret:                       12ada70c0d34914d194f1a790c9b23bd
+  # used by J1 e.g. to encrypt cookies
+  session_secret:                       <your-secret-string>
 
 
 # ==============================================================================
@@ -38,13 +37,13 @@ modules:
   webhook:
 
     comment:
-      name:                             j1-template@jekyll-one-org
-      user:                             j1juergen
-      repo:                             jekyll-one-org/j1-template
-      server_url:                       https://github.com/jekyll-one-org/j1-template/settings/hooks
+      name:                             <your-config-name>
+      user:                             <your-gh-user>
+      repo:                             <your-gh-repo>
+      server_url:                       <your-gh-webhook-url>
 
-    secret:                             12ada70c0d34914d194f1a790c9b23bd        # secret used at GH Webhook
-    payload_url:                        https://smee.io/bzTe8lpQq1KeSJF         # payload url (e.g channel at smee.io)
+    secret:                             <your-gh-secret>
+    payload_url:                        <your-payload-url>
 
 
 # ==============================================================================
@@ -55,20 +54,20 @@ util_srv:
   oauth:
 
     # GH OAuth settings used for J1 Control Center (NetlifyCMS) for the
-    # external OAuth client (base_url)
+    # external OAuth client
     # --------------------------------------------------------------------------
     comment:
-      name:                           j1-utilitiy-server@local-44444
-      user:                           j1juergen@jekyll-one-org
-      user_url:                       https://github.com/organizations/jekyll-one-org/settings/applications/1129706
+      name:                           <your-config-name>
+      user:                           <your-gh-user>
+      user_url:                       <your-user-url>
       strategy:                       members
       members:                        all
 
     site_url:                         http://localhost:44444
     site_redirect_url:                http://localhost:44444/auth/github/callback
     client_scope:                     repo, user
-    client_id:                        1a0d2977414958182711
-    client_secret:                    358b3b44e3711f9b279d4ae7164c9de2e5dafc27
+    client_id:                        <your-client-id>
+    client_secret:                    <your-client-secret>
 
 
 # ==============================================================================
@@ -80,120 +79,69 @@ middleware:
   # ----------------------------------------------------------------------------
   oauth:
 
-    # --------------------------------------------------------------------------
     # DISQUS credentials
-    # ==========================================================================
+    # --------------------------------------------------------------------------
     disqus:
 
-      # J1 Auth client (mode APP, development system)
+      # J1 Auth client (mode WEB, development system)
       # ------------------------------------------------------------------------
       comment:
-        name:                           j1-starter-local-5k
-        user:                           juergen.adams@jekyll-one.com
+        name:                           <your-config-name>
+        user:                           <your-gh-user>
+        org:                            <your-gh-organisation>
         strategy:                       members
+        members:                        all
 
       client_url:                       http://localhost:5000
       client_redirect_url:              http://localhost:5000/auth/disqus/callback
-      client_id:                        ssPdlHsww2Kz6MFHsKkJNWvO5kzGpjcPf0AnGkbgMiXobsz29Va9yIGkNZaex1z3
-      client_secret:                    lZFhPYlTRiKd5pl9KAMM9QumbpkLi15TR0Bx0T6wwRZ97ndvvO7b9RmSKHleNHR4
+      client_id:                        <your-client-id>
+      client_secret:                    <your-client-secret>
 
-      # J1 Auth client (mode APP, production)
+      # J1 Auth client (mode APP, development system)
       # ------------------------------------------------------------------------
-#     comment:
-#       name:                           j1-starter-app
-#       user:                           juergen.adams@jekyll-one.com
-#       strategy:                       members
-#
-#     client_url:                       https://app.jekyll.one
-#     client_redirect_url:              http://app.jekyll.one/auth/disqus/callback
-#     client_id:                        nxfGmVWvtPHhv2XqXMDZShOwwlEyCyxCvx36xMG1DEv0WfcsKb5Y83yV0CE045X4
-#     client_secret:                    72vMIfD7RXfPQ9T1hxbwvUOkycWofa14apUOLoYkfJ8ZVDFqjBTrOIjDHzkBQFuw
+      comment:
+        name:                           <your-config-name>
+        user:                           <your-gh-user>
+        org:                            <your-gh-organisation>
+        strategy:                       members
+        members:                        all
 
+      client_url:                       http://localhost:5000
+      client_redirect_url:              http://localhost:5000/auth/disqus/callback
+      client_id:                        <your-client-id>
+      client_secret:                    <your-client-secret>
 
-    # --------------------------------------------------------------------------
     # GITHUB credentials
-    # ==========================================================================
+    # --------------------------------------------------------------------------
     github:
 
-      # J1 Auth client (mode APP, development system)
+      # J1 Auth client (mode WEB, development system)
       # ------------------------------------------------------------------------
       comment:
-        name:                           j1-starter@local-5k
-        user:                           jekyll-one
-        org:                            jekyll-one-org
+        name:                           <your-config-name>
+        user:                           <your-gh-user>
+        org:                            <your-gh-organisation>
         strategy:                       members
         members:                        all
 
       client_url:                       http://localhost:5000
       client_redirect_url:              http://localhost:5000/auth/github/callback
-      client_id:                        4759b4d27a5f526c632a
-      client_secret:                    8472988317760fd097d1e80e996f4ec410c1857a
-
-      # J1 Auth client (mode APP, prod system)
-      # ------------------------------------------------------------------------
-#     comment:
-#       name:                           https://docs.jekyll.one
-#       user:                           jekyll-one
-#       org:                            jekyll-one-org
-#       strategy:                       members
-#       members:                        all
-#
-#     client_url:                       https://docs.jekyll.one/
-#     client_redirect_url:              https://docs.jekyll.one/auth/github/callback
-#     client_id:                        9bf5e62056aabee42898
-#     client_secret:                    e9c70921603e56dc38cf05b53868417172b35c2e
-
-
-    # --------------------------------------------------------------------------
-    # PATREON credentials
-    # ==========================================================================
-    patreon:
+      client_id:                        <your-client-id>
+      client_secret:                    <your-client-secret>
 
       # J1 Auth client (mode APP, development system)
       # ------------------------------------------------------------------------
-#     comment:
-#       name:                           j1-starter-local-5k
-#       user:                           juergen@jekyll.one
-#       strategy:                       members
-#       api:                            v1
-#
-#     client_url:                       http://localhost:5000
-#     client_redirect_url:              http://localhost:5000/auth/github/callback
-#     client_id:                        bDuEYHyKjtypxb5wQKMILCCUw-x5XtYD-_9MsDAO22agQGoaB2CRKtP5UReRVflS
-#     client_secret:                    uDRsD1dwWSLPUCeBrjz4umjsNMD04drCtTqy7xSEjkqIVACGa-h-n1w8t9o2mW42
-
-      # J1 Auth client (mode APP, production)
-      # ------------------------------------------------------------------------
-#     comment:
-#       name:                           j1-starter-app-heroku
-#       user:                           juergen@jekyll.one
-#       strategy:                       members
-#       api:                            v1
-#
-#     client_url:                       https://j1-starter-app.herokuapp.com
-#     client_redirect_url:              https://j1-starter-app.herokuapp.com/auth/patreon/callback
-#     client_id:                        HOgyFtiKA_wwgL-PkwwrQszs3LXJdnw28JYrX28-MvCkhx5dyp8kRW8RC4WnzdVE
-#     client_secret:                    ofh0yfPNtJzzFoCMDW0miHbf7CWJ-JSaOkvXkqyOdczkmNBk-16Gf2GFP3ihD8Gd
-
-
-
-    # --------------------------------------------------------------------------
-    # TWITTER credentials (currently NOT supported)
-    # ==========================================================================
-    twitter:
+      comment:
+        name:                           <your-config-name>
+        user:                           <your-gh-user>
+        org:                            <your-gh-organisation>
+        strategy:                       members
+        members:                        all
 
-      # J1 Auth client
-      # ------------------------------------------------------------------------
-#     comment:
-#       name:                           <your-oauth-app-name>
-#       user:                           <your-userid>
-#       strategy:                       <your-strategy>
-#       api:                            v1
-#
-#     client_url:                       <your-client-url>
-#     client_redirect_url:              <your-client-redirect-url>
-#     client_id:                        <your-client-id>
-#     client_secret:                    <your-client-secret>
+      client_url:                       http://localhost:5000
+      client_redirect_url:              http://localhost:5000/auth/github/callback
+      client_id:                        <your-client-id>
+      client_secret:                    <your-client-secret>
 
 # ------------------------------------------------------------------------------
 # END

data/lib/starter_web/_data/resources.yml

@@ -350,7 +350,7 @@ resources:
   #   5   log4javascript                log4javascript@1.4.15
   #   6   Bootstrap                     bootstrap@4.4.1
   #   6   bs_material_design            bootstrap-material-design@4.0.0-beta.4
-  #   7   j1_template                   j1_template_4@2020.0.18
+  #   7   j1_template                   j1_template_4@2020.0.19
   #   8   tocbot                        tocbot@4.11.2
   #   9   jekyll_search                 simple_jekyll_search@1.1.5
   #   10  bs_theme_switcher             bs_theme_switcher@1.1.5
@@ -380,8 +380,8 @@ resources:
         css:                            [
                                           core/css/uno,
                                           core/css/vendor,
-                                          core/css/material-design-icons,
-                                          core/css/fontawesome
+                                          core/css/icons-fontawesome,
+                                          core/css/icons-materialdesign
                                         ]
         files:                          [
                                           modules/util/js/js.cookie.js,
@@ -721,26 +721,6 @@ resources:
         js:                             []
         init_function:                  []
 
-  # ----------------------------------------------------------------------------
-  # Twitter Emoji
-  #
-  - name:                               Twemoji
-    resource:
-      id:                               twemoji
-      enabled:                          true
-      comment:                          Twemoji
-      region:                           head
-      layout:                           [ page, post, collection ]
-      required:                         ondemand
-      script_load:                      defer
-      dependencies:                     false
-      pass_init_data:                   false
-      data:
-        css:                            [ core/css/twemoji ]
-        files:                          []
-        js:                             []
-        init_function:                  []
-
   # ----------------------------------------------------------------------------
   # Animate CSS
   #
@@ -825,13 +805,13 @@ resources:
         init_function:                  [ j1.adapter.lightbox.init ]
 
   # ----------------------------------------------------------------------------
-  # Twitter Emoji
+  # Twitter Emoji (Icons)
   #
-  - name:                               Twitter Emoji Picker
+  - name:                               Twitter Emoji Icons
     resource:
       id:                               twemoji
       enabled:                          true
-      comment:                          module twemoji_picker
+      comment:                          module twemoji
       layout:                           [ home, page, post, collection ]
       region:                           head
       required:                         ondemand
@@ -839,7 +819,27 @@ resources:
       dependencies:                     false
       pass_init_data:                   false
       data:
-        css:                            []
+        css:                            [ core/css/icons-twemoji ]
+        files:                          []
+        js:                             []
+        init_function:                  []
+
+  # ----------------------------------------------------------------------------
+  # Twitter Emoji (Picker)
+  #
+  - name:                               Twitter Emoji Picker
+    resource:
+      id:                               twemoji_picker
+      enabled:                          true
+      comment:                          module twemoji_picker
+      layout:                           [ page ]
+      region:                           head
+      required:                         ondemand
+      script_load:                      deferred
+      dependencies:                     false
+      pass_init_data:                   false
+      data:
+        css:                            [ modules/twemoji/css/picker/twemoji-picker ]
         files:                          []
         js:                             [
 #                                         modules/twemoji/js/twemoji,
@@ -848,7 +848,27 @@ resources:
         init_function:                  []
 
   # ----------------------------------------------------------------------------
-  # Iconify Framework
+  # MDI Previewer
+  #
+  - name:                               MDI Previewer
+    resource:
+      id:                               mdi_previewer
+      enabled:                          true
+      comment:                          module mdi_previewer
+      layout:                           [ page ]
+      region:                           head
+      required:                         ondemand
+      script_load:                      deferred
+      dependencies:                     false
+      pass_init_data:                   false
+      data:
+        css:                            [ modules/mdiPreviewer/css/previewer ]
+        files:                          []
+        js:                             []
+        init_function:                  []
+
+  # ----------------------------------------------------------------------------
+  # Iconify (Icons) Framework
   #
   - name:                               Iconify Framework
     resource:
@@ -862,7 +882,7 @@ resources:
       dependencies:                     false
       pass_init_data:                   false
       data:
-        css:                            [ core/css/iconify-icons ]
+        css:                            [ core/css/icons-iconify ]
         files:                          [ modules/iconifyAPI/js/iconify.min.js ]
         js:                             []
         init_function:                  []

data/lib/starter_web/assets/images/modules/icons/j1/scalable/j1.svg

@@ -16,7 +16,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="j1.svg"
-   inkscape:export-filename="X:\j1\github\j1_template\packages\300_template_src\assets\images\modules\icons\j1\j1-512x512.png"
+   inkscape:export-filename="X:\j1\github\j1-template\packages\300_template_src\assets\images\modules\icons\j1\j1-512x512.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <title
@@ -1313,9 +1313,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.3373274"
-     inkscape:cx="341.84077"
-     inkscape:cy="181.05754"
+     inkscape:zoom="1.71"
+     inkscape:cx="250"
+     inkscape:cy="250"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -1361,10 +1361,6 @@
        position="666.2542,249.0041"
        orientation="0,1"
        id="guide4541" />
-    <sodipodi:guide
-       position="-25.802752,175.45872"
-       orientation="0,1"
-       id="guide4547" />
   </sodipodi:namedview>
   <metadata
      id="metadata7">
@@ -1417,33 +1413,33 @@
      id="layer1"
      transform="translate(0,-552.36218)"
      style="display:inline">
-    <rect
-       style="fill:none;fill-opacity:1"
-       id="rect3745"
-       width="93.470009"
-       height="91.974487"
-       x="-267.69809"
-       y="556.59729" />
-    <rect
-       style="fill:#ffffff;fill-opacity:1"
-       id="rect3747"
-       width="102.44314"
-       height="109.92074"
-       x="-222.08473"
-       y="631.37329" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:203.11209106px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#87aade;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
-       x="57.554077"
-       y="1092.8141"
-       id="text4682"
-       sodipodi:linespacing="125%"
-       transform="scale(1.2190564,0.82030662)"><tspan
-         sodipodi:role="line"
-         id="tspan4684"
-         x="57.554077"
-         y="1092.8141"
-         style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:564.20019531px;font-family:'Brush Script MT';-inkscape-font-specification:'Brush Script MT Italic';fill:#87aade;">j1</tspan></text>
+    <g
+       id="g4482">
+      <text
+         transform="scale(-1.1438394,0.87424863)"
+         sodipodi:linespacing="125%"
+         id="text4513"
+         y="1111.0399"
+         x="-420.70685"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:541.57806396px;line-height:125%;font-family:Roboto;-inkscape-font-specification:Roboto;letter-spacing:0px;word-spacing:0px;fill:#757575;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="1111.0399"
+           x="-420.70685"
+           id="tspan4515"
+           sodipodi:role="line">1</tspan></text>
+      <text
+         transform="scale(1.1450956,-0.87328952)"
+         sodipodi:linespacing="125%"
+         id="text4513-3"
+         y="-723.17688"
+         x="15.25074"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:545.76879883px;line-height:125%;font-family:Roboto;-inkscape-font-specification:Roboto;letter-spacing:0px;word-spacing:0px;display:inline;fill:#0d47a1;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+         xml:space="preserve"><tspan
+           y="-723.17688"
+           x="15.25074"
+           id="tspan4515-9"
+           sodipodi:role="line">1</tspan></text>
+    </g>
   </g>
   <g
      style="display:none"