From f8d1de5d3092b7679810a76a72f719eea2cea0f5 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Wed, 5 Jun 2024 17:47:01 +0300 Subject: [PATCH] 1.1.4 update rising and highlight my_routes --- static/css/styles(boris).css | 4 +++ static/css/styles.css | 8 ++++++ static/js/user_profile.js | 34 +++++++++++++++++------- templates/widgets/routes/w_my_route.html | 5 ++-- 4 files changed, 39 insertions(+), 12 deletions(-) diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index c747b96..d13c39c 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -1322,6 +1322,7 @@ padding-left: 35px; padding-right: 35px; margin-bottom: 20px; + border-radius: 10px; } @@ -1384,6 +1385,9 @@ .container_inf_about_moving{ display: block; width: 100%; + background: #F8F8F8; + padding: 5px; + border-radius: 10px; } diff --git a/static/css/styles.css b/static/css/styles.css index 3931745..b0d4d2d 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -688,6 +688,10 @@ header .header-second { display: inline-block; } +.carrier-card.highlight-color{ + background: linear-gradient(90deg, #FBED96 0%, #ABECD6 100%); +} + .control_frame{ display: none; position: absolute; @@ -2065,6 +2069,10 @@ button#raise_route { background: #E6E6E6; } + +.edit_route.highlight-color{ + background: #F8F8F8; +} .edit_route.hide{ display: none; } diff --git a/static/js/user_profile.js b/static/js/user_profile.js index 4e6ce35..a963106 100644 --- a/static/js/user_profile.js +++ b/static/js/user_profile.js @@ -671,27 +671,22 @@ function confirmUpgrade(el, routeID){ // } // } - for (let i = 0; i < remainsRisingCount.length; i++){ - remainsRisingCount[i].outerHTML = data.remains_route_rising_count.toString(); - } - for (let i = 0; i < remainsHighlightCount.length; i++){ - remainsHighlightCount[i].outerHTML = data.remains_route_highlight_count.toString(); - } // document.getElementById('remains_route_rising_count').outerHTML = data.remains_route_rising_count.toString(); // document.getElementById('remains_route_highlight_count').outerHTML = data.remains_route_highlight_count.toString(); - let data_route_id = data.route_id + // location.href = '/profile' - if(!data.status){ - document.querySelector('[data-number-of-route="' + routeID + '"]').innerHTML = data.html - } + // if(!data.status){ + // document.querySelector('[data-number-of-route="' + routeID + '"]').innerHTML = data.html + // } + let data_route_id = data.route_id let el_route = document.querySelector(`[data-number-of-route="${data_route_id}"]`); if (routeID){ el_route = document.querySelector(`[data-number-of-route="${routeID}"]`); @@ -702,6 +697,25 @@ function confirmUpgrade(el, routeID){ inline:'start' }); + let editButton = document.getElementById('edit_route_' + routeID) + + if(url === '/routes/highlight_route/'){ + el_route.classList.add('highlight-color'); + editButton.classList.add('highlight-color') + } + + + for (let i = 0; i < remainsRisingCount.length; i++){ + remainsRisingCount[i].outerHTML = data.remains_route_rising_count.toString(); + } + + for (let i = 0; i < remainsHighlightCount.length; i++){ + remainsHighlightCount[i].outerHTML = data.remains_route_highlight_count.toString(); + } + + + + diff --git a/templates/widgets/routes/w_my_route.html b/templates/widgets/routes/w_my_route.html index 1c9daf1..5d2a852 100644 --- a/templates/widgets/routes/w_my_route.html +++ b/templates/widgets/routes/w_my_route.html @@ -2,7 +2,8 @@ {% load i18n %} -
+
+{#
#}
{#
#} {#
#} @@ -146,7 +147,7 @@