@@ -21,7 +21,7 @@
:collid="coll.id"
@click.prevent="onFlagActionCard"
>
- {{ coll.name }}
+ {{ coll.name }}
@@ -36,7 +36,7 @@
@@ -77,7 +78,8 @@ export default {
},
computed: {
...mapState({
- flagcolls: state => state.User.flagcolls
+ flagcolls: state => state.User.flagcolls,
+ isloggedin: state => state.User.isloggedin
})
},
methods: {
@@ -116,15 +118,17 @@ export default {
}
},
openModalCard (e) {
- this.$modal.show(
- ModalCard,
- { item: this.item },
- {
- draggable: true,
- width: '850px',
- height: '610px'
- }
- )
+ if(this.isLoggedin){
+ this.$modal.show(
+ ModalCard,
+ { item: this.item },
+ {
+ draggable: true,
+ width: '850px',
+ height: '610px'
+ }
+ )
+ }
}
}
}
diff --git a/web/themes/custom/materiotheme/vuejs/components/Pages/Article.vue b/web/themes/custom/materiotheme/vuejs/components/Pages/Article.vue
index 417e76cb..c80ef049 100644
--- a/web/themes/custom/materiotheme/vuejs/components/Pages/Article.vue
+++ b/web/themes/custom/materiotheme/vuejs/components/Pages/Article.vue
@@ -287,7 +287,7 @@ export default {
});
}
- console.log('this.content.lightbox_items', this.lightbox_items);
+ // console.log('this.content.lightbox_items', this.lightbox_items);
// update main page title
this.$store.commit('Common/setPagetitle', article.title)
@@ -296,32 +296,12 @@ export default {
},
onPrevNext(a){
// console.log('clicked on next', this.prevnext.next);
- // let alias = this.prevnext.next.view_node.replace(/^.?\/blabla\//g, '')
let alias = a.replace(/^.?\/blabla\//g, '')
this.$router.push({
name:`article`,
params: { alias:alias }
- // query: { uuid: this.prevnext.next.uuid }
})
},
- // onNext(){
- // // console.log('clicked on next', this.prevnext.next);
- // let alias = this.prevnext.next.view_node.replace(/^.?\/blabla\//g, '')
- // this.$router.push({
- // name:`article`,
- // params: { alias:alias }
- // // query: { uuid: this.prevnext.next.uuid }
- // })
- // },
- // onPrev(){
- // // console.log('clicked on prev', this.prevnext.next);
- // let alias = this.prevnext.prev.view_node.replace(/^.?\/blabla\//g, '')
- // this.$router.push({
- // name:`article`,
- // params: { alias:alias }
- // // query: { uuid: this.prevnext.prev.uuid }
- // })
- // },
setLightboxIndex(index) {
this.lightbox_index = index
}
diff --git a/web/themes/custom/materiotheme/vuejs/store/modules/blabla.js b/web/themes/custom/materiotheme/vuejs/store/modules/blabla.js
index 24402a00..add6332e 100644
--- a/web/themes/custom/materiotheme/vuejs/store/modules/blabla.js
+++ b/web/themes/custom/materiotheme/vuejs/store/modules/blabla.js
@@ -35,16 +35,6 @@ export default {
// actions
actions: {
getItems ({ dispatch, commit, state }) {
- // if(!state.contenttype){
- // REST.get('/entity/node_type/article?_format=json', {})
- // .then(({ data }) => {
- // console.log('blabla REST contenttype : data', data);
- // })
- // .catch(( error ) => {
- // console.warn('Issue with blabla contenttype', error)
- // Promise.reject(error)
- // })
- // }
return REST.get(`/blabla_rest?_format=json&page=${state.page}`, {})
.then(({ data }) => {
console.log('blabla REST: data', data)
@@ -70,8 +60,8 @@ export default {
getItemIndex ({ dispatch, commit, state }, nid) {
console.log('getItemIndex nid', nid)
return state.items.findIndex((e) => {
- // console.log('findIndex', e, nid);
- return e.nid === nid
+ console.log('findIndex', e.nid, nid);
+ return e.nid == nid
})
},
getPrevNextItems ({ dispatch, commit, state }, index) {