sysadminix/tripwithbonus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.8.427

Browse Source
This commit is contained in:
SBD
2023-11-29 18:28:31 +03:00
parent 8a6317da2b
commit 01d72c5f45
2 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ArticlesApp/funcs.py
View File

@@ -1,7 +1,7 @@
from .models import * from .models import *
elements_on_page = 4 elements_on_page = 1
def get_articles(art_kwargs, request_Data=None, from_el=None, to_el=None): def get_articles(art_kwargs, request_Data=None, from_el=None, to_el=None):

45
static/js/dynamic_loading_routes.js
View File

@@ -62,28 +62,27 @@ function load_routes (el,news=null,incrase) {
document.querySelector(".col_vo_els_f_load").innerHTML = ` ${data.next_page_els_count}` document.querySelector(".col_vo_els_f_load").innerHTML = ` ${data.next_page_els_count}`
} }
let place_ins_parent = el.closest(".block_w_paging")
let place_ins = place_ins_parent.querySelector(`.page_paging_elements_${local_page_iterator}`)
// //
// let place_ins = el // let place_ins = el
if (news && standart_page_iterator === 1){ if (news && standart_page_iterator === 1){
page_iterator++ page_iterator++
standart_page_iterator++ let old_page_iterator = standart_page_iterator
let new_page_routes = document.createElement("div") let new_page_routes = document.querySelector(".page_paging_elements_1")
let old_page_iterator = local_page_iterator // let new_page_routes = document.createElement("div")
new_page_routes.classList.add("page_paging_elements_" + standart_page_iterator) // let old_page_iterator = local_page_iterator
$(new_page_routes).insertAfter(".page_paging_elements_" + old_page_iterator); // new_page_routes.classList.add("page_paging_elements_" + standart_page_iterator--)
old_page_iterator++ // $(new_page_routes).insertAfter(".page_paging_elements_" + old_page_iterator);
let line_separator = document.createElement("div") // old_page_iterator++
line_separator.classList.add("line_separator_page_w_el") // let line_separator = document.createElement("div")
// line_separator.classList.add("line_separator_page_w_el")
new_page_routes.innerHTML = data.html new_page_routes.innerHTML = data.html
local_page_iterator++ local_page_iterator++
local_page_iterator++ separator_iterator++
standart_page_iterator++
let new_page_routes1 = document.createElement("div") let new_page_routes1 = document.createElement("div")
new_page_routes1.classList.add("page_paging_elements_" + local_page_iterator) new_page_routes1.classList.add("page_paging_elements_" + local_page_iterator)
$(new_page_routes).insertAfter(".page_paging_elements_" + old_page_iterator); $(new_page_routes1).insertAfter(".page_paging_elements_" + old_page_iterator);
let line_separator1 = document.createElement("div") let line_separator1 = document.createElement("div")
line_separator1.classList.add("line_separator_page_w_el") line_separator1.classList.add("line_separator_page_w_el")
el.setAttribute("id",parseInt(number_last_route) + incrase) el.setAttribute("id",parseInt(number_last_route) + incrase)
@@ -92,20 +91,31 @@ function load_routes (el,news=null,incrase) {
iterator_f_check++ iterator_f_check++
iterator_f_check++ iterator_f_check++
if (data.last_block === true){ if (data.last_block === true){
el.classList.add("hide") el.classList.add("hide")
} else if (data.last_block === false){ } else if (data.last_block === false){
if (el.classList.contains("hide")) { if (el.classList.contains("hide")) {
el.classList.remove("hide") el.classList.remove("hide")
} }
} }
page_iterator++
standart_page_iterator++
separator_iterator++
iterator_f_check++
document.querySelector(".loader_f_loading_routes.show").classList.remove("show") document.querySelector(".loader_f_loading_routes.show").classList.remove("show")
} else { } else {
page_iterator++
standart_page_iterator++
separator_iterator++
iterator_f_check++
let place_ins_parent = el.closest(".block_w_paging")
let place_ins = place_ins_parent.querySelector(`.page_paging_elements_${local_page_iterator}`)
if (!place_ins){
place_ins = place_ins_parent.querySelector(`.page_paging_elements_${local_page_iterator}`)
}
place_ins.innerHTML = data.html place_ins.innerHTML = data.html
let old_page_iterator = local_page_iterator let old_page_iterator = local_page_iterator
// standart_page_iterator++ // standart_page_iterator++
local_page_iterator++
page_iterator++
standart_page_iterator++
loader.classList.toggle("show") loader.classList.toggle("show")
if (!data.last_block_routes){ if (!data.last_block_routes){
el.classList.toggle("hide") el.classList.toggle("hide")
@@ -116,6 +126,7 @@ function load_routes (el,news=null,incrase) {
// behavior:"smooth" // behavior:"smooth"
// } // }
// ) // )
local_page_iterator++
let new_page_routes = document.createElement("div") let new_page_routes = document.createElement("div")
new_page_routes.classList.add("page_paging_elements_" + local_page_iterator) new_page_routes.classList.add("page_paging_elements_" + local_page_iterator)
$(new_page_routes).insertAfter(".page_paging_elements_" + old_page_iterator); $(new_page_routes).insertAfter(".page_paging_elements_" + old_page_iterator);