Compare commits
No commits in common. "main" and "shadi/dev" have entirely different histories.
|
@ -1766,33 +1766,6 @@ export default {
|
||||||
alert("ontouchstart");
|
alert("ontouchstart");
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
components: {
|
|
||||||
ContextMenu: defineAsyncComponent(() =>
|
|
||||||
import("@components/global/ContextMenu.vue")
|
|
||||||
),
|
|
||||||
EntityQustionsContent: defineAsyncComponent(() =>
|
|
||||||
import("@search/components/entity/components/entity-contents/EntityQustionsContent.vue")
|
|
||||||
),
|
|
||||||
Multiselect: () => import("vue-multiselect"),
|
|
||||||
|
|
||||||
|
|
||||||
// EntityQustionsContent: () =>
|
|
||||||
// import("@chat/components/entity-contents/EntityQustionsContent.vue"),
|
|
||||||
// EntityListContent: () =>
|
|
||||||
// import("@chat/components/entity-contents/EntityListContent.vue"),
|
|
||||||
// EntitySliderContent: () =>
|
|
||||||
// import("@chat/components/entity-contents/EntitySliderContent.vue"),
|
|
||||||
// EntityTextContent: () =>
|
|
||||||
// import("@chat/components/entity-contents/EntityTextContent.vue"),
|
|
||||||
// EntitySliderContentTwo: () =>
|
|
||||||
// import("@chat/components/entity-contents/EntitySliderContentTwo.vue"),
|
|
||||||
// EntityHorizontalListContent: () =>
|
|
||||||
// import(
|
|
||||||
// "@chat/components/entity-contents/EntityHorizontalListContent.vue"
|
|
||||||
// ),
|
|
||||||
// EntityFishContent: () =>
|
|
||||||
// import("@chat/components/entity-contents/EntityFishContent.vue"),
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
|
|
|
@ -533,7 +533,7 @@
|
||||||
<svg class="icon icon-Component-112--1">
|
<svg class="icon icon-Component-112--1">
|
||||||
<use xlink:href="#icon-Component-112--1"></use>
|
<use xlink:href="#icon-Component-112--1"></use>
|
||||||
</svg>
|
</svg>
|
||||||
{{ groupItem?.seen_messages?.count }}
|
{{ groupItem.seen_messages?.count }}
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<!-- replay info -->
|
<!-- replay info -->
|
||||||
|
@ -683,7 +683,7 @@
|
||||||
<svg class="icon icon-Component-112--1">
|
<svg class="icon icon-Component-112--1">
|
||||||
<use xlink:href="#icon-Component-112--1"></use>
|
<use xlink:href="#icon-Component-112--1"></use>
|
||||||
</svg>
|
</svg>
|
||||||
{{ lobby?.seen_messages?.count }}
|
{{ lobby.seen_messages.count }}
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<!-- replay info -->
|
<!-- replay info -->
|
||||||
|
@ -1621,7 +1621,7 @@ export default {
|
||||||
},
|
},
|
||||||
getGroupTypes() {
|
getGroupTypes() {
|
||||||
let url = chatApi.forms.groupTypes;
|
let url = chatApi.forms.groupTypes;
|
||||||
// console.log("🚀 ~ getGroupTypes ~ url:", url);
|
console.log("🚀 ~ getGroupTypes ~ url:", url);
|
||||||
this.httpService.postRequest("keyvalue/" + url).then((response) => {
|
this.httpService.postRequest("keyvalue/" + url).then((response) => {
|
||||||
this.groupfilters = response.data;
|
this.groupfilters = response.data;
|
||||||
});
|
});
|
||||||
|
@ -1746,7 +1746,6 @@ export default {
|
||||||
// group.active = true;
|
// group.active = true;
|
||||||
group["redirectViaInviteLink"] = true;
|
group["redirectViaInviteLink"] = true;
|
||||||
this.SET_LIST(group);
|
this.SET_LIST(group);
|
||||||
// console.log("🟢 ~ this.groups.forEach ~ group:", group)
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -1757,12 +1756,10 @@ export default {
|
||||||
if (group.id == this.groupId) {
|
if (group.id == this.groupId) {
|
||||||
group.active = true;
|
group.active = true;
|
||||||
this.SET_LIST(group);
|
this.SET_LIST(group);
|
||||||
// console.log("🟢 ~ this.groups.forEach ~ group:", group)
|
|
||||||
} else if (group.reference_id == this.groupId) {
|
} else if (group.reference_id == this.groupId) {
|
||||||
this.groupId = group.id;
|
this.groupId = group.id;
|
||||||
group.active = true;
|
group.active = true;
|
||||||
this.SET_LIST(group);
|
this.SET_LIST(group);
|
||||||
// console.log("🟢 ~ this.groups.forEach ~ group:", group)
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} else if (typeof this.getForwardItem == "object") {
|
} else if (typeof this.getForwardItem == "object") {
|
||||||
|
@ -1773,7 +1770,6 @@ export default {
|
||||||
if (group.user == this.groupId) {
|
if (group.user == this.groupId) {
|
||||||
isExist = true;
|
isExist = true;
|
||||||
group.active = true;
|
group.active = true;
|
||||||
// console.log("🟢 ~ this.groups.forEach ~ group:", group)
|
|
||||||
this.SET_LIST(group);
|
this.SET_LIST(group);
|
||||||
this.prevSelectedItemIndex = index;
|
this.prevSelectedItemIndex = index;
|
||||||
}
|
}
|
||||||
|
@ -1784,7 +1780,6 @@ export default {
|
||||||
isExist = true;
|
isExist = true;
|
||||||
group.active = true;
|
group.active = true;
|
||||||
this.SET_LIST(group);
|
this.SET_LIST(group);
|
||||||
// console.log("🟢 ~ this.groups.forEach ~ group:", group)
|
|
||||||
this.prevSelectedItemIndex = index;
|
this.prevSelectedItemIndex = index;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -1800,7 +1795,6 @@ export default {
|
||||||
|
|
||||||
this.groups.push(this.groupModel);
|
this.groups.push(this.groupModel);
|
||||||
this.SET_LIST(this.groupModel);
|
this.SET_LIST(this.groupModel);
|
||||||
// console.log("🟢 ~ this.groups.forEach ~ group:", this.groupModel)
|
|
||||||
this.prevSelectedItemIndex = this.groups.length - 1;
|
this.prevSelectedItemIndex = this.groups.length - 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1961,7 +1955,7 @@ export default {
|
||||||
getListOnScroll() {
|
getListOnScroll() {
|
||||||
debugger;
|
debugger;
|
||||||
const listType = this.$route.name;
|
const listType = this.$route.name;
|
||||||
// console.log("🚀 ~ getListOnScroll ~ listType:", listType);
|
console.log("🚀 ~ getListOnScroll ~ listType:", listType);
|
||||||
let url = "message/" + chatApi[listType].list;
|
let url = "message/" + chatApi[listType].list;
|
||||||
|
|
||||||
// let urlPrefix = chatApi.groups.list;
|
// let urlPrefix = chatApi.groups.list;
|
||||||
|
@ -1974,11 +1968,11 @@ export default {
|
||||||
// const methodType = listType == "unReads" ? 'postRequest' : 'getRequest'
|
// const methodType = listType == "unReads" ? 'postRequest' : 'getRequest'
|
||||||
|
|
||||||
const tempGroupFilter = this.selectedGroupFilter;
|
const tempGroupFilter = this.selectedGroupFilter;
|
||||||
// console.log("🚀 ~ getListOnScroll ~ tempGroupFilter:", tempGroupFilter);
|
console.log("🚀 ~ getListOnScroll ~ tempGroupFilter:", tempGroupFilter);
|
||||||
const payload = {
|
const payload = {
|
||||||
type: tempGroupFilter.map((item) => item.id),
|
type: tempGroupFilter.map((item) => item.id),
|
||||||
};
|
};
|
||||||
// console.log("🚀 ~ getListOnScroll ~ url:", url);
|
console.log("🚀 ~ getListOnScroll ~ url:", url);
|
||||||
|
|
||||||
this.httpService
|
this.httpService
|
||||||
.postRequest(url, payload)
|
.postRequest(url, payload)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user