From bc8d6df5d0792c62d8946ab6a6cef6ba7f057ba6 Mon Sep 17 00:00:00 2001 From: borissedw Date: Wed, 9 Aug 2023 16:34:24 +0300 Subject: [PATCH 1/6] 0.0.91 --- static/js/check_new_messages.js | 4 ++-- static/js/global_js.js | 23 ++++++++++++++++++----- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/static/js/check_new_messages.js b/static/js/check_new_messages.js index 17b29b6..79f23fc 100644 --- a/static/js/check_new_messages.js +++ b/static/js/check_new_messages.js @@ -21,7 +21,7 @@ function check_new_messages_timeout(){ } check_msg = setInterval(function () { // let new_message = getNewMessageSession() - let user_online = userOnline('set') + // let user_online = userOnline('set') window = document.querySelector(".container-messages") if (window === null){ // @@ -30,7 +30,7 @@ function check_new_messages_timeout(){ check_new_messages(window,it) } }, - 10000) + 1000) } diff --git a/static/js/global_js.js b/static/js/global_js.js index abf8c58..b72ab13 100644 --- a/static/js/global_js.js +++ b/static/js/global_js.js @@ -3,9 +3,22 @@ $(document).ready(function (){ }) function getNewMessageSession (){ - let new_message = JSON.parse( - sessionStorage.getItem('user_alerts') - ) - return new_message -} + var o = document.cookie.split("; "); + var r = [{}]; + for(var i = 0;i < o.length;i++){ + r[o[i].split("=")[0]] = o[i].split("=")[1]; + } + let prs = JSON.parse(r['user_alerts']) + let prs_ = JSON.parse(prs) + // if (prs === "{'new_message': True}"){ + // prs = { + // 'new_message' : 'True' + // } + // } else { + // prs = { + // 'new_message' : 'False' + // } + // } + return prs_; +} From 417d0dc3be21157616f71d7c1e03ae39d2d3a8e2 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Wed, 9 Aug 2023 16:38:32 +0300 Subject: [PATCH 2/6] 0.0.79 --- static/css/styles.css | 1 + 1 file changed, 1 insertion(+) diff --git a/static/css/styles.css b/static/css/styles.css index 161f7d1..3aa8dd0 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -789,6 +789,7 @@ section.profile { .selected{ background: #FF613A !important; + transition: background 200ms cubic-bezier(1, -0.16, 0, 1.14) } .selected>a{ From a983d70ffac8412865f79ce23b70e1a7279b680c Mon Sep 17 00:00:00 2001 From: ArtemB Date: Wed, 9 Aug 2023 16:39:33 +0300 Subject: [PATCH 3/6] 0.0.80 --- static/css/styles.css | 5 ----- 1 file changed, 5 deletions(-) diff --git a/static/css/styles.css b/static/css/styles.css index 3aa8dd0..c1a37ef 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -218,11 +218,6 @@ section.register>h1 { line-height: 22px; } -@font-face { - font-family: "mr_NorwesterG"; - src: url("/static/fonts/mr_NorwesterG.ttf"); -} - .first-column>div:nth-child(2)>div:first-child { color: #FFF; /* Body text 3 */ From e36af0a49c7869c9213046b0b150e508131364e9 Mon Sep 17 00:00:00 2001 From: borissedw Date: Wed, 9 Aug 2023 16:41:57 +0300 Subject: [PATCH 4/6] 0.0.92 --- static/css/styles.css | 5 +++++ static/js/global_js.js | 1 + 2 files changed, 6 insertions(+) diff --git a/static/css/styles.css b/static/css/styles.css index c1a37ef..3aa8dd0 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -218,6 +218,11 @@ section.register>h1 { line-height: 22px; } +@font-face { + font-family: "mr_NorwesterG"; + src: url("/static/fonts/mr_NorwesterG.ttf"); +} + .first-column>div:nth-child(2)>div:first-child { color: #FFF; /* Body text 3 */ diff --git a/static/js/global_js.js b/static/js/global_js.js index b72ab13..71ddb13 100644 --- a/static/js/global_js.js +++ b/static/js/global_js.js @@ -19,6 +19,7 @@ function getNewMessageSession (){ // 'new_message' : 'False' // } // } + // b = cookieS return prs_; } From 1207cdd1055ce7b25d53c36f5eec8f91a1e8239c Mon Sep 17 00:00:00 2001 From: borissedw Date: Wed, 9 Aug 2023 16:46:07 +0300 Subject: [PATCH 5/6] 0.0.93 --- static/js/global_js.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/static/js/global_js.js b/static/js/global_js.js index 71ddb13..16ad226 100644 --- a/static/js/global_js.js +++ b/static/js/global_js.js @@ -8,8 +8,14 @@ function getNewMessageSession (){ for(var i = 0;i < o.length;i++){ r[o[i].split("=")[0]] = o[i].split("=")[1]; } - let prs = JSON.parse(r['user_alerts']) - let prs_ = JSON.parse(prs) + let prs_ = null + if (r['user_alerts']){ + let prs = JSON.parse(r['user_alerts']) + prs_ = JSON.parse(prs) + } else { + // + } + // if (prs === "{'new_message': True}"){ // prs = { // 'new_message' : 'True' @@ -20,6 +26,7 @@ function getNewMessageSession (){ // } // } // b = cookieS + // let b = CookieStore.getAll() return prs_; } From fb8ccb5721d74f0a8ee559734cb7680478bdfb47 Mon Sep 17 00:00:00 2001 From: borissedw Date: Wed, 9 Aug 2023 16:51:44 +0300 Subject: [PATCH 6/6] 0.0.94 --- static/js/global_js.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/js/global_js.js b/static/js/global_js.js index 16ad226..d85c2ce 100644 --- a/static/js/global_js.js +++ b/static/js/global_js.js @@ -9,7 +9,7 @@ function getNewMessageSession (){ r[o[i].split("=")[0]] = o[i].split("=")[1]; } let prs_ = null - if (r['user_alerts']){ + if (r['user_alerts'] !== null || r['user_alerts']){ let prs = JSON.parse(r['user_alerts']) prs_ = JSON.parse(prs) } else {