From c5644a51d6d8fce30652dcdef555fc86fd74bdd2 Mon Sep 17 00:00:00 2001 From: veselcraft Date: Wed, 18 Sep 2024 01:02:56 +0300 Subject: [PATCH] feat(friends): add ajax --- Web/Presenters/templates/@listView.xml | 2 +- Web/Presenters/templates/User/Friends.xml | 10 +++--- Web/static/css/main.css | 16 ++++++++++ Web/static/js/openvk.cls.js | 38 +++++++++++++++++++++++ install/sqls/00046-deny-request.sql | 2 +- locales/en.strings | 3 ++ locales/ru.strings | 3 ++ 7 files changed, 67 insertions(+), 7 deletions(-) diff --git a/Web/Presenters/templates/@listView.xml b/Web/Presenters/templates/@listView.xml index f2342a85..4b2dd9ff 100644 --- a/Web/Presenters/templates/@listView.xml +++ b/Web/Presenters/templates/@listView.xml @@ -49,7 +49,7 @@ {include description, x => $dat} {/ifset} - + {include actions, x => $dat} diff --git a/Web/Presenters/templates/User/Friends.xml b/Web/Presenters/templates/User/Friends.xml index 40146f11..b84228c5 100644 --- a/Web/Presenters/templates/User/Friends.xml +++ b/Web/Presenters/templates/User/Friends.xml @@ -145,21 +145,21 @@ {if ($x->getId() !== $thisUser->getId()) && ($thisUser->getId() === $user->getId())} {var $subStatus = $x->getSubscriptionStatus($thisUser)} {if $subStatus === 0} -
+
{elseif $subStatus === 1} -
+
{if $act !== 'followers'} -
+ @@ -167,7 +167,7 @@
{/if} {elseif $subStatus === 2} -
+ @@ -175,7 +175,7 @@
{elseif $subStatus === 3} {_send_message} -
+ diff --git a/Web/static/css/main.css b/Web/static/css/main.css index 61576a40..37b8b354 100644 --- a/Web/static/css/main.css +++ b/Web/static/css/main.css @@ -427,6 +427,22 @@ h1 { text-transform: lowercase; } +.action_links.disable>a, +.action_links.disable>form>input, +.action_links.disable { + cursor: not-allowed; + color: grey; +} + +.action_links.loading::after { + content: ""; + display: inline-block; + background-image: url('/assets/packages/static/openvk/img/loading_mini.gif'); + width: 30px; + height: 7px; + margin-left: 5px; +} + .profile_link.disable>a, .profile_link.disable { cursor: not-allowed; diff --git a/Web/static/js/openvk.cls.js b/Web/static/js/openvk.cls.js index b131bfa0..a09dd3cb 100644 --- a/Web/static/js/openvk.cls.js +++ b/Web/static/js/openvk.cls.js @@ -167,6 +167,44 @@ document.addEventListener("DOMContentLoaded", function() { //BEGIN return false; }); + u("#_submitUserSubscriptionAction").handle("submit", async function(e) { + u(this).nodes[0].parentElement.classList.add('loading'); + u(this).nodes[0].parentElement.classList.add('disable'); + console.log(e.target); + const data = await fetch(u(this).attr('action'), { method: 'POST', body: new FormData(e.target) }); + if (data.ok) { + u(this).nodes[0].parentElement.classList.remove('loading'); + u(this).nodes[0].parentElement.classList.remove('disable'); + if (e.target[0].value == "add") { + u(this).nodes[0].parentElement.innerHTML = tr("friends_add_msg"); + } else if (e.target[0].value == "rej") { + u(this).nodes[0].parentElement.innerHTML = tr("friends_rej_msg"); + } else if (e.target[0].value == "rem") { + u(this).nodes[0].parentElement.innerHTML = tr("friends_rem_msg"); + } + } + }) + + /* + + + + */ + }); //END ONREADY DECLS async function repostPost(id, hash) { diff --git a/install/sqls/00046-deny-request.sql b/install/sqls/00046-deny-request.sql index 276c94b8..0cea83d8 100755 --- a/install/sqls/00046-deny-request.sql +++ b/install/sqls/00046-deny-request.sql @@ -1 +1 @@ -ALTER TABLE `subscriptions` ADD `flags` tinyint(3) unsigned NOT NULL; \ No newline at end of file +ALTER TABLE `subscriptions` ADD `flags` tinyint(3) unsigned NOT NULL DEFAULT '0' AFTER `target` \ No newline at end of file diff --git a/locales/en.strings b/locales/en.strings index 15eac7b6..c4cfc172 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -260,6 +260,9 @@ "friends_reject" = "Reject request"; "friends_accept" = "Accept request"; "friends_leave_in_flw" = "Leave in followers"; +"friends_add_msg" = "Now you're friends."; +"friends_rej_msg" = "You left this user as subscriber."; +"friends_rem_msg" = "You deleted this user from your friend list."; "send_message" = "Send a message"; "incoming_req" = "Pending"; "outcoming_req" = "Outgoing"; diff --git a/locales/ru.strings b/locales/ru.strings index 629403e6..6eacddaa 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -240,6 +240,9 @@ "friends_reject" = "Отменить заявку"; "friends_accept" = "Принять заявку"; "friends_leave_in_flw" = "Оставить в подписчиках"; +"friends_add_msg" = "Теперь вы друзья."; +"friends_rej_msg" = "Вы оставили пользователя в подписчиках."; +"friends_rem_msg" = "Вы удалили пользователя из списка своих друзей."; "send_message" = "Отправить сообщение"; "incoming_req" = "Входящие"; "outcoming_req" = "Исходящие";