From 7002bd2600d5f49fd280a798e525147afa700daf Mon Sep 17 00:00:00 2001 From: ArtemB Date: Tue, 5 Sep 2023 18:39:49 +0300 Subject: [PATCH] 0.0.129 add bad remove_route_button design --- static/css/styles.css | 15 ++++++++------- static/js/user_profile.js | 40 ++++++++++++++++++++++++--------------- 2 files changed, 33 insertions(+), 22 deletions(-) diff --git a/static/css/styles.css b/static/css/styles.css index c171e00..4101854 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -1632,25 +1632,26 @@ button#remove_route { } button.confirm_remove{ width: 49% !important; - background: #ff0000a8; + border: 1px solid #ff0000a8; border-radius: 10px; - color: white; + color: #ff0000a8; font-style: normal; font-weight: 600; margin-right: 3px; padding: 5px 0px 5px 0px; - - - + font-size: 16px; } + button.cancel_remove{ width: 48%; - background: #808080cc; + border: 1px solid #808080cc; border-radius: 10px; - color: white; + color: #808080cc; font-style: normal; font-weight: 600; padding: 5px 0px 5px 0px; + font-size: 16px; + } diff --git a/static/js/user_profile.js b/static/js/user_profile.js index a3d9081..8da3e97 100644 --- a/static/js/user_profile.js +++ b/static/js/user_profile.js @@ -154,11 +154,10 @@ function myProfile(el){ function removeRoute(el) { - - - let remove_item = el.currentTarget.parentNode.parentNode.parentNode.parentNode.parentNode.dataset.numberOfRoute + let data = el.currentTarget.closest('.carrier-card'); + let remove_item = data.dataset.numberOfRoute let remove_data = {} - let name_route = 'route.id' + let name_route = 'route_id' remove_data[name_route] = remove_item // console.log(remove_item) @@ -199,29 +198,40 @@ function removeRoute(el) { } +function cancelRemove() { + let parent_cancel_button = document.querySelector('.button_remove_route') + let cancel_button = document.querySelector('.cancel_remove') + parent_cancel_button.removeChild(cancel_button) + + let remove_button = document.querySelector('.confirm_remove'); + remove_button.classList.remove('confirm_remove'); + remove_button.innerText = 'Удалить'; + remove_button.setAttribute("id", "remove_route"); + + +} function confirmRemove(el) { - // let new_button = document.querySelector('.cancel_remove') - // if(!new_button){ - - // } el.setAttribute("id", "select-remove"); let btn = document.querySelector("#select-remove"); if (!btn.classList.contains('confirm_remove')) { - btn.classList.add('confirm_remove') - btn.innerText = 'Подтвердить удаление' - // let place = document.querySelector('.button_remove_route') - let cancel_button = document.createElement('button') + btn.classList.add('confirm_remove'); + btn.innerText = 'Подтвердить удаление'; + btn.addEventListener('click', removeRoute, { once: true }); + + let cancel_button = document.createElement('button'); cancel_button.className = "cancel_remove"; cancel_button.innerText = "Отменить удаление"; - let place = btn.closest(".button_remove_route") + cancel_button.addEventListener('click', cancelRemove) + + + let place = btn.closest(".button_remove_route"); place.insertBefore(cancel_button, btn.nextSibling); - btn.addEventListener('click', removeRoute, { once: true }) - btn.removeAttribute("id", "select-remove") + btn.removeAttribute( "select-remove"); }