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 f38d75c..3c440d0 100644 Binary files a/gestaoRaul/db.sqlite3 and b/gestaoRaul/db.sqlite3 differ diff --git a/gestaoRaul/gestaoRaul/__pycache__/settings.cpython-310.pyc b/gestaoRaul/gestaoRaul/__pycache__/settings.cpython-310.pyc index 35f2176..d849a14 100644 Binary files a/gestaoRaul/gestaoRaul/__pycache__/settings.cpython-310.pyc and b/gestaoRaul/gestaoRaul/__pycache__/settings.cpython-310.pyc differ diff --git a/gestaoRaul/products/__pycache__/urls.cpython-310.pyc b/gestaoRaul/products/__pycache__/urls.cpython-310.pyc index a46f1ab..97ed013 100644 Binary files a/gestaoRaul/products/__pycache__/urls.cpython-310.pyc and b/gestaoRaul/products/__pycache__/urls.cpython-310.pyc differ diff --git a/gestaoRaul/products/__pycache__/views.cpython-310.pyc b/gestaoRaul/products/__pycache__/views.cpython-310.pyc index 47b4d76..ec108f0 100644 Binary files a/gestaoRaul/products/__pycache__/views.cpython-310.pyc and b/gestaoRaul/products/__pycache__/views.cpython-310.pyc differ 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