diff --git a/static/css/styles.css b/static/css/styles.css index 2c8a863..64c2910 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -1118,10 +1118,16 @@ input#id_cargo_type{ width: 50%; } +.errorlist.hide { + display: none; +} + /*my routes*/ .my_route{ + width: 100%; + height: 296px; background-color: White; border-radius: 10px; margin: 2% 0 0 0; @@ -1129,16 +1135,85 @@ input#id_cargo_type{ } .route_info{ + vertical-align: top; border-style: inset; border-width: 1px; border-color: transparent #F8F8F8 transparent transparent; width: 59%; - float: left; + height: 280px; + display: inline-block; } +.route_info_about>span:first-child{ + background: url("/static/img/png/Tag.png") left center no-repeat; + margin: 0 20px 0 20px; + padding-left: 15px; + +} +.route_info_about>span:nth-child(2){ + background: url("/static/img/png/Scales.png") left center no-repeat; + padding-left: 20px; +} + +.route_info_about>span:last-child{ + background: url("/static/img/png/Airplane.png") left center no-repeat; + float: right; + margin-right: 20px; + padding-left: 15px; +} + .route_contact{ width: 40%; - float: right; + display: inline-block; } -/*my routes*/ +#edit_route { + display: block; + height: 44px; + width: 285px; + background: #FF613A; + color: #FFF; + font-family: Inter; + font-size: 18px; + font-style: normal; + font-weight: 600; + text-decoration: none; + line-height: 26px; + border-radius: 10px; + text-align: center; + margin-bottom: 5px; +} + +.button_remove_route { + display: inline-block; +} + + +button#remove_route { + height: 44px; + width: 285px; +} +.confirm_remove{ + width: 43% !important; + background: #ff0000a8; + border-radius: 10px; + color: white; + font-size: 18px; + font-style: normal; + font-weight: 600; + + + +} +button.cancel_remove{ + height: 44px; + width: 43%; + background: #808080cc; + border-radius: 10px; + color: white; + font-size: 18px; + font-style: normal; + font-weight: 600; +} + +/*my routes END*/ diff --git a/static/img/png/Airplane.png b/static/img/png/Airplane.png new file mode 100644 index 0000000..d9b0ed7 Binary files /dev/null and b/static/img/png/Airplane.png differ diff --git a/static/img/png/Car.png b/static/img/png/Car.png new file mode 100644 index 0000000..3ec3794 Binary files /dev/null and b/static/img/png/Car.png differ diff --git a/static/img/png/Scales.png b/static/img/png/Scales.png new file mode 100644 index 0000000..aacaf34 Binary files /dev/null and b/static/img/png/Scales.png differ diff --git a/static/img/png/Tag.png b/static/img/png/Tag.png new file mode 100644 index 0000000..4035a28 Binary files /dev/null and b/static/img/png/Tag.png differ diff --git a/static/js/autocomlite.js b/static/js/autocomlite.js index 31bdc12..7efa33c 100644 --- a/static/js/autocomlite.js +++ b/static/js/autocomlite.js @@ -84,3 +84,12 @@ function onblurInputField(event,el){ // } } + + +// function hideErrorMsg(el) { +// let hide_element = document.querySelector() +// if(el.value !== 0){ +// hide_element.classList.add('hide') +// } +// +// } \ No newline at end of file diff --git a/static/js/newRoute.js b/static/js/newRoute.js index 1bb11c2..30878fb 100644 --- a/static/js/newRoute.js +++ b/static/js/newRoute.js @@ -69,4 +69,5 @@ function getRoute(){ } }); -} \ No newline at end of file +} + diff --git a/static/js/sendRoute.js b/static/js/sendRoute.js index 993d616..01b85c9 100644 --- a/static/js/sendRoute.js +++ b/static/js/sendRoute.js @@ -62,35 +62,24 @@ function OnSelectionChange(el) { // location.href = '/profile' document.querySelector(".info_profile").innerHTML = data.html // - // $(document).ready(function (e){ - // $('#id_weight').ionRangeSlider({ - // skin: "round", - // type: "single", - // min: 0, - // max: 1000, - // from: 100, - // step: 1, - // grid: true, - // grid_num: 5, - // } - //get dynamic value - // let fromCountry = document.getElementById('id_from_country'); - // let toCounytry = document.getElementById('id_to_country') - // - // toCounytry.oninput = function (){ - // console.log(toCounytry.value) - // } - // fromCountry.oninput = function (){ - // console.log(fromCountry.value) -// -// }; + $('#id_weight').ionRangeSlider({ + skin: "round", + type: "single", + min: 0, + max: 1000, + from: 0, + step: 1, + grid: true, + grid_num: 5, + }); - - } + } }); -} +}; + + diff --git a/static/js/user_profile.js b/static/js/user_profile.js index cd7e60a..f605fee 100644 --- a/static/js/user_profile.js +++ b/static/js/user_profile.js @@ -92,4 +92,20 @@ function myProfile(){ } }); +} + +function confirmRemove(el) { + let place = document.querySelector('.button_remove_route') + // let new_button = document.querySelector('.cancel_remove') + // if(!button){ + let cancel_button = document.createElement('button') + cancel_button.className = "cancel_remove"; + cancel_button.innerText = "Отменить удаление"; + place.appendChild(cancel_button); + // } + + + el.classList.add('confirm_remove') + el.innerText = 'Подтвердить удаление' + } \ No newline at end of file diff --git a/templates/blocks/profile/b_new_route.html b/templates/blocks/profile/b_new_route.html index dfad0f0..981a466 100644 --- a/templates/blocks/profile/b_new_route.html +++ b/templates/blocks/profile/b_new_route.html @@ -123,6 +123,7 @@