From 8fc47ff6cdc1ec33a367a62b6ba968524c4e8400 Mon Sep 17 00:00:00 2001 From: mrilyew <99399973+mrilyew@users.noreply.github.com> Date: Sat, 2 Nov 2024 11:16:25 +0300 Subject: [PATCH 1/3] rewrite --- Web/Presenters/NotesPresenter.php | 9 +-- Web/Presenters/SearchPresenter.php | 1 + Web/Presenters/templates/@listView.xml | 4 +- Web/Presenters/templates/Audio/List.xml | 10 +-- Web/Presenters/templates/Audio/Playlist.xml | 4 +- Web/Presenters/templates/Gifts/Pick.xml | 4 +- Web/Presenters/templates/Group/Suggested.xml | 4 +- Web/Presenters/templates/Messenger/Index.xml | 4 +- Web/Presenters/templates/Notes/List.xml | 15 +++- .../templates/Notification/Feed.xml | 4 +- Web/Presenters/templates/Photos/Album.xml | 4 +- Web/Presenters/templates/Search/Index.xml | 58 +++++++++++---- Web/Presenters/templates/User/Groups.xml | 1 + .../templates/components/paginator.xml | 2 +- Web/static/js/al_music.js | 29 ++++++++ Web/static/js/al_suggestions.js | 4 +- Web/static/js/al_wall.js | 73 +++++++++++++++++++ Web/static/js/openvk.cls.js | 6 +- 18 files changed, 185 insertions(+), 51 deletions(-) diff --git a/Web/Presenters/NotesPresenter.php b/Web/Presenters/NotesPresenter.php index 67105fe3..37475013 100644 --- a/Web/Presenters/NotesPresenter.php +++ b/Web/Presenters/NotesPresenter.php @@ -22,15 +22,10 @@ final class NotesPresenter extends OpenVKPresenter if(!$user->getPrivacyPermission('notes.read', $this->user->identity ?? NULL)) $this->flashFail("err", tr("forbidden"), tr("forbidden_comment")); - $this->template->notes = $this->notes->getUserNotes($user, (int)($this->queryParam("p") ?? 1)); + $this->template->page = (int)($this->queryParam("p") ?? 1); + $this->template->notes = $this->notes->getUserNotes($user, $this->template->page); $this->template->count = $this->notes->getUserNotesCount($user); $this->template->owner = $user; - $this->template->paginatorConf = (object) [ - "count" => $this->template->count, - "page" => $this->queryParam("p") ?? 1, - "amount" => NULL, - "perPage" => OPENVK_DEFAULT_PER_PAGE, - ]; } function renderView(int $owner, int $note_id): void diff --git a/Web/Presenters/SearchPresenter.php b/Web/Presenters/SearchPresenter.php index a7f3f151..9e16450e 100644 --- a/Web/Presenters/SearchPresenter.php +++ b/Web/Presenters/SearchPresenter.php @@ -125,5 +125,6 @@ final class SearchPresenter extends OpenVKPresenter ]; $this->template->extendedPaginatorConf = clone $this->template->paginatorConf; $this->template->extendedPaginatorConf->space = 11; + $this->template->paginatorConf->atTop = true; } } diff --git a/Web/Presenters/templates/@listView.xml b/Web/Presenters/templates/@listView.xml index 4b2dd9ff..f97d0da5 100644 --- a/Web/Presenters/templates/@listView.xml +++ b/Web/Presenters/templates/@listView.xml @@ -19,7 +19,7 @@ {ifset specpage} {include specpage, x => $dat} {else} -
+
{var $data = is_array($iterator) ? $iterator : iterator_to_array($iterator)} {ifset top} @@ -27,7 +27,7 @@ {/ifset} {if sizeof($data) > 0} -
+
diff --git a/Web/Presenters/templates/Audio/List.xml b/Web/Presenters/templates/Audio/List.xml index b67bb208..32d2e26b 100644 --- a/Web/Presenters/templates/Audio/List.xml +++ b/Web/Presenters/templates/Audio/List.xml @@ -64,8 +64,8 @@
{include "../components/content_error.xml", description => $ownerId > 0 ? ($ownerId == $thisUser->getId() ? tr("no_audios_thisuser") : tr("no_audios_user")) : tr("no_audios_club")}
-
-
+
+
{include "player.xml", audio => $audio, club => $club}
@@ -86,10 +86,10 @@ {include "../components/content_error.xml", description => $ownerId > 0 ? ($ownerId == $thisUser->getId() ? tr("no_playlists_thisuser") : tr("no_playlists_user")) : tr("no_playlists_club")}
-
- {foreach $playlists as $playlist} +
+
{include 'playlistListView.xml', playlist => $playlist} - {/foreach} +
diff --git a/Web/Presenters/templates/Audio/Playlist.xml b/Web/Presenters/templates/Audio/Playlist.xml index 4139fa2f..7f8c7348 100644 --- a/Web/Presenters/templates/Audio/Playlist.xml +++ b/Web/Presenters/templates/Audio/Playlist.xml @@ -67,11 +67,11 @@
-
+
{if $count < 1} {_empty_playlist} {else} -
+
{include "player.xml", audio => $audio}
diff --git a/Web/Presenters/templates/Gifts/Pick.xml b/Web/Presenters/templates/Gifts/Pick.xml index dad30839..cb01b944 100644 --- a/Web/Presenters/templates/Gifts/Pick.xml +++ b/Web/Presenters/templates/Gifts/Pick.xml @@ -12,8 +12,8 @@ {/block} {block content} -
-
+
+
{_gift} diff --git a/Web/Presenters/templates/Group/Suggested.xml b/Web/Presenters/templates/Group/Suggested.xml index 1c882675..1a07e0a8 100644 --- a/Web/Presenters/templates/Group/Suggested.xml +++ b/Web/Presenters/templates/Group/Suggested.xml @@ -12,9 +12,9 @@ {include "../components/error.xml", title => "", description => $type == "my" ? tr("no_suggested_posts_by_you") : tr("no_suggested_posts_by_people")} {else}

