bachir/materio-d9
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#1107: first light_home then async load full home, do not aggregate nor preprocess theme js libraries

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2021-05-25 22:22:00 +02:00
parent afb929c042
commit c1b9d16216
14 changed files with 182 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
web/themes/custom/materiotheme/vuejs/components/Content/MainContent.vue
View File

@ -2,7 +2,7 @@
<div :id="id">
<!-- <router-view name="home" :html="home_template_src"></router-view> -->
<!-- <router-view name="base"></router-view> -->
<router-view :html="home_template_src"/>
<router-view :html="home_template_src" :full="full_home_template_loaded"/>
</div>
</template>
@ -17,25 +17,38 @@ export default {
props:['id','html', 'isfront'],
data() {
return {
home_template_src: null
home_template_src: null,
full_home_template_loaded: false
}
},
beforeMount() {
// console.log('MainContent beforeMount this.html', this.html)
if (!this.home_template_src) {
// // console.log('no home_template_src')
// if (this.html && this.isfront) { // if html prop is available and we are landing on home then record it has data
// this.home_template_src = this.html
// } else { // else get it from ajax (e.g. if we didn't load the page from home)
// this.getHomeHtml()
// }
// console.log('no home_template_src')
if (this.html && this.isfront) { // if html prop is available and we are landing on home then record it has data
if (this.isfront) {
// if html prop is available and we are landing on home then record it has data
this.home_template_src = this.html
} else { // else get it from ajax (e.g. if we didn't load the page from home)
}
// in any case load the full home template if not already loaded
if (!this.full_home_template_loaded) {
this.getHomeHtml()
}
}
},
methods: {
getHomeHtml(){
console.log('MainContent getHomeHtml');
MA.get('materio_home/ajax/gethome')
.then(({data}) => {
// console.log('Home getHomeHtml data', data)
console.log('MainContent getHomeHtml data', data)
this.full_home_template_loaded = true
this.home_template_src = data.rendered // record the html src into data
})
.catch((error) => {

7
web/themes/custom/materiotheme/vuejs/components/Pages/Home.vue
View File

@ -3,7 +3,7 @@
import Vue from 'vue'
export default {
props: ['html'], // get the html from parent with props
props: ['html', 'full'], // get the html from parent with props
data() {
return {
template: null, // compiled template from html used in render
@ -40,7 +40,10 @@ export default {
this.$options.staticRenderFns = []
this._staticTrees = []
this.template.staticRenderFns.map(fn => (this.$options.staticRenderFns.push(fn)))
setTimeout(this.initShowroomCarroussel.bind(this), 250)
console.log('compileTemplate, full', this.full)
if (this.full) {
setTimeout(this.initShowroomCarroussel.bind(this), 250)
}
},
initShowroomCarroussel(){
console.log('startShowroomCarroussel')