diff --git a/gestaoRaul/balcao/templates/viewBalcao.html b/gestaoRaul/balcao/templates/viewBalcao.html index 9f3994e..1e66bbc 100644 --- a/gestaoRaul/balcao/templates/viewBalcao.html +++ b/gestaoRaul/balcao/templates/viewBalcao.html @@ -21,12 +21,12 @@
- - + {% endfor %} @@ -120,12 +120,12 @@
diff --git a/gestaoRaul/clients/templates/clients.html b/gestaoRaul/clients/templates/clients.html index 75ebbb4..8459fca 100644 --- a/gestaoRaul/clients/templates/clients.html +++ b/gestaoRaul/clients/templates/clients.html @@ -17,9 +17,8 @@ Clientes
-
@@ -85,9 +84,9 @@ Clientes diff --git a/gestaoRaul/comandas/templates/comandas.html b/gestaoRaul/comandas/templates/comandas.html index 56b23cb..27abe8a 100644 --- a/gestaoRaul/comandas/templates/comandas.html +++ b/gestaoRaul/comandas/templates/comandas.html @@ -15,7 +15,7 @@ Comandas
- +
@@ -63,8 +63,8 @@ Comandas
- - + +
diff --git a/gestaoRaul/comandas/templates/viewcomanda.html b/gestaoRaul/comandas/templates/viewcomanda.html index ddd2e9d..cf001d4 100644 --- a/gestaoRaul/comandas/templates/viewcomanda.html +++ b/gestaoRaul/comandas/templates/viewcomanda.html @@ -22,33 +22,33 @@ Detalhes {{comanda.name}}
- - {% if comanda.status == 'PAYING' %} - + {% else %} {% endif %} {% if comanda.status != 'OPEN'%} - {% endif %} {% if user|groupUser:"Gerente" %} - +
+

Adicionar Produto

+
+
{% for product in products %} @@ -153,8 +156,8 @@ Detalhes {{comanda.name}}
- - + +
@@ -172,11 +175,11 @@ Detalhes {{comanda.name}}
- - + - +
@@ -199,8 +202,8 @@ Detalhes {{comanda.name}}
- - + +
@@ -229,9 +232,8 @@ Detalhes {{comanda.name}}
- - + +
diff --git a/gestaoRaul/db.sqlite3 b/gestaoRaul/db.sqlite3 index 4bb38d4..b2f2737 100644 Binary files a/gestaoRaul/db.sqlite3 and b/gestaoRaul/db.sqlite3 differ diff --git a/gestaoRaul/orders/templates/orders.html b/gestaoRaul/orders/templates/orders.html index dc3aca5..00df152 100644 --- a/gestaoRaul/orders/templates/orders.html +++ b/gestaoRaul/orders/templates/orders.html @@ -51,7 +51,7 @@

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

Atendente: {{order.id_comanda.user.first_name}}

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

-
@@ -75,7 +75,7 @@

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

Atendente: {{order.id_comanda.user.first_name}}

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

-
@@ -98,7 +98,7 @@

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

Atendente: {{order.id_comanda.user.first_name}}

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

-
diff --git a/gestaoRaul/products/templates/products.html b/gestaoRaul/products/templates/products.html index 6fa6646..396e443 100644 --- a/gestaoRaul/products/templates/products.html +++ b/gestaoRaul/products/templates/products.html @@ -16,9 +16,7 @@ Produtos
-
@@ -112,9 +110,9 @@ Produtos
- - - + + +
@@ -123,8 +121,6 @@ Produtos - - {% endblock %} \ No newline at end of file diff --git a/gestaoRaul/templates/htmx_components/htmx_list_products_in_balcao.html b/gestaoRaul/templates/htmx_components/htmx_list_products_in_balcao.html index 9aabe11..98cd0a9 100644 --- a/gestaoRaul/templates/htmx_components/htmx_list_products_in_balcao.html +++ b/gestaoRaul/templates/htmx_components/htmx_list_products_in_balcao.html @@ -8,7 +8,7 @@ {{item.product.name}} R$ {{item.product.price}} - diff --git a/gestaoRaul/templates/htmx_components/orders/htmx_list_orders_fila.html b/gestaoRaul/templates/htmx_components/orders/htmx_list_orders_fila.html index 51bce7a..68e17aa 100644 --- a/gestaoRaul/templates/htmx_components/orders/htmx_list_orders_fila.html +++ b/gestaoRaul/templates/htmx_components/orders/htmx_list_orders_fila.html @@ -23,7 +23,7 @@

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