{if $type == "my"}{tr("suggested_posts_in_group_by_you", $count)}{else}{tr("suggested_posts_in_group", $count)}{/if}

-
+
{var $microblog = $thisUser->hasMicroblogEnabled()} -
+
{if $microblog} {include "../components/post/microblogpost.xml", post => $post, commentSection => false, suggestion => true, forceNoCommentsLink => true, forceNoPinLink => true, forceNoLike => true, forceNoShareLink => true, forceNoDeleteLink => false} {else} diff --git a/Web/Presenters/templates/Messenger/Index.xml b/Web/Presenters/templates/Messenger/Index.xml index 5c62bf9f..b045c06f 100644 --- a/Web/Presenters/templates/Messenger/Index.xml +++ b/Web/Presenters/templates/Messenger/Index.xml @@ -17,9 +17,9 @@
{if sizeof($corresps) > 0} -
+
{var $recipient = $coresp->getCorrespondents()[1]} {var $lastMsg = $coresp->getPreviewMessage()} diff --git a/Web/Presenters/templates/Notes/List.xml b/Web/Presenters/templates/Notes/List.xml index 7f2fcf7c..3189a146 100644 --- a/Web/Presenters/templates/Notes/List.xml +++ b/Web/Presenters/templates/Notes/List.xml @@ -1,6 +1,5 @@ {extends "../@listView.xml"} {var $iterator = iterator_to_array($notes)} -{var $page = $paginatorConf->page} {block title}{_notes}{/block} @@ -60,12 +59,12 @@ } -
+
{var $data = is_array($iterator) ? $iterator : iterator_to_array($iterator)} {if sizeof($data) > 0} - {var $data = is_array($iterator) ? $iterator : iterator_to_array($iterator)} {if sizeof($data) > 0} -
-
+
+
{var $sxModel = $dat->getModel(1)} diff --git a/Web/Presenters/templates/Photos/Album.xml b/Web/Presenters/templates/Photos/Album.xml index e8157dd1..fa779e11 100644 --- a/Web/Presenters/templates/Photos/Album.xml +++ b/Web/Presenters/templates/Photos/Album.xml @@ -30,10 +30,10 @@ {/if}

