From c0e93980ac5a86aaacd926c5bc05e37545f091c7 Mon Sep 17 00:00:00 2001 From: Welton Moura Date: Tue, 7 Jan 2025 19:16:29 -0300 Subject: [PATCH] =?UTF-8?q?style:=20altera=C3=A7=C3=A3o=20icones=20e=20fix?= =?UTF-8?q?a=C3=A7=C3=A3o=20barra=20nav?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../comandas/templates/viewcomanda.html | 10 +++++-- gestaoRaul/db.sqlite3 | Bin 241664 -> 241664 bytes .../__pycache__/settings.cpython-310.pyc | Bin 2726 -> 2693 bytes .../products/__pycache__/urls.cpython-310.pyc | Bin 444 -> 480 bytes .../__pycache__/views.cpython-310.pyc | Bin 1527 -> 2009 bytes gestaoRaul/products/templates/products.html | 25 +++++++++++++++--- gestaoRaul/templates/base.html | 2 ++ .../htmx_list_products_in_comanda.html | 14 +++++++++- .../products/htmx_search_products.html | 25 ++++++++++++++---- gestaoRaul/templates/static/base.css | 15 +++++++---- .../static/comandas/js/viewcomanda.js | 14 +++++----- .../templates/static/midia/icons/delete.svg | 12 +++++++++ .../templates/static/midia/icons/edit.svg | 7 +++++ .../static/midia/icons/toggle-off.svg | 7 +++++ .../static/midia/icons/toggle-on.svg | 7 +++++ 15 files changed, 114 insertions(+), 24 deletions(-) create mode 100644 gestaoRaul/templates/static/midia/icons/delete.svg create mode 100644 gestaoRaul/templates/static/midia/icons/edit.svg create mode 100644 gestaoRaul/templates/static/midia/icons/toggle-off.svg create mode 100644 gestaoRaul/templates/static/midia/icons/toggle-on.svg diff --git a/gestaoRaul/comandas/templates/viewcomanda.html b/gestaoRaul/comandas/templates/viewcomanda.html index 4ab45ce..1603de5 100644 --- a/gestaoRaul/comandas/templates/viewcomanda.html +++ b/gestaoRaul/comandas/templates/viewcomanda.html @@ -80,8 +80,14 @@ Detalhes {{comanda.name}} {% if comanda.status != 'OPEN'%} {% else %} - + + {% endif %} diff --git a/gestaoRaul/db.sqlite3 b/gestaoRaul/db.sqlite3 index f38d75cfb6610d7d37f3b12894edc1f936ce2176..3c440d0ba314ae9484f5d840801f2a14a9508c3a 100644 GIT binary patch delta 600 zcmZ{ey=xRf7>8%x$?R^jGrNs}fDvSanC6C^+1c9<U~Cr* zR0V@V376x^fvR+91649l&1hfdsYKn}(VHeR^r6lkC_`O2i4y>HA#t2ZNgQJiC5|!& z5=WR_iNnmc#39BbkaSAx8PIe(SBXbjrgFy601QBE@?M;C;!t?kG zo%CU;YOE7hnHqSfQ&c~Opr|IlU=ouOqpm0q=TmwCGpu8zi S*34}4Po^|>M()W8Ty6l delta 113 zcmZn_T_(z#&&$ij00fKkE7PMl^3G-QXRG2hv^3H)G_%k%&@(hJs1nI2DJihh*GCl< b1&J182n(R7(l;{Me1j>Cosnm^HOizQ4{<#qWAv*`W32b8q9Pec;c) z>cPX8uJS$_YmV|?8MVsyWC{9`YApJe=!+kaNsN|p2nvSK11(yzWhS7+C+G=nC5Dp9 zOhg0&NeI^Ru^)#GY;Hc<#;)3J>aVa?=``A5y&g5Y9o>jJ@$r*Q-QKG=yY206C+z5W zv8as~Dbe4nj}Yo7(Z>|s!V*nVD`oQev(-#)gc^B9w8>*Zp z#O%~nI>bI17kE!Y05)x$O9R-*Uds*JFN#OO1Rej~d>gK$CyT$>Ij5#Qq^i8w!YAI21|@LCJvxL(8+s zfGIXxR!by8nMC+W&Kg1@>!qTyU&`IF!X3*!yYTGX8`ouqIRzgd!T=bOV4OrAxss7{Sk^Mug)Y96*uH%X5Pu{=1E?2pKj3e{j7oO?p_|eTZ5nkTZ6T2bJwW&&(~GZ zFYM9v(U$>9PT%lFYs?S!m44!@rC$!&1(dOKEPLT;OX)XW24DN;EEM&!d03yM78|7^ zVZOJTkg`$U-)Ph&RnN<8fxC znMv7Y(@s+>HXS8sjLM`{djwZNBXLYN;zM_2fT6t5xdKEiYBGlM7h{8;s8CMexe{9b z51s^B3@>?RgSv7kV{vl2cceP%T+-_$Sm}HGBiYEL5H~|PPYnceVQCS=K0!8Ffb5d1 lln^XqxmI!Yx>I+H7{^FuSwA={dHOFV438mlE^Og?;tN+mZjt~1 diff --git a/gestaoRaul/products/templates/products.html b/gestaoRaul/products/templates/products.html index c16936f..9eb87b7 100644 --- a/gestaoRaul/products/templates/products.html +++ b/gestaoRaul/products/templates/products.html @@ -17,7 +17,7 @@ Produtos {% block 'body' %} -
+
+ {% else %} - + {% endif %} diff --git a/gestaoRaul/templates/base.html b/gestaoRaul/templates/base.html index 4eff707..709458a 100644 --- a/gestaoRaul/templates/base.html +++ b/gestaoRaul/templates/base.html @@ -15,6 +15,7 @@ {% endblock %} {% block 'title' %}{% endblock %} +
+
{% block 'body' %} {% endblock %} diff --git a/gestaoRaul/templates/htmx_components/htmx_list_products_in_comanda.html b/gestaoRaul/templates/htmx_components/htmx_list_products_in_comanda.html index df1c9e7..03295ff 100644 --- a/gestaoRaul/templates/htmx_components/htmx_list_products_in_comanda.html +++ b/gestaoRaul/templates/htmx_components/htmx_list_products_in_comanda.html @@ -1,3 +1,6 @@ +{% load static %} + + Produto Preço @@ -8,7 +11,16 @@ {{item.product.name}} R$ {{item.product.price}} - + + + + {% endfor %} diff --git a/gestaoRaul/templates/htmx_components/products/htmx_search_products.html b/gestaoRaul/templates/htmx_components/products/htmx_search_products.html index 7c6ca6e..97d33fa 100644 --- a/gestaoRaul/templates/htmx_components/products/htmx_search_products.html +++ b/gestaoRaul/templates/htmx_components/products/htmx_search_products.html @@ -1,3 +1,4 @@ +{% load static %} @@ -17,8 +18,11 @@ {{product.category.name}}
-

πŸ“

- + +
@@ -26,10 +30,21 @@ {% if product.active == True %} - + {% else %} - - + {% endif %}
diff --git a/gestaoRaul/templates/static/base.css b/gestaoRaul/templates/static/base.css index 94b708a..bb494c6 100644 --- a/gestaoRaul/templates/static/base.css +++ b/gestaoRaul/templates/static/base.css @@ -1,25 +1,29 @@ @import url('https://fonts.googleapis.com/css2?family=Inter:wght@200;300;400;500&display=swap'); body { - margin: 0px 0px 0px 0px; - padding: 15px; - font-family: Arial, sans-serif; + margin: 70px 0px 0px 0px; + /* padding: 15px; + font-family: Arial, sans-serif; */ } -/* * { +* { padding: 0; margin: 0; font-family: 'Inter', sans-serif; -} */ +} .p-header { background-color: #24252a; box-shadow: 0px 3px 10px #464646; + position: fixed; + top: 0; + width: 100%; } .nav-bar { display: flex; justify-content: space-between; padding: 0.1rem 2rem; + } .logo { @@ -58,6 +62,7 @@ body { padding: 10px 15px; border-radius: 5px; background-color: #0187a7; + margin-top: 10px; } .login-button button a { diff --git a/gestaoRaul/templates/static/comandas/js/viewcomanda.js b/gestaoRaul/templates/static/comandas/js/viewcomanda.js index a5c5ca6..489b378 100644 --- a/gestaoRaul/templates/static/comandas/js/viewcomanda.js +++ b/gestaoRaul/templates/static/comandas/js/viewcomanda.js @@ -5,10 +5,10 @@ function openModal() { } -function open_remove_product_comanda() { - document.getElementById('remove-product-comanda').style.display = 'block'; - // alert('Produto removido com sucesso!'); -} +// function open_remove_product_comanda() { +// document.getElementById('remove-product-comanda').style.display = 'block'; +// // alert('Produto removido com sucesso!'); +// } function modal_payment_comanda() { document.getElementById('payment-comanda').style.display = 'block'; @@ -23,9 +23,9 @@ function closeModal() { } -function removeCloseModal() { - document.getElementById('remove-product-comanda').style.display = 'none'; -} +// function removeCloseModal() { +// document.getElementById('remove-product-comanda').style.display = 'none'; +// } function imprimirFichas() { const element = document.getElementById("list-products-comanda"); diff --git a/gestaoRaul/templates/static/midia/icons/delete.svg b/gestaoRaul/templates/static/midia/icons/delete.svg new file mode 100644 index 0000000..0c5b8bf --- /dev/null +++ b/gestaoRaul/templates/static/midia/icons/delete.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/gestaoRaul/templates/static/midia/icons/edit.svg b/gestaoRaul/templates/static/midia/icons/edit.svg new file mode 100644 index 0000000..91394f3 --- /dev/null +++ b/gestaoRaul/templates/static/midia/icons/edit.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/gestaoRaul/templates/static/midia/icons/toggle-off.svg b/gestaoRaul/templates/static/midia/icons/toggle-off.svg new file mode 100644 index 0000000..6820cbf --- /dev/null +++ b/gestaoRaul/templates/static/midia/icons/toggle-off.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/gestaoRaul/templates/static/midia/icons/toggle-on.svg b/gestaoRaul/templates/static/midia/icons/toggle-on.svg new file mode 100644 index 0000000..ca92dfd --- /dev/null +++ b/gestaoRaul/templates/static/midia/icons/toggle-on.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file