diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index 86312cb..1e55bcf 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -1032,4 +1032,26 @@ font-size: 18px; color: #272424; padding-bottom: 10px; +} + +.items_subscribe.select{ + font-size: 16px; + color: #272424; +} + +.items_subscribe.select::marker{ + content: url("/static/img/svg/galka.svg"); + display: inline-block; + width: 10%; + clear: both; +} + +.items_subscribe > span{ + display: inline-block; + padding-left: 10px; + width: 90%; +} + +.items_subscribe{ + padding-bottom: 5px; } \ No newline at end of file diff --git a/static/js/chat_sockets.js b/static/js/chat_sockets.js new file mode 100644 index 0000000..544f7bc --- /dev/null +++ b/static/js/chat_sockets.js @@ -0,0 +1,40 @@ +// +// let senderName = localStorage.getItem('senderName'); +// if (!senderName) { +// localStorage.setItem('senderName', senderName); +// } +// +// chatSocket.onmessage = function (e) { +// let data = JSON.parse(e.data); +// console.log('Data:', data); +// +// if (data.type === 'chat') { +// let messages = document.getElementById('messages') +// let cssClass = data.sender === senderName? 'sender' : 'receiver'; +// messages.insertAdjacentHTML('beforeend', `
+//

${data.message}

+//
`) +// } +// } +// let form = document.getElementById('form') +// form.addEventListener('submit', (e) => { +// e.preventDefault() +// let message = e.target.message.value +// chatSocket.send(JSON.stringify({ +// 'message': message, +// 'sender': senderName +// })) +// form.reset() +// }) + + + + +let url = `ws://localhost:8000/ws/socket-server/`; + +const chatSocket = new WebSocket(url); + +chatSocket.onmessage = function (e) { + let data = JSON.parse(e.data) + console.log('Data: ', data) +} \ No newline at end of file diff --git a/static/js/check_new_messages.js b/static/js/check_new_messages.js index d3eb8ac..2d5876e 100644 --- a/static/js/check_new_messages.js +++ b/static/js/check_new_messages.js @@ -1,212 +1,212 @@ -window.onload = function () { - funcFocus() -} - -// -// document.querySelector(".enter-message-inp").onload( +// window.onload = function () { // funcFocus() -// ) - -function funcFocus(){ - let window = document.querySelector(".container-messages") - if (window !== null){ - let inp = document.querySelector(".enter-message-inp") - if (inp !== null){ - inp.focus() - } - } else{ - check_new_messages_timeout(long_timeout) - } - -} - - - -var check_msg = null -var it = 0 - -var short_timeout = 50000 -var long_timeout = 60000 - -// function initial_function (){ -// var it_set_func = 0 -// var it_func = 0 -// check_new_messages_timeout(60000,it_set_func,it_func) // } - -function check_new_messages_timeout(timeout_time=short_timeout){ - if (check_msg){ - clearInterval(check_msg) - } - - let window = document.querySelector(".container-messages") - // if (window !== null){ - // - // - // } - // if (it_set_func === 0){ - // // clearInterval(check_msg) - // if (window === null){ - // it_set_func++ - // check_new_messages_timeout(60000,it_set_func,it_func) - // } else { - // let new_timeout_time = 1000 - // it_set_func++ - // check_new_messages_timeout(new_timeout_time,it_set_func,it_func) - // } - // - // } - check_msg = setInterval(function () { - - // let new_message = getNewMessageSession() - // let user_online = userOnline('set') - window = document.querySelector(".container-messages") - if (window === null){ - check_new_messages(window,true) - // let new_timeout_time = 60000 - // - // check_new_messages_timeout(new_timeout_time,it_set_func,it_func) - } else { - // if (it_func === 0){ - // let new_timeout_time = 1000 - // it_func++ - // check_new_messages_timeout(new_timeout_time,it_set_func,it_func) - // } - check_new_messages(window,false) - } - - }, - timeout_time) -} - - - - -var data_new_messages = null - -function check_new_messages (window,only_sender_mode){ - // if (it === 0){ - if (only_sender_mode === false){ - let data_set = document.querySelector(".container-messages").dataset - let sender = data_set['userId']; - let receiver = data_set['curReceiver']; - let ticket_id = data_set['ticketId']; - data_new_messages = { - 'sender': sender, - 'receiver': receiver, - 'ticket_id': ticket_id - // 'last_message_modifiteDT':last_message_time - } - } else { - let profile_data_set = document.querySelector(".button_profile_header").dataset - let sender = profile_data_set['userId'] - data_new_messages = { - 'sender': sender - } - } - // } - // let user_online_check = document.addEventListener("mouseover"); - let last_message_time = document.querySelector(".date_n_time_last_message") - if (last_message_time === null){ - // - } else { - data_new_messages.last_message_modifiedDT = last_message_time.dataset['modifieddt'] - } - - - $.ajax({ - headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() }, - url: '/ru/messages/update_chat/', - type: "POST", - // async: true, - cache: false, - processData: false, - contentType: false, - // enctype: 'json', - data: JSON.stringify(data_new_messages), - success: function(data){ - success_check_new_messages(data) - - }, - error: function (data){ - - let request = document.querySelector(".info_profile") - if (request === undefined || window === null){ - clearTimeout(check_msg) - } else { - // request.innerHTML = data.responseText; - } - if (check_msg !== null){ - clearInterval(check_msg) - } - } - }); -} - - -function success_check_new_messages (data) { - let window = document.querySelector(".container-messages") - if (window === null){ - clearTimeout(check_msg) - } else { - if (data !== null) { - if (data_new_messages['ticket_id'] && data_new_messages['ticket_id'] !== "null") { - if (data.msgs_count > 1) { - if (document.querySelector(".container-messages")) { - document.querySelector(".container-messages").innerHTML = data.html; - } - else if (data.tickets_list_html){ - if (document.querySelector(".block-list-of-users")) { - document.querySelector(".block-list-of-users").innerHTML = data.tickets_list_html - } - } - - } else { - document.querySelector(".info_profile").innerHTML = data.html; - } - } - - else if (data.chat_html) { - if (document.querySelector(".container-messages")) { - document.querySelector(".container-messages").innerHTML = data.chat_html; - } - if (data.users_list_html){ - if (document.querySelector(".block-list-of-users")) { - document.querySelector(".block-list-of-users").innerHTML = data.users_list_html; - } - } - } - - - if (data.required_beep === true){ - const beep = new Audio('/static/sounds/beep_2.mp3') - beep.play() - - } - - - } - - } - - // let updatedCookie = encodeURIComponent(name_cookie) + "=" + encodeURIComponent(''); - // let search_cookie = document.cookie.match("(^|[^;]+)\s*" + name_cookie + "\s*=\s*([^;]+)")[0].substring(1) - // let search_cookie = getCookieValue('user_alerts') - // document.cookie = document.cookie.replace(search_cookie,name_cookie + "=") - // document.cookie = updatedCookie - // document.cookie = document.cookie.slice(0,-26) - // document.cookie = document.cookie.replace('user_alerts="{\"new_message\": true}"','user_alerts=;') -} - -function userOnline (set=null,check=null) { - let user_online = null - if (set !== null){ - user_online = navigator.userActivation.isActive || navigator.userActivation.hasBeenActive === true; - sessionStorage.setItem('online',user_online) - - } else if (check !== null){ - user_online = navigator.userActivation.isActive || navigator.userActivation.hasBeenActive === true; - sessionStorage.getItem('online') - } - return user_online -} \ No newline at end of file +// +// // +// // document.querySelector(".enter-message-inp").onload( +// // funcFocus() +// // ) +// +// function funcFocus(){ +// let window = document.querySelector(".container-messages") +// if (window !== null){ +// let inp = document.querySelector(".enter-message-inp") +// if (inp !== null){ +// inp.focus() +// } +// } else{ +// check_new_messages_timeout(long_timeout) +// } +// +// } +// +// +// +// var check_msg = null +// var it = 0 +// +// var short_timeout = 50000 +// var long_timeout = 60000 +// +// // function initial_function (){ +// // var it_set_func = 0 +// // var it_func = 0 +// // check_new_messages_timeout(60000,it_set_func,it_func) +// // } +// +// function check_new_messages_timeout(timeout_time=short_timeout){ +// if (check_msg){ +// clearInterval(check_msg) +// } +// +// let window = document.querySelector(".container-messages") +// // if (window !== null){ +// // +// // +// // } +// // if (it_set_func === 0){ +// // // clearInterval(check_msg) +// // if (window === null){ +// // it_set_func++ +// // check_new_messages_timeout(60000,it_set_func,it_func) +// // } else { +// // let new_timeout_time = 1000 +// // it_set_func++ +// // check_new_messages_timeout(new_timeout_time,it_set_func,it_func) +// // } +// // +// // } +// check_msg = setInterval(function () { +// +// // let new_message = getNewMessageSession() +// // let user_online = userOnline('set') +// window = document.querySelector(".container-messages") +// if (window === null){ +// check_new_messages(window,true) +// // let new_timeout_time = 60000 +// // +// // check_new_messages_timeout(new_timeout_time,it_set_func,it_func) +// } else { +// // if (it_func === 0){ +// // let new_timeout_time = 1000 +// // it_func++ +// // check_new_messages_timeout(new_timeout_time,it_set_func,it_func) +// // } +// check_new_messages(window,false) +// } +// +// }, +// timeout_time) +// } +// +// +// +// +// var data_new_messages = null +// +// function check_new_messages (window,only_sender_mode){ +// // if (it === 0){ +// if (only_sender_mode === false){ +// let data_set = document.querySelector(".container-messages").dataset +// let sender = data_set['userId']; +// let receiver = data_set['curReceiver']; +// let ticket_id = data_set['ticketId']; +// data_new_messages = { +// 'sender': sender, +// 'receiver': receiver, +// 'ticket_id': ticket_id +// // 'last_message_modifiteDT':last_message_time +// } +// } else { +// let profile_data_set = document.querySelector(".button_profile_header").dataset +// let sender = profile_data_set['userId'] +// data_new_messages = { +// 'sender': sender +// } +// } +// // } +// // let user_online_check = document.addEventListener("mouseover"); +// let last_message_time = document.querySelector(".date_n_time_last_message") +// if (last_message_time === null){ +// // +// } else { +// data_new_messages.last_message_modifiedDT = last_message_time.dataset['modifieddt'] +// } +// +// +// $.ajax({ +// headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() }, +// url: '/ru/messages/update_chat/', +// type: "POST", +// // async: true, +// cache: false, +// processData: false, +// contentType: false, +// // enctype: 'json', +// data: JSON.stringify(data_new_messages), +// success: function(data){ +// success_check_new_messages(data) +// +// }, +// error: function (data){ +// +// let request = document.querySelector(".info_profile") +// if (request === undefined || window === null){ +// clearTimeout(check_msg) +// } else { +// // request.innerHTML = data.responseText; +// } +// if (check_msg !== null){ +// clearInterval(check_msg) +// } +// } +// }); +// } +// +// +// function success_check_new_messages (data) { +// let window = document.querySelector(".container-messages") +// if (window === null){ +// clearTimeout(check_msg) +// } else { +// if (data !== null) { +// if (data_new_messages['ticket_id'] && data_new_messages['ticket_id'] !== "null") { +// if (data.msgs_count > 1) { +// if (document.querySelector(".container-messages")) { +// document.querySelector(".container-messages").innerHTML = data.html; +// } +// else if (data.tickets_list_html){ +// if (document.querySelector(".block-list-of-users")) { +// document.querySelector(".block-list-of-users").innerHTML = data.tickets_list_html +// } +// } +// +// } else { +// document.querySelector(".info_profile").innerHTML = data.html; +// } +// } +// +// else if (data.chat_html) { +// if (document.querySelector(".container-messages")) { +// document.querySelector(".container-messages").innerHTML = data.chat_html; +// } +// if (data.users_list_html){ +// if (document.querySelector(".block-list-of-users")) { +// document.querySelector(".block-list-of-users").innerHTML = data.users_list_html; +// } +// } +// } +// +// +// if (data.required_beep === true){ +// const beep = new Audio('/static/sounds/beep_2.mp3') +// beep.play() +// +// } +// +// +// } +// +// } +// +// // let updatedCookie = encodeURIComponent(name_cookie) + "=" + encodeURIComponent(''); +// // let search_cookie = document.cookie.match("(^|[^;]+)\s*" + name_cookie + "\s*=\s*([^;]+)")[0].substring(1) +// // let search_cookie = getCookieValue('user_alerts') +// // document.cookie = document.cookie.replace(search_cookie,name_cookie + "=") +// // document.cookie = updatedCookie +// // document.cookie = document.cookie.slice(0,-26) +// // document.cookie = document.cookie.replace('user_alerts="{\"new_message\": true}"','user_alerts=;') +// } +// +// function userOnline (set=null,check=null) { +// let user_online = null +// if (set !== null){ +// user_online = navigator.userActivation.isActive || navigator.userActivation.hasBeenActive === true; +// sessionStorage.setItem('online',user_online) +// +// } else if (check !== null){ +// user_online = navigator.userActivation.isActive || navigator.userActivation.hasBeenActive === true; +// sessionStorage.getItem('online') +// } +// return user_online +// } \ No newline at end of file diff --git a/static/js/global_js.js b/static/js/global_js.js index 036b1ca..557905e 100644 --- a/static/js/global_js.js +++ b/static/js/global_js.js @@ -3,18 +3,18 @@ $(document).ready(function (){ }) function getNewMessageSession(){ - let window_messages = document.querySelector(".container-messages") - let new_timeout_time; - if (window_messages !== null){ - // check_new_messages(window) - new_timeout_time = short_timeout - } else { - new_timeout_time = long_timeout - } - if (check_msg !== null){ - clearInterval(check_msg) - } - check_new_messages_timeout(new_timeout_time) + // let window_messages = document.querySelector(".container-messages") + // let new_timeout_time; + // if (window_messages !== null){ + // // check_new_messages(window) + // new_timeout_time = short_timeout + // } else { + // new_timeout_time = long_timeout + // } + // if (check_msg !== null){ + // clearInterval(check_msg) + // } + // check_new_messages_timeout(new_timeout_time) } diff --git a/templates/blocks/profile/b_subscribe.html b/templates/blocks/profile/b_subscribe.html index a56cfed..758682b 100644 --- a/templates/blocks/profile/b_subscribe.html +++ b/templates/blocks/profile/b_subscribe.html @@ -35,8 +35,13 @@ Опции:
-
diff --git a/templates/pages/profile/p_user_profile.html b/templates/pages/profile/p_user_profile.html index a798c29..430baea 100644 --- a/templates/pages/profile/p_user_profile.html +++ b/templates/pages/profile/p_user_profile.html @@ -9,6 +9,8 @@ + +