{if $album->getPhotosCount() > 0} -
+
{foreach $photos as $photo} {php if($photo->isDeleted()) continue; } -
+
diff --git a/Web/Presenters/templates/Search/Index.xml b/Web/Presenters/templates/Search/Index.xml index 6cbf1036..a515fd16 100644 --- a/Web/Presenters/templates/Search/Index.xml +++ b/Web/Presenters/templates/Search/Index.xml @@ -29,10 +29,10 @@
-
+
{if $count > 0} {if $section === 'users'} -
+
@@ -125,10 +125,14 @@ {elseif $section === 'groups'} -
+
@@ -180,10 +184,14 @@ {elseif $section === 'apps'} -
+
@@ -210,10 +218,14 @@ {elseif $section === 'posts'} -
+
{if !$dat || $dat->getWallOwner()->isHideFromGlobalFeedEnabled()} {_closed_group_post}. {else} @@ -222,31 +234,47 @@
{elseif $section === 'videos'} -
+
{include "../components/video.xml", video => $dat}
{elseif $section === 'audios'} -
+
{include "../Audio/player.xml", audio => $dat}
{elseif $section === 'audios_playlists'} -
+
{include "../Audio/playlistListView.xml", playlist => $dat}
{/if} {else} diff --git a/Web/Presenters/templates/User/Groups.xml b/Web/Presenters/templates/User/Groups.xml index bca006e8..281447ba 100644 --- a/Web/Presenters/templates/User/Groups.xml +++ b/Web/Presenters/templates/User/Groups.xml @@ -2,6 +2,7 @@ {var $iterator = $user->getClubs($page, $admin)} {var $count = $user->getClubCount($admin)} +{block noscroll}{/block} {block title} {_groups} {/block} diff --git a/Web/Presenters/templates/components/paginator.xml b/Web/Presenters/templates/components/paginator.xml index 0dffd004..3db45de9 100644 --- a/Web/Presenters/templates/components/paginator.xml +++ b/Web/Presenters/templates/components/paginator.xml @@ -2,7 +2,7 @@ {var $pageCount = ceil($conf->count / $conf->perPage)}
-
+
« {for $j = $conf->page - ($space-1); $j <= $conf->page + ($space-1); $j++} {$j} diff --git a/Web/static/js/al_music.js b/Web/static/js/al_music.js index 7ee1f035..9aeab1f8 100644 --- a/Web/static/js/al_music.js +++ b/Web/static/js/al_music.js @@ -641,6 +641,35 @@ class bigPlayer { duration: this.tracks["currentTrack"].length }) } + + loadContextPage(page, lesser = false) { + const formdata = new FormData() + formdata.append("context", this.context["context_type"]) + formdata.append("context_entity", this.context["context_id"]) + formdata.append("hash", u("meta[name=csrf]").attr("value")) + formdata.append("page", page) + + ky.post("/audios/context", { + hooks: { + afterResponse: [ + async (_request, _options, response) => { + const newArr = await response.json() + + if(lesser) + this.tracks["tracks"] = newArr["items"].concat(this.tracks["tracks"]) + else + this.tracks["tracks"] = this.tracks["tracks"].concat(newArr["items"]) + + this.context["playedPages"].push(String(newArr["page"])) + + this.updateButtons() + console.info("Loaded context for page " + page) + } + ] + }, + body: formdata + }) + } } document.addEventListener("DOMContentLoaded", function() { diff --git a/Web/static/js/al_suggestions.js b/Web/static/js/al_suggestions.js index 1c3da3e8..befe78b7 100644 --- a/Web/static/js/al_suggestions.js +++ b/Web/static/js/al_suggestions.js @@ -201,7 +201,7 @@ $(document).on("click", ".sugglist a", (e) => { }) // нажатие на пагинатор у постов предложки -$(document).on("click", "#postz .paginator a", (e) => { +/*$(document).on("click", "#postz .paginator a", (e) => { e.preventDefault() ky(e.currentTarget.href, { @@ -228,4 +228,4 @@ $(document).on("click", "#postz .paginator a", (e) => { ] } }) -}) +})*/ diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js index 3278810d..8b516f11 100644 --- a/Web/static/js/al_wall.js +++ b/Web/static/js/al_wall.js @@ -1643,3 +1643,76 @@ $(document).on("click", ".avatarDelete", (e) => { }), ]); }) + +async function __processPaginatorNextPage(page) +{ + const container = u('.scroll_container') + const container_node = '.scroll_node' + const parser = new DOMParser + + const replace_url = new URL(location.href) + replace_url.searchParams.set('p', page) + + const new_content = await fetch(replace_url.href) + const new_content_response = await new_content.text() + const parsed_content = parser.parseFromString(new_content_response, 'text/html') + + const nodes = parsed_content.querySelectorAll(container_node) + nodes.forEach(node => { + container.append(node) + }) + + u(`.paginator:not(.paginator-at-top)`).html(parsed_content.querySelector('.paginator:not(.paginator-at-top)').innerHTML) + // fffffuck + if(u(`.paginator:not(.paginator-at-top)`).nodes[0].closest('.scroll_container')) { + container.nodes[0].append(u(`.paginator:not(.paginator-at-top)`).nodes[0].parentNode) + } + + if(window.player) { + window.player.loadContextPage(page) + } + + if(typeof __scrollHook != 'undefined') { + __scrollHook(page) + } +} + +const showMoreObserver = new IntersectionObserver(entries => { + entries.forEach(async x => { + if(x.isIntersecting) { + if(u('.scroll_container').length < 1) { + return + } + + const target = u(x.target) + if(target.length < 1 || target.hasClass('paginator-at-top')) { + return + } + + const current_url = new URL(location.href) + if(current_url.searchParams && !isNaN(parseInt(current_url.searchParams.get('p')))) { + return + } + + target.addClass('lagged') + const active_tab = target.find('.active') + const next_page = u(active_tab.nodes[0] ? active_tab.nodes[0].nextElementSibling : null) + if(next_page.length < 1) { + u('.paginator:not(.paginator-at-top)').removeClass('lagged') + return + } + + const page_number = Number(next_page.html()) + await __processPaginatorNextPage(page_number) + u('.paginator:not(.paginator-at-top)').removeClass('lagged') + } + }) +}, { + root: null, + rootMargin: '0px', + threshold: 0, +}) + +if(u('.paginator:not(.paginator-at-top)').length > 0) { + showMoreObserver.observe(u('.paginator:not(.paginator-at-top)').nodes[0]) +} diff --git a/Web/static/js/openvk.cls.js b/Web/static/js/openvk.cls.js index 64700084..5878945e 100644 --- a/Web/static/js/openvk.cls.js +++ b/Web/static/js/openvk.cls.js @@ -90,7 +90,7 @@ document.addEventListener("DOMContentLoaded", function() { //BEGIN }); /* @rem-pai why this func wasn't named as "#_deleteDialog"? It looks universal IMO */ - u("#_noteDelete").on("click", function(e) { + u(document).on("click", "#_noteDelete", function(e) { var formHtml = "
"; formHtml += ""; formHtml += ""; @@ -167,7 +167,7 @@ document.addEventListener("DOMContentLoaded", function() { //BEGIN return false; }); - u("#_submitUserSubscriptionAction").handle("submit", async function(e) { + u(document).handle("submit", "#_submitUserSubscriptionAction", async function(e) { u(this).nodes[0].parentElement.classList.add('loading'); u(this).nodes[0].parentElement.classList.add('disable'); console.log(e.target); @@ -518,7 +518,7 @@ function highlightText(searchText, container_selector, selectors = []) { node.parentNode.insertBefore(tempDiv.firstChild, node) } node.parentNode.removeChild(node) - } else if(node.nodeType === 1 && node.tagName !== 'SCRIPT' && node.tagName !== 'BR' && node.tagName !== 'STYLE') { + } else if(node.nodeType === 1 && node.tagName !== 'SCRIPT' && node.tagName !== 'BR' && node.tagName !== 'STYLE' && !node.classList.contains('highlight')) { Array.from(node.childNodes).forEach(highlightNode); } } From 389f0b4bb4ee6fff71e2259c1b41c67e87f142d5 Mon Sep 17 00:00:00 2001 From: mrilyew <99399973+mrilyew@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:13:17 +0300 Subject: [PATCH 2/3] allow comments scroll --- Web/Presenters/templates/components/comments.xml | 8 +++++--- Web/static/js/al_comments.js | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Web/Presenters/templates/components/comments.xml b/Web/Presenters/templates/components/comments.xml index 0df0c91f..a4bf59da 100644 --- a/Web/Presenters/templates/components/comments.xml +++ b/Web/Presenters/templates/components/comments.xml @@ -9,9 +9,11 @@
{if sizeof($comments) > 0} - {foreach $comments as $comment} - {include "comment.xml", comment => $comment} - {/foreach} +
+
+ {include "comment.xml", comment => $comment} +
+
{include "paginator.xml", conf => (object) ["page" => $page, "count" => $count, "amount" => sizeof($comments), "perPage" => 10]}
diff --git a/Web/static/js/al_comments.js b/Web/static/js/al_comments.js index f4172428..70c7210d 100644 --- a/Web/static/js/al_comments.js +++ b/Web/static/js/al_comments.js @@ -1,4 +1,4 @@ -u(".comment-reply").on("click", function(e) { +u(document).on("click", ".comment-reply", function(e) { let comment = u(e.target).closest(".post"); let authorId = comment.data("owner-id"); let authorNm = u(".post-author > a > b", comment.first()).text().trim(); From c4fec2bf9701ecee798df37bff1b6f285763213b Mon Sep 17 00:00:00 2001 From: mrilyew <99399973+mrilyew@users.noreply.github.com> Date: Sat, 2 Nov 2024 13:02:34 +0300 Subject: [PATCH 3/3] rework to up button --- Web/Presenters/templates/@layout.xml | 9 +++++++- Web/static/css/main.css | 29 ++++++++++++++++++++++++-- Web/static/js/scroll.js | 31 +++++++++++++++++++++++----- 3 files changed, 61 insertions(+), 8 deletions(-) diff --git a/Web/Presenters/templates/@layout.xml b/Web/Presenters/templates/@layout.xml index b54ef44c..5e095508 100644 --- a/Web/Presenters/templates/@layout.xml +++ b/Web/Presenters/templates/@layout.xml @@ -82,7 +82,14 @@ {/if}
- ⬆ {_to_top} +
+ + {_to_top} +
+ +
+ +
diff --git a/Web/static/css/main.css b/Web/static/css/main.css index cb633d0a..e649df4e 100644 --- a/Web/static/css/main.css +++ b/Web/static/css/main.css @@ -1381,7 +1381,7 @@ textarea { .toTop { position: fixed; - padding: 20px; + padding: 12px; width: 100px; height: 100%; background-color: #f3f3f3; @@ -1391,9 +1391,34 @@ textarea { opacity: 0; transition: .1s all; z-index: 129; + user-select: none; } -body.scrolled .toTop:hover { +.toTop > div svg { + display: inline-block; + margin-right: 2px; + width: 8px; + height: 7px; + fill: #3f3f3f; +} + +.toTop > div span { + font-weight: bold; +} + +.toTop.has_down #to_up, .toTop #to_back { + display: none; +} + +.toTop.has_down #to_back { + display: block; +} + +.toTop.has_down { + opacity: .3; +} + +body.scrolled .toTop:hover, .toTop.has_down:hover { opacity: .5; cursor: pointer; } diff --git a/Web/static/js/scroll.js b/Web/static/js/scroll.js index 3b652afd..dff0ca4b 100644 --- a/Web/static/js/scroll.js +++ b/Web/static/js/scroll.js @@ -1,14 +1,35 @@ window.addEventListener("scroll", function(e) { if(window.scrollY < 100) { + if(window.temp_y_scroll) { + u('.toTop').addClass('has_down') + } document.body.classList.toggle("scrolled", false); } else { document.body.classList.toggle("scrolled", true); + u('.toTop').removeClass('has_down') } }); u(".toTop").on("click", function(e) { - window.scrollTo({ - top: 0, - behavior: "smooth" - }); -}); \ No newline at end of file + const y_scroll = window.scrollY + const scroll_margin = 20 + + if(y_scroll > 100) { + window.temp_y_scroll = y_scroll + window.scrollTo(0, scroll_margin) + window.scrollTo({ + top: 0, + behavior: "smooth" + }) + } else { + if(window.temp_y_scroll) { + window.scrollTo(0, window.temp_y_scroll - scroll_margin) + window.scrollTo({ + top: window.temp_y_scroll, + behavior: "smooth" + }) + } + } + + u(document).trigger('scroll') +})