diff --git a/assets/js/chat.js b/assets/js/chat.js index b7fca99..93c8c3b 100644 --- a/assets/js/chat.js +++ b/assets/js/chat.js @@ -1,13 +1,13 @@ var SocketHandler = function () { domain = domain.replace(':' + port, ''); - var url = 'ws://' + domain + ':8888/chat/' + userId + '/'; + var url = 'ws://' + domain + '/chat/' + userId + '/'; var sock = new WebSocket(url); var intervalId; sock.onopen = function () { console.log("Start connect"); intervalId = setInterval(function () { sock.send('{"dummy": 1}'); - }, 150000); + }, 15000); }; sock.onmessage = function (event) { console.log(event.data); diff --git a/chat/chat.py b/chat/chat.py index bc54fe1..89cd43b 100644 --- a/chat/chat.py +++ b/chat/chat.py @@ -105,5 +105,5 @@ if __name__ == '__main__': future.result() http_server = HTTPServer(application) - http_server.listen(PORT, 'localhost') + http_server.listen(PORT, '127.0.0.1') ioloop.start() diff --git a/chat/templates/chat.js b/chat/templates/chat.js deleted file mode 100644 index d7f0942..0000000 --- a/chat/templates/chat.js +++ /dev/null @@ -1,74 +0,0 @@ -var SocketHandler = function () { - - domain = domain.replace(':' + port, ''); - var url = 'ws://' + domain + ':8888/chat/' + userId + '/'; - var sock = new WebSocket(url); - var intervalId; - sock.onopen = function () { - console.log("Start connect"); - intervalId = setInterval(function () { - sock.send('{"dummy": 1}'); - }, 150000); - }; - sock.onmessage = function (event) { - console.log(event.data); - var message = JSON.parse(event.data); - var inbox; - if (message.answer_type == 'contact' || message.answer_type == 'add_message_contact') { - inbox = document.getElementById('message-chat-space'); - } else if (message.answer_type == 'order' || message.answer_type == 'add_message_order') { - inbox = document.getElementById('message-chat-order-space'); - } else if (message.answer_type == 'add_message_team') { - inbox = document.getElementById('message-chat-team-space'); - } - inbox.innerHTML += '
' + - '

ВЫ

Сейчас
' + - '

' + message.msg + '

'; - - }; - - this.send_order_message = function (orderId) { - var data = { - "format_type": "order_message", - "order_id": orderId - } - sock.send(JSON.stringify(data)); - console.log(data); - }; - - this.send_contact_message = function (userId) { - var data = { - "format_type": "add_message", - "user_id": userId - } - sock.send(JSON.stringify(data)); - console.log(data); - }; - - this.add_team_message = function (messageData) { - - console.log(messageData); - sock.send(JSON.stringify(messageData)); - } - - this.add_contact_message = function (messageData) { - console.log(messageData); - sock.send(JSON.stringify(messageData)); - }; - - this.send_message = function (form) { - var elements = form.elements; - var data = {}; - var i = 0; - for (var i; i < elements.length; i++) { - if (elements[i].name == 'message') { - data[elements[i].name] = elements[i].value; - } - } - sock.send(JSON.stringify(data)); - var textareaMessage = document.getElementById("message"); - textareaMessage.value = ""; - } - -} - diff --git a/chat/templates/chat1.js b/chat/templates/chat1.js deleted file mode 100644 index de9b61d..0000000 --- a/chat/templates/chat1.js +++ /dev/null @@ -1,75 +0,0 @@ -var SocketHandler = function () { - var userId = {{ request.user.pk }}; - var domain = '{{ request.META.HTTP_HOST }}'; - var port = '{{ request.META.SERVER_PORT }}'; - domain = domain.replace(':' + port, ''); - var url = 'ws://' + domain + ':8888/chat/' + userId + '/'; - var sock = new WebSocket(url); - var intervalId; - sock.onopen = function () { - console.log("Start connect"); - intervalId = setInterval(function () { - sock.send('{"dummy": 1}'); - }, 150000); - }; - sock.onmessage = function (event) { - console.log(event.data); - var message = JSON.parse(event.data); - var inbox; - if (message.answer_type == 'contact' || message.answer_type == 'add_message_contact') { - inbox = document.getElementById('message-chat-space'); - } else if (message.answer_type == 'order' || message.answer_type == 'add_message_order') { - inbox = document.getElementById('message-chat-order-space'); - } else if (message.answer_type == 'add_message_team') { - inbox = document.getElementById('message-chat-team-space'); - } - inbox.innerHTML += '
' + - '

ВЫ

Сейчас
' + - '

' + message.msg + '

'; - - }; - - this.send_order_message = function (orderId) { - var data = { - "format_type": "order_message", - "order_id": orderId - } - sock.send(JSON.stringify(data)); - console.log(data); - }; - - this.send_contact_message = function (userId) { - var data = { - "format_type": "add_message", - "user_id": userId - } - sock.send(JSON.stringify(data)); - console.log(data); - }; - - this.add_team_message = function (messageData) { - - console.log(messageData); - sock.send(JSON.stringify(messageData)); - } - - this.add_contact_message = function (messageData) { - console.log(messageData); - sock.send(JSON.stringify(messageData)); - }; - - this.send_message = function (form) { - var elements = form.elements; - var data = {}; - var i = 0; - for (var i; i < elements.length; i++) { - if (elements[i].name == 'message') { - data[elements[i].name] = elements[i].value; - } - } - sock.send(JSON.stringify(data)); - var textareaMessage = document.getElementById("message"); - textareaMessage.value = ""; - } - - } diff --git a/chat/templates/chat2.js b/chat/templates/chat2.js deleted file mode 100644 index 6283706..0000000 --- a/chat/templates/chat2.js +++ /dev/null @@ -1,68 +0,0 @@ -var SocketHandler = function () { - var domain = '{{ request.META.HTTP_HOST }}'; - var port = '{{ request.META.SERVER_PORT }}'; - domain = domain.replace(':' + port, ''); - var url = 'ws://' + domain + ':8888/chat/' + userId + '/'; - var sock = new WebSocket(url); - var intervalId; - sock.onopen = function () { - console.log("Start connect"); - intervalId = setInterval(function () { - sock.send('{"dummy": 1}'); - }, 150000); - }; - sock.onmessage = function (event) { - console.log(event.data); - var message = JSON.parse(event.data); - var inbox; - if (message.answer_type == 'contact' || message.answer_type == 'add_message_contact') { - inbox = document.getElementById('message-chat-space'); - } else if (message.answer_type == 'order' || message.answer_type == 'add_message_order') { - inbox = document.getElementById('message-chat-order-space'); - } else if (message.answer_type == 'add_message_team') { - inbox = document.getElementById('message-chat-team-space'); - } - inbox.innerHTML += '
' + - '

Вы

Сейчас
' + - '

' + message.msg + '

'; - - }; - - this.send_order_message = function (orderId) { - var data = { - "format_type": "order_message", - "order_id": orderId - } - sock.send(JSON.stringify(data)); - console.log(data); - }; - - this.send_contact_message = function (userId) { - var data = { - "format_type": "add_message", - "user_id": userId - } - sock.send(JSON.stringify(data)); - console.log(data); - }; - - this.add_contact_message = function (messageData) { - console.log(messageData); - sock.send(JSON.stringify(messageData)); - }; - - this.send_message = function (form) { - var elements = form.elements; - var data = {}; - var i = 0; - for (var i; i < elements.length; i++) { - if (elements[i].name == 'message') { - data[elements[i].name] = elements[i].value; - } - } - sock.send(JSON.stringify(data)); - var textareaMessage = document.getElementById("message"); - textareaMessage.value = ""; - - } - } diff --git a/templates/partials/base.html b/templates/partials/base.html index 4fdd01b..511529f 100644 --- a/templates/partials/base.html +++ b/templates/partials/base.html @@ -82,14 +82,14 @@ if (queryString.indexOf('/chat') != 0) { domain = domain.replace(':' + port, ''); - var url = 'ws://' + domain + ':8888/chat/' + userId + '/'; + var url = 'ws://' + domain + '/chat/' + userId + '/'; var sock = new WebSocket(url); var intervalId; sock.onopen = function () { console.log("Start connect"); intervalId = setInterval(function () { sock.send('{"dummy": 1}'); - }, 150000); + }, 15000); }; sock.onmessage = function (event) { @@ -97,7 +97,7 @@ $.jGrowl("Вам пришло новое сообщение!" + notificationData.msg, {sticky: true}); }; } - } + }; $(function () { var userId = '{{ request.user.pk }}'; if (userId) {