j1-template 2021.1.5 → 2021.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (38) hide show
  1. checksums.yaml +4 -4
  2. data/assets/data/themes.json +6 -6
  3. data/assets/themes/j1/adapter/js/cookieConsent.js +54 -28
  4. data/assets/themes/j1/adapter/js/j1.js +119 -150
  5. data/assets/themes/j1/adapter/js/themer.js +37 -29
  6. data/assets/themes/j1/adapter/js/toccer.js +4 -45
  7. data/assets/themes/j1/modules/cookieConsent/js/cookieConsent.js +286 -286
  8. data/assets/themes/j1/modules/cookieConsent/js/cookieConsent.min.js +3 -3
  9. data/assets/themes/j1/modules/fam/css/{uno → theme/uno}/fam.css +0 -0
  10. data/assets/themes/j1/modules/fam/css/theme/uno/fam.min.css +15 -0
  11. data/assets/themes/j1/modules/fam/js/fam.js +1 -6
  12. data/assets/themes/j1/modules/mmenuLight/css/{mmenu.css → mmenu-light.css} +0 -0
  13. data/assets/themes/j1/modules/mmenuLight/css/{mmenu.min.css → mmenu-light.min.css} +0 -0
  14. data/assets/themes/j1/modules/mmenuLight/css/theme/{uno.css → uno/mmenu.css} +0 -0
  15. data/assets/themes/j1/modules/mmenuLight/css/theme/{uno.min.css → uno/mmenu.min.css} +0 -0
  16. data/assets/themes/j1/modules/rtable/css/theme/{uno.css → uno/rtable.css} +0 -0
  17. data/assets/themes/j1/modules/rtable/css/theme/{uno.min.css → uno/rtable.min.css} +0 -0
  18. data/assets/themes/j1/modules/themeSwitcher/js/switcher.js +33 -47
  19. data/assets/themes/j1/modules/themeSwitcher/js/switcher.min.js +410 -2
  20. data/lib/j1/version.rb +1 -1
  21. data/lib/j1_app/j1_auth_manager/auth_manager.rb +2 -3
  22. data/lib/starter_web/Gemfile +1 -1
  23. data/lib/starter_web/_config.yml +1 -1
  24. data/lib/starter_web/_data/j1_config.yml +20 -17
  25. data/lib/starter_web/_data/modules/defaults/themer.yml +2 -1
  26. data/lib/starter_web/_data/private.default.yml +119 -0
  27. data/lib/starter_web/_data/resources.yml +6 -7
  28. data/lib/starter_web/_includes/attributes.asciidoc +1 -1
  29. data/lib/starter_web/_plugins/lunr_index.rb +1 -1
  30. data/lib/starter_web/dot.gitignore +1 -1
  31. data/lib/starter_web/package.json +1 -1
  32. data/lib/starter_web/pages/public/blog/navigator/archive.html +3 -2
  33. data/lib/starter_web/pages/public/blog/navigator/archive/categoryview.html +3 -2
  34. data/lib/starter_web/pages/public/blog/navigator/archive/dateview.html +3 -2
  35. data/lib/starter_web/pages/public/blog/navigator/archive/tagview.html +3 -2
  36. data/lib/starter_web/utilsrv/_defaults/package.json +1 -1
  37. data/lib/starter_web/utilsrv/package.json +1 -1
  38. metadata +11 -9
data/lib/j1/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module J1
2
- VERSION = '2021.1.5'
2
+ VERSION = '2021.1.6'
3
3
  end
data/lib/j1_app/j1_auth_manager/auth_manager.rb CHANGED
@@ -154,10 +154,9 @@ module J1App
154
154
  # --------------------------------------------------------------------------
155
155
  j1_mw_auth_mgr.info 'initialize web session cookie'
156
156
  use Rack::Session::Cookie,
157
- http_only: true, # if set to 'true', make session cookie visible to the browser (document) for HTTP
157
+ http_only: true,
158
158
  key: 'j1.app.session',