Atendente: {{order.id_comanda.user.first_name}}

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

-
@@ -48,7 +48,7 @@

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

Atendente: {{order.id_comanda.user.first_name}}

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

-
@@ -71,7 +71,7 @@

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

Atendente: {{order.id_comanda.user.first_name}}

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

-
diff --git a/gestaoRaul/templates/htmx_components/orders/htmx_list_orders_pronto.html b/gestaoRaul/templates/htmx_components/orders/htmx_list_orders_pronto.html index 8f986e6..20e09ac 100644 --- a/gestaoRaul/templates/htmx_components/orders/htmx_list_orders_pronto.html +++ b/gestaoRaul/templates/htmx_components/orders/htmx_list_orders_pronto.html @@ -23,7 +23,7 @@

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

Atendente: {{order.id_comanda.user.first_name}}

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

- @@ -48,7 +48,7 @@

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

Atendente: {{order.id_comanda.user.first_name}}

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

- diff --git a/gestaoRaul/templates/static/base.css b/gestaoRaul/templates/static/base.css index 44333e8..5d9e19e 100644 --- a/gestaoRaul/templates/static/base.css +++ b/gestaoRaul/templates/static/base.css @@ -5,7 +5,6 @@ } - body { margin: 70px 0px 0px 0px; } @@ -14,6 +13,81 @@ h1{ text-align: center; } + +form { + display: flex; + flex-direction: column; + gap: 10px; +} + +input, textarea, select { + width: 95%; + max-width: 95%; + max-height: 300px; + /* padding: 8px; */ + margin-top: 5px; + border-radius: 8px; + border: 1px solid #cccccc52; +} + + +.btn-primary { + align-items: center; + background: var(--main-gradient); + border-color: rgba(86, 187, 255, 0.192); + border-radius: 8px; + box-shadow: 0px 0px 10px rgba(12, 12, 12, 0.973); + text-align: left; + line-height: 20px; + padding: 15px 30px 15px 30px; + transition: box-shadow 0.4s; + } + + .btn-primary:hover { + box-shadow: 0px 0px 15px rgba(86, 187, 255, 0.815); + text-align: left; + line-height: 20px; + padding: 15px 30px 15px 30px; + } + +.btn-secondary { + align-items: center; + background: var(--main-gradient); + border-color: rgba(53, 241, 62, 0.425); + border-radius: 8px; + box-shadow: 0px 0px 10px rgba(12, 12, 12, 0.973); + text-align: left; + line-height: 20px; + padding: 15px 30px 15px 30px; + transition: box-shadow 0.4s; + } + + .btn-secondary:hover { + box-shadow: 0px 0px 15px rgb(53, 241, 62); + text-align: left; + line-height: 20px; + padding: 15px 30px 15px 30px; + } + +.btn-cancel { + align-items: center; + background: linear-gradient(145deg, #dd3d3d8e, #9b4d4dbd); + border-color: rgba(250, 62, 62, 0.404); + border-radius: 8px; + box-shadow: 0px 0px 10px rgba(12, 12, 12, 0.973); + text-align: left; + line-height: 20px; + padding: 15px 30px 15px 30px; + transition: box-shadow 0.4s; + } + + .btn-cancel:hover { + box-shadow: 0px 0px 15px rgba(255, 86, 86, 0.815); + text-align: left; + line-height: 20px; + padding: 15px 30px 15px 30px; + } + * { padding: 0; margin: 0; diff --git a/gestaoRaul/templates/static/clients/css/clients.css b/gestaoRaul/templates/static/clients/css/clients.css index 7b63355..1caf927 100644 --- a/gestaoRaul/templates/static/clients/css/clients.css +++ b/gestaoRaul/templates/static/clients/css/clients.css @@ -1,22 +1,5 @@ -form { - display: flex; - flex-direction: column; - gap: 10px; -} - -input, textarea { - width: 95%; - max-width: 95%; - padding: 8px; - margin-top: 5px; - border-radius: 5px; - border: 1px solid #ccc; -} - - - .grid-buttons { grid-template-columns: 1fr 1fr; display: flex; diff --git a/gestaoRaul/templates/static/comandas/css/comandas.css b/gestaoRaul/templates/static/comandas/css/comandas.css index d8dd05c..0993d31 100644 --- a/gestaoRaul/templates/static/comandas/css/comandas.css +++ b/gestaoRaul/templates/static/comandas/css/comandas.css @@ -35,21 +35,6 @@ p { box-shadow: 10px 10px 20px rgba(0, 0, 0, 0.3); } -form { - display: flex; - flex-direction: column; - gap: 10px; -} - -input, textarea { - width: 95%; - max-width: 95%; - padding: 8px; - margin-top: 5px; - border-radius: 5px; - border: 1px solid #ccc; -} - @media (max-width: 768px) { .grid-container { diff --git a/gestaoRaul/templates/static/comandas/css/viewbalcao.css b/gestaoRaul/templates/static/comandas/css/viewbalcao.css index 5070447..9309ee5 100644 --- a/gestaoRaul/templates/static/comandas/css/viewbalcao.css +++ b/gestaoRaul/templates/static/comandas/css/viewbalcao.css @@ -30,17 +30,3 @@ table td th { text-align: center; } -form { - display: flex; - flex-direction: column; - gap: 10px; - } - -input, textarea { - width: 95%; - max-width: 95%; - padding: 8px; - margin-top: 5px; - border-radius: 5px; - border: 1px solid #ccc; - } diff --git a/gestaoRaul/templates/static/comandas/css/viewcomanda.css b/gestaoRaul/templates/static/comandas/css/viewcomanda.css index 00ccbd2..3ea904e 100644 --- a/gestaoRaul/templates/static/comandas/css/viewcomanda.css +++ b/gestaoRaul/templates/static/comandas/css/viewcomanda.css @@ -13,7 +13,7 @@ grid-template-columns: repeat(3, 1fr); gap: 8px; max-width: 800px; - margin: 0 auto; + /* margin: 0 auto; */ } .card-product { @@ -31,17 +31,3 @@ text-align: center; } -form { - display: flex; - flex-direction: column; - gap: 10px; -} - -input, textarea { - width: 95%; - max-width: 95%; - padding: 8px; - margin-top: 5px; - border-radius: 5px; - border: 1px solid #ccc; -} diff --git a/gestaoRaul/templates/static/products/css/products.css b/gestaoRaul/templates/static/products/css/products.css index aed7391..7605c20 100644 --- a/gestaoRaul/templates/static/products/css/products.css +++ b/gestaoRaul/templates/static/products/css/products.css @@ -1,20 +1,5 @@ -form { - display: flex; - flex-direction: column; - gap: 10px; -} - -input, textarea { - width: 95%; - max-width: 95%; - padding: 8px; - margin-top: 5px; - border-radius: 5px; - border: 1px solid #ccc; -} - .grid-buttons { display: grid; grid-template-columns: repeat(2, 1fr); @@ -31,7 +16,15 @@ input, textarea { } .grid-top { - display: flex; + display: grid; + padding: 10px; + align-items: center; + justify-items: center; + justify-self: center; + align-content: center; + align-self: center; + grid-template-columns: 1fr 3fr; + gap: 20px; width: 100%; }