handled home loading if not available in dom (if drupalSettings.path.isFront == false)

This commit is contained in:
2019-06-04 22:38:44 +02:00
parent d8e5f93c14
commit 082e011fbb
22 changed files with 591 additions and 160 deletions

View File

@@ -28,6 +28,31 @@ export default {
items: state => state.Search.items
})
},
methods: {
...mapActions({
newSearch: 'Search/newSearch'
})
},
created() {
// laucnh a search if params exists in url query
console.log('Base created() location',window.location);
let params = new URLSearchParams(window.location.search)
if(params.has('keys')){
this.$store.commit('Search/setKeys', params.get('keys'))
this.newSearch()
}
},
// beforeRouteEnter (to, from, next) {
// console.log('Base beforeRouteEnter');//, to, from, next);
// next()
// },
beforeRouteUpdate (to, from, next) {
console.log('Base beforeRouteUpdate', to, from, next);
this.$store.commit('Search/setKeys', to.query.keys)
this.$store.commit('Search/setTerm', to.query.term)
this.newSearch()
next()
},
components: {
Card
}

View File

@@ -1,45 +1,25 @@
<script>
import Vue from 'vue'
import { MA } from 'vuejs/api/ma-axios'
export default {
props: ['html'], // get the html from parent with props
data() {
return {
template_src: null, // record the prop into data as it will be available in every hooks
template: null // compiled template from html used in render
}
},
beforeMount() {
// console.log('Home beforeMount this.html', this.html);
if(!this.template_src){
if(this.html){ // if html prop is available record it has data
this.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('Home beforeMount');
// compile the html src (coming from parent with props or from ajax call)
if(this.template_src){
this.template = Vue.compile(this.template_src)
if(this.html){
// console.log('html', this.html);
this.template = Vue.compile(this.html)
this.$options.staticRenderFns = []
this._staticTrees = []
this.template.staticRenderFns.map(fn => (this.$options.staticRenderFns.push(fn)))
}
},
methods: {
getHomeHtml(){
MA.get(`/materio_user/login_block`)
.then(({data}) => {
this.template_src = data.rendered // record the html src into data
})
.catch(( error ) => {
console.warn('Issue with getHomeHtml', error)
})
}
},
render(h) {
if(!this.template){
return h('span', 'Loading ...')

View File

@@ -1,6 +1,6 @@
<template lang="html">
<div :id="id">
<router-view name="home" :html="html"></router-view>
<router-view name="home" :html="home_template_src"></router-view>
<router-view name="base"></router-view>
</div>
</template>
@@ -8,23 +8,40 @@
<script>
import { mapState, mapActions } from 'vuex'
import { MA } from 'vuejs/api/ma-axios'
import router from 'vuejs/route'
export default {
router,
props:['id','html']
// computed: {
// ...mapState({
// token: state => state.User.token,
// isloggedin: state => state.User.isloggedin
// })
// },
// beforeMount() {
// console.log('MainContent beforeMount this.html', this.html);
// },
// mounted() {
// console.log('MainContent this.$router', this.$router);
// }
props:['id','html', 'isfront'],
data() {
return {
home_template_src: null
}
},
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()
}
}
},
methods: {
getHomeHtml(){
MA.get('materio_home/ajax/gethome')
.then(({data}) => {
// console.log('Home getHomeHtml data', data);
this.home_template_src = data.rendered // record the html src into data
})
.catch(( error ) => {
console.warn('Issue with getHomeHtml', error)
})
}
}
}
</script>