From de3f90f83b7050d413a1bd8aaa881d9a075f9fb0 Mon Sep 17 00:00:00 2001 From: Welton Moura Date: Thu, 23 Jan 2025 13:43:16 -0300 Subject: [PATCH] style: consistencia --- gestaoRaul/balcao/templates/viewBalcao.html | 10 +-- gestaoRaul/clients/templates/clients.html | 11 ++- gestaoRaul/comandas/templates/comandas.html | 6 +- .../comandas/templates/viewcomanda.html | 34 ++++---- gestaoRaul/db.sqlite3 | Bin 299008 -> 299008 bytes gestaoRaul/orders/templates/orders.html | 6 +- gestaoRaul/products/templates/products.html | 12 +-- .../htmx_list_products_in_balcao.html | 2 +- .../orders/htmx_list_orders_fila.html | 6 +- .../orders/htmx_list_orders_pronto.html | 4 +- gestaoRaul/templates/static/base.css | 76 +++++++++++++++++- .../templates/static/clients/css/clients.css | 17 ---- .../static/comandas/css/comandas.css | 15 ---- .../static/comandas/css/viewbalcao.css | 14 ---- .../static/comandas/css/viewcomanda.css | 16 +--- .../static/products/css/products.css | 25 +++--- 16 files changed, 129 insertions(+), 125 deletions(-) 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 4bb38d4f9fec4fa73ea5b4bb6d10dc21a622cc46..b2f27377c71b9c51bec74dafd163f3a1eadfa12e 100644 GIT binary patch delta 995 zcmb7DU2GIp6rOwT>`c3znM09Ox2?F;A|%rJ-(SHl+Xw|s0YhQ{K@)vyF}j+#MM(f{ z(k47qAmyl}$!Z8MmZXNXBdBR1kP0zPi6u};W1*!$TT6MUF@>nJtS|WH(>>>Y_dDM? zC*R$lTf9HF__GRj>`-N0;FzF)c<|e|n{;Lz8PdyG=E!Z`V(CvqMr+7mUdVvy_rjVo zAmI1-32wlrwBNL^wVm3t>Rq)<-J{kj3(5eQIoL|694KB(4(b%JGW79DSo(zRgsn)@ ziY2YM9z30D!5t-L(GRgh0rc(P6cj0Te+3)Z;rtt-I@hG-q8-9SD^kzSV zm`u(6(B{Ee2&l5e8I+0!X@hXeFLrJa(u~)u^CS;}1^yWyf-$fBGF(?4z2&0eJsbrI zHVQ%&YZP#=_LtVGX=;aBp?sw@E9*)oO5O?11}_A^3}%Y|EZ$cv6&)xllH27nsZ**B zd=s$6(_)Gb@CLX7ud{L1cxua{r3|uZvL<24TZKgxW_4W0jX%Bx+fKTU9#2?qEb$-2 zO-4*TYR4Qq`Z(eylBTUkqtUqKZ_b}Kd;>nBSI3|kvbA~D5Z##oh5B#6&umTMVssqd zV5NoBWS2V@iZ<&EXot=b> z04od{xd)Xck%%65OvkYnHB#3--!AV?!9IF_8b)Zz6gaeJ23A7z3VP;uDEIni;1Z+5 zvoKGyQ_xZ!6a+!TGXg%qKkz=z;BCB#qj(K}!9l!;=dlmZkU5t(;auK?a}dRV$OV?6 zzQ5t6u!h|N&f^?T<0LNN82*Ys;jqs=hd*F9_I8+jYe$MJJuQ3{N&(K8nxS6g4LdSa&qcMP7yFB!_t&V7d27m=9{clYogvnwA-S+=pF~P5vBny;UZc3aX`PO4jmA zK4_7g;&EnqFQ)i??NLiS-5T4(z1Sx4bVbRw(xCrYnuKB@Lte}OMIZW_bJ>qdt@FGUV|Whw{U?ax7{E>C>{we_v05XpEv zDcY?y@p!yd7=$o{l@6iq{4fL=>-J@(dJ+zS((ewPgo}za^AN^Z!V)63TC{O;f)Kx( z&BHOEhP&!(xTLaf&ZRmE>z3k+_$+SoI{F;f<63ORqj(74#eMiOKP`8RLY+J?3Yo(9 zpc?8BA@nW>$;aUGDP+>`1A#AI>;uDZ1sU{Y5%vY4MyaPLimA9~J{2o>TxyVKcRi3to28I1?4VN-~%=W zHS`$ip(d%GbV_DR5SG6eL6rxJ@SMipB+nR*;}H34(Mv!P5|DNts`4V+X~%=WW$9dp zTbgo;Z16DhFV^T^!W1jLu3CBJ8oWdk)q8#l`Wk(&ktY`bLMhn7j<<+di*1{BQ%8sx zp3s6)Lq()HoveZzZ$RI2?frk8{tL#MQV)?~Zd;-?(cTvG6k5{lRfRJ*;IezT1i!%& zeKT3S;B#Lm-Bzu!O3){}W?{A5I}K0BxoLPyzVQe2%iS|@Da7vZ_sFUT4Tg2wO0?Uy zEh^K>{j<;n?7I8OEKE@iGeoQG(vg`txV^%gX~n|xzN0tt&gKxQudJI;Ap2g~ZOY@* z(AyaFY7HDA_$S`MTR4j)EaD{oj6dQy{(xt3M2d3dhnFiqybNvV^N21XNB)8hrhx^5 zx3P>fIEC|g6@S5Vc+n%r@H;H<5041ednCp5d_QYOzaczyi!319((u1LFPx^%QIjbw zf)S~jtP}L--AyJN=j!H7fn@=W$Vil3^U_JF3ih}g70id(Z2_6=VCTJXLaHgY#&uGx b%)M|Xv6Z=rt;#p`gF6;&cc0#+{{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%; }