159
- # same_site: 'None',
160
- same_site: 'Lax',
159
+ same_site: 'Strict',
161
160
  secret: ENV['J1_SESSION_SECRET'] || SecureRandom.hex
162
161
 
163
162
  # use Rack::Cache do |config|
data/lib/starter_web/Gemfile CHANGED
@@ -54,7 +54,7 @@ gem 'jekyll', '~> 4.2'
54
54
 
55
55
  # Theme Rubies, default: J1 Template (NOT used for the development system)
56
56
  #
57
- gem 'j1-template', '~> 2021.1.5'
57
+ gem 'j1-template', '~> 2021.1.6'
58
58
 
59
59
  # ------------------------------------------------------------------------------
60
60
  # PRODUCTION: Gem needed for the Jekyll and J1 prod environment
data/lib/starter_web/_config.yml CHANGED
@@ -53,7 +53,7 @@ environment: production
53
53
  # ------------------------------------------------------------------------------
54
54
  # Sets the build version of J1 Template Gem
55
55
  #
56
- version: 2021.1.5
56
+ version: 2021.1.6
57
57
 
58
58
  # version
59
59
  # ------------------------------------------------------------------------------
data/lib/starter_web/_data/j1_config.yml CHANGED
@@ -140,6 +140,7 @@ cookies:
140
140
  app_session: j1.app.session
141
141
  user_session: j1.user.session
142
142
  user_state: j1.user.state
143
+ user_consent: j1.user.consent
143
144
 
144
145
 
145
146
  # ==============================================================================
@@ -386,15 +387,15 @@ comments:
386
387
  provider: disqus
387
388
 
388
389
  disqus:
389
- short_name: '<your-site-short-name>'
390
+ short_name: '<your-site-id>'
390
391
 
391
- # facebook:
392
+ # facebook: # currently NOT supported
392
393
  # appid: 123
393
394
  # num_posts: 5
394
395
  # width: 580
395
396
  # colorscheme: light
396
397
 
397
- # custom:
398
+ # custom: # currently NOT supported
398
399
  # custom_data:
399
400
 
400
401
  # ------------------------------------------------------------------------------
@@ -410,8 +411,8 @@ analytics:
410
411
  google:
411
412
  tracking_id: '<your-tracking-id>'
412
413
 
413
- custom:
414
- custom_data:
414
+ # custom: # currently NOT supported
415
+ # custom_data:
415
416
 
416
417
  # ------------------------------------------------------------------------------
417
418
  # ADVERTISING settings
@@ -422,26 +423,28 @@ analytics:
422
423
  advertising:
423
424
  enabled: false
424
425
  provider: google
426
+
425
427
  google:
426
428
  publisher_id: '<your-publisher-id>'
427
- custom:
428
- custom_data:
429
+
430
+ # custom: # currently NOT supported
431
+ # custom_data:
429
432
 
430
433
  # ------------------------------------------------------------------------------
431
- # TRANSLATOR settings
434
+ # TRANSLATOR settings (currently NOT supported)
432
435
  #
433
436
  # Set 'enabled' to false to turn translators off globally
434
437
  # Set 'provider' to the translation provider you want to use
435
438
  #
436
- translation:
437
- enabled: false
438
- provider: google
439
-
440
- google:
441
- layout: default
442
- meta_data: [google-translate-customization]
443
- page_language: en
444
- translation_languages: [all]
439
+ # translation:
440
+ # enabled: false
441
+ # provider: google
442
+ #
443
+ # google:
444
+ # layout: default
445
+ # meta_data: [google-translate-customization]
446
+ # page_language: en
447
+ # translation_languages: [all]
445
448
 
446
449
  # ------------------------------------------------------------------------------
447
450
  # SHARING settings (currently NOT supported)
