From f687b46777fb36d9ec49f1e82ba23fb0fa7dd9c7 Mon Sep 17 00:00:00 2001 From: emile Date: Wed, 24 Jul 2024 11:43:09 +0300 Subject: [PATCH] new --- osinaweb/db.sqlite3 | Bin 1728512 -> 1732608 bytes .../__pycache__/consumers.cpython-310.pyc | Bin 4282 -> 4290 bytes osinaweb/osichat/consumers.py | 1 + .../static/js/osichat-admin/conversation.js | 2 +- osinaweb/static/js/osichat/conversation.js | 29 +++++++++++++++--- osinaweb/static/js/osichat/visitors.js | 7 ++--- 6 files changed, 29 insertions(+), 10 deletions(-) diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index 81bf772e84916bb75f6f6e97d15d46edf5140f1d..23fd456d52ff56e08ed34bc6ae038bbb1a86998b 100644 GIT binary patch delta 11805 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 diff --git a/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc b/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc index 1800cf4bfd7429ac62f341eee5e8098071c9142b..9b64f65008a4bd56b0805194d4ee376ae33b61a1 100644 GIT binary patch delta 187 zcmdm`cu0{qpO=@50SHd)S&){yke7o|Y%(8*6JyZiKn^>;8rB+yc-|E58rCen6rRb9 zoD!4QbFh1M)-Ww#O5t0`Sd?1AUm^hGrSSJM)w1U?r7+a8mk4HYWO3H8*Dz%9g5?Dk zGL~>H;9kg(BG}7P%aI~f!;!_e`9H@VMn<#A+qo1b-{A^o44Z7gt;xd1#>BKan!AgU fv1Icz9&1L%*3C+M28@i8CI|D+WHg=pmj5gOB+fHR delta 187 zcmX@4xJ!{YpO=@50SFrZ%};Y%$jiYfFqx0TiP3*@Acq}W3U>`_7VqTQ9E$pFHB1Yb zQur1!7A2MNmGHxODg3=mwd{FJDGasjB?4I-S)4WOH4IsTlV5X4GV`VgPoB#mv00vT z5u>6D(2^o{AaRQ&v^cfs7PoUoVu^2RadBdLYLOXGeDWi%V8)QiX55-gOzfMJxw{w{ fi#NaHv1Vj!*{sE9z{ogpay0);Mw7{3`Og9XG4C^r diff --git a/osinaweb/osichat/consumers.py b/osinaweb/osichat/consumers.py index fa76de4e..b59b4ab5 100644 --- a/osinaweb/osichat/consumers.py +++ b/osinaweb/osichat/consumers.py @@ -83,6 +83,7 @@ class OsitcomChatRoom(WebsocketConsumer): mobile_number= text_data_json.get('guest_mobile_number'), session_id=self.session_id ) + self.chat_room = chat_room event = { 'type': 'start_conversation_handler', 'chat_room_id': chat_room.id diff --git a/osinaweb/static/js/osichat-admin/conversation.js b/osinaweb/static/js/osichat-admin/conversation.js index 3d1c2abe..ca0e946a 100644 --- a/osinaweb/static/js/osichat-admin/conversation.js +++ b/osinaweb/static/js/osichat-admin/conversation.js @@ -1,5 +1,5 @@ const admin_chat_ws_scheme = window.location.protocol === "https:" ? "wss" : "ws"; -const admin_chat_domain = "192.168.1.111:8000"; +const admin_chat_domain = "192.168.1.106:8000"; let chatWebSocket = null; function openConversation(chatId) { diff --git a/osinaweb/static/js/osichat/conversation.js b/osinaweb/static/js/osichat/conversation.js index cf0ce642..fa65445a 100644 --- a/osinaweb/static/js/osichat/conversation.js +++ b/osinaweb/static/js/osichat/conversation.js @@ -1,12 +1,10 @@ const chat_ws_scheme = window.location.protocol === "https:" ? "wss" : "ws"; -const domain = "192.168.1.111:8000"; +const domain = "192.168.1.106:8000"; // Function to fetch session ID - - async function fetchSessionID() { try { - const response = await fetch('http://192.168.1.111:3000/get-client-session/'); + const response = await fetch('http://192.168.1.106:3000/get-client-session/'); const data = await response.json(); return data.session_id; } catch (error) { @@ -90,9 +88,30 @@ async function initializeChatWebSocket() { } } else if (data.event_type === 'start_conversation') { - const chatDiv = document.getElementById('startChatContainer'); + const chatDiv = document.getElementById('osichat'); const html = data.html; chatDiv.innerHTML = html; + const textareaScript = document.createElement('script'); + textareaScript.type = 'text/javascript'; + textareaScript.src = `http://${domain}/static/js/osichat/textarea.js`; + chatDiv.appendChild(textareaScript); + const sendMessageContainer = document.getElementById('sendMessage'); + sendMessageContainer.addEventListener('submit', function (event) { + event.preventDefault(); + + const message = event.target.elements.message.value; + + const eventMessage = { + 'event_type': 'send_message', + 'message': message, + }; + + osichatSocket.send(JSON.stringify(eventMessage)); + + event.target.reset(); + }); + + } else if (data.event_type === 'send_message') { const messagesDiv = document.getElementById('messages'); diff --git a/osinaweb/static/js/osichat/visitors.js b/osinaweb/static/js/osichat/visitors.js index e086d6ca..5e88240d 100644 --- a/osinaweb/static/js/osichat/visitors.js +++ b/osinaweb/static/js/osichat/visitors.js @@ -1,9 +1,9 @@ const visitors_ws_scheme = window.location.protocol === "https:" ? "wss" : "ws"; -const my_domain = "192.168.1.111:8000"; +const my_domain = "192.168.1.106:8000"; async function fetchClientData() { try { - const response = await fetch('http://192.168.1.111:8000/get-client-ip/'); + const response = await fetch('http://192.168.1.106:8000/get-client-ip/'); const data = await response.json(); return { client_ip: data.ip, @@ -20,7 +20,7 @@ async function fetchClientData() { async function fetchVisitorsSession() { try { - const response = await fetch('http://192.168.1.111:3000/get-client-session/'); + const response = await fetch('http://192.168.1.106:3000/get-client-session/'); const data = await response.json(); return data.session_id; } catch (error) { @@ -30,7 +30,6 @@ async function fetchVisitorsSession() { } async function initializeVisitorsWebSocket() { - console.log('Initializing WebSocket...'); const referrer = document.referrer; const clientData = await fetchClientData();