diff --git a/package.json b/package.json index 1192782..45f01d9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "evolution-manager", - "version": "0.2.11", + "version": "0.2.12", "main": "dist", "scripts": { "dev": "vite", diff --git a/src/components/instance/InstanceBody.vue b/src/components/instance/InstanceBody.vue index f19ae76..94bd9eb 100644 --- a/src/components/instance/InstanceBody.vue +++ b/src/components/instance/InstanceBody.vue @@ -28,6 +28,7 @@ import Rabbitmq from "./settings/Rabbitmq.vue"; import Chatwoot from "./settings/Chatwoot.vue"; import Typebot from "./settings/Typebot.vue"; +import OpenSendMessage from "./message/OpenSendMessage.vue"; import MyGroups from "./message/MyGroups.vue"; import MyChats from "./message/MyChats.vue"; import MyContacts from "./message/MyContacts.vue"; @@ -40,6 +41,7 @@ export default { Rabbitmq, Chatwoot, Typebot, + OpenSendMessage, MyGroups, MyChats, HasWhatsapp, @@ -65,7 +67,13 @@ export default { id: "message", icon: "mdi-message", title: "Mensagens", - components: ["HasWhatsapp", "MyContacts", "MyGroups", "MyChats"], + components: [ + "OpenSendMessage", + "HasWhatsapp", + "MyContacts", + "MyGroups", + "MyChats", + ], }, ], }), diff --git a/src/components/instance/message/MyContacts.vue b/src/components/instance/message/MyContacts.vue index 055d95e..ea2ba52 100644 --- a/src/components/instance/message/MyContacts.vue +++ b/src/components/instance/message/MyContacts.vue @@ -63,7 +63,12 @@ mdi-account-circle {{ item.pushName }} - + Instância diff --git a/src/components/instance/message/OpenSendMessage.vue b/src/components/instance/message/OpenSendMessage.vue new file mode 100644 index 0000000..2f07316 --- /dev/null +++ b/src/components/instance/message/OpenSendMessage.vue @@ -0,0 +1,57 @@ + + + + + diff --git a/src/components/modal/SendMessage.vue b/src/components/modal/SendMessage.vue new file mode 100644 index 0000000..c1f938e --- /dev/null +++ b/src/components/modal/SendMessage.vue @@ -0,0 +1,267 @@ + + + diff --git a/src/helpers/deepMerge.js b/src/helpers/deepMerge.js new file mode 100644 index 0000000..4487b60 --- /dev/null +++ b/src/helpers/deepMerge.js @@ -0,0 +1,31 @@ +/** + * Simple object check. + * @param item + * @returns {boolean} + */ +export function isObject(item) { + return (item && typeof item === 'object' && !Array.isArray(item)); +} + +/** + * Deep merge two objects. + * @param target + * @param ...sources + */ +export function mergeDeep(target, ...sources) { + if (!sources.length) return target; + const source = sources.shift(); + + if (isObject(target) && isObject(source)) { + for (const key in source) { + if (isObject(source[key])) { + if (!target[key]) Object.assign(target, { [key]: {} }); + mergeDeep(target[key], source[key]); + } else { + Object.assign(target, { [key]: source[key] }); + } + } + } + + return mergeDeep(target, ...sources); +} \ No newline at end of file diff --git a/src/services/instanceChatController.js b/src/services/instanceChatController.js index c3fdbf0..359e41d 100644 --- a/src/services/instanceChatController.js +++ b/src/services/instanceChatController.js @@ -39,8 +39,23 @@ const getContacts = async (instanceName, numbers) => { }); } +const sendMessage = async (instanceName, options) => { + return await http + .post("/message/sendText/:instance", options, { + params: { + instance: instanceName + } + }) + .then((r) => r.data) + .catch((error) => { + throw error.response?.data || error.response || error; + }); + +} + export default { getAll: getAll, hasWhatsapp: hasWhatsapp, - getContacts: getContacts + getContacts: getContacts, + sendMessage: sendMessage } \ No newline at end of file