diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index 81bf772e..23fd456d 100644 Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ diff --git a/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc b/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc index 1800cf4b..9b64f650 100644 Binary files a/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc and b/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc differ 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();