data/lib/starter_web/_data/modules/defaults/themer.yml CHANGED
@@ -143,6 +143,7 @@ about_config:
143
143
  defaults:
144
144
 
145
145
  enabled: false
146
+
146
147
  retries: 30 # retry to load theme list from API
147
148
  saveToCookie: true
148
149
  debug: false
@@ -151,7 +152,7 @@ defaults:
151
152
  menu_icon_color: "#9E9E9E"
152
153
  menu_icon_size: mdi-sm
153
154
  cssThemeLink: bootstrapTheme
154
- defaultCssFile: https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css
155
+ defaultCssFile: https://cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/css/bootstrap.min.css
155
156
  bootswatchApiUrl: https://bootswatch.com/api
156
157
  bootswatchApiVersion: 4
157
158
  loadFromBootswatch: true
data/lib/starter_web/_data/private.default.yml ADDED
@@ -0,0 +1,119 @@
1
+ # ------------------------------------------------------------------------------
2
+ # ~/_data/private.yml
3
+ # The private.yml file is used to set sensitive private data used by
4
+ # J1 components to configure security and authentication settings
5
+ #
6
+ # Product/Info:
7
+ # https://jekyll.one
8
+ #
9
+ # Copyright (C) 2019 Juergen Adams
10
+ #
11
+ # J1 Template is licensed under the MIT License.
12
+ # See: https://github.com/jekyll-one-org/j1_template/blob/master/LICENSE
13
+ # ------------------------------------------------------------------------------
14
+ # NOTE:
15
+ # As this file contains very confidential data, a productive private.yml
16
+ # file should ALWAYS be excluded from ANY source published to the public
17
+ # (e.g. a repo at Github)
18
+ # ------------------------------------------------------------------------------
19
+
20
+
21
+ # ==============================================================================
22
+ # GLOBAL settings
23
+ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
24
+ global:
25
+
26
+ # used by J1 to encrypt cookies
27
+ session_secret: <your-secret-string>
28
+
29
+
30
+ # ==============================================================================
31
+ # MODULE settings
32
+ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
33
+ modules:
34
+
35
+ # J1 Webhook
36
+ # NOTE:
37
+ # ----------------------------------------------------------------------------
38
+ webhook:
39
+
40
+ comment:
41
+ name: <your-config-name>
42
+ user: <your-gh-user>
43
+ repo: <your-gh-repo>
44
+ server_url: <your-gh-webhook-url>
45
+
46
+ secret: <your-gh-secret> # secret used at GH Webhooks
47
+ payload_url: <your-payload-url> # payload url (e.g channel at smee.io)
48
+
49
+
50
+ # ==============================================================================
51
+ # # J1 Utility Server
52
+ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
53
+ util_srv:
54
+
55
+ oauth:
56
+
57
+ # GH OAuth settings used for J1 Control Center (NetlifyCMS) for the
58
+ # external OAuth client (base_url)
59
+ # --------------------------------------------------------------------------
60
+ comment:
61
+ name: <your-config-name>
62
+ user: <your-gh-user>
63
+ user_url: <your-user-url>
64
+ strategy: members
65
+ members: all
66
+
67
+ site_url: http://localhost:41010
68
+ site_redirect_url: http://localhost:41010/auth/github/callback
69
+ client_scope: repo, user
70
+ client_id: <your-client-id>
71
+ client_secret: <your-client-secret>
72
+
73
+
74
+ # ==============================================================================
75
+ # MIDDLEWARE settings
76
+ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
77
+ middleware:
78
+
79
+ # OAuth settings (J1 Auth Client)
80
+ # ----------------------------------------------------------------------------
81
+ oauth:
82
+
83
+ # --------------------------------------------------------------------------
84
+ # DISQUS credentials
85
+ # ==========================================================================
86
+ disqus:
87
+
88
+ # J1 Auth client (mode APP, development system)
89
+ # ------------------------------------------------------------------------
90
+ comment:
91
+ name: <your-disqus-config-name>
92
+ user: <your-disqus-user>
93
+
94
+ client_url: http://localhost:41010
95
+ client_redirect_url: http://localhost:41010/auth/disqus/callback
96
+ client_id: <your-disqus-client-id>
97
+ client_secret: <your-disqus-client-secret>
98
+
99
+ # --------------------------------------------------------------------------
100
+ # GITHUB credentials
101
+ # ==========================================================================
102
+ github:
103
+
104
+ # J1 Auth client (mode APP, development system)
105
+ # ------------------------------------------------------------------------
106
+ comment:
107
+ name: <your-gh-config-name>
108
+ user: <your-gh-user>
109
+ org: <your-gh-org>
110
+ strategy: members
111
+ members: all
112
+
113
+ client_url: http://localhost:41010
114
+ client_redirect_url: http://localhost:41010/auth/github/callback
115
+ client_id: <your-gh-client-id>
116
+ client_secret: <your-gh-client-secret>
117
+
118
+ # ------------------------------------------------------------------------------
119
+ # END
data/lib/starter_web/_data/resources.yml CHANGED
@@ -462,9 +462,9 @@ resources:
462
462
  init_function: [ j1.adapter.navigator.init ]
463
463
 
464
464
  # ----------------------------------------------------------------------------
465
- # MMenu Light
465
+ # Mobile Menu (Light)
466
466
  #
467
- - name: Mobile Menu
467
+ - name: MMenu
468
468
  resource:
469
469
  id: mmenu
470
470
  enabled: true
@@ -478,8 +478,8 @@ resources:
478
478
  pass_init_data: false
479
479
  data:
480
480
  css: [
481
- modules/mmenuLight/css/mmenu,
482
- modules/mmenuLight/css/theme/uno
481
+ modules/mmenuLight/css/mmenu-light,
482
+ modules/mmenuLight/css/theme/uno/mmenu
483
483
  ]
484
484
  files: [
485
485
  modules/mmenuLight/js/mmenu.js,
@@ -678,7 +678,7 @@ resources:
678
678
  dependencies: false
679
679
  pass_init_data: false
680
680
  data:
681
- css: [ modules/rtable/css/theme/uno ]
681
+ css: [ modules/rtable/css/theme/uno/rtable ]
682
682
  files: [ adapter/js/rtable.js ]
683
683
  js: [ modules/rtable/js/rtable ]
684
684
  init_function: [ j1.adapter.rtable.init ]
@@ -1182,9 +1182,8 @@ resources:
1182
1182
  dependencies: false
1183
1183
  pass_init_data: true
1184
1184
  data:
1185
- css: []
1185
+ css: [ modules/fam/css/theme/uno/fam ] # styles for (J1) theme Uno]
1186
1186
  files: [
1187
- modules/fam/css/uno/fam.css, # styles for (J1) theme Uno
1188
1187
  # modules/cash/js/cash.js, # current version|s of Cash NOT usable
1189
1188
  modules/materialize/js/cash.js, # adapted|old (1.3.5) version from Materialize
1190
1189
  modules/fam/js/fam.js, # modified version for J1 (former: button.js)
data/lib/starter_web/_includes/attributes.asciidoc CHANGED
@@ -412,7 +412,7 @@ end::tables[]
412
412
  // -----------------------------------------------------------------------------
413
413
  tag::products[]
414
414
  :j1--license: MIT License
415
- :j1--version: 2021.1.5
415
+ :j1--version: 2021.1.6
416
416
  :j1--site-name: Jekyll One
417
417
  end::products[]
418
418
 
data/lib/starter_web/_plugins/lunr_index.rb CHANGED
@@ -360,6 +360,6 @@ end
360
360
 
361
361
  module Jekyll
362
362
  module J1LunrSearch
363
- VERSION = '2021.1.5'
363
+ VERSION = '2021.1.6'
364
364
  end
365
365
  end
data/lib/starter_web/dot.gitignore CHANGED
@@ -14,7 +14,7 @@ Gemfile.lock
14
14
 
15
15
  Passengerfile.json
16
16
 
17
- google*.html
17
+ /google*.html
18
18
 
19
19
  tmp/
20
20
 
data/lib/starter_web/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "private": true,
3
3
  "name": "j1_starter",
4
- "version": "2021.1.5",
4
+ "version": "2021.1.6",
5
5
  "description": "J1 Template Starter Web",
6
6
  "homepage": "https://your.site",
7
7
  "author": {
data/lib/starter_web/pages/public/blog/navigator/archive.html CHANGED
@@ -145,10 +145,11 @@ resource_options:
145
145
  var user_state = j1.readCookie(user_state_cookie_name);
146
146
  var user_state_last_page = "{{browser_page_url}}";
147
147
  user_state.last_page = user_state_last_page;
148
- // j1.setUserState( {last_page:user_state_last_page} );
148
+
149
149
  j1.writeCookie({
150
150
  name: user_state_cookie_name,
151
- data: user_state
151
+ data: user_state,
152
+ samesite: 'Strict'
152
153
  });
153
154
  logger.info('Saved current Post Browser page to cookie: {{browser_page_url}}');
154
155
  }
data/lib/starter_web/pages/public/blog/navigator/archive/categoryview.html CHANGED
@@ -190,10 +190,11 @@ resource_options:
190
190
  var user_state = j1.readCookie(user_state_cookie_name);
191
191
  var user_state_last_page = "{{browser_page_url}}";
192
192
  user_state.last_page = user_state_last_page;
193
- // j1.setUserState( {last_page:user_state_last_page} );
193
+
194
194
  j1.writeCookie({
195
195
  name: user_state_cookie_name,
196
- data: user_state
196
+ data: user_state,
197
+ samesite: 'Strict'
197
198
  });
198
199
  logger.info('Saved current Post Browser page to cookie: {{browser_page_url}}');
199
200
  }
data/lib/starter_web/pages/public/blog/navigator/archive/dateview.html CHANGED
@@ -177,10 +177,11 @@ resource_options:
177
177
  var user_state = j1.readCookie(user_state_cookie_name);
178
178
  var user_state_last_page = "{{browser_page_url}}";
179
179
  user_state.last_page = user_state_last_page;
180
- // j1.setUserState( {last_page:user_state_last_page} );
180
+
181
181
  j1.writeCookie({
182
182
  name: user_state_cookie_name,
183
- data: user_state
183
+ data: user_state,
184
+ samesite: 'Strict'
184
185
  });
185
186
  logger.info('Saved current Post Browser page to cookie: {{browser_page_url}}');
186
187
  }
