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:
SDE
2023-11-29 17:51:12 +03:00
parent 16e7ea3109 41fa14351a
commit de6bd9682e
3 changed files with 81 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
static/css/styles.css
View File

@@ -280,7 +280,7 @@ section.register>h1 {
line-height: 20px;
margin-bottom: 10px;
}
.first-column>div:first-child{
.footer_logo{
margin-bottom: 40px;
}
@@ -471,7 +471,7 @@ footer>div {
margin-bottom: 10px;
}
.first-column>div:nth-child(2)>div:last-child>div {
#footer_input_button {
display: flex;
width: 60px;
height: 60px;
@@ -2871,14 +2871,14 @@ details[open] summary ~ *{
width: 76%;
}
.news_item_pagination:nth-child(odd) .pag_news_img,
.news_item_pagination:nth-child(odd) .pag_news_item_text{
.news_item_pagination .odd .pag_news_img,
.news_item_pagination .odd .pag_news_item_text{
float: left;
margin: 10px;
overflow-wrap: break-word;
}
.news_item_pagination:nth-child(even) .pag_news_img,
.news_item_pagination:nth-child(even) .pag_news_item_text{
.news_item_pagination .even .pag_news_img,
.news_item_pagination .even .pag_news_item_text{
float: right;
margin: 10px;
overflow-wrap: break-word;

112
static/js/dynamic_loading_routes.js
View File

@@ -67,53 +67,87 @@ function load_routes (el,news=null,incrase) {
//
// let place_ins = el
if (news && standart_page_iterator === 1){
page_iterator++
standart_page_iterator++
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++
local_page_iterator++
standart_page_iterator++
let new_page_routes1 = document.createElement("div")
new_page_routes1.classList.add("page_paging_elements_" + local_page_iterator)
$(new_page_routes).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")
}
}
document.querySelector(".loader_f_loading_routes.show").classList.remove("show")
} else {
place_ins.innerHTML = data.html
let old_page_iterator = local_page_iterator
// standart_page_iterator++
local_page_iterator++
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"
// }
// )
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")
place_ins.innerHTML = data.html
let old_page_iterator = local_page_iterator
// standart_page_iterator++
local_page_iterator++
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"
// }
// )
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){
//
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++
}
} 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")
// 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")
}
}
}
},
error: function (data){

4
templates/blocks/b_footer.html
View File

@@ -4,11 +4,11 @@
<div>
<div class="left-column">
<div class="first-column">
<div><img class="svg" src="/static/img/svg/LogoWhite.svg"></div>
<div class="footer_logo"><img class="svg" src="/static/img/svg/LogoWhite.svg"></div>
<div>
<div class="footer_text_sub">{% trans "Подпишись и будь в курсе всех событий, а также получай подарки и бонусы от Trip With Bonus" %}</div>
<div class="footer_input_wrap"><input class="footer_input" type="text" placeholder="{% trans "Введите ваш e-mail" %}">
<div><img class="svg" src="/static/img/svg/CaretCircleRight.svg"></div>
<div id="footer_input_button"><img class="svg" src="/static/img/svg/CaretCircleRight.svg"></div>
</div>
</div>
<div class="social_media_footer">