소스 검색

reload on login for compatibility with autologout

bach 2 년 전
부모
커밋
a535a2e3cf

+ 0 - 17
config/devel/ultimate_cron.job.dblog_cron.yml

@@ -1,17 +0,0 @@
-uuid: a050024d-e271-4be0-9142-6dda5ddaa561
-langcode: en
-status: true
-dependencies:
-  module:
-    - dblog
-title: 'Remove expired log messages and flood control events'
-id: dblog_cron
-weight: 0
-module: dblog
-callback: dblog_cron
-scheduler:
-  id: simple
-launcher:
-  id: serial
-logger:
-  id: database

+ 1 - 1
config/sync/autologout.settings.yml

@@ -10,7 +10,7 @@ enforce_admin: false
 jstimer_format: '%hours%:%mins%:%secs%'
 jstimer_js_load_option: false
 use_alt_logout_method: true
-use_watchdog: true
+use_watchdog: false
 langcode: fr
 _core:
   default_config_hash: m2pxH8tc4KIlh127R5TYim65W7NBY9gpYQnIXlvDp0M

+ 12 - 12
config/sync/filter.format.full_html.yml

@@ -23,6 +23,12 @@ filters:
     weight: 0
     settings:
       filter_url_length: 72
+  filter_html_image_secure:
+    id: filter_html_image_secure
+    provider: filter
+    status: true
+    weight: 9
+    settings: {  }
   filter_url_to_video:
     id: filter_url_to_video
     provider: url_to_video_filter
@@ -39,6 +45,12 @@ filters:
     status: true
     weight: 0
     settings: {  }
+  editor_file_reference:
+    id: editor_file_reference
+    provider: editor
+    status: true
+    weight: 0
+    settings: {  }
   filter_html:
     id: filter_html
     provider: filter
@@ -48,15 +60,3 @@ filters:
       allowed_html: '<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type> <li> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <img src alt data-entity-type data-entity-uuid> <s> <p> <h1> <pre>'
       filter_html_help: true
       filter_html_nofollow: false
-  editor_file_reference:
-    id: editor_file_reference
-    provider: editor
-    status: true
-    weight: 0
-    settings: {  }
-  filter_html_image_secure:
-    id: filter_html_image_secure
-    provider: filter
-    status: true
-    weight: 9
-    settings: {  }

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
web/themes/custom/materiotheme/assets/dist/main.js


BIN
web/themes/custom/materiotheme/assets/dist/main.js.gz


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
web/themes/custom/materiotheme/assets/dist/report.html


+ 1 - 0
web/themes/custom/materiotheme/materiotheme.libraries.yml

@@ -32,3 +32,4 @@ global-js:
     # - url_to_video_filter/player_embed
     # - url_to_video_filter/vimeo_embed
     # - url_to_video_filter/youtube_embed
+    

+ 4 - 4
web/themes/custom/materiotheme/vuejs/components/cardMixins.js

@@ -9,7 +9,7 @@ export default {
           const img = figure.querySelector('img:not(.blank)')
           figure.classList.add('loading')
           img.addEventListener('load', function (e) {
-            console.log('img loaded', e)
+            // console.log('img loaded', e)
             figure.classList.remove('loading')
             figure.classList.add('loaded')
           })
@@ -57,14 +57,14 @@ export default {
   },
   mounted () {
     // lazy load images on mouseover
-    console.log('card mounted', this.$options.name)
+    // console.log('card mounted', this.$options.name)
     // if (this.$options.name ==! 'ModalCard') {
     this.activateLazyLoad()
     // }
   },
   updated () {
     // lazy load images on mouseover
-    console.log('card updated', this.$options.name)
+    // console.log('card updated', this.$options.name)
     // if (this.$options.name ==! 'ModalCard') {
     this.activateLazyLoad()
     // }
@@ -72,7 +72,7 @@ export default {
   methods: {
     // used by ModalCard
     activateLazyLoad () {
-      console.log('card activateLazyLoad', this.$options.name)
+      // console.log('card activateLazyLoad', this.$options.name)
 
       this.$el.addEventListener('mouseover', function (event) {
         const figures = this.querySelectorAll('.images figure.lazy:not(.loaded):not(.loading)')

+ 12 - 8
web/themes/custom/materiotheme/vuejs/store/modules/user.js

@@ -180,15 +180,19 @@ export default {
               commit('setToken', response.data)
               dispatch('getUser').then(userdata => {
                 console.log('User Loggedin', state.isAdmin, state.isAdherent)
-                if (state.isAdmin) {
-                  window.location.reload(true)
-                }
+                // have to reload systematicly because of autologout library not loaded if not logged in the begining
+                // if (state.isAdmin) {
+                //   window.location.reload()
+                // }
                 if (state.isAdherent) {
-                  router.push({
-                    name: 'base'
-                  })
-                  // TODO: openCloseHamMenu(false)
-                  dispatch('Common/openCloseHamMenu', false)
+                  // router.push({
+                  //   name: 'base'
+                  // })
+                  // // TODO: openCloseHamMenu(false)
+                  // dispatch('Common/openCloseHamMenu', false)
+                  window.location = '/base'
+                } else {
+                  window.location.reload()
                 }
                 resolve()
               })

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.