data/lib/starter_web/pages/public/blog/navigator/archive/tagview.html CHANGED
@@ -211,10 +211,11 @@ resource_options:
211
211
  var user_state = j1.readCookie(user_state_cookie_name);
212
212
  var user_state_last_page = "{{browser_page_url}}";
213
213
  user_state.last_page = user_state_last_page;
214
- // j1.setUserState( {last_page:user_state_last_page} );
214
+
215
215
  j1.writeCookie({
216
216
  name: user_state_cookie_name,
217
- data: user_state
217
+ data: user_state,
218
+ samesite: 'Strict'
218
219
  });
219
220
  logger.info('Saved current Post Browser page to cookie: {{browser_page_url}}');
220
221
  }
data/lib/starter_web/utilsrv/_defaults/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "private": true,
3
3
  "name": "utls",
4
- "version": "2021.1.5",
4
+ "version": "2021.1.6",
5
5
  "description": "J1 Template Utility Server",
6
6
  "homepage": "https://jekyll.one",
7
7
  "author": {
data/lib/starter_web/utilsrv/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "private": true,
3
3
  "name": "utls",
4
- "version": "2021.1.5",
4
+ "version": "2021.1.6",
5
5
  "description": "J1 Template Utility Server",
6
6
  "homepage": "https://jekyll.one",
7
7
  "author": {
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: j1-template
3
3
  version: !ruby/object:Gem::Version
4
- version: 2021.1.5
4
+ version: 2021.1.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - juergen_jekyll_one
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-06-29 00:00:00.000000000 Z
11
+ date: 2021-07-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: jekyll
@@ -560,7 +560,8 @@ files:
560
560
  - assets/themes/j1/modules/datatables/css/theme/uno.css
561
561
  - assets/themes/j1/modules/datatables/js/datatables.js
562
562
  - assets/themes/j1/modules/datatables/js/datatables.min.js
563
- - assets/themes/j1/modules/fam/css/uno/fam.css
563
+ - assets/themes/j1/modules/fam/css/theme/uno/fam.css
564
+ - assets/themes/j1/modules/fam/css/theme/uno/fam.min.css
564
565
  - assets/themes/j1/modules/fam/js/fam.js
565
566
  - assets/themes/j1/modules/iconifyAPI/js/iconify.min.js
566
567
  - assets/themes/j1/modules/iframeResizer/LICENSE
@@ -821,10 +822,10 @@ files:
821
822
  - assets/themes/j1/modules/mdiPreviewer/js/previewer.min.js
822
823
  - assets/themes/j1/modules/mdiPreviewer/js/previewer.new.js
823
824
  - assets/themes/j1/modules/mdiPreviewer/js/previewer.old.js
824
- - assets/themes/j1/modules/mmenuLight/css/mmenu.css
825
- - assets/themes/j1/modules/mmenuLight/css/mmenu.min.css
826
- - assets/themes/j1/modules/mmenuLight/css/theme/uno.css
827
- - assets/themes/j1/modules/mmenuLight/css/theme/uno.min.css
825
+ - assets/themes/j1/modules/mmenuLight/css/mmenu-light.css
826
+ - assets/themes/j1/modules/mmenuLight/css/mmenu-light.min.css
827
+ - assets/themes/j1/modules/mmenuLight/css/theme/uno/mmenu.css
828
+ - assets/themes/j1/modules/mmenuLight/css/theme/uno/mmenu.min.css
828
829
  - assets/themes/j1/modules/mmenuLight/js/mmenu.js
829
830
  - assets/themes/j1/modules/mmenuLight/js/mmenu.min.js
830
831
  - assets/themes/j1/modules/popper/js/popper.js
@@ -856,8 +857,8 @@ files:
856
857
  - assets/themes/j1/modules/rtable/LICENSE
857
858
  - assets/themes/j1/modules/rtable/README.md
858
859
  - assets/themes/j1/modules/rtable/css/tablesaw.stackonly.css
859
- - assets/themes/j1/modules/rtable/css/theme/uno.css
860
- - assets/themes/j1/modules/rtable/css/theme/uno.min.css
860
+ - assets/themes/j1/modules/rtable/css/theme/uno/rtable.css
861
+ - assets/themes/j1/modules/rtable/css/theme/uno/rtable.min.css
861
862
  - assets/themes/j1/modules/rtable/js/rtable.js
862
863
  - assets/themes/j1/modules/rtable/js/rtable.min.js
863
864
  - assets/themes/j1/modules/rtable/js/tablesaw-init.js
@@ -1037,6 +1038,7 @@ files:
1037
1038
  - lib/starter_web/_data/pages/builder.yml
1038
1039
  - lib/starter_web/_data/plugins/defaults/paginator.yml
1039
1040
  - lib/starter_web/_data/plugins/paginator.yml
1041
+ - lib/starter_web/_data/private.default.yml
1040
1042
  - lib/starter_web/_data/private.yml
1041
1043
  - lib/starter_web/_data/resources.yml
1042
1044
  - lib/starter_web/_data/utilities/defaults/util_srv.yml