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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
ArtemB
2023-11-29 20:11:56 +03:00
parent 0d394fb6b7 9635a1dcf2
commit f7e032a5bc
2 changed files with 128 additions and 96 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 *
elements_on_page = 5
elements_on_page = 10
def get_articles(art_kwargs, request_Data=None, from_el=None, to_el=None):

222
static/js/dynamic_loading_routes.js
View File

@@ -2,6 +2,7 @@ page_iterator = 2
standart_page_iterator = 1
separator_iterator = 1
iterator_f_check = 1
paging_iterator = 1
function load_routes (el,news=null,incrase) {
let local_page_iterator = standart_page_iterator
@@ -58,107 +59,138 @@ function load_routes (el,news=null,incrase) {
//
//
//
//
// //
//
// // let place_ins = el
// if (news && standart_page_iterator === 1){
// page_iterator++
// let new_page_routes = document.querySelector(".page_paging_elements_1")
// let new_page_routes_f_ = null
// let insert_place = new_page_routes
// if (new_page_routes.innerHTML){
// new_page_routes_f_ = document.createElement("div")
// let page_iterator_f_1 = local_page_iterator
// page_iterator_f_1++
// new_page_routes_f_.classList.add("page_paging_elements_" + page_iterator_f_1)
// $(new_page_routes_f_).insertAfter(".page_paging_elements_" + local_page_iterator);
// local_page_iterator++
// local_page_iterator++
// insert_place = new_page_routes_f_
// }
//
// insert_place.innerHTML = data.html
// local_page_iterator++
// separator_iterator++
// let new_page_routes1 = document.createElement("div")
// new_page_routes1.classList.add("page_paging_elements_" + local_page_iterator)
// $(new_page_routes1).insertAfter(".page_paging_elements_" + local_page_iterator--);
// let line_separator1 = document.createElement("div")
// line_separator1.classList.add("line_separator_page_w_el")
// el.setAttribute("id",parseInt(number_last_route) + incrase)
// history.pushState({'data':data_d,'str_data':get_url}, "state_filters", `?${get_url}`);
// // number_last_route = parseInt(number_last_route) + "11"
// iterator_f_check++
// iterator_f_check++
// if (data.last_block === true){
// el.classList.add("hide")
// } else if (data.last_block === false){
// if (el.classList.contains("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")
// } 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
// let old_page_iterator = local_page_iterator
// // standart_page_iterator++
// loader.classList.toggle("show")
// if (!data.last_block_routes){
// el.classList.toggle("hide")
// }
// // let el_scroll = place_ins.firstElementChild
// // el_scroll.scrollIntoView(
// // {
// // behavior:"smooth"
// // }
// // )
// local_page_iterator++
// let new_page_routes = document.createElement("div")
// new_page_routes.classList.add("page_paging_elements_" + local_page_iterator)
// $(new_page_routes).insertAfter(".page_paging_elements_" + old_page_iterator);
// let line_separator = document.createElement("div")
// line_separator.classList.add("line_separator_page_w_el")
//
// if (news){
// if (iterator_f_check === 1){
// //
// } else {
// $(line_separator).insertAfter(".page_paging_elements_" + separator_iterator);
// separator_iterator++
// }
// } else {
// $(line_separator).insertAfter(".page_paging_elements_" + separator_iterator);
// separator_iterator++
// }
//
// // document.querySelector(".info_profile").innerHTML = data.html;
// el.setAttribute("id",parseInt(number_last_route) + incrase)
// history.pushState({'data':data_d,'str_data':get_url}, "state_filters", `?${get_url}`);
// // number_last_route = parseInt(number_last_route) + "11"
// iterator_f_check++
// if (data.last_block === true){
// el.classList.add("hide")
// } else if (data.last_block === false){
// if (el.classList.contains("hide")) {
// el.classList.remove("hide")
// }
// }
// }
if (data.next_page_els_count){
document.querySelector(".col_vo_els_f_load").innerHTML = ` ${data.next_page_els_count}`
}
//
// let place_ins = el
if (news && standart_page_iterator === 1){
page_iterator++
let old_page_iterator = standart_page_iterator
let new_page_routes = document.querySelector(".page_paging_elements_1")
// let new_page_routes = document.createElement("div")
// let old_page_iterator = local_page_iterator
// new_page_routes.classList.add("page_paging_elements_" + standart_page_iterator--)
// $(new_page_routes).insertAfter(".page_paging_elements_" + old_page_iterator);
// old_page_iterator++
// let line_separator = document.createElement("div")
// line_separator.classList.add("line_separator_page_w_el")
new_page_routes.innerHTML = data.html
local_page_iterator++
separator_iterator++
let new_page_routes1 = document.createElement("div")
new_page_routes1.classList.add("page_paging_elements_" + local_page_iterator)
$(new_page_routes1).insertAfter(".page_paging_elements_" + old_page_iterator);
let line_separator1 = document.createElement("div")
line_separator1.classList.add("line_separator_page_w_el")
el.setAttribute("id",parseInt(number_last_route) + incrase)
history.pushState({'data':data_d,'str_data':get_url}, "state_filters", `?${get_url}`);
// number_last_route = parseInt(number_last_route) + "11"
iterator_f_check++
iterator_f_check++
if (data.last_block === true){
el.classList.add("hide")
} else if (data.last_block === false){
if (el.classList.contains("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")
let first_block_iteration = document.querySelector(`.page_paging_elements_${paging_iterator}`)
let insert_place = null
if (first_block_iteration.innerHTML){
paging_iterator++
let new_page_paging_elements = document.createElement('div')
new_page_paging_elements.classList.add(`page_paging_elements_${paging_iterator}`)
let splitter = document.createElement("div")
splitter.classList.add("line_separator_page_w_el")
$(splitter).insertAfter(first_block_iteration)
$(new_page_paging_elements).insertAfter(splitter)
insert_place = new_page_paging_elements
} 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
let old_page_iterator = local_page_iterator
// standart_page_iterator++
loader.classList.toggle("show")
if (!data.last_block_routes){
el.classList.toggle("hide")
}
// let el_scroll = place_ins.firstElementChild
// el_scroll.scrollIntoView(
// {
// behavior:"smooth"
// }
// )
local_page_iterator++
let new_page_routes = document.createElement("div")
new_page_routes.classList.add("page_paging_elements_" + local_page_iterator)
$(new_page_routes).insertAfter(".page_paging_elements_" + old_page_iterator);
let line_separator = document.createElement("div")
line_separator.classList.add("line_separator_page_w_el")
if (news){
if (iterator_f_check === 1){
//
} else {
$(line_separator).insertAfter(".page_paging_elements_" + separator_iterator);
separator_iterator++
}
} else {
$(line_separator).insertAfter(".page_paging_elements_" + separator_iterator);
separator_iterator++
}
// document.querySelector(".info_profile").innerHTML = data.html;
el.setAttribute("id",parseInt(number_last_route) + incrase)
history.pushState({'data':data_d,'str_data':get_url}, "state_filters", `?${get_url}`);
// number_last_route = parseInt(number_last_route) + "11"
iterator_f_check++
if (data.last_block === true){
el.classList.add("hide")
} else if (data.last_block === false){
if (el.classList.contains("hide")) {
el.classList.remove("hide")
}
let splitter = document.createElement("div")
splitter.classList.add("line_separator_page_w_el")
$(splitter).insertAfter(first_block_iteration)
}
insert_place.innerHTML = data.html
document.querySelector(".loader_f_loading_routes.show").classList.remove("show")
if (data.last_block === true){
el.classList.add("hide")
} else if (data.last_block === false){
if (el.classList.contains("hide")) {
el.classList.remove("hide")
}
}
el.setAttribute("id",parseInt(number_last_route) + incrase)
},
error: